Merge branch 'master' of http://pqmcc.com:3000/Web/admin-sjzx

# Conflicts:
#	src/views/pqs/supervise/technology/feedbackPopup.vue

src/api/device-boot/panorama.ts

@@ -172,5 +172,13 @@ export function getAreaPollution(data: any) {
 } 
 //场站级评估
 export function downPollutionSubCalc(data: any) {
-    return request({ url: 'harmonic-boot/PollutionSubstation/downPollutionSubCalc', method: 'post', data })
+    return request({ url: '/harmonic-boot/PollutionSubstation/downPollutionSubCalc', method: 'post', data })
+} 
+//监测点评价
+export function limitTableDetail(data: any) {
+    return request({ url: '/device-boot/dataVerify/limitTableDetail', method: 'post', data })
+} 
+//重要及敏感用户详情
+export function downPollutionSensitiveUser(data: any) {
+    return request({ url: '/harmonic-boot/PollutionSubstation/downPollutionSensitiveUser', method: 'post', data })
 } 

src/api/process-boot/interference.ts

@@ -6,7 +6,7 @@ export function getUndocumentednonlinearData() {
         method: 'get'
     })
 }
-//获取入网评估报告审核数据
+//获取系统接入方案审核数据
 export function getReportreviewData() {
     return createAxios({
         url: '/Process-supervision/Reportreview/getReportreview',

src/api/system-boot/file.ts

@@ -1,5 +1,5 @@
 import createAxios from '@/utils/request'
-
+import { ElMessage } from 'element-plus'
 const SYSTEM_PREFIX = '/system-boot'
 
 /**
@@ -17,6 +17,11 @@ export const uploadFile = (file: any, path: string) => {
             'Content-Type': 'multipart/form-data'
         },
         data: form
+    }).then(res => {
+        if (res.code == `A0000`) {
+            ElMessage.success('上传成功!')
+            return res
+        }
     })
 }
 
@@ -50,7 +55,7 @@ export const downloadFile = (filePath: any) => {
 /**
  * 获取文件的短期url展示
  */
-export const getFileUrl = (params:any) => {
+export const getFileUrl = (params: any) => {
     let form = new FormData()
     // form.append('filePath', filePath)
     return createAxios({

src/assets/font/demo_index.html

@@ -54,6 +54,36 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe782;</span>
+                <div class="name">253_ipower</div>
+                <div class="code-name">&amp;#xe782;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe665;</span>
+                <div class="name">电压</div>
+                <div class="code-name">&amp;#xe665;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe758;</span>
+                <div class="name">三相电压幅值不平衡</div>
+                <div class="code-name">&amp;#xe758;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe61e;</span>
+                <div class="name">电压总谐波畸变率</div>
+                <div class="code-name">&amp;#xe61e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe612;</span>
+                <div class="name">闪变</div>
+                <div class="code-name">&amp;#xe612;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe65d;</span>
                 <div class="name">停运事件管理</div>
@@ -252,9 +282,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1764826411334') format('woff2'),
+  src: url('iconfont.woff2?t=1765612648830') format('woff2'),
-       url('iconfont.woff?t=1764826411334') format('woff'),
+       url('iconfont.woff?t=1765612648830') format('woff'),
-       url('iconfont.ttf?t=1764826411334') format('truetype');
+       url('iconfont.ttf?t=1765612648830') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -280,6 +310,51 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-a-253_ipower"></span>
+            <div class="name">
+              253_ipower
+            </div>
+            <div class="code-name">.icon-a-253_ipower
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-dianya"></span>
+            <div class="name">
+              电压
+            </div>
+            <div class="code-name">.icon-dianya
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-sanxiangdianyafuzhibupingheng"></span>
+            <div class="name">
+              三相电压幅值不平衡
+            </div>
+            <div class="code-name">.icon-sanxiangdianyafuzhibupingheng
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-dianyazongxiebojibianshuai"></span>
+            <div class="name">
+              电压总谐波畸变率
+            </div>
+            <div class="code-name">.icon-dianyazongxiebojibianshuai
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shanbian"></span>
+            <div class="name">
+              闪变
+            </div>
+            <div class="code-name">.icon-shanbian
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-tingyunshijianguanli"></span>
             <div class="name">
@@ -577,6 +652,46 @@
       <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-a-253_ipower"></use>
+                </svg>
+                <div class="name">253_ipower</div>
+                <div class="code-name">#icon-a-253_ipower</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dianya"></use>
+                </svg>
+                <div class="name">电压</div>
+                <div class="code-name">#icon-dianya</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-sanxiangdianyafuzhibupingheng"></use>
+                </svg>
+                <div class="name">三相电压幅值不平衡</div>
+                <div class="code-name">#icon-sanxiangdianyafuzhibupingheng</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dianyazongxiebojibianshuai"></use>
+                </svg>
+                <div class="name">电压总谐波畸变率</div>
+                <div class="code-name">#icon-dianyazongxiebojibianshuai</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shanbian"></use>
+                </svg>
+                <div class="name">闪变</div>
+                <div class="code-name">#icon-shanbian</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tingyunshijianguanli"></use>

src/assets/font/iconfont.css

@@ -1,9 +1,10 @@
 @font-face {
-  font-family: 'iconfont';
+  font-family: "iconfont"; /* Project id 3482754 */
-  src: url('/src/assets/font/iconfont.woff2?t=1764826411334') format('woff2'),
+  src: url('iconfont.woff2?t=1765612648830') format('woff2'),
-       url('/src/assets/font/iconfont.woff?t=1764826411334') format('woff'),
+       url('iconfont.woff?t=1765612648830') format('woff'),
-       url('/src/assets/font/iconfont.ttf?t=1764826411334') format('truetype');
+       url('iconfont.ttf?t=1765612648830') format('truetype');
 }
+
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
@@ -12,6 +13,26 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-a-253_ipower:before {
+  content: "\e782";
+}
+
+.icon-dianya:before {
+  content: "\e665";
+}
+
+.icon-sanxiangdianyafuzhibupingheng:before {
+  content: "\e758";
+}
+
+.icon-dianyazongxiebojibianshuai:before {
+  content: "\e61e";
+}
+
+.icon-shanbian:before {
+  content: "\e612";
+}
+
 .icon-tingyunshijianguanli:before {
   content: "\e65d";
 }

src/assets/font/iconfont.json

@@ -5,6 +5,41 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "33424624",
+      "name": "253_ipower",
+      "font_class": "a-253_ipower",
+      "unicode": "e782",
+      "unicode_decimal": 59266
+    },
+    {
+      "icon_id": "12331657",
+      "name": "电压",
+      "font_class": "dianya",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "33073330",
+      "name": "三相电压幅值不平衡",
+      "font_class": "sanxiangdianyafuzhibupingheng",
+      "unicode": "e758",
+      "unicode_decimal": 59224
+    },
+    {
+      "icon_id": "37400988",
+      "name": "电压总谐波畸变率",
+      "font_class": "dianyazongxiebojibianshuai",
+      "unicode": "e61e",
+      "unicode_decimal": 58910
+    },
+    {
+      "icon_id": "43700638",
+      "name": "闪变",
+      "font_class": "shanbian",
+      "unicode": "e612",
+      "unicode_decimal": 58898
+    },
     {
       "icon_id": "25458995",
       "name": "停运事件管理",

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 = ref('')
-const url = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
+const excelOptions = ref({})
-console.log("🚀 ~ url:", url)
+if(VITE_FLAG){
-const excelOptions = ref({
+     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/designer/ProcessViewer.vue

@@ -279,6 +279,27 @@ const getResultCss = (status) => {
   return ''
 }
 
+const getTaskNameItemType = (itemStatus: any) => {
+  if (itemStatus === 1) {
+    return '审批中'
+  }else if (itemStatus === 2) {
+    return '审批通过'
+  }else if (itemStatus === 3) {
+    return '审批不通过'
+  }else if (itemStatus === 4) {
+    return '已取消'
+  }else if (itemStatus === 5) {
+    return '退回'
+  } else if (itemStatus === 6) {
+    return '委派'
+  } else if (itemStatus === 7) {
+    return '审批通过中'
+  } else if (itemStatus === 0) {
+    return '待审批'
+  }
+  return ''
+}
+
 const getActivityOutgoing = (activity) => {
   // 如果有 outgoing，则直接使用它
   if (activity.outgoing && activity.outgoing.length > 0) {
@@ -316,7 +337,9 @@ const elementHover = (element) => {
   !overlays.value && (overlays.value = bpmnModeler.get('overlays'))
   // 展示信息
   // console.log(activityLists.value, 'activityLists.value')
-  // console.log(element.value, 'element.value')
+   if (element.value.type === 'bpmn:SequenceFlow') {
+    return
+  }
   const activity = activityLists.value.find((m) => m.key === element.value.id)
   // console.log(activity, 'activityactivityactivityactivity')
   if (!activity) {
@@ -330,22 +353,22 @@ const elementHover = (element) => {
     if (element.value.type === 'bpmn:StartEvent' && processInstance.value) {
       html = `<p>发起人：${processInstance.value.startUser.name}</p>
                   <p>部门：${processInstance.value.startUser.deptName}</p>
-                  <p>创建时间：${formatDate(processInstance.value.createTime)}`
+                  <p>创建时间：${formatDate(processInstance.value.startTime)}`
     } else if (element.value.type === 'bpmn:UserTask') {
       let task = taskList.value.find((m) => m.id === activity.taskId) // 找到活动对应的 taskId
       if (!task) {
         return
       }
-      let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
+      // let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
-      let dataResult = ''
+      // let dataResult = ''
-      optionData.forEach((element) => {
+      // optionData.forEach((element) => {
-        if (element.value == task.status) {
+      //   if (element.value == task.status) {
-          dataResult = element.label
+      //     dataResult = element.label
-        }
+      //   }
-      })
+      // })
       html = `<p>审批人：${task.assigneeUser.name}</p>
                   <p>部门：${task.assigneeUser.deptName}</p>
-                  <p>结果：${dataResult}</p>
+                  <p>结果：${getTaskNameItemType(task.status)}</p>
                   <p>创建时间：${formatDate(task.createTime)}</p>`
       // html = `<p>审批人：${task.assigneeUser.nickname}</p>
       //             <p>部门：${task.assigneeUser.deptName}</p>
@@ -368,20 +391,20 @@ const elementHover = (element) => {
         html += `<p>结束时间：${formatDate(activity.endTime)}</p>`
       }
     } else if (element.value.type === 'bpmn:EndEvent' && processInstance.value) {
-      let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
+      // let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
-      let dataResult = ''
+      // let dataResult = ''
-      optionData.forEach((element) => {
+      // optionData.forEach((element) => {
-        if (element.value == processInstance.value.status) {
+      //   if (element.value == processInstance.value.status) {
-          dataResult = element.label
+      //     dataResult = element.label
-        }
+      //   }
-      })
+      // })
-      html = `<p>结果：${dataResult}</p>`
+      // html = `<p>结果：${dataResult}</p>`
       // html = `<p>结果：${getIntDictOptions(
       //   DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
       //   processInstance.value.status
       // )}</p>`
       if (processInstance.value.endTime) {
-        html += `<p>结束时间：${formatDate(processInstance.value.endTime)}</p>`
+        html = `<p>结束时间：${formatDate(processInstance.value.endTime)}</p>`
       }
     }
     elementOverlayIds.value[element.value.id] = toRaw(overlays.value)?.add(element.value, {
@@ -660,7 +683,7 @@ watch(
 }
 
 .element-overlays {
-  width: 200px;
+  width: 250px;
   padding: 8px;
   color: #fafafa;
   background: rgb(0 0 0 / 60%);

src/components/cockpit/terminalEvaluation/index.vue

@@ -64,7 +64,7 @@
                 </div>
             </div>
             <div style="flex: 2" class="ml15">
-                <div class="title">完整性统计</div>
+                <div class="title">终端运行统计</div>
 
                 <div class="mb5" style="height: 40px">
                     <el-segmented

src/components/echarts/MyEchart.vue

@@ -15,7 +15,7 @@ import { color, gradeColor3 } from './color'
 import { useConfig } from '@/stores/config'
 const config = useConfig()
 // import { nextTick } from 'process'
-const emit = defineEmits(['triggerPoint', 'group'])
+const emit = defineEmits(['triggerPoint', 'group', 'echartClick'])
 color[0] = config.layout.elementUiPrimary[0]
 const chartRef = ref<HTMLDivElement>()
 
@@ -153,6 +153,9 @@ const initChart = () => {
     chart.on('click', function (params) {
         if (params.seriesName == '暂态触发点') {
             emit('triggerPoint', params.data)
+        } else {
+
+            emit('echartClick', params)
         }
     })
 

src/components/table/defaultAttribute.ts

@@ -4,7 +4,7 @@ export const defaultAttribute: VxeTableProps = {
     align: 'center',
     headerCellClassName: 'table-header-cell',
     border: true,
-   
+    stripe: true,
     size: 'small',
     columnConfig: { resizable: true },
     rowConfig: { isCurrent: true, isHover: true },
@@ -13,6 +13,7 @@ export const defaultAttribute: VxeTableProps = {
     treeConfig: {
         reserve: true
     },
-
+    showOverflow: true,
-    showOverflow: true
+     showFooter:true
 }
+

src/components/table/header/index.vue

@@ -182,7 +182,7 @@ const handlerHeight = () => {
     }
 }
 const computedSearchRow = () => {
-    if (!headerForm.value.$el) return
+    if (!headerForm.value?.$el) return
     // 清空headerFormSecond.value.$el下的元素
     while (headerFormSecond.value.$el.firstChild) {
         headerForm.value.$el.appendChild(headerFormSecond.value.$el.firstChild)
@@ -231,6 +231,16 @@ const setDatePicker = (list: any) => {
 const onResetForm = () => {
     //时间重置成默认值
     datePickerRef.value?.setTheDate(3)
+
+    if (props.datePicker && timeAll.value) {
+        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
+        tableStore.table.params.interval = datePickerRef.value.interval
+    }
+
     tableStore.onTableAction('reset', {})
 }
 const setTheDate = (val: any) => {
@@ -238,7 +248,7 @@ const setTheDate = (val: any) => {
 }
 // 导出
 const onExport = () => {
-    console.log('导出')
+    
     tableStore.onTableAction('export', { showAllFlag: true })
 }
 

src/components/tree/index.vue

@@ -59,7 +59,7 @@
                             effect="customized"
                             placement="bottom-start"
                             :offset="0"
-                            v-if=" data.level == 6"
+                            v-if="data.level == 6"
                         >
                             <template #content>
                                 <el-button type="primary" plain @click="viewDetails(data)">
@@ -74,18 +74,16 @@
             </el-tree>
         </div>
         <!-- 变电站详情 -->
-           <SubstationDetails ref="SubstationRef"/>
+        <SubstationDetails ref="SubstationRef" />
         <!-- 监测点详情 -->
-         <MonitoringPointDetails ref="MonitoringPointRef"/>
+        <MonitoringPointDetails ref="MonitoringPointRef" />
-        
-        
     </div>
 </template>
 
 <script lang="ts" setup>
 import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElTree } from 'element-plus'
-import { ref, watch } from 'vue'
+import { ref, watch, onMounted, nextTick } from 'vue'
 import { ElMessage } from 'element-plus'
 import MonitoringPointDetails from './details/monitoringPointDetails.vue'
 import SubstationDetails from './details/substationDetails.vue'
@@ -110,6 +108,7 @@ const menuCollapse = ref(false)
 const MonitoringPointRef = ref()
 const SubstationRef = ref()
 const filterText = ref('')
+const treeRef = ref()
 const defaultProps = {
     label: 'name',
     value: 'id'
@@ -148,7 +147,7 @@ const onMenuCollapse = () => {
 }
 // 查看详情
 const viewDetails = (data: any) => {
-    console.log("🚀 ~ viewDetails ~ data:", data)
+    console.log('🚀 ~ viewDetails ~ data:', data)
     if (data.level == 3) {
         // 变电站详情
         // substationDetails
@@ -194,12 +193,40 @@ const chooseNode = (value: string, data: any, node: any) => {
     // 没匹配到返回false
     return false
 }
+
+onMounted(async () => {
+    // 等待树渲染完成
+    await nextTick()
+    // 可以等待更长时间确保树完全展开
+})
+
+const scrollToNode = (id: string) => {
+    console.log("🚀 ~ scrollToNode ~ id:", id)
+    if (!treeRef.value) return
+
+    // 获取目标节点的元素
+    const targetNode = treeRef.value.getNode(id)
+    if (!targetNode) return
+
+    // 获取节点的DOM元素
+    const nodeElement = document.querySelector(`[data-key="${id}"]`)
+    if (nodeElement) {
+        // 滚动到节点位置
+        nodeElement.scrollIntoView({
+            behavior: 'smooth', // 平滑滚动
+            block: 'center', // 垂直方向居中
+            inline: 'nearest' // 水平方向最近
+        })
+
+        // 如果需要高亮当前节点
+        treeRef.value.setCurrentKey(id)
+    }
+}
 // 添加树
 const onAddTree = () => {
     emit('onAddTree')
 }
-const treeRef = ref<InstanceType<typeof ElTree>>()
+defineExpose({ treeRef, scrollToNode })
-defineExpose({ treeRef })
 </script>
 
 <style lang="scss" scoped>

src/components/tree/pqs/assessTree.vue

@@ -14,9 +14,7 @@ import { useDictData } from '@/stores/dictData'
 import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
 import { useConfig } from '@/stores/config'
 import { defineProps } from 'vue'
-import {
+import { getTree } from '@/api/advance-boot/assess'
-    getTree
-} from '@/api/advance-boot/assess'
 
 defineOptions({
     name: 'pms/pointTree'
@@ -46,25 +44,24 @@ const formData = ref({
     scale: null
 })
 
-
 // 添加数据转换函数
 const transformTreeData = (data: any[]) => {
-    if (!data || !Array.isArray(data)) return [];
+    if (!data || !Array.isArray(data)) return []
     return data.map(item => {
         // 创建新对象，确保不修改原始数据
         const newItem: any = {
-            name: item.treeName , 
+            name: item.treeName,
-            id: item.treeId ,
+            id: item.treeId,
             children: []
-        };
+        }
 
         // 递归处理子节点
         if (item.children && Array.isArray(item.children)) {
-            newItem.children = transformTreeData(item.children);
+            newItem.children = transformTreeData(item.children)
         }
-        return newItem;
+        return newItem
-    });
+    })
-};
+}
 
 const loadData = () => {
     let obj = classificationData.find(function (i) {
@@ -75,12 +72,15 @@ const loadData = () => {
     let nodeKey = ''
     getTree({}).then(res => {
         // 转换数据结构为指定格式
-         const transformedData = transformTreeData(res.data);
+        const transformedData = transformTreeData(res.data)
 
         // 确保有数据再进行处理
-           if (transformedData && transformedData.length > 0 && 
+        if (
-            transformedData[0].children && transformedData[0].children.length > 0) {
+            transformedData &&
-            
+            transformedData.length > 0 &&
+            transformedData[0].children &&
+            transformedData[0].children.length > 0
+        ) {
             nodeKey = transformedData[0].children[0].id
             emit('init', transformedData[0].children[0])
 
@@ -94,7 +94,15 @@ const loadData = () => {
         }
     })
 }
+const scrollToNode = (id: string) => {
+    // 树滚动
+    treeRef.value.scrollToNode(id)
+}
 loadData()
+defineExpose({
+    tree,
+    scrollToNode
+})
 </script>
 <style lang="scss">
 .point-tree {

src/components/tree/pqs/pointTree.vue

@@ -135,11 +135,17 @@ const loadData = () => {
         if (nodeKey) {
             nextTick(() => {
                 treeRef.value.treeRef.setCurrentKey(nodeKey)
+
                 // treeRef.value.treeRef.setExpandedKeys(nodeKey)
             })
         }
     })
 }
+const scrollToNode = (id: string) => {
+    // 树滚动
+    treeRef.value.scrollToNode(id)
+}
+defineExpose({ treeRef, scrollToNode, tree })
 loadData()
 </script>
 <style lang="scss">

src/main.ts

@@ -16,12 +16,14 @@ import '@/assets/font/iconfont.css'
 import { ElDialog } from 'element-plus'
 import BaiduMap from 'vue-baidu-map-3x'
 import BaiduMapOffline from 'vue-baidu-map-offline'
+
 import ExcelJS from 'exceljs'
 import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
 // 方式1：NPM 安装，注入 ExcelJS 对象
 VXETable.use(VXETablePluginExportXLSX, {
     ExcelJS
 })
+// 全局注册 tooltip 组件
 window.XEUtils = XEUtils
 
 // 初始化多语言
@@ -35,21 +37,21 @@ const setupAll = async () => {
     const app = createApp(App)
 
     //开启离线地图
-    // app.use(BaiduMapOffline, {
+    app.use(BaiduMapOffline, {
-    //     offline: true,
+        offline: true,
-    //     offlineConfig: {
+        offlineConfig: {
-    //         imgext: '.png',
+            imgext: '.png',
-    //         customstyle: '',
+            customstyle: '',
-    //         tiles_dir: '',
+            tiles_dir: '',
-    //         tiles_hybrid: '',
+            tiles_hybrid: '',
-    //         tiles_self: '',
+            tiles_self: '',
-    //         tiles_v_dir: '',
+            tiles_v_dir: '',
-    //         tiles_satellite_dir: '',
+            tiles_satellite_dir: '',
-    //         tiles_road_dir: '',
+            tiles_road_dir: '',
-    //         tiles_v_road_dir: '',
+            tiles_v_road_dir: '',
-    //         home: './plugin/offline/'
+            home: './plugin/offline/'
-    //     }
+        }
-    // })
+    })
     app.use(BaiduMap, {
         // ak: 'Yp57V71dkOPiXjiN8VdcFRsVELzlVNKK',
         ak: 'RpQi6WNFZ9tseKzhdwOQsXwFsoVntnsN',
@@ -61,6 +63,7 @@ const setupAll = async () => {
     app.use(pinia)
     app.use(ElementPlus)
     app.use(VXETable)
+   
     ;(app._context.components.ElDialog as typeof ElDialog).props.closeOnClickModal.default = false
     registerIcons(app) // icons
 

src/stores/modules/dict.ts

@@ -68,6 +68,7 @@ export const useDictStore = defineStore('dict', {
       }
     },
     getDictByType(type: string) {
+      console.log("🚀 ~ type:", type)
       if (!this.isSetDict) {
         this.setDictMap()
       }

src/styles/app.css

@@ -373,3 +373,4 @@ body,
 .w-e-scroll {
   min-height: 200px !important;
 }
+

src/styles/element.scss

@@ -268,3 +268,8 @@
 .el-drawer__body {
     padding: 10px;
 }
+
+.aLoad{
+    color: var(--el-color-primary);
+    cursor: pointer;
+}

src/styles/vxeTable.scss

@@ -63,7 +63,10 @@
 .vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon {
     color: var(--el-color-primary-light-5);
 }
-
+.vxe-table--render-default .vxe-body--row.row--current,
+.vxe-table--render-default .vxe-body--row.row--current:hover {
+    background-color: var(--el-color-primary-light-8);
+}
 // .vxe-table--render-default .is--disabled.vxe-cell--checkbox .vxe-checkbox--icon{
 //     color: #fff0;
 // }
@@ -77,14 +80,14 @@
 .vxe-modal--wrapper {
     z-index: 5000 !important;
 }
-.vxe-table--body .vxe-body--row:nth-child(even) {
+// .vxe-table--body .vxe-body--row:nth-child(even) {
-    background-color: #f9f9f9;
+//     background-color: #f9f9f9;
-    // background-color: var(--el-color-primary-light-9);
+//     // background-color: var(--el-color-primary-light-9);
-}
+// }
 
-.vxe-table--body .vxe-body--row:nth-child(odd) {
+// .vxe-table--body .vxe-body--row:nth-child(odd) {
-    background-color: #ffffff;
+//     background-color: #ffffff;
-}
+// }
 .default-theme.splitpanes--vertical > .splitpanes__splitter,
 .default-theme .splitpanes--vertical > .splitpanes__splitter {
     width: 10px !important;

src/utils/dict.ts

@@ -40,6 +40,7 @@ export const getIntDictOptions = (dictType: string): NumberDictDataType[] => {
       value: parseInt(dict.value + '')
     })
   })
+  console.log("🚀 ~ getIntDictOptions ~ dictOption:", dictOption)
   return dictOption
 }
 

src/utils/fileDownLoad.ts

@@ -0,0 +1,42 @@
+import { downloadFile } from '@/api/system-boot/file'
+// 下载文件
+export const download = (urls: string) => {
+    console.log("🚀 ~ download ~ urls:", urls)
+    downloadFile({ filePath: urls }).then((res: any) => {
+        let blob = new Blob([res], {
+            type: urls.includes('.pdf')
+                ? 'application/pdf'
+                : urls.includes('.zip')
+                ? 'application/zip'
+                : urls.includes('.doc')
+                ? 'application/msword'
+                : urls.includes('.docx')
+                ? 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+                : urls.includes('.xls')
+                ? 'application/vnd.ms-excel'
+                : urls.includes('.xlsx')
+                ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                : urls.includes('.png')
+                ? 'image/png'
+                : urls.includes('.jpeg')
+                ? 'image/jpeg'
+                : urls.includes('.jpg')
+                ? 'image/jpg'
+                : ''
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        let name = removeLastDotSuffix(urls.split('/')[2])
+        link.href = url
+        link.download = name
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+}
+function removeLastDotSuffix(str: string) {
+    // 找到最后一个 . 的位置
+    const lastDotIndex = str.lastIndexOf('.')
+    // 如果存在 .，截取到 . 之前的部分；否则返回原字符串
+    return lastDotIndex !== -1 ? str.slice(0, lastDotIndex) : str
+}

src/utils/tableStore.ts

@@ -130,6 +130,7 @@ export default class TableStore {
      * @param data 携带数据
      */
     onTableAction = (event: string, data: anyObj) => {
+     
         const actionFun = new Map([
             [
                 'search',
@@ -202,6 +203,7 @@ export default class TableStore {
                 'export',
                 () => {
                     // this.index()
+                    console.log('export')
                     let params = { ...this.table.params, pageNum: 1, pageSize: this.table.total }
                     createAxios(
                         Object.assign(
@@ -213,6 +215,7 @@ export default class TableStore {
                         )
                     ).then(res => {
                         this.table.allData = filtration(res.data.records || res.data)
+                        console.log('11111',this.table.allData)
                         this.table.exportProcessingData && this.table.exportProcessingData()
                         this.table.allFlag = data.showAllFlag || true
                     })

src/views/pqs/auditManage/auditList/index.vue

@@ -146,7 +146,7 @@ const tableStore: any = new TableStore({
         { field: 'describe', title: '事件描述' },
         { field: 'type', title: '事件类型', sortable: true },
         { field: 'result', title: '操作结果', sortable: true },
-        { field: 'ip', title: '操作IP' },
+        { field: 'ip', title: '操作IP' ,width:'120px'},
         { field: 'level', title: '事件等级', sortable: true }
     ],
     loadCallback: () => {

src/views/pqs/auditManage/userInfo/index.vue

@@ -26,7 +26,7 @@ const tableStore: any = new TableStore({
     method: 'POST',
     column: [
         { field: 'userName', title: '登录用户' },
-        { field: 'ip', title: '登录ip' },
+        { field: 'ip', title: '登录ip' ,width:'120px'},
         { field: 'time', title: '登录时间' }
     ]
 })

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

@@ -270,7 +270,7 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '名称', field: 'name' },
-        { title: 'IP', field: 'ip' },
+        { title: 'IP', field: 'ip' ,width:'120px' },
         {
             title: '等级',
             field: 'nodeGrade',
@@ -332,29 +332,29 @@ const tableStore = new TableStore({
                         formData.value = JSON.parse(JSON.stringify(row))
                     }
                 },
-                {
+                // {
-                    name: 'edit',
+                //     name: 'edit',
-                    title: '重启',
+                //     title: '重启',
-                    type: 'warning',
+                //     type: 'warning',
-                    icon: 'el-icon-Delete',
+                //     icon: 'el-icon-Delete',
-                    render: 'confirmButton',
+                //     render: 'confirmButton',
-                    popconfirm: {
+                //     popconfirm: {
-                        confirmButtonText: '确认',
+                //         confirmButtonText: '确认',
-                        cancelButtonText: '取消',
+                //         cancelButtonText: '取消',
-                        confirmButtonType: 'warning',
+                //         confirmButtonType: 'warning',
-                        title: '确定重启吗？'
+                //         title: '确定重启吗？'
-                    },
+                //     },
-                    click: row => {
+                //     click: row => {
-                        askRestartProcess({
+                //         askRestartProcess({
-                            deviceRebootType: null,
+                //             deviceRebootType: null,
-                            nodeId: row.id,
+                //             nodeId: row.id,
-                            processNo: 1
+                //             processNo: 1
-                        }).then(res => {
+                //         }).then(res => {
-                            ElMessage.success('重启成功')
+                //             ElMessage.success('重启成功')
-                            tableStore.index()
+                //             tableStore.index()
-                        })
+                //         })
-                    }
+                //     }
-                },
+                // },
 
                 {
                     name: 'del',

src/views/pqs/business/terminal/TerminalManagement/components/disposition.vue

@@ -25,7 +25,7 @@
                 :checkbox-config="{ labelField: 'name' }"
             >
                 <vxe-column field="name" align="left" title="电网拓扑" min-width="200" tree-node></vxe-column>
-                <vxe-column field="ip" title="网络参数"></vxe-column>
+                <vxe-column field="ip" title="网络参数" width="120px"></vxe-column>
                 <vxe-column field="runFlag" title="终端状态" v-if="key == 0">
                     <template #default="{ row }">
                         <el-tag v-if="row.runFlag === 0" type="success" size="small">投运</el-tag>

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

@@ -88,7 +88,7 @@
                     </template>
                 </vxe-column>
                 <vxe-column field="version" title="版本信息"></vxe-column>
-                <vxe-column field="ip" title="网络参数"></vxe-column>
+                <vxe-column field="ip" title="网络参数" width="120px"></vxe-column>
 
                 <vxe-column field="runFlag" title="终端状态">
                     <template #default="{ row }">

src/views/pqs/business/terminal/userLedger/components/detail.vue

@@ -110,10 +110,7 @@
             >
                 {{ proviteData.agreementCapacity }}
             </el-descriptions-item>
-            <el-descriptions-item
+            <el-descriptions-item label="装机容量（MW）">
-                label="装机容量（MW）"
-                
-            >
                 {{ proviteData?.ratePower }}
             </el-descriptions-item>
             <el-descriptions-item
@@ -485,7 +482,7 @@ const getProviteData = async () => {
         getFileNamePath(proviteData.value.additionalAttachments, 'additionalAttachments')
     }
 
-    // 入网评估报告
+    // 系统接入方案
     if (detailData.value.netInReport.length > 0) {
         netInReportList.value = []
         detailData.value.netInReport.forEach((item: any) => {

src/views/pqs/comptroller/list.vue

@@ -39,7 +39,7 @@ const tableStore = new TableStore({
         { title: '事件描述', field: 'describe', align: 'center', showOverflow: true,minWidth: 200 },
         { title: '事件类型', field: 'type', align: 'center', width: 160 },
         { title: '操作结果', field: 'type', align: 'center', width: 100 },
-        { title: '操作IP', field: 'ip', align: 'center', width: 160 },
+        { title: '操作IP', field: 'ip', align: 'center', width: 120 },
         { title: '事件等级', field: 'level', align: 'center', width: 100 }
     ]
 })

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

@@ -12,7 +12,7 @@
                     <div style="display: flex;align-items: center;">
                         <div>{{ item.name }}</div>
 
-                        <el-icon class="elView" v-if="item.name" @click="view(item)">
+                        <el-icon class="elView" v-if="item.name && VITE_FLAG" @click="view(item)">
                             <View />
                         </el-icon>
                         <el-icon class="elView" v-if="item.name" @click="download(item)">
@@ -50,6 +50,7 @@ import { ref, reactive } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { getFileNameAndFilePath, downloadFile } from '@/api/system-boot/file'
 import { Download, View } from '@element-plus/icons-vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const dialogVisible = ref(false)
 const tableData: any = ref({
 

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

@@ -36,8 +36,8 @@
 //引入相关样式
 import '@vue-office/excel/lib/index.css'
 //引入VueOfficeDocx组件
-import VueOfficeDocx from '@vue-office/docx'
+ import VueOfficeDocx from '@vue-office/docx'
-import VueOfficeExcel from '@vue-office/excel'
+ import VueOfficeExcel from '@vue-office/excel'
 //引入VueOfficePdf组件
 import VueOfficePdf from '@vue-office/pdf'
 import { ref, reactive } from '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/standard/index.vue

@@ -77,6 +77,8 @@ onMounted(() => {
     }
 })
 
+
+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

@@ -127,7 +127,7 @@ const tableStore = new TableStore({
         { field: 'lineName', title: '监测点名称', minWidth: '180' },
         { field: 'gdName', title: '供电公司', minWidth: '120' },
         { field: 'subName', title: '变电站', minWidth: '150' },
-        { field: 'ip', title: '网络参数', minWidth: '110' },
+        { field: 'ip', title: '网络参数' ,width:'120px' },
         { field: 'scale', title: '电压等级', minWidth: '110' },
         // {
         //     field: 'advanceType',

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

@@ -194,7 +194,7 @@ const tableStore = new TableStore({
         {
             title: '网络参数',
             field: 'ip',
-            align: 'center',
+            align: 'center',width:'120px',
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }

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

@@ -199,7 +199,7 @@ const tableStore = new TableStore({
         {
             title: '网络参数',
             field: 'ip',
-            align: 'center',
+            align: 'center' ,width:'120px',
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }

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

@@ -5,7 +5,7 @@
             贡献度计算
             <div style="font-size: 14px; font-weight: 500">
                 <!-- {{ dotList.alias || '' }} -->
-                <span class="monitoring-point">当前位置：{{ dotList.alias || '' }}</span>
+                <span class="monitoring-point1">当前位置：{{ dotList.alias || '' }}</span>
                 <back-component />
             </div>
         </div>
@@ -598,7 +598,7 @@ onMounted(() => {
         width: 300px;
     }
 }
-.monitoring-point {
+.monitoring-point1 {
     font-size: 14px;
     font-weight: 700;
     color: var(--el-color-primary);

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

@@ -3,9 +3,9 @@
         <!-- 模版 -->
         <TableHeader datePicker showExport :showReset="false" ref="TableHeaderRef">
             <template #select>
-                <el-form-item label="关键字">
+                <!-- <el-form-item label="关键字">
                     <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字" />
-                </el-form-item>
+                </el-form-item> -->
             </template>
             <template #operation>
                 <el-button type="primary" icon="el-icon-CreditCard"
@@ -41,7 +41,7 @@ const tableStore = new TableStore({
         { title: '供电公司', field: 'gdName' },
         { title: '变电站', field: 'subName' },
         { title: '终端名称', field: 'devName' },
-        { title: 'IP', field: 'ip' },
+        { title: 'IP', field: 'ip' ,width:'120px' },
         { title: '监测点名称', field: 'lineName' },
         { title: '类型', field: 'dataType' },
         { title: '谐波次数', field: 'dataTimes' },

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

@@ -1,408 +0,0 @@
-<template>
-  <div class="tab-content">
-    <TableHeader datePicker ref="tableHeaderRef" @selectChange="handleSelectChange" >
-      <template #select>
-        <el-form-item label="区域">
-          <el-cascader 
-            v-bind="$attrs" 
-            :options="areOptions" 
-            :props="cascaderProps" 
-            v-model="selectedArea"
-            @change="handleFilterChange"
-          />
-        </el-form-item>
-        <el-form-item label="统计类型">
-          <el-select
-            v-model="tableStore.table.params.statisticalType"
-            value-key="id"
-            placeholder="请选择统计类型"
-            @change="handleStatisticalTypeChange"
-          >
-            <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="电网标志">
-          <el-select 
-            v-model="tableStore.table.params.powerFlag" 
-            placeholder="请选择电网标志"
-            @change="handleFilterChange"
-          >
-            <el-option label="全部" value="0"></el-option>
-            <el-option label="电网侧" value="1"></el-option>
-            <el-option label="非电网侧" value="2"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="筛选数据">
-          <el-input 
-            v-model="searchKeyword" 
-            placeholder="请输入变电站/终端/监测点"
-            clearable
-            @input="handleFilterChange"
-            :show-word-limit=true
-            :maxlength="32"
-          />
-        </el-form-item>
-      </template>
-      <template #operation>
-        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button>
-      </template>
-    </TableHeader>
-    
-    <div v-loading="tableStore.table.loading" class="main-container">
-      <vxe-table
-        class="full-height-table"
-        ref="tableRef"
-        auto-resize
-        :data="tableStore.table.data"
-        v-bind="defaultAttribute"
-        :height="tableHeight"
-        resizable
-        show-overflow
-      >
-        <vxe-column title="序号" width="80" type="seq" align="center"></vxe-column>
-        <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="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="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-table>
-    </div>
-    
-      <div class="pagination-container">
-        <el-pagination
-          :current-page="tableStore.table.params.pageNum"
-          :page-size="tableStore.table.params.pageSize"
-          :page-sizes="[10, 20, 50, 100]"
-          background
-          layout="sizes, total, prev, pager, next, jumper"
-          :total="tableStore.table.total"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          class="custom-pagination"/>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-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'
-import { debounce } from 'lodash-es'
-
-const props = defineProps({
-  active: {
-    type: Boolean,
-    default: false
-  }
-})
-
-const emit = defineEmits(['initialized'])
-
-const dictData = useDictData()
-const options = dictData.getBasicData('Pollution_Calc')
-const tableHeight = ref(500)
-const tableRef = ref()
-const tableHeaderRef = ref()
-
-const selectedArea = ref()
-const areOptions: any = dictData.state.area
-const allData = ref<PollutionItem[]>([])
-const searchKeyword = ref('')
-const harmonicValueTitle = ref('谐波电压污染值')
-
-const cascaderProps = {
-  label: 'name',
-  value: 'id',
-  checkStrictly: true,
-  emitPath: false
-}
-
-interface PollutionItem {
-  gdName?: string
-  subStationName?: string
-  devName?: string
-  lineName?: string
-  powerFlag?: string
-}
-
-const formatMonitorId = (row: any) => {
-  return row.cellValue || '/'
-}
-
-const handleSelectChange = (isExpanded: boolean) => {
-  if (isExpanded) {
-    tableHeight.value = tableHeight.value - 55
-  } else {
-    tableHeight.value = tableHeight.value + 55
-  }
-}
-
-const calculateTableHeight = () => {
-  const windowHeight = window.innerHeight
-  const headerHeight = 160
-  const paginationHeight = 120
-  const padding = 30
-  const calculatedHeight = windowHeight - headerHeight - paginationHeight - padding
-  tableHeight.value = Math.max(calculatedHeight, 300)
-}
-
-const debouncedCalculateTableHeight = debounce(() => {
-  calculateTableHeight()
-}, 300)
-
-const filteredData = computed(() => {
-  let result = [...allData.value]
-
-  if (selectedArea.value) {
-    let areaName = ''
-    let areaLevel = -1
-    const findAreaName = (areas: any[]) => {
-      for (const area of areas) {
-        if (area.id === selectedArea.value) {
-          areaName = area.name
-          areaLevel = area.level !== undefined ? area.level : -1
-          break
-        }
-        if (area.children && area.children.length > 0) {
-          findAreaName(area.children)
-        }
-      }
-    }
-    findAreaName(areOptions)
-    
-    if (areaName && areaLevel > 1) {
-      result = result.filter(item => item.gdName && item.gdName.includes(areaName))
-    }
-  }
-
-  if (tableStore.table.params.powerFlag === '1') {
-    result = result.filter(item => item.powerFlag && !item.powerFlag.includes('非'))
-  } else if (tableStore.table.params.powerFlag === '2') {
-    result = result.filter(item => item.powerFlag && item.powerFlag.includes('非'))
-  }
-
-  if (searchKeyword.value) {
-    const keyword = searchKeyword.value.toLowerCase()
-    result = result.filter(item => 
-      (item.subStationName && item.subStationName.toLowerCase().includes(keyword)) ||
-      (item.devName && item.devName.toLowerCase().includes(keyword)) ||
-      (item.lineName && item.lineName.toLowerCase().includes(keyword))
-    )
-  }
-  
-  return result
-})
-
-const currentPageData = computed(() => {
-  const pageSize = tableStore.table.params.pageSize
-  const pageNum = tableStore.table.params.pageNum
-  const start = (pageNum - 1) * pageSize
-  const end = start + pageSize
-  return filteredData.value.slice(start, end)
-})
-
-const updateTotal = computed(() => {
-  return filteredData.value.length
-})
-
-const tableStore = new TableStore({
-  url: '/harmonic-boot/PollutionSubstation/downPollutionLineCalc',
-  method: 'POST',
-  column: [],
-  beforeSearchFun: () => {
-    delete tableStore.table.params.deptIndex
-    delete tableStore.table.params.interval
-    delete tableStore.table.params.searchEndTime
-    delete tableStore.table.params.searchBeginTime
-    delete tableStore.table.params.timeFlag
-  },
-  loadCallback: () => {
-    allData.value = tableStore.table.data || []
-    tableStore.table.total = updateTotal.value
-    tableStore.table.data = currentPageData.value
-  },
-  resetCallback: () => {
-    clearQueryParams()
-  }
-})
-
-provide('tableStore', tableStore)
-
-watch(
-  () => areOptions,
-  (newOptions) => {
-    if (newOptions && newOptions.length > 0) {
-      selectedArea.value = newOptions[0].id
-      tableStore.table.params.id = newOptions[0].id
-    }
-  },
-  { immediate: true }
-)
-
-watch(
-  () => options,
-  (newOptions) => {
-    if (newOptions && newOptions.length > 0) {
-      if (!tableStore.table.params.statisticalType) {
-        tableStore.table.params.statisticalType = newOptions[0]
-        tableStore.table.params.ids = [newOptions[0].id]
-      }
-    }
-  },
-  { immediate: true }
-)
-
-tableStore.table.params.powerFlag = "0"
-tableStore.table.params.isUpToGrid = 0
-tableStore.table.params.type = 1
-
-const handleStatisticalTypeChange = (newVal: { id: any }) => {
-  if (newVal) {
-    tableStore.table.params.statisticalType = newVal
-    tableStore.table.params.ids = [newVal.id]
-    if (newVal.name) {
-      harmonicValueTitle.value = newVal.name + '污染值'
-    }
-  }
-  // 重新调用接口
-  tableStore.index()
-}
-
-const handleFilterChange = () => {
-  tableStore.table.params.pageNum = 1
-  tableStore.table.data = currentPageData.value
-  tableStore.table.total = updateTotal.value
-}
-
-const handleSizeChange = (val: number) => {
-  tableStore.table.params.pageSize = val
-  tableStore.table.params.pageNum = 1
-  tableStore.table.data = currentPageData.value
-  tableStore.table.total = updateTotal.value
-}
-
-const handleCurrentChange = (val: number) => {
-  tableStore.table.params.pageNum = val
-  tableStore.table.data = currentPageData.value
-  tableStore.table.total = updateTotal.value
-}
-
-const exportEvent = () => {
-  const allFilteredData = filteredData.value
-  tableRef.value.exportData({
-    filename: '监测点评估-污染值报告',
-    sheetName: 'Sheet1',
-    type: 'xlsx',
-    useStyle: true,
-    data: allFilteredData,
-    columnFilterMethod: function (column, $columnIndex) {
-      return !(column.$columnIndex === 0)
-    }
-  })
-}
-
-onMounted(() => {
-  if (props.active) {
-    tableStore.index()
-    emit('initialized', 'pollutionReport')
-  }
-  calculateTableHeight()
-  window.addEventListener('resize', debouncedCalculateTableHeight)
-})
-
-onBeforeUnmount(() => {
-  window.removeEventListener('resize', debouncedCalculateTableHeight)
-})
-
-
-const clearQueryParams = () => {
-  // 将区域恢复成第一层
-  if (areOptions && areOptions.length > 0) {
-    selectedArea.value = areOptions[0].id
-    tableStore.table.params.id = areOptions[0].id
-  }
-  
-  // 清空搜索关键词
-  searchKeyword.value = ''
-}
-
-defineExpose({
-  refresh: () => {
-     // 清空查询参数
-    clearQueryParams()
-    tableHeaderRef.value.setTheDate(3)
-    tableStore.index()
-  }
-})
-</script>
-
-<style scoped>
-.pagination-container {
-  border: 1px solid #ebeef5;
-  border-top: none;
-  padding: 10px;
-  margin: 0 0 5px 0;
-  background-color: #fff;
-}
-
-:deep(.custom-pagination) {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  flex-wrap: wrap;
-}
-
-:deep(.custom-pagination .el-pagination__sizes) {
-  margin-right: 10px;
-}
-
-:deep(.custom-pagination .el-pagination__total) {
-  margin-right: auto;
-}
-
-:deep(.custom-pagination .el-pagination__jump) {
-  margin-left: 20px;
-}
-
-/* 响应式处理 */
-@media screen and (max-width: 768px) {
-  :deep(.custom-pagination) {
-    flex-direction: column;
-    align-items: stretch;
-  }
-  
-  :deep(.custom-pagination .el-pagination__total) {
-    margin-right: 0;
-    order: 1;
-    margin-top: 10px;
-  }
-  
-  :deep(.custom-pagination .el-pagination__sizes) {
-    order: 2;
-  }
-  
-  :deep(.custom-pagination .btn-prev),
-  :deep(.custom-pagination .el-pager),
-  :deep(.custom-pagination .btn-next),
-  :deep(.custom-pagination .el-pagination__jump) {
-    order: 3;
-    justify-content: center;
-    margin-top: 10px;
-  }
-}
-</style>

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

@@ -1,520 +0,0 @@
-<template>
-  <div class="tab-content">
-    <TableHeader datePicker ref="tableHeaderRef" @selectChange="handleSelectChange">
-      <template #select>
-        <el-form-item label="区域">
-          <el-cascader 
-            v-bind="$attrs" 
-            :options="areOptions" 
-            :props="cascaderProps" 
-            v-model="selectedArea"
-            @change="handleFilterChange"
-          />
-        </el-form-item>
-        <el-form-item label="统计类型">
-          <el-select
-            v-model="tableStore.table.params.statisticalType"
-            value-key="id"
-            placeholder="请选择统计类型"
-            @change="handleStatisticalTypeChange"
-          >
-            <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="电网标志">
-          <el-select 
-            v-model="tableStore.table.params.powerFlag" 
-            placeholder="请选择电网标志"
-            @change="handleFilterChange"
-          >
-            <el-option label="全部" value="0"></el-option>
-            <el-option label="电网侧" value="1"></el-option>
-            <el-option label="非电网侧" value="2"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="筛选数据">
-          <el-input 
-            v-model="searchKeyword" 
-            placeholder="请输入变电站"
-            clearable
-            @input="handleFilterChange"
-            :show-word-limit=true
-            :maxlength="32"
-          />
-        </el-form-item>
-      </template>
-      <template #operation>
-        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button>
-      </template>
-    </TableHeader>
-    
-    <div v-loading="tableStore.table.loading" class="main-container">
-      <vxe-table
-        class="full-height-table"
-        ref="tableRef"
-        auto-resize
-        :data="tableStore.table.data"
-        v-bind="defaultAttribute"
-        :height="tableHeight"
-        resizable
-        show-overflow
-      >
-        <vxe-column title="序号" width="80" type="seq" align="center"></vxe-column>
-        <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="subVStationValue" :title="harmonicValueTitle" align="center" min-width="150"></vxe-column>
-        <vxe-column field="subVoltage" title="变电站电压等级" align="center" min-width="150"></vxe-column>
-        <vxe-column title="操作" width="150" align="center">
-          <template #default="{ row }">
-            <el-button size="small" type="primary" @click="showDetailDialog(row)">监测点详情</el-button>
-          </template>
-        </vxe-column>
-      </vxe-table>
-    </div>
-    
-    <div class="pagination-container">
-        <el-pagination
-          :current-page="tableStore.table.params.pageNum"
-          :page-size="tableStore.table.params.pageSize"
-          :page-sizes="[10, 20, 50, 100]"
-          background
-          layout="sizes, total, prev, pager, next, jumper"
-          :total="tableStore.table.total"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          class="custom-pagination"/>
-    </div>
-
-     <!-- 添加弹窗 -->
-    <el-dialog  draggable
-      v-model="detailDialogVisible" 
-      :title="detailDialogTitle" 
-      width="1000px"
-     
-    >
-      <div v-loading="detailLoading">
-        <div style="margin-bottom: 10px; text-align: right;">
-          <el-button icon="el-icon-Download" type="primary" @click="exportDetailEvent">导出</el-button>
-        </div>
-        <vxe-table
-          ref="detailTableRef"
-          :data="detailData"
-          auto-resize
-          v-bind="defaultAttribute"
-          resizable
-          show-overflow
-          height="400px"
-        >
-          <vxe-column title="序号" width="60" type="seq" align="center"></vxe-column>
-         
-          <vxe-column field="lineName" title="监测点名称" align="center" min-width="120"></vxe-column>
-          <vxe-column field="devName" title="终端名称" align="center" min-width="120"></vxe-column>
-          <vxe-column field="devType" title="终端型号" align="center" min-width="100"></vxe-column>
-          <vxe-column field="manufacturer" title="终端厂家" align="center" min-width="120"></vxe-column>
-          <vxe-column field="loginTime" title="投运时间" align="center" min-width="120"></vxe-column>
-          <vxe-column field="interval" title="统计间隔" align="center" min-width="100"></vxe-column>
-          <vxe-column field="powerFlag" title="监测位置" align="center" min-width="100"></vxe-column>
-          <vxe-column field="vharmonicValue" title="监测点污染值" align="center" min-width="120"></vxe-column>
-        </vxe-table>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-
-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'
-import { debounce } from 'lodash-es'
-
-const props = defineProps({
-  active: {
-    type: Boolean,
-    default: false
-  }
-})
-
-const emit = defineEmits(['initialized'])
-
-const dictData = useDictData()
-const options = dictData.getBasicData('Pollution_Calc')
-const tableHeight = ref(500)
-const tableRef = ref()
-const tableHeaderRef = ref()
-const detailTableRef = ref()
-const selectedArea = ref()
-const areOptions: any = dictData.state.area
-const allData = ref<PollutionItem[]>([])
-const searchKeyword = ref('')
-const harmonicValueTitle = ref('电站谐波电压污染值')
-const detailDialogVisible = ref(false)
-const detailDialogTitle = ref('')
-const detailLoading = ref(false)
-const detailData = ref<PollutionItem[]>([])
-const originalTableData = ref<any[]>([])
-
-// 方法
-const showDetailDialog = (row) => {
-  detailDialogTitle.value = `${row.subStationName} - 监测点详情`
-  loadDetailData(row)
-  detailDialogVisible.value = true
-}
-
-
-const loadDetailData = async (row) => {
-  detailLoading.value = true
-  try {
-    // 从原始数据中查找该变电站的详细信息
-    const originalItem = originalTableData.value.find(
-      item => item.subStationName === row.subStationName
-    )
-    
-    if (originalItem && originalItem.powerFlagPollutionList) {
-      const detailList: PollutionItem[] = []
-      originalItem.powerFlagPollutionList.forEach((point: any) => {
-        detailList.push({
-        
-          lineName: processNullValue(point.lineName),
-          devName: processNullValue(point.devName),
-          devType: processNullValue(point.devType),
-          manufacturer: processNullValue(point.manufacturer),
-          loginTime: processNullValue(point.loginTime),
-          interval: processNullValue(point.interval),
-          powerFlag: processNullValue(point.powerFlag),
-          vharmonicValue: processNullValue(point.vharmonicValue)
-        })
-      })
-      detailData.value = detailList
-    } else {
-      detailData.value = []
-    }
-  } catch (error) {
-    console.error('加载详情数据失败:', error)
-    detailData.value = []
-  } finally {
-    detailLoading.value = false
-  }
-}
-
-const cascaderProps = {
-  label: 'name',
-  value: 'id',
-  checkStrictly: true,
-  emitPath: false
-}
-
-interface PollutionItem {
-  gdName?: string
-  subStationName?: string
-  subVStationValue?: string
-  subVoltage?: string
-  devName?: string
-  lineName?: string
-  powerFlag?: string
-  devType?: string
-  manufacturer?: string
-  loginTime?: string
-  interval?: string
-  vharmonicValue?: string
-}
-
-const handleSelectChange = (isExpanded: boolean) => {
-  if (isExpanded) {
-    tableHeight.value = tableHeight.value - 55
-  } else {
-    tableHeight.value = tableHeight.value + 55
-  }
-}
-
-const calculateTableHeight = () => {
-  const windowHeight = window.innerHeight
-  const headerHeight = 160
-  const paginationHeight = 120
-  const padding = 30
-  const calculatedHeight = windowHeight - headerHeight - paginationHeight - padding
-  tableHeight.value = Math.max(calculatedHeight, 300)
-}
-
-const debouncedCalculateTableHeight = debounce(() => {
-  calculateTableHeight()
-}, 300)
-
-const filteredData = computed(() => {
-  let result = [...allData.value]
-
-  if (selectedArea.value) {
-    let areaName = ''
-    let areaLevel = -1
-    const findAreaName = (areas: any[]) => {
-      for (const area of areas) {
-        if (area.id === selectedArea.value) {
-          areaName = area.name
-          areaLevel = area.level !== undefined ? area.level : -1
-          break
-        }
-        if (area.children && area.children.length > 0) {
-          findAreaName(area.children)
-        }
-      }
-    }
-    findAreaName(areOptions)
-    
-    if (areaName && areaLevel > 1) {
-      result = result.filter(item => item.gdName && item.gdName.includes(areaName))
-    }
-  }
-
-  if (tableStore.table.params.powerFlag === '1') {
-    result = result.filter(item => item.powerFlag && !item.powerFlag.includes('非'))
-  } else if (tableStore.table.params.powerFlag === '2') {
-    result = result.filter(item => item.powerFlag && item.powerFlag.includes('非'))
-  }
-
-  if (searchKeyword.value) {
-    const keyword = searchKeyword.value.toLowerCase()
-    result = result.filter(item => 
-      (item.subStationName && item.subStationName.toLowerCase().includes(keyword)) ||
-      (item.devName && item.devName.toLowerCase().includes(keyword)) ||
-      (item.lineName && item.lineName.toLowerCase().includes(keyword))
-    )
-  }
-  
-  return result
-})
-
-const currentPageData = computed(() => {
-  const pageSize = tableStore.table.params.pageSize
-  const pageNum = tableStore.table.params.pageNum
-  const start = (pageNum - 1) * pageSize
-  const end = start + pageSize
-  return filteredData.value.slice(start, end)
-})
-
-const updateTotal = computed(() => {
-  return filteredData.value.length
-})
-
-const processNullValue = (value: any) => {
-  return value === null || value === undefined || value === '' || value === 'null'? '/' : value
-}
-
-const tableStore = new TableStore({
-  url: '/harmonic-boot/PollutionSubstation/downPollutionSubCalc',
-  method: 'POST',
-  column: [],
-  beforeSearchFun: () => {
-    delete tableStore.table.params.deptIndex
-    delete tableStore.table.params.interval
-    delete tableStore.table.params.searchEndTime
-    delete tableStore.table.params.searchBeginTime
-    delete tableStore.table.params.timeFlag
-  },
-  loadCallback: () => {
-    // 保存原始数据以便后续查询
-    originalTableData.value = [...(tableStore.table.data || [])]
-    
-    const expandedData: PollutionItem[] = [];
-    
-    (tableStore.table.data || []).forEach((item: any) => {
-      expandedData.push({
-        gdName: processNullValue(item.gdName),
-        subStationName: processNullValue(item.subStationName),
-        subVStationValue: processNullValue(item.subVStationValue),
-        subVoltage: processNullValue(item.subVoltage)
-        
-      });
-    });
-    
-    allData.value = expandedData;
-    tableStore.table.total = updateTotal.value;
-    tableStore.table.data = currentPageData.value;
-  },
-  resetCallback: () => {
-    clearQueryParams()
-  }
-})
-
-provide('tableStore', tableStore)
-
-watch(
-  () => areOptions,
-  (newOptions) => {
-    if (newOptions && newOptions.length > 0) {
-      selectedArea.value = newOptions[0].id
-      tableStore.table.params.id = newOptions[0].id
-    }
-  },
-  { immediate: true }
-)
-
-watch(
-  () => options,
-  (newOptions) => {
-    if (newOptions && newOptions.length > 0) {
-      if (!tableStore.table.params.statisticalType) {
-        tableStore.table.params.statisticalType = newOptions[0]
-        tableStore.table.params.ids = [newOptions[0].id]
-      }
-    }
-  },
-  { immediate: true }
-)
-
-tableStore.table.params.powerFlag = "0"
-tableStore.table.params.isUpToGrid = 0
-tableStore.table.params.type = 1
-
-const handleStatisticalTypeChange = (newVal: { id: any }) => {
-  if (newVal) {
-    tableStore.table.params.statisticalType = newVal
-    tableStore.table.params.ids = [newVal.id]
-    if (newVal.name) {
-      harmonicValueTitle.value = '电站' + newVal.name + '污染值'
-    }
-  }
-  // 重新调用接口
-  tableStore.index()
-}
-
-const handleFilterChange = () => {
-  tableStore.table.params.pageNum = 1
-  tableStore.table.data = currentPageData.value
-  tableStore.table.total = updateTotal.value
-}
-
-const handleSizeChange = (val: number) => {
-  tableStore.table.params.pageSize = val
-  tableStore.table.params.pageNum = 1
-  tableStore.table.data = currentPageData.value
-  tableStore.table.total = updateTotal.value
-}
-
-const handleCurrentChange = (val: number) => {
-  tableStore.table.params.pageNum = val
-  tableStore.table.data = currentPageData.value
-  tableStore.table.total = updateTotal.value
-}
-
-const exportEvent = () => {
-  const allFilteredData = filteredData.value
-  tableRef.value.exportData({
-    filename: '场站级评估-污染值报告',
-    sheetName: 'Sheet1',
-    type: 'xlsx',
-    useStyle: true,
-    data: allFilteredData,
-    columnFilterMethod: function (column: any) {
-            return !(
-                column.column.title === '操作'
-            )
-        }
-  })
-}
-
-// 导出详情数据的方法
-const exportDetailEvent = () => {
-  detailTableRef.value.exportData({
-    filename: detailDialogTitle.value,
-    sheetName: 'Sheet1',
-    type: 'xlsx',
-    useStyle: true,
-    data: detailData.value,
-    columnFilterMethod({ column }) {
-      // 导出所有列，包括隐藏列
-      return true;
-    }
-  })
-}
-
-onMounted(() => {
-  if (props.active) {
-    tableStore.index()
-    emit('initialized', 'pollutionReport')
-  }
-  calculateTableHeight()
-  window.addEventListener('resize', debouncedCalculateTableHeight)
-})
-
-onBeforeUnmount(() => {
-  window.removeEventListener('resize', debouncedCalculateTableHeight)
-})
-
-const clearQueryParams = () => {
-  // 将区域恢复成第一层
-  if (areOptions && areOptions.length > 0) {
-    selectedArea.value = areOptions[0].id
-    tableStore.table.params.id = areOptions[0].id
-  }
-  
-  // 清空搜索关键词
-  searchKeyword.value = ''
-}
-
-defineExpose({
-  refresh: () => {
-    clearQueryParams()
-    tableHeaderRef.value.setTheDate(3)
-    tableStore.index()
-  }
-})
-</script>
-
-<style scoped>
-.pagination-container {
-  border: 1px solid #ebeef5;
-  border-top: none;
-  padding: 10px;
-  margin: 0 0 5px 0;
-  background-color: #fff;
-}
-
-:deep(.custom-pagination) {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  flex-wrap: wrap;
-}
-
-:deep(.custom-pagination .el-pagination__sizes) {
-  margin-right: 10px;
-}
-
-:deep(.custom-pagination .el-pagination__total) {
-  margin-right: auto;
-}
-
-:deep(.custom-pagination .el-pagination__jump) {
-  margin-left: 20px;
-}
-
-/* 响应式处理 */
-@media screen and (max-width: 768px) {
-  :deep(.custom-pagination) {
-    flex-direction: column;
-    align-items: stretch;
-  }
-  
-  :deep(.custom-pagination .el-pagination__total) {
-    margin-right: 0;
-    order: 1;
-    margin-top: 10px;
-  }
-  
-  :deep(.custom-pagination .el-pagination__sizes) {
-    order: 2;
-  }
-  
-  :deep(.custom-pagination .btn-prev),
-  :deep(.custom-pagination .el-pager),
-  :deep(.custom-pagination .btn-next),
-  :deep(.custom-pagination .el-pagination__jump) {
-    order: 3;
-    justify-content: center;
-    margin-top: 10px;
-  }
-}
-</style>

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

@@ -0,0 +1,430 @@
+<template>
+    <div class="tab-content">
+        <TableHeader datePicker ref="tableHeaderRef" @selectChange="handleSelectChange">
+            <template #select>
+                <el-form-item label="区域">
+                    <el-cascader
+                        v-bind="$attrs"
+                        :options="areOptions"
+                        :props="cascaderProps"
+                        v-model="selectedArea"
+                        @change="handleFilterChange"
+                    />
+                </el-form-item>
+                <el-form-item label="统计类型">
+                    <el-select
+                        v-model="tableStore.table.params.statisticalType"
+                        value-key="id"
+                        placeholder="请选择统计类型"
+                        @change="handleStatisticalTypeChange"
+                    >
+                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="电网标志">
+                    <el-select
+                        v-model="tableStore.table.params.powerFlag"
+                        placeholder="请选择电网标志"
+                        @change="handleFilterChange"
+                    >
+                        <el-option label="全部" value="0"></el-option>
+                        <el-option label="电网侧" value="1"></el-option>
+                        <el-option label="非电网侧" value="2"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="筛选数据">
+                    <el-input
+                        v-model="searchKeyword"
+                        placeholder="请输入变电站/终端/监测点"
+                        clearable
+                        @input="handleFilterChange"
+                        :show-word-limit="true"
+                        :maxlength="32"
+                    />
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button>
+            </template>
+        </TableHeader>
+
+        <div v-loading="tableStore.table.loading" class="main-container">
+            <vxe-table
+                class="full-height-table"
+                ref="tableRef"
+                auto-resize
+                :data="tableStore.table.data"
+                v-bind="defaultAttribute"
+                :height="tableHeight"
+                resizable
+                show-overflow
+            >
+                <vxe-column title="序号" width="80" type="seq" align="center"></vxe-column>
+                <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="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="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-table>
+        </div>
+
+        <div class="pagination-container">
+            <el-pagination
+                :current-page="tableStore.table.params.pageNum"
+                :page-size="tableStore.table.params.pageSize"
+                :page-sizes="[10, 20, 50, 100, 200]"
+                background
+                layout="sizes, total, prev, pager, next, jumper"
+                :total="tableStore.table.total"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                class="custom-pagination"
+            />
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+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'
+import { debounce } from 'lodash-es'
+
+const props = defineProps({
+    active: {
+        type: Boolean,
+        default: false
+    }
+})
+
+const emit = defineEmits(['initialized'])
+
+const dictData = useDictData()
+const options = dictData.getBasicData('Pollution_Calc')
+const tableHeight = ref(500)
+const tableRef = ref()
+const tableHeaderRef = ref()
+
+const selectedArea = ref()
+const areOptions: any = dictData.state.area
+const allData = ref<PollutionItem[]>([])
+const searchKeyword = ref('')
+const harmonicValueTitle = ref('谐波电压污染值')
+
+const cascaderProps = {
+    label: 'name',
+    value: 'id',
+    checkStrictly: true,
+    emitPath: false
+}
+
+interface PollutionItem {
+    gdName?: string
+    subStationName?: string
+    devName?: string
+    lineName?: string
+    powerFlag?: string
+}
+
+const formatMonitorId = (row: any) => {
+    return row.cellValue || '/'
+}
+
+const handleSelectChange = (isExpanded: boolean) => {
+    if (isExpanded) {
+        tableHeight.value = tableHeight.value - 55
+    } else {
+        tableHeight.value = tableHeight.value + 55
+    }
+}
+
+const calculateTableHeight = () => {
+    const windowHeight = window.innerHeight
+    const headerHeight = 160
+    const paginationHeight = 120
+    const padding = 30
+    const calculatedHeight = windowHeight - headerHeight - paginationHeight - padding
+    tableHeight.value = Math.max(calculatedHeight, 300)
+}
+
+const debouncedCalculateTableHeight = debounce(() => {
+    calculateTableHeight()
+}, 300)
+
+const filteredData = computed(() => {
+    let result = [...allData.value]
+
+    if (selectedArea.value) {
+        let areaName = ''
+        let areaLevel = -1
+        const findAreaName = (areas: any[]) => {
+            for (const area of areas) {
+                if (area.id === selectedArea.value) {
+                    areaName = area.name
+                    areaLevel = area.level !== undefined ? area.level : -1
+                    break
+                }
+                if (area.children && area.children.length > 0) {
+                    findAreaName(area.children)
+                }
+            }
+        }
+        findAreaName(areOptions)
+
+        if (areaName && areaLevel > 1) {
+            result = result.filter(item => item.gdName && item.gdName.includes(areaName))
+        }
+    }
+
+    if (tableStore.table.params.powerFlag === '1') {
+        result = result.filter(item => item.powerFlag && !item.powerFlag.includes('非'))
+    } else if (tableStore.table.params.powerFlag === '2') {
+        result = result.filter(item => item.powerFlag && item.powerFlag.includes('非'))
+    }
+
+    if (searchKeyword.value) {
+        const keyword = searchKeyword.value.toLowerCase()
+        result = result.filter(
+            item =>
+                (item.subStationName && item.subStationName.toLowerCase().includes(keyword)) ||
+                (item.devName && item.devName.toLowerCase().includes(keyword)) ||
+                (item.lineName && item.lineName.toLowerCase().includes(keyword))
+        )
+    }
+
+    return result
+})
+
+const currentPageData = computed(() => {
+    const pageSize = tableStore.table.params.pageSize
+    const pageNum = tableStore.table.params.pageNum
+    const start = (pageNum - 1) * pageSize
+    const end = start + pageSize
+    return filteredData.value.slice(start, end)
+})
+
+const updateTotal = computed(() => {
+    return filteredData.value.length
+})
+
+const tableStore = new TableStore({
+    url: '/harmonic-boot/PollutionSubstation/downPollutionLineCalc',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {
+        delete tableStore.table.params.deptIndex
+        delete tableStore.table.params.interval
+        delete tableStore.table.params.searchEndTime
+        delete tableStore.table.params.searchBeginTime
+        delete tableStore.table.params.timeFlag
+    },
+    loadCallback: () => {
+        allData.value = tableStore.table.data || []
+        tableStore.table.total = updateTotal.value
+        tableStore.table.data = currentPageData.value
+    },
+    resetCallback: () => {
+        clearQueryParams()
+    }
+})
+
+provide('tableStore', tableStore)
+
+watch(
+    () => areOptions,
+    newOptions => {
+        if (newOptions && newOptions.length > 0) {
+            selectedArea.value = newOptions[0].id
+            tableStore.table.params.id = newOptions[0].id
+        }
+    },
+    { immediate: true }
+)
+
+watch(
+    () => options,
+    newOptions => {
+        if (newOptions && newOptions.length > 0) {
+            if (!tableStore.table.params.statisticalType) {
+                tableStore.table.params.statisticalType = newOptions[0]
+                tableStore.table.params.ids = [newOptions[0].id]
+            }
+        }
+    },
+    { immediate: true }
+)
+
+tableStore.table.params.powerFlag = '0'
+tableStore.table.params.isUpToGrid = 0
+tableStore.table.params.type = 1
+
+const handleStatisticalTypeChange = (newVal: { id: any }) => {
+    console.log('🚀 ~ handleStatisticalTypeChange ~ newVal:', newVal)
+    if (newVal) {
+        tableStore.table.params.statisticalType = newVal
+        tableStore.table.params.ids = [newVal.id]
+        if (newVal.name) {
+            harmonicValueTitle.value = newVal.name + '污染值'
+        }
+    }
+    // 重新调用接口
+    tableStore.index()
+}
+
+const handleFilterChange = () => {
+    tableStore.table.params.pageNum = 1
+    tableStore.table.data = currentPageData.value
+    tableStore.table.total = updateTotal.value
+}
+
+const handleSizeChange = (val: number) => {
+    tableStore.table.params.pageSize = val
+    tableStore.table.params.pageNum = 1
+    tableStore.table.data = currentPageData.value
+    tableStore.table.total = updateTotal.value
+}
+
+const handleCurrentChange = (val: number) => {
+    tableStore.table.params.pageNum = val
+    tableStore.table.data = currentPageData.value
+    tableStore.table.total = updateTotal.value
+}
+
+const exportEvent = () => {
+    const allFilteredData = filteredData.value
+    tableRef.value.exportData({
+        filename: '监测点评估-污染值报告',
+        sheetName: 'Sheet1',
+        type: 'xlsx',
+        useStyle: true,
+        data: allFilteredData,
+        columnFilterMethod: function (column, $columnIndex) {
+            return !(column.$columnIndex === 0)
+        }
+    })
+}
+
+onMounted(() => {
+    if (props.active) {
+        tableStore.index()
+        emit('initialized', 'pollutionReport')
+    }
+    calculateTableHeight()
+    window.addEventListener('resize', debouncedCalculateTableHeight)
+})
+
+onBeforeUnmount(() => {
+    window.removeEventListener('resize', debouncedCalculateTableHeight)
+})
+
+const clearQueryParams = () => {
+    // 将区域恢复成第一层
+    if (areOptions && areOptions.length > 0) {
+        selectedArea.value = areOptions[0].id
+        tableStore.table.params.id = areOptions[0].id
+    }
+
+    // 清空搜索关键词
+    searchKeyword.value = ''
+}
+
+defineExpose({
+    refresh: (name?: any) => {
+        // 清空查询参数
+        clearQueryParams()
+        tableHeaderRef.value.setTheDate(3)
+        if (name) {
+            searchKeyword.value = name
+        }
+        tableStore.index()
+    }
+})
+</script>
+
+<style scoped>
+.pagination-container {
+    border: 1px solid #ebeef5;
+    border-top: none;
+    padding: 10px;
+    margin: 0 0 5px 0;
+    background-color: #fff;
+}
+
+:deep(.custom-pagination) {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+:deep(.custom-pagination .el-pagination__sizes) {
+    margin-right: 10px;
+}
+
+:deep(.custom-pagination .el-pagination__total) {
+    margin-right: auto;
+}
+
+:deep(.custom-pagination .el-pagination__jump) {
+    margin-left: 20px;
+}
+
+/* 响应式处理 */
+@media screen and (max-width: 768px) {
+    :deep(.custom-pagination) {
+        flex-direction: column;
+        align-items: stretch;
+    }
+
+    :deep(.custom-pagination .el-pagination__total) {
+        margin-right: 0;
+        order: 1;
+        margin-top: 10px;
+    }
+
+    :deep(.custom-pagination .el-pagination__sizes) {
+        order: 2;
+    }
+
+    :deep(.custom-pagination .btn-prev),
+    :deep(.custom-pagination .el-pager),
+    :deep(.custom-pagination .btn-next),
+    :deep(.custom-pagination .el-pagination__jump) {
+        order: 3;
+        justify-content: center;
+        margin-top: 10px;
+    }
+}
+</style>

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

@@ -0,0 +1,510 @@
+<template>
+    <div class="tab-content">
+        <TableHeader datePicker ref="tableHeaderRef" @selectChange="handleSelectChange">
+            <template #select>
+                <el-form-item label="区域">
+                    <el-cascader
+                        v-bind="$attrs"
+                        :options="areOptions"
+                        :props="cascaderProps"
+                        v-model="selectedArea"
+                        @change="handleFilterChange"
+                    />
+                </el-form-item>
+                <el-form-item label="统计类型">
+                    <el-select
+                        v-model="tableStore.table.params.statisticalType"
+                        value-key="id"
+                        placeholder="请选择统计类型"
+                    >
+                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
+                    </el-select>
+                </el-form-item>
+                <!-- <el-form-item label="电网标志">
+          <el-select 
+            v-model="tableStore.table.params.powerFlag" 
+            placeholder="请选择电网标志"
+            @change="handleFilterChange"
+          >
+            <el-option label="全部" value="0"></el-option>
+            <el-option label="电网侧" value="1"></el-option>
+            <el-option label="非电网侧" value="2"></el-option>
+          </el-select>
+        </el-form-item> -->
+                <el-form-item label="筛选数据">
+                    <el-input
+                        v-model="searchKeyword"
+                        placeholder="请输入变电站"
+                        clearable
+                        @input="handleFilterChange"
+                        :show-word-limit="true"
+                        :maxlength="32"
+                    />
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出</el-button>
+            </template>
+        </TableHeader>
+
+        <div v-loading="tableStore.table.loading" class="main-container">
+            <vxe-table
+                class="full-height-table"
+                ref="tableRef"
+                auto-resize
+                :data="tableStore.table.data"
+                v-bind="defaultAttribute"
+                :height="tableHeight"
+                resizable
+                show-overflow
+            >
+                <vxe-column title="序号" width="80" type="seq" align="center"></vxe-column>
+                <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="subVStationValue"
+                    :title="harmonicValueTitle"
+                    align="center"
+                    min-width="150"
+                ></vxe-column>
+                <vxe-column field="subVoltage" title="变电站电压等级" align="center" min-width="150"></vxe-column>
+                <vxe-column title="操作" width="150" align="center">
+                    <template #default="{ row }">
+                        <el-button size="small" type="primary" link @click="showDetailDialog(row)">
+                            监测点污染详情
+                        </el-button>
+                    </template>
+                </vxe-column>
+            </vxe-table>
+        </div>
+
+        <div class="pagination-container">
+            <el-pagination
+                :current-page="tableStore.table.params.pageNum"
+                :page-size="tableStore.table.params.pageSize"
+                :page-sizes="[10, 20, 50, 100, 200]"
+                background
+                layout="sizes, total, prev, pager, next, jumper"
+                :total="tableStore.table.total"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                class="custom-pagination"
+            />
+        </div>
+
+        <!-- 添加弹窗 -->
+        <el-dialog draggable v-model="detailDialogVisible" :title="detailDialogTitle" width="1000px">
+            <div v-loading="detailLoading">
+                <div style="margin-bottom: 10px; text-align: right">
+                    <el-button icon="el-icon-Download" type="primary" @click="exportDetailEvent">导出</el-button>
+                </div>
+                <vxe-table
+                    ref="detailTableRef"
+                    :data="detailData"
+                    auto-resize
+                    v-bind="defaultAttribute"
+                    resizable
+                    show-overflow
+                    height="400px"
+                >
+                    <vxe-column title="序号" width="60" type="seq" align="center"></vxe-column>
+
+                    <vxe-column title="序号" width="60" type="seq" align="center"></vxe-column>
+                    <vxe-column field="subName" title="变电站名称" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="lineName" title="监测点名称" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="objName" title="监测对象名称" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="loadType" title="干扰源类型" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="powerFlag" title="监测位置" align="center" min-width="100"></vxe-column>
+                    <vxe-column field="vharmonicValue" title="监测点污染值" align="center" min-width="120"></vxe-column>
+                </vxe-table>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="ts">
+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'
+import { debounce } from 'lodash-es'
+
+const props = defineProps({
+    active: {
+        type: Boolean,
+        default: false
+    }
+})
+
+const emit = defineEmits(['initialized'])
+
+const dictData = useDictData()
+const options = dictData.getBasicData('Pollution_Calc')
+const tableHeight = ref(500)
+const tableRef = ref()
+const tableHeaderRef = ref()
+const detailTableRef = ref()
+const selectedArea = ref()
+const areOptions: any = dictData.state.area
+const allData = ref<PollutionItem[]>([])
+const searchKeyword = ref('')
+const harmonicValueTitle = ref('电站谐波电压污染值')
+const detailDialogVisible = ref(false)
+const detailDialogTitle = ref('')
+const detailLoading = ref(false)
+const detailData = ref<PollutionItem[]>([])
+const originalTableData = ref<any[]>([])
+
+// 方法
+const showDetailDialog = row => {
+    detailDialogTitle.value = `${row.subStationName} - 监测点污染详情`
+    loadDetailData(row)
+    detailDialogVisible.value = true
+}
+
+const loadDetailData = async row => {
+    detailLoading.value = true
+    try {
+        // 从原始数据中查找该变电站的详细信息
+        const originalItem = originalTableData.value.find(item => item.subStationName === row.subStationName)
+
+        if (originalItem && originalItem.powerFlagPollutionList) {
+            const detailList: PollutionItem[] = []
+            // originalItem.powerFlagPollutionList.forEach((point: any) => {
+            //   detailList.push({
+            //     lineName: processNullValue(point.lineName),
+            //     devName: processNullValue(point.devName),
+            //     devType: processNullValue(point.devType),
+            //     manufacturer: processNullValue(point.manufacturer),
+            //     loginTime: processNullValue(point.loginTime),
+            //     interval: processNullValue(point.interval),
+            //     powerFlag: processNullValue(point.powerFlag),
+            //     vharmonicValue: processNullValue(point.vharmonicValue)
+            //   })
+            // })
+            detailData.value = originalItem.powerFlagPollutionList //detailList
+        } else {
+            detailData.value = []
+        }
+    } catch (error) {
+        console.error('加载详情数据失败:', error)
+        detailData.value = []
+    } finally {
+        detailLoading.value = false
+    }
+}
+
+const cascaderProps = {
+    label: 'name',
+    value: 'id',
+    checkStrictly: true,
+    emitPath: false
+}
+
+interface PollutionItem {
+    gdName?: string
+    subStationName?: string
+    subVStationValue?: string
+    subVoltage?: string
+    devName?: string
+    lineName?: string
+    powerFlag?: string
+    devType?: string
+    manufacturer?: string
+    loginTime?: string
+    interval?: string
+    vharmonicValue?: string
+}
+
+const handleSelectChange = (isExpanded: boolean) => {
+    if (isExpanded) {
+        tableHeight.value = tableHeight.value - 55
+    } else {
+        tableHeight.value = tableHeight.value + 55
+    }
+}
+
+const calculateTableHeight = () => {
+    const windowHeight = window.innerHeight
+    const headerHeight = 160
+    const paginationHeight = 120
+    const padding = 30
+    const calculatedHeight = windowHeight - headerHeight - paginationHeight - padding
+    tableHeight.value = Math.max(calculatedHeight, 300)
+}
+
+const debouncedCalculateTableHeight = debounce(() => {
+    calculateTableHeight()
+}, 300)
+
+const filteredData = computed(() => {
+    let result = [...allData.value]
+
+    if (selectedArea.value) {
+        let areaName = ''
+        let areaLevel = -1
+        const findAreaName = (areas: any[]) => {
+            for (const area of areas) {
+                if (area.id === selectedArea.value) {
+                    areaName = area.name
+                    areaLevel = area.level !== undefined ? area.level : -1
+                    break
+                }
+                if (area.children && area.children.length > 0) {
+                    findAreaName(area.children)
+                }
+            }
+        }
+        findAreaName(areOptions)
+
+        if (areaName && areaLevel > 1) {
+            result = result.filter(item => item.gdName && item.gdName.includes(areaName))
+        }
+    }
+
+    if (tableStore.table.params.powerFlag === '1') {
+        result = result.filter(item => item.powerFlag && !item.powerFlag.includes('非'))
+    } else if (tableStore.table.params.powerFlag === '2') {
+        result = result.filter(item => item.powerFlag && item.powerFlag.includes('非'))
+    }
+
+    if (searchKeyword.value) {
+        const keyword = searchKeyword.value.toLowerCase()
+        result = result.filter(
+            item =>
+                (item.subStationName && item.subStationName.toLowerCase().includes(keyword)) ||
+                (item.devName && item.devName.toLowerCase().includes(keyword)) ||
+                (item.lineName && item.lineName.toLowerCase().includes(keyword))
+        )
+    }
+
+    return result
+})
+
+const currentPageData = computed(() => {
+    const pageSize = tableStore.table.params.pageSize
+    const pageNum = tableStore.table.params.pageNum
+    const start = (pageNum - 1) * pageSize
+    const end = start + pageSize
+    return filteredData.value.slice(start, end)
+})
+
+const updateTotal = computed(() => {
+    return filteredData.value.length
+})
+
+const processNullValue = (value: any) => {
+    return value === null || value === undefined || value === '' || value === 'null' ? '/' : value
+}
+
+const tableStore = new TableStore({
+    url: '/harmonic-boot/PollutionSubstation/downPollutionSubCalc',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {
+        delete tableStore.table.params.deptIndex
+        delete tableStore.table.params.interval
+        delete tableStore.table.params.searchEndTime
+        delete tableStore.table.params.searchBeginTime
+        delete tableStore.table.params.timeFlag
+        tableStore.table.params.ids = [tableStore.table.params.statisticalType.id]
+    },
+    loadCallback: () => {
+        // 保存原始数据以便后续查询
+        originalTableData.value = [...(tableStore.table.data || [])]
+
+        const expandedData: PollutionItem[] = []
+
+        ;(tableStore.table.data || []).forEach((item: any) => {
+            expandedData.push({
+                gdName: processNullValue(item.gdName),
+                subStationName: processNullValue(item.subStationName),
+                subVStationValue: processNullValue(item.subVStationValue),
+                subVoltage: processNullValue(item.subVoltage)
+            })
+        })
+        harmonicValueTitle.value = tableStore.table.params.statisticalType.name + '污染值'
+        allData.value = expandedData
+        tableStore.table.total = updateTotal.value
+        tableStore.table.data = currentPageData.value
+    },
+    resetCallback: () => {
+        clearQueryParams()
+    }
+})
+
+provide('tableStore', tableStore)
+
+watch(
+    () => areOptions,
+    newOptions => {
+        if (newOptions && newOptions.length > 0) {
+            selectedArea.value = newOptions[0].id
+            tableStore.table.params.id = newOptions[0].id
+        }
+    },
+    { immediate: true }
+)
+
+watch(
+    () => options,
+    newOptions => {
+        if (newOptions && newOptions.length > 0) {
+            if (!tableStore.table.params.statisticalType) {
+                tableStore.table.params.statisticalType = newOptions[0]
+            }
+        }
+    },
+    { immediate: true }
+)
+
+tableStore.table.params.powerFlag = '0'
+tableStore.table.params.isUpToGrid = 0
+tableStore.table.params.type = 1
+
+const handleFilterChange = () => {
+    tableStore.table.params.pageNum = 1
+    tableStore.table.data = currentPageData.value
+    tableStore.table.total = updateTotal.value
+}
+
+const handleSizeChange = (val: number) => {
+    tableStore.table.params.pageSize = val
+    tableStore.table.params.pageNum = 1
+    tableStore.table.data = currentPageData.value
+    tableStore.table.total = updateTotal.value
+}
+
+const handleCurrentChange = (val: number) => {
+    tableStore.table.params.pageNum = val
+    tableStore.table.data = currentPageData.value
+    tableStore.table.total = updateTotal.value
+}
+
+const exportEvent = () => {
+    const allFilteredData = filteredData.value
+    tableRef.value.exportData({
+        filename: '场站级评估-污染值报告',
+        sheetName: 'Sheet1',
+        type: 'xlsx',
+        useStyle: true,
+        data: allFilteredData,
+        columnFilterMethod: function (column: any) {
+            return !(column.column.title === '操作')
+        }
+    })
+}
+
+// 导出详情数据的方法
+const exportDetailEvent = () => {
+    detailTableRef.value.exportData({
+        filename: detailDialogTitle.value,
+        sheetName: 'Sheet1',
+        type: 'xlsx',
+        useStyle: true,
+        data: detailData.value,
+        columnFilterMethod({ column }) {
+            // 导出所有列，包括隐藏列
+            return true
+        }
+    })
+}
+
+onMounted(() => {
+    if (props.active) {
+        tableStore.index()
+        emit('initialized', 'pollutionReport')
+    }
+    calculateTableHeight()
+    window.addEventListener('resize', debouncedCalculateTableHeight)
+})
+
+onBeforeUnmount(() => {
+    window.removeEventListener('resize', debouncedCalculateTableHeight)
+})
+
+const clearQueryParams = () => {
+    // 将区域恢复成第一层
+    if (areOptions && areOptions.length > 0) {
+        selectedArea.value = areOptions[0].id
+        tableStore.table.params.id = areOptions[0].id
+    }
+
+    // 清空搜索关键词
+    searchKeyword.value = ''
+}
+
+defineExpose({
+    refresh: (statisticalType?: string) => {
+        tableStore.table.params.statisticalType = options.filter(item => item.id == statisticalType)[0] || options[0]
+
+        clearQueryParams()
+        tableHeaderRef.value.setTheDate(3)
+        tableStore.index()
+    }
+})
+</script>
+
+<style scoped>
+.pagination-container {
+    border: 1px solid #ebeef5;
+    border-top: none;
+    padding: 10px;
+    margin: 0 0 5px 0;
+    background-color: #fff;
+}
+
+:deep(.custom-pagination) {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+:deep(.custom-pagination .el-pagination__sizes) {
+    margin-right: 10px;
+}
+
+:deep(.custom-pagination .el-pagination__total) {
+    margin-right: auto;
+}
+
+:deep(.custom-pagination .el-pagination__jump) {
+    margin-left: 20px;
+}
+
+/* 响应式处理 */
+@media screen and (max-width: 768px) {
+    :deep(.custom-pagination) {
+        flex-direction: column;
+        align-items: stretch;
+    }
+
+    :deep(.custom-pagination .el-pagination__total) {
+        margin-right: 0;
+        order: 1;
+        margin-top: 10px;
+    }
+
+    :deep(.custom-pagination .el-pagination__sizes) {
+        order: 2;
+    }
+
+    :deep(.custom-pagination .btn-prev),
+    :deep(.custom-pagination .el-pager),
+    :deep(.custom-pagination .btn-next),
+    :deep(.custom-pagination .el-pagination__jump) {
+        order: 3;
+        justify-content: center;
+        margin-top: 10px;
+    }
+}
+</style>

src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue

@@ -0,0 +1,173 @@
+<template>
+    <div>
+        <TableHeader datePicker area ref="TableHeaderRef" showExport>
+            <template #select>
+                <el-form-item label="统计类型">
+                    <el-select
+                        v-model="tableStore.table.params.statisticalType"
+                        value-key="id"
+                        placeholder="请选择统计类型"
+                    >
+                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
+                    </el-select>
+                </el-form-item>
+                <!-- <el-form-item label="电网标志">
+                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                        <el-option label="全部" :value="0"></el-option>
+                        <el-option label="电网侧" :value="1"></el-option>
+                        <el-option label="非电网侧" :value="2"></el-option>
+                    </el-select>
+                </el-form-item> -->
+                <el-form-item label="筛选数据">
+                    <el-input
+                        v-model="tableStore.table.params.searchValue"
+                        placeholder="请输入变电站/终端/监测点"
+                        clearable
+                        :show-word-limit="true"
+                        :maxlength="32"
+                    />
+                </el-form-item>
+            </template>
+
+            <template #operation>
+                <!-- <el-button icon="el-icon-Download" type="primary">导出</el-button> -->
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <!-- 添加弹窗 -->
+        <el-dialog draggable v-model="detailDialogVisible" :title="detailDialogTitle" width="1000px">
+            <div v-loading="detailLoading">
+                <div style="margin-bottom: 10px; text-align: right">
+                    <el-button icon="el-icon-Download" type="primary" @click="exportDetailEvent">导出</el-button>
+                </div>
+                <vxe-table
+                    ref="detailTableRef"
+                    :data="detailData"
+                    auto-resize
+                    v-bind="defaultAttribute"
+                    resizable
+                    show-overflow
+                    height="400px"
+                >
+                    <vxe-column title="序号" width="60" type="seq" align="center"></vxe-column>
+                    <vxe-column field="subName" title="变电站名称" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="lineName" title="监测点名称" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="objName" title="监测对象名称" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="loadType" title="干扰源类型" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="powerFlag" title="监测位置" align="center" min-width="100"></vxe-column>
+                    <vxe-column field="vharmonicValue" title="监测点污染值" align="center" min-width="120"></vxe-column>
+                </vxe-table>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick, watch } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
+//
+const detailDialogVisible = ref(false)
+const detailLoading = ref(false)
+const detailDialogTitle = ref('')
+const detailData = ref([])
+const dictData = useDictData()
+const detailTableRef = ref()
+const lineList = dictData.getBasicData('Line_Type')
+const options = dictData.getBasicData('Pollution_Calc')
+const tableStore = new TableStore({
+    url: '/harmonic-boot/PollutionSubstation/getAreaPollution',
+    publicHeight: 65,
+    isWebPaging: true,
+    method: 'POST',
+    filename: '区域级评估',
+    column: [
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+
+        {
+            field: 'deptName',
+            title: '区域',
+            minWidth: 100
+        },
+
+        {
+            field: 'score',
+            title: '污染值',
+            minWidth: 150
+        },
+        {
+            title: '操作',
+            width: '180',
+            fixed: 'right',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '监测点污染详情',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+
+                    click: row => {
+                        detailDialogTitle.value = row.deptName + '监测点污染详情'
+                        detailLoading.value = true
+                        detailData.value = row.powerFlagPollutionList
+                        detailDialogVisible.value = true
+                        detailLoading.value = false
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.id = tableStore.table.params.deptIndex
+        tableStore.table.params.ids = [tableStore.table.params.statisticalType?.id]
+    },
+    loadCallback: () => {
+        tableStore.table.column[2].title = tableStore.table.params.statisticalType.name + '污染值'
+    }
+})
+
+tableStore.table.params.searchValue = ''
+tableStore.table.params.statisticalType = options[0]
+tableStore.table.params.searchState = '0'
+tableStore.table.params.lineRunFlag = 0
+
+// 导出详情数据的方法
+const exportDetailEvent = () => {
+    detailTableRef.value.exportData({
+        filename: detailDialogTitle.value,
+        sheetName: 'Sheet1',
+        type: 'xlsx',
+        useStyle: true,
+        data: detailData.value,
+        columnFilterMethod: function (column: any) {
+            return !(column.$columnIndex === 0)
+        }
+    })
+}
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+const setSearchValue = (val: string) => {
+    tableStore.table.params.searchValue = val
+    tableStore.index()
+}
+
+defineExpose({
+    setSearchValue
+})
+</script>

src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue

@@ -0,0 +1,174 @@
+<template>
+    <div>
+        <TableHeader datePicker area ref="TableHeaderRef" showExport>
+            <template #select>
+                <el-form-item label="统计类型">
+                    <el-select
+                        v-model="tableStore.table.params.statisticalType"
+                        value-key="id"
+                        placeholder="请选择统计类型"
+                    >
+                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
+                    </el-select>
+                </el-form-item>
+               
+                <el-form-item label="筛选数据">
+                    <el-input
+                        v-model="tableStore.table.params.searchValue"
+                        placeholder="请输入项目名称"
+                        clearable
+                        :show-word-limit="true"
+                        :maxlength="32"
+                    />
+                </el-form-item>
+            </template>
+
+            <template #operation>
+                <!-- <el-button icon="el-icon-Download" type="primary">导出</el-button> -->
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <!-- 添加弹窗 -->
+        <el-dialog draggable v-model="detailDialogVisible" :title="detailDialogTitle" width="1000px">
+            <div v-loading="detailLoading">
+                <div style="margin-bottom: 10px; text-align: right">
+                    <el-button icon="el-icon-Download" type="primary" @click="exportDetailEvent">导出</el-button>
+                </div>
+                <vxe-table
+                    ref="detailTableRef"
+                    :data="detailData"
+                    auto-resize
+                    v-bind="defaultAttribute"
+                    resizable
+                    show-overflow
+                    height="400px"
+                >
+                    <vxe-column title="序号" width="60" type="seq" align="center"></vxe-column>
+                    <vxe-column field="subName" title="变电站名称" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="lineName" title="监测点名称" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="objName" title="监测对象名称" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="loadType" title="干扰源类型" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="powerFlag" title="监测位置" align="center" min-width="100"></vxe-column>
+                    <vxe-column field="vharmonicValue" title="监测点污染值" align="center" min-width="120"></vxe-column>
+                </vxe-table>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick, watch } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
+//
+const detailDialogVisible = ref(false)
+const detailLoading = ref(false)
+const detailDialogTitle = ref('')
+const detailData = ref([])
+const dictData = useDictData()
+const detailTableRef = ref()
+const lineList = dictData.getBasicData('Line_Type')
+const options = dictData.getBasicData('Pollution_Calc')
+const tableStore = new TableStore({
+    url: '/harmonic-boot/PollutionSubstation/downPollutionSensitiveUser',
+    publicHeight: 65,
+    isWebPaging: true,
+    method: 'POST',
+    filename: '敏感及重要用户评估',
+    column: [
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+
+        {
+            field: 'gdName',
+            title: '供电公司',
+            width: 150
+        },
+
+        { field: 'subStationName', title: '变电站', minWidth: 150 },
+        { field: 'projectName', title: '项目名称', minWidth: 150 },
+        {
+            field: 'subValue',
+            title: '污染值',
+            width: 150,
+            formatter: (row: any) => {
+                return row.cellValue == null ? '暂未安装监测点' : row.cellValue
+            }
+        },
+        {
+            title: '操作',
+            width: '180',
+            fixed: 'right',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '监测点污染详情',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.subValue == null
+                    },
+                    click: row => {
+                        detailDialogTitle.value = '监测点污染详情'
+                        console.log('🚀 ~ row:', row)
+                        detailLoading.value = true
+                        detailData.value = row.powerFlagPollutionList
+                        detailDialogVisible.value = true
+                        detailLoading.value = false
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.deptId = tableStore.table.params.deptIndex
+        tableStore.table.params.ids = [tableStore.table.params.statisticalType?.id]
+    },
+    loadCallback: () => {
+        tableStore.table.column[4].title = tableStore.table.params.statisticalType.name + '污染值'
+    }
+})
+
+tableStore.table.params.searchValue = ''
+tableStore.table.params.statisticalType = options[0]
+tableStore.table.params.powerFlag = 0
+tableStore.table.params.isUpToGrid = 0
+// 导出详情数据的方法
+const exportDetailEvent = () => {
+    detailTableRef.value.exportData({
+        filename: detailDialogTitle.value,
+        sheetName: 'Sheet1',
+        type: 'xlsx',
+        useStyle: true,
+        data: detailData.value,
+        columnFilterMethod: function (column: any) {
+            return !(column.$columnIndex === 0)
+        }
+    })
+}
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+const setSearchValue = (val: string) => {
+    tableStore.table.params.searchValue = val
+    tableStore.index()
+}
+
+defineExpose({
+    setSearchValue
+})
+</script>

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

@@ -2,19 +2,17 @@
     <div class="default-main">
         <el-tabs v-model="activeTab" type="border-card" @tab-change="handleTabChange">
             <el-tab-pane label="监测点评估" name="pollutionReport">
-        <MonitoringPointTab 
+                <MonitoringPointTab ref="monitoringPointTabRef" :active="activeTab === 'pollutionReport'" />
-          ref="monitoringPointTabRef"
-          :active="activeTab === 'pollutionReport'"
-          
-        />
             </el-tab-pane>
 
             <el-tab-pane label="场站级评估" name="anotherReport">
-        <SubstationTab 
+                <SubstationTab ref="substationTabRef" :active="activeTab === 'anotherReport'" />
-          ref="substationTabRef"
+            </el-tab-pane>
-          :active="activeTab === 'anotherReport'"
+            <el-tab-pane label="区域级评估" name="3">
-      
+                <regionalAssessment v-if="activeTab == '3'" />
-        />
+            </el-tab-pane>
+            <el-tab-pane label="敏感及重要用户评估" name="4">
+                <userEvaluation ref="userEvaluationRef" v-if="activeTab == '4'" />
             </el-tab-pane>
         </el-tabs>
     </div>
@@ -22,9 +20,12 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import MonitoringPointTab from './MonitoringPointTab.vue'
+import MonitoringPointTab from './components/MonitoringPointTab.vue'
-import SubstationTab from './SubstationTab.vue'
+import SubstationTab from './components/SubstationTab.vue'
-
+import regionalAssessment from './components/regionalAssessment.vue'
+import userEvaluation from './components/userEvaluation.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
 defineOptions({
     name: 'harmonic-boot/qydetailedAnalysis/pollutionReport'
 })
@@ -32,18 +33,38 @@ defineOptions({
 const activeTab = ref('pollutionReport')
 const monitoringPointTabRef = ref()
 const substationTabRef = ref()
-
+const userEvaluationRef = ref()
-
 const handleTabChange = (tabName: string) => {
     if (tabName === 'pollutionReport' && monitoringPointTabRef.value) {
-
         monitoringPointTabRef.value.refresh()
     } else if (tabName === 'anotherReport' && substationTabRef.value) {
         substationTabRef.value.refresh()
     }
-  
 }
-
+watch(
-
+    () => route.query.t,
+    async (newValue, oldValue) => {
+        if (route.fullPath.includes('harmonic-boot/qydetailedAnalysis/pollutionReport')) {
+            let type = (route.query.type as string) || 'null'
+            if (type == 'null') {
+            } else if (type == '1') {
+                activeTab.value = 'pollutionReport'
+                setTimeout(() => {
+                    monitoringPointTabRef.value.refresh((route.query.name as string) || 'null')
+                }, 500)
+            } else if (type == '2') {
+                activeTab.value = 'anotherReport'
+                setTimeout(() => {
+                    substationTabRef.value.refresh((route.query.statisticalType as string) || 'null')
+                }, 500)
+            } else if (type == '4') {
+                activeTab.value = '4'
+                setTimeout(() => {
+                    userEvaluationRef.value.setSearchValue((route.query.name as string) || '')
+                }, 500)
+            }
+        }
+    },
+    { deep: true, immediate: true }
+)
 </script>
-

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

@@ -123,7 +123,7 @@ const tableStore = new TableStore({
         { field: 'name', title: '电网拓扑', width: 350, type: 'radio', align: 'left', treeNode: true },
         {
             field: 'ip',
-            title: '网络参数',
+            title: '网络参数' ,width:'120px',
             formatter: ({ row }: any) => {
                 return row.ip || '/'
             }

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

@@ -123,7 +123,7 @@ const tableStore = new TableStore({
         { field: 'name', title: '电网拓扑', width: 350, type: 'radio', align: 'left', treeNode: true },
         {
             field: 'ip',
-            title: '网络参数',
+            title: '网络参数' ,width:'120px',
             formatter: ({ row }: any) => {
                 return row.ip || '/'
             }

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

@@ -154,11 +154,7 @@
                         <vxe-column type="seq" title="序号" width="80px">
                             <template #default="{ rowIndex }">
                                 <span>
-                                    {{
+                                    {{ (pageNum - 1) * pageSize + rowIndex + 1 }}
-                                        (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize +
-                                        rowIndex +
-                                        1
-                                    }}
                                 </span>
                             </template>
                         </vxe-column>
@@ -167,7 +163,7 @@
                         <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="ip" title="终端IP" :formatter="formatter" width="120px"></vxe-column>
                         <vxe-column
                             field="lineName"
                             title="监测点名称"
@@ -216,7 +212,7 @@
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref } from 'vue'
+import { onMounted, provide, ref, watch } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
@@ -225,7 +221,8 @@ import { getMonitorVerifyDay } from '@/api/device-boot/dataVerify'
 defineOptions({
     name: 'harmonic-boot/harmonic/getIntegrityData'
 })
-
+import { useRoute } from 'vue-router'
+const route = useRoute()
 const dictData = useDictData()
 //字典获取监督对象类型
 const pageHeight = mainHeight(97)
@@ -490,6 +487,23 @@ onMounted(() => {
     tableStore.index()
 })
 
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
+        if (route.fullPath.includes('harmonic-boot/harmonic/getIntegrityData')) {
+            let type = (route.query.type as string) || 'null'
+            if (type == 'null') {
+            } else if (type == '1') {
+                setTimeout(() => {
+                    tableStore.table.params.searchValue = (route.query.name as string) || ''
+                    tableStore.index()
+                }, 500)
+            }
+        }
+    },
+    { deep: true, immediate: true }
+)
+
 tableStore.table.params.name = ''
 provide('tableStore', tableStore)
 </script>

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

@@ -65,7 +65,7 @@ const tableStore = new TableStore({
         { field: 'name', title: '电网拓扑',     width: 350, align: 'left', treeNode: true },
         {
             field: 'ip',
-            title: '网络参数',
+            title: '网络参数' ,width:'120px',
             formatter: ({ row }: any) => {
                 return row.ip || '/'
             }

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

@@ -152,11 +152,7 @@
                         <vxe-column type="seq" title="序号" width="80px">
                             <template #default="{ rowIndex }">
                                 <span>
-                                    {{
+                                    {{ (pageNum - 1) * pageSize + rowIndex + 1 }}
-                                        (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize +
-                                        rowIndex +
-                                        1
-                                    }}
                                 </span>
                             </template>
                         </vxe-column>
@@ -165,7 +161,7 @@
                         <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="ip" title="终端IP" :formatter="formatter" width="120px"></vxe-column>
                         <vxe-column field="runFlag" title="运行状态" width="90px">
                             <template #default="{ row }">
                                 <el-tag
@@ -217,7 +213,8 @@ import { getMonitorVerifyDay } from '@/api/device-boot/dataVerify'
 defineOptions({
     name: 'harmonic-boot/harmonic/getIntegrityData'
 })
-
+import { useRoute } from 'vue-router'
+const route = useRoute()
 const dictData = useDictData()
 //字典获取监督对象类型
 const pageHeight = mainHeight(97)
@@ -480,6 +477,22 @@ onMounted(() => {
 
     tableStore.index()
 })
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
+        if (route.fullPath.includes('harmonic-boot/area/OnlineRate')) {
+            let type = (route.query.type as string) || 'null'
+            if (type == 'null') {
+            } else if (type == '1') {
+                setTimeout(() => {
+                    tableStore.table.params.searchValue = (route.query.name as string) || ''
+                    tableStore.index()
+                }, 500)
+            }
+        }
+    },
+    { deep: true, immediate: true }
+)
 
 tableStore.table.params.name = ''
 provide('tableStore', tableStore)

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

@@ -0,0 +1,74 @@
+<template>
+    <div>
+        <TableHeader datePicker ref="TableHeaderRef">
+            <template v-slot:select>
+                <el-form-item label="超标指标">
+                    <el-select
+                        v-model="tableStore.table.params.targetId"
+                        clearable
+                      
+                        collapse-tags
+                        collapse-tags-tooltip
+                        placeholder="请选择超标指标"
+                    >
+                        <el-option v-for="item in exceeded" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+    </div>
+</template>
+<script setup lang="ts">
+import { nextTick, onMounted, reactive, ref } from 'vue'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { useMonitoringPoint } from '@/stores/monitoringPoint'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const exceeded = dictData.getBasicData('Steady_Statis')
+const monitoringPoint = useMonitoringPoint()
+
+const tableStore = new TableStore({
+    url: '/supervision-boot/onlineMonitor/overLimitDetail',
+    publicHeight: 80,
+    isWebPaging: true,
+    method: 'POST',
+    filename: '监测点台账',
+    column: [
+        {
+            title: '序号',
+            width: 70,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+
+        {
+            field: 'time',
+            title: '日期',
+            width: '140px'
+        },
+        {
+            field: 'overLimitInfo',
+            title: '越限详情'
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.lineId = monitoringPoint.state.lineId
+    }
+})
+tableStore.table.params.targetId = exceeded.filter(item => item.code == 'Total_Indicator')[0].id
+    ? exceeded.filter(item => item.code == 'Total_Indicator')[0].id
+    : ''
+onMounted(() => {
+    tableStore.index()
+})
+
+provide('tableStore', tableStore)
+</script>
+<style></style>

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

@@ -41,9 +41,9 @@
                         <el-tab-pane label="监测点运行状态" name="6" lazy v-if="!isReload">
                             <Yunxingzhuangtai v-if="activeName == '6'" />
                         </el-tab-pane>
-                        <el-tab-pane label="实时数据" name="7" lazy v-if="!isReload && !VITE_FLAG">
+                        <!-- <el-tab-pane label="实时数据" name="7" lazy v-if="!isReload && !VITE_FLAG">
                             <Shishishuju v-if="activeName == '7'" />
-                        </el-tab-pane>
+                        </el-tab-pane> -->
                         <el-tab-pane label="统计报表" name="8" lazy v-if="!isReload && VITE_FLAG">
                             <StatisticalReport v-if="activeName == '8'" />
                         </el-tab-pane>
@@ -64,23 +64,25 @@ import { defineOptions, watch, onMounted, ref, nextTick } from 'vue'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
 import PointTree from '@/components/tree/pqs/pointTree.vue'
-import { useMonitoringPoint } from '@/stores/monitoringPoint'
+
 import { mainHeight } from '@/utils/layout'
 import Wentaizonghepinggu from './wentaizonghepinggu/index.vue'
 import Wentaizhibiaohegelv from './wentaizhibiaohegelv/index.vue'
 import Wentaishujufenxi from './wentaishujufenxi/index.vue'
 import Xiebopingpu from './xiebopingpu/index.vue'
-import Gaojingshujutongji from './gaojingshujutongji/index.vue'
+import Gaojingshujutongji from './gaojingshujutongji/index_JB.vue'
 import Yunxingzhuangtai from './yunxingzhuangtai/index.vue'
 import Shishishuju from './shishishuju/index.vue'
+import { useRoute } from 'vue-router'
 import StatisticalReport from './statisticalReport/index.vue'
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 import router from '@/router'
-
+import { useMonitoringPoint } from '@/stores/monitoringPoint'
+import { id } from 'element-plus/es/locale'
 defineOptions({
     name: 'harmonic-boot/monitor/online'
 })
-
+const route = useRoute()
 const monitoringPoint = useMonitoringPoint()
 const pointTree = ref()
 const size = ref(23)
@@ -121,7 +123,9 @@ watch(
     { immediate: true }
 )
 watch(
-    () => monitoringPoint.state.lineId,
+    () => {
+        return monitoringPoint.state.lineId
+    },
     () => {
         //  刷新页面
         isReload.value = true
@@ -130,6 +134,49 @@ watch(
         })
     }
 )
+
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
+        if (route.fullPath.includes('harmonic-boot/monitor/online')) {
+            let type = (route.query.type as string) || 'null'
+            let lineId = (route.query.id as string) || 'null'
+            if (type == 'null') {
+            } else {
+                setTimeout(() => {
+                    monitoringPoint.setValue('lineId', lineId)
+                    //
+                    // pointTree.value.tree
+                    activeName.value = type
+                    setTimeout(() => {
+                        pointTree.value.scrollToNode(lineId)
+
+                        monitoringPoint.setValue('lineName', findNodeByTreeId(pointTree.value.tree, lineId).alias)
+                    }, 500)
+                }, 1000)
+            }
+        }
+    },
+    { deep: true, immediate: true }
+)
+// 递归函数（同上）
+const findNodeByTreeId = (treeData: any, id: any) => {
+    for (const node of treeData) {
+        if (node.id == id) return node
+        if (node.children && Array.isArray(node.children) && node.children.length) {
+            const found: any = findNodeByTreeId(node.children, id)
+            if (found) return found
+        }
+    }
+    return null
+}
+
+// 调用示例
+const getTargetNode = () => {
+    const targetId = '9b7adecf588b4110acb7018f297592a7'
+    const node = findNodeByTreeId(treeData.value, targetId)
+    console.log('Vue中找到的节点：', node)
+}
 const changeTab = (e: string) => {
     activeName.value = e
 }

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

@@ -140,11 +140,11 @@ const exportReport = () => {
     loading.value = true
     let form = new FormData()
     form.append('isUrl', false)
-    form.append('lineIndex', dotList.value.id)
+    form.append('lineIndex', monitoringPoint.state.lineId)
     form.append('startTime', TableHeaderRef.value.datePickerRef.timeValue[0])
     form.append('endTime', TableHeaderRef.value.datePickerRef.timeValue[1])
     form.append('type', 0)
-    form.append('name', dotList.value.name)
+    form.append('name', monitoringPoint.state.lineName.split('>').pop())
     ElMessage({
         message: '下载报告中,请稍等.....',
         duration: 1000
@@ -159,7 +159,7 @@ const exportReport = () => {
             const link = document.createElement('a') // 创建a标签
             link.href = url
             link.download =
-                dotList.value.name +
+                monitoringPoint.state.lineName.split('>').pop() +
                 TableHeaderRef.value.datePickerRef.timeValue[0] +
                 '_' +
                 TableHeaderRef.value.datePickerRef.timeValue[1] // 设置下载的文件名

src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue

@@ -113,7 +113,7 @@ const tableStore = new TableStore({
         { field: 'businessType', title: '行业类型' , minWidth: 100},
 
         { field: 'devName', title: '终端名称', minWidth: 80 },
-        { field: 'ip', title: '网络参数' , minWidth: 100},
+        { field: 'ip', title: '网络参数' ,width:'120px'},
 
         // { field: 'comFlag', title: '通讯状态' , minWidth: 100},
         {

src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue

@@ -154,7 +154,7 @@ const tableStore = new TableStore({
         { field: 'manufacturer', title: '厂家', minWidth: 100 },
 
         { field: 'devName', title: '终端名称', minWidth: 80 },
-        { field: 'ip', title: '网络参数', minWidth: 100 },
+        { field: 'ip', title: '网络参数' ,width:'120px' },
         { field: 'loginTime', title: '投运时间', minWidth: 100 },
         { field: 'devType', title: '终端型号', minWidth: 100 },
         { field: 'port', title: '端口', minWidth: 100 },

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

@@ -85,7 +85,7 @@ const options: any = dictData.getBasicData('Pollution_Statis').filter(item => {
         return item
     }
 })
-const contaminate = ref(options[0].id)
+const contaminate = ref(options[0]?.id)
 const rowList: any = ref({})
 const trendEChart: any = ref({})
 const tableData: any = ref([])

src/views/pqs/qualityInspeection/panorama/components/city/exceeded.vue

@@ -10,15 +10,19 @@
                 <div class="boxSteps">
                     <el-steps>
                         <template v-for="(item, i) in Voltage">
-                            <el-step :class="active == i ? 'highlight' : ''" :title="item.name"
+                            <el-step
-                                @click="handleClick(i)"></el-step>
+                                :class="active == i ? 'highlight' : ''"
+                                :title="item.name"
+                                @click="handleClick(i)"
+                            ></el-step>
                         </template>
                     </el-steps>
                 </div>
                 <div v-for="(item, i) in evaluationData" class="evaluationData">
                     <el-row style="width: 100%">
                         <el-col :span="12" style="display: flex">
-                            <img :src="url[i]" />
+                            <!-- <img :src="url[i]" /> -->
+                            <span :class="`iconfont ${url[i]} icoColor`"></span>
                             <span>{{ item.targetName }}</span>
                         </el-col>
                         <el-col :span="12" style="display: flex">
@@ -66,11 +70,11 @@ const Voltage: any = dictData.getBasicData('Dev_Voltage_Stand').filter(item => {
 
 const chartRef = ref<HTMLDivElement>()
 const url: any = [
-    new URL(`@/assets/img/PLPC.png`, import.meta.url),
+    'icon-frequency',
-    new URL(`@/assets/img/DYPC.png`, import.meta.url),
+    'icon-dianya',
-    new URL(`@/assets/img/JBL.png`, import.meta.url),
+    'icon-dianyazongxiebojibianshuai',
-    new URL(`@/assets/img/SXDY.png`, import.meta.url),
+    'icon-sanxiangdianyafuzhibupingheng',
-    new URL(`@/assets/img/SB.png`, import.meta.url)
+    'icon-a-253_ipower'
 ]
 const tableData: any = ref([])
 
@@ -199,6 +203,7 @@ const handleClick = (i: any) => {
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
+@import '@/assets/font/iconfont.css';
 :deep(.el-select) {
     min-width: 80px;
 }
@@ -283,4 +288,9 @@ defineExpose({ open })
     //     color: var(--el-color-primary) !important;
     // }
 }
+.icoColor {
+    color: var(--el-color-primary);
+    margin: 0 20px;
+    font-size: 20px;
+}
 </style>

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

@@ -61,20 +61,20 @@
                     </div>
                 </div>
             </div>
-            <!-- 监测点指标统计 -->
+            <!-- 资产性质 -->
             <div :style="`height:calc(${boxHeight.height} + 50px)`">
                 <div class="title">
-                    <span>监测点指标统计</span>
+                    <span>资产性质</span>
                 </div>
                 <div style="display: flex" class="mt2">
                     <img src="@/assets/img/FGX.png" />
                 </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" />
+                            <!-- <img src="@/assets/img/TJ.png" />
-                            {{ item.title }}
+                            {{ item.title }} -->
-                        </div> -->
+                        </div>
                         <div
                             class="card-Box mt10"
                             :style="`height:calc((${boxHeight.height} - 20px )/ 2);`"
@@ -95,33 +95,44 @@
                                 </div>
                                 <div>
                                     数据完整性:
-                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
+                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate || 0 }}%</span>
                                 </div>
                                 <div>
                                     在线率:
-                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
+                                    <span style="color: #2dcd28; cursor: text">{{ val.onLineRate || 0 }}%</span>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <!-- 监测点指标统计 -->
+            <!-- 资产性质 -->
             <div :style="`height:calc(${boxHeight.height} - 55px)`">
                 <div class="title">
                     <span>监测运行统计</span>
+                    <div class="titleNum">
+                        ( 合格:
+                        <span class="mr10" style="color: #2dcd28" @click="LookMap(linList[0].lineListOne, [], 0)">
+                            {{ linList[0].lineNumOne || 0 }}
+                        </span>
+                        告警:
+                        <span style="color: #a52a2a" @click="LookMap(linList[0].lineListOne, [], 0)">
+                            {{ linList[0].lineNumTwo || 0 }}
+                        </span>
+                        )
+                    </div>
                 </div>
                 <div style="display: flex" class="mt2">
                     <img src="@/assets/img/FGX.png" />
                 </div>
 
                 <div :style="`height:calc(${boxHeight.height} - 100px);overflow-y: auto;`" class="BoxA mt10">
-                    <div class="card-Box" v-for="item in linList">
+                    <div class="card-Box" v-for="item in linList.slice(1)">
-                        <div>
+                        <div class="num num2">
+                            <div style="text-align: left">
                                 <span class="line"></span>
-                            <span class="vol">{{ item.title[0] }}</span>
+                                <i class="vol">{{ item.title[0] }}</i>
                             </div>
-                        <div class="num">
                             <div>
                                 {{ item.title[1] }}:
                                 <span style="color: #2dcd28" @click="LookMap(item.lineListOne, [], 0)">
@@ -297,9 +308,10 @@ const countList: any = ref([
                 title: '电网侧监测点',
                 num: 0,
                 onLineNum: 0,
-                integrityRate: 0
+                integrityRate: 0,
+                onLineRate: 0
             },
-            { title: '非电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }
+            { title: '非电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0, onLineRate: 0 }
         ]
     }
     // {
@@ -379,7 +391,7 @@ const info = async (row: any) => {
             numOneList: []
         })
     })
-    // 监测点指标统计
+    // 资产性质
     getGridDiagramStatistics(form).then(res => {
         countList.value[0].children[0] = { title: '电网侧监测点', ...res.data.data[0] }
         countList.value[0].children[1] = { title: '非电网侧监测点', ...res.data.data[1] }
@@ -519,13 +531,13 @@ defineExpose({ info, show })
     // grid-template-rows: 1fr 1fr;
     display: flex;
     flex-direction: column;
-    justify-content: space-evenly;
+    justify-content: space-around;
     // align-items: center;
     margin: 0 5px 5px;
     padding: 10px;
     background-color: #edededc0;
     border-radius: 10px;
-    min-height: 60px;
+    min-height: 40px;
     max-height: 120px;
 
     .line {
@@ -554,7 +566,7 @@ defineExpose({ info, show })
     .num1 {
         grid-template-columns: 1fr 1fr;
         grid-template-rows: auto auto;
-        gap: 8px;
+        gap: 15px;
         div {
             display: flex;
             padding-left: 20px;
@@ -563,12 +575,16 @@ defineExpose({ info, show })
             }
         }
     }
+    .num2 {
+        display: grid;
+        grid-template-columns: 1fr 1fr 1fr !important;
+    }
 }
 
 .BoxA {
     display: grid;
-    grid-template-columns: 1fr 1fr;
+grid-template-columns: 1fr;
-    grid-template-rows: 1fr 1fr;
+    grid-template-rows: 1fr 1fr 1fr;
 
     // grid-template-rows: 80px;
     .num {
@@ -619,4 +635,13 @@ defineExpose({ info, show })
 :deep(.el-dialog__body) {
     max-height: none !important;
 }
+.titleNum {
+    font-size: 13px;
+    font-weight: normal;
+    margin-left: 5px;
+    span {
+        font-weight: 600;
+        cursor: pointer;
+    }
+}
 </style>

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

@@ -1,15 +1,19 @@
 <template>
     <!-- 综合评估详情 -->
-    <el-dialog draggable title="区域污染值统计" v-model="dialogVisible" width="1400px">
+    <el-dialog draggable title="稳态电能质量水平评估" v-model="dialogVisible" width="1400px">
+        <div class="title mb5">
+            <span>区域污染水平评估</span>
+        </div>
         <div style="display: flex">
             <div style="width: 400px">
                 <vxe-table
                     v-bind="defaultAttribute"
                     ref="tableRef"
-                    @current-change="currentChangeEvent"
+                    @cell-click="currentChangeEvent"
-                    height="240px"
+                    height="250px"
                     :row-config="{ isCurrent: true, isHover: true }"
                     :data="tableData"
+                    style="cursor: pointer"
                 >
                     <vxe-column field="deptName" title="地市" />
                     <vxe-column field="score" title="污染值" sortable>
@@ -26,14 +30,22 @@
                 </vxe-table>
             </div>
             <div class="ml10" style="width: 990px">
-                <vxe-table v-bind="defaultAttribute" v-loading="loadingTab" ref="vxeRef" height="240px" :data="subdata">
+                <vxe-table
-                    <vxe-column type="seq" width="70"></vxe-column>
+                    v-bind="defaultAttribute"
-                    <vxe-column field="devName" title="终端名称"></vxe-column>
+                    @cell-click="clickAttribute"
-                    <vxe-column field="lineName" title="监测点名称" />
+                    v-loading="loadingTab"
-                    <vxe-column field="powerFlag" title="电网标志" />
+                    ref="vxeRef"
-                    <vxe-column field="devType" title="终端型号"></vxe-column>
+                    height="250px"
-                    <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
+                    :data="subdata"
-                    <vxe-column field="vharmonicValue" title="污染值" sortable>
+                    style="cursor: pointer"
+                >
+                    <vxe-column type="seq" width="70" title="序号"></vxe-column>
+                    <vxe-column field="subName" title="变电站名称" min-width="120"></vxe-column>
+                    <vxe-column field="lineName" title="监测点名称" align="center" min-width="120"></vxe-column>
+                    <vxe-column field="objName" title="监测对象名称" align="center" min-width="100"></vxe-column>
+                    <vxe-column field="loadType" title="干扰源类型" align="center" min-width="100"></vxe-column>
+                    <vxe-column field="powerFlag" title="监测位置" align="center" min-width="100"></vxe-column>
+                    <vxe-column field="vharmonicValue" title="污染值" sortable min-width="80">
                         <template #default="scope">
                             <span
                                 :style="{
@@ -47,19 +59,27 @@
                 </vxe-table>
             </div>
         </div>
-        <div style="height: 300px; margin-top: 10px; position: relative" v-loading="loading">
+        <div class="title mb5 mt10">
-            <!-- <div style="position: absolute; width: 100px; top: 0px; right: 0px; z-index: 1">
+            <span>敏感及重要用户评估</span>
-                <el-radio-group v-model="city" size="small" @change="analysis">
+        </div>
-                    <el-radio-button label="0">省</el-radio-button>
+        <div style="height: 265px; position: relative" v-loading="loading">
-                    <el-radio-button label="1">市</el-radio-button>
+            <vxe-table
-                </el-radio-group>
+                v-bind="defaultAttribute"
-                <el-radio-group v-model="type" size="small" @change="analysis">
+                ref="tableRef1"
-                    <el-radio-button label="1">年</el-radio-button>
+                @cell-click="pollutionClick"
-                    <el-radio-button label="3">月</el-radio-button>
+                height="265px"
-                </el-radio-group>
+                :row-config="{ isCurrent: true, isHover: true }"
-            </div> -->
+                :data="pollutionValueList"
+                style="cursor: pointer"
+            >
+                <vxe-column title="序号" width="60" type="seq"></vxe-column>
+                <vxe-column field="gdName" title="供电公司" Width="150" />
+                <vxe-column field="subStationName" title="变电站" />
+                <vxe-column field="projectName" title="项目名称" />
+                <vxe-column field="subValue" title="谐波电压污染值" width="150" />
+            </vxe-table>
 
-            <MyEChart style="height: 300px" :options="picEChart" />
+            <!-- <MyEChart style="height: 300px" :options="picEChart" @echartClick="echartClick" /> -->
         </div>
     </el-dialog>
 </template>
@@ -68,7 +88,9 @@ import { ref, nextTick } from 'vue'
 import MyEChart from '@/components/echarts/MyEchart.vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { useDictData } from '@/stores/dictData'
-import { getAssessDetail, getAssessTrend, downPollutionSubCalc } from '@/api/device-boot/panorama'
+import { getAssessDetail, getAssessTrend, downPollutionSensitiveUser } from '@/api/device-boot/panorama'
+import { useRoute } from 'vue-router'
+const router = useRouter()
 const dictData = useDictData()
 const dialogVisible: any = ref(false)
 const rowList: any = ref({})
@@ -78,6 +100,7 @@ const loading = ref(false)
 const tableData: any = ref([])
 const subdata: any = ref([])
 const picEChart = ref()
+const pollutionValueList = ref([])
 const tableRef = ref()
 const loadingTab = ref(false)
 const PollutionList = dictData.getBasicData('Pollution_Calc').filter(item => item.name == '谐波电压')
@@ -108,49 +131,49 @@ const currentChangeEvent = async () => {
 const analysis = () => {
     loading.value = true
     let time = rowList.value.searchBeginTime.slice(0, 4) + `-01-01`
-    downPollutionSubCalc({ ...rowList.value, ids: [PollutionList[0].id] }).then(res => {
+    downPollutionSensitiveUser({ ...rowList.value, ids: [PollutionList[0].id], deptId: rowList.value.id }).then(res => {
-        const first10Items = res.data.slice(0, 10)
+        pollutionValueList.value = res.data.filter((item: any) => item.subValue != null)
-        picEChart.value = {
+        // const first10Items = res.data.slice(0, 10)
-            title: {
+        // picEChart.value = {
-                text: '污染值排名前十变电站'
+        //     title: {
-            },
+        //         text: '污染值排名前十敏感及重要用户'
+        //     },
 
-            xAxis: {
+        //     xAxis: {
-                name: '',
+        //         name: '',
-                data: first10Items.map((item: any) => item.subStationName),
+        //         data: first10Items.map((item: any) => item.projectName.split('(')[0].trim()),
-                axisLabel: {
+        //         axisLabel: {
-                    rotate: 30, // 核心：倾斜 45 度（推荐 30/45/60，角度太大易读性差）
+        //             rotate: 20 // 核心：倾斜 45 度（推荐 30/45/60，角度太大易读性差）
-                   
+        //         }
-                }
+        //     },
-            },
+        //     grid: {
-            grid: {
+        //         bottom: 10
-                bottom: 10
+        //     },
-            },
+        //     legend: {
-            legend: {
+        //         show: false
-                show: false
+        //     },
-            },
+        //     yAxis: {
-            yAxis: {
+        //         name: ''
-                name: ''
+        //     },
-            },
+        //     options: {
-            options: {
+        //         dataZoom: false,
-                dataZoom: false,
+        //         series: [
-                series: [
+        //             {
-                    {
+        //                 // name: time[i],
-                        // name: time[i],
+        //                 name: '污染值',
-                        name: '污染值',
+        //                 type: 'bar',
-                        type: 'bar',
+        //                 data: first10Items.map((item: any) => item.subValue),
-                        data: first10Items.map((item: any) => item.subVStationValue),
+        //                 itemStyle: {
-                        itemStyle: {
+        //                     color: function (params) {
-                            color: function (params) {
+        //                         // params.value 是当前柱子的数值
-                                // params.value 是当前柱子的数值
+        //                         const value = params.value
-                                const value = params.value
+        //                         return setColor(value)
-                                return setColor(value)
+        //                     }
-                            }
+        //                 }
-                        }
+        //             }
-                    }
+        //         ]
-                ]
+        //     }
-            }
+        // }
-        }
 
         loading.value = false
     })
@@ -170,6 +193,26 @@ const setColor = val => {
         ? '#00B07D'
         : ''
 }
+const pollutionClick = (res: any) => {
+    router.push({
+        name: 'harmonic-boot/qydetailedAnalysis/pollutionReport',
+        query: {
+            type: '4',
+            name: res.row.projectName,
+            t: Date.now()
+        }
+    })
+}
+const clickAttribute = (row: any) => {
+    router.push({
+        name: 'harmonic-boot/qydetailedAnalysis/pollutionReport',
+        query: {
+            type: '1',
+            name: row.row.lineName,
+            t: Date.now()
+        }
+    })
+}
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
@@ -199,4 +242,19 @@ defineExpose({ open })
 :deep(.el-select) {
     min-width: 80px !important;
 }
+.title {
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+
+    span {
+        font-weight: 550;
+        font-size: 18px;
+    }
+
+    .WarningFilled {
+        width: 16px;
+        cursor: pointer;
+    }
+}
 </style>

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

@@ -19,17 +19,33 @@
             <el-col :span="12">
                 <div class="title">
                     <span>分布统计</span>
-                    <el-select
+                    <el-radio-group v-model="statisticalType" size="small">
+                        <el-radio-button v-for="item in options" :label="item.code" @change="statiStics">
+                            {{ item.name }}
+                        </el-radio-button>
+                    </el-radio-group>
+                    <!-- <el-select
                         v-model="statisticalType"
                         value-key="id"
                         style="width: 120px; margin-right: 80px"
                         @change="statiStics"
                     >
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
-                    </el-select>
+                    </el-select> -->
                 </div>
                 <div class="pie">
-                    <MyEChart style="height: 260px" :options="picEChart" />
+                    <!-- <MyEChart style="height: 260px" :options="picEChart" /> -->
+                    <MyEChart style="height: 260px; width: 50%" :options="picEChart" />
+                    <el-table size="small" height="260px" style="width: 50%" :data="picList">
+                        <el-table-column prop="orgName" width="90px" align="center">
+                            <template #default="scope">
+                                {{ scope.row.orgName.split('(')[0].trim() }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="integrityRate" label="完整性(%)" align="center"></el-table-column>
+                        <el-table-column prop="onLineRate" label="在线率(%)" align="center" />
+                        <el-table-column prop="outOfStandardRate" label="超标占比(%)" align="center" />
+                    </el-table>
                 </div>
             </el-col>
         </el-row>
@@ -55,12 +71,12 @@ import { useDictData } from '@/stores/dictData'
 import { getGridDiagramLineTendency, getGridDiagramLineData, getHalfReport } from '@/api/device-boot/panorama'
 const dictData = useDictData()
 const dialogVisible: any = ref(false)
-
+const picList: any = ref([])
 const Voltage = dictData.getBasicData('Dev_Voltage_Stand')
 const tableData: any = ref([])
-const options = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Power_Network'])
+const options = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Power_Network', 'JB_Power_Flag'])
 const time = ref('1')
-const statisticalType = ref(options[0])
+const statisticalType = ref('Load_Type')
 const loadTypeArr = dictData.getBasicData('Interference_Source')
 
 const rowList: any = ref({})
@@ -68,6 +84,7 @@ const trendEChart: any = ref()
 
 const picEChart = ref()
 const open = async (row: any) => {
+    statisticalType.value = 'Load_Type'
     time.value = '1'
     rowList.value = {
         deviceInfoParam: {
@@ -141,52 +158,65 @@ const analysis = (e: any) => {
 }
 // 统计
 const statiStics = () => {
-    getGridDiagramLineData({ ...rowList.value, statisticalType: statisticalType.value }).then(res => {
+    getGridDiagramLineData({
+        ...rowList.value,
+        statisticalType: options.filter((item: any) => item.code == statisticalType.value)[0]
+    }).then(res => {
+        picList.value = res.data
+        let picData: any = []
+        const total = res.data.reduce((sum, item) => {
+            const num = (item.orgName.match(/\((\d+)\)/) || [])[1] || 0
+            return sum + Number(num)
+        }, 0)
+
+        res.data.forEach((item: any) => {
+            let value = (item.orgName.match(/\((\d+)\)/) || [])[1] || 0
+            picData.push({
+                value: value,
+                name: item.orgName,
+                proportion: (value / total).toFixed(2)
+            })
+        })
+
         picEChart.value = {
-            title: {
+            tooltip: {
-                text: ''
+                trigger: 'item',
+                formatter: '{b}: 占比 {d}%  '
+            },
+
+            legend: {
+                show: false
             },
             xAxis: {
-                data: res.data.map((item: any) => item.orgName)
+                show: false
             },
             yAxis: {
-                name: '%',
+                show: false
-                min: 0,
-                max: 100
             },
             options: {
                 dataZoom: null,
                 series: [
                     {
-                        name: '数据完整性',
+                        type: 'pie',
-                        type: 'bar',
+                        startAngle: 360,
+                        center: ['50%', '55%'],
+                        radius: ['40%', '60%'],
+                        endAngle: 0,
+                        labelLine: {
+                            length: 8,
+                            length2: 30,
+                            show: true
+                        },
+                        label: {
+                            padding: [0, -30],
+                            formatter: '{b}\n\n'
+                        },
+                        itemStyle: {
+                            borderColor: '#fff',
+                            borderWidth: 1
+                        },
 
-                        data: res.data.map((item: any) => item.integrityRate),
+                        data: picData.sort((a, b) => b.value - a.value)
-                        label: {
-                            show: true,
-                            position: 'top',
-                            fontSize: 12
-                        }
-                    },
-                    {
-                        name: '在线率',
-                        type: 'bar',
-                        data: res.data.map((item: any) => item.onLineRate),
-                        label: {
-                            show: true,
-                            position: 'top',
-                            fontSize: 12
-                        }
-                    },
-                    {
-                        name: '超标监测点占比',
-                        type: 'bar',
-                        data: res.data.map((item: any) => item.outOfStandardRate),
-                        label: {
-                            show: true,
-                            position: 'top',
-                            fontSize: 12
-                        }
                     }
                 ]
             }

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

@@ -0,0 +1,153 @@
+<template>
+    <div class="propInfo" v-if="show">
+        <div class="top">
+            <el-form :inline="false" label-width="auto">
+                <el-form-item label=" 筛选数据">
+                    <el-input v-model="value" size="small" clearable placeholder="请输入关键字进行筛选"></el-input>
+                </el-form-item>
+                <!-- <el-form-item label="电网标志">
+                    <el-select v-model="powerFlag" placeholder="请选择电网标志">
+                        <el-option label="全部" value="0"></el-option>
+                        <el-option label="电网侧" value="1"></el-option>
+                        <el-option label="非电网侧" value="2"></el-option>
+                    </el-select>
+                </el-form-item> -->
+            </el-form>
+            <Close class="ico" @click="show = false" />
+        </div>
+        <vxe-table
+            height="200px"
+            :data="filterDataByKeyword(dataList, value)"
+            size="mini"
+            border
+            ref="tableRef"
+            align="center"
+            showOverflow
+            v-loading="loading"
+            :row-config="{ isCurrent: true, isHover: true }"
+            :columnConfig="{ resizable: true }"
+            @cell-click="currentChangeEvent"
+            style="z-index: 0"
+        >
+            <vxe-column type="seq" title="序号" width="70px"></vxe-column>
+            <vxe-column field="gdName" title="供电公司"></vxe-column>
+            <vxe-column field="subName" title="变电站名称"></vxe-column>
+            <!-- <vxe-column field="deviceName" title="终端名称"></vxe-column> -->
+            <!-- <vxe-column field="ip" title="IP"></vxe-column> -->
+            <vxe-column field="lineName" title="监测点名称"></vxe-column>
+            <vxe-column field="powerFlag" title="电网标志">
+                <template #default="{ row }">
+                    {{ row.powerFlag == 0 ? '电网侧' : '非电网侧' }}
+                </template>
+            </vxe-column>
+            <!-- <vxe-column field="loadType" title="干扰源"></vxe-column> -->
+            <vxe-column field="loadType" title="干扰源类型"></vxe-column>
+            <vxe-column field="objName" title="监测对象"></vxe-column>
+        </vxe-table>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, nextTick, ref, provide } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { Close } from '@element-plus/icons-vue'
+const emit = defineEmits(['flyTo'])
+const value = ref('')
+const tableRef = ref()
+const dataList = ref([])
+const loading = ref(false)
+const powerFlag = ref('0')
+const open = (data: any) => {
+    dataList.value = []
+    loading.value = true
+    show.value = true
+    setTimeout(() => {
+        dataList.value = data
+        loading.value = false
+    }, 1000)
+}
+
+/**
+ * 根据关键字过滤数据，匹配gdName/subName/deviceName字段
+ * @param {Array} data - 原始数据数组
+ * @param {string} keyword - 过滤关键字（支持多关键字空格分隔，忽略大小写）
+ * @returns {Array} 过滤后的结果数组
+ */
+function filterDataByKeyword(data, keyword) {
+    // 空关键字直接返回全部数据
+    if (!keyword || keyword.trim() === '') {
+        return [...data] // 返回新数组，避免修改原数据
+    }
+
+    // 处理关键字：转小写、去除首尾空格、拆分多关键字（空格分隔）
+    const keywords = keyword
+        .trim()
+        .toLowerCase()
+        .split(/\s+/)
+        .filter(k => k)
+
+    // 无有效关键字时返回全部
+    if (keywords.length === 0) {
+        return [...data]
+    }
+
+    // 过滤逻辑
+    return data.filter(item => {
+        // 提取需要匹配的三个字段，统一转小写（忽略大小写）
+        const gdName = (item.gdName || '').toLowerCase()
+        const subName = (item.subName || '').toLowerCase()
+        const deviceName = (item.deviceName || '').toLowerCase()
+        const ip = (item.ip || '').toLowerCase()
+        const lineName = (item.lineName || '').toLowerCase()
+
+        // 多关键字需全部匹配（逻辑与）
+        return keywords.every(key => {
+            // 只要有一个字段包含关键字，就匹配成功
+            return (
+                gdName.includes(key) ||
+                subName.includes(key) ||
+                deviceName.includes(key) ||
+                ip.includes(key) ||
+                lineName.includes(key)
+            )
+        })
+    })
+}
+const currentChangeEvent = () => {
+    // tableRef.value.getCurrentRecord()
+    console.log('🚀 ~ currentChangeEvent ~  tableRef.value.getCurrentRecord():', tableRef.value.getCurrentRecord())
+    let data = tableRef.value.getCurrentRecord()
+    emit('flyTo', { coordinate: [data.lng, data.lat] }, 16)
+}
+
+const show = ref(false)
+defineExpose({ open, show })
+</script>
+<style lang="scss" scoped>
+.propInfo {
+    position: absolute;
+    width: 48%;
+    bottom: 10px;
+    left: 26%;
+    background-color: #fff;
+    padding: 10px;
+    // z-index: 1;
+}
+.vxe-table--render-default.size--mini .vxe-body--column:not(.col--ellipsis),
+.vxe-table--render-default.size--mini .vxe-footer--column:not(.col--ellipsis),
+.vxe-table--render-default.size--mini .vxe-header--column:not(.col--ellipsis) {
+    padding: 5px;
+}
+.top {
+    width: 100%;
+    height: 40px;
+    background-color: #fff;
+    display: flex;
+    justify-content: space-between;
+
+    .ico {
+        height: 20px;
+        cursor: pointer;
+        margin-top: 8px;
+    }
+}
+</style>

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

@@ -18,14 +18,14 @@
             </el-col>
             <el-col :span="12">
                 <div class="title">
-                    <span>
+                    <span class="text-style" @click="jump">
                         污染告警
                         <el-popover placement="right" :width="190" trigger="hover">
                             <template #reference>
                                 <WarningFilled class="WarningFilled" />
                             </template>
                             <div class="text">
-                                 <span style="color: #00B07D">无污染：0</span>
+                                <span style="color: #00b07d">无污染：0</span>
                                 <br />
                                 <span style="color: #3399ff">轻微污染：(0 , 100]</span>
                                 <br />
@@ -33,7 +33,7 @@
                                 <br />
                                 <span style="color: #ff9900">中度污染：(1000 , 10000]</span>
                                 <br />
-                                <span style="color: #A52a2a">重度污染：(10000</span>
+                                <span style="color: #a52a2a">重度污染：(10000</span>
                             </div>
                         </el-popover>
                     </span>
@@ -51,12 +51,7 @@
                 </div>
                 <!-- :style="i == 3 ? `margin-left: 20%;` : ``" -->
                 <div class="pie">
-                    <MyEChart
+                    <MyEChart v-for="(item, i) in picEChart" @click="echartClick" class="MyEChart" :options="item" />
-                        v-for="(item, i) in picEChart"
-                       
-                        class="MyEChart"
-                        :options="item"
-                    />
                 </div>
             </el-col>
         </el-row>
@@ -72,7 +67,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-column field="num6" sortable title="暂无数据数量" :formatter="formatter" /> -->
             </vxe-table>
         </div>
     </el-dialog>
@@ -82,9 +77,10 @@ import { ref } from 'vue'
 import MyEChart from '@/components/echarts/MyEchart.vue'
 import { useDictData } from '@/stores/dictData'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
-
 import { WarningFilled } from '@element-plus/icons-vue'
 import { getPollutionAlarmList, getPollutionAlarmData, getGridDiagramSubTendency } from '@/api/device-boot/panorama'
+import { useRouter } from 'vue-router'
+const router = useRouter()
 const dictData = useDictData()
 const dialogVisible: any = ref(false)
 const time = ref('1')
@@ -95,7 +91,7 @@ const options: any = dictData.getBasicData('Pollution_Calc')
 //         return item
 //     }
 // })
-const contaminate = ref(options[0].id)
+const contaminate = ref(options[0]?.id)
 const rowList: any = ref({})
 const trendEChart: any = ref({})
 const tableData: any = ref([])
@@ -290,8 +286,7 @@ const contaminateC = () => {
         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
-        let total = a1 + a2 + a3 + a4 + a5 + a6
         // if (rowList.value.isUpToGrid == 0) {
         //     data = res.data.info
         // } else {
@@ -331,13 +326,9 @@ const contaminateC = () => {
             {
                 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','#ccc']
+        const color = ['#00B07D', '#3399ff', '#ffcc33', '#ff9900', '#A52a2a', '#ccc']
 
         list.forEach((item, i) => {
             picEChart.value[i] = {
@@ -500,6 +491,17 @@ const handleClose = () => {
     dialogVisible.value = false
 }
 
+const jump = () => {
+    router.push({
+        name: 'harmonic-boot/qydetailedAnalysis/pollutionReport',
+        query: {
+            type: '2',
+            statisticalType: contaminate.value,
+            t: Date.now()
+        }
+    })
+}
+
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
@@ -531,4 +533,10 @@ defineExpose({ open })
 :deep(.el-dialog__body) {
     max-height: none !important;
 }
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+    text-decoration-color: var(--el-color-primary);
+    text-underline-offset: 4px;
+}
 </style>

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

@@ -10,15 +10,19 @@
                 <div class="boxSteps">
                     <el-steps>
                         <template v-for="(item, i) in Voltage">
-                            <el-step :class="active == i ? 'highlight' : ''" :title="item.name"
+                            <el-step
-                                @click="handleClick(i)"></el-step>
+                                :class="active == i ? 'highlight' : ''"
+                                :title="item.name"
+                                @click="handleClick(i)"
+                            ></el-step>
                         </template>
                     </el-steps>
                 </div>
                 <div v-for="(item, i) in evaluationData" class="evaluationData">
                     <el-row style="width: 100%">
                         <el-col :span="12" style="display: flex">
-                            <img :src="url[i]" />
+                            <span :class="`iconfont ${url[i]} icoColor`"></span>
+                            <!-- <img :src="url[i]" /> -->
                             <span>{{ item.targetName }}</span>
                         </el-col>
                         <el-col :span="12" style="display: flex">
@@ -90,11 +94,16 @@ const Voltage: any = dictData.getBasicData('Dev_Voltage_Stand').filter(item => {
 
 const chartRef = ref<HTMLDivElement>()
 const url: any = [
-    new URL(`@/assets/img/PLPC.png`, import.meta.url),
+    'icon-frequency',
-    new URL(`@/assets/img/DYPC.png`, import.meta.url),
+    'icon-dianya',
-    new URL(`@/assets/img/JBL.png`, import.meta.url),
+    'icon-dianyazongxiebojibianshuai',
-    new URL(`@/assets/img/SXDY.png`, import.meta.url),
+    'icon-sanxiangdianyafuzhibupingheng',
-    new URL(`@/assets/img/SB.png`, import.meta.url)
+    'icon-a-253_ipower'
+    // new URL(`@/assets/img/PLPC.png`, import.meta.url),
+    // new URL(`@/assets/img/DYPC.png`, import.meta.url),
+    // new URL(`@/assets/img/JBL.png`, import.meta.url),
+    // new URL(`@/assets/img/SXDY.png`, import.meta.url),
+    // new URL(`@/assets/img/SB.png`, import.meta.url)
 ]
 const tableData: any = ref([])
 const title = ['频率偏差(超标)', '电压偏差(超标)', '电压总谐波畸变率(超标)', '闪变(超标)', '三相电压不平衡度(超标)']
@@ -108,7 +117,8 @@ const echart = (row: any) => {
 
     let chart = echarts.init(chartRef.value as HTMLDivElement)
 
-    let dataname = ['频率偏差(Hz)',
+    let dataname = [
+        '频率偏差(Hz)',
         '电压偏差(%)',
         '电压总谐波畸变率(%)',
         '三相电压不平衡度(%)',
@@ -116,7 +126,8 @@ const echart = (row: any) => {
         '谐波电压(%)',
         '谐波电流(%)',
         '间谐波电压(%)',
-        '负序电流(A)']
+        '负序电流(A)'
+    ]
     // let datamax = [100, 100, 100, 100, 100, 100]
     let indicator = []
     for (let i = 0; i < dataname.length; i++) {
@@ -247,6 +258,7 @@ const handleClick = (i: any) => {
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
+@import '@/assets/font/iconfont.css';
 :deep(.el-select) {
     min-width: 80px;
 }
@@ -335,4 +347,9 @@ defineExpose({ open })
 :deep(.el-dialog__body) {
     max-height: none !important;
 }
+.icoColor{
+    color: var(--el-color-primary);
+    margin: 0 20px;
+    font-size: 20px;
+}
 </style>

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

@@ -2,7 +2,7 @@
 <template>
     <el-dialog draggable title="技术监督统计" v-model="dialogVisible" width="1400px">
         <div>
-            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="320px" :data="tableData">
+            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="325px" :data="tableData">
                 <vxe-column field="orgName" title="区域" />
                 <vxe-column field="abnormalNum" title="异常问题总数" />
                 <vxe-column field="workNum" title="工单总数" />

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

@@ -1,14 +1,35 @@
 <!-- 暂态 -->
 <template>
     <el-dialog draggable title="暂态电能质量水平评估统计" v-model="dialogVisible" width="1400px">
+        <div v-loading="loading">
             <div>
-            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="360px" :data="tableData">
+                <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="365px" :data="tableData">
                     <vxe-column field="name" title="区域" />
 
-                <vxe-column sortable field="sagTimes" title="暂降次数" />
+                    <vxe-column sortable field="sagTimes" title="暂降次数">
-                <vxe-column sortable field="swellTimes" title="暂升次数" />
+                        <template #default="{ row }">
-                <vxe-column sortable field="interruptTimes" title="短时中断次数" />
+                            <span class="text-style" @click="transientOpen(row.sagTimesIds, row.name, '暂降')">
-
+                                {{ row.sagTimes }}
+                            </span>
+                        </template>
+                    </vxe-column>
+                    <vxe-column sortable field="swellTimes" title="暂升次数">
+                        <template #default="{ row }">
+                            <span class="text-style" @click="transientOpen(row.swellTimesIds, row.name, '暂升')">
+                                {{ row.swellTimes }}
+                            </span>
+                        </template>
+                    </vxe-column>
+                    <vxe-column sortable field="interruptTimes" title="短时中断次数">
+                        <template #default="{ row }">
+                            <span
+                                class="text-style"
+                                @click="transientOpen(row.interruptTimesIds, row.name, '短时中断')"
+                            >
+                                {{ row.interruptTimes }}
+                            </span>
+                        </template>
+                    </vxe-column>
                     <vxe-colgroup title="暂态严重度占比">
                         <vxe-column sortable field="rate90" title="SARFI-90" />
                         <vxe-column sortable field="rate50" title="SARFI-50" />
@@ -38,27 +59,39 @@
                     </div>
                 </div>
             </div>
+        </div>
     </el-dialog>
+    <!-- 暂态详情 -->
+    <transientDetails ref="transientRef" />
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
 import MyEChart from '@/components/echarts/MyEchart.vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { getEventReason, getEventDetailByList } from '@/api/device-boot/panorama'
-
+import transientDetails from './transientDetails.vue'
+import { ElMessage } from 'element-plus'
 const dialogVisible: any = ref(false)
-
+const transientRef = ref()
 const tableData: any = ref([])
 const descentData = ref([])
 const resembleData = ref([])
-
 const picEChart = ref({})
 const picEChart1 = ref({})
+const loading = ref(false)
 const open = async (row: any) => {
-    getEventDetailByList({ ...row, deviceInfoParam: row }).then((res: any) => {
+    const [year, , day] = row.startTime.split('-')
+    dialogVisible.value = true
+    loading.value = true
+     getEventDetailByList({
+        ...row,
+        deviceInfoParam: row,
+        searchBeginTime: `${year}-01-${day}`,
+        startTime: `${year}-01-${day}`
+    }).then((res: any) => {
         tableData.value = res.data
     })
-    getEventReason(row).then(res => {
+    await getEventReason({ ...row, searchBeginTime: `${year}-01-${day}`, startTime: `${year}-01-${day}` }).then(res => {
         descentData.value = res.data.reason
         resembleData.value = res.data.type
         picEChart.value = {
@@ -128,7 +161,14 @@ const open = async (row: any) => {
             }
         }
     })
-    dialogVisible.value = true
+    loading.value = false
+}
+// 查看详情
+const transientOpen = (row: any, name: string, type: string) => {
+    if (row == null || row?.length == 0) {
+        return ElMessage.info('暂无详情')
+    }
+    transientRef.value.open(row, name, type)
 }
 
 defineExpose({ open })
@@ -150,4 +190,8 @@ defineExpose({ open })
 :deep(.el-dialog__body) {
     max-height: none !important;
 }
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+}
 </style>

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

@@ -19,6 +19,10 @@
             <el-col :span="12">
                 <div class="title">
                     <span>分布统计</span>
+                    <el-radio-group v-model="type" size="small" @change="getGridDiagramDev">
+                        <el-radio-button label="1">区域</el-radio-button>
+                        <el-radio-button label="3">终端厂家</el-radio-button>
+                    </el-radio-group>
                 </div>
                 <div class="pie">
                     <MyEChart style="height: 260px; width: 50%" :options="picEChart" />
@@ -77,11 +81,12 @@ const dialogVisible: any = ref(false)
 const time = ref('1')
 const rowList: any = ref({})
 const tableData: any = ref()
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
 
 const picList = ref([])
-
+const type = ref('1')
 const trendEChart: any = ref({})
-
+const loadingTab = ref(false)
 const picEChart = ref()
 const open = async (row: any) => {
     time.value = '1'
@@ -97,13 +102,49 @@ const open = async (row: any) => {
     analysis(1)
     dialogVisible.value = true
     //分布统计
-    getGridDiagramDevData(rowList.value).then(res => {
+    getGridDiagramDev()
-        picList.value = res.data
+    // 列表
+    getGridDiagramDevDataList({
+        deviceInfoParam: {
+            ...row,
+            serverName: 'pqs-common',
+            ids: [row.id],
+            runFlag: [],
+            comFlag: [],
+            manufacturer: dictData.getBasicData('Dev_Manufacturers'),
+            statisticalType: dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
+        },
+        ...row,
+        serverName: 'pqs-common',
+        ids: [row.id],
+        runFlag: [],
+        comFlag: [],
+        manufacturer: dictData.getBasicData('Dev_Manufacturers'),
+        statisticalType: dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
+    }).then((res: any) => {
+        tableData.value = res.data
+    })
+}
+
+const getGridDiagramDev = async () => {
+    loadingTab.value = true
+    let data = JSON.parse(JSON.stringify(rowList.value))
+    data.deviceInfoParam.statisticalType = type.value == '1' ? classificationData[0] : classificationData[1]
+    data.statisticalType = type.value == '1' ? classificationData[0] : classificationData[1]
+
+    await getGridDiagramDevData(data).then((res: any) => {
+        const total = res.data.reduce((sum, item) => {
+            return sum + item.devCount
+        }, 0)
+
+        picList.value = type.value == '1' ? res.data : res.data.filter((item: any) => item.devCount != 0)
         let picData: any = []
-        res.data.forEach((item: any) => {
+        picList.value = picList.value.sort((a, b) => b.devCount - a.devCount)
+        picList.value.forEach((item: any) => {
             picData.push({
                 value: item.devCount,
-                name: `${item.orgName}`,
+                name: `${item.orgName}(${item.devCount})`,
+                proportion: (item.devCount / total).toFixed(2),
                 itemStyle: {
                     color: item.onlineEvaluate < 60 ? 'red' : item.onlineEvaluate < 90 ? 'orange' : 'green'
                 }
@@ -113,7 +154,7 @@ const open = async (row: any) => {
         picEChart.value = {
             tooltip: {
                 trigger: 'item',
-                formatter: '{b} :在运终端数 {c} 台'
+                formatter: '{b}: 占比 {d}%  '
             },
             legend: {
                 show: false
@@ -153,29 +194,8 @@ const open = async (row: any) => {
             }
         }
     })
-    // 列表
+    loadingTab.value = false
-    getGridDiagramDevDataList({
-        deviceInfoParam: {
-            ...row,
-            serverName: 'pqs-common',
-            ids: [row.id],
-            runFlag: [],
-            comFlag: [],
-            manufacturer: dictData.getBasicData('Dev_Manufacturers'),
-            statisticalType: dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
-        },
-        ...row,
-        serverName: 'pqs-common',
-        ids: [row.id],
-        runFlag: [],
-        comFlag: [],
-        manufacturer: dictData.getBasicData('Dev_Manufacturers'),
-        statisticalType: dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
-    }).then((res: any) => {
-        tableData.value = res.data
-    })
 }
-
 const analysis = (e: any) => {
     let time = rowList.value.searchBeginTime.slice(0, 4) + `-01-01`
 

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

@@ -0,0 +1,80 @@
+<!-- 暂态 -->
+<template>
+    <el-dialog draggable :title="title" v-model="dialogVisible" width="800px">
+        <vxe-table
+            v-bind="defaultAttribute"
+            ref="vxeRef"
+            height="360px"
+            :data="tableData"
+            @cell-click="currentChangeEvent"
+            style="cursor: pointer;"
+        >
+            <vxe-column title="序号" width="70" type="seq"></vxe-column>
+            <vxe-column field="lineName" title="监测点名称" />
+            <vxe-column field="subName" title="变电站名称"></vxe-column>
+            <vxe-column field="devName" title="终端名称"></vxe-column>
+            <vxe-column sortable field="count" :title="types + '次数'"></vxe-column>
+        </vxe-table>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import MyEChart from '@/components/echarts/MyEchart.vue'
+import { useDictData } from '@/stores/dictData'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { getEventDetailByList } from '@/api/device-boot/panorama'
+import { useRouter } from 'vue-router'
+const router = useRouter()
+const dictData = useDictData()
+const dialogVisible: any = ref(false)
+const list = dictData.getBasicData('Event_Statis')
+const tableData: any = ref([])
+const title = ref('详情')
+const types = ref('')
+// Event_Statis
+const open = async (row: any, name: string, type: string) => {
+    types.value = type
+    title.value = name + type + '详情'
+    tableData.value = row
+
+    dialogVisible.value = true
+}
+const currentChangeEvent = (row: any) => {
+    router.push({
+        name: 'Descentsystem/transientList',
+        query: {
+            type: '1',
+            name:row.row.lineName,
+            dicData: types.value,
+            t: Date.now()
+        }
+    })
+}
+// 跳转暂态列表
+
+// 查看详情
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+.statistics-main {
+    // height: 300px;
+    display: grid;
+    width: 100%;
+    grid-template-columns: 1fr 1fr;
+
+    .statistics-box {
+        // height: 300px;
+        // display: flex;
+        display: grid;
+        grid-template-columns: 2fr 1fr;
+    }
+}
+:deep(.el-dialog__body) {
+    max-height: none !important;
+}
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+}
+</style>

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

@@ -3,32 +3,38 @@
         <DatePicker ref="datePickerRef" style="display: none" theCurrentTime />
         <el-page-header :icon="ArrowLeft" @back="emit('back')">
             <template #content>
-                <span style="font-size: 16px">{{ dropList.lineName }}详情　</span>
+                <span style="">{{ dropList.gdName }}_{{ dropList.bdName }}_{{ dropList.lineName }}</span>
-                <span style="font-weight: 500">最新数据时间：</span>
+                <span style="font-weight: 500" class="ml20">最新数据时间：</span>
-                <span style="color: var(--color-primary-default)">{{ dropList.updateTime }}</span>
+                <span style="color: var(--el-color-primary)">{{ dropList.updateTime }}</span>
                 <span style="font-weight: 500" class="ml20">统计日期：</span>
-                <span style="color: var(--color-primary-default)">
+                <span style="color: var(--el-color-primary)">
                     {{ getTimeOfTheMonth('3')[0] + '至' + getTimeOfTheMonth('3')[1] }}
                 </span>
             </template>
         </el-page-header>
         <el-row :gutter="20" class="mt10" :style="`height:${rowHeight}`">
             <el-col :span="8">
-                <h3 class="mb10 iconBox">
+                <h3 class="mb10 iconBox text-style" @click="clickLinName">
                     <span></span>
                     台账信息
                 </h3>
-                <el-descriptions title="" border :column="2">
+                <el-descriptions title="" label-width="100px" border :column="2" size="small">
-                    <el-descriptions-item label="监测点名称" width="140px">
+                    <el-descriptions-item label="变电站名称">
+                        {{ dropList.bdName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="监测点名称">
                         {{ dropList.lineName }}
                     </el-descriptions-item>
+                    <el-descriptions-item label="监测对象名称">
+                        {{ dropList.objName }}
+                    </el-descriptions-item>
                     <el-descriptions-item label="所属厂家">{{ dropList.manufacturer }}</el-descriptions-item>
                     <el-descriptions-item label="电压等级">{{ dropList.scale }}</el-descriptions-item>
                     <el-descriptions-item label="投运日期">{{ dropList.loginTime }}</el-descriptions-item>
-                    <el-descriptions-item label="PT">{{ dropList.pt }}</el-descriptions-item>
+                    <!-- <el-descriptions-item label="PT">{{ dropList.pt }}</el-descriptions-item>
-                    <el-descriptions-item label="CT">{{ dropList.ct }}</el-descriptions-item>
+                    <el-descriptions-item label="CT">{{ dropList.ct }}</el-descriptions-item> -->
                     <el-descriptions-item label="干扰源类型">{{ dropList.loadType }}</el-descriptions-item>
-                    <el-descriptions-item label="通讯状态" width="140px">
+                    <el-descriptions-item label="通讯状态">
                         <el-tag size="small" :type="dropList.comFlag == '正常' ? 'success' : 'danger'" effect="dark">
                             {{ dropList.comFlag }}
                         </el-tag>
@@ -36,9 +42,12 @@
                 </el-descriptions>
             </el-col>
             <el-col :span="8">
-                <h3 class="mb10 iconBox">
+                <h3
+                    class="mb10 iconBox text-style"
+                    @click="TargetData.info == 1 ? clickAlarm(5) : TargetData.info == 2 ? Integrity() : ''"
+                >
                     <span></span>
-                    告警明细 (天)
+                    告警天数
                 </h3>
                 <el-descriptions title="" border :column="2" size="small">
                     <el-descriptions-item width="140px" label="告警原因">
@@ -78,6 +87,43 @@
                     </el-descriptions-item>
                 </el-descriptions>
             </el-col>
+            <el-col :span="8">
+                <h3 class="mb10 iconBox text-style" @click="clickAlarm(8)">
+                    <span></span>
+                    告警明细
+                </h3>
+
+                <!-- <vxe-table
+                    height="200px"
+                    :data="evaluationData"
+                    size="mini"
+                    border
+                    align="center"
+                    showOverflow
+                    :columnConfig="{ resizable: true }"
+                >
+                    <vxe-column field="targetName" title="供电公司"></vxe-column>
+                    <vxe-column field="avg" title="幅值"></vxe-column>
+                    <vxe-column field="xz" title="最大限值"></vxe-column>
+                 
+                </vxe-table> -->
+                <!-- ${rowHeight} -->
+                <el-table :data="evaluationData.filter((item) => item.avg != 3.14159)" v-loading='loading' :height='`calc(${rowHeight} - 31px)`' size="small" border >
+                    <el-table-column prop="targetName" align="center" label="指标名称" />
+                    <el-table-column prop="avg" align="center" label="最大越限幅值">
+                        <template #default="{ row }">
+                            {{ Math.floor(row.avg * 100) / 100 }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="xz" align="center" label="限值">
+                        <template #default="{ row }">
+                            {{ row.xz == 3.14159 ? '/' : row.xz }}
+                        </template>
+                    </el-table-column>
+                </el-table>  
+            </el-col>
+        </el-row>
+        <el-row :gutter="20" class="mt10" :style="`height:${rowHeight}`">
             <el-col :span="8">
                 <h3 class="mb10 iconBox">
                     <span></span>
@@ -92,75 +138,16 @@
                     />
                 </div>
             </el-col>
-        </el-row>
-        <el-row :gutter="20" class="mt10" :style="`height:${rowHeight}`">
             <el-col :span="8">
-                <h3 class="mb10 iconBox">
+                <h3 class="mb10 iconBox text-style" @click="clickAlarm(2)">
-                    <span></span>
-                    监测点总体评价结论
-                </h3>
-
-                <div class="evaluationData">
-                    <el-row style="width: 96%" class="row pb5">
-                        <el-col :span="12" style="display: flex">
-                            <span>{{ dropList.lineName }}</span>
-                        </el-col>
-                        <el-col :span="12" style="display: flex">
-                            <div>
-                                综合评估得分:
-                                <span
-                                    class="conclusion"
-                                    :class="
-                                        dropList.assessData == '特质'
-                                            ? 'background1'
-                                            : dropList.assessData == '较差'
-                                            ? 'background2'
-                                            : dropList.assessData == '极差'
-                                            ? 'background3'
-                                            : ''
-                                    "
-                                >
-                                    {{ dropList.assessData }}
-                                </span>
-                            </div>
-                        </el-col>
-                    </el-row>
-                    <el-row style="width: 96%" v-for="(item, i) in evaluationData" class="row pb4 pt3">
-                        <el-col :span="14" style="display: flex; align-items: center">
-                            <img :src="url[i]" />
-                            <span style="line-height: 20px">{{ item.targetName }}</span>
-                        </el-col>
-                        <el-col :span="10" style="display: flex; align-items: center">
-                            <div style="width: 100%">
-                                评估得分：
-                                <span
-                                    class="conclusion"
-                                    :class="
-                                        item.avg == '特质'
-                                            ? 'background1'
-                                            : item.avg == '较差'
-                                            ? 'background2'
-                                            : item.avg == '极差'
-                                            ? 'background3'
-                                            : ''
-                                    "
-                                >
-                                    {{ item.avg }}
-                                </span>
-                            </div>
-                        </el-col>
-                    </el-row>
-                </div>
-            </el-col>
-            <el-col :span="8">
-                <h3 class="mb10 iconBox">
                     <span></span>
                     稳态指标合格率
                 </h3>
-                <div :style="`height: calc(${rowHeight} - 31px)`" ref="chartRef"></div>
+
+                <div :style="`height: calc(${rowHeight} - 31px); `" ref="chartRef"></div>
             </el-col>
             <el-col :span="8">
-                <h3 class="mb10 iconBox">
+                <h3 class="mb10 iconBox text-style" @click="clickTransient()">
                     <span></span>
                     暂态事件统计
                 </h3>
@@ -199,10 +186,11 @@ import {
     lineQualifiedDetail,
     getLineAssess,
     getEventDetailByLineId,
-    getGridDiagramTargetData
+    getGridDiagramTargetData,
+    limitTableDetail
 } from '@/api/device-boot/panorama'
 import { formatter } from 'element-plus'
-
+const loading=ref(false)
 const emit = defineEmits(['back'])
 const dropList: any = ref({})
 const TargetData: any = ref({})
@@ -386,41 +374,66 @@ const open = async (id: string) => {
             }
         }
     })
-
+    loading.value = true
     // 监测点总体评价结论
-    getLineAssess({
+    limitTableDetail({
         lineId: id,
-        startTime: datePickerRef.value.timeValue[0],
+        monitorIds: [id],
-        endTime: datePickerRef.value.timeValue[1]
+        searchBeginTime: datePickerRef.value.timeValue[0],
+        searchEndTime: datePickerRef.value.timeValue[1],
+        searchState: 0,
+        lineRunFlag: 0
     }).then((res: any) => {
-        dropList.value.assessData = res.data.assessLevel
+        // dropList.value.assessData = res.data.assessLevel
         evaluationData.value = [
             {
-                targetName: '频率偏差(Hz)',
+                targetName: '频率偏差',
-                avg: res.data.freqAssessLevel,
+                avg: res.data.freqData,
-                sd: res.data.freqQualifyData
+                xz: res.data.freqLimit
             },
             {
-                targetName: '电压偏差(%)',
+                targetName: '电压偏差',
-                avg: res.data.vdevAssessLevel,
+                avg: res.data.vdevData,
-                sd: res.data.vdevQualifyData
+                xz: res.data.vdevLimit
             },
             {
-                targetName: '电压总谐波畸变率(%)',
+                targetName: '谐波电流',
-                avg: res.data.harmAssessLevel,
+                avg: res.data.iharmData,
-                sd: res.data.harmQualifyData
+                xz: res.data.iharmLimit
             },
             {
-                targetName: '三相电压不平衡度(%)',
+                targetName: '负序电流',
-                avg: res.data.unbalanceAssessLevel,
+                avg: res.data.inegData,
-                sd: res.data.unbalanceQualifyData
+                xz: res.data.inegLimit
+            },
+            {
+                targetName: '间谐波电压',
+                avg: res.data.inuharmData,
+                xz: res.data.inuharmLimit
+            },
+
+            {
+                targetName: '电压总谐波畸变率',
+                avg: res.data.uaberranceData,
+                xz: res.data.uaberranceLimit
             },
             {
                 targetName: '闪变',
-                avg: res.data.flickerAssessLevel,
+                avg: res.data.flickerData,
-                sd: res.data.flickerQualifyData
+                xz: res.data.flickerLimit
+            },
+            {
+                targetName: '谐波电压',
+                avg: res.data.uharmData,
+                xz: res.data.uharmLimit
+            },
+            {
+                targetName: '三相电压不平衡度',
+                avg: res.data.unbalanceData,
+                xz: res.data.unbalanceLimit
             }
         ]
+         loading.value = false
     })
     // 稳态指标合格率
 
@@ -687,15 +700,58 @@ const echart = (row: any) => {
 // 跳转
 const Integrity = () => {
     router.push({
-        name: 'harmonic-boot/harmonic/getIntegrityData'
+        name: 'harmonic-boot/harmonic/getIntegrityData',
-    })
+        query: {
-}
+            type: '1',
-const OnlineRate = () => {
+            name: dropList.value.lineName,
-    router.push({
+            t: Date.now()
-        name: 'harmonic-boot/area/OnlineRate'
+        }
     })
 }
 
+const OnlineRate = () => {
+    router.push({
+        name: 'harmonic-boot/area/OnlineRate',
+        query: {
+            type: '1',
+            name: dropList.value.devName,
+            t: Date.now()
+        }
+    })
+}
+// 跳转在线监测点
+const clickAlarm = (value: any) => {
+    router.push({
+        name: 'harmonic-boot/monitor/online',
+        query: {
+            type: value,
+            id: lineId.value,
+            t: Date.now()
+        }
+    })
+}
+// 跳转暂态列表
+const clickTransient = () => {
+    router.push({
+        name: 'Descentsystem/transientList',
+        query: {
+            type: '1',
+            name: dropList.value.lineName,
+            t: Date.now()
+        }
+    })
+}
+// 跳转台账信息
+const clickLinName = () => {
+    router.push({
+        name: 'Supervision/Terminaldetection',
+        query: {
+            type: '5',
+            name: dropList.value.lineName,
+            t: Date.now()
+        }
+    })
+}
 onMounted(() => {
     // open('4c87b7dff2281254fc55c25a4da31506')
 })
@@ -735,7 +791,7 @@ defineExpose({ open })
 
 .iconBox {
     display: flex;
-
+    align-items: center;
     span {
         display: inline-block;
         width: 3px;
@@ -767,4 +823,13 @@ defineExpose({ open })
     background-color: #a52a2a;
     color: #fff;
 }
+:deep(.el-table--small .el-table__cell) {
+    padding: 2px 0 !important;
+}
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+    text-decoration-color: var(--el-color-primary);
+    text-underline-offset: 4px;
+}
 </style>

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

@@ -19,6 +19,12 @@
             </template>
         </el-input>
     </div>
+    <div>
+        <!-- <el-button @click="showPsrmap" class="psrmapBut">电网图层</el-button> -->
+        <el-checkbox-group v-model="group" @change="showPsrmap" size="small" class="psrmapBut">
+            <el-checkbox-button value="1" label="电网图层"></el-checkbox-button>
+        </el-checkbox-group>
+    </div>
     <!-- 搜索内容展示 -->
     <div class="query-box-wrap collapse" v-show="showWrap">
         <div v-if="QueryList.length == 0" class="collapse_none">查询无结果</div>
@@ -50,6 +56,8 @@
             展开搜索结果
         </div>
     </div>
+    <!-- 点击弹框 -->
+    <propInfo ref="propInfoRef" @flyTo="flyTo"/>
 </template>
 
 <script setup lang="ts">
@@ -63,7 +71,8 @@ import { getGridDiagramAreaData } from '@/api/device-boot/panorama'
 import { Search } from '@element-plus/icons-vue'
 import '@/assets/panorama/narimap.css'
 import '@/assets/panorama/nrgisCommon.css'
-const emit = defineEmits(['changeValue', 'drop', 'show'])
+import propInfo from '@/views/pqs/qualityInspeection/panorama/components/details/propInfo.vue'
+const emit = defineEmits(['changeValue', 'drop', 'show', 'setLine'])
 const prop = defineProps({
     lineInfo: {
         type: Boolean
@@ -77,6 +86,7 @@ const datePickerRef = ref()
 const form: any = ref({})
 const colorKey = ref('')
 const PopKey = ref(2)
+const propInfoRef = ref()
 const assessList: any = ref([])
 const linList: any = ref([])
 const QueryList: any = ref([])
@@ -144,7 +154,7 @@ narimap.Require(
     // ['PSRMap', 'Components.Query', 'Marker'],
     () => {
         if (narimap.Config.examples.notlogin) {
-            initMap(narimap.Config.styles.sjRaster)
+            initMap(narimap.Config.styles.sjDark)
         } else {
             //电网GIS地图服务登录
             narimap.SGAuth.login()
@@ -156,7 +166,7 @@ narimap.Require(
                     }
 
                     //默认打开电网GIS影像图
-                    initMap(narimap.Config.styles.sjRaster)
+                    initMap(narimap.Config.styles.sjDark)
                 })
                 .catch((err: any) => {
                     console.log('错误', err)
@@ -278,7 +288,6 @@ const addSource = async () => {
     //     }
     // }
     // ]
-    console.log('🚀 ~ sourceList:', sourceList.value)
 
     if (map.value.getSource('themeData')) {
         map.value.getSource('themeData').setData({
@@ -353,30 +362,52 @@ const addSource = async () => {
                  */
                 'heatmap-opacity': 1
             },
-            maxzoom: 12
+            maxzoom: 12,
+            layout: {
+                visibility: 'none'
+            }
         })
     }
 }
+const changeHeat = e => {
+    map.value.setLayoutProperty('earthquakes-paint', 'visibility', e ? 'visible' : 'none')
+}
+const psrmap = ref(null)
 // 添加变电站线路
 const addLine = () => {
     //添加电网图层
-    let psrmap = new narimap.PSRMap(map.value, {
+    psrmap.value = new narimap.PSRMap(map.value, {
         orgId: orgId.value == '1100F3DE20806FADE050007F01006CBE' ? '' : orgId.value
+        // disableFilterByUserAuth:new narimap.Config.examples.disableFilterByUserAuth
     })
-    psrmap.addPSR()
+    psrmap.value.addPSR()
 
     initDeviceCard()
     setTimeout(() => {
-        psrmap.filterByDomain(1)
+        // psrmap.filterByDomain(1)
     }, 0)
+
+    psrmap.value.on('load', () => {
+        // 显示电网图层
+        // psrmap.value.hide()
+    })
     //添加电网要素点击事件
-    psrmap.on('click', (features: any) => {
+    psrmap.value.on('click', (features: any) => {
         console.log(features)
         showCollapse.value = false
+       
         if (inputQuery.value.length == 0) showWrap.value = false
     })
 }
-
+const group = ref(['1'])
+const showPsrmap = e => {
+    if (e.length > 0) {
+        psrmap.value.show()
+    } else {
+        psrmap.value.hide()
+    }
+}
+const propInfoShow=ref(false)
 // 添加变电站弹框
 const initDeviceCard = () => {
     deviceCard.value && deviceCard.value.close()
@@ -401,10 +432,13 @@ const initDeviceCard = () => {
     deviceCard.value.on('click', (res: any) => {
         if (res.button.id == 'nariPopupViewDetail') {
             emit('show', true)
+            propInfoShow.value=propInfoRef.value.show
+            propInfoRef.value.show=false
         }
         setTimeout(() => {
             document.querySelectorAll('.nari-tabs__close')[0].onclick = function (v: any) {
                 emit('show', false)
+                propInfoRef.value.show=propInfoShow.value
             }
         }, 10)
     })
@@ -726,6 +760,7 @@ const addLayer = () => {
 
 const PollutionList = dictData.getBasicData('Pollution_Calc').filter(item => item.name == '谐波电压')
 //添加多个监测点
+const lineData = ref([])
 const addMarkers = async (row?: any, key?: any, num?: any) => {
     if (map.value == null) return
     let params = {
@@ -740,7 +775,7 @@ const addMarkers = async (row?: any, key?: any, num?: any) => {
         statisticalType: {},
         ...row
     }
-
+    lineData.value = []
     let { data } = await getAreaLineInfo(params)
 
     let r = 0.0035
@@ -756,6 +791,7 @@ const addMarkers = async (row?: any, key?: any, num?: any) => {
         }
 
         item.children.forEach((val: any, i: number) => {
+            lineData.value.push(val)
             val.lng = item.lng + r * Math.cos((2 * Math.PI * i) / item.children.length)
             val.lat = item.lat + r * Math.sin((2 * Math.PI * i) / item.children.length)
             val.imageUrl =
@@ -796,18 +832,6 @@ 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',
@@ -817,12 +841,16 @@ const addMarkers = async (row?: any, key?: any, num?: any) => {
                 },
                 properties: {
                     value: val.vharmonicValue || 0
-                    // value: num //10 //val.vharmonicValue || 0
-                    // value: 0
                 }
             })
         })
     })
+    console.log('🚀 ~ addMarkers ~ num:', key)
+
+    if (key != undefined) {
+        propInfoRef.value.open(lineData.value)
+        // emit('setLine', lineData.value)
+    }
 
     if (flag.value) {
         linList.value = [...tempFeatureZ, ...tempFeatureT]
@@ -1150,7 +1178,7 @@ const createMapSelectorComponent = () => {
     )
 }
 
-defineExpose({ locatePositions, addMarkers, grids, DeviceQ, radiusPop, flyTo })
+defineExpose({ locatePositions, addMarkers, grids, DeviceQ, radiusPop, flyTo, changeHeat })
 const height = mainHeight(20)
 </script>
 

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

@@ -61,10 +61,10 @@
                     </div>
                 </div>
             </div>
-            <!-- 监测点指标统计 -->
+            <!-- 资产性质 -->
             <div :style="`height:calc(${boxHeight.height} + 50px)`">
                 <div class="title">
-                    <span>监测点指标统计</span>
+                    <span>资产性质</span>
                 </div>
                 <div style="display: flex" class="mt2">
                     <img src="@/assets/img/FGX.png" />
@@ -97,33 +97,48 @@
 
                                 <div>
                                     数据完整性:
-                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
+                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate || 0 }}%</span>
                                 </div>
                                 <div>
                                     在线率:
-                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
+                                    <span style="color: #2dcd28; cursor: text">{{ val.onLineRate || 0 }}%</span>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <!-- 监测点指标统计 -->
+            <!-- 资产性质 -->
             <div :style="`height:calc(${boxHeight.height} - 55px)`">
                 <div class="title">
                     <span>监测运行统计</span>
+                    <div class="titleNum">
+                        ( 合格:
+                        <span class="mr10" style="color: #2dcd28" @click="LookMap(linList[0].lineListOne, [], 0)">
+                            {{ linList[0].lineNumOne || 0 }}
+                        </span>
+                        告警:
+                        <span style="color: #a52a2a" @click="LookMap(linList[0].lineListTwo, [], 1)">
+                            {{ linList[0].lineNumTwo || 0 }}
+                        </span>
+                        )
+                    </div>
                 </div>
                 <div style="display: flex" class="mt2">
                     <img src="@/assets/img/FGX.png" />
                 </div>
 
                 <div :style="`height:calc(${boxHeight.height} - 100px);overflow-y: auto;`" class="BoxA mt10">
-                    <div class="card-Box" v-for="item in linList">
+                    <div class="card-Box" v-for="item in linList.slice(1)">
-                        <div>
+                        <!-- <div>
                             <span class="line"></span>
                             <span class="vol">{{ item.title[0] }}</span>
+                        </div> -->
+                        <div class="num num2">
+                            <div style="text-align: left">
+                                <span class="line"></span>
+                                <i class="vol">{{ item.title[0] }}</i>
                             </div>
-                        <div class="num">
                             <div>
                                 {{ item.title[1] }}:
                                 <span style="color: #2dcd28" @click="LookMap(item.lineListOne, [], 0)">
@@ -148,12 +163,12 @@
             @click="show = !show"
             src="@/assets/img/QH.png"
         />
-        <div class="legeng">
+        <!-- <div class="legeng">
             <div v-for="item in legengList">
                 <span :style="`background-color: ${item.color};`"></span>
                 <span>{{ item.title }}</span>
             </div>
-        </div>
+        </div> -->
 
         <!-- 变电站详情 -->
         <stand ref="standRef" />
@@ -305,9 +320,10 @@ const countList: any = ref([
                 title: '电网侧监测点',
                 num: 0,
                 onLineNum: 0,
-                integrityRate: 0
+                integrityRate: 0,
+                onLineRate: 0
             },
-            { title: '非电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }
+            { title: '非电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0, onLineRate: 0 }
         ]
     }
     // {
@@ -409,7 +425,7 @@ const info = async (row: any) => {
             numOneList: []
         })
     })
-    // 监测点指标统计
+    // 资产性质
     getGridDiagramStatistics(form).then(res => {
         countList.value[0].children[0] = { title: '电网侧监测点', ...res.data.data[0] }
         countList.value[0].children[1] = { title: '非电网侧监测点', ...res.data.data[1] }
@@ -549,13 +565,13 @@ defineExpose({ info, show })
     // grid-template-rows: 1fr 1fr;
     display: flex;
     flex-direction: column;
-    justify-content: space-evenly;
+    justify-content: space-around;
     // align-items: center;
     margin: 0 5px 5px;
     padding: 10px;
     background-color: #edededc0;
     border-radius: 10px;
-    min-height: 60px;
+    min-height: 40px;
     // max-height: 120px;
 
     .line {
@@ -581,10 +597,11 @@ defineExpose({ info, show })
             font-weight: 550;
         }
     }
+
     .num1 {
         grid-template-columns: 1fr 1fr; /* 核心：改为2列，均分宽度 */
         grid-template-rows: auto auto;
-        gap: 8px; /* 可选：子元素间距，提升美观度 */
+        gap: 15px; /* 可选：子元素间距，提升美观度 */
         div {
             display: flex;
             padding-left: 20px;
@@ -594,12 +611,16 @@ defineExpose({ info, show })
             }
         }
     }
+    .num2 {
+        display: grid;
+        grid-template-columns: 1fr 1fr 1fr !important;
+    }
 }
 
 .BoxA {
     display: grid;
-    grid-template-columns: 1fr 1fr;
+    grid-template-columns: 1fr;
-    grid-template-rows: 1fr 1fr;
+    grid-template-rows: 1fr 1fr 1fr;
 
     // grid-template-rows: 80px;
     .num {
@@ -655,7 +676,7 @@ defineExpose({ info, show })
     position: absolute;
     padding: 5px;
     bottom: 0;
-    right: -75px;
+    right: -78px;
     width: 70px;
     font-size: 12px;
     height: 120px;
@@ -679,4 +700,13 @@ defineExpose({ info, show })
         }
     }
 }
+.titleNum {
+    font-size: 13px;
+    font-weight: normal;
+    margin-left: 5px;
+    span {
+        font-weight: 600;
+        cursor: pointer;
+    }
+}
 </style>

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

@@ -4,11 +4,21 @@
             <!-- 综合评估 -->
             <div style="height: 110px">
                 <div class="title">
-                    <span>
+                    <span>稳态电能质量水平评估</span>
-                        稳态综合评估
+                    <span class="info" @click="open(0)">
+                        详情
+                        <ArrowRight style="width: 12px" />
+                    </span>
+                </div>
+                <div style="display: flex" class="mt2">
+                    <img src="@/assets/img/FGX.png" />
+                </div>
+                <div class="mt10 TJTop">
+                    <img src="@/assets/img/TJ.png" />
+                    区域污染水平评估
                     <el-popover placement="right" :width="190" trigger="hover">
                         <template #reference>
-                                <WarningFilled class="WarningFilled" />
+                            <WarningFilled class="WarningFilled ml5" />
                         </template>
                         <div class="text">
                             <span style="color: #00b07d">无污染：0</span>
@@ -22,39 +32,15 @@
                             <span style="color: #a52a2a">重度污染：(10000</span>
                         </div>
                     </el-popover>
-                    </span>
+                    <el-switch
-                    <span class="info" @click="open(0)">
+                        v-model="heat"
-                        详情
+                        class="ml5"
-                        <ArrowRight style="width: 12px" />
+                        @change="changeHeat"
-                    </span>
+                        size="small"
-                </div>
+                        inline-prompt
-                <div style="display: flex" class="mt2">
+                        active-text="热力图"
-                    <img src="@/assets/img/FGX.png" />
+                        inactive-text="热力图"
-                </div>
+                    />
-                <div class="mt10 TJTop">
-                    <!-- <img src="@/assets/img/TJ.png" />
-                    综合评估得分：
-                    <span
-                        :style="{
-                            color:
-                                assessList.score == 3.14159
-                                    ? ''
-                                    : assessList.score > 4.5
-                                    ? '#339966'
-                                    : assessList.score > 4
-                                    ? '#2b7fd3'
-                                    : assessList.score > 3
-                                    ? '#ffcc33'
-                                    : assessList.score > 2
-                                    ? '#97017e'
-                                    : assessList.score > 0
-                                    ? '#A52a2a'
-                                    : ''
-                        }"
-                    >
-                        {{ assessList.score == 3.14159 ? '/' : assessList.score }}
-                    
-                    </span> -->
                 </div>
                 <div class="evaluate">
                     <div v-for="item in assessList" style="min-width: 60px">
@@ -80,16 +66,16 @@
             </div>
             <!-- 稳态电能质量水平评估 -->
             <div>
-                <div class="title">
+                <!-- <div class="title">
                     <span>稳态电能质量水平评估</span>
                     <span class="info" @click="open(1)">
                         详情
                         <ArrowRight style="width: 12px" />
                     </span>
-                </div>
+                </div> -->
-                <div style="display: flex" class="mt2">
+                <!-- <div style="display: flex" class="mt2">
                     <img src="@/assets/img/FGX.png" />
-                </div>
+                </div> -->
                 <div :style="boxHeight" class="boxR">
                     <div class="top">
                         <div class="TJTop">
@@ -256,6 +242,7 @@ import {
     getEventLevelEvaluation,
     getSupervisionData
 } from '@/api/device-boot/panorama'
+const emit = defineEmits(['changeHeat'])
 const dictData = useDictData()
 const show = ref(false)
 const height = mainHeight(30)
@@ -309,6 +296,7 @@ const options = ref([
         value: '9'
     }
 ])
+const heat = ref(false)
 const technology: any = ref({})
 const harmonicType = ref('6')
 const transientNum = ref([0, 0])
@@ -366,7 +354,7 @@ const PollutionList = dictData.getBasicData('Pollution_Calc').filter(item => ite
 const value = ref(options1[0].id)
 const open = (e: number) => {
     if (e == 0) {
-        evaluateRef.value.open(formRow.value,assessList.value)
+        evaluateRef.value.open(formRow.value, assessList.value)
     } else if (e == 1) {
         steadyStateRef.value.open(formRow.value)
     } else if (e == 2) {
@@ -375,7 +363,10 @@ const open = (e: number) => {
         techniqueRef.value.open(formRow.value)
     }
 }
-const setColor = val => {
+const changeHeat = (e: any) => {
+    emit('changeHeat', e)
+}
+const setColor = (val: any) => {
     return val == 3.14159
         ? ''
         : val > 10000
@@ -390,7 +381,7 @@ const setColor = val => {
         ? '#00B07D'
         : ''
 }
-const setVal = val => {
+const setVal = (val: any) => {
     return val == 3.14159
         ? '/'
         : val > 10000
@@ -447,7 +438,13 @@ const harmonicChange = () => {
     })
 }
 const transientChange = () => {
-    getEventLevelEvaluation({ ...formRow.value, ids: [value.value] }).then(res => {
+    const [year, , day] = formRow.value.startTime.split('-') //`${year}-01-${day}`
+    getEventLevelEvaluation({
+        ...formRow.value,
+        ids: [value.value],
+        searchBeginTime: `${year}-01-${day}`,
+        startTime: `${year}-01-${day}`
+    }).then(res => {
         let data = []
         transientNum.value = [0, 0]
         if (formRow.value.isUpToGrid == 0) {
@@ -497,14 +494,15 @@ defineExpose({ info, show })
         cursor: pointer;
         color: #757575;
     }
-    .WarningFilled {
+}
+.WarningFilled {
     width: 12px;
     font-weight: 500;
     cursor: pointer;
-    }
 }
 .TJTop {
     display: flex;
+    align-items: center;
     img {
         height: 1.2rem;
         width: 1.2rem;
@@ -512,7 +510,7 @@ defineExpose({ info, show })
     }
 }
 .evaluate {
-    margin: 10px 0;
+    margin: 5px 0 10px 0;
     display: flex;
     justify-content: space-around;
     text-align: center;

src/views/pqs/qualityInspeection/panorama/components/style/map.scss

@@ -7,7 +7,12 @@
     .Icon {
         width: 30px;
         height: 30px;
-        background-image: url('@/assets/icons/网公司.svg');
+        background-color: var(--el-color-primary);
+        border-radius: 5px;
+        background-image: url('@/assets/img/inlogo.png');
+        background-size: 25px;
+        background-repeat: no-repeat;
+        background-position: center;
     }
     .el-input__icon {
         font-size: 20px;
@@ -200,3 +205,13 @@
     width: 450px;
     z-index: 0;
 }
+.psrmapBut{
+    position: absolute;
+    bottom: 103px;
+    right: 60px;
+    // z-index: 0.1;
+}
+#nrDeviceCard{
+    z-index: 1;
+}
+

src/views/pqs/qualityInspeection/panorama/index.vue

@@ -4,14 +4,19 @@
             <DatePicker ref="datePickerRef" style="display: none" theCurrentTime />
             <el-form :inline="true" :model="form" class="demo-form-inline">
                 <el-form-item>
-                    <Area ref="areaRef" :show-all-levels="false" v-model="form.orgNo" style="width: 100px"
+                    <Area
-                        @changeValue="changeValue" />
+                        ref="areaRef"
+                        :show-all-levels="false"
+                        v-model="form.orgNo"
+                        style="width: 100px"
+                        @changeValue="changeValue"
+                    />
                 </el-form-item>
-                <el-form-item>
+                <!-- <el-form-item>
                     <el-select v-model="form.isUpToGrid" style="width: 100px" @change="info">
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <div class="Icon" @click="reset">
                         <Icon name="fa fa-refresh" />
@@ -21,13 +26,19 @@
         </div>
 
         <!-- 地图 -->
-        <Map v-if="VITE_FLAG" ref="mapRef" @changeValue="changeValue" :lineInfo="lineInfo" @drop="drop"
+        <Map
-            @show="infoShow" />
+            v-if="VITE_FLAG"
+            ref="mapRef"
+            @changeValue="changeValue"
+            :lineInfo="lineInfo"
+            @drop="drop"
+            @show="infoShow"
+        />
         <div v-show="lineInfo">
             <!-- 省级 -->
             <div v-show="control == 1">
                 <mapL ref="mapLRef" class="mapL" @LookMap="LookMap" @GridDiagram="GridDiagram" />
-                <mapR ref="mapRRef" class="mapR" />
+                <mapR ref="mapRRef" class="mapR" @changeHeat="changeHeat" />
             </div>
             <!-- 市级 -->
             <!-- <div v-show="control == 4"> -->
@@ -102,6 +113,15 @@ const changeValue = (e: any) => {
 
     info()
 }
+// 热力图开关
+const changeHeat = (e: boolean) => {
+    console.log('🚀 ~ changeHeat ~ e:', e)
+
+    mapRef.value.changeHeat(e)
+    if (e) {
+        mapRef.value.flyTo({ coordinate: [116.84428600000001, 40.57707185292256] }, 6.409267680647425)
+    }
+}
 //点击监测点详情
 const drop = (id: string) => {
     lineInfo.value = false
@@ -178,6 +198,7 @@ const info = () => {
     form.value.type = datePickerRef.value.interval
 
     VITE_FLAG ? mapRef.value.grids(form.value) : ''
+    VITE_FLAG ? mapRef.value.addMarkers() : ''
     if (control.value == 1) {
         mapLRef.value.info(form.value)
         mapRRef.value.info(form.value)
@@ -197,9 +218,10 @@ const reset = () => {
     changeValue({ data: dictData.state.area[0] })
 }
 onMounted(() => {
-    // info()
+    nextTick(() => {
+        // datePickerRef.value.setTheDate(1)
         changeValue({ data: dictData.state.area[0] })
-    // aaa()
+    })
 })
 </script>
 
@@ -254,7 +276,7 @@ onMounted(() => {
 .mapR {
     position: absolute;
     top: 10px;
-    // z-index: 1;
+    z-index: 1;
     right: 10px;
 }
 

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

@@ -167,7 +167,7 @@
                         <vxe-column field="monitorName" title="监测点名称"></vxe-column>
                         <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
                         <vxe-column field="devName" title="所属终端名称"></vxe-column>
-                        <vxe-column field="ip" title="IP">
+                        <vxe-column field="ip" title="IP" width="120px">
                             <template #default="{ row }">
                                 {{ decryptFromBase64(row.ip) }}
                             </template>
@@ -243,7 +243,7 @@ const tableStore = new TableStore({
     method: 'POST',
     showPage: false,
     filename: '稳态告警统计',
-    publicHeight: 470,
+    publicHeight: 480,
     column: [],
     beforeSearchFun: () => {
         loading.value = true

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

@@ -3,10 +3,10 @@
         <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
             <pane :size="size">
                 <AssessTree
+                    ref="AssessTreeRef"
                     :default-expand-all="false"
                     @node-click="handleNodeClick"
                     @init="handleNodeClick"
-                    ref="assessTreeRef"
                     :highlight-current="true"
                     :current-node-key="currentTreeKey"
                     :expand-on-click-node="false"
@@ -263,7 +263,7 @@ onMounted(() => {
 })
 
 // 添加树组件的引用
-const assessTreeRef = ref<any>(null)
+const AssessTreeRef = ref()
 // 控制树组件当前高亮的节点key
 const currentTreeKey = ref<string | number | null>(null)
 // 保存上一次真正有效的节点key（子节点）
@@ -308,6 +308,44 @@ const handleNodeClick = (data: any, node: any) => {
     infoLoading.value = true
     outcomeLoading.value = true
 }
+const setId = (id: any) => {
+    setTimeout(() => {
+        lastValidNodeKey.value = id
+        currentTreeKey.value = lastValidNodeKey.value
+        dotList.value = findNodeByTreeId(AssessTreeRef.value?.tree, id)?.name || {}
+        currentNodeName.value = findNodeByTreeId(AssessTreeRef.value?.tree, id)?.name || '' //data?.name || ''
+        currentNodeId.value = id
+        AssessTreeRef.value?.scrollToNode(id)
+    }, 100)
+}
+/**
+ * 递归查找树形结构中匹配treeId的节点对象
+ * @param {Array} treeData - 树形结构数据（数组）
+ * @param {string} targetTreeId - 要查找的treeId
+ * @returns {object|null} 匹配的节点对象（未找到返回null）
+ */
+const findNodeByTreeId = (treeData: any, id: any) => {
+    // 遍历每一个顶层节点
+    for (const node of treeData) {
+        // 1. 当前节点匹配，直接返回
+        if (node.id === id) {
+            return node
+        }
+        // 2. 当前节点有子节点，递归查找子节点
+        if (node.children && Array.isArray(node.children) && node.children.length > 0) {
+            const foundNode: any = findNodeByTreeId(node.children, id)
+            // 子节点中找到则返回（终止递归）
+            if (foundNode) {
+                return foundNode
+            }
+        }
+    }
+    // 遍历完所有节点未找到，返回null
+    return null
+}
+defineExpose({
+    setId
+})
 </script>
 <style lang="scss" scoped>
 .splitpanes.default-theme .splitpanes__pane {

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

@@ -110,10 +110,10 @@
                 <el-collapse-item title="谐波电流/电压评估结果" :name="4">
                     <div class="flickerWaves" style="height: 520px">
                         <vxe-table :data="harmonicCurrents" height="520px" v-bind="defaultAttribute"    :cell-class-name="getCellClassName3" style="width: 50%">
-                            <vxe-column title="谐波次数" field="name" />
+                            <vxe-column title="谐波次数" field="name" width="90px"/>
                             <vxe-colgroup title="电容器谐波电流评估值(A)">
-                                <vxe-column field="notInvested" title="未投入" min-width="160px" />
+                                <vxe-column field="notInvested" title="未投入" />
-                                <vxe-column field="hasInvested" title="已投入" min-width="160px" />
+                                <vxe-column field="hasInvested" title="已投入" />
                             </vxe-colgroup>
                             <vxe-column title="国标限值(%)" field="limitData" />
                             <vxe-column title="判断">
@@ -131,10 +131,10 @@
                             :cell-class-name="getCellClassName3"
                             style="width: 50%"
                         >
-                            <vxe-column title="谐波次数" field="name" />
+                            <vxe-column title="谐波次数" field="name" width="90px"/>
                             <vxe-colgroup title="电容器谐波电压评估值(%)">
-                                <vxe-column field="notInvested" title="未投入" min-width="160px" />
+                                <vxe-column field="notInvested" title="未投入" />
-                                <vxe-column field="hasInvested" title="已投入" min-width="160px" />
+                                <vxe-column field="hasInvested" title="已投入" />
                             </vxe-colgroup>
                             <vxe-column title="国标限值(A)" field="limitData" />
                             <vxe-column title="判断">

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

@@ -1,20 +1,39 @@
 <template>
     <div class="default-main">
         <el-tabs type="border-card" v-model="activeName">
-            <el-tab-pane label="评估用户维护" name="1"><User v-if="activeName == '1'"/></el-tab-pane>
+            <el-tab-pane label="评估用户维护" name="1"><User v-if="activeName == '1'" /></el-tab-pane>
-            <el-tab-pane label="用户二级评估" name="2"><Assess v-if="activeName == '2'"/></el-tab-pane>
+            <el-tab-pane label="用户二级评估" name="2"><Assess ref="AssessRef" v-if="activeName == '2'" /></el-tab-pane>
-            <el-tab-pane label="参数字典维护" name="3"><Dictionary  v-if="activeName == '3'"/></el-tab-pane>
+            <el-tab-pane label="参数字典维护" name="3"><Dictionary v-if="activeName == '3'" /></el-tab-pane>
         </el-tabs>
     </div>
 </template>
 <script setup lang="ts">
-import { ref, reactive } from 'vue'
+import { ref, reactive, watch } from 'vue'
 import User from '@/views/pqs/runManage/assessment/components/uese/index.vue'
 import Assess from '@/views/pqs/runManage/assessment/components/assess/index.vue'
 import Dictionary from '@/views/pqs/runManage/assessment/components/dictionary/index.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
 defineOptions({
     name: 'runManage/assessment'
 })
+const AssessRef = ref()
 const activeName = ref('1')
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
+        if (route.fullPath.includes('runManage/assessment')) {
+            let type = (route.query.type as string) || 'null'
+            if (type == 'null') {
+            } else if (type == '2') {
+                activeName.value = '2'
+                setTimeout(() => {
+                    AssessRef.value.setId((route.query.secondAssessmentId as string) || '')
+                }, 500)
+            }
+        }
+    },
+    { deep: true, immediate: true }
+)
 </script>
 <style lang="scss" scoped></style>

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

@@ -147,7 +147,14 @@
                     <MyEchart :options="options"></MyEchart>
                 </div>
                 <el-form :inline="true" class="form">
-                    <el-form-item label="异常持续天数"></el-form-item>
+                    <el-form-item label="数据筛选">
+                        <el-input
+                            placeholder="请输入监测点名称/终端名称"
+                            v-model="tableStore.table.params.searchValue"
+                            clearable
+                        ></el-input>
+                    </el-form-item>
+                    <!-- <el-form-item label="异常持续天数"></el-form-item>
                     <el-form-item label="告警阀值(天)">
                         <el-input-number
                             v-model="tableStore.table.params.alarmDayLimit"
@@ -163,7 +170,7 @@
                             :step="1"
                             step-strictly
                         />
-                    </el-form-item>
+                    </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="onExport" icon="el-icon-Download">导出</el-button>
@@ -183,18 +190,22 @@
                                 </span>
                             </template>
                         </vxe-column>
+                        <vxe-column field="city" title="地市" minWidth="110px"></vxe-column>
+                        <vxe-column field="stationName" title="变电站" minWidth="110px"></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="所属电站" 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="objType"
+                            title="监测对象类型"
+                            :formatter="formatter"
+                            minWidth="110px"
+                        ></vxe-column>
+                        <vxe-column
+                            field="objName"
+                            title="监测对象名称"
+                            :formatter="formatter"
+                            minWidth="110px"
+                        ></vxe-column>
                         <vxe-column field="abnormalDay" title="异常天数" width="80px">
                             <template #default="{ row }">
                                 <span class="table_name" @click="quantityClick(row, 1)">
@@ -202,6 +213,35 @@
                                 </span>
                             </template>
                         </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" width="120px">
+                            <template #default="{ row }">
+                                {{ decryptFromBase64(row.ip) }}
+                            </template>
+                        </vxe-column>
+                        <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="严重度" width="80px">
                             <template #default="{ row }">
                                 <el-tag type="warning" v-if="row.severity == 0">预警</el-tag>
@@ -279,7 +319,7 @@ const tableStore = new TableStore({
     method: 'POST',
     showPage: false,
     filename: '异常数据统计',
-    publicHeight: 470,
+    publicHeight: 480,
     column: [],
     beforeSearchFun: () => {
         loading.value = true

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

@@ -11,15 +11,41 @@
                     @current-change="currentChangeEvent"
                 >
                     <vxe-column type="seq" title="序号" width="60px"></vxe-column>
-                    <vxe-column field="date" title="日期"></vxe-column>
+                    <!-- <vxe-column field="date" title="日期"></vxe-column> -->
-                    <vxe-column field="bdName" title="所属电站(场站)" width="120px"></vxe-column>
+                    <vxe-column field="bdName" title="所属电站(场站)"></vxe-column>
-                    <vxe-column field="monitorName" title="监测点名称" width="120px"></vxe-column>
+                    <vxe-column field="monitorName" title="监测点名称"></vxe-column>
-                    <vxe-column field="timeSum" title="异常时间(分钟)" width="80px"></vxe-column>
+                    <vxe-column field="timeSum" title="异常天数" width="80px">
-                    <vxe-column field="errCount" title="异常次数" width="80px"></vxe-column>
+                        <template v-slot="{ row }">
+                            {{ row.dateList?.length }}
+                        </template>
+                    </vxe-column>
+                    <!-- <vxe-column field="errCount" title="异常次数" width="80px"></vxe-column> -->
                 </vxe-table>
             </div>
 
-            <div :style="height" style="width: 920px" v-loading="loading1">
+            <div style="width: 920px" v-loading="loading1">
+                <el-form :inline="true" class="form">
+                    <el-form-item label="统计日期">
+                        <el-select
+                            v-model="timeList"
+                            multiple
+                            collapse-tags
+                            clearable
+                            placeholder="请选择异常天数"
+                            style="width: 200px"
+                        >
+                            <el-option v-for="item in dateList" :key="item" :label="item" :value="item" />
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="form_but">
+                        <span class="mr20">异常时间：<span class="title">{{ timeSum }}</span>分钟</span>
+                        <span class="mr10">异常次数：<span class="title">{{ errCount }}</span>次</span>
+
+                        <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
+                    </el-form-item>
+                </el-form>
+                <div :style="height">
                     <vxe-table
                         height="auto"
                         :data="TableData1.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
@@ -86,6 +112,7 @@
                     </div>
                 </div>
             </div>
+        </div>
     </el-dialog>
 </template>
 <script lang="ts" setup>
@@ -97,17 +124,21 @@ import { monitorAbnormalTable, monitorAbnormalTableDetail } from '@/api/device-b
 import { mainHeight } from '@/utils/layout'
 const dialogVisible = ref(false)
 const height1 = mainHeight(-110, 2)
-const height = mainHeight(10, 2)
+const height = mainHeight(90, 2)
 const tableRef = ref()
 const title = ref('')
 const loading = ref(false)
 const loading1 = ref(false)
 const TableData = ref([])
 const TableData1 = ref([])
+const dateList: any = ref([])
 const pageNum = ref(1)
 const pageSize = ref(20)
 const numKey = ref(0)
 const targetKey = ref('')
+const errCount = ref('')
+const timeSum = ref('')
+const timeList = ref([])
 const showColumn = ref(true)
 const open = (data: anyObj, time: string[], num: number) => {
     // title.value = (num == 0 ? data.targetName : data.monitorName) + '_异常监测点详情'
@@ -134,16 +165,28 @@ const open = (data: anyObj, time: string[], num: number) => {
     dialogVisible.value = true
 }
 const currentChangeEvent = () => {
-    loading1.value = true
     let data = tableRef.value.getCurrentRecord()
+
+    dateList.value = data.dateList
+    console.log('🚀 ~ currentChangeEvent ~ dateList.value:', dateList.value)
+    timeList.value = [data.dateList[0]]
+    init()
+}
+const init = () => {
+    if(timeList.value.length == 0) return ElMessage.warning('请选择异常天数！')
+    loading1.value = true
     TableData1.value = []
+    let data = tableRef.value.getCurrentRecord()
     monitorAbnormalTableDetail({
         monitorIds: [data.monitorId],
+        time: timeList.value,
         searchBeginTime: data.date,
         targetKey: numKey.value == 0 ? targetKey.value : ''
     })
         .then(res => {
-            TableData1.value = res.data
+            errCount.value = res.data.errCount
+            timeSum.value = res.data.timeSum
+            TableData1.value = res.data.time
             showColumn.value = res.data[0]?.featureAmplitude == null ? true : false
             loading1.value = false
             pageNum.value = 1
@@ -171,7 +214,18 @@ defineExpose({ open })
 }
 :deep(.box) {
     .row--current {
-//    background-color: var(--el-color-primary-light-8) !important;
+        //    background-color: var(--el-color-primary-light-8) !important;
     }
 }
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.title{
+    font-weight: 600;
+    font-size: 16px;
+}
 </style>

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

@@ -4,7 +4,7 @@
             <vxe-column type="seq" width="70px" title="序号"></vxe-column>
             <vxe-column field="name" title="终端名称" min-width="100"></vxe-column>
             <vxe-column field="subName" title="所属电站" min-width="100"></vxe-column>
-            <vxe-column field="ip" title="网络参数" min-width="100"></vxe-column>
+            <vxe-column field="ip" title="网络参数" width="120px"></vxe-column>
             <vxe-colgroup title="运行评价">
                 <vxe-column field="integrityRate" title="完整率(%)" min-width="90"></vxe-column>
                 <vxe-column field="onLineRate" title="在线率(%)" min-width="90"></vxe-column>

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

@@ -36,7 +36,7 @@
                 <el-card class="mt10">
                     <template #header>
                         <div class="card-header">
-                            <span>完整性统计</span>
+                            <span>终端运行统计</span>
                         </div>
                     </template>
                     <div class="mb5" style="height: 40px">
@@ -131,7 +131,7 @@
                             <template #default="{ rowIndex }">
                                 <span>
                                     {{
-                                        (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize +
+                                        (pageNum - 1) * pageSize +
                                         rowIndex +
                                         1
                                     }}
@@ -143,7 +143,7 @@
                         <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="ip" title="终端IP" :formatter="formatter" width="120px"></vxe-column>
                         <vxe-column field="runFlag" title="运行状态" width="100px">
                             <template #default="{ row }">
                                 <el-tag

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

@@ -41,10 +41,10 @@
                     {{ list.takeStep }}
                 </el-descriptions-item>
                 <el-descriptions-item :span="1" label="处理成效报告">
-                <el-icon class="elView " v-if="list?.reportName" >
+                <el-icon class="elView " v-if="list?.reportName && VITE_FLAG" >
-                    <View @click="openFile(list?.reportName)" />
+                    <View @click="openFile(list?.reportPath)" />
                 </el-icon>
-                <a :href="list.reportPath" target="_blank">{{ list.reportName }}</a>
+                <a class="aLoad" @click="download(list.keyName)" target="_blank">{{ list.reportName }}</a>
             </el-descriptions-item>
 
 
@@ -58,22 +58,25 @@ import { ref, reactive } from 'vue'
 import {  View } from '@element-plus/icons-vue'
 import { useDictData } from '@/stores/dictData'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
+import {download} from '@/utils/fileDownLoad'
 const dialogVisible = ref(false)
 const title = ref('')
 const dictData = useDictData()
 const list: any = ref({})
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const open = (row: any) => {
     list.value={}
     title.value = row.title
     dialogVisible.value = true
     list.value = JSON.parse(JSON.stringify(row.row))
      getFileNameAndFilePath({ filePath: row.row.reportPath }).then(res => {
+        list.value.keyName = res.data.name
         list.value.reportPath = res.data.url
         list.value.reportName = res.data.fileName
     })
 }
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
+    window.open(window.location.origin + '/#/previewFile?' + name)
 }
 
 defineExpose({ open })

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

@@ -0,0 +1,245 @@
+<template>
+    <el-dialog draggable width="1250px" class="cn-operate-dialog" v-model="dialogVisible" :title="title">
+        <div style="display: flex" v-loading="loading">
+            <div :style="height1" class="mr10 box" style="width: 300px">
+                <vxe-table
+                    height="auto"
+                    :data="timeList"
+                    v-bind="defaultAttribute"
+                    ref="tableRef"
+                    :row-config="{ isCurrent: true, isHover: true }"
+                    @current-change="currentChangeEvent"
+                >
+                    <vxe-column type="seq" title="序号" width="60px"></vxe-column>
+                    <!-- <vxe-column field="date" title="日期"></vxe-column> -->
+                    <vxe-column field="name" title="统计日期"></vxe-column>
+                    <!-- <vxe-column field="monitorName" title="监测点名称"></vxe-column>
+                    <vxe-column field="timeSum" title="异常天数" width="80px">
+                        <template v-slot="{ row }">
+                            {{ row.dateList?.length }}
+                        </template>
+                    </vxe-column> -->
+                    <!-- <vxe-column field="errCount" title="异常次数" width="80px"></vxe-column> -->
+                </vxe-table>
+            </div>
+
+            <div style="width: 920px" v-loading="loading1">
+                <el-form :inline="true" class="form">
+                    <!-- <el-form-item label="统计日期">
+                        <el-select
+                            v-model="timeList"
+                            multiple
+                            collapse-tags
+                            clearable
+                            placeholder="请选择异常天数"
+                            style="width: 200px"
+                        >
+                            <el-option v-for="item in dateList" :key="item" :label="item" :value="item" />
+                        </el-select>
+                    </el-form-item> -->
+
+                    <el-form-item class="form_but">
+                        <span class="mr20">
+                            异常时间：
+                            <span class="title">{{ timeSum }}</span>
+                            分钟
+                        </span>
+                        <span class="mr10">
+                            异常次数：
+                            <span class="title">{{ errCount }}</span>
+                            次
+                        </span>
+
+                        <!-- <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button> -->
+                    </el-form-item>
+                </el-form>
+                <div :style="height">
+                    <vxe-table
+                        height="auto"
+                        :data="TableData1.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+                        v-bind="defaultAttribute"
+                       
+                    >
+                        <vxe-column type="seq" title="序号" width="80px">
+                            <template #default="{ rowIndex }">
+                                <span>{{ (pageNum - 1) * pageSize + rowIndex + 1 }}</span>
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="time" title="时间" width="150px"></vxe-column>
+                        <vxe-column field="targetName" title="指标类型" min-width="80px"></vxe-column>
+                        <vxe-column field="phaseType" title="相别" width="60px">
+                            <template v-slot="{ row }">
+                                {{ row.phaseType == 'T' ? '/' : row.phaseType }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="rangeDesc" title="合理范围" min-width="90px"></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
+                            v-model:currentPage="pageNum"
+                            v-model:page-size="pageSize"
+                            :page-sizes="[10, 20, 50, 100, 200]"
+                            background
+                            layout="sizes,total, ->, prev, pager, next, jumper"
+                            :total="TableData1.length"
+                        ></el-pagination>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { ElMessage } from 'element-plus'
+import { monitorAbnormalTable, monitorAbnormalTableDetail } from '@/api/device-boot/dataVerify'
+import { mainHeight } from '@/utils/layout'
+const dialogVisible = ref(false)
+const height1 = mainHeight(-110, 2)
+const height = mainHeight(90, 2)
+const tableRef = ref()
+const title = ref('')
+const loading = ref(false)
+const loading1 = ref(false)
+const TableData = ref([])
+const TableData1 = ref([])
+const dateList: any = ref([])
+const pageNum = ref(1)
+const pageSize = ref(20)
+const targetKey = ref('')
+const errCount = ref('')
+const timeSum = ref('')
+const timeList = ref([])
+const showColumn = ref(true)
+const open = (data: anyObj, time: string[]) => {
+    // title.value = (num == 0 ? data.targetName : data.monitorName) + '_异常监测点详情'
+    loading.value = true
+    title.value = '详情'
+    TableData.value = []
+    TableData1.value = []
+    timeList.value = []
+    targetKey.value = data.key
+    monitorAbnormalTable({
+        monitorIds:[data.lineId],
+        targetKey: '',
+        searchBeginTime: time[0],
+        searchEndTime: time[1]
+    })
+        .then(async res => {
+            TableData.value = res.data
+            timeList.value = TableData.value[0]?.dateList.map((item: any) => {
+                return {
+                    name: item
+                }
+            })
+            await tableRef.value.setCurrentRow(timeList.value[0])
+            await currentChangeEvent()
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
+        })
+    dialogVisible.value = true
+}
+const currentChangeEvent = () => {
+    let data = tableRef.value.getCurrentRecord()
+
+    // dateList.value = data.dateList
+    //[data.dateList[0]]
+    init()
+}
+const init = () => {
+    loading1.value = true
+    TableData1.value = []
+    let data = tableRef.value.getCurrentRecord()
+    monitorAbnormalTableDetail({
+        monitorIds: [TableData.value[0]?.monitorId],
+        time: [data.name],
+        searchBeginTime: TableData.value[0].date,
+        targetKey: ''
+    })
+        .then(res => {
+            errCount.value = res.data.errCount
+            timeSum.value = res.data.timeSum
+            TableData1.value = res.data.time
+            showColumn.value = res.data[0]?.featureAmplitude == null ? true : false
+            loading1.value = false
+            pageNum.value = 1
+        })
+        .catch(() => {
+            loading1.value = false
+        })
+}
+const formatter = (row: any) => {
+    return row.cellValue == null ? '/' : (row.cellValue - 0).toFixed(2)
+}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+.table-pagination {
+    height: 58px;
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 100%;
+    background-color: var(--ba-bg-color-overlay);
+    padding: 13px 15px;
+    border-left: 1px solid #e4e7e9;
+    border-right: 1px solid #e4e7e9;
+    border-bottom: 1px solid #e4e7e9;
+}
+:deep(.box) {
+    .row--current {
+        //    background-color: var(--el-color-primary-light-8) !important;
+    }
+}
+.form {
+    // display: flex;
+    // justify-content: end;
+    // position: relative;
+    // .form_but {
+      
+    //     right: -22px;
+    // }
+}
+.title {
+    font-weight: 600;
+    font-size: 16px;
+}
+</style>

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

@@ -130,6 +130,7 @@ const submit = () => {
 
 const open = (row: any) => {
     dialogVisible.value = true
+    resetForm()
     List.value = row.row
     title.value = row.text
 

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

@@ -47,7 +47,7 @@
                         ></el-input>
                     </el-form-item> -->
                     <el-form-item for="-" label="监测点:" prop="monitorNumber">
-                        <el-select v-model="form.monitorNumber" clearable style="width: 100%" placeholder="请选择监测点">
+                        <el-select v-model="form.monitorNumber" clearable filterable style="width: 100%" placeholder="请选择监测点">
                             <el-option v-for="item in minitorList" :key="item.id" :label="item.name"
                                 :value="item.id"></el-option>
                         </el-select>

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

@@ -2,7 +2,7 @@
     <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="time" title="日期" width="140px"></vxe-column>
                 <vxe-column field="overLimitInfo" title="越限详情"></vxe-column>
             </vxe-table>
         </div>

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

@@ -6,13 +6,33 @@
             <el-form-item label="区域">
                 <Area ref="areaRef" v-model="tableStore.table.params.deptId" @changeValue="changeArea" />
             </el-form-item>
+            <el-form-item label="筛选数据">
+                <el-input
+                    v-model="tableStore.table.params.searchValue"
+                    clearable
+                    maxlength="32"
+                    show-word-limit
+                    placeholder="请输入监测点名称"
+                />
+            </el-form-item>
             <el-form-item label="监测点性质">
                 <el-select v-model="tableStore.table.params.lineType" clearable placeholder="请选择监测点性质">
                     <el-option label="电网侧" value="0" />
                     <el-option label="非电网侧" value="1" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="超标指标">
+            <el-form-item label="数据类型">
+                <el-select
+                    v-model="tableStore.table.params.dataType"
+                    @change="changeDataType"
+                    placeholder="请选择监测点性质"
+                >
+                    <el-option label="超标数据" value="1" />
+                    <el-option label="异常数据" value="2" />
+                    <el-option label="无数据" value="0" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="超标指标" v-show="tableStore.table.params.dataType == 1">
                 <el-select
                     v-model="tableStore.table.params.targetList"
                     clearable
@@ -24,7 +44,7 @@
                     <el-option v-for="item in exceeded" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="数据类型">
+            <!-- <el-form-item label="数据类型">
                 <el-switch
                     v-model="tableStore.table.params.dataType"
                     inline-prompt
@@ -33,9 +53,8 @@
                     active-text="超标数据"
                     inactive-text="无数据"
                 />
-            </el-form-item>
+            </el-form-item> -->
-            <el-form-item label="预警阈值">
+            <!-- <el-form-item label="预警阈值">
-                <!-- <el-input v-model="tableStore.table.params.alertThreshold" placeholder="请输入预警阈值" clearable></el-input> -->
                 <el-input-number
                     v-model="tableStore.table.params.alertThreshold"
                     :min="0"
@@ -52,7 +71,7 @@
                     step-strictly
                     @change="changeAlarm"
                 />
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="搜索">
           <el-input
               v-model="tableStore.table.params.searchValue"
@@ -75,6 +94,8 @@
     <alarmList ref="alarmListRef" @onSubmit="tableStore.index()" />
     <!-- 详情 -->
     <detail ref="detailRef" />
+    <!-- 异常数据详情 -->
+    <abnormal ref="abnormalRef" />
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -86,10 +107,13 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { useDictData } from '@/stores/dictData'
 import alarmList from './form/alarmList.vue'
 import detail from './form/detail.vue'
+import abnormal from './form/abnormal.vue'
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const dictData = useDictData()
 import { useRouter } from 'vue-router'
-
+defineOptions({
+    name: 'supervision/electricitymanagement'
+})
 const router = useRouter() // 路由对象
 //字典获取超标指标
 const exceeded = dictData.getBasicData('Steady_Statis')
@@ -97,8 +121,10 @@ const tableRef = ref()
 const industry = dictData.getBasicData('Business_Type')
 const TableHeaderRef = ref()
 const alarmListRef = ref()
+const abnormalRef = ref()
 const flagTime = ref(false)
 const detailRef = ref()
+const time: any = ref([])
 const list: any = ref({
     deptId: '',
     searchBeginTime: '',
@@ -115,7 +141,7 @@ const tableStore = new TableStore({
     filename: '在线监测',
     // isWebPaging:true,
     column: [
-        { title: '', type: 'checkbox', width: 40 },
+        { type: 'checkbox', width: 40 },
         {
             title: '序号',
 
@@ -176,12 +202,16 @@ const tableStore = new TableStore({
                         return row.targetType == 0
                     },
                     click: row => {
+                        if (row.dataType == 2) {
+                            abnormalRef.value.open(row, time.value)
+                        } else {
                             detailRef.value.open({
                                 text: '详情',
                                 row: row,
                                 list: list.value
                             })
                         }
+                    }
                 },
                 {
                     name: 'productSetting',
@@ -285,6 +315,7 @@ const tableStore = new TableStore({
         }
     ],
     beforeSearchFun: () => {
+        time.value = [tableStore.table.params.startTime, tableStore.table.params.endTime]
         tableStore.table.params.currentPage = tableStore.table.params.pageNum
         list.value.deptId = tableStore.table.params.deptId
 
@@ -297,6 +328,9 @@ const tableStore = new TableStore({
         list.value.alarmThreshold = tableStore.table.params.alarmThreshold
         flag.value = level.value
         flagTime.value = tableStore.table.params.dataType == 0 ? true : false
+        if (tableStore.table.params.dataType != 1) {
+            delete tableStore.table.params.targetList
+        }
     },
     loadCallback: () => {
         // tableStore.table.data = [
@@ -319,8 +353,9 @@ const tableStore = new TableStore({
         // ]
     }
 })
-tableStore.table.params.alertThreshold = 5
+tableStore.table.params.alertThreshold = 1
-tableStore.table.params.alarmThreshold = 5
+tableStore.table.params.alarmThreshold = 1
+tableStore.table.params.searchValue = ''
 tableStore.table.params.targetList = exceeded.filter(item => item.code == 'Total_Indicator')[0].id
     ? [exceeded.filter(item => item.code == 'Total_Indicator')[0].id]
     : []
@@ -329,7 +364,7 @@ tableStore.table.params.dataType = '1'
 tableStore.table.params.deptId = dictData.state.area[0].id
 provide('tableStore', tableStore)
 onMounted(() => {
-    // TableHeaderRef.value.setDatePicker([{label: '月', value: 3}])
+    TableHeaderRef.value.setDatePicker([{ label: '月', value: 3 }])
 
     tableStore.index()
     setTimeout(() => {
@@ -337,6 +372,13 @@ onMounted(() => {
     }, 10)
 })
 
+const changeDataType = e => {
+    if (e == 1) {
+        tableStore.table.params.targetList = exceeded.filter(item => item.code == 'Total_Indicator')[0].id
+            ? [exceeded.filter(item => item.code == 'Total_Indicator')[0].id]
+            : []
+    }
+}
 const changeAlert = e => {
     if (e == null) {
         tableStore.table.params.alertThreshold = 5
@@ -357,19 +399,33 @@ const changeAlarm = e => {
         }
     }
 }
+let flagList = exceeded.filter(item => item.name == '谐波电压' || item.name == '谐波电流').map(item => item.id)
 // 发起预警单
 const launch = (title: string) => {
+    console.log('🚀 ~ flagList:', flagList)
+
     if (tableStore.table.selection.length == 0) {
         ElMessage.warning('请选择一条数据')
         return
     }
+    let flag = false
+    tableStore.table.selection.forEach(item => {
+        if (!flagList.includes(item.targetType)) {
+            flag = true
+        }
+    })
+    if (flag) {
+        ElMessage.warning('目前只支持谐波电压/谐波电流下发预告警单')
+        return
+    }
+
+    console.log('🚀 ~ launch ~ list.value:', tableStore.table.selection)
 
     alarmListRef.value.open({
         text: title,
         form: list.value,
         row: tableStore.table.selection
     })
-    console.log('🚀 ~ launch ~ list.value:', list.value)
 }
 const changeArea = e => {
     level.value = e.data.level

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

@@ -44,10 +44,10 @@
                     {{ list.takeStep }}
                 </el-descriptions-item>
                 <el-descriptions-item :span="2" label="处理成效报告">
-                    <el-icon class="elView " v-if="list?.reportName">
+                    <el-icon class="elView " v-if="list?.reportName && VITE_FLAG">
-                        <View @click="openFile(list?.reportName)" />
+                        <View @click="openFile(list?.reportPath)" />
                     </el-icon>
-                    <a :href="list.reportPath" target="_blank">{{ list.reportName }}</a>
+                    <a class="aLoad" @click="download(list.keyName)" target="_blank">{{ list.reportName }}</a>
                 </el-descriptions-item>
 
 
@@ -61,16 +61,19 @@ import { ref, reactive } from 'vue'
 import { View } from '@element-plus/icons-vue'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { useDictData } from '@/stores/dictData'
+import {download} from '@/utils/fileDownLoad'
 const dialogVisible = ref(false)
 const title = ref('')
 const list: any = ref({})
 const dictData = useDictData()
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const open = (row: any) => {
     list.value = {}
     title.value = row.title
     dialogVisible.value = true
     list.value = JSON.parse(JSON.stringify(row.row))
     getFileNameAndFilePath({ filePath: row.row.reportPath }).then(res => {
+        list.value.keyName = res.data.name
         list.value.reportPath = res.data.url
         list.value.reportName = res.data.fileName
     })

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

@@ -1,13 +1,13 @@
 <template>
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
-            <el-tab-pane label="在线监测问题" name="1" v-if="tabList.includes('1')">
+            <el-tab-pane  :label="VITE_FLAG ? '在线监测评估' : '在线监测问题'"   name="1" v-if="tabList.includes('1')">
                 <online v-if="activeName == '1'" />
             </el-tab-pane>
             <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" v-if="tabList.includes('3')">
+            <el-tab-pane :label="VITE_FLAG ? '现场测试' : '计划实施问题'"  name="3" v-if="tabList.includes('3')">
                 <testQuestions v-if="activeName == '3'" />
             </el-tab-pane>
             <el-tab-pane label="试运行评估" name="4" v-if="tabList.includes('4')">
@@ -33,9 +33,10 @@ 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'
+    name: 'supervision/electricitymanagement1'
 })
 const tabList = ref(['1', '2', '3', '4'])
 const activeName = ref('1')

src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue

@@ -1,7 +1,14 @@
 <template>
     <el-dialog draggable :title="title" v-model="planAddition" width="500px" :before-close="cancelFn">
-        <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" scroll-to-error
+        <el-form
-            :validate-on-rule-change="false" class="form-one">
+            :model="form"
+            ref="formRef"
+            :rules="rules"
+            label-width="auto"
+            scroll-to-error
+            :validate-on-rule-change="false"
+            class="form-one"
+        >
             <el-form-item for="-" label="计划负责单位:">
                 <Area v-model="form.deptId" @change="changeArea" />
             </el-form-item>
@@ -10,20 +17,34 @@
             </el-form-item>
             <el-form-item label="监督类型:" prop="supvType">
                 <el-select v-model="form.supvType" placeholder="请选择监督类型" style="width: 100%" @change="++key">
-                    <el-option v-for="item in supvTypeOptionList" :key="item.id" :label="item.name"
+                    <el-option
-                        :value="item.id"></el-option>
+                        v-for="item in supvTypeOptionList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="监督对象名称:" prop="supvObjectName">
                 <el-input v-model="form.supvObjectName" placeholder="请输入监督对象名称"></el-input>
             </el-form-item>
             <el-form-item for="-" label="计划开始时间:" prop="planStartTime">
-                <el-date-picker v-model="form.planStartTime" type="date" placeholder="选择计划开始时间"
+                <el-date-picker
-                    value-format="YYYY-MM-DD" :disabled-date="disableStartDate"></el-date-picker>
+                    v-model="form.planStartTime"
+                    type="date"
+                    placeholder="选择计划开始时间"
+                    value-format="YYYY-MM-DD"
+                    :disabled-date="disableStartDate"
+                ></el-date-picker>
             </el-form-item>
             <el-form-item for="-" label="计划结束时间:" prop="planEndTime">
-                <el-date-picker v-model="form.planEndTime" type="date" placeholder="选择计划结束时间"
+                <el-date-picker
-                    :disabled-date="disableEndDate" value-format="YYYY-MM-DD"></el-date-picker>
+                    v-model="form.planEndTime"
+                    type="date"
+                    placeholder="选择计划结束时间"
+                    :disabled-date="disableEndDate"
+                    value-format="YYYY-MM-DD"
+                ></el-date-picker>
             </el-form-item>
             <!-- <el-form-item for="-" label="实际完成时间:" prop="planComplateTime">
                 <el-date-picker
@@ -43,10 +64,23 @@
                     <el-radio :value="1">否</el-radio>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item :key="key" label="关联电站:" v-if="form.customSubstationFlag == 0" :prop="dynamicProp"
+            <el-form-item
-                style="display: flex; align-items: center">
+                :key="key"
-                <el-cascader v-model="form.substation" :options="treeData" :props="defaultProps" clearable filterable
+                label="关联电站:"
-                    collapse-tags collapse-tags-tooltip placeholder="请选择关联电站" />
+                v-if="form.customSubstationFlag == 0"
+                :prop="dynamicProp"
+                style="display: flex; align-items: center"
+            >
+                <el-cascader
+                    v-model="form.substation"
+                    :options="treeData"
+                    :props="defaultProps"
+                    clearable
+                    filterable
+                    collapse-tags
+                    collapse-tags-tooltip
+                    placeholder="请选择关联电站"
+                />
                 <!-- <el-tree-select
                     accordion
                     ref="treeRef"
@@ -63,7 +97,13 @@
                 /> -->
             </el-form-item>
 
-            <el-form-item for="-" label="关联电站:" :key="key" v-if="form.customSubstationFlag == 1" :prop="dynamicProp">
+            <el-form-item
+                for="-"
+                label="关联电站:"
+                :key="key"
+                v-if="form.customSubstationFlag == 1"
+                :prop="dynamicProp"
+            >
                 <el-input v-model="form.substation" placeholder="名称格式：220kV某某电站"></el-input>
             </el-form-item>
             <!-- <el-form :model="form" label-width="auto"> -->
@@ -124,7 +164,7 @@ import Area from '@/components/form/area/index.vue'
 import { ElMessage, UploadProps } from 'element-plus'
 
 import { useDictData } from '@/stores/dictData'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const emit = defineEmits(['onsubmit'])
 const loading = ref(false)
 const dictData = useDictData()
@@ -213,6 +253,7 @@ const treeData = ref()
 const loadData = () => {
     initDetpStataionTree({ orgId: dictData.state.area[0].id }).then(res => {
         treeList.value = res.data
+
         initDetpStataionTree({ orgId: 'a3069759b0b6072c99cf9a7af6c162e9' }).then(res => {
             treeListCgy.value = res.data
             setTimeout(() => {
@@ -242,11 +283,15 @@ const submitFn = async (flag: boolean) => {
         }
         addForm.saveOrCheckflag = '1'
 
-      await  addSurveyPlan(addForm).then(res => {
+        await addSurveyPlan(addForm)
+            .then(res => {
                 cancelFn()
                 ElMessage.success('保存成功！')
                 emit('onsubmit')
-        }).catch(() => {  loading.value = false})
+            })
+            .catch(() => {
+                loading.value = false
+            })
     } else {
         formRef.value.validate(async (valid: any) => {
             if (valid) {
@@ -257,17 +302,25 @@ const submitFn = async (flag: boolean) => {
                 }
                 addForm.saveOrCheckflag = '2'
                 if (title.value == '计划新增') {
-                    await addSurveyPlan(addForm).then(res => {
+                    await addSurveyPlan(addForm)
+                        .then(res => {
                             cancelFn()
                             ElMessage.success('计划新增成功！')
                             emit('onsubmit')
-                    }).catch(() => {  loading.value = false})
+                        })
+                        .catch(() => {
+                            loading.value = false
+                        })
                 } else {
-                    await  updateSurveyPlan(addForm).then(res => {
+                    await updateSurveyPlan(addForm)
+                        .then(res => {
                             cancelFn()
                             ElMessage.success('重新发起成功！')
                             emit('onsubmit')
-                    }).catch(() => {  loading.value = false})
+                        })
+                        .catch(() => {
+                            loading.value = false
+                        })
                 }
             }
         })
@@ -279,7 +332,7 @@ const submitFn = async (flag: boolean) => {
 // 修改关联电站
 const changeArea = () => {
     let list: any = []
-
+    if (VITE_FLAG) {
         treeList.value.forEach((item: any) => {
             if (item.id == form.value.deptId) {
                 list.push(item)
@@ -293,6 +346,16 @@ const changeArea = () => {
                 }
             }
         })
+    } else {
+        treeList.value.forEach((item: any) => {
+            if (item.id == form.value.deptId) {
+                list.push(item)
+            } else {
+                list.push(item.children.filter((v: any) => v.id == form.value.deptId)[0])
+            }
+        })
+    }
+
     treeData.value = list
 }
 const audit = (filePath: any) => {
@@ -332,4 +395,5 @@ defineExpose({ open })
 <style lang="scss" scoped>
 // :deep(.el-upload-list__item-info) {
 //     width: 250px;
-// }</style>
+// }
+</style>

src/views/pqs/supervise/harmonicSurvey/components/planManage.vue

@@ -25,8 +25,8 @@
         <template #operation>
             <el-button icon="el-icon-Plus" type="primary" @click="add">新增计划</el-button>
             <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-            <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 icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
+            <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button> -->
         </template>
     </TableHeader>
     <Table ref="tableRef" :checkbox-config="checkboxConfig" />

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

@@ -21,12 +21,12 @@
             </el-descriptions-item>
             <el-descriptions-item label="文件">
                 <div v-for="(item, index) in aList">
-                    <el-icon class="elView" v-if="item?.fileName">
+                    <el-icon class="elView" v-if="item?.fileName && VITE_FLAG">
                         <View @click="openFile(item?.fileName)" />
                     </el-icon>
-                    <a :href="item.url">
+                    <span class="aLoad" @click="download(item.keyName)">
                         {{ item.fileName }}
-                    </a>
+                   </span >
                 </div>
             </el-descriptions-item>
         </el-descriptions>
@@ -61,6 +61,9 @@ import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { useDictData } from '@/stores/dictData'
 import { Link, View } from '@element-plus/icons-vue'
+import{ download} from '@/utils/fileDownLoad'
+import { util } from 'echarts'
+import { it } from 'node:test'
 const { query } = useRoute() // 查询参数
 const openFile = (name: any) => {
     window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
@@ -74,7 +77,7 @@ const detailData: any = ref({}) // 详情数据
 const levelList = dictData.getBasicData('Dev_Voltage_Stand')
 const aList: any = ref([]) // 详情数据
 const queryId = query.id // 从 URL 传递过来的 id 编号
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 /** 获得数据 */
 const getInfo = async () => {
     detailLoading.value = true
@@ -86,6 +89,7 @@ const getInfo = async () => {
 
             arr.slice(0, -1).forEach((item: any) => {
                 getFileNameAndFilePath({ filePath: item }).then((res: any) => {
+                    res.data.keyName = res.data.name
                     aList.value.push(res.data)
                 })
             })

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

@@ -1,7 +1,7 @@
 <template>
     <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')">
+            <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="VITE_FLAG ? '工作计划实施' : '技术监督测试管理'"   name="2" v-if="tabList.includes('2')">

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

@@ -56,30 +56,30 @@
 
 
             <el-descriptions-item :span="2" label="技术监督报告">
-                <el-icon class="elView" v-if="detailData?.supervisionReportName">
+                <el-icon class="elView" v-if="detailData?.supervisionReportName && VITE_FLAG">
                     <View @click="openFile(detailData?.supervisionReportName)" />
                 </el-icon>
-                <a :href="detailData.supervisionReport" target="_blank">{{ detailData.supervisionReportName }}</a>
+               <span  class="aLoad" @click="download(detailData.keyName)" target="_blank">{{ detailData.supervisionReportName }}</span >
             </el-descriptions-item>
             <el-descriptions-item :span="2" label="测试报告">
-                <el-icon class="elView" v-if="detailData?.testReportName">
+                <el-icon class="elView" v-if="detailData?.testReportName && VITE_FLAG">
                     <View @click="openFile(detailData?.testReportName)" />
                 </el-icon>
-                <a :href="detailData.testReport" target="_blank">{{ detailData.testReportName }}</a>
+               <span  class="aLoad" @click="download(detailData.keyName)" target="_blank">{{ detailData.testReportName }}</span >
             </el-descriptions-item>
             <el-descriptions-item :span="2" label="其他报告">
                 <div v-for="item in detailData.otherReports">
-                    <el-icon class="elView">
+                    <el-icon class="elView" v-if="item.fileName && VITE_FLAG">
                         <View @click="openFile(item.fileName)" />
                     </el-icon>
-                    <a :href="item.url" target="_blank">{{ item.fileName }}</a>
+                   <span  class="aLoad" @click="download(item.keyName)" target="_blank">{{ item.fileName }}</span >
                 </div>
             </el-descriptions-item>
             <el-descriptions-item :span="2" label="处理成效报告" v-if="props.flag">
-                <el-icon class="elView " v-if="detailData?.reportName">
+                <el-icon class="elView " v-if="detailData?.reportName && VITE_FLAG">
                     <View @click="openFile(detailData?.reportName)" />
                 </el-icon>
-                <a :href="detailData.reportPath" target="_blank">{{ detailData.reportName }}</a>
+               <span  class="aLoad" @click="download(detailData.keyName)" target="_blank">{{ detailData.reportName }}</span >
             </el-descriptions-item>
             <!-- <el-descriptions-item label="流程状态" >
                 <el-tag :type="getDeviceStatusType(detailData?.status)">
@@ -100,9 +100,12 @@ import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { getTestById } from '@/api/supervision-boot/survey/test'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { Link, View } from '@element-plus/icons-vue'
+import {download} from '@/utils/fileDownLoad'
 const openFile = (name: any) => {
     window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
+
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const { query } = useRoute() // 查询参数
 const props = defineProps({
     id: propTypes.string.def(undefined),
@@ -128,6 +131,7 @@ const getInfo = async () => {
 const getFileData = async () => {
     detailData.value.otherReports = []
     await getFileNameAndFilePath({ filePath: detailData.value.testReport }).then(res => {
+        detailData.value.keyName = res.data.name
         detailData.value.testReport = res.data.url
         detailData.value.testReportName = res.data.fileName
     })
@@ -137,17 +141,20 @@ const getFileData = async () => {
             await getFileNameAndFilePath({
                 filePath: '/supervision/' + detailData.value.otherReport.split(',')[i]
             }).then(res => {
+                res.data.keyName = res.data.name
                 detailData.value.otherReports.push(res.data)
             })
         }
     }
 
     await getFileNameAndFilePath({ filePath: detailData.value.supervisionReport }).then(res => {
+        detailData.value.keyName = res.data.name
         detailData.value.supervisionReport = res.data.url
         detailData.value.supervisionReportName = res.data.fileName
     })
     if (props.flag) {
         getFileNameAndFilePath({ filePath: detailData.value.reportPath }).then(res => {
+            detailData.value.keyName = res.data.name
             detailData.value.reportPath = res.data.url
             detailData.value.reportName = res.data.fileName
         })