From bc184eeb951bc2e71fccb30e3011e230f8c0dffc Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 31 Aug 2022 09:51:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql | 49 +++++++++++++++++-- .../src/views/wms/sb/stat/task/bigScreen.vue | 24 ++++++--- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql index 1c9a6505..f2913873 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql @@ -67,10 +67,23 @@ END ) AS invstatus, mst.real_start_date, - mst.real_end_date + mst.real_end_date, + + dept.name AS dept_name, + file.extend_code AS extend_code, + ( + CASE + mst.fault_level + WHEN '01' THEN '紧急' + WHEN '02' THEN '一般' + WHEN '03' THEN '不紧急' + END + ) AS fault_level, + mst.update_optname AS user_name FROM EM_BI_DeviceRepairMst mst LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id + LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid WHERE mst.is_delete = '0' AND (mst.invstatus <> '99' or (mst.invstatus = '99' and mst.audit_time like 输入.today)) @@ -90,8 +103,8 @@ WHEN '0' THEN ( CASE st.is_passed - WHEN '0' THEN '否' - WHEN '1' THEN '是' + WHEN '0' THEN '不通过' + WHEN '1' THEN '通过' END ) WHEN '1' THEN @@ -110,12 +123,25 @@ END ) AS invstatus, mst.real_start_date, - mst.real_end_date + mst.real_end_date, + + dept.name AS dept_name, + file.extend_code AS extend_code, + ( + CASE + st.fault_level + WHEN '01' THEN '紧急' + WHEN '02' THEN '一般' + WHEN '03' THEN '不紧急' + END + ) AS fault_level, + mst.update_optname AS user_name FROM EM_BI_DeviceRepairRequest st LEFT JOIN EM_BI_EquipmentFile file ON st.devicerecord_id = file.devicerecord_id LEFT JOIN md_pb_classstandard class ON class.class_id = st.device_faultclass_id LEFT JOIN EM_BI_DeviceRepairMst mst ON mst.source_bill_id = st.request_id + LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid WHERE st.is_delete = '0' AND (st.status <> '99' or (st.status = '99' and st.finish_time like 输入.today)) @@ -147,10 +173,23 @@ END ) AS invstatus, mst.real_start_date, - mst.real_end_date + mst.real_end_date, + + dept.name AS dept_name, + file.extend_code AS extend_code, + ( + CASE + mst.plan_start_date + WHEN '01' THEN '紧急' + WHEN '02' THEN '一般' + WHEN '03' THEN '不紧急' + END + ) AS fault_level, + mst.update_optid AS user_name FROM EM_BI_DeviceMaintenanceMst mst LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id + LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid WHERE mst.is_delete = '0' AND (mst.invstatus <> '99' or (mst.invstatus = '99' and mst.audit_time like 输入.today)) diff --git a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue index fd855dfb..5bfaa3a8 100644 --- a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue +++ b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue @@ -2,17 +2,21 @@
当日任务列表
- + - + + - - + + + + - - + + +
@@ -48,6 +52,13 @@ export default { this.init() }, methods: { + setRowStyle({ row, rowIndex }) { + const stylejson = {} + if (row.invstatus === '99') { + stylejson.color = 'green' + return stylejson + } + }, // webSocket init: function() { if (typeof (WebSocket) === 'undefined') { @@ -70,7 +81,6 @@ export default { console.log('连接错误') }, getMessage: function(msg) { - debugger const data = JSON.parse(msg.data) if (data.msg.length !== 0) { this.tableData = data.msg