diff --git a/src/api/device-boot/panorama.ts b/src/api/device-boot/panorama.ts
index e02c1530..2ec497ef 100644
--- a/src/api/device-boot/panorama.ts
+++ b/src/api/device-boot/panorama.ts
@@ -165,3 +165,12 @@ export function getSupervisionDetailsData(data: any) {
 export function getSupervisionCityDetailsData(data: any) {
     return request({ url: '/supervision-boot/gridDiagram/getSupervisionCityDetailsData', method: 'post', data })
 }
+
+//区域污染值统计
+export function getAreaPollution(data: any) {
+    return request({ url: '/harmonic-boot/PollutionSubstation/getAreaPollution', method: 'post', data })
+} 
+//场站级评估
+export function downPollutionSubCalc(data: any) {
+    return request({ url: 'harmonic-boot/PollutionSubstation/downPollutionSubCalc', method: 'post', data })
+} 
\ No newline at end of file
diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
index f735a94a..721616e0 100644
--- a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
+++ b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
@@ -301,7 +301,7 @@ const options1 = [
 const height = mainHeight(20)
 const heightB = mainHeight(448)
 const heightA = mainHeight(180)
-const size = ref(0)
+const size = ref(23)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})
@@ -493,35 +493,35 @@ const tableStore = new TableStore({
             {
                 label: '0%~10%',
                 quantity: res.minsNum0,
-                percentage: res.proportion0.toFixed(2)  + '%',
+                percentage: res.proportion0.toFixed(2) + '%',
                 crossTheLine: res.isOrNot0,
                 value: '0%~10%'
             },
             {
                 label: '10%~20%',
                 quantity: res.minsNum1,
-                percentage: res.proportion1.toFixed(2)  + '%',
+                percentage: res.proportion1.toFixed(2) + '%',
                 crossTheLine: res.isOrNot1,
                 value: '10%~10%'
             },
             {
                 label: '20%~30%',
                 quantity: res.minsNum2,
-                percentage: res.proportion2.toFixed(2)  + '%',
+                percentage: res.proportion2.toFixed(2) + '%',
                 crossTheLine: res.isOrNot2,
                 value: '10%~30%'
             },
             {
                 label: '30%~40%',
                 quantity: res.minsNum3,
-                percentage: res.proportion3.toFixed(2)  + '%',
+                percentage: res.proportion3.toFixed(2) + '%',
                 crossTheLine: res.isOrNot3,
                 value: '30%~40%'
             },
             {
                 label: '40%~50%',
                 quantity: res.minsNum4,
-                percentage: res.proportion4.toFixed(2)  + '%',
+                percentage: res.proportion4.toFixed(2) + '%',
                 crossTheLine: res.isOrNot4,
                 value: '40%~50%'
             }
@@ -530,35 +530,35 @@ const tableStore = new TableStore({
             {
                 label: '50%~60%',
                 quantity: res.minsNum5,
-                percentage: res.proportion5.toFixed(2)  + '%',
+                percentage: res.proportion5.toFixed(2) + '%',
                 crossTheLine: res.isOrNot5,
                 value: '50%~60%'
             },
             {
                 label: '60%~70%',
                 quantity: res.minsNum6,
-                percentage: res.proportion6.toFixed(2)  + '%',
+                percentage: res.proportion6.toFixed(2) + '%',
                 crossTheLine: res.isOrNot6,
                 value: '60%~70%'
             },
             {
                 label: '70%~80%',
                 quantity: res.minsNum7,
-                percentage: res.proportion7.toFixed(2)  + '%',
+                percentage: res.proportion7.toFixed(2) + '%',
                 crossTheLine: res.isOrNot7,
                 value: '70%~80%'
             },
             {
                 label: '80%~90%',
                 quantity: res.minsNum8,
-                percentage: res.proportion8.toFixed(2)  + '%',
+                percentage: res.proportion8.toFixed(2) + '%',
                 crossTheLine: res.isOrNot8,
                 value: '80%~90%'
             },
             {
                 label: '90%~100%',
                 quantity: res.minsNum9,
-                percentage: res.proportion9.toFixed(2)  + '%',
+                percentage: res.proportion9.toFixed(2) + '%',
                 crossTheLine: res.isOrNot9,
                 value: '90%~100%'
             }
@@ -589,7 +589,7 @@ const tableStore = new TableStore({
                             lineHeight: 8,
                             minMargin: 10,
                             formatter: function (e) {
-                                return '{name|' + e.name + '}{percent|' + e.data.percentage+ '}'
+                                return '{name|' + e.name + '}{percent|' + e.data.percentage + '}'
                             },
                             rich: {
                                 name: {
diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/test.vue b/src/views/LN/newEnergy/newEnergyAnalysis/test.vue
index a3958eae..a0aaa0b2 100644
--- a/src/views/LN/newEnergy/newEnergyAnalysis/test.vue
+++ b/src/views/LN/newEnergy/newEnergyAnalysis/test.vue
@@ -27,7 +27,7 @@
                                 </div>
                             </div>
                         </template>
-                  
+
                         <el-card class="card-top mt5">
                             <div
                                 v-for="(item, index) in powerList1"
@@ -321,7 +321,7 @@ const options1 = [
 ]
 const height = mainHeight(20)
 const heightB = mainHeight(445)
-const size = ref(0)
+const size = ref(23)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})
diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
index ec24cd65..2e638082 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
@@ -205,7 +205,7 @@ const props = defineProps(['rowList'])
 const harmonic = harmonicOptions.filter(item => item.value < 26)
 const currentLod = ref(false)
 const monitoringPoint = useMonitoringPoint()
-const size = ref(0)
+const size = ref(23)
 const dictData = useDictData()
 const datePickerRef = ref()
 const height = mainHeight(80).height
diff --git a/src/views/pqs/business/terminal/deviceter/index.vue b/src/views/pqs/business/terminal/deviceter/index.vue
index cd951041..d171fb12 100644
--- a/src/views/pqs/business/terminal/deviceter/index.vue
+++ b/src/views/pqs/business/terminal/deviceter/index.vue
@@ -54,14 +54,17 @@
                             </el-button>
                         </el-form-item>
                         <el-form-item style="right: 500px; position: absolute; overflow: hidden">
-                           <LocationInformation style="width: 16px; margin-right: 8px; color: var(--el-color-primary)" />
-                            <span style="font-size: 16px; font-weight: bold; color: var(--el-color-primary)">当前操作节点：</span>
+                            <LocationInformation
+                                style="width: 16px; margin-right: 8px; color: var(--el-color-primary)"
+                            />
+                            <span style="font-size: 16px; font-weight: bold; color: var(--el-color-primary)">
+                                当前操作节点：
+                            </span>
                         </el-form-item>
                         <el-form-item style="right: 0; position: absolute; overflow: hidden">
                             <div class="title" :class="titleList.length > 5 ? 'titleScroll' : ''">
                                 <span v-for="(item, index) in titleList">{{ index == 0 ? '' : ' >　' }}{{ item }}</span>
                             </div>
-                           
                         </el-form-item>
                     </el-form>
                     <div id="scrollBox" :style="{ height: Height.height }" style="overflow-y: auto">
@@ -1691,7 +1694,7 @@ import { useDictData } from '@/stores/dictData'
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getYwZtSubstation } from '@/api/device-boot/device'
-const size = ref(0)
+const size = ref(23)
 const TerminalRef = ref()
 const pageHeight = mainHeight(20)
 const Height = mainHeight(100)
@@ -2024,12 +2027,12 @@ const latff: any = ref((rule: any, value: any, callback: any) => {
     }
 })
 const plevel = ref(0)
-const nodeDataList=ref()
-const nodeEventList=ref()
-const nodeLevel1=ref(0)
+const nodeDataList = ref()
+const nodeEventList = ref()
+const nodeLevel1 = ref(0)
 const nodeClick = (e: anyObj, data: any) => {
-   nodeDataList.value = data
-   nodeEventList.value = e
+    nodeDataList.value = data
+    nodeEventList.value = e
     plevel.value = data.data.plevel
     treeClickCount.value++
     if (treeClickCount.value > 2) return
@@ -2338,7 +2341,9 @@ const next = async () => {
                     break
                 case 600:
                     addLine()
-                     selectChanged(AddProjectBO.value.deviceParam[deviceIndex.value].subVoltageParam[busBarIndex.value].scale)
+                    selectChanged(
+                        AddProjectBO.value.deviceParam[deviceIndex.value].subVoltageParam[busBarIndex.value].scale
+                    )
                     nextfalg.value = false
                     break
                 case 700:
@@ -2355,8 +2360,7 @@ const black = () => {
     busBarIndex.value = '0'
     deviceIndex.value = '0'
     lineIndex.value = '0'
-    nodeClick(nodeEventList.value,nodeDataList.value)
-    
+    nodeClick(nodeEventList.value, nodeDataList.value)
 }
 // 确认提交
 const onsubmit = () => {
diff --git a/src/views/pqs/database/algorithm/index.vue b/src/views/pqs/database/algorithm/index.vue
index d211cf52..057da940 100644
--- a/src/views/pqs/database/algorithm/index.vue
+++ b/src/views/pqs/database/algorithm/index.vue
@@ -3,10 +3,15 @@
         <!-- 算法库 -->
         <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
             <pane :size="size">
-                <algorithmTree ref="treeRef" :default-expand-all="false"
+                <algorithmTree
+                    ref="treeRef"
+                    :default-expand-all="false"
                     :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
-                    :current-node-key="monitoringPoint.state.lineId" @node-click="handleNodeClick"
-                    @init="handleNodeClick" @onAddTree="onAddTree"></algorithmTree>
+                    :current-node-key="monitoringPoint.state.lineId"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                    @onAddTree="onAddTree"
+                ></algorithmTree>
             </pane>
             <pane style="background: #fff" :style="height">
                 <div class="boxTop">
@@ -16,9 +21,7 @@
                         </el-radio-group>
                     </div>
                     <div v-if="information">
-                        <el-button icon="el-icon-Plus" type="primary" @click="addUser">
-                            新增
-                        </el-button>
+                        <el-button icon="el-icon-Plus" type="primary" @click="addUser">新增</el-button>
                         <el-button icon="el-icon-Edit" type="primary" @click="revise">修改</el-button>
                         <el-button icon="el-icon-Delete" type="primary" @click="deletes">删除</el-button>
                     </div>
@@ -35,12 +38,12 @@
                                     row.period == 0
                                         ? '日'
                                         : row.period == 1
-                                            ? '月'
-                                            : row.period == 2
-                                                ? '季'
-                                                : row.period == 3
-                                                    ? '年'
-                                                    : ''
+                                        ? '月'
+                                        : row.period == 2
+                                        ? '季'
+                                        : row.period == 3
+                                        ? '年'
+                                        : ''
                                 }}
                             </template>
                         </vxe-column>
@@ -55,10 +58,8 @@
                         </vxe-column> -->
                         <vxe-column field="definition" title="定义">
                             <template #default="{ row }">
-
                                 <el-button type="primary" link @click="view(row)">查看</el-button>
                             </template>
-
                         </vxe-column>
                         <!-- <vxe-column title="操作" width="150px">
                             <template #default="{ row }">
@@ -78,19 +79,28 @@
         <!-- 树弹框 -->
         <addTree ref="addTreeRef" @getTree="treeRef.loadData(dotList.id)" />
         <!-- 弹框 -->
-        <PopupEdit ref="popupEditRef" v-if="popupEditFlag"
-            @getTree="treeRef.loadData(dotList.id), (popupEditFlag = false)" />
+        <PopupEdit
+            ref="popupEditRef"
+            v-if="popupEditFlag"
+            @getTree="treeRef.loadData(dotList.id), (popupEditFlag = false)"
+        />
         <!-- 定义 -->
         <el-dialog draggable v-model="viewFlag" title="定义" width="60%">
-            <div style="min-height: 300px; max-height: 55vh;">
+            <div style="min-height: 300px; max-height: 55vh">
                 <div class="editor" ref="editorRef" v-html="summary" />
-
             </div>
         </el-dialog>
         <!-- 删除 -->
         <el-dialog draggable v-model="dialogVisible" title="请选择需要删除的数据" width="400">
-            <el-tree-select v-model="TreeValue" :data="TreeData" filterable check-strictly :props="defaultProps"
-                default-expand-all :render-after-expand="false" />
+            <el-tree-select
+                v-model="TreeValue"
+                :data="TreeData"
+                filterable
+                check-strictly
+                :props="defaultProps"
+                default-expand-all
+                :render-after-expand="false"
+            />
             <template #footer>
                 <div class="dialog-footer">
                     <el-button @click="dialogVisible = false">取消</el-button>
@@ -115,8 +125,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { deleteyById } from '@/api/supervision-boot/database/index'
 import { queryAllAlgorithmLibrary, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
 import { useAdminInfo } from '@/stores/adminInfo'
-import katex from "katex";
-import "katex/dist/katex.css";
+import katex from 'katex'
+import 'katex/dist/katex.css'
 const adminInfo = useAdminInfo()
 defineOptions({
     name: 'database/algorithm'
@@ -124,7 +134,7 @@ defineOptions({
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
 const heightTab = mainHeight(82)
-const size = ref(0)
+const size = ref(23)
 const addTreeRef = ref()
 const editorRef = ref()
 const dialogVisible = ref(false)
@@ -213,31 +223,26 @@ onMounted(() => {
 })
 
 const view = (row: any) => {
-
     viewFlag.value = true
     summary.value = row.definition
     setTimeout(() => {
-
-        const spans = document.querySelectorAll('span[data-value]');
-        // 遍历每个 span 标签  
+        const spans = document.querySelectorAll('span[data-value]')
+        // 遍历每个 span 标签
         spans.forEach(function (span) {
-
             let val = katex.renderToString(span.getAttribute('data-value'), {
-                throwOnError: false,
+                throwOnError: false
             })
             // var newDiv = document.createElement('div');
             var newDiv = span
-            newDiv.innerHTML = val;
-
-            span.parentNode.replaceChild(newDiv, span);
-        });
+            newDiv.innerHTML = val
 
+            span.parentNode.replaceChild(newDiv, span)
+        })
     }, 100)
 
-    // 
+    //
 }
 
-
 const handleNodeClick = (data: any, node: any) => {
     if (data.pid != '0') {
         dotList.value = data
diff --git a/src/views/pqs/database/standard/index.vue b/src/views/pqs/database/standard/index.vue
index 5109cf8e..b7a4e249 100644
--- a/src/views/pqs/database/standard/index.vue
+++ b/src/views/pqs/database/standard/index.vue
@@ -63,7 +63,7 @@ defineOptions({
 const excelOptions = ref({})
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
-const size = ref(0)
+const size = ref(23)
 const treeRef = ref()
 const addTreeRef = ref()
 const url = ref('')
diff --git a/src/views/pqs/harmonicMonitoring/detailed/division/components/compute.vue b/src/views/pqs/harmonicMonitoring/detailed/division/components/compute.vue
index fac9e1d7..738ad0af 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/division/components/compute.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/division/components/compute.vue
@@ -194,7 +194,7 @@ const dotList: any = ref({})
 const height = mainHeight(20)
 const heightB = mainHeight(70)
 const harmonic = harmonicOptions.slice(1)
-const size = ref(0)
+const size = ref(23)
 const showTabs = ref(false)
 const loadDataOptions: any = ref([])
 const form: any = reactive({
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
index 2b9d6950..4b5433bc 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
@@ -45,7 +45,7 @@
                             <Shishishuju v-if="activeName == '7'" />
                         </el-tab-pane>
                         <el-tab-pane label="统计报表" name="8" lazy v-if="!isReload && VITE_FLAG">
-                            <StatisticalReport v-if="activeName == '8'"  />
+                            <StatisticalReport v-if="activeName == '8'" />
                         </el-tab-pane>
                     </el-tabs>
                     <!-- <div
@@ -83,7 +83,7 @@ defineOptions({
 
 const monitoringPoint = useMonitoringPoint()
 const pointTree = ref()
-const size = ref(0)
+const size = ref(23)
 const isReload = ref(false)
 const height = mainHeight(40)
 const activeName = ref('2')
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
index 3a533bd8..aa350159 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
@@ -1,46 +1,44 @@
 <template>
     <div class="" :style="height">
-
-                <TableHeader ref="TableHeaderRef" datePicker @selectChange="selectChange">
-                    <template v-slot:select>
-                        <el-form-item label="模板策略">
-                            <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
-                                <el-option
-                                    v-for="item in templatePolicy"
-                                    :key="item.id" 
-                                    :label="item.name"
-                                    :value="item"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="报表类型">
-                            <el-input readonly type="text" value="分析报表"></el-input>
-                            <!--                            <el-select-->
-                            <!--                                :disabled="true"-->
-                            <!--                                v-model="reportForm"-->
-                            <!--                                :popper-append-to-body="false"-->
-                            <!--                                placeholder="请选择报表类型"-->
-                            <!--                            >-->
-                            <!--                                <el-option-->
-                            <!--                                    v-for="item in reportFormList"-->
-                            <!--                                    :key="item.value"-->
-                            <!--                                    :label="item.label"-->
-                            <!--                                    :value="item.value"-->
-                            <!--                                ></el-option>-->
-                            <!--                            </el-select>-->
-                        </el-form-item>
-                    </template>
-                    <template #operation>
-                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
-                        <el-button icon="el-icon-Download" :loading="loading" @click="exportReport" type="primary">
-                            下载报告
-                        </el-button>
-                    </template>
-                </TableHeader>
-                <div class="box">
-                    <div id="luckysheet" :style="`height: calc(${tableStore.table.height} )`"></div>
-                </div>
-        
+        <TableHeader ref="TableHeaderRef" datePicker @selectChange="selectChange">
+            <template v-slot:select>
+                <el-form-item label="模板策略">
+                    <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
+                        <el-option
+                            v-for="item in templatePolicy"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="报表类型">
+                    <el-input readonly type="text" value="分析报表"></el-input>
+                    <!--                            <el-select-->
+                    <!--                                :disabled="true"-->
+                    <!--                                v-model="reportForm"-->
+                    <!--                                :popper-append-to-body="false"-->
+                    <!--                                placeholder="请选择报表类型"-->
+                    <!--                            >-->
+                    <!--                                <el-option-->
+                    <!--                                    v-for="item in reportFormList"-->
+                    <!--                                    :key="item.value"-->
+                    <!--                                    :label="item.label"-->
+                    <!--                                    :value="item.value"-->
+                    <!--                                ></el-option>-->
+                    <!--                            </el-select>-->
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
+                <el-button icon="el-icon-Download" :loading="loading" @click="exportReport" type="primary">
+                    下载报告
+                </el-button>
+            </template>
+        </TableHeader>
+        <div class="box">
+            <div id="luckysheet" :style="`height: calc(${tableStore.table.height} )`"></div>
+        </div>
     </div>
 </template>
 <script setup lang="ts">
@@ -63,7 +61,7 @@ defineOptions({
 const monitoringPoint = useMonitoringPoint()
 const showTree = ref(false)
 const height = mainHeight(20)
-const size = ref(0)
+const size = ref(23)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
@@ -79,7 +77,7 @@ const tableStore = new TableStore({
     publicHeight: 30,
     beforeSearchFun: () => {
         tableStore.table.params.tempId = Template.value.id
-        tableStore.table.params.lineId =monitoringPoint.state.lineId
+        tableStore.table.params.lineId = monitoringPoint.state.lineId
     },
     loadCallback: () => {
         tableStore.table.data.forEach((item: any) => {
@@ -135,13 +133,10 @@ const selectChange = () => {
     }
 }
 
-
-
 const exportEvent = () => {
     exportExcel(luckysheet.getAllSheets(), '统计报表下载')
 }
 const exportReport = () => {
-  
     loading.value = true
     let form = new FormData()
     form.append('isUrl', false)
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
index dfa18866..b2df2470 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
@@ -71,7 +71,7 @@ defineOptions({
 })
 const showTree = ref(false)
 const height = mainHeight(20)
-const size = ref(0)
+const size = ref(23)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
@@ -165,7 +165,6 @@ const exportEvent = () => {
     exportExcel(luckysheet.getAllSheets(), '统计报表下载')
 }
 const exportReport = () => {
-  
     loading.value = true
     let form = new FormData()
     form.append('isUrl', false)
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
index 3f401df3..cbb3c406 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
@@ -1,36 +1,58 @@
 <template>
-    <div class='default-main' :style='height'>
-        <splitpanes style='height: 100%' class='default-theme' id='navigation-splitpanes'>
-            <pane :size='size'>
-                <PointTree :default-expand-all='false' @node-click='handleNodeClick' @init='handleNodeClick'>
-                </PointTree>
+    <div class="default-main" :style="height">
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <PointTree
+                    :default-expand-all="false"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                ></PointTree>
             </pane>
-            <pane style='background: #fff' :style='height'>
-                <TableHeader ref='TableHeaderRef' datePicker :show-search='false'>
+            <pane style="background: #fff" :style="height">
+                <TableHeader ref="TableHeaderRef" datePicker :show-search="false">
                     <template v-slot:select>
-                        <el-form-item label='客户名称'>
-                            <el-input v-model='tableStore.table.params.crmName' maxlength='32' show-word-limit clearable
-                                      placeholder='请输入客户名称' />
+                        <el-form-item label="客户名称">
+                            <el-input
+                                v-model="tableStore.table.params.crmName"
+                                maxlength="32"
+                                show-word-limit
+                                clearable
+                                placeholder="请输入客户名称"
+                            />
                         </el-form-item>
-                        <el-form-item label='报表编号'>
-                            <el-input v-model='tableStore.table.params.reportNumber' clearable
-                                      placeholder='请输入报表编号' maxlength='12' show-word-limit />
+                        <el-form-item label="报表编号">
+                            <el-input
+                                v-model="tableStore.table.params.reportNumber"
+                                clearable
+                                placeholder="请输入报表编号"
+                                maxlength="12"
+                                show-word-limit
+                            />
                         </el-form-item>
                     </template>
                     <template #operation>
-                        <el-upload :show-file-list='false' ref='uploadRef' action='' accept='.png,.jpg'
-                                   :on-change='choose' :auto-upload='false'>
+                        <el-upload
+                            :show-file-list="false"
+                            ref="uploadRef"
+                            action=""
+                            accept=".png,.jpg"
+                            :on-change="choose"
+                            :auto-upload="false"
+                        >
                             <template #trigger>
-                                <el-button icon='el-icon-Upload' type='primary' class='mr10 ml10'>上传接线图</el-button>
+                                <el-button icon="el-icon-Upload" type="primary" class="mr10 ml10">上传接线图</el-button>
                             </template>
                         </el-upload>
-                        <el-button icon='el-icon-Download' type='primary' @click='exportEvent'>生成</el-button>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">生成</el-button>
                     </template>
                 </TableHeader>
-                <div class='box'>
-                    <div id='luckysheet'>
-                        <img width='100%' :style='`height: calc(${tableStore.table.height} + 40px)`'
-                             src='@/assets/img/jss.png' />
+                <div class="box">
+                    <div id="luckysheet">
+                        <img
+                            width="100%"
+                            :style="`height: calc(${tableStore.table.height} + 40px)`"
+                            src="@/assets/img/jss.png"
+                        />
                     </div>
                 </div>
             </pane>
@@ -38,7 +60,7 @@
     </div>
 </template>
 
-<script setup lang='ts'>
+<script setup lang="ts">
 import { onMounted, ref, provide } from 'vue'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
@@ -55,7 +77,7 @@ defineOptions({
     // name: 'harmonic-boot/report/word'
 })
 const height = mainHeight(20)
-const size = ref(0)
+const size = ref(23)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
@@ -66,24 +88,19 @@ const tableStore = new TableStore({
     url: '',
     method: 'POST',
     column: [],
-    beforeSearchFun: () => {
-    },
-    loadCallback: () => {
-    }
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
 })
 provide('tableStore', tableStore)
 
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
 
-
     if (dom) {
-
         size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
 })
 
-
 const handleNodeClick = (data: any, node: any) => {
     dotList.value = data
 }
@@ -117,12 +134,15 @@ const exportEvent = () => {
     form.append('file', uploadList.value?.raw || '')
     // 特殊字符正则表达式
     const specialCharRegex = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/
-    if (specialCharRegex.test(tableStore.table.params.crmName) || specialCharRegex.test(tableStore.table.params.reportNumber)) {
+    if (
+        specialCharRegex.test(tableStore.table.params.crmName) ||
+        specialCharRegex.test(tableStore.table.params.reportNumber)
+    ) {
         ElNotification({
             type: 'error',
             message: '包含特殊字符，请注意修改!'
         })
-    }else{
+    } else {
         ElMessage('生成报告中...')
         exportModel(form).then((res: any) => {
             let blob = new Blob([res], {
@@ -138,10 +158,9 @@ const exportEvent = () => {
             document.body.removeChild(link)
         })
     }
-
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 .splitpanes.default-theme .splitpanes__pane {
     background: #eaeef1;
 }
diff --git a/src/views/pqs/panorama/components/mapR.vue b/src/views/pqs/panorama/components/mapR.vue
index 8aa30d99..82f3614b 100644
--- a/src/views/pqs/panorama/components/mapR.vue
+++ b/src/views/pqs/panorama/components/mapR.vue
@@ -6,20 +6,21 @@
                 <div class="title">
                     <span>
                         稳态综合评估
-                        <el-popover placement="right" :width="150" trigger="hover">
+                        <el-popover placement="right" :width="190" trigger="hover">
                             <template #reference>
                                 <WarningFilled class="WarningFilled" />
                             </template>
+                           
                             <div class="text">
-                                <span style="color: #00b07d">优质：(4.5 , 5]</span>
+                                <span style="color: #00B07D">无污染：0</span>
                                 <br />
-                                <span style="color: #2b7fd3">良好：(4 , 4.5]</span>
+                                <span style="color: #3399ff">轻微污染：(0 , 100]</span>
                                 <br />
-                                <span style="color: #ffcc33">合格：(3 , 4]</span>
+                                <span style="color: #ffcc33">轻度污染：(100 , 1000]</span>
                                 <br />
-                                <span style="color: #97017e">较差：(2 , 3]</span>
+                                <span style="color: #ff9900">中度污染：(1000 , 10000]</span>
                                 <br />
-                                <span style="color: #A52a2a">极差：[1 , 2]</span>
+                                <span style="color: #A52a2a">重度污染：(10000</span>
                             </div>
                         </el-popover>
                     </span>
@@ -53,7 +54,6 @@
                         }"
                     >
                         {{ assessList.score == 3.14159 ? '/' : assessList.score }}
-                        <!-- {{ assessList.level }} -->
                     </span>
                 </div>
                 <div class="evaluate">
diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue
index 0d21a865..38e0c9c1 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue
@@ -13,8 +13,10 @@
                     <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.3' : ''">
                         <div class="card">
                             <span style="cursor: pointer" @click="GridDiagram(i)">{{ item.title }}：</span>
-                            <span :style="`color: ${item.color[0]}; cursor:pointer`"
-                                @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)">
+                            <span
+                                :style="`color: ${item.color[0]}; cursor:pointer`"
+                                @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)"
+                            >
                                 {{ item.list[4].numOne }}
                             </span>
                         </div>
@@ -23,8 +25,10 @@
                 <!-- 监测规模 列表 -->
                 <div>
                     <div class="vcl mt5">
-                        <p v-for="(item, i) in vList"
-                            :style="i == 0 ? 'width: 60px' : i == 5 ? 'width: 32px' : 'flex:1'">
+                        <p
+                            v-for="(item, i) in vList"
+                            :style="i == 0 ? 'width: 60px' : i == 5 ? 'width: 32px' : 'flex:1'"
+                        >
                             {{ item }}
                         </p>
                     </div>
@@ -67,17 +71,20 @@
                 </div>
                 <div :style="`height:calc(${boxHeight.height} + 20px);overflow-y: auto;`">
                     <div v-for="item in countList">
-                        <div class="title mt5" style="font-weight: 500">
+                        <!-- <div class="title mt5" style="font-weight: 500">
                             <img src="@/assets/img/TJ.png" />
                             {{ item.title }}
-                        </div>
-                        <div class="card-Box" :style="`height:calc((${boxHeight.height} - 50px )/ 3);`"
-                            v-for="val in item.children">
+                        </div> -->
+                        <div
+                            class="card-Box mt10"
+                            :style="`height:calc((${boxHeight.height} - 20px )/ 2);`"
+                            v-for="val in item.children"
+                        >
                             <div>
                                 <span class="line"></span>
                                 <span class="vol">{{ val.title }}</span>
                             </div>
-                            <div class="num">
+                            <div class="num num1">
                                 <div @click="LookMap(val.numList, [], 0)">
                                     投运:
                                     <span>{{ val.num }}</span>
@@ -90,6 +97,10 @@
                                     数据完整性:
                                     <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
                                 </div>
+                                <div>
+                                    在线率:
+                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -119,7 +130,7 @@
                             </div>
                             <div>
                                 {{ item.title[2] }}:
-                                <span style="color: #A52a2a" @click="LookMap([], item.lineListTwo, 1)">
+                                <span style="color: #a52a2a" @click="LookMap([], item.lineListTwo, 1)">
                                     {{ item.lineNumTwo || 0 }}
                                 </span>
                             </div>
@@ -129,8 +140,12 @@
             </div>
         </div>
 
-        <img class="imgL" :style="show ? 'transform: rotate(0deg);' : 'transform: rotate(180deg);'"
-            @click="show = !show" src="@/assets/img/QH.png" />
+        <img
+            class="imgL"
+            :style="show ? 'transform: rotate(0deg);' : 'transform: rotate(180deg);'"
+            @click="show = !show"
+            src="@/assets/img/QH.png"
+        />
 
         <!-- 变电站详情 -->
         <stand ref="standRef" />
@@ -286,11 +301,11 @@ const countList: any = ref([
             },
             { title: '非电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }
         ]
-    },
-    {
-        title: '上送网公司',
-        children: [{ title: '电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }]
     }
+    // {
+    //     title: '上送网公司',
+    //     children: [{ title: '电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }]
+    // }
 ])
 const linList: any = ref([
     {
@@ -307,7 +322,7 @@ const linList: any = ref([
         title: ['电能质量指标', '未超标', '超标']
     }
 ])
-const vList = ['', '500kV', '220kV', '110kV', '35kV',]
+const vList = ['', '500kV', '220kV', '110kV', '35kV']
 const formRow: any = ref({})
 const height = mainHeight(30)
 const boxHeight = mainHeight(290, 2)
@@ -368,7 +383,7 @@ const info = async (row: any) => {
     getGridDiagramStatistics(form).then(res => {
         countList.value[0].children[0] = { title: '电网侧监测点', ...res.data.data[0] }
         countList.value[0].children[1] = { title: '非电网侧监测点', ...res.data.data[1] }
-        countList.value[1].children[0] = { title: '电网侧监测点', ...res.data.gwData[0] }
+        // countList.value[1].children[0] = { title: '电网侧监测点', ...res.data.gwData[0] }
     })
     // 监测运行统计
     getGridDiagramRunData(form).then(res => {
@@ -392,7 +407,7 @@ const LookMap = (coutList: object, alarmList: object, key?: any) => {
 const GridDiagram = (k: any) => {
     emit('GridDiagram', k, 3)
 }
-onMounted(() => { })
+onMounted(() => {})
 defineExpose({ info, show })
 </script>
 
@@ -536,6 +551,18 @@ defineExpose({ info, show })
             font-weight: 550;
         }
     }
+    .num1 {
+        grid-template-columns: 1fr 1fr;
+        grid-template-rows: auto auto;
+        gap: 8px;
+        div {
+            display: flex;
+            padding-left: 20px;
+            span {
+                margin-left: 5px;
+            }
+        }
+    }
 }
 
 .BoxA {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
index b797377b..da54aa85 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
@@ -1,137 +1,54 @@
 <template>
     <!-- 综合评估详情 -->
-    <el-dialog draggable title="综合评估统计" v-model="dialogVisible" width="1400px">
-        <div>
-            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="300px" :data="tableData">
-                <vxe-column field="deptName" title="地市" />
-                <vxe-column field="assessLevel" title="综合评估结论">
-                    <template #default="scope">
-                        <!-- class="conclusion"
-                            :class="
-                                scope.row.assessLevel == '特质'
-                                    ? 'background1'
-                                    : scope.row.assessLevel == '较差'
-                                    ? 'background2'
-                                    : scope.row.assessLevel == '极差'
-                                    ? 'background3'
-                                    : ''
-                            " -->
-                        <span>
-                            {{ scope.row.assessData }}
-                        </span>
-                    </template>
-                </vxe-column>
-                <vxe-column field="qualifyData" title="指标合格率(%)" />
-
-                <!-- <vxe-colgroup title="评估结论">
-                    <vxe-column field="vdevAssessLevel" title="电压偏差">
+    <el-dialog draggable title="区域污染值统计" v-model="dialogVisible" width="1400px">
+        <div style="display: flex">
+            <div style="width: 400px">
+                <vxe-table
+                    v-bind="defaultAttribute"
+                    ref="tableRef"
+                    @current-change="currentChangeEvent"
+                    height="240px"
+                    :row-config="{ isCurrent: true, isHover: true }"
+                    :data="tableData"
+                >
+                    <vxe-column field="deptName" title="地市" />
+                    <vxe-column field="score" title="污染值" sortable>
                         <template #default="scope">
                             <span
-                                class="conclusion"
-                                :class="
-                                    scope.row.vdevAssessLevel == '特质'
-                                        ? 'background1'
-                                        : scope.row.vdevAssessLevel == '较差'
-                                        ? 'background2'
-                                        : scope.row.vdevAssessLevel == '极差'
-                                        ? 'background3'
-                                        : ''
-                                "
+                                :style="{
+                                    color: setColor(scope.row.score)
+                                }"
                             >
-                                {{ scope.row.vdevAssessLevel }}
+                                {{ scope.row.score }}
                             </span>
                         </template>
                     </vxe-column>
-
-                    <vxe-column field="freqAssessLevel" title="频率偏差">
+                </vxe-table>
+            </div>
+            <div class="ml10" style="width: 990px">
+                <vxe-table v-bind="defaultAttribute" v-loading="loadingTab" ref="vxeRef" height="240px" :data="subdata">
+                    <vxe-column type="seq" width="70"></vxe-column>
+                    <vxe-column field="devName" title="终端名称"></vxe-column>
+                    <vxe-column field="lineName" title="监测点名称" />
+                    <vxe-column field="powerFlag" title="电网标志" />
+                    <vxe-column field="devType" title="终端型号"></vxe-column>
+                    <vxe-column field="manufacturer" title="终端厂家"></vxe-column>
+                    <vxe-column field="vharmonicValue" title="污染值" sortable>
                         <template #default="scope">
                             <span
-                                class="conclusion"
-                                :class="
-                                    scope.row.freqAssessLevel == '特质'
-                                        ? 'background1'
-                                        : scope.row.freqAssessLevel == '较差'
-                                        ? 'background2'
-                                        : scope.row.freqAssessLevel == '极差'
-                                        ? 'background3'
-                                        : ''
-                                "
+                                :style="{
+                                    color: setColor(scope.row.vharmonicValue)
+                                }"
                             >
-                                {{ scope.row.freqAssessLevel }}
+                                {{ scope.row.vharmonicValue }}
                             </span>
                         </template>
                     </vxe-column>
-
-                    <vxe-column field="harmAssessLevel" title="电压总谐波畸变率">
-                        <template #default="scope">
-                            <span
-                                class="conclusion"
-                                :class="
-                                    scope.row.harmAssessLevel == '特质'
-                                        ? 'background1'
-                                        : scope.row.harmAssessLevel == '较差'
-                                        ? 'background2'
-                                        : scope.row.harmAssessLevel == '极差'
-                                        ? 'background3'
-                                        : ''
-                                "
-                            >
-                                {{ scope.row.harmAssessLevel }}
-                            </span>
-                        </template>
-                    </vxe-column>
-
-                    <vxe-column field="flickerAssessLevel" title="电压闪变">
-                        <template #default="scope">
-                            <span
-                                class="conclusion"
-                                :class="
-                                    scope.row.flickerAssessLevel == '特质'
-                                        ? 'background1'
-                                        : scope.row.flickerAssessLevel == '较差'
-                                        ? 'background2'
-                                        : scope.row.flickerAssessLevel == '极差'
-                                        ? 'background3'
-                                        : ''
-                                "
-                            >
-                                {{ scope.row.flickerAssessLevel }}
-                            </span>
-                        </template>
-                    </vxe-column>
-
-                    <vxe-column field="unbalanceAssessLevel" title="三相电压不平衡度">
-                        <template #default="scope">
-                            <span
-                                class="conclusion"
-                                :class="
-                                    scope.row.unbalanceAssessLevel == '特质'
-                                        ? 'background1'
-                                        : scope.row.unbalanceAssessLevel == '较差'
-                                        ? 'background2'
-                                        : scope.row.unbalanceAssessLevel == '极差'
-                                        ? 'background3'
-                                        : ''
-                                "
-                            >
-                                {{ scope.row.unbalanceAssessLevel }}
-                            </span>
-                        </template>
-                    </vxe-column>
-                </vxe-colgroup> -->
-            </vxe-table>
+                </vxe-table>
+            </div>
         </div>
         <div style="height: 300px; margin-top: 10px; position: relative" v-loading="loading">
-            <!-- <el-select
-                v-model="time"
-                size="small"
-               
-                @change="analysis"
-            >
-                <el-option label="年" value="1" />
-                <el-option label="月" value="3" />
-            </el-select> -->
-            <div style="position: absolute; width: 100px; top: 0px; right: 0px; z-index: 1">
+            <!-- <div style="position: absolute; width: 100px; top: 0px; right: 0px; z-index: 1">
                 <el-radio-group v-model="city" size="small" @change="analysis">
                     <el-radio-button label="0">省</el-radio-button>
                     <el-radio-button label="1">市</el-radio-button>
@@ -140,133 +57,119 @@
                     <el-radio-button label="1">年</el-radio-button>
                     <el-radio-button label="3">月</el-radio-button>
                 </el-radio-group>
-            </div>
+            </div> -->
 
             <MyEChart style="height: 300px" :options="picEChart" />
         </div>
     </el-dialog>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, nextTick } from 'vue'
 import MyEChart from '@/components/echarts/MyEchart.vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
-import { getAssessDetail, getAssessTrend } from '@/api/device-boot/panorama'
+import { useDictData } from '@/stores/dictData'
+import { getAssessDetail, getAssessTrend, downPollutionSubCalc } from '@/api/device-boot/panorama'
+const dictData = useDictData()
 const dialogVisible: any = ref(false)
 const rowList: any = ref({})
 const type = ref('1')
 const city = ref('0')
 const loading = ref(false)
 const tableData: any = ref([])
-
+const subdata: any = ref([])
 const picEChart = ref()
-const open = async (row: any) => {
-    getAssessDetail(row).then(res => {
-        tableData.value = res.data
+const tableRef = ref()
+const loadingTab = ref(false)
+const PollutionList = dictData.getBasicData('Pollution_Calc').filter(item => item.name == '谐波电压')
+
+const open = async (row: any, list: any) => {
+    console.log('🚀 ~ open ~ list:', list)
+    // getAssessDetail(row).then(res => {
+    tableData.value = list
+    subdata.value = tableData.value[0]?.powerFlagPollutionList || []
+    nextTick(() => {
+        setTimeout(() => {
+            tableRef.value?.setCurrentRow(tableData.value[0])
+        }, 0)
     })
+    // })
     rowList.value = row
     analysis()
     dialogVisible.value = true
 }
+const currentChangeEvent = async () => {
+    loadingTab.value = true
+    setTimeout(() => {
+        subdata.value = tableRef.value.getCurrentRecord()?.powerFlagPollutionList || []
+        loadingTab.value = false
+    }, 1000)
+}
+
 const analysis = () => {
     loading.value = true
     let time = rowList.value.searchBeginTime.slice(0, 4) + `-01-01`
-    getAssessTrend({ ...rowList.value, searchBeginTime: time, type: type.value, areaType: city.value }).then(res => {
+    downPollutionSubCalc({ ...rowList.value, ids: [PollutionList[0].id] }).then(res => {
+        const first10Items = res.data.slice(0, 10)
         picEChart.value = {
             title: {
-                text: '各地市综合评估趋势对比'
+                text: '污染值排名前十变电站'
+            },
+
+            xAxis: {
+                name: '',
+                data: first10Items.map((item: any) => item.subStationName),
+                axisLabel: {
+                    rotate: 30, // 核心：倾斜 45 度（推荐 30/45/60，角度太大易读性差）
+                   
+                }
+            },
+            grid: {
+                bottom: 10
             },
             legend: {
-                right: 120,
-                top: 20
+                show: false
             },
-            // tooltip: {
-            //     formatter: function (params: any) {
-            //         // console.log(123, params)
-
-            //         var tips = ''
-
-            //         for (var i = 0; i < params.length; i++) {
-            //             console.log('🚀 ~ getAssessTrend ~ params[i].value:', params[i].value)
-
-            //             tips +=
-            //                 params[i].seriesName +
-            //                 ':' +
-            //                 `<span style="color:${
-            //                     params[i].value > 4.5
-            //                         ? ''
-            //                         : params[i].value > 4
-            //                         ? ''
-            //                         : params[i].value > 3
-            //                         ? ''
-            //                         : params[i].value > 2
-            //                         ? '#97017e'
-            //                         : params[i].value > 0
-            //                         ? '#A52a2a'
-            //                         : ''
-            //                 }">
-            //                     ${
-            //                         params[i].value > 4.5
-            //                             ? '优质'
-            //                             : params[i].value > 4
-            //                             ? '良好'
-            //                             : params[i].value > 3
-            //                             ? '一般'
-            //                             : params[i].value > 2
-            //                             ? '较差'
-            //                             : params[i].value > 0
-            //                             ? '极差'
-            //                             : ''
-            //                     }
-            //                     </span>` +
-            //                 '</br>'
-            //         }
-            //         return tips
-            //     }
-            // },
-            xAxis: {
-                name: '时间',
-                data: res.data[0].children.map((item: any) => item.dataTime)
-            },
-
-            grid: {
-                bottom: '10px',
-                top: '60px'
-            },
-
             yAxis: {
                 name: ''
             },
             options: {
                 dataZoom: false,
-                series: []
+                series: [
+                    {
+                        // name: time[i],
+                        name: '污染值',
+                        type: 'bar',
+                        data: first10Items.map((item: any) => item.subVStationValue),
+                        itemStyle: {
+                            color: function (params) {
+                                // params.value 是当前柱子的数值
+                                const value = params.value
+                                return setColor(value)
+                            }
+                        }
+                    }
+                ]
             }
         }
 
-        let list: any = []
-        let time: any = []
-        let mun: any = []
-        res.data.forEach((item: any, num: any) => {
-            time.push(item.deptName)
-            list.push([])
-            item.children.forEach((val: any, i: any) => {
-                mun.push(val.score == 3.14159 ? null : val.score)
-                list[num].push(val.score == 3.14159 ? null : val.score)
-            })
-        })
-
-        list.forEach((item: any, i: any) => {
-            picEChart.value.options.series.push({
-                name: time[i],
-                type: 'line',
-                data: item
-            })
-        })
-        picEChart.value.yAxis.min = Math.min(...mun) < 1 ? 0 : (Math.min(...mun) - 0.5).toFixed(2)
-        picEChart.value.yAxis.max = Math.max(...mun) > 4.5 ? 5 : (Math.max(...mun) + 0.5).toFixed(2)
         loading.value = false
     })
 }
-
+const setColor = val => {
+    return val == 3.14159
+        ? ''
+        : val > 10000
+        ? '#A52a2a'
+        : val > 1000
+        ? '#ff9900'
+        : val > 100
+        ? '#ffcc33'
+        : val > 0
+        ? '#3399ff'
+        : val == 0
+        ? '#00B07D'
+        : ''
+}
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
@@ -290,7 +193,7 @@ defineExpose({ open })
     color: #fff;
 }
 .background3 {
-    background-color: #A52a2a;
+    background-color: #a52a2a;
     color: #fff;
 }
 :deep(.el-select) {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
index 24946d98..40cc34b5 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
@@ -20,20 +20,20 @@
                 <div class="title">
                     <span>
                         污染告警
-                        <el-popover placement="right" :width="170" trigger="hover">
+                        <el-popover placement="right" :width="190" trigger="hover">
                             <template #reference>
                                 <WarningFilled class="WarningFilled" />
                             </template>
                             <div class="text">
-                                <span style="color: #00b07d">无污染：(0 , 1]</span>
+                                 <span style="color: #00B07D">无污染：0</span>
                                 <br />
-                                <span style="color: #3399ff">轻微污染：(1 , 1.2]</span>
+                                <span style="color: #3399ff">轻微污染：(0 , 100]</span>
                                 <br />
-                                <span style="color: #ffcc33">轻度污染：(1.2 , 1.6]</span>
+                                <span style="color: #ffcc33">轻度污染：(100 , 1000]</span>
                                 <br />
-                                <span style="color: #ff9900">中度污染：(1.6 , 2]</span>
+                                <span style="color: #ff9900">中度污染：(1000 , 10000]</span>
                                 <br />
-                                <span style="color: #a52a2a">重度污染：(2 , +∞)</span>
+                                <span style="color: #A52a2a">重度污染：(10000</span>
                             </div>
                         </el-popover>
                     </span>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
index 9562b0cb..60ff6bd7 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
@@ -13,8 +13,10 @@
                     <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.3' : ''">
                         <div class="card">
                             <span style="cursor: pointer" @click="GridDiagram(i)">{{ item.title }}：</span>
-                            <span :style="`color: ${item.color[0]}; cursor:pointer`"
-                                @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)">
+                            <span
+                                :style="`color: ${item.color[0]}; cursor:pointer`"
+                                @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)"
+                            >
                                 {{ item.list[4].numOne }}
                             </span>
                         </div>
@@ -23,8 +25,10 @@
                 <!-- 监测规模 列表 -->
                 <div>
                     <div class="vcl mt5">
-                        <p v-for="(item, i) in vList"
-                            :style="i == 0 ? 'width: 60px' : i == 5 ? 'width: 32px' : 'flex:1'">
+                        <p
+                            v-for="(item, i) in vList"
+                            :style="i == 0 ? 'width: 60px' : i == 5 ? 'width: 32px' : 'flex:1'"
+                        >
                             {{ item }}
                         </p>
                     </div>
@@ -48,8 +52,10 @@
                         <p class="numOne" @click="LookMap(item.list[3].numOneList, item.list[3].numTwoList, 0)">
                             {{ item.list[3].numOne }}
                         </p>
-                        <p style="font-size: 12px; width: 32px; cursor: pointer; color: var(--el-color-primary)"
-                            @click.stop="open(i)">
+                        <p
+                            style="font-size: 12px; width: 32px; cursor: pointer; color: var(--el-color-primary)"
+                            @click.stop="open(i)"
+                        >
                             详情
                         </p>
                     </div>
@@ -66,28 +72,37 @@
                 <div :style="`height:calc(${boxHeight.height} + 20px);overflow-y: auto;`">
                     <div v-for="item in countList">
                         <div class="title mt5" style="font-weight: 500">
-                            <img src="@/assets/img/TJ.png" />
-                            {{ item.title }}
+                            <!-- <img src="@/assets/img/TJ.png" />
+                            {{ item.title }} -->
                         </div>
-                        <div class="card-Box" :style="`height:calc((${boxHeight.height} - 50px )/ 3);`"
-                            v-for="val in item.children">
+                        <div
+                            class="card-Box mt10"
+                            :style="`height:calc((${boxHeight.height} - 20px )/ 2);`"
+                            v-for="val in item.children"
+                        >
                             <div>
                                 <span class="line"></span>
                                 <span class="vol">{{ val.title }}</span>
                             </div>
-                            <div class="num">
+                            <div class="num num1">
                                 <div @click="LookMap(val.numList, [], 0)">
                                     投运:
                                     <span>{{ val.num }}</span>
                                 </div>
+
                                 <div @click="LookMap(val.onLineNumList, [], 0)">
                                     在线:
                                     <span style="color: #2dcd28">{{ val.onLineNum }}</span>
                                 </div>
+
                                 <div>
                                     数据完整性:
                                     <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
                                 </div>
+                                <div>
+                                    在线率:
+                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -117,7 +132,7 @@
                             </div>
                             <div>
                                 {{ item.title[2] }}:
-                                <span style="color: #A52a2a" @click="LookMap([], item.lineListTwo, 1)">
+                                <span style="color: #a52a2a" @click="LookMap([], item.lineListTwo, 1)">
                                     {{ item.lineNumTwo || 0 }}
                                 </span>
                             </div>
@@ -127,8 +142,12 @@
             </div>
         </div>
 
-        <img class="imgL" :style="show ? 'transform: rotate(0deg);' : 'transform: rotate(180deg);'"
-            @click="show = !show" src="@/assets/img/QH.png" />
+        <img
+            class="imgL"
+            :style="show ? 'transform: rotate(0deg);' : 'transform: rotate(180deg);'"
+            @click="show = !show"
+            src="@/assets/img/QH.png"
+        />
         <div class="legeng">
             <div v-for="item in legengList">
                 <span :style="`background-color: ${item.color};`"></span>
@@ -290,7 +309,7 @@ const countList: any = ref([
             },
             { title: '非电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }
         ]
-    },
+    }
     // {
     //     title: '上送网公司',
     //     children: [{ title: '电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }]
@@ -418,7 +437,7 @@ const LookMap = (coutList: object, alarmList: object, key?: any) => {
 const GridDiagram = (k: any) => {
     emit('GridDiagram', k)
 }
-onMounted(() => { })
+onMounted(() => {})
 defineExpose({ info, show })
 </script>
 
@@ -537,7 +556,7 @@ defineExpose({ info, show })
     background-color: #edededc0;
     border-radius: 10px;
     min-height: 60px;
-    max-height: 120px;
+    // max-height: 120px;
 
     .line {
         display: inline-block;
@@ -562,6 +581,19 @@ defineExpose({ info, show })
             font-weight: 550;
         }
     }
+    .num1 {
+        grid-template-columns: 1fr 1fr; /* 核心：改为2列，均分宽度 */
+        grid-template-rows: auto auto;
+        gap: 8px; /* 可选：子元素间距，提升美观度 */
+        div {
+            display: flex;
+            padding-left: 20px;
+            // justify-content: center;
+            span {
+                margin-left: 5px;
+            }
+        }
+    }
 }
 
 .BoxA {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
index b6d39a77..ffe8bd35 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
@@ -6,20 +6,20 @@
                 <div class="title">
                     <span>
                         稳态综合评估
-                        <el-popover placement="right" :width="150" trigger="hover">
+                        <el-popover placement="right" :width="190" trigger="hover">
                             <template #reference>
                                 <WarningFilled class="WarningFilled" />
                             </template>
                             <div class="text">
-                                <span style="color: #00b07d">优质：(4.5 , 5]</span>
+                                <span style="color: #00b07d">无污染：0</span>
                                 <br />
-                                <span style="color: #2b7fd3">良好：(4 , 4.5]</span>
+                                <span style="color: #3399ff">轻微污染：(0 , 100]</span>
                                 <br />
-                                <span style="color: #ffcc33">合格：(3 , 4]</span>
+                                <span style="color: #ffcc33">轻度污染：(100 , 1000]</span>
                                 <br />
-                                <span style="color: #97017e">较差：(2 , 3]</span>
+                                <span style="color: #ff9900">中度污染：(1000 , 10000]</span>
                                 <br />
-                                <span style="color: #A52a2a">极差：[1 , 2]</span>
+                                <span style="color: #a52a2a">重度污染：(10000</span>
                             </div>
                         </el-popover>
                     </span>
@@ -32,7 +32,7 @@
                     <img src="@/assets/img/FGX.png" />
                 </div>
                 <div class="mt10 TJTop">
-                    <img src="@/assets/img/TJ.png" />
+                    <!-- <img src="@/assets/img/TJ.png" />
                     综合评估得分：
                     <span
                         :style="{
@@ -53,35 +53,27 @@
                         }"
                     >
                         {{ assessList.score == 3.14159 ? '/' : assessList.score }}
-                        <!-- {{ assessList.level }} -->
-                    </span>
+                    
+                    </span> -->
                 </div>
                 <div class="evaluate">
-                    <div v-for="item in assessList.children" style="min-width: 50px">
+                    <div v-for="item in assessList" style="min-width: 60px">
                         <div>
-                            <span class="line"></span>
-                            {{ item.name }}
+                            <span
+                                class="line"
+                                :style="{
+                                    background: setColor(item.score)
+                                }"
+                            ></span>
+                            {{ item.deptName }}
                         </div>
                         <div
                             style="margin-top: 5px"
                             :style="{
-                                color:
-                                    item.score == 3.14159
-                                        ? ''
-                                        : item.score > 4.5
-                                        ? '#339966'
-                                        : item.score > 4
-                                        ? '#2b7fd3'
-                                        : item.score > 3
-                                        ? '#ffcc33'
-                                        : item.score > 2
-                                        ? '#97017e'
-                                        : item.score > 0
-                                        ? '#A52a2a'
-                                        : ''
+                                color: setColor(item.score)
                             }"
                         >
-                            {{ item.score == 3.14159 ? '/' : item.score }}
+                            {{ setVal(item.score) }}
                         </div>
                     </div>
                 </div>
@@ -259,6 +251,7 @@ import temporaryState from './details/temporaryState.vue'
 import technique from './details/technique.vue'
 import {
     getAssessOverview,
+    getAreaPollution,
     getEvaluationOverview,
     getEventLevelEvaluation,
     getSupervisionData
@@ -314,8 +307,7 @@ const options = ref([
     {
         label: '负序电流',
         value: '9'
-    },
-  
+    }
 ])
 const technology: any = ref({})
 const harmonicType = ref('6')
@@ -364,17 +356,17 @@ const JDlist = ref([
     {
         name: '试运行问题',
         value: 0
-    },
-  
+    }
 ])
 const harmonicList: any = ref([])
 const harmonicLineRatio: any = ref(0)
 const WTList: any = ref([])
+const PollutionList = dictData.getBasicData('Pollution_Calc').filter(item => item.name == '谐波电压')
 
 const value = ref(options1[0].id)
 const open = (e: number) => {
     if (e == 0) {
-        evaluateRef.value.open(formRow.value)
+        evaluateRef.value.open(formRow.value,assessList.value)
     } else if (e == 1) {
         steadyStateRef.value.open(formRow.value)
     } else if (e == 2) {
@@ -383,6 +375,36 @@ const open = (e: number) => {
         techniqueRef.value.open(formRow.value)
     }
 }
+const setColor = val => {
+    return val == 3.14159
+        ? ''
+        : val > 10000
+        ? '#A52a2a'
+        : val > 1000
+        ? '#ff9900'
+        : val > 100
+        ? '#ffcc33'
+        : val > 0
+        ? '#3399ff'
+        : val == 0
+        ? '#00B07D'
+        : ''
+}
+const setVal = val => {
+    return val == 3.14159
+        ? '/'
+        : val > 10000
+        ? '重度污染'
+        : val > 1000
+        ? '中度污染'
+        : val > 100
+        ? '轻度污染'
+        : val > 0
+        ? '轻微污染'
+        : val == 0
+        ? '无污染'
+        : ''
+}
 const info = (row: any) => {
     let form = {
         ...row,
@@ -402,7 +424,7 @@ const info = (row: any) => {
     transientChange()
     // 综合评估
     setTimeout(() => {
-        getAssessOverview(form).then(res => {
+        getAreaPollution({ ...form, ids: [PollutionList[0].id] }).then(res => {
             assessList.value = res.data
         })
     }, 300)
@@ -413,8 +435,7 @@ const info = (row: any) => {
         JDlist.value[1].value = res.data?.onLineNum || 0
         JDlist.value[2].value = res.data?.userNum || 0
         JDlist.value[3].value = res.data?.trialRunNum || 0
-
-    }) 
+    })
 }
 const harmonicChange = () => {
     getEvaluationOverview({ ...formRow.value, harmonicType: harmonicType.value }).then(res => {
@@ -502,7 +523,7 @@ defineExpose({ info, show })
         width: 0.5rem;
         height: 0.5rem;
         border-radius: 0.25rem;
-        background: var(--el-color-primary);
+        // background: var(--el-color-primary);
         margin-right: 2px;
         margin-bottom: 1px;
     }
diff --git a/src/views/pqs/runManage/alarmCleaning/components/alarm.vue b/src/views/pqs/runManage/alarmCleaning/components/alarm.vue
index d2dbda9f..82fa10b2 100644
--- a/src/views/pqs/runManage/alarmCleaning/components/alarm.vue
+++ b/src/views/pqs/runManage/alarmCleaning/components/alarm.vue
@@ -17,6 +17,16 @@
                         ></el-option>
                     </el-select>
                 </el-form-item> -->
+                <el-form-item label="运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                        <el-option
+                            v-for="item in runFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="终端厂家:">
                     <el-select
                         v-model="tableStore.table.params.manufacturer"
@@ -221,7 +231,13 @@ const mapList: any = ref([])
 const segmented = ref(1)
 const terminaloption = dictData.getBasicData('Dev_Manufacturers')
 const time = ref(['', ''])
-
+const runFlagList = [
+    { id: 0, name: '运行' },
+    { id: 1, name: '检修' },
+    { id: 2, name: '停运' },
+    { id: 3, name: '调试' },
+    { id: 4, name: '退运' }
+]
 const tableStore = new TableStore({
     url: '/device-boot/dataVerify/getMonitorLimitData',
     method: 'POST',
@@ -426,6 +442,7 @@ tableStore.table.params.objType = ''
 tableStore.table.params.alarmDayLimit = 5
 tableStore.table.params.warnDayLimit = 1
 tableStore.table.params.manufacturer = ''
+tableStore.table.params.lineRunFlag = 0
 const quantityClick = (e: any, num: number) => {
     if (num == 0 && e.ids?.length == 0) return
     alarmDetailsRef.value.open(e, time.value, num)
diff --git a/src/views/pqs/runManage/assessment/components/assess/index.vue b/src/views/pqs/runManage/assessment/components/assess/index.vue
index 8133e975..d05d8629 100644
--- a/src/views/pqs/runManage/assessment/components/assess/index.vue
+++ b/src/views/pqs/runManage/assessment/components/assess/index.vue
@@ -1,67 +1,67 @@
 <template>
-  <div :style="height">
-      <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
-          <pane :size="size">
-              <AssessTree
-                  :default-expand-all="false"
-                  @node-click="handleNodeClick"
-                  @init="handleNodeClick"
-                  ref="assessTreeRef"
-                  :highlight-current = 'true'
-                  :current-node-key="currentTreeKey"
-                  :expand-on-click-node="false"
-              ></AssessTree>
-          </pane>
-          <pane style="background: #fff">
-              <div class="actionButtons mb10">
-                <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"  :loading="loading">模版下载</el-button>
-                <el-button type="primary" icon="el-icon-Upload" @click="handleImportClick">导入数据背景</el-button>
-                  <el-button type="primary" icon="el-icon-Memo" class="ml10" @click="assess2">评估</el-button>
-                  <el-button type="primary" icon="el-icon-Download" @click="exportReport">导出报告</el-button>
-              </div>
-              <div :style="collapseHeight" style="overflow-y: auto">
-                  <el-collapse v-model="collapseName" class="pl10 pr10">
-                      <el-collapse-item title="基本信息" :name="1">
-                        <div class="loading-container">
-                          <div v-if="infoLoading" class="loading-wrapper">
-                            <el-icon class="is-loading"><Loading /></el-icon>
-                            <span class="loading-text">加载中...</span>
-                          </div>
-                          <information 
-                              v-show="!infoLoading" 
-                              :node-id="currentNodeId" 
-                              @data-loaded="() => infoLoading = false" 
-                          />
-                        </div>
-                      </el-collapse-item>
-                      <el-collapse-item title="评估结果信息" :name="2">
-                        <div class="loading-container">
-                          <div v-if="outcomeLoading" class="loading-wrapper">
-                          <el-icon class="is-loading"><Loading /></el-icon>
-                          <span class="loading-text">加载中...</span>
-                        </div>
-                          <Outcome 
-                              v-show="!outcomeLoading" 
-                              :node-id="currentNodeId" 
-                              @data-status="handleDataStatus" 
-                              @data-loaded="() => outcomeLoading = false" 
-                
-                          />
-                        </div>
-                      </el-collapse-item>
-                  </el-collapse>
-              </div>
-          </pane>
-      </splitpanes>
-  </div>
-
- <AssessTemplate ref="assessTemplate" @data-success = "assess"></AssessTemplate>
+    <div :style="height">
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <AssessTree
+                    :default-expand-all="false"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                    ref="assessTreeRef"
+                    :highlight-current="true"
+                    :current-node-key="currentTreeKey"
+                    :expand-on-click-node="false"
+                ></AssessTree>
+            </pane>
+            <pane style="background: #fff">
+                <div class="actionButtons mb10">
+                    <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate" :loading="loading">
+                        模版下载
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-Upload" @click="handleImportClick">导入数据背景</el-button>
+                    <el-button type="primary" icon="el-icon-Memo" class="ml10" @click="assess2">评估</el-button>
+                    <el-button type="primary" icon="el-icon-Download" @click="exportReport">导出报告</el-button>
+                </div>
+                <div :style="collapseHeight" style="overflow-y: auto">
+                    <el-collapse v-model="collapseName" class="pl10 pr10">
+                        <el-collapse-item title="基本信息" :name="1">
+                            <div class="loading-container">
+                                <div v-if="infoLoading" class="loading-wrapper">
+                                    <el-icon class="is-loading"><Loading /></el-icon>
+                                    <span class="loading-text">加载中...</span>
+                                </div>
+                                <information
+                                    v-show="!infoLoading"
+                                    :node-id="currentNodeId"
+                                    @data-loaded="() => (infoLoading = false)"
+                                />
+                            </div>
+                        </el-collapse-item>
+                        <el-collapse-item title="评估结果信息" :name="2">
+                            <div class="loading-container">
+                                <div v-if="outcomeLoading" class="loading-wrapper">
+                                    <el-icon class="is-loading"><Loading /></el-icon>
+                                    <span class="loading-text">加载中...</span>
+                                </div>
+                                <Outcome
+                                    v-show="!outcomeLoading"
+                                    :node-id="currentNodeId"
+                                    @data-status="handleDataStatus"
+                                    @data-loaded="() => (outcomeLoading = false)"
+                                />
+                            </div>
+                        </el-collapse-item>
+                    </el-collapse>
+                </div>
+            </pane>
+        </splitpanes>
+    </div>
 
+    <AssessTemplate ref="assessTemplate" @data-success="assess"></AssessTemplate>
 </template>
 
 <script setup lang="ts">
 import { ElMessage, ElLoading } from 'element-plus'
-import { onMounted, ref, provide ,nextTick } from 'vue'
+import { onMounted, ref, provide, nextTick } from 'vue'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
 import TableStore from '@/utils/tableStore'
@@ -70,19 +70,18 @@ import TableHeader from '@/components/table/header/index.vue'
 import { mainHeight } from '@/utils/layout'
 import information from './information.vue'
 import Outcome from './outcome.vue'
-import {exportResult,downloadAssessTemplate,assessResult,userGetInfo} from '@/api/advance-boot/assess'
+import { exportResult, downloadAssessTemplate, assessResult, userGetInfo } from '@/api/advance-boot/assess'
 import { Loading } from '@element-plus/icons-vue'
 import AssessTemplate from './assessTemplate.vue'
 import { fa, tr } from 'element-plus/es/locale'
 
-
 defineOptions({
-  // name: 'harmonic-boot/report/word'
+    // name: 'harmonic-boot/report/word'
 })
 const collapseName = ref([1, 2])
 const height = mainHeight(80)
 const collapseHeight = mainHeight(125)
-const size = ref(0)
+const size = ref(23)
 const dotList: any = ref({})
 const infoLoading = ref(false)
 const outcomeLoading = ref(false)
@@ -92,93 +91,93 @@ const assessTemplate = ref()
 const currentNodeId = ref<string | number | null>(null)
 const currentNodeName = ref('')
 
-
 const tableStore = new TableStore({
-  url: '',
-  method: 'POST',
-  column: [],
-  beforeSearchFun: () => {},
-  loadCallback: () => {}
+    url: '',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {},
+    loadCallback: () => {}
 })
 provide('tableStore', tableStore)
 
 //有无评估结果
 const result = ref(true)
 const handleDataStatus = (hasData: boolean) => {
-if (!hasData) {
-  result.value = false
-} else {
-  result.value = true
-}
+    if (!hasData) {
+        result.value = false
+    } else {
+        result.value = true
+    }
 }
 
 //模板下载
 const exportExcelTemplate = async () => {
-  loading.value = true
-  downloadAssessTemplate().then((res: any) => {
-      let blob = new Blob([res], {
-          type: 'application/vnd.ms-excel'
-      })
-      const url = window.URL.createObjectURL(blob)
-      const link = document.createElement('a')
-      link.href = url
-      link.download = '评估结果模板'
-      document.body.appendChild(link)
-      link.click()
-      link.remove()
-  })
-  await setTimeout(() => {
-      loading.value = false
-  }, 0)
+    loading.value = true
+    downloadAssessTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '评估结果模板'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
 }
 
 //导出
-const exportReport = () => { 
-  if (!result.value){
-      ElMessage.warning('请先评估！')
-      return
-  } 
-  
-  const loadingMessage = ElMessage({
-    message: '正在导出中',
-    icon: h(Loading),
-    duration: 0 // 不自动关闭
-  })
-  
-  exportResult({}, currentNodeId.value ?? '').then((res: any) => {
-      let blob = new Blob([res], {  // 注意使用 res.data 而不是 res
-         type: 'application/vnd.ms-excel'
-      })
-      const url = window.URL.createObjectURL(blob)
-      const link = document.createElement('a')
-      link.href = url
-      link.download = currentNodeName.value + '-评估结果.xls'  // 建议添加文件扩展名
-      document.body.appendChild(link)
-      link.click()
-      link.remove()
-      window.URL.revokeObjectURL(url)
-      
-      // 关闭加载提示并显示成功消息
-      loadingMessage.close() 
-      ElMessage.success('导出成功！')
-  }).catch(error => {
-      // 处理导出失败情况
-      loadingMessage.close() 
-      ElMessage.error('导出失败，请重试！')
-  })
-}
+const exportReport = () => {
+    if (!result.value) {
+        ElMessage.warning('请先评估！')
+        return
+    }
 
+    const loadingMessage = ElMessage({
+        message: '正在导出中',
+        icon: h(Loading),
+        duration: 0 // 不自动关闭
+    })
+
+    exportResult({}, currentNodeId.value ?? '')
+        .then((res: any) => {
+            let blob = new Blob([res], {
+                // 注意使用 res.data 而不是 res
+                type: 'application/vnd.ms-excel'
+            })
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a')
+            link.href = url
+            link.download = currentNodeName.value + '-评估结果.xls' // 建议添加文件扩展名
+            document.body.appendChild(link)
+            link.click()
+            link.remove()
+            window.URL.revokeObjectURL(url)
+
+            // 关闭加载提示并显示成功消息
+            loadingMessage.close()
+            ElMessage.success('导出成功！')
+        })
+        .catch(error => {
+            // 处理导出失败情况
+            loadingMessage.close()
+            ElMessage.error('导出失败，请重试！')
+        })
+}
 
 //导入
 const handleImportClick = () => {
-  if (!currentNodeId.value) {
-    ElMessage.warning('请选择评估节点！')
-    return
-  }
-  assessTemplate.value.open('导入背景数据', currentNodeId.value.toString())
+    if (!currentNodeId.value) {
+        ElMessage.warning('请选择评估节点！')
+        return
+    }
+    assessTemplate.value.open('导入背景数据', currentNodeId.value.toString())
 }
 
-
 // 导入弹窗关闭后通知父组件更新
 const assess = async () => {
     // 展开评估结果
@@ -192,71 +191,75 @@ const assess = async () => {
     currentNodeId.value = null // 先置空
 
     setTimeout(() => {
-      currentNodeId.value = tempId // 再恢复，触发 watch
+        currentNodeId.value = tempId // 再恢复，触发 watch
     }, 0)
 }
 
 //评估
 const assess2 = async () => {
-  // 显示导出中提示
-  const loading = ElMessage({
-    message: '评估结果中',
-    icon: h(Loading),
-    duration: 0 // 不自动关闭
-  })
+    // 显示导出中提示
+    const loading = ElMessage({
+        message: '评估结果中',
+        icon: h(Loading),
+        duration: 0 // 不自动关闭
+    })
 
-  userGetInfo({ assessId: currentNodeId.value }).then(res => {
-    // 获取昨天的日期
-    const yesterday = new Date();
-    yesterday.setDate(yesterday.getDate() - 1);
+    userGetInfo({ assessId: currentNodeId.value })
+        .then(res => {
+            // 获取昨天的日期
+            const yesterday = new Date()
+            yesterday.setDate(yesterday.getDate() - 1)
 
-    // 格式化为 yyyy-MM-dd
-    const yyyy = yesterday.getFullYear();
-    const mm = String(yesterday.getMonth() + 1).padStart(2, '0');
-    const dd = String(yesterday.getDate()).padStart(2, '0');
-    const yesterdayStr = `${yyyy}-${mm}-${dd}`;
+            // 格式化为 yyyy-MM-dd
+            const yyyy = yesterday.getFullYear()
+            const mm = String(yesterday.getMonth() + 1).padStart(2, '0')
+            const dd = String(yesterday.getDate()).padStart(2, '0')
+            const yesterdayStr = `${yyyy}-${mm}-${dd}`
 
-    const assessData = {
-    assessId: currentNodeId.value,
-    endTime: `${yesterdayStr} 23:59:59`, // 使用动态的昨天日期
-    id: res.data.lineId,
-    startTime: `${yesterdayStr} 00:00:00` // 使用动态的昨天日期
-  };
+            const assessData = {
+                assessId: currentNodeId.value,
+                endTime: `${yesterdayStr} 23:59:59`, // 使用动态的昨天日期
+                id: res.data.lineId,
+                startTime: `${yesterdayStr} 00:00:00` // 使用动态的昨天日期
+            }
 
-    assessResult(assessData).then(res => {
-      // 关闭加载提示并显示成功消息
-      loading.close();
-      ElMessage.success('评估成功！');
+            assessResult(assessData)
+                .then(res => {
+                    // 关闭加载提示并显示成功消息
+                    loading.close()
+                    ElMessage.success('评估成功！')
 
-      // 展开评估结果
-      collapseName.value = [2];
-      // 更新评估状态
-      result.value = true;
+                    // 展开评估结果
+                    collapseName.value = [2]
+                    // 更新评估状态
+                    result.value = true
 
-      const tempId = currentNodeId.value;
-      currentNodeId.value = null; // 先置空
-      setTimeout(() => {
-        currentNodeId.value = tempId; // 再恢复，触发 watch
-      }, 0);
-    }).catch(error => {
-      // 关闭加载提示并显示失败消息
-      loading.close();
-      ElMessage.error('评估失败');
-    });
-  }).catch(error => {
-    // 处理 userGetInfo 的错误
-    loading.close();
-    ElMessage.error('获取用户信息失败');
-  });
-};
+                    const tempId = currentNodeId.value
+                    currentNodeId.value = null // 先置空
+                    setTimeout(() => {
+                        currentNodeId.value = tempId // 再恢复，触发 watch
+                    }, 0)
+                })
+                .catch(error => {
+                    // 关闭加载提示并显示失败消息
+                    loading.close()
+                    ElMessage.error('评估失败')
+                })
+        })
+        .catch(error => {
+            // 处理 userGetInfo 的错误
+            loading.close()
+            ElMessage.error('获取用户信息失败')
+        })
+}
 
 onMounted(() => {
-  const dom = document.getElementById('navigation-splitpanes')
-  setTimeout(() => {
-      if (dom) {
-          size.value = Math.round((180 / dom.offsetHeight) * 120)
-      }
-  }, 100)
+    const dom = document.getElementById('navigation-splitpanes')
+    setTimeout(() => {
+        if (dom) {
+            size.value = Math.round((180 / dom.offsetHeight) * 120)
+        }
+    }, 100)
 })
 
 // 添加树组件的引用
@@ -267,98 +270,96 @@ const currentTreeKey = ref<string | number | null>(null)
 const lastValidNodeKey = ref<string | number | null>(null)
 
 const handleNodeClick = (data: any, node: any) => {
-// 阻止点击父节点的逻辑处理
-if (!data || 
-    (node && !node.isLeaf) || 
-    (data.children && data.children.length > 0) ||
-    (node && node.childNodes && node.childNodes.length > 0)) {
-  
-  // 点击父节点时，保持树的高亮状态为上一次有效的子节点
-  currentTreeKey.value = lastValidNodeKey.value
-  return
-}
+    // 阻止点击父节点的逻辑处理
+    if (
+        !data ||
+        (node && !node.isLeaf) ||
+        (data.children && data.children.length > 0) ||
+        (node && node.childNodes && node.childNodes.length > 0)
+    ) {
+        // 点击父节点时，保持树的高亮状态为上一次有效的子节点
+        currentTreeKey.value = lastValidNodeKey.value
+        return
+    }
 
+    // 如果点击的是同一个节点，不需要重新加载，但可以提供刷新功能
+    if (currentNodeId.value === data?.id) {
+        // 可选：如果你希望重复点击能刷新数据，可以保留下面的代码
+        // 否则可以直接 return 不做任何操作
+        infoLoading.value = true
+        outcomeLoading.value = true
+        // 强制触发子组件重新加载，通过先置空再恢复
+        const tempId = currentNodeId.value
+        currentNodeId.value = null
+        nextTick(() => {
+            currentNodeId.value = tempId
+        })
+        return
+    }
 
-// 如果点击的是同一个节点，不需要重新加载，但可以提供刷新功能
-  if (currentNodeId.value === data?.id) {
-    // 可选：如果你希望重复点击能刷新数据，可以保留下面的代码
-    // 否则可以直接 return 不做任何操作
+    // 点击的是不同的子节点，更新高亮状态
+    lastValidNodeKey.value = data?.id || null
+    currentTreeKey.value = lastValidNodeKey.value
+    dotList.value = data
+    currentNodeId.value = data?.id || null
+    currentNodeName.value = data?.name || ''
+
+    // ✅ 开启两个 loading
     infoLoading.value = true
     outcomeLoading.value = true
-    // 强制触发子组件重新加载，通过先置空再恢复
-    const tempId = currentNodeId.value
-    currentNodeId.value = null
-    nextTick(() => {
-      currentNodeId.value = tempId
-    })
-    return
-  }
-
-// 点击的是不同的子节点，更新高亮状态
-lastValidNodeKey.value = data?.id || null
-currentTreeKey.value = lastValidNodeKey.value
-dotList.value = data
-currentNodeId.value = data?.id || null
-currentNodeName.value = data?.name || ''
-
-// ✅ 开启两个 loading
-infoLoading.value = true
-outcomeLoading.value = true
 }
 </script>
 <style lang="scss" scoped>
 .splitpanes.default-theme .splitpanes__pane {
-  background: #eaeef1;
+    background: #eaeef1;
 }
 
 :deep(.el-collapse-item__header) {
-  // font-family: AlimamaDongFangDaKai;
-  font-size: 20px;
-  &::before {
-      content: '▍'; /* 添加星号 */
-      font-size: 16px;
-      color: var(--el-color-primary);
-
-  }
+    // font-family: AlimamaDongFangDaKai;
+    font-size: 20px;
+    &::before {
+        content: '▍'; /* 添加星号 */
+        font-size: 16px;
+        color: var(--el-color-primary);
+    }
 }
 
 .actionButtons {
-  display: flex;
-  justify-content: end;
+    display: flex;
+    justify-content: end;
 }
 
 .loading-container {
-position: relative;
-min-height: 100px; /* 防止空白时高度塌陷 */
+    position: relative;
+    min-height: 100px; /* 防止空白时高度塌陷 */
 }
 
 .loading-wrapper {
-display: flex;
-align-items: center;
-justify-content: center;
-padding: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 20px;
 }
 
 .loading-text {
-margin-left: 8px;
-color: #606266;
+    margin-left: 8px;
+    color: #606266;
 }
 
-
 .is-loading {
-animation: rotating 2s linear infinite;
+    animation: rotating 2s linear infinite;
 }
 
 @keyframes rotating {
-0% {
-  transform: rotate(0deg);
-}
-100% {
-  transform: rotate(360deg);
-}
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
 }
 
 .ml10 {
-margin-left: 10px;
+    margin-left: 10px;
 }
 </style>
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
index 7ca62f26..a6e9c756 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
@@ -1,25 +1,29 @@
 <template>
-  <!-- 用户投诉 -->
-  <!-- 2 有新增 发起 预警单 -->
+    <!-- 用户投诉 -->
+    <!-- 2 有新增 发起 预警单 -->
 
-  <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
-    <template v-slot:select>
-      <el-form-item label="是否解决">
-        <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
-          <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
-            :value="item.value"></el-option>
-        </el-select>
-      </el-form-item>
-    </template>
-    <template v-slot:operation>
-      <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-    </template>
-  </TableHeader>
-  <Table ref="tableRef" />
-  <!-- 新增 -->
-  <complaintsForm ref="formRef" @onSubmit="tableStore.index()" />
-  <!-- 详情 -->
-  <detail ref="detailRef" />
+    <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
+        <template v-slot:select>
+            <el-form-item label="是否解决">
+                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+                    <el-option
+                        v-for="item in dealStateList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template v-slot:operation>
+            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!-- 新增 -->
+    <complaintsForm ref="formRef" @onSubmit="tableStore.index()" />
+    <!-- 详情 -->
+    <detail ref="detailRef" />
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -31,7 +35,8 @@ import { useDictData } from '@/stores/dictData'
 import complaintsForm from './form/complaintsForm.vue'
 import { useRouter } from 'vue-router'
 import { sureInitiateWarningLeaflet } from '@/api/process-boot/electricitymanagement'
-import detail from './complaintsDetail.vue';
+import detail from './complaintsDetail.vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 // Steady_Statis
 const dictData = useDictData()
 const exceeded = dictData.getBasicData('Steady_Statis')
@@ -42,169 +47,163 @@ const TableHeaderRef = ref()
 const detailRef = ref()
 const router = useRouter() // 路由对象
 const dealStateList = ref([
-  {
-    label: '未解决',
-    value: '0'
-  },
-
+    {
+        label: '未解决',
+        value: '0'
+    }
 ])
 const tableStore = new TableStore({
-  url: '/supervision-boot/SupervisionUserComplaint/list',
-  publicHeight: 65,
-  method: 'POST',
-  filename:'用户投诉',
-  column: [
-    {
-      title: '序号',
-
-      align: 'center',
-      width: 80,
-      formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    { field: 'userName', title: '用户名称' },
-    { field: 'userNumber', title: '用户编号' },
-    { field: 'dutyOrgName', title: '负责单位', minWidth: '80' },
-    // { field: 'userCategory', title: '用户类别' },
-
-    { field: 'complaintText', title: '投诉内容' },
-    { field: 'steadyIndicator', title: '稳态指标' },
-    { field: 'transientIndicators', title: '暂态指标' },
-    {
-      field: 'monitorName',
-      title: '监测点名称',
-      formatter: (row: any) => {
-        return row.cellValue ? row.cellValue : '/'
-      }
-    },
-    {
-      field: 'detectionFlag',
-      title: '是否实现监测',
-
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-
-      },
-      replaceValue: {
-        0: '否',
-        1: '是',
-
-      }
-    },
-
-    {
-      field: 'createBy',
-      title: '填报人',
-      minWidth: 80,
-      formatter: (row: any) => {
-        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-      }
-    },
-    {
-      field: 'dealState',
-      title: '是否解决',
-
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-        null: 'info'
-      },
-      replaceValue: {
-        0: '未解决',
-        1: '已解决',
-        null: '/'
-      }
-    },
-    {
-      title: '操作',
-      minWidth: 120,
-      align: 'center',
-      render: 'buttons',
-      buttons: [
+    url: '/supervision-boot/SupervisionUserComplaint/list',
+    publicHeight: 65,
+    method: 'POST',
+    filename: '用户投诉',
+    column: [
         {
-          name: 'edit',
-          title: '发起告警单',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.dealState != 0
-          },
-          // popconfirm: {
-          //     confirmButtonText: '确认',
-          //     cancelButtonText: '取消',
-          //     confirmButtonType: 'primary',
-          //     title: '请确认发起告警单!'
-          // },
-          click: async row => {
-            const { value } = await ElMessageBox.prompt('', '整改意见', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
+            title: '序号',
 
-              inputType: 'textarea',
-              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-              inputErrorMessage: '请输入整改意见'
-            })
-            sureInitiateWarningLeaflet({ id: row.id, reformAdvice: value }).then(res => {
-              ElMessage.success('发起告警单成功！')
-              tableStore.index()
-            })
+            align: 'center',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'userName', title: '用户名称' },
+        { field: 'userNumber', title: '用户编号' },
+        { field: 'dutyOrgName', title: '负责单位', minWidth: '80' },
+        // { field: 'userCategory', title: '用户类别' },
 
-          }
+        { field: 'complaintText', title: '投诉内容' },
+        { field: 'steadyIndicator', title: '稳态指标' },
+        { field: 'transientIndicators', title: '暂态指标' },
+        {
+            field: 'monitorName',
+            title: '监测点名称',
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
         },
         {
-          name: 'edit',
-          title: '详情',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.dealState == 0
-          },
+            field: 'detectionFlag',
+            title: '是否实现监测',
 
-          click: row => {
-            detailRef.value.open({
-              row: row,
-              title: '详情',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary'
+            },
+            replaceValue: {
+                0: '否',
+                1: '是'
+            }
+        },
 
-            })
-
-          }
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
         },
         {
-          name: 'edit',
-          title: '查看告警单',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.initiateWarningFlag == 0
-          },
-          click: row => {
-            router.push({
-              name: 'supervision/supervision/manage',
-              query: {
-                type: 1,
-                t: Date.now()
-              }
-            })
-          }
+            field: 'dealState',
+            title: '是否解决',
+
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                null: 'info'
+            },
+            replaceValue: {
+                0: '未解决',
+                1: '已解决',
+                null: '/'
+            }
+        },
+        {
+            title: '操作',
+            minWidth: 120,
+            align: 'center',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '发起告警单',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.dealState != 0
+                    },
+                    // popconfirm: {
+                    //     confirmButtonText: '确认',
+                    //     cancelButtonText: '取消',
+                    //     confirmButtonType: 'primary',
+                    //     title: '请确认发起告警单!'
+                    // },
+                    click: async row => {
+                        const { value } = await ElMessageBox.prompt('', '整改意见', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+
+                            inputType: 'textarea',
+                            inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+                            inputErrorMessage: '请输入整改意见'
+                        })
+                        sureInitiateWarningLeaflet({ id: row.id, reformAdvice: value }).then(res => {
+                            ElMessage.success('发起告警单成功！')
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '详情',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.dealState == 0
+                    },
+
+                    click: row => {
+                        detailRef.value.open({
+                            row: row,
+                            title: '详情'
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '查看告警单',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.initiateWarningFlag == 0
+                    },
+                    click: row => {
+                        router.push({
+                             name: 'supervision/supervision/manage' + (VITE_FLAG ? '4' : ''),
+                            query: {
+                                type: 4,
+                                t: Date.now()
+                            }
+                        })
+                    }
+                }
+            ]
         }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    tableStore.table.params.currentPage = tableStore.table.params.pageNum
-  },
-  exportProcessingData: () => {
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
+    },
+    exportProcessingData: () => {
         tableStore.table.allData = tableStore.table.allData.filter(item => {
-            item.dealState =item.dealState==0?'未解决':item.dealState==1?'已解决':'/'
-            item.detectionFlag=item.detectionFlag==0?'否':item.detectionFlag==1?'是':'/'
-               
+            item.dealState = item.dealState == 0 ? '未解决' : item.dealState == 1 ? '已解决' : '/'
+            item.detectionFlag = item.detectionFlag == 0 ? '否' : item.detectionFlag == 1 ? '是' : '/'
+
             return item
         })
     }
@@ -213,11 +212,11 @@ const tableStore = new TableStore({
 provide('tableStore', tableStore)
 tableStore.table.params.dealState = ''
 onMounted(() => {
-  tableStore.index()
+    tableStore.index()
 })
 // 新增
 const add = () => {
-  formRef.value.open({ text: '新增投诉' })
+    formRef.value.open({ text: '新增投诉' })
 }
 </script>
 
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue
index ab7cd7fa..fd0a63e2 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue
@@ -1,6 +1,6 @@
 <template>
-    <el-dialog draggable v-model="dialogVisible"  v-loading="loading" :title="title" width="80%" :before-close="handleClose">
-        <div style="height: 45vh">
+    <el-dialog draggable v-model="dialogVisible"   :title="title" width="80%" :before-close="handleClose">
+        <div style="height: 45vh"  v-loading="loading">
             <vxe-table show-overflow v-bind="defaultAttribute" :data="List">
                 <vxe-column field="time" title="日期" width="230px"></vxe-column>
                 <vxe-column field="overLimitInfo" title="越限详情"></vxe-column>
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
index 59484e21..11cdde32 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
@@ -1,94 +1,94 @@
 <template>
-  <!-- <div>1 监测点信息  发起预告警单 </div> -->
+    <!-- <div>1 监测点信息  发起预告警单 </div> -->
 
-  <TableHeader datePicker nextFlag theCurrentTime  ref="TableHeaderRef" showExport>
-    <template v-slot:select>
-      <el-form-item label="区域">
-        <Area ref="areaRef" v-model="tableStore.table.params.deptId" @changeValue="changeArea"/>
-      </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-select
-            v-model="tableStore.table.params.targetList"
-            clearable
-            multiple
-            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>
-      <el-form-item label="数据类型">
-        <el-switch
-            v-model="tableStore.table.params.dataType"
-            inline-prompt
-            active-value="1"
-            inactive-value="0"
-            active-text="超标数据"
-            inactive-text="无数据"
-        />
-      </el-form-item>
-      <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"
-            :step="1"
-            step-strictly
-            @change="changeAlert"
-        />
-      </el-form-item>
-      <el-form-item label="告警阈值">
-        <el-input-number
-            v-model="tableStore.table.params.alarmThreshold"
-            :min="0"
-            :step="1"
-            step-strictly
-            @change="changeAlarm"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="搜索">
+    <TableHeader datePicker nextFlag theCurrentTime ref="TableHeaderRef" showExport>
+        <template v-slot:select>
+            <el-form-item label="区域">
+                <Area ref="areaRef" v-model="tableStore.table.params.deptId" @changeValue="changeArea" />
+            </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-select
+                    v-model="tableStore.table.params.targetList"
+                    clearable
+                    multiple
+                    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>
+            <el-form-item label="数据类型">
+                <el-switch
+                    v-model="tableStore.table.params.dataType"
+                    inline-prompt
+                    active-value="1"
+                    inactive-value="0"
+                    active-text="超标数据"
+                    inactive-text="无数据"
+                />
+            </el-form-item>
+            <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"
+                    :step="1"
+                    step-strictly
+                    @change="changeAlert"
+                />
+            </el-form-item>
+            <el-form-item label="告警阈值">
+                <el-input-number
+                    v-model="tableStore.table.params.alarmThreshold"
+                    :min="0"
+                    :step="1"
+                    step-strictly
+                    @change="changeAlarm"
+                />
+            </el-form-item>
+            <!-- <el-form-item label="搜索">
           <el-input
               v-model="tableStore.table.params.searchValue"
               placeholder="输入变电站、终端、监测点名称"
               clearable
           ></el-input>
       </el-form-item> -->
-    </template>
-    <template #operation>
-      <el-button icon="el-icon-Plus" :disabled="flag != '2'" type="primary" @click="launch('发起预警单')">
-        发起预警单
-      </el-button>
-      <el-button icon="el-icon-Plus" :disabled="flag != '2'" type="primary" @click="launch('发起告警单')">
-        发起告警单
-      </el-button>
-    </template>
-  </TableHeader>
-  <Table ref="tableRef"/>
-  <!-- /告警单 -->
-  <alarmList ref="alarmListRef" @onSubmit="tableStore.index()"/>
-  <!-- 详情 -->
-  <detail ref="detailRef"/>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Plus" :disabled="flag != '2'" type="primary" @click="launch('发起预警单')">
+                发起预警单
+            </el-button>
+            <el-button icon="el-icon-Plus" :disabled="flag != '2'" type="primary" @click="launch('发起告警单')">
+                发起告警单
+            </el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!-- /告警单 -->
+    <alarmList ref="alarmListRef" @onSubmit="tableStore.index()" />
+    <!-- 详情 -->
+    <detail ref="detailRef" />
 </template>
 <script setup lang="ts">
-import {ref, onMounted, provide, nextTick} from 'vue'
+import { ref, onMounted, provide, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Area from '@/components/form/area/index.vue'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {useDictData} from '@/stores/dictData'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useDictData } from '@/stores/dictData'
 import alarmList from './form/alarmList.vue'
 import detail from './form/detail.vue'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const dictData = useDictData()
-import {useRouter} from 'vue-router'
+import { useRouter } from 'vue-router'
 
 const router = useRouter() // 路由对象
 //字典获取超标指标
@@ -100,224 +100,224 @@ const alarmListRef = ref()
 const flagTime = ref(false)
 const detailRef = ref()
 const list: any = ref({
-  deptId: '',
-  searchBeginTime: '',
-  searchEndTime: '',
-  alertThreshold: '',
-  alarmThreshold: ''
+    deptId: '',
+    searchBeginTime: '',
+    searchEndTime: '',
+    alertThreshold: '',
+    alarmThreshold: ''
 })
 const level: any = ref(dictData.state.area[0]?.level)
 const flag: any = ref('')
 const tableStore = new TableStore({
-  url: '/supervision-boot/onlineMonitor/list',
-  publicHeight: 65,
-  method: 'POST',
-  filename:'在线监测',
-  // isWebPaging:true,
-  column: [
-    {title: '', type: 'checkbox', width: 40},
-    {
-      title: '序号',
-
-      align: 'center',
-      width: 80,
-      formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    {field: 'dept', title: '负责单位'},
-    {field: 'substation', title: '变电站名称'},
-    {field: 'deviceName', title: '终端名称'},
-    {field: 'lineName', title: '监测点名称'},
-
-    {
-      field: 'businessType',
-      title: '监测对象类型',
-
-      formatter: (row: any) => {
-        return industry.find((item: any) => item.id == row.cellValue)?.name || '/'
-      }
-    },
-    {field: 'objectName', title: '监测对象名称'},
-    {
-      field: 'targetType',
-      title: '指标类型',
-      formatter: (row: any) => {
-        return exceeded.find((item: any) => item.id == row.cellValue)?.name || '/'
-      }
-    },
-
-    {
-      field: 'overLimitDay',
-      title: '累计超标天数',
-      formatter: (row: any) => {
-        return row.cellValue != null ? row.cellValue : '/'
-      }
-    },
-    {
-      field: 'updateTime',
-      visible: flagTime,
-      title: '最新数据时间'
-    },
-    {
-      title: '操作',
-      width: '180',
-      align: 'center',
-      render: 'buttons',
-      fixed: 'right',
-      buttons: [
+    url: '/supervision-boot/onlineMonitor/list',
+    publicHeight: 65,
+    method: 'POST',
+    filename: '在线监测',
+    // isWebPaging:true,
+    column: [
+        { title: '', type: 'checkbox', width: 40 },
         {
-          name: 'productSetting',
-          title: '详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return row.targetType == 0
-          },
-          click: row => {
-            detailRef.value.open({
-              text: '详情',
-              row: row,
-              list: list.value
-            })
-          }
+            title: '序号',
+
+            align: 'center',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'dept', title: '负责单位' },
+        { field: 'substation', title: '变电站名称' },
+        { field: 'deviceName', title: '终端名称' },
+        { field: 'lineName', title: '监测点名称' },
+
+        {
+            field: 'businessType',
+            title: '监测对象类型',
+
+            formatter: (row: any) => {
+                return industry.find((item: any) => item.id == row.cellValue)?.name || '/'
+            }
+        },
+        { field: 'objectName', title: '监测对象名称' },
+        {
+            field: 'targetType',
+            title: '指标类型',
+            formatter: (row: any) => {
+                return exceeded.find((item: any) => item.id == row.cellValue)?.name || '/'
+            }
+        },
+
+        {
+            field: 'overLimitDay',
+            title: '累计超标天数',
+            formatter: (row: any) => {
+                return row.cellValue != null ? row.cellValue : '/'
+            }
         },
         {
-          name: 'productSetting',
-          title: '查看预警单',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return row.step != 1
-          },
-          click: row => {
-            router.push({
-              name: 'supervision/supervision/manage',
-              query: {
-                type: 0,
-                t: Date.now()
-              }
-            })
-          }
+            field: 'updateTime',
+            visible: flagTime,
+            title: '最新数据时间'
         },
         {
-          name: 'productSetting',
-          title: '查看告警单',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return row.step != 2
-          },
-          click: row => {
-            router.push({
-              name: 'supervision/supervision/manage',
-              query: {
-                type: 1,
-                t: Date.now()
-              }
-            })
-          }
+            title: '操作',
+            width: '180',
+            align: 'center',
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.targetType == 0
+                    },
+                    click: row => {
+                        detailRef.value.open({
+                            text: '详情',
+                            row: row,
+                            list: list.value
+                        })
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '查看预警单',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.step != 1
+                    },
+                    click: row => {
+                        router.push({
+                            name: 'supervision/supervision/manage' + (VITE_FLAG ? '3' : ''),
+                            query: {
+                                type: 3,
+                                t: Date.now()
+                            }
+                        })
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '查看告警单',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.step != 2
+                    },
+                    click: row => {
+                        router.push({
+                            name: 'supervision/supervision/manage' + (VITE_FLAG ? '4' : ''),
+                            query: {
+                                type: 4,
+                                t: Date.now()
+                            }
+                        })
+                    }
+                }
+                // {
+                //     name: 'productSetting',
+                //     title: '发起告警单',
+                //     type: 'warning',
+                //     disabled: row => {
+                //         return row.overLimitDay < tableStore.table.params.alarmThreshold
+                //     },
+                //     icon: 'el-icon-EditPen',
+                //     render: 'basicButton',
+
+                //     click: async row => {
+                //         // handleWarningAlarmFlag(row).then(res => {
+                //         //     console.log(res)
+                //         //     ElMessage.success('发起告警单成功！')
+                //         //     tableStore.index()
+                //         // })
+                //         const { value } = await ElMessageBox.prompt('', '整改意见', {
+                //             confirmButtonText: '确定',
+                //             cancelButtonText: '取消',
+
+                //             inputType: 'textarea',
+                //             inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+                //             inputErrorMessage: '请输入整改意见'
+                //         })
+                //         handleWarningAlarmFlag({ ...row, reformAdvice: value }).then(res => {
+                //             ElMessage.success('发起告警单成功！')
+                //             tableStore.index()
+                //         })
+                //     }
+                // },
+                // {
+                //     name: 'edit',
+                //     title: '发起预警单',
+                //     type: 'primary',
+                //     icon: 'el-icon-Open',
+                //     disabled: row => {
+                //         return row.overLimitDay >= tableStore.table.params.alarmThreshold
+                //     },
+                //     render: 'basicButton',
+
+                //     click: async row => {
+                //         // handleWarningAlarmFlag(row).then(res => {
+                //         //     console.log(res)
+                //         //     ElMessage.success('发起预警单成功！')
+                //         //     tableStore.index()
+                //         // })
+                //         const { value } = await ElMessageBox.prompt('', '整改意见', {
+                //             confirmButtonText: '确定',
+                //             cancelButtonText: '取消',
+
+                //             inputType: 'textarea',
+                //             inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+                //             inputErrorMessage: '请输入整改意见'
+                //         })
+                //         handleWarningAlarmFlag({ ...row, reformAdvice: value }).then(res => {
+                //             ElMessage.success('发起预警单成功！')
+                //             tableStore.index()
+                //         })
+                //     }
+                // }
+            ]
         }
-        // {
-        //     name: 'productSetting',
-        //     title: '发起告警单',
-        //     type: 'warning',
-        //     disabled: row => {
-        //         return row.overLimitDay < tableStore.table.params.alarmThreshold
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
+        list.value.deptId = tableStore.table.params.deptId
+
+        list.value.searchBeginTime = tableStore.table.params.searchBeginTime
+        list.value.searchEndTime = tableStore.table.params.searchEndTime
+        if (tableStore.table.params.alertThreshold != '') {
+            list.value.alertThreshold = tableStore.table.params.alertThreshold
+        }
+        list.value.lineType = tableStore.table.params.lineType
+        list.value.alarmThreshold = tableStore.table.params.alarmThreshold
+        flag.value = level.value
+        flagTime.value = tableStore.table.params.dataType == 0 ? true : false
+    },
+    loadCallback: () => {
+        // tableStore.table.data = [
+        //     {
+        //         orgName: '张家口',
+        //         subName: '110kV马头山风电场',
+        //         lineName: '111口头线',
+        //         voltageScale: '110kV',
+        //         overDay: '20',
+        //         overDays: '10'
         //     },
-        //     icon: 'el-icon-EditPen',
-        //     render: 'basicButton',
-
-        //     click: async row => {
-        //         // handleWarningAlarmFlag(row).then(res => {
-        //         //     console.log(res)
-        //         //     ElMessage.success('发起告警单成功！')
-        //         //     tableStore.index()
-        //         // })
-        //         const { value } = await ElMessageBox.prompt('', '整改意见', {
-        //             confirmButtonText: '确定',
-        //             cancelButtonText: '取消',
-
-        //             inputType: 'textarea',
-        //             inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        //             inputErrorMessage: '请输入整改意见'
-        //         })
-        //         handleWarningAlarmFlag({ ...row, reformAdvice: value }).then(res => {
-        //             ElMessage.success('发起告警单成功！')
-        //             tableStore.index()
-        //         })
+        //     {
+        //         orgName: '张家口',
+        //         subName: '110kV韩家庄风电场',
+        //         lineName: '111缘韩一线',
+        //         voltageScale: '110kV',
+        //         overDay: '20',
+        //         overDays: '16'
         //     }
-        // },
-        // {
-        //     name: 'edit',
-        //     title: '发起预警单',
-        //     type: 'primary',
-        //     icon: 'el-icon-Open',
-        //     disabled: row => {
-        //         return row.overLimitDay >= tableStore.table.params.alarmThreshold
-        //     },
-        //     render: 'basicButton',
-
-        //     click: async row => {
-        //         // handleWarningAlarmFlag(row).then(res => {
-        //         //     console.log(res)
-        //         //     ElMessage.success('发起预警单成功！')
-        //         //     tableStore.index()
-        //         // })
-        //         const { value } = await ElMessageBox.prompt('', '整改意见', {
-        //             confirmButtonText: '确定',
-        //             cancelButtonText: '取消',
-
-        //             inputType: 'textarea',
-        //             inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        //             inputErrorMessage: '请输入整改意见'
-        //         })
-        //         handleWarningAlarmFlag({ ...row, reformAdvice: value }).then(res => {
-        //             ElMessage.success('发起预警单成功！')
-        //             tableStore.index()
-        //         })
-        //     }
-        // }
-      ]
+        // ]
     }
-  ],
-  beforeSearchFun: () => {
-    tableStore.table.params.currentPage = tableStore.table.params.pageNum
-    list.value.deptId = tableStore.table.params.deptId
-
-    list.value.searchBeginTime = tableStore.table.params.searchBeginTime
-    list.value.searchEndTime = tableStore.table.params.searchEndTime
-    if (tableStore.table.params.alertThreshold != '') {
-      list.value.alertThreshold = tableStore.table.params.alertThreshold
-    }
-    list.value.lineType = tableStore.table.params.lineType
-    list.value.alarmThreshold = tableStore.table.params.alarmThreshold
-    flag.value = level.value
-    flagTime.value = tableStore.table.params.dataType == 0 ? true : false
-  },
-  loadCallback: () => {
-    // tableStore.table.data = [
-    //     {
-    //         orgName: '张家口',
-    //         subName: '110kV马头山风电场',
-    //         lineName: '111口头线',
-    //         voltageScale: '110kV',
-    //         overDay: '20',
-    //         overDays: '10'
-    //     },
-    //     {
-    //         orgName: '张家口',
-    //         subName: '110kV韩家庄风电场',
-    //         lineName: '111缘韩一线',
-    //         voltageScale: '110kV',
-    //         overDay: '20',
-    //         overDays: '16'
-    //     }
-    // ]
-  }
 })
 tableStore.table.params.alertThreshold = 5
 tableStore.table.params.alarmThreshold = 5
@@ -329,50 +329,50 @@ 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(() => {
-    TableHeaderRef.value.showSelectChange()
-  }, 10)
+    tableStore.index()
+    setTimeout(() => {
+        TableHeaderRef.value.showSelectChange()
+    }, 10)
 })
 
 const changeAlert = e => {
-  if (e == null) {
-    tableStore.table.params.alertThreshold = 5
-  } else {
-    if (e > tableStore.table.params.alarmThreshold) {
-      ElMessage.warning('预警阈值不能大于报警阈值')
-      tableStore.table.params.alertThreshold = 5
+    if (e == null) {
+        tableStore.table.params.alertThreshold = 5
+    } else {
+        if (e > tableStore.table.params.alarmThreshold) {
+            ElMessage.warning('预警阈值不能大于报警阈值')
+            tableStore.table.params.alertThreshold = 5
+        }
     }
-  }
 }
 const changeAlarm = e => {
-  if (e == null) {
-    tableStore.table.params.alarmThreshold = 5
-  } else {
-    if (e < tableStore.table.params.alertThreshold) {
-      ElMessage.warning('报警阈值不能小于预警阈值')
-      tableStore.table.params.alarmThreshold = 5
+    if (e == null) {
+        tableStore.table.params.alarmThreshold = 5
+    } else {
+        if (e < tableStore.table.params.alertThreshold) {
+            ElMessage.warning('报警阈值不能小于预警阈值')
+            tableStore.table.params.alarmThreshold = 5
+        }
     }
-  }
 }
 // 发起预警单
 const launch = (title: string) => {
-  if (tableStore.table.selection.length == 0) {
-    ElMessage.warning('请选择一条数据')
-    return
-  }
+    if (tableStore.table.selection.length == 0) {
+        ElMessage.warning('请选择一条数据')
+        return
+    }
 
-  alarmListRef.value.open({
-    text: title,
-    form: list.value,
-    row: tableStore.table.selection
-  })
-  console.log('🚀 ~ launch ~ list.value:', list.value)
+    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
+    level.value = e.data.level
 }
 </script>
 
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
index 71c6d431..f8717200 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
@@ -1,25 +1,33 @@
 <template>
-  <!--     <div> 普测结果 发起预告警单</div> -->
-  <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
-    <template v-slot:select>
-      <el-form-item label="计划名称">
-        <el-input style="width: 200px" v-model="tableStore.table.params.searchValue" clearable
-          placeholder="请输入计划名称"></el-input>
-      </el-form-item>
-      <el-form-item label="是否解决">
-        <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
-          <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
-            :value="item.value"></el-option>
-        </el-select>
-      </el-form-item>
-    </template>
-  </TableHeader>
-  <Table ref="tableRef" />
-  <testQuestionsForm ref="testQuestionsFormRef" />
-  <!-- 详情 -->
-  <el-dialog draggable v-model="dialogVisible" v-if="dialogVisible" title="详情" width="1000">
-    <detail :id="detailId" :flag="flag" />
-  </el-dialog>
+    <!--     <div> 普测结果 发起预告警单</div> -->
+    <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
+        <template v-slot:select>
+            <el-form-item label="计划名称">
+                <el-input
+                    style="width: 200px"
+                    v-model="tableStore.table.params.searchValue"
+                    clearable
+                    placeholder="请输入计划名称"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="是否解决">
+                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+                    <el-option
+                        v-for="item in dealStateList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+    <testQuestionsForm ref="testQuestionsFormRef" />
+    <!-- 详情 -->
+    <el-dialog draggable v-model="dialogVisible" v-if="dialogVisible" title="详情" width="1000">
+        <detail :id="detailId" :flag="flag" />
+    </el-dialog>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -32,7 +40,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
 import { useDictData } from '@/stores/dictData'
 import detail from '@/views/pqs/supervise/harmonicSurvey/test/detail.vue'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const dictData = useDictData()
 const { push } = useRouter()
 const router = useRouter() // 路由对象
@@ -151,9 +159,9 @@ const tableStore = new TableStore({
           },
           click: row => {
             router.push({
-              name: 'supervision/supervision/manage',
+                name: 'supervision/supervision/manage' + (VITE_FLAG ? '4' : ''),
               query: {
-                type: 1,
+                type: 4,
                 t: Date.now()
               }
             })
@@ -168,7 +176,7 @@ const tableStore = new TableStore({
   exportProcessingData: () => {
         tableStore.table.allData = tableStore.table.allData.filter(item => {
             item.dealState = item.dealState == 0 ? '未解决' : item.dealState == 1 ? '已解决' : '/'
-               
+
             return item
         })
     }
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
index b48ecbeb..681b5d62 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
@@ -1,25 +1,34 @@
 <!---试运行列表-->
 <template>
-  <div>
-    <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
-      <template #select>
-        <el-form-item label="流程状态">
-          <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-            <el-option v-for="item in statusSelect" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否解决">
-          <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
-            <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
-              :value="item.value"></el-option>
-          </el-select>
-        </el-form-item>
-      </template>
-    </TableHeader>
-    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-    <!-- 详情 -->
-    <detail ref="detailRef" />
-  </div>
+    <div>
+        <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
+            <template #select>
+                <el-form-item label="流程状态">
+                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                        <el-option
+                            v-for="item in statusSelect"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="是否解决">
+                    <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+                        <el-option
+                            v-for="item in dealStateList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+        <!-- 详情 -->
+        <detail ref="detailRef" />
+    </div>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, reactive } from 'vue'
@@ -35,7 +44,7 @@ import { VxeTablePropTypes } from 'vxe-table'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import detail from './testRunDetail.vue'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const dictData = useDictData()
 const statusSelect = dictData.statusSelect()
 const { push } = useRouter()
@@ -218,9 +227,9 @@ const tableStore = new TableStore({
           },
           click: row => {
             push({
-              name: 'supervision/supervision/manage',
+              name: 'supervision/supervision/manage' + (VITE_FLAG ? '4' : ''),
               query: {
-                type: 1,
+                type: 4,
                 t: Date.now()
               }
             })
diff --git a/src/views/pqs/supervise/electricalEnergy/index.vue b/src/views/pqs/supervise/electricalEnergy/index.vue
index cc2c8694..3ca5b615 100644
--- a/src/views/pqs/supervise/electricalEnergy/index.vue
+++ b/src/views/pqs/supervise/electricalEnergy/index.vue
@@ -1,16 +1,16 @@
 <template>
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
-            <el-tab-pane label="在线监测" name="1">
+            <el-tab-pane label="在线监测问题" name="1" v-if="tabList.includes('1')">
                 <online v-if="activeName == '1'" />
             </el-tab-pane>
-            <el-tab-pane label="用户投诉" name="2">
+            <el-tab-pane label="用户投诉问题" name="2" v-if="tabList.includes('2')">
                 <complaints v-if="activeName == '2'" />
             </el-tab-pane>
-            <el-tab-pane label="计划问题" name="3">
+            <el-tab-pane label="计划实施问题" name="3" v-if="tabList.includes('3')">
                 <testQuestions v-if="activeName == '3'" />
             </el-tab-pane>
-            <el-tab-pane label="试运行评估问题" name="4">
+            <el-tab-pane label="试运行评估" name="4" v-if="tabList.includes('4')">
                 <testRun v-if="activeName == '4'" />
             </el-tab-pane>
             <!-- <el-tabs v-model="activeName" type="border-card">
@@ -30,14 +30,23 @@ import online from './components1/online.vue'
 import complaints from './components1/complaints.vue'
 import testQuestions from './components1/testQuestions.vue'
 import testRun from './components1/testRun.vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 // import maintenance from './components/maintenance.vue'
 // import audit from './components/audit.vue'
 import { mainHeight } from '@/utils/layout'
 defineOptions({
     name: 'supervision/electricitymanagement'
 })
+const tabList = ref(['1', '2', '3', '4'])
 const activeName = ref('1')
-
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
 const layout = mainHeight(63) as any
 </script>
 
diff --git a/src/views/pqs/supervise/harmonicSurvey/index.vue b/src/views/pqs/supervise/harmonicSurvey/index.vue
index d8116b93..bbc3f48f 100644
--- a/src/views/pqs/supervise/harmonicSurvey/index.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/index.vue
@@ -1,24 +1,24 @@
 <template>
-    <div class='default-main'>
-        <el-tabs v-model='activeName' type='border-card'>
-            <el-tab-pane label='技术监督计划管理' name='1'>
-                <plan-manage :id='id' v-if="activeName == '1'" />
+    <div class="default-main">
+        <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane :label="VITE_FLAG ? '工作计划指定' : '技术监督计划管理'" name="1" v-if="tabList.includes('1')">
+                <plan-manage :id="id" v-if="activeName == '1'" />
             </el-tab-pane>
-            <el-tab-pane label='技术监督测试管理' name='2'>
-                <test-manage :id='id' :businessKey='key' v-if="activeName == '2'" />
+            <el-tab-pane :label="VITE_FLAG ? '工作计划实施' : '技术监督测试管理'"   name="2" v-if="tabList.includes('2')">
+                <test-manage :id="id" :businessKey="key" v-if="activeName == '2'" />
             </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
-<script setup lang='ts'>
-import { ref } from 'vue'
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
 import planManage from './components/planManage.vue'
 import testManage from './components/testManage.vue'
 import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import { useRoute } from 'vue-router'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const route = useRoute()
 const dictData = useDictData()
 const statusSelect = dictData.statusSelect()
@@ -27,27 +27,39 @@ const key = ref('')
 defineOptions({
     name: 'supervision/harmonicmanagement'
 })
+const tabList = ref(['1', '2', '3', '4'])
 const activeName = ref('1')
-
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
 const layout = mainHeight(63) as any
 
-watch(() => route.query.t, async (newValue, oldValue) => {
-    if (route.fullPath.includes('supervision/harmonicmanagement')) {
-        let type = (route.query.type as string) || 'null'
-        if (type == 'null') { }
-        else if (type == '1') {
-            activeName.value = '1'
-        } else {
-            activeName.value = '2'
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
+        if (route.fullPath.includes('supervision/harmonicmanagement')) {
+            let type = (route.query.type as string) || 'null'
+            if (type == 'null') {
+            } else if (type == '1') {
+                activeName.value = '1'
+            } else {
+                activeName.value = '2'
+            }
+            id.value = (route.query.id as string) || 'null'
+            id.value = id.value + '@' + route.query.t
+            key.value = (route.query.key as string) || 'null'
         }
-        id.value = (route.query.id as string) || 'null'
-        id.value = id.value + '@' + route.query.t
-        key.value = (route.query.key as string) || 'null'
-    }
-}, { deep: true, immediate: true })
+    },
+    { deep: true, immediate: true }
+)
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .bars_w {
     width: 100%;
     height: 500px;
diff --git a/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue b/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue
index 9da79e43..c05aaff5 100644
--- a/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <div class='default-main'>
-    <el-descriptions :column='2' border>
+    <el-descriptions :column='2' label-width="140px" border>
       <el-descriptions-item label='技术监督计划名称'>
         {{ detailData?.planName }}
       </el-descriptions-item>
@@ -8,7 +8,7 @@
         {{ detailData?.deptName }}
       </el-descriptions-item>
       <el-descriptions-item label='监督类型'>
-        {{
+        {{  
           supvTypeList.find(item => {
             return item.id == detailData?.supvType
           })?.name
diff --git a/src/views/pqs/supervise/interfere/index.vue b/src/views/pqs/supervise/interfere/index.vue
index 0c974aba..6dea22c5 100644
--- a/src/views/pqs/supervise/interfere/index.vue
+++ b/src/views/pqs/supervise/interfere/index.vue
@@ -1,23 +1,23 @@
 <template>
   <div class='default-main'>
     <el-tabs v-model='activeName' type='border-card'>
-      <el-tab-pane label='未建档用户档案录入管理' name='1'>
+      <el-tab-pane :label="VITE_FLAG ? '预测评估' : '未建档用户档案录入管理'"  name='1' v-if="tabList.includes('1')">
         <undocumented ref='Undocumented' :id='id' v-if="activeName == '1'" />
       </el-tab-pane>
-      <el-tab-pane label='常态化干扰源用户管理' name='3'>
-        <interferenceUserTable ref='InterferenceUserTable' :id='id' :businessKey="key" v-if="activeName == '3'" />
+      <el-tab-pane :label="VITE_FLAG ? '接入管理' : '常态化干扰源用户管理'"  name='2' v-if="tabList.includes('2')">
+        <interferenceUserTable ref='InterferenceUserTable' :id='id' :businessKey="key" v-if="activeName == '2'" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script setup lang='ts'>
-import { nextTick, ref, provide } from 'vue'
+import { nextTick, ref, provide,onMounted } from 'vue'
 import { mainHeight } from '@/utils/layout'
 import undocumented from './components/undocumented/index.vue'
 import interferenceUserTable from './components/normalizationManager/interferenceUserTable.vue'
 import { useRoute } from 'vue-router'
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const route = useRoute()
 const Undocumented = ref()
 const InterferenceUserTable = ref()
@@ -27,7 +27,15 @@ defineOptions({
 const activeName = ref('1')
 const id = ref('')
 const key = ref('')
-
+const tabList = ref(['1', '2', ])
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
 
 watch(() => route.query.t, async (newValue, oldValue) => {
   if (route.fullPath.includes('supervision/interferencemanagement')) {
diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue
index 347ea60f..886e2d3d 100644
--- a/src/views/pqs/supervise/plan/index.vue
+++ b/src/views/pqs/supervise/plan/index.vue
@@ -49,6 +49,7 @@ import { planDetailsAudit, sendAlarm } from '@/api/supervision-boot/plan/index'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { cancelPlanFormData } from '@/api/supervision-boot/plan/index'
 //获取登陆用户姓名和部门
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const adminInfo = useAdminInfo()
 defineOptions({
     name: 'plan'
@@ -71,9 +72,13 @@ const tableStore = new TableStore({
     // publicHeight: 65,
     method: 'POST',
     column: [
-        { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
         {
             field: 'province',
             title: '所属省份',
@@ -270,9 +275,9 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         router.push({
-                            name: 'supervision/supervision/manage',
+                            name: 'supervision/supervision/manage' + (VITE_FLAG ? '4' : ''),
                             query: {
-                                type: 1
+                                type: 4
                             }
                         })
                     }
diff --git a/src/views/pqs/supervise/technology/index.vue b/src/views/pqs/supervise/technology/index.vue
index 3d8fd70d..9aeac82a 100644
--- a/src/views/pqs/supervise/technology/index.vue
+++ b/src/views/pqs/supervise/technology/index.vue
@@ -26,15 +26,15 @@ const key = ref('')
 defineOptions({
     name: 'supervision/supervision/manage'
 })
-let tabList = ['3', '4']
+const tabList = ref(['3', '4'])
 const activeName: any = ref('3')
 onMounted(() => {
-    let key = window.location.href.slice(-1)
+    let key = window.location.href.split('?')[0].slice(-1)
     const isNumber = /^\d$/.test(key)
-    // if (isNumber) {
-    //     tabList = [key]
-    //     activeName.value = key
-    // }
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
 })
 
 watch(
diff --git a/src/views/pqs/supervise/terminal/index.vue b/src/views/pqs/supervise/terminal/index.vue
index bef8d7b7..11974549 100644
--- a/src/views/pqs/supervise/terminal/index.vue
+++ b/src/views/pqs/supervise/terminal/index.vue
@@ -1,26 +1,26 @@
 <template>
-    <div class='default-main'>
-        <el-tabs v-model='activeName' type='border-card'>
-            <el-tab-pane label='干扰源用户台账' name='1'>
-                <interferenceUserTable :id='id' v-if="activeName == '1'" />
+    <div class="default-main">
+        <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane label="干扰源用户台账" name="1" v-if="tabList.includes('1')">
+                <interferenceUserTable :id="id" v-if="activeName == '1'" />
             </el-tab-pane>
-            <el-tab-pane label='敏感及重要用户台账' name='2'>
+            <el-tab-pane label="敏感及重要用户台账" name="2" v-if="tabList.includes('2')">
                 <sensitiveUserTable v-if="activeName == '2'" />
             </el-tab-pane>
-            <el-tab-pane label='变电站台账' name='3'>
+            <el-tab-pane label="变电站台账" name="3" v-if="tabList.includes('3')">
                 <substationLedger v-if="activeName == '3'" />
             </el-tab-pane>
-            <el-tab-pane label='终端台账' name='4'>
+            <el-tab-pane label="终端台账" name="4" v-if="tabList.includes('4')">
                 <deviceLedgerTable v-if="activeName == '4'" />
             </el-tab-pane>
-            <el-tab-pane label='监测点台账' name='5'>
+            <el-tab-pane label="监测点台账" name="5" v-if="tabList.includes('5')">
                 <monitorLedgerTable v-if="activeName == '5'" />
             </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
-<script setup lang='ts'>
+<script setup lang="ts">
 import { onMounted, reactive, ref, provide } from 'vue'
 import interferenceUserTable from './components/interferenceUserTable.vue'
 import sensitiveUserTable from './components/sensitiveUserTable.vue'
@@ -37,23 +37,35 @@ defineOptions({
 })
 const activeName = ref('1')
 
-
-watch(() => route.query.t, async (newValue, oldValue) => {
-    if (route.fullPath.includes('Supervision/Terminaldetection')) {
-        let type = (route.query.type as string) || 'null'
-        if (type == 'null') { }
-        else if (type == '1') {
-            activeName.value = '1'
-        }
-        id.value = (route.query.id as string) || 'null'
-        id.value = id.value + '@' + route.query.t
+const tabList = ref(['1', '2', '3', '4', '5'])
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
     }
-}, { deep: true, immediate: true })
+})
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
+        if (route.fullPath.includes('Supervision/Terminaldetection')) {
+            let type = (route.query.type as string) || 'null'
+            if (type == 'null') {
+            } else if (type == '1') {
+                activeName.value = '1'
+            }
+            id.value = (route.query.id as string) || 'null'
+            id.value = id.value + '@' + route.query.t
+        }
+    },
+    { deep: true, immediate: true }
+)
 
 const layout = mainHeight(63) as any
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .bars_w {
     width: 100%;
     height: 500px;
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/index.vue
index ebb7c5ce..5c8d28c5 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/index.vue
@@ -1,7 +1,7 @@
 <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="终端检测" name="1" v-if="tabList.includes('1')">
                 <terminal :id="id" v-if="activeName == '1'" />
             </el-tab-pane>
             <el-tab-pane label="监测点台账录入" name="2" v-if="tabList.includes('2')">
@@ -10,7 +10,7 @@
             <el-tab-pane label="监测点联调列表" name="3" v-if="tabList.includes('3')">
                 <jointDebugList :id="id" v-if="activeName == '3'" />
             </el-tab-pane>
-            <el-tab-pane label="终端周期检测" name="4" v-if="tabList.includes('4')">
+            <el-tab-pane label="周期校验" name="4" v-if="tabList.includes('4')">
                 <cycleDetection :id="id" :businessKey="key" v-if="activeName == '4'" />
             </el-tab-pane>
         </el-tabs>
@@ -34,12 +34,12 @@ const activeName = ref('1')
 const route = useRoute()
 const id = ref('')
 const key = ref('')
-let tabList = ['1', '2', '3', '4']
+const tabList = ref(['1', '2', '3', '4'])
 onMounted(() => {
-    let key = window.location.href.slice(-1)
+    let key = window.location.href.split('?')[0].slice(-1)
     const isNumber = /^\d$/.test(key)
     if (isNumber) {
-        tabList = [key]
+        tabList.value = [key]
         activeName.value = key
     }
 })
diff --git a/src/views/pqs/supervise/testRun/index.vue b/src/views/pqs/supervise/testRun/index.vue
index 8eb385b9..71a94659 100644
--- a/src/views/pqs/supervise/testRun/index.vue
+++ b/src/views/pqs/supervise/testRun/index.vue
@@ -1,21 +1,29 @@
 <!---试运行列表-->
 <template>
     <div class="default-main">
-        <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
-            <template #select>
-                <el-form-item label="流程状态">
-                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                        <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
-                            :value="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="startRunTest">试运行</el-button>
-                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+        <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane label="试运行评估" name="1">
+                <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
+                    <template #select>
+                        <el-form-item label="流程状态">
+                            <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                                <el-option
+                                    v-for="item in statusSelect"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </template>
+                    <template #operation>
+                        <el-button icon="el-icon-Plus" type="primary" @click="startRunTest">试运行</el-button>
+                        <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+                    </template>
+                </TableHeader>
+                <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+            </el-tab-pane>
+        </el-tabs>
 
         <!--        <el-dialog
                     v-model='timeDialog'
@@ -62,11 +70,11 @@ const { push } = useRouter()
 const adminInfo = useAdminInfo()
 const TableHeaderRef = ref()
 const tableRef = ref()
-
+const activeName = ref('1')
 const tableStore = new TableStore({
     url: '/supervision-boot/tempLinedebug/pageHasDebug',
     method: 'POST',
-    // publicHeight: 65,
+    publicHeight: 65,
     column: [
         { title: '', type: 'checkbox', width: 40 },
         { field: 'lineName', title: '监测点名称', minWidth: 160 },
@@ -266,23 +274,20 @@ const deleteEven = () => {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
+        }).then(() => {
+            let createBy = tableStore.table.selection.map(item => item.createBy)
+            let status = tableStore.table.selection.map(item => item.status)
+            if (adminInfo.roleCode.includes('delete_info')) {
+                deleteList()
+            } else if (createBy.includes(adminInfo.$state.id) && status.includes(0)) {
+                deleteList()
+            } else {
+                ElMessage({
+                    type: 'warning',
+                    message: '只能删除自己填报的数据!!!'
+                })
+            }
         })
-            .then(() => {
-                let createBy = tableStore.table.selection.map(item => item.createBy)
-                let status = tableStore.table.selection.map(item => item.status)
-                if (adminInfo.roleCode.includes('delete_info')) {
-                    deleteList()
-                } else if (createBy.includes(adminInfo.$state.id) && status.includes(0)) {
-                    deleteList()
-                } else {
-                    ElMessage({
-                        type: 'warning',
-                        message: '只能删除自己填报的数据!!!'
-                    })
-                }
-
-            })
-
     }
 }
 
@@ -410,43 +415,46 @@ const runTestSubmit = (type: number) => {
 
 const route = useRoute()
 
-watch(() => route.query.t, async (newValue, oldValue) => {
-    let nowTime = Date.now()
-    let routeTime = route.query.t as number || 1
-    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-    if (route.fullPath.includes('/testRun')) {
-        let id = (route.query.id as string) || 'null'
-        if (id != 'null') {
-            monitorIds = []
-            monitorIds.push(id)
-            const start = new Date()
-            start.setDate(start.getDate() + 1)
-            start.setHours(0, 0, 0)
-            const end = new Date()
-            end.setDate(end.getDate() + 3)
-            end.setHours(23, 59, 59)
-            const startString = formatDate(start, 'YYYY-MM-DD') // 转换为 YYYY-MM-DD  格式
-            const endString = formatDate(end, 'YYYY-MM-DD')
-            const data = {
-                startTime: startString,
-                endTime: endString,
-                lineIds: monitorIds,
-                operateType: 1,
-                id
-            }
-            update(data).then((res: any) => {
-                if (res.code === 'A0000') {
-                    ElMessage({
-                        message: '发起试运行成功',
-                        type: 'success'
-                    })
-                    tableStore.index()
+watch(
+    () => route.query.t,
+    async (newValue, oldValue) => {
+        let nowTime = Date.now()
+        let routeTime = (route.query.t as number) || 1
+        if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+        if (route.fullPath.includes('/testRun')) {
+            let id = (route.query.id as string) || 'null'
+            if (id != 'null') {
+                monitorIds = []
+                monitorIds.push(id)
+                const start = new Date()
+                start.setDate(start.getDate() + 1)
+                start.setHours(0, 0, 0)
+                const end = new Date()
+                end.setDate(end.getDate() + 3)
+                end.setHours(23, 59, 59)
+                const startString = formatDate(start, 'YYYY-MM-DD') // 转换为 YYYY-MM-DD  格式
+                const endString = formatDate(end, 'YYYY-MM-DD')
+                const data = {
+                    startTime: startString,
+                    endTime: endString,
+                    lineIds: monitorIds,
+                    operateType: 1,
+                    id
                 }
-            })
-
+                update(data).then((res: any) => {
+                    if (res.code === 'A0000') {
+                        ElMessage({
+                            message: '发起试运行成功',
+                            type: 'success'
+                        })
+                        tableStore.index()
+                    }
+                })
+            }
         }
-    }
-}, { deep: true, immediate: true })
+    },
+    { deep: true, immediate: true }
+)
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise/testRun/testRun.vue b/src/views/pqs/supervise/testRun/testRun.vue
index 1e72b474..d55b7e8f 100644
--- a/src/views/pqs/supervise/testRun/testRun.vue
+++ b/src/views/pqs/supervise/testRun/testRun.vue
@@ -2,13 +2,13 @@
     <div class="default-main">
       <el-tabs v-model="activeName" type="border-card">
     
-        <el-tab-pane label="监测点台账录入" name="1">
+        <el-tab-pane label="监测点台账录入" name="1" v-if="tabList.includes('1')">
           <monitorpoint :id="id" v-if="activeName == '1'" />
         </el-tab-pane>
-        <el-tab-pane label="监测点联调列表" name="2">
+        <el-tab-pane label="监测点联调列表" name="2" v-if="tabList.includes('2')">
           <jointDebugList :id="id" v-if="activeName == '2'" />
         </el-tab-pane>
-        <el-tab-pane label="试运行评估" name="3">
+        <el-tab-pane label="试运行评估" name="3" v-if="tabList.includes('3')">
           <testRun :id="id" v-if="activeName == '3'" />
         </el-tab-pane>
       </el-tabs>
@@ -16,7 +16,7 @@
   </template>
   
   <script setup lang="ts">
-  import { ref } from 'vue'
+  import { ref ,onMounted} from 'vue'
 
   import { mainHeight } from '@/utils/layout'
   import monitorpoint from '@/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue'
@@ -29,7 +29,15 @@
     name: 'terminalNetwotk'
   })
   const activeName = ref('1')
-  
+  const tabList = ref(['1', '2', '3',])
+onMounted(() => {
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
+    }
+})
   const route = useRoute()
   const id = ref('')
   const key = ref('')
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/index_JB.vue b/src/views/pqs/voltageSags/monitoringPoint/online/index_JB.vue
index 7280fd68..675c4ac2 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/index_JB.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/index_JB.vue
@@ -24,10 +24,10 @@
                         @tab-change="handleTabChange"
                     >
                         <el-tab-pane label="事件分析" name="3" lazy v-if="!isReload">
-                            <EventStudy :externalHeight='20'/>
+                            <EventStudy :externalHeight="20" />
                         </el-tab-pane>
                         <el-tab-pane label="事件统计" name="2" lazy v-if="!isReload">
-                            <EventStatistics :externalHeight='20'/>
+                            <EventStatistics :externalHeight="20" />
                         </el-tab-pane>
 
                         <!-- <el-tab-pane label="运行情况" name="4" lazy :style="height" v-if="!isReload">
@@ -63,7 +63,7 @@ defineOptions({
 
 const monitoringPoint = useMonitoringPoint()
 const pointTree = ref()
-const size = ref(0)
+const size = ref(23)
 const isReload = ref(false)
 const height = mainHeight(40)
 const activeName = ref('3')
diff --git a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
index 20ea229f..90509a5b 100644
--- a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
+++ b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
@@ -145,7 +145,7 @@ defineOptions({
 })
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
-const size = ref(0)
+const size = ref(23)
 const value = ref('')
 const TableHeaderRef = ref()
 const dotList: any = ref({
@@ -191,7 +191,7 @@ getList({
     type: 0
 }).then(res => {
     templatePolicy.value = res.data.records
-       // 默认选中第一个
+    // 默认选中第一个
     if (res.data.records && res.data.records.length > 0) {
         value.value = res.data.records[0].id
         // 触发 change 事件，加载对应的配置
diff --git a/src/views/system/bpm/task/todo/index.vue b/src/views/system/bpm/task/todo/index.vue
index 55cca084..cb8ced8f 100644
--- a/src/views/system/bpm/task/todo/index.vue
+++ b/src/views/system/bpm/task/todo/index.vue
@@ -30,7 +30,7 @@ import { getRunningDeviceById } from '@/api/supervision-boot/device/quitRunningD
 const props = defineProps({
     height: [String, Number]
 })
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const router = useRouter() // 路由对象
 defineOptions({
     name: 'businessUser'
@@ -44,7 +44,7 @@ const tableStore = new TableStore({
     method: 'POST',
     publicHeight: 65,
     isWebPaging: true,
-    filename:'待办任务',
+    filename: '待办任务',
     column: [
         {
             field: 'index',
@@ -208,10 +208,19 @@ const tableStore = new TableStore({
                         // 页面内tab切换
                         let type = row.tabValue
                         let key = '3'
+                        let name = row.routePath
+                        if (VITE_FLAG) {
+                            let key = row.routePath?.split('?')[0].slice(-1)
+                            const isNumber = /^\d$/.test(key)
+                            if (!isNumber) {
+                                name = row.routePath + type
+                            }
+                        }
+
                         // 业务记录id
                         let id = row.id
                         router.push({
-                            name: row.routePath,
+                            name: name,
                             query: {
                                 type,
                                 id,