From fad6097b889268af72ae2ff2f1206bdd7bd09b31 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期日, 30 三月 2025 20:52:13 +0800 Subject: [PATCH] get room profile --- vite.config.ts | 16 ++++++++-------- .env.dev | 8 ++++---- src/views/ecg/callingscreen/roomscreen.vue | 12 ++++-------- src/api/ecg/doctor/index.ts | 7 +++++++ 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.env.dev b/.env.dev index 232f1c6..ea5bb35 100644 --- a/.env.dev +++ b/.env.dev @@ -1,15 +1,15 @@ # 寮�鍙戠幆澧冿細鏈湴鍙惎鍔ㄥ墠绔」鐩紝渚濊禆寮�鍙戠幆澧冿紙鍚庣銆丄PP锛� -NODE_ENV=production +NODE_ENV=development VITE_DEV=true # 璇锋眰璺緞 -VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn' +VITE_BASE_URL='http://localhost' # 鏂囦欢涓婁紶绫诲瀷锛歴erver - 鍚庣涓婁紶锛� client - 鍓嶇鐩磋繛涓婁紶锛屼粎鏀寔S3鏈嶅姟 VITE_UPLOAD_TYPE=server # 涓婁紶璺緞 -VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://localhost/admin-api/infra/file/upload' # 鎺ュ彛鍦板潃 VITE_API_URL=/admin-api @@ -33,4 +33,4 @@ VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' # 楠岃瘉鐮佺殑寮�鍏� -VITE_APP_CAPTCHA_ENABLE=true +VITE_APP_CAPTCHA_ENABLE=false diff --git a/src/api/ecg/doctor/index.ts b/src/api/ecg/doctor/index.ts index fd515d5..fe702c0 100644 --- a/src/api/ecg/doctor/index.ts +++ b/src/api/ecg/doctor/index.ts @@ -1,5 +1,12 @@ import request from '@/config/axios' +export interface RoomProfileVO { + roomId: number | null // 璇婂缂栧彿 + roomName: string | null + bedNum: number | null // 璇婄枟搴婃暟閲� + callingScreenType: number | null // 鍙彿灞忕被鍨� +} + export interface RoomBedVO { roomId: number | null // 璇婂缂栧彿 roomName: string | null diff --git a/src/views/ecg/callingscreen/roomscreen.vue b/src/views/ecg/callingscreen/roomscreen.vue index bcca1bb..3ae2ead 100644 --- a/src/views/ecg/callingscreen/roomscreen.vue +++ b/src/views/ecg/callingscreen/roomscreen.vue @@ -1,6 +1,6 @@ <script setup lang="ts"> -import {RoomBedVO} from "@/api/ecg/doctor"; +import {RoomBedVO, RoomProfileVO} from "@/api/ecg/doctor"; import {RoomApi} from "@/api/ecg/room"; import {ScreenQueueVO, ScreenApi} from "@/api/ecg/screen"; import {CallApi, CallVO} from "@/api/ecg/call"; @@ -16,11 +16,7 @@ let curSpeakPat : CallVO | null = null; -const roomBed = ref<RoomBedVO>({ - roomId : null, - roomName: null, - bedNo: null -}) +const roomProfile = ref<RoomProfileVO>() const getList = async () => { const data = await ScreenApi.getRoomScreenData() @@ -30,7 +26,7 @@ const getRoomByIp = async () => { const data = await RoomApi.getRoomByIP() - roomBed.value = data + roomProfile.value = data } const startScrolling = () => { @@ -105,7 +101,7 @@ <template> <el-container style="height: 100%;"> - <el-header style="font-size: 25px">{{ roomBed.roomName }}</el-header> + <el-header style="font-size: 25px">{{ roomProfile.roomName }}</el-header> <el-main> <el-table :data="list" diff --git a/vite.config.ts b/vite.config.ts index 8cba915..47e407b 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -29,14 +29,14 @@ host: "0.0.0.0", open: env.VITE_OPEN === 'true', // 鏈湴璺ㄥ煙浠g悊. 鐩墠娉ㄩ噴鐨勫師鍥狅細鏆傛椂娌℃湁鐢ㄩ�旓紝server 绔凡缁忔敮鎸佽法鍩� - // proxy: { - // ['/admin-api']: { - // target: env.VITE_BASE_URL, - // ws: false, - // changeOrigin: true, - // rewrite: (path) => path.replace(new RegExp(`^/admin-api`), ''), - // }, - // }, + proxy: { + ['/admin-api']: { + target: 'http://192.168.3.180:48080', + ws: false, + changeOrigin: true, + // rewrite: (path) => path.replace(new RegExp(`^/admin-api`), ''), + }, + }, }, // 椤圭洰浣跨敤鐨剉ite鎻掍欢銆� 鍗曠嫭鎻愬彇鍒癰uild/vite/plugin涓鐞� plugins: createVitePlugins(), -- Gitblit v1.9.3