From 088cb504d95b79fc336079dcdd6733e6f01d0b52 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Tue, 23 May 2023 14:15:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E6=8E=A7=E5=88=86=E5=8E=82=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=B7=BB=E5=8A=A0=E5=9C=A8=E7=BA=BF=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/electronicControl/childContent/left.vue | 6 +++---
 src/views/index.vue                               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/electronicControl/childContent/left.vue b/src/views/electronicControl/childContent/left.vue
index 18c3370..b4b7af7 100644
--- a/src/views/electronicControl/childContent/left.vue
+++ b/src/views/electronicControl/childContent/left.vue
@@ -73,7 +73,7 @@ let tabledata = reactive({
     t('messages.DevName'),
     t('messages.type'),
     t('messages.DevStatus'),
-    t('messages.RunTime'),
+    `${t('messages.RunTime')}`,
       // "设备信号",
     ],
     data: [],
@@ -120,7 +120,7 @@ function changedevlist(val: any) {
       res.name,
       res.devType,
       JSON.parse(res.devstatus) ? t('messages.onLine') : t('messages.offline'),
-      '1'
+      `${res.runTime}min`
     ]);
 
   });
@@ -128,7 +128,7 @@ function changedevlist(val: any) {
   tabledata.data.rowNum = val.length < 10 ? val.length : 10;
   tabledata.data.waitTime = 3000;
   // tabledata.data.columnWidth=[90,115,115,115,115]
-  listWH.width ? tabledata.data.columnWidth = [listWH.width * 0.12, listWH.width * 0.30, listWH.width * 0.15, listWH.width * 0.21] : ''
+  listWH.width ? tabledata.data.columnWidth = [listWH.width * 0.12, listWH.width * 0.30, listWH.width * 0.15, listWH.width * 0.18] : ''
   tableref.value.changeData(tabledata.data);
 }
 function setDataList(val: any) {
diff --git a/src/views/index.vue b/src/views/index.vue
index 5a5cf38..058cb21 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -19,7 +19,7 @@
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item :class="'简体中文' == lang?'select':'' " command="简体中文">简体中文</el-dropdown-item>
-        <el-dropdown-item :class="'English/USD' == lang?'select':'' " command="English/USD">English/USD</el-dropdown-item>
+        <el-dropdown-item :class="'English/USD' == lang?'select':'' " command="English/USD">English</el-dropdown-item>
       </el-dropdown-menu>
     </template>
   </el-dropdown>