From d6e6f8b5b31e132e4597eb531168d3e88f3bda72 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 04 七月 2025 17:26:49 +0800
Subject: [PATCH] 2025.7.4 动态溯源

---
 src/views/realtimemode/component/DashBoard.vue |   74 ++++++++++++++++++++++++------------
 1 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/views/realtimemode/component/DashBoard.vue b/src/views/realtimemode/component/DashBoard.vue
index 30c87e6..00e6ccc 100644
--- a/src/views/realtimemode/component/DashBoard.vue
+++ b/src/views/realtimemode/component/DashBoard.vue
@@ -1,26 +1,42 @@
 <template>
-  <el-row class="wrap">
-    <el-col v-show="show" span="10">
-      <BaseCard>
-        <template #content>
-          <WeatherData
-            :factor-datas="factorDatas"
-            :temprature="temprature"
-            :humidity="humidity"
-            :wind-direction="windDirection"
-            :wind-speed="windSpeed"
-          ></WeatherData>
-          <VehicleData :factor-datas="factorDatas" :speed="speed"></VehicleData>
-          <el-row justify="center">
-            <div class="tag-time">鏃堕棿锛歿{ time }}</div>
-          </el-row>
-        </template>
-      </BaseCard>
-    </el-col>
-    <el-col span="2">
-      <CardButton name="瀹炴椂鐩戞祴" @click="() => (show = !show)"></CardButton>
-    </el-col>
-  </el-row>
+  <div>
+    <!-- <el-row justify="end">
+      <el-text class="tag-time" size="default">
+        <el-icon><Timer /></el-icon>
+        {{ time }}
+      </el-text>
+    </el-row> -->
+    <el-row class="dash-wrap">
+      <el-col :span="8">
+        <FactorIconText
+          elIcon="Timer"
+          label="TIME"
+          :value="hms"
+          :des="date"
+        ></FactorIconText>
+        <VehicleData
+          :factor-datas="factorDatas"
+          :speed="speed"
+          class="m-t-4"
+        ></VehicleData>
+        <!-- <el-text class="tag-time" size="default">
+          <el-icon><Timer /></el-icon>
+          {{ time }}
+        </el-text> -->
+      </el-col>
+      <el-col :span="16">
+        <WeatherData
+          :factor-datas="factorDatas"
+          :temprature="temprature"
+          :humidity="humidity"
+          :wind-direction="windDirection"
+          :wind-speed="windSpeed"
+        ></WeatherData>
+      </el-col>
+    </el-row>
+    <!-- <el-row justify="center"> -->
+    <!-- </el-row> -->
+  </div>
 </template>
 <script>
 import { FactorDatas } from '@/model/FactorDatas';
@@ -41,7 +57,9 @@
       windDirection: '--',
       windSpeed: '--',
       speed: '0',
-      time: '----/--/--'
+      time: '----/--/--',
+      date: '----/--/--',
+      hms: '--:--:--'
     };
   },
   methods: {
@@ -61,6 +79,8 @@
       this.windSpeed = this.getFactorData(factorDatas, index, '16') + '';
       this.speed = this.getFactorData(factorDatas, index, '14', 1);
       this.time = factorDatas.times[index];
+      this.date = this.time.split(' ')[0];
+      this.hms = this.time.split(' ')[1];
     }
   },
   mounted() {
@@ -69,10 +89,14 @@
 };
 </script>
 <style scoped>
+.dash-wrap {
+  border-bottom: 1px solid rgba(255, 255, 255, 0.445);
+}
 .tag-time {
+  color: rgba(255, 255, 255, 0.815);
   padding: 2px 4px;
-  border: 1px solid white;
+  /* border: 1px solid white;
   border-radius: 2px;
-  -moz-border-radius: 25px;
+  -moz-border-radius: 25px; */
 }
 </style>

--
Gitblit v1.9.3