diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
index c25bc538..4dce0c97 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
@@ -9,7 +9,7 @@
                     multiple
                     collapse-tags
                     clearable
-                    placeholder="请选择评估类型"
+                    placeholder="请选择超标指标"
                 >
                     <el-option v-for="item in exceeded" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
@@ -27,14 +27,15 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { useDictData } from '@/stores/dictData'
 // Steady_Statis
 const dictData = useDictData()
-const exceeded = dictData.getBasicData('Steady_Statis')
+//字典获取超标指标
+const exceeded = dictData.getBasicData('Indicator_Type')
 const tableRef = ref()
 const planAddRef = ref()
 const listFormRef = ref()
 const TableHeaderRef = ref()
 
 const tableStore = new TableStore({
-    url: '/supervision-boot/generalSurvey/getSurvey',
+    url: '/harmonic-boot/rmppartharmonicdetail/getRMpPartHarmonicDetail',
     publicHeight: 65,
     method: 'POST',
     column: [
@@ -47,13 +48,24 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'orgName', title: '区域' },
-        { field: 'subName', title: '变电站' },
-        { field: 'lineName', title: '监测点名称' },
-        { field: 'voltageScale', title: '电压等级' },
-        { field: 'overDay', title: '总超标天数' },
-        { field: 'overDays', title: '连续超标天数' },
-
+        { field: 'barName', title: '母线名称', width: 170 },
+        { field: 'dateList', title: '超标天数详情', width: 170 },
+        { field: 'loadType', title: '监测点对象类型', width: 170 },
+        { field: 'measurementPointName', title: '监测点名称', width: 170 },
+        { field: 'objName', title: '监测点对象名称' , width: 170 },
+        {
+            field: 'overLimitContinuous',
+            title: '连续超标天数',
+            width: 170
+        },
+        {
+            field: 'overLimitDay',
+            title: '超标天数',
+            width: 170
+        },
+        { field: 'overLimitrate', title: '超标占比'  , width: 170},
+        { field: 'sustationName', title: '变电站名称'  , width: 170},
+        { field: 'voltageLevel', title: '电压等级' , width: 170 },
         {
             title: '操作',
             width: '180',
@@ -66,7 +78,7 @@ const tableStore = new TableStore({
                     title: '发起告警单',
                     type: 'warning',
                     disabled: row => {
-                        return row.overDays <= 15
+                        return row.alarmFlag != 1
                     },
                     icon: 'el-icon-EditPen',
                     render: 'confirmButton',
@@ -84,7 +96,7 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-Open',
                     disabled: row => {
-                        return row.overDays > 15
+                        return row.warningFlag != 1
                     },
                     render: 'confirmButton',
                     popconfirm: {
@@ -104,24 +116,24 @@ const tableStore = new TableStore({
         tableStore.table.params.currentPage = tableStore.table.params.pageNum
     },
     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.data = [
+        //     {
+        //         orgName: '张家口',
+        //         subName: '110kV马头山风电场',
+        //         lineName: '111口头线',
+        //         voltageScale: '110kV',
+        //         overDay: '20',
+        //         overDays: '10'
+        //     },
+        //     {
+        //         orgName: '张家口',
+        //         subName: '110kV韩家庄风电场',
+        //         lineName: '111缘韩一线',
+        //         voltageScale: '110kV',
+        //         overDay: '20',
+        //         overDays: '16'
+        //     }
+        // ]
     }
 })
 
diff --git a/src/views/pqs/supervise/electricalEnergy/index.vue b/src/views/pqs/supervise/electricalEnergy/index.vue
index 2bc609ef..4077fc63 100644
--- a/src/views/pqs/supervise/electricalEnergy/index.vue
+++ b/src/views/pqs/supervise/electricalEnergy/index.vue
@@ -2,13 +2,13 @@
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
             <el-tab-pane label="在线监测" name="1">
-                <online />
+                <online  v-if="activeName=='1'"/>
             </el-tab-pane>
             <el-tab-pane label="用户投诉" name="2">
-                <complaints />
+                <complaints   v-if="activeName=='2'"/>
             </el-tab-pane>
             <el-tab-pane label="现场测试问题" name="3">
-                <testQuestions/>
+                <testQuestions  v-if="activeName=='3'"/>
             </el-tab-pane>
             <!-- <el-tabs v-model="activeName" type="border-card">
             <el-tab-pane label="电能质量问题查询维护" name="1">