From 45e97b23aa5b6a29ccb65c0935d87ca3eb920ad0 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 05 九月 2024 16:19:50 +0800
Subject: [PATCH] update
---
src/api/ecg/screen/index.ts | 35 ++++++++
src/views/ecg/callingscreen/bigscreen.vue | 150 ++++++++++++++++++++-----------------
src/views/ecg/callingscreen/roomscreen.vue | 16 +--
src/api/ecg/queue/index.ts | 5 -
4 files changed, 120 insertions(+), 86 deletions(-)
diff --git a/src/api/ecg/queue/index.ts b/src/api/ecg/queue/index.ts
index 2618825..53eba5c 100644
--- a/src/api/ecg/queue/index.ts
+++ b/src/api/ecg/queue/index.ts
@@ -68,11 +68,6 @@
//
resetSchedule: async () => {
return await request.get({ url: `/ecg/queue/reset-scheduler` })
- },
-
- //
- getRoomScreenData: async () => {
- return await request.get({ url: `/ecg/queue/room-screen-data` })
}
}
diff --git a/src/api/ecg/screen/index.ts b/src/api/ecg/screen/index.ts
new file mode 100644
index 0000000..664bcc0
--- /dev/null
+++ b/src/api/ecg/screen/index.ts
@@ -0,0 +1,35 @@
+import request from '@/config/axios'
+
+export const statusMap = new Map([
+ [20, "鍑嗗涓�"],
+ [30, "灏辫瘖涓�"],
+ [50, "杩囧彿"]
+]);
+
+// 鍙彿 VO
+export interface CallingVO {
+ patId: string // 鎮ｈ�呯紪鍙�
+ patName: string // 鎮ｈ�呭鍚�
+ patGender: number // 鎮ｈ�呮�у埆
+ bookCheckType: number // 棰勭害妫�鏌ョ被鍨�
+ seqNum: number // 鎺掗槦搴忓彿
+ status: number // 10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡
+ passed: number // 杩囧彿鏍囪
+ expired: number // 棰勭害杩囨湡鏍囪
+ jumpFlag: number //鎻掗槦鏍囪
+ roomId: number // 璇婂缂栧彿
+ roomName: string // 璇婂鍚嶇О
+ bedNo: string // 璇婄枟搴婄紪鍙�
+}
+
+// 鎺掗槦 API
+export const ScreenApi = {
+ //
+ getRoomScreenData: async () => {
+ return await request.get({ url: `/ecg/screen/room-screen-data` })
+ },
+
+ getBigScreenData: async () => {
+ return await request.get({ url: `/ecg/screen/calling-data` })
+ }
+}
diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index 98b4cab..c9095e4 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -1,67 +1,53 @@
<script setup lang="ts">
+import {ScreenApi, statusMap, CallingVO} from "@/api/ecg/screen";
+
defineOptions({ name: 'bigscreen' })
- const tableData = [{
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- }]
+const listReady = ref<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+const listWaiting = ref<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+const listPassed = ref<CallingVO[]>([]) //
- const names = ["Alice", "Bob", "Charlie", "David", "Eve", "Frank", "Grace",
- "鐗规湕鏅�", "椹崱榫�", "鏅噾", "绌嗚开鑰佷粰", "鎷滅櫥", "鍗＄壒"]
- const visibleCount = 5 // 鍙悓鏃舵樉绀虹殑鍚嶅瓧鏁伴噺
- const startIndex = ref<number>(0);
+const getList = async () => {
+ const data = await ScreenApi.getBigScreenData()
+ listReady.value = data[1]
+ listWaiting.value = data[2]
+ listPassed.value = data[3]
+}
- const visibleNames : string[] = computed(() => {
- const endIndex = (startIndex.value + visibleCount) % names.length;
- if (endIndex > startIndex.value) {
- return names.slice(startIndex.value, endIndex);
- } else {
- return [...names.slice(startIndex.value), ...names.slice(0, endIndex)];
- }
- })
+const startScrolling = () => {
+ setInterval(() => {
+ // console.info("...")
+ getList();
+ }, 3000); // 姣忎袱绉掓粴鍔ㄤ竴娆�
+}
- const startScrolling = () => {
- setInterval(() => {
- // console.info("...")
- startIndex.value = (startIndex.value + visibleCount) % names.length;
- }, 3000); // 姣忎袱绉掓粴鍔ㄤ竴娆�
- }
+onMounted( () => {
+ startScrolling()
+})
- onMounted( () => {
- startScrolling()
- })
+const speak = (msg) => {
+ //const msg = new SpeechSynthesisUtterance(`璇�${this.currentNumber}鍙峰氨璇奰);
+ const repeatNum = 3
+ var speech = new SpeechSynthesisUtterance()
+ speech.text = msg
+ speech.pitch = 1 // 鑾峰彇骞惰缃瘽璇殑闊宠皟(0-2 榛樿1锛屽�艰秺澶ц秺灏栭攼,瓒婁綆瓒婁綆娌�)
+ speech.rate = 0.9 // 鑾峰彇骞惰缃璇濈殑閫熷害(0.1-10 榛樿1锛屽�艰秺澶ц閫熻秺蹇�,瓒婂皬璇�熻秺鎱�)
+ speech.volume = 100 // 鑾峰彇骞惰缃璇濈殑闊抽噺
+ speech.lang = 'zh-CN' // 璁剧疆鎾斁璇█
- const speak = (msg) => {
- //const msg = new SpeechSynthesisUtterance(`璇�${this.currentNumber}鍙峰氨璇奰);
- const repeatNum = 3
- var speech = new SpeechSynthesisUtterance()
- speech.text = msg
- speech.pitch = 1 // 鑾峰彇骞惰缃瘽璇殑闊宠皟(0-2 榛樿1锛屽�艰秺澶ц秺灏栭攼,瓒婁綆瓒婁綆娌�)
- speech.rate = 0.9 // 鑾峰彇骞惰缃璇濈殑閫熷害(0.1-10 榛樿1锛屽�艰秺澶ц閫熻秺蹇�,瓒婂皬璇�熻秺鎱�)
- speech.volume = 100 // 鑾峰彇骞惰缃璇濈殑闊抽噺
- speech.lang = 'zh-CN' // 璁剧疆鎾斁璇█
- // 澧炲姞鎺у埗鎾斁娆℃暟
- let count = 1
+ utterance.onend = function() {
+ console.log("Speech ended");
+ };
+
+ // 澧炲姞鎺у埗鎾斁娆℃暟
+ let count = 1
+ speechSynthesis.speak(speech)
+ while (count < repeatNum) {
speechSynthesis.speak(speech)
- while (count < repeatNum) {
- speechSynthesis.speak(speech)
- count++
- }
+ count++
}
+}
</script>
@@ -71,32 +57,56 @@
<el-container>
<el-aside width="500px">
<el-table
- :data="tableData"
+ :data="listReady"
stripe
:show-header="false"
style="width: 100%">
<el-table-column
- prop="date"
- label="鏃ユ湡"
- width="180"/>
- <el-table-column
- prop="name"
- label="濮撳悕"
- width="180"/>
- <el-table-column
- prop="address"
- label="鍦板潃"/>
+ prop="patName"
+ label="鎮ｈ�呭鍚�"
+ width="80"/>
+ <el-table-column label="鐘舵��" align="center" prop="status" width="80">
+ <template #default="scope">
+ {{ statusMap.get(scope.row.status) }}
+ </template>
+ </el-table-column>
</el-table>
</el-aside>
<el-container>
<el-main>
- <div class="name-scroller">
- <div class="name-box">
- <span v-for="(name, index) in visibleNames" :key="index">{{ name }}</span>
- </div>
- </div>
+ <el-table
+ :data="listWaiting"
+ stripe
+ :show-header="false"
+ style="width: 100%">
+ <el-table-column
+ prop="patName"
+ label="鎮ｈ�呭鍚�"
+ width="80"/>
+ <el-table-column label="鐘舵��" align="center" prop="status" width="80">
+ <template #default="scope">
+ {{ statusMap.get(scope.row.status) }}
+ </template>
+ </el-table-column>
+ </el-table>
</el-main>
- <el-footer>Footer</el-footer>
+ <el-footer>
+ <el-table
+ :data="listPassed"
+ stripe
+ :show-header="false"
+ style="width: 100%">
+ <el-table-column
+ prop="patName"
+ label="鎮ｈ�呭鍚�"
+ width="80"/>
+ <el-table-column label="鐘舵��" align="center" prop="status" width="80">
+ <template #default="scope">
+ {{ statusMap.get(scope.row.status) }}
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-footer>
</el-container>
</el-container>
<el-button @click="speak('璇� 鐗规湕鏅� 鍒颁簩鍙疯瘖瀹� 灏辫瘖')" >鍙彿</el-button>
diff --git a/src/views/ecg/callingscreen/roomscreen.vue b/src/views/ecg/callingscreen/roomscreen.vue
index 3d9f039..0d3afeb 100644
--- a/src/views/ecg/callingscreen/roomscreen.vue
+++ b/src/views/ecg/callingscreen/roomscreen.vue
@@ -1,13 +1,13 @@
<script setup lang="ts">
-import {QueueApi, QueueVO} from "@/api/ecg/queue";
import {RoomBedVO} from "@/api/ecg/doctor";
import {DICT_TYPE} from "@/utils/dict";
import {RoomApi} from "@/api/ecg/room";
+import {CallingVO, statusMap, ScreenApi} from "@/api/ecg/screen";
defineOptions({ name: 'roomscreen' })
-const list = ref<QueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+const list = ref<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
const roomBed : RoomBedVO = ref<RoomBedVO>({
roomId : null,
@@ -15,14 +15,8 @@
bedNo: null
})
-const statusMap = new Map([
- [20, "鍑嗗涓�"],
- [30, "灏辫瘖涓�"],
- [50, "杩囧彿"]
-]);
-
const getList = async () => {
- const data = await QueueApi.getRoomScreenData()
+ const data = await ScreenApi.getRoomScreenData()
list.value = data
}
@@ -47,7 +41,7 @@
<template>
<el-container>
- <el-aside width="200px">Aside</el-aside>
+ <el-aside width="200px">A----</el-aside>
<el-container>
<el-header>{{ roomBed.roomName }}</el-header>
<el-main>
@@ -67,7 +61,7 @@
</el-table-column>
</el-table>
</el-main>
- <el-footer>Footer</el-footer>
+ <el-footer>F----</el-footer>
</el-container>
</el-container>
</template>
--
Gitblit v1.9.3