diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue
index a52d530..9b4645b 100644
--- a/src/components/echarts/shushiboxi.vue
+++ b/src/components/echarts/shushiboxi.vue
@@ -5,14 +5,8 @@
-
+
下载
@@ -80,8 +74,8 @@ export default {
if (this.flag == 1) {
this.vh = mainHeight(165).height
- } else {
- this.vh = mainHeight(165,2).height
+ } else {
+ this.vh = mainHeight(165, 2).height
}
this.vw = '100%'
},
@@ -97,7 +91,7 @@ export default {
}
},
mounted() {
- // console.log(`123123`,this.boxoList,this.wp);
+ // console.log(`123123`,this.boxoList,this.wp);
this.zoom = 1 / document.body.style.zoom
window.addEventListener('resize', () => {
this.zoom = 1 / document.body.style.zoom
@@ -172,17 +166,17 @@ export default {
's'
}
else if (this.boxoList.systemType == 'WX') {
+ console.log("🚀 ~ initWaves ~ this.boxoList:", this.boxoList)
this.titles =
- // "变电站名称：" +
- // this.boxoList.equipmentName +
+
' 监测点名称：' +
- this.boxoList.equipmentName +
- ' 发生时刻：' +
- this.boxoList.startTime +
- ' 暂降(骤升)幅值：' +
- this.boxoList.featureAmplitude==null?'/':this.boxoList.featureAmplitude.toFixed(2) +
- ' 持续时间：' +
- this.boxoList.persistTime==null? '/':this.boxoList.persistTime+
+ this.boxoList.lineId +
+ ' 发生时刻：' +
+ this.boxoList.startTime +
+ ' 暂降(骤升)幅值：' +
+ this.boxoList.featureAmplitude==null ? '/' : this.boxoList.featureAmplitude.toFixed(2) +
+ ' 持续时间：' +
+ this.boxoList.persistTime==null ? '/' : this.boxoList.persistTime +
's'
} else {
this.titles =
@@ -211,12 +205,12 @@ export default {
for (var i = 0; i < picCounts; i++) {
this.fliteWaveData(this.wp, i)
this.waveDatas.push({
- instantF :this.instantF,
- instantS :this.instantS,
- shunshiF :this.shunshiF,
- shunshiS :this.shunshiS,
- title :this.title,
- unit :this.unit,
+ instantF: this.instantF,
+ instantS: this.instantS,
+ shunshiF: this.shunshiF,
+ shunshiS: this.shunshiS,
+ title: this.title,
+ unit: this.unit,
})
@@ -398,7 +392,7 @@ export default {
}
- return this.waveData(instantF, instantS, shunshiF, shunshiS, title, unit)
+ return this.waveData(instantF, instantS, shunshiF, shunshiS, title, unit)
},
//开始画图
initWave(waveDatas, time, type, severity, isOpen) {
@@ -547,10 +541,10 @@ export default {
let _this = this
var myChartes = echarts.init(wave)
- let echartsColor = {WordColor:"#000",thread:"#000000",FigureColor:["#07CCCA ","#00BFF5","#FFBF00","#77DA63","#D5FF6B","#Ff6600","#FF9100","#5B6E96","#66FFCC","#B3B3B3","#FF00FF","#CC00FF","#FF9999"]}
+ let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
setTimeout(() => {
- wave.style.width ='100%';
- wave.style.height =_this.vh;
+ wave.style.width = '100%';
+ wave.style.height = _this.vh;
}, 0);
var option = {
tooltip: {
@@ -593,7 +587,7 @@ export default {
},
title: {
left: 'center',
- text: title,
+ text: '电网侧-电压 ' + title,
textStyle: {
fontSize: '0.8rem',
color: _this.DColor ? '#fff' : echartsColor.WordColor
@@ -910,7 +904,7 @@ export default {
})
}
var myChartes = echarts.init(waveIds)
- let echartsColor = {WordColor:"#000",thread:"#000000",FigureColor:["#07CCCA ","#00BFF5","#FFBF00","#77DA63","#D5FF6B","#Ff6600","#FF9100","#5B6E96","#66FFCC","#B3B3B3","#FF00FF","#CC00FF","#FF9999"]}
+ let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
var option = {
tooltip: {
trigger: 'axis',
diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index 58454d4..166fe03 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -12,9 +12,9 @@
- 离线数据导入
- 设备补召
- 解析列表
+ 离线补召
+ 在线补召
+ 补招日志
{{ deviceData.name ? deviceData.name : '/' }}
@@ -26,13 +26,13 @@
{{ deviceData.devAccessMethod ? deviceData.devAccessMethod : '/' }}
-
+
{{ deviceData.ndid ? deviceData.ndid : '/' }}
{{ echoName(deviceData.devModel, devModelOptions) }}
-
+
{{ deviceData.time ? deviceData.time : '/' }}
diff --git a/src/views/govern/device/control/tabs/event.vue b/src/views/govern/device/control/tabs/event.vue
index 6c24953..ce81f73 100644
--- a/src/views/govern/device/control/tabs/event.vue
+++ b/src/views/govern/device/control/tabs/event.vue
@@ -91,7 +91,7 @@ const tableStore: any = new TableStore({
row.loading = false
if (res != undefined) {
boxoList.value = row
- boxoList.value.systemType = 'WX'
+ // boxoList.value.systemType = 'WX'
wp.value = res.data
view.value = false
view2.value = true
diff --git a/src/views/govern/device/manage/index.vue b/src/views/govern/device/manage/index.vue
index fb9c76e..558134d 100644
--- a/src/views/govern/device/manage/index.vue
+++ b/src/views/govern/device/manage/index.vue
@@ -11,7 +11,7 @@
@click="openGroup"
:loading="getGroupLoading"
>
- 设备模版分组
+ 模版数据分组
@@ -24,13 +24,13 @@
{{ deviceData.devAccessMethod }}
-
+
{{ deviceData.ndid }}
{{ echoName(deviceData.devModel, devModelOptions) }}
-
+
{{ deviceData.time }}
diff --git a/src/views/govern/device/manage/popup.vue b/src/views/govern/device/manage/popup.vue
index 3bdf778..1c82402 100644
--- a/src/views/govern/device/manage/popup.vue
+++ b/src/views/govern/device/manage/popup.vue
@@ -4,7 +4,7 @@
{{ popupData.deviceData.name }}
-
+
{{ popupData.deviceData.ndid }}
diff --git a/src/views/govern/device/planData/components/device_back.vue b/src/views/govern/device/planData/components/device_back.vue
index 121e822..cc642d8 100644
--- a/src/views/govern/device/planData/components/device_back.vue
+++ b/src/views/govern/device/planData/components/device_back.vue
@@ -50,7 +50,7 @@
-
+