From cd416d7d018f1c2de1eeee2d66ece8d2db092a39 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 12 Jan 2024 11:23:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=91=E6=8E=A7=E5=8A=A0?=
=?UTF-8?q?=E5=88=86=E9=A1=B5&=E9=A9=BE=E9=A9=B6=E8=88=B1=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/websocket.js | 54 +-----------------
.../databoard/components/FlueGasChart.vue | 6 +-
.../databoard/components/NumRateChart.vue | 2 +-
.../databoard/deepProcessing/DefectSum.vue | 3 +-
.../databoard/deepProcessing/EqAlarm.vue | 55 ++++++++++---------
.../deepProcessing/WorkOrderMonitoring.vue | 4 +-
src/views/databoard/deepProcessing/index.vue | 4 +-
src/views/databoard/kiln/index.vue | 4 +-
src/views/databoard/wholePlant/index.vue | 4 +-
.../components/monitoringRingCharts.vue | 2 +-
.../orderCompletionMonitoring/index.vue | 12 ++--
11 files changed, 51 insertions(+), 99 deletions(-)
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 7b69b33e..6cab536b 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -25,58 +25,8 @@ const state = {
israWeekStatistic: [],//缺陷统计
israMonthStatistic: [],//缺陷统计
israYearStatistic: [],//缺陷统计
- productline: [{
- "creator": "1",
- "sumOutputNum": 15,
- "outputNum": 15,
- "passRate": 0.6,
- "lineName": "3#深加工",
- "updateTime": "2024-01-04T16:00:19",
- "updater": "1",
- "inputNum": 15,
- "deleted": false,
- "recordTime": "2023-12-25T20:00:00",
- "createTime": "2023-10-13T10:44:27",
- "tenantId": 1,
- "id": 1712660539187441666,
- "productionLineId": 1737313260027285506,
- "sumInputNum": 15
- }, {
- "creator": "1",
- "sumOutputNum": 49,
- "outputNum": 16,
- "passRate": 0.3,
- "lineName": "2#深加工",
- "updateTime": "2024-01-04T16:00:19",
- "updater": "1",
- "inputNum": 17,
- "deleted": false,
- "recordTime": "2023-12-25T20:00:00",
- "createTime": "2023-10-13T10:44:27",
- "tenantId": 1,
- "id": 1712660539187441665,
- "productionLineId": 1737313119178362881,
- "sumInputNum": 47
- }, {
- "creator": "1",
- "sumOutputNum": 29,
- "outputNum": 18,
- "passRate": 0.5,
- "lineName": "1#深加工",
- "updateTime": "2024-01-04T16:00:19",
- "updater": "1",
- "inputNum": 20,
- "deleted": false,
- "recordTime": "2023-12-25T20:00:00",
- "createTime": "2023-10-13T10:43:17",
- "tenantId": 1,
- "id": 1712660244285927426,
- "productionLineId": 1737312466842456065,
- "sumInputNum": 27
- }], // SJG产线产量及良品率
- sjgEquipment:[
- {name: 'sadd', error:false,code: 'EQ202312121624540000072',status: "正常"}
- ],// SJG设备报警
+ productline: [], // SJG产线产量及良品率
+ sjgEquipment:[],// SJG设备报警
workOrder: [], // 工单监控
defectSum: [], // 缺陷汇总
order: [],// 订单完成情况
diff --git a/src/views/databoard/components/FlueGasChart.vue b/src/views/databoard/components/FlueGasChart.vue
index e0e1a33e..ed3e9eae 100644
--- a/src/views/databoard/components/FlueGasChart.vue
+++ b/src/views/databoard/components/FlueGasChart.vue
@@ -1,7 +1,7 @@
@@ -149,8 +149,8 @@ export default {
}
temp2.map(i => {
xData.push(i.time)
- yData.push(i.value)
- })
+ yData.push((i.value)?(Number(i.value)).toFixed(2):null)
+ })
if (yData.length == 0) {
seriesData = []
}else {
diff --git a/src/views/databoard/components/NumRateChart.vue b/src/views/databoard/components/NumRateChart.vue
index 15ed3a41..77b74890 100644
--- a/src/views/databoard/components/NumRateChart.vue
+++ b/src/views/databoard/components/NumRateChart.vue
@@ -29,7 +29,7 @@ export default {
if (newVal === oldVal) {
return false
}
- // this.updateChart()
+ this.updateChart()
}
}
},
diff --git a/src/views/databoard/deepProcessing/DefectSum.vue b/src/views/databoard/deepProcessing/DefectSum.vue
index 2d9f1353..2dba70a8 100644
--- a/src/views/databoard/deepProcessing/DefectSum.vue
+++ b/src/views/databoard/deepProcessing/DefectSum.vue
@@ -26,7 +26,8 @@ export default {
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [60],
align: ['center'],
- data: [[1, 'Y61', '破损','10','气泡']],
+ data: [],
+ // data: [[1, 'Y61', '破损','10','气泡']],
rowNum: 10
}
}
diff --git a/src/views/databoard/deepProcessing/EqAlarm.vue b/src/views/databoard/deepProcessing/EqAlarm.vue
index 36cafe77..724865e6 100644
--- a/src/views/databoard/deepProcessing/EqAlarm.vue
+++ b/src/views/databoard/deepProcessing/EqAlarm.vue
@@ -26,38 +26,39 @@ export default {
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
columnWidth: [60, 150, 190],
align: ['center'],
- data: [
- [1, '四大线3小线铺纸机', 'EQ20240110130909000255', '正常', '否'],
- [2, '四大线2小线铺纸机', 'EQ20240110130848000254', '正常', '否'],
- [3, '四大线1小线铺纸机', 'EQ20240110130832000253', '正常', '否'],
- [4, '12线下片台', 'EQ20240110130817000252', '正常', '否'],
- [5, '11线下片台', ' EQ20240110130743000250', '正常', '否'],
- [6, '10线下片台', ' EQ20240110130743000250', '正常', '否'],
- [7, '4大线五区自动连线柜', 'EQ20240110130731000249', '正常', '否'],
- [8, '四大线四区2小线清洗机', 'EQ20240110112716000248', '正常', '否'],
- [9, '四大线四区1小线清洗机', 'EQ20240110112700000247', '正常', '否'],
- [10, '4大线四区自动连线柜', 'EQ20240110112646000246', '正常', '否']
- ],
+ data: [],
+ // data: [
+ // [1, '四大线3小线铺纸机', 'EQ20240110130909000255', '正常', '否'],
+ // [2, '四大线2小线铺纸机', 'EQ20240110130848000254', '正常', '否'],
+ // [3, '四大线1小线铺纸机', 'EQ20240110130832000253', '正常', '否'],
+ // [4, '12线下片台', 'EQ20240110130817000252', '正常', '否'],
+ // [5, '11线下片台', ' EQ20240110130743000250', '正常', '否'],
+ // [6, '10线下片台', ' EQ20240110130743000250', '正常', '否'],
+ // [7, '4大线五区自动连线柜', 'EQ20240110130731000249', '正常', '否'],
+ // [8, '四大线四区2小线清洗机', 'EQ20240110112716000248', '正常', '否'],
+ // [9, '四大线四区1小线清洗机', 'EQ20240110112700000247', '正常', '否'],
+ // [10, '4大线四区自动连线柜', 'EQ20240110112646000246', '正常', '否']
+ // ],
rowNum: 10
}
}
},
mounted(){
},
- // watch:{
- // sjgEquipment: {
- // handler(newVal, oldVal) {
- // let outArr = this.sjgEquipment.map((item, index) => [
- // index+1,
- // item.name,
- // item.code,
- // item.status,
- // item.error? '是': '否'
- // ]);
- // this.config.data = outArr
- // this.$refs['eqScrollBoard'].updateRows(outArr)
- // }
- // }
- // }
+ watch:{
+ sjgEquipment: {
+ handler(newVal, oldVal) {
+ let outArr = this.sjgEquipment.map((item, index) => [
+ index+1,
+ `${item.name || ''}`,
+ `${item.code || ''}`,
+ item.status,
+ item.error? '是': '否'
+ ]);
+ this.config.data = outArr
+ this.$refs['eqScrollBoard'].updateRows(outArr)
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue b/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue
index 58093a92..ab5c2253 100644
--- a/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue
+++ b/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue
@@ -37,10 +37,10 @@ export default {
handler(newVal, oldVal) {
let outArr = this.order.map((item, index) => [
index+1,
- item.name,
+ `${item.name || ''}`,
item.specifications,
item.lines,
- ['等待','已下发','已完成'][item.status],
+ this.getDictDatas(this.DICT_TYPE.ORDER_STATUS)[item.status]?.label,
formatDate(item.planFinishTime),
item.planQuantity,
item.planAssignQuantity
diff --git a/src/views/databoard/deepProcessing/index.vue b/src/views/databoard/deepProcessing/index.vue
index 48d32fd4..b0abf2ce 100644
--- a/src/views/databoard/deepProcessing/index.vue
+++ b/src/views/databoard/deepProcessing/index.vue
@@ -133,10 +133,10 @@ export default {
console.log('非全屏')
console.log(this.$store.state.app.sidebar.opened)
if (this.$store.state.app.sidebar.opened) {
- wx = (rw-264) / bw
+ wx = (rw-280) / bw
hx = (rh-116) / bh
}else{
- wx = (rw-78) / bw
+ wx = (rw-85) / bw
hx = (rh-116) / bh
}
}
diff --git a/src/views/databoard/kiln/index.vue b/src/views/databoard/kiln/index.vue
index 7913a92b..060cc89a 100644
--- a/src/views/databoard/kiln/index.vue
+++ b/src/views/databoard/kiln/index.vue
@@ -126,10 +126,10 @@ export default {
console.log('非全屏')
console.log(this.$store.state.app.sidebar.opened)
if (this.$store.state.app.sidebar.opened) {
- wx = (rw-264) / bw
+ wx = (rw-280) / bw
hx = (rh-116) / bh
}else{
- wx = (rw-78) / bw
+ wx = (rw-85) / bw
hx = (rh-116) / bh
}
}
diff --git a/src/views/databoard/wholePlant/index.vue b/src/views/databoard/wholePlant/index.vue
index dd9cdf37..822f7e5c 100644
--- a/src/views/databoard/wholePlant/index.vue
+++ b/src/views/databoard/wholePlant/index.vue
@@ -123,10 +123,10 @@ export default {
console.log('非全屏')
console.log(this.$store.state.app.sidebar.opened)
if (this.$store.state.app.sidebar.opened) {
- wx = (rw-264) / bw
+ wx = (rw-280) / bw
hx = (rh-116) / bh
}else{
- wx = (rw-78) / bw
+ wx = (rw-85) / bw
hx = (rh-116) / bh
}
}
diff --git a/src/views/order/monitoring/components/monitoringRingCharts.vue b/src/views/order/monitoring/components/monitoringRingCharts.vue
index 54a55a19..b3c39465 100644
--- a/src/views/order/monitoring/components/monitoringRingCharts.vue
+++ b/src/views/order/monitoring/components/monitoringRingCharts.vue
@@ -132,7 +132,7 @@ export default {
.chartBox {
width: 100%;
padding-right: 6px;
- height: calc(100vh - 310px);
+ height: calc(100vh - 356px);
display: flex;
flex-flow: row wrap;
overflow: auto;
diff --git a/src/views/order/monitoring/orderCompletionMonitoring/index.vue b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
index 89a60ad5..ca3d92ad 100644
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@@ -28,15 +28,15 @@
@clickBtn="handleClick"
/>
-
+