我的任务，干扰源分析，常态化干扰源用户管理，终端检测，bug调整

src/api/device-boot/line.ts

@@ -30,3 +30,18 @@ export const getSubstationSelect = () => {
         method: 'get'
     })
 }
+// 查询变电站详情
+export const getSubstationSelectLine = (id: string) => {
+    return request({
+        url: '/device-boot/line/getSubstationData',
+        method: 'post',
+        data: [id]
+    })
+}
+// 查询监测点
+export const getLineOverLimitData = (id: string) => {
+    return request({
+        url: '/device-boot/line/getLineOverLimitData?id=' + id,
+        method: 'post'
+    })
+}

src/api/device-boot/panorama.ts

@@ -165,3 +165,12 @@ export function getSupervisionDetailsData(data: any) {
 export function getSupervisionCityDetailsData(data: any) {
     return request({ url: '/supervision-boot/gridDiagram/getSupervisionCityDetailsData', method: 'post', data })
 }
+
+//区域污染值统计
+export function getAreaPollution(data: any) {
+    return request({ url: '/harmonic-boot/PollutionSubstation/getAreaPollution', method: 'post', data })
+} 
+//场站级评估
+export function downPollutionSubCalc(data: any) {
+    return request({ url: 'harmonic-boot/PollutionSubstation/downPollutionSubCalc', method: 'post', data })
+} 

src/assets/font/demo_index.html

@@ -54,6 +54,24 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe65d;</span>
+                <div class="name">停运事件管理</div>
+                <div class="code-name">&amp;#xe65d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe604;</span>
+                <div class="name">在运设备</div>
+                <div class="code-name">&amp;#xe604;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe666;</span>
+                <div class="name">异常类_14非智能表在运异常</div>
+                <div class="code-name">&amp;#xe666;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe82f;</span>
                 <div class="name">综合评价</div>
@@ -234,9 +252,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1744179175277') format('woff2'),
-       url('iconfont.woff?t=1744179175277') format('woff'),
-       url('iconfont.ttf?t=1744179175277') format('truetype');
+  src: url('iconfont.woff2?t=1764826411334') format('woff2'),
+       url('iconfont.woff?t=1764826411334') format('woff'),
+       url('iconfont.ttf?t=1764826411334') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -262,6 +280,33 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-tingyunshijianguanli"></span>
+            <div class="name">
+              停运事件管理
+            </div>
+            <div class="code-name">.icon-tingyunshijianguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zaiyunshebei"></span>
+            <div class="name">
+              在运设备
+            </div>
+            <div class="code-name">.icon-zaiyunshebei
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yichanglei_14feizhinengbiaozaiyunyichang"></span>
+            <div class="name">
+              异常类_14非智能表在运异常
+            </div>
+            <div class="code-name">.icon-yichanglei_14feizhinengbiaozaiyunyichang
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-zonghepingjia1"></span>
             <div class="name">
@@ -532,6 +577,30 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tingyunshijianguanli"></use>
+                </svg>
+                <div class="name">停运事件管理</div>
+                <div class="code-name">#icon-tingyunshijianguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zaiyunshebei"></use>
+                </svg>
+                <div class="name">在运设备</div>
+                <div class="code-name">#icon-zaiyunshebei</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yichanglei_14feizhinengbiaozaiyunyichang"></use>
+                </svg>
+                <div class="name">异常类_14非智能表在运异常</div>
+                <div class="code-name">#icon-yichanglei_14feizhinengbiaozaiyunyichang</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-zonghepingjia1"></use>

src/assets/font/iconfont.css

@@ -1,10 +1,9 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 3482754 */
-  src: url('iconfont.woff2?t=1744179175277') format('woff2'),
-       url('iconfont.woff?t=1744179175277') format('woff'),
-       url('iconfont.ttf?t=1744179175277') format('truetype');
+  font-family: 'iconfont';
+  src: url('/src/assets/font/iconfont.woff2?t=1764826411334') format('woff2'),
+       url('/src/assets/font/iconfont.woff?t=1764826411334') format('woff'),
+       url('/src/assets/font/iconfont.ttf?t=1764826411334') format('truetype');
 }
-
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
@@ -13,6 +12,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-tingyunshijianguanli:before {
+  content: "\e65d";
+}
+
+.icon-zaiyunshebei:before {
+  content: "\e604";
+}
+
+.icon-yichanglei_14feizhinengbiaozaiyunyichang:before {
+  content: "\e666";
+}
+
 .icon-zonghepingjia1:before {
   content: "\e82f";
 }

