修改冀北现场反馈问题

src/api/systerm.ts

@@ -29,4 +29,17 @@ export function getTheme() {
         method: 'get'
     })
 }
-
+export function addVersion(data:any) {
+    return createAxios({
+        url: '/cs-system-boot/appVersion/add',
+        method: 'post',
+        data
+    })
+}
+export function getLastData(data:any) {
+    return createAxios({
+        url: '/cs-system-boot/appVersion/getLastData',
+        method: 'post',
+        params:data
+    })
+}

src/layouts/admin/components/navBar/classic.vue

@@ -8,7 +8,9 @@
                 size="18"
             />
         </div>
-        <span class="nav-bar-title">{{ getTheme.name }}</span>
+        <span class="nav-bar-title">{{ getTheme.name }} <span style="font-size: 14px;" v-if="Version?.versionName">
+                ({{ Version?.versionName }})
+            </span></span>
         <NavMenus />
     </div>
 </template>
@@ -18,7 +20,8 @@ import { useConfig } from '@/stores/config'
 import NavTabs from '@/layouts/admin/components/navBar/tabs.vue'
 import NavMenus from '../navMenus.vue'
 import { showShade } from '@/utils/pageShade'
-
+import { getLastData } from '@/api/systerm'
+const Version: any = ref({})
 const config = useConfig()
 const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
 
@@ -29,6 +32,10 @@ const onMenuCollapse = () => {
     config.setLayout('menuCollapse', false)
 }
 onMounted(() => {
+    // getLastData({ versionType: 'WEB' }).then(res => {
+    //     Version.value = res.data
+
+    // })
     document.title = getTheme.name
 })
 </script>

src/layouts/admin/components/popup/adminInfo.vue

@@ -1,7 +1,6 @@
 <template>
-    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title">
+    <el-dialog draggable width="600px" v-model="dialogVisible" :title="title">
-        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
-            <el-form :inline="false" :model="form" label-width="120px">
                 <el-form-item label="用户名称:">
                     <el-input v-model="form.name" :disabled="true"></el-input>
                 </el-form-item>
@@ -21,7 +20,7 @@
                     <el-input v-model="form.email" :disabled="true"></el-input>
                 </el-form-item>
             </el-form>
-        </el-scrollbar>
+  
     </el-dialog>
 </template>
 <script lang="ts" setup>

src/main.ts

