Merge branch 'feat/layout-style' into 'dev'

feat(*): 除尘器总览添加跳转

See merge request !24

src/views/AboutView/AboutView.vue

@@ -150,6 +150,8 @@ import { useRoute, useRouter } from "vue-router";
 import { getDataFun, postDataJSON } from "@/request/method.js";
 import moment from "moment";
 
+const route = useRoute();
+
 const router = useRouter();
 const formInline = ref({
   eventName: "",
@@ -157,9 +159,20 @@ const formInline = ref({
   dusterName: "",
   deviceType: "",
   suspendFlag: "2",
-  date: "",
+  date: 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 currentPage = ref(1);
 const pageSize = ref(20);
 const equDialog = ref(false);

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 type="primary" class="default-btn" @click="onSearch">搜索</el-button>
+        <el-button  class="default-btn" @click="onReset">重置</el-button>
       </el-form-item>
     </el-form>
     <div class="table-box">

src/views/dustOverview/index.vue

 <template>
   <div class="page-container dust-container">
     <div class="header">
-      <div class="item-box">
+      <div class="item-box crusor-click" @click="handleDusterLeakNumClick">
         <img src="@/assets/icons/warn.png" alt="dust" />
         <div class="title">
           <span>泄漏告警(条)</span>
@@ -17,7 +17,7 @@
         </div>
       </div>
 
-      <div class="item-box">
+      <div class="item-box crusor-click" @click="handleCloseLoopNumClick">
         <img src="@/assets/icons/close.png" alt="dust" />
         <div class="title">
           <span>闭环(条)</span>
@@ -184,7 +184,7 @@ import { ElMessageBox, ElMessage } from "element-plus";
 import RoomSettingDialog from "./components/roomSettingDialog.vue";
 import ValveSettingDialog from "./components/valveSettingDialog.vue";
 import AddDustCollectorDialog from "./components/addDustCollectorDialog.vue";
-
+import moment from "moment";
 const router = useRouter();
 
 const formInline = ref({
@@ -368,6 +368,24 @@ const handleStatusDotClick = (row, colIndex) => {
   });
 };
 
+const handleDusterLeakNumClick = () => {
+  router.push({
+    path: "/alerts",
+    query: {
+      startTime: moment().format("YYYY-MM-DD HH:mm:ss"),
+      endTime: moment().subtract(24, 'hours').format("YYYY-MM-DD HH:mm:ss"),
+    },
+  });
+};
+
+const handleCloseLoopNumClick = () => {
+  router.push({
+    path: "/my-loop/myAgency",
+  });
+};
+
+
+
 // 确认电磁阀设置
 const handleValveSettingConfirm = (updatedStatusData) => {
   const list = updatedStatusData.map((item) => {
@@ -556,6 +574,13 @@ onBeforeUnmount(() => {});
         margin-top: 10px;
       }
     }
+    .crusor-click {
+      cursor: pointer;
+      transition: box-shadow 0.3s ease; // 添加过渡动画
+      &:hover {
+        box-shadow: 0px 1.33px 16px 0px rgba(83, 100, 170, 0.5);
+      }
+    }
   }
   .content-box {
     margin-top: 24px;