rev:输送线、OPC页面调整

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

@@ -1,21 +1,19 @@
 <template>
   <!--标准版-输送机-->
-  <div class="belt-conveyor-page">
+  <div>
-    <el-card class="box-card config-card" shadow="never">
+    <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="100px" class="protocol-form">
+      <el-row>
-        <el-row :gutter="20">
         <el-col :span="12">
-            <el-form-item label="OpcServer" class="protocol-item">
+          OpcServer:
           <el-select
             v-model="opc_id"
             placeholder="无"
             clearable
             filterable
-                class="full-width-select"
             @change="changeOpc"
           >
             <el-option
@@ -25,16 +23,13 @@
               :value="item.opc_id"
             />
           </el-select>
-            </el-form-item>
         </el-col>
         <el-col :span="12">
-            <el-form-item label="PLC" class="protocol-item">
+          PLC:
           <el-select
             v-model="plc_id"
             placeholder="无"
             clearable
-                filterable
-                class="full-width-select"
             @change="changePlc"
           >
             <el-option
@@ -44,66 +39,69 @@
               :value="item.plc_id"
             />
           </el-select>
-            </el-form-item>
         </el-col>
       </el-row>
-      </el-form>
     </el-card>
 
-    <el-card class="box-card config-card" shadow="never">
+    <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
-        <span class="role-span">开关：</span>
+        <span class="role-span">指令相关：</span>
       </div>
-      <el-form ref="form" class="config-form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
-        <el-row :gutter="20" class="form-grid">
+        <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item label="关联设备" prop="device_code">
+              <el-select
+                v-model="form.link_device_code"
+                filterable
+                multiple
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_code"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </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>
           </el-col>
-          <el-col :span="12">
+          <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-row :gutter="20" class="form-grid">
-          <el-col :span="12">
-            <el-form-item label="双向点位" label-width="150px">
-              <el-switch v-model="form.isTwoWayPoint" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="创建指令" label-width="150px">
-              <el-switch v-model="form.isCreateInst" />
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
     </el-card>
 
-    <el-card class="box-card config-card" shadow="never">
+    <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
         <span class="role-span">输送系统：</span>
       </div>
-      <el-form ref="form" class="config-form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
-        <el-row :gutter="20" class="form-grid">
+        <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="电气调度号" label-width="150px">
               <el-input v-model="form.address" />
             </el-form-item>
           </el-col>
-          <el-col :span="12" />
         </el-row>
       </el-form>
     </el-card>
 
-    <el-card class="box-card config-card" shadow="never">
+    <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
         <span class="role-span">指令相关：</span>
       </div>
-      <el-form ref="form" class="config-form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
-        <el-row :gutter="20" class="form-grid">
+        <el-row>
           <el-col :span="12">
             <el-form-item label="排：" label-width="150px" prop="x">
               <el-input v-model.number="form.x" />
@@ -115,67 +113,28 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20" class="form-grid">
+        <el-row>
           <el-col :span="12">
-            <el-form-item label="层：" label-width="150px" prop="y">
+            <el-form-item label="层：" label-width="150px" prop="yY">
               <el-input v-model.number="form.y" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="目标设备：" prop="targetDeviceCode" label-width="150px">
-              <el-select
-                v-model="form.targetDeviceCode"
-                filterable
-                clearable
-                multiple
-                reserve-keyword
-                placeholder="请选择目标点位"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="关联设备:" prop="device_code" label-width="150px">
-              <el-select
-                v-model="form.link_device_code"
-                filterable
-                multiple
-                clearable
-                placeholder="请选择"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for="item in deviceList"
-                  :key="item.device_code"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
     </el-card>
 
-    <el-card class="box-card config-card" shadow="never">
+    <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
         <span class="role-span">AGV相关：</span>
       </div>
-      <el-form ref="form" class="config-form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
-        <el-row :gutter="20" class="form-grid">
+        <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="取货">
               <el-switch v-model="form.is_pickup" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="放货">
               <el-switch v-model="form.is_release" />
             </el-form-item>
@@ -184,11 +143,11 @@
       </el-form>
     </el-card>
 
-    <el-card class="box-card config-card" shadow="never">
+    <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
         <span class="role-span">PLC读取字段：</span>
       </div>
-      <el-form ref="form" class="config-form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
         <el-table
           v-loading="false"
           :data="data1"
@@ -221,11 +180,11 @@
       </el-form>
     </el-card>
 
