From f2c906b0a4a03e84dc7b4db8f4ec9f33f9eb9676 Mon Sep 17 00:00:00 2001 From: zhujiyan <17812234322@163.com> Date: Fri, 17 May 2024 16:32:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF-=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E3=80=81=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision-boot/monitorpoint/index.ts | 17 +- .../terminalNetworkDetection/addForm.vue | 2292 +++++++++++++++++ .../components/monitorpoint/addForm.vue | 104 +- .../components/monitorpoint/detail.vue | 397 +-- .../components/monitorpoint/index.vue | 1 - 5 files changed, 2586 insertions(+), 225 deletions(-) create mode 100644 src/views/pqs/supervise/terminalMonitoring/components/monitorPoints/terminalNetworkDetection/addForm.vue diff --git a/src/api/supervision-boot/monitorpoint/index.ts b/src/api/supervision-boot/monitorpoint/index.ts index b8718e54..d7c91fc7 100644 --- a/src/api/supervision-boot/monitorpoint/index.ts +++ b/src/api/supervision-boot/monitorpoint/index.ts @@ -2,7 +2,7 @@ import createAxios from '@/utils/request' import { SUPERVISION_BOOT } from '@/utils/constantRequest' -const MAPPING_PATH = SUPERVISION_BOOT + '/workflow/wfForm' +const MAPPING_PATH = SUPERVISION_BOOT + '/tempLine' /** * 提交监测点信息表单数据 @@ -26,3 +26,18 @@ export const getList = (data: any) => { data: data }) } + + +/** + * 根据id获取终端录入的详细数据 + */ +export const getTempLineDetailsById = (obj: any) => { + let form = new FormData() + form.append('id', obj.id) + return createAxios({ + url:MAPPING_PATH + '/getDetail', + method: 'POST', + data:form + }) +} + diff --git a/src/views/pqs/supervise/terminalMonitoring/components/monitorPoints/terminalNetworkDetection/addForm.vue b/src/views/pqs/supervise/terminalMonitoring/components/monitorPoints/terminalNetworkDetection/addForm.vue new file mode 100644 index 00000000..7f3071af --- /dev/null +++ b/src/views/pqs/supervise/terminalMonitoring/components/monitorPoints/terminalNetworkDetection/addForm.vue @@ -0,0 +1,2292 @@ + + + diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue index 4c0dc483..75873c55 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue @@ -74,7 +74,7 @@ - + @@ -145,8 +145,8 @@ @@ -204,7 +204,12 @@ - + @@ -299,9 +304,10 @@ clearable style="width: 100%" placeholder="请选择干扰源类型" + @change="changeLoadType" > { getList(obj).then(res => { projectList.value = res.data res.data.map(item => { - userNameList.value.push(item?.projectName) + userNameList.value.push({ + name:item?.projectName, + id:item?.id + }) }) //初始化 let obj = res.data[0] @@ -545,7 +555,10 @@ const getSelectableList = () => { reporter: obj.reporter, reportDate: obj.reportDate, orgId: obj.orgId, - expectedProductionDate: obj.expectedProductionDate + orgName:obj.orgName, + expectedProductionDate: obj.expectedProductionDate, + userName:userNameList.value[0]?.name, + userId:userNameList.value[0]?.id } }) } @@ -577,7 +590,8 @@ const resetForm = () => { form.value = { reporter: '', //填报人 reportDate: '', //填报日期 - orgId: '', //填报部门 + orgId: '', //填报部门id + orgName:'', //填报部门名称 expectedProductionDate: '', //工程投产日期 city: areaOptionList[0].name, //所属地市 userStatus: userStateList[1].id, //用户状态 @@ -611,14 +625,43 @@ const resetForm = () => { voltageLevel: voltageLevelList[0].id //监测点电压等级 } - form.value.reporter = adminInfo.$state.name - form.value.orgId = adminInfo.$state.deptName + // form.value.reporter = adminInfo.$state.name + // form.value.orgId = adminInfo.$state.deptName } //初始化数据 resetForm() getSelectableList() findAllMonitoringTerminalList() +//获取树形图数据 +const treeData: any = ref('') +//干扰源类型 取树形图第一层children数据 +const loadTypeList = ref([]) +//干扰源类别 取树形图第二层children数据 +const businessTypeList = ref([]) +const getTreeList = () => { + queryByAllCode().then(res => { + treeData.value = [res.data.find(item => item.code == 'Major_Nonlinear_Device')] + treeData.value[0].children.map(item => { + //干扰源类型数据 + loadTypeList.value.push({ + id: item?.id, + name: item?.name, + children: item?.children + }) + }) + form.value.loadType = loadTypeList.value[0]?.id + changeLoadType() + }) +} +getTreeList() +//选择干扰源类型的时候,干扰源类别数据跟随改变 +const changeLoadType = async () => { + businessTypeList.value = loadTypeList.value.find(item => { + return item.id == form.value.loadType + }).children + form.value.businessType = businessTypeList.value[0]?.id +} //选择关联干扰源回显数据 const changeUserName = () => { let obj = projectList.value.find(item => { @@ -630,17 +673,19 @@ const changeUserName = () => { reporter: obj.reporter, reportDate: obj.reportDate, orgId: obj.orgId, + orgName: obj.orgName, userName: obj.projectName, userId: obj.id, expectedProductionDate: obj.expectedProductionDate } - console.log(obj, '000000000000') + console.log(obj, '选择关联干扰源回显数据') } //监测点信息表单格式 const monitorPointForm = ref({ reporter: '', //填报人 reportDate: '', //填报日期 orgId: '', //填报部门 + orgName:'', expectedProductionDate: '', //工程投产日期 city: areaOptionList[0].name, //所属地市 userStatus: userStateList[1].id, //用户状态 @@ -893,9 +938,7 @@ const rules = ref({ }) watch( () => form.value, - (val, oldVal) => { - - }, + (val, oldVal) => {}, { deep: true, immediate: true @@ -957,13 +1000,12 @@ const confirmForm = () => { console.log(form.value, '打印form对象') // 先判断提交终端信息与监测点信息 - // 提交终端信息 - if (selectFormType.value == '0') { + // 提交监测点信息 ruleFormRef.value.validate(valid => { if (valid) { //整理上传文件的数据 //处理填报日期时间格式 - form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd') + form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd') let confirmFormData = JSON.parse(JSON.stringify(form.value)) //1.判断是否上传 @@ -985,9 +1027,7 @@ const confirmForm = () => { lineFilePath: lineFilePath?.value, //监测点信息 mainWiringDiagram: mainWiringDiagram.value //主接线图 } - console.log(confirmFormData, '打印提交表单111111111111') addMointorPointFormData(confirmFormData).then(res => { - console.log(res, '打印提交结果222222222222+++++++++') ruleFormRef.value.resetFields() resetForm() close() @@ -997,10 +1037,6 @@ const confirmForm = () => { return false } }) - } - //提交监测点信息 - else { - } } defineExpose({ open }) @@ -1033,9 +1069,6 @@ defineExpose({ open }) ::v-deep .el-input-number .el-input__inner { text-align: left; } -.no_required::v-deep .el-form-item__label { - padding-left: 10px !important; -} //表单tab容器 .form_tab_item { @@ -1055,15 +1088,18 @@ defineExpose({ open }) left: -10px; margin-top: 8px; color: #f56c6c; - margin-left: 20px; - } - .required_text { - // padding-left: 20px; - } - .el-form-item__label { margin-left: 10px; } + .required_text { + padding-left: 20px; + } } +.no_required::v-deep .el-form-item__label { + padding-left: 10px !important; + width: 70px !important; + margin-left: 0px !important; +} + // ::v-deep .tabs_form{ // height:300px !important; // } diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue index 44988865..7835066c 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue @@ -1,101 +1,123 @@ - -