From 8ea0d733ede06c48672429a8e24da8db3aecb15b Mon Sep 17 00:00:00 2001
From: xh <11675084@qq.com>
Date: Thu, 29 Jan 2026 17:24:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=9C=BA=E6=97=B6=E9=97=B4=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96,=E6=9B=B2=E7=BA=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/Echart/src/Echart.vue           |  2 +-
 .../HandDevice/Home/components/HistoricalCurve.vue | 52 +++++++++++++++++-----
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/web/src/components/Echart/src/Echart.vue b/web/src/components/Echart/src/Echart.vue
index 78573e1..de00673 100644
--- a/web/src/components/Echart/src/Echart.vue
+++ b/web/src/components/Echart/src/Echart.vue
@@ -72,7 +72,7 @@ watch(
   () => options.value,
   (options) => {
     if (echartRef) {
-      echartRef?.setOption(options,true)
+      echartRef?.setOption(options,false)
     }
   },
   {
diff --git a/web/src/views/HandDevice/Home/components/HistoricalCurve.vue b/web/src/views/HandDevice/Home/components/HistoricalCurve.vue
index 6e9a425..c57c406 100644
--- a/web/src/views/HandDevice/Home/components/HistoricalCurve.vue
+++ b/web/src/views/HandDevice/Home/components/HistoricalCurve.vue
@@ -5,18 +5,33 @@
     :before-close="handleClose"
     :destroy-on-close="true"
     resizable
-    size="480px"
+    size="600px"
+    class="drawer"
   >
     <template #header>
-      <h4
+      <!-- <h4
         >{{ currentMarker?.name }}手持表
         <span class="gasChemical">{{ currentMarker?.gasChemical }}检测</span></h4
-      >
+      > -->
+      <div class="flex items-center justify-between">
+        <div class="chart-title">{{ currentMarker?.name }}手持表 {{ currentMarker?.gasChemical }}检测 </div>
+        <div style="padding-right: 20px;">
+          <el-date-picker
+            v-model="gasDateTimeRange"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="datetimerange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+            @change="handleDateChange"
+          />
+        </div>
+      </div>
     </template>
     <template #default>
       <!-- <div> 数据统计截止：{{ currentMarker?.timeStr }} </div> -->
-      <div>
-        <div class="flex items-center justify-between">
+    
+        <!-- <div class="flex items-center justify-between">
           <div class="chart-title"> {{ currentMarker?.gasChemical }}浓度与电量趋势 </div>
           <div>
             <el-date-picker
@@ -29,14 +44,14 @@
               @change="handleDateChange"
             />
           </div>
-        </div>
-        <div v-if="drawer && !loading">
-          <Echart :options="gasLineOptions" :height="325" />
+        </div> -->
+        <div v-if="drawer && !loading" style="height: 100%;">
+          <Echart :options="gasLineOptions" height="100%" />
         </div>
         <!-- <div v-if="drawer && !loading">
           <Echart :options="gasSigLineOptions" :height="325" />
         </div> -->
-      </div>
+    
       <!-- <div>
         <div class="flex items-center justify-between">
           <div> 电量趋势 </div>
@@ -74,6 +89,8 @@ import { tdengineApi, tdStruct } from '@/api/gas/tdengine/index'
 import { EChartsOption } from 'echarts'
 import Echart from '@/components/Echart/src/Echart.vue'
 
+import { formatPast2 } from '@/utils/formatTime'
+
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 
@@ -309,7 +326,7 @@ const gasLineOptions = computed<EChartsOption>(() => {
         animationEasing: 'cubicInOut'
       },
       {
-        name: '内存占用',
+        name: '可用内存',
         smooth: true,
         type: 'line',
         yAxisIndex: 1,
@@ -327,7 +344,7 @@ const gasLineOptions = computed<EChartsOption>(() => {
         }
       },
       {
-        name: '系统运行时间',
+        name: '开机时间',
         smooth: true,
         type: 'line',
         yAxisIndex: 1,
@@ -340,7 +357,7 @@ const gasLineOptions = computed<EChartsOption>(() => {
             if (value === null || value === undefined || isNaN(value)) {
               return '-'
             }
-            return Number(value).toFixed(3) + '分钟' // 返回带单位的字符串
+            return formatPast2(Number(value) * 60 * 1000) // 返回带单位的字符串
           }
         }
       }
@@ -540,4 +557,15 @@ defineExpose({
   color: #f59a23;
   background-color: rgba(245, 154, 35, 0.09);
 }
+
+</style>
+<style  lang="scss">
+.drawer {
+  .el-drawer__header {
+    margin-bottom: 12px;
+  }
+  .el-drawer__body{
+    padding: 0 10px;
+  }
+}
 </style>