From 34da29d5669c42c17f56ed4da6c20ef3257bb0d6 Mon Sep 17 00:00:00 2001
From: wwp <782568523@qq.com>
Date: Thu, 15 Aug 2024 17:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SafeCampus.WEB/src/views/warn/zjrq/index.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/SafeCampus.WEB/src/views/warn/zjrq/index.vue b/SafeCampus.WEB/src/views/warn/zjrq/index.vue
index 9fd7159..e9d5cff 100644
--- a/SafeCampus.WEB/src/views/warn/zjrq/index.vue
+++ b/SafeCampus.WEB/src/views/warn/zjrq/index.vue
@@ -20,7 +20,7 @@
       label="label"
       id="value"
       :isData="true"
-      width="300px"
+      width="260px"
       :data="warnOptions"
       @change="changeType"
     ></TreeFilter>
@@ -59,7 +59,12 @@
           <s-button link :opt="FormOptEnum.DELETE" @click="onDelete([scope.row.id], `确定删除该预警吗？`)" />
         </template>
       </ProTable>
-      <el-dialog v-model="visible" :title="detailData.alarmTypeDesc + '-' + detailData.tick" width="830px" :before-close="handleClose">
+      <el-dialog
+        v-model="visible"
+        :title="detailData.alarmTypeDesc ? detailData.alarmTypeDesc + '-' + detailData.tick : ''"
+        width="830px"
+        :before-close="handleClose"
+      >
         <div>
           <img class="detailpic" :src="detailData.snapshotUrl" alt="" />
           <el-row :gutter="20">
@@ -281,6 +286,7 @@ const columns: ColumnProps<ZJRQ.WarnInfo>[] = [
   { 
     prop: "tick", 
     label: "预警时间",
+    width: 180,
     search: {
       // 自定义 search 组件
       span: 1,
@@ -340,16 +346,14 @@ function RefreshTable() {
 let detailData = ref({});
 function onDetail(row: any) {
   visible.value = true;
-  setTimeout(async ()=> {
-    await warnZJRQApi.detail({ id: row.id }).then((res:any) => {
+   warnZJRQApi.detail({ id: row.id }).then((res:any) => {
       let { code, data } = res;
     
       if (code == 200) {
         detailData.value = data
-        
       }
     });
-  })
+  
   
 }