From 6c9bf8dda14a8257a920fd21c9127c13dd92214e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 14:17:56 +0800
Subject: [PATCH] bug fix
---
src/views/ecg/room/index.vue | 9 +++++++--
src/views/ecg/room/RoomForm.vue | 11 +++++------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/views/ecg/room/RoomForm.vue b/src/views/ecg/room/RoomForm.vue
index 1dfcfa8..141b9f6 100644
--- a/src/views/ecg/room/RoomForm.vue
+++ b/src/views/ecg/room/RoomForm.vue
@@ -26,15 +26,15 @@
<el-form-item label="妫�鏌ョ被鍨�" prop="checkTypes">
<el-checkbox-group v-model="formData.checkTypes">
- <el-checkbox v-for="checkType in checkTypeStore.getCheckTypeOptions()" :value="checkType.value" :key="checkType.value">{{checkType.label}}</el-checkbox>
+ <el-checkbox v-for="checkTypeVO in checkTypeStore.getCheckTypeOptions()" :value="checkTypeVO.value" :key="checkTypeVO.value">{{checkTypeVO.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="浣滀笟绫诲瀷" prop="opType">
<el-radio-group v-model="formData.opType">
- <el-radio key="0" :label="0"> 妫�鏌� </el-radio>
- <el-radio key="1" :label="1"> 棰嗙敤 </el-radio>
- <el-radio key="2" :label="2"> 瑁呮満 </el-radio>
+ <el-radio :value="0" > 妫�鏌� </el-radio>
+ <el-radio :value="1" > 棰嗙敤 </el-radio>
+ <el-radio :value="2" > 瑁呮満 </el-radio>
</el-radio-group>
</el-form-item>
@@ -47,8 +47,7 @@
</template>
<script setup lang="ts">
import { RoomApi, RoomVO } from '@/api/ecg/room'
-import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
-import {CheckTypeApi} from "@/api/ecg/checktype";
+import {useCheckTypeStore} from "@/store/modules/checkType";
/** 璇婂鍜岃瘖鐤楀簥 琛ㄥ崟 */
defineOptions({ name: 'RoomForm' })
diff --git a/src/views/ecg/room/index.vue b/src/views/ecg/room/index.vue
index fb40856..b7c4590 100644
--- a/src/views/ecg/room/index.vue
+++ b/src/views/ecg/room/index.vue
@@ -70,7 +70,9 @@
<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}}
+ <div v-for="(checkType, subIndex) in scope.row.checkTypes" :key="subIndex">
+ {{checkTypeStore.getCheckTypeName(checkType)}}
+ </div>
</template>
</el-table-column>
<el-table-column
@@ -114,10 +116,11 @@
</template>
<script setup lang="ts">
-import {dateFormatter, dateFormatter2} 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";
/** 璇婂鍜岃瘖鐤楀簥 鍒楄〃 */
defineOptions({ name: 'Room' })
@@ -125,6 +128,8 @@
const message = useMessage() // 娑堟伅寮圭獥
const { t } = useI18n() // 鍥介檯鍖�
+const checkTypeStore = useCheckTypeStore();
+
const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑
const list = ref<RoomVO[]>([]) // 鍒楄〃鐨勬暟鎹�
const total = ref(0) // 鍒楄〃鐨勬�婚〉鏁�
--
Gitblit v1.9.3