From 752211c2db1c97c950bfd0aaca4a21cc52cbae8d Mon Sep 17 00:00:00 2001 From: hzz Date: Fri, 16 Jun 2023 17:42:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=A2=B0=E5=88=86?= =?UTF-8?q?=E5=8E=82=E8=BD=A6=E9=97=B4=E7=8E=AF=E5=A2=83=20=E7=94=A8?= =?UTF-8?q?=E7=94=B5=E9=87=8F=E7=94=9F=E4=BA=A7=E9=A2=9D=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E6=9F=B1=E5=AE=BD=E5=BA=A6=20=E6=B0=B4=E6=88=BF=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E6=B7=BB=E5=8A=A0=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/lang/en.ts | 16 ++++++++ src/locales/lang/zh.ts | 16 ++++++++ src/views/Mechanics/child/son/index.vue | 4 +- .../Mechanics/components/scrollBoard.vue | 30 +++++++++++++- src/views/Mechanics/indexNew.vue | 4 +- src/views/PaintShopView/View1/bottom.vue | 4 +- src/views/PaintShopView/finishView/bottom.vue | 4 +- .../PaintShopView/machiningView/bottom.vue | 4 +- src/views/PaintShopView/stuffView/bottom.vue | 4 +- src/views/PaintShopView/weldView/bottom.vue | 4 +- src/views/Waterhouse/index.vue | 40 ++++++++++--------- 11 files changed, 99 insertions(+), 31 deletions(-) diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 325c4cb..73a1c15 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -290,5 +290,21 @@ export default { '机器名称':'机器名称', '机器类型':'机器类型', '机器状态':'机器状态', + '南门水房物联监测系统':'南门水房物联监测系统', + '数据监测':'数据监测', + '进水':'进水', + '出水':'出水', + '消耗':'消耗', + '用电':'用电', + '总体趋势图':'总体趋势图', + '近一周':'Last Week', + '近一月':'Last Month', + '近三月':'Last Three Months', + '最大值':'Max', + '最小值':'Min', + '平均值':'Avg', + '效益&效率':'Benefit&Efficiency', + '效益':'Benefit', + '效率':'Efficiency', } } \ No newline at end of file diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index b068d69..472643f 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -290,5 +290,21 @@ export default { '机器名称':'机器名称', '机器类型':'机器类型', '机器状态':'机器状态', + '南门水房物联监测系统':'南门水房物联监测系统', + '数据监测':'数据监测', + '进水':'进水', + '出水':'出水', + '消耗':'消耗', + '用电':'用电', + '总体趋势图':'总体趋势图', + '近一周':'近一周', + '近一月':'近一月', + '近三月':'近三月', + '最大值':'最大值', + '最小值':'最小值', + '平均值':'平均值', + '效益&效率':'效益&效率', + '效益':'效益', + '效率':'效率', } } \ No newline at end of file diff --git a/src/views/Mechanics/child/son/index.vue b/src/views/Mechanics/child/son/index.vue index 7484a56..d461783 100644 --- a/src/views/Mechanics/child/son/index.vue +++ b/src/views/Mechanics/child/son/index.vue @@ -119,6 +119,8 @@ const router=useRouter() } } function setdata(val:any){ + + let data={ name:val.name, //设备名称 status:val.status=='H_E_STOP'?t('messages.STOP'):val.status=='H_OFF'?t('messages.Standby'):val.status=='H_ON'?t('messages.work'):t('messages.halt'), //设备状态 @@ -127,7 +129,7 @@ let data={ stoptime:val.stoptime,//急停时长 data:'2020-05-06',//采购日期 src:imgurlAddXhr(val.data),//设备图片 - timeguagu:Math.abs((val.ontime)/(val.ontime+val.offtime)*100).toFixed(1)||0,//时间稼动率 + timeguagu:+Math.abs((val.ontime)/(val.ontime+val.offtime+val.stoptime)*100).toFixed(1)||0,//时间稼动率 MTBF:2724,//MTBF MTTR:169,//MTTR MTTF:2555,//MTTF diff --git a/src/views/Mechanics/components/scrollBoard.vue b/src/views/Mechanics/components/scrollBoard.vue index 624ba7d..fa13c34 100644 --- a/src/views/Mechanics/components/scrollBoard.vue +++ b/src/views/Mechanics/components/scrollBoard.vue @@ -11,7 +11,7 @@
{{t('messages.机械分厂设备列表')}}
- @@ -51,6 +51,34 @@ const dvMouseover = (value) => { } }; +/** + * 点击表格事件 + */ +const dvClick = (value) =>{ + if (value.row) { + let id = { + '精加车间':1, + '机加车间':2, + '大件车间':3, + '精饰车间':4, + '焊接车间':5, + } + + prop.config.rawData.forEach((res,index) => { + + if (index == value.row[0]-1) { + router.push({ + name: "Mechanicsson", + params: { + id: id[value.row[2]], + dev: res.id + }, + }); + } + }); + } + +} /** * @函数功能: 鼠标移出组件方法 * @出口参数: diff --git a/src/views/Mechanics/indexNew.vue b/src/views/Mechanics/indexNew.vue index 7b116ab..fe5527f 100644 --- a/src/views/Mechanics/indexNew.vue +++ b/src/views/Mechanics/indexNew.vue @@ -94,7 +94,8 @@ let scrollBoardConfig = reactive({ rowNum: 10, columnWidth: [80, 290, 120, 120, 120, 120], align: ['center', 'center', 'center', 'center', 'center', 'center'], - data: [] + data: [], + rawData:[] }) let gatewayData = ref([]) let devNumTimer: any = null @@ -169,6 +170,7 @@ async function reqDeviceTotelListMFfun() { item.failure + '%' ] }) + scrollBoardConfig.rawData = result.data; } } diff --git a/src/views/PaintShopView/View1/bottom.vue b/src/views/PaintShopView/View1/bottom.vue index dc201fa..a6fccd8 100644 --- a/src/views/PaintShopView/View1/bottom.vue +++ b/src/views/PaintShopView/View1/bottom.vue @@ -207,7 +207,7 @@ function setcontentData(val) { return color[params.dataIndex]; } }, - barWidth: '30%', + barWidth: '50%', label: { show: true, color: '#fff', @@ -251,7 +251,7 @@ function setcontentData(val) { return color[params.dataIndex]; } }, - barWidth: '25%', + barWidth: '45%', label: { show: true, color: '#fff', diff --git a/src/views/PaintShopView/finishView/bottom.vue b/src/views/PaintShopView/finishView/bottom.vue index 8400d45..db5341c 100644 --- a/src/views/PaintShopView/finishView/bottom.vue +++ b/src/views/PaintShopView/finishView/bottom.vue @@ -205,7 +205,7 @@ function setcontentData(val) { return color[params.dataIndex]; } }, - barWidth: '30%', + barWidth: '50%', label: { show: true, color: '#fff', @@ -248,7 +248,7 @@ function setcontentData(val) { return color[params.dataIndex]; } }, - barWidth: '25%', + barWidth: '45%', label: { show: true, color: '#fff', diff --git a/src/views/PaintShopView/machiningView/bottom.vue b/src/views/PaintShopView/machiningView/bottom.vue index 42631ee..9a678c9 100644 --- a/src/views/PaintShopView/machiningView/bottom.vue +++ b/src/views/PaintShopView/machiningView/bottom.vue @@ -206,7 +206,7 @@ function setcontentData(val) { return color[params.dataIndex]; } }, - barWidth: '30%', + barWidth: '50%', label: { show: true, color: '#fff', @@ -249,7 +249,7 @@ function setcontentData(val) { return color[params.dataIndex]; } }, - barWidth: '25%', + barWidth: '45%', label: { show: true, color: '#fff', diff --git a/src/views/PaintShopView/stuffView/bottom.vue b/src/views/PaintShopView/stuffView/bottom.vue index 73ea6fd..f3fd14c 100644 --- a/src/views/PaintShopView/stuffView/bottom.vue +++ b/src/views/PaintShopView/stuffView/bottom.vue @@ -206,7 +206,7 @@ function setcontentData(val) { return color[params.dataIndex]; } }, - barWidth: '30%', + barWidth: '50%', label: { show: true, color: '#fff', @@ -250,7 +250,7 @@ function setcontentData(val) { return color[params.dataIndex]; } }, - barWidth: '25%', + barWidth: '45%', label: { show: true, color: '#fff', diff --git a/src/views/PaintShopView/weldView/bottom.vue b/src/views/PaintShopView/weldView/bottom.vue index 15cf900..c9d762d 100644 --- a/src/views/PaintShopView/weldView/bottom.vue +++ b/src/views/PaintShopView/weldView/bottom.vue @@ -206,7 +206,7 @@ function setcontentData(val) { return color[params.dataIndex]; } }, - barWidth: '30%', + barWidth: '50%', label: { show: true, color: '#fff', @@ -250,7 +250,7 @@ function setcontentData(val) { return color[params.dataIndex]; } }, - barWidth: '25%', + barWidth: '45%', label: { show: true, color: '#fff', diff --git a/src/views/Waterhouse/index.vue b/src/views/Waterhouse/index.vue index 8f199eb..5461c63 100644 --- a/src/views/Waterhouse/index.vue +++ b/src/views/Waterhouse/index.vue @@ -1,41 +1,41 @@