root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev 信号类型

Browse Source
This commit is contained in:
gengby
2023-04-25 11:10:19 +08:00
parent 8c3e1d0a3a
commit 2313d80660
6 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wcs/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -8,7 +8,7 @@ spring:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy 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 # 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} username: ${DB_USER:root}
#password: ${DB_PWD:123456} #password: ${DB_PWD:123456}

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/ItemProtocol.java
View File

@@ -78,7 +78,7 @@ public class ItemProtocol {
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
list.add(new ItemDto(item_heartbeat, "心跳", "DB1.W82")); list.add(new ItemDto(item_heartbeat, "心跳", "DB1.W82"));
list.add(new ItemDto(item_running, "储料仓运行中", "DB1.B2.0")); 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_error, "储料仓故障", "DB1.W38"));
list.add(new ItemDto(item_silo_weight, "储料仓重量", "DB1.D84")); list.add(new ItemDto(item_silo_weight, "储料仓重量", "DB1.D84"));
list.add(new ItemDto(item_full_number, "储料仓总数量", "DB1.D164")); list.add(new ItemDto(item_full_number, "储料仓总数量", "DB1.D164"));

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java
View File

@@ -122,7 +122,7 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
*/ */
public String replace(String message) { public String replace(String message) {
if (message.endsWith(",")) { if (message.endsWith(",")) {
return message.replace(message.charAt(message.length() - 1) + "", "!"); return message.substring(0, message.length() - 1);
} }
return message; return message;
} }

2
wcs/nladmin-ui/src/views/acs/device/index.vue
View File

@@ -118,7 +118,7 @@
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="device_id" label="设备标识" /> <el-table-column v-if="false" prop="device_id" label="设备标识" />
<el-table-column sortable prop="device_code" label="设备编码" /> <el-table-column sortable prop="device_code" label="设备编码" />
<el-table-column sortable label="设备名字"> <el-table-column sortable label="设备名字" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.device_name }}</div> <div>{{ scope.row.device_name }}</div>
</template> </template>

58
wcs/nladmin-ui/src/views/acs/device/opc/index.vue
View File

@@ -14,9 +14,9 @@
class="filter-item" class="filter-item"
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
<rrOperation/> <rrOperation />
</div> </div>
<crudOperation :permission="permission"/> <crudOperation :permission="permission" />
<!--表单组件--> <!--表单组件-->
<el-dialog <el-dialog
:close-on-click-modal="false" :close-on-click-modal="false"
@@ -27,32 +27,32 @@
> >
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="OPC编码" prop="opc_code"> <el-form-item label="OPC编码" prop="opc_code">
<el-input v-model="form.opc_code" style="width: 370px;"/> <el-input v-model="form.opc_code" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="OPC名称" prop="opc_name"> <el-form-item label="OPC名称" prop="opc_name">
<el-input v-model="form.opc_name" style="width: 370px;"/> <el-input v-model="form.opc_name" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="OPC地址"> <el-form-item label="OPC地址">
<el-input v-model="form.opc_host" style="width: 370px;"/> <el-input v-model="form.opc_host" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="用户名"> <el-form-item label="用户名">
<el-input v-model="form.user" style="width: 370px;"/> <el-input v-model="form.user" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="密码" prop="password"> <el-form-item label="密码" prop="password">
<el-input v-model="form.password" style="width: 370px;" type="password"/> <el-input v-model="form.password" style="width: 370px;" type="password" />
<el-button :loading="crud.cu === 2" type="primary" @click="getDetail()">详情</el-button> <el-button :loading="crud.cu === 2" type="primary" @click="getDetail()">详情</el-button>
</el-form-item> </el-form-item>
<el-form-item label="程序ID"> <el-form-item label="程序ID">
<el-input v-model="form.prog_id" style="width: 370px;"/> <el-input v-model="form.prog_id" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="注册表ID"> <el-form-item label="注册表ID">
<el-input v-model="form.cls_id" style="width: 370px;"/> <el-input v-model="form.cls_id" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="domain"> <el-form-item label="domain">
<el-input v-model="form.domain" style="width: 370px;"/> <el-input v-model="form.domain" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/> <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -63,18 +63,18 @@
<el-dialog title="PLC管理" :visible.sync="dialogPlcFormVisible" width="550px"> <el-dialog title="PLC管理" :visible.sync="dialogPlcFormVisible" width="550px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-input v-model="form.opc_server_id" type="hidden" prop="opc_server_id"/> <el-input v-model="form.opc_server_id" type="hidden" prop="opc_server_id" />
<el-form-item label="PLC编码" prop="plc_code"> <el-form-item label="PLC编码" prop="plc_code">
<el-input v-model="form.plc_code" style="width: 370px;"/> <el-input v-model="form.plc_code" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="OPC名称" prop="plc_opc_name"> <el-form-item label="OPC名称" prop="plc_opc_name">
<el-input v-model="form.plc_opc_name" style="width: 370px;" disabled/> <el-input v-model="form.plc_opc_name" style="width: 370px;" disabled />
</el-form-item> </el-form-item>
<el-form-item label="PLC名称" prop="plc_name"> <el-form-item label="PLC名称" prop="plc_name">
<el-input v-model="form.plc_name" style="width: 370px;"/> <el-input v-model="form.plc_name" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="PLC地址" prop="plc_host"> <el-form-item label="PLC地址" prop="plc_host">
<el-input v-model="form.plc_host" style="width: 370px;"/> <el-input v-model="form.plc_host" style="width: 370px;" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -97,18 +97,18 @@
@select-all="crud.selectAllChange" @select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler" @selection-change="crud.selectionChangeHandler"
> >
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55" />
<el-table-column prop="opc_code" label="OPC编码" width="100"/> <el-table-column prop="opc_code" label="OPC编码" show-overflow-tooltip width="135" />
<el-table-column prop="opc_name" label="OPC名称"/> <el-table-column prop="opc_name" label="OPC名称" show-overflow-tooltip width="135" />
<el-table-column prop="opc_host" label="OPC地址" min-width="130"/> <el-table-column prop="opc_host" label="OPC地址" show-overflow-tooltip min-width="130" />
<el-table-column prop="type" label="类型"/> <el-table-column prop="type" label="类型" show-overflow-tooltip />
<el-table-column prop="user" label="用户名" min-width="100"/> <el-table-column prop="user" label="用户名" show-overflow-tooltip min-width="100" />
<el-table-column prop="password" label="密码"/> <el-table-column prop="password" label="密码" show-overflow-tooltip />
<el-table-column prop="prog_id" label="程序ID" min-width="150"/> <el-table-column prop="prog_id" label="程序ID" show-overflow-tooltip min-width="150" />
<el-table-column prop="cls_id" label="注册表ID" min-width="150"/> <el-table-column prop="cls_id" label="注册表ID" show-overflow-tooltip min-width="150" />
<el-table-column prop="domain" label="domain"/> <el-table-column prop="domain" label="domain" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" min-width="100"/> <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="100" />
<el-table-column prop="createtime" label="创建时间"/> <el-table-column prop="createtime" label="创建时间" show-overflow-tooltip />
<el-table-column label="操作" width="200px" align="center" fixed="right"> <el-table-column label="操作" width="200px" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row,'1')">修改</el-button> <el-button type="text" size="small" @click="handleClick(scope.row,'1')">修改</el-button>
@@ -120,7 +120,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination/> <pagination />
</div> </div>
</div> </div>
</template> </template>

