diff --git a/wcs/hd/nladmin-system/src/main/resources/config/application-dev.yml b/wcs/hd/nladmin-system/src/main/resources/config/application-dev.yml index 35d6a853..2e6a93c3 100644 --- a/wcs/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/wcs/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -8,7 +8,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_acs_one}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_acs_one}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: ${DB_USER:root} #password: ${DB_PWD:123456} diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/ItemProtocol.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/ItemProtocol.java index bf8eb083..3ab29edf 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/ItemProtocol.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/ItemProtocol.java @@ -78,7 +78,7 @@ public class ItemProtocol { ArrayList list = new ArrayList(); list.add(new ItemDto(item_heartbeat, "心跳", "DB1.W82")); list.add(new ItemDto(item_running, "储料仓运行中", "DB1.B2.0")); - list.add(new ItemDto(item_is_open, "储料仓开关", "DB1.W36")); + list.add(new ItemDto(item_is_open, "储料仓开关", "DB1.B36.0")); list.add(new ItemDto(item_error, "储料仓故障", "DB1.W38")); list.add(new ItemDto(item_silo_weight, "储料仓重量", "DB1.D84")); list.add(new ItemDto(item_full_number, "储料仓总数量", "DB1.D164")); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java index 405d925c..7eb46636 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java @@ -122,7 +122,7 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc */ public String replace(String message) { if (message.endsWith(",")) { - return message.replace(message.charAt(message.length() - 1) + "", "!"); + return message.substring(0, message.length() - 1); } return message; } diff --git a/wcs/nladmin-ui/src/views/acs/device/index.vue b/wcs/nladmin-ui/src/views/acs/device/index.vue index fa87c1eb..5dc5fb1d 100644 --- a/wcs/nladmin-ui/src/views/acs/device/index.vue +++ b/wcs/nladmin-ui/src/views/acs/device/index.vue @@ -118,7 +118,7 @@ - + diff --git a/wcs/nladmin-ui/src/views/acs/device/opc/index.vue b/wcs/nladmin-ui/src/views/acs/device/opc/index.vue index 1afca03d..70cad1c7 100644 --- a/wcs/nladmin-ui/src/views/acs/device/opc/index.vue +++ b/wcs/nladmin-ui/src/views/acs/device/opc/index.vue @@ -14,9 +14,9 @@ class="filter-item" @keyup.enter.native="crud.toQuery" /> - + - + - + - + - + - + - + 详情 - + - + - + - +
@@ -63,18 +63,18 @@ - + - + - + - + - +
@@ -97,18 +97,18 @@ @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler" > - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/wcs/qd/package.json b/wcs/qd/package.json index e50f774d..81ea67be 100644 --- a/wcs/qd/package.json +++ b/wcs/qd/package.json @@ -39,45 +39,50 @@ "af-table-column": "^1.0.3", "ansi_up": "^5.1.0", "axios": "0.18.1", - "clipboard": "2.0.4", + "clipboard": "^2.0.4", "codemirror": "^5.49.2", "connect": "3.6.6", "echarts": "^4.2.1", "echarts-gl": "^1.1.1", "echarts-wordcloud": "^1.1.3", - "element-ui": "^2.13.2", - "file-saver": "^1.3.8", + "element-ui": "^2.15.8", + "file-saver": "1.3.8", "font-awesome": "^4.7.0", "fuse.js": "3.4.4", "jquery": "^3.6.0", "js-beautify": "^1.10.2", "js-cookie": "2.2.0", + "jsbarcode": "^3.11.5", "jsencrypt": "^3.0.0-rc.1", "jszip": "3.1.5", "mavon-editor": "^2.9.0", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", + "qrcodejs2": "0.0.2", "qs": "^6.9.1", "screenfull": "4.2.0", "sortablejs": "1.8.4", + "throttle-debounce": "^5.0.0", "vue": "2.6.10", "vue-color": "^2.8.1", "vue-count-to": "1.0.13", "vue-cropper": "0.4.9", + "vue-easy-print": "0.0.8", "vue-echarts": "^5.0.0-beta.0", "vue-highlightjs": "^1.3.3", "vue-image-crop-upload": "^2.5.0", + "vue-print-nb": "^1.7.5", "vue-router": "3.0.2", "vue-seamless-scroll": "^1.1.23", "vue-splitpane": "1.0.4", - "vuedraggable": "2.20.0", + "vuedraggable": "^2.24.3", "vuex": "3.1.0", "vxe-table": "^3.3.10", "wangeditor": "^3.1.1", "xe-ajax": "^4.0.5", "xe-utils": "^3.3.1", - "xlsx": "^0.14.5" + "xlsx": "^0.14.1" }, "devDependencies": { "@babel/core": "7.0.0", @@ -105,8 +110,9 @@ "husky": "1.3.1", "lint-staged": "8.1.5", "plop": "2.3.0", + "print-template": "^1.2.5", "runjs": "^4.3.2", - "sass": "^1.26.10", + "sass": "~1.26.5", "sass-loader": "^7.1.0", "script-ext-html-webpack-plugin": "2.1.3", "script-loader": "0.7.2",