diff --git a/src/api/device-boot/panorama.ts b/src/api/device-boot/panorama.ts
index 2b8aad23..ffd3ff63 100644
--- a/src/api/device-boot/panorama.ts
+++ b/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 })
+}
diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
index a305ac39..bcc209ec 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
+++ b/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',
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
index 33695391..e41e3bdc 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
@@ -48,11 +48,13 @@
变电站详细列表
-
-
-
-
-
+
+
+
+
+
+
+
@@ -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 => {
- tableData.value = res.data.records
+ getPollutionAlarmList(rowList.value).then(res => {
+ 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
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue b/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue
index da389575..cd3f0177 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue
@@ -3,17 +3,16 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
@@ -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 => {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
index 45f2d91b..afa81fda 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
@@ -43,7 +43,7 @@
-
+