Merge branch 'dev' of https://app.bmetech.com/liuzhaohui/dctomproject into dev

src/views/closeManage/myAgency.vue

@@ -46,8 +46,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button class="default-btn" @click="onSearch">查询</el-button>
-        <el-button type="primary"  class="default-btn" @click="onReset">重置</el-button>
+        <el-button class="default-btn" @click="onReset">重置</el-button>
+        <el-button type="primary" class="default-btn" @click="onSearch">查询</el-button>
       </el-form-item>
     </el-form>
     <div class="table-box">
@@ -632,7 +632,6 @@ import moment from 'moment';
 import { getToken } from '@/utils/auth.js';
 import { ElMessage } from 'element-plus'
 import { storeToRefs } from 'pinia'
-
 import { useUsersStore } from "@/pinia/user.js";
 import { useRoute, useRouter } from "vue-router";
 const router = useRouter();
@@ -646,7 +645,16 @@ const formInline = ref({
   warnType: '',
   productionLineId: '',
   deviceType: '',
-  createTime: ['','']
+  createTime: route.query.startTime
+    ? [
+        moment(new Date(route.query.startTime).getTime()).format(
+          "YYYY-MM-DD HH:mm:ss"
+        ),
+        moment(new Date(route.query.endTime).getTime()).format(
+          "YYYY-MM-DD HH:mm:ss"
+        ),
+      ]
+    : ['','']
 });
 
 const workTicketNo = ref('');
@@ -881,8 +889,7 @@ const onReset =()=> {
   formInline.value.productionLineId = '';
   formInline.value.deviceType = '';
   formInline.value.createTime = [
-    moment(new Date().getTime() - 1000 * 60 * 60 * 24).format('YYYY-MM-DD HH:mm:ss'),
-    moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+   '',''
   ]
   searchData();
 }

src/views/closeManage/myDone.vue

@@ -46,8 +46,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button  class="default-btn" @click="onSearch">查询</el-button>
-        <el-button type="primary" class="default-btn" @click="onReset">重置</el-button>
+        <el-button  class="default-btn" @click="onReset">重置</el-button>
+        <el-button type="primary"  class="default-btn" @click="onSearch">查询</el-button>
       </el-form-item>
     </el-form>
     <div class="table-box">
@@ -938,7 +938,7 @@ const onReset =()=> {
   formInline.value.productionLineId = '';
   formInline.value.deviceType = '';
   formInline.value.createTime = [
-    moment(new Date().getTime() - 1000 * 60 * 60 * 24).format('YYYY-MM-DD HH:mm:ss'),
+    moment(new Date().getTime() - 1000 * 60 * 60 * 24 * 30).format('YYYY-MM-DD HH:mm:ss'),
     moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
   ]
   searchData();

src/views/dustOverview/index.vue

@@ -379,6 +379,10 @@ const handleDusterLeakNumClick = () => {
 const handleCloseLoopNumClick = () => {
   router.push({
     path: "/my-loop/myAgency",
+    query: {
+      startTime: moment().subtract(24, 'hours').format("YYYY-MM-DD HH:mm:ss"),
+      endTime: moment().format("YYYY-MM-DD HH:mm:ss"),
+    },
   });
 };