rev:设备监控页面优化

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java

@@ -629,16 +629,16 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
      */
     public JSONObject clearMessage() {
         JSONObject json = new JSONObject();
-        json.put("task_code", "");
+        json.put("task_code", "0");
-        json.put("inst_code", "");
+        json.put("inst_code", "0");
-        json.put("start_device_code", "");
+        json.put("start_device_code", "0");
-        json.put("next_device_code", "");
+        json.put("next_device_code", "0");
-        json.put("material_type", "");
+        json.put("material_type", "0");
-        json.put("quantity", "");
+        json.put("quantity", "0");
-        json.put("vehicle_code", "");
+        json.put("vehicle_code", "0");
-        json.put("instruction_status", "");
+        json.put("instruction_status", "0");
-        json.put("entry_time", "");
+        json.put("entry_time", "0");
-        json.put("ip", "");
+        json.put("ip", "0");
         return json;
     }
 

acs2/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js

@@ -6,8 +6,8 @@ import icon_alert from '../../../image/icon_alert.png'
 class ButtonNodeModel extends HtmlResize.model {
   initNodeData(data) {
     super.initNodeData(data)
-    this.width = 100
+    this.width = 60
-    this.height = 100
+    this.height = 60
     this.text.draggable = true
     this.text.editable = false
   }
@@ -66,7 +66,7 @@ class ButtonNode extends HtmlResize.view {
     // el.id = 'uml-app'
     const html = `
       <div>
-        <div style="height: 15px; width: 15px; background-color: ${statusColor}; position: absolute; border-radius: 100px; z-index: 9999"></div>
+        <div style="height: 6px; width: 6px; background-color: ${statusColor}; position: absolute; border-radius: 100px; z-index: 9999"></div>
         <img src="${goods}" style="position: absolute; height: ${trayHeight}px; width: ${trayWidth}px; top: 15%; left: 15%; display: ${trayDisplay}">
         <img style="transform: rotate(${properties.transform}deg);" height="${oldNode._height}" width="${oldNode._width}" src="${imageUrl}">
         <img src="${fault}" style="position: absolute; height: ${trayHeight}px; width: ${trayWidth}px; top: 15%; left: 15%; display: ${faultDisplay}">

acs2/nladmin-ui/src/views/system/monitor/device/index.vue

@@ -248,6 +248,7 @@
 
 <script>
 import crudStage from '@/api/logicflow/stage'
+import bgMonitor from '@/assets/images/bg_monitor.jpg'
 import deviceCrud from '@/api/acs/device/device'
 import { getDeviceByCodes } from '@/api/acs/device/deviceStageMonitor'
 import '@logicflow/core/dist/style/index.css'
@@ -333,8 +334,11 @@ export default {
           size: 5
         },
         background: {
-          backgroundImage: 'url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")',
+          // backgroundImage: 'url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")',
-          backgroundRepeat: 'repeat'
+          // backgroundRepeat: 'repeat'
+          backgroundImage: 'url(' + bgMonitor + ')',
+          backgroundSize: '100% 100%',
+          backgroundRepeat: 'no-repeat'
         },
         isSilentMode: true,
         adjustEdge: false,
@@ -801,12 +805,74 @@ body {
   height: 100%;
 }
 
-.newDialog /deep/ .el-dialog__header {
+/deep/ .el-dialog {
-  padding: 1vh 1vw 0 1vw;
+  background-color: transparent;
+  background-color: rgba(2, 11, 47, 0.9);
+  border: 1px solid #4dbeff;
+  box-shadow: inset 4px 4px 8px 0px rgba(77,190,255,.9),inset -4px -4px 8px 0px rgba(77,190,255,.9);
+  /* background-image: url('../../../../assets/images/kanban.svg'); */
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  background-position: top center;
+  padding: 10px 14px;
 }
 
-.newDialog /deep/ .el-dialog__body {
+/deep/ .el-dialog__header {
-  padding: 1vh 1vw;
+  padding: 1vh 1vw 0 1vw;
+  border-bottom: 1px solid #395d6f;
+  background: linear-gradient(to right, #00b3ee 0%, rgba(2, 11, 47, 0.3) 30%, rgba(2, 11, 47, 0) 100%);
+}
+
+/deep/ .el-dialog__title {
+  font-size: 16px;
+  color: #fff;
+}
+
+/deep/ .el-dialog__body {
+  padding-top: 20px !important;
+}
+
+/deep/ .el-form-item__label, /deep/ .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+
+/deep/ .el-input.is-disabled .el-input__inner, /deep/ .el-radio-button__inner {
+  background-color: #00557c;
+  border-color: #00b3ee;
+  color: #fff;
+}
+
+/deep/ .el-radio-button:first-child .el-radio-button__inner {
+  border-left-color: #00b3ee;
+}
+
+.newDialog /deep/ .el-dialog__body .el-table tr, .newDialog /deep/ .el-dialog__body .el-table .el-table__header-wrapper th, .newDialog /deep/ .el-dialog__body .el-table {
+  background-color: transparent;
+}
+
+.newDialog /deep/ .el-table--border, .newDialog /deep/ .el-table--border .el-table__cell {
+  border: 0;
+  color: #00afff;
+}
+
+.newDialog /deep/ .el-table::before {
+  height: 0;
+}
+
+.newDialog /deep/ .el-table--border::after {
+  width: 0;
+}
+
+.newDialog /deep/ .el-table_1_column_1, .newDialog /deep/ .el-table_2_column_3 {
+  color: #fff;
+}
+
+.newDialog /deep/ .el-table_1_column_2, .newDialog /deep/ .el-table_2_column_4 {
+  color: #00b3ee;
+}
+
+.newDialog /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+  background-color: #00557c;
 }
 
 .toolbar-sty {