From 85b864f5ccd283c16d86adf51d20e8c83b1b8bf4 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期五, 01 九月 2023 16:54:50 +0800
Subject: [PATCH] 预警信息管理
---
src/types/warning.d.ts | 11 ++++++++++-
src/views/warningManage/warningInfo/index.vue | 15 ++++++++-------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/types/warning.d.ts b/src/types/warning.d.ts
index 7162092..24b5361 100644
--- a/src/types/warning.d.ts
+++ b/src/types/warning.d.ts
@@ -56,6 +56,15 @@
peopleList: Array<TableDataPeople>
}
+
+export interface UsersInfo {
+ id: string;
+ warnLogId: string;
+ warnUserId: string;
+ warnUserName: string;
+ warnUserRealName: string;
+ warnUserPhone: string;
+}
export interface TableDataInfo {
id: string;
content: string;
@@ -68,7 +77,7 @@
handlerTime: string;
status: string;
method?: string;
- gasWarnLogSmsUsers: []
+ gasWarnLogSmsUsers: Array<UsersInfo>
}
export interface InfoDataState {
tableData: {
diff --git a/src/views/warningManage/warningInfo/index.vue b/src/views/warningManage/warningInfo/index.vue
index 4adf885..ef97da0 100644
--- a/src/views/warningManage/warningInfo/index.vue
+++ b/src/views/warningManage/warningInfo/index.vue
@@ -60,11 +60,11 @@
</el-form>
</div>
<el-table :data="state.tableData.data" style="width: 100%">
- <el-table-column align="center" prop="content" label="预警内容"/>
- <el-table-column align="center" prop="warnTime" label="预警时间"/>
+ <el-table-column align="center" prop="content" width="180px" label="预警内容"/>
+ <el-table-column align="center" prop="warnTime" width="115px" label="预警时间"/>
<el-table-column align="center" prop="gasName" label="气体名称"/>
<el-table-column align="center" prop="gasConcentration" label="气体浓度"/>
- <el-table-column align="center" prop="gasThresholdId" label="预警级别" height="100">
+ <el-table-column align="center" prop="gasThresholdId" width="120px" label="预警级别" height="100">
<template #default="scope">
<span class="yellow" v-if="scope.row.gasThresholdId == '1'">黄色预警</span>
<span class="red" v-else-if="scope.row.gasThresholdId == '2'">红色预警</span>
@@ -73,12 +73,12 @@
<el-table-column align="center" prop="gasWarnLogSmsUsers" label="通知人员">
<template #default="scope">
<div v-for="(item, index) in scope.row.gasWarnLogSmsUsers" :key="index">
- {{item.realname}}
+ {{item.warnUserRealName}}
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="handlerRealName" label="处理人"/>
- <el-table-column align="center" prop="handlerTime" label="处理时间"/>
+ <el-table-column align="center" prop="handlerTime" width="115px" label="处理时间"/>
<el-table-column align="center" prop="status" label="处理状态">
<template #default="scope">
<span v-if="scope.row.status == '0'">未处理</span>
@@ -185,8 +185,8 @@
pageIndex: state.tableData.listQuery.pageIndex,
pageSize: state.tableData.listQuery.pageSize,
searchParams: {
- startTime: state.tableData.listQuery.searchParams.time[0],
- endTime: state.tableData.listQuery.searchParams.time[1],
+ startTime: state.tableData.listQuery.searchParams.time ? state.tableData.listQuery.searchParams.time[0] : '',
+ endTime: state.tableData.listQuery.searchParams.time ? state.tableData.listQuery.searchParams.time[1]: '' ,
gasCategoryId: state.tableData.listQuery.searchParams.gas,
status: state.tableData.listQuery.searchParams.status,
gasThresholdId: state.tableData.listQuery.searchParams.level,
@@ -248,6 +248,7 @@
state.tableData.listQuery.searchParams.level = '';
state.tableData.listQuery.searchParams.status = '';
state.tableData.listQuery.searchParams.gas = '';
+ initInfoData();
}
</script>
<style scoped lang="scss">
--
Gitblit v1.9.2