更新

acs/nladmin-ui/src/views/acs/device/config.vue

@@ -82,11 +82,11 @@ import standard_conveyor_control from '@/views/acs/device/driver/standard_convey
 import standard_conveyor_monitor from '@/views/acs/device/driver/standard_conveyor_monitor'
 import hailiang_smart_plc_test from '@/views/acs/device/driver/hailiang_smart_plc_test'
 import paint_conveyor from '@/views/acs/device/driver/paint_conveyor'
-import haokai_auto_conveyor from '@/views/acs/device/driver/haokai_auto_conveyor'
 import cargo_lift_conveyor from '@/views/acs/device/driver/cargo_lift_conveyor'
 import empty_vehicle_stacking_position from '@/views/acs/device/driver/empty_vehicle_stacking_position'
 import agv_ndc_one from '@/views/acs/device/driver/agv/agv_ndc_one'
 import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two'
+import hongxiang_device from '@/views/acs/device/driver/hongxiang_device'
 
 export default {
   name: 'DeviceConfig',
@@ -100,11 +100,11 @@ export default {
     standard_conveyor_monitor,
     hailiang_smart_plc_test,
     paint_conveyor,
-    haokai_auto_conveyor,
     cargo_lift_conveyor,
     empty_vehicle_stacking_position,
     agv_ndc_two,
-    agv_ndc_one
+    agv_ndc_one,
+    hongxiang_device
   },
   dicts: ['device_type'],
   mixins: [crud],

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

@@ -1,5 +1,5 @@
 <template>
-  <!--豪凯自动线对接位-->
+  <!--检测站点-->
   <div>
     <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
@@ -13,7 +13,6 @@
             v-model="opc_id"
             placeholder="无"
             clearable
-            filterable
             @change="changeOpc"
           >
             <el-option
@@ -31,7 +30,6 @@
             placeholder="无"
             clearable
             @change="changePlc"
-            filterable
           >
             <el-option
               v-for="item in dataOpcPlcs"
@@ -53,7 +51,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="电气调度号" label-width="150px">
-              <el-input v-model="form.address" />
+              <el-input v-model="form.OPCServer" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -101,8 +99,8 @@
             <el-form-item label="关联设备" prop="device_code">
               <el-select
                 v-model="form.link_device_code"
-                clearable
                 filterable
+                multiple
                 placeholder="请选择"
               >
                 <el-option
@@ -267,7 +265,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'StandardConveyorControl',
+  name: 'StandardInspectSite',
   mixins: [crud],
   props: {
     parentForm: {
@@ -281,7 +279,6 @@ export default {
       device_id: '',
       plc_id: '',
       plc_code: '',
-      address: '',
       opc_id: '',
       opc_code: '',
       configLoading: false,
@@ -299,7 +296,7 @@ export default {
         manual_create_task: true,
         is_pickup: true,
         is_release: true,
-        link_device_code: ''
+        link_device_code: []
       },
       rules: {}
     }
@@ -349,6 +346,7 @@ export default {
     finishReadEdit(data) {
       // 编辑的是code列,并且值包含mode
       if (data.code.indexOf('mode') !== -1) {
+        debugger
         const dbValue = data.db
         // .之前的字符串
         const beforeStr = dbValue.match(/(\S*)\./)[1]
@@ -364,26 +362,11 @@ export default {
           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) {
-            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
-          }
-          if (this.data1[val].code.indexOf('ioaction') !== -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) + 7)
           }
         }
       }

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

@@ -73,6 +73,11 @@
               <el-switch v-model="form.input_material" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否开启等待" label-width="150px">
+              <el-switch v-model="form.wait" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">