diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue
index de33e66..d15a5f1 100644
--- a/src/views/govern/device/planData/index.vue
+++ b/src/views/govern/device/planData/index.vue
@@ -15,157 +15,165 @@
{{ deviceData.describe ? deviceData.describe : '/' }}
-
-
-
-
-
-
-
-
-
- {{ item.itemName }}
-
-
-
-
- {{ item.itemName }}
-
-
- {{ item.statisticalInterval }}分钟
-
-
- {{
- voltageLevelList.find(vv => {
- return vv.id == item.voltageLevel
- })?.name
- }}
-
-
- {{
- volConTypeList.find(vv => {
- return vv.id == item.volConType
- })?.name
- }}
-
-
- {{ item.capacitySscmin }}MVA
-
-
- {{ item.capacitySi }}MVA
-
-
- {{ item.capacitySscb }}MVA
-
-
- {{ item.capacitySt }}MVA
-
-
- {{ item.pt && item.pt1 ? item.pt / item.pt1 : item.pt }}
-
-
- {{ item.ct && item.ct1 ? item.ct / item.ct1 : item.ct }}
-
-
-
- {{ item.startTime }}
-
-
-
-
- {{ item.endTime }}
-
-
-
- {{ item.location }}
-
-
-
- 数据绑定
-
-
-
-
-
-
'
+ // for (var i = 0, l = params.length; i < l; i++) {
+ // params[i].unit =
+ // echartsData.value.options.yAxis[
+ // echartsData.value.options.series[params[i].seriesIndex].yAxisIndex
+ // ]?.name
+ // res +=
+ // params[i].seriesName +
+ // ' ' +
+ // `` +
+ // `${params[i].value} ${params[i].unit}
`
+ // }
+ // return res
+ // }
},
// grid: {
- // left: historyDataList.value.length != 0 ? '5%' : '1%',
+ // left: chartsList.length != 0 ? '5%' : '1%',
// right: '5%',
// bottom: '10%',
// top: '8%',
@@ -482,7 +531,7 @@ const init = () => {
// },
xAxis: [
{
- type: 'time',//category
+ type: 'time', //category
name: '\n\n\n\n\n时间',
axisLabel: {
color: '#A9AEB2',
@@ -490,6 +539,9 @@ const init = () => {
show: function (index: any, value: any) {
// 检查数据中是否存在这个时间点
// return data.some(item:any => item[0] === value)
+ },
+ formatter: {
+ day: '{MM}-{d}'
}
},
nameTextStyle: {
@@ -577,16 +629,18 @@ const init = () => {
}
})
}
-
+ echartsData.value.options.legend.data = []
+ console.log(list, '988888888888606')
list.map((item: any, index: any) => {
item.map((vv: any, indexs: any) => {
//处理legend
- if (historyDataList.value.length != 0) {
+ if (chartsList.length != 0) {
echartsData.value.options.legend.data.push({
name: vv.phase + '相' + vv.showName,
icon: iconThree
})
}
+ console.log(echartsData.value.options.legend.data, 'legend-legend-legend')
if (
unitList.findIndex((item: any) => {
return item == vv.unit
@@ -609,15 +663,18 @@ const init = () => {
},
itemStyle: {},
//数据
- data: historyDataList.value
- .map((kk: any) => {
- if (kk.statisticalName == vv.name) {
- return kk.statisticalData
- } else {
- return ''
- }
- })
- .filter((kk: any) => kk !== ''),
+ data: filterArray(
+ chartsList
+ .map((kk: any, kks: any) => {
+ if (kk.statisticalName == vv.name) {
+ // console.log([xAxis[kks],kk.statisticalData],"========>>>>>>>");
+ return Array.from(new Set([xAxis[kks], kk.statisticalData]))
+ } else {
+ return ''
+ }
+ })
+ .filter((kk: any) => kk !== '')
+ ),
//数据对应的y轴
// yAxisIndex:0,
yAxisIndex: vv.yAxisIndex
@@ -634,8 +691,10 @@ const init = () => {
}
}
}
+ // item.data = filterArray(item.data)
})
loading.value = false
+ console.log(echartsData.value.options.series, '++++++++++++++++++++669')
}
})
.catch(error => {
@@ -698,6 +757,7 @@ const handleExport = async () => {
}
if (historyDataList.value.length != 0) {
+ console.log(historyDataList.value, 'historyDataList')
let xAxis: any = []
let timeList: any = []
historyDataList.value.map((item: any) => {
@@ -713,6 +773,7 @@ const handleExport = async () => {
csv = convertToCSV([], [])
chartsCsv.value = csv
// 如果你想提供下载链接
+ console.log(list, '745745745745')
function convertToCSV(data: any, key: any) {
// 添加列头
let title = '统计时间,'
@@ -722,16 +783,19 @@ const handleExport = async () => {
let csv = ''
csv = title
// 遍历数据并添加到CSV字符串中
- list[0].data.map((vv: any, indexs: any) => {
+ list[0]?.data.map((vv: any, indexs: any) => {
let strs = '',
count = null
list.map((item: any, index: any) => {
if (index == 0) {
count = index
}
+ // console.log( list[index].data[indexs][list[index].data[indexs]], indexs,"88888888888888");
+ console.log(list[index].data[indexs],"iiiiii");
+ let itemList:any=list[index].data[indexs]
index == list.length - 1
- ? (strs += list[index].data[indexs])
- : (strs += list[index].data[indexs] + ',')
+ ? (strs += itemList[0])
+ : (strs += itemList[0] + ',')
})
if (count == 0 && xAxis[indexs]) {
csv += `${xAxis[indexs]},` + strs + '\n'
@@ -797,7 +861,7 @@ watch(
() => searchForm.value.index,
(val: any, oldval: any) => {
if (val) {
- let list = [val]
+ let list = val
// formatCountOptions(list)
// if (val == 0) {
// countData.value = []
@@ -894,8 +958,7 @@ onMounted(() => {
width: 95%;
display: flex;
justify-content: flex-start;
-
- // overflow-x: auto;
+ overflow-x: auto;
// height: 45px;
// padding-top: 18px;
// flex-wrap: wrap;
@@ -921,7 +984,7 @@ onMounted(() => {
.history_chart {
width: 100%;
- min-height: calc(100vh - 680px) !important;
+ height: calc(100vh - 440px) !important;
flex: 1;
margin-top: 10px;
}
@@ -929,4 +992,9 @@ onMounted(() => {
::v-deep .el-select {
width: 120px !important;
}
+
+::v-deep .el-collapse-item__header{
+ font-size: 16px !important;
+ font-weight: 800 !important;
+}