From 4d9e8e537300d616c37584f5014d990a1fe3e2a8 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, 24 Jun 2025 13:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=E7=B2=BE=E7=A1=AE?=
 =?UTF-8?q?=E5=88=B0=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/dzjk/gzgj/index.vue     |  7 +++----
 src/views/ems/dzjk/tjbb/gltj/Dlzb.vue | 24 ++++++++----------------
 src/views/ems/dzjk/tjbb/gltj/Syzb.vue | 22 +++++++---------------
 3 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/src/views/ems/dzjk/gzgj/index.vue b/src/views/ems/dzjk/gzgj/index.vue
index db812f3..d203ef8 100644
--- a/src/views/ems/dzjk/gzgj/index.vue
+++ b/src/views/ems/dzjk/gzgj/index.vue
@@ -17,7 +17,7 @@
         <el-form-item label="时间选择">
           <el-date-picker
             v-model="dateRange"
-            type="datetimerange"
+            type="daterange"
             range-separator="至"
             start-placeholder="开始时间"
             :picker-options="pickerOptions"
@@ -112,8 +112,8 @@ export default {
         {name:'类型三',id:3},
       ],
       gjdjOptions:[
-        {name:'严重',id:1},
-        {name:'普通',id:2},
+        {name:'等级一',id:1},
+        {name:'等级二',id:2},
       ],
       tableData:[
         {name:'告警一',gjdj:'等级一',gjnr:'设备一温度过高',startTime:'2025/06/20 18:09:40',finishTime:'2025/06/20 20:07:01',status:1},
@@ -151,7 +151,6 @@ export default {
     const now = new Date();
     const lastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
     this.defaultDateRange = [lastMonth, now];
-    // this.dateRange = [lastMonth, now];
   }
 }
 </script>
diff --git a/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue b/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
index 0a0dc29..7c173ef 100644
--- a/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
+++ b/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
@@ -7,15 +7,10 @@
       <!--    搜索栏-->
       <div class="select-container">
         <el-form :inline="true">
-          <el-form-item label="设备类型">
-            <el-select v-model="sjwd" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-              <el-option :label="item.name" :value="item.id" v-for="(item,index) in sjwdOptions" :key="index+'syzbSjwdOptions'"></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="时间选择">
             <el-date-picker
               v-model="dateRange"
-              type="datetimerange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始时间"
               :picker-options="pickerOptions"
@@ -55,11 +50,6 @@ export default {
       },
       defaultDateRange:[],//默认展示的时间
       dateRange:[],
-      sjwd:'',
-      sjwdOptions:[
-        {name:'时间一',id:1},
-        {name:'时间二',id:2},
-      ],
       loading:false,
       chart: null
 
@@ -73,7 +63,6 @@ export default {
     // 重置
     onReset(){
       this.dateRange=[]
-      this.sjwd=''
       this.getData()
     },
     getData(){
@@ -102,9 +91,12 @@ export default {
         dataset:{
           // source
           source:[//格式
-            ['product','收益1','收益2'],
-            ['今天',10,20],
-            ['昨天',20,30],
+            ['product','充电量','放电量'],
+            ['6/10',101,220],
+            ['6/11',210,390],
+            ['6/12',220,360],
+            ['6/13',520,340],
+            ['6/14',270,430],
           ]
         },
         series: [
@@ -113,7 +105,7 @@ export default {
           },
           {
             type: 'bar',//柱状图
-          }
+          },
         ]
       })
     },
diff --git a/src/views/ems/dzjk/tjbb/gltj/Syzb.vue b/src/views/ems/dzjk/tjbb/gltj/Syzb.vue
index a182af8..cdb2ea9 100644
--- a/src/views/ems/dzjk/tjbb/gltj/Syzb.vue
+++ b/src/views/ems/dzjk/tjbb/gltj/Syzb.vue
@@ -7,15 +7,10 @@
       <!--    搜索栏-->
       <div class="select-container">
         <el-form :inline="true">
-          <el-form-item label="设备类型">
-            <el-select v-model="sjwd" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-              <el-option :label="item.name" :value="item.id" v-for="(item,index) in sjwdOptions" :key="index+'syzbSjwdOptions'"></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="时间选择">
             <el-date-picker
               v-model="dateRange"
-              type="datetimerange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始时间"
               :picker-options="pickerOptions"
@@ -53,11 +48,6 @@ export default {
       },
       defaultDateRange:[],//默认展示的时间
       dateRange:[],
-      sjwd:'',
-      sjwdOptions:[
-        {name:'时间一',id:1},
-        {name:'时间二',id:2},
-      ],
       loading:false,
       chart: null
 
@@ -71,7 +61,6 @@ export default {
     // 重置
     onReset(){
       this.dateRange=[]
-      this.sjwd=''
       this.getData()
     },
     getData(){
@@ -100,9 +89,12 @@ export default {
         dataset:{
           // source
           source:[//格式
-            ['product','收益1','收益2'],
-            ['今天',10,20],
-            ['昨天',20,30],
+            ['product','收入','支出'],
+            ['6/10',10,20],
+            ['6/11',20,30],
+            ['6/12',20,34],
+            ['6/13',20,90],
+            ['6/14',20,3],
           ]
         },
         series: [