From b9292e1e2d4ee1b461d7724a9d0f5ca27802ed70 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 15:38:40 +0800
Subject: [PATCH] bug fix
---
src/views/ecg/room/index.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/views/ecg/room/index.vue b/src/views/ecg/room/index.vue
index cf58b81..fb40856 100644
--- a/src/views/ecg/room/index.vue
+++ b/src/views/ecg/room/index.vue
@@ -8,9 +8,9 @@
:inline="true"
label-width="68px"
>
- <el-form-item label="璇婂缂栧彿" prop="roomNo">
+ <el-form-item label="璇婂缂栧彿" prop="roomId">
<el-input
- v-model="queryParams.roomNo"
+ v-model="queryParams.roomId"
placeholder="璇疯緭鍏ヨ瘖瀹ょ紪鍙�"
clearable
@keyup.enter="handleQuery"
@@ -64,14 +64,20 @@
<!-- 鍒楄〃 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
- <el-table-column label="璇婂缂栧彿" align="center" prop="roomNo" />
+ <el-table-column label="璇婂缂栧彿" align="center" prop="roomId" />
+ <el-table-column label="璇婂鍚嶇О" align="center" prop="roomName" />
<el-table-column label="璇婄枟搴婄紪鍙�" align="center" prop="bedNo" />
+ <el-table-column label="璇婂IP" align="center" prop="ip" />
+ <el-table-column label="妫�鏌ョ被鍨�" align="center" prop="checkTypes" width="180px">
+ <template #default="scope">
+ {{scope.row.checkTypes}}
+ </template>
+ </el-table-column>
<el-table-column
label="鍒涘缓鏃堕棿"
align="center"
prop="createTime"
- :formatter="dateFormatter"
- width="180px"
+ :formatter="dateFormatter2"
/>
<el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template #default="scope">
@@ -108,7 +114,7 @@
</template>
<script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
+import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download'
import { RoomApi, RoomVO } from '@/api/ecg/room'
import RoomForm from './RoomForm.vue'
@@ -125,7 +131,7 @@
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
- roomNo: undefined,
+ roomId: undefined,
bedNo: undefined,
createTime: []
})
--
Gitblit v1.9.3