From 672c9c35b818c03090dbdb13425b04308855a963 Mon Sep 17 00:00:00 2001
From: whyczyk <525500596@qq.com>
Date: 星期二, 12 十月 2021 14:47:35 +0800
Subject: [PATCH] 整流器模块反馈问题修复
---
src/components/charts/imgPieChart.vue | 4 ++++
src/assets/js/charts/persons/zengyvkai.js | 4 ++++
src/components/charts/histogramAlternating.vue | 11 -----------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/assets/js/charts/persons/zengyvkai.js b/src/assets/js/charts/persons/zengyvkai.js
index a9f34cf..8e3d9d9 100644
--- a/src/assets/js/charts/persons/zengyvkai.js
+++ b/src/assets/js/charts/persons/zengyvkai.js
@@ -68,6 +68,10 @@
value: 50,
name: '鏁存祦鍣ㄦ瑺鍘�'
},
+ {
+ value: 70,
+ name: '鏁存祦鍣ㄨ繃鍘�'
+ },
]
}
}
diff --git a/src/components/charts/histogramAlternating.vue b/src/components/charts/histogramAlternating.vue
index bf0a8d1..0c210bb 100644
--- a/src/components/charts/histogramAlternating.vue
+++ b/src/components/charts/histogramAlternating.vue
@@ -3,10 +3,6 @@
<div class="echarts-content" ref="alternating">
</div>
- <div class="titleShow">
- <span><i></i><span class="textTitle">鍛婅鏈烘埧鎬绘暟:</span><span class="textValue">{{ gjjfzs }}</span></span><br>
- <span><i></i><span class="textTitle">鍛婅鏈烘埧鏁版瘮渚�:</span><span class="textValue">{{ gjjfsbl }}</span></span>
- </div>
</div>
</template>
@@ -43,8 +39,6 @@
},
data() {
return {
- gjjfzs: 0,
- gjjfsbl: 0,
userId: "",
websock: null
}
@@ -74,7 +68,6 @@
let self = this;
if (res.code == 1) {
let result = res.data[0];
- let zsObj = res.data[1];
let dataList = [];
let dataName = [];
for (const key in result) {
@@ -83,8 +76,6 @@
}
self.$options.chartData.dataList = dataList;
self.$options.chartData.dataName = dataName;
- self.$options.chartData.gjjfzs = zsObj.鍛婅鏈烘埧鎬绘暟;
- self.$options.chartData.gjjfsbl = zsObj.鍛婅鏈烘埧鏁版瘮渚� + "%";
self.optionSet(self.$options.chartData);
}
},
@@ -97,8 +88,6 @@
let self = this;
if (data) {
self.$options.chartData = data;
- self.gjjfzs = data.gjjfzs;
- self.gjjfsbl = data.gjjfsbl;
self.optionSet(self.$options.chartData);
} else {
self.postData()
diff --git a/src/components/charts/imgPieChart.vue b/src/components/charts/imgPieChart.vue
index b251260..5ddd771 100644
--- a/src/components/charts/imgPieChart.vue
+++ b/src/components/charts/imgPieChart.vue
@@ -205,6 +205,10 @@
value: 0,
name: '鏁存祦鍣ㄦ瑺鍘�'
},
+ {
+ value: 0,
+ name: '鏁存祦鍣ㄨ繃鍘�'
+ },
]
}
let resData = res.data;
--
Gitblit v1.9.1