From 49206ee0689d44367b9f5de3decf0c3ec02bfb51 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 15 四月 2025 10:56:18 +0800 Subject: [PATCH] update --- src/views/ecg/room/index.vue | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/views/ecg/room/index.vue b/src/views/ecg/room/index.vue index cf58b81..6182195 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,22 @@ <!-- 鍒楄〃 --> <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"> + <div v-for="(checkType, subIndex) in scope.row.checkTypes" :key="subIndex"> + {{getCheckTypeName(checkType)}} + </div> + </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,10 +116,12 @@ </template> <script setup lang="ts"> -import { dateFormatter } from '@/utils/formatTime' +import {dateFormatter2} from '@/utils/formatTime' import download from '@/utils/download' import { RoomApi, RoomVO } from '@/api/ecg/room' import RoomForm from './RoomForm.vue' +import {useCheckTypeStore} from "@/store/modules/checkType"; +import {getCheckTypeName} from "../../../utils/checkTypeFormatter"; /** 璇婂鍜岃瘖鐤楀簥 鍒楄〃 */ defineOptions({ name: 'Room' }) @@ -119,13 +129,15 @@ const message = useMessage() // 娑堟伅寮圭獥 const { t } = useI18n() // 鍥介檯鍖� +const checkTypeStore = useCheckTypeStore(); + const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑 const list = ref<RoomVO[]>([]) // 鍒楄〃鐨勬暟鎹� const total = ref(0) // 鍒楄〃鐨勬�婚〉鏁� const queryParams = reactive({ pageNo: 1, pageSize: 10, - roomNo: undefined, + roomId: undefined, bedNo: undefined, createTime: [] }) -- Gitblit v1.9.3