opt: 历史任务记录显示起点2终点2,监控大屏2秒刷新

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

@@ -60,6 +60,20 @@
               <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Task_type')">
+            <el-select
+              v-model="query.type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Task_type')"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Origin_or_destination')">
             <el-input
               v-model="query.point_code"
@@ -200,7 +214,7 @@ const defaultForm = {
   update_time: null
 }
 export default {
-  dicts: ['task_status'],
+  dicts: ['task_status', 'task_type'],
   name: 'Instruction',
   components: { pagination, crudOperation, Search },
   mixins: [presenter(), header(), form(defaultForm), crud()],

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

@@ -293,6 +293,8 @@
         <el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" />
         <el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" />
         <el-table-column prop="next_point_code" :label="$t('task.select.Destination')" />
+        <el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))" />
+        <el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))" />
         <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
         <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" />