From 46a639e51fbb0fe55db932e522e60106c8868143 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Mon, 23 Dec 2024 13:24:43 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/acs/device/config.vue           |  9 +++-
 .../acs/device/driver/cargo_lift_conveyor.vue |  2 +-
 .../empty_vehicle_stacking_position.vue       |  2 +-
 .../acs/device/driver/fold_disc_site.vue      |  2 +-
 .../device/driver/hailiang_smart_plc_test.vue |  2 +-
 .../acs/device/driver/hongxiang_conveyor.vue  |  2 +-
 .../acs/device/driver/hongxiang_device.vue    |  2 +-
 .../acs/device/driver/lamp_three_color.vue    | 18 +++++++-
 .../acs/device/driver/siemens_conveyor.vue    |  2 +-
 .../device/driver/siemens_conveyor_ckk.vue    |  2 +-
 .../driver/siemens_conveyor_labeling.vue      |  2 +-
 .../src/views/acs/device/driver/ssx_site.vue  | 44 ++++++++++---------
 acs/nladmin-ui/src/views/acs/device/index.vue |  2 +-
 13 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/acs/nladmin-ui/src/views/acs/device/config.vue b/acs/nladmin-ui/src/views/acs/device/config.vue
index 8aa2813..60ecc7d 100644
--- a/acs/nladmin-ui/src/views/acs/device/config.vue
+++ b/acs/nladmin-ui/src/views/acs/device/config.vue
@@ -11,6 +11,7 @@
               <el-col :span="12">
                 <el-form-item label="设备类型" prop="device_type">
                   <el-select
+                    id="device_type"
                     v-model="form.device_type"
                     placeholder=""
                     disabled
@@ -27,7 +28,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="设备编号" prop="device_code">
-                  <el-input v-model="form.device_code" disabled />
+                  <el-input v-model="form.device_code" disabled id="device_code" />
                   <span style="color: #C0C0C0;margin-left: 10px;" />
                 </el-form-item>
               </el-col>
@@ -36,13 +37,14 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="设备名称" prop="device_name">
-                  <el-input v-model="form.device_name" disabled />
+                  <el-input v-model="form.device_name" id="device_name" disabled />
                   <span style="color: #C0C0C0;margin-left: 10px;" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="设备驱动" prop="driver_code">
                   <el-select
+                    id="driver_code"
                     v-model="form.driver_code"
                     filterable
                     placeholder=""
@@ -78,6 +80,7 @@ import standard_inspect_site from './driver/standard_inspect_site'
 import standard_ordinary_site from './driver/standard_ordinary_site'
 import standard_storage from '@/views/acs/device/driver/standard_storage'
 import standard_scanner from '@/views/acs/device/driver/standard_scanner'
+import lamp_three_color from '@/views/acs/device/driver/lamp_three_color'
 import standard_conveyor_control_with_scanner from '@/views/acs/device/driver/standard_conveyor_control_with_scanner'
 import standard_conveyor_control from '@/views/acs/device/driver/standard_conveyor_control'
 import standard_conveyor_monitor from '@/views/acs/device/driver/standard_conveyor_monitor'
@@ -111,6 +114,7 @@ export default {
     agv_ndc_one,
     xg_agv,
     ssx_site,
+    lamp_three_color,
     fold_disc_site
   },
   dicts: ['device_type'],
