diff --git a/dist.zip b/dist.zip index 8f595d9..615a372 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/public/img/energySources/background12.jpg b/public/img/energySources/background12.jpg new file mode 100644 index 0000000..25ca2df Binary files /dev/null and b/public/img/energySources/background12.jpg differ diff --git a/public/img/energySources/background13.jpg b/public/img/energySources/background13.jpg new file mode 100644 index 0000000..c193cf4 Binary files /dev/null and b/public/img/energySources/background13.jpg differ diff --git a/public/img/energySources/background14.jpg b/public/img/energySources/background14.jpg new file mode 100644 index 0000000..e134eab Binary files /dev/null and b/public/img/energySources/background14.jpg differ diff --git a/public/img/energySources/background15.jpg b/public/img/energySources/background15.jpg new file mode 100644 index 0000000..c7f4615 Binary files /dev/null and b/public/img/energySources/background15.jpg differ diff --git a/src/views/energySources/component/all.vue b/src/views/energySources/component/all.vue index ef10097..f76aeb5 100644 --- a/src/views/energySources/component/all.vue +++ b/src/views/energySources/component/all.vue @@ -130,7 +130,6 @@ export default { getTotal() { getTotalElectricity({ manufacturerBrand: this.deptName }).then(res => { let data = res.data.data - console.log(data, 'datadatadata') this.yearNum.arr = this.formatNumber(data.currentYear).arr this.yearNum.unit = this.formatNumber(data.currentYear).unit diff --git a/src/views/energySources/component/emodal.vue b/src/views/energySources/component/emodal.vue index 97496f3..cedf71d 100644 --- a/src/views/energySources/component/emodal.vue +++ b/src/views/energySources/component/emodal.vue @@ -23,7 +23,7 @@ {{ scope.row.loadRate }}% - + diff --git a/src/views/energySources/component/equipmentLoad.vue b/src/views/energySources/component/equipmentLoad.vue index fe19560..70e5a6c 100644 --- a/src/views/energySources/component/equipmentLoad.vue +++ b/src/views/energySources/component/equipmentLoad.vue @@ -15,7 +15,7 @@ {{ scope.row.loadRate }}% - + diff --git a/src/views/energySources/component/header.vue b/src/views/energySources/component/header.vue index f4590d1..46ea1a3 100644 --- a/src/views/energySources/component/header.vue +++ b/src/views/energySources/component/header.vue @@ -20,12 +20,12 @@ -
-
+
+
{{ deptName }}能耗监测系统
-
+
{{ deptName }}能耗监测系统
@@ -48,8 +48,7 @@ export default { timeFun: null, temp: '', text: '', - - divFontSize: "0.32rem", + htitleStyle: '' }; }, computed: { @@ -58,16 +57,25 @@ export default { created() { if (this.deptName.length <= 12) { - this.divFontSize = "0.32rem" + this.htitleStyle = {} } if (this.deptName.length == 13) { - this.divFontSize = "0.3rem" + this.htitleStyle = { + left: '6.52rem', + width: '6.1rem' + } } if (this.deptName.length == 14) { - this.divFontSize = "0.29rem" + this.htitleStyle = { + left: '6.4rem', + width: '6.4rem' + } } if (this.deptName.length == 15) { - this.divFontSize = "0.28rem" + this.htitleStyle = { + left: '6.2rem', + width: '6.78rem' + } } getWeather().then(res => { this.temp = res.data.now.temp @@ -147,6 +155,7 @@ export default { left: 0; width: 100%; height: 100%; + font-size: 0.32rem; text-align: center; font-family: Microsoft YaHei; font-weight: bold; @@ -162,6 +171,7 @@ export default { text-align: center; font-family: Microsoft YaHei; + font-size: 0.32rem; font-weight: bold; color: rgba(0, 0, 0, 0); top: 0; diff --git a/src/views/energySources/index.vue b/src/views/energySources/index.vue index 11bc70d..e770c0f 100644 --- a/src/views/energySources/index.vue +++ b/src/views/energySources/index.vue @@ -1,18 +1,20 @@