From 9ae87c892ad565eb79704610f006cb031b4d9685 Mon Sep 17 00:00:00 2001
From: 123456 <123456>
Date: Mon, 15 May 2023 11:57:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E7=99=BB=E5=A4=A7=E5=B1=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8F=8A=E5=9B=BD=E9=99=85=E5=8C=96=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/assembly/RotationTable.vue     |   5 +-
 src/hook/nowTime.ts                           |   7 +-
 src/locales/lang/en.ts                        |   2 +-
 src/utils/time.ts                             |  48 +--
 src/views/InPlantProducts/content/top.vue     |   2 +-
 src/views/Temp/Large_Format/index.vue         |   4 +-
 .../OffsiteDevList/childContent/center.vue    |   6 +-
 .../childContent/chart/devTip.vue             |   4 +-
 .../OffsiteDevList/childContent/right.vue     |   3 +-
 src/views/Temp/OffsiteDevList/index.vue       | 281 +++++++++---------
 src/views/Temp/Winding/index.vue              |  12 +-
 .../content/child/historyData.vue             |   4 +-
 src/views/legionProducts/index.vue            |  13 +-
 13 files changed, 215 insertions(+), 176 deletions(-)

diff --git a/src/components/assembly/RotationTable.vue b/src/components/assembly/RotationTable.vue
index fb82270..2121b4b 100644
--- a/src/components/assembly/RotationTable.vue
+++ b/src/components/assembly/RotationTable.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\components\assembly\RotationTable.vue
+ * @FilePath: \screenFront\src\components\assembly\RotationTable.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 15:09:06
@@ -20,7 +20,7 @@
         <div class="box">
           <h2>{{ props.title }}</h2>
         </div>
-        <dv-scroll-board
+        <zd-scroll-board
           ref="devList"
           :config="props.data.data"
           @click="dvClick"
@@ -51,6 +51,7 @@ import { getCurrentInstance, onMounted, reactive, ref, watch } from "vue";
 import { EDataPerson, devListType } from "@/type/InPlantProducts";
 import border2 from "@/components/borderBox/border2.vue";
 import border6 from "@/components/borderBox/border6.vue";
+import zdScrollBoard from "@/components/data-view/index.vue";
 import { useRouter } from "vue-router";
 import { Offsite } from "@/store/module/offsite";
 // const { proxy } = getCurrentInstance() as any;
diff --git a/src/hook/nowTime.ts b/src/hook/nowTime.ts
index 9e2eae4..f1549e9 100644
--- a/src/hook/nowTime.ts
+++ b/src/hook/nowTime.ts
@@ -7,6 +7,7 @@
  * 
  * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
  */
