From 67efef738abd356d0d23810c56092621b579f6fa Mon Sep 17 00:00:00 2001 From: sjl <1716605279@qq.com> Date: Mon, 15 Dec 2025 16:19:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E6=89=B0=E6=BA=90=E6=8E=A5=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E7=BB=88=E7=AB=AF=E6=A3=80=E6=B5=8B=EF=BC=8C=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E7=AE=A1=E7=90=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/undocumented/detail.vue | 31 ++++++++++++++----- src/views/pqs/supervise/terminal/index.vue | 6 ++-- .../components/monitorpoint/addForm.vue | 25 +++++++-------- .../components/terminainal/detail.vue | 2 +- .../components/undocumented/addForm.vue | 1 + .../components/terminainal/detail.vue | 2 +- 6 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue index 551387a1..a89a14e6 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue @@ -191,11 +191,20 @@ }} - {{ - energyQualityIndexList.find(item => { - return item.id == proviteData.energyQualityIndex - })?.name - }} + + {{ + Array.isArray(proviteData.energyQualityIndex) + ? proviteData.energyQualityIndex.map(id => + energyQualityIndexList.find(item => item.id == id)?.name + ).filter(name => name).join(', ') + : typeof proviteData.energyQualityIndex === 'string' + ? proviteData.energyQualityIndex.split(', ').map(id => + energyQualityIndexList.find(item => item.id == id)?.name + ).filter(name => name).join(', ') + : energyQualityIndexList.find(item => item.id == proviteData.energyQualityIndex)?.name + }} + + - @@ -509,7 +518,7 @@ const dictData = useDictData() //字典获取所在地市 const areaOptionList = dictData.getBasicData('jibei_area') //字典获取敏感电能质量指标 -const energyQualityIndexList = dictData.getBasicData('Indicator_Type') +const energyQualityIndexList = dictData.getBasicData('Problem_Indicators') //字典获取行业类型 const industryList = dictData.getBasicData('industry_type_jb') //字典电压等级 @@ -612,6 +621,8 @@ const queryFiles = () => { } //判断userType选择取用的对象 const getProviteData = async () => { + + console.log('energyQualityIndexList',energyQualityIndexList) if (detailData.value.userType == '0' || detailData.value.userType == '1') { proviteData.value = detailData.value.userReportProjectPO //查询非线性终端类型 @@ -626,8 +637,7 @@ const getProviteData = async () => { ) { proviteData.value = detailData.value.userReportSubstationPO //查询非线性负荷类型 - - + if (proviteData.value?.nonlinearLoadType != undefined) { await getDictTreeById(proviteData.value.nonlinearLoadType).then(res => { proviteData.value.nonlinearLoadType = res.data?.name @@ -636,6 +646,11 @@ const getProviteData = async () => { } else { proviteData.value = detailData.value.userReportSensitivePO + console.log(proviteData.value.energyQualityIndex) + console.log('proviteData.value.nonlinearLoadType',energyQualityIndexList.find(item => { + return item.id == proviteData.value.energyQualityIndex + })?.name) + } //可研报告 if (proviteData.value?.feasibilityReport != undefined && proviteData.value?.feasibilityReport.length>7) { diff --git a/src/views/pqs/supervise/terminal/index.vue b/src/views/pqs/supervise/terminal/index.vue index b31ad867..8cfd51fe 100644 --- a/src/views/pqs/supervise/terminal/index.vue +++ b/src/views/pqs/supervise/terminal/index.vue @@ -40,9 +40,9 @@ import { useRoute } from 'vue-router' const route = useRoute() const id = ref('') -defineOptions({ - name: 'Supervision/Terminaldetection' -}) +// defineOptions({ +// name: 'Supervision/Terminaldetection' +// }) const activeName = ref('1') const tabList = ref(['1', '2', '3', '4', '5', '6', '7']) diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue index a4d0e057..c5e8e663 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue @@ -210,6 +210,7 @@ import { addMointorPointFormData, getList, updateMointorPointFormData } from '@/ import { queryByAllCode } from '@/api/system-boot/dictTree' import { getUserReportById } from '@/api/supervision-boot/userReport/form' import { getDictTreeById } from '@/api/system-boot/dictTree' +import { use } from 'vxe-table' const emits = defineEmits(['onSubmit']) const dictData = useDictData() const dialogFormVisible = ref(false) @@ -442,7 +443,8 @@ const resetForm = async () => { userId: userNameList.value[0]?.id, objName: userNameList.value[0]?.projectName } - changeUserName() + + changeUserName() } }) if (title.value != '编辑') { @@ -523,7 +525,7 @@ const getTreeList = () => { children: item?.children }) }) - console.log('treeData', treeData.value) + form.value.loadType = loadTypeList.value[0]?.id changeLoadType() }) @@ -535,21 +537,20 @@ getTreeList() //选择干扰源类型的时候，干扰源类别数据跟随改变 const changeLoadType = async () => { - console.log('123',loadTypeList.value) - console.log('456',form.value.loadType) + businessTypeList.value = loadTypeList.value.find(item => { return item.id == form.value.loadType })?.children - console.log('-====',businessTypeList.value) + form.value.businessType = businessTypeList.value[0]?.id } //选择关联干扰源回显数据 const changeUserName = () => { - + let obj: any = projectList.value.find((item: any) => { return form.value.userName == item.id }) - console.log('changeUserName', obj) + form.value = { ...form.value, city: obj?.city, @@ -605,12 +606,12 @@ const changeUserName = () => { } } const getDictTree = (e?: string) => { - console.log('e', e) + if (e) { getDictTreeById(e).then(res => { form.value.loadType = res.data.pids.split(',')[1] || '' form.value.businessType = res.data.pids.split(',')[2] || '' - console.log('res', form.value.loadType ) + changeLoadType() }) } else { @@ -838,9 +839,6 @@ const resendId = ref('') const rowValue: any = ref({}) - - - const open = async (row: any) => { resetForm() dialogFormVisible.value = true @@ -854,8 +852,7 @@ const open = async (row: any) => { await getTempLineDetailsById({ id: row.row.id }).then(res => { form.value = res.data form.value.loadType = loadTypeList.value.filter((item: any) => item.name == res.data.loadType)[0]?.id - console.log('res.data',form.value.loadType) - console.log('res.businessTypeList.value',businessTypeList.value) + form.value.businessType = businessTypeList.value.filter( (item: any) => item.name == res.data.businessType )[0]?.id diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue index 11356697..ea085912 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue @@ -346,7 +346,7 @@ const summonFlagList = [ }, { id: '1', - name: '变为触发' + name: '变位触发' } ] //定义终端模型下拉框数据 diff --git a/src/views/pqs/supervise_hn/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise_hn/interfere/components/undocumented/addForm.vue index 3b074ea2..9cc2601d 100644 --- a/src/views/pqs/supervise_hn/interfere/components/undocumented/addForm.vue +++ b/src/views/pqs/supervise_hn/interfere/components/undocumented/addForm.vue @@ -368,6 +368,7 @@ const areaOptionList = dictData //字典获取敏感电能质量指标 // const energyQualityIndexList = dictData.getBasicData('Indicator_Type') const energyQualityIndexList = dictData.getBasicData('Problem_Indicators') +console.log('0000',energyQualityIndexList.values) const devIdList: any = ref([]) const lineIdList: any = ref([]) //字典获取行业类型 diff --git a/src/views/pqs/supervise_hn/terminalNetworkDetection/components/terminainal/detail.vue b/src/views/pqs/supervise_hn/terminalNetworkDetection/components/terminainal/detail.vue index 11356697..ea085912 100644 --- a/src/views/pqs/supervise_hn/terminalNetworkDetection/components/terminainal/detail.vue +++ b/src/views/pqs/supervise_hn/terminalNetworkDetection/components/terminainal/detail.vue @@ -346,7 +346,7 @@ const summonFlagList = [ }, { id: '1', - name: '变为触发' + name: '变位触发' } ] //定义终端模型下拉框数据