From b4a3a8c6d3bd07d5d40304482a1e5e37629c2d67 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Fri, 16 Jun 2023 10:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E6=88=BF=E5=A4=A7=E5=B1=8F=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=9C=BA=E5=86=85=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E8=AE=BE=E5=A4=87->=E4=BA=A7=E5=93=81=20=20=E5=B0=86?=
 =?UTF-8?q?=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82=E8=AE=BE=E5=A4=87=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E8=B7=AF=E7=94=B1=E6=8D=A2=E6=88=90indexNew?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/lang/en.ts                        |  2 +
 src/locales/lang/zh.ts                        | 36 +++++++------
 src/router/index.ts                           |  2 +-
 .../InPlantProducts/child/component/axle.vue  |  2 +-
 .../child/component/sensor2.vue               |  2 +-
 src/views/InPlantProducts/child/left.vue      |  4 +-
 .../content/chart/deviceslist.vue             |  4 +-
 .../InPlantProducts/content/chart/gateway.vue |  2 +-
 src/views/Waterhouse/index.vue                | 52 ++++++++++++++++---
 src/views/legionProducts/chart/devStatus.vue  |  2 +-
 src/views/legionProducts/chart/ringChart.vue  |  2 +-
 src/views/legionProducts/index.vue            |  2 +-
 12 files changed, 79 insertions(+), 33 deletions(-)

diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 017df43..6ac91ab 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -275,5 +275,7 @@ export default {
         '传感器监测走势图':'传感器监测走势图',
         '机械分厂设备列表':'机械分厂设备列表',        
         '设备状态总览':'设备状态总览',
+        '产品状态':'产品状态',
+        '产品数量':'产品数量',
       }
   }