@@ -35,13 +35,13 @@ const setupAll = async () => {
     const app = createApp(App)
 
     //开启离线地图
-    // app.use(BaiduMapOffline, {
+    app.use(BaiduMapOffline, {
-    //     offline: true,
+        offline: true,
-    //     // offlineUrl:'http://sjzx:8088/map/' //window.location.origin + '/map/'
+        // offlineUrl:'http://sjzx:8088/map/' //window.location.origin + '/map/'
-    // })
+    })
     app.use(BaiduMap, {
         // ak: 'Yp57V71dkOPiXjiN8VdcFRsVELzlVNKK',
-        ak: 'aDYDfiR6ROVR1ehrLedSc9makxGD1vxZ',
+        ak: 'RpQi6WNFZ9tseKzhdwOQsXwFsoVntnsN',
         v: '3.0'
     })
 

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

@@ -50,31 +50,25 @@
             <el-descriptions-item label="预测评估结论">
                 {{ detailData.evaluationConclusion }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item :label="detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                :label="
+                " v-if="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                "
-                v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                "
+                ">
-            >
                 {{ proviteData.nonlinearLoadType }}
             </el-descriptions-item>
             <el-descriptions-item label="是否需要治理">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
@@ -83,14 +77,12 @@
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">
@@ -103,26 +95,20 @@
             <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
                 {{ proviteData?.pccPoint }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="PCC供电设备容量" v-if="
-                label="PCC供电终端容量"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData.pccEquipmentCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="基准短路容量" v-if="
-                label="基准短路容量"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData.baseShortCircuitCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
@@ -135,26 +121,20 @@
             <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
                 {{ proviteData?.evaluationChekDept }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="系统最小短路容量" v-if="
-                label="系统最小短路容量"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.minShortCircuitCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户用电协议容量" v-if="
-                label="用户用电协议容量"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.userAgreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="行业" v-if="detailData.userType == 6">
@@ -186,14 +166,12 @@
                         {{ proviteData.feasibilityReport.name }}
                     </a>
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     <el-icon class="elView" v-if="proviteData?.feasibilityReport.name">
                         <View @click="openFile(proviteData.feasibilityReport.name)" />
                     </el-icon>
@@ -234,10 +212,7 @@
                     {{ proviteData?.predictionEvaluationReviewOpinions.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                label="用户接入变电站主接线示意图"
-                v-if="detailData.userType != 0 && detailData.userType != 1"
-            >
                 <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram.name">
                     <View @click="openFile(proviteData?.substationMainWiringDiagram.name)" />
                 </el-icon>
@@ -300,10 +275,8 @@
             <el-descriptions-item label="填报部门">
                 {{ detailData.orgName }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item :label="applyTitle + '报告'"
-                :label="applyTitle + '报告'"
+                v-if="proviteData?.otherReport && proviteData?.otherReport.url">
-                v-if="proviteData?.otherReport && proviteData?.otherReport.url"
-            >
                 <el-icon class="elView" v-if="proviteData?.otherReport.name">
                     <View @click="openFile(proviteData?.otherReport.nam)" />
                 </el-icon>
@@ -593,6 +566,7 @@ onMounted(() => {
     // position: absolute !important;
     // top: 20px !important;
 }
+
 // .details {
 //     width: 100%;
 //     display: flex;
@@ -602,9 +576,11 @@ onMounted(() => {
     cursor: pointer;
     margin-right: 10px;
 }
+
 :deep(.el-descriptions__label) {
     width: 20%;
 }
+
 :deep(.el-descriptions__content) {
     width: 30%;
 }

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

@@ -47,10 +47,7 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="非线性终端类型" v-if="detailData.userType == 0 || detailData.userType == 1">
-                    label="非线性终端类型"
-                    v-if="detailData.userType == 0 || detailData.userType == 1"
-                >
                     {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="预测评估单位">
@@ -59,33 +56,27 @@
                 <el-descriptions-item label="预测评估结论" :span="2">
                     {{ detailData.evaluationConclusion }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item :label="detailData.userType == '4' || detailData.userType == '5'
-                    :label="
-                        detailData.userType == '4' || detailData.userType == '5'
                         ? '非线性设备类型: '
                         : '非线性负荷类型：'
-                    "
+                    " v-if="
-                    v-if="
                         detailData.userType == '2' ||
                         detailData.userType == '3' ||
                         detailData.userType == '4' ||
                         detailData.userType == '5'
-                    "
+                    ">
-                >
                     {{ proviteData.nonlinearLoadType }}
                 </el-descriptions-item>
                 <el-descriptions-item label="是否需要治理">
                     <span v-if="detailData.userType == 0 || detailData.userType == 1">
                         {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData.userType == 2 ||
                         detailData.userType == 3 ||
                         detailData.userType == 4 ||
                         detailData.userType == 5
-                        "
+                    ">
-                    >
                         {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                     </span>
                     <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
@@ -94,14 +85,12 @@
                     <span v-if="detailData.userType == 0 || detailData.userType == 1">
                         {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData.userType == 2 ||
                         detailData.userType == 3 ||
                         detailData.userType == 4 ||
                         detailData.userType == 5
-                        "
+                    ">
-                    >
                         {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                     </span>
                     <span v-if="detailData.userType == 6">
@@ -113,54 +102,39 @@
                         {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
                     </span>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData.userType == 0 || detailData.userType == 1">
-                    label="用户协议容量（MVA）"
-                    v-if="detailData.userType == 0 || detailData.userType == 1"
-                >
                     {{ proviteData.agreementCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="PCC供电设备容量（MVA）" v-if="
-                    label="PCC供电终端容量（MVA）"
-                    v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData.pccEquipmentCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="基准短路容量（MVA）" v-if="
-                    label="基准短路容量（MVA）"
-                    v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData.baseShortCircuitCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="系统最小短路容量（MVA）" v-if="
-                    label="系统最小短路容量（MVA）"
-                    v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData?.minShortCircuitCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户用电协议容量（MVA）" v-if="
-                    label="用户用电协议容量（MVA）"
-                    v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData?.userAgreementCapacity }}
                 </el-descriptions-item>
                 <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
@@ -173,10 +147,7 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
-                    label="预测评估评审单位"
-                    v-if="detailData.userType != 0 && detailData.userType != 1"
-                >
                     {{ proviteData?.evaluationChekDept }}
                 </el-descriptions-item>
                 <el-descriptions-item label="行业" v-if="detailData.userType == 6">
@@ -225,14 +196,12 @@
                             {{ proviteData.feasibilityReport?.name }}
                         </a>
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData.userType == 2 ||
                         detailData.userType == 3 ||
                         detailData.userType == 4 ||
                         detailData.userType == 5
-                        "
+                    ">
-                    >
                         <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
                             <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                         </el-icon>
@@ -274,10 +243,7 @@
                         {{ proviteData?.predictionEvaluationReviewOpinions?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                    label="用户接入变电站主接线示意图"
-                    v-if="detailData.userType != 0 && detailData.userType != 1"
-                >
                     <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram?.name">
                         <View @click="openFile(proviteData?.substationMainWiringDiagram?.name)" />
                     </el-icon>
@@ -309,10 +275,8 @@
                         {{ proviteData?.powerQualityReport?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="其他附件"
-                    label="其他附件"
+                    v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url">
-                    v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url"
-                >
                     <el-icon class="elView" v-if="proviteData?.additionalAttachments?.name">
                         <View @click="openFile(proviteData?.additionalAttachments?.name)" />
                     </el-icon>
@@ -367,10 +331,7 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="非线性终端类型" v-if="detailData1.userType == 0 || detailData1.userType == 1">
-                    label="非线性终端类型"
-                    v-if="detailData1.userType == 0 || detailData1.userType == 1"
-                >
                     {{ proviteData1.nonlinearDeviceType ? proviteData1.nonlinearDeviceType : '-' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="预测评估单位">
@@ -379,33 +340,27 @@
                 <el-descriptions-item label="预测评估结论" :span="2">
                     {{ detailData1.evaluationConclusion }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item :label="detailData1.userType == '4' || detailData1.userType == '5'
-                    :label="
-                        detailData1.userType == '4' || detailData1.userType == '5'
                         ? '非线性设备类型: '
                         : '非线性负荷类型：'
-                    "
+                    " v-if="
-                    v-if="
                         detailData1.userType == '2' ||
                         detailData1.userType == '3' ||
                         detailData1.userType == '4' ||
                         detailData1.userType == '5'
-                    "
+                    ">
-                >
                     {{ proviteData1.nonlinearLoadType }}
                 </el-descriptions-item>
                 <el-descriptions-item label="是否需要治理">
                     <span v-if="detailData1.userType == 0 || detailData1.userType == 1">
                         {{ proviteData1.needGovernance == 0 ? '否' : '是' }}
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData1.userType == 2 ||
                         detailData1.userType == 3 ||
                         detailData1.userType == 4 ||
                         detailData1.userType == 5
-                        "
+                    ">
-                    >
                         {{ proviteData1.needGovernance == 0 ? '否' : '是' }}
                     </span>
                     <span v-if="detailData1.userType == 6">{{ proviteData1.needGovernance == 0 ? '否' : '是' }}</span>
@@ -414,14 +369,12 @@
                     <span v-if="detailData1.userType == 0 || detailData1.userType == 1">
                         {{ proviteData1.backgroundTestPerformed == 0 ? '否' : '是' }}
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData1.userType == 2 ||
                         detailData1.userType == 3 ||
                         detailData1.userType == 4 ||
                         detailData1.userType == 5
-                        "
+                    ">
-                    >
                         {{ proviteData1.backgroundTestPerformed == 0 ? '否' : '是' }}
                     </span>
                     <span v-if="detailData1.userType == 6">
@@ -433,54 +386,39 @@
                         {{ proviteData1.antiInterferenceTest == 0 ? '否' : '是' }}
                     </span>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData1.userType == 0 || detailData1.userType == 1">
-                    label="用户协议容量（MVA）"
-                    v-if="detailData1.userType == 0 || detailData1.userType == 1"
-                >
                     {{ proviteData1.agreementCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="PCC供电设备容量（MVA）" v-if="
-                    label="PCC供电终端容量（MVA）"
-                    v-if="
                     detailData1.userType == '2' ||
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData1.pccEquipmentCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="基准短路容量（MVA）" v-if="
-                    label="基准短路容量（MVA）"
-                    v-if="
                     detailData1.userType == '2' ||
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData1.baseShortCircuitCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="系统最小短路容量（MVA）" v-if="
-                    label="系统最小短路容量（MVA）"
-                    v-if="
                     detailData1.userType == '2' ||
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData1?.minShortCircuitCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户用电协议容量（MVA）" v-if="
-                    label="用户用电协议容量（MVA）"
-                    v-if="
                     detailData1.userType == '2' ||
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData1?.userAgreementCapacity }}
                 </el-descriptions-item>
                 <el-descriptions-item label="PCC点" v-if="detailData1.userType != 0 && detailData1.userType != 1">
@@ -493,10 +431,7 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="预测评估评审单位" v-if="detailData1.userType != 0 && detailData1.userType != 1">
-                    label="预测评估评审单位"
-                    v-if="detailData1.userType != 0 && detailData1.userType != 1"
-                >
                     {{ proviteData1?.evaluationChekDept }}
                 </el-descriptions-item>
                 <el-descriptions-item label="行业" v-if="detailData1.userType == 6">
@@ -545,14 +480,12 @@
                             {{ proviteData1.feasibilityReport?.name }}
                         </a>
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData1.userType == 2 ||
                         detailData1.userType == 3 ||
                         detailData1.userType == 4 ||
                         detailData1.userType == 5
-                        "
+                    ">
-                    >
                         <el-icon class="elView" v-if="proviteData1?.feasibilityReport?.name">
                             <View @click="openFile(proviteData1?.feasibilityReport?.name)" />
                         </el-icon>
@@ -594,10 +527,7 @@
                         {{ proviteData1?.predictionEvaluationReviewOpinions?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                    label="用户接入变电站主接线示意图"
-                    v-if="detailData.userType != 0 && detailData.userType != 1"
-                >
                     <el-icon class="elView" v-if="proviteData1?.substationMainWiringDiagram?.name">
                         <View @click="openFile(proviteData1?.substationMainWiringDiagram?.name)" />
                     </el-icon>
@@ -629,10 +559,8 @@
                         {{ proviteData1?.powerQualityReport?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="其他附件"
-                    label="其他附件"
+                    v-if="proviteData1?.additionalAttachments && proviteData1?.additionalAttachments?.url">
-                    v-if="proviteData1?.additionalAttachments && proviteData1?.additionalAttachments?.url"
-                >
                     <el-icon class="elView" v-if="proviteData1?.additionalAttachments?.name">
                         <View @click="openFile(proviteData1?.additionalAttachments?.name)" />
                     </el-icon>
@@ -1059,6 +987,7 @@ onMounted(() => {
     // top: 20px !important;
     // float: right;
 }
+
 // .el-icon {
 //     float: left;
 // }

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

@@ -33,11 +33,12 @@
                 </el-select>
             </el-form-item>
             <el-form-item for='-' label='归口管理部门：' prop='responsibleDepartment'>
-                <el-input v-model.trim='form.responsibleDepartment' autocomplete='off'
+                <el-input v-model.trim='form.responsibleDepartment' autocomplete='off' placeholder='请输入归口管理部门'
-                          placeholder='请输入归口管理部门' maxlength='32' show-word-limit  />
+                    maxlength='32' show-word-limit />
             </el-form-item>
             <el-form-item for='-' label='项目名称：' prop='projectName'>
-                <el-input v-model.trim='form.projectName' autocomplete='off' placeholder='请输入项目名称' maxlength='64' show-word-limit  />
+                <el-input v-model.trim='form.projectName' autocomplete='off' placeholder='请输入项目名称' maxlength='64'
+                    show-word-limit />
             </el-form-item>
             <el-form-item for='-' label='用户状态：' prop='userStatus'>
                 <el-select v-model='form.userStatus' placeholder='请选择用户状态'>
@@ -46,13 +47,15 @@
                 </el-select>
             </el-form-item>
             <el-form-item for='-' label='厂站名称：' prop='substation'>
-                <el-input v-model.trim='form.substation' autocomplete='off' placeholder='请输入厂站名称' maxlength='64' show-word-limit />
+                <el-input v-model.trim='form.substation' autocomplete='off' placeholder='请输入厂站名称' maxlength='64'
+                    show-word-limit />
             </el-form-item>
             <el-form-item for='-' v-if="form.userType == '0' || form.userType == '1'" label='用户协议容量：'
                 prop='agreementCapacity'>
                 <el-input v-model.trim='form.agreementCapacity' oninput="value=value.replace(/[^\-?\d.]/g,'')
 .replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
-.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" autocomplete='off' placeholder='请输入用户协议容量' maxlength="6" show-word-limit>
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" autocomplete='off' placeholder='请输入用户协议容量' maxlength="6"
+                    show-word-limit>
                     <template #append>MVA</template>
                 </el-input>
             </el-form-item>
@@ -60,8 +63,7 @@
                 prop='nonlinearDeviceType'>
                 <el-tree-select accordion ref='treeRef' :default-expand-all='false' show-checkbox check-strictly
                     :highlight-current='true' readonly node-key='id' :props='defaultProps'
-                                v-model='form.nonlinearDeviceType' :data='nonlinearDeviceTypeList'
+                    v-model='form.nonlinearDeviceType' :data='nonlinearDeviceTypeList' :render-after-expand='false' />
-                                :render-after-expand='false' />
             </el-form-item>
             <el-form-item for='-' label='电压等级：' prop='voltageLevel'>
                 <el-select v-model='form.voltageLevel' placeholder='请选择电压等级' node-key='id'>
@@ -130,10 +132,10 @@
             </el-form-item>
             <el-form-item for='-'
                 v-if="form.userType == '2' || form.userType == '3' || form.userType == '4' || form.userType == '5'"
-                          label='PCC供电终端容量：' prop='pccEquipmentCapacity'>
+                label='PCC供电设备容量：' prop='pccEquipmentCapacity'>
                 <el-input v-model.trim='form.pccEquipmentCapacity' oninput="value=value.replace(/[^\-?\d.]/g,'')
 .replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
-.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder='请输入PCC供电终端容量'>
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder='请输入PCC供电设备容量'>
                     <template #append>MVA</template>
                 </el-input>
             </el-form-item>
@@ -155,8 +157,7 @@
                 <el-input v-model.trim='form.deviceName' autocomplete='off' placeholder='请输入敏感终端名称' />
             </el-form-item>
             <el-form-item for='-' v-if="form.userType == '6'" label='供电电源数量：' prop='powerSupplyCount'>
-                <el-input-number style='width: 100%' v-model='form.powerSupplyCount' :min='0'
+                <el-input-number style='width: 100%' v-model='form.powerSupplyCount' :min='0' placeholder='请输入供电电源数量' />
-                                 placeholder='请输入供电电源数量' />
             </el-form-item>
             <el-form-item for='-' v-if="form.userType == '6'" label='敏感电能质量指标：' prop='energyQualityIndex'>
                 <el-select v-model='form.energyQualityIndex' multiple collapse-tags collapse-tags-tooltip
@@ -171,8 +172,7 @@
                 prop='nonlinearLoadType'>
                 <el-tree-select accordion ref='treeRef' :default-expand-all='false' show-checkbox check-strictly
                     :highlight-current='true' readonly node-key='id' :props='defaultProps' filterable
-                                v-model='form.nonlinearLoadType' :data='nonlinearDeviceTypeList'
+                    v-model='form.nonlinearLoadType' :data='nonlinearDeviceTypeList' :render-after-expand='false'
-                                :render-after-expand='false'
                     placeholder='请选择' />
             </el-form-item>
             <el-form-item for='-' v-if="form.userType == '6'" label='是否开展抗扰度测试：' prop='antiInterferenceTest'>
@@ -190,16 +190,14 @@
             </el-form-item>
             <el-form-item for='-' v-if="form.userType == '6' && isInterferencemanagement" label='供电电源情况：'
                 prop='powerSupplyInfo'>
-                <el-select v-model='form.powerSupplyInfo' collapse-tags collapse-tags-tooltip
+                <el-select v-model='form.powerSupplyInfo' collapse-tags collapse-tags-tooltip placeholder='请选择供电电源情况'>
-                           placeholder='请选择供电电源情况'>
                     <el-option v-for='(item, index) in powerSupplyInfoOptionList' :label='item.name' :value='item.id'
                         :key='index' />
                 </el-select>
             </el-form-item>
             <el-form-item for='-' v-if="form.userType != '0' && form.userType != '1'" label='预测评估评审单位：'
                 prop='evaluationChekDept'>
-                <el-input v-model.trim='form.evaluationChekDept' autocomplete='off'
+                <el-input v-model.trim='form.evaluationChekDept' autocomplete='off' placeholder='请输入预测评估评审单位' />
-                          placeholder='请输入预测评估评审单位' />
             </el-form-item>
             <el-form-item for='-' label='预测评估结论：' prop='evaluationConclusion' style='width: 100%'>
                 <el-input type='textarea' v-model.trim='form.evaluationConclusion' autocomplete='off'
@@ -216,8 +214,7 @@
             </el-form-item>
             <el-form-item class='uploadFile' for='-' label='项目初步设计说明书：' prop='preliminaryDesignDescription'>
                 <el-upload v-model:file-list='form.preliminaryDesignDescription' ref='uploadRef' action=''
-                           :accept='acceptType' :limit='1' :on-change='choose' :auto-upload='false'
+                    :accept='acceptType' :limit='1' :on-change='choose' :auto-upload='false' :on-remove='removeFile'
-                           :on-remove='removeFile'
                     :on-progress="uploadFileName('preliminaryDesignDescription')">
                     <template #trigger>
                         <el-button type='primary'>上传文件</el-button>
@@ -226,19 +223,16 @@
             </el-form-item>
             <el-form-item class='uploadFile' for='-' label='预测评估报告：' prop='predictionEvaluationReport'>
                 <el-upload v-model:file-list='form.predictionEvaluationReport' ref='uploadRef' action=''
-                           :accept='acceptType' :limit='1' :on-change='choose' :auto-upload='false'
+                    :accept='acceptType' :limit='1' :on-change='choose' :auto-upload='false' :on-remove='removeFile'
-                           :on-remove='removeFile'
                     :on-progress="uploadFileName('predictionEvaluationReport')">
                     <template #trigger>
                         <el-button type='primary'>上传文件</el-button>
                     </template>
                 </el-upload>
             </el-form-item>
-            <el-form-item class='uploadFile' for='-' label='预测评估评审意见报告：'
+            <el-form-item class='uploadFile' for='-' label='预测评估评审意见报告：' prop='predictionEvaluationReviewOpinions'>
-                          prop='predictionEvaluationReviewOpinions'>
                 <el-upload v-model:file-list='form.predictionEvaluationReviewOpinions' ref='uploadRef' action=''
-                           :accept='acceptType' :limit='1' :on-change='choose' :auto-upload='false'
+                    :accept='acceptType' :limit='1' :on-change='choose' :auto-upload='false' :on-remove='removeFile'
-                           :on-remove='removeFile'
                     :on-progress="uploadFileName('predictionEvaluationReviewOpinions')">
                     <template #trigger>
                         <el-button type='primary'>上传文件</el-button>
@@ -257,8 +251,7 @@
             <el-form-item for='-' class='uploadFile' v-if="form.userType != '0' && form.userType != '1'"
                 label='用户接入变电站主接线示意图：' prop='substationMainWiringDiagram'>
                 <el-upload v-model:file-list='form.substationMainWiringDiagram' ref='uploadRef' action=''
-                           :accept='acceptType' :limit='1' :on-change='choose' :auto-upload='false'
+                    :accept='acceptType' :limit='1' :on-change='choose' :auto-upload='false' :on-remove='removeFile'
-                           :on-remove='removeFile'
                     :on-progress="uploadFileName('substationMainWiringDiagram')">
                     <template #trigger>
                         <el-button type='primary'>上传文件</el-button>
@@ -278,8 +271,7 @@
             <el-form-item class='uploadFile' for='-' v-if="form.userType == '6'" label='抗扰度测试报告：'
                 prop='antiInterferenceReport'>
                 <el-upload v-model:file-list='form.antiInterferenceReport' ref='uploadRef' action=''
-                           :accept='acceptType' :limit='1' :on-change='choose' :auto-upload='false'
+                    :accept='acceptType' :limit='1' :on-change='choose' :auto-upload='false' :on-remove='removeFile'
-                           :on-remove='removeFile'
                     :on-progress="uploadFileName('antiInterferenceReport')">
                     <template #trigger>
                         <el-button type='primary'>上传文件</el-button>
@@ -490,7 +482,7 @@ const resetForm = () => {
         agreementCapacity: '', //用户协议容量  1
         nonlinearDeviceType: '', //非线性终端类型 1
         nonlinearLoadType: '', //非线性负荷类型 1
-        pccEquipmentCapacity: '', // PCC供电终端容量（MVA） 1
+        pccEquipmentCapacity: '', // PCC供电设备容量（MVA） 1
         baseShortCircuitCapacity: '', //基准短路容量（MVA）1
         industry: industryList[0].id, //行业 1
         deviceName: '', //敏感终端名称  1
@@ -707,7 +699,7 @@ const rules = ref({
     evaluationChekDept: [{ required: true, message: '请输入预测评估审单位', trigger: 'blur' }],
     baseShortCircuitCapacity: [{ required: true, message: '请输入基准短路容量', trigger: 'blur' }],
     minShortCircuitCapacity: [{ required: true, message: '请输入系统最小短路容量', trigger: 'blur' }],
-    pccEquipmentCapacity: [{ required: true, message: '请输入PCC供电终端容量', trigger: 'blur' }],
+    pccEquipmentCapacity: [{ required: true, message: '请输入PCC供电设备容量', trigger: 'blur' }],
     userAgreementCapacity: [{ required: true, message: '请输入用户用电协议容量', trigger: 'blur' }],
     nonlinearLoadType: [{ required: true, message: '请输入非线性负荷类型', trigger: 'blur' }],
     substationMainWiringDiagram: [{ required: true, message: '请上传用户接入变电站主接线示意图', trigger: 'change' }],
@@ -1341,8 +1333,7 @@ const setcontroFlag = () => {
 defineExpose({ open, filterUsers, setcontroFlag })
 </script>
 <style lang='scss' scoped>
-.el-form {
+.el-form {}
-}
 
 .form-label-left-align {
     text-align: left;

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

@@ -55,31 +55,25 @@
             <el-descriptions-item label="预测评估结论" :span="2">
                 {{ detailData.evaluationConclusion }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item :label="detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                :label="
+                " v-if="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                "
-                v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                "
+                ">
-            >
                 {{ proviteData.nonlinearLoadType }}
             </el-descriptions-item>
             <el-descriptions-item label="是否需要治理">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
@@ -88,14 +82,12 @@
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">
@@ -120,54 +112,39 @@
                     {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
                 </span>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData.userType == 0 || detailData.userType == 1">
-                label="用户协议容量（MVA）"
-                v-if="detailData.userType == 0 || detailData.userType == 1"
-            >
                 {{ proviteData.agreementCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="PCC供电设备容量（MVA）" v-if="
-                label="PCC供电终端容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData.pccEquipmentCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="基准短路容量（MVA）" v-if="
-                label="基准短路容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData.baseShortCircuitCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="系统最小短路容量（MVA）" v-if="
-                label="系统最小短路容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.minShortCircuitCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户用电协议容量（MVA）" v-if="
-                label="用户用电协议容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.userAgreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
@@ -229,14 +206,12 @@
                         {{ proviteData.feasibilityReport?.name }}
                     </a>
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
                         <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                     </el-icon>
@@ -278,10 +253,7 @@
                     {{ proviteData?.predictionEvaluationReviewOpinions?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                label="用户接入变电站主接线示意图"
-                v-if="detailData.userType != 0 && detailData.userType != 1"
-            >
                 <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram?.name">
                     <View @click="openFile(proviteData?.substationMainWiringDiagram?.name)" />
                 </el-icon>
@@ -313,10 +285,8 @@
                     {{ proviteData?.powerQualityReport?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="其他附件"
-                label="其他附件"
+                v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url">
-                v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url"
-            >
                 <el-icon class="elView" v-if="proviteData?.additionalAttachments?.name">
                     <View @click="openFile(proviteData?.additionalAttachments?.name)" />
                 </el-icon>
@@ -846,6 +816,7 @@ onMounted(() => {
     // top: 20px !important;
     // float: right;
 }
+
 // .el-icon {
 //     float: left;
 // }

src/views/pqs/supervise/terminal/components/detail.vue

@@ -55,31 +55,25 @@
             <el-descriptions-item label="预测评估结论" :span="2">
                 {{ detailData.evaluationConclusion }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item :label="detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                :label="
+                " v-if="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                "
-                v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                "
+                ">
-            >
                 {{ proviteData.nonlinearLoadType }}
             </el-descriptions-item>
             <el-descriptions-item label="是否需要治理">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
@@ -88,14 +82,12 @@
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">
@@ -120,54 +112,39 @@
                     {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
                 </span>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData.userType == 0 || detailData.userType == 1">
-                label="用户协议容量（MVA）"
-                v-if="detailData.userType == 0 || detailData.userType == 1"
-            >
                 {{ proviteData.agreementCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="PCC供电设备容量（MVA）" v-if="
-                label="PCC供电终端容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData.pccEquipmentCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="基准短路容量（MVA）" v-if="
-                label="基准短路容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData.baseShortCircuitCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="系统最小短路容量（MVA）" v-if="
-                label="系统最小短路容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.minShortCircuitCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户用电协议容量（MVA）" v-if="
-                label="用户用电协议容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.userAgreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
@@ -229,14 +206,12 @@
                         {{ proviteData.feasibilityReport?.name }}
                     </a>
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
                         <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                     </el-icon>
@@ -278,10 +253,7 @@
                     {{ proviteData?.predictionEvaluationReviewOpinions?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                label="用户接入变电站主接线示意图"
-                v-if="detailData.userType != 0 && detailData.userType != 1"
-            >
                 <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram?.name">
                     <View @click="openFile(proviteData?.substationMainWiringDiagram?.name)" />
                 </el-icon>
@@ -313,10 +285,8 @@
                     {{ proviteData?.powerQualityReport?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="其他附件"
-                label="其他附件"
+                v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url">
-                v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url"
-            >
                 <el-icon class="elView" v-if="proviteData?.additionalAttachments?.name">
                     <View @click="openFile(proviteData?.additionalAttachments?.name)" />
                 </el-icon>
@@ -345,7 +315,7 @@
                     </a>
                 </div>
             </el-descriptions-item>
-            <el-descriptions-item label="信息安全检测报告" >
+            <el-descriptions-item label="信息安全检测报告">
                 <el-icon class="elView" v-if="form.informationSecurityTestReport[0]?.name">
                     <View @click="openFile(form.informationSecurityTestReport[0]?.name)" />
                 </el-icon>
@@ -353,7 +323,7 @@
                     {{ form.informationSecurityTestReport[0]?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item label="入网设计方案审查报告" >
+            <el-descriptions-item label="入网设计方案审查报告">
                 <div v-for="item in form.NetReport">
                     <el-icon class="elView" v-if="item.name">
                         <View @click="openFile(item.name)" />
@@ -363,7 +333,7 @@
                     </a>
                 </div>
             </el-descriptions-item>
-            <el-descriptions-item label="治理工程验收报告" >
+            <el-descriptions-item label="治理工程验收报告">
                 <div v-for="item in form.governReport">
                     <el-icon class="elView" v-if="item.name">
                         <View @click="openFile(item.name)" />
@@ -374,7 +344,7 @@
                 </div>
             </el-descriptions-item>
 
-            <el-descriptions-item label="验收检验报告单" >
+            <el-descriptions-item label="验收检验报告单">
                 <el-icon class="elView" v-if="form.acceptanceInspectionReportSingle[0]?.name">
                     <View @click="openFile(form.acceptanceInspectionReportSingle[0]?.name)" />
                 </el-icon>
@@ -383,7 +353,7 @@
                 </a>
             </el-descriptions-item>
 
-            <el-descriptions-item label="验收检验报告" >
+            <el-descriptions-item label="验收检验报告">
                 <el-icon class="elView" v-if="form.acceptanceInspectionReport[0]?.name">
                     <View @click="openFile(form.acceptanceInspectionReport[0]?.name)" />
                 </el-icon>
@@ -391,7 +361,7 @@
                     {{ form.acceptanceInspectionReport[0]?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item label="型式实验报告" >
+            <el-descriptions-item label="型式实验报告">
                 <el-icon class="elView" v-if="form.typeExperimentReport[0]?.name">
                     <View @click="openFile(form.typeExperimentReport[0]?.name)" />
                 </el-icon>
@@ -400,7 +370,7 @@
                 </a>
             </el-descriptions-item>
 
-            <el-descriptions-item label="出厂检验报告" >
+            <el-descriptions-item label="出厂检验报告">
                 <el-icon class="elView" v-if="form.factoryInspectionReport[0]?.name">
                     <View @click="openFile(form.factoryInspectionReport[0]?.name)" />
                 </el-icon>
@@ -408,7 +378,7 @@
                     {{ form.factoryInspectionReport[0]?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item label="性能检测报告" >
+            <el-descriptions-item label="性能检测报告">
                 <el-icon class="elView" v-if="form.performanceTestReport[0]?.name">
                     <View @click="openFile(form.performanceTestReport[0]?.name)" />
                 </el-icon>
@@ -416,7 +386,7 @@
                     {{ form.performanceTestReport[0]?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item label="主接线图" >
+            <el-descriptions-item label="主接线图">
                 <el-icon class="elView" v-if="form.mainWiringDiagram[0]?.name">
                     <View @click="openFile(form.mainWiringDiagram[0]?.name)" />
                 </el-icon>
@@ -424,7 +394,7 @@
                     {{ form.mainWiringDiagram[0]?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item label="试运行报告" >
+            <el-descriptions-item label="试运行报告">
                 <el-icon class="elView" v-if="form.runTheReport[0]?.name">
                     <View @click="openFile(form.runTheReport[0]?.name)" />
                 </el-icon>
@@ -845,6 +815,7 @@ onMounted(() => {
     // top: 20px !important;
     // float: right;
 }
+
 // .el-icon {
 //     float: left;
 // }

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

@@ -50,31 +50,25 @@
             <el-descriptions-item label="预测评估结论">
                 {{ detailData.evaluationConclusion }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item :label="detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                :label="
+                " v-if="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                "
-                v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                "
+                ">
-            >
                 {{ proviteData.nonlinearLoadType }}
             </el-descriptions-item>
             <el-descriptions-item label="是否需要治理">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
@@ -83,14 +77,12 @@
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">
@@ -103,26 +95,20 @@
             <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
                 {{ proviteData?.pccPoint }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="PCC供电设备容量" v-if="
-                label="PCC供电终端容量"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData.pccEquipmentCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="基准短路容量" v-if="
-                label="基准短路容量"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData.baseShortCircuitCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
@@ -135,26 +121,20 @@
             <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
                 {{ proviteData?.evaluationChekDept }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="系统最小短路容量" v-if="
-                label="系统最小短路容量"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.minShortCircuitCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户用电协议容量" v-if="
-                label="用户用电协议容量"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.userAgreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="行业" v-if="detailData.userType == 6">
@@ -186,14 +166,12 @@
                         {{ proviteData.feasibilityReport.name }}
                     </a>
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     <el-icon class="elView" v-if="proviteData?.feasibilityReport.name">
                         <View @click="openFile(proviteData.feasibilityReport.name)" />
                     </el-icon>
@@ -234,10 +212,7 @@
                     {{ proviteData?.predictionEvaluationReviewOpinions.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                label="用户接入变电站主接线示意图"
-                v-if="detailData.userType != 0 && detailData.userType != 1"
-            >
                 <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram.name">
                     <View @click="openFile(proviteData?.substationMainWiringDiagram.name)" />
                 </el-icon>
@@ -300,10 +275,8 @@
             <el-descriptions-item label="填报部门">
                 {{ detailData.orgName }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item :label="applyTitle + '报告'"
-                :label="applyTitle + '报告'"
+                v-if="proviteData?.otherReport && proviteData?.otherReport.url">
-                v-if="proviteData?.otherReport && proviteData?.otherReport.url"
-            >
                 <el-icon class="elView" v-if="proviteData?.otherReport.name">
                     <View @click="openFile(proviteData?.otherReport.nam)" />
                 </el-icon>
@@ -593,6 +566,7 @@ onMounted(() => {
     // position: absolute !important;
     // top: 20px !important;
 }
+
 // .details {
 //     width: 100%;
 //     display: flex;
@@ -602,9 +576,11 @@ onMounted(() => {
     cursor: pointer;
     margin-right: 10px;
 }
+
 :deep(.el-descriptions__label) {
     width: 20%;
 }
+
 :deep(.el-descriptions__content) {
     width: 30%;
 }

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

@@ -47,10 +47,7 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="非线性终端类型" v-if="detailData.userType == 0 || detailData.userType == 1">
-                    label="非线性终端类型"
-                    v-if="detailData.userType == 0 || detailData.userType == 1"
-                >
                     {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="预测评估单位">
@@ -59,33 +56,27 @@
                 <el-descriptions-item label="预测评估结论" :span="2">
                     {{ detailData.evaluationConclusion }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item :label="detailData.userType == '4' || detailData.userType == '5'
-                    :label="
-                        detailData.userType == '4' || detailData.userType == '5'
                         ? '非线性设备类型: '
                         : '非线性负荷类型：'
-                    "
+                    " v-if="
-                    v-if="
                         detailData.userType == '2' ||
                         detailData.userType == '3' ||
                         detailData.userType == '4' ||
                         detailData.userType == '5'
-                    "
+                    ">
-                >
                     {{ proviteData.nonlinearLoadType }}
                 </el-descriptions-item>
                 <el-descriptions-item label="是否需要治理">
                     <span v-if="detailData.userType == 0 || detailData.userType == 1">
                         {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData.userType == 2 ||
                         detailData.userType == 3 ||
                         detailData.userType == 4 ||
                         detailData.userType == 5
-                        "
+                    ">
-                    >
                         {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                     </span>
                     <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
@@ -94,14 +85,12 @@
                     <span v-if="detailData.userType == 0 || detailData.userType == 1">
                         {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData.userType == 2 ||
                         detailData.userType == 3 ||
                         detailData.userType == 4 ||
                         detailData.userType == 5
-                        "
+                    ">
-                    >
                         {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                     </span>
                     <span v-if="detailData.userType == 6">
@@ -113,54 +102,39 @@
                         {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
                     </span>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData.userType == 0 || detailData.userType == 1">
-                    label="用户协议容量（MVA）"
-                    v-if="detailData.userType == 0 || detailData.userType == 1"
-                >
                     {{ proviteData.agreementCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="PCC供电设备容量（MVA）" v-if="
-                    label="PCC供电终端容量（MVA）"
-                    v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData.pccEquipmentCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="基准短路容量（MVA）" v-if="
-                    label="基准短路容量（MVA）"
-                    v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData.baseShortCircuitCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="系统最小短路容量（MVA）" v-if="
-                    label="系统最小短路容量（MVA）"
-                    v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData?.minShortCircuitCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户用电协议容量（MVA）" v-if="
-                    label="用户用电协议容量（MVA）"
-                    v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData?.userAgreementCapacity }}
                 </el-descriptions-item>
                 <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
@@ -173,10 +147,7 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
-                    label="预测评估评审单位"
-                    v-if="detailData.userType != 0 && detailData.userType != 1"
-                >
                     {{ proviteData?.evaluationChekDept }}
                 </el-descriptions-item>
                 <el-descriptions-item label="行业" v-if="detailData.userType == 6">
@@ -225,14 +196,12 @@
                             {{ proviteData.feasibilityReport?.name }}
                         </a>
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData.userType == 2 ||
                         detailData.userType == 3 ||
                         detailData.userType == 4 ||
                         detailData.userType == 5
-                        "
+                    ">
-                    >
                         <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
                             <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                         </el-icon>
@@ -274,10 +243,7 @@
                         {{ proviteData?.predictionEvaluationReviewOpinions?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                    label="用户接入变电站主接线示意图"
-                    v-if="detailData.userType != 0 && detailData.userType != 1"
-                >
                     <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram?.name">
                         <View @click="openFile(proviteData?.substationMainWiringDiagram?.name)" />
                     </el-icon>
@@ -309,10 +275,8 @@
                         {{ proviteData?.powerQualityReport?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="其他附件"
-                    label="其他附件"
+                    v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url">
-                    v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url"
-                >
                     <el-icon class="elView" v-if="proviteData?.additionalAttachments?.name">
                         <View @click="openFile(proviteData?.additionalAttachments?.name)" />
                     </el-icon>
@@ -367,10 +331,7 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="非线性终端类型" v-if="detailData1.userType == 0 || detailData1.userType == 1">
-                    label="非线性终端类型"
-                    v-if="detailData1.userType == 0 || detailData1.userType == 1"
-                >
                     {{ proviteData1.nonlinearDeviceType ? proviteData1.nonlinearDeviceType : '-' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="预测评估单位">
@@ -379,33 +340,27 @@
                 <el-descriptions-item label="预测评估结论" :span="2">
                     {{ detailData1.evaluationConclusion }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item :label="detailData1.userType == '4' || detailData1.userType == '5'
-                    :label="
-                        detailData1.userType == '4' || detailData1.userType == '5'
                         ? '非线性设备类型: '
                         : '非线性负荷类型：'
-                    "
+                    " v-if="
-                    v-if="
                         detailData1.userType == '2' ||
                         detailData1.userType == '3' ||
                         detailData1.userType == '4' ||
                         detailData1.userType == '5'
-                    "
+                    ">
-                >
                     {{ proviteData1.nonlinearLoadType }}
                 </el-descriptions-item>
                 <el-descriptions-item label="是否需要治理">
                     <span v-if="detailData1.userType == 0 || detailData1.userType == 1">
                         {{ proviteData1.needGovernance == 0 ? '否' : '是' }}
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData1.userType == 2 ||
                         detailData1.userType == 3 ||
                         detailData1.userType == 4 ||
                         detailData1.userType == 5
-                        "
+                    ">
-                    >
                         {{ proviteData1.needGovernance == 0 ? '否' : '是' }}
                     </span>
                     <span v-if="detailData1.userType == 6">{{ proviteData1.needGovernance == 0 ? '否' : '是' }}</span>
@@ -414,14 +369,12 @@
                     <span v-if="detailData1.userType == 0 || detailData1.userType == 1">
                         {{ proviteData1.backgroundTestPerformed == 0 ? '否' : '是' }}
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData1.userType == 2 ||
                         detailData1.userType == 3 ||
                         detailData1.userType == 4 ||
                         detailData1.userType == 5
-                        "
+                    ">
-                    >
                         {{ proviteData1.backgroundTestPerformed == 0 ? '否' : '是' }}
                     </span>
                     <span v-if="detailData1.userType == 6">
@@ -433,54 +386,39 @@
                         {{ proviteData1.antiInterferenceTest == 0 ? '否' : '是' }}
                     </span>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData1.userType == 0 || detailData1.userType == 1">
-                    label="用户协议容量（MVA）"
-                    v-if="detailData1.userType == 0 || detailData1.userType == 1"
-                >
                     {{ proviteData1.agreementCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="PCC供电设备容量（MVA）" v-if="
-                    label="PCC供电终端容量（MVA）"
-                    v-if="
                     detailData1.userType == '2' ||
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData1.pccEquipmentCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="基准短路容量（MVA）" v-if="
-                    label="基准短路容量（MVA）"
-                    v-if="
                     detailData1.userType == '2' ||
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData1.baseShortCircuitCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="系统最小短路容量（MVA）" v-if="
-                    label="系统最小短路容量（MVA）"
-                    v-if="
                     detailData1.userType == '2' ||
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData1?.minShortCircuitCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户用电协议容量（MVA）" v-if="
-                    label="用户用电协议容量（MVA）"
-                    v-if="
                     detailData1.userType == '2' ||
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                    "
+                ">
-                >
                     {{ proviteData1?.userAgreementCapacity }}
                 </el-descriptions-item>
                 <el-descriptions-item label="PCC点" v-if="detailData1.userType != 0 && detailData1.userType != 1">
@@ -493,10 +431,7 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="预测评估评审单位" v-if="detailData1.userType != 0 && detailData1.userType != 1">
-                    label="预测评估评审单位"
-                    v-if="detailData1.userType != 0 && detailData1.userType != 1"
-                >
                     {{ proviteData1?.evaluationChekDept }}
                 </el-descriptions-item>
                 <el-descriptions-item label="行业" v-if="detailData1.userType == 6">
@@ -545,14 +480,12 @@
                             {{ proviteData1.feasibilityReport?.name }}
                         </a>
                     </span>
-                    <span
+                    <span v-if="
-                        v-if="
                         detailData1.userType == 2 ||
                         detailData1.userType == 3 ||
                         detailData1.userType == 4 ||
                         detailData1.userType == 5
-                        "
+                    ">
-                    >
                         <el-icon class="elView" v-if="proviteData1?.feasibilityReport?.name">
                             <View @click="openFile(proviteData1?.feasibilityReport?.name)" />
                         </el-icon>
@@ -594,10 +527,7 @@
                         {{ proviteData1?.predictionEvaluationReviewOpinions?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                    label="用户接入变电站主接线示意图"
-                    v-if="detailData.userType != 0 && detailData.userType != 1"
-                >
                     <el-icon class="elView" v-if="proviteData1?.substationMainWiringDiagram?.name">
                         <View @click="openFile(proviteData1?.substationMainWiringDiagram?.name)" />
                     </el-icon>
@@ -629,10 +559,8 @@
                         {{ proviteData1?.powerQualityReport?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item
+                <el-descriptions-item label="其他附件"
-                    label="其他附件"
+                    v-if="proviteData1?.additionalAttachments && proviteData1?.additionalAttachments?.url">
-                    v-if="proviteData1?.additionalAttachments && proviteData1?.additionalAttachments?.url"
-                >
                     <el-icon class="elView" v-if="proviteData1?.additionalAttachments?.name">
                         <View @click="openFile(proviteData1?.additionalAttachments?.name)" />
                     </el-icon>
@@ -1059,6 +987,7 @@ onMounted(() => {
     // top: 20px !important;
     // float: right;
 }
+
 // .el-icon {
 //     float: left;
 // }

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

@@ -128,10 +128,10 @@
             </el-form-item>
             <el-form-item for="-"
                 v-if="form.userType == '2' || form.userType == '3' || form.userType == '4' || form.userType == '5'"
-                label="PCC供电终端容量：" prop="pccEquipmentCapacity">
+                label="PCC供电设备容量：" prop="pccEquipmentCapacity">
                 <el-input v-model="form.pccEquipmentCapacity" oninput="value=value.replace(/[^\-?\d.]/g,'')
 .replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
-.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入PCC供电终端容量">
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入PCC供电设备容量">
                     <template #append>MVA</template>
                 </el-input>
             </el-form-item>
@@ -477,7 +477,7 @@ const resetForm = () => {
         agreementCapacity: '', //用户协议容量  1
         nonlinearDeviceType: '', //非线性终端类型 1
         nonlinearLoadType: '', //非线性负荷类型 1
-        pccEquipmentCapacity: '', // PCC供电终端容量（MVA） 1
+        pccEquipmentCapacity: '', // PCC供电设备容量（MVA） 1
         baseShortCircuitCapacity: '', //基准短路容量（MVA）1
         industry: industryList[0].id, //行业 1
         deviceName: '', //敏感终端名称  1
@@ -651,7 +651,7 @@ const rules = ref({
     evaluationChekDept: [{ required: true, message: '请输入预测评估审单位', trigger: 'blur' }],
     baseShortCircuitCapacity: [{ required: true, message: '请输入基准短路容量', trigger: 'blur' }],
     minShortCircuitCapacity: [{ required: true, message: '请输入系统最小短路容量', trigger: 'blur' }],
-    pccEquipmentCapacity: [{ required: true, message: '请输入PCC供电终端容量', trigger: 'blur' }],
+    pccEquipmentCapacity: [{ required: true, message: '请输入PCC供电设备容量', trigger: 'blur' }],
     userAgreementCapacity: [{ required: true, message: '请输入用户用电协议容量', trigger: 'blur' }],
     nonlinearLoadType: [{ required: true, message: '请输入非线性负荷类型', trigger: 'blur' }],
     substationMainWiringDiagram: [{ required: true, message: '请上传用户接入变电站主接线示意图', trigger: 'change' }],
@@ -1064,7 +1064,7 @@ const confirmForm = async (flag: boolean) => {
             })
         }
     } else {
-     await   ruleFormRef.value.validate( async (valid: any) => {
+        await ruleFormRef.value.validate(async (valid: any) => {
             if (valid) {
                 //整理上传文件的数据
                 // userType==0,1

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

@@ -55,31 +55,25 @@
             <el-descriptions-item label="预测评估结论" :span="2">
                 {{ detailData.evaluationConclusion }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item :label="detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                :label="
+                " v-if="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                "
-                v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                "
+                ">
-            >
+                {{ proviteData?.nonlinearLoadType || '' }}
-                {{ proviteData?.nonlinearLoadType ||''}}
             </el-descriptions-item>
             <el-descriptions-item label="是否需要治理">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData?.needGovernance == 1 ? '是' : '否' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData?.needGovernance == 1 ? '是' : '否' }}
                 </span>
                 <span v-if="detailData.userType == 6">{{ proviteData?.needGovernance == 1 ? '是' : '否' }}</span>
@@ -88,14 +82,12 @@
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
                 </span>
                 <span v-if="detailData.userType == 6">
@@ -120,54 +112,39 @@
                     {{ proviteData.antiInterferenceTest == 1 ? '是' : '否' }}
                 </span>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData.userType == 0 || detailData.userType == 1">
-                label="用户协议容量（MVA）"
-                v-if="detailData.userType == 0 || detailData.userType == 1"
-            >
                 {{ proviteData?.agreementCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="PCC供电设备容量（MVA）" v-if="
-                label="PCC供电终端容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.pccEquipmentCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="基准短路容量（MVA）" v-if="
-                label="基准短路容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.baseShortCircuitCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="系统最小短路容量（MVA）" v-if="
-                label="系统最小短路容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.minShortCircuitCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户用电协议容量（MVA）" v-if="
-                label="用户用电协议容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.userAgreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
@@ -229,14 +206,12 @@
                         {{ proviteData?.feasibilityReport?.name }}
                     </a>
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
                         <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                     </el-icon>
@@ -278,10 +253,7 @@
                     {{ proviteData?.predictionEvaluationReviewOpinions?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                label="用户接入变电站主接线示意图"
-                v-if="detailData.userType != 0 && detailData.userType != 1"
-            >
                 <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram?.name">
                     <View @click="openFile(proviteData?.substationMainWiringDiagram?.name)" />
                 </el-icon>
@@ -313,10 +285,8 @@
                     {{ proviteData?.powerQualityReport?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="其他附件"
-                label="其他附件"
+                v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url">
-                v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url"
-            >
                 <el-icon class="elView" v-if="proviteData?.additionalAttachments?.name">
                     <View @click="openFile(proviteData?.additionalAttachments?.name)" />
                 </el-icon>
@@ -658,7 +628,7 @@ const getProviteData = async () => {
         //查询非线性负荷类型
 
 
-        if(proviteData.value?.nonlinearLoadType !=undefined){
+        if (proviteData.value?.nonlinearLoadType != undefined) {
             await getDictTreeById(proviteData.value.nonlinearLoadType).then(res => {
                 proviteData.value.nonlinearLoadType = res.data?.name
             })
@@ -668,47 +638,47 @@ const getProviteData = async () => {
         proviteData.value = detailData.value.userReportSensitivePO
     }
     //可研报告
-    if (proviteData.value?.feasibilityReport  !=undefined) {
+    if (proviteData.value?.feasibilityReport != undefined) {
         await getFileNamePath(proviteData.value.feasibilityReport, 'feasibilityReport')
     }
     //项目初步设计说明书
-    if (proviteData.value?.preliminaryDesignDescription  !=undefined) {
+    if (proviteData.value?.preliminaryDesignDescription != undefined) {
         await getFileNamePath(proviteData.value.preliminaryDesignDescription, 'preliminaryDesignDescription')
     }
     //预测评估报告
-    if (proviteData.value?.predictionEvaluationReport !=undefined) {
+    if (proviteData.value?.predictionEvaluationReport != undefined) {
         await getFileNamePath(proviteData.value.predictionEvaluationReport, 'predictionEvaluationReport')
     }
 
     //预测评估评审意见报告
-    if (proviteData.value?.predictionEvaluationReviewOpinions  !=undefined) {
+    if (proviteData.value?.predictionEvaluationReviewOpinions != undefined) {
         await getFileNamePath(
             proviteData.value.predictionEvaluationReviewOpinions,
             'predictionEvaluationReviewOpinions'
         )
     }
     //用户接入变电站主接线示意图
-    if (proviteData.value?.substationMainWiringDiagram  !=undefined) {
+    if (proviteData.value?.substationMainWiringDiagram != undefined) {
         await getFileNamePath(proviteData.value.substationMainWiringDiagram, 'substationMainWiringDiagram')
     }
 
     //主要敏感终端清单
-    if (proviteData.value?.sensitiveDevices !=undefined) {
+    if (proviteData.value?.sensitiveDevices != undefined) {
         await getFileNamePath(proviteData.value.sensitiveDevices, 'sensitiveDevices')
     }
 
     //抗扰度测试报告
-    if (proviteData.value?.antiInterferenceReport!=undefined) {
+    if (proviteData.value?.antiInterferenceReport != undefined) {
         await getFileNamePath(proviteData.value.antiInterferenceReport, 'antiInterferenceReport')
     }
 
     //背景电能质量测试报告
-    if (proviteData.value?.powerQualityReport!=undefined) {
+    if (proviteData.value?.powerQualityReport != undefined) {
         await getFileNamePath(proviteData.value.powerQualityReport, 'powerQualityReport')
     }
 
     //其他附件
-    if (proviteData.value?.additionalAttachments!=undefined) {
+    if (proviteData.value?.additionalAttachments != undefined) {
         getFileNamePath(proviteData.value.additionalAttachments, 'additionalAttachments')
     }
 
@@ -851,6 +821,7 @@ onMounted(() => {
     // top: 20px !important;
     // float: right;
 }
+
 // .el-icon {
 //     float: left;
 // }

src/views/pqs/supervise_jb/terminal/components/detail.vue

@@ -55,31 +55,25 @@
             <el-descriptions-item label="预测评估结论" :span="2">
                 {{ detailData.evaluationConclusion }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item :label="detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                :label="
+                " v-if="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                "
-                v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
                     detailData.userType == '4' ||
                     detailData.userType == '5'
-                "
+                ">
-            >
                 {{ proviteData.nonlinearLoadType }}
             </el-descriptions-item>
             <el-descriptions-item label="是否需要治理">
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData.needGovernance == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
@@ -88,14 +82,12 @@
                 <span v-if="detailData.userType == 0 || detailData.userType == 1">
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
                 </span>
                 <span v-if="detailData.userType == 6">
@@ -120,54 +112,39 @@
                     {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
                 </span>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData.userType == 0 || detailData.userType == 1">
-                label="用户协议容量（MVA）"
-                v-if="detailData.userType == 0 || detailData.userType == 1"
-            >
                 {{ proviteData.agreementCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="PCC供电设备容量（MVA）" v-if="
-                label="PCC供电终端容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData.pccEquipmentCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="基准短路容量（MVA）" v-if="
-                label="基准短路容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData.baseShortCircuitCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="系统最小短路容量（MVA）" v-if="
-                label="系统最小短路容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.minShortCircuitCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户用电协议容量（MVA）" v-if="
-                label="用户用电协议容量（MVA）"
-                v-if="
                 detailData.userType == '2' ||
                 detailData.userType == '3' ||
                 detailData.userType == '4' ||
                 detailData.userType == '5'
-                "
+            ">
-            >
                 {{ proviteData?.userAgreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
@@ -229,14 +206,12 @@
                         {{ proviteData.feasibilityReport?.name }}
                     </a>
                 </span>
-                <span
+                <span v-if="
-                    v-if="
                     detailData.userType == 2 ||
                     detailData.userType == 3 ||
                     detailData.userType == 4 ||
                     detailData.userType == 5
-                    "
+                ">
-                >
                     <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
                         <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                     </el-icon>
@@ -278,10 +253,7 @@
                     {{ proviteData?.predictionEvaluationReviewOpinions?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                label="用户接入变电站主接线示意图"
-                v-if="detailData.userType != 0 && detailData.userType != 1"
-            >
                 <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram?.name">
                     <View @click="openFile(proviteData?.substationMainWiringDiagram?.name)" />
                 </el-icon>
@@ -313,10 +285,8 @@
                     {{ proviteData?.powerQualityReport?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="其他附件"
-                label="其他附件"
+                v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url">
-                v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url"
-            >
                 <el-icon class="elView" v-if="proviteData?.additionalAttachments?.name">
                     <View @click="openFile(proviteData?.additionalAttachments?.name)" />
                 </el-icon>
@@ -345,7 +315,7 @@
                     </a>
                 </div>
             </el-descriptions-item>
-            <el-descriptions-item label="信息安全检测报告" >
+            <el-descriptions-item label="信息安全检测报告">
                 <el-icon class="elView" v-if="form.informationSecurityTestReport[0]?.name">
                     <View @click="openFile(form.informationSecurityTestReport[0]?.name)" />
                 </el-icon>
@@ -353,7 +323,7 @@
                     {{ form.informationSecurityTestReport[0]?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item label="入网设计方案审查报告" >
+            <el-descriptions-item label="入网设计方案审查报告">
                 <div v-for="item in form.NetReport">
                     <el-icon class="elView" v-if="item.name">
                         <View @click="openFile(item.name)" />
@@ -363,7 +333,7 @@
                     </a>
                 </div>
             </el-descriptions-item>
-            <el-descriptions-item label="治理工程验收报告" >
+            <el-descriptions-item label="治理工程验收报告">
                 <div v-for="item in form.governReport">
                     <el-icon class="elView" v-if="item.name">
                         <View @click="openFile(item.name)" />
@@ -374,7 +344,7 @@
                 </div>
             </el-descriptions-item>
 
-            <el-descriptions-item label="验收检验报告单" >
+            <el-descriptions-item label="验收检验报告单">
                 <el-icon class="elView" v-if="form.acceptanceInspectionReportSingle[0]?.name">
                     <View @click="openFile(form.acceptanceInspectionReportSingle[0]?.name)" />
                 </el-icon>
@@ -383,7 +353,7 @@
                 </a>
             </el-descriptions-item>
 
-            <el-descriptions-item label="验收检验报告" >
+            <el-descriptions-item label="验收检验报告">
                 <el-icon class="elView" v-if="form.acceptanceInspectionReport[0]?.name">
                     <View @click="openFile(form.acceptanceInspectionReport[0]?.name)" />
                 </el-icon>
@@ -391,7 +361,7 @@
                     {{ form.acceptanceInspectionReport[0]?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item label="型式实验报告" >
+            <el-descriptions-item label="型式实验报告">
                 <el-icon class="elView" v-if="form.typeExperimentReport[0]?.name">
                     <View @click="openFile(form.typeExperimentReport[0]?.name)" />
                 </el-icon>
@@ -400,7 +370,7 @@
                 </a>
             </el-descriptions-item>
 
-            <el-descriptions-item label="出厂检验报告" >
+            <el-descriptions-item label="出厂检验报告">
                 <el-icon class="elView" v-if="form.factoryInspectionReport[0]?.name">
                     <View @click="openFile(form.factoryInspectionReport[0]?.name)" />
                 </el-icon>
@@ -408,7 +378,7 @@
                     {{ form.factoryInspectionReport[0]?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item label="性能检测报告" >
+            <el-descriptions-item label="性能检测报告">
                 <el-icon class="elView" v-if="form.performanceTestReport[0]?.name">
                     <View @click="openFile(form.performanceTestReport[0]?.name)" />
                 </el-icon>
@@ -416,7 +386,7 @@
                     {{ form.performanceTestReport[0]?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item label="主接线图" >
+            <el-descriptions-item label="主接线图">
                 <el-icon class="elView" v-if="form.mainWiringDiagram[0]?.name">
                     <View @click="openFile(form.mainWiringDiagram[0]?.name)" />
                 </el-icon>
@@ -424,7 +394,7 @@
                     {{ form.mainWiringDiagram[0]?.name }}
                 </a>
             </el-descriptions-item>
-            <el-descriptions-item label="试运行报告" >
+            <el-descriptions-item label="试运行报告">
                 <el-icon class="elView" v-if="form.runTheReport[0]?.name">
                     <View @click="openFile(form.runTheReport[0]?.name)" />
                 </el-icon>
@@ -845,6 +815,7 @@ onMounted(() => {
     // top: 20px !important;
     // float: right;
 }
+
 // .el-icon {
 //     float: left;
 // }

src/views/pqs/voltageSags/monitoringPoint/online/index.vue

@@ -32,7 +32,7 @@ import router from '@/router'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
 
 defineOptions({
-    name: 'Descentsystem/monitoringpoint'
+    // name: 'Descentsystem/monitoringpoint'
 })
 const isReload = ref(false)
 const navigationRef = ref()

src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue

@@ -40,7 +40,7 @@ const params = ref({
 })
 const datePickerRef = ref()
 const mapList: any = ref([])
-const flag = ref(false)
+const flag = ref(true)
 const showTree = ref(false)
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
@@ -62,7 +62,12 @@ const handleNodeClick = (data: any, node: any) => {
 
 
     if (data.level === 6) {
+        console.log("🚀 ~ handleNodeClick ~ window.localStorage.getItem('BMAP_SECKEY'):", window.localStorage.getItem('BMAP_SECKEY')==null)
+
+        if(window.localStorage.getItem('BMAP_SECKEY')==null){
             flag.value = false
+        }
+
         monitoringPoint.setValue('lineId', data.id)
 
     }

src/views/pqs/voltageSags/overview/index.vue

@@ -285,7 +285,10 @@ const lookPoint = () => {
 onMounted(() => {
     if (siteList.value.length == 0) {
         setTimeout(() => {
+            if (window.localStorage.getItem('BMAP_SECKEY') == null) {
                 hackReset.value = false
+            }
+
 
         }, 1000)
         setTimeout(() => {

src/views/system/auth/menu/popupApi.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title">
+    <el-dialog draggable  width="600px" v-model="dialogVisible" :title="title">
         <el-scrollbar>
-            <el-form :mode="form" :inline="false" :model="form" label-width="120px" :rules="rules">
+            <el-form :mode="form" :inline="false" class="form-one" :model="form" label-width="auto" :rules="rules">
                 <el-form-item prop="name" label="接口/按钮名称">
                     <el-input v-model="form.name" placeholder="请输入接口名称" />
                 </el-form-item>

src/views/system/auth/menu/popupMenu.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title">
+    <el-dialog draggable width="600px" v-model="dialogVisible" :title="title">
         <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="120px">
+            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
                 <el-form-item label="上级菜单">
                     <el-cascader
                         v-model="form.pid"

src/views/system/version/index.vue

@@ -0,0 +1,123 @@
+<template>
+    <div class="default-main">
+        <TableHeader :showReset="false">
+            <template #select>
+
+
+                <!-- <el-radio-group v-model.trim="tableStore.table.params.versionType" @change="tableStore.index()">
+                    <el-radio-button label="web" value="WEB" />
+                    <el-radio-button label="app" value="APP" />
+
+                </el-radio-group> -->
+            </template>
+            <template #operation>
+                <el-button type="primary" icon="el-icon-Plus" @click="addMenu">新增版本</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <el-dialog width="600px" v-model.trim="dialogVisible" title="新增版本">
+            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
+                <el-form-item label="版本号">
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.appVersion" placeholder="请输入版本号" />
+                </el-form-item>
+                <el-form-item label="整改内容">
+                    <el-input maxlength="300" type="textarea" show-word-limit v-model.trim="form.content"
+                        placeholder="请输入整改内容" />
+                </el-form-item>
+                <el-form-item label="发布类型">
+
+                    <el-select v-model.trim="form.sev" placeholder="请选择发布类型">
+                        <el-option label="优化" :value="0" />
+                        <el-option label="bug调整" :value="1" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="版本类型">
+
+                    <el-select v-model.trim="form.versionType" placeholder="please select your zone">
+                        <el-option label="web" value="WEB" />
+                        <el-option label="app" value="APP" />
+                    </el-select>
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="submit">确认</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage } from 'element-plus'
+import { addVersion } from '@/api/systerm'
+import router from '@/router/index'
+const dialogVisible = ref(false)
+const form = ref({
+    appVersion: '',
+    content: '',
+    versionType: '',
+    sev: '',
+})
+const tableStore = new TableStore({
+    url: '/cs-system-boot/appVersion/getAllData',
+    method: 'POST',
+    showPage: false,
+    paramsPOST: true,
+    column: [
+        {
+            title: '序号', width: 80, formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '版本号', field: 'versionName', width: '150' },
+
+        { title: '创建时间', field: 'createTime', width: '220' },
+        {
+            title: '发布类型', field: 'sev', formatter: (row,) => {
+                return row.cellValue == 0 ? '优化' : 'bug调整'
+            },
+            width: '150'
+        },
+        { title: '整改内容', field: 'content' },
+
+
+
+
+    ],
+})
+tableStore.table.params.versionType = 'WEB'
+provide('tableStore', tableStore)
+
+onMounted(async () => {
+    tableStore.index()
+    // await queryByCode('Direct_Connected_Device').then((res) => {
+    //     queryByid(res.data.id).then((res) => {
+    //         DevTypeOptions.value = res.data
+    //     })
+    // })
+    // tableStore.table.params.devType = ''
+})
+const submit = () => {
+    addVersion(form.value).then(res => {
+        ElMessage.success('新增成功')
+        tableStore.index()
+        dialogVisible.value = false
+        router.go(0)
+    })
+}
+const addMenu = () => {
+    dialogVisible.value = true
+    form.value.appVersion = tableStore.table.data[0].versionName || ''
+    form.value.content = ''
+    form.value.sev = tableStore.table.data[0].sev || 0
+    form.value.versionType = tableStore.table.data[0].versionType || 'WEB'
+}
+
+</script>