-    <el-card class="box-card config-card" shadow="never">
+    <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
         <span class="role-span">PLC写入字段：</span>
       </div>
-      <el-form ref="form" class="config-form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
         <el-table
           v-loading="false"
           :data="data2"
@@ -266,20 +225,21 @@
       </el-form>
     </el-card>
 
-    <el-card class="box-card action-card" shadow="never">
+    <el-card class="box-card" shadow="never">
-      <div class="action-bar">
+      <div slot="header" class="clearfix">
-        <div />
+        <span class="role-span" />
         <el-button
           :loading="false"
           icon="el-icon-check"
-          size="small"
+          size="mini"
+          style="float: right; padding: 6px 9px"
           type="primary"
-          class="save-button"
           @click="doSubmit"
         >保存
         </el-button>
       </div>
     </el-card>
+
   </div>
 </template>
 
@@ -325,19 +285,13 @@ export default {
         inspect_in_stocck: true,
         ignore_pickup_check: false,
         ignore_release_check: true,
-        targetDeviceCode: null,
+        apply_task: true,
-        apply_task: false,
         link_three_lamp: '',
         manual_create_task: true,
         is_pickup: true,
         is_release: true,
         link_device_code: [],
-        checkoutStartDeviceCode: null,
+        ship_device_update: true
-        ship_device_update: true,
-        isTwoWayPoint: false,
-        isCreateInst: false,
-        cacheDeviceCode: null,
-        maxInstNum: null
       },
       rules: {}
     }
