From bf18a739ae75072b3ba1737f46c1dbef454ba178 Mon Sep 17 00:00:00 2001 From: wu <2468489804@qq.com> Date: Thu, 18 Aug 2022 14:21:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=A7=84=E5=88=99=E9=AA=8C=E8=AF=81=E3=80=81=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA&=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AE=BE=E5=A4=87=E8=8A=82=E7=82=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edgeServer/edgeServerConfigure/device.vue | 171 ++++-- .../edgeServerConfigure/deviceConfigure.vue | 54 +- .../deviceSetting/index.json | 568 +++++++++++++----- 3 files changed, 557 insertions(+), 236 deletions(-) diff --git a/src/views/edgeServer/edgeServerConfigure/device.vue b/src/views/edgeServer/edgeServerConfigure/device.vue index 1cc8078..554aa47 100644 --- a/src/views/edgeServer/edgeServerConfigure/device.vue +++ b/src/views/edgeServer/edgeServerConfigure/device.vue @@ -44,22 +44,11 @@ :defaultFormData="defaultFormData" /> - + 新增 @@ -85,7 +74,7 @@ export default { components: { DeviceConfigure: () => import('./deviceConfigure') }, - data () { + data() { return { active: '', columns: [ @@ -115,10 +104,33 @@ export default { }, { title: '类型', - key: '@RequestType', + key: '@DataTypeCode', component: { - name: 'el-input', - size: 'small' + name: 'el-select', + size: 'small', + options: [ + { + value: 'string', + label: 'string (字符串)' + }, + { + value: 'int', + label: 'int (整数)' + }, + { + value: 'float', + label: 'float (浮点数)' + }, + { + value: 'short', + label: 'short' + }, + + { + value: 'bool', + label: 'bool (逻辑值)' + } + ] } }, { @@ -161,7 +173,7 @@ export default { text: '绑定', size: 'mini', emit: 'banding', - show (index, row) { + show(index, row) { if (row.showBindButton) { return true } @@ -171,7 +183,7 @@ export default { { text: '发送', size: 'mini', - show (index, row) { + show(index, row) { if (row.showSendButton) { return true } @@ -181,7 +193,7 @@ export default { { text: '复制', size: 'mini', - show (index, row) { + show(index, row) { if (row.showCopyButton) { return true } @@ -193,7 +205,7 @@ export default { size: 'mini', confirm: true, - show (index, row) { + show(index, row) { if (row.showRemoveButton) { return true } @@ -210,12 +222,45 @@ export default { '@Name': { title: '名称' }, - '@Address': { title: '地址' }, + '@DisplayName': { + title: '显示名称' + }, '@RequestType': { - title: '类型' + title: '请求类型' + }, + '@DataTypeCode': { + title: '数据类型', + component: { + name: 'el-select', + + options: [ + { + value: 'string', + label: 'string (字符串)' + }, + { + value: 'int', + label: 'int (整数)' + }, + { + value: 'float', + label: 'float (浮点数)' + }, + { + value: 'short', + label: 'short' + }, + + { + value: 'bool', + label: 'bool (逻辑值)' + } + ], + span: 12 + } }, '@RequestInterval': { title: '采集周期(ms)' @@ -232,11 +277,12 @@ export default { }, addRules: { '@Name': [{ required: true, type: 'string', message: '请输入名称', trigger: 'blur' }], - '@Address': [{ required: true, message: '请输入地址', trigger: 'blur' }], - '@RequestType': [{ required: true, type: 'string', message: '请选择类型', trigger: 'blur' }], + '@Address': [{ required: true, type: 'string', message: '请输入地址', trigger: 'blur' }], + '@DisplayName': [{ required: true, type: 'string', message: '请输入显示名称', trigger: 'blur' }], + '@RequestType': [{ required: true, type: 'string', message: '请输入请求类型', trigger: 'blur' }], + '@DataTypeCode': [{ required: true, type: 'string', message: '请选择类型', trigger: 'blur' }], '@RequestInterval': [{ required: true, message: '请输入采集周期(ms)', trigger: 'blur' }], - '@Length': [{ required: true, message: '请输入长度', trigger: 'blur' }], - '@Value': [{ required: true, message: '请输入当前值', trigger: 'blur' }] + '@Length': [{ required: true, message: '请输入长度', trigger: 'blur' }] }, serverData: {}, devicePointData: [], @@ -252,7 +298,7 @@ export default { }, watch: { server: { - handler (val) { + handler(val) { this.serverData = val this.getDevice() }, @@ -260,23 +306,23 @@ export default { } }, methods: { - addRow () { + addRow() { this.$refs.d2Crud.showDialog({ mode: 'add' }) }, - handleFormDataChange ({ key }) { + handleFormDataChange({ key }) { if (key === 'workingSubclass') { const { workingSubclass } = this.$refs.d2Crud.formData this.getCodesByWorkingSubclass(workingSubclass) this.$refs.d2Crud.$forceUpdate() } }, - handleCellDataChange ({ rowIndex, row }) { + handleCellDataChange({ rowIndex, row }) { this.devicePointData[rowIndex] = row this.setDeviceConfigure() }, - bandingNodeTemplate ({ index }) { + bandingNodeTemplate({ index }) { this.$refs.d2Crud.showDialog({ mode: 'edit', rowIndex: index, @@ -303,14 +349,14 @@ export default { } }) }, - handleDialogCancel (done) { + handleDialogCancel(done) { this.$message({ message: '用户取消保存', type: 'warning' }) done() }, - handleCommand (command) { + handleCommand(command) { switch (command) { case 'add': this.addDevice() @@ -320,7 +366,7 @@ export default { break } }, - async getCodesByWorkingSubclass (workingSubclass) { + async getCodesByWorkingSubclass(workingSubclass) { try { const nodeCode = await this.$api.QUERY_CODES(workingSubclass) const nodeCodeData = [] @@ -337,7 +383,7 @@ export default { console.log(e) } }, - async getworkingSubclasses () { + async getworkingSubclasses() { try { const workingSubclasses = await this.$api.QUERY_WORKING_SUBCLASSES() const workingSubclassesData = [] @@ -350,7 +396,7 @@ export default { console.log(e) } }, - async getDevice () { + async getDevice() { try { this.deviceData = await this.$api.GET_DEVICE(this.serverData.id) if (this.deviceData.length > 0) { @@ -360,7 +406,7 @@ export default { console.log(e) } }, - async getDeviceConfigure (e) { + async getDeviceConfigure(e) { this.deviceActiveStatus = e this.devicePointData = [] // 当切换设备时把保存configure、point的数据清空 this.defaultDeviceName = '' @@ -386,7 +432,7 @@ export default { } } }, - addDevice () { + addDevice() { const that = this this.$prompt('输入设备名称', '新加设备', { confirmButtonText: '确定', @@ -401,10 +447,8 @@ export default { }) }) }, - async delDevice () { - const url = 'http://8.sctmes.com:20522' - // 'http://'+ this.serverData.url +':'+ this.serverData.port - const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE(url, 'admin', '123456') + async delDevice() { + let deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', '123456') let deviceNode = deviceConfigure.Content.Settings.GroupNode[0].DeviceNode if (deviceNode !== undefined && isArray(deviceNode)) { deviceNode = filter(deviceNode, item => { @@ -414,8 +458,9 @@ export default { } else { unset(deviceConfigure, 'Content.Settings.GroupNode[0].DeviceNode') } + try { - await this.$api.SET_HSLSERVER_CONFIGURE(url, 'admin', '123456', { data: deviceConfigure.Content }) + await this.$api.SET_HSLSERVER_CONFIGURE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', '123456', { data: deviceConfigure.Content }) await this.$api.DEL_DEVICE({ action: 'remove_device', id: this.deviceData[this.deviceActiveStatus].id }) this.$message({ message: '删除设备成功', @@ -426,7 +471,7 @@ export default { console.log(e) } }, - async addDevicePoint (row, done) { + async addDevicePoint(row, done) { this.formOptions.saveLoading = true if (!this.$refs.deviceConfigure.defaultDeviceTypeNameValue) { this.$message({ @@ -442,12 +487,14 @@ export default { } this.formOptions.saveLoading = false }, - async delDevicePoint ({ index, row }, done) { - this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = this.devicePointData.splice(index, 1) + async delDevicePoint({ index, row }, done) { + this.devicePointData.splice(index, 1) + this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = this.devicePointData + await this.setDeviceConfigure() done() }, - async getDevicePoint () { + async getDevicePoint() { const data = { action: 'add_node', server_id: this.serverData.id, device_id: this.deviceData[this.deviceActiveStatus].id } try { this.devicePointData = await this.$api.GET_DEVICE_POINT(data) @@ -455,16 +502,20 @@ export default { console.log(e) } }, - async devicePointBandingNode ({ index, row }, done) { + async devicePointBandingNode({ index, row }, done) { this.devicePointData[index]['@Binding'] = row.nodeCode this.setDeviceConfigure() done() }, - async setDeviceConfigure () { + async setDeviceConfigure() { try { - const url = 'http://8.sctmes.com:20522' - // 'http://'+ this.serverData.url +':'+ this.serverData.port - const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE(url, 'admin', '123456') + // 验证表单 + this.$refs.deviceConfigure.$refs.form.validate((valid) => { + if (!valid) { + return false + } + }) + const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', '123456') if (this.devicePointData.length > 0) { const devicePointData = this.devicePointData each(devicePointData, (item) => { @@ -478,7 +529,6 @@ export default { this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = devicePointData } this.$refs.deviceConfigure.deviceConfigureModelValue['@Name'] = this.deviceData[this.deviceActiveStatus].name - let deviceNode = deviceConfigure.Content.Settings.GroupNode[0].DeviceNode || [] let isExist = false if (deviceNode !== undefined) { @@ -495,10 +545,9 @@ export default { if (!isExist) { deviceNode.push(this.$refs.deviceConfigure.deviceConfigureModelValue) } - deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = deviceNode + await this.$api.SET_HSLSERVER_CONFIGURE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', '123456', { data: deviceConfigure.Content }) this.$refs.deviceConfigure.deviceConfigureModelValue.DeviceTypeName = this.$refs.deviceConfigure.defaultDeviceTypeNameValue - await this.$api.SET_HSLSERVER_CONFIGURE(url, 'admin', '123456', { data: deviceConfigure.Content }) const data = { action: 'update_device', conf: JSON.stringify(this.$refs.deviceConfigure.deviceConfigureModelValue), @@ -513,7 +562,7 @@ export default { console.log(e) } }, - getDeviceStatus () { + getDeviceStatus() { this.$api.GET_DEVICE_STATUS(this.serverData.id).then(res => { each(this.deviceData, (item) => { if (item.id in res.device_status) { @@ -524,7 +573,7 @@ export default { }) } }, - mounted () { + mounted() { this.getDevice() this.getworkingSubclasses() // setInterval(this.getDeviceStatus, 2000) diff --git a/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue b/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue index cf037dd..f495563 100644 --- a/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue +++ b/src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue @@ -1,6 +1,7 @@ @@ -79,6 +77,7 @@ export default { deviceConfigureFormItem: [], defaultDeviceTypeNameValue: '', deviceConfigureModelValue: {}, + rules: {}, deviceSelectedVlaue: '', deviceTypeData: [ ] @@ -88,13 +87,18 @@ export default { deviceChange (e) { // 获取所有字符串的key 用于v-model渲染 const deviceConfigureModelValue = {} + const rules = {} each(deviceConfigureFormItemData[e], (item) => { if (item.type === 'time') { deviceConfigureModelValue[item.key] = item.defaultValue ? item.defaultValue : new Date() } else { deviceConfigureModelValue[item.key] = item.defaultValue ? item.defaultValue : '' } + if (item.rules !== undefined) { + rules[item.key] = item.rules + } }) + this.rules = rules this.deviceConfigureModelValue = deviceConfigureModelValue this.deviceConfigureFormItem = deviceConfigureFormItemData[e] }, diff --git a/src/views/edgeServer/edgeServerConfigure/deviceSetting/index.json b/src/views/edgeServer/edgeServerConfigure/deviceSetting/index.json index 9a2f53b..2eac28e 100644 --- a/src/views/edgeServer/edgeServerConfigure/deviceSetting/index.json +++ b/src/views/edgeServer/edgeServerConfigure/deviceSetting/index.json @@ -14,7 +14,8 @@ "placeholder":"", "key":"@Name", "disabled":true, - "defaultValue":"三菱PLC-MC" + "defaultValue":"", + "isShow":true }, { "labelName":"Description", @@ -47,16 +48,16 @@ "key":"@WebApiEnable", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], - "disabled":true, - "defaultValue":"true" + "disabled":false, + "defaultValue":"True" }, { "labelName":"IpAddress", @@ -64,7 +65,10 @@ "placeholder":"", "key":"@IpAddress", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入IpAddress", "trigger": "blur" } + ] }, { "labelName":"Port", @@ -72,7 +76,10 @@ "placeholder":"", "key":"@Port", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Port", "trigger": "blur" } + ] }, { "labelName":"ConnectTimeOut", @@ -80,7 +87,10 @@ "placeholder":"", "key":"@ConnectTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ConnectTimeOut", "trigger": "blur" } + ] }, { "labelName":"ReceiveTimeOut", @@ -88,7 +98,10 @@ "placeholder":"", "key":"@ReceiveTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ReceiveTimeOut", "trigger": "blur" } + ] }, { "labelName":"DTU", @@ -104,7 +117,10 @@ "placeholder":"", "key":"@NetworkNumber", "disabled":false, - "defaultValue":"" + "defaultValue":"0", + "rules":[ + { "required": true, "message": "请输入NetworkNumber", "trigger": "blur" } + ] }, { "labelName":"NetworkStationNumber", @@ -112,7 +128,10 @@ "placeholder":"", "key":"@NetworkStationNumber", "disabled":false, - "defaultValue":"" + "defaultValue":"0", + "rules":[ + { "required": true, "message": "请输入NetworkStationNumber", "trigger": "blur" } + ] }, { "labelName":"IsBinary", @@ -121,15 +140,128 @@ "key":"@IsBinary", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, + "defaultValue":"True" + } + ], + "三菱PLC-MC-R系列":[ + { + "labelName":"设备类型", + "type":"text", + "placeholder":"", + "key":"@DeviceType", + "disabled":true, + "defaultValue":"MelsecMcQna3E" + }, + { + "labelName":"Name", + "type":"text", + "placeholder":"", + "key":"@Name", + "disabled":true, + "defaultValue":"", + "isShow":true + }, + { + "labelName":"Description", + "type":"text", + "placeholder":"", + "key":"@Description", + "disabled":false, + "defaultValue":"" + }, + { + "labelName":"CreateTime", + "type":"time", + "placeholder":"", + "key":"@CreateTime", + "disabled":true, + "defaultValue":"" + }, + { + "labelName":"InstallationDate", + "type":"time", + "placeholder":"", + "key":"@InstallationDate", + "disabled":true, + "defaultValue":"" + }, + { + "labelName":"WebApiEnable", + "type":"select", + "placeholder":"", + "key":"@WebApiEnable", + "option":[ + { + "label":"True", + "value":"True" + }, + { + "label":"False", + "value":"False" + } + ], + "disabled":false, + "defaultValue":"True" + }, + { + "labelName":"IpAddress", + "type":"text", + "placeholder":"", + "key":"@IpAddress", + "disabled":false, + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入IpAddress", "trigger": "blur" } + ] + }, + { + "labelName":"Port", + "type":"text", + "placeholder":"", + "key":"@Port", + "disabled":false, + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Port", "trigger": "blur" } + ] + }, + { + "labelName":"ConnectTimeOut", + "type":"text", + "placeholder":"", + "key":"@ConnectTimeOut", + "disabled":false, + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ConnectTimeOut", "trigger": "blur" } + ] + }, + { + "labelName":"ReceiveTimeOut", + "type":"text", + "placeholder":"", + "key":"@ReceiveTimeOut", + "disabled":false, + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ReceiveTimeOut", "trigger": "blur" } + ] + }, + { + "labelName":"DTU", + "type":"text", + "placeholder":"", + "key":"@DTU", + "disabled":false, "defaultValue":"" } ], @@ -148,7 +280,8 @@ "placeholder":"", "key":"@Name", "disabled":true, - "defaultValue":"三菱PLC-A1E" + "defaultValue":"", + "isShow":true }, { "labelName":"Description", @@ -181,16 +314,16 @@ "key":"@WebApiEnable", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":true, - "defaultValue":"true" + "defaultValue":"True" }, { "labelName":"IpAddress", @@ -198,7 +331,10 @@ "placeholder":"", "key":"@IpAddress", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入IpAddress", "trigger": "blur" } + ] }, { "labelName":"Port", @@ -206,7 +342,10 @@ "placeholder":"", "key":"@Port", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Port", "trigger": "blur" } + ] }, { "labelName":"ConnectTimeOut", @@ -214,7 +353,10 @@ "placeholder":"", "key":"@ConnectTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ConnectTimeOut", "trigger": "blur" } + ] }, { "labelName":"ReceiveTimeOut", @@ -222,7 +364,10 @@ "placeholder":"", "key":"@ReceiveTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ReceiveTimeOut", "trigger": "blur" } + ] }, { "labelName":"DTU", @@ -238,7 +383,10 @@ "placeholder":"", "key":"@PLCNumber", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入PLCNumber", "trigger": "blur" } + ] }, { "labelName":"IsBinary", @@ -247,12 +395,12 @@ "key":"@IsBinary", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, @@ -274,7 +422,8 @@ "placeholder":"", "key":"@Name", "disabled":true, - "defaultValue":"三菱PLC-MC-UDP" + "defaultValue":"", + "isShow":true }, { "labelName":"Description", @@ -307,16 +456,16 @@ "key":"@WebApiEnable", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":true, - "defaultValue":"true" + "defaultValue":"True" }, { "labelName":"IpAddress", @@ -324,7 +473,10 @@ "placeholder":"", "key":"@IpAddress", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入IpAddress", "trigger": "blur" } + ] }, { "labelName":"Port", @@ -332,7 +484,10 @@ "placeholder":"", "key":"@Port", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Port", "trigger": "blur" } + ] }, { "labelName":"ConnectTimeOut", @@ -340,7 +495,10 @@ "placeholder":"", "key":"@ConnectTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ConnectTimeOut", "trigger": "blur" } + ] }, { "labelName":"ReceiveTimeOut", @@ -348,7 +506,10 @@ "placeholder":"", "key":"@ReceiveTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ReceiveTimeOut", "trigger": "blur" } + ] }, { "labelName":"DTU", @@ -364,7 +525,10 @@ "placeholder":"", "key":"@NetworkNumber", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入NetworkNumber", "trigger": "blur" } + ] }, { "labelName":"NetworkStationNumber", @@ -372,7 +536,10 @@ "placeholder":"", "key":"@NetworkStationNumber", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入NetworkStationNumber", "trigger": "blur" } + ] }, { "labelName":"IsBinary", @@ -381,12 +548,12 @@ "key":"@IsBinary", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, @@ -408,7 +575,8 @@ "placeholder":"", "key":"@Name", "disabled":true, - "defaultValue":"三菱PLC-FxSerial" + "defaultValue":"", + "isShow":true }, { "labelName":"Description", @@ -441,16 +609,16 @@ "key":"@WebApiEnable", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":true, - "defaultValue":"true" + "defaultValue":"True" }, { "labelName":"PortName", @@ -466,7 +634,10 @@ "placeholder":"", "key":"@BaudRate", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入BaudRate", "trigger": "blur" } + ] }, { "labelName":"DataBits", @@ -474,7 +645,10 @@ "placeholder":"", "key":"@DataBits", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入DataBits", "trigger": "blur" } + ] }, { "labelName":"StopBits", @@ -482,7 +656,10 @@ "placeholder":"", "key":"@StopBits", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入StopBits", "trigger": "blur" } + ] }, { "labelName":"Parity", @@ -490,7 +667,10 @@ "placeholder":"", "key":"@Parity", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入StopBits", "trigger": "blur" } + ] }, { "labelName":"ReceiveTimeOut", @@ -498,7 +678,10 @@ "placeholder":"", "key":"@ReceiveTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ReceiveTimeOut", "trigger": "blur" } + ] }, { "labelName":"SleepTime", @@ -506,7 +689,10 @@ "placeholder":"", "key":"@SleepTime", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入SleepTime", "trigger": "blur" } + ] }, { "labelName":"IsVersionNew", @@ -515,16 +701,16 @@ "key":"@IsVersionNew", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, - "defaultValue":"" + "defaultValue":"True" }, { "labelName":"IsActiveOnStart", @@ -533,16 +719,16 @@ "key":"@IsActiveOnStart", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, - "defaultValue":"" + "defaultValue":"False" } ], "三菱PLC-FxSerial-OverTcp":[ @@ -560,7 +746,8 @@ "placeholder":"", "key":"@Name", "disabled":true, - "defaultValue":"三菱PLC-FxSerial-OverTcp" + "defaultValue":"", + "isShow":true }, { "labelName":"Description", @@ -593,16 +780,16 @@ "key":"@WebApiEnable", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":true, - "defaultValue":"true" + "defaultValue":"True" }, { "labelName":"IpAddress", @@ -610,7 +797,10 @@ "placeholder":"", "key":"@IpAddress", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入IpAddress", "trigger": "blur" } + ] }, { "labelName":"Port", @@ -618,7 +808,10 @@ "placeholder":"", "key":"@Port", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Port", "trigger": "blur" } + ] }, { "labelName":"ConnectTimeOut", @@ -626,7 +819,10 @@ "placeholder":"", "key":"@ConnectTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ConnectTimeOut", "trigger": "blur" } + ] }, { "labelName":"ReceiveTimeOut", @@ -634,7 +830,10 @@ "placeholder":"", "key":"@ReceiveTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ReceiveTimeOut", "trigger": "blur" } + ] }, { "labelName":"DTU", @@ -651,16 +850,16 @@ "key":"@IsVersionNew", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, - "defaultValue":"" + "defaultValue":"True" }, { "labelName":"IsActiveOnStart", @@ -669,16 +868,16 @@ "key":"@IsActiveOnStart", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, - "defaultValue":"" + "defaultValue":"False" }, { "labelName":"UseGotConnect", @@ -687,16 +886,16 @@ "key":"@UseGotConnect", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, - "defaultValue":"" + "defaultValue":"False" } ], "三菱PLC-FxLinks":[ @@ -714,7 +913,8 @@ "placeholder":"", "key":"@Name", "disabled":true, - "defaultValue":"三菱PLC-FxLinks" + "defaultValue":"", + "isShow":true }, { "labelName":"Description", @@ -747,16 +947,16 @@ "key":"@WebApiEnable", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":true, - "defaultValue":"true" + "defaultValue":"True" }, { "labelName":"PortName", @@ -772,7 +972,10 @@ "placeholder":"", "key":"@BaudRate", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入BaudRate", "trigger": "blur" } + ] }, { "labelName":"DataBits", @@ -780,7 +983,10 @@ "placeholder":"", "key":"@DataBits", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入DataBits", "trigger": "blur" } + ] }, { "labelName":"StopBits", @@ -788,7 +994,10 @@ "placeholder":"", "key":"@StopBits", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入StopBits", "trigger": "blur" } + ] }, { "labelName":"Parity", @@ -796,7 +1005,10 @@ "placeholder":"", "key":"@Parity", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Parity", "trigger": "blur" } + ] }, { "labelName":"ReceiveTimeOut", @@ -804,7 +1016,10 @@ "placeholder":"", "key":"@ReceiveTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ReceiveTimeOut", "trigger": "blur" } + ] }, { "labelName":"SleepTime", @@ -812,7 +1027,10 @@ "placeholder":"", "key":"@SleepTime", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入SleepTime", "trigger": "blur" } + ] }, { "labelName":"Station", @@ -820,7 +1038,10 @@ "placeholder":"", "key":"@Station", "disabled":false, - "defaultValue":"" + "defaultValue":"0", + "rules":[ + { "required": true, "message": "请输入Station", "trigger": "blur" } + ] }, { "labelName":"SumCheck", @@ -829,16 +1050,16 @@ "key":"@SumCheck", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, - "defaultValue":"" + "defaultValue":"True" }, { "labelName":"WaittingTime", @@ -846,7 +1067,10 @@ "placeholder":"", "key":"@WaittingTime", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入WaittingTime", "trigger": "blur" } + ] } ], "三菱PLC-A3C":[ @@ -864,7 +1088,8 @@ "placeholder":"", "key":"@Name", "disabled":false, - "defaultValue":"三菱PLC-A3C" + "defaultValue":"", + "isShow":true }, { "labelName":"Description", @@ -897,16 +1122,16 @@ "key":"@WebApiEnable", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":true, - "defaultValue":"true" + "defaultValue":"True" }, { "labelName":"PortName", @@ -922,7 +1147,10 @@ "placeholder":"", "key":"@BaudRate", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入BaudRate", "trigger": "blur" } + ] }, { "labelName":"DataBits", @@ -930,7 +1158,10 @@ "placeholder":"", "key":"@DataBits", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入DataBits", "trigger": "blur" } + ] }, { "labelName":"StopBits", @@ -938,7 +1169,10 @@ "placeholder":"", "key":"@StopBits", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入StopBits", "trigger": "blur" } + ] }, { "labelName":"Parity", @@ -946,7 +1180,10 @@ "placeholder":"", "key":"@Parity", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Parity", "trigger": "blur" } + ] }, { "labelName":"ReceiveTimeOut", @@ -954,7 +1191,10 @@ "placeholder":"", "key":"@ReceiveTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ReceiveTimeOut", "trigger": "blur" } + ] }, { "labelName":"SleepTime", @@ -962,7 +1202,10 @@ "placeholder":"", "key":"@SleepTime", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入SleepTime", "trigger": "blur" } + ] }, { "labelName":"Station", @@ -970,7 +1213,10 @@ "placeholder":"", "key":"@Station", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Station", "trigger": "blur" } + ] }, { "labelName":"SumCheck", @@ -979,16 +1225,16 @@ "key":"@SumCheck", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, - "defaultValue":"" + "defaultValue":"True" }, { "labelName":"Format", @@ -996,7 +1242,10 @@ "placeholder":"", "key":"@Format", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Format", "trigger": "blur" } + ] } ], "三菱PLC-A3C-OverTcp":[ @@ -1014,7 +1263,8 @@ "placeholder":"", "key":"@Name", "disabled":false, - "defaultValue":"三菱PLC-A3C-OverTcp" + "defaultValue":"", + "isShow":true }, { "labelName":"Description", @@ -1047,16 +1297,16 @@ "key":"@WebApiEnable", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":true, - "defaultValue":"true" + "defaultValue":"True" }, { "labelName":"IpAddress", @@ -1064,7 +1314,10 @@ "placeholder":"", "key":"@IpAddress", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Port", "trigger": "blur" } + ] }, { "labelName":"Port", @@ -1072,7 +1325,10 @@ "placeholder":"", "key":"@Port", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Port", "trigger": "blur" } + ] }, { "labelName":"ConnectTimeOut", @@ -1080,7 +1336,10 @@ "placeholder":"", "key":"@ConnectTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ConnectTimeOut", "trigger": "blur" } + ] }, { "labelName":"ReceiveTimeOut", @@ -1088,7 +1347,10 @@ "placeholder":"", "key":"@ReceiveTimeOut", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入ReceiveTimeOut", "trigger": "blur" } + ] }, { "labelName":"DTU", @@ -1104,7 +1366,10 @@ "placeholder":"", "key":"@Station", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Station", "trigger": "blur" } + ] }, { "labelName":"SumCheck", @@ -1113,16 +1378,16 @@ "key":"@SumCheck", "option":[ { - "label":"true", - "value":"true" + "label":"True", + "value":"True" }, { - "label":"false", - "value":"false" + "label":"False", + "value":"False" } ], "disabled":false, - "defaultValue":"" + "defaultValue":"True" }, { "labelName":"Format", @@ -1130,7 +1395,10 @@ "placeholder":"", "key":"@Format", "disabled":false, - "defaultValue":"" + "defaultValue":"", + "rules":[ + { "required": true, "message": "请输入Format", "trigger": "blur" } + ] } ] }