rev：五期现场测试优化

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

@@ -46,12 +46,12 @@
 
     <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" :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-form-item label="外部系统IP" label-width="150px">
               <el-input v-model="form.address" />
             </el-form-item>
           </el-col>

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

@@ -46,15 +46,32 @@
 
     <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" :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-form-item label="外部系统IP" label-width="150px">
               <el-input v-model="form.address" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="外部系统" label-width="150px">
+              <el-select
+                v-model="form.ext_system"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in extSystemList"
+                  :key="item.label"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -286,6 +303,7 @@ export default {
       dataOpcservers: [],
       dataOpcPlcs: [],
       deviceList: [],
+      extSystemList: [{'label': 'WMS交互', 'value': '1' }, { 'label': 'MES点', 'value': '2' }, { 'label': '焊接线交互', 'value': '3' }],
       data1: [],
       data2: [],
       form: {
@@ -298,7 +316,8 @@ export default {
         is_pickup: true,
         is_release: true,
         link_device_code: [],
-        address: ''
+        address: '',
+        ext_system: ''
       },
       rules: {}
     }

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

@@ -34,9 +34,12 @@
           <el-form-item label="层" prop="z">
             <el-input v-model="form.z" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="AGV编码">
+          <el-form-item label="取货AGV编码">
             <el-input v-model="form.address" style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="放货AGV编码">
+            <el-input v-model="form.address1" style="width: 370px;" />
+          </el-form-item>
           <el-form-item label="父级系统编码" prop="parent_storage_code">
             <el-input v-model="form.parent_storage_code" style="width: 370px;" />
           </el-form-item>
@@ -56,7 +59,8 @@
         <el-table-column prop="x" label="排" />
         <el-table-column prop="y" label="列" />
         <el-table-column prop="z" label="层" />
-        <el-table-column prop="address" label="地址" />
+        <el-table-column prop="address" label="取货地址" />
+        <el-table-column prop="address1" label="卸货地址" />
         <el-table-column prop="create_by" label="创建者" />
         <el-table-column prop="create_time" label="创建时间" />
         <el-table-column prop="parent_storage_code" label="父级系统编码" />
@@ -83,7 +87,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
 
-const defaultForm = { storage_id: null, storage_code: null, x: null, y: null, z: null, address: null, remark: null, is_active: null, is_delete: null, create_by: null, create_time: null, update_by: null, update_time: null, parent_storage_code: null }
+const defaultForm = { storage_id: null, storage_code: null, x: null, y: null, z: null, address: null, address1: null, remark: null, is_active: null, is_delete: null, create_by: null, create_time: null, update_by: null, update_time: null, parent_storage_code: null }
 export default {
   name: 'StorageCell',
   components: { pagination, crudOperation, udOperation, rrOperation },

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

@@ -0,0 +1,198 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input
+          v-model="query.blurry"
+          size="small"
+          clearable
+          placeholder="输入名称或者编码"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <rrOperation />
+      </div>
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="任务类型" prop="task_type">
+            <el-select v-model="form.task_type"   style="width: 370px;">
+              <el-option
+                v-for="item in dict.task_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="起点1" prop="point_code1">
+            <el-select
+              v-model="form.point_code1"
+              style="width: 370px;"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_code"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="终点1" prop="point_code2">
+            <el-select
+              v-model="form.point_code2"
+              style="width: 370px;"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_code"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="起点2" prop="point_code3">
+            <el-select
+              v-model="form.point_code3"
+              style="width: 370px;"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_code"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="终点2" prop="point_code4">
+            <el-select
+              v-model="form.point_code4"
+              style="width: 370px;"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_code"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input v-model="form.remark" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="task_type" label="任务类型" >
+          <template slot-scope="scope">
+            {{ dict.label.task_type[scope.row.task_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="point_code1" label="起点1" />
+        <el-table-column prop="point_code2" label="终点1" />
+        <el-table-column prop="point_code3" label="起点2" />
+        <el-table-column prop="point_code4" label="终点2" />
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column v-permission="['admin','TaskConfig:edit','TaskConfig:del']" label="操作" width="150px" align="center">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudTaskConfig from '@/api/acs/TaskConfig'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import deviceCrud from '@/api/acs/device/device'
+
+const defaultForm = { task_config_id: null, task_type: null, point_code1: null, point_code2: null, point_code3: null, point_code4: null, remark: null, create_by: null, create_time: null, update_by: null, update_time: null, is_delete: null }
+export default {
+  name: 'TaskConfig',
+  // eslint-disable-next-line vue/no-unused-components
+  dicts: ['task_type'],
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({ title: '任务配置', url: 'api/TaskConfig', idField: 'task_config_id', sort: 'task_config_id,desc', crudMethod: { ...crudTaskConfig }})
+  },
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'TaskConfig:add'],
+        edit: ['admin', 'TaskConfig:edit'],
+        del: ['admin', 'TaskConfig:del']
+      },
+      isDisabled: false,
+      deviceList: [],
+      rules: {
+        methods_id: [
+          { required: true, message: '方法标识不能为空', trigger: 'blur' }
+        ],
+        task_type: [
+          { required: true, message: '任务类型不能为空', trigger: 'blur' }
+        ],
+        point_code1: [
+          { required: true, message: '起点1不能为空', trigger: 'blur' }
+        ],
+        point_code2: [
+          { required: true, message: '终点1不能为空', trigger: 'blur' }
+        ],
+        create_by: [
+          { required: true, message: '创建人不能为空', trigger: 'blur' }
+        ],
+        create_time: [
+          { required: true, message: '创建时间不能为空', trigger: 'blur' }
+        ],
+        is_delete: [
+          { required: true, message: '是否删除不能为空', trigger: 'blur' }
+        ]
+      }}
+  },
+  created() {
+    deviceCrud.selectDeviceList().then(data => {
+      this.deviceList = data
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>