From 2cd83a2e9e984401151fdab2afeb7f97e55e4863 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Fri, 29 Mar 2024 17:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/styles/JiHeExpressway.scss     | 10 +++++++++
 .../pages/Home/components/InfoBoard/index.vue | 21 ++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
index cc02947f..0395d767 100644
--- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
+++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
@@ -277,4 +277,14 @@
       .el-time-spinner__item.active{ color: #fff !important;}
     }
 
+    .el-picker-panel{
+      .today div a,.today div span{
+        color: #ff0 !important;
+        font-weight: bold !important;
+      }
+      .current div a.cell {
+        // background-color: #000 !important;
+      }
+    }
+
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
index 28b7f398..9e48a5ab 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
@@ -61,20 +61,20 @@
                 <el-tabs v-model="activeTab" @tab-click="tabClickFn">
                   <el-tab-pane label="详情信息" name="first">
                     <div class="show_bottom_tab_box">
-                      <div class="deviceInfo">
-                        <div class="deviceInfo_l">设备名称</div>
+                      <div class="deviceInfo title">
+                        <div class="deviceInfo_l">设备名称:</div>
                         <div class="deviceInfo_r">
                           {{ selectedDevice.deviceName }}
                         </div>
                       </div>
                       <div class="deviceInfo">
-                        <div class="deviceInfo_l">设备桩号</div>
+                        <div class="deviceInfo_l">设备桩号:</div>
                         <div class="deviceInfo_r">
                           {{ selectedDevice.stakeMark }}
                         </div>
                       </div>
                       <div class="deviceInfo">
-                        <div class="deviceInfo_l">屏幕像素</div>
+                        <div class="deviceInfo_l">屏幕像素:</div>
                         <div class="deviceInfo_r">
                           {{
                             JSON.parse(selectedDevice.otherConfig).screenSize
@@ -82,6 +82,12 @@
                           px
                         </div>
                       </div>
+                      <div class="deviceInfo">
+                        <div class="deviceInfo_l">设备状态</div>
+                        <div class="deviceInfo_r">
+                          {{ selectedDevice.deviceState == 1 ? "在线" : "离线" }}
+                        </div>
+                      </div>
                       <!-- <div class="deviceInfo" v-for="item in tabDataInfoList" :key="item.id">
                       <div class="deviceInfo_l">{{ item.tit }}: </div>
                       <div class="deviceInfo_r" :style="{ 'color': item.col }"> {{ item.txt }}</div>
@@ -763,11 +769,12 @@ export default {
 }
 
 .deviceInfo {
-  width: 50%;
+  width: 33.333%;
   padding: 10px 0;
   display: flex;
   // flex-wrap: wrap;
-  align-items: stretch;
+  align-items: center;
+  &.title{ width: 100%;}
 }
 
 .show_bottom_tab_box {
@@ -780,7 +787,7 @@ export default {
 .deviceInfo_l {
   color: #3de8ff;
   font-size: 14px;
-  width: 70px;
+  width: 60px;
   display: flex;
   flex-direction: row;
   align-items: center;