代码更新

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 '0' THEN '不通过'
-                                    WHEN '1' 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))

mes/qd/src/views/wms/sb/stat/task/bigScreen.vue

@@ -2,17 +2,21 @@
   <div class="login" :style="'background-image:url('+ Background +');'">
     <div style="font-size: 22px; color: #f4f4f5; padding: 6px 50px 6px 700px;background-color: transparent">当日任务列表</div>
     <div class="t_btn2">
-      <el-table border style="width: 100%;" :data="tableData" max-height="800" :header-cell-style="cellStyle" :row-style="cellStyle" :cell-style="cellStyle" :highlight-current-row="true" >
+      <el-table border style="width: 100%;" :data="tableData" max-height="800" :row-style="setRowStyle" :highlight-current-row="true" >
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column prop="input_time" label="生成时间" />
+        <el-table-column prop="input_time" label="生成时间" show-overflow-tooltip />
         <el-table-column prop="repair_code" label="任务号" />
         <el-table-column prop="maintenancecycle" label="任务类型" />
+        <el-table-column prop="fault_level" label="故障等级" />
         <!--        <el-table-column prop="" label="部门" />-->
-        <el-table-column prop="device_code" label="设备编码" />
+        <el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
-        <el-table-column prop="device_name" label="设备名称" />
+        <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
+        <el-table-column prop="extend_code" label="自编号" />
+        <el-table-column prop="dept_name" label="使用部门" />
         <el-table-column prop="invstatus" label="状态" />
-        <el-table-column prop="real_start_date" label="开始时间" />
+        <el-table-column prop="user_name" label="维修/保养人" />
-        <el-table-column prop="real_end_date" label="结束时间" />
+        <el-table-column prop="real_start_date" label="开始时间" show-overflow-tooltip  />
+        <el-table-column prop="real_end_date" label="结束时间" show-overflow-tooltip />
       </el-table>
     </div>
   </div>
@@ -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