修改字段

src/api/device-boot/panorama.ts

@@ -8,6 +8,10 @@ export function getSubLineGiveAnAlarm(data: any) {
 export function getPollutionAlarmPageData(data: any) {
     return request({ url: '/harmonic-boot/gridDiagram/getPollutionAlarmPageData', method: 'post', data })
 }
+// 变电站新详细列表
+export function getPollutionAlarmList(data: any) {
+    return request({ url: '/harmonic-boot/gridDiagram/getPollutionAlarmList', method: 'post', data })
+}
 // 变电站污染告警占比
 export function getPollutionAlarmData(data: any) {
     return request({ url: '/harmonic-boot/gridDiagram/getPollutionAlarmData', method: 'post', data })
@@ -105,4 +109,8 @@ export function qualifiedDetail(data: any) {
 export function getAssessTrend(data: any) {
     return request({ url: '/harmonic-boot/grid/getAssessTrend', method: 'post', data })
 }
+// 暂态详细列表
+export function getEventDetailByList(data: any) {
+    return request({ url: '/event-boot/gridDiagram/getEventDetailByList', method: 'post', data })
+}
 

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

@@ -293,7 +293,7 @@ const info = (row: any) => {
             },
             xAxis: {
                 type: 'category',
-                data: res.data[0].list.map((item: any) => {
+                data: res.data[0].list?.map((item: any) => {
                     return item.targetName.length > 4
                         ? item.targetName.slice(0, 4) + '\n ' + item.targetName.slice(4)
                         : item.targetName
@@ -315,7 +315,7 @@ const info = (row: any) => {
                     {
                         name: '超标监测点数',
                         type: 'bar',
-                        data: res.data[0].list.map((item: any) => item.overNum),
+                        data: res.data[0].list?.map((item: any) => item.overNum),
                         label: {
                             show: true,
                             position: 'top',
@@ -328,7 +328,7 @@ const info = (row: any) => {
                     {
                         name: '超标天数',
                         type: 'bar',
-                        data: res.data[0].list.map((item: any) => item.overDay),
+                        data: res.data[0].list?.map((item: any) => item.overDay),
                         label: {
                             show: true,
                             position: 'top',

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

@@ -48,11 +48,13 @@
                 <span>变电站详细列表</span>
             </div>
             <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="300px" :data="tableData">
-                <vxe-column field="name" title="电站名称" />
+                <vxe-column field="name" title="所属区域" />
-                <vxe-column field="powerCompany" title="所属区域" />
+                <vxe-column field="num" title="变电站总数" />
-                <vxe-column field="voltageLevel" title="电压等级" :formatter="formatter" />
+                <vxe-column field="num1" title="无污染数量" :formatter="formatter" />
-                <vxe-column field="data" title="谐波电压" :formatter="formatter" />
+                <vxe-column field="num2" title="轻微污染数量" :formatter="formatter" />
-                <vxe-column field="dataV" title="谐波电流" :formatter="formatter" />
+                <vxe-column field="num3" title="轻度污染数量" :formatter="formatter" />
+                <vxe-column field="num4" title="中度污染数量" :formatter="formatter" />
+                <vxe-column field="num5" title="重度污染数量" :formatter="formatter" />
             </vxe-table>
         </div>
     </el-dialog>
@@ -64,7 +66,7 @@ import { useDictData } from '@/stores/dictData'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 
 import { WarningFilled } from '@element-plus/icons-vue'
-import { getPollutionAlarmPageData, getPollutionAlarmData, getGridDiagramSubTendency } from '@/api/device-boot/panorama'
+import { getPollutionAlarmList, getPollutionAlarmData, getGridDiagramSubTendency } from '@/api/device-boot/panorama'
 const dictData = useDictData()
 const dialogVisible: any = ref(false)
 const time = ref('1')
@@ -94,8 +96,18 @@ const open = async (row: any) => {
     // 污染
     contaminateC()
     // 列表
-    getPollutionAlarmPageData(rowList.value).then(res => {
+    getPollutionAlarmList(rowList.value).then(res => {
-        tableData.value = res.data.records
+        tableData.value = res.data.map((item: any) => {
+            return {
+                name: item[0],
+                num: item[1],
+                num1: item[2],
+                num2: item[3],
+                num3: item[4],
+                num4: item[5],
+                num5: item[5],
+            }
+        })
     })
 
     dialogVisible.value = true

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

@@ -3,17 +3,16 @@
     <el-dialog draggable title="暂态电能质量水平评估详情" v-model="dialogVisible" width="1400px">
         <div>
             <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="300px" :data="tableData">
-                <vxe-column field="devName" title="所属区域" />
+                <vxe-column field="name" title="所属区域" />
-                <vxe-column field="devName" title="暂态评估得分" />
+
-                <vxe-column field="devName" title="暂态指标" />
+                <vxe-column field="sagTimes" title="暂降次数" />
-                <vxe-column field="devName" title="暂降次数" />
+                <vxe-column field="swellTimes" title="暂升次数" />
-                <vxe-column field="devName" title="暂降原因" />
+                <vxe-column field="interruptTimes" title="短时中断次数" />
-                <vxe-column field="devName" title="暂降类型" />
+
-                <vxe-column field="devName" title="暂态事件个数" />
                 <vxe-colgroup title="暂态严重度占比">
-                    <vxe-column field="devName" title="SARFI-90" />
+                    <vxe-column field="rate20" title="SARFI-90" />
-                    <vxe-column field="devName" title="SARFI-50" />
+                    <vxe-column field="rate20" title="SARFI-50" />
-                    <vxe-column field="devName" title="SARFI-20" />
+                    <vxe-column field="rate90" title="SARFI-20" />
                 </vxe-colgroup>
             </vxe-table>
         </div>
@@ -45,7 +44,7 @@
 import { ref } from 'vue'
 import MyEChart from '@/components/echarts/MyEchart.vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
-import { getEventStatisticsList, getEventReason } from '@/api/device-boot/panorama'
+import { getEventReason, getEventDetailByList } from '@/api/device-boot/panorama'
 
 const dialogVisible: any = ref(false)
 
@@ -56,7 +55,7 @@ const resembleData = ref([])
 const picEChart = ref({})
 const picEChart1 = ref({})
 const open = async (row: any) => {
-    getEventStatisticsList(row).then((res: any) => {
+    getEventDetailByList({ ...row, deviceInfoParam: row }).then((res: any) => {
         tableData.value = res.data
     })
     getEventReason(row).then(res => {

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

@@ -43,7 +43,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column prop="devCount" label="在运终端数" align="center" />
-                        <el-table-column prop="devCount" label="在线终端数" align="center" />
+                        <el-table-column prop="devOnCount" label="在线终端数" align="center" />
                     </el-table>
                 </div>
             </el-col>