更新

acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue

@@ -359,29 +359,20 @@ export default {
           return
         }
         for (const val in this.data1) {
+          if (this.data1[val].code.indexOf('mode') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 0)
+          }
           if (this.data1[val].code.indexOf('move') !== -1) {
             this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
           }
-          if (this.data1[val].code.indexOf('action') !== -1) {
+          if (this.data1[val].code.indexOf('carrier_direction') !== -1) {
             this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
           }
-          if (this.data1[val].code.indexOf('ioaction') !== -1) {
+          if (this.data1[val].code.indexOf('error') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 3)
-          }
-          if (this.data1[val].code.indexOf('height') !== -1) {
             this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
           }
-          if (this.data1[val].code.indexOf('error') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 5)
-          }
-          if (this.data1[val].code.indexOf('direction') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 6)
-          }
-          if (this.data1[val].code.indexOf('operation_type') !== -1) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 7)
-          }
           if (this.data1[val].code.indexOf('task') !== -1) {
-            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 21)
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 8)
           }
         }
       }
@@ -400,13 +391,32 @@ export default {
         if (isNaN(parseInt(endNumber))) {
           return
         }
+        console.log(endNumber)
         for (const val in this.data2) {
+          if (this.data2[val].code.indexOf('to_command') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 0)
+          }
           if (this.data2[val].code.indexOf('to_target') !== -1) {
             this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
           }
+          if (this.data2[val].code.indexOf('to_container_type') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4)
+          }
           if (this.data2[val].code.indexOf('to_task') !== -1) {
             this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
           }
+          if (this.data2[val].code.indexOf('to_strap_times') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 10)
+          }
+          if (this.data2[val].code.indexOf('to_length') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 12)
+          }
+          if (this.data2[val].code.indexOf('to_weight') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 14)
+          }
+          if (this.data2[val].code.indexOf('to_height') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 16)
+          }
         }
       }
     },

acs/nladmin-ui/src/views/acs/route/routeLine/index.vue

@@ -87,12 +87,12 @@
 
           <el-form-item label="当前设备名称" prop="device_code">
             <el-select
+              ref="test"
               v-model="form.device_code"
               filterable
-              ref="test"
               clearable
               multiple
-              reserveKeyword
+              reserve-keyword
               placeholder="请选择"
               style="width: 370px;"
             >
@@ -110,7 +110,7 @@
               v-model="form.next_device_code"
               filterable
               clearable
-              reserveKeyword
+              reserve-keyword
               multiple
               placeholder="请选择"
               style="width: 370px;"
@@ -314,6 +314,13 @@ export default {
       this.form.next_device_code = Array.of(data.form.next_device_code.split('').join(''))
       return true
     },
+    [CRUD.HOOK.beforeSubmit](data) {
+      if (this.crud.status.edit === 1) {
+        this.form.device_code = data.form.device_code.join('')
+        this.form.next_device_code = data.form.next_device_code.join('')
+      }
+      return true
+    },
     // 改变状态
     changeEnabled(data) {
       var msg = '停用'