@@ -644,81 +598,4 @@ export default {
 </script>
 
 <style scoped>
-.belt-conveyor-page {
-  padding-bottom: 8px;
-}
-
-.config-card {
-  margin-bottom: 16px;
-  border-radius: 14px;
-  border: 1px solid #e8edf5;
-  overflow: hidden;
-}
-
-.config-card /deep/ .el-card__header {
-  padding: 16px 20px;
-  background: linear-gradient(180deg, #fbfcfe 0%, #f4f7fb 100%);
-  border-bottom: 1px solid #eef2f7;
-}
-
-.config-card /deep/ .el-card__body {
-  padding: 20px;
-}
-
-.protocol-form {
-  margin-bottom: -8px;
-}
-
-.protocol-item /deep/ .el-form-item__content {
-  width: calc(100% - 100px);
-}
-
-.full-width-select {
-  width: 100%;
-}
-
-.action-card {
-  border-radius: 14px;
-  border: 1px solid #dbe7ff;
-  background: linear-gradient(135deg, #f7fbff 0%, #eef5ff 100%);
-}
-
-.action-card /deep/ .el-card__body {
-  padding: 18px 20px;
-}
-
-.action-bar {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 20px;
-}
-
-.action-title {
-  color: #1d2a3a;
-  font-size: 15px;
-  font-weight: 600;
-  line-height: 22px;
-}
-
-.action-desc {
-  margin-top: 4px;
-  color: #6f7c91;
-  font-size: 12px;
-  line-height: 18px;
-}
-
-.save-button {
-  min-width: 88px;
-  height: 36px;
-  padding: 0 20px;
-  border-radius: 18px;
-}
-
-@media (max-width: 768px) {
-  .action-bar {
-    flex-direction: column;
-    align-items: flex-start;
-  }
-}
 </style>

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

@@ -43,42 +43,6 @@
       </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="6">
-            <el-form-item label="忽略工作模式校验" label-width="150px">
-              <el-switch v-model="form.ignore_pickup_check" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="放货校验" label-width="150px">
-              <el-switch v-model="form.ignore_release_check" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请任务" label-width="150px">
-              <el-switch v-model="form.apply_task" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="双向点位" label-width="150px">
-              <el-switch v-model="form.isTwoWayPoint" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="创建指令" label-width="150px">
-              <el-switch v-model="form.isCreateInst" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-card>
 
     <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
@@ -118,97 +82,6 @@
               <el-input v-model.number="form.y" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="目标设备：" prop="targetDeviceCode" label-width="150px">
-              <el-select
-                v-model="form.targetDeviceCode"
-                filterable
-                clearable
-                multiple
-                reserve-keyword
-                placeholder="请选择目标点位"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="关联设备:" prop="device_code" label-width="150px">
-              <el-select
-                v-model="form.link_device_code"
-                filterable
-                multiple
-                clearable
-                placeholder="请选择"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for="item in deviceList"
-                  :key="item.device_code"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="禁止起点：" prop="checkoutStartDeviceCode" label-width="100px">
-              <el-select
-                v-model="form.checkoutStartDeviceCode"
-                filterable
-                clearable
-                multiple
-                reserve-keyword
-                placeholder="出库禁止的起点"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="关联指令终点：" prop="cacheDeviceCode" label-width="150px">
-              <el-select
-                v-model="form.cacheDeviceCode"
-                filterable
-                clearable
-                reserve-keyword
-                placeholder="要查询的指令终点"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="最大指令数量:" label-width="150px">
-              <el-input
-                v-model.number="form.maxInstNum"
-                type="number"
-                :min="1"
-                :step="1"
-              />
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -375,19 +248,13 @@ export default {
         inspect_in_stocck: true,
         ignore_pickup_check: true,
         ignore_release_check: true,
-        apply_task: false,
+        apply_task: true,
         link_three_lamp: '',
         manual_create_task: true,
-        targetDeviceCode: null,
-        checkoutStartDeviceCode: null,
         is_pickup: true,
         is_release: true,
         link_device_code: [],
-        ship_device_update: true,
+        ship_device_update: true
-        isTwoWayPoint: false,
-        isCreateInst: false,
-        cacheDeviceCode: null,
-        maxInstNum: null
       },
       rules: {}
     }

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

@@ -44,43 +44,6 @@
 
     </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="6">
-            <el-form-item label="忽略工作模式校验" label-width="150px">
-              <el-switch v-model="form.ignore_pickup_check" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="放货校验" label-width="150px">
-              <el-switch v-model="form.ignore_release_check" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请任务" label-width="150px">
-              <el-switch v-model="form.apply_task" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="双向点位" label-width="150px">
-              <el-switch v-model="form.isTwoWayPoint" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="创建指令" label-width="150px">
-              <el-switch v-model="form.isCreateInst" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-card>
-
     <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
         <span class="role-span">输送系统：</span>
@@ -119,97 +82,6 @@
               <el-input v-model.number="form.y" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="目标设备：" prop="targetDeviceCode" label-width="150px">
-              <el-select
-                v-model="form.targetDeviceCode"
-                filterable
-                clearable
-                multiple
-                reserve-keyword
-                placeholder="请选择目标点位"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="关联设备:" prop="device_code" label-width="150px">
-              <el-select
-                v-model="form.link_device_code"
-                filterable
-                multiple
-                clearable
-                placeholder="请选择"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for="item in deviceList"
-                  :key="item.device_code"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="禁止起点：" prop="checkoutStartDeviceCode" label-width="100px">
-              <el-select
-                v-model="form.checkoutStartDeviceCode"
-                filterable
-                clearable
-                multiple
-                reserve-keyword
-                placeholder="出库禁止的起点"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="关联指令终点：" prop="cacheDeviceCode" label-width="150px">
-              <el-select
-                v-model="form.cacheDeviceCode"
-                filterable
-                clearable
-                reserve-keyword
-                placeholder="要查询的指令终点"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="最大指令数量:" label-width="150px">
-              <el-input
-                v-model.number="form.maxInstNum"
-                type="number"
-                :min="1"
-                :step="1"
-              />
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -382,13 +254,7 @@ export default {
         is_pickup: true,
         is_release: true,
         link_device_code: [],
-        ship_device_update: true,
+        ship_device_update: true
-        checkoutStartDeviceCode: null,
-        isTwoWayPoint: false,
-        isCreateInst: false,
-        targetDeviceCode: null,
-        cacheDeviceCode: null,
-        maxInstNum: null
       },
       rules: {}
     }

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

@@ -43,42 +43,7 @@
       </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="6">
-            <el-form-item label="忽略工作模式校验" label-width="150px">
-              <el-switch v-model="form.ignore_pickup_check" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="放货校验" label-width="150px">
-              <el-switch v-model="form.ignore_release_check" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请任务" label-width="150px">
-              <el-switch v-model="form.apply_task" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="双向点位" label-width="150px">
-              <el-switch v-model="form.isTwoWayPoint" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="创建指令" label-width="150px">
-              <el-switch v-model="form.isCreateInst" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-card>
     <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
         <span class="role-span">输送系统：</span>
@@ -117,97 +82,6 @@
               <el-input v-model.number="form.y" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="目标设备：" prop="targetDeviceCode" label-width="150px">
-              <el-select
-                v-model="form.targetDeviceCode"
-                filterable
-                clearable
-                multiple
-                reserve-keyword
-                placeholder="请选择目标点位"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="关联设备:" prop="device_code" label-width="150px">
-              <el-select
-                v-model="form.link_device_code"
-                filterable
-                multiple
-                clearable
-                placeholder="请选择"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for="item in deviceList"
-                  :key="item.device_code"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="禁止起点：" prop="checkoutStartDeviceCode" label-width="100px">
-              <el-select
-                v-model="form.checkoutStartDeviceCode"
-                filterable
-                clearable
-                multiple
-                reserve-keyword
-                placeholder="出库禁止的起点"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="关联指令终点：" prop="cacheDeviceCode" label-width="150px">
-              <el-select
-                v-model="form.cacheDeviceCode"
-                filterable
-                clearable
-                reserve-keyword
-                placeholder="要查询的指令终点"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="最大指令数量:" label-width="150px">
-              <el-input
-                v-model.number="form.maxInstNum"
-                type="number"
-                :min="1"
-                :step="1"
-              />
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -380,13 +254,7 @@ export default {
         is_pickup: true,
         is_release: true,
         link_device_code: [],
-        checkoutStartDeviceCode: null,
+        ship_device_update: true
-        ship_device_update: true,
-        isTwoWayPoint: false,
-        isCreateInst: false,
-        targetDeviceCode: null,
-        cacheDeviceCode: null,
-        maxInstNum: null
       },
       rules: {}
     }

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

