diff --git a/src/assets/css/variable.scss b/src/assets/css/variable.scss index 2a1c223..1fe7f44 100644 --- a/src/assets/css/variable.scss +++ b/src/assets/css/variable.scss @@ -4,6 +4,7 @@ --el-font-size-base: 16px; } $main-color: #006080; +$red: #ea3323; $border-color: #EBEEF5; $border1-color: #E4E7ED; $border2-color: #DCDFE6; diff --git a/src/stores/remote-info-store.ts b/src/stores/remote-info-store.ts index 40494ac..2218d3e 100644 --- a/src/stores/remote-info-store.ts +++ b/src/stores/remote-info-store.ts @@ -1,13 +1,11 @@ import { defineStore } from 'pinia' -import type { RemoteItem } from '@/utils/public-interface' +import type { RemoteItem, RemoteLogItem } from '@/utils/public-interface' export const useRemoteStore = defineStore('remote', { state: () => { return { remoteTasks: [] as Array, - currentRemote: { - - } as any + currentRemote: {} as RemoteItem } }, // 也可以这样定义 @@ -19,11 +17,27 @@ export const useRemoteStore = defineStore('remote', { setRemoteTasks(e: Array) { this.remoteTasks = e }, + setRemoteLog(obj: RemoteLogItem, index: number) { + if(this.remoteTasks[index]) { + const len = this.remoteTasks[index].log.length + const maxLen = 20 + if(len > maxLen) this.remoteTasks[index].log.splice(0, len - maxLen) + this.remoteTasks[index].log.push(obj) + } + }, getCurrentRemote() { return this.currentRemote }, - setCurrentRemote(e: object) { + setCurrentRemote(e: RemoteItem) { this.currentRemote = e + }, + setCurrentRemoteLog(obj: RemoteLogItem) { + if(this.currentRemote.log) { + const len = this.currentRemote.log.length + const maxLen = 20 + if(len > maxLen) this.currentRemote.log.splice(0, len - maxLen) + this.currentRemote.log.push(obj) + } } }, }) \ No newline at end of file diff --git a/src/utils/public-interface.ts b/src/utils/public-interface.ts index 2e19c51..5f25d1b 100644 --- a/src/utils/public-interface.ts +++ b/src/utils/public-interface.ts @@ -3,16 +3,6 @@ export interface MenuItem { path: string } -export interface RemoteItem { - isRemote: boolean - dataAlarm: boolean - title: string - serverUser: string - patientName: string - patientCode: string - index: number -} - export interface MenuListItem { id: string | number menuName: string @@ -21,4 +11,32 @@ export interface MenuListItem { route: string type: '菜单' | '按钮' children?: Array -} \ No newline at end of file +} + +export interface RemoteLogItem { + time: Date + title: string + state: string +} +export interface RemoteItem { + isRemote: boolean // 服务器连接状态 + dataAlarm: boolean // 是否异常 + title: string // 连接名称 + serverUser: string // 服务器用户名 + patientName: string // 病人姓名 + patientCode: string // 病人身份证号 + index: number + log: Array +} +export interface PatientInfoItem { + name: string // 病人名称 + code: string // 住院号 + time: Date // 手术时间 + state: boolean // 手术状态 false 正常 true 异常 + BIS: number + SBP: number + SPO2: number + DBP: number + HR: number + TEMP: number +} diff --git a/src/views/remote-manage/part/message-item-part.vue b/src/views/remote-manage/part/message-item-part.vue new file mode 100644 index 0000000..50f6bb6 --- /dev/null +++ b/src/views/remote-manage/part/message-item-part.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/views/remote-manage/part/message-item.vue b/src/views/remote-manage/part/message-item.vue deleted file mode 100644 index cc2b263..0000000 --- a/src/views/remote-manage/part/message-item.vue +++ /dev/null @@ -1,80 +0,0 @@ - - - - - diff --git a/src/views/remote-manage/part/message-part.vue b/src/views/remote-manage/part/message-part.vue index 39715a6..7415b6c 100644 --- a/src/views/remote-manage/part/message-part.vue +++ b/src/views/remote-manage/part/message-part.vue @@ -1,79 +1,82 @@ diff --git a/src/views/remote-manage/part/remote-item-part.vue b/src/views/remote-manage/part/remote-item-part.vue new file mode 100644 index 0000000..e74748b --- /dev/null +++ b/src/views/remote-manage/part/remote-item-part.vue @@ -0,0 +1,371 @@ + + + + + diff --git a/src/views/remote-manage/part/remote-item.vue b/src/views/remote-manage/part/remote-item.vue deleted file mode 100644 index 0e9c9ed..0000000 --- a/src/views/remote-manage/part/remote-item.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/src/views/remote-manage/part/remote-part.vue b/src/views/remote-manage/part/remote-part.vue index 20bc4f9..d8c9a14 100644 --- a/src/views/remote-manage/part/remote-part.vue +++ b/src/views/remote-manage/part/remote-part.vue @@ -113,26 +113,14 @@ @@ -148,18 +156,18 @@ const breakRemote = (e: RemoteItem) => { .thumbnail { cursor: pointer; position: absolute; - width: 50px; - height: 50px; + width: 70px; + height: 70px; top: 0; right: 0; display: flex; justify-content: center; align-items: center; background: #f8b300; - border-top-left-radius: 25px; - border-bottom-left-radius: 25px; + border-top-left-radius: 35px; + border-bottom-left-radius: 35px; box-shadow: -3px 3px 5px 0 rgba(black, .2); - font-size: 16px; + font-size: 20px; color: white; transition: all .1s; .el-icon { @@ -172,7 +180,7 @@ const breakRemote = (e: RemoteItem) => { white-space: nowrap; } &:hover { - width: 100px; + width: 160px; transition: all .3s; &>span { display: block; diff --git a/src/views/remote-manage/remote-thumbnail.vue b/src/views/remote-manage/remote-thumbnail.vue index cb2d5e7..afd1bc6 100644 --- a/src/views/remote-manage/remote-thumbnail.vue +++ b/src/views/remote-manage/remote-thumbnail.vue @@ -1,77 +1,114 @@