diff --git a/src/views/bigScreen/components/allEnergy.vue b/src/views/bigScreen/components/allEnergy.vue index 2fd4fc2..d2f5e12 100644 --- a/src/views/bigScreen/components/allEnergy.vue +++ b/src/views/bigScreen/components/allEnergy.vue @@ -124,10 +124,10 @@ export default { { name: "数据详情:", data: [ - { value: this.energyMes.totalEle, name: "耗电量标准煤" }, - { value: this.energyMes.totalEle, name: "用水量标准煤" }, - { value: this.energyMes.totalEle, name: "产冷量标准煤" }, - { value: this.energyMes.totalEle, name: "蒸汽量标准煤" }, + { value: this.energyMes.eleStandardCoal, name: "耗电量" }, + { value: this.energyMes.waterStandardCoal, name: "用水量" }, + { value: this.energyMes.coldStandardCoal, name: "产冷量" }, + { value: this.energyMes.gasStandardCoal, name: "蒸汽量" }, ], itemStyle: { color: function (params) { @@ -140,10 +140,10 @@ export default { }, { data: [ - { value: this.energyMes.totalEle, name: "耗电量标准煤" }, - { value: this.energyMes.totalEle, name: "用水量标准煤" }, - { value: this.energyMes.totalEle, name: "产冷量标准煤" }, - { value: this.energyMes.totalEle, name: "蒸汽量标准煤" }, + { value: this.energyMes.eleStandardCoal, name: "耗电量" }, + { value: this.energyMes.waterStandardCoal, name: "用水量" }, + { value: this.energyMes.coldStandardCoal, name: "产冷量" }, + { value: this.energyMes.gasStandardCoal, name: "蒸汽量" }, ], }, ], @@ -227,10 +227,10 @@ export default { { name: "数据详情:", data: [ - { value: 0, name: "耗电量标准煤" }, - { value: 0, name: "用水量标准煤" }, - { value: 0, name: "产冷量标准煤" }, - { value: 0, name: "蒸汽量标准煤" }, + { value: 0, name: "耗电量" }, + { value: 0, name: "用水量" }, + { value: 0, name: "产冷量" }, + { value: 0, name: "蒸汽量" }, ], itemStyle: { color: function (params) { @@ -243,10 +243,10 @@ export default { }, { data: [ - { value: 0, name: "耗电量标准煤" }, - { value: 0, name: "用水量标准煤" }, - { value: 0, name: "产冷量标准煤" }, - { value: 0, name: "蒸汽量标准煤" }, + { value: 0, name: "耗电量" }, + { value: 0, name: "用水量" }, + { value: 0, name: "产冷量" }, + { value: 0, name: "蒸汽量" }, ], }, ], @@ -278,7 +278,7 @@ export default { this.option = { //环形图中间文字 title: { - subtext: "总标准煤", + subtext: "标准煤", textStyle: { color: "#ffffff", }, diff --git a/src/views/bigScreen/components/coldSysEnergy.vue b/src/views/bigScreen/components/coldSysEnergy.vue index 6dbdd70..ea9b5df 100644 --- a/src/views/bigScreen/components/coldSysEnergy.vue +++ b/src/views/bigScreen/components/coldSysEnergy.vue @@ -2,8 +2,8 @@
-
用电量:{{energyMes.totalEle}}kw/h
-
产冷量:{{energyMes.totalCold}}kwh
+
用电量:{{ energyMes.totalEle }}kw/h
+
产冷量:{{ energyMes.totalCold }}kwh
@@ -460,8 +460,18 @@ export default { console.log("两个系统参数返回", res); if (res.code == 200) { this.energyMes = res.rows[0]; - this.useForm.maxData = 10; - this.useForm.useData = res.rows[0].eer; + this.useForm.maxData = 10; //最大值 + const { totalEle, totalCold } = res.rows[0]; + if (totalEle === 0 || totalCold === 0) { + this.useForm.useData = 0; + } else { + const result = totalCold / totalEle; + if (Number.isInteger(result)) { + this.useForm.useData = result; + } else { + this.useForm.useData = parseFloat(result.toFixed(2)); + } + } let that = this; // 使用配置函数 const axisLineColor = this.getAxisLineColor( diff --git a/src/views/bigScreen/components/waterSysEnergy.vue b/src/views/bigScreen/components/waterSysEnergy.vue index 7f067ae..face20c 100644 --- a/src/views/bigScreen/components/waterSysEnergy.vue +++ b/src/views/bigScreen/components/waterSysEnergy.vue @@ -1,599 +1,609 @@ - - - - - \ No newline at end of file +} +