From 26a424d7e38e3a740be4adecd26b0346a2ac0b48 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Fri, 22 Mar 2024 22:37:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/Dialogs/Broadcast/index.vue        | 2 +-
 .../pages/Home/components/Dialogs/DrivingGuidance/index.vue  | 2 +-
 .../FatigueWakesUp/components/DeviceControlDialog.vue        | 5 +++++
 .../pages/Home/components/Dialogs/FatigueWakesUp/index.vue   | 2 +-
 .../JiHeExpressway/pages/Home/components/InfoBoard/index.vue | 4 ++--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
index 1c85889a..a2f7bcb6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
@@ -8,7 +8,7 @@
           <Descriptions :list="list" :data="data" style="gap: 18px">
           </Descriptions>
         </ElTabPane>
-        <ElTabPane label="设备参数" name="second">设备参数</ElTabPane>
+        <!-- <ElTabPane label="设备参数" name="second">设备参数</ElTabPane> -->
         <ElTabPane label="在线率统计" name="third">
           <LineChart
             v-if="activeName === 'third'"
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
index 2b75466b..022d9efa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
@@ -7,7 +7,7 @@
         <ElTabPane label="基本信息" name="first">
           <Descriptions :list="list" :data="data" style="gap: 18px" />
         </ElTabPane>
-        <ElTabPane label="设备参数" name="second">设备参数</ElTabPane>
+        <!-- <ElTabPane label="设备参数" name="second">设备参数</ElTabPane> -->
         <ElTabPane label="在线率统计" name="third">
           <LineChart
             v-if="activeName === 'third'"
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
index 6b6444ea..2550448b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
@@ -306,6 +306,11 @@ export default {
           }
         })
         this.tableData = tData;
+      } else {
+        //查询时间
+        let resultTime = await this.requestURL('ASKTM');
+        this.formData.onWorkStatus = resultTime.data || 0;
+        this.activeName = 'first';
       }
     },
     async handleSubmit() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
index 49de0871..25cfa3ee 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
@@ -6,7 +6,7 @@
         <ElTabPane label="基本信息" name="first">
           <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" />
         </ElTabPane>
-        <ElTabPane label="设备参数" name="second">设备参数</ElTabPane>
+        <!-- <ElTabPane label="设备参数" name="second">设备参数</ElTabPane> -->
         <ElTabPane label="在线率统计" name="third">
           <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 180px" />
         </ElTabPane>
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 cf5c629e..28b7f398 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
@@ -88,9 +88,9 @@
                     </div> -->
                     </div>
                   </el-tab-pane>
-                  <el-tab-pane label="设备参数" name="second"
+                  <!-- <el-tab-pane label="设备参数" name="second"
                     >设备参数</el-tab-pane
-                  >
+                  > -->
                   <el-tab-pane label="在线率统计" name="third">
                     <LineChart
                       v-if="activeTab === 'third'"