+import { getStoredLanguage } from '@/utils/languageStorage';
 import {onMounted, onUnmounted, reactive, ref} from 'vue'
 export default function( ){
     let timeHtml =ref('')
@@ -22,7 +23,11 @@ export default function( ){
  
         // 周日-周六(0-6) 刚好对应数字下标
         var day = time.getDay();
-        var arr = ["星期日","星期一","星期二","星期三","星期四","星期五","星期六"];
+        if (getStoredLanguage() == 'English/USD') {
+            var arr = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+    } else {
+            var arr = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+    }
         var hours:any = time.getHours();
         var minutes:any = time.getMinutes();
         var seconds:any = time.getSeconds();
diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 8ea741f..902387f 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -11,7 +11,7 @@
 export default {
     messages: {
         'energyConsume': 'Energy Consumption Real-time Monitoring System',
-        'ECHistoryData' :'能耗 历史数据检测系统',
+        'ECHistoryData' :'Energy Historical data detection System',
         'generalEnvironment': 'Environment-Convention Real-time Monitoring System',
         'InPlantProducts': 'Iot System Products in Factory',
         'Mechanics': 'Machinery Factory Equipment Monitor and Control Center',
diff --git a/src/utils/time.ts b/src/utils/time.ts
index 668fec9..5e7d119 100644
--- a/src/utils/time.ts
+++ b/src/utils/time.ts
@@ -7,36 +7,44 @@
  * 
  * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
  */
-export function gettime(data=null){
+
+import { getStoredLanguage } from "../utils/languageStorage";
+export function gettime(data = null) {
         var time
-        if(data){
-        time = new Date(data);
-        }else{
-        time = new Date();
+        if (data) {
+                time = new Date(data);
+        } else {
+                time = new Date();
         }
         var year = time.getFullYear();
         // 1月到12月(0-11)
-        var month = time.getMonth()+1;
+        var month = time.getMonth() + 1;
         var dates = time.getDate();
- 
+
         // 周日-周六(0-6) 刚好对应数字下标
         var day = time.getDay();
-        var arr = ["星期日","星期一","星期二","星期三","星期四","星期五","星期六"];
-        var hours:any = time.getHours();
-        var minutes:any = time.getMinutes();
-        var seconds:any = time.getSeconds();
+        console.log(getStoredLanguage());
+
+        if (getStoredLanguage() == 'English/USD') {
+                var arr = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+        } else {
+                var arr = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+        }
+        var hours: any = time.getHours();
+        var minutes: any = time.getMinutes();
+        var seconds: any = time.getSeconds();
         // 小于10分钟前面补零
         if (hours < 10) hours = "0" + hours;
         if (minutes < 10) minutes = "0" + minutes;
         if (seconds < 10) seconds = "0" + seconds;
- 
-        return year + "-" + month + "-" + dates + " "+hours+':'+minutes+':'+seconds+' '+arr[day];
+
+        return year + "-" + month + "-" + dates + " " + hours + ':' + minutes + ':' + seconds + ' ' + arr[day];
 }
-export function clacendTime(endtime,nowtime){
-        let newDate=Math.abs( endtime-nowtime)
-        var day=Math.floor(newDate/1000/60/60/24)
-        var h=Math.floor(newDate/1000/60/60%24)
-        var m=Math.floor(newDate/1000/60%60)
-        var s=Math.floor(newDate/1000%60)
-        return day+'天'+h+'时'+m+'分'+s+'秒'
+export function clacendTime(endtime, nowtime) {
+        let newDate = Math.abs(endtime - nowtime)
+        var day = Math.floor(newDate / 1000 / 60 / 60 / 24)
+        var h = Math.floor(newDate / 1000 / 60 / 60 % 24)
+        var m = Math.floor(newDate / 1000 / 60 % 60)
+        var s = Math.floor(newDate / 1000 % 60)
+        return day + '天' + h + '时' + m + '分' + s + '秒'
 }
\ No newline at end of file
diff --git a/src/views/InPlantProducts/content/top.vue b/src/views/InPlantProducts/content/top.vue
index 92e90bf..c436b11 100644
--- a/src/views/InPlantProducts/content/top.vue
+++ b/src/views/InPlantProducts/content/top.vue
@@ -12,7 +12,7 @@
   <div class="content-left">
     <el-row>
       <el-col :span="6">
-        <gateway ref="gateway1" :title="t('messages.QiCheCommunication')" @click="toLegionProducts(5,'汽车军团')"> </gateway>
+        <gateway ref="gateway1" :title="t('messages.QiCheCommunication')" @click="toLegionProducts(5,t('messages.QiCheLegion'))"> </gateway>
       </el-col>
       <el-col :span="6">
         <gateway ref="gateway2" :title="t('messages.FuZhuangCommunication')" @click="toLegionProducts(3,'服装军团')"> </gateway>
diff --git a/src/views/Temp/Large_Format/index.vue b/src/views/Temp/Large_Format/index.vue
index faa92f7..87ac67f 100644
--- a/src/views/Temp/Large_Format/index.vue
+++ b/src/views/Temp/Large_Format/index.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\Temp\Large_Format\index.vue
+ * @FilePath: \screenFront\src\views\Temp\Large_Format\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-17 15:04:50
@@ -144,7 +144,7 @@ async function getDeviceDetailfun() {
           "realityTime": "",
           "planProductionDate": "2023年04月11日",
           "customerSalesman": "王佳美",
-          "progress": "100",
+          "progress": "70",
           "salesPerson": "王佳美",
           "deliveryDate": "",
           "tradeType": "外贸",
diff --git a/src/views/Temp/OffsiteDevList/childContent/center.vue b/src/views/Temp/OffsiteDevList/childContent/center.vue
index 5a546b7..0caf9a0 100644
--- a/src/views/Temp/OffsiteDevList/childContent/center.vue
+++ b/src/views/Temp/OffsiteDevList/childContent/center.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\Offsite\child\childContent\center.vue
+ * @FilePath: \screenFront\src\views\Temp\OffsiteDevList\childContent\center.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-12 08:46:57
@@ -145,8 +145,8 @@ function changedevlist(val: any) {
       res.deviceType,
       res.realityDate,
       JSON.parse(res.deviceStatus)
-        ? t('messages.onLine')
-        : t('messages.offline'),
+        ? `<span style="color:#20aec5;">${t('messages.onLine')}</span>`
+        : `<span style="color:rgb(228, 57, 97);">${t('messages.offline')}</span>`,
       // "",
     ]);
     
diff --git a/src/views/Temp/OffsiteDevList/childContent/chart/devTip.vue b/src/views/Temp/OffsiteDevList/childContent/chart/devTip.vue
index e220585..cd56798 100644
--- a/src/views/Temp/OffsiteDevList/childContent/chart/devTip.vue
+++ b/src/views/Temp/OffsiteDevList/childContent/chart/devTip.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\Offsite\child\childContent\chart\devTip.vue
+ * @FilePath: \screenFront\src\views\Temp\OffsiteDevList\childContent\chart\devTip.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-12 10:21:10
@@ -33,7 +33,7 @@
                       <p>时间:<span>{{ res.ts }}</span></p>
                     </div>
                     <div class="item-text">
-                      <p><span :style="{ color: JSON.parse(res.status) ? 'green' : 'red' }">{{ JSON.parse(res.status) ? t('messages.onLine') : t('messages.offline') }}</span></p>
+                      <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>
                     </div>
                   </div>
diff --git a/src/views/Temp/OffsiteDevList/childContent/right.vue b/src/views/Temp/OffsiteDevList/childContent/right.vue
index e4f280c..cf4787c 100644
--- a/src/views/Temp/OffsiteDevList/childContent/right.vue
+++ b/src/views/Temp/OffsiteDevList/childContent/right.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\Offsite\child\childContent\right.vue
+ * @FilePath: \screenFront\src\views\Temp\OffsiteDevList\childContent\right.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-13 09:09:03
@@ -207,7 +207,6 @@ val.typenum.forEach(res=>{
 DevType.option.series[0].data=echartdata
 chartref.value.changeData(DevType.option)
 
-data2.push(...data2)
 devTipRef.value.setData(data2);
 }
 onMounted(() => {
diff --git a/src/views/Temp/OffsiteDevList/index.vue b/src/views/Temp/OffsiteDevList/index.vue
index a1b3712..4fd34b2 100644
--- a/src/views/Temp/OffsiteDevList/index.vue
+++ b/src/views/Temp/OffsiteDevList/index.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\Offsite\child\index.vue
+ * @FilePath: \screenFront\src\views\Temp\OffsiteDevList\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-11 13:50:05
@@ -8,178 +8,187 @@
  * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
 -->
 <template>
- <div class="container">
-  <div class="header">
-        <div class="title">
-          <header2 ref="headerref" :width="'100%'" :height="'100px'" :title="'再登-东莞产品物联管理系统'" :titleTip="[]" :typeFun="['comback','time']" :alarmType="[]"></header2>
-        </div>
-      </div>
-      <div class="content" ref="Acontent">
-        <el-row>
-            <el-col :span="7">
-                <left :width="size.oWidth*7" :height="size.oHeight" ref="leftRef"></left>
-            </el-col>
-            <el-col :span="11">
-                <center :width="size.oWidth*11" :height="size.oHeight" ref="centerRef"></center>
-            </el-col>
-            <el-col :span="6">
-                <right :width="size.oWidth*6" :height="size.oHeight" ref="rightRef"></right>
-            </el-col>
-          </el-row>
+  <div class="container">
+    <div class="header">
+      <div class="title">
+        <header2 ref="headerref" :width="'100%'" :height="'100px'" :title="'再登-东莞产品物联管理系统'" :titleTip="[]"
+          :typeFun="['comback', 'time']" :alarmType="[]"></header2>
       </div>
     </div>
+    <div class="content" ref="Acontent">
+      <el-row>
+        <el-col :span="7">
+          <left :width="size.oWidth * 7" :height="size.oHeight" ref="leftRef"></left>
+        </el-col>
+        <el-col :span="11">
+          <center :width="size.oWidth * 11" :height="size.oHeight" ref="centerRef"></center>
+        </el-col>
+        <el-col :span="6">
+          <right :width="size.oWidth * 6" :height="size.oHeight" ref="rightRef"></right>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
 </template>
 
 <script setup lang="ts">
-import {onMounted, onUnmounted, reactive, ref} from "vue"
+import { onMounted, onUnmounted, reactive, ref } from "vue"
 import devSwiper from "@/components/EquipmentStatusDiagram/EquipmentStatusDiagram.vue"
 import header2 from '@/components/headerBox/header2.vue'
-import {calcWH} from '@/components/ts/selfAdaption'
+import { calcWH } from '@/components/ts/selfAdaption'
 import { Offsite } from "@/store/module/offsite";
-import { deviceCountsSecondaryOfOutPlantData,deviceTypeCountsSecondaryOfOutPlantData,deviceStatusCountsSecondaryOfOutPlantData,secondaryOutPlantData} from "@/http/offsite";
+import { deviceCountsSecondaryOfOutPlantData, deviceTypeCountsSecondaryOfOutPlantData, deviceStatusCountsSecondaryOfOutPlantData, secondaryOutPlantData } from "@/http/offsite";
 import left from "./childContent/left.vue"
 import center from "./childContent/center.vue"
 import right from "./childContent/right.vue"
 import { useRoute, useRouter } from "vue-router";
 import { useI18n } from 'vue-i18n'
-let {t} = useI18n();
+let { t } = useI18n();
 const route = useRoute();
-const store=Offsite()
-let Acontent=ref()
-let time=ref(null)
-let routeCity=route.params.city
+const store = Offsite()
+let Acontent = ref()
+let time = ref(null)
+let routeCity = route.params.city
 
-let leftRef=ref()
-let centerRef=ref()
-let rightRef=ref()
-let size=reactive({
-    oWidth:0,
-    oHeight:0
-  });
-  function WH(div:HTMLElement){
-    let a=calcWH(div.offsetHeight,div.offsetWidth,1,24,0)
-  size.oWidth=a.oWidth
-  size.oHeight=a.oHeight
-    
-  }
+let leftRef = ref()
+let centerRef = ref()
+let rightRef = ref()
+let size = reactive({
+  oWidth: 0,
+  oHeight: 0
+});
+function WH(div: HTMLElement) {
+  let a = calcWH(div.offsetHeight, div.offsetWidth, 1, 24, 0)
+  size.oWidth = a.oWidth
+  size.oHeight = a.oHeight
+
+}
 // 各分公司设备数量(二级)
-  async function deviceCountsSecondaryOfOutPlantDatafun(){
-    let result:any = await deviceCountsSecondaryOfOutPlantData()
-   let a={"code":200,"msg":null,"data":{"浙江省":[{"id":"6694a9e0-af40-11ed-939a-bf37ddc1d39c","name":"浙江展厅wifi网关","status":"true","city":"浙江省","counts":1},{"id":"e307d530-aead-11ed-939a-bf37ddc1d39c","name":"浙江展厅网关_4G","status":"true","city":"浙江省","counts":3}],"广东省":[{"id":"939863c0-c393-11ed-a742-83feda1d6cb3","name":"东莞4G网关","status":"true","city":"广东省","counts":13},{"id":"e8a527e0-c393-11ed-a742-83feda1d6cb3","name":"东莞WiFi网关","status":"false","city":"广东省","counts":1}]}}
-    if(result.code==200){
-      // store.setoffsitegatewayStatus(result.data)
-    }
+async function deviceCountsSecondaryOfOutPlantDatafun() {
+  let result: any = await deviceCountsSecondaryOfOutPlantData()
+  let a = { "code": 200, "msg": null, "data": { "浙江省": [{ "id": "6694a9e0-af40-11ed-939a-bf37ddc1d39c", "name": "浙江展厅wifi网关", "status": "true", "city": "浙江省", "counts": 1 }, { "id": "e307d530-aead-11ed-939a-bf37ddc1d39c", "name": "浙江展厅网关_4G", "status": "true", "city": "浙江省", "counts": 3 }], "广东省": [{ "id": "939863c0-c393-11ed-a742-83feda1d6cb3", "name": "东莞4G网关", "status": "true", "city": "广东省", "counts": 13 }, { "id": "e8a527e0-c393-11ed-a742-83feda1d6cb3", "name": "东莞WiFi网关", "status": "false", "city": "广东省", "counts": 1 }] } }
+  if (result.code == 200) {
+    // store.setoffsitegatewayStatus(result.data)
   }
-  // 分公司各类型设备数量(二级)
-  async function deviceTypeCountsSecondaryOfOutPlantDatafun(){
-    let result:any = await deviceTypeCountsSecondaryOfOutPlantData()
-   let a ={"code":200,"msg":null,"data":{"浙江省":[{"deptId":"浙江省","name":"缝纫","counts":1,"gatewayStatus":null},{"deptId":"浙江省","name":"绣花","counts":1,"gatewayStatus":null},{"deptId":"浙江省","name":"裁剪","counts":2,"gatewayStatus":null}],"广东省":[{"deptId":"广东省","name":"裁剪","counts":4,"gatewayStatus":null},{"deptId":"广东省","name":"绣花","counts":3,"gatewayStatus":null},{"deptId":"广东省","name":"缝纫","counts":6,"gatewayStatus":null},{"deptId":"广东省","name":"版房","counts":1,"gatewayStatus":null}]}}
-    if(result.code==200){
-      // store.setoffsitegatewayStatus(result.data)
+}
+// 分公司各类型设备数量(二级)
+async function deviceTypeCountsSecondaryOfOutPlantDatafun() {
+  let result: any = await deviceTypeCountsSecondaryOfOutPlantData()
+  let a = { "code": 200, "msg": null, "data": { "浙江省": [{ "deptId": "浙江省", "name": "缝纫", "counts": 1, "gatewayStatus": null }, { "deptId": "浙江省", "name": "绣花", "counts": 1, "gatewayStatus": null }, { "deptId": "浙江省", "name": "裁剪", "counts": 2, "gatewayStatus": null }], "广东省": [{ "deptId": "广东省", "name": "裁剪", "counts": 4, "gatewayStatus": null }, { "deptId": "广东省", "name": "绣花", "counts": 3, "gatewayStatus": null }, { "deptId": "广东省", "name": "缝纫", "counts": 6, "gatewayStatus": null }, { "deptId": "广东省", "name": "版房", "counts": 1, "gatewayStatus": null }] } }
+  if (result.code == 200) {
+    // store.setoffsitegatewayStatus(result.data)
 
-    }
   }
-  // 分公司设备各种状态的数量(二级)
-  async function deviceStatusCountsSecondaryOfOutPlantDatafun(){
-    let result:any = await deviceStatusCountsSecondaryOfOutPlantData()
-   let a ={"code":200,"msg":null,"data":{"浙江省":[{"deptId":"浙江省","name":"false","counts":4,"gatewayStatus":null}],"广东省":[{"deptId":"广东省","name":"false","counts":14,"gatewayStatus":null}]}}
-    if(result.code==200){
-      // store.setoffsitegatewayStatus(result.data)
-    }
+}
+// 分公司设备各种状态的数量(二级)
+async function deviceStatusCountsSecondaryOfOutPlantDatafun() {
+  let result: any = await deviceStatusCountsSecondaryOfOutPlantData()
+  let a = { "code": 200, "msg": null, "data": { "浙江省": [{ "deptId": "浙江省", "name": "false", "counts": 4, "gatewayStatus": null }], "广东省": [{ "deptId": "广东省", "name": "false", "counts": 14, "gatewayStatus": null }] } }
+  if (result.code == 200) {
+    // store.setoffsitegatewayStatus(result.data)
   }
+}
 // 分公司二级页面列表
-    async function secondaryOutPlantDatafun(){
-  let a = {"code":200,"msg":null,"data":{"浙江省":[{"id":"4817dbe0-b4ef-11ed-939a-bf37ddc1d39c","label":"RHL23","name":"富怡全自动缝纫机","deviceStatus":"false","machineModel":null,"unit":null,"city":"浙江省","isExhibition":"是","deviceType":"缝纫","model":"RPAS-L-R-1-1200X800-A-IS-VR2-LH50,RH360-1P220","deptId":"17"},{"id":"b2cdf1b0-c9dd-11ed-a742-83feda1d6cb3","label":"0202101#","name":"富怡电脑精密单头帽绣成衣绣花机","deviceStatus":"false","machineModel":null,"unit":null,"city":"浙江省","isExhibition":"是","deviceType":"绣花","model":"RPCE-NM-TC-1-400x450-LB-F15-VR1-NA-1P220","deptId":"17"},{"id":"c462aa50-b4ee-11ed-939a-bf37ddc1d39c","label":"10410100","name":"富怡模板铣切机","deviceStatus":"false","machineModel":null,"unit":null,"city":"浙江省","isExhibition":"是","deviceType":"裁剪","model":"RPFP-NM-PD+DKC+TC-1-1300X1000-SGAF-P+K+MC2-NA-1P220","deptId":"17"},{"id":"ffc09bb0-c921-11ed-a742-83feda1d6cb3","label":"050916#","name":"富怡全自动针梭通用铺布机","deviceStatus":"false","machineModel":null,"unit":null,"city":"浙江省","isExhibition":"是","deviceType":"裁剪","model":"RPSM-NM-1-1000×1800-C-KW100-NA-1P220","deptId":"17"}],"广东省":[{"id":"0267aa80-ca0c-11ed-a742-83feda1d6cb3","label":"50231","name":"富怡全自动电脑裁床","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"裁剪","model":"RPAG-NW-MC6-1-1800X1800-SB-MH-P-3P380","deptId":"16"},{"id":"22761c60-c6cb-11ed-a742-83feda1d6cb3","label":"1885","name":"富怡电脑绣花机（三合一）","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"绣花","model":"RPCE-MC6-2-9-550X680-B-L-R","deptId":"16"},{"id":"32e98630-c6c7-11ed-a742-83feda1d6cb3","label":"170322798","name":"富怡激光雕刻切割机","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"裁剪","model":"RPLC-CB130X090S10E-M","deptId":"16"},{"id":"511266c0-c6c9-11ed-a742-83feda1d6cb3","label":null,"name":"电子夹线直驱平缝机","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"缝纫","model":"RPS-GFL-9800D-2J-M-E","deptId":"16"},{"id":"688a6750-d44b-11ed-a742-83feda1d6cb3","label":"170321NS064","name":"富怡全自动缝纫机（零等待）","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"缝纫","model":"RPAS-NS-1-900X600-B-2-LH.HM","deptId":"16"},{"id":"73b2c280-c6c7-11ed-a742-83feda1d6cb3","label":"RPS-1108-165","name":"富怡特种缝纫机","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"缝纫","model":"RPS.SSC-M","deptId":"16"},{"id":"804e8a60-d44b-11ed-a742-83feda1d6cb3","label":"RHUL-01","name":"富怡全自动任意转单针缝纫机","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"缝纫","model":"RPAS-RH-1-1200×800-A-2-LH,LM","deptId":"16"},{"id":"915872d0-ca0a-11ed-a742-83feda1d6cb3","label":"040720","name":"三合一裁床","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"裁剪","model":"RP-TM1518S-MJ.MF.KC.PK.VK","deptId":"16"},{"id":"a40b97b0-c6ca-11ed-a742-83feda1d6cb3","label":null,"name":"微油超高速四线包缝机","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"缝纫","model":"RPS-GFL-8200W-4/AT-M-E","deptId":"16"},{"id":"b338ce60-ca12-11ed-a742-83feda1d6cb3","label":"1170824#","name":"富怡全自动双头垫板式冲孔机","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"绣花","model":"RPCE-L-P-2-900×600-B-P6-O-NA-1P200","deptId":"16"},{"id":"bd70dc60-c571-11ed-a742-83feda1d6cb3","label":"0201112","name":"富怡电脑绣花机","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"绣花","model":"RPCE-FN-6.9-275(550+40)*680-B","deptId":"16"},{"id":"bf0dc030-c6f5-11ed-a742-83feda1d6cb3","label":"50945","name":"富怡全自动铺布机","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"裁剪","model":"RPCP-1018-IV-D","deptId":"16"},{"id":"cc95d870-c6c6-11ed-a742-83feda1d6cb3","label":"MJKC1703080121","name":"富怡平板切割机","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"版房","model":"RP-TM1512S-MJ.KC","deptId":"16"},{"id":"d7371c40-c6ca-11ed-a742-83feda1d6cb3","label":null,"name":"工业平缝机","deviceStatus":"false","machineModel":null,"unit":null,"city":"广东省","isExhibition":"是","deviceType":"缝纫","model":null,"deptId":"16"}]}}
-    let result:any = await secondaryOutPlantData()
-   
-    if(result.code==200){
-      // store.setoffsitegatewayStatus(result.data)
-    }
+async function secondaryOutPlantDatafun() {
+  let a = { "code": 200, "msg": null, "data": { "浙江省": [{ "id": "4817dbe0-b4ef-11ed-939a-bf37ddc1d39c", "label": "RHL23", "name": "富怡全自动缝纫机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "浙江省", "isExhibition": "是", "deviceType": "缝纫", "model": "RPAS-L-R-1-1200X800-A-IS-VR2-LH50,RH360-1P220", "deptId": "17" }, { "id": "b2cdf1b0-c9dd-11ed-a742-83feda1d6cb3", "label": "0202101#", "name": "富怡电脑精密单头帽绣成衣绣花机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "浙江省", "isExhibition": "是", "deviceType": "绣花", "model": "RPCE-NM-TC-1-400x450-LB-F15-VR1-NA-1P220", "deptId": "17" }, { "id": "c462aa50-b4ee-11ed-939a-bf37ddc1d39c", "label": "10410100", "name": "富怡模板铣切机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "浙江省", "isExhibition": "是", "deviceType": "裁剪", "model": "RPFP-NM-PD+DKC+TC-1-1300X1000-SGAF-P+K+MC2-NA-1P220", "deptId": "17" }, { "id": "ffc09bb0-c921-11ed-a742-83feda1d6cb3", "label": "050916#", "name": "富怡全自动针梭通用铺布机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "浙江省", "isExhibition": "是", "deviceType": "裁剪", "model": "RPSM-NM-1-1000×1800-C-KW100-NA-1P220", "deptId": "17" }], "广东省": [{ "id": "0267aa80-ca0c-11ed-a742-83feda1d6cb3", "label": "50231", "name": "富怡全自动电脑裁床", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "裁剪", "model": "RPAG-NW-MC6-1-1800X1800-SB-MH-P-3P380", "deptId": "16" }, { "id": "22761c60-c6cb-11ed-a742-83feda1d6cb3", "label": "1885", "name": "富怡电脑绣花机（三合一）", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "绣花", "model": "RPCE-MC6-2-9-550X680-B-L-R", "deptId": "16" }, { "id": "32e98630-c6c7-11ed-a742-83feda1d6cb3", "label": "170322798", "name": "富怡激光雕刻切割机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "裁剪", "model": "RPLC-CB130X090S10E-M", "deptId": "16" }, { "id": "511266c0-c6c9-11ed-a742-83feda1d6cb3", "label": null, "name": "电子夹线直驱平缝机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "缝纫", "model": "RPS-GFL-9800D-2J-M-E", "deptId": "16" }, { "id": "688a6750-d44b-11ed-a742-83feda1d6cb3", "label": "170321NS064", "name": "富怡全自动缝纫机（零等待）", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "缝纫", "model": "RPAS-NS-1-900X600-B-2-LH.HM", "deptId": "16" }, { "id": "73b2c280-c6c7-11ed-a742-83feda1d6cb3", "label": "RPS-1108-165", "name": "富怡特种缝纫机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "缝纫", "model": "RPS.SSC-M", "deptId": "16" }, { "id": "804e8a60-d44b-11ed-a742-83feda1d6cb3", "label": "RHUL-01", "name": "富怡全自动任意转单针缝纫机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "缝纫", "model": "RPAS-RH-1-1200×800-A-2-LH,LM", "deptId": "16" }, { "id": "915872d0-ca0a-11ed-a742-83feda1d6cb3", "label": "040720", "name": "三合一裁床", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "裁剪", "model": "RP-TM1518S-MJ.MF.KC.PK.VK", "deptId": "16" }, { "id": "a40b97b0-c6ca-11ed-a742-83feda1d6cb3", "label": null, "name": "微油超高速四线包缝机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "缝纫", "model": "RPS-GFL-8200W-4/AT-M-E", "deptId": "16" }, { "id": "b338ce60-ca12-11ed-a742-83feda1d6cb3", "label": "1170824#", "name": "富怡全自动双头垫板式冲孔机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "绣花", "model": "RPCE-L-P-2-900×600-B-P6-O-NA-1P200", "deptId": "16" }, { "id": "bd70dc60-c571-11ed-a742-83feda1d6cb3", "label": "0201112", "name": "富怡电脑绣花机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "绣花", "model": "RPCE-FN-6.9-275(550+40)*680-B", "deptId": "16" }, { "id": "bf0dc030-c6f5-11ed-a742-83feda1d6cb3", "label": "50945", "name": "富怡全自动铺布机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "裁剪", "model": "RPCP-1018-IV-D", "deptId": "16" }, { "id": "cc95d870-c6c6-11ed-a742-83feda1d6cb3", "label": "MJKC1703080121", "name": "富怡平板切割机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "版房", "model": "RP-TM1512S-MJ.KC", "deptId": "16" }, { "id": "d7371c40-c6ca-11ed-a742-83feda1d6cb3", "label": null, "name": "工业平缝机", "deviceStatus": "false", "machineModel": null, "unit": null, "city": "广东省", "isExhibition": "是", "deviceType": "缝纫", "model": null, "deptId": "16" }] } }
+  let result: any = await secondaryOutPlantData()
+
+  if (result.code == 200) {
+    // store.setoffsitegatewayStatus(result.data)
   }
-  function getdata(){
-    Promise.all([deviceCountsSecondaryOfOutPlantData(),deviceTypeCountsSecondaryOfOutPlantData(),deviceStatusCountsSecondaryOfOutPlantData(),secondaryOutPlantData()]).then((res:any)=>{
-      let data={devnum:null,typenum:null,statusnum:null,citylist:null,}
-      res.forEach((ele,i)=>{
-            for(let key in ele.data){
-              if(key=="广东省"){
-                i==0?data.devnum=ele.data[key]:i==1?data.typenum=ele.data[key]:i==2?data.statusnum=ele.data[key]:i==3?data.citylist=ele.data[key]:''
-              }
-            }
-          })
-          
-          leftRef.value.setDataList(data)
-          centerRef.value.setDataList(data)
-          rightRef.value.setDataList(data)
-      })
-  }
-  onMounted(()=>{
-    // deviceCountsSecondaryOfOutPlantDatafun()
-    // deviceTypeCountsSecondaryOfOutPlantDatafun()
-    // deviceStatusCountsSecondaryOfOutPlantDatafun()
-    // secondaryOutPlantDatafun()
-    getdata()
-    let contentBox=Acontent.value
-    // let Timedombox=Timedom.value
-    window.document.title="再登-东莞产品物联管理系统"
-    WH(contentBox)
-    window.addEventListener('resize',()=>{
-      if(time.value){
-        clearTimeout(time.value)
-        time.value=null
+}
+function getdata() {
+  Promise.all([deviceCountsSecondaryOfOutPlantData(), deviceTypeCountsSecondaryOfOutPlantData(), deviceStatusCountsSecondaryOfOutPlantData(), secondaryOutPlantData()]).then((res: any) => {
+    let data = { devnum: null, typenum: null, statusnum: null, citylist: null, }
+    res.forEach((ele, i) => {
+      for (let key in ele.data) {
+        if (key == "广东省") {
+          i == 0 ? data.devnum = ele.data[key] : i == 1 ? data.typenum = ele.data[key] : i == 2 ? data.statusnum = ele.data[key] : i == 3 ? data.citylist = ele.data[key] : ''
+        }
       }
-      time.value = setTimeout(() => {WH(contentBox)
-      }, 1000);
     })
+
+    leftRef.value.setDataList(data)
+    centerRef.value.setDataList(data)
+    rightRef.value.setDataList(data)
   })
-  onUnmounted(() => {
-    clearTimeout(time)
-    // store.resetAllData()
+}
+onMounted(() => {
+  // deviceCountsSecondaryOfOutPlantDatafun()
+  // deviceTypeCountsSecondaryOfOutPlantDatafun()
+  // deviceStatusCountsSecondaryOfOutPlantDatafun()
+  // secondaryOutPlantDatafun()
+  getdata()
+  let contentBox = Acontent.value
+  // let Timedombox=Timedom.value
+  window.document.title = "再登-东莞产品物联管理系统"
+  WH(contentBox)
+  window.addEventListener('resize', () => {
+    if (time.value) {
+      clearTimeout(time.value)
+      time.value = null
+    }
+    time.value = setTimeout(() => {
+      WH(contentBox)
+    }, 1000);
   })
+})
+onUnmounted(() => {
+  clearTimeout(time)
+  // store.resetAllData()
+})
 </script>
 
 <style scoped>
 .container {
   height: 1080px;
   width: 1920px;
-    color: #20aec5;
-    background-color: #100c2a;
-  }
-  .title {
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    position: relative;
-  }
-  .title > h1 {
-    font-size: 30px;
-    position: absolute;
-    top: 10px;
-  }
-  .header{
-      position: relative;
-  }
-  .header p{
-      position: absolute;
-      right: 50px;
-      bottom: 20px;
-      font-size:20px;
-  }
-  .content{
-      width:100%;
-      --header:100px;
-      height:calc(1080px - var(--header))
-  }
+  color: #20aec5;
+  background-color: #100c2a;
+}
+
+.title {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+}
+
+.title>h1 {
+  font-size: 30px;
+  position: absolute;
+  top: 10px;
+}
+
+.header {
+  position: relative;
+}
+
+.header p {
+  position: absolute;
+  right: 50px;
+  bottom: 20px;
+  font-size: 20px;
+}
+
+.content {
+  width: 100%;
+  --header: 100px;
+  height: calc(1080px - var(--header))
+}
 </style>
 <style>
 body {
-  
+
   /* --content:calc(100vh - var(--header)) */
   overflow: hidden !important;
-  -ms-overflow-style: none; /* IE + Edge */
-  scrollbar-width: none; /* Firefox */
+  -ms-overflow-style: none;
+  /* IE + Edge */
+  scrollbar-width: none;
+  /* Firefox */
 }
+
 ::-webkit-scrollbar {
   display: none;
-}
-</style>
\ No newline at end of file
+}</style>
\ No newline at end of file
diff --git a/src/views/Temp/Winding/index.vue b/src/views/Temp/Winding/index.vue
index fb85063..96859e2 100644
--- a/src/views/Temp/Winding/index.vue
+++ b/src/views/Temp/Winding/index.vue
@@ -1,3 +1,13 @@
+<!--
+ * @Author: 123456 123456
+ * @Date: 2023-05-12 16:37:43
+ * @LastEditors: 123456 123456
+ * @LastEditTime: 2023-05-15 10:56:17
+ * @FilePath: \screenFront\src\views\Temp\Winding\index.vue
+ * @Description: 
+ * 
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
+-->
 <template>
     <div :class="$style['container']">
         <div class="header">
@@ -29,7 +39,7 @@ import { ref } from "vue";
 
 
 let header1Config = {
-    value: 100,
+    value: 80,
     colors: ["#01c4f9", "#c135ff"],
     borderWidth: 3,
 }
diff --git a/src/views/energyConsume/content/child/historyData.vue b/src/views/energyConsume/content/child/historyData.vue
index 822275f..d174c35 100644
--- a/src/views/energyConsume/content/child/historyData.vue
+++ b/src/views/energyConsume/content/child/historyData.vue
@@ -5,7 +5,7 @@
         <header2
           :width="'100%'"
           :height="'100px'"
-          :title="'能耗 历史数据检测系统'"
+          :title="t('messages.ECHistoryData')"
           :titleTip="[]"
           :typeFun="['comback','time']"
           :alarmType="['']"
@@ -49,6 +49,8 @@ import {
 } from "@/http/energyConsume";
 import { useenergyUseStore } from "@/store/module/energyUse";
 const store = useenergyUseStore();
+import { useI18n } from 'vue-i18n'
+let {t} = useI18n();
 // let titleTip = [
 //   {
 //     color: "rgb(32, 174, 197)",
diff --git a/src/views/legionProducts/index.vue b/src/views/legionProducts/index.vue
index 2784437..cc4de96 100644
--- a/src/views/legionProducts/index.vue
+++ b/src/views/legionProducts/index.vue
@@ -74,11 +74,16 @@ const router = useRouter()
 let severdata = reactive([])
 let percentage = ref(0)
 //军团id
-const deptId = route.params.deptId
+const deptId:any = route.params.deptId
 const title = route.query.title
 const gatwayList = ref([])
 const deviceStatus = ref([])
-
+let legion:any = {
+    '5': '汽车军团',
+    '3': '服装军团',
+    '4': '家纺军团',
+    '15': '医防军团'
+}
 let scrollBoardConfig = reactive({
     header: [t('messages.SerialNum'), t('messages.DevName'), t('messages.model'), t('messages.RackNum'), t('messages.type'), t('messages.InstallPhase'), t('messages.DevStatus'), t('messages.AssemblyGroup'), t('messages.electronicGroup'), t('messages.inspector'), t('messages.deliveryDay')],
     headerBGC: 'rgb(52, 105, 243)',
@@ -122,11 +127,11 @@ const getWayStatus = ()=>{
         if (res.code == 200) {
             
             let index = res.data.findIndex((item: any) => {
-                return item.name == title
+                return item.name == legion[deptId]
             })
             gatwayList.value.push(res.data[index])
+            gatwayList.value[0].name = title
         }
-        console.log(gatwayList.value,'gatwayList');
         
     })
 }