干扰源接入，终端检测，台账管理bug修复

2025-12-15 16:19:33 +08:00
parent 6918611d06
commit 67efef738a
6 changed files with 40 additions and 27 deletions
--- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
@@ -191,11 +191,20 @@
                }}
            </el-descriptions-item>
            <el-descriptions-item label="敏感电能质量指标" v-if="detailData.userType == 6">
+                 <span v-if="proviteData.energyQualityIndex">
                    {{
-                    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
                    }}
+                </span>
+                <span v-else>-</span>
            </el-descriptions-item>
            <el-descriptions-item label="可研报告">
                <span v-if="detailData.userType == 0 || detailData.userType == 1">
@@ -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
        //查询非线性终端类型
@@ -627,7 +638,6 @@ 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) {
--- 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'])
--- 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,6 +443,7 @@ const resetForm = async () => {
                userId: userNameList.value[0]?.id,
                objName: userNameList.value[0]?.projectName
            }
+           
           changeUserName()
        }
    })
@@ -523,7 +525,7 @@ const getTreeList = () => {
                children: item?.children
            })
        })
-        console.log('treeData', treeData.value)
+
        form.value.loadType = loadTypeList.value[0]?.id
        changeLoadType()
    })
@@ -535,12 +537,11 @@ 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
 }
 //选择关联干扰源回显数据
@@ -549,7 +550,7 @@ 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
--- 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: '变位触发'
    }
 ]
 //定义终端模型下拉框数据
--- 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([])
 //字典获取行业类型
--- 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: '变位触发'
    }
 ]
 //定义终端模型下拉框数据