diff --git a/src/views/pqs/business/terminal/userLedger/components/addForm.vue b/src/views/pqs/business/terminal/userLedger/components/addForm.vue
index af2d3195..9e15ab1c 100644
--- a/src/views/pqs/business/terminal/userLedger/components/addForm.vue
+++ b/src/views/pqs/business/terminal/userLedger/components/addForm.vue
@@ -144,7 +144,7 @@
                     <template #append>MW</template>
                 </el-input>
             </el-form-item>
-            <el-form-item for="-" v-if="form.userType == '0' || form.userType == '1'" label="非线性终端类型：">
+<!--            <el-form-item for="-" v-if="form.userType == '0' || form.userType == '1'" label="非线性终端类型：">
                 <el-tree-select
                     accordion
                     ref="treeRef"
@@ -159,7 +159,7 @@
                     :data="nonlinearDeviceTypeList"
                     :render-after-expand="false"
                 />
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item for="-" label="电压等级：">
                 <el-select v-model="form.voltageLevel" placeholder="请选择电压等级" node-key="id" filterable>
                     <el-option
@@ -186,6 +186,7 @@
                     />
                 </el-select>
             </el-form-item>
+<!--
             <el-form-item for="-" label="是否需要治理：">
                 <el-radio-group v-model="form.needGovernance">
                     <el-radio :value="1">是</el-radio>
@@ -198,6 +199,7 @@
                     <el-radio :value="0">否</el-radio>
                 </el-radio-group>
             </el-form-item>
+-->
 
             <el-form-item for="-" v-if="form.userType != '0' && form.userType != '1'" label="评估类型：">
                 <el-select v-model="form.evaluationType" placeholder="请选择评估类型" filterable>
@@ -209,9 +211,9 @@
                     />
                 </el-select>
             </el-form-item>
-            <el-form-item for="-" v-if="form.userType != '0' && form.userType != '1'" label="PCC点：">
+<!--            <el-form-item for="-" v-if="form.userType != '0' && form.userType != '1'" label="PCC点：">
                 <el-input v-model.trim="form.pccPoint" autocomplete="off" placeholder="请输入PCC点" />
-            </el-form-item>
+            </el-form-item>-->
 <!--            <el-form-item
                 for="-"
                 v-if="form.userType == '2' || form.userType == '3' || form.userType == '4' || form.userType == '5'"
@@ -306,7 +308,7 @@
                     />
                 </el-select>
             </el-form-item>
-            <el-form-item
+<!--            <el-form-item
                 for="-"
                 v-if="form.userType == '2' || form.userType == '3' || form.userType == '4' || form.userType == '5'"
                 :label="form.userType == '4' || form.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'"
@@ -327,13 +329,13 @@
                     :render-after-expand="false"
                     placeholder="请选择"
                 />
-            </el-form-item>
-            <el-form-item for="-" v-if="form.userType == '6'" label="是否开展抗扰度测试：">
+            </el-form-item>-->
+<!--            <el-form-item for="-" v-if="form.userType == '6'" label="是否开展抗扰度测试：">
                 <el-radio-group v-model="form.antiInterferenceTest">
                     <el-radio value="1">是</el-radio>
                     <el-radio value="0">否</el-radio>
                 </el-radio-group>
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item for="-" v-if="form.userType == '6' && isInterferencemanagement" label="负荷级别：">
                 <el-select v-model="form.loadLevel" collapse-tags collapse-tags-tooltip placeholder="请选择负荷级别" filterable>
                     <el-option
