add:新增字段展示以及优化监控信息展示

acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue

@@ -32,6 +32,17 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Vehicle_number2')">
+            <el-input
+              v-model="query.vehicle_code2"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Vehicle2_registration_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Material_type')">
             <el-select
               v-model="query.material_type"
@@ -149,6 +160,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
+        <el-table-column prop="vehicle_code2" :label="$t('task.txt_box.Vehicle_number2')" :min-width="flexWidth('vehicle_code2',crud.data,$t('task.txt_box.Vehicle_number2'))" />
         <el-table-column prop="instruction_status" :label="$t('TaskRecord.table.Instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('TaskRecord.table.Instruction_status'))">
           <template slot-scope="scope">
             <span v-if="scope.row.instruction_status=='0' ">{{ $t('task.select.Ready') }}</span>
@@ -299,6 +311,7 @@ export default {
       const params = {
         code: this.query.task_code,
         vehicle_code: this.query.vehicle_code,
+        vehicle_code2: this.query.vehicle_code2,
         material_type: this.query.material_type,
         status: this.query.status,
         point_code: this.crud.pointCode,

acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue

@@ -32,6 +32,17 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Vehicle_number2')">
+            <el-input
+              v-model="query.vehicle_code2"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Vehicle2_registration_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Material_type')">
             <el-select
               v-model="query.material_type"
@@ -277,8 +288,8 @@
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))" />
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
+        <el-table-column prop="vehicle_code2" :label="$t('task.txt_box.Vehicle_number2')" />
         <el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
-          debugger
           <template slot-scope="scope">
             <span v-if="scope.row.class_type!=null && scope.row.class_type.length===2 ">{{ dict.label.task_type[scope.row.class_type] }}</span>
             <span v-else>{{ dict.label.task_type[scope.row.task_type] }}</span>
@@ -327,6 +338,7 @@ import { downloadFile } from '@/utils'
 const defaultForm = {
   task_id: null,
   vehicle_code: null,
+  vehicle_code2: null,
   vehicle_type: null,
   task_type: null,
   class_type: null,
@@ -493,6 +505,7 @@ export default {
       const params = {
         task_code: this.query.task_code,
         vehicle_code: this.query.vehicle_code,
+        vehicle_code2: this.query.vehicle_code2,
         material_type: this.query.material_type,
         status: this.query.status,
         point_code: this.crud.pointCode,

acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue

@@ -32,6 +32,17 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Vehicle_number2')">
+            <el-input
+              v-model="query.vehicle_code2"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Vehicle2_registration_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Material_type')">
             <el-select
               v-model="query.material_type"
@@ -123,6 +134,7 @@
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" :label="$t('TaskRecord.table.Task_number')" :min-width="flexWidth('task_code',crud.data,$t('TaskRecord.table.Task_number'))" />
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
+        <el-table-column prop="vehicle_code2" :label="$t('task.txt_box.Vehicle_number2')" :min-width="flexWidth('vehicle_code2',crud.data,$t('task.txt_box.Vehicle_number2'))" />
         <el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
           <template slot-scope="scope">
             <span v-if="scope.row.class_type!=null && scope.row.class_type.length===2">{{ dict.label.task_type[scope.row.class_type] }}</span>
@@ -182,6 +194,7 @@ import { downloadFile } from '@/utils'
 const defaultForm = {
   task_id: null,
   vehicle_code: null,
+  vehicle_code2: null,
   vehicle_type: null,
   task_type: null,
   task_status: null,
@@ -262,6 +275,7 @@ export default {
       const params = {
         task_code: this.query.task_code,
         vehicle_code: this.query.vehicle_code,
+        vehicle_code2: this.query.vehicle_code2,
         material_type: this.query.material_type,
         status: this.query.is_over,
         point_code: this.crud.pointCode,

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

@@ -32,6 +32,17 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item :label="$t('Inst.table.vehicle_code2')">
+            <el-input
+              v-model="query.vehicle_code2"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Vehicle2_registration_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item :label="$t('Inst.table.material')">
             <el-select
               v-model="query.material_type"
@@ -159,6 +170,7 @@
         <!--        <el-table-column prop="link_num" label="关联编号" />-->
         <el-table-column prop="task_code" :label="$t('Inst.table.task_code')" :min-width="flexWidth('task_code',crud.data,$t('Inst.table.task_code'))" />
         <el-table-column prop="vehicle_code" :label="$t('Inst.table.vehicle_code')" :min-width="flexWidth('vehicle_code',crud.data,$t('Inst.table.vehicle_code'))" />
+        <el-table-column prop="vehicle_code2" :label="$t('Inst.table.vehicle_code2')" :min-width="flexWidth('vehicle_code2',crud.data,$t('Inst.table.vehicle_code2'))" />
         <el-table-column prop="instruction_status" :label="$t('Inst.table.instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('Inst.table.instruction_status'))">
           <template slot-scope="scope">
             <span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span>
@@ -235,6 +247,8 @@ const defaultForm = {
   instruction_id: null,
   task_id: null,
   instruction_code: null,
+  vehicle_code: null,
+  vehicle_code2: null,
   execute_device_code: null,
   execute_status: null,
   execute_status_description: null,

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

@@ -46,6 +46,17 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Vehicle_number2')">
+            <el-input
+              v-model="query.vehicle_code2"
+              size="small"
+              clearable
+              :placeholder="$t('task.txt_box.Vehicle2_registration_number')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Material_type')">
             <el-select
               v-model="query.material_type"
@@ -546,6 +557,9 @@
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')"
                          :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))"
         />
+        <el-table-column prop="vehicle_code2" :label="$t('task.txt_box.Vehicle_number2')"
+                         :min-width="flexWidth('vehicle_code2',crud.data,$t('task.txt_box.Vehicle_number2'))"
+        />
         <el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" width="150px">
           <template slot-scope="scope">
             <span v-if="scope.row.task_status==='0' ">{{ $t('task.select.Ready') }}</span>
@@ -724,6 +738,7 @@ export default {
       form: {
         task_id: null,
         vehicle_code: null,
+        vehicle_code2: null,
         vehicle_type: null,
         task_type: '1',
         storage_task_type: '',