From b34e7d50bc009025d071725dcdb236f723f67e6e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 20 九月 2024 11:09:03 +0800
Subject: [PATCH] 诊间屏 完善

---
 src/api/ecg/screen/index.ts                |    2 +-
 src/views/ecg/callingscreen/roomscreen.vue |   34 ++++++++++++++++++++++++++++++----
 src/views/ecg/queue/QueueForm.vue          |    4 ++--
 src/api/ecg/queue/index.ts                 |    2 +-
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/api/ecg/queue/index.ts b/src/api/ecg/queue/index.ts
index 53eba5c..410e86e 100644
--- a/src/api/ecg/queue/index.ts
+++ b/src/api/ecg/queue/index.ts
@@ -9,7 +9,7 @@
   bookTimeslot: number // 棰勭害鏃堕棿娈�
   bookCheckType: number // 棰勭害妫�鏌ョ被鍨�
   seqNum: number // 鎺掗槦搴忓彿
-  status: number // 10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡
+  status: number // 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿
   passed: number // 杩囧彿鏍囪
   expired: number // 棰勭害杩囨湡鏍囪
   jumpFlag: number //鎻掗槦鏍囪
diff --git a/src/api/ecg/screen/index.ts b/src/api/ecg/screen/index.ts
index 0ca8df3..2087008 100644
--- a/src/api/ecg/screen/index.ts
+++ b/src/api/ecg/screen/index.ts
@@ -14,7 +14,7 @@
   bookDate: Date // 棰勭害鏃ユ湡
   bookCheckType: number // 棰勭害妫�鏌ョ被鍨�
   seqNum: number // 鎺掗槦搴忓彿
-  status: number // 10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡
+  status: number // 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿
   passed: number // 杩囧彿鏍囪
   expired: number // 棰勭害杩囨湡鏍囪
   called: number
diff --git a/src/views/ecg/callingscreen/roomscreen.vue b/src/views/ecg/callingscreen/roomscreen.vue
index decf64a..a51aedb 100644
--- a/src/views/ecg/callingscreen/roomscreen.vue
+++ b/src/views/ecg/callingscreen/roomscreen.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
 
 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<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+const listPassed = ref<CallingVO[]>([]) // 杩囧彿鍒楄〃鐨勬暟鎹�
 
-const roomBed : RoomBedVO = ref<RoomBedVO>({
+const roomBed = ref<RoomBedVO>({
   roomId : null,
   roomName: null,
   bedNo: null
@@ -17,7 +17,8 @@
 
 const getList = async () => {
   const data = await ScreenApi.getRoomScreenData()
-  list.value = data
+  list.value = data[1]
+  listPassed.value = data[2]
 }
 
 const getRoomByIp = async () => {
@@ -30,6 +31,21 @@
     // console.info("...")
     getList()
   }, 3000); // 姣忎袱绉掓粴鍔ㄤ竴娆�
+}
+
+const nameDesensitize = (patName) => {
+  if (patName.length == 2) {
+    //鎴彇name 瀛楃涓叉埅鍙栫涓�涓瓧绗︼紝
+    return patName.substring(0, 1) + '*';
+  } else if (patName.length == 3) {
+    //鎴彇绗竴涓拰绗笁涓瓧绗�
+    return patName.substring(0, 1) + '*' + patName.substring(2, 3);
+  } else if (patName.length > 3) {
+    //鎴彇绗竴涓拰澶т簬绗�4涓瓧绗�
+    return (
+        patName.substring(0, 1) + '*' + '*' + patName.substring(3, patName.length)
+    );
+  }
 }
 
 onMounted( () => {
@@ -51,7 +67,11 @@
         <el-table-column
             prop="patName"
             label="鎮ｈ�呭鍚�"
-            width="80"/>
+            width="80">
+          <template #default="scope">
+            {{ nameDesensitize(scope.row.patName) }}
+          </template>
+        </el-table-column>
         <el-table-column label="鐘舵��" align="center" :prop="status" width="80">
           <template #default="scope">
             {{ statusMap.get(scope.row.status) }}
@@ -59,6 +79,12 @@
         </el-table-column>
       </el-table>
     </el-main>
+    <el-footer height="100px" style="padding: 0 0">
+      <el-header height="30px" style="background-color: #98b8e5; line-height: 30px;">杩囧彿鍖�</el-header>
+      <span v-for="(passedItem, index) in listPassed" :key="index">
+            {{nameDesensitize(passedItem.patName) + "&nbsp;&nbsp;&nbsp;&nbsp;"}}
+          </span>
+    </el-footer>
   </el-container>
 </template>
 
diff --git a/src/views/ecg/queue/QueueForm.vue b/src/views/ecg/queue/QueueForm.vue
index 695c8bc..e4aebb6 100644
--- a/src/views/ecg/queue/QueueForm.vue
+++ b/src/views/ecg/queue/QueueForm.vue
@@ -29,7 +29,7 @@
       <el-form-item label="鎺掗槦搴忓彿" prop="seqNum">
         <el-input v-model="formData.seqNum" placeholder="璇疯緭鍏ユ帓闃熷簭鍙�" />
       </el-form-item>
-      <el-form-item label="10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡" prop="status">
+      <el-form-item label="10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
         </el-radio-group>
@@ -89,7 +89,7 @@
   patName: [{ required: true, message: '鎮ｈ�呭鍚嶄笉鑳戒负绌�', trigger: 'blur' }],
   bookTimeslot: [{ required: true, message: '棰勭害鏃堕棿娈典笉鑳戒负绌�', trigger: 'blur' }],
   seqNum: [{ required: true, message: '鎺掗槦搴忓彿涓嶈兘涓虹┖', trigger: 'blur' }],
-  status: [{ required: true, message: '10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡涓嶈兘涓虹┖', trigger: 'blur' }],
+  status: [{ required: true, message: '10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿', trigger: 'blur' }],
   passed: [{ required: true, message: '杩囧彿鏍囪涓嶈兘涓虹┖', trigger: 'blur' }],
   expired: [{ required: true, message: '棰勭害杩囨湡鏍囪涓嶈兘涓虹┖', trigger: 'blur' }]
 })

--
Gitblit v1.9.3