From 0861c3e15f8a5d47b62929c69743f79c4b512f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Tue, 1 Jul 2025 15:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=8F=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/dzjk/gzgj/index.vue      | 11 ++++++-----
 src/views/ems/dzjk/sbjk/dtdc/index.vue |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/ems/dzjk/gzgj/index.vue b/src/views/ems/dzjk/gzgj/index.vue
index 109bfa1..ca8c4fd 100644
--- a/src/views/ems/dzjk/gzgj/index.vue
+++ b/src/views/ems/dzjk/gzgj/index.vue
@@ -4,12 +4,12 @@
     <!--    搜索栏-->
     <el-form :inline="true" class="select-container">
       <el-form-item label="设备类型">
-        <el-select v-model="search.deviceType" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+        <el-select v-model="search.deviceType" clearable placeholder="请选择" :loading="loading" loading-text="正在加载数据">
           <el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.deviceTypeOptions" :key="key+'deviceTypeOptions'"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="告警等级">
-        <el-select v-model="search.alarmLevel" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+        <el-select v-model="search.alarmLevel" clearable placeholder="请选择" :loading="loading" loading-text="正在加载数据">
           <el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.alarmLevelOptions" :key="key+'alarmLevelOptions'"></el-option>
         </el-select>
       </el-form-item>
@@ -157,7 +157,7 @@ export default {
     },
     // 搜索
     onSearch(){
-      const [alarmStartTime='',alarmEndTime='']=this.dateRange
+      const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
       // 选中了时间范围
       if(alarmStartTime && alarmStartTime){
         // 如果选择的时间范围是今天
@@ -182,7 +182,7 @@ export default {
       if(id !== this.activeBtn){
         console.log('点击了不同的菜单，更新数据')
         this.activeBtn=id;
-        const [alarmStartTime,alarmEndTime]=this.dateRange
+        const [alarmStartTime,alarmEndTime]=(this.dateRange || [])
         // 切换到今日告警，如果已经选择了时间范围清空
         if(alarmStartTime && alarmEndTime){
           // 如果切换到了今日告警，时间范围不相等或者相等但是不是今天 清空时间选择范围
@@ -201,7 +201,7 @@ export default {
       this.loading=true
       const {deviceType,alarmLevel} = this.search
       const {siteId,pageNum,pageSize,activeBtn} =this
-      const [alarmStartTime='',alarmEndTime='']=this.dateRange
+      const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
       let start='',end = '',now =new Date()
       if(activeBtn === 'today'){
         start = end = now
@@ -232,3 +232,4 @@ export default {
   }
 }
 </script>
+
diff --git a/src/views/ems/dzjk/sbjk/dtdc/index.vue b/src/views/ems/dzjk/sbjk/dtdc/index.vue
index fa24395..dded048 100644
--- a/src/views/ems/dzjk/sbjk/dtdc/index.vue
+++ b/src/views/ems/dzjk/sbjk/dtdc/index.vue
@@ -7,12 +7,12 @@
       <!--    搜索栏-->
       <el-form :inline="true" class="select-container">
         <el-form-item label="电池堆">
-          <el-select v-model="search.stackId" placeholder="请选择" @change="changeStackId">
+          <el-select v-model="search.stackId" clearable placeholder="请选择" @change="changeStackId">
             <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in stackOptions" :key="index+'stackOptions'"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="电池簇">
-          <el-select v-model="search.clusterId" :no-data-text="!search.stackId && stackOptions.length > 0 ? '请先选择电池堆':'无数据'" placeholder="请选择" :loading="clusterloading" loading-text="正在加载数据">
+          <el-select v-model="search.clusterId" clearable :no-data-text="!search.stackId && stackOptions.length > 0 ? '请先选择电池堆':'无数据'" placeholder="请选择" :loading="clusterloading" loading-text="正在加载数据">
             <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in clusterOptions" :key="index+'clusterOptions'"></el-option>
           </el-select>
         </el-form-item>