冀北 问题修改

src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue

@@ -51,7 +51,7 @@
                 {{ detailData.evaluationConclusion }}
             </el-descriptions-item>
             <el-descriptions-item
-                label="非线性负荷类型"
+                  :label=" detailData.userType == '4'?'非线性设备类型: ':'非线性负荷类型：'"
                 v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||

src/views/pqs/supervise/interfere/components/normalizationManager/normalization/detail.vue

@@ -60,7 +60,7 @@
                     {{ detailData.evaluationConclusion }}
                 </el-descriptions-item>
                 <el-descriptions-item
-                    label="非线性负荷类型"
+                    :label="detailData.userType == '4' ? '非线性设备类型: ' : '非线性负荷类型：'"
                     v-if="
                         detailData.userType == '2' ||
                         detailData.userType == '3' ||
@@ -376,7 +376,7 @@
                     {{ detailData1.evaluationConclusion }}
                 </el-descriptions-item>
                 <el-descriptions-item
-                    label="非线性负荷类型"
+                    :label="detailData1.userType == '4' ? '非线性设备类型: ' : '非线性负荷类型：'"
                     v-if="
                         detailData1.userType == '2' ||
                         detailData1.userType == '3' ||

src/views/pqs/supervise/interfere/components/undocumented/addForm.vue

@@ -277,7 +277,7 @@
             <el-form-item
                 for="-"
                 v-if="form.userType == '2' || form.userType == '3' || form.userType == '4' || form.userType == '5'"
-                label="非线性负荷类型："
+                :label="form.userType == '4' ? '非线性设备类型: ' : '非线性负荷类型：'"
                 prop="nonlinearLoadType"
             >
                 <el-tree-select
@@ -290,6 +290,7 @@
                     readonly
                     node-key="id"
                     :props="defaultProps"
+                    filterable
                     v-model="form.nonlinearLoadType"
                     :data="nonlinearDeviceTypeList"
                     :render-after-expand="false"
@@ -741,8 +742,26 @@ resetForm()
 //获取树形图数据
 const getTreeList = () => {
     queryByAllCode().then(res => {
-        nonlinearDeviceTypeList.value = [res.data.find((item: any) => item.code == 'Major_Nonlinear_Device')]
+        // nonlinearDeviceTypeList.value = [res.data.find((item: any) => item.code == 'Major_Nonlinear_Device')]
-        nonlinearDeviceTypeList.value.map((item: any) => {
+
+        // nonlinearDeviceTypeList.value.map((item: any) => {
+        //     //tree禁用根节点
+        //     item.disabled = 'disabled'
+        //     item.children.map((vv: any) => {
+        //         //tree禁用二级节点
+        //         vv.disabled = 'disabled'
+        //         vv.children.map((kk: any) => {
+        //             //tree禁用三级节点
+        //             kk.disabled = 'disabled'
+        //             kk.children.map((ss: any) => {
+        //                 ss.name = vv.name + '-' + kk.name + '-' + ss.name
+        //             })
+        //         })
+        //     })
+        // })
+        let data = [res.data.find((item: any) => item.code == 'Major_Nonlinear_Device')]
+        nonlinearDeviceTypeList.value = [{ ...JSON.parse(JSON.stringify(...data)), children: [], disabled: 'disabled' }]
+        data.map((item: any) => {
             //tree禁用根节点
             item.disabled = 'disabled'
             item.children.map((vv: any) => {
@@ -751,11 +770,16 @@ const getTreeList = () => {
                 vv.children.map((kk: any) => {
                     //tree禁用三级节点
                     kk.disabled = 'disabled'
+                    kk.children.map((ss: any) => {
+                        ss.name = vv.name + '-' + kk.name + '-' + ss.name
+                        nonlinearDeviceTypeList.value[0].children.push(ss)
+                    })
                 })
             })
         })
     })
 }
+
 getTreeList()
 const treeRef = ref()
 const subForm: any = ref({

src/views/pqs/supervise/interfere/components/undocumented/detail.vue

@@ -56,7 +56,7 @@
                 {{ detailData.evaluationConclusion }}
             </el-descriptions-item>
             <el-descriptions-item
-                label="非线性负荷类型"
+                 :label="detailData.userType == '4'?'非线性设备类型: ':'非线性负荷类型：'"
                 v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||

src/views/pqs/supervise/technology/components/alarm.vue

@@ -254,9 +254,16 @@ const tableStore = new TableStore({
                         if (row.problemType == 2) {
                             window.open(row.filePath)
                         } else {
-                            getFileNameAndFilePath({ filePath: row.reportPath }).then(res => {
+                            if (row.problemPath == null) {
-                                window.open(res.data.url)
+                                ElMessage({
-                            })
+                                    message: '暂无报告!',
+                                    type: 'warning'
+                                })
+                            } else {
+                                getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
+                                    window.open(res.data.url)
+                                })
+                            }
                         }
                     }
                 },