@@ -157,6 +161,7 @@ export default {
   },
   methods: {
     changeDriver(val) {
+      console.log(val)
       this.currentComponent = val
     }
   }
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/cargo_lift_conveyor.vue b/acs/nladmin-ui/src/views/acs/device/driver/cargo_lift_conveyor.vue
index 16ebdd3..5bec85d 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/cargo_lift_conveyor.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/cargo_lift_conveyor.vue
@@ -303,7 +303,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'StandardConveyorControl',
+  name: 'CargoLiftConveyor',
   mixins: [crud],
   props: {
     parentForm: {
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/empty_vehicle_stacking_position.vue b/acs/nladmin-ui/src/views/acs/device/driver/empty_vehicle_stacking_position.vue
index 097cd0b..7427d25 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/empty_vehicle_stacking_position.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/empty_vehicle_stacking_position.vue
@@ -272,7 +272,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'StandardConveyorControl',
+  name: 'EmptyVehicleStackingPosition',
   mixins: [crud],
   props: {
     parentForm: {
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue
index bb54bb8..87e6983 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue
@@ -291,7 +291,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'LnshFoldDisc',
+  name: 'FoldDiscSite',
   mixins: [crud],
   props: {
     parentForm: {
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/hailiang_smart_plc_test.vue b/acs/nladmin-ui/src/views/acs/device/driver/hailiang_smart_plc_test.vue
index ca26aa0..b334190 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/hailiang_smart_plc_test.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/hailiang_smart_plc_test.vue
@@ -267,7 +267,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'StandardConveyorControl',
+  name: 'HailiangSmartPlcTest',
   mixins: [crud],
   props: {
     parentForm: {
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue b/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue
index e0d20f8..c50df4c 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue
@@ -275,7 +275,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'StandardInspectSite',
+  name: 'HongxiangConveyor',
   mixins: [crud],
   props: {
     parentForm: {
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue b/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue
index fa78611..43e0ab0 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue
@@ -274,7 +274,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'StandardInspectSite',
+  name: 'HongxiangDevice',
   mixins: [crud],
   props: {
     parentForm: {
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue b/acs/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue
index bdb9079..5cd8668 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue
@@ -105,6 +105,14 @@
               />
             </template>
           </el-table-column>
+          <el-table-column prop="dbr_value2">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_read2()">测试读</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data2[scope.$index].dbr_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
           <el-table-column prop="dbw_value">
             <template slot="header">
               <el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
@@ -278,6 +286,15 @@ export default {
         }
       })
     },
+    test_read2() {
+      testRead(this.data2, this.opc_id).then(data => {
+        this.data2 = data
+        console.log(this.data2)
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
     test_read1() {
       testRead(this.data1, this.opc_id).then(data => {
         this.data1 = data
@@ -341,4 +358,3 @@ export default {
 <style scoped>
 
 </style>
-
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
index 7ecfb7d..f4f44e1 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
@@ -281,7 +281,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'StandardConveyorControl',
+  name: 'SiemensConveyor',
   mixins: [crud],
   props: {
     parentForm: {
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_ckk.vue b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_ckk.vue
index 54f6fd8..7b9ad04 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_ckk.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_ckk.vue
@@ -274,7 +274,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'StandardConveyorControl',
+  name: 'SiemensConveyorCkk',
   mixins: [crud],
   props: {
     parentForm: {
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_labeling.vue b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_labeling.vue
index 98c28fe..9da1cad 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_labeling.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_labeling.vue
@@ -274,7 +274,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'StandardConveyorControl',
+  name: 'SiemensConveyorLabeling',
   mixins: [crud],
   props: {
     parentForm: {
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/ssx_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/ssx_site.vue
index 2a71c31..cecad7b 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/ssx_site.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/ssx_site.vue
@@ -51,8 +51,8 @@
       <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-input v-model="form.address" />
+            <el-form-item label="电气调度号" label-width="150px" prop="address">
+              <el-input v-model="form.address" id="address" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -66,39 +66,40 @@
       <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="检验有货">
-              <el-switch v-model="form.inspect_in_stocck" />
+            <el-form-item label="检验有货" prop="inspect_in_stocck">
+              <el-switch v-model="form.inspect_in_stocck"  id="inspect_in_stocck" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="忽视取货校验" label-width="150px">
-              <el-switch v-model="form.ignore_pickup_check" />
+            <el-form-item label="忽视取货校验" label-width="150px" prop="ignore_pickup_check">
+              <el-switch v-model="form.ignore_pickup_check" id="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 label="忽视放货校验" label-width="150px" prop="ignore_release_check">
+              <el-switch v-model="form.ignore_release_check" id="ignore_release_check" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="8">
-            <el-form-item label="呼叫">
-              <el-switch v-model="form.apply_task" />
+            <el-form-item label="呼叫" prop="apply_task">
+              <el-switch v-model="form.apply_task" id="apply_task" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="响应" label-width="150px">
-              <el-switch v-model="form.manual_create_task" />
+            <el-form-item label="响应" label-width="150px" prop="manual_create_task">
+              <el-switch v-model="form.manual_create_task" id="manual_create_task" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="8">
-            <el-form-item label="关联设备" prop="device_code">
+            <el-form-item label="关联设备" prop="link_device_code">
               <el-select
+                id="link_device_code"
                 v-model="form.link_device_code"
                 filterable
                 multiple
@@ -114,8 +115,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="关联三色灯" prop="device_code" label-width="100px">
+            <el-form-item label="关联三色灯" prop="link_three_lamp" label-width="100px">
               <el-select
+                id="link_three_lamp"
                 v-model="form.link_three_lamp"
                 filterable
                 clearable
@@ -131,8 +133,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="是否输入物料" label-width="150px">
-              <el-switch v-model="form.input_material" />
+            <el-form-item label="是否输入物料" label-width="150px" prop="input_material">
+              <el-switch v-model="form.input_material" id="input_material" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -146,13 +148,13 @@
       <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="取货">
-              <el-switch v-model="form.is_pickup" />
+            <el-form-item label="取货" prop="is_pickup">
+              <el-switch v-model="form.is_pickup" id="is_pickup" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="放货">
-              <el-switch v-model="form.is_release" />
+            <el-form-item label="放货" prop="is_release">
+              <el-switch v-model="form.is_release" id="is_release" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -266,7 +268,7 @@ import crud from '@/mixins/crud'
 import deviceCrud from '@/api/acs/device/device'
 
 export default {
-  name: 'StandardInspectSite',
+  name: 'SsxSite',
   mixins: [crud],
   props: {
     parentForm: {
diff --git a/acs/nladmin-ui/src/views/acs/device/index.vue b/acs/nladmin-ui/src/views/acs/device/index.vue
index b1b50c2..59dae18 100644
--- a/acs/nladmin-ui/src/views/acs/device/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/index.vue
@@ -195,7 +195,7 @@ const defaultForm = {
   remark: null
 }
 export default {
-  name: 'Device',
+  name: 'OvenManipulator',
   components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {