From 37679db2f89dc6fdeba88e670a09c090c2b0135f Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Fri, 22 Mar 2024 21:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=B2=E5=8A=B3=E5=94=A4=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DeviceControlDialog.vue        | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

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 d72620c8..6b6444ea 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
@@ -19,57 +19,57 @@
             <ElTableColumn prop="time" width="120" label="时间">
               <template slot-scope="scope">
                 <div style="display: flex;">
-                  <el-input-number style="width: 80px;" v-model="scope.row.time" :min="0" :max="999"></el-input-number>
-                  <p>秒</p>
+                  <el-input-number style="width: 120px;" v-model="scope.row.time" :min="0"></el-input-number>
+                  <p>豪秒</p>
                 </div>
               </template>
             </ElTableColumn>
 
             <ElTableColumn prop="A" label="线路A">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.A" active-color="#13ce66" inactive-color="#C9C9C9">
+                <el-switch active-value="1" inactive-value="0" v-model="scope.row.A" active-color="#13ce66" inactive-color="#C9C9C9">
                 </el-switch>
               </template>
             </ElTableColumn>
             <ElTableColumn prop="B" label="线路B">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.B" active-color="#13ce66" inactive-color="#C9C9C9">
+                <el-switch active-value="1" inactive-value="0" v-model="scope.row.B" active-color="#13ce66" inactive-color="#C9C9C9">
                 </el-switch>
               </template>
             </ElTableColumn>
             <ElTableColumn prop="C" label="线路C">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.C" active-color="#13ce66" inactive-color="#C9C9C9">
+                <el-switch active-value="1" inactive-value="0" v-model="scope.row.C" active-color="#13ce66" inactive-color="#C9C9C9">
                 </el-switch>
               </template>
             </ElTableColumn>
             <ElTableColumn prop="D" label="线路D">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.D" active-color="#13ce66" inactive-color="#C9C9C9">
+                <el-switch active-value="1" inactive-value="0" v-model="scope.row.D" active-color="#13ce66" inactive-color="#C9C9C9">
                 </el-switch>
               </template>
             </ElTableColumn>
             <ElTableColumn prop="E" label="线路E">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.E" active-color="#13ce66" inactive-color="#C9C9C9">
+                <el-switch active-value="1" inactive-value="0" v-model="scope.row.E" active-color="#13ce66" inactive-color="#C9C9C9">
                 </el-switch>
               </template>
             </ElTableColumn>
             <ElTableColumn prop="F" label="线路F">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.F" active-color="#13ce66" inactive-color="#C9C9C9">
+                <el-switch active-value="1" inactive-value="0" v-model="scope.row.F" active-color="#13ce66" inactive-color="#C9C9C9">
                 </el-switch>
               </template>
             </ElTableColumn>
             <ElTableColumn prop="G" label="线路G">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.G" active-color="#13ce66" inactive-color="#C9C9C9">
+                <el-switch active-value="1" inactive-value="0" v-model="scope.row.G" active-color="#13ce66" inactive-color="#C9C9C9">
                 </el-switch>
               </template>
             </ElTableColumn>
             <ElTableColumn prop="H" label="线路H">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.H" active-color="#13ce66" inactive-color="#C9C9C9">
+                <el-switch active-value="1" inactive-value="0" v-model="scope.row.H" active-color="#13ce66" inactive-color="#C9C9C9">
                 </el-switch>
               </template>
             </ElTableColumn>
@@ -300,7 +300,8 @@ export default {
             this.onWorkStatus2 = item.value;
           } else if (item.property == 'MD') {
           } else {
-            let data = JSON.parse(item.value || {});
+            let data = JSON.parse(item.formatValue || {});
+
             tData.push({ ...data, ds: item.property })
           }
         })