From e456f20e2d54f542800580c489f36c0b5eaf734f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 29 八月 2024 17:33:29 +0800
Subject: [PATCH] update
---
src/views/ecg/room/RoomLoginSelect.vue | 8 ++++----
src/api/ecg/room/index.ts | 6 +++++-
src/views/ecg/room/RoomStatusSetting.vue | 10 ++++++++--
src/views/ecg/doctor/index.vue | 8 ++++----
src/views/ecg/queue/QueueForm.vue | 8 ++++----
src/components/RoomStatus/src/RoomStatus.vue | 6 +++---
src/views/ecg/queue/index.vue | 10 +++++-----
src/api/ecg/queue/index.ts | 2 +-
8 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/api/ecg/queue/index.ts b/src/api/ecg/queue/index.ts
index 66ab1c1..f9cc24f 100644
--- a/src/api/ecg/queue/index.ts
+++ b/src/api/ecg/queue/index.ts
@@ -19,7 +19,7 @@
}
// 鎺掗槦 API
-export const queueApi = {
+export const QueueApi = {
// 鏌ヨ鎺掗槦鍒嗛〉
getqueuePage: async (params: any) => {
return await request.get({ url: `/ecg/queue/page`, params })
diff --git a/src/api/ecg/room/index.ts b/src/api/ecg/room/index.ts
index 32fdc98..bccbf38 100644
--- a/src/api/ecg/room/index.ts
+++ b/src/api/ecg/room/index.ts
@@ -53,9 +53,13 @@
return await request.get({ url: `/clinic/room/list-simple-room` })
},
-
// 鑾峰彇璇婂簥Map
getAllBedMap: async () => {
return await request.get({ url: `/clinic/room/list-all-bed` })
+ },
+
+ //
+ resetRoom: async () => {
+ return await request.get({ url: `/clinic/room/reset-room` })
}
}
diff --git a/src/components/RoomStatus/src/RoomStatus.vue b/src/components/RoomStatus/src/RoomStatus.vue
index 76df435..f5e363f 100644
--- a/src/components/RoomStatus/src/RoomStatus.vue
+++ b/src/components/RoomStatus/src/RoomStatus.vue
@@ -1,6 +1,6 @@
<script lang="ts" setup>
import { RoomApi, RoomVO } from '@/api/ecg/room'
-import { queueApi } from '@/api/ecg/queue'
+import { QueueApi } from '@/api/ecg/queue'
import {PropType} from "vue";
const emit = defineEmits(['refresh'])
@@ -20,12 +20,12 @@
})
const openBed = async (item) => {
- await queueApi.bedOpen(item)
+ await QueueApi.bedOpen(item)
emit('refresh')
}
const closeBed = async (item) => {
- await queueApi.bedClose(item)
+ await QueueApi.bedClose(item)
emit('refresh')
}
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index 26536e9..c91c40f 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -3,7 +3,7 @@
import QueuePanel from "@/views/ecg/doctor/components/QueuePanel.vue";
import {DoctorApi, PatientStatisticVO, RoomBedVO} from '@/api/ecg/doctor';
import {useUserStore} from "@/store/modules/user";
-import {queueApi, QueueVO} from "@/api/ecg/queue";
+import {QueueApi, QueueVO} from "@/api/ecg/queue";
const userStore = useUserStore();
@@ -45,7 +45,7 @@
const initLoad = async () => {
list.value = await DoctorApi.getPatientList(roomBedVO)
patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
- const queueVO2 = await queueApi.bedDoctorGet(roomBedVO)
+ const queueVO2 = await QueueApi.bedDoctorGet(roomBedVO)
if (queueVO2.status === 20)
state.value = true
else if (queueVO2.status === 30)
@@ -55,10 +55,10 @@
const bedControl = async () => {
bedControlFlag.value = true
if (state.value) {
- await queueApi.bedDoctorPause(roomBedVO)
+ await QueueApi.bedDoctorPause(roomBedVO)
state.value = false
} else {
- await queueApi.bedDoctorResume(roomBedVO)
+ await QueueApi.bedDoctorResume(roomBedVO)
state.value = true
}
bedControlFlag.value = false
diff --git a/src/views/ecg/queue/QueueForm.vue b/src/views/ecg/queue/QueueForm.vue
index efa7a7a..695c8bc 100644
--- a/src/views/ecg/queue/QueueForm.vue
+++ b/src/views/ecg/queue/QueueForm.vue
@@ -58,7 +58,7 @@
</Dialog>
</template>
<script setup lang="ts">
-import { queueApi, QueueVO } from '@/api/ecg/queue'
+import { QueueApi, QueueVO } from '@/api/ecg/queue'
/** 鎺掗槦 琛ㄥ崟 */
defineOptions({ name: 'queueForm' })
@@ -105,7 +105,7 @@
if (id) {
formLoading.value = true
try {
- formData.value = await queueApi.getqueue(id)
+ formData.value = await QueueApi.getqueue(id)
} finally {
formLoading.value = false
}
@@ -123,10 +123,10 @@
try {
const data = formData.value as unknown as QueueVO
if (formType.value === 'create') {
- await queueApi.createqueue(data)
+ await QueueApi.createqueue(data)
message.success(t('common.createSuccess'))
} else {
- await queueApi.updatequeue(data)
+ await QueueApi.updatequeue(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index eb58137..a0ef71a 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -214,7 +214,7 @@
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
-import { queueApi, QueueVO } from '@/api/ecg/queue'
+import { QueueApi, QueueVO } from '@/api/ecg/queue'
import queueForm from './QueueForm.vue'
import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
@@ -250,7 +250,7 @@
const getList = async () => {
loading.value = true
try {
- const data = await queueApi.getqueuePage(queryParams)
+ const data = await QueueApi.getqueuePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
@@ -282,7 +282,7 @@
// 鍒犻櫎鐨勪簩娆＄‘璁�
await message.delConfirm()
// 鍙戣捣鍒犻櫎
- await queueApi.deletequeue(id)
+ await QueueApi.deletequeue(id)
message.success(t('common.delSuccess'))
// 鍒锋柊鍒楄〃
await getList()
@@ -297,7 +297,7 @@
else
item.jumpFlag = 0
- const data = await queueApi.jumpQueue(item)
+ const data = await QueueApi.jumpQueue(item)
message.success(data)
// 鍒锋柊鍒楄〃
await getList()
@@ -311,7 +311,7 @@
await message.exportConfirm()
// 鍙戣捣瀵煎嚭
exportLoading.value = true
- const data = await queueApi.exportqueue(queryParams)
+ const data = await QueueApi.exportqueue(queryParams)
download.excel(data, '鎺掗槦.xls')
} catch {
} finally {
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index 1eec0ed..77fc841 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -16,7 +16,7 @@
<script setup lang="ts">
import {RoomBedSelect} from "@/components/RoomBedSelect"
import { RoomApi, RoomVO } from '@/api/ecg/room'
-import { queueApi } from '@/api/ecg/queue'
+import { QueueApi } from '@/api/ecg/queue'
import {useUserStore} from "@/store/modules/user";
import {ElMessage, ElMessageBox} from "element-plus";
import {isStringEmpty} from "@/utils/stringUtil";
@@ -76,7 +76,7 @@
if (newRoomVO !== curSel.value) {
let data;
if (curSel.value.docId !== null) {
- data = await queueApi.bedDoctorOff(curSel.value)
+ data = await QueueApi.bedDoctorOff(curSel.value)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -92,7 +92,7 @@
const tempRoomVO = cloneDeep(newRoomVO)
tempRoomVO.docId = curUser.id
tempRoomVO.docName = curUser.nickname
- data = await queueApi.bedDoctorOn(tempRoomVO)
+ data = await QueueApi.bedDoctorOn(tempRoomVO)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -118,7 +118,7 @@
const leaveSeatConfirm = async () => {
if (curSel.value.docId !== null) {
- let data = await queueApi.bedDoctorOff(curSel.value)
+ let data = await QueueApi.bedDoctorOff(curSel.value)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
diff --git a/src/views/ecg/room/RoomStatusSetting.vue b/src/views/ecg/room/RoomStatusSetting.vue
index ffe1001..93f93d3 100644
--- a/src/views/ecg/room/RoomStatusSetting.vue
+++ b/src/views/ecg/room/RoomStatusSetting.vue
@@ -5,12 +5,13 @@
</div>
</div>
<el-button @click="startBiz"> 鎵嬪姩寮�璇� </el-button>
+ <el-button @click="resetRoom"> 閲嶇疆璇婂 </el-button>
</template>
<script setup lang="ts">
import {RoomStatus} from "@/components/RoomStatus"
import { RoomApi, RoomVO } from '@/api/ecg/room'
-import { queueApi, QueueVO } from '@/api/ecg/queue'
+import { QueueApi } from '@/api/ecg/queue'
defineOptions({ name: 'RoomStatusSetting' })
@@ -23,7 +24,12 @@
}
const startBiz = async () => {
- await queueApi.startBiz();
+ await QueueApi.startBiz();
+}
+
+const resetRoom = async () => {
+ await RoomApi.resetRoom();
+ getList()
}
/** 鍒濆鍖� **/
--
Gitblit v1.9.3