bug修复

src/router/index.js

@@ -80,6 +80,7 @@ const routes = [
             meta: { title: 'BME布袋监测', icon: 'collectorList' },
           },
           {
+            name: 'alerts',
             path: '/alerts',
             component: () => import('../views/AboutView/AboutView.vue'),
             meta: { title: '告警总览', icon: 'warnning' },

src/views/AboutView/AboutView.vue

@@ -107,36 +107,45 @@
       :close-on-press-escape="false"
     >
       <div class="equd_body">
-        <span
-          >是否要对<span class="bold">{{ clickItem.name }}</span
-          >不再告警：</span
+        <el-form
+          ref="ruleFormRef"
+          :model="equSubmitInfo"
+          :rules="rules"
+          class="equd_form"
         >
-        <el-form-item>
-          <el-radio-group v-model="equSubmitInfo.noAlarm" @change="onSubmit">
-            <el-radio value="1">是</el-radio>
-            <el-radio value="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="开始时间">
-          <el-date-picker
-            v-model="equSubmitInfo.startTime"
-            type="datetime"
-            placeholder="选择开始时间"
-          />
-        </el-form-item>
-        <el-form-item label="结束时间">
-          <el-date-picker
-            v-model="equSubmitInfo.endTime"
-            type="datetime"
-            placeholder="选择结束时间"
-          />
-        </el-form-item>
+          <span
+            >是否要对<span class="bold">{{ clickItem.name }}</span
+            >不再告警：</span
+          >
+          <el-form-item>
+            <el-radio-group v-model="equSubmitInfo.noAlarm" @change="onSubmit">
+              <el-radio value="1">是</el-radio>
+              <el-radio value="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              v-model="equSubmitInfo.startTime"
+              type="datetime"
+              placeholder="选择开始时间"
+            />
+          </el-form-item>
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker
+              v-model="equSubmitInfo.endTime"
+              type="datetime"
+              placeholder="选择结束时间"
+            />
+          </el-form-item>
+        </el-form>
       </div>
 
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="equDialog = false">取消</el-button>
-          <el-button type="primary" @click="equPending"> 确认 </el-button>
+          <el-button type="primary" @click="equPending(ruleFormRef)">
+            确认
+          </el-button>
         </span>
       </template>
     </el-dialog>
@@ -151,13 +160,15 @@ import { getDataFun, postDataJSON } from "@/request/method.js";
 import moment from "moment";
 
 const router = useRouter();
+const route = useRoute();
+
 const formInline = ref({
   eventName: "",
   name: "",
   dusterName: "",
   deviceType: "",
-  suspendFlag: "2",
-  date: "",
+  suspendFlag: "0",
+  date: [],
 });
 
 const currentPage = ref(1);
@@ -212,6 +223,17 @@ const tableColumns = ref([
   },
 ]);
 
+const ruleFormRef = ref(null);
+const rules = {
+  startTime: [{ required: true, message: "请填写开始时间", trigger: "blur" }],
+  endTime: [
+    {
+      required: true,
+      message: "请填写结束时间",
+    },
+  ],
+};
+
 const tableData = reactive({
   list: [],
 });
@@ -251,7 +273,7 @@ const onReset = () => {
     name: "",
     dusterName: "",
     deviceType: "",
-    suspendFlag: "2",
+    suspendFlag: "0",
     date: [],
   };
   currentPage.value = 1;
@@ -309,7 +331,8 @@ const equSubmitInfo = ref({
   endTime: "",
 });
 