src/assets/font/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "25458995",
+      "name": "停运事件管理",
+      "font_class": "tingyunshijianguanli",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "35341056",
+      "name": "在运设备",
+      "font_class": "zaiyunshebei",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "22630860",
+      "name": "异常类_14非智能表在运异常",
+      "font_class": "yichanglei_14feizhinengbiaozaiyunyichang",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
     {
       "icon_id": "32402696",
       "name": "综合评价",

src/assets/img/view.vue

@@ -6,7 +6,7 @@
         </div> -->
         <TableHeader :showSearch="false">
             <template v-slot:select>
-                <el-form-item label="日期">
+                <el-form-item label="统计时间">
                     <DatePicker ref="datePickerRef" :nextFlag="false" :theCurrentTime="true"></DatePicker>
                 </el-form-item>
             </template>

src/components/PreviewFile/index.vue

@@ -18,14 +18,22 @@ import VueOfficeDocx from '@vue-office/docx'
 import VueOfficeExcel from '@vue-office/excel'
 //引入VueOfficePdf组件
 import VueOfficePdf from '@vue-office/pdf'
+import { downloadFile } from '@/api/system-boot/file'
 const { push, options, currentRoute } = useRouter()
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 // const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1]
-
-const url = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
-console.log("🚀 ~ url:", url)
-const excelOptions = ref({
+const url = ref('')
+const excelOptions = ref({})
+if(VITE_FLAG){
+     url.value = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
+     excelOptions.value = ref({
         xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
     })
+}else{
+    //下载
+    
+}
+
 onMounted(() => {
     console.log()
 })

src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue

@@ -162,7 +162,7 @@
         <template v-if="listenerForm.event === 'timeout'">
           <el-form-item label="定时器类型" prop="eventDefinitionType" key="eventDefinitionType">
             <el-select v-model="listenerForm.eventDefinitionType">
-              <el-option label="日期" value="date" />
+              <el-option label="统计时间" value="date" />
               <el-option label="持续时长" value="duration" />
               <el-option label="循环" value="cycle" />
               <el-option label="无" value="null" />

src/components/cockpit/dataCleaning/index.vue

@@ -204,6 +204,7 @@ const tableStore: any = new TableStore({
 tableStore.table.params.deptId = dictData.state.area[0].id
 tableStore.table.params.alarmDayLimit = 5
 tableStore.table.params.warnDayLimit = 1
+tableStore.table.params.lineRunFlag = 0
 const echart = () => {
     percentage.value = {
         color: ['#FF9100'],
@@ -364,6 +365,7 @@ watch(
 )
 </script>
 <style lang="scss" scoped>
+     @import '@/assets/font/iconfont.css';
 .monitoringPoints {
     display: flex;
     .statistics {

src/components/cockpit/integrity/index.vue

@@ -31,7 +31,7 @@
                         <div class="divBox mt10">
                             <span class="iconfont icon-igw-f-warning-data" style="color: #ff6600"></span>
                             <span class="divBox_title">低于90%监测点数</span>
-                            <span class="divBox_num" style="color: #ff6600">
+                            <span class="divBox_num" style="color: #57bc6e">
                                 {{ monitoringPoints.abnormalNum }}
                             </span>
                         </div>
@@ -90,7 +90,7 @@
                             {{ o.citTotalNum }}
                         </span>
                         <!-- 低于90%监测点数 -->
-                        <span style="flex: 1; color: #ff9100" class="text">
+                        <span style="flex: 1; color: #388e3c" class="text">
                             {{ o.citBelowNum }}
                         </span>
                         <span
@@ -179,10 +179,17 @@ const tableStore: any = new TableStore({
         monitoringPoints.value.runNum = tableStore.table.data.totalNum
         monitoringPoints.value.abnormalNum = tableStore.table.data.belowNum
         monitoringPoints.value.totalOnlineRate = tableStore.table.data.totalOnlineRate - 0
-        abnormal.value = tableStore.table.data.citDetailList
+        abnormal.value = tableStore.table.data.citDetailList.filter((k: any) => {
+            if (tableStore.table.params.statisticalType.name == '终端厂家') {
+                return k.citTotalNum != 0
+            } else {
+                return k.citName != '上送国网' && k.citName != '非上送国网'
+            }
+        })
     }
 })
 tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.lineRunFlag = 0
 const echart = () => {
     percentage.value = {
         color: ['#FF9100'],
@@ -340,6 +347,7 @@ watch(
 )
 </script>
 <style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
 .monitoringPoints {
     display: flex;
     .statistics {

src/components/cockpit/onlineRate/index.vue

@@ -31,7 +31,7 @@
                         <div class="divBox mt10">
                             <span class="iconfont icon-igw-f-warning-data" style="color: #ff6600"></span>
                             <span class="divBox_title">低于90%终端数</span>
-                            <span class="divBox_num" style="color: #ff6600">
+                            <span class="divBox_num" style="color: #57bc6e">
                                 {{ monitoringPoints.abnormalNum }}
                             </span>
                         </div>
@@ -88,7 +88,7 @@
                             {{ o.citTotalNum }}
                         </span>
                         <!-- 低于90%终端数 -->
-                        <span style="flex: 1; color: #ff9100" class="text">
+                        <span style="flex: 1; color: #388e3c" class="text">
                             {{ o.citBelowNum }}
                         </span>
                         <span
@@ -177,10 +177,18 @@ const tableStore: any = new TableStore({
         monitoringPoints.value.runNum = tableStore.table.data.totalNum
         monitoringPoints.value.abnormalNum = tableStore.table.data.belowNum
         monitoringPoints.value.totalOnlineRate = tableStore.table.data.totalOnlineRate - 0
-        abnormal.value = tableStore.table.data.citDetailList
+        abnormal.value = tableStore.table.data.citDetailList.filter((k: any) => {
+            if (tableStore.table.params.statisticalType.name == '终端厂家') {
+                return k.citTotalNum != 0
+            } else {
+                return k.citName != '上送国网' && k.citName != '非上送国网'
+            }
+        })
+        
     }
 })
 tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.lineRunFlag = 0
 const echart = () => {
     percentage.value = {
         color: ['#FF9100'],
@@ -338,6 +346,7 @@ watch(
 )
 </script>
 <style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
 .monitoringPoints {
     display: flex;
     .statistics {

src/components/cockpit/terminalEvaluation/index.vue

@@ -18,24 +18,48 @@
         >
             <div style="flex: 1">
                 <div class="title">终端统计</div>
-                <div style="height: 135px" class="box1">
-                    <div class="boxDiv hexagon">
-                        <div style="color: #fff">{{ statisticsList.allNum }}</div>
-                        <div class="mt10 divBot">总数</div>
+                <div
+                    class="box1"
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 30px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div class="statistics">
+                        <div class="divBox div1">
+                            <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                            <span class="divBox_title">终端总数</span>
+                            <span class="divBox_num text-style" style="color: #57bc6e">
+                                {{ statisticsList.allNum }}
+                            </span>
                         </div>
-                    <div class="boxDiv hexagon hexagon1">
-                        <div style="color: #fff">{{ statisticsList.runNum }}</div>
-                        <div class="mt10 divBot">在运</div>
+                        <div class="divBox div2">
+                            <span class="iconfont icon-zaiyunshebei" style="color: #67c23a"></span>
+                            <span class="divBox_title">在运终端数</span>
+                            <span class="divBox_num text-style" style="color: #67c23a">
+                                {{ statisticsList.runNum }}
+                            </span>
                         </div>
                     </div>
-                <div style="height: 135px" class="box1">
-                    <div class="boxDiv hexagon hexagon2">
-                        <div style="color: #fff">{{ statisticsList.checkNum }}</div>
-                        <div class="mt10 divBot">调试</div>
+
+                    <div class="statistics">
+                        <div class="divBox div3">
+                            <span
+                                class="iconfont icon-yichanglei_14feizhinengbiaozaiyunyichang"
+                                style="color: #ffbf00"
+                            ></span>
+                            <span class="divBox_title">调试终端数</span>
+                            <span class="divBox_num text-style" style="color: #ffbf00">
+                                {{ statisticsList.checkNum }}
+                            </span>
+                        </div>
+                        <div class="divBox div4">
+                            <span class="iconfont icon-tingyunshijianguanli" style="color: #f56c6c"></span>
+                            <span class="divBox_title">停运终端数</span>
+                            <span class="divBox_num text-style" style="color: #f56c6c">
+                                {{ statisticsList.stopRunNum }}
+                            </span>
                         </div>
-                    <div class="boxDiv hexagon hexagon3">
-                        <div style="color: #fff">{{ statisticsList.stopRunNum }}</div>
-                        <div class="mt10 divBot">停运</div>
                     </div>
                 </div>
             </div>
@@ -65,7 +89,7 @@
                     <span style="width: 90px">终端总数</span>
                     <span style="flex: 1">完整性(%)</span>
                     <span style="flex: 1">在线率(%)</span>
-                    <span style="flex: 1">合格率(%)</span>
+                    <span style="flex: 1">异常率(%)</span>
                 </div>
                 <div
                     :style="{
@@ -84,7 +108,7 @@
                         </span>
                         <!--  -->
                         <sp
-                            style="flex: 1; color: #ff9100"
+                            style="flex: 1; color: #388e3c"
                             class="text"
                             :class="` ${o.integrity < 90 ? 'text-red' : ''}`"
                         >
@@ -99,7 +123,7 @@
                         </span>
                         <span
                             style="flex: 1; color: #388e3c"
-                            :class="` ${o.qualified < 90 ? 'text-red' : ''}`"
+                            :class="` ${o.qualified > 10 ? 'text-red' : ''}`"
                             class="text"
                         >
                             {{ o.qualified }}
@@ -205,11 +229,17 @@ const tableStore: any = new TableStore({
         statisticsList.value.checkNum = totalData.value.filter(item => item.runFlag === '调试').length
         statisticsList.value.stopRunNum = totalData.value.filter(item => item.runFlag === '停运').length
 
-        abnormal.value = tableStore.table.data
+        abnormal.value = tableStore.table.data.filter((k: any) => {
+            if (tableStore.table.params.statisticalType.name == '终端厂家') {
+                return k.count != 0
+            } else {
+                return k.name != '上送国网' && k.name != '非上送国网'
+            }
+        })
     }
 })
 tableStore.table.params.deptIndex = dictData.state.area[0].id
-
+tableStore.table.params.lineRunFlag = 0
 provide('tableStore', tableStore)
 
 onMounted(() => {
@@ -234,6 +264,7 @@ watch(
 )
 </script>
 <style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
 .monitoringPoints {
     display: flex;
 }
@@ -344,32 +375,7 @@ watch(
     color: #fff;
     border-radius: 8px;
 }
-.box1 {
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-    .boxDiv {
-        // flex: 1;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        position: relative;
-        margin: 0 5px;
 
-        div:nth-child(1) {
-            position: absolute;
-            font-size: 30px;
-            top: -10px;
-            font-weight: 700;
-        }
-        .divBot {
-            font-size: 16px;
-            position: absolute;
-            top: 20px;
-        }
-        color: #fff;
-    }
-}
 .hexagon {
     position: relative;
     width: 100px;
@@ -427,4 +433,44 @@ watch(
         border-top: 27.5px solid #a52a2a;
     }
 }
+.statistics {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    .divBox {
+        width: 100%;
+        height: 70px;
+        padding: 10px;
+        display: flex;
+        margin-bottom: 10px;
+        .iconfont {
+            font-size: 40px;
+            margin-right: 5px;
+        }
+        .divBox_title {
+            font-weight: 550;
+        }
+        .divBox_num {
+            font-size: 20px;
+            font-weight: 550;
+            margin-left: auto;
+            font-family: AlimamaDongFangDaKai;
+        }
+        align-items: center;
+        // text-align: center;
+        border-radius: 5px;
+    }
+    .div1 {
+        background-color: #eef8f0;
+    }
+    .div2 {
+        background-color: #67c23a24;
+    }
+    .div3 {
+        background-color: #ffbf0024;
+    }
+    .div4 {
+        background-color: #f56c6c24;
+    }
+}
 </style>

src/components/echarts/color.ts

@@ -1,4 +1,4 @@
-export let color = [
+export const color = [
     '#07CCCA',
     '#00BFF5',
     '#FFBF00',
@@ -8,7 +8,10 @@ export let color = [
     '#FF9100',
     '#5B6E96',
     '#66FFCC',
-    '#B3B'
+    '#B266FF',
+    '#FF6680',
+    '#40A0FF',
+    '#33CC99' 
 ]
 export const gradeColor3 = ['#339966', '#FFCC33', '#A52a2a']
 export const gradeColor5 = ['#00CC00', '#99CC99', '#FF9900', '#996600', '#A52a2a']

src/components/table/header/index.vue

@@ -11,7 +11,7 @@
             >
                 <el-form-item v-if="datePicker" style="grid-column: span 2; max-width: 630px">
                     <template #label>
-                        <el-checkbox v-if="showTimeAll" v-model="timeAll" label="时间" />
+                        <el-checkbox v-if="showTimeAll" v-model="timeAll" label="统计时间" />
                         <span v-else>{{ dateLabel }}</span>
                     </template>
                     <DatePicker
@@ -111,7 +111,7 @@ const props = withDefaults(defineProps<Props>(), {
     showReset: true,
     showExport: false,
     showTimeAll: false,
-    dateLabel: '时间'
+    dateLabel: '统计日期'
 })
 // 动态计算table高度
 const resizeObserver = new ResizeObserver(entries => {

src/components/tree/details/monitoringPointDetails.vue

@@ -0,0 +1,205 @@
+<template>
+    <el-dialog draggable v-model="dialogVisible" :title="title" width="1200px">
+        <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="监测点详情" name="tab1">
+                <el-descriptions :column="3" border label-width="150px">
+                    <el-descriptions-item  label="项目工程">
+                        {{ details.areaName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="项目单位">
+                        {{ details.gdName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="所属变电站">
+                        {{ details.bdName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="电压等级">
+                        {{ details.scale }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="终端厂家">
+                        {{ details.manufacturer }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="终端名称">
+                        {{ details.devName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="网络参数">
+                        {{ details.ip }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="监测点名称">
+                        {{ details.lineName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="监测点序号">
+                        {{ details.id }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="通讯状态">
+                        {{ details.comFlag }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="干扰源类型">
+                        {{ details.loadType }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="监测点对象名称">
+                        {{ details.objName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="接线方式">
+                        {{ details.ptType }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="PT变比">
+                        {{ details.pt }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="CT变比">
+                        {{ details.ct }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="基准容量(MVA)">
+                        {{ details.standardCapacity }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="最小短路容量(MVA)">
+                        {{ details.shortCapacity }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="供电设备容量(MVA)">
+                        {{ details.devCapacity }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="用户协议容量(MVA)">
+                        {{ details.dealCapacity }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-tab-pane>
+            <el-tab-pane label="监测点限值" name="tab2">
+                <el-descriptions :column="3"  border label-width="250px">
+                    <el-descriptions-item  label="电压偏差上限值(%)">
+                        {{ limitValue.voltageDev }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="电压偏差下限值(%)">
+                        {{ limitValue.uvoltageDev }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="频率偏差限值(Hz)">
+                        {{ limitValue.freqDev }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="三相电压不平衡度限值(%)">
+                        {{ limitValue.ubalance }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="负序电流限值(A)">
+                        {{ limitValue.ineg }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="长时闪变限值(%)">
+                        {{ limitValue.flicker }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="电压总畸变率限值(%)">
+                        {{ limitValue.uaberrance }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="奇次谐波电压含有率限值(%)">
+                        {{ limitValue.oddHarm }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="偶次谐波电压含有率限值(%)">
+                        {{ limitValue.evenHarm }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="3次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm3 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="4次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm4 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="5次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm5 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="6次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm6 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="7次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm7 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="8次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm8 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="9次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm9 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="10次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm10 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="11次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm11 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="12次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm12 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="13次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm13 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="14次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm14 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="15次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm15 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="16次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm16 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="17次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm17 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="18次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm18 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="19次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm19 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="20次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm20 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="21次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm21 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="22次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm22 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="23次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm23 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="24次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm24 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="25次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm25 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="0.5-1.5次间谐波电压含有率限值(%)">
+                        {{ limitValue.inUharm }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="2.5-15.5次谐波电压含有率限值(%)">
+                        {{ limitValue.inUharm16 }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-tab-pane>
+        </el-tabs>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { getLineOverLimitData, getLineDetailData } from '@/api/device-boot/line'
+const dialogVisible = ref(false)
+const title = ref('')
+const activeName = ref('tab1')
+const details: any = ref([])
+const limitValue: any = ref([])
+const open = (data: any) => {
+    details.value = []
+    limitValue.value = []
+    activeName.value = 'tab1'
+    title.value = data.name.replace(/（[^）]*）/g, '') + '_详情'
+
+    getLineDetailData(data.id).then(res => {
+        details.value = res.data
+        
+    })
+    getLineOverLimitData(data.id).then(res => {
+        limitValue.value = res.data
+    })
+
+    dialogVisible.value = true
+}
+const handleClick = (tab: any, event: Event) => {}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>

src/components/tree/details/substationDetails.vue

@@ -0,0 +1,34 @@
+<template>
+    <el-dialog draggable v-model="dialogVisible" :title="title" width="500px">
+        <el-descriptions class="margin-top" :column="1" border label-width="150px"> 
+            <el-descriptions-item  label="变电站名称">{{ list[0]?.srbName }}</el-descriptions-item>
+            <el-descriptions-item  label="电压等级">{{ list[0]?.scale }}</el-descriptions-item>
+            <el-descriptions-item  label="经度">{{ list[0]?.coordY }}</el-descriptions-item>
+            <el-descriptions-item  label="纬度">{{ list[0]?.coordX }}</el-descriptions-item>
+        </el-descriptions>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { getSubstationSelectLine } from '@/api/device-boot/line'
+const dialogVisible = ref(false)
+const title = ref('')
+const list: any = ref([])
+const open = (data: any) => {
+    list.value = []
+    title.value = data.name.replace(/（[^）]*）/g, '') + '_详情'
+
+    getSubstationSelectLine(data.id).then(res => {
+        list.value = res.data
+    })
+
+    dialogVisible.value = true
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>

src/components/tree/index.vue

@@ -1,32 +1,84 @@
 <template>
     <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
-        <Icon v-show="menuCollapse" @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-            :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 mt20 menu-collapse"
-            style="cursor: pointer" />
+        <Icon
+            v-show="menuCollapse"
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
             <div style="display: flex; align-items: center" class="mb10">
-                <el-input v-model="filterText" placeholder="请输入内容" clearable maxlength="10" show-word-limit @input="change">
+                <el-input
+                    v-model="filterText"
+                    placeholder="请输入内容"
+                    clearable
+                    maxlength="10"
+                    show-word-limit
+                    @input="change"
+                >
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
                 </el-input>
-                <Icon @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-                    :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 menu-collapse"
-                    style="cursor: pointer" v-if="props.canExpand" />
-                <el-button icon="el-icon-Plus" v-if="props.addTree" type="primary" class="ml10"
-                    @click="onAddTree">新增</el-button>
+                <Icon
+                    @click="onMenuCollapse"
+                    :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                    :class="menuCollapse ? 'unfold' : ''"
+                    size="18"
+                    class="fold ml10 menu-collapse"
+                    style="cursor: pointer"
+                    v-if="props.canExpand"
+                />
+                <el-button icon="el-icon-Plus" v-if="props.addTree" type="primary" class="ml10" @click="onAddTree">
+                    新增
+                </el-button>
             </div>
-            <el-tree style="flex: 1; overflow: auto" ref="treeRef" :props="defaultProps" highlight-current
-                :filter-node-method="filterNode" node-key="id" v-bind="$attrs">
+            <el-tree
+                style="flex: 1; overflow: auto"
+                ref="treeRef"
+                :props="defaultProps"
+                highlight-current
+                :filter-node-method="filterNode"
+                node-key="id"
+                v-bind="$attrs"
+            >
                 <template #default="{ node, data }">
                     <span class="custom-tree-node">
-                        <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                            v-if="data.icon" />
+                        <Icon
+                            :name="data.icon"
+                            style="font-size: 16px"
+                            :style="{ color: data.color }"
+                            v-if="data.icon"
+                        />
+
+                        <el-tooltip
+                            class="box-item"
+                            effect="customized"
+                            placement="bottom-start"
+                            :offset="0"
+                            v-if=" data.level == 6"
+                        >
+                            <template #content>
+                                <el-button type="primary" plain @click="viewDetails(data)">
+                                    {{ data.level == 3 ? '变电站详情' : '监测点详情' }}
+                                </el-button>
+                            </template>
                             <span style="margin-left: 4px">{{ node.label }}</span>
+                        </el-tooltip>
+                        <span v-else style="margin-left: 4px">{{ node.label }}</span>
                     </span>
                 </template>
             </el-tree>
         </div>
+        <!-- 变电站详情 -->
+           <SubstationDetails ref="SubstationRef"/>
+         <!-- 监测点详情 -->
+         <MonitoringPointDetails ref="MonitoringPointRef"/>
+        
+        
     </div>
 </template>
 
@@ -35,6 +87,9 @@ import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElTree } from 'element-plus'
 import { ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
+import MonitoringPointDetails from './details/monitoringPointDetails.vue'
+import SubstationDetails from './details/substationDetails.vue'
+
 defineOptions({
     name: 'govern/tree'
 })
@@ -52,19 +107,22 @@ const props = withDefaults(defineProps<Props>(), {
 })
 const { proxy } = useCurrentInstance()
 const menuCollapse = ref(false)
+const MonitoringPointRef = ref()
+const SubstationRef = ref()
 const filterText = ref('')
 const defaultProps = {
     label: 'name',
     value: 'id'
 }
-const specialCharsPattern = /[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g;
-const change=(val) => {
-
-
+const specialCharsPattern = /[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g
+const change = val => {
     if (specialCharsPattern.test(val)) {
         ElMessage.warning('禁止输入特殊字符!')
-        filterText.value = val.replace(/[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g, "")
-        console.log("🚀 ~ change ~ filterText.value:", filterText.value)
+        filterText.value = val.replace(
+            /[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g,
+            ''
+        )
+        console.log('🚀 ~ change ~ filterText.value:', filterText.value)
 
         treeRef.value!.filter(filterText.value)
     } else {
@@ -88,18 +146,30 @@ const onMenuCollapse = () => {
     menuCollapse.value = !menuCollapse.value
     proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
 }
+// 查看详情
+const viewDetails = (data: any) => {
+    console.log("🚀 ~ viewDetails ~ data:", data)
+    if (data.level == 3) {
+        // 变电站详情
+        // substationDetails
+        SubstationRef.value.open(data)
+    } else {
+        // 监测点详情 
+        MonitoringPointRef.value.open(data)
+    }
+
+    // proxy.eventBus.emit('viewDetails', data)
+}
 const filterNode = (value: string, data: any, node: any) => {
     if (!value) return true
     // return data.name.includes(value)
     if (data.name) {
-
         return chooseNode(value, data, node)
     }
 }
 
 // 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
 const chooseNode = (value: string, data: any, node: any) => {
-
     if (data.name.indexOf(value) !== -1) {
         return true
     }
@@ -160,3 +230,16 @@ defineExpose({ treeRef })
     align-items: center;
 }
 </style>
+<style>
+.el-popper.is-customized {
+    /* Set padding to ensure the height is 32px */
+    padding: 0;
+    background: var(--el-color-primary-light-3);
+}
+
+.el-popper.is-customized .el-popper__arrow::before {
+    background: var(--el-color-primary-light-3);
+    right: 0;
+    display: none;
+}
+</style>

src/styles/var.scss

@@ -10,7 +10,7 @@ $bg-color: () !default;
 $bg-color: map.merge(
     (
         '': #edf0f3,
-                        'overlay': #ffffff,
+        'overlay': #ffffff
     ),
     $bg-color
 );
@@ -19,7 +19,7 @@ $bg-color: map.merge(
 $border-color: () !default;
 $border-color: map.merge(
     (
-                        '': #f6f6f6,
+        '': #f6f6f6
     ),
     $border-color
 );
@@ -29,6 +29,8 @@ $border-color: map.merge(
     @include set-css-var-value('color-primary-light', $primary-light);
     @include set-component-css-var('bg-color', $bg-color);
     @include set-component-css-var('border-color', $border-color);
+    --vxe-ui-table-row-current-background-color: var(--el-color-primary-light-8);
+    --vxe-ui-table-row-hover-current-background-color: var(--el-color-primary-light-8);
     //   --vxe-table-row-current-background-color: var(--el-color-primary-light-7);
     //   --vxe-table-row-hover-background-color: var(--el-color-primary-light-9);
     //   --vxe-table-row-hover-current-background-color: var(--el-color-primary-light-7);

src/styles/vxeTable.css

@@ -75,3 +75,4 @@
 .default-theme .splitpanes--vertical > .splitpanes__splitter:before {
     background-color: #000 !important;
 }
+

src/utils/formatTime.ts

@@ -362,3 +362,4 @@ export function getTimeOfTheMonth(key: string): [string, string] {
             throw new Error('Invalid key')
     }
 }
+

src/views/LN/newEnergy/newEnergyAnalysis/index.vue

@@ -301,7 +301,7 @@ const options1 = [
 const height = mainHeight(20)
 const heightB = mainHeight(448)
 const heightA = mainHeight(180)
-const size = ref(0)
+const size = ref(23)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})
@@ -781,7 +781,7 @@ provide('tableStore', tableStore)
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
 })
 

src/views/LN/newEnergy/newEnergyAnalysis/test.vue

@@ -321,7 +321,7 @@ const options1 = [
 ]
 const height = mainHeight(20)
 const heightB = mainHeight(445)
-const size = ref(0)
+const size = ref(23)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})
@@ -797,7 +797,7 @@ provide('tableStore', tableStore)
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
 })
 

src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue

@@ -14,7 +14,7 @@
             <pane style="background: #fff">
                 <TableHeader :showSearch="false" v-show="props.rowList.id == undefined">
                     <template #select>
-                        <el-form-item label="时间">
+                        <el-form-item label="统计时间">
                             <DatePicker ref="datePickerRef"></DatePicker>
                         </el-form-item>
                     </template>
@@ -205,7 +205,7 @@ const props = defineProps(['rowList'])
 const harmonic = harmonicOptions.filter(item => item.value < 26)
 const currentLod = ref(false)
 const monitoringPoint = useMonitoringPoint()
-const size = ref(0)
+const size = ref(23)
 const dictData = useDictData()
 const datePickerRef = ref()
 const height = mainHeight(80).height

src/views/pqs/business/terminal/FrontManagement/index.vue

@@ -579,7 +579,7 @@ const addMenu = () => {}
 :deep(.default) {
     display: flex;
     .row--current {
-        background-color: var(--el-color-primary-light-8) !important;
+       // background-color: var(--el-color-primary-light-8) !important;
     }
 }
 .custom-tree-node {

src/views/pqs/business/terminal/ProgramManagement/index.vue

@@ -42,7 +42,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="筛选">
+                <el-form-item label="筛选数据">
                     <el-input
                         v-model="tableStore.table.params.filterName"
                         @keyup="searchEvent"

src/views/pqs/business/terminal/TerminalManagement/index.vue

@@ -38,7 +38,7 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="筛选">
+                <el-form-item label="筛选数据">
                     <el-input
                         v-model="tableStore.table.params.filterName"
                         @keyup="searchEvent"

src/views/pqs/business/terminal/deviceter/index.vue

@@ -54,14 +54,17 @@
                             </el-button>
                         </el-form-item>
                         <el-form-item style="right: 500px; position: absolute; overflow: hidden">
-                           <LocationInformation style="width: 16px; margin-right: 8px; color: var(--el-color-primary)" />
-                            <span style="font-size: 16px; font-weight: bold; color: var(--el-color-primary)">当前操作节点：</span>
+                            <LocationInformation
+                                style="width: 16px; margin-right: 8px; color: var(--el-color-primary)"
+                            />
+                            <span style="font-size: 16px; font-weight: bold; color: var(--el-color-primary)">
+                                当前操作节点：
+                            </span>
                         </el-form-item>
                         <el-form-item style="right: 0; position: absolute; overflow: hidden">
                             <div class="title" :class="titleList.length > 5 ? 'titleScroll' : ''">
                                 <span v-for="(item, index) in titleList">{{ index == 0 ? '' : ' >　' }}{{ item }}</span>
                             </div>
-                           
                         </el-form-item>
                     </el-form>
                     <div id="scrollBox" :style="{ height: Height.height }" style="overflow-y: auto">
@@ -1691,7 +1694,7 @@ import { useDictData } from '@/stores/dictData'
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getYwZtSubstation } from '@/api/device-boot/device'
-const size = ref(0)
+const size = ref(23)
 const TerminalRef = ref()
 const pageHeight = mainHeight(20)
 const Height = mainHeight(100)
@@ -2338,7 +2341,9 @@ const next = async () => {
                     break
                 case 600:
                     addLine()
-                     selectChanged(AddProjectBO.value.deviceParam[deviceIndex.value].subVoltageParam[busBarIndex.value].scale)
+                    selectChanged(
+                        AddProjectBO.value.deviceParam[deviceIndex.value].subVoltageParam[busBarIndex.value].scale
+                    )
                     nextfalg.value = false
                     break
                 case 700:
@@ -2356,7 +2361,6 @@ const black = () => {
     deviceIndex.value = '0'
     lineIndex.value = '0'
     nodeClick(nodeEventList.value, nodeDataList.value)
-    
 }
 // 确认提交
 const onsubmit = () => {
@@ -3073,7 +3077,7 @@ const setDown = () => {
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
     if (VITE_FLAG) {
         getYwZtSubstation({ orgId: '' }).then(res => {

src/views/pqs/cockpit/homePage/index.vue

@@ -2,7 +2,7 @@
     <div class="default-main">
         <TableHeader :showSearch="false" v-show="flag">
             <template v-slot:select>
-                <el-form-item label="日期">
+                <el-form-item label="统计时间">
                     <DatePicker
                         ref="datePickerRef"
                         :nextFlag="false"

src/views/pqs/cockpit/setUp/components/view.vue

@@ -6,7 +6,7 @@
         </div> -->
         <TableHeader :showSearch="false">
             <template v-slot:select>
-                <el-form-item label="日期">
+                <el-form-item label="统计时间">
                     <DatePicker ref="datePickerRef" :nextFlag="false" :theCurrentTime="true"></DatePicker>
                 </el-form-item>
             </template>

src/views/pqs/database/algorithm/index.vue

@@ -3,10 +3,15 @@
         <!-- 算法库 -->
         <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
             <pane :size="size">
-                <algorithmTree ref="treeRef" :default-expand-all="false"
+                <algorithmTree
+                    ref="treeRef"
+                    :default-expand-all="false"
                     :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
-                    :current-node-key="monitoringPoint.state.lineId" @node-click="handleNodeClick"
-                    @init="handleNodeClick" @onAddTree="onAddTree"></algorithmTree>
+                    :current-node-key="monitoringPoint.state.lineId"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                    @onAddTree="onAddTree"
+                ></algorithmTree>
             </pane>
             <pane style="background: #fff" :style="height">
                 <div class="boxTop">
@@ -16,9 +21,7 @@
                         </el-radio-group>
                     </div>
                     <div v-if="information">
-                        <el-button icon="el-icon-Plus" type="primary" @click="addUser">
-                            新增
-                        </el-button>
+                        <el-button icon="el-icon-Plus" type="primary" @click="addUser">新增</el-button>
                         <el-button icon="el-icon-Edit" type="primary" @click="revise">修改</el-button>
                         <el-button icon="el-icon-Delete" type="primary" @click="deletes">删除</el-button>
                     </div>
@@ -55,10 +58,8 @@
                         </vxe-column> -->
                         <vxe-column field="definition" title="定义">
                             <template #default="{ row }">
-
                                 <el-button type="primary" link @click="view(row)">查看</el-button>
                             </template>
-
                         </vxe-column>
                         <!-- <vxe-column title="操作" width="150px">
                             <template #default="{ row }">
@@ -78,19 +79,28 @@
         <!-- 树弹框 -->
         <addTree ref="addTreeRef" @getTree="treeRef.loadData(dotList.id)" />
         <!-- 弹框 -->
-        <PopupEdit ref="popupEditRef" v-if="popupEditFlag"
-            @getTree="treeRef.loadData(dotList.id), (popupEditFlag = false)" />
+        <PopupEdit
+            ref="popupEditRef"
+            v-if="popupEditFlag"
+            @getTree="treeRef.loadData(dotList.id), (popupEditFlag = false)"
+        />
         <!-- 定义 -->
         <el-dialog draggable v-model="viewFlag" title="定义" width="60%">
-            <div style="min-height: 300px; max-height: 55vh;">
+            <div style="min-height: 300px; max-height: 55vh">
                 <div class="editor" ref="editorRef" v-html="summary" />
-
             </div>
         </el-dialog>
         <!-- 删除 -->
         <el-dialog draggable v-model="dialogVisible" title="请选择需要删除的数据" width="400">
-            <el-tree-select v-model="TreeValue" :data="TreeData" filterable check-strictly :props="defaultProps"
-                default-expand-all :render-after-expand="false" />
+            <el-tree-select
+                v-model="TreeValue"
+                :data="TreeData"
+                filterable
+                check-strictly
+                :props="defaultProps"
+                default-expand-all
+                :render-after-expand="false"
+            />
             <template #footer>
                 <div class="dialog-footer">
                     <el-button @click="dialogVisible = false">取消</el-button>
@@ -115,8 +125,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { deleteyById } from '@/api/supervision-boot/database/index'
 import { queryAllAlgorithmLibrary, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
 import { useAdminInfo } from '@/stores/adminInfo'
-import katex from "katex";
-import "katex/dist/katex.css";
+import katex from 'katex'
+import 'katex/dist/katex.css'
 const adminInfo = useAdminInfo()
 defineOptions({
     name: 'database/algorithm'
@@ -124,7 +134,7 @@ defineOptions({
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
 const heightTab = mainHeight(82)
-const size = ref(0)
+const size = ref(23)
 const addTreeRef = ref()
 const editorRef = ref()
 const dialogVisible = ref(false)
@@ -207,37 +217,32 @@ const revise = () => {
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
     // tableStore.index()
 })
 
 const view = (row: any) => {
-
     viewFlag.value = true
     summary.value = row.definition
     setTimeout(() => {
-
-        const spans = document.querySelectorAll('span[data-value]');
+        const spans = document.querySelectorAll('span[data-value]')
         // 遍历每个 span 标签
         spans.forEach(function (span) {
-
             let val = katex.renderToString(span.getAttribute('data-value'), {
-                throwOnError: false,
+                throwOnError: false
             })
             // var newDiv = document.createElement('div');
             var newDiv = span
-            newDiv.innerHTML = val;
-
-            span.parentNode.replaceChild(newDiv, span);
-        });
+            newDiv.innerHTML = val
 
+            span.parentNode.replaceChild(newDiv, span)
+        })
     }, 100)
 
     //
 }
 
-
 const handleNodeClick = (data: any, node: any) => {
     if (data.pid != '0') {
         dotList.value = data

src/views/pqs/database/case/components/drawer.vue

@@ -52,12 +52,18 @@ const num = ref(0)
 const url = ref('')
 const excelOptions = ref({})
 const information = adminInfo.roleCode.includes('information_info')
+
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const open = (row: any) => {
     // console.log('🚀 ~ open ~ row:', row)
     // url.value = row
     drawer.value = true
+    if(VITE_FLAG){
         url.value = `/api-docx/excelreport` + row
         excelOptions.value = { xls: row.split('.')[1] == 'xls' ? true : false }
+    }else{
+        
+    }
     // getFileNameAndFilePath({ filePath: row }).then(res => {
     //     url.value = res.data.url
     // })

src/views/pqs/database/model/components/harmonicImpedance.vue

@@ -1,6 +1,6 @@
 
 <template>
-    <div class="default-main">
+    <div >
         <TableHeader ref="TableHeaderRef">
             <template v-slot:select>
                <el-form-item label="名称">
@@ -26,6 +26,7 @@ const tableStore = new TableStore({
     url: '/supervision-boot/libModel/pageLibModelQuery',
     method: 'POST',
     showPage: true, // 确保启用分页
+        publicHeight: 60,
     column: [
         {
             title: '典型设备',

src/views/pqs/database/model/components/harmonicSources.vue

@@ -1,13 +1,17 @@
 <template>
-    <div class="default-main">
+    <div>
         <TableHeader>
             <template v-slot:select>
                 <el-form-item label="名称">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable
-                        placeholder="请输入搜索名称" maxlength="32" show-word-limit/>
+                    <el-input
+                        v-model="tableStore.table.params.searchValue"
+                        clearable
+                        placeholder="请输入搜索名称"
+                        maxlength="32"
+                        show-word-limit
+                    />
                 </el-form-item>
             </template>
-
         </TableHeader>
         <Table ref="tableRef" isGroup />
     </div>
@@ -23,6 +27,7 @@ const tableRef = ref()
 const tableStore = new TableStore({
     url: '/supervision-boot/libModel/pageLibModelQuery',
     method: 'POST',
+    publicHeight: 60,
     column: [
         {
             title: '谐波源',
@@ -32,7 +37,9 @@ const tableStore = new TableStore({
                     title: '序号',
                     width: '80',
                     formatter: (row: any) => {
-                        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+                        return (
+                            (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+                        )
                     }
                 },
                 { field: 'name', title: '名称', minWidth: 200 },
@@ -56,7 +63,7 @@ const tableStore = new TableStore({
     },
     resetCallback: () => {
         tableStore.table.params.searchValue = ''
-    },
+    }
 })
 
 tableStore.table.params.type = 1
@@ -70,5 +77,4 @@ const queryData = () => {
 defineExpose({
     queryData
 })
-
 </script>

src/views/pqs/database/standard/index.vue

@@ -63,7 +63,7 @@ defineOptions({
 const excelOptions = ref({})
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
-const size = ref(0)
+const size = ref(23)
 const treeRef = ref()
 const addTreeRef = ref()
 const url = ref('')
@@ -73,10 +73,12 @@ const information = adminInfo.roleCode.includes('information_info')
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
 })
 
+
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const handleNodeClick = (data: any, node: any) => {
     console.log("🚀 ~ handleNodeClick ~ data:", data)
     dotList.value = data
@@ -86,8 +88,13 @@ const handleNodeClick = (data: any, node: any) => {
         flag.value = true
 
         setTimeout(() => {
+             if(VITE_FLAG){
                    url.value = `/api-docx/excelreport` + data.url
                    excelOptions.value = { xls: data.url.split('.')[1] == 'xls' ? true : false }
+             }else{
+                   
+             }
+         
             // getFileNameAndFilePath({ filePath: data.url }).then(res => {
             //     url.value = res.data.url
             // })

src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue

@@ -3,7 +3,7 @@
         <div v-show="view">
             <TableHeader datePicker area showExport>
                 <template #select>
-                    <el-form-item label="筛选">
+                    <el-form-item label="筛选数据">
                         <el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" />
                     </el-form-item>
                     <el-form-item label="统计类型:">

src/views/pqs/harmonicMonitoring/detailed/division/components/compute.vue

@@ -194,7 +194,7 @@ const dotList: any = ref({})
 const height = mainHeight(20)
 const heightB = mainHeight(70)
 const harmonic = harmonicOptions.slice(1)
-const size = ref(0)
+const size = ref(23)
 const showTabs = ref(false)
 const loadDataOptions: any = ref([])
 const form: any = reactive({
@@ -571,7 +571,7 @@ const group = (chart: any, myChartDom: any) => {
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
     userDataList({
         pageNum: 1,

src/views/pqs/harmonicMonitoring/detailed/pollutionReport/MonitoringPointTab.vue

@@ -32,7 +32,7 @@
             <el-option label="非电网侧" value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="筛选">
+        <el-form-item label="筛选数据">
           <el-input 
             v-model="searchKeyword" 
             placeholder="请输入变电站/终端/监测点"
@@ -63,21 +63,21 @@
         <vxe-column field="gdName" title="供电公司" align="center" min-width="120" ></vxe-column>
         <vxe-column field="subStationName" :show-overflow="true" title="变电站" align="center" min-width="150"></vxe-column>
         <vxe-column field="devName" title="终端名称" align="center" min-width="120"></vxe-column>
-        <vxe-column field="devType" title="终端型号" align="center" min-width="150"></vxe-column>
-        <vxe-column field="loginTime" title="投运时间" align="center" min-width="120"></vxe-column>
+        <!-- <vxe-column field="devType" title="终端型号" align="center" min-width="150"></vxe-column> -->
+        <!-- <vxe-column field="loginTime" title="投运时间" align="center" min-width="120"></vxe-column> -->
         <vxe-column field="lineName" title="监测点名称" align="center" min-width="150" :formatter="formatMonitorId"></vxe-column>
-        <vxe-column field="powerFlag" title="监测位置" align="center" min-width="100"></vxe-column>
-        <vxe-column field="lineVoltage" title="监测点电压等级" align="center" min-width="120"></vxe-column>
-        <vxe-column field="loadType" title="干扰源类型" align="center" min-width="120"></vxe-column>
-        <vxe-column field="objName" title="监测对象名称" align="center" min-width="150" :formatter="formatMonitorId"></vxe-column>
-        <vxe-column field="interval" title="统计间隔" align="center" min-width="100" :formatter="formatMonitorId"></vxe-column>
-        <vxe-column field="onlineRate" title="在线率(%)" align="center" min-width="100"></vxe-column>
-        <vxe-column field="integrity" title="完整率(%)" align="center" min-width="100"></vxe-column>
+        <!-- <vxe-column field="powerFlag" title="监测位置" align="center" min-width="100"></vxe-column> -->
+        <!-- <vxe-column field="lineVoltage" title="监测点电压等级" align="center" min-width="120"></vxe-column> -->
+        <!-- <vxe-column field="loadType" title="干扰源类型" align="center" min-width="120"></vxe-column> -->
+        <!-- <vxe-column field="objName" title="监测对象名称" align="center" min-width="150" :formatter="formatMonitorId"></vxe-column> -->
+        <!-- <vxe-column field="interval" title="统计间隔" align="center" min-width="100" :formatter="formatMonitorId"></vxe-column> -->
+        <!-- <vxe-column field="onlineRate" title="在线率(%)" align="center" min-width="100"></vxe-column> -->
+        <!-- <vxe-column field="integrity" title="完整率(%)" align="center" min-width="100"></vxe-column> -->
         <vxe-column field="harmonicValue" :title="harmonicValueTitle" align="center" min-width="120"></vxe-column>
-        <vxe-column field="upCounts" title="暂升次数(次)" align="center" min-width="100"></vxe-column>
-        <vxe-column field="downCounts" title="电压暂降(次)" align="center" min-width="100"></vxe-column>
-        <vxe-column field="breakCounts" title="短时中断(次)" align="center" min-width="100"></vxe-column>
-        <vxe-column field="monitorId" title="一类监测点" align="center" min-width="120" :formatter="formatMonitorId"></vxe-column>
+        <!-- <vxe-column field="upCounts" title="暂升次数(次)" align="center" min-width="100"></vxe-column> -->
+        <!-- <vxe-column field="downCounts" title="电压暂降(次)" align="center" min-width="100"></vxe-column> -->
+        <!-- <vxe-column field="breakCounts" title="短时中断(次)" align="center" min-width="100"></vxe-column> -->
+        <!-- <vxe-column field="monitorId" title="一类监测点" align="center" min-width="120" :formatter="formatMonitorId"></vxe-column> -->
       </vxe-table>
     </div>
     

src/views/pqs/harmonicMonitoring/detailed/pollutionReport/SubstationTab.vue

@@ -32,7 +32,7 @@
             <el-option label="非电网侧" value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="筛选">
+        <el-form-item label="筛选数据">
           <el-input 
             v-model="searchKeyword" 
             placeholder="请输入变电站"
@@ -86,9 +86,10 @@
     </div>
 
      <!-- 添加弹窗 -->
-    <el-dialog 
+    <el-dialog  draggable
       v-model="detailDialogVisible" 
       :title="detailDialogTitle" 
+      width="1000px"
      
     >
       <div v-loading="detailLoading">
@@ -99,6 +100,7 @@
           ref="detailTableRef"
           :data="detailData"
           auto-resize
+          v-bind="defaultAttribute"
           resizable
           show-overflow
           height="400px"
@@ -123,6 +125,7 @@
 
 import { ref, onMounted, provide, onBeforeUnmount, computed, watch } from 'vue'
 import TableStore from '@/utils/tableStore'
+
 import TableHeader from '@/components/table/header/index.vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { useDictData } from '@/stores/dictData'

src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue

@@ -109,7 +109,7 @@ const tableStore = new TableStore({
         { field: 'name', title: '电网拓扑', minWidth: '150' },
         {
             field: 'onlineMonitorNumber',
-            title: '在线监测点数量(个)',
+            title: '在运监测点数(个)',
             minWidth: '100px',
             formatter: (row: any) => {
                 return row.cellValue == -1 ? '/' : row.cellValue

src/views/pqs/harmonicMonitoring/embed/dataOverview_JB/index.vue

@@ -2,7 +2,7 @@
     <div class="default-main">
         <TableHeader :showSearch="false" v-show="flag">
             <template v-slot:select>
-                <el-form-item label="日期">
+                <el-form-item label="统计时间">
                     <DatePicker
                         ref="datePickerRef"
                         :nextFlag="false"

src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue

@@ -1,7 +1,7 @@
 <template>
     <TableHeader area datePicker ref="TableHeaderRef">
         <template #select>
-            <el-form-item label="筛选">
+            <el-form-item label="筛选数据">
                 <el-input
                     v-model="tableStore.table.params.filterName"
                     @keyup="searchEvent"

src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue

@@ -1,7 +1,7 @@
 <template>
     <TableHeader area datePicker ref="TableHeaderRef">
         <template #select>
-            <el-form-item label="筛选">
+            <el-form-item label="筛选数据">
                 <el-input
                     v-model="tableStore.table.params.filterName"
                     @keyup="searchEvent"

src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker ref="TableHeaderRef" :dateLabel="`数据统计时间`">
+        <TableHeader date-picker ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="运行状态">
                     <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
@@ -12,8 +12,8 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="筛选">
-                    <el-input v-model="tableStore.table.params.filterName" placeholder="输入关键字筛选" />
+                <el-form-item label="筛选数据">
+                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入监测点名称" />
                 </el-form-item>
             </template>
 
@@ -47,7 +47,7 @@
                                 <span class="divBox_title">低于90%监测点数</span>
                                 <span
                                     class="divBox_num text-style"
-                                    style="color: #ff6600"
+                                    style="color: #57bc6e"
                                     @click="totalTable(90, '低于90%监测点_')"
                                 >
                                     {{ monitoringPoints.abnormalNum }}
@@ -56,7 +56,9 @@
                         </div>
                         <div class="echartTitle">
                             <div>总的数据完整性</div>
-                            <div>{{ monitoringPoints.totalOnlineRate }}%</div>
+                            <div>
+                                {{ monitoringPoints.totalOnlineRate > 100 ? 100 : monitoringPoints.totalOnlineRate }}%
+                            </div>
                         </div>
                         <div style="height: 30px">
                             <MyEchart :options="percentage"></MyEchart>
@@ -115,7 +117,7 @@
                             </span>
                             <!-- 低于90%监测点数 -->
                             <span
-                                style="flex: 1; color: #ff9100"
+                                style="flex: 1; color: #388e3c"
                                 class="text text-style"
                                 @click="renderTable(o.detailList, 90, o.citName + '_低于90%监测点_')"
                             >
@@ -160,13 +162,18 @@
                                 </span>
                             </template>
                         </vxe-column>
-                        <vxe-column field="cit" title="所在地市" width="110px"></vxe-column>
-                        <vxe-column field="company" title="供电公司"></vxe-column>
-                        <vxe-column field="subStation" title="变电站"></vxe-column>
-                        <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
-                        <vxe-column field="deviceName" title="终端名称"></vxe-column>
+                        <vxe-column field="cit" title="所在地市" minWidth="110px"></vxe-column>
+                        <vxe-column field="company" title="供电公司" minWidth="110px"></vxe-column>
+                        <vxe-column field="subStation" title="变电站" minWidth="110px"></vxe-column>
+                        <vxe-column field="manufacturer" title="终端厂家" minWidth="110px"></vxe-column>
+                        <vxe-column field="deviceName" title="终端名称" minWidth="110px"></vxe-column>
                         <vxe-column field="ip" title="终端IP" :formatter="formatter" width="130px"></vxe-column>
-                        <vxe-column field="lineName" title="监测点名称" :formatter="formatter"></vxe-column>
+                        <vxe-column
+                            field="lineName"
+                            title="监测点名称"
+                            :formatter="formatter"
+                            minWidth="110px"
+                        ></vxe-column>
                         <vxe-column field="runFlag" title="运行状态" width="90px">
                             <template #default="{ row }">
                                 <el-tag
@@ -267,7 +274,13 @@ const tableStore = new TableStore({
         monitoringPoints.value.runNum = tableStore.table.data.totalNum
         monitoringPoints.value.abnormalNum = tableStore.table.data.belowNum
         monitoringPoints.value.totalOnlineRate = tableStore.table.data.totalOnlineRate - 0
-        abnormal.value = tableStore.table.data.citDetailList
+        abnormal.value = tableStore.table.data.citDetailList.filter((k: any) => {
+            if (tableStore.table.params.statisticalType.name == '终端厂家') {
+                return k.citTotalNum != 0
+            } else {
+                return k.citName != '上送国网' && k.citName != '非上送国网'
+            }
+        })
         // 合并子集数据 并去重
         totalData.value = Array.from(
             tableStore.table.data.citDetailList
@@ -348,7 +361,13 @@ const echart = () => {
                     name: '异常占比',
                     type: 'bar',
                     barWidth: 13,
-                    data: [monitoringPoints.value.totalOnlineRate == 0 ? '' : monitoringPoints.value.totalOnlineRate],
+                    data: [
+                        monitoringPoints.value.totalOnlineRate == 0
+                            ? ''
+                            : monitoringPoints.value.totalOnlineRate > 100
+                            ? 100
+                            : monitoringPoints.value.totalOnlineRate
+                    ],
                     z: 0,
                     zlevel: 0,
                     itemStyle: {
@@ -413,7 +432,8 @@ const echart = () => {
     }
 }
 tableStore.table.params.deptIndex = dictData.state.area[0].id
-tableStore.table.params.lineRunFlag = ''
+tableStore.table.params.lineRunFlag = 0
+tableStore.table.params.searchValue = ''
 
 const formatter = (row: any) => {
     return row.cellValue || '/'
@@ -474,6 +494,7 @@ tableStore.table.params.name = ''
 provide('tableStore', tableStore)
 </script>
 <style lang="scss" scoped>
+@import '@/assets/font/iconfont.css';
 .card-list {
     display: flex;
     .monitoringPoints {

src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue

@@ -1,7 +1,7 @@
 <template>
     <TableHeader area datePicker ref="TableHeaderRef">
         <template #select>
-            <el-form-item label="筛选">
+            <el-form-item label="筛选数据">
                 <el-input v-model="tableStore.table.params.filterName" @keyup="searchEvent" placeholder="输入关键字筛选" />
             </el-form-item>
             <el-form-item label="统计类型:">

src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker ref="TableHeaderRef" :dateLabel="`数据统计时间`">
+        <TableHeader date-picker ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="运行状态">
                     <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
@@ -12,8 +12,8 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="筛选">
-                    <el-input v-model="tableStore.table.params.filterName" placeholder="输入关键字筛选" />
+                <el-form-item label="筛选数据">
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入终端名称" />
                 </el-form-item>
             </template>
 
@@ -34,7 +34,11 @@
                             <div class="divBox">
                                 <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
                                 <span class="divBox_title">终端总数</span>
-                                <span class="divBox_num text-style" style="color: #57bc6e" @click="totalTable(100001, '')">
+                                <span
+                                    class="divBox_num text-style"
+                                    style="color: #57bc6e"
+                                    @click="totalTable(100001, '')"
+                                >
                                     {{ monitoringPoints.runNum }}
                                 </span>
                             </div>
@@ -43,7 +47,7 @@
                                 <span class="divBox_title">低于90%终端数</span>
                                 <span
                                     class="divBox_num text-style"
-                                    style="color: #ff6600"
+                                    style="color: #57bc6e"
                                     @click="totalTable(90, '低于90%终端_')"
                                 >
                                     {{ monitoringPoints.abnormalNum }}
@@ -111,7 +115,7 @@
                             </span>
                             <!-- 低于90%终端数 -->
                             <span
-                                style="flex: 1; color: #ff9100"
+                                style="flex: 1; color: #388e3c"
                                 class="text text-style"
                                 @click="renderTable(o.detailList, 90, o.citName + '_低于90%终端_')"
                             >
@@ -157,10 +161,10 @@
                             </template>
                         </vxe-column>
                         <vxe-column field="cit" title="所在地市" width="110px"></vxe-column>
-                        <vxe-column field="company" title="供电公司"></vxe-column>
-                        <vxe-column field="subStation" title="变电站"></vxe-column>
-                        <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
-                        <vxe-column field="deviceName" title="终端名称"></vxe-column>
+                        <vxe-column field="company" title="供电公司" minWidth="110px"></vxe-column>
+                        <vxe-column field="subStation" title="变电站" minWidth="110px"></vxe-column>
+                        <vxe-column field="manufacturer" title="终端厂家" minWidth="110px"></vxe-column>
+                        <vxe-column field="deviceName" title="终端名称" minWidth="110px"></vxe-column>
                         <vxe-column field="ip" title="终端IP" :formatter="formatter" width="130px"></vxe-column>
                         <vxe-column field="runFlag" title="运行状态" width="90px">
                             <template #default="{ row }">
@@ -200,6 +204,7 @@
 </template>
 
 <script setup lang="ts">
+// import '@/assets/font/iconfont.css'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
@@ -262,10 +267,19 @@ const tableStore = new TableStore({
         monitoringPoints.value.runNum = tableStore.table.data.totalNum
         monitoringPoints.value.abnormalNum = tableStore.table.data.belowNum
         monitoringPoints.value.totalOnlineRate = tableStore.table.data.totalOnlineRate - 0
-        abnormal.value = tableStore.table.data.citDetailList
+        abnormal.value = tableStore.table.data.citDetailList.filter((k: any) => {
+            if (tableStore.table.params.statisticalType.name == '终端厂家') {
+                return k.citTotalNum != 0
+            } else {
+                return k.citName != '上送国网' && k.citName != '非上送国网'
+            }
+        })
+        console.log(123, tableStore.table.params.statisticalType.name)
+
         // 合并子集数据 并去重
         totalData.value = Array.from(
             tableStore.table.data.citDetailList
+
                 .map((item: any) => item.detailList)
                 .flat()
                 .reduce((map: any, item: any) => {
@@ -409,7 +423,8 @@ const echart = () => {
     }
 }
 tableStore.table.params.deptIndex = dictData.state.area[0].id
-tableStore.table.params.lineRunFlag = ''
+tableStore.table.params.lineRunFlag = 0
+tableStore.table.params.searchValue = ''
 
 const formatter = (row: any) => {
     return row.cellValue || '/'
@@ -470,6 +485,7 @@ tableStore.table.params.name = ''
 provide('tableStore', tableStore)
 </script>
 <style lang="scss" scoped>
+@import '@/assets/font/iconfont.css';
 .card-list {
     display: flex;
     .monitoringPoints {

src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue

@@ -4,7 +4,7 @@
             <el-form-item label="多监测点">
                 <el-checkbox v-model="checked" @change="checkChange" />
             </el-form-item>
-            <el-form-item label="日期">
+            <el-form-item label="统计时间">
                 <DatePicker ref="datePickerRef" ></DatePicker>
             </el-form-item>
             <el-form-item label="指标类型:">

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

@@ -83,14 +83,14 @@ defineOptions({
 
 const monitoringPoint = useMonitoringPoint()
 const pointTree = ref()
-const size = ref(0)
+const size = ref(23)
 const isReload = ref(false)
 const height = mainHeight(40)
 const activeName = ref('2')
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
 })
 const handleNodeClick = (data: any, node: any) => {

src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue

@@ -1,6 +1,5 @@
 <template>
     <div class="" :style="height">
-
         <TableHeader ref="TableHeaderRef" datePicker @selectChange="selectChange">
             <template v-slot:select>
                 <el-form-item label="模板策略">
@@ -40,7 +39,6 @@
         <div class="box">
             <div id="luckysheet" :style="`height: calc(${tableStore.table.height} )`"></div>
         </div>
-        
     </div>
 </template>
 <script setup lang="ts">
@@ -63,7 +61,7 @@ defineOptions({
 const monitoringPoint = useMonitoringPoint()
 const showTree = ref(false)
 const height = mainHeight(20)
-const size = ref(0)
+const size = ref(23)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
@@ -109,7 +107,7 @@ provide('tableStore', tableStore)
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
 })
 getTemplateByDept({ id: dictData.state.area[0].id })
@@ -135,13 +133,10 @@ const selectChange = () => {
     }
 }
 
-
-
 const exportEvent = () => {
     exportExcel(luckysheet.getAllSheets(), '统计报表下载')
 }
 const exportReport = () => {
-  
     loading.value = true
     let form = new FormData()
     form.append('isUrl', false)

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue

@@ -6,7 +6,7 @@
                     <el-form-item label="多监测点">
                         <el-checkbox v-model="checked" @change="checkChange" />
                     </el-form-item>
-                    <el-form-item label="日期">
+                    <el-form-item label="统计时间">
                         <DatePicker ref="datePickerRef" :theCurrentTime="true"></DatePicker>
                     </el-form-item>
                     <el-form-item label="指标类型:">

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index1.vue

@@ -4,7 +4,7 @@
             <el-form-item label="多监测点">
                 <el-checkbox v-model="checked" @change="checkChange" />
             </el-form-item>
-            <el-form-item label="日期">
+            <el-form-item label="统计时间">
                 <DatePicker ref="datePickerRef"></DatePicker>
             </el-form-item>
             <el-form-item label="指标类型:">

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue

@@ -2,7 +2,7 @@
     <div style="display: flex; flex-direction: column; height: 100%">
         <TableHeader ref="TableHeaderRef" :showSearch="false">
             <template v-slot:select>
-                <el-form-item label="日期">
+                <el-form-item label="统计时间">
                     <DatePicker ref="datePickerRef"></DatePicker>
                 </el-form-item>
                 <el-form-item label="对比">

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizonghepinggu/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div style="display: flex; flex-direction: column; height: 100%">
         <el-form :inline="true">
-            <el-form-item label="日期">
+            <el-form-item label="统计时间">
                 <DatePicker ref="datePickerRef"></DatePicker>
             </el-form-item>
             <el-form-item>

src/views/pqs/harmonicMonitoring/monitoringPoint/online/xiebopingpu/index.vue

@@ -2,7 +2,7 @@
     <div style="display: flex; flex-direction: column; height: 100%">
         <TableHeader ref="TableHeaderRef" :showSearch="false">
             <template v-slot:select>
-                <el-form-item label="日期">
+                <el-form-item label="统计时间">
                     <DatePicker ref="datePickerRef"></DatePicker>
                 </el-form-item>
                 <el-form-item label="指标">

src/views/pqs/harmonicMonitoring/monitoringPoint/online/yunxingzhuangtai/index.vue

@@ -2,7 +2,7 @@
     <div style="display: flex; flex-direction: column; height: 100%">
         <TableHeader ref="TableHeaderRef" :showSearch="false">
             <template v-slot:select>
-                <el-form-item label="日期">
+                <el-form-item label="统计时间">
                     <DatePicker ref="datePickerRef"></DatePicker>
                 </el-form-item>
                 <el-form-item label="对比">

src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue

@@ -71,7 +71,7 @@ defineOptions({
 })
 const showTree = ref(false)
 const height = mainHeight(20)
-const size = ref(0)
+const size = ref(23)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
@@ -129,7 +129,7 @@ provide('tableStore', tableStore)
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
 })
 getTemplateByDept({ id: dictData.state.area[0].id })
@@ -165,7 +165,6 @@ const exportEvent = () => {
     exportExcel(luckysheet.getAllSheets(), '统计报表下载')
 }
 const exportReport = () => {
-  
     loading.value = true
     let form = new FormData()
     form.append('isUrl', false)

src/views/pqs/harmonicMonitoring/reportForms/word/index.vue

@@ -1,36 +1,58 @@
 <template>
-    <div class='default-main' :style='height'>
-        <splitpanes style='height: 100%' class='default-theme' id='navigation-splitpanes'>
-            <pane :size='size'>
-                <PointTree :default-expand-all='false' @node-click='handleNodeClick' @init='handleNodeClick'>
-                </PointTree>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <PointTree
+                    :default-expand-all="false"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></PointTree>
             </pane>
-            <pane style='background: #fff' :style='height'>
-                <TableHeader ref='TableHeaderRef' datePicker :show-search='false'>
+            <pane style="background: #fff" :style="height">
+                <TableHeader ref="TableHeaderRef" datePicker :show-search="false">
                     <template v-slot:select>
-                        <el-form-item label='客户名称'>
-                            <el-input v-model='tableStore.table.params.crmName' maxlength='32' show-word-limit clearable
-                                      placeholder='请输入客户名称' />
+                        <el-form-item label="客户名称">
+                            <el-input
+                                v-model="tableStore.table.params.crmName"
+                                maxlength="32"
+                                show-word-limit
+                                clearable
+                                placeholder="请输入客户名称"
+                            />
                         </el-form-item>
-                        <el-form-item label='报表编号'>
-                            <el-input v-model='tableStore.table.params.reportNumber' clearable
-                                      placeholder='请输入报表编号' maxlength='12' show-word-limit />
+                        <el-form-item label="报表编号">
+                            <el-input
+                                v-model="tableStore.table.params.reportNumber"
+                                clearable
+                                placeholder="请输入报表编号"
+                                maxlength="12"
+                                show-word-limit
+                            />
                         </el-form-item>
                     </template>
                     <template #operation>
-                        <el-upload :show-file-list='false' ref='uploadRef' action='' accept='.png,.jpg'
-                                   :on-change='choose' :auto-upload='false'>
+                        <el-upload
+                            :show-file-list="false"
+                            ref="uploadRef"
+                            action=""
+                            accept=".png,.jpg"
+                            :on-change="choose"
+                            :auto-upload="false"
+                        >
                             <template #trigger>
-                                <el-button icon='el-icon-Upload' type='primary' class='mr10 ml10'>上传接线图</el-button>
+                                <el-button icon="el-icon-Upload" type="primary" class="mr10 ml10">上传接线图</el-button>
                             </template>
                         </el-upload>
-                        <el-button icon='el-icon-Download' type='primary' @click='exportEvent'>生成</el-button>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">生成</el-button>
                     </template>
                 </TableHeader>
-                <div class='box'>
-                    <div id='luckysheet'>
-                        <img width='100%' :style='`height: calc(${tableStore.table.height} + 40px)`'
-                             src='@/assets/img/jss.png' />
+                <div class="box">
+                    <div id="luckysheet">
+                        <img
+                            width="100%"
+                            :style="`height: calc(${tableStore.table.height} + 40px)`"
+                            src="@/assets/img/jss.png"
+                        />
                     </div>
                 </div>
             </pane>
@@ -38,7 +60,7 @@
     </div>
 </template>
 
-<script setup lang='ts'>
+<script setup lang="ts">
 import { onMounted, ref, provide } from 'vue'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
@@ -55,7 +77,7 @@ defineOptions({
     // name: 'harmonic-boot/report/word'
 })
 const height = mainHeight(20)
-const size = ref(0)
+const size = ref(23)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
@@ -66,24 +88,19 @@ const tableStore = new TableStore({
     url: '',
     method: 'POST',
     column: [],
-    beforeSearchFun: () => {
-    },
-    loadCallback: () => {
-    }
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
 })
 provide('tableStore', tableStore)
 
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
 
-
     if (dom) {
-
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
 })
 
-
 const handleNodeClick = (data: any, node: any) => {
     dotList.value = data
 }
@@ -117,7 +134,10 @@ const exportEvent = () => {
     form.append('file', uploadList.value?.raw || '')
     // 特殊字符正则表达式
     const specialCharRegex = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/
-    if (specialCharRegex.test(tableStore.table.params.crmName) || specialCharRegex.test(tableStore.table.params.reportNumber)) {
+    if (
+        specialCharRegex.test(tableStore.table.params.crmName) ||
+        specialCharRegex.test(tableStore.table.params.reportNumber)
+    ) {
         ElNotification({
             type: 'error',
             message: '包含特殊字符，请注意修改!'
@@ -138,10 +158,9 @@ const exportEvent = () => {
             document.body.removeChild(link)
         })
     }
-
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 .splitpanes.default-theme .splitpanes__pane {
     background: #eaeef1;
 }

src/views/pqs/panorama/components/details/steadyState.vue

@@ -52,7 +52,7 @@
             </div>
             <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="365px" :data="tableData">
                 <vxe-column field="deptName" title="区域" />
-                <vxe-column sortable field="onlineNum" title="在线监测点数量(个)" />
+                <vxe-column sortable field="onlineNum" title="在运监测点数(个)" />
                 <vxe-column sortable field="overNum" title="超标监测点数量(个)" />
                 <vxe-column sortable field="overRatio" title="超标监测点占比(%)" />
 
@@ -100,7 +100,7 @@ const url: any = [
     new URL(`@/assets/img/SB.png`, import.meta.url)
 ]
 const tableData: any = ref([])
-const title = ['电压偏差(超标)', '频率偏差(超标)', '电压总谐波畸变率(超标)', '闪变(超标)', '三相电压不平衡度(超标)']
+const title = ['频率偏差(超标)', '电压偏差(超标)', '电压总谐波畸变率(超标)', '闪变(超标)', '三相电压不平衡度(超标)']
 
 const echart = (row: any) => {
     let maxList: any = []

src/views/pqs/panorama/components/mapR.vue

@@ -6,20 +6,21 @@
                 <div class="title">
                     <span>
                         稳态综合评估
-                        <el-popover placement="right" :width="150" trigger="hover">
+                        <el-popover placement="right" :width="190" trigger="hover">
                             <template #reference>
                                 <WarningFilled class="WarningFilled" />
                             </template>
+                           
                             <div class="text">
-                                <span style="color: #00b07d">优质：(4.5 , 5]</span>
+                                <span style="color: #00B07D">无污染：0</span>
                                 <br />
-                                <span style="color: #2b7fd3">良好：(4 , 4.5]</span>
+                                <span style="color: #3399ff">轻微污染：(0 , 100]</span>
                                 <br />
-                                <span style="color: #ffcc33">合格：(3 , 4]</span>
+                                <span style="color: #ffcc33">轻度污染：(100 , 1000]</span>
                                 <br />
-                                <span style="color: #97017e">较差：(2 , 3]</span>
+                                <span style="color: #ff9900">中度污染：(1000 , 10000]</span>
                                 <br />
-                                <span style="color: #A52a2a">极差：[1 , 2]</span>
+                                <span style="color: #A52a2a">重度污染：(10000</span>
                             </div>
                         </el-popover>
                     </span>
@@ -53,7 +54,6 @@
                         }"
                     >
                         {{ assessList.score == 3.14159 ? '/' : assessList.score }}
-                        <!-- {{ assessList.level }} -->
                     </span>
                 </div>
                 <div class="evaluate">
@@ -318,7 +318,7 @@ const options = ref([
   
 ])
 const technology: any = ref({})
-const harmonicType = ref('0')
+const harmonicType = ref('6')
 const transientNum = ref([0, 0])
 const options1: any = dictData.getBasicData('Event_Statis').filter(item => {
     if (item.code == 'Voltage_Dip' || item.code == 'Voltage_Rise' || item.code == 'Short_Interruptions') {

src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue

@@ -13,8 +13,10 @@
                     <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.3' : ''">
                         <div class="card">
                             <span style="cursor: pointer" @click="GridDiagram(i)">{{ item.title }}：</span>
-                            <span :style="`color: ${item.color[0]}; cursor:pointer`"
-                                @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)">
+                            <span
+                                :style="`color: ${item.color[0]}; cursor:pointer`"
+                                @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)"
+                            >
                                 {{ item.list[4].numOne }}
                             </span>
                         </div>
@@ -23,8 +25,10 @@
                 <!-- 监测规模 列表 -->
                 <div>
                     <div class="vcl mt5">
-                        <p v-for="(item, i) in vList"
-                            :style="i == 0 ? 'width: 60px' : i == 5 ? 'width: 32px' : 'flex:1'">
+                        <p
+                            v-for="(item, i) in vList"
+                            :style="i == 0 ? 'width: 60px' : i == 5 ? 'width: 32px' : 'flex:1'"
+                        >
                             {{ item }}
                         </p>
                     </div>
@@ -67,17 +71,20 @@
                 </div>
                 <div :style="`height:calc(${boxHeight.height} + 20px);overflow-y: auto;`">
                     <div v-for="item in countList">
-                        <div class="title mt5" style="font-weight: 500">
+                        <!-- <div class="title mt5" style="font-weight: 500">
                             <img src="@/assets/img/TJ.png" />
                             {{ item.title }}
-                        </div>
-                        <div class="card-Box" :style="`height:calc((${boxHeight.height} - 50px )/ 3);`"
-                            v-for="val in item.children">
+                        </div> -->
+                        <div
+                            class="card-Box mt10"
+                            :style="`height:calc((${boxHeight.height} - 20px )/ 2);`"
+                            v-for="val in item.children"
+                        >
                             <div>
                                 <span class="line"></span>
                                 <span class="vol">{{ val.title }}</span>
                             </div>
-                            <div class="num">
+                            <div class="num num1">
                                 <div @click="LookMap(val.numList, [], 0)">
                                     投运:
                                     <span>{{ val.num }}</span>
@@ -90,6 +97,10 @@
                                     数据完整性:
                                     <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
                                 </div>
+                                <div>
+                                    在线率:
+                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -119,7 +130,7 @@
                             </div>
                             <div>
                                 {{ item.title[2] }}:
-                                <span style="color: #A52a2a" @click="LookMap([], item.lineListTwo, 1)">
+                                <span style="color: #a52a2a" @click="LookMap([], item.lineListTwo, 1)">
                                     {{ item.lineNumTwo || 0 }}
                                 </span>
                             </div>
@@ -129,8 +140,12 @@
             </div>
         </div>
 
-        <img class="imgL" :style="show ? 'transform: rotate(0deg);' : 'transform: rotate(180deg);'"
-            @click="show = !show" src="@/assets/img/QH.png" />
+        <img
+            class="imgL"
+            :style="show ? 'transform: rotate(0deg);' : 'transform: rotate(180deg);'"
+            @click="show = !show"
+            src="@/assets/img/QH.png"
+        />
 
         <!-- 变电站详情 -->
         <stand ref="standRef" />
@@ -286,11 +301,11 @@ const countList: any = ref([
             },
             { title: '非电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }
         ]
-    },
-    {
-        title: '上送网公司',
-        children: [{ title: '电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }]
     }
+    // {
+    //     title: '上送网公司',
+    //     children: [{ title: '电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }]
+    // }
 ])
 const linList: any = ref([
     {
@@ -307,7 +322,7 @@ const linList: any = ref([
         title: ['电能质量指标', '未超标', '超标']
     }
 ])
-const vList = ['', '500kV', '220kV', '110kV', '35kV',]
+const vList = ['', '500kV', '220kV', '110kV', '35kV']
 const formRow: any = ref({})
 const height = mainHeight(30)
 const boxHeight = mainHeight(290, 2)
@@ -368,7 +383,7 @@ const info = async (row: any) => {
     getGridDiagramStatistics(form).then(res => {
         countList.value[0].children[0] = { title: '电网侧监测点', ...res.data.data[0] }
         countList.value[0].children[1] = { title: '非电网侧监测点', ...res.data.data[1] }
-        countList.value[1].children[0] = { title: '电网侧监测点', ...res.data.gwData[0] }
+        // countList.value[1].children[0] = { title: '电网侧监测点', ...res.data.gwData[0] }
     })
     // 监测运行统计
     getGridDiagramRunData(form).then(res => {
@@ -536,6 +551,18 @@ defineExpose({ info, show })
             font-weight: 550;
         }
     }
+    .num1 {
+        grid-template-columns: 1fr 1fr;
+        grid-template-rows: auto auto;
+        gap: 8px;
+        div {
+            display: flex;
+            padding-left: 20px;
+            span {
+                margin-left: 5px;
+            }
+        }
+    }
 }
 
 .BoxA {

src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue

@@ -1,137 +1,54 @@
 <template>
     <!-- 综合评估详情 -->
-    <el-dialog draggable title="综合评估统计" v-model="dialogVisible" width="1400px">
-        <div>
-            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="300px" :data="tableData">
+    <el-dialog draggable title="区域污染值统计" v-model="dialogVisible" width="1400px">
+        <div style="display: flex">
+            <div style="width: 400px">
+                <vxe-table
+                    v-bind="defaultAttribute"
+                    ref="tableRef"
+                    @current-change="currentChangeEvent"
+                    height="240px"
+                    :row-config="{ isCurrent: true, isHover: true }"
+                    :data="tableData"
+                >
                     <vxe-column field="deptName" title="地市" />
-                <vxe-column field="assessLevel" title="综合评估结论">
-                    <template #default="scope">
-                        <!-- class="conclusion"
-                            :class="
-                                scope.row.assessLevel == '特质'
-                                    ? 'background1'
-                                    : scope.row.assessLevel == '较差'
-                                    ? 'background2'
-                                    : scope.row.assessLevel == '极差'
-                                    ? 'background3'
-                                    : ''
-                            " -->
-                        <span>
-                            {{ scope.row.assessData }}
-                        </span>
-                    </template>
-                </vxe-column>
-                <vxe-column field="qualifyData" title="指标合格率(%)" />
-
-                <!-- <vxe-colgroup title="评估结论">
-                    <vxe-column field="vdevAssessLevel" title="电压偏差">
+                    <vxe-column field="score" title="污染值" sortable>
                         <template #default="scope">
                             <span
-                                class="conclusion"
-                                :class="
-                                    scope.row.vdevAssessLevel == '特质'
-                                        ? 'background1'
-                                        : scope.row.vdevAssessLevel == '较差'
-                                        ? 'background2'
-                                        : scope.row.vdevAssessLevel == '极差'
-                                        ? 'background3'
-                                        : ''
-                                "
+                                :style="{
+                                    color: setColor(scope.row.score)
+                                }"
                             >
-                                {{ scope.row.vdevAssessLevel }}
+                                {{ scope.row.score }}
                             </span>
                         </template>
                     </vxe-column>
-
-                    <vxe-column field="freqAssessLevel" title="频率偏差">
-                        <template #default="scope">
-                            <span
-                                class="conclusion"
-                                :class="
-                                    scope.row.freqAssessLevel == '特质'
-                                        ? 'background1'
-                                        : scope.row.freqAssessLevel == '较差'
-                                        ? 'background2'
-                                        : scope.row.freqAssessLevel == '极差'
-                                        ? 'background3'
-                                        : ''
-                                "
-                            >
-                                {{ scope.row.freqAssessLevel }}
-                            </span>
-                        </template>
-                    </vxe-column>
-
-                    <vxe-column field="harmAssessLevel" title="电压总谐波畸变率">
-                        <template #default="scope">
-                            <span
-                                class="conclusion"
-                                :class="
-                                    scope.row.harmAssessLevel == '特质'
-                                        ? 'background1'
-                                        : scope.row.harmAssessLevel == '较差'
-                                        ? 'background2'
-                                        : scope.row.harmAssessLevel == '极差'
-                                        ? 'background3'
-                                        : ''
-                                "
-                            >
-                                {{ scope.row.harmAssessLevel }}
-                            </span>
-                        </template>
-                    </vxe-column>
-
-                    <vxe-column field="flickerAssessLevel" title="电压闪变">
-                        <template #default="scope">
-                            <span
-                                class="conclusion"
-                                :class="
-                                    scope.row.flickerAssessLevel == '特质'
-                                        ? 'background1'
-                                        : scope.row.flickerAssessLevel == '较差'
-                                        ? 'background2'
-                                        : scope.row.flickerAssessLevel == '极差'
-                                        ? 'background3'
-                                        : ''
-                                "
-                            >
-                                {{ scope.row.flickerAssessLevel }}
-                            </span>
-                        </template>
-                    </vxe-column>
-
-                    <vxe-column field="unbalanceAssessLevel" title="三相电压不平衡度">
-                        <template #default="scope">
-                            <span
-                                class="conclusion"
-                                :class="
-                                    scope.row.unbalanceAssessLevel == '特质'
-                                        ? 'background1'
-                                        : scope.row.unbalanceAssessLevel == '较差'
-                                        ? 'background2'
-                                        : scope.row.unbalanceAssessLevel == '极差'
-                                        ? 'background3'
-                                        : ''
-                                "
-                            >
-                                {{ scope.row.unbalanceAssessLevel }}
-                            </span>
-                        </template>
-                    </vxe-column>
-                </vxe-colgroup> -->
                 </vxe-table>
             </div>
-        <div style="height: 300px; margin-top: 10px; position: relative" v-loading="loading">
-            <!-- <el-select
-                v-model="time"
-                size="small"
-               
-                @change="analysis"
+            <div class="ml10" style="width: 990px">
+                <vxe-table v-bind="defaultAttribute" v-loading="loadingTab" ref="vxeRef" height="240px" :data="subdata">
+                    <vxe-column type="seq" width="70"></vxe-column>
+                    <vxe-column field="devName" title="终端名称"></vxe-column>
+                    <vxe-column field="lineName" title="监测点名称" />
+                    <vxe-column field="powerFlag" title="电网标志" />
+                    <vxe-column field="devType" title="终端型号"></vxe-column>
+                    <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
+                    <vxe-column field="vharmonicValue" title="污染值" sortable>
+                        <template #default="scope">
+                            <span
+                                :style="{
+                                    color: setColor(scope.row.vharmonicValue)
+                                }"
                             >
-                <el-option label="年" value="1" />
-                <el-option label="月" value="3" />
-            </el-select> -->
-            <div style="position: absolute; width: 100px; top: 0px; right: 0px; z-index: 1">
+                                {{ scope.row.vharmonicValue }}
+                            </span>
+                        </template>
+                    </vxe-column>
+                </vxe-table>
+            </div>
+        </div>
+        <div style="height: 300px; margin-top: 10px; position: relative" v-loading="loading">
+            <!-- <div style="position: absolute; width: 100px; top: 0px; right: 0px; z-index: 1">
                 <el-radio-group v-model="city" size="small" @change="analysis">
                     <el-radio-button label="0">省</el-radio-button>
                     <el-radio-button label="1">市</el-radio-button>
@@ -140,133 +57,119 @@
                     <el-radio-button label="1">年</el-radio-button>
                     <el-radio-button label="3">月</el-radio-button>
                 </el-radio-group>
-            </div>
+            </div> -->
 
             <MyEChart style="height: 300px" :options="picEChart" />
         </div>
     </el-dialog>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, nextTick } from 'vue'
 import MyEChart from '@/components/echarts/MyEchart.vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
-import { getAssessDetail, getAssessTrend } from '@/api/device-boot/panorama'
+import { useDictData } from '@/stores/dictData'
+import { getAssessDetail, getAssessTrend, downPollutionSubCalc } from '@/api/device-boot/panorama'
+const dictData = useDictData()
 const dialogVisible: any = ref(false)
 const rowList: any = ref({})
 const type = ref('1')
 const city = ref('0')
 const loading = ref(false)
 const tableData: any = ref([])
-
+const subdata: any = ref([])
 const picEChart = ref()
-const open = async (row: any) => {
-    getAssessDetail(row).then(res => {
-        tableData.value = res.data
+const tableRef = ref()
+const loadingTab = ref(false)
+const PollutionList = dictData.getBasicData('Pollution_Calc').filter(item => item.name == '谐波电压')
+
+const open = async (row: any, list: any) => {
+    console.log('🚀 ~ open ~ list:', list)
+    // getAssessDetail(row).then(res => {
+    tableData.value = list
+    subdata.value = tableData.value[0]?.powerFlagPollutionList || []
+    nextTick(() => {
+        setTimeout(() => {
+            tableRef.value?.setCurrentRow(tableData.value[0])
+        }, 0)
     })
+    // })
     rowList.value = row
     analysis()
     dialogVisible.value = true
 }
+const currentChangeEvent = async () => {
+    loadingTab.value = true
+    setTimeout(() => {
+        subdata.value = tableRef.value.getCurrentRecord()?.powerFlagPollutionList || []
+        loadingTab.value = false
+    }, 1000)
+}
+
 const analysis = () => {
     loading.value = true
     let time = rowList.value.searchBeginTime.slice(0, 4) + `-01-01`
-    getAssessTrend({ ...rowList.value, searchBeginTime: time, type: type.value, areaType: city.value }).then(res => {
+    downPollutionSubCalc({ ...rowList.value, ids: [PollutionList[0].id] }).then(res => {
+        const first10Items = res.data.slice(0, 10)
         picEChart.value = {
             title: {
-                text: '各地市综合评估趋势对比'
+                text: '污染值排名前十变电站'
+            },
+
+            xAxis: {
+                name: '',
+                data: first10Items.map((item: any) => item.subStationName),
+                axisLabel: {
+                    rotate: 30, // 核心：倾斜 45 度（推荐 30/45/60，角度太大易读性差）
+                   
+                }
+            },
+            grid: {
+                bottom: 10
             },
             legend: {
-                right: 120,
-                top: 20
+                show: false
             },
-            // tooltip: {
-            //     formatter: function (params: any) {
-            //         // console.log(123, params)
-
-            //         var tips = ''
-
-            //         for (var i = 0; i < params.length; i++) {
-            //             console.log('🚀 ~ getAssessTrend ~ params[i].value:', params[i].value)
-
-            //             tips +=
-            //                 params[i].seriesName +
-            //                 ':' +
-            //                 `<span style="color:${
-            //                     params[i].value > 4.5
-            //                         ? ''
-            //                         : params[i].value > 4
-            //                         ? ''
-            //                         : params[i].value > 3
-            //                         ? ''
-            //                         : params[i].value > 2
-            //                         ? '#97017e'
-            //                         : params[i].value > 0
-            //                         ? '#A52a2a'
-            //                         : ''
-            //                 }">
-            //                     ${
-            //                         params[i].value > 4.5
-            //                             ? '优质'
-            //                             : params[i].value > 4
-            //                             ? '良好'
-            //                             : params[i].value > 3
-            //                             ? '一般'
-            //                             : params[i].value > 2
-            //                             ? '较差'
-            //                             : params[i].value > 0
-            //                             ? '极差'
-            //                             : ''
-            //                     }
-            //                     </span>` +
-            //                 '</br>'
-            //         }
-            //         return tips
-            //     }
-            // },
-            xAxis: {
-                name: '时间',
-                data: res.data[0].children.map((item: any) => item.dataTime)
-            },
-
-            grid: {
-                bottom: '10px',
-                top: '60px'
-            },
-
             yAxis: {
                 name: ''
             },
             options: {
                 dataZoom: false,
-                series: []
+                series: [
+                    {
+                        // name: time[i],
+                        name: '污染值',
+                        type: 'bar',
+                        data: first10Items.map((item: any) => item.subVStationValue),
+                        itemStyle: {
+                            color: function (params) {
+                                // params.value 是当前柱子的数值
+                                const value = params.value
+                                return setColor(value)
+                            }
+                        }
+                    }
+                ]
             }
         }
 
-        let list: any = []
-        let time: any = []
-        let mun: any = []
-        res.data.forEach((item: any, num: any) => {
-            time.push(item.deptName)
-            list.push([])
-            item.children.forEach((val: any, i: any) => {
-                mun.push(val.score == 3.14159 ? null : val.score)
-                list[num].push(val.score == 3.14159 ? null : val.score)
-            })
-        })
-
-        list.forEach((item: any, i: any) => {
-            picEChart.value.options.series.push({
-                name: time[i],
-                type: 'line',
-                data: item
-            })
-        })
-        picEChart.value.yAxis.min = Math.min(...mun) < 1 ? 0 : (Math.min(...mun) - 0.5).toFixed(2)
-        picEChart.value.yAxis.max = Math.max(...mun) > 4.5 ? 5 : (Math.max(...mun) + 0.5).toFixed(2)
         loading.value = false
     })
 }
-
+const setColor = val => {
+    return val == 3.14159
+        ? ''
+        : val > 10000
+        ? '#A52a2a'
+        : val > 1000
+        ? '#ff9900'
+        : val > 100
+        ? '#ffcc33'
+        : val > 0
+        ? '#3399ff'
+        : val == 0
+        ? '#00B07D'
+        : ''
+}
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
@@ -290,7 +193,7 @@ defineExpose({ open })
     color: #fff;
 }
 .background3 {
-    background-color: #A52a2a;
+    background-color: #a52a2a;
     color: #fff;
 }
 :deep(.el-select) {

src/views/pqs/qualityInspeection/panorama/components/details/stand.vue

@@ -20,20 +20,20 @@
                 <div class="title">
                     <span>
                         污染告警
-                        <el-popover placement="right" :width="170" trigger="hover">
+                        <el-popover placement="right" :width="190" trigger="hover">
                             <template #reference>
                                 <WarningFilled class="WarningFilled" />
                             </template>
                             <div class="text">
-                                <span style="color: #00b07d">无污染：(0 , 1]</span>
+                                 <span style="color: #00B07D">无污染：0</span>
                                 <br />
-                                <span style="color: #3399ff">轻微污染：(1 , 1.2]</span>
+                                <span style="color: #3399ff">轻微污染：(0 , 100]</span>
                                 <br />
-                                <span style="color: #ffcc33">轻度污染：(1.2 , 1.6]</span>
+                                <span style="color: #ffcc33">轻度污染：(100 , 1000]</span>
                                 <br />
-                                <span style="color: #ff9900">中度污染：(1.6 , 2]</span>
+                                <span style="color: #ff9900">中度污染：(1000 , 10000]</span>
                                 <br />
-                                <span style="color: #A52a2a">重度污染：(2 , +∞)</span>
+                                <span style="color: #A52a2a">重度污染：(10000</span>
                             </div>
                         </el-popover>
                     </span>
@@ -49,11 +49,11 @@
                         <el-radio-button v-for="item in options" :label="item.id">{{ item.name }}</el-radio-button>
                     </el-radio-group>
                 </div>
-
+                <!-- :style="i == 3 ? `margin-left: 20%;` : ``" -->
                 <div class="pie">
                     <MyEChart
                         v-for="(item, i) in picEChart"
-                        :style="i == 3 ? `margin-left: 20%;` : ``"
+                       
                         class="MyEChart"
                         :options="item"
                     />
@@ -72,6 +72,7 @@
                 <vxe-column field="num3" sortable title="轻度污染数量" :formatter="formatter" />
                 <vxe-column field="num4" sortable title="中度污染数量" :formatter="formatter" />
                 <vxe-column field="num5" sortable title="重度污染数量" :formatter="formatter" />
+                <vxe-column field="num6" sortable title="暂无数据数量" :formatter="formatter" />
             </vxe-table>
         </div>
     </el-dialog>
@@ -88,11 +89,12 @@ const dictData = useDictData()
 const dialogVisible: any = ref(false)
 const time = ref('1')
 const Voltage = dictData.getBasicData('Dev_Voltage_Stand')
-const options: any = dictData.getBasicData('Pollution_Statis').filter(item => {
-    if (item.code == 'V_Harmonic' || item.code == 'I_All') {
-        return item
-    }
-})
+const options: any = dictData.getBasicData('Pollution_Calc')
+// .filter(item => {
+//     if (item.code == 'V_Harmonic' || item.code == 'I_All') {
+//         return item
+//     }
+// })
 const contaminate = ref(options[0].id)
 const rowList: any = ref({})
 const trendEChart: any = ref({})
@@ -119,57 +121,223 @@ const open = async (row: any) => {
 }
 const contaminateC = () => {
     // rowList.value.deviceInfoParam.ids=[contaminate.value]
-    getPollutionAlarmData({ ...rowList.value, ids: [contaminate.value] }).then(res => {
-        let data = []
+    // getPollutionAlarmData({ ...rowList.value, ids: [contaminate.value] }).then(res => {
+    //     let data = []
 
-        let a1 = 0
-        let a2 = 0
-        let a3 = 0
-        let a4 = 0
-        let a5 = 0
-        if (rowList.value.isUpToGrid == 0) {
-            data = res.data.info
-        } else {
-            data = res.data.gwInfo
+    //     let a1 = 0
+    //     let a2 = 0
+    //     let a3 = 0
+    //     let a4 = 0
+    //     let a5 = 0
+    //     if (rowList.value.isUpToGrid == 0) {
+    //         data = res.data.info
+    //     } else {
+    //         data = res.data.gwInfo
+    //     }
+    //     for (let i = 0; i < data.length; i++) {
+    //         if (data[i] >= 2) {
+    //             ++a5
+    //         } else if (data[i] >= 1.6 && data[i] < 2) {
+    //             ++a4
+    //         } else if (data[i] >= 1.2 && data[i] < 1.6) {
+    //             ++a3
+    //         } else if (data[i] >= 1 && data[i] < 1.2) {
+    //             ++a2
+    //         } else if (data[i] >= 0 && data[i] < 1) {
+    //             ++a1
+    //         }
+    //     }
+
+    //     let list = [
+    //         {
+    //             value: ((a1 / data.length || 0) * 100).toFixed(2),
+    //             name: `无污染：${a1}座`
+    //         },
+    //         {
+    //             value: ((a2 / data.length || 0) * 100).toFixed(2),
+    //             name: `轻微污染：：${a2}座`
+    //         },
+    //         {
+    //             value: ((a3 / data.length || 0) * 100).toFixed(2),
+    //             name: `轻度污染：${a3}座`
+    //         },
+    //         {
+    //             value: ((a4 / data.length || 0) * 100).toFixed(2),
+    //             name: `中度污染：${a4}座`
+    //         },
+    //         {
+    //             value: ((a5 / data.length || 0) * 100).toFixed(2),
+    //             name: `重度污染：${a5}座`
+    //         }
+    //     ]
+    //     const color = ['#00B07D', '#3399ff', '#ffcc33', '#ff9900', '#A52a2a']
+
+    //     list.forEach((item, i) => {
+    //         picEChart.value[i] = {
+    //             legend: {
+    //                 type: 'scroll',
+    //                 orient: 'vertical',
+    //                 left: 10,
+    //                 top: '10%'
+    //             },
+    //             xAxis: {
+    //                 show: false
+    //             },
+    //             yAxis: {
+    //                 show: false
+    //             },
+    //             options: {
+    //                 toolbox:null,
+    //                 dataZoom: null,
+    //                 series: [
+    //                     {
+    //                         type: 'gauge',
+    //                         startAngle: 180,
+    //                         center: ['50%', '80%'],
+    //                         radius: '135%',
+    //                         endAngle: 0,
+    //                         min: 0,
+    //                         max: 100,
+    //                         progress: {
+    //                             show: true,
+    //                             width: 15,
+    //                             itemStyle: {
+    //                                 color: color[i]
+    //                             }
+    //                         },
+    //                         pointer: {
+    //                             show: false
+    //                         },
+    //                         axisLine: {
+    //                             lineStyle: {
+    //                                 width: 15,
+    //                                 color: [[1, '#f4f4f4']]
+    //                             }
+    //                         },
+    //                         axisTick: {
+    //                             show: false
+    //                         },
+    //                         splitLine: {
+    //                             show: false
+    //                         },
+    //                         axisLabel: {
+    //                             show: false
+    //                             // distance: 5,
+    //                             // color: '#666',
+    //                             // fontSize: 12,
+    //                             // formatter: function (value: any) {
+    //                             //     if (value === 0 || value === 100) {
+    //                             //         return value + '%'
+    //                             //     }
+    //                             // }
+    //                         },
+    //                         anchor: {
+    //                             show: false,
+    //                             showAbove: false,
+    //                             size: 25,
+    //                             itemStyle: {
+    //                                 borderWidth: 60
+    //                             }
+    //                         },
+    //                         title: {
+    //                             show: true,
+    //                             offsetCenter: [0, '20%'],
+    //                             fontSize: 14
+    //                         },
+    //                         detail: {
+    //                             valueAnimation: true,
+    //                             fontSize: 14,
+    //                             lineHeight: 20,
+    //                             color: color[i],
+    //                             fontWeight: 'bold',
+    //                             offsetCenter: [0, '-20%'],
+    //                             formatter: function (value: any) {
+    //                                 return '{a|占比} ' + '\n' + value + '{a|%}'
+    //                             },
+    //                             rich: {
+    //                                 a: {
+    //                                     color: '#333',
+    //                                     fontSize: 16,
+    //                                     lineHeight: 30
+    //                                 }
+    //                             }
+    //                         },
+    //                         data: [item]
+    //                     }
+    //                 ]
+    //             }
+    //         }
+    //     })
+    // })
+    getPollutionAlarmList({ ...rowList.value, ids: [contaminate.value] }).then(res => {
+        tableData.value = res.data.map((item: any) => {
+            return {
+                name: item[0],
+                num: item[1],
+                num1: item[2],
+                num2: item[3],
+                num3: item[4],
+                num4: item[5],
+                num5: item[6],
+                num6: item[7]
             }
-        for (let i = 0; i < data.length; i++) {
-            if (data[i] >= 2) {
-                ++a5
-            } else if (data[i] >= 1.6 && data[i] < 2) {
-                ++a4
-            } else if (data[i] >= 1.2 && data[i] < 1.6) {
-                ++a3
-            } else if (data[i] >= 1 && data[i] < 1.2) {
-                ++a2
-            } else if (data[i] >= 0 && data[i] < 1) {
-                ++a1
-            }
-        }
-        // console.log('🚀 ~ getPollutionAlarmData ~ a1 / data.length:', a1 / data.length)
+        })
+        console.log(123, tableData.value)
+
+        let data = []
+        let a1 = tableData.value.reduce((t, item) => t + (item.num1 - 0 || 0), 0)
+        let a2 = tableData.value.reduce((t, item) => t + (item.num2 - 0 || 0), 0)
+        let a3 = tableData.value.reduce((t, item) => t + (item.num3 - 0 || 0), 0)
+        let a4 = tableData.value.reduce((t, item) => t + (item.num4 - 0 || 0), 0)
+        let a5 = tableData.value.reduce((t, item) => t + (item.num5 - 0 || 0), 0)
+        let a6 = tableData.value.reduce((t, item) => t + (item.num6 - 0 || 0), 0)
+        let total = a1 + a2 + a3 + a4 + a5 + a6
+        // if (rowList.value.isUpToGrid == 0) {
+        //     data = res.data.info
+        // } else {
+        //     data = res.data.gwInfo
+        // }
+        // for (let i = 0; i < data.length; i++) {
+        //     if (data[i] >= 2) {
+        //         ++a5
+        //     } else if (data[i] >= 1.6 && data[i] < 2) {
+        //         ++a4
+        //     } else if (data[i] >= 1.2 && data[i] < 1.6) {
+        //         ++a3
+        //     } else if (data[i] >= 1 && data[i] < 1.2) {
+        //         ++a2
+        //     } else if (data[i] >= 0 && data[i] < 1) {
+        //         ++a1
+        //     }
+        // }
 
         let list = [
             {
-                value: ((a1 / data.length || 0) * 100).toFixed(2),
+                value: ((a1 / total || 0) * 100).toFixed(2),
                 name: `无污染：${a1}座`
             },
             {
-                value: ((a2 / data.length || 0) * 100).toFixed(2),
+                value: ((a2 / total || 0) * 100).toFixed(2),
                 name: `轻微污染：：${a2}座`
             },
             {
-                value: ((a3 / data.length || 0) * 100).toFixed(2),
+                value: ((a3 / total || 0) * 100).toFixed(2),
                 name: `轻度污染：${a3}座`
             },
             {
-                value: ((a4 / data.length || 0) * 100).toFixed(2),
+                value: ((a4 / total || 0) * 100).toFixed(2),
                 name: `中度污染：${a4}座`
             },
             {
-                value: ((a5 / data.length || 0) * 100).toFixed(2),
+                value: ((a5 / total || 0) * 100).toFixed(2),
                 name: `重度污染：${a5}座`
-            }
+            },
+            {
+                value: ((a6 / total || 0) * 100).toFixed(2),
+                name: `暂无数据：${a6}座`
+            },
         ]
-        const color = ['#00B07D', '#3399ff', '#ffcc33', '#ff9900', '#A52a2a']
+        const color = ['#00B07D', '#3399ff', '#ffcc33', '#ff9900', '#A52a2a','#ccc']
 
         list.forEach((item, i) => {
             picEChart.value[i] = {
@@ -268,19 +436,6 @@ const contaminateC = () => {
             }
         })
     })
-    getPollutionAlarmList({ ...rowList.value, ids: [contaminate.value] }).then(res => {
-        tableData.value = res.data.map((item: any) => {
-            return {
-                name: item[0],
-                num: item[1],
-                num1: item[2],
-                num2: item[3],
-                num3: item[4],
-                num4: item[5],
-                num5: item[6]
-            }
-        })
-    })
 }
 const analysis = (e: any) => {
     let time = rowList.value.searchBeginTime?.slice(0, 4) + `-01-01`

src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue

@@ -49,7 +49,7 @@
             </div>
             <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="365px" :data="tableData">
                 <vxe-column field="deptName" title="区域" />
-                <vxe-column sortable field="onlineNum" title="在线监测点数量(个)" />
+                <vxe-column sortable field="onlineNum" title="在运监测点数(个)" />
                 <vxe-column sortable field="overNum" title="超标监测点数量(个)" />
                 <vxe-column sortable field="overRatio" title="超标监测点占比(%)" />
 
@@ -97,7 +97,7 @@ const url: any = [
     new URL(`@/assets/img/SB.png`, import.meta.url)
 ]
 const tableData: any = ref([])
-const title = ['电压偏差(超标)', '频率偏差(超标)', '电压总谐波畸变率(超标)', '闪变(超标)', '三相电压不平衡度(超标)']
+const title = ['频率偏差(超标)', '电压偏差(超标)', '电压总谐波畸变率(超标)', '闪变(超标)', '三相电压不平衡度(超标)']
 
 const echart = (row: any) => {
     let maxList: any = []

src/views/pqs/qualityInspeection/panorama/components/line/info.vue

@@ -6,6 +6,10 @@
                 <span style="font-size: 16px">{{ dropList.lineName }}详情　</span>
                 <span style="font-weight: 500">最新数据时间：</span>
                 <span style="color: var(--color-primary-default)">{{ dropList.updateTime }}</span>
+                <span style="font-weight: 500" class="ml20">统计日期：</span>
+                <span style="color: var(--color-primary-default)">
+                    {{ getTimeOfTheMonth('3')[0] + '至' + getTimeOfTheMonth('3')[1] }}
+                </span>
             </template>
         </el-page-header>
         <el-row :gutter="20" class="mt10" :style="`height:${rowHeight}`">
@@ -38,8 +42,16 @@
                 </h3>
                 <el-descriptions title="" border :column="2" size="small">
                     <el-descriptions-item width="140px" label="告警原因">
-                        <span style="font-weight: 550"
-                            :style="TargetData.info == 0 ? 'color: #0e8780;' : TargetData.info == 3 ? 'color: #000' : 'color: #ff0000;'">
+                        <span
+                            style="font-weight: 550"
+                            :style="
+                                TargetData.info == 0
+                                    ? 'color: #0e8780;'
+                                    : TargetData.info == 3
+                                    ? 'color: #000'
+                                    : 'color: #ff0000;'
+                            "
+                        >
                             {{
                                 TargetData.info == 1
                                     ? '超标告警'
@@ -73,8 +85,11 @@
                 </h3>
                 <div style="display: flex">
                     <MyEChart :style="`height: calc(${rowHeight} - 31px)`" :options="ComCharts" @click="Integrity" />
-                    <MyEChart :style="`height: calc(${rowHeight} - 31px)`" :options="onLineCharts"
-                        @click="OnlineRate" />
+                    <MyEChart
+                        :style="`height: calc(${rowHeight} - 31px)`"
+                        :options="onLineCharts"
+                        @click="OnlineRate"
+                    />
                 </div>
             </el-col>
         </el-row>
@@ -93,14 +108,18 @@
                         <el-col :span="12" style="display: flex">
                             <div>
                                 综合评估得分:
-                                <span class="conclusion" :class="dropList.assessData == '特质'
+                                <span
+                                    class="conclusion"
+                                    :class="
+                                        dropList.assessData == '特质'
                                             ? 'background1'
                                             : dropList.assessData == '较差'
                                             ? 'background2'
                                             : dropList.assessData == '极差'
                                             ? 'background3'
                                             : ''
-                                    ">
+                                    "
+                                >
                                     {{ dropList.assessData }}
                                 </span>
                             </div>
@@ -114,14 +133,18 @@
                         <el-col :span="10" style="display: flex; align-items: center">
                             <div style="width: 100%">
                                 评估得分：
-                                <span class="conclusion" :class="item.avg == '特质'
+                                <span
+                                    class="conclusion"
+                                    :class="
+                                        item.avg == '特质'
                                             ? 'background1'
                                             : item.avg == '较差'
                                             ? 'background2'
                                             : item.avg == '极差'
                                             ? 'background3'
                                             : ''
-                                    ">
+                                    "
+                                >
                                     {{ item.avg }}
                                 </span>
                             </div>
@@ -167,6 +190,7 @@ import DatePicker from '@/components/form/datePicker/index.vue'
 import MyEChart from '@/components/echarts/MyEchart.vue'
 import echarts from '@/components/echarts/echarts'
 import { useRouter } from 'vue-router'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
 const router = useRouter()
 import { getLineDetailData } from '@/api/advance-boot/bearingCapacity'
 import {
@@ -522,7 +546,7 @@ const open = async (id: string) => {
                 if (res.data[k] != '/') {
                     judgment = false
                 }
-                flag += (res.data[k] == '/' ? 0 : res.data[k])
+                flag += res.data[k] == '/' ? 0 : res.data[k]
             }
         }
 
@@ -633,7 +657,7 @@ const echart = (row: any) => {
             },
             indicator: indicator
         },
-
+        color: color,
         series: []
     }
 
@@ -642,13 +666,17 @@ const echart = (row: any) => {
             name: item.time,
             type: 'radar',
             symbol: 'none',
+
             areaStyle: {
-                normal: {
-                    color: '#2a9fe069'
-                }
+                opacity: 0.6, // 调整透明度，避免重叠遮挡
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                    { offset: 0, color: `${color[i]}50` },
+                    { offset: 1, color: `${color[i]}50` } // 渐变透明
+                ])
             },
-            itemStyle: {
-                color: '#2a9fe0'
+            lineStyle: {
+                color: color[i],
+                width: 2
             },
             data: [item.ratioList]
         })
@@ -736,7 +764,7 @@ defineExpose({ open })
 }
 
 .background3 {
-    background-color: #A52a2a;
+    background-color: #a52a2a;
     color: #fff;
 }
 </style>

src/views/pqs/qualityInspeection/panorama/components/map.vue

@@ -128,8 +128,7 @@ const LngLat = [
 import { getAssessOverview } from '@/api/device-boot/panorama'
 // narimap.publicKey =
 //     'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRYFEiMdZVgY8+jIjx4GR1QbN7qVgCE0istwPZN8xRqdSV+hePUPIW1k9eCVh9gxIIWHAw2TfNZLb8l0Tmk9OH3XnZ009TNBjzZ2zWLrbjFQzgutKKI2JRLK+CaJbOZ0LiD78QnTo5Zk+ZuQBKgtyFJdp4T5gQS+Mnbj/c4EnK0QIDAQAB'
- narimap.publicKey =
-    'JBb74325ae94dc49358b7d699660b692'
+narimap.publicKey = 'JBb74325ae94dc49358b7d699660b692'
 
 narimap.Require(
     [
@@ -198,15 +197,16 @@ const Query = () => {
             base: {
                 outline: {
                     paint: {
-                        'line-color': '#0D867F',
-                        'line-width': 1,
+                        'line-color': '#fff',
+                        'line-width': 2,
                         'line-opacity': 1
                     }
                 },
                 fill: {
                     paint: {
                         'fill-color': '#0D867F',
-                        'fill-opacity': 0.3
+                        // 'fill-opacity': 0.3
+                        'fill-opacity': 0
                     }
                 },
                 label: {
@@ -226,7 +226,7 @@ const Query = () => {
                     },
                     outline: {
                         paint: {
-                            'line-color': '#0D867F',
+                            'line-color': '#fff',
                             'line-width': 4,
                             'line-opacity': 1
                         }
@@ -248,7 +248,8 @@ const Query = () => {
     )
 
     powerManageGridMap.value.on('load', function () {
-        powerLoad()
+        // 区分区域颜色
+        // powerLoad()
     })
 
     setTimeout(() => {
@@ -262,7 +263,100 @@ const Query = () => {
         }, 500)
     }, 500)
 }
+// 添加热力图
+const sourceList: any = ref([])
+const addSource = async () => {
+    // const features = [
+    // {
+    //     type: 'Feature',
+    //     geometry: {
+    //         type: 'Point',
+    //         coordinates: [117.651148, 41.121061]
+    //     },
+    //     properties: {
+    //         value: 64
+    //     }
+    // }
+    // ]
+    console.log('🚀 ~ sourceList:', sourceList.value)
 
+    if (map.value.getSource('themeData')) {
+        map.value.getSource('themeData').setData({
+            type: 'FeatureCollection',
+            features: sourceList.value
+        })
+    } else {
+        map.value.addSource('themeData', {
+            type: 'geojson',
+            data: {
+                type: 'FeatureCollection',
+                features: sourceList.value
+            }
+        })
+    }
+    if (map.value.getLayer('earthquakes-paint')) {
+    } else {
+        map.value.addLayer({
+            id: 'earthquakes-paint',
+            type: 'heatmap',
+            source: 'themeData',
+            paint: {
+                /**
+                 * 数据点的影响力，weight=10的点相当于十个weight=1的点
+                 * 下述为插值表达式，输入是点geojson的properties的mag，输出随mag线性增大
+                 */
+                'heatmap-weight': [
+                    'interpolate',
+                    ['linear'],
+                    ['get', 'value'],
+                    0,
+                    0.1,
+                    1,
+                    0.3,
+                    101,
+                    0.5,
+                    1001,
+                    0.7,
+                    10001,
+                    1
+                ],
+                'heatmap-color': [
+                    'interpolate',
+                    ['linear'],
+                    ['heatmap-density'],
+                    0,
+                    'rgba(255, 0, 0, 0)',
+                    0.1,
+                    'rgba(7, 91, 243, .8)',
+                    0.3,
+                    'rgba(7, 208, 255, .6)',
+
+                    0.5,
+                    'rgba(213, 251, 12, .8)',
+
+                    0.7,
+                    'rgba(255, 191, 0, .8)',
+
+                    1,
+                    'rgba(255, 0, 0, .8)'
+                ],
+
+                'heatmap-intensity': ['interpolate', ['linear'], ['zoom'], 0, 1, 12, 3],
+                /**
+                 * 该值越大，热力图越平滑，信息越不详细。
+                 * 下述为插值表达式，输出随zoom线性变化，zoom为0时值为8，zoom为9时值为20
+                 */
+                'heatmap-radius': 30,
+                /**
+                 * 透明度，输出为1则不透明
+                 * 下述为插值表达式，输出随zoom线性变化，zoom为5时值为0.8，zoom为12时值为0.4
+                 */
+                'heatmap-opacity': 1
+            },
+            maxzoom: 12
+        })
+    }
+}
 // 添加变电站线路
 const addLine = () => {
     //添加电网图层
@@ -629,102 +723,8 @@ const addLayer = () => {
         }
     })
 }
-// 测试添加点
-const testAddLayer = () => {
-    // 注册图片
-    map.value.loadImage(
-        new URL('@/assets/test5.png', import.meta.url).href, // 图片地址
-        (error: any, image: any) => {
-            if (error) throw error
-            //添加图片到 map.value ，第一个参数为图片设置 id
-            map.value.addImage('poi5', image)
-            //添加 layer
-            map.value.addLayer({
-                id: 'test',
-                type: 'symbol',
-                minzoom: 6.5, //图片层级
-                source: {
-                    type: 'geojson',
-                    data: {
-                        type: 'FeatureCollection',
-                        features: []
-                    }
-                },
-                layout: {
-                    // 为图层设置引用的图片ID
-                    'icon-image': 'poi5',
-                    'icon-pitch-alignment': 'map', //贴地
-                    'icon-ignore-placement': true,
-                    'icon-allow-overlap': true,
-                    'icon-anchor': 'center', // 中心点
-                    'icon-size': ['interpolate', ['linear'], ['zoom'], 6, 0.1, 50, 1] // 图符大小
-                }
-            })
-        }
-    )
-    // 添加图片需要先注册图片才能加载
-    setTimeout(() => {
-        map.value.getSource('test').setData({
-            type: 'FeatureCollection',
-            features: [
-                {
-                    type: 'Feature',
-                    geometry: {
-                        type: 'Point',
-                        coordinates: [115.3544544, 40.217797]
-                    }
-                },
-                {
-                    type: 'Feature',
-                    geometry: {
-                        type: 'Point',
-                        coordinates: [115.4544544, 40.317797]
-                    }
-                }
-            ]
-        })
-    }, 1000)
 
-    // 地图连线
-    map.value.addLayer({
-        id: 'power-line',
-        type: 'line',
-        source: {
-            type: 'geojson',
-            data: {
-                type: 'FeatureCollection',
-                features: [
-                    {
-                        type: 'Feature',
-                        geometry: {
-                            type: 'MultiLineString', //MultiLineString3层数组可以绘制多条线  LineString2层数组
-                            coordinates: [
-                                [
-                                    [117, 39],
-                                    [116, 40]
-                                ],
-                                [
-                                    [116, 39],
-                                    [115, 40]
-                                ]
-                            ]
-                        }
-                    }
-                ]
-            }
-        },
-
-        paint: {
-            'line-color': '#ff0000',
-            'line-width': 3,
-            'line-opacity': 0.6
-        }
-    })
-    setTimeout(() => {
-        //先判断是否有图层 'power-line'是图层注册id
-        if (map.value.getLayer('power-line')) map.value.removeLayer('power-line')
-    }, 5000)
-}
+const PollutionList = dictData.getBasicData('Pollution_Calc').filter(item => item.name == '谐波电压')
 //添加多个监测点
 const addMarkers = async (row?: any, key?: any, num?: any) => {
     if (map.value == null) return
@@ -735,6 +735,8 @@ const addMarkers = async (row?: any, key?: any, num?: any) => {
         searchBeginTime: datePickerRef.value.timeValue[0],
         searchEndTime: datePickerRef.value.timeValue[1],
         serverName: 'event-boot',
+        dicData: [PollutionList[0].id],
+        isPollution: 1,
         statisticalType: {},
         ...row
     }
@@ -744,6 +746,8 @@ const addMarkers = async (row?: any, key?: any, num?: any) => {
     let r = 0.0035
     let tempFeatureZ: any = []
     let tempFeatureT: any = []
+
+    sourceList.value = []
     data.forEach((item: any) => {
         if (item.children.length > 10 && item.children.length < 100) {
             r = 0.0055
@@ -792,6 +796,31 @@ const addMarkers = async (row?: any, key?: any, num?: any) => {
                         break
                 }
             }
+            let num = 20
+            if (val.vharmonicValue > 10000) {
+                num = 100
+            } else if (val.vharmonicValue > 1000) {
+                num = 80
+            } else if (val.vharmonicValue > 100) {
+                num = 60
+            } else if (val.vharmonicValue > 0) {
+                num = 40
+            } else {
+                num = 20
+            }
+
+            sourceList.value.push({
+                type: 'Feature',
+                geometry: {
+                    type: 'Point',
+                    coordinates: [val.lng, val.lat]
+                },
+                properties: {
+                    value: val.vharmonicValue || 0
+                    // value: num //10 //val.vharmonicValue || 0
+                    // value: 0
+                }
+            })
         })
     })
 
@@ -856,7 +885,10 @@ const addMarkers = async (row?: any, key?: any, num?: any) => {
         type: 'FeatureCollection',
         features: [...tempFeatureT, ...tempFeatureZ]
     })
+    addSource()
+    //
 }
+
 // 统计弹框数据
 const GridDiagramArea = () => {
     LngLat.forEach((item: any) => {

src/views/pqs/qualityInspeection/panorama/components/mapL.vue

@@ -13,8 +13,10 @@
                     <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.3' : ''">
                         <div class="card">
                             <span style="cursor: pointer" @click="GridDiagram(i)">{{ item.title }}：</span>
-                            <span :style="`color: ${item.color[0]}; cursor:pointer`"
-                                @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)">
+                            <span
+                                :style="`color: ${item.color[0]}; cursor:pointer`"
+                                @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)"
+                            >
                                 {{ item.list[4].numOne }}
                             </span>
                         </div>
@@ -23,8 +25,10 @@
                 <!-- 监测规模 列表 -->
                 <div>
                     <div class="vcl mt5">
-                        <p v-for="(item, i) in vList"
-                            :style="i == 0 ? 'width: 60px' : i == 5 ? 'width: 32px' : 'flex:1'">
+                        <p
+                            v-for="(item, i) in vList"
+                            :style="i == 0 ? 'width: 60px' : i == 5 ? 'width: 32px' : 'flex:1'"
+                        >
                             {{ item }}
                         </p>
                     </div>
@@ -48,8 +52,10 @@
                         <p class="numOne" @click="LookMap(item.list[3].numOneList, item.list[3].numTwoList, 0)">
                             {{ item.list[3].numOne }}
                         </p>
-                        <p style="font-size: 12px; width: 32px; cursor: pointer; color: var(--el-color-primary)"
-                            @click.stop="open(i)">
+                        <p
+                            style="font-size: 12px; width: 32px; cursor: pointer; color: var(--el-color-primary)"
+                            @click.stop="open(i)"
+                        >
                             详情
                         </p>
                     </div>
@@ -66,28 +72,37 @@
                 <div :style="`height:calc(${boxHeight.height} + 20px);overflow-y: auto;`">
                     <div v-for="item in countList">
                         <div class="title mt5" style="font-weight: 500">
-                            <img src="@/assets/img/TJ.png" />
-                            {{ item.title }}
+                            <!-- <img src="@/assets/img/TJ.png" />
+                            {{ item.title }} -->
                         </div>
-                        <div class="card-Box" :style="`height:calc((${boxHeight.height} - 50px )/ 3);`"
-                            v-for="val in item.children">
+                        <div
+                            class="card-Box mt10"
+                            :style="`height:calc((${boxHeight.height} - 20px )/ 2);`"
+                            v-for="val in item.children"
+                        >
                             <div>
                                 <span class="line"></span>
                                 <span class="vol">{{ val.title }}</span>
                             </div>
-                            <div class="num">
+                            <div class="num num1">
                                 <div @click="LookMap(val.numList, [], 0)">
                                     投运:
                                     <span>{{ val.num }}</span>
                                 </div>
+
                                 <div @click="LookMap(val.onLineNumList, [], 0)">
                                     在线:
                                     <span style="color: #2dcd28">{{ val.onLineNum }}</span>
                                 </div>
+
                                 <div>
                                     数据完整性:
                                     <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
                                 </div>
+                                <div>
+                                    在线率:
+                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -117,7 +132,7 @@
                             </div>
                             <div>
                                 {{ item.title[2] }}:
-                                <span style="color: #A52a2a" @click="LookMap([], item.lineListTwo, 1)">
+                                <span style="color: #a52a2a" @click="LookMap([], item.lineListTwo, 1)">
                                     {{ item.lineNumTwo || 0 }}
                                 </span>
                             </div>
@@ -127,8 +142,12 @@
             </div>
         </div>
 
-        <img class="imgL" :style="show ? 'transform: rotate(0deg);' : 'transform: rotate(180deg);'"
-            @click="show = !show" src="@/assets/img/QH.png" />
+        <img
+            class="imgL"
+            :style="show ? 'transform: rotate(0deg);' : 'transform: rotate(180deg);'"
+            @click="show = !show"
+            src="@/assets/img/QH.png"
+        />
         <div class="legeng">
             <div v-for="item in legengList">
                 <span :style="`background-color: ${item.color};`"></span>
@@ -290,11 +309,11 @@ const countList: any = ref([
             },
             { title: '非电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }
         ]
-    },
-    {
-        title: '上送网公司',
-        children: [{ title: '电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }]
     }
+    // {
+    //     title: '上送网公司',
+    //     children: [{ title: '电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }]
+    // }
 ])
 const linList: any = ref([
     {
@@ -394,7 +413,7 @@ const info = async (row: any) => {
     getGridDiagramStatistics(form).then(res => {
         countList.value[0].children[0] = { title: '电网侧监测点', ...res.data.data[0] }
         countList.value[0].children[1] = { title: '非电网侧监测点', ...res.data.data[1] }
-        countList.value[1].children[0] = { title: '电网侧监测点', ...res.data.gwData[0] }
+        // countList.value[1].children[0] = { title: '电网侧监测点', ...res.data.gwData[0] }
     })
     // 监测运行统计
     getGridDiagramRunData(form).then(res => {
@@ -537,7 +556,7 @@ defineExpose({ info, show })
     background-color: #edededc0;
     border-radius: 10px;
     min-height: 60px;
-    max-height: 120px;
+    // max-height: 120px;
 
     .line {
         display: inline-block;
@@ -562,6 +581,19 @@ defineExpose({ info, show })
             font-weight: 550;
         }
     }
+    .num1 {
+        grid-template-columns: 1fr 1fr; /* 核心：改为2列，均分宽度 */
+        grid-template-rows: auto auto;
+        gap: 8px; /* 可选：子元素间距，提升美观度 */
+        div {
+            display: flex;
+            padding-left: 20px;
+            // justify-content: center;
+            span {
+                margin-left: 5px;
+            }
+        }
+    }
 }
 
 .BoxA {

src/views/pqs/qualityInspeection/panorama/components/mapR.vue

@@ -6,20 +6,20 @@
                 <div class="title">
                     <span>
                         稳态综合评估
-                        <el-popover placement="right" :width="150" trigger="hover">
+                        <el-popover placement="right" :width="190" trigger="hover">
                             <template #reference>
                                 <WarningFilled class="WarningFilled" />
                             </template>
                             <div class="text">
-                                <span style="color: #00b07d">优质：(4.5 , 5]</span>
+                                <span style="color: #00b07d">无污染：0</span>
                                 <br />
-                                <span style="color: #2b7fd3">良好：(4 , 4.5]</span>
+                                <span style="color: #3399ff">轻微污染：(0 , 100]</span>
                                 <br />
-                                <span style="color: #ffcc33">合格：(3 , 4]</span>
+                                <span style="color: #ffcc33">轻度污染：(100 , 1000]</span>
                                 <br />
-                                <span style="color: #97017e">较差：(2 , 3]</span>
+                                <span style="color: #ff9900">中度污染：(1000 , 10000]</span>
                                 <br />
-                                <span style="color: #A52a2a">极差：[1 , 2]</span>
+                                <span style="color: #a52a2a">重度污染：(10000</span>
                             </div>
                         </el-popover>
                     </span>
@@ -32,7 +32,7 @@
                     <img src="@/assets/img/FGX.png" />
                 </div>
                 <div class="mt10 TJTop">
-                    <img src="@/assets/img/TJ.png" />
+                    <!-- <img src="@/assets/img/TJ.png" />
                     综合评估得分：
                     <span
                         :style="{
@@ -53,35 +53,27 @@
                         }"
                     >
                         {{ assessList.score == 3.14159 ? '/' : assessList.score }}
-                        <!-- {{ assessList.level }} -->
-                    </span>
+                    
+                    </span> -->
                 </div>
                 <div class="evaluate">
-                    <div v-for="item in assessList.children" style="min-width: 50px">
+                    <div v-for="item in assessList" style="min-width: 60px">
                         <div>
-                            <span class="line"></span>
-                            {{ item.name }}
+                            <span
+                                class="line"
+                                :style="{
+                                    background: setColor(item.score)
+                                }"
+                            ></span>
+                            {{ item.deptName }}
                         </div>
                         <div
                             style="margin-top: 5px"
                             :style="{
-                                color:
-                                    item.score == 3.14159
-                                        ? ''
-                                        : item.score > 4.5
-                                        ? '#339966'
-                                        : item.score > 4
-                                        ? '#2b7fd3'
-                                        : item.score > 3
-                                        ? '#ffcc33'
-                                        : item.score > 2
-                                        ? '#97017e'
-                                        : item.score > 0
-                                        ? '#A52a2a'
-                                        : ''
+                                color: setColor(item.score)
                             }"
                         >
-                            {{ item.score == 3.14159 ? '/' : item.score }}
+                            {{ setVal(item.score) }}
                         </div>
                     </div>
                 </div>
@@ -259,6 +251,7 @@ import temporaryState from './details/temporaryState.vue'
 import technique from './details/technique.vue'
 import {
     getAssessOverview,
+    getAreaPollution,
     getEvaluationOverview,
     getEventLevelEvaluation,
     getSupervisionData
@@ -314,11 +307,10 @@ const options = ref([
     {
         label: '负序电流',
         value: '9'
-    },
-  
+    }
 ])
 const technology: any = ref({})
-const harmonicType = ref('0')
+const harmonicType = ref('6')
 const transientNum = ref([0, 0])
 const options1: any = dictData.getBasicData('Event_Statis').filter(item => {
     if (item.code == 'Voltage_Dip' || item.code == 'Voltage_Rise' || item.code == 'Short_Interruptions') {
@@ -364,17 +356,17 @@ const JDlist = ref([
     {
         name: '试运行问题',
         value: 0
-    },
-  
+    }
 ])
 const harmonicList: any = ref([])
 const harmonicLineRatio: any = ref(0)
 const WTList: any = ref([])
+const PollutionList = dictData.getBasicData('Pollution_Calc').filter(item => item.name == '谐波电压')
 
 const value = ref(options1[0].id)
 const open = (e: number) => {
     if (e == 0) {
-        evaluateRef.value.open(formRow.value)
+        evaluateRef.value.open(formRow.value,assessList.value)
     } else if (e == 1) {
         steadyStateRef.value.open(formRow.value)
     } else if (e == 2) {
@@ -383,6 +375,36 @@ const open = (e: number) => {
         techniqueRef.value.open(formRow.value)
     }
 }
+const setColor = val => {
+    return val == 3.14159
+        ? ''
+        : val > 10000
+        ? '#A52a2a'
+        : val > 1000
+        ? '#ff9900'
+        : val > 100
+        ? '#ffcc33'
+        : val > 0
+        ? '#3399ff'
+        : val == 0
+        ? '#00B07D'
+        : ''
+}
+const setVal = val => {
+    return val == 3.14159
+        ? '/'
+        : val > 10000
+        ? '重度污染'
+        : val > 1000
+        ? '中度污染'
+        : val > 100
+        ? '轻度污染'
+        : val > 0
+        ? '轻微污染'
+        : val == 0
+        ? '无污染'
+        : ''
+}
 const info = (row: any) => {
     let form = {
         ...row,
@@ -402,7 +424,7 @@ const info = (row: any) => {
     transientChange()
     // 综合评估
     setTimeout(() => {
-        getAssessOverview(form).then(res => {
+        getAreaPollution({ ...form, ids: [PollutionList[0].id] }).then(res => {
             assessList.value = res.data
         })
     }, 300)
@@ -413,7 +435,6 @@ const info = (row: any) => {
         JDlist.value[1].value = res.data?.onLineNum || 0
         JDlist.value[2].value = res.data?.userNum || 0
         JDlist.value[3].value = res.data?.trialRunNum || 0
-
     })
 }
 const harmonicChange = () => {
@@ -502,7 +523,7 @@ defineExpose({ info, show })
         width: 0.5rem;
         height: 0.5rem;
         border-radius: 0.25rem;
-        background: var(--el-color-primary);
+        // background: var(--el-color-primary);
         margin-right: 2px;
         margin-bottom: 1px;
     }

src/views/pqs/runManage/alarmCleaning/components/alarm.vue

@@ -2,7 +2,7 @@
     <div>
         <TableHeader date-picker area ref="TableHeaderRef">
             <template v-slot:select>
-                <el-form-item label="对象类型">
+                <!-- <el-form-item label="对象类型">
                     <el-select
                         v-model="tableStore.table.params.objType"
                         clearable
@@ -16,6 +16,16 @@
                             :value="item.id"
                         ></el-option>
                     </el-select>
+                </el-form-item> -->
+                <el-form-item label="运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                        <el-option
+                            v-for="item in runFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="终端厂家:">
                     <el-select
@@ -136,7 +146,7 @@
                         />
                     </el-form-item>
                     <el-form-item class="form_but">
-                        <el-button type="primary" @click="MonitorVerify" icon="el-icon-Refresh">更新</el-button>
+                        <el-button type="primary" @click="MonitorVerify" icon="el-icon-Search">查询</el-button>
                         <el-button type="primary" @click="onExport" icon="el-icon-Download">导出</el-button>
                     </el-form-item>
                 </el-form>
@@ -221,7 +231,13 @@ const mapList: any = ref([])
 const segmented = ref(1)
 const terminaloption = dictData.getBasicData('Dev_Manufacturers')
 const time = ref(['', ''])
-
+const runFlagList = [
+    { id: 0, name: '运行' },
+    { id: 1, name: '检修' },
+    { id: 2, name: '停运' },
+    { id: 3, name: '调试' },
+    { id: 4, name: '退运' }
+]
 const tableStore = new TableStore({
     url: '/device-boot/dataVerify/getMonitorLimitData',
     method: 'POST',
@@ -426,6 +442,7 @@ tableStore.table.params.objType = ''
 tableStore.table.params.alarmDayLimit = 5
 tableStore.table.params.warnDayLimit = 1
 tableStore.table.params.manufacturer = ''
+tableStore.table.params.lineRunFlag = 0
 const quantityClick = (e: any, num: number) => {
     if (num == 0 && e.ids?.length == 0) return
     alarmDetailsRef.value.open(e, time.value, num)
@@ -476,6 +493,7 @@ tableStore.table.params.name = ''
 provide('tableStore', tableStore)
 </script>
 <style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
 .card-list {
     display: flex;
     .monitoringPoints {

src/views/pqs/runManage/alarmCleaning/components/alarmDetails.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog draggable width="1350px" class="cn-operate-dialog" v-model="dialogVisible" :title="title">
-        <div style="display: flex">
+        <div style="display: flex" v-loading="loading">
             <div :style="height1" class="mr10 box" style="width: 500px">
                 <vxe-table
                     height="auto"
@@ -39,6 +39,7 @@
 
                     <vxe-column field="type" title="数据类型" width="105px" :formatter="formatter"></vxe-column>
                     <vxe-column field="val" title="值" width="85px" :formatter="formatter"></vxe-column>
+                    <vxe-column field="overLimitValue" title="限值" width="85px" :formatter="formatter"></vxe-column>
                 </vxe-table>
                 <div class="table-pagination">
                     <el-pagination
@@ -68,6 +69,7 @@ const height1 = mainHeight(-110, 2)
 const height = mainHeight(10, 2)
 const tableRef = ref()
 const title = ref('')
+const loading = ref(false)
 const loading1 = ref(false)
 const TableData = ref([])
 const TableData1 = ref([])
@@ -78,6 +80,7 @@ const targetKey = ref('')
 const clickRow = ref({})
 const open = (data: anyObj, time: string[], num: number) => {
     // title.value = (num == 0 ? data.targetName : data.monitorName) + '_告警详情展示'
+    loading.value = true
     title.value = '告警监测点详情'
     numKey.value = num
     targetKey.value = data.key
@@ -87,10 +90,15 @@ const open = (data: anyObj, time: string[], num: number) => {
         targetKey: num == 0 ? data.key : '',
         searchBeginTime: time[0],
         searchEndTime: time[1]
-    }).then(res => {
+    })
+       .then(async(res) => {
             TableData.value = res.data
-        tableRef.value.setCurrentRow(TableData.value[0])
-        currentChangeEvent()
+           await tableRef.value.setCurrentRow(TableData.value[0])
+           await currentChangeEvent()
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
         })
     dialogVisible.value = true
 }
@@ -137,7 +145,7 @@ defineExpose({ open })
 }
 :deep(.box) {
     .row--current {
-        background-color: var(--el-color-primary-light-8) !important;
+//background-color: var(--el-color-primary-light-8) !important;
     }
 }
 </style>

src/views/pqs/runManage/assessment/components/assess/index.vue

@@ -7,14 +7,16 @@
                     @node-click="handleNodeClick"
                     @init="handleNodeClick"
                     ref="assessTreeRef"
-                  :highlight-current = 'true'
+                    :highlight-current="true"
                     :current-node-key="currentTreeKey"
                     :expand-on-click-node="false"
                 ></AssessTree>
             </pane>
             <pane style="background: #fff">
                 <div class="actionButtons mb10">
-                <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"  :loading="loading">模版下载</el-button>
+                    <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate" :loading="loading">
+                        模版下载
+                    </el-button>
                     <el-button type="primary" icon="el-icon-Upload" @click="handleImportClick">导入数据背景</el-button>
                     <el-button type="primary" icon="el-icon-Memo" class="ml10" @click="assess2">评估</el-button>
                     <el-button type="primary" icon="el-icon-Download" @click="exportReport">导出报告</el-button>
@@ -30,7 +32,7 @@
                                 <information
                                     v-show="!infoLoading"
                                     :node-id="currentNodeId"
-                              @data-loaded="() => infoLoading = false" 
+                                    @data-loaded="() => (infoLoading = false)"
                                 />
                             </div>
                         </el-collapse-item>
@@ -44,8 +46,7 @@
                                     v-show="!outcomeLoading"
                                     :node-id="currentNodeId"
                                     @data-status="handleDataStatus"
-                              @data-loaded="() => outcomeLoading = false" 
-                
+                                    @data-loaded="() => (outcomeLoading = false)"
                                 />
                             </div>
                         </el-collapse-item>
@@ -56,7 +57,6 @@
     </div>
 
     <AssessTemplate ref="assessTemplate" @data-success="assess"></AssessTemplate>
-
 </template>
 
 <script setup lang="ts">
@@ -75,14 +75,13 @@ import { Loading } from '@element-plus/icons-vue'
 import AssessTemplate from './assessTemplate.vue'
 import { fa, tr } from 'element-plus/es/locale'
 
-
 defineOptions({
     // name: 'harmonic-boot/report/word'
 })
 const collapseName = ref([1, 2])
 const height = mainHeight(80)
 const collapseHeight = mainHeight(125)
-const size = ref(0)
+const size = ref(23)
 const dotList: any = ref({})
 const infoLoading = ref(false)
 const outcomeLoading = ref(false)
@@ -92,7 +91,6 @@ const assessTemplate = ref()
 const currentNodeId = ref<string | number | null>(null)
 const currentNodeName = ref('')
 
-
 const tableStore = new TableStore({
     url: '',
     method: 'POST',
@@ -145,8 +143,10 @@ const exportReport = () => {
         duration: 0 // 不自动关闭
     })
 
-  exportResult({}, currentNodeId.value ?? '').then((res: any) => {
-      let blob = new Blob([res], {  // 注意使用 res.data 而不是 res
+    exportResult({}, currentNodeId.value ?? '')
+        .then((res: any) => {
+            let blob = new Blob([res], {
+                // 注意使用 res.data 而不是 res
                 type: 'application/vnd.ms-excel'
             })
             const url = window.URL.createObjectURL(blob)
@@ -161,14 +161,14 @@ const exportReport = () => {
             // 关闭加载提示并显示成功消息
             loadingMessage.close()
             ElMessage.success('导出成功！')
-  }).catch(error => {
+        })
+        .catch(error => {
             // 处理导出失败情况
             loadingMessage.close()
             ElMessage.error('导出失败，请重试！')
         })
 }
 
-
 //导入
 const handleImportClick = () => {
     if (!currentNodeId.value) {
@@ -178,7 +178,6 @@ const handleImportClick = () => {
     assessTemplate.value.open('导入背景数据', currentNodeId.value.toString())
 }
 
-
 // 导入弹窗关闭后通知父组件更新
 const assess = async () => {
     // 展开评估结果
@@ -205,56 +204,60 @@ const assess2 = async () => {
         duration: 0 // 不自动关闭
     })
 
-  userGetInfo({ assessId: currentNodeId.value }).then(res => {
+    userGetInfo({ assessId: currentNodeId.value })
+        .then(res => {
             // 获取昨天的日期
-    const yesterday = new Date();
-    yesterday.setDate(yesterday.getDate() - 1);
+            const yesterday = new Date()
+            yesterday.setDate(yesterday.getDate() - 1)
 
             // 格式化为 yyyy-MM-dd
-    const yyyy = yesterday.getFullYear();
-    const mm = String(yesterday.getMonth() + 1).padStart(2, '0');
-    const dd = String(yesterday.getDate()).padStart(2, '0');
-    const yesterdayStr = `${yyyy}-${mm}-${dd}`;
+            const yyyy = yesterday.getFullYear()
+            const mm = String(yesterday.getMonth() + 1).padStart(2, '0')
+            const dd = String(yesterday.getDate()).padStart(2, '0')
+            const yesterdayStr = `${yyyy}-${mm}-${dd}`
 
             const assessData = {
                 assessId: currentNodeId.value,
                 endTime: `${yesterdayStr} 23:59:59`, // 使用动态的昨天日期
                 id: res.data.lineId,
                 startTime: `${yesterdayStr} 00:00:00` // 使用动态的昨天日期
-  };
+            }
 
-    assessResult(assessData).then(res => {
+            assessResult(assessData)
+                .then(res => {
                     // 关闭加载提示并显示成功消息
-      loading.close();
-      ElMessage.success('评估成功！');
+                    loading.close()
+                    ElMessage.success('评估成功！')
 
                     // 展开评估结果
-      collapseName.value = [2];
+                    collapseName.value = [2]
                     // 更新评估状态
-      result.value = true;
+                    result.value = true
 
-      const tempId = currentNodeId.value;
-      currentNodeId.value = null; // 先置空
+                    const tempId = currentNodeId.value
+                    currentNodeId.value = null // 先置空
                     setTimeout(() => {
-        currentNodeId.value = tempId; // 再恢复，触发 watch
-      }, 0);
-    }).catch(error => {
+                        currentNodeId.value = tempId // 再恢复，触发 watch
+                    }, 0)
+                })
+                .catch(error => {
                     // 关闭加载提示并显示失败消息
-      loading.close();
-      ElMessage.error('评估失败');
-    });
-  }).catch(error => {
+                    loading.close()
+                    ElMessage.error('评估失败')
+                })
+        })
+        .catch(error => {
             // 处理 userGetInfo 的错误
-    loading.close();
-    ElMessage.error('获取用户信息失败');
-  });
-};
+            loading.close()
+            ElMessage.error('获取用户信息失败')
+        })
+}
 
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     setTimeout(() => {
         if (dom) {
-          size.value = Math.round((180 / dom.offsetHeight) * 100)
+            size.value = Math.round((180 / dom.offsetHeight) * 120)
         }
     }, 100)
 })
@@ -268,17 +271,17 @@ const lastValidNodeKey = ref<string | number | null>(null)
 
 const handleNodeClick = (data: any, node: any) => {
     // 阻止点击父节点的逻辑处理
-if (!data || 
+    if (
+        !data ||
         (node && !node.isLeaf) ||
         (data.children && data.children.length > 0) ||
-    (node && node.childNodes && node.childNodes.length > 0)) {
-  
+        (node && node.childNodes && node.childNodes.length > 0)
+    ) {
         // 点击父节点时，保持树的高亮状态为上一次有效的子节点
         currentTreeKey.value = lastValidNodeKey.value
         return
     }
 
-
     // 如果点击的是同一个节点，不需要重新加载，但可以提供刷新功能
     if (currentNodeId.value === data?.id) {
         // 可选：如果你希望重复点击能刷新数据，可以保留下面的代码
@@ -318,7 +321,6 @@ outcomeLoading.value = true
         content: '▍'; /* 添加星号 */
         font-size: 16px;
         color: var(--el-color-primary);
-
     }
 }
 
@@ -344,7 +346,6 @@ margin-left: 8px;
     color: #606266;
 }
 
-
 .is-loading {
     animation: rotating 2s linear infinite;
 }

src/views/pqs/runManage/cleaning/components/abnormal.vue

@@ -2,7 +2,7 @@
     <div>
         <TableHeader date-picker area ref="TableHeaderRef">
             <template v-slot:select>
-                <el-form-item label="对象类型">
+                <!-- <el-form-item label="对象类型">
                     <el-select
                         v-model="tableStore.table.params.objType"
                         clearable
@@ -16,6 +16,16 @@
                             :value="item.id"
                         ></el-option>
                     </el-select>
+                </el-form-item> -->
+                 <el-form-item label="运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                        <el-option
+                            v-for="item in runFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="终端厂家:">
                     <el-select v-model="tableStore.table.params.manufacturer" clearable placeholder="请选择终端厂家">
@@ -99,13 +109,13 @@
                         </el-segmented>
                     </div>
                     <div class="header">
-                        <span style="width: 170px; text-align: left">指标名称</span>
+                        <span style="width: 165px; text-align: left">指标名称</span>
                         <span style="flex: 1">合理范围</span>
-                        <span style="width: 90px">异常测点数</span>
+                        <span style="width: 80px">异常测点数</span>
                     </div>
                     <div :style="indicatorHeight" style="overflow-y: auto">
                         <div v-for="o in abnormal.filter(item => item.remark == segmented)" class="abnormal mb10">
-                            <span style="width: 170px; height: 24px" class="iconDiv">
+                            <span style="width: 165px; height: 24px" class="iconDiv">
                                 <div :style="{ backgroundColor: o.ids.length > 0 ? '#FF9100' : '' }"></div>
                                 {{ o.targetName }}
                             </span>
@@ -113,7 +123,7 @@
                                 <!-- 合理范围： -->
                                 <span style="color: #388e3c" class="text">{{ o.rangeDesc }}</span>
                             </span>
-                            <span style="width: 90px; text-align: center">
+                            <span style="width: 80px; text-align: center">
                                 <span
                                     style="color: #388e3c"
                                     :class="` ${o.ids.length > 0 ? 'text-red' : ''}`"
@@ -173,26 +183,26 @@
                                 </span>
                             </template>
                         </vxe-column>
-                        <vxe-column field="monitorName" title="监测点名称"></vxe-column>
-                        <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
-                        <vxe-column field="devName" title="所属终端名称"></vxe-column>
+                        <vxe-column field="monitorName" title="监测点名称" minWidth="110px"></vxe-column>
+                        <vxe-column field="manufacturer" title="终端厂家" minWidth="110px"></vxe-column>
+                        <vxe-column field="devName" title="所属终端名称" minWidth="110px"></vxe-column>
                         <vxe-column field="ip" title="IP">
                             <template #default="{ row }">
                                 {{ decryptFromBase64(row.ip) }}
                             </template>
                         </vxe-column>
-                        <vxe-column field="stationName" title="所属电站"></vxe-column>
-                        <vxe-column field="objType" title="监测对象类型" :formatter="formatter"></vxe-column>
-                        <vxe-column field="objName" title="监测对象名称" :formatter="formatter"></vxe-column>
-                        <vxe-column field="voltageLevel" title="电压等级"></vxe-column>
-                        <vxe-column field="abnormalDay" title="异常天数">
+                        <vxe-column field="stationName" title="所属电站" minWidth="110px"></vxe-column>
+                        <vxe-column field="objType" title="监测对象类型" :formatter="formatter" minWidth="110px"></vxe-column>
+                        <vxe-column field="objName" title="监测对象名称" :formatter="formatter" minWidth="110px"></vxe-column>
+                        <vxe-column field="voltageLevel" title="电压等级" minWidth="80px"></vxe-column>
+                        <vxe-column field="abnormalDay" title="异常天数" width="80px">
                             <template #default="{ row }">
                                 <span class="table_name" @click="quantityClick(row, 1)">
                                     {{ row.abnormalDay }}
                                 </span>
                             </template>
                         </vxe-column>
-                        <vxe-column field="abnormalDay" title="严重度">
+                        <vxe-column field="abnormalDay" title="严重度" width="80px">
                             <template #default="{ row }">
                                 <el-tag type="warning" v-if="row.severity == 0">预警</el-tag>
                                 <el-tag type="danger" v-if="row.severity == 1">告警</el-tag>
@@ -256,6 +266,14 @@ const segmentedList = ref([
         num: 0
     }
 ])
+//定义监测点运行状态下拉框数据
+const runFlagList = [
+    { id: 0, name: '运行' },
+    { id: 1, name: '检修' },
+    { id: 2, name: '停运' },
+    { id: 3, name: '调试' },
+    { id: 4, name: '退运' }
+]
 const tableStore = new TableStore({
     url: '/device-boot/dataVerify/getMonitorVerifyData',
     method: 'POST',
@@ -467,7 +485,7 @@ tableStore.table.params.objType = ''
 tableStore.table.params.alarmDayLimit = 5
 tableStore.table.params.warnDayLimit = 1
 tableStore.table.params.manufacturer = ''
-
+tableStore.table.params.lineRunFlag = 0
 const quantityClick = (e: any, num: number) => {
     if (num == 0 && e.ids?.length == 0) return
     anomalyDetailsRef.value.open(e, time.value, num)
@@ -518,6 +536,7 @@ tableStore.table.params.name = ''
 provide('tableStore', tableStore)
 </script>
 <style lang="scss" scoped>
+@import '@/assets/font/iconfont.css';
 .card-list {
     display: flex;
     .monitoringPoints {

src/views/pqs/runManage/cleaning/components/anomalyDetails.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog draggable width="1550px" class="cn-operate-dialog" v-model="dialogVisible" :title="title">
-        <div style="display: flex">
+        <div style="display: flex" v-loading="loading">
             <div :style="height1" class="mr10 box" style="width: 600px">
                 <vxe-table
                     height="auto"
@@ -38,10 +38,41 @@
                         </template>
                     </vxe-column>
                     <vxe-column field="rangeDesc" title="合理范围" min-width="90px"></vxe-column>
-                    <vxe-column field="max" title="最大" width="85px" :formatter="formatter"></vxe-column>
-                    <vxe-column field="min" title="最小" width="85px" :formatter="formatter"></vxe-column>
-                    <vxe-column field="avg" title="平均" width="85px" :formatter="formatter"></vxe-column>
-                    <vxe-column field="cp95" title="CP95" width="85px" :formatter="formatter"></vxe-column>
+                    <vxe-column
+                        field="max"
+                        title="最大"
+                        width="85px"
+                        :formatter="formatter"
+                        v-if="showColumn"
+                    ></vxe-column>
+                    <vxe-column
+                        field="min"
+                        title="最小"
+                        width="85px"
+                        :formatter="formatter"
+                        v-if="showColumn"
+                    ></vxe-column>
+                    <vxe-column
+                        field="avg"
+                        title="平均"
+                        width="85px"
+                        :formatter="formatter"
+                        v-if="showColumn"
+                    ></vxe-column>
+                    <vxe-column
+                        field="cp95"
+                        title="CP95"
+                        width="85px"
+                        :formatter="formatter"
+                        v-if="showColumn"
+                    ></vxe-column>
+                    <vxe-column
+                        field="featureAmplitude"
+                        title="幅值"
+                        width="85px"
+                        :formatter="formatter"
+                        v-if="!showColumn"
+                    ></vxe-column>
                 </vxe-table>
                 <div class="table-pagination">
                     <el-pagination
@@ -69,6 +100,7 @@ const height1 = mainHeight(-110, 2)
 const height = mainHeight(10, 2)
 const tableRef = ref()
 const title = ref('')
+const loading = ref(false)
 const loading1 = ref(false)
 const TableData = ref([])
 const TableData1 = ref([])
@@ -76,8 +108,10 @@ const pageNum = ref(1)
 const pageSize = ref(20)
 const numKey = ref(0)
 const targetKey = ref('')
+const showColumn = ref(true)
 const open = (data: anyObj, time: string[], num: number) => {
     // title.value = (num == 0 ? data.targetName : data.monitorName) + '_异常监测点详情'
+    loading.value = true
     title.value = '异常监测点详情'
     TableData.value = []
     numKey.value = num
@@ -87,10 +121,15 @@ const open = (data: anyObj, time: string[], num: number) => {
         targetKey: num == 0 ? data.key : '',
         searchBeginTime: time[0],
         searchEndTime: time[1]
-    }).then(res => {
+    })
+        .then(async res => {
             TableData.value = res.data
-        tableRef.value.setCurrentRow(TableData.value[0])
-        currentChangeEvent()
+            await tableRef.value.setCurrentRow(TableData.value[0])
+            await currentChangeEvent()
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
         })
     dialogVisible.value = true
 }
@@ -105,6 +144,7 @@ const currentChangeEvent = () => {
     })
         .then(res => {
             TableData1.value = res.data
+            showColumn.value = res.data[0]?.featureAmplitude == null ? true : false
             loading1.value = false
             pageNum.value = 1
         })
@@ -131,7 +171,7 @@ defineExpose({ open })
 }
 :deep(.box) {
    .row--current {
-        background-color: var(--el-color-primary-light-8) !important;
+//    background-color: var(--el-color-primary-light-8) !important;
     }
 }
 </style>

src/views/pqs/runManage/runEvaluate/components/statistics_JB.vue

@@ -0,0 +1,121 @@
+<template>
+    <div style="height: 145px" class="box1">
+        <!-- <div class="boxDiv hexagon">
+            <div class="text-style" @click="change('')">{{ props.params.allNum }}</div>
+            <div class="mt10 divBot">总数</div>
+        </div>
+        <div class="boxDiv hexagon hexagon1">
+            <div class="text-style" @click="change('运行')">{{ props.params.runNum }}</div>
+            <div class="mt10 divBot">在运</div>
+        </div>
+        <div class="boxDiv hexagon hexagon2">
+            <div class="text-style" @click="change('调试')">{{ props.params.checkNum }}</div>
+            <div class="mt10 divBot">调试</div>
+        </div>
+        <div class="boxDiv hexagon hexagon3">
+            <div class="text-style" @click="change('停运')">{{ props.params.stopRunNum }}</div>
+            <div class="mt10 divBot">停运</div>
+        </div> -->
+        <div class="statistics">
+            <div class="divBox div1">
+                <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                <span class="divBox_title">终端总数</span>
+                <span class="divBox_num text-style" style="color: #57bc6e" @click="change('')">
+                    {{ props.params.allNum }}
+                </span>
+            </div>
+            <div class="divBox div2" style="width: 210px">
+                <span class="iconfont icon-zaiyunshebei" style="color: #67c23a"></span>
+                <span class="divBox_title">在运终端数</span>
+                <span class="divBox_num text-style" style="color: #67c23a" @click="change('运行')">
+                    {{ props.params.runNum }}
+                </span>
+            </div>
+        </div>
+        <div class="statistics">
+            <div class="divBox div3">
+                <span class="iconfont icon-yichanglei_14feizhinengbiaozaiyunyichang" style="color: #ffbf00"></span>
+                <span class="divBox_title">调试终端数</span>
+                <span class="divBox_num text-style" style="color: #ffbf00" @click="change('调试')">
+                    {{ props.params.checkNum }}
+                </span>
+            </div>
+            <div class="divBox div4" style="width: 210px">
+                <span class="iconfont icon-tingyunshijianguanli" style="color: #f56c6c"></span>
+                <span class="divBox_title">停运终端数</span>
+                <span class="divBox_num text-style" style="color: #f56c6c" @click="change('停运')">
+                    {{ props.params.stopRunNum }}
+                </span>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import MyEChart from '@/components/echarts/MyEchart.vue'
+import { mainHeight } from '@/utils/layout'
+import { color } from '@/components/echarts/color'
+const emit = defineEmits(['change'])
+const height = mainHeight(330, 3)
+const props = defineProps({
+    params: {
+        type: Object,
+        default: () => {}
+    }
+})
+const change = (e: string) => {
+    emit('change', e)
+}
+const info = () => {}
+onMounted(() => {
+    info()
+})
+</script>
+<style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
+.statistics {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    margin-bottom: 10px;
+    .divBox {
+        width: 210px;
+        height: 70px;
+        padding: 10px;
+        display: flex;
+
+        .iconfont {
+            font-size: 40px;
+            margin-right: 5px;
+        }
+        .divBox_title {
+            font-weight: 550;
+        }
+        .divBox_num {
+            font-size: 20px;
+            font-weight: 550;
+            margin-left: auto;
+            font-family: AlimamaDongFangDaKai;
+        }
+        align-items: center;
+        // text-align: center;
+        border-radius: 5px;
+    }
+    .div1 {
+        background-color: #eef8f0;
+    }
+    .div2 {
+        background-color: #67c23a24;
+    }
+    .div3 {
+        background-color: #ffbf0024;
+    }
+    .div4 {
+        background-color: #f56c6c24;
+    }
+}
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+}
+</style>

src/views/pqs/runManage/runEvaluate/index_JB.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker ref="TableHeaderRef" :dateLabel="`数据统计时间`">
+        <TableHeader date-picker ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="运行状态">
                     <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
@@ -12,8 +12,8 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="筛选">
-                    <el-input v-model="tableStore.table.params.filterName" placeholder="输入关键字筛选" />
+                <el-form-item label="筛选数据">
+                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入终端名称" />
                 </el-form-item>
             </template>
 
@@ -23,7 +23,7 @@
         </TableHeader>
         <div class="card-list pt10" v-loading="tableStore.table.loading">
             <div class="monitoringPoints">
-                <el-card style="height: 200px">
+                <el-card style="height: 215px">
                     <template #header>
                         <div class="card-header">
                             <span>终端统计</span>
@@ -68,7 +68,7 @@
                         <span style="width: 90px">终端总数</span>
                         <span style="flex: 1">完整性(%)</span>
                         <span style="width: 80px">在线率(%)</span>
-                        <span style="width: 80px">合格率(%)</span>
+                        <span style="width: 80px">异常率(%)</span>
                     </div>
                     <div :style="indicatorHeight" style="overflow-y: auto">
                         <div v-for="o in abnormal" class="abnormal mb10">
@@ -86,7 +86,7 @@
                             </span>
                             <!--  -->
                             <span
-                                style="flex: 1; color: #ff9100"
+                                style="flex: 1; color: #388e3c"
                                 class="text"
                                 :class="` ${o.integrity  < 90 ? 'text-red' : ''}`"
                             >
@@ -101,7 +101,7 @@
                             </span>
                             <span
                                 style="width: 80px; color: #388e3c"
-                                :class="` ${o.qualified < 90 ? 'text-red' : ''}`"
+                                :class="` ${o.qualified > 10 ? 'text-red' : ''}`"
                                 class="text"
                             >
                                 {{ o.qualified }}
@@ -138,11 +138,11 @@
                                 </span>
                             </template>
                         </vxe-column>
-                        <vxe-column field="cit" title="所在地市" width="110px"></vxe-column>
-                        <vxe-column field="company" title="供电公司"></vxe-column>
-                        <vxe-column field="subName" title="变电站"></vxe-column>
-                        <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
-                        <vxe-column field="name" title="终端名称"></vxe-column>
+                        <vxe-column field="cit" title="所在地市" minWidth="110px"></vxe-column>
+                        <vxe-column field="company" title="供电公司"  minWidth="110px"></vxe-column>
+                        <vxe-column field="subName" title="变电站" minWidth="110px"></vxe-column>
+                        <vxe-column field="manufacturer" title="终端厂家" minWidth="110px"></vxe-column>
+                        <vxe-column field="name" title="终端名称" minWidth="110px"></vxe-column>
                         <vxe-column field="ip" title="终端IP" :formatter="formatter" width="130px" ></vxe-column>
                         <vxe-column field="runFlag" title="运行状态" width="100px">
                             <template #default="{ row }">
@@ -165,7 +165,7 @@
                         </vxe-column>
                         <vxe-column field="integrityRate" title="完整性(%)" width="100px"></vxe-column>
                         <vxe-column field="onLineRate" title="在线率(%)" width="100px"></vxe-column>
-                        <vxe-column field="passRate" title="合格率(%)" width="100px"></vxe-column>
+                        <vxe-column field="passRate" title="异常率(%)" width="100px"></vxe-column>
                     </vxe-table>
                 </div>
                 <div class="table-pagination">
@@ -191,7 +191,7 @@ import { onMounted, provide, ref } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
-import statistics from './components/statistics.vue'
+import statistics from './components/statistics_JB.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { getMonitorVerifyDay } from '@/api/device-boot/dataVerify'
 defineOptions({
@@ -201,7 +201,7 @@ defineOptions({
 const dictData = useDictData()
 //字典获取监督对象类型
 const pageHeight = mainHeight(97)
-const indicatorHeight = mainHeight(447)
+const indicatorHeight = mainHeight(462)
 const monitoringPoints = ref({
     runNum: 0,
     abnormalNum: 0,
@@ -269,7 +269,13 @@ const tableStore = new TableStore({
         statisticsList.value.checkNum = totalData.value.filter(item => item.runFlag === '调试').length
         statisticsList.value.stopRunNum = totalData.value.filter(item => item.runFlag === '停运').length
 
-        abnormal.value = tableStore.table.data
+        abnormal.value = tableStore.table.data.filter((k: any) => {
+            if (tableStore.table.params.statisticalType.name == '终端厂家') {
+                return k.count != 0
+            } else {
+                return k.name != '上送国网' && k.name != '非上送国网'
+            }
+        })
         // 合并子集数据 并去重
 
         totalTable(101, '')
@@ -404,7 +410,8 @@ const echart = () => {
     }
 }
 tableStore.table.params.deptIndex = dictData.state.area[0].id
-tableStore.table.params.lineRunFlag = ''
+tableStore.table.params.lineRunFlag = 0
+tableStore.table.params.searchValue = ''
 
 const formatter = (row: any) => {
     return row.cellValue || '/'
@@ -484,7 +491,7 @@ provide('tableStore', tableStore)
             justify-content: space-between;
             margin-bottom: 10px;
             .divBox {
-                width: 200px;
+                width: 215x;
                 height: 70px;
                 padding: 10px;
                 display: flex;

src/views/pqs/supervise/electricalEnergy/components1/complaints.vue

@@ -6,8 +6,12 @@
         <template v-slot:select>
             <el-form-item label="是否解决">
                 <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
-          <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
-            :value="item.value"></el-option>
+                    <el-option
+                        v-for="item in dealStateList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
                 </el-select>
             </el-form-item>
         </template>
@@ -31,7 +35,8 @@ import { useDictData } from '@/stores/dictData'
 import complaintsForm from './form/complaintsForm.vue'
 import { useRouter } from 'vue-router'
 import { sureInitiateWarningLeaflet } from '@/api/process-boot/electricitymanagement'
-import detail from './complaintsDetail.vue';
+import detail from './complaintsDetail.vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 // Steady_Statis
 const dictData = useDictData()
 const exceeded = dictData.getBasicData('Steady_Statis')
@@ -45,8 +50,7 @@ const dealStateList = ref([
     {
         label: '未解决',
         value: '0'
-  },
-
+    }
 ])
 const tableStore = new TableStore({
     url: '/supervision-boot/SupervisionUserComplaint/list',
@@ -85,13 +89,11 @@ const tableStore = new TableStore({
             render: 'tag',
             custom: {
                 0: 'warning',
-        1: 'primary',
-
+                1: 'primary'
             },
             replaceValue: {
                 0: '否',
-        1: '是',
-
+                1: '是'
             }
         },
 
@@ -153,7 +155,6 @@ const tableStore = new TableStore({
                             ElMessage.success('发起告警单成功！')
                             tableStore.index()
                         })
-
                     }
                 },
                 {
@@ -169,10 +170,8 @@ const tableStore = new TableStore({
                     click: row => {
                         detailRef.value.open({
                             row: row,
-              title: '详情',
-
+                            title: '详情'
                         })
-
                     }
                 },
                 {
@@ -186,9 +185,9 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         router.push({
-              name: 'supervision/supervision/manage',
+                             name: 'supervision/supervision/manage' + (VITE_FLAG ? '4' : ''),
                             query: {
-                type: 1,
+                                type: 4,
                                 t: Date.now()
                             }
                         })

src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue

@@ -82,7 +82,7 @@ const dialogVisible = ref(false)
 const title: any = ref('')
 const industry = dictData.getBasicData('Business_Type')
 const form: any = ref({})
-const exceeded = dictData.getBasicData('Indicator_Type')
+const exceeded = dictData.getBasicData('Steady_Statis')
 const loading = ref(false)
 const resetForm = () => {
     form.value = {

src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue

@@ -1,6 +1,6 @@
 <template>
-    <el-dialog draggable v-model="dialogVisible"  v-loading="loading" :title="title" width="80%" :before-close="handleClose">
-        <div style="height: 45vh">
+    <el-dialog draggable v-model="dialogVisible"   :title="title" width="80%" :before-close="handleClose">
+        <div style="height: 45vh"  v-loading="loading">
             <vxe-table show-overflow v-bind="defaultAttribute" :data="List">
                 <vxe-column field="time" title="日期" width="230px"></vxe-column>
                 <vxe-column field="overLimitInfo" title="越限详情"></vxe-column>

src/views/pqs/supervise/electricalEnergy/components1/online.vue

@@ -86,7 +86,7 @@ import {ElMessage, ElMessageBox} from 'element-plus'
 import { useDictData } from '@/stores/dictData'
 import alarmList from './form/alarmList.vue'
 import detail from './form/detail.vue'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const dictData = useDictData()
 import { useRouter } from 'vue-router'
 
@@ -194,9 +194,9 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         router.push({
-              name: 'supervision/supervision/manage',
+                            name: 'supervision/supervision/manage' + (VITE_FLAG ? '3' : ''),
                             query: {
-                type: 0,
+                                type: 3,
                                 t: Date.now()
                             }
                         })
@@ -213,9 +213,9 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         router.push({
-              name: 'supervision/supervision/manage',
+                            name: 'supervision/supervision/manage' + (VITE_FLAG ? '4' : ''),
                             query: {
-                type: 1,
+                                type: 4,
                                 t: Date.now()
                             }
                         })

src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue

@@ -3,13 +3,21 @@
     <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
         <template v-slot:select>
             <el-form-item label="计划名称">
-        <el-input style="width: 200px" v-model="tableStore.table.params.searchValue" clearable
-          placeholder="请输入计划名称"></el-input>
+                <el-input
+                    style="width: 200px"
+                    v-model="tableStore.table.params.searchValue"
+                    clearable
+                    placeholder="请输入计划名称"
+                ></el-input>
             </el-form-item>
             <el-form-item label="是否解决">
                 <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
-          <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
-            :value="item.value"></el-option>
+                    <el-option
+                        v-for="item in dealStateList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
                 </el-select>
             </el-form-item>
         </template>
@@ -32,7 +40,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
 import { useDictData } from '@/stores/dictData'
 import detail from '@/views/pqs/supervise/harmonicSurvey/test/detail.vue'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const dictData = useDictData()
 const { push } = useRouter()
 const router = useRouter() // 路由对象
@@ -151,9 +159,9 @@ const tableStore = new TableStore({
           },
           click: row => {
             router.push({
-              name: 'supervision/supervision/manage',
+                name: 'supervision/supervision/manage' + (VITE_FLAG ? '4' : ''),
               query: {
-                type: 1,
+                type: 4,
                 t: Date.now()
               }
             })

src/views/pqs/supervise/electricalEnergy/components1/testRun.vue

@@ -5,13 +5,22 @@
             <template #select>
                 <el-form-item label="流程状态">
                     <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-            <el-option v-for="item in statusSelect" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                        <el-option
+                            v-for="item in statusSelect"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="是否解决">
                     <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
-            <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
-              :value="item.value"></el-option>
+                        <el-option
+                            v-for="item in dealStateList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
             </template>
@@ -35,7 +44,7 @@ import { VxeTablePropTypes } from 'vxe-table'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import detail from './testRunDetail.vue'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const dictData = useDictData()
 const statusSelect = dictData.statusSelect()
 const { push } = useRouter()
@@ -218,9 +227,9 @@ const tableStore = new TableStore({
           },
           click: row => {
             push({
-              name: 'supervision/supervision/manage',
+              name: 'supervision/supervision/manage' + (VITE_FLAG ? '4' : ''),
               query: {
-                type: 1,
+                type: 4,
                 t: Date.now()
               }
             })

src/views/pqs/supervise/electricalEnergy/index.vue

@@ -1,16 +1,16 @@
 <template>
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
-            <el-tab-pane label="在线监测" name="1">
+            <el-tab-pane label="在线监测问题" name="1" v-if="tabList.includes('1')">
                 <online v-if="activeName == '1'" />
             </el-tab-pane>
-            <el-tab-pane label="用户投诉" name="2">
+            <el-tab-pane label="用户投诉问题" name="2" v-if="tabList.includes('2')">
                 <complaints v-if="activeName == '2'" />
             </el-tab-pane>
-            <el-tab-pane label="计划问题" name="3">
+            <el-tab-pane label="计划实施问题" name="3" v-if="tabList.includes('3')">
                 <testQuestions v-if="activeName == '3'" />
             </el-tab-pane>
-            <el-tab-pane label="试运行评估问题" name="4">
+            <el-tab-pane label="试运行评估" name="4" v-if="tabList.includes('4')">
                 <testRun v-if="activeName == '4'" />
             </el-tab-pane>
             <!-- <el-tabs v-model="activeName" type="border-card">
@@ -30,14 +30,23 @@ import online from './components1/online.vue'
 import complaints from './components1/complaints.vue'
 import testQuestions from './components1/testQuestions.vue'
 import testRun from './components1/testRun.vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 // import maintenance from './components/maintenance.vue'
 // import audit from './components/audit.vue'
 import { mainHeight } from '@/utils/layout'
 defineOptions({
     name: 'supervision/electricitymanagement'
 })
+const tabList = ref(['1', '2', '3', '4'])
 const activeName = ref('1')
-
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
 const layout = mainHeight(63) as any
 </script>
 

src/views/pqs/supervise/harmonicSurvey/index.vue

@@ -1,24 +1,24 @@
 <template>
-    <div class='default-main'>
-        <el-tabs v-model='activeName' type='border-card'>
-            <el-tab-pane label='技术监督计划管理' name='1'>
-                <plan-manage :id='id' v-if="activeName == '1'" />
+    <div class="default-main">
+        <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane :label="VITE_FLAG ? '工作计划指定' : '技术监督计划管理'" name="1" v-if="tabList.includes('1')">
+                <plan-manage :id="id" v-if="activeName == '1'" />
             </el-tab-pane>
-            <el-tab-pane label='技术监督测试管理' name='2'>
-                <test-manage :id='id' :businessKey='key' v-if="activeName == '2'" />
+            <el-tab-pane :label="VITE_FLAG ? '工作计划实施' : '技术监督测试管理'"   name="2" v-if="tabList.includes('2')">
+                <test-manage :id="id" :businessKey="key" v-if="activeName == '2'" />
             </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
-<script setup lang='ts'>
-import { ref } from 'vue'
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
 import planManage from './components/planManage.vue'
 import testManage from './components/testManage.vue'
 import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import { useRoute } from 'vue-router'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const route = useRoute()
 const dictData = useDictData()
 const statusSelect = dictData.statusSelect()
@@ -27,15 +27,25 @@ const key = ref('')
 defineOptions({
     name: 'supervision/harmonicmanagement'
 })
+const tabList = ref(['1', '2', '3', '4'])
 const activeName = ref('1')
-
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
 const layout = mainHeight(63) as any
 
-watch(() => route.query.t, async (newValue, oldValue) => {
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
         if (route.fullPath.includes('supervision/harmonicmanagement')) {
             let type = (route.query.type as string) || 'null'
-        if (type == 'null') { }
-        else if (type == '1') {
+            if (type == 'null') {
+            } else if (type == '1') {
                 activeName.value = '1'
             } else {
                 activeName.value = '2'
@@ -44,10 +54,12 @@ watch(() => route.query.t, async (newValue, oldValue) => {
             id.value = id.value + '@' + route.query.t
             key.value = (route.query.key as string) || 'null'
         }
-}, { deep: true, immediate: true })
+    },
+    { deep: true, immediate: true }
+)
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .bars_w {
     width: 100%;
     height: 500px;

src/views/pqs/supervise/harmonicSurvey/plan/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='default-main'>
-    <el-descriptions :column='2' border>
+    <el-descriptions :column='2' label-width="140px" border>
       <el-descriptions-item label='技术监督计划名称'>
         {{ detailData?.planName }}
       </el-descriptions-item>

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

@@ -181,6 +181,7 @@ import { useAdminInfo } from '@/stores/adminInfo'
 import { uploadFile } from '@/api/system-boot/file'
 import { submitGoNet } from '@/api/supervision-boot/interfere/index'
 import { getUserReportById } from '@/api/supervision-boot/userReport/form'
+import { lo } from 'element-plus/es/locale'
 
 const props = defineProps({
     openType: {
@@ -340,6 +341,8 @@ const handleExceed: UploadProps['onExceed'] = files => {
 //移除文件上传
 const removeFile = (file: any, uploadFiles: any) => {
     console.log(file, uploadFiles)
+    goToNetReport.value = ''
+    form.value.goToNetReport = uploadFiles
 }
 
 // 治理工程验收报告数组
@@ -373,6 +376,7 @@ const confirmForm = (flag: boolean) => {
         })
     } else {
         if (goToNetReport.value == null || goToNetReport.value == '') {
+            loading.value = false
             return ElMessage({
                 message: props.bussType == 0 ? '请上传入网设计方案审查报告' : '请上传治理工程验收报告',
                 type: 'warning'

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

@@ -201,7 +201,7 @@
             </el-form-item>
             <el-form-item class="uploadFile" for="-" label="可研报告：" prop="feasibilityReport">
                 <el-upload v-model:file-list="form.feasibilityReport" ref="uploadRef" action="" :accept="acceptType"
-                    :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile"
+                    :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile('feasibilityReport')"
                     :on-progress="uploadFileName('feasibilityReport')">
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -210,7 +210,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" :on-remove="removeFile"
+                    :accept="acceptType" :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile('preliminaryDesignDescription')"
                     :on-progress="uploadFileName('preliminaryDesignDescription')">
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -219,7 +219,7 @@
             </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" :on-remove="removeFile"
+                    :accept="acceptType" :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile('predictionEvaluationReport')"
                     :on-progress="uploadFileName('predictionEvaluationReport')">
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -228,7 +228,7 @@
             </el-form-item>
             <el-form-item class="uploadFile" for="-" label="预测评估评审意见报告：" prop="predictionEvaluationReviewOpinions">
                 <el-upload v-model:file-list="form.predictionEvaluationReviewOpinions" ref="uploadRef" action=""
-                    :accept="acceptType" :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile"
+                    :accept="acceptType" :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile('predictionEvaluationReviewOpinions')"
                     :on-progress="uploadFileName('predictionEvaluationReviewOpinions')">
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -237,7 +237,7 @@
             </el-form-item>
             <el-form-item class="uploadFile" for="-" label="其他附件：" prop="additionalAttachments">
                 <el-upload v-model:file-list="form.additionalAttachments" ref="uploadRef" action="" :accept="acceptType"
-                    :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile"
+                    :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile('additionalAttachments')"
                     :on-progress="uploadFileName('additionalAttachments')">
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -247,7 +247,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" :on-remove="removeFile"
+                    :accept="acceptType" :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile('substationMainWiringDiagram')"
                     :on-progress="uploadFileName('substationMainWiringDiagram')">
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -257,7 +257,7 @@
             <el-form-item class="uploadFile" for="-" label="主要敏感终端清单：" v-if="form.userType == '6'"
                 prop="sensitiveDevices">
                 <el-upload v-model:file-list="form.sensitiveDevices" ref="uploadRef" action="" :accept="acceptType"
-                    :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile"
+                    :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile('sensitiveDevices')"
                     :on-progress="uploadFileName('sensitiveDevices')">
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -267,7 +267,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" :on-remove="removeFile"
+                    :accept="acceptType" :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile('antiInterferenceReport')"
                     :on-progress="uploadFileName('antiInterferenceReport')">
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -277,7 +277,7 @@
             <el-form-item class="uploadFile" for="-" v-if="form.userType == '6'" label="背景电能质量测试报告："
                 prop="powerQualityReport">
                 <el-upload v-model:file-list="form.powerQualityReport" ref="uploadRef" action="" :accept="acceptType"
-                    :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile"
+                    :limit="1" :on-change="choose" :auto-upload="false" :on-remove="removeFile('powerQualityReport')"
                     :on-progress="uploadFileName('powerQualityReport')">
                     <template #trigger>
                         <el-button type="primary">上传文件</el-button>
@@ -300,7 +300,7 @@
 <script lang="ts" setup>
 import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
 // import { upload, insertTerminal, updateTerminal } from '@/api/process-boot/terminal'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import type { UploadFile, UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import { genFileId, ElMessage } from 'element-plus'
 import { useDictData } from '@/stores/dictData'
 import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
@@ -499,6 +499,8 @@ const resetForm = () => {
 }
 //初始化数据
 resetForm()
+
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 //获取树形图数据
 const getTreeList = () => {
     queryByAllCode().then(res => {
@@ -520,6 +522,27 @@ const getTreeList = () => {
         //     })
         // })
         let data = [res.data.find((item: any) => item.code == 'Major_Nonlinear_Device')]
+    //     nonlinearDeviceTypeList.value = [{ ...JSON.parse(JSON.stringify(...data)), children: [], disabled: 'disabled' }]
+
+    //     data.map((item: any) => {
+    //         //tree禁用根节点
+    //         item.disabled = 'disabled'
+    //         item.children.map((vv: any) => {
+    //             //tree禁用二级节点
+    //             vv.disabled = 'disabled'
+    //             vv.children.map((kk: any) => {
+    //                 //tree禁用三级节点
+    //                 kk.disabled = 'disabled'
+    //                 kk.children.map((ss: any) => {
+    //                     ss.name = vv.name + '-' + kk.name + '-' + ss.name
+    //                     nonlinearDeviceTypeList.value[0].children.push(ss)
+    //                 })
+    //             })
+    //         })
+    //     })
+    // })
+    if (VITE_FLAG) {
+            // VITE_FLAG为true时，保持原有逻辑（包含根节点）
             nonlinearDeviceTypeList.value = [{ ...JSON.parse(JSON.stringify(...data)), children: [], disabled: 'disabled' }]
             data.map((item: any) => {
                 //tree禁用根节点
@@ -537,6 +560,20 @@ const getTreeList = () => {
                     })
                 })
             })
+        } else {
+            // VITE_FLAG为false时，去除第一层（根节点），只保留子节点
+            nonlinearDeviceTypeList.value = []
+            data.map((item: any) => {
+                item.children.map((vv: any) => {
+                    vv.children.map((kk: any) => {
+                        kk.children.map((ss: any) => {
+                            ss.name = vv.name + '-' + kk.name + '-' + ss.name
+                            nonlinearDeviceTypeList.value.push(ss)
+                        })
+                    })
+                })
+            })
+        }
     })
 }
 
@@ -811,6 +848,29 @@ const open = async (row: any) => {
     } else {
         resendId.value = ''
         form.value.userType = userTypeList.value[0].value
+
+
+        // 清空所有文件引用
+        feasibilityReport.value = ''
+        preliminaryDesignDescription.value = ''
+        predictionEvaluationReport.value = ''
+        predictionEvaluationReviewOpinions.value = ''
+        additionalAttachments.value = ''
+        substationMainWiringDiagram.value = ''
+        sensitiveDevices.value = ''
+        antiInterferenceReport.value = ''
+        powerQualityReport.value = ''
+        
+        // 清空表单中的文件列表
+        form.value.feasibilityReport = []
+        form.value.preliminaryDesignDescription = []
+        form.value.predictionEvaluationReport = []
+        form.value.predictionEvaluationReviewOpinions = []
+        form.value.additionalAttachments = []
+        form.value.substationMainWiringDiagram = []
+        form.value.sensitiveDevices = []
+        form.value.antiInterferenceReport = []
+        form.value.powerQualityReport = []
     }
     setTimeout(() => {
         getByDeptDevLine({ id: deptIds }).then(res => {
@@ -899,9 +959,45 @@ let uploadName = ref('')
 const uploadFileName = (val: any) => { 
     uploadName.value = val
 }
+
+
 // 移除文件上传
-const removeFile = (file: any, uploadFiles: any) => {
-    console.log(file, uploadFiles)
+const removeFile = (val: any) => {
+  return (file: UploadFile, fileList: UploadFile[]) => {
+    // 根据上传字段名称清除对应的文件引用
+    switch(val) {
+      case 'feasibilityReport':
+        feasibilityReport.value = ''
+        break
+      case 'preliminaryDesignDescription':
+        preliminaryDesignDescription.value = ''
+        break
+      case 'predictionEvaluationReport':
+        predictionEvaluationReport.value = ''
+        break
+      case 'predictionEvaluationReviewOpinions':
+        predictionEvaluationReviewOpinions.value = ''
+        break
+      case 'additionalAttachments':
+        additionalAttachments.value = ''
+        break
+      case 'substationMainWiringDiagram':
+        substationMainWiringDiagram.value = ''
+        break
+      case 'sensitiveDevices':
+        sensitiveDevices.value = ''
+        break
+      case 'antiInterferenceReport':
+        antiInterferenceReport.value = ''
+        break
+      case 'powerQualityReport':
+        powerQualityReport.value = ''
+        break
+    }
+    
+    // 同步更新表单中的文件列表
+    form.value[val] = fileList
+  }
 }
 // 可研报告数组
 const feasibilityReport = ref('')

src/views/pqs/supervise/interfere/index.vue

@@ -1,23 +1,23 @@
 <template>
   <div class='default-main'>
     <el-tabs v-model='activeName' type='border-card'>
-      <el-tab-pane label='未建档用户档案录入管理' name='1'>
+      <el-tab-pane :label="VITE_FLAG ? '预测评估' : '未建档用户档案录入管理'"  name='1' v-if="tabList.includes('1')">
         <undocumented ref='Undocumented' :id='id' v-if="activeName == '1'" />
       </el-tab-pane>
-      <el-tab-pane label='常态化干扰源用户管理' name='3'>
-        <interferenceUserTable ref='InterferenceUserTable' :id='id' :businessKey="key" v-if="activeName == '3'" />
+      <el-tab-pane :label="VITE_FLAG ? '接入管理' : '常态化干扰源用户管理'"  name='2' v-if="tabList.includes('2')">
+        <interferenceUserTable ref='InterferenceUserTable' :id='id' :businessKey="key" v-if="activeName == '2'" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script setup lang='ts'>
-import { nextTick, ref, provide } from 'vue'
+import { nextTick, ref, provide,onMounted } from 'vue'
 import { mainHeight } from '@/utils/layout'
 import undocumented from './components/undocumented/index.vue'
 import interferenceUserTable from './components/normalizationManager/interferenceUserTable.vue'
 import { useRoute } from 'vue-router'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const route = useRoute()
 const Undocumented = ref()
 const InterferenceUserTable = ref()
@@ -27,7 +27,15 @@ defineOptions({
 const activeName = ref('1')
 const id = ref('')
 const key = ref('')
-
+const tabList = ref(['1', '2', ])
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
 
 watch(() => route.query.t, async (newValue, oldValue) => {
   if (route.fullPath.includes('supervision/interferencemanagement')) {

src/views/pqs/supervise/plan/index.vue

@@ -49,6 +49,7 @@ import { planDetailsAudit, sendAlarm } from '@/api/supervision-boot/plan/index'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { cancelPlanFormData } from '@/api/supervision-boot/plan/index'
 //获取登陆用户姓名和部门
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const adminInfo = useAdminInfo()
 defineOptions({
     name: 'plan'
@@ -71,9 +72,13 @@ const tableStore = new TableStore({
     // publicHeight: 65,
     method: 'POST',
     column: [
-        { title: '序号',  width: 80,formatter: (row: any) => {
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
+            }
+        },
         {
             field: 'province',
             title: '所属省份',
@@ -270,9 +275,9 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         router.push({
-                            name: 'supervision/supervision/manage',
+                            name: 'supervision/supervision/manage' + (VITE_FLAG ? '4' : ''),
                             query: {
-                                type: 1
+                                type: 4
                             }
                         })
                     }

src/views/pqs/supervise/technology/index.vue

@@ -1,20 +1,20 @@
 <template>
-  <div class='default-main'>
-    <el-tabs v-model='activeName' type='border-card'>
+    <div class="default-main">
+        <el-tabs v-model="activeName" type="border-card">
             <!-- <el-tab-pane label="概览" name="1"><overview v-if="activeName == '1'"/></el-tab-pane>
       <el-tab-pane label="技术监督管理" name="2"><technology  v-if="activeName == '2'"/></el-tab-pane> -->
 
-      <el-tab-pane label='预警单列表' name='3'>
-        <earlyWarn :id="id" :businessKey='key' v-if="activeName == '3'" />
+            <el-tab-pane label="预警单列表" name="3" v-if="tabList.includes('3')">
+                <earlyWarn :id="id" :businessKey="key" v-if="activeName == '3'" />
             </el-tab-pane>
-      <el-tab-pane label='告警单列表' name='4'>
-        <alarm :id="id" :businessKey='key' v-if="activeName == '4'" />
+            <el-tab-pane label="告警单列表" name="4" v-if="tabList.includes('4')">
+                <alarm :id="id" :businessKey="key" v-if="activeName == '4'" />
             </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
-<script setup lang='ts'>
+<script setup lang="ts">
 import earlyWarn from './components/earlyWarn.vue'
 import alarm from './components/alarm.vue'
 import { ref } from 'vue'
@@ -26,15 +26,24 @@ const key = ref('')
 defineOptions({
     name: 'supervision/supervision/manage'
 })
-
+const tabList = ref(['3', '4'])
 const activeName: any = ref('3')
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
 
-
-watch(() => route.query.t, async (newValue, oldValue) => {
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
         if (route.fullPath.includes('supervision/supervision/manage')) {
             let type = (route.query.type as string) || 'null'
-    if (type == 'null') { }
-    else if (type == '0' || type == '3') {
+            if (type == 'null') {
+            } else if (type == '0' || type == '3') {
                 activeName.value = '3'
             } else {
                 activeName.value = '4'
@@ -43,13 +52,14 @@ watch(() => route.query.t, async (newValue, oldValue) => {
             key.value = (route.query.key as string) || 'null'
             id.value = id.value + '@' + route.query.t
         }
-}, { deep: true, immediate: true })
-
+    },
+    { deep: true, immediate: true }
+)
 
 const layout = mainHeight(63) as any
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .bars_w {
     width: 100%;
     height: 500px;

src/views/pqs/supervise/terminal/index.vue

@@ -1,26 +1,26 @@
 <template>
-    <div class='default-main'>
-        <el-tabs v-model='activeName' type='border-card'>
-            <el-tab-pane label='干扰源用户台账' name='1'>
-                <interferenceUserTable :id='id' v-if="activeName == '1'" />
+    <div class="default-main">
+        <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane label="干扰源用户台账" name="1" v-if="tabList.includes('1')">
+                <interferenceUserTable :id="id" v-if="activeName == '1'" />
             </el-tab-pane>
-            <el-tab-pane label='敏感及重要用户台账' name='2'>
+            <el-tab-pane label="敏感及重要用户台账" name="2" v-if="tabList.includes('2')">
                 <sensitiveUserTable v-if="activeName == '2'" />
             </el-tab-pane>
-            <el-tab-pane label='变电站台账' name='3'>
+            <el-tab-pane label="变电站台账" name="3" v-if="tabList.includes('3')">
                 <substationLedger v-if="activeName == '3'" />
             </el-tab-pane>
-            <el-tab-pane label='终端台账' name='4'>
+            <el-tab-pane label="终端台账" name="4" v-if="tabList.includes('4')">
                 <deviceLedgerTable v-if="activeName == '4'" />
             </el-tab-pane>
-            <el-tab-pane label='监测点台账' name='5'>
+            <el-tab-pane label="监测点台账" name="5" v-if="tabList.includes('5')">
                 <monitorLedgerTable v-if="activeName == '5'" />
             </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
-<script setup lang='ts'>
+<script setup lang="ts">
 import { onMounted, reactive, ref, provide } from 'vue'
 import interferenceUserTable from './components/interferenceUserTable.vue'
 import sensitiveUserTable from './components/sensitiveUserTable.vue'
@@ -37,23 +37,35 @@ defineOptions({
 })
 const activeName = ref('1')
 
-
-watch(() => route.query.t, async (newValue, oldValue) => {
+const tabList = ref(['1', '2', '3', '4', '5'])
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
         if (route.fullPath.includes('Supervision/Terminaldetection')) {
             let type = (route.query.type as string) || 'null'
-        if (type == 'null') { }
-        else if (type == '1') {
+            if (type == 'null') {
+            } else if (type == '1') {
                 activeName.value = '1'
             }
             id.value = (route.query.id as string) || 'null'
             id.value = id.value + '@' + route.query.t
         }
-}, { deep: true, immediate: true })
+    },
+    { deep: true, immediate: true }
+)
 
 const layout = mainHeight(63) as any
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .bars_w {
     width: 100%;
     height: 500px;

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue

@@ -168,7 +168,7 @@
             <el-form-item for="-" label="监测终端安装位置：" prop="monitoringDeviceInstallationPosition" class="label_over_warp">
                 <!-- 电网侧、用户侧 -->
                 <el-select v-model="form.monitoringDeviceInstallationPosition" clearable style="width: 100%"
-                    placeholder="请选择监测终端安装位置">
+                    placeholder="请选择监测终端安装位置" disabled>
                     <el-option v-for="item in monitoringDeviceInstallationPositionList" :key="item.id"
                         :label="item.name" :value="item.id"></el-option>
                 </el-select>
@@ -240,9 +240,9 @@
                     <el-radio :value="0">关闭</el-radio>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item for="-" label="电镀功能：" prop="electroplatingFunction">
+            <el-form-item for="-" label="电度功能：" prop="electroplatingFunction">
                 <!-- 默认 关闭 下拉框 -->
-                <el-select v-model="form.electroplatingFunction" clearable style="width: 100%" placeholder="请选择电镀功能">
+                <el-select v-model="form.electroplatingFunction" clearable style="width: 100%" placeholder="请选择电度功能">
                     <el-option v-for="item in electroplatingFunctionList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
@@ -509,10 +509,15 @@ const changeSubstationFlag = () => {
         form.value.substationName = substationList.value.find((item: any) => {
             return form.value.substation == item.id
         })?.name
+
+         // 系统电站选"是"时，安装位置设为"电网侧"
+        form.value.monitoringDeviceInstallationPosition = '0'
     } else {
         form.value.substation = ''
         form.value.substationName = ''
         form.value.substationVoltageLevel = voltageLevelList[0].id
+          // 系统电站选"否"时，安装位置设为"用户侧"
+        form.value.monitoringDeviceInstallationPosition = '1'
     }
 }
 watch(
@@ -1345,10 +1350,15 @@ const confirmForm = async (flag: boolean) => {
         loading.value = false
     }, 0)
 }
+
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 // 编码改动
 const encode = (e: string) => {
+    if(VITE_FLAG){
         form.value.monitoringTerminalName = e.replace(/:/g, '')
     }
+   
+}
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>

src/views/pqs/supervise/terminalNetworkDetection/index.vue

@@ -1,30 +1,30 @@
 <template>
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
-      <el-tab-pane label="终端入网检测" name="1">
+            <el-tab-pane label="终端检测" name="1" v-if="tabList.includes('1')">
                 <terminal :id="id" v-if="activeName == '1'" />
             </el-tab-pane>
-      <el-tab-pane label="监测点台账录入" name="2">
+            <el-tab-pane label="监测点台账录入" name="2" v-if="tabList.includes('2')">
                 <monitorpoint :id="id" v-if="activeName == '2'" />
             </el-tab-pane>
-      <el-tab-pane label="监测点联调列表" name="3">
+            <el-tab-pane label="监测点联调列表" name="3" v-if="tabList.includes('3')">
                 <jointDebugList :id="id" v-if="activeName == '3'" />
             </el-tab-pane>
-      <el-tab-pane label="终端周期检测" name="4">
-        <cycleDetection :id="id" :businessKey='key' v-if="activeName == '4'" />
+            <el-tab-pane label="周期校验" name="4" v-if="tabList.includes('4')">
+                <cycleDetection :id="id" :businessKey="key" v-if="activeName == '4'" />
             </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import { mainHeight } from '@/utils/layout'
 import terminal from './components/terminainal/index.vue'
 import monitorpoint from './components/monitorpoint/index.vue'
 import jointDebugList from './components/jointDebugList/index.vue'
 import cycleDetection from './components/cycleDetection/index.vue'
-import { useRoute } from "vue-router";
+import { useRoute } from 'vue-router'
 
 defineOptions({
     name: 'terminalNetwotk'
@@ -34,12 +34,23 @@ const activeName = ref('1')
 const route = useRoute()
 const id = ref('')
 const key = ref('')
+const tabList = ref(['1', '2', '3', '4'])
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
 
-watch(() => route.query.t, async (newValue, oldValue) => {
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
         if (route.fullPath.includes('terminalNetwotk')) {
             let type = (route.query.type as string) || 'null'
-    if (type == 'null') { }
-    else if (type == '1') {
+            if (type == 'null') {
+            } else if (type == '1') {
                 activeName.value = '1'
             } else if (type == '2') {
                 activeName.value = '2'
@@ -52,8 +63,9 @@ watch(() => route.query.t, async (newValue, oldValue) => {
             key.value = (route.query.key as string) || 'null'
             id.value = id.value + '@' + route.query.t
         }
-}, { deep: true, immediate: true })
-
+    },
+    { deep: true, immediate: true }
+)
 
 const layout = mainHeight(63) as any
 </script>

src/views/pqs/supervise/testRun/index.vue

@@ -1,12 +1,18 @@
 <!---试运行列表-->
 <template>
     <div class="default-main">
+        <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane label="试运行评估" name="1">
                 <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
                     <template #select>
                         <el-form-item label="流程状态">
                             <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                        <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
-                            :value="item.id"></el-option>
+                                <el-option
+                                    v-for="item in statusSelect"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id"
+                                ></el-option>
                             </el-select>
                         </el-form-item>
                     </template>
@@ -16,6 +22,8 @@
                     </template>
                 </TableHeader>
                 <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+            </el-tab-pane>
+        </el-tabs>
 
         <!--        <el-dialog
                     v-model='timeDialog'
@@ -62,11 +70,11 @@ const { push } = useRouter()
 const adminInfo = useAdminInfo()
 const TableHeaderRef = ref()
 const tableRef = ref()
-
+const activeName = ref('1')
 const tableStore = new TableStore({
     url: '/supervision-boot/tempLinedebug/pageHasDebug',
     method: 'POST',
-    // publicHeight: 65,
+    publicHeight: 65,
     column: [
         { title: '', type: 'checkbox', width: 40 },
         { field: 'lineName', title: '监测点名称', minWidth: 160 },
@@ -266,8 +274,7 @@ const deleteEven = () => {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
-        })
-            .then(() => {
+        }).then(() => {
             let createBy = tableStore.table.selection.map(item => item.createBy)
             let status = tableStore.table.selection.map(item => item.status)
             if (adminInfo.roleCode.includes('delete_info')) {
@@ -280,9 +287,7 @@ const deleteEven = () => {
                     message: '只能删除自己填报的数据!!!'
                 })
             }
-
         })
-
     }
 }
 
@@ -410,9 +415,11 @@ const runTestSubmit = (type: number) => {
 
 const route = useRoute()
 
-watch(() => route.query.t, async (newValue, oldValue) => {
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
         let nowTime = Date.now()
-    let routeTime = route.query.t as number || 1
+        let routeTime = (route.query.t as number) || 1
         if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
         if (route.fullPath.includes('/testRun')) {
             let id = (route.query.id as string) || 'null'
@@ -443,10 +450,11 @@ watch(() => route.query.t, async (newValue, oldValue) => {
                         tableStore.index()
                     }
                 })
-
             }
         }
-}, { deep: true, immediate: true })
+    },
+    { deep: true, immediate: true }
+)
 </script>
 
 <style scoped lang="scss"></style>

src/views/pqs/supervise/testRun/testRun.vue

@@ -2,13 +2,13 @@
     <div class="default-main">
       <el-tabs v-model="activeName" type="border-card">
     
-        <el-tab-pane label="监测点台账录入" name="1">
+        <el-tab-pane label="监测点台账录入" name="1" v-if="tabList.includes('1')">
           <monitorpoint :id="id" v-if="activeName == '1'" />
         </el-tab-pane>
-        <el-tab-pane label="监测点联调列表" name="2">
+        <el-tab-pane label="监测点联调列表" name="2" v-if="tabList.includes('2')">
           <jointDebugList :id="id" v-if="activeName == '2'" />
         </el-tab-pane>
-        <el-tab-pane label="试运行评估" name="3">
+        <el-tab-pane label="试运行评估" name="3" v-if="tabList.includes('3')">
           <testRun :id="id" v-if="activeName == '3'" />
         </el-tab-pane>
       </el-tabs>
@@ -16,7 +16,7 @@
   </template>
   
   <script setup lang="ts">
-  import { ref } from 'vue'
+  import { ref ,onMounted} from 'vue'
 
   import { mainHeight } from '@/utils/layout'
   import monitorpoint from '@/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue'
@@ -29,7 +29,15 @@
     name: 'terminalNetwotk'
   })
   const activeName = ref('1')
-  
+  const tabList = ref(['1', '2', '3',])
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
   const route = useRoute()
   const id = ref('')
   const key = ref('')

src/views/pqs/supervise_hn/interfere/components/normalizationManager/interferenceUserTable.vue

@@ -347,6 +347,7 @@ const cancelLeave = async (row: any) => {
 const needGovernance = ref()
 /** 方案审查 */
 const toFangAn = (row: any, typeNo: number) => {
+
   //查询详情拿到needGovernance
   /** 获得数据 */
   getUserReportById(row.id).then(res => {

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

@@ -837,6 +837,7 @@ watch(
 const resendId = ref('')
 const status = ref('')
 const open = async (row: any) => {
+
     title.value = row.title
     dialogFormVisible.value = true
     let deptIds = adminInfo.$state.deptId

src/views/pqs/supervise_hn/retire/monitor.vue

@@ -9,7 +9,7 @@
                             :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="筛选">
+                <el-form-item label="筛选数据">
                     <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入关键字"
                     clearable  maxlength="32" show-word-limit></el-input>
                 </el-form-item>

src/views/pqs/supervise_hn/retire/terminal.vue

@@ -9,7 +9,7 @@
                             :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="筛选">
+                <el-form-item label="筛选数据">
                     <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入关键字" clearable  maxlength="32" show-word-limit></el-input>
                 </el-form-item>
             </template>