diff --git a/src/api/device-boot/panorama.ts b/src/api/device-boot/panorama.ts index f6f41477..0e0c6a50 100644 --- a/src/api/device-boot/panorama.ts +++ b/src/api/device-boot/panorama.ts @@ -145,3 +145,11 @@ export function getGridDiagramAreaData(data: any) { export function getGridDiagramTargetData(data: any) { return request({ url: '/harmonic-boot/gridDiagram/getGridDiagramTargetData', method: 'post', data }) } +//监测点指标统计 +export function getGridDiagramStatistics(data: any) { + return request({ url: '/device-boot/gridDiagram/getGridDiagramStatistics', method: 'post', data }) +} +//监测运行统计 +export function getGridDiagramRunData(data: any) { + return request({ url: '/harmonic-boot/gridDiagram/getGridDiagramRunData', method: 'post', data }) +} diff --git a/src/utils/request.ts b/src/utils/request.ts index ad6bd23e..ae9e70db 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -140,11 +140,11 @@ function createAxios>( }) } } else if (response.data.code == 'A0024') { - // 登录失效 - ElNotification({ - type: 'error', - message: response.data.message - }) + // // 登录失效 + // ElNotification({ + // type: 'error', + // message: response.data.message + // }) adminInfo.removeToken() router.push({ name: 'login' }) return Promise.reject(response.data) diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue index 8631a86e..c7ccea65 100644 --- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue +++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue @@ -168,11 +168,13 @@ const tableStore = new TableStore({ let treeData = [] tableStore.table.data.forEach((item: any) => { if (item.children.length > 0) { - item.id = item.children[0].pid + item.children.forEach((k: any) => { + k.pid = item.id + }) } }) - treeData = tree2List(tableStore.table.data,) + treeData = tree2List(tableStore.table.data) tableStore.table.data = JSON.parse(JSON.stringify(treeData)) setTimeout(() => { diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue index e7f52129..e7c433a2 100644 --- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue +++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue @@ -171,7 +171,9 @@ const tableStore = new TableStore({ let treeData = [] tableStore.table.data.forEach((item: any) => { if (item.children.length > 0) { - item.id = item.children[0].pid + item.children.forEach((k: any) => { + k.pid = item.id + }) } }) treeData = tree2List(tableStore.table.data) @@ -195,7 +197,6 @@ const tree2List = (list: any) => { // 遍历 tree 数组 list.forEach((item: any) => { item.comFlag = item.comFlag == null ? 3 : item.comFlag - item.assess = item.onlineRate == 3.14159 ? 0 : item.onlineRate < 60 ? 1 : item.onlineRate < 90 ? 2 : 3 // 判断item是否存在children if (!item.children) return arr.push(item) diff --git a/src/views/pqs/qualityInspeection/panorama/components/map.vue b/src/views/pqs/qualityInspeection/panorama/components/map.vue index 2172c349..47428e35 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/map.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/map.vue @@ -76,7 +76,7 @@ const dictData = useDictData() const datePickerRef = ref() const form: any = ref({}) const colorKey = ref('') -const PopKey = ref(0) +const PopKey = ref(2) const assessList: any = ref([]) const linList: any = ref([]) const QueryList: any = ref([]) @@ -781,10 +781,9 @@ const radiusPop = (k?: number) => { } mapList.value.forEach((item: any, i: number) => { - console.log('🚀 ~ mapList.value.forEach ~ item:', item.LngLat) let infoText = '' - if (PopKey.value == 0) { + if (PopKey.value == 2) { // 监测点 infoText = `
@@ -798,7 +797,7 @@ const radiusPop = (k?: number) => { item.alarmList }" data-key="1" data-LngLat="${item.LngLat}">告警
${item.alarm}
` - } else if (PopKey.value == 1) { + } else if (PopKey.value == 0) { // 变电站 infoText = `
@@ -809,7 +808,7 @@ const radiusPop = (k?: number) => { item.alarmSubList }" data-key="1" data-LngLat="${item.LngLat}">告警
${item.alarmSubNum}
` - } else if (PopKey.value == 2) { + } else if (PopKey.value == 1) { // 终端 infoText = `
diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue index bf851df8..7c82b11e 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue @@ -1,124 +1,132 @@