\ No newline at end of file
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 3c522e7..0958fef 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -75,15 +75,15 @@ export default {
         'fanwei':'范围',
         'onLine':'在线',
         'offline':'离线',
-        'QiCheCommunication':'汽车军团数据通讯',
-        'FuZhuangCommunication':'服装军团数据通讯',
-        'JiaFangCommunication':'家纺军团数据通讯',
-        'YiFangCommunication':'医防军团数据通讯',
+        'QiCheCommunication':'汽车军团数据通信',
+        'FuZhuangCommunication':'服装军团数据通信',
+        'JiaFangCommunication':'家纺军团数据通信',
+        'YiFangCommunication':'医防军团数据通信',
         'DevNum':'设备数量',
-        'FuZhuangDevSchedule':'服装军团 设备完成进度',
-        'JiaFangDevSchedule':'家纺军团 设备完成进度',
-        'YiFangDevSchedule':'医防军团 设备完成进度',
-        'QiCheDevSchedule':'汽车军团 设备完成进度',
+        'FuZhuangDevSchedule':'服装军团 产品完成进度',
+        'JiaFangDevSchedule':'家纺军团 产品完成进度',
+        'YiFangDevSchedule':'医防军团 产品完成进度',
+        'QiCheDevSchedule':'汽车军团 产品完成进度',
         'InPlantProductsDevList':'军团厂内设备列表',
         'SerialNum':'序号',
         'RackNum':'机架号',
@@ -130,11 +130,11 @@ export default {
         'ClientName':'客户名称',
         'ClientSalesman':'客户业务员',
         'expectDeliveryDate':'预计工厂交货日期',
-        'JingJia_datacom':'精加-数据通讯',
-        'JiJia_datacom':'机加-数据通讯',
-        'DaJian_datacom':'大件-数据通讯',
-        'JingShi_datacom':'精饰-数据通讯',
-        'HanJie_datacom':'焊接-数据通讯',
+        'JingJia_datacom':'精加-数据通信',
+        'JiJia_datacom':'机加-数据通信',
+        'DaJian_datacom':'大件-数据通信',
+        'JingShi_datacom':'精饰-数据通信',
+        'HanJie_datacom':'焊接-数据通信',
         'JingJiaDevStatus':'精加设备状态',
         'JiJiaDevStatus':'机加设备状态',
         'DaJianDevStatus':'大件设备状态',
@@ -171,8 +171,8 @@ export default {
         'realityTrimNum':'实际剪线次数',
         'AvgTrimNum':'平均剪线次数',
         'runTime':'运行时间',
-        'datacom':'数据通讯',
-        'OffSiteDevList':'厂外设备列表',
+        'datacom':'数据通信',
+        'OffSiteDevList':'厂外机器列表',
         'province':'省份',
         'type':'类型',
         'OnlineOrNot':'是否在线',
@@ -275,5 +275,11 @@ export default {
         '传感器监测走势图':'传感器监测走势图',
         '机械分厂设备列表':'机械分厂设备列表',
         '设备状态总览':'设备状态总览',
+        '产品状态':'产品状态',
+        '产品数量':'产品数量',
+        '产品类型':'产品类型',
+        '产品信息':'产品信息',
+        '产品电机':'产品电机',
+        '产品传感器':'产品传感器',
       }
   }
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index aa47344..5f2333b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -20,7 +20,7 @@ const routes: Array<RouteRecordRaw> = [
       {
         path: "/Mechanics",
         name: "Mechanics",
-        component: () => import("../views/Mechanics/index.vue"),
+        component: () => import("../views/Mechanics/indexNew.vue"),
       },
       {
         path: "/demo",
diff --git a/src/views/InPlantProducts/child/component/axle.vue b/src/views/InPlantProducts/child/component/axle.vue
index efdf41a..906ec91 100644
--- a/src/views/InPlantProducts/child/component/axle.vue
+++ b/src/views/InPlantProducts/child/component/axle.vue
@@ -9,7 +9,7 @@
 -->
 <template>
     <div :style="{width:itemSize.width,height:itemSize.height}">
-  <border1 ref="refborder1" :title="t('messages.DevMotor')">
+  <border1 ref="refborder1" :title="t('messages.产品电机')">
       <template v-slot>
         <div class="box" :key="keynum" :style="{width:boxSize.width,height:boxSize.height,position:'relative'}">
             <div class="type">
diff --git a/src/views/InPlantProducts/child/component/sensor2.vue b/src/views/InPlantProducts/child/component/sensor2.vue
index 49e5679..e2fe404 100644
--- a/src/views/InPlantProducts/child/component/sensor2.vue
+++ b/src/views/InPlantProducts/child/component/sensor2.vue
@@ -9,7 +9,7 @@
 -->
 <template>
     <div :style="{ width: itemSize.width, height: itemSize.height }">
-        <border1 ref="refborder1" :title="t('messages.DevSensors')">
+        <border1 ref="refborder1" :title="t('messages.产品传感器')">
             <template v-slot>
                 <div class="box" :key="keynum" :style="{ width: boxSize.width, height: boxSize.height, position: 'relative' }">
                     <div class="type">
diff --git a/src/views/InPlantProducts/child/left.vue b/src/views/InPlantProducts/child/left.vue
index ade86fd..a0d882d 100644
--- a/src/views/InPlantProducts/child/left.vue
+++ b/src/views/InPlantProducts/child/left.vue
@@ -217,7 +217,7 @@ watch(
     //动态更新
     let originData=[
     [t('messages.RackNum'),route.params.label],
-    [t('messages.DevName'),route.params.name],
+    [t('messages.productName'),route.params.name],
     [t('messages.SupplierSalesperson'),newVal.devInfo.partnerName],
     [t('messages.TradeType'),newVal.devInfo.tradeType],
     [t('messages.ModelNo'),newVal.devInfo.productModel],
@@ -229,7 +229,7 @@ watch(
     [t('messages.ClientName'),newVal.devInfo.customerName],
     [t('messages.ClientSalesman'),newVal.devInfo.customerSalesman],
     ]
-    originRef.value.setData(originData,t('messages.DevInfo'));
+    originRef.value.setData(originData,t('messages.产品信息'));
 
 
     let detailsData = [];
diff --git a/src/views/InPlantProducts/content/chart/deviceslist.vue b/src/views/InPlantProducts/content/chart/deviceslist.vue
index f5aff9a..82388c2 100644
--- a/src/views/InPlantProducts/content/chart/deviceslist.vue
+++ b/src/views/InPlantProducts/content/chart/deviceslist.vue
@@ -87,9 +87,9 @@ const setData = (val: any) => {
   listdata.header = [
   t('messages.SerialNum'),
   t('messages.RackNum'),
-  t('messages.DevName'),
+  t('messages.productName'),
   t('messages.ofLegion'),
-  t('messages.DevStatus'),
+  t('messages.产品状态'),
   t('messages.DebugProgress'),
   t('messages.deliveryDay'),
   ];
diff --git a/src/views/InPlantProducts/content/chart/gateway.vue b/src/views/InPlantProducts/content/chart/gateway.vue
index 4db8934..4c48fed 100644
--- a/src/views/InPlantProducts/content/chart/gateway.vue
+++ b/src/views/InPlantProducts/content/chart/gateway.vue
@@ -17,7 +17,7 @@
             <i :class="value.data==1?'iconfont '+value.iconname+' online':'iconfont '+value.iconname+' noonline'"></i>
             <!-- <img src="../../../../assets/svg/gateway.svg" alt="" :class="value.data==1?' online':' noonline'"> -->
             <h2>{{ props.title }}</h2>
-            <h2 class="devnum">{{t('messages.DevNum')}}:{{ value.num }}</h2>
+            <h2 class="devnum">{{t('messages.产品数量')}}:{{ value.num }}</h2>
           </div>
       </template>
   </border6>
diff --git a/src/views/Waterhouse/index.vue b/src/views/Waterhouse/index.vue
index 94d4410..8f199eb 100644
--- a/src/views/Waterhouse/index.vue
+++ b/src/views/Waterhouse/index.vue
@@ -24,13 +24,29 @@
             <div class="rt-title">总体趋势图</div>
             <div class="rt-radio">
                 <el-radio-group v-model="date" size="small">
-                    <el-radio-button label="1" >本月</el-radio-button>
-                    <el-radio-button label="2" >近三月</el-radio-button>
-                    <el-radio-button label="3" >近一年</el-radio-button>
+                    <el-radio-button label="1">近一周</el-radio-button>
+                    <el-radio-button label="2">近一月</el-radio-button>
+                    <el-radio-button label="3">近三月</el-radio-button>
                 </el-radio-group>
             </div>
             <div class="mainChart" ref="mainChart"></div>
-            <div class="math-content"></div>
+            <div class="math-content">
+                <el-row>
+                    <el-col :span="12" class="p-left10"></el-col>
+                    <el-col :span="4" class="math-title-color">最大值</el-col>
+                    <el-col :span="4" class="math-title-color">最小值</el-col>
+                    <el-col :span="4" class="math-title-color">平均值</el-col>
+                </el-row>
+                <el-row v-for="item in mathList">
+                    <el-col :span="12" class="p-left10" style="display: flex;justify-content: start;align-items: center;">
+                        <div :style="{'background':item.color,'width':'25px','height':'20px','margin-right':'5px'}"></div>
+                        <text>{{ item.name }}</text>
+                    </el-col>
+                    <el-col :span="4">{{ item.max }}</el-col>
+                    <el-col :span="4">{{ item.min }}</el-col>
+                    <el-col :span="4">{{ item.avg }}</el-col>
+                </el-row>
+            </div>
             <!-- 效益&效率 -->
             <div class="rb-title">效益&效率</div>
             <div class="rb-content">
@@ -56,6 +72,12 @@ const mainChart = ref(null)
 let chart = null
 let date = ref('1')
 const colors = ['#5470C6', '#91CC75', '#EE6666'];
+//进水量 出水量 用电量 最大值 最小值 平均值
+let mathList = reactive([
+    { color: '#5470C6', name: '进水量', max: 100, min: 0, avg: 50 },
+    { color: '#91CC75', name: '出水量', max: 100, min: 0, avg: 50 },
+    { color: '#EE6666', name: '用电量', max: 100, min: 0, avg: 50 }
+])
 function init() {
     chart = proxy.$echarts.init(mainChart.value, 'dark');
     let option = {
@@ -199,6 +221,7 @@ onMounted(() => {
     font-size: 28px;
     color: #fff;
 }
+
 .rt-radio {
     position: absolute;
     top: 96px;
@@ -213,13 +236,17 @@ onMounted(() => {
     top: 136px;
     left: 1227px;
 }
+
 .math-content {
     position: absolute;
     width: 555px;
     height: 100px;
     top: 418px;
     left: 1271px;
-    background: rgba(255, 255, 255, 0.4);
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    color: #fff;
 }
 
 .rb-title {
@@ -229,6 +256,7 @@ onMounted(() => {
     font-size: 28px;
     color: #fff;
 }
+
 .rb-content {
     position: absolute;
     display: flex;
@@ -242,13 +270,23 @@ onMounted(() => {
 }
 
 :deep(.progress .el-progress__text) {
-  font-weight: bold;
-  font-size: 30px !important;
+    font-weight: bold;
+    font-size: 30px !important;
 }
+
 .progress-text {
     font-size: 18px;
     font-weight: bold;
     margin-top: 5px;
     color: #fff;
 }
+
+.p-left10 {
+    text-align: left;
+    box-sizing: border-box;
+    padding-left: 10px;
+}
+.math-title-color {
+    color: #025AE5;
+}
 </style>
diff --git a/src/views/legionProducts/chart/devStatus.vue b/src/views/legionProducts/chart/devStatus.vue
index f89b765..ae68ff9 100644
--- a/src/views/legionProducts/chart/devStatus.vue
+++ b/src/views/legionProducts/chart/devStatus.vue
@@ -9,7 +9,7 @@
 -->
 <template>
     <div class="box">
-        <div class="box-title">{{t('messages.DevStatus')}}</div>
+        <div class="box-title">{{t('messages.产品状态')}}</div>
         <div class="box-body">
             <div class="card">
                 <div><b>{{ prop.data.counts}}</b>{{t('messages.units')}}</div>
diff --git a/src/views/legionProducts/chart/ringChart.vue b/src/views/legionProducts/chart/ringChart.vue
index c466686..8d3d04f 100644
--- a/src/views/legionProducts/chart/ringChart.vue
+++ b/src/views/legionProducts/chart/ringChart.vue
@@ -25,7 +25,7 @@ const init = () => {
     ringChart = proxy.$echarts.init(ringRef.value, 'dark')
     let option = {
         title: {
-            text: t('messages.DevType'),
+            text: t('messages.产品类型'),
             show: true,
             textStyle: {
                 color: "#fff",
diff --git a/src/views/legionProducts/index.vue b/src/views/legionProducts/index.vue
index 1398902..a0c9062 100644
--- a/src/views/legionProducts/index.vue
+++ b/src/views/legionProducts/index.vue
@@ -87,7 +87,7 @@ let legion: any = {
     '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')],
+    header: [t('messages.SerialNum'), t('messages.productName'), t('messages.model'), t('messages.RackNum'), t('messages.type'), t('messages.InstallPhase'), t('messages.产品状态'), t('messages.AssemblyGroup'), t('messages.electronicGroup'), t('messages.inspector'), t('messages.deliveryDay')],
     headerBGC: 'rgb(52, 105, 243)',
     oddRowBGC: '#100c2a',
     evenRowBGC: '#100c2a',