diff --git a/src/components/Charts/MixChart.1.vue b/src/components/Charts/MixChart.1.vue
new file mode 100644
index 0000000..b590854
--- /dev/null
+++ b/src/components/Charts/MixChart.1.vue
@@ -0,0 +1,423 @@
+
+
+
+
+
diff --git a/src/views/energy/ammonia-analysis.vue b/src/views/energy/ammonia-analysis.vue
index 145a1c1..14adb03 100644
--- a/src/views/energy/ammonia-analysis.vue
+++ b/src/views/energy/ammonia-analysis.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-19 10:55:33
* @LastEditors: gtz
- * @LastEditTime: 2021-11-30 20:23:37
+ * @LastEditTime: 2021-12-01 09:18:32
* @Description:
-->
@@ -14,21 +14,6 @@
-
-
-
- 氨气流量分析
-
-
-
-
-
- 氨气流量(立方米):123,109
- 昨日氨气流量(立方米):1145
-
-
-
-
@@ -51,7 +36,7 @@
-
+
@@ -665,13 +650,15 @@ export default {
chartType: ['柱状'],
eleType: '年',
showId: 0,
- yaoluIndex: 0
+ yaoluIndex: 0,
+ yaoluName: ''
}
},
mounted () {
this.dataList = this.eleYearList
this.lastDataList = this.lastEleYearList
this.showId = this.yaoluList[0].id
+ this.yaoluName = this.yaoluList[0].label
},
methods: {
changeEleType (v) {
@@ -701,6 +688,7 @@ export default {
handleNode (obj, node, e) {
if (!(obj.children)) {
this.showId = obj.id
+ this.yaoluName = obj.label
}
}
}
diff --git a/src/views/energy/ammonia.vue b/src/views/energy/ammonia.vue
index c941f5c..be11874 100644
--- a/src/views/energy/ammonia.vue
+++ b/src/views/energy/ammonia.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-19 10:55:33
* @LastEditors: gtz
- * @LastEditTime: 2021-11-30 20:23:45
+ * @LastEditTime: 2021-12-01 09:17:51
* @Description:
-->
@@ -51,7 +51,7 @@
-
+
@@ -665,13 +665,15 @@ export default {
chartType: ['柱状'],
eleType: '年',
showId: 0,
- yaoluIndex: 0
+ yaoluIndex: 0,
+ yaoluName: ''
}
},
mounted () {
this.dataList = this.eleYearList
this.lastDataList = this.lastEleYearList
this.showId = this.yaoluList[0].id
+ this.yaoluName = this.yaoluList[0].label
},
methods: {
changeEleType (v) {
@@ -701,6 +703,7 @@ export default {
handleNode (obj, node, e) {
if (!(obj.children)) {
this.showId = obj.id
+ this.yaoluName = obj.label
}
}
}
diff --git a/src/views/energy/electric.vue b/src/views/energy/electric.vue
index 0663606..90766ce 100644
--- a/src/views/energy/electric.vue
+++ b/src/views/energy/electric.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-19 10:55:33
* @LastEditors: gtz
- * @LastEditTime: 2021-11-30 20:19:52
+ * @LastEditTime: 2021-12-01 09:15:35
* @Description:
-->
@@ -50,7 +50,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
diff --git a/src/views/energy/kiln-electric.vue b/src/views/energy/kiln-electric.vue
index fbdc0ee..58a04a3 100644
--- a/src/views/energy/kiln-electric.vue
+++ b/src/views/energy/kiln-electric.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-19 10:55:33
* @LastEditors: gtz
- * @LastEditTime: 2021-11-30 20:24:04
+ * @LastEditTime: 2021-12-01 09:16:16
* @Description:
-->
@@ -57,7 +57,7 @@
-
+
@@ -80,7 +80,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -717,13 +717,15 @@ export default {
chartType: ['柱状'],
eleType: '年',
showId: 0,
- yaoluIndex: 0
+ yaoluIndex: 0,
+ yaoluName: ''
}
},
mounted () {
this.dataList = this.eleYearList
this.lastDataList = this.lastEleYearList
this.showId = this.yaoluList[0].id
+ this.yaoluName = this.yaoluList[0].label
},
methods: {
changeEleType (v) {
@@ -756,6 +758,7 @@ export default {
this.yaoluList.map((item, index) => {
if (item.id === obj.id) {
this.yaoluIndex = index
+ this.yaoluName = obj.label
}
})
}
diff --git a/src/views/energy/kiln-speed.vue b/src/views/energy/kiln-speed.vue
index b6a19d7..b65ed56 100644
--- a/src/views/energy/kiln-speed.vue
+++ b/src/views/energy/kiln-speed.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-19 10:55:33
* @LastEditors: gtz
- * @LastEditTime: 2021-11-30 20:24:10
+ * @LastEditTime: 2021-12-01 10:54:45
* @Description:
-->
@@ -14,21 +14,6 @@
-
-
-
- 氨气流量分析
-
-
-
-
-
- 氨气流量(立方米):123,109
- 昨日氨气流量(立方米):1145
-
-
-
-
@@ -51,7 +36,7 @@
-
+
@@ -60,7 +45,7 @@