From f961a0674b58d032985b078dd0cb439489ac6ed4 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Fri, 16 Jun 2023 12:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=82=E5=A4=96=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E5=A4=A7=E5=B1=8F=E8=AE=BE=E5=A4=87=E6=94=B9=E6=9C=BA?=
 =?UTF-8?q?=E5=99=A8=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/lang/en.ts                                | 8 +++++++-
 src/locales/lang/zh.ts                                | 8 +++++++-
 src/views/Offsite/child/childContent/center.vue       | 8 ++++----
 src/views/Offsite/child/childContent/chart/devTip.vue | 4 ++--
 src/views/Offsite/child/childContent/left.vue         | 4 ++--
 src/views/Offsite/child/childContent/right.vue        | 6 +++---
 src/views/Offsite/content/left.vue                    | 2 +-
 7 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 4c79d94..325c4cb 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \screenFront\src\locales\lang\en.ts
+ * @FilePath: \code\gitscreenFront\src\locales\lang\en.ts
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-05-04 16:36:13
@@ -88,8 +88,10 @@ export default {
         'SerialNum':'Serial Number',
         'RackNum':'Machine Number',
         'DevName':'Machine Name',
+        'JiqiName':'Machine Name',
         'ofLegion':'Affiliated Division',
         'DevStatus':'Equipment Status',
+        'JiqiStatus':'Machine Status',
         "RunTime":'Running hours',
         'finishSchedule':'Complete Schedule',
         'deliveryDay':'Delivery Date',
@@ -108,6 +110,7 @@ export default {
         'units':'set',
         'LegionDevList':'Division Equipment List',
         'DevType':'Equipment Type',
+        'JiqiType':'Machine Type',
         'model':'Model',
         'InstallPhase':'Installation',
         'AssemblyGroup':'Assembly Group',
@@ -183,11 +186,13 @@ export default {
         'OffProduct':'Offline Product',
         'DongGuan_GatewayStatus':'Dongguan-IoT Gateway Status',
         'DevPreviewChart':'Equipment Preview',
+        'JiqiPreviewChart':'Machine Preview',
         'OffNum':'Offline Quantity',
         'DongGuanDevList':'Dongguan Branch Devices',
         'Ex_factoryDate':'EXW Date',
         'Devsignal':'Equipment Signal',
         'DevReminder':'Equipment Warning',
+        'JiqiReminder':'Machine Warning',
         'abnormal':'Abnormal',
         'NoAbnormal':'No Abnormal',
         'disconnection':'Disconnect',
@@ -260,6 +265,7 @@ export default {
         'AllNum':'Total',
         'CH2Ojiance':'Alcohol Test',
         'DevList':'Devices',
+        'JiqiList':'machine',
         'AlarmTime':'Alarm Time',
         'duration':'duration',
         'IoT_System':'IoT Management System',
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 82c6643..b068d69 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \gitscreenFront\src\locales\lang\zh.ts
+ * @FilePath: \code\gitscreenFront\src\locales\lang\zh.ts
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-05-04 16:36:13
@@ -88,8 +88,10 @@ export default {
         'SerialNum':'序号',
         'RackNum':'机架号',
         'DevName':'设备名称',
+        'JiqiName':'机器名称',
         'ofLegion':'所属军团',
         'DevStatus':'设备状态',
+        'JiqiStatus':'机器状态',
         "RunTime":'工作时长',
         'finishSchedule':'完成进度',
         'deliveryDay':'交货日期',
@@ -108,6 +110,7 @@ export default {
         'units':'台',
         'LegionDevList':'军团设备列表',
         'DevType':'设备类型',
+        'JiqiType':'机器类型',
         'model':'型号',
         'InstallPhase':'安装阶段',
         'AssemblyGroup':'装配组',
@@ -183,11 +186,13 @@ export default {
         'OffProduct':'离线产品',
         'DongGuan_GatewayStatus':'东莞-物联网关状态',
         'DevPreviewChart':'设备预览图',
+        'JiqiPreviewChart':'机器预览图',
         'OffNum':'离线数量',
         'DongGuanDevList':'东莞分公司设备列表',
         'Ex_factoryDate':'出厂日期',
         'Devsignal':'设备信号',
         'DevReminder':'设备提醒',
+        'JiqiReminder':'机器提醒',
         'abnormal':'异常',
         'NoAbnormal':'无异常',
         'disconnection':'断连',
@@ -260,6 +265,7 @@ export default {
         'AllNum':'总数',
         'CH2Ojiance':'甲醛监测',
         'DevList':'设备列表',
+        'JiqiList':'机器列表',
         'AlarmTime':'报警时间',
         'duration':'持续时间',
         'IoT_System':'物联管理系统',
diff --git a/src/views/Offsite/child/childContent/center.vue b/src/views/Offsite/child/childContent/center.vue
index 24fcfa1..20efacf 100644
--- a/src/views/Offsite/child/childContent/center.vue
+++ b/src/views/Offsite/child/childContent/center.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\Offsite\child\childContent\center.vue
+ * @FilePath: \code\gitscreenFront\src\views\Offsite\child\childContent\center.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-12 08:46:57
@@ -64,16 +64,16 @@ let data1 = [
   },
 ];
 let tabledata = reactive({
-  title: t('messages.DevList'),
+  title: t('messages.JiqiList'),
   data: {
     header: [
     t('messages.SerialNum'),
-    t('messages.DevName'),
+    t('messages.JiqiName'),
     t('messages.model'),
       t('messages.RackNum'),
       t('messages.type'),
       t('messages.Ex_factoryDate'),
-      t('messages.DevStatus'),
+      t('messages.JiqiStatus'),
       // t('messages.Devsignal'),
     ],
     data: [],
diff --git a/src/views/Offsite/child/childContent/chart/devTip.vue b/src/views/Offsite/child/childContent/chart/devTip.vue
index 040b6b3..b612142 100644
--- a/src/views/Offsite/child/childContent/chart/devTip.vue
+++ b/src/views/Offsite/child/childContent/chart/devTip.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\Offsite\child\childContent\chart\devTip.vue
+ * @FilePath: \code\gitscreenFront\src\views\Offsite\child\childContent\chart\devTip.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-12 10:21:10
@@ -34,7 +34,7 @@
                     </div>
                     <div class="item-text">
                       <p><span :style="{ color: JSON.parse(res.status) ? '#20aec5' : 'rgb(228, 57, 97)' }">{{ JSON.parse(res.status) ? t('messages.onLine') : t('messages.offline') }}</span></p>
-                      <p>{{t('messages.DevName')}}:<span>{{ res.name }}</span></p>
+                      <p>{{t('messages.JiqiName')}}:<span>{{ res.name }}</span></p>
                     </div>
                   </div>
                 </li>
diff --git a/src/views/Offsite/child/childContent/left.vue b/src/views/Offsite/child/childContent/left.vue
index 0ede6aa..af4b6ea 100644
--- a/src/views/Offsite/child/childContent/left.vue
+++ b/src/views/Offsite/child/childContent/left.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\Offsite\child\childContent\left.vue
+ * @FilePath: \code\gitscreenFront\src\views\Offsite\child\childContent\left.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-12 08:46:57
@@ -17,7 +17,7 @@
         ></offsitegateway>
       </el-col>
       <el-col>
-        <devImage ref="devImageRef" :title="t('messages.DevPreviewChart')"></devImage>
+        <devImage ref="devImageRef" :title="t('messages.JiqiPreviewChart')"></devImage>
       </el-col>
     </el-row>
   </div>
diff --git a/src/views/Offsite/child/childContent/right.vue b/src/views/Offsite/child/childContent/right.vue
index 718e125..001ca72 100644
--- a/src/views/Offsite/child/childContent/right.vue
+++ b/src/views/Offsite/child/childContent/right.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\Offsite\child\childContent\right.vue
+ * @FilePath: \code\gitscreenFront\src\views\Offsite\child\childContent\right.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-13 09:09:03
@@ -18,7 +18,7 @@
         ></chart>
       </el-col>
       <el-col>
-        <devtip ref="devTipRef" :title="t('messages.DevReminder')"></devtip>
+        <devtip ref="devTipRef" :title="t('messages.JiqiReminder')"></devtip>
       </el-col>
     </el-row>
   </div>
@@ -68,7 +68,7 @@ let DevType = reactive({
   title: "",
   option: {
     title: {
-      text: t('messages.DevType'),
+      text: t('messages.JiqiType'),
       show: true,
       textStyle: {
         color: "#fff",
diff --git a/src/views/Offsite/content/left.vue b/src/views/Offsite/content/left.vue
index 877365c..9776d04 100644
--- a/src/views/Offsite/content/left.vue
+++ b/src/views/Offsite/content/left.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\Offsite\content\left.vue
+ * @FilePath: \code\gitscreenFront\src\views\Offsite\content\left.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-03-26 16:09:16