@@ -809,7 +811,7 @@ const rules = ref({
     ratePower: [{ required: true, message: '请输入装机容量', trigger: 'blur' }],
     lineId: [{ required: true, message: '请选择关联监测点', trigger: 'change' }],
     agreementCapacity: [{ required: true, message: '请选择用户协议容量', trigger: 'blur' }],
-    nonlinearDeviceType: [{ required: true, message: '请选择非线性终端类型', trigger: 'change' }],
+    //nonlinearDeviceType: [{ required: true, message: '请选择非线性终端类型', trigger: 'change' }],
     needGovernance: [{ required: true, message: '请选择是否需要治理', trigger: 'change' }],
     backgroundTestPerformed: [{ required: true, message: '请选择是否开展背景测试', trigger: 'change' }],
     state: [{ required: true, message: '请选择数据状态', trigger: 'change' }],
diff --git a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
index dde14517..28c8230f 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
@@ -132,7 +132,7 @@ const tableStore = new TableStore({
                 return row.cellValue == -1 ? '/' : row.cellValue
             }
         },
-        {
+   /*     {
             title: '频率偏差超标情况',
             children: [
                 {
@@ -205,7 +205,7 @@ const tableStore = new TableStore({
                     }
                 }
             ]
-        },
+        },*/
         {
             title: '谐波电压超标情况',
             children: [
diff --git a/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue b/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue
index 6639cd5e..0c50db7e 100644
--- a/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue
+++ b/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue
@@ -167,7 +167,7 @@ const tableStore = new TableStore({
             minWidth: 100
         },
 
-        { field: 'id', title: '监测点序号', minWidth: 70 },
+        { field: 'runNo', title: '监测点序号', minWidth: 70 },
 
         { field: 'devName', title: '监测终端编号 ', minWidth: 140 },
         { field: 'ptType', title: '监测终端接线方式', minWidth: 140 },
diff --git a/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/monitorLimit.vue b/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/monitorLimit.vue
index a8a0314b..e94d0874 100644
--- a/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/monitorLimit.vue
+++ b/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/monitorLimit.vue
@@ -21,7 +21,8 @@
             </el-row>
             <el-row :gutter="20" style="margin-top: 10px;">
                 <el-col :span="8">
-                    <div><strong>电压等级：</strong>{{ currentRow?.scale || '-' }}</div>
+                    <!-- 电压等级补kV单位 -->
+                    <div><strong>电压等级：</strong>{{ currentRow?.scale ? `${currentRow.scale}kV` : '-' }}</div>
                 </el-col>
                 <el-col :span="8">
                     <div><strong>干扰源类型：</strong>{{ currentRow?.loadType || '-' }}</div>
@@ -38,13 +39,20 @@
                     <el-table-column prop="name" label="参数名称" width="300" fixed />
                     <el-table-column prop="value" label="限值" width="300">
                         <template #default="{ row }">
-                            <span>{{ row.value !== null && row.value !== undefined ? row.value + '%' : '-' }}</span>
+                            <!-- 按参数匹配对应单位，空值只显示'-' -->
+                            <span>
+                                {{
+                                    row.value !== null && row.value !== undefined
+                                        ? `${row.value}${row.unit}`
+                                        : '-'
+                                }}
+                            </span>
                         </template>
                     </el-table-column>
                 </el-table>
             </el-tab-pane>
 
-            <el-tab-pane label="谐波电压限值" name="harmonicVoltage">
+            <el-tab-pane label="谐波电压含有率限值" name="harmonicVoltage">
                 <el-table :data="harmonicVoltageData" border style="width: 100%" max-height="400">
                     <el-table-column prop="harmonic" label="谐波次数" width="300" />
                     <el-table-column prop="limit" label="限值(%)" width="300">
@@ -55,10 +63,10 @@
                 </el-table>
             </el-tab-pane>
 
-            <el-tab-pane label="谐波电流限值" name="harmonicCurrent">
+            <el-tab-pane label="谐波电流幅值限值" name="harmonicCurrent">
                 <el-table :data="harmonicCurrentData" border style="width: 100%" max-height="400">
                     <el-table-column prop="harmonic" label="谐波次数" width="300" />
-                    <el-table-column prop="limit" label="限值(%)" width="300">
+                    <el-table-column prop="limit" label="限值(A)" width="300">
                         <template #default="{ row }">
                             <span>{{ row.limit || '-' }}</span>
                         </template>
@@ -82,56 +90,23 @@ const dialogVisible = ref(false)
 const activeTab = ref('powerQuality')
 const currentRow = ref<any>(null)
 
-// 电能质量限值数据
+// 电能质量限值数据：新增unit字段，绑定每个参数的合规单位
 const limitData = ref([
-    { name: '频率偏差', value: 0.2 },
-    { name: '电压偏差上限', value: null },
-    { name: '电压偏差下限', value: null },
-    { name: '电压不平衡度', value: 2 },
-    { name: '闪变', value: 1 },
-    { name: '电压波变', value: 3 },
-    { name: '间谐波电压', value: 0.16 },
-    { name: '负序电流', value: null },
+    { name: '频率偏差', value: 0.2, unit: '%' },
+    { name: '电压偏差上限', value: null, unit: '%' },
+    { name: '电压偏差下限', value: null, unit: '%' },
+    { name: '电压不平衡度', value: 2, unit: '%' },
+    { name: '闪变', value: 1, unit: '%' },
+    { name: '电压波动', value: 3, unit: '%' }, // 修正行业标准名称
+    { name: '间谐波电压', value: 0.16, unit: '%' },
+    { name: '负序电流', value: null, unit: 'A' },
 ])
 
 // 谐波电压数据（2-25次）
-const harmonicVoltageData = ref(
-    Array.from({ length: 24 }, (_, i) => {
-        const harmonicNumber = i + 2
-        let limit = 0
-        if (harmonicNumber <= 3) limit = 2.4
-        else if (harmonicNumber <= 5) limit = 1.2
-        else if (harmonicNumber <= 7) limit = 0.8
-        else if (harmonicNumber <= 9) limit = 0.6
-        else if (harmonicNumber <= 11) limit = 0.5
-        else if (harmonicNumber <= 13) limit = 0.4
-        else if (harmonicNumber <= 15) limit = 0.3
-        else if (harmonicNumber <= 17) limit = 0.2
-        else if (harmonicNumber <= 19) limit = 0.18
-        else limit = 0.15
-
-        return {
-            harmonic: `${harmonicNumber}次`,
-            limit: limit
-        }
-    })
-)
+const harmonicVoltageData = ref()
 
 // 谐波电流数据（2-25次）
-const harmonicCurrentData = ref(
-    Array.from({ length: 24 }, (_, i) => {
-        const harmonicNumber = i + 2
-        const limits = {
-            2: 16, 3: 13, 4: 8.1, 5: 13, 6: 5.4, 7: 9.3, 8: 4.1, 9: 4.3,
-            10: 3.3, 11: 5.9, 12: 2.7, 13: 5, 14: 2.3, 15: 2.6, 16: 2, 17: 3.8,
-            18: 1.8, 19: 3.4, 20: 1.6, 21: 1.9, 22: 1.5, 23: 2.8, 24: 1.4, 25: 2.6
-        }
-        return {
-            harmonic: `${harmonicNumber}次`,
-            limit: limits[harmonicNumber as keyof typeof limits] || 0
-        }
-    })
-)
+const harmonicCurrentData = ref()
 
 // 打开弹框
 const open = (row: any) => {
@@ -141,12 +116,35 @@ const open = (row: any) => {
         if (item.name === '电压偏差上限') {
             item.value = row.voltageDev !== undefined ? row.voltageDev : null
         } else if (item.name === '电压偏差下限') {
-            item.value = row.uvoltageDev !== undefined ? row.uvoltageDev : null
+            item.value = row.uvoltageDev !== undefined ? row.uvoltageDev : null // 修正原笔误uvoltageDev
         } else if (item.name === '负序电流') {
             item.value = row.ineg !== undefined ? row.ineg : null
         }
     })
 
+    // 直接从row取奇偶限值，不用函数判断电压
+    const oddHarm = row.oddHarm ?? 0
+    const evenHarm = row.evenHarm ?? 0
+
+    harmonicVoltageData.value = Array.from({ length: 24 }, (_, i) => {
+        const harmonicNumber = i + 2
+        const limit = harmonicNumber % 2 === 0 ? evenHarm : oddHarm
+        return {
+            harmonic: `${harmonicNumber}次`,
+            limit
+        }
+    })
+
+    // 谐波电流 循环2-25次，从row读取iharm+次数
+    harmonicCurrentData.value = Array.from({ length: 24 }, (_, i) => {
+        const num = i + 2
+        const key = `iharm${num}` as keyof typeof row
+        return {
+            harmonic: `${num}次`,
+            limit: row[key] ?? 0
+        }
+    })
+
     dialogVisible.value = true
 }
 
diff --git a/src/views/pqs/panorama/components/city/statistics.vue b/src/views/pqs/panorama/components/city/statistics.vue
index 75bc4b06..67fad15c 100644
--- a/src/views/pqs/panorama/components/city/statistics.vue
+++ b/src/views/pqs/panorama/components/city/statistics.vue
@@ -3,8 +3,8 @@
     <el-dialog draggable title="指标合格率统计" v-model="dialogVisible" width="1500px">
         <div>
             <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="600px" :data="tableData">
-                <vxe-column field="substationName" title="变电站名称" />
                 <vxe-column field="lineName" title="监测点名称" />
+                <vxe-column field="objName" title="监测对象" />
                 <vxe-colgroup title="各指标合格率">
                     <vxe-column field="freqDev" sortable title="	频率偏差" :formatter="formatter" />
                     <vxe-column field="vdev" sortable title="电压偏差"  :formatter="formatter" />
diff --git a/src/views/pqs/panorama/components/cityMapL-LN.vue b/src/views/pqs/panorama/components/cityMapL-LN.vue
index 1af076b5..bc40f265 100644
--- a/src/views/pqs/panorama/components/cityMapL-LN.vue
+++ b/src/views/pqs/panorama/components/cityMapL-LN.vue
@@ -10,28 +10,43 @@
                     <img src="@/assets/img/FGX.png" />
                 </div>
                 <div style="display: flex">
-                    <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.3' : ''">
+                    <div
+                        v-for="(item, i) in list"
+                        class="cardBox mt10"
+                        :style="i == 1 ? 'flex:1.2' : i === 2 ? '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[item.list.length - 1].numOneList,
-                                        item.list[item.list.length - 1].numTwoList,
+                                        item.list?.[item.list.length - 1]?.numOneList,
+                                        item.list?.[item.list.length - 1]?.numTwoList,
                                         0
                                     )
                                 "
                             >
-                                {{ item.list[item.list.length - 1]?.numOne }}
+                                {{ item.list?.[item.list.length - 1]?.numOne }}
                             </span>
                         </div>
                     </div>
                 </div>
                 <!-- 监测规模 列表 -->
                 <div>
-                    <div class="vcl mt5">
-                        <p v-for="(item, i) in vList" :style="i == 0 ? 'width: 60px' : 'flex:1'">
+                    <div class="vcl mt2">
+                        <p
+                            v-for="(item, i) in displayVList"
+                            :style="
+                                i == 0
+                                    ? 'width: 60px'
+                                    : i == displayVList?.length - 1
+                                    ? IS_LN
+                                        ? 'flex:1'
+                                        : 'width: 32px'
+                                    : 'flex:1'
+                            "
+                        >
                             {{ item }}
                         </p>
                     </div>
@@ -39,21 +54,15 @@
                     <div v-for="(item, i) in list" class="vcl">
                         <p style="width: 60px">
                             {{ item.title }}
-                            <!-- <span style="position: absolute; font-size: 10px; top: -10px; right: -5px; color: #575757">
-                                详情
-                            </span> -->
                         </p>
                         <p
-                            v-for="(k, i) in vList?.slice(0, vList.length - 1)"
+                            v-for="(k, i) in dataVList"
                             class="numOne"
                             @click="LookMap(item.list[i].numOneList, item.list[i].numTwoList, 0)"
                         >
                             {{ item.list[i]?.numOne }}
                         </p>
-                        <!-- <p class="numOne" @click="LookMap(item.list[0].numOneList, item.list[0].numTwoList, 0)">
-                            {{ item.list[0].numOne }}
-                        </p>
-                        <p class="numOne" @click="LookMap(item.list[1].numOneList, item.list[1].numTwoList, 0)">
+                        <!-- <p class="numOne" @click="LookMap(item.list[1].numOneList, item.list[1].numTwoList, 0)">
                             {{ item.list[1].numOne }}
                         </p>
                         <p class="numOne" @click="LookMap(item.list[2].numOneList, item.list[2].numTwoList, 0)">
@@ -62,29 +71,31 @@
                         <p class="numOne" @click="LookMap(item.list[3].numOneList, item.list[3].numTwoList, 0)">
                             {{ item.list[3].numOne }}
                         </p> -->
-                        <!-- <p
+                        <p
+                            v-if="!IS_LN"
                             style="font-size: 12px; width: 32px; cursor: pointer; color: var(--el-color-primary)"
                             @click.stop="open(i)"
                         >
                             详情
-                        </p> -->
+                        </p>
                     </div>
                 </div>
             </div>
             <!-- 干扰源类型统计 -->
-            <div :style="`height:calc(${boxHeight.height} - 55px)`">
+            <div :style="`height:calc(${boxHeight.height} - 95px)`">
                 <div class="title">
-                    <span>干扰源类型统计</span>
+                    <span>场站分类统计</span>
                 </div>
                 <div style="display: flex" class="mt2">
                     <img src="@/assets/img/FGX.png" />
                 </div>
-                <div :style="`height:calc(${boxHeight.height} - 100px );overflow-y: auto;`">
+                <div :style="`height:calc(${boxHeight.height} - 130px );overflow-y: auto;`">
                     <div v-for="item in loadTypeVOListData">
                         <div
                             class="card-Box mt10 card-Box-loadTypeVO"
                             style="max-height: 100px"
-                            :style="`height:calc((${boxHeight.height} - 40px )/ 5.5);`"
+                            :style="`height:calc((${boxHeight.height} - 50px )/ 5.5);`"
+
                         >
                             <div>
                                 <span class="line"></span>
@@ -94,8 +105,7 @@
                             </div>
                             <div class="num">
                                 <div @click="LookMap(item.loadTypeList, [], 0)">
-                                    暂降次数:
-                                    <span>{{ item.count }}</span>
+                                    <span style="color: #0d84ff">{{ item.count }} 个</span>
                                 </div>
                             </div>
                         </div>
@@ -191,7 +201,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref, provide } from 'vue'
+import { onMounted, reactive, ref, provide, computed } from 'vue'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
 import { ArrowRight, View } from '@element-plus/icons-vue'
@@ -204,20 +214,59 @@ import {
     getGridDiagramDev,
     getGridDiagramStatistics,
     getGridDiagramRunData,
-    loadTypeVOList
+    loadTypeVOList, getAreaObjAlarm
 } from '@/api/device-boot/panorama'
 const emit = defineEmits(['LookMap', 'GridDiagram'])
+const IS_LN = import.meta.env.VITE_NAME == 'LN' || import.meta.env.VITE_NAME == 'LNqr'
 const dictData = useDictData()
 const show = ref(false)
 const standRef = ref()
 const terminalRef = ref()
 const pointRef = ref()
 const list: any = ref([
+    {
+        title: '场站',
+        color: ['#000', '#bd3124'],
+
+        list: [
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            }
+        ]
+    },
     {
         title: '变电站',
         color: ['#000', '#bd3124'],
 
         list: [
+
             {
                 numOne: 0,
                 numTwo: 0,
@@ -360,7 +409,9 @@ const linList: any = ref([
     }
 ])
 const panoramicVoltage: any = dictData.getBasicData('Dev_Voltage_Stand')
-const vList = ref(['', '500kV', '220kV', '110kV', '35kV'])
+const vList = ref(['', '500kV', '220kV', '110kV', '35kV', ''])
+const displayVList = computed(() => (IS_LN && vList.value.length ? vList.value.slice(0, -1) : vList.value))
+const dataVList = computed(() => (IS_LN ? vList.value.slice(1, -1) : vList.value.slice(0, vList.value.length - 2)))
 const formRow: any = ref({})
 const height = mainHeight(30)
 const boxHeight = mainHeight(290, 2)
@@ -389,25 +440,31 @@ const info = async (row: any) => {
     countList.value[0].title = row.areaName
     formRow.value = form
     vList.value = ['']
-    // 变电站
-    getSubLineGiveAnAlarm(form).then(res => {
+
+    getAreaObjAlarm(form).then(res => {
         let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
         data[0].data.forEach((item: any) => {
             if (item.columnName) vList.value.push(panoramicVoltage.find((v: any) => v.id == item.columnName).name)
         })
-
+        vList.value.push('')
         list.value[0].list = data[0].data
     })
+
+    // 变电站
+    getSubLineGiveAnAlarm(form).then(res => {
+        let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
+        list.value[1].list = data[0].data
+    })
     // 终端
     getGridDiagramDev(form).then(res => {
         let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
-        list.value[1].list = data[0].data
+        list.value[2].list = data[0].data
     })
     // 监测点
     await getGridDiagramMonitor(form).then(res => {
         let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
 
-        list.value[2].list = data[0].data.map((item: any) => {
+        list.value[3].list = data[0].data.map((item: any) => {
             return {
                 numOne: item.num,
                 numTwo: item.onLineNum,
@@ -428,7 +485,8 @@ const info = async (row: any) => {
         // countList.value[1].children[0] = { title: '电网侧监测点', ...res.data.gwData[0] }
     })
     // 干扰源类型统计
-    loadTypeVOList({ form }).then(res => {
+    loadTypeVOList(form).then(res => {
+        console.log('🚀 ~ loadTypeVOList ~ res:', res)
         loadTypeVOListData.value = res.data
     })
     // 监测运行统计
diff --git a/src/views/pqs/panorama/components/cityMapR.vue b/src/views/pqs/panorama/components/cityMapR.vue
index 528ad5e5..d1f2fa4e 100644
--- a/src/views/pqs/panorama/components/cityMapR.vue
+++ b/src/views/pqs/panorama/components/cityMapR.vue
@@ -20,7 +20,7 @@
             <!-- 稳态指标超标占比 -->
             <div :style="`height:calc(${boxHeight.height} + 40px)`">
                 <div class="title">
-                    <span>稳态指标超标占比</span>
+                    <span>稳态指标超标详情</span>
                     <span class="info" @click="open(1)">
                         详情
                         <ArrowRight style="width: 12px" />
diff --git a/src/views/pqs/panorama/components/details/evaluate.vue b/src/views/pqs/panorama/components/details/evaluate.vue
index 084d2fe3..f004c931 100644
--- a/src/views/pqs/panorama/components/details/evaluate.vue
+++ b/src/views/pqs/panorama/components/details/evaluate.vue
@@ -94,8 +94,8 @@ const router = useRouter()
 const dictData = useDictData()
 const dialogVisible: any = ref(false)
 const rowList: any = ref({})
-const type = ref('1')
-const city = ref('0')
+const type = ref('3')
+const city = ref('1')
 const loading = ref(false)
 const tableData: any = ref([])
 const subdata: any = ref([])
diff --git a/src/views/pqs/panorama/components/mapL-LN.vue b/src/views/pqs/panorama/components/mapL-LN.vue
index b098cece..783ec8ee 100644
--- a/src/views/pqs/panorama/components/mapL-LN.vue
+++ b/src/views/pqs/panorama/components/mapL-LN.vue
@@ -84,7 +84,7 @@
             <!-- 干扰源类型统计 -->
             <div :style="`height:calc(${boxHeight.height} - 95px)`">
                 <div class="title">
-                    <span>干扰源类型统计</span>
+                    <span>场站分类统计</span>
                 </div>
                 <div style="display: flex" class="mt2">
                     <img src="@/assets/img/FGX.png" />
@@ -105,8 +105,7 @@
                             </div>
                             <div class="num">
                                 <div @click="LookMap(item.loadTypeList, [], 0)">
-                                    暂降次数:
-                                    <span>{{ item.count }}</span>
+                                    <span style="color: #0d84ff">{{ item.count }} 个</span>
                                 </div>
                             </div>
                         </div>
@@ -517,7 +516,7 @@ const info = async (row: any) => {
         // countList.value[1].children[0] = { title: '电网侧监测点', ...res.data.gwData[0] }
     })
     // 干扰源类型统计
-    loadTypeVOList({ form }).then(res => {
+    loadTypeVOList(form).then(res => {
         loadTypeVOListData.value = res.data
     })
 
diff --git a/src/views/pqs/panorama/components/mapR.vue b/src/views/pqs/panorama/components/mapR.vue
index b6e442cb..b7af8e8d 100644
--- a/src/views/pqs/panorama/components/mapR.vue
+++ b/src/views/pqs/panorama/components/mapR.vue
@@ -4,7 +4,26 @@
             <!-- 综合评估 -->
             <div style="height: 110px">
                 <div class="title">
-                    <span>稳态电能质量水平评估</span>
+                    <span>
+                        稳态综合评估
+                        <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>
+                                <br />
+                                <span style="color: #3399ff">良好:(4,4.5]</span>
+                                <br />
+                                <span style="color: #ffcc33">合格:(3,4]</span>
+                                <br />
+                                <span style="color: #ff9900">较差:(2,3]</span>
+                                <br />
+                                <span style="color: #A52a2a">极差:[1,2]</span>
+                            </div>
+                        </el-popover>
+                    </span>
                     <span class="info" @click="open(0)">
                         详情
                         <ArrowRight style="width: 12px" />
@@ -15,47 +34,58 @@
                 </div>
                 <div class="mt10 TJTop">
                     <img src="@/assets/img/TJ.png" />
-                    区域污染水平评估
-                    <el-popover placement="right" :width="190" trigger="hover">
-                        <template #reference>
-                            <WarningFilled class="WarningFilled ml5" />
-                        </template>
-                        <div class="text">
-                            <span style="color: #00b07d">无污染：0</span>
-                            <br />
-                            <span style="color: #3399ff">轻微污染：(0 , 100]</span>
-                            <br />
-                            <span style="color: #ffcc33">轻度污染：(100 , 1000]</span>
-                            <br />
-                            <span style="color: #ff9900">中度污染：(1000 , 10000]</span>
-                            <br />
-                            <span style="color: #a52a2a">重度污染：(10000</span>
-                        </div>
-                    </el-popover>
+                    综合评估得分：
+                    <span
+                        :style="{
+                            color:
+                                assessList.score == 3.14159
+                                    ? ''
+                                    : assessList.score > 4.5
+                                    ? '#339966'
+                                    : assessList.score > 4
+                                    ? '#2b7fd3'
+                                    : assessList.score > 3
+                                    ? '#ffcc33'
+                                    : assessList.score > 2
+                                    ? '#97017e'
+                                    : assessList.score > 0
+                                    ? '#A52a2a'
+                                    : ''
+                        }"
+                    >
+                        {{ assessList.score == 3.14159 ? '/' : assessList.score }}
+                    </span>
                 </div>
                 <div class="evaluate">
-                    <div v-for="item in assessList" style="min-width: 60px" class="mb3">
+                    <div v-for="item in assessList.children" style="min-width: 50px">
                         <div>
-                            <span
-                                class="line"
-                                :style="{
-                                    background: setColor(item.score)
-                                }"
-                            ></span>
-                            {{ item.deptName }}
+                            <span class="line"></span>
+                            {{ item.name }}
                         </div>
                         <div
                             style="margin-top: 5px"
                             :style="{
-                                color: setColor(item.score)
+                                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'
+                                        : ''
                             }"
                         >
-                            {{ setVal(item.score) }}
+                            {{ item.score == 3.14159 ? '/' : item.score }}
                         </div>
                     </div>
                 </div>
             </div>
-
             <!-- 稳态电能质量水平评估 -->
             <div>
                 <div class="title">
@@ -78,13 +108,7 @@
                             </span>
                         </div>
 
-                        <el-select
-                            v-model="harmonicType"
-                            style="width: 120px"
-                            @change="harmonicChange"
-                            size="small"
-                            filterable
-                        >
+                        <el-select v-model="harmonicType" style="width: 120px" @change="harmonicChange" size="small" filterable>
                             <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -131,13 +155,7 @@
                             </div>
                         </div>
 
-                        <el-select
-                            v-model="value"
-                            style="width: 120px"
-                            size="small"
-                            @change="transientChange"
-                            filterable
-                        >
+                        <el-select v-model="value" style="width: 120px" size="small" @change="transientChange" filterable>
                             <el-option v-for="item in options1" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </div>
@@ -241,7 +259,6 @@ import temporaryState from './details/temporaryState.vue'
 import technique from './details/technique.vue'
 import {
     getAssessOverview,
-    getAreaPollution,
     getEvaluationOverview,
     getEventLevelEvaluation,
     getSupervisionData
@@ -297,7 +314,8 @@ const options = ref([
     {
         label: '负序电流',
         value: '9'
-    }
+    },
+
 ])
 const technology: any = ref({})
 const harmonicType = ref('6')
@@ -346,16 +364,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, assessList.value)
+        evaluateRef.value.open(formRow.value)
     } else if (e == 1) {
         steadyStateRef.value.open(formRow.value)
     } else if (e == 2) {
@@ -364,36 +383,6 @@ const open = (e: number) => {
         techniqueRef.value.open(formRow.value)
     }
 }
-const setColor = (val: any) => {
-    return val == 3.14159
-        ? ''
-        : val > 10000
-        ? '#A52a2a'
-        : val > 1000
-        ? '#ff9900'
-        : val > 100
-        ? '#ffcc33'
-        : val > 0
-        ? '#3399ff'
-        : val == 0
-        ? '#00B07D'
-        : ''
-}
-const setVal = (val: any) => {
-    return val == 3.14159
-        ? '/'
-        : val > 10000
-        ? '重度'
-        : val > 1000
-        ? '中度'
-        : val > 100
-        ? '轻度'
-        : val > 0
-        ? '轻微'
-        : val == 0
-        ? '无'
-        : ''
-}
 const info = (row: any) => {
     let form = {
         ...row,
@@ -413,10 +402,7 @@ const info = (row: any) => {
     transientChange()
     // 综合评估
     setTimeout(() => {
-        // getAssessOverview(form).then(res => {
-        //     assessList.value = res.data
-        // })
-        getAreaPollution({ ...form, ids: [PollutionList?.[0]?.id] }).then(res => {
+        getAssessOverview(form).then(res => {
             assessList.value = res.data
         })
     }, 300)
@@ -427,6 +413,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 = () => {
@@ -489,11 +476,11 @@ defineExpose({ info, show })
         cursor: pointer;
         color: #757575;
     }
-}
-.WarningFilled {
-    width: 12px;
-    font-weight: 500;
-    cursor: pointer;
+    .WarningFilled {
+        width: 12px;
+        font-weight: 500;
+        cursor: pointer;
+    }
 }
 .TJTop {
     display: flex;