Merge remote-tracking branch 'origin/master'

# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties

acs2/nladmin-ui/src/views/acs/device/customPolicy/task/index.vue

@@ -135,7 +135,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   cruds() {
@@ -164,9 +164,9 @@ export default {
   created() {
     deviceCrud.selectDeviceList().then(data => {
       this.deviceList = data
-    }),
+    })
     selectById(this.id).then(data => {
-      if (data != null && data != '') {
+      if (data != null && data !== '') {
         console.log(data)
         this.modeform = data
       }

acs2/nladmin-ui/src/views/acs/device/driver/agv/agv_ndc_one.vue

@@ -48,7 +48,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/agv/agv_ndc_two.vue

@@ -46,7 +46,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/agv/xg_agv.vue

@@ -229,7 +229,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/agv/xg_agv_car.vue

@@ -229,7 +229,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue

@@ -41,7 +41,26 @@
           </el-select>
         </el-col>
       </el-row>
+    </el-card>
 
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">指令相关：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="取货校验" label-width="150px">
+              <el-switch v-model="form.ignore_pickup_check" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="放货校验" label-width="150px">
+              <el-switch v-model="form.ignore_release_check" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </el-card>
 
     <el-card class="box-card" shadow="never">
@@ -226,7 +245,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/blank_manipulator.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_name"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -317,7 +318,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -399,7 +400,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -426,7 +427,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/blanking_button.vue

@@ -234,7 +234,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/box_manipulator.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_name"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -317,7 +318,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -399,7 +400,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -426,7 +427,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/box_manipulator_site.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -332,7 +332,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/box_palletizing_manipulator.vue

@@ -72,12 +72,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_name"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -309,7 +310,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -391,7 +392,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -418,7 +419,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/conveyor_with_scanner_weight.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -332,7 +332,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -307,7 +307,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/double_station_stacker.vue

@@ -300,7 +300,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/dry_manipulator.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_name"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -317,7 +318,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -399,7 +400,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -426,7 +427,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -332,7 +332,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/green_foil_machine_button.vue

@@ -234,7 +234,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue

@@ -72,12 +72,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -280,7 +280,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -279,7 +279,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/inflatable_shaft_library.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -328,7 +328,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue

@@ -155,7 +155,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/led_screen.vue

@@ -124,7 +124,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -206,7 +206,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -233,7 +233,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/manipulator_agv_station.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -286,7 +286,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_storage_out_conveyor.vue

@@ -226,7 +226,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_subvolumes_conveyor.vue

@@ -226,7 +226,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/one_conveyor/finished_product_out_with_bind_lable_conveyor.vue

@@ -226,7 +226,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/one_conveyor/fold_disc_site.vue

@@ -226,7 +226,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/one_conveyor/scanner_weight_conveyor.vue

@@ -226,7 +226,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/one_conveyor/un_box_lable_conveyor.vue

@@ -226,7 +226,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_package_manipulator.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_name"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -317,7 +318,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -399,7 +400,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -426,7 +427,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_storage_manipulator.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_name"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -317,7 +318,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -399,7 +400,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -426,7 +427,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue

@@ -53,6 +53,7 @@
             >
               <el-option
                 v-for="item in deviceList"
+                :key="item.device_name"
                 :label="item.device_name"
                 :value="item.device_code"
               />
@@ -107,12 +108,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -185,6 +186,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_name"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -353,7 +355,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -435,7 +437,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -462,7 +464,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue

@@ -53,6 +53,7 @@
             >
               <el-option
                 v-for="item in deviceList"
+                :key="item.device_name"
                 :label="item.device_name"
                 :value="item.device_code"
               />
@@ -107,12 +108,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -185,6 +186,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_name"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -353,7 +355,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -435,7 +437,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -462,7 +464,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/volume_two_manipulator.vue

@@ -53,6 +53,7 @@
             >
               <el-option
                 v-for="item in deviceList"
+                :key="item.device_code"
                 :label="item.device_name"
                 :value="item.device_code"
               />
@@ -107,12 +108,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -185,6 +186,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_code"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -353,7 +355,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -435,7 +437,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -462,7 +464,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/oven_inspect_site.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -271,7 +271,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/oven_manipulator.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_code"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -317,7 +318,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -399,7 +400,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -426,7 +427,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/paper_tube_conveyor2.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -279,7 +279,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/plug_pull_device_site.vue

@@ -72,12 +72,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -280,7 +280,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/pull_head_manipulator.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_code"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -317,7 +318,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -399,7 +400,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -426,7 +427,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/pull_tail_manipulator.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_code"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -317,7 +318,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -399,7 +400,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -426,7 +427,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/rgv.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -332,7 +332,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

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

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -286,7 +286,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_ckk.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -279,7 +279,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_labeling.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -279,7 +279,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/slit_two_manipulator.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_code"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -317,7 +318,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -399,7 +400,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -426,7 +427,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue

@@ -170,7 +170,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -271,7 +271,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control_with_scanner.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -332,7 +332,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/standard_conveyor_monitor.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -271,7 +271,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -271,7 +271,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/standard_manipulator.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -149,6 +149,7 @@
               >
                 <el-option
                   v-for="item in deviceList"
+                  :key="item.device_code"
                   :label="item.device_name"
                   :value="item.device_code"
                 />
@@ -317,7 +318,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {
@@ -399,7 +400,7 @@ export default {
         debugger
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字
@@ -426,7 +427,7 @@ export default {
       if (data.code.indexOf('to_command') !== -1) {
         const dbValue = data.db
         // .之前的字符串
-        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // const beforeStr = dbValue.match(/(\S*)\./)[1]
         // .之后的字符串
         const afterStr = dbValue.match(/\.(\S*)/)[1]
         // 取最后数字

acs2/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue

@@ -29,12 +29,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -156,7 +156,7 @@ export default {
     // eslint-disable-next-line vue/require-default-prop
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/standard_scanner.vue

@@ -46,7 +46,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/standard_stacker.vue

@@ -287,7 +287,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true,
+      required: true,
       default: () => ({})
     }
   },

acs2/nladmin-ui/src/views/acs/device/driver/standard_station.vue

@@ -85,12 +85,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>

acs2/nladmin-ui/src/views/acs/device/driver/standard_storage.vue

@@ -96,7 +96,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/subvolume_weighing_station.vue

@@ -234,7 +234,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/waste_foil_weighing_station.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -328,7 +328,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/driver/with_station_device.vue

@@ -71,12 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
+            <el-form-item label="取货校验" label-width="150px">
               <el-switch v-model="form.ignore_pickup_check" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视放货校验" label-width="150px">
+            <el-form-item label="放货校验" label-width="150px">
               <el-switch v-model="form.ignore_release_check" />
             </el-form-item>
           </el-col>
@@ -328,7 +328,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

acs2/nladmin-ui/src/views/acs/device/index.vue

@@ -254,6 +254,9 @@ export default {
         ],
         device_type: [
           { required: true, message: '设备类型不能为空', trigger: 'blur' }
+        ],
+        region: [
+          { required: true, message: '所属区域不能为空', trigger: 'blur' }
         ]
 
       }

acs2/nladmin-ui/src/views/acs/protocolConfig/config.vue

@@ -94,7 +94,7 @@ export default {
   props: {
     parentForm: {
       type: Object,
-      require: true
+      required: true
     }
   },
   data() {

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

@@ -66,7 +66,7 @@
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :visible.sync="crud.status.cu"
         :title="crud.status.title"
         width="600px"
       >

acs2/nladmin-ui/src/views/acs/task/index.vue

@@ -689,7 +689,7 @@ export default {
         to_x2: null,
         to_y2: null,
         to_z2: null,
-        agv_system_type: '1',
+        agv_system_type: '',
         interactionJson: null
       },
       extension: [{

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

@@ -68,8 +68,8 @@ class ButtonNode extends HtmlResize.view {
       <div>
         <div style="height: 15px; width: 15px; 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 src="${fault}" style="position: absolute; height: ${trayHeight}px; width: ${trayWidth}px; top: 15%; left: 15%; display: ${faultDisplay}">
         <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}">
       </div>
     `
     el.innerHTML = html