diff --git a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
index ec11395c..5a41662f 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
@@ -1,42 +1,78 @@
@@ -23,8 +31,10 @@
-
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
-
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue
index ca069d3f..ed3e729c 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue
@@ -87,15 +87,15 @@ const init = () => {
let yData = [],
yData2 = []
for (let i = 0; i < steadyInfoList.length; i++) {
- if (steadyInfoList[i] == 3.1415) {
- steadyInfoList[i] = 1
- yData.push(steadyInfoList[i])
- } else if (steadyInfoList[i] == 3.14159) {
- steadyInfoList[i] = 1
- yData.push(steadyInfoList[i])
- } else if (steadyInfoList[i] !== 3.14159) {
- yData.push(steadyInfoList[i])
- }
+ // if (steadyInfoList[i] == 3.1415) {
+ // steadyInfoList[i] = 1
+ // yData.push(steadyInfoList[i])
+ // } else if (steadyInfoList[i] == 3.14159) {
+ // steadyInfoList[i] = 1
+ // yData.push(steadyInfoList[i])
+ // } else if (steadyInfoList[i] !== 3.14159) {
+ yData.push(steadyInfoList[i])
+ // }
}
for (let i = 0; i < steadyInfoData.length; i++) {
if (steadyInfoData[i] == 3.1415) {
@@ -169,6 +169,8 @@ const init = () => {
return gradeColor3[0]
} else if (params.value > 60) {
return gradeColor3[1]
+ } else if (params.value == 3.14159) {
+ return '#ccc'
} else {
return gradeColor3[2]
}
@@ -224,7 +226,7 @@ const init = () => {
opacity: 0.35,
fontSize: 14
},
- backgroundColor: 'rgba(0,0,0,0.55)',
+ backgroundColor: 'rgba(0,0,0,0.55)'
// formatter: function (params: any) {
// //console.log(params)
// let msg = ''
diff --git a/src/views/pqs/panorama/components/cityMapL.vue b/src/views/pqs/panorama/components/cityMapL.vue
index a650ab86..27e91c70 100644
--- a/src/views/pqs/panorama/components/cityMapL.vue
+++ b/src/views/pqs/panorama/components/cityMapL.vue
@@ -13,9 +13,17 @@
{{ item.title }}：
-
- {{ item.list[4].numOne }}
+
+ {{ item.list[item.list.length - 1]?.numOne }}
-
@@ -36,7 +46,14 @@
详情
-->
- +
{{ item }}
+
+ {{ item.list[i]?.numOne }} +
+
- 在线监测点数：{{ monitorList.onlineNum }}
+ 在线监测点数：{{ monitorList?.onlineNum }}
- 超标监测点数：{{ monitorList.overNum }}
+ 超标监测点数：{{ monitorList?.overNum }}
- 超标监测点占比：{{ monitorList.overRatio }}
+ 超标监测点占比：{{ monitorList?.overRatio }}
+
省
市
@@ -176,7 +176,7 @@ const analysis = () => {
text: '各地市综合评估趋势对比'
},
legend: {
- right: 120,
+ right: 125,
top: 20
},
// tooltip: {
diff --git a/src/views/pqs/panorama/components/line/history.vue b/src/views/pqs/panorama/components/line/history.vue
index 45a87952..cbd36a7d 100644
--- a/src/views/pqs/panorama/components/line/history.vue
+++ b/src/views/pqs/panorama/components/line/history.vue
@@ -1,6 +1,6 @@
-
{
}
],
toolbox: {
- show: true,
+ show: false,
feature: {
dataZoom: {
// bottom: '10px',
diff --git a/src/views/pqs/panorama/components/line/info.vue b/src/views/pqs/panorama/components/line/info.vue
index 43abb9bf..fa73fd54 100644
--- a/src/views/pqs/panorama/components/line/info.vue
+++ b/src/views/pqs/panorama/components/line/info.vue
@@ -653,6 +653,7 @@ const echart = (row: any) => {
data: [item.ratioList]
})
})
+ console.log("🚀 ~ echart ~ option:", option)
chart.setOption(option)
}
diff --git a/src/views/pqs/panorama/components/map.vue b/src/views/pqs/panorama/components/map.vue
index e1f8847d..33eb3fa3 100644
--- a/src/views/pqs/panorama/components/map.vue
+++ b/src/views/pqs/panorama/components/map.vue
@@ -235,7 +235,7 @@ const AreaData: any = ref([])
const PopKey: any = ref(2)
const imgUrl0 = new URL('@/assets/img/BDZ-ZS.png', import.meta.url).href
const imgUrl1 = new URL('@/assets/img/ZD-ZS.png', import.meta.url).href
-const imgUrl2 = new URL('@/assets/img/JCD-ZS.png', import.meta.url).hre
+const imgUrl2 = new URL('@/assets/img/JCD-ZS.png', import.meta.url).href
const boundaryList: any = ref([
// {
// orgName: '唐山',
@@ -534,7 +534,6 @@ const grids = (row: any) => {
getGridDiagramAreaData({ ...form, deptIndex: deptIndex.value }).then((res: any) => {
AreaData.value = res.data
- console.log('🚀 ~ getGridDiagramAreaData ~ AreaData.value:', AreaData.value)
GridDiagramArea()
})
// if (powerManageGridMap.value) powerLoad()
@@ -546,22 +545,24 @@ const radiusPop = (k: any) => {
}
const GridDiagramArea = () => {
boundaryList.value.forEach((item: any) => {
- assessList.value.forEach((y: any) => {
- if (item.orgName == y.name) {
- if (y.score == 3.14159) {
- } else if (y.score > 4.5) {
- item.background = '#33996699'
- } else if (y.score > 4) {
- item.background = '#3399ff99'
- } else if (y.score > 3) {
- item.background = '#ffcc3399'
- } else if (y.score > 2) {
- item.background = '#db088799'
- } else if (y.score > 0) {
- item.background = '#ff000099'
+
+ assessList.value &&
+ assessList.value.forEach((y: any) => {
+ if (item.orgName == y.name) {
+ if (y.score == 3.14159) {
+ } else if (y.score > 4.5) {
+ item.background = '#33996699'
+ } else if (y.score > 4) {
+ item.background = '#3399ff99'
+ } else if (y.score > 3) {
+ item.background = '#ffcc3399'
+ } else if (y.score > 2) {
+ item.background = '#db088799'
+ } else if (y.score > 0) {
+ item.background = '#ff000099'
+ }
}
- }
- })
+ })
AreaData.value.forEach((k: any, i: any) => {
if (item.orgName == k.orgName) {
for (let kk in item) {
diff --git a/src/views/pqs/panorama/components/mapL.vue b/src/views/pqs/panorama/components/mapL.vue
index 576b89a6..2c64e1df 100644
--- a/src/views/pqs/panorama/components/mapL.vue
+++ b/src/views/pqs/panorama/components/mapL.vue
@@ -13,9 +13,17 @@
@@ -23,8 +31,10 @@
@@ -69,8 +82,11 @@
{{ item.title }}
-
{{ item.title }}：
-
- {{ item.list[4].numOne }}
+
+ {{ item.list?.[item.list.length - 1]?.numOne }}
-
@@ -32,14 +42,15 @@
+
{{ item }}
{{ item.title }} -
-- {{ item.list[0].numOne }} +
+ {{ item.list[i]?.numOne }}
-+ +
详情
{{ item.title }}
+
- 
+
{{ val.title }}
@@ -127,8 +143,12 @@
+
@@ -333,7 +353,8 @@ const legengList = [
title: '极差'
}
]
-const vList = ['', '500kV', '220kV', '110kV', '35kV', '']
+const panoramicVoltage: any = dictData.getBasicData('Dev_Voltage_Stand')
+const vList = ref(['', '500kV', '220kV', '110kV', '35kV', ''])
const formRow: any = ref({})
const height = mainHeight(30)
const boxHeight = mainHeight(290, 2)
@@ -361,10 +382,14 @@ const info = async (row: any) => {
}
countList.value[0].title = row.areaName
formRow.value = form
-
+ vList.value = ['']
// 变电站
getSubLineGiveAnAlarm(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
})
// 终端
@@ -385,10 +410,10 @@ const info = async (row: any) => {
}
})
- list.value[2].list.push({
- numOne: 0,
- numOneList: []
- })
+ // list.value[2].list.push({
+ // numOne: 0,
+ // numOneList: []
+ // })
})
// 监测点指标统计
getGridDiagramStatistics(form).then(res => {
@@ -418,7 +443,7 @@ const LookMap = (coutList: object, alarmList: object, key?: any) => {
const GridDiagram = (k: any) => {
emit('GridDiagram', k)
}
-onMounted(() => { })
+onMounted(() => {})
defineExpose({ info, show })
diff --git a/src/views/pqs/panorama/index.vue b/src/views/pqs/panorama/index.vue
index 1549b614..3462635b 100644
--- a/src/views/pqs/panorama/index.vue
+++ b/src/views/pqs/panorama/index.vue
@@ -7,11 +7,11 @@
-
+
@@ -226,7 +225,7 @@ const inputQuery: any = ref('')
const QueryList: any = ref([])
const activeName: any = ref(0)
-const zoomMap = ref(8.8)
+const zoomMap = ref(9.8)
const colorKey = ref('')
const showCollapse: any = ref(true)
const showWrap: any = ref(false)
@@ -236,7 +235,7 @@ const AreaData: any = ref([])
const PopKey: any = ref(2)
const imgUrl0 = new URL('@/assets/img/BDZ-ZS.png', import.meta.url).href
const imgUrl1 = new URL('@/assets/img/ZD-ZS.png', import.meta.url).href
-const imgUrl2 = new URL('@/assets/img/JCD-ZS.png', import.meta.url).hre
+const imgUrl2 = new URL('@/assets/img/JCD-ZS.png', import.meta.url).href
const boundaryList: any = ref([
{
orgName: '唐山',
@@ -264,1522 +263,17 @@ const boundaryList: any = ref([
boundary: mapJson.lfJSON
}
])
-const mapStyle = ref(
- ref({
- styleJson: [
- {
- featureType: 'land',
- elementType: 'geometry',
- stylers: {
- visibility: 'on',
- color: '#091220ff'
- }
- },
- {
- featureType: 'water',
- elementType: 'geometry',
- stylers: {
- visibility: 'on',
- color: '#113549ff'
- }
- },
- {
- featureType: 'green',
- elementType: 'geometry',
- stylers: {
- visibility: 'on',
- color: '#0e1b30ff'
- }
- },
- {
- featureType: 'building',
- elementType: 'geometry',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'building',
- elementType: 'geometry.topfill',
- stylers: {
- color: '#113549ff'
- }
- },
- {
- featureType: 'building',
- elementType: 'geometry.sidefill',
- stylers: {
- color: '#143e56ff'
- }
- },
- {
- featureType: 'building',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#dadada00'
- }
- },
- {
- featureType: 'subwaystation',
- elementType: 'geometry',
- stylers: {
- visibility: 'on',
- color: '#113549B2'
- }
- },
- {
- featureType: 'education',
- elementType: 'geometry',
- stylers: {
- visibility: 'on',
- color: '#12223dff'
- }
- },
- {
- featureType: 'medical',
- elementType: 'geometry',
- stylers: {
- visibility: 'on',
- color: '#12223dff'
- }
- },
- {
- featureType: 'scenicspots',
- elementType: 'geometry',
- stylers: {
- visibility: 'on',
- color: '#12223dff'
- }
- },
- {
- featureType: 'highway',
- elementType: 'geometry',
- stylers: {
- visibility: 'on',
- weight: 4
- }
- },
- {
- featureType: 'highway',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'highway',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#fed66900'
- }
- },
- {
- featureType: 'highway',
- elementType: 'labels',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'highway',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'highway',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'highway',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'arterial',
- elementType: 'geometry',
- stylers: {
- visibility: 'on',
- weight: 2
- }
- },
- {
- featureType: 'arterial',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'arterial',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffeebb00'
- }
- },
- {
- featureType: 'arterial',
- elementType: 'labels',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'arterial',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'arterial',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'local',
- elementType: 'geometry',
- stylers: {
- visibility: 'on',
- weight: 1
- }
- },
- {
- featureType: 'local',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'local',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'local',
- elementType: 'labels',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'local',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#979c9aff'
- }
- },
- {
- featureType: 'local',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffffff'
- }
- },
- {
- featureType: 'railway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'subway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off',
- weight: 1
- }
- },
- {
- featureType: 'subway',
- elementType: 'geometry.fill',
- stylers: {
- color: '#d8d8d8ff'
- }
- },
- {
- featureType: 'subway',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'subway',
- elementType: 'labels',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'subway',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#979c9aff'
- }
- },
- {
- featureType: 'subway',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffffff'
- }
- },
- {
- featureType: 'continent',
- elementType: 'labels',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'continent',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'continent',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'continent',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'city',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'city',
- elementType: 'labels',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'city',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'city',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'town',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'town',
- elementType: 'labels',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'town',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#454d50ff'
- }
- },
- {
- featureType: 'town',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffffff'
- }
- },
- {
- featureType: 'road',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'poilabel',
- elementType: 'labels',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'districtlabel',
- elementType: 'labels',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'road',
- elementType: 'geometry',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'road',
- elementType: 'labels',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'road',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'district',
- elementType: 'labels',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'poilabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'poilabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'poilabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'manmade',
- elementType: 'geometry',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'districtlabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffffff'
- }
- },
- {
- featureType: 'entertainment',
- elementType: 'geometry',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'shopping',
- elementType: 'geometry',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'nationalway',
- stylers: {
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '6'
- }
- },
- {
- featureType: 'nationalway',
- stylers: {
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '7'
- }
- },
- {
- featureType: 'nationalway',
- stylers: {
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '8'
- }
- },
- {
- featureType: 'nationalway',
- stylers: {
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '9'
- }
- },
- {
- featureType: 'nationalway',
- stylers: {
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '10'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '6'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '7'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '8'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '9'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '10'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'labels',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '6'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'labels',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '7'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'labels',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '8'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'labels',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '9'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'labels',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,10',
- level: '10'
- }
- },
- {
- featureType: 'cityhighway',
- stylers: {
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '6'
- }
- },
- {
- featureType: 'cityhighway',
- stylers: {
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '7'
- }
- },
- {
- featureType: 'cityhighway',
- stylers: {
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '8'
- }
- },
- {
- featureType: 'cityhighway',
- stylers: {
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '9'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '6'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '7'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '8'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'geometry',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '9'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'labels',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '6'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'labels',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '7'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'labels',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '8'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'labels',
- stylers: {
- visibility: 'off',
- curZoomRegionId: '0',
- curZoomRegion: '6,9',
- level: '9'
- }
- },
- {
- featureType: 'subwaylabel',
- elementType: 'labels',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'subwaylabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'tertiarywaysign',
- elementType: 'labels',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'tertiarywaysign',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'provincialwaysign',
- elementType: 'labels',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'provincialwaysign',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'nationalwaysign',
- elementType: 'labels',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'nationalwaysign',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'highwaysign',
- elementType: 'labels',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'highwaysign',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'village',
- elementType: 'labels',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'district',
- elementType: 'labels.text',
- stylers: {
- fontsize: 20
- }
- },
- {
- featureType: 'district',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'district',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'country',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'country',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'water',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'water',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'tertiaryway',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'tertiaryway',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff10'
- }
- },
- {
- featureType: 'provincialway',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'provincialway',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'highway',
- elementType: 'labels.text',
- stylers: {
- fontsize: 20
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'nationalway',
- elementType: 'labels.text',
- stylers: {
- fontsize: 20
- }
- },
- {
- featureType: 'provincialway',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'provincialway',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'provincialway',
- elementType: 'labels.text',
- stylers: {
- fontsize: 20
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'labels.text',
- stylers: {
- fontsize: 20
- }
- },
- {
- featureType: 'cityhighway',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'estate',
- elementType: 'geometry',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'tertiaryway',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'tertiaryway',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'fourlevelway',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'fourlevelway',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'scenicspotsway',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'scenicspotsway',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'universityway',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'universityway',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'vacationway',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'vacationway',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'fourlevelway',
- elementType: 'geometry',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'fourlevelway',
- elementType: 'geometry.fill',
- stylers: {
- color: '#12223dff'
- }
- },
- {
- featureType: 'fourlevelway',
- elementType: 'geometry.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'transportationlabel',
- elementType: 'labels',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'transportationlabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'transportationlabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'transportationlabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'educationlabel',
- elementType: 'labels',
- stylers: {
- visibility: 'on'
- }
- },
- {
- featureType: 'educationlabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'educationlabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'educationlabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'transportation',
- elementType: 'geometry',
- stylers: {
- color: '#113549ff'
- }
- },
- {
- featureType: 'airportlabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'airportlabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'scenicspotslabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'scenicspotslabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'medicallabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'medicallabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'medicallabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'scenicspotslabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'airportlabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'entertainmentlabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'entertainmentlabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'entertainmentlabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'estatelabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'estatelabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'estatelabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'businesstowerlabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'businesstowerlabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'businesstowerlabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'companylabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'companylabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'companylabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'governmentlabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'governmentlabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'governmentlabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'restaurantlabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'restaurantlabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'restaurantlabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'hotellabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'hotellabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'hotellabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'shoppinglabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'shoppinglabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'shoppinglabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'lifeservicelabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'lifeservicelabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'lifeservicelabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'carservicelabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'carservicelabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'carservicelabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'financelabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'financelabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'financelabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'otherlabel',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'otherlabel',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'otherlabel',
- elementType: 'labels.icon',
- stylers: {
- visibility: 'off'
- }
- },
- {
- featureType: 'manmade',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'manmade',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'transportation',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'transportation',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'education',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'education',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'medical',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'medical',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- },
- {
- featureType: 'scenicspots',
- elementType: 'labels.text.fill',
- stylers: {
- color: '#2dc4bbff'
- }
- },
- {
- featureType: 'scenicspots',
- elementType: 'labels.text.stroke',
- stylers: {
- color: '#ffffff00'
- }
- }
- ]
- })
-)
+
+
+
const zoom = ref(13)
const areaLineInfo = ref([])
const siteList = ref([])
const polyline = ref([])
const lineId = ref('')
const center = ref({
- lng: 116.84428600000001,
- lat: 40.57707185292256
+ lng: 122.42588,
+ lat: 41.210977
})
const infoWindowPoint = ref({
lng: 0,
diff --git a/src/views/pqs/runManage/runEvaluate/components/region.vue b/src/views/pqs/runManage/runEvaluate/components/region.vue
index 22ba672a..8236a80c 100644
--- a/src/views/pqs/runManage/runEvaluate/components/region.vue
+++ b/src/views/pqs/runManage/runEvaluate/components/region.vue
@@ -36,9 +36,9 @@ const info = () => {
yAxis: {
type: 'category',
data: dataSource.map(item => item.name),
- axisLabel: {
- color: '#fff'
- },
+ // axisLabel: {
+ // color: '#fff'
+ // },
splitLine: {
show: false
}
@@ -48,9 +48,9 @@ const info = () => {
data: [1,2,3,4],
axisLabel: {
show: true,
- textStyle: {
- color: '#FFF'
- },
+ // textStyle: {
+ // color: '#FFF'
+ // },
// formatter: function (value) {
// }
diff --git a/src/views/pqs/runManage/runEvaluate/components/run.vue b/src/views/pqs/runManage/runEvaluate/components/run.vue
index bd457dce..0c0f6b54 100644
--- a/src/views/pqs/runManage/runEvaluate/components/run.vue
+++ b/src/views/pqs/runManage/runEvaluate/components/run.vue
@@ -1,135 +1,164 @@
-
-
-
-
-
-
+
+
+
{{ infoWindowPoint.gdName }}
{{ infoWindowPoint.subName }}
{{ infoWindowPoint.voltageName }}
-
-
- 完整率
- 98分
- 优
+
@@ -250,7 +252,7 @@ import TableHeader from '@/components/table/header/index.vue'
import TableStore from '@/utils/tableStore'
import { useDictData } from '@/stores/dictData'
import { mainHeight } from '@/utils/layout'
-
+import Area from '@/components/form/area/index.vue'
import Map from './components/map.vue'
import { BorderBox13 } from '@kjgl77/datav-vue3'
import { useConfig } from '@/stores/config'
@@ -266,45 +268,36 @@ import regionDetails from './components/regionDetails.vue'
defineOptions({
name: 'runManage/runEvaluate'
})
+const runRef = ref()
+const weekRef = ref()
+const terminalDetailsRef = ref()
const config = useConfig()
const color = config.layout.elementUiPrimary
const dictData = useDictData()
const height = mainHeight(115)
const height3 = mainHeight(115, 3)
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
//字典获取监督对象类型
-const supvObjTypeList = dictData.getBasicData('supv_obj_type')
+const powerFlagList = dictData.getBasicData('power_flag')
const tableStore = new TableStore({
- url: '/user-boot/user/getAllUserSimpleList',
- method: 'GET',
- isWebPaging: true,
- showPage: false,
- publicHeight: 480,
- column: [
- { title: '序号', width: 80 },
- { title: '监测对象类型', field: 'name3' },
- { title: '监测对象名称', field: 'name4' },
- { title: '电压等级', field: 'name5' },
- {
- title: '操作',
- width: '120',
- render: 'buttons',
- buttons: [
- {
- name: 'edit',
- title: '工单',
- type: 'primary',
- icon: 'el-icon-Plus',
- render: 'basicButton',
- click: row => {}
- }
- ]
- }
- ],
+ url: '/device-boot/dev/statisticDevNum',
+ method: 'POST',
+ column: [],
loadCallback: () => {
- tableStore.table.data = []
+ runRef.value.info()
+ weekRef.value.info()
+ terminalDetailsRef.value.info()
}
})
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.loadType = dictData.getBasicData('Interference_Source')
+tableStore.table.params.terminaloption = dictData.getBasicData('Dev_Manufacturers')
+tableStore.table.params.scale = dictData.getBasicData('Dev_Voltage_Stand')
+tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0] //dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.serverName = 'harmonicBoot'
provide('tableStore', tableStore)
const leftVisible = ref(true)
const rightVisible = ref(true)
@@ -317,14 +310,21 @@ const toggle = () => {
rightVisible.value = !rightVisible.value
centerVisible.value = !centerVisible.value
}
-// 终端统计详情
-const endpointStatistics = () => {
- statisticsPopUpBoxRef.value.open()
+
+// 区域变化
+const changeValue = (val: any) => {
+
+ tableStore.index()
}
// 区域详情
const regionEvaluation = () => {
regionDetailsRef.value.open()
}
+const terminalOperationRef = ref()
+//渲染 在线率
+const reviewDetails = (item: any) => {
+ terminalOperationRef.value.info(item)
+}
onMounted(() => {
// 加载数据
@@ -439,7 +439,7 @@ onMounted(() => {
top: 80px;
left: calc(50% + 45px);
- z-index: 1;
+ z-index: 10;
.el-select {
min-width: 100px;
@@ -473,4 +473,7 @@ onMounted(() => {
margin-right: 15px;
}
}
+:deep(.view) {
+ color: #000 !important;
+}
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/ITICquxianfenxi/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/ITICquxianfenxi/index.vue
index 376aec77..4109f55e 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/ITICquxianfenxi/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/ITICquxianfenxi/index.vue
@@ -62,7 +62,6 @@ const init = () => {
},
legend: {
data: ['上限', '下限', '可容忍事件', '不可容忍事件'],
- x: 'left'
},
tooltip: {
trigger: 'item',
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue
index 64592d58..7855c52e 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue
@@ -61,7 +61,6 @@ const init = () => {
},
legend: {
data: ['上限', '下限', '可容忍事件', '不可容忍事件'],
- x: 'left'
},
tooltip: {
trigger: 'item',
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue
index 85ed11d0..9e771baa 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue
@@ -48,7 +48,6 @@ const init = () => {
},
legend: {
show: true,
- left: 10,
data: ['概率分布', '占比'],
textStyle: {
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfenbutongji/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfenbutongji/index.vue
index 833b0bbe..fcfba86a 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfenbutongji/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfenbutongji/index.vue
@@ -117,7 +117,7 @@ const initFirst = () => {
},
legend: {
data: ['暂降次数'],
- x: 'right'
+
},
xAxis: [
{
@@ -198,7 +198,6 @@ const initSecond = () => {
},
legend: {
orient: 'vertical',
- left: 'left',
data: reaArray
},
series: [
@@ -274,7 +273,6 @@ const initThird = () => {
},
legend: {
orient: 'vertical',
- left: 'left',
data: typeArray
},
series: [
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfuzhigailvfenbu/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfuzhigailvfenbu/index.vue
index 1a4da3b2..ae683a5f 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfuzhigailvfenbu/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfuzhigailvfenbu/index.vue
@@ -48,7 +48,6 @@ const init = () => {
},
legend: {
show: true,
- left: 10,
data: ['概率分布', '占比'],
textStyle: {
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
index 2920171b..a7289317 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
@@ -76,9 +76,9 @@
@click="markerClick(path)"
>
-
+
@@ -226,14 +228,14 @@
+
+
-
-
+
diff --git a/src/views/pqs/runManage/runEvaluate/components/statistics.vue b/src/views/pqs/runManage/runEvaluate/components/statistics.vue
index df8fef97..ae015699 100644
--- a/src/views/pqs/runManage/runEvaluate/components/statistics.vue
+++ b/src/views/pqs/runManage/runEvaluate/components/statistics.vue
@@ -1,17 +1,22 @@
-
+
-
+
- 在线率
- 98分
- 优
+
{{ item.name }}
+ {{ Math.floor(item.evaluate * 100).toFixed(0) / 100 }}分
+
+ {{ rating(item.evaluate) }}
+
+
-
-
- 合格率
- 98分
- 优
-
-
+
()
-const info = () => {
+const info = (item: any) => {
let chart = echarts.init(chartRef.value as HTMLDivElement)
- let option = {
- toolbox: {
- show: false
- },
- tooltip: {
- trigger: 'item',
- axisPointer: {
- type: 'shadow',
- label: {
- color: '#fff',
- fontSize: 14
- }
- },
- textStyle: {
- color: '#fff',
- fontStyle: 'normal',
- opacity: 0.35,
- fontSize: 14
- },
- backgroundColor: 'rgba(0,0,0,0.55)',
- borderWidth: 0,
- confine: true
- },
+ let everyDepartment = {
+ stages: [
+ { name: '在线率', max: 100 },
+ { name: '合格率', max: 100 },
+ { name: '完整率', max: 100 }
+ ],
+ scores: [item.onLineRate, item.passRate, item.integrityRate]
+ }
+
+ function contains(arr, obj) {
+ var i = arr.length
+ while (i--) {
+ if (arr[i].name === obj) {
+ return i
+ }
+ }
+ return false
+ }
+
+ let option = {
+ backgroundColor: '',
+ color: ['#fff'],
radar: {
- shape: 'circle',
- center: ['50%', '55%'],
+ center: ['50%', '65%'],
+ radius: '80%',
+ triggerEvent: true,
name: {
- textStyle: {
- color: '#fff',
- fontSize: 14
+ rich: {
+ a: {
+ color: '#000',
+ fontSize: 14,
+ lineHeight: 20
+ },
+ b: {
+ color: config.layout.elementUiPrimary[0],
+ fontSize: 16,
+ align: 'center'
+ },
+ triggerEvent: true
+ },
+ formatter: (a, index) => {
+ let values = a.length > 6 ? a.slice(0, 6) + '...' : a
+ let i = contains(everyDepartment.stages, a) // 处理对应要显示的样式
+ return `{a| ${values}}{b| ${(everyDepartment.scores[i])}%}`
}
},
- indicator: [
- {
- text: '完整率',
- min: 0,
- max: 100
- },
- {
- text: '合格率',
- min: 0,
- max: 100
- },
- {
- text: '在线率',
- min: 0,
- max: 100
- }
- ],
+ indicator: everyDepartment.stages,
+ startAngle: 90,
+ splitNumber: 5,
splitArea: {
- // 坐标轴在 grid 区域中的分隔区域，默认不显示。
- show: true,
areaStyle: {
- // 分隔区域的样式设置。
- color: ['rgba(27, 50, 66, 0.4)']
+ color: ['#FFFFFF', '#F5F9FF'].reverse()
}
},
+ axisLabel: {
+ show: false
+ },
axisLine: {
- //指向外圈文本的分隔线样式
+ show: true,
lineStyle: {
- color: '#5aa3d0'
+ color: '#D2E4F8'
}
},
splitLine: {
+ show: true,
lineStyle: {
- color: 'rgba(99,192,251,0.2)', // 分隔线颜色
- width: 2 // 分隔线线宽
+ color: '#D2E4F8'
}
}
},
- series: {
- name: '',
- type: 'radar',
- symbolSize: 8,
- itemStyle: {
- borderColor: color[1],
- borderWidth: 2
- },
- areaStyle: {
- normal: {
- width: 1,
- opacity: 0.3
- }
- },
- data: [
- {
- itemStyle: {
- normal: {
- color: color[1]
- }
- },
- value: [20, 33, 80]
- }
- ]
- }
+
+ series: [
+ {
+ type: 'radar',
+ // 外线框
+ symbol: 'none',
+ areaStyle: {
+ normal: {
+ color: `${config.layout.elementUiPrimary[0]}69`
+ }
+ },
+ itemStyle: {
+ color: config.layout.elementUiPrimary[0]
+ },
+
+ data: [
+ {
+ value: everyDepartment.scores
+ }
+ ]
+ }
+ ]
}
chart.setOption(option)
+ window.addEventListener('resize', () => {
+ chart.resize() // 调用 resize 方法
+ })
}
-onMounted(() => {
- info()
+defineExpose({
+ info
})
diff --git a/src/views/pqs/runManage/runEvaluate/components/week.vue b/src/views/pqs/runManage/runEvaluate/components/week.vue
index c9d59831..cd20777b 100644
--- a/src/views/pqs/runManage/runEvaluate/components/week.vue
+++ b/src/views/pqs/runManage/runEvaluate/components/week.vue
@@ -8,112 +8,78 @@ import { ref, reactive, onMounted } from 'vue'
import MyEChart from '@/components/echarts/MyEchart.vue'
import { mainHeight } from '@/utils/layout'
import { yMethod } from '@/utils/echartMethod'
+import { lastWeekTrend } from '@/api/device-boot/runEvaluate'
+const props = defineProps({
+ params: {
+ type: Object,
+ default: () => {}
+ }
+})
const options = ref({})
-const height = mainHeight(330, 3)
+const height = mainHeight(290, 3)
const info = () => {
- let [min, max] = yMethod([80, 99])
- options.value = {
- xAxis: {
- axisLabel: {
- show: true,
- textStyle: {
- color: '#FFF'
+ lastWeekTrend(props.params).then((res: any) => {
+
+ options.value = {
+ xAxis: {
+ axisLabel: {
+ show: true
+ },
+ splitLine: {
+ show: false
+ },
+ axisTick: {
+ show: false
+ },
+ axisLine: {
+ show: true
+ },
+ data: res.data.date
+ },
+ grid: {
+ top: '30',
+ left: '10',
+ right: '10'
+ },
+ toolbox: {
+ show: false
+ },
+ yAxis: {
+ min: 0,
+ max: 100,
+ axisLine: {
+ show: true
+ },
+
+ splitLine: {
+ show: false
}
},
- splitLine: {
- show: false
+ legend:{
+ top: '5',
+ right: '5',
+ type: 'scroll',
},
- axisTick: {
- show: false
- },
- axisLine: {
- show: true
- },
- data: ['03-24', '03-25', '03-26', '03-27', '03-28', '03-29', '03-30']
- },
- legend: {
- textStyle: {
- color: '#fff'
+ options: {
+ series: []
}
- },
- grid: {
- top: '50',
- left: '20',
- right: '20'
- },
- toolbox: {
- show: false
- },
- yAxis: {
- min: min,
- max: 100,
- axisLine: {
- show: true
- },
- axisLabel: {
- color: '#fff'
- },
- splitLine: {
- show: false
- }
- },
- // color: [color[1]],
- // ['承德', '唐山', '秦皇岛', '廊坊', '张家口']
- options: {
- dataZoom: null,
- series: [
- {
- name: '承德',
- type: 'line',
- symbol: 'circle',
- smooth: true,
- showSymbol: false,
-
- data: [80, 82, 90, 92, 97,100,100]
- },
- {
- name: '唐山',
- type: 'line',
- symbol: 'circle',
- smooth: true,
- showSymbol: false,
-
- data: [83, 84, 91, 93, 98,100,100]
- },
- {
- name: '秦皇岛',
- type: 'line',
- symbol: 'circle',
- smooth: true,
- showSymbol: false,
-
- data: [84, 82, 90, 90, 95,100,100]
- },
- {
- name: '廊坊',
- type: 'line',
- symbol: 'circle',
- smooth: true,
- showSymbol: false,
-
- data: [87, 82, 90, 94, 97,100,100]
- },
- {
- name: '张家口',
- type: 'line',
- symbol: 'circle',
- smooth: true,
- showSymbol: false,
-
- data: [90, 92, 95, 97, 100,100,100]
- }
- ]
}
- }
+ res.data.name.forEach((item: any, i: number) => {
+ options.value.options.series.push({
+ name: item,
+ type: 'line',
+ symbol: 'circle',
+ smooth: true,
+ showSymbol: false,
+ data: res.data.score[i]
+ })
+ })
+ })
}
-onMounted(() => {
- info()
+onMounted(() => {})
+defineExpose({
+ info
})
diff --git a/src/views/pqs/runManage/runEvaluate/index.vue b/src/views/pqs/runManage/runEvaluate/index.vue
index e2aa568e..229d1d9b 100644
--- a/src/views/pqs/runManage/runEvaluate/index.vue
+++ b/src/views/pqs/runManage/runEvaluate/index.vue
@@ -1,19 +1,19 @@
@@ -192,13 +194,13 @@
@@ -207,7 +209,7 @@
style="height: 100%"
:color="[color[0], color[0]]"
class="box"
- :backgroundColor="`${color[0]}24`"
+ :backgroundColor="`#f3f1ec90`"
title="最近一周终端评价趋势"
>
- 
300
+ {{ props.params.allNum }}
总数
-
250
+ {{ props.params.runNum }}
在运
-
+
+ 50
+ {{ props.params.checkNum }}
+
+ 调试
+
+
@@ -23,37 +28,41 @@ import MyEChart from '@/components/echarts/MyEchart.vue'
import { mainHeight } from '@/utils/layout'
import { color } from '@/components/echarts/color'
const height = mainHeight(330, 3)
-
+const props = defineProps({
+ params: {
+ type: Object,
+ default: () => {}
+ }
+})
const info = () => {}
onMounted(() => {
info()
})
diff --git a/src/views/pqs/runManage/runEvaluate/components/terminalOperation.vue b/src/views/pqs/runManage/runEvaluate/components/terminalOperation.vue
index 73753833..1d148760 100644
--- a/src/views/pqs/runManage/runEvaluate/components/terminalOperation.vue
+++ b/src/views/pqs/runManage/runEvaluate/components/terminalOperation.vue
@@ -9,114 +9,114 @@ import echarts from '@/components/echarts/echarts'
import { useDictData } from '@/stores/dictData'
import { color } from '@/components/echarts/color'
import { mainHeight } from '@/utils/layout'
-
-
+import { useConfig } from '@/stores/config'
+const config = useConfig()
const height = mainHeight(330, 3)
const chartRef = ref{{ props.params.stopRunNum }}
停运
-
+
-
+
@@ -125,17 +125,19 @@
-
-
-
+
@@ -145,44 +147,44 @@
style="height: 200px"
:color="[color[0], color[0]]"
class="box"
- :backgroundColor="`${color[0]}24`"
+ :backgroundColor="`#f3f1ec90`"
title="终端统计"
>
终端统计
-
+
-
终端运行评价
- 详情
+
-
终端运行评价详情
-
+
-
区域终端运行评价
- 详情
+ 详情
@@ -215,7 +217,7 @@
最近一周终端评价趋势
-
异常终端详情
-