From cc3164a423e316f90a31e610639efe6e36b1672c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Mon, 8 Sep 2025 18:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Ems/DateRangeSelect/index.vue | 4 ++--
 src/components/Ems/ZdSelect/index.vue        | 8 ++++----
 src/views/ems/dzjk/home/ActiveChart.vue      | 2 +-
 src/views/ems/dzjk/home/WeekChart.vue        | 4 ++--
 src/views/ems/dzjk/home/index.vue            | 2 +-
 src/views/ems/dzjk/sbjk/bmsdcc/index.vue     | 4 ++--
 src/views/ems/search/index.vue               | 6 +++---
 src/views/ems/site/sblb/index.vue            | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

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 @@
   <div class="zd-select-container">
     <el-form :inline="true">
       <el-form-item label="站点选择">
-        <el-select v-model="id" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据">
+        <el-select v-model="id" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据" @change="onSubmit">
           <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary" :loading="searchLoading" @click="onSubmit">搜索</el-button>
-      </el-form-item>
+<!--      <el-form-item>-->
+<!--        <el-button type="primary" :loading="searchLoading" @click="onSubmit">搜索</el-button>-->
+<!--      </el-form-item>-->
     </el-form>
   </div>
 </template>
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"
         >
           <div slot="header">
-            <span class="card-title">静态信息</span>
+            <span class="card-title">站点信息</span>
           </div>
           <div
             style="box-sizing: border-box; height: 250px; padding: 20px 15px"
diff --git a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
index 16584bc..8653293 100644
--- a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
@@ -4,7 +4,7 @@
     <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmsdccContainer'" style="margin-bottom:25px;">
       <el-card shadow="always" class="common-card-container common-card-container-body-no-padding common-card-container-no-title-bg">
         <div slot="header">
-          <span class="large-title">{{index+1}}#{{baseInfo.deviceName}}</span>
+          <span class="large-title">{{index+1}}#{{baseInfo.parentDeviceName?`${baseInfo.parentDeviceName} -> ` : ''}}{{baseInfo.deviceName}}</span>
         </div>
           <div class="descriptions-main">
             <el-descriptions direction="vertical" :column="3" :colon="false">
@@ -20,7 +20,7 @@
             <!--        进度-->
             <div class="process-container">
               <div class="process-line-bg">
-                <div class="process-line":style="{height:baseInfo.currentSoc+'%'}"></div>
+                <div class="process-line" :style="{height:baseInfo.currentSoc+'%'}"></div>
               </div>
               <div class="process">当前SOC :  {{baseInfo.currentSoc}}%</div>
             </div>
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 @@
         <span class="card-title"></span>
         <date-time-select :data-unit="this.form.dataUnit" @initDate="((e)=>form.dataRange=e||[])" @updateDate="updateDate"/>
       </div>
-      <div style="height: 310px" id="searchChart"></div>
+      <div style="height: 350px" id="searchChart"></div>
     </el-card>
   </div>
 </template>
@@ -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 @@
   <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
     <el-form :inline="true" class="select-container">
         <el-form-item label="站点选择">
-          <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据">
+          <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据" @change="onSearch">
             <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
           </el-select>
         </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
+<!--        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>-->
         <el-button @click="onReset" native-type="button">重置</el-button>
       </el-form-item>
     </el-form>