From 937eb934dca53f5357d5c9738bff306beef4a5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Fri, 30 May 2025 09:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5G0321=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FatigueWakesUp/components/DeviceParam.vue | 21 +++++++++----------
 .../pages/Home/components/Thumbnail/index.vue |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
index 48d7dfe5..2f4e53ed 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
@@ -268,22 +268,21 @@ export default {
       const options={
         "ASK":"7"
       }
-      let ask = await this.requestURL("ASKDF",options);
-
-      let workingMode = await this.requestURL("ASKMD");
-      // if (result.data == 7) {
-      //   this.activeName = "second";
-      //   this.tabClick();
-      // } else {
-      console.log("工作模式")
-      console.log(workingMode.data)
-      this.formData.controlType = workingMode.data + "" || "0";
+    //  let ask = await this.requestURL("ASKDF",options);
       //查询时间
       let resultTime = await this.requestURL("ASKTM");
       console.log("工作时长")
       console.log(resultTime.data)
-      this.formData.onWorkStatus = resultTime.data || 0;
+      this.formData.onWorkStatus = resultTime.data + "" || "0";
       this.activeName = "first";
+
+
+      let workingMode = await this.requestURL("ASKMD");
+
+      console.log("工作模式")
+      console.log(workingMode.data)
+      this.formData.controlType = workingMode.data + "" || "0";
+
       // }
     },
     async requestURL(functionId, options = {}) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
index 4c4e52a5..39fb85e2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
@@ -228,7 +228,7 @@ export default {
           },
           {
             type: "text",
-            label: "G3021德上高速",
+            label: "G0321德上高速",
             x: width - 50,
             y: height / 2 - 21,
             attrs: {