-const equPending = () => {
+const equPending = async (formEl) => {
+  if (!formEl) return;
   const url = "/alarm/suspendDevice";
   const params = {
     id: clickItem.value.id,
@@ -325,15 +348,33 @@ const equPending = () => {
         )
       : "",
   };
-  return getDataFun(url, params).then((res) => {
-    if (res && res.code == 1) {
-      equDialog.value = false;
-      getAlarmList();
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      return getDataFun(url, params).then((res) => {
+        if (res && res.code == 1) {
+          equDialog.value = false;
+          getAlarmList();
+        }
+      });
+    } else {
     }
   });
 };
 
 onMounted(async () => {
+  if (route.query) {
+    const { deviceName, suspendStartTime, suspendEndTime } = route.query;
+    if (deviceName) {
+      formInline.value.dusterName = deviceName;
+    }
+    if (suspendStartTime) {
+      formInline.value.date[0] = suspendStartTime;
+    }
+    if (deviceName) {
+      formInline.value.date[1] = suspendEndTime;
+    }
+  }
+
   getTypeList();
   getAlarmList();
 });
@@ -540,10 +581,12 @@ onBeforeUnmount(() => {});
   }
   .equWarnDialog {
     .equd_body {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
+      .equd_form {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      }
       .bold {
         font-weight: bold;
       }

src/views/collectorList/collectorList.vue

@@ -82,13 +82,13 @@
     <el-dialog
       class="dustListDialog"
       v-model="dustLineisShow"
-      title="仓室数量设置"
+      title="更换周期分析"
       width="1000px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
     >
       <div class="input-group">
-        <span>仓室编号：</span>
+        <span>除尘器名称：</span>
         <el-select
           v-model="selectDustNo"
           @change="changeDust"
@@ -149,12 +149,12 @@ const tableColumns = ref([
   {
     prop: "compart",
     label: "仓室",
-    width: "8%",
+    width: "10%",
   },
   {
     prop: "bagLocation",
     label: "布袋位置（排/列）",
-    width: "8%",
+    width: "6%",
   },
   {
     prop: "bagChangeNextTime",
@@ -169,13 +169,13 @@ const tableColumns = ref([
   {
     prop: "bagChangeAuthor",
     label: "更换人",
-    width: "8%",
-  },
-  {
-    prop: "dusterName",
-    label: "所属除尘器",
-    width: "8%",
+    width: "5%",
   },
+  // {
+  //   prop: "dusterName",
+  //   label: "所属除尘器",
+  //   width: "8%",
+  // },
   {
     prop: "bagChangePeriod",
     label: "更换周期(与上次更换比)",

src/views/equipmentManagement/suspendManagement/suspendManagement.vue

@@ -13,7 +13,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="设备类别">
+          <el-form-item label="设备类型">
             <el-select v-model="formInline.deviceType" style="width: 200px">
               <el-option
                 v-for="i in typeList.list"
@@ -63,10 +63,8 @@
           <template #index="{ $index }">
             {{ getIndex($index) }}
           </template>
-          <template #deviceName="{ row }">
-            <span class="health-score" @dblclick="openDialog(row.deviceName)">{{
-              row.deviceName
-            }}</span>
+          <template #operate="{ row }">
+            <span class="health-score" @click="linkTo(row)">挂起期间告警</span>
           </template>
           <!-- <template #operation="{ row }">
             <span class="view-btn" @click="handleView(row)">详情</span>
@@ -82,7 +80,9 @@
 import { ref, onMounted, onBeforeUnmount, computed, reactive } from "vue";
 import CommonTable from "@/components/commonTable/index.vue";
 import { getDataFun, postDataJSON } from "@/request/method.js";
+import { useRoute, useRouter } from "vue-router";
 
+const router = useRouter();
 const formInline = ref({
   projectId: "",
   deviceType: "",
@@ -98,11 +98,11 @@ const tableColumns = ref([
     label: "序号",
     width: "5%",
   },
-  {
-    prop: "projectName",
-    label: "项目名称",
-    width: "7%",
-  },
+  // {
+  //   prop: "projectName",
+  //   label: "项目名称",
+  //   width: "7%",
+  // },
   {
     prop: "deviceNo",
     label: "设备编号",
@@ -159,7 +159,7 @@ const tableColumns = ref([
     width: "7%",
   },
   {
-    prop: "lastAlarmTime",
+    prop: "operate",
     label: "操作",
     width: "8%",
   },
@@ -267,6 +267,17 @@ const getManagementList = () => {
   });
 };
 
+const linkTo = (item) => {
+  router.push({
+    path: "/alerts",
+    query: {
+      deviceName: item.deviceName,
+      suspendStartTime: item.suspendStartTime,
+      suspendEndTime: item.suspendEndTime,
+    },
+  });
+};
+
 onMounted(async () => {
   getNameList();
   getTypeList();