18
wcs/qd/package.json
View File

@@ -39,45 +39,50 @@
"af-table-column": "^1.0.3", "af-table-column": "^1.0.3",
"ansi_up": "^5.1.0", "ansi_up": "^5.1.0",
"axios": "0.18.1", "axios": "0.18.1",
"clipboard": "2.0.4", "clipboard": "^2.0.4",
"codemirror": "^5.49.2", "codemirror": "^5.49.2",
"connect": "3.6.6", "connect": "3.6.6",
"echarts": "^4.2.1", "echarts": "^4.2.1",
"echarts-gl": "^1.1.1", "echarts-gl": "^1.1.1",
"echarts-wordcloud": "^1.1.3", "echarts-wordcloud": "^1.1.3",
"element-ui": "^2.13.2", "element-ui": "^2.15.8",
"file-saver": "^1.3.8", "file-saver": "1.3.8",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"fuse.js": "3.4.4", "fuse.js": "3.4.4",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"js-beautify": "^1.10.2", "js-beautify": "^1.10.2",
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"jsbarcode": "^3.11.5",
"jsencrypt": "^3.0.0-rc.1", "jsencrypt": "^3.0.0-rc.1",
"jszip": "3.1.5", "jszip": "3.1.5",
"mavon-editor": "^2.9.0", "mavon-editor": "^2.9.0",
"normalize.css": "7.0.0", "normalize.css": "7.0.0",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"path-to-regexp": "2.4.0", "path-to-regexp": "2.4.0",
"qrcodejs2": "0.0.2",
"qs": "^6.9.1", "qs": "^6.9.1",
"screenfull": "4.2.0", "screenfull": "4.2.0",
"sortablejs": "1.8.4", "sortablejs": "1.8.4",
"throttle-debounce": "^5.0.0",
"vue": "2.6.10", "vue": "2.6.10",
"vue-color": "^2.8.1", "vue-color": "^2.8.1",
"vue-count-to": "1.0.13", "vue-count-to": "1.0.13",
"vue-cropper": "0.4.9", "vue-cropper": "0.4.9",
"vue-easy-print": "0.0.8",
"vue-echarts": "^5.0.0-beta.0", "vue-echarts": "^5.0.0-beta.0",
"vue-highlightjs": "^1.3.3", "vue-highlightjs": "^1.3.3",
"vue-image-crop-upload": "^2.5.0", "vue-image-crop-upload": "^2.5.0",
"vue-print-nb": "^1.7.5",
"vue-router": "3.0.2", "vue-router": "3.0.2",
"vue-seamless-scroll": "^1.1.23", "vue-seamless-scroll": "^1.1.23",
"vue-splitpane": "1.0.4", "vue-splitpane": "1.0.4",
"vuedraggable": "2.20.0", "vuedraggable": "^2.24.3",
"vuex": "3.1.0", "vuex": "3.1.0",
"vxe-table": "^3.3.10", "vxe-table": "^3.3.10",
"wangeditor": "^3.1.1", "wangeditor": "^3.1.1",
"xe-ajax": "^4.0.5", "xe-ajax": "^4.0.5",
"xe-utils": "^3.3.1", "xe-utils": "^3.3.1",
"xlsx": "^0.14.5" "xlsx": "^0.14.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.0.0", "@babel/core": "7.0.0",
@@ -105,8 +110,9 @@
"husky": "1.3.1", "husky": "1.3.1",
"lint-staged": "8.1.5", "lint-staged": "8.1.5",
"plop": "2.3.0", "plop": "2.3.0",
"print-template": "^1.2.5",
"runjs": "^4.3.2", "runjs": "^4.3.2",
"sass": "^1.26.10", "sass": "~1.26.5",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",
"script-ext-html-webpack-plugin": "2.1.3", "script-ext-html-webpack-plugin": "2.1.3",
"script-loader": "0.7.2", "script-loader": "0.7.2",