From 943d2875938ca95f7c1071cd242d67e19e03a613 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 30 八月 2024 11:16:59 +0800
Subject: [PATCH] update
---
src/views/ecg/room/RoomLoginSelect.vue | 8 ++--
src/views/ecg/doctor/index.vue | 8 ++--
src/api/ecg/doctor/index.ts | 25 ++++++++++++
src/views/ecg/queue/index.vue | 12 ------
src/api/ecg/queue/index.ts | 25 ------------
5 files changed, 33 insertions(+), 45 deletions(-)
diff --git a/src/api/ecg/doctor/index.ts b/src/api/ecg/doctor/index.ts
index 3ee013c..4143a4b 100644
--- a/src/api/ecg/doctor/index.ts
+++ b/src/api/ecg/doctor/index.ts
@@ -22,6 +22,31 @@
// 鍖荤敓 API
export const DoctorApi = {
+ // 鍖荤敓鏆傚仠锛屾殏鏃朵笉鎺ユ敹鎮ｈ��
+ bedDoctorPause: async (params) => {
+ return await request.get({ url: `/ecg/doctor/bed-doctor-pause`, params })
+ },
+
+ // 鍖荤敓鎭㈠锛屾仮澶嶆帴鏀舵偅鑰�
+ bedDoctorResume: async (params) => {
+ return await request.get({ url: `/ecg/doctor/bed-doctor-resume`, params })
+ },
+
+ // 鍖荤敓鍏ュ骇锛�
+ bedDoctorOn: async (params) => {
+ return await request.get({ url: `/ecg/doctor/bed-doctor-on`, params })
+ },
+
+ // 鍖荤敓绂诲骇锛�
+ bedDoctorOff: async (params) => {
+ return await request.get({ url: `/ecg/doctor/bed-doctor-off`, params })
+ },
+
+ // 鑾峰彇鍖荤敓鐨勫伐浣嶄俊鎭�
+ bedDoctorGet: async (params) => {
+ return await request.get({ url: `/ecg/doctor/bed-doctor-get`, params })
+ },
+
// 鐪嬪畬锛屽彇涓嬩竴浣嶆偅鑰�
finishNextPatient: async (params: RoomBedVO) => {
return await request.get({ url: `/ecg/doctor/finish-next-patient`, params })
diff --git a/src/api/ecg/queue/index.ts b/src/api/ecg/queue/index.ts
index f3cfb61..0d59020 100644
--- a/src/api/ecg/queue/index.ts
+++ b/src/api/ecg/queue/index.ts
@@ -70,31 +70,6 @@
return await request.get({ url: `/ecg/queue/bed-close`, params })
},
- // 鍖荤敓鏆傚仠锛屾殏鏃朵笉鎺ユ敹鎮ｈ��
- bedDoctorPause: async (params) => {
- return await request.get({ url: `/ecg/queue/bed-doctor-pause`, params })
- },
-
- // 鍖荤敓鎭㈠锛屾仮澶嶆帴鏀舵偅鑰�
- bedDoctorResume: async (params) => {
- return await request.get({ url: `/ecg/queue/bed-doctor-resume`, params })
- },
-
- // 鍖荤敓鍏ュ骇锛�
- bedDoctorOn: async (params) => {
- return await request.get({ url: `/ecg/queue/bed-doctor-on`, params })
- },
-
- // 鍖荤敓绂诲骇锛�
- bedDoctorOff: async (params) => {
- return await request.get({ url: `/ecg/queue/bed-doctor-off`, params })
- },
-
- // 鑾峰彇鍖荤敓鐨勫伐浣嶄俊鎭�
- bedDoctorGet: async (params) => {
- return await request.get({ url: `/ecg/queue/bed-doctor-get`, params })
- },
-
//
resetSchedule: async () => {
return await request.get({ url: `/ecg/queue/reset-scheduler` })
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index c91c40f..86edce1 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 {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 DoctorApi.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 DoctorApi.bedDoctorPause(roomBedVO)
state.value = false
} else {
- await QueueApi.bedDoctorResume(roomBedVO)
+ await DoctorApi.bedDoctorResume(roomBedVO)
state.value = true
}
bedControlFlag.value = false
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index a0ef71a..c226d11 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -98,17 +98,6 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
- <el-date-picker
- v-model="queryParams.createTime"
- value-format="YYYY-MM-DD HH:mm:ss"
- type="daterange"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
- class="!w-220px"
- />
- </el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 鎼滅储</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆</el-button>
@@ -241,7 +230,6 @@
expired: undefined,
roomId: undefined,
bedNo: undefined,
- createTime: []
})
const queryFormRef = ref() // 鎼滅储鐨勮〃鍗�
const exportLoading = ref(false) // 瀵煎嚭鐨勫姞杞戒腑
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index 77fc841..15a620a 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -16,11 +16,11 @@
<script setup lang="ts">
import {RoomBedSelect} from "@/components/RoomBedSelect"
import { RoomApi, RoomVO } from '@/api/ecg/room'
-import { QueueApi } from '@/api/ecg/queue'
import {useUserStore} from "@/store/modules/user";
import {ElMessage, ElMessageBox} from "element-plus";
import {isStringEmpty} from "@/utils/stringUtil";
import {cloneDeep} from "lodash-es";
+import {DoctorApi} from "@/api/ecg/doctor";
const { push } = useRouter()
defineOptions({ name: 'RoomLoginSelect' })
@@ -76,7 +76,7 @@
if (newRoomVO !== curSel.value) {
let data;
if (curSel.value.docId !== null) {
- data = await QueueApi.bedDoctorOff(curSel.value)
+ data = await DoctorApi.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 DoctorApi.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 DoctorApi.bedDoctorOff(curSel.value)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
--
Gitblit v1.9.3