@@ -43,42 +43,6 @@
       </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="6">
-            <el-form-item label="忽略工作模式校验" label-width="150px">
-              <el-switch v-model="form.ignore_pickup_check" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="放货校验" label-width="150px">
-              <el-switch v-model="form.ignore_release_check" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请任务" label-width="150px">
-              <el-switch v-model="form.apply_task" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="双向点位" label-width="150px">
-              <el-switch v-model="form.isTwoWayPoint" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="创建指令" label-width="150px">
-              <el-switch v-model="form.isCreateInst" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-card>
 
     <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
@@ -118,66 +82,6 @@
               <el-input v-model.number="form.y" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="目标设备：" prop="targetDeviceCode" label-width="150px">
-              <el-select
-                v-model="form.targetDeviceCode"
-                filterable
-                clearable
-                multiple
-                reserve-keyword
-                placeholder="请选择目标点位"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="关联设备:" prop="device_code" label-width="150px">
-              <el-select
-                v-model="form.link_device_code"
-                filterable
-                multiple
-                clearable
-                placeholder="请选择"
-                style="width: 170px"
-              >
-                <el-option
-                  v-for="item in deviceList"
-                  :key="item.device_code"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="禁止起点：" prop="checkoutStartDeviceCode" label-width="100px">
-              <el-select
-                v-model="form.checkoutStartDeviceCode"
-                filterable
-                clearable
-                multiple
-                reserve-keyword
-                placeholder="出库禁止的起点"
-              >
-                <el-option
-                  v-for=" item in deviceList"
-                  :key="item.device_id"
-                  :label="item.device_name"
-                  :value="item.device_code"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -350,11 +254,7 @@ export default {
         is_pickup: true,
         is_release: true,
         link_device_code: [],
-        checkoutStartDeviceCode: null,
+        ship_device_update: true
-        ship_device_update: true,
-        isTwoWayPoint: false,
-        isCreateInst: false,
-        targetDeviceCode: null
       },
       rules: {}
     }

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

@@ -108,8 +108,8 @@
         style="width: 100%"
         row-key="opc_id"
         border
-        default-expand-all
+        :default-expand-all="true"
-        :tree-props="{children: 'children', has_children: 'has_children'}"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         @select="crud.selectChange"
         @select-all="crud.selectAllChange"
         @selection-change="crud.selectionChangeHandler"
@@ -232,6 +232,25 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    [CRUD.HOOK.afterRefresh]() {
+      this.crud.data = this.processTreeData(this.crud.data)
+    },
+    processTreeData(data) {
+      if (!data || !Array.isArray(data)) return data
+      return data.map(item => {
+        if (item.hasOwnProperty('hasChildren')) {
+          item.hasChildren = item.hasChildren === '1' || item.hasChildren === 1 || item.hasChildren === true
+        } else if (item.children && item.children.length > 0) {
+          item.hasChildren = true
+        } else {
+          item.hasChildren = false
+        }
+        if (item.children && Array.isArray(item.children)) {
+          item.children = this.processTreeData(item.children)
+        }
+        return item
+      })
+    },
     handleClick(row, flag) {
       // flag为0是新增，flag为1是编辑，flag为2是删除
       // 如果是父类操作