diff --git a/src/api/supervision-boot/plan/index.ts b/src/api/supervision-boot/plan/index.ts index dc40330e..b01b039f 100644 --- a/src/api/supervision-boot/plan/index.ts +++ b/src/api/supervision-boot/plan/index.ts @@ -5,7 +5,7 @@ import { SUPERVISION_BOOT } from '@/utils/constantRequest' const MAPPING_PATH = SUPERVISION_BOOT + '/deVReport' /** - * 提交终端信息表单数据 + * 提交技术监督计划表单数据 */ export const addPlanFormData = (data: any) => { return createAxios({ @@ -16,16 +16,50 @@ export const addPlanFormData = (data: any) => { } + /** - * 根据id获取终端录入的详细数据 + * 根据当前登陆用户的部门id查询人员 + */ +export const getUserByDeptId = (data: any) => { + return createAxios({ + url: '/user-boot/user/getUserListByDeptId', + method: 'GET', + params: data + }) +} + +// 提交审核 +export const planDetailsAudit = (obj: any) => { + let form = new FormData() + form.append('id', obj.id) + return createAxios({ + url:'/supervision-boot/superPlan/initiateAudit', + method: 'POST', + data:form + }) +} +/** + * 根据id获取监督计划详情 */ export const getPlanDetailsById = (obj: any) => { let form = new FormData() form.append('id', obj.id) return createAxios({ - url:MAPPING_PATH + '/queryDeviceDetail', + url:'/supervision-boot/superPlan/getDetail', method: 'POST', data:form }) } + + +/** + * 提交技术监督计划实施问题表单数据 + */ +export const addPlanProblemFormData = (data: any) => { + return createAxios({ + url: '/supervision-boot/superProblem/addProblem', + method: 'POST', + data: data + }) +} diff --git a/src/views/pqs/supervise/plan/components/addForm.vue b/src/views/pqs/supervise/plan/components/addForm.vue index b4277348..311789d1 100644 --- a/src/views/pqs/supervise/plan/components/addForm.vue +++ b/src/views/pqs/supervise/plan/components/addForm.vue @@ -22,27 +22,20 @@ - + - - - + - + @@ -50,7 +43,7 @@ - + @@ -150,7 +143,7 @@ - + @@ -159,7 +152,7 @@ @@ -170,7 +163,7 @@ @@ -188,7 +181,7 @@ placeholder="请选择监督对象关联电站电压等级" > * - + @@ -464,21 +457,26 @@ import type { ComponentSize, FormInstance, FormRules } from 'element-plus' import { queryByAllCode } from '@/api/system-boot/dictTree' import { useAdminInfo } from '@/stores/adminInfo' import { uploadFile } from '@/api/system-boot/file' -import { addPlanFormData } from '@/api/supervision-boot/plan/index' +import { addPlanFormData, getUserByDeptId } from '@/api/supervision-boot/plan/index' import { getAreaList } from '@/api/common' +import Area from '@/components/form/area/index.vue' const emits = defineEmits(['onSubmit']) const dictData = useDictData() const dialogFormVisible = ref(false) const form: any = ref({}) const ruleFormRef = ref(null) +//获取登陆用户姓名和部门 +const adminInfo = useAdminInfo() +//字典获取监督类型 +const supvTypeList = dictData.getBasicData('supv_type') //字典获取监督阶段 -const areaOptionList = dictData.getBasicData('jibei_area') -//字典获取监督对象关联电站电压等级 -const neutralPointWiringMethodList = dictData.getBasicData('Neutral_Point') +const supvStageList = dictData.getBasicData('supv_stage') +//字典获取监督对象类型 +const supvObjTypeList = dictData.getBasicData('supv_obj_type') //字典获取实施状态 -const manufacturerList = dictData.getBasicData('Dev_Manufacturers') -//字典获取实施人员 -const frontEndMachineList = dictData.getBasicData('Front_Type') +const effectStatusList = dictData.getBasicData('effect_status') +//字典获取计划状态 +const planStatusList = dictData.getBasicData('plan_status') //字典获取电压等级 const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand') // @@ -492,29 +490,37 @@ const objTypeList = [ name: '新（改、扩）建站' } ] +const effectUserIdList: any = ref([]) +//根据当前登陆用户的部门id查询实施人员 +const getEffectUserList = () => { + getUserByDeptId({ deptId: adminInfo.$state.deptId }).then(res => { + effectUserIdList.value = res.data + }) +} +getEffectUserList() const resetForm = () => { form.value = { workPlanName: '', //计划名称 supvOrgId: '', //监督单位 planOrgId: '', //计划编制单位 supvType: '', //监督类型 - supvStage: areaOptionList[0].id, //监督阶段 + supvStage: supvStageList[0]?.id, //监督阶段 planSupvDate: '', //计划监督时间 - supvObjType: areaOptionList[0].id, //监督对象类型 + supvObjType: supvObjTypeList[0]?.id, //监督对象类型 supvObjName: '', //监督对象名称 objVoltageLevel: voltageLevelList[0].id, // 监督对象电压等级 - objType: '', //监督对象属性 + objType: objTypeList[0].id, //监督对象属性 objTypeName: '', //监督对象属性名称 - objCapacity: '', //监督对象协议容量 + objCapacity: '0', //监督对象协议容量 substationName: '', //监督对象关联电站 substationVoltageLevel: voltageLevelList[0].id, // 监督对象关联电站电压等级 - effectStatus: '0', //实施状态 + effectStatus: effectStatusList[0].id, //实施状态 effectStartTime: '', //开始实施时间 effectEndTime: '', //结束实施时间 reportIssueTime: '', //报告出具时间 problemOcTime: '', //电能质量问题发生时间 - effectUserId: '', //实施人员 - planStatus: '', //计划状态 + effectUserId: effectUserIdList.value[0]?.id, //实施人员 + planStatus: planStatusList[0].id, //计划状态 otherRemark: '', //其他要求 planUserId: '' //计划编制人,挡墙登陆用户 // sealReport: '', //盖章报告 @@ -718,8 +724,6 @@ const choose = (e: any) => { const disabledDate = time => { return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天 } -//获取登陆用户姓名和部门 -const adminInfo = useAdminInfo() //提交 const confirmForm = () => { // 提交终端信息 diff --git a/src/views/pqs/supervise/plan/components/detail.vue b/src/views/pqs/supervise/plan/components/detail.vue index 89b44c44..32738526 100644 --- a/src/views/pqs/supervise/plan/components/detail.vue +++ b/src/views/pqs/supervise/plan/components/detail.vue @@ -2,108 +2,85 @@
- {{ detailData.planName }} + {{ detailData.workPlanName }} - {{ detailData.planUnit }} + {{ detailData.supvOrgName }} - {{ detailData.planDept }} + {{ detailData.planOrgName }} - {{ detailData.expectedProductionDate }} + {{ detailData.supvType }} - {{ detailData.city }} + {{ detailData.supvStage }} - {{ formatDate(detailData.reportDate, 'YYYY-MM-DD') }} + {{ formatDate(detailData.planSupvDate, 'YYYY-MM-DD') }} - - - - - {{ detailData?.lineFilePath.name }} - + {{ detailData.supvObjType }} - {{ - areaOptionList.find(item => { - return item.id == detailData.supervisionTempDeviceReport?.powerCompany - })?.name - }} + {{ detailData.supvObjName }} {{ voltageLevelList.find(item => { - return item.id == detailData.supervisionTempDeviceReport?.substationVoltageLevel + return item.id == detailData.objVoltageLevel })?.name }} - {{ detailData.supervisionTempDeviceReport?.substation }} + {{ detailData.objType }} - {{ detailData.supervisionTempDeviceReport?.monitoringTerminalCode }} + {{ detailData.objTypeName }} - {{ detailData.supervisionTempDeviceReport?.monitoringTerminalName }} + {{ detailData.objCapacity }} {{ - voltageTransformerTypeList.find(item => { - return item.id == detailData.supervisionTempDeviceReport?.voltageTransformerType - })?.name + detailData.substationName }} {{ - terminalWiringMethodTypeList.find(item => { - return item.id == detailData.supervisionTempDeviceReport?.terminalWiringMethodType + voltageLevelList.find(item => { + return item.id == detailData.substationVoltageLevel })?.name }} {{ - neutralPointWiringMethodList.find(item => { - return item.id == detailData.supervisionTempDeviceReport?.neutralPointWiringMethod - })?.name + detailData.effectStatus }} {{ - manufacturerList.find(item => { - return item.id == detailData.supervisionTempDeviceReport?.manufacturer - })?.name + detailData.effectStartTime }} - {{ detailData.supervisionTempDeviceReport?.manufacturerDeviceNumber }} + {{ detailData.effectEndTime }} - {{ detailData.supervisionTempDeviceReport?.terminalIp }} + {{ detailData.reportIssueTime }} - {{ - terminalTypeList.find(item => { - return item.id == detailData.supervisionTempDeviceReport?.terminalType - })?.name - }} + {{ detailData.problemOcTime }} - {{ detailData.supervisionTempDeviceReport?.terminalPort }} + {{ detailData.effectUserId }} - {{ - frontEndMachineList.find(item => { - return item.id == detailData.supervisionTempDeviceReport?.frontEndMachine - })?.name - }} - + {{ detailData.planStatus }} + - {{ detailData.supervisionTempDeviceReport?.currentTerminalDetectionTime.replace('T', ' ') }} + {{ detailData.otherRemark }} @@ -157,6 +134,7 @@ import { getTerminalDetailsById } from '@/api/supervision-boot/terminal/index' import { getDictTreeById } from '@/api/system-boot/dictTree' import { useDictData } from '@/stores/dictData' import { getFileNameAndFilePath } from '@/api/system-boot/file' +import { addPlanFormData, getUserByDeptId,getPlanDetailsById} from '@/api/supervision-boot/plan/index' import { Link } from '@element-plus/icons-vue' defineOptions({ name: 'BpmUserReportDetail' }) @@ -260,7 +238,7 @@ const manufacturerList = dictData.getBasicData('Dev_Manufacturers') const getInfo = async () => { detailLoading.value = true try { - await getTerminalDetailsById({ id: props.id || queryId }).then(res => { + await getPlanDetailsById({ id: props.id || queryId }).then(res => { detailData.value = res.data console.log(detailData.value, '+++++++++') getFileName() diff --git a/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue new file mode 100644 index 00000000..2e23575b --- /dev/null +++ b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue @@ -0,0 +1,535 @@ + + + diff --git a/src/views/pqs/supervise/plan/components/effectProblem/index.vue b/src/views/pqs/supervise/plan/components/effectProblem/index.vue new file mode 100644 index 00000000..14cadfcc --- /dev/null +++ b/src/views/pqs/supervise/plan/components/effectProblem/index.vue @@ -0,0 +1,247 @@ + + + diff --git a/src/views/pqs/supervise/plan/components/index.vue b/src/views/pqs/supervise/plan/components/index.vue deleted file mode 100644 index 5319330e..00000000 --- a/src/views/pqs/supervise/plan/components/index.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - - diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue index a8964633..f3ac7bbf 100644 --- a/src/views/pqs/supervise/plan/index.vue +++ b/src/views/pqs/supervise/plan/index.vue @@ -1,25 +1,289 @@ - + - -