rev:代码优化

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

@@ -72,8 +72,17 @@
             />
           </el-form-item>
           <el-form-item :label="$t('task.txt_box.time')">
-            <Search />
+            <el-date-picker
+              v-model="query.createTime"
+              type="datetimerange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              align="right"
+              @change="crud.toQuery"
+            />
           </el-form-item>
+          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -163,6 +172,7 @@ import pagination from '@crud/Pagination'
 import crudInstruction from '@/api/acs/instruction/instruction'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
 import { getDicts } from '@/views/system/dict/dict'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
@@ -205,7 +215,7 @@ const defaultForm = {
 export default {
   dicts: ['task_status', 'task_type'],
   name: 'Instruction',
-  components: { pagination, crudOperation, Search },
+  components: { pagination, crudOperation, rrOperation, Search },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({

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

@@ -72,8 +72,17 @@
             />
           </el-form-item>
           <el-form-item :label="$t('task.txt_box.time')">
-            <Search />
+            <el-date-picker
+              v-model="query.createTime"
+              type="datetimerange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              align="right"
+              @change="crud.toQuery"
+            />
           </el-form-item>
+          <rrOperation />
         </el-form>
         <!--        <el-input-->
         <!--          v-if="false"-->
@@ -301,6 +310,7 @@ import crudTask from '@/api/acs/task/task'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
 import deviceCrud from '@/api/acs/device/device'
 import routeCurd from '@/api/acs/route/routePlan'
 import { getDicts } from '@/views/system/dict/dict'
@@ -331,7 +341,7 @@ const defaultForm = {
 }
 export default {
   name: 'Task',
-  components: { pagination, crudOperation, Search },
+  components: { pagination, crudOperation,rrOperation, Search },
   dicts: ['task_status', 'task_type'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {

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

@@ -72,8 +72,17 @@
             />
           </el-form-item>
           <el-form-item :label="$t('task.txt_box.time')">
-            <Search />
+            <el-date-picker
+              v-model="query.createTime"
+              type="datetimerange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              align="right"
+              @change="crud.toQuery"
+            />
           </el-form-item>
+          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -148,6 +157,7 @@ import crudInstruction from '@/api/acs/instruction/instruction'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
 import deviceCrud from '@/api/acs/device/device'
 import routeCurd from '@/api/acs/route/routePlan'
 import { getDicts } from '@/views/system/dict/dict'
@@ -168,7 +178,7 @@ const defaultForm = {
   remark: null }
 export default {
   name: 'Task',
-  components: { pagination, crudOperation, Search },
+  components: { pagination, crudOperation, rrOperation, Search },
   dicts: ['task_status', 'task_type'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {

acs2/nladmin-ui/src/views/lucene/search.vue

@@ -54,12 +54,11 @@
 
     <el-date-picker
       v-model="query.createTime"
-      type="datetimerange"
-      format="yyyy-MM-dd HH:mm:ss"
-      :picker-options="pickerOptions"
-      range-separator="至"
+      type="daterange"
+      value-format="yyyy-MM-dd HH:mm:ss"
       start-placeholder="开始日期"
       end-placeholder="结束日期"
+      :default-time="['00:00:00', '23:59:59']"
       align="right"
     />
     <rrOperation />