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

src/views/AboutView/AboutView.vue

@@ -167,7 +167,7 @@ const formInline = ref({
   name: "",
   dusterName: "",
   deviceType: "",
-  suspendFlag: "2",
+  suspendFlag: "0",
   date: route.query.startTime
     ? [
         moment(new Date(route.query.startTime).getTime()).format(
@@ -372,9 +372,10 @@ const equPending = async (formEl) => {
 
 onMounted(async () => {
   if (route.query) {
-    const { deviceName, suspendStartTime, suspendEndTime } = route.query;
+    const { deviceName, suspendStartTime, suspendEndTime, suspendFlag } =
+      route.query;
     if (deviceName) {
-      formInline.value.dusterName = deviceName;
+      formInline.value.name = deviceName;
     }
     if (suspendStartTime) {
       formInline.value.date[0] = suspendStartTime;
@@ -382,6 +383,9 @@ onMounted(async () => {
     if (suspendEndTime) {
       formInline.value.date[1] = suspendEndTime;
     }
+    if (suspendFlag) {
+      formInline.value.suspendFlag = suspendFlag;
+    }
   }
 
   getTypeList();

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('');
@@ -727,6 +735,7 @@ const saveBag = ()=>{
          message: '更换布袋成功'
        });
        bagDialog.value.show = false;
+       searchData();
       }
    });
 }
@@ -881,8 +890,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();
 }
@@ -1075,7 +1083,7 @@ const searchData =()=> {
 }
 
 const getTableData = ()=> {
-  let keyWord = formInline.value.keyword?.replace(/#/g, '%23');
+  let keyWord = formInline.value.keyword;
   const params = {
     eventName: formInline.value.eventName,
     warnType: formInline.value.warnType,

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();
@@ -1130,7 +1130,7 @@ const searchData = ()=>{
 const total = ref(0);
 
 const getTableData = ()=> {
-  let keyWord = formInline.value.keyword?.replace(/#/g, '%23');
+  let keyWord = formInline.value.keyword;
   const params = {
     eventName: formInline.value.eventName,
     warnType: formInline.value.warnType,

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"),
+    },
   });
 };
 

src/views/equipmentManagement/suspendManagement/suspendManagement.vue

@@ -274,6 +274,7 @@ const linkTo = (item) => {
       deviceName: item.deviceName,
       suspendStartTime: item.suspendStartTime,
       suspendEndTime: item.suspendEndTime,
+      suspendFlag: "1",
     },
   });
 };