diff --git a/src/views/energySources/component/dosage.vue b/src/views/energySources/component/dosage.vue
index f048c44..bafc644 100644
--- a/src/views/energySources/component/dosage.vue
+++ b/src/views/energySources/component/dosage.vue
@@ -4,7 +4,7 @@
监测明细
-
选择月份:
+
选择时间:
@@ -122,6 +122,22 @@ export default {
return "background: #1AD0A3"
}
},
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 === 0) {
+ if (row.loadRate > 0) {
+ return 'trEven';
+ } else {
+ return 'trEven';
+ }
+
+ } else {
+ if (row.loadRate > 0) {
+ return 'trOdd';
+ } else {
+ return 'trOdd';
+ }
+ }
+ },
getPeriodData() {
getPeriodElectricity({ manufacturerBrand: this.userInfo.dept_name, today: this.selectDay }).then(res => {
console.log('period =====>', res)
@@ -260,6 +276,10 @@ export default {
background-color: transparent !important;
border: 0 !important;
}
+.dosage /deep/ .trEven td {
+ background: rgba($color: #0de5ff, $alpha: 0.1) !important;
+}
+
.dosage /deep/ .el-table td span {
font-size: 0.14rem !important;
@@ -349,12 +369,16 @@ export default {
}
.rank {
+ display: inline-block;
+ width: 0.44rem;
+ height: 0.22rem;
+ line-height: 0.21rem;
+ text-align: center;
font-size: 0.14rem;
font-family: Acumin Variable Concept;
font-weight: normal;
color: #FFFFFF;
- padding: 0.04rem 0.06rem;
border-radius: 0.08rem;
- margin-left: 0.04rem;
+ margin-left: 0.1rem;
}
}
diff --git a/src/views/energySources/component/equipmentAnalyze.vue b/src/views/energySources/component/equipmentAnalyze.vue
index 5df3561..8f1bb47 100644
--- a/src/views/energySources/component/equipmentAnalyze.vue
+++ b/src/views/energySources/component/equipmentAnalyze.vue
@@ -1,7 +1,8 @@
- 选择月份:
+
+ 选择时间:
diff --git a/src/views/energySources/component/header.vue b/src/views/energySources/component/header.vue
index 55890c2..ffe3659 100644
--- a/src/views/energySources/component/header.vue
+++ b/src/views/energySources/component/header.vue
@@ -12,16 +12,23 @@
{{ $moment().format('dddd') }}
- {{temp}}℃ {{text}}
+ {{ temp }}℃ {{ text }}
-
+

返回首页
- {{ userInfo.dept_name }}实业公司能耗监测系统
+
+
+ {{ userInfo.dept_name }}实业公司能耗监测系统
+
+
+
+ {{ userInfo.dept_name }}实业公司能耗监测系统
+
@@ -34,11 +41,11 @@ export default {
return {
time: '',
timeFun: null,
- temp:'',
- text:'',
+ temp: '',
+ text: '',
};
},
- computed:{
+ computed: {
...mapGetters(["userInfo", "permission"]),
},
created() {
@@ -53,7 +60,7 @@ export default {
},
methods: {
},
- beforeDestroyed() {
+ beforeDestroyed() {
clearInterval(this.timeFun)
},
};
@@ -97,6 +104,7 @@ export default {
line-height: 0.48rem;
margin-left: 0.36rem;
}
+
div:nth-child(5) {
font-size: 0.2rem;
line-height: 0.48rem;
@@ -112,14 +120,38 @@ export default {
left: 7.2rem;
width: 4.82rem;
height: 0.46rem;
- text-align: center;
- font-size: 0.34rem;
- font-family: Microsoft YaHei;
- font-weight: bold;
- color: #FFFFFF;
- text-shadow: 3px 4px 2px rgba(0, 0, 0, 0.2);
- background: linear-gradient(-12deg, #C9E7FF 0%, #ECFCFF 100%);
- -webkit-background-clip: text;
- -webkit-text-fill-color: transparent;
+
+ .htitle-t {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ text-align: center;
+ font-size: 0.3rem;
+ font-family: Microsoft YaHei;
+ font-weight: bold;
+ color: #FFFFFF;
+ background: linear-gradient(-12deg, #C9E7FF 0%, #ECFCFF 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ z-index: 2;
+ }
+
+ .htitle-b {
+ position: absolute;
+
+ text-align: center;
+ font-size: 0.3rem;
+ font-family: Microsoft YaHei;
+ font-weight: bold;
+ color: rgba(0, 0, 0, 0);
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: 1;
+ text-shadow: 4px 5px 2px rgba(0, 0, 0, 0.3);
+ }
}
diff --git a/src/views/energySources/component/load.vue b/src/views/energySources/component/load.vue
index 5cd9e01..9504497 100644
--- a/src/views/energySources/component/load.vue
+++ b/src/views/energySources/component/load.vue
@@ -2,7 +2,7 @@
- 选择月份:
+ 选择时间:
@@ -118,6 +118,7 @@ export default {
let data = res.data.data
let xAxisArr = Object.keys(data)
+ xAxisArr.sort()
let seriesJson = {
jian: [],
feng: [],
diff --git a/src/views/energySourcesProvince/component/statistics.vue b/src/views/energySourcesProvince/component/statistics.vue
index 8c09acc..4e15328 100644
--- a/src/views/energySourcesProvince/component/statistics.vue
+++ b/src/views/energySourcesProvince/component/statistics.vue
@@ -170,13 +170,18 @@ export default {
}
.rank {
+ display: inline-block;
+ width: 0.44rem;
+ height: 0.22rem;
+ line-height: 0.21rem;
+ text-align: center;
font-size: 0.14rem;
font-family: Acumin Variable Concept;
font-weight: normal;
color: #FFFFFF;
- padding: 0.04rem 0.06rem;
+ // padding: 0.04rem 0.06rem;
border-radius: 0.08rem;
- margin-left: 0.04rem;
+ margin-left: 0.1rem;
}
}