diff --git a/src/components/Ems/DateRangeSelect/index.vue b/src/components/Ems/DateRangeSelect/index.vue index 10196c2..fb026df 100644 --- a/src/components/Ems/DateRangeSelect/index.vue +++ b/src/components/Ems/DateRangeSelect/index.vue @@ -38,9 +38,9 @@ export default { } }, methods: { - init(){ + init(today=false){ const now = new Date(),formatNow = formatDate(now); - const weekAgo = formatDate(new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000)) + const weekAgo = formatDate(today ? new Date(now.getTime()) : new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000)) this.dateRange = [weekAgo, formatNow]; this.defaultDateRange=[weekAgo, formatNow]; this.$emit('updateDate',this.dateRange) diff --git a/src/components/Ems/ZdSelect/index.vue b/src/components/Ems/ZdSelect/index.vue index 83e85cc..bfe869f 100644 --- a/src/components/Ems/ZdSelect/index.vue +++ b/src/components/Ems/ZdSelect/index.vue @@ -3,13 +3,13 @@
- + - - 搜索 - + + +
diff --git a/src/views/ems/dzjk/home/ActiveChart.vue b/src/views/ems/dzjk/home/ActiveChart.vue index 0b4eca4..1d768a0 100644 --- a/src/views/ems/dzjk/home/ActiveChart.vue +++ b/src/views/ems/dzjk/home/ActiveChart.vue @@ -57,7 +57,7 @@ export default { this.siteId = siteId this.timeRange=[] this.deviceId='' - this.$refs.dateRangeSelect.init() + this.$refs.dateRangeSelect.init(true) this.showLoading() getPcsNameList(siteId).then(response=>{ const data=response?.data || []; diff --git a/src/views/ems/dzjk/home/WeekChart.vue b/src/views/ems/dzjk/home/WeekChart.vue index 486f5e8..1cd685f 100644 --- a/src/views/ems/dzjk/home/WeekChart.vue +++ b/src/views/ems/dzjk/home/WeekChart.vue @@ -107,11 +107,11 @@ export default { series: [ { yAxisIndex:0, - type: 'line', + type: 'bar', }, { yAxisIndex:0, - type: 'line', + type: 'bar', }, ] }) diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue index 9398a11..e500155 100644 --- a/src/views/ems/dzjk/home/index.vue +++ b/src/views/ems/dzjk/home/index.vue @@ -10,7 +10,7 @@ class="common-card-container common-card-container-body-no-padding" >
- 静态信息 + 站点信息
- {{index+1}}#{{baseInfo.deviceName}} + {{index+1}}#{{baseInfo.parentDeviceName?`${baseInfo.parentDeviceName} -> ` : ''}}{{baseInfo.deviceName}}
@@ -20,7 +20,7 @@
-
+
当前SOC : {{baseInfo.currentSoc}}%
diff --git a/src/views/ems/search/index.vue b/src/views/ems/search/index.vue index aecbbed..62c2c86 100644 --- a/src/views/ems/search/index.vue +++ b/src/views/ems/search/index.vue @@ -60,7 +60,7 @@
-
+
@@ -193,8 +193,8 @@ export default { console.log('图表数据',dataset) this.chart.setOption({ legend: { - left: 'center', - top: '10', + // left: 'center', + // top: '10', }, grid: { containLabel: true diff --git a/src/views/ems/site/sblb/index.vue b/src/views/ems/site/sblb/index.vue index 597ef95..1823343 100644 --- a/src/views/ems/site/sblb/index.vue +++ b/src/views/ems/site/sblb/index.vue @@ -3,12 +3,12 @@
- + - 搜索 + 重置