Merge remote-tracking branch 'origin/一期' into 一期

# Conflicts:
#	src/views/remote-manage/remote-control.vue
This commit is contained in:
熊猫 2024-05-29 14:26:50 +08:00
commit 3876d93321
12 changed files with 238 additions and 202 deletions

View File

@ -1,6 +1,7 @@
import * as other from "@/utils/other";
import {ElMessage} from "element-plus";
import request, {CommonHeaderEnum, postData} from "@/utils/request";
import { Local, Session } from "@/utils/storage";
const registerUrl = "/admin/register/user"
@ -8,6 +9,9 @@ const logoutUrl = "/admin/token/logout"
export const login = (data: any) => {
return new Promise(resolve => {
Local.clear()
Session.clear()
const basicAuth = 'Basic ' + window.btoa(import.meta.env.VITE_OAUTH2_PASSWORD_CLIENT);
let encPassword = data.password;

View File

@ -66,7 +66,7 @@ export function userPage(data: any) {
}).then((res: any) => {
resolve(res.data)
}).catch(err => {
console.log(err)
resolve(err)
})
})
}
@ -77,7 +77,7 @@ export function userList(data: any): Promise<any> {
.then((res: any) => {
resolve(res.data)
}).catch(err => {
console.log(err)
resolve(err)
})
})
}

View File

@ -1,5 +1,5 @@
import { defineStore } from "pinia";
import { Local, Session } from "@/utils/storage";
import { Session } from "@/utils/storage";
const vitalUrl = "ws://localhost:5173/socket.io/admin/rax/vitalSignsMedicine?token=" + Session.getToken()
const medicineUrl = "ws://localhost:5173/socket.io/admin/rax/addMedicine?token=" + Session.getToken()
@ -11,7 +11,7 @@ export const useRemoteWsStore = defineStore("remoteWs", {
patient: {} as any,
remoteTasks: [] as any,
remoteTasksCap: 10,
currentTaskIndex: 0,
currentTaskIndex: -1,
varMedicine: ["丙泊酚", "舒芬太尼", "瑞芬太尼", "顺阿曲库胺"],
fixedMedicine: ["尼卡地平", "艾司洛尔", "麻黄素", "阿托品"],
exceptionType: ["BIS_except", "DBP_except", "EtCO2_except", "HR_except", "SBP_except", "ST_except"],
@ -24,26 +24,26 @@ export const useRemoteWsStore = defineStore("remoteWs", {
actions: {
setCurrentTaskIndex(i: number) {
this.currentTaskIndex = i
Local.set("currentTaskIndex", i)
Session.set("currentTaskIndex", i)
},
getCurrentTaskIndex() {
if (Local.get("currentTaskIndex")) {
this.currentTaskIndex = Local.get("currentTaskIndex")
if (Session.get("currentTaskIndex")) {
this.currentTaskIndex = Session.get("currentTaskIndex")
}
return this.currentTaskIndex
},
setRemoteTask() {
Local.set("remoteTasks", this.remoteTasks)
Session.set("remoteTasks", this.remoteTasks)
},
getRemoteTask() {
if (Local.get("remoteTasks")) {
this.remoteTasks = Local.get("remoteTasks")
if (Session.get("remoteTasks")) {
this.remoteTasks = Session.get("remoteTasks")
}
return this.remoteTasks
},
initRemoteTask() {
if (Local.get("remoteTasks")) {
this.remoteTasks = Local.get("remoteTasks")
if (Session.get("remoteTasks")) {
this.remoteTasks = Session.get("remoteTasks")
}
if (this.remoteTasks.length <= 0) {
for (let i = 0; i < 10; i++) {
@ -79,7 +79,7 @@ export const useRemoteWsStore = defineStore("remoteWs", {
index: i,
message: []
})
Local.set("remoteTasks", this.remoteTasks)
Session.set("remoteTasks", this.remoteTasks)
},
getActiveRemoteTask() {
for (let i = 0; i < this.remoteTasks.length; i++) {
@ -89,8 +89,8 @@ export const useRemoteWsStore = defineStore("remoteWs", {
setRemoteLog(log: any, i: number) {
this.remoteTasks[i].log.push(log)
},
createConnect(name: string, id: string, date: string) {
if (!this.patient[name + id + date]) {
createConnect(name: string, id: string, date: string, index: number) {
if (!this.patient[name + id + date + index]) {
const vitalWS = new WebSocket(vitalUrl)
const medicineWS = new WebSocket(medicineUrl)
const chatWS = new WebSocket(chatUrl)
@ -115,42 +115,42 @@ export const useRemoteWsStore = defineStore("remoteWs", {
date: date
}))
}
this.patient[name + id + date] = {
this.patient[name + id + date + index] = {
vitalWS,
medicineWS,
chatWS
}
}
},
disconnect(name: string, id: string, date: string) {
const patient: any = this.patient[name + id + date]
disconnect(name: string, id: string, date: string, index: number) {
const patient: any = this.patient[name + id + date + index]
if (patient) {
patient.vitalWS.close()
patient.medicineWS.close()
patient.chatWS.close()
delete this.patient[name + id + date]
delete this.patient[name + id + date + index]
}
},
subscribeVital(name: string, id: string, date: string, cb: any) {
const patient: any = this.patient[name + id + date]
subscribeVital(name: string, id: string, date: string, index: number, cb: any) {
const patient: any = this.patient[name + id + date + index]
if (patient) {
patient.vitalWS.onmessage = cb
patient.vitalCB = cb
} else {
this.createConnect(name, id, date)
this.patient[name + id + date].vitalWS.onmessage = cb
this.patient[name + id + date].vitalCB = cb
this.createConnect(name, id, date, index)
this.patient[name + id + date + index].vitalWS.onmessage = cb
this.patient[name + id + date + index].vitalCB = cb
}
},
unsubscribeVital(name: string, id: string, date: string) {
const patient: any = this.patient[name + id + date]
unsubscribeVital(name: string, id: string, date: string, index: number) {
const patient: any = this.patient[name + id + date + index]
if (patient && patient.vitalWS) {
patient.vitalWS.onmessage = undefined;
patient.vitalCB = undefined;
}
},
sendMsg(name: string, id: string, date: string, msg: string, cb: any) {
const patient: any = this.patient[name + id + date]
sendMsg(name: string, id: string, date: string, msg: string, index: number, cb: any) {
const patient: any = this.patient[name + id + date + index]
if (patient) {
const params = {
patientName: name,
@ -169,8 +169,8 @@ export const useRemoteWsStore = defineStore("remoteWs", {
})
}
},
subscribeChat(name: string, id: string, date: string, cb: any) {
const patient: any = this.patient[name + id + date]
subscribeChat(name: string, id: string, date: string, index: number, cb: any) {
const patient: any = this.patient[name + id + date + index]
if (patient) {
patient.chatCB = cb
patient.chatWS.onmessage = cb
@ -181,8 +181,8 @@ export const useRemoteWsStore = defineStore("remoteWs", {
})
}
},
unsubscribeChat(name: string, id: string, date: string) {
const patient: any = this.patient[name + id + date]
unsubscribeChat(name: string, id: string, date: string, index: number) {
const patient: any = this.patient[name + id + date + index]
patient.chatCB = undefined;
patient.chatWS.onmessage = undefined;
},
@ -193,8 +193,8 @@ export const useRemoteWsStore = defineStore("remoteWs", {
flag: string,
medicine: string,
value: string
}, cb: any) {
const patient: any = this.patient[args.name + args.id + args.date]
}, index: number, cb: any) {
const patient: any = this.patient[args.name + args.id + args.date + index]
if (patient) {
const params = {
patientName: args.name,
@ -215,8 +215,8 @@ export const useRemoteWsStore = defineStore("remoteWs", {
})
}
},
subscribeMedicine(name: string, id: string, date: string, cb: any) {
const patient = this.patient[name + id + date]
subscribeMedicine(name: string, id: string, date: string, index: number, cb: any) {
const patient = this.patient[name + id + date + index]
if (patient) {
patient.medicineCB = cb
patient.medicineWS.onmessage = cb
@ -227,8 +227,8 @@ export const useRemoteWsStore = defineStore("remoteWs", {
})
}
},
unsubscribeMedicine(name: string, id: string, date: string) {
const patient: any = this.patient[name + id + date]
unsubscribeMedicine(name: string, id: string, date: string, index: number) {
const patient: any = this.patient[name + id + date + index]
patient.medicineCB = undefined;
patient.medicineWS.onmessage = undefined;
}

View File

@ -1,6 +1,6 @@
import {defineStore} from 'pinia'
import {getUserMenu} from "@/api/menu";
import {Session} from "@/utils/storage";
import {Local, Session} from "@/utils/storage";
import router from "@/router";
export const useUserStore = defineStore('login', {
@ -37,6 +37,7 @@ export const useUserStore = defineStore('login', {
},
logout() {
Session.clear();
Local.clear();
router.removeRoute("root");
router.addRoute({
name: "root",

View File

@ -5,8 +5,8 @@
<div class="message-box">
<el-carousel height="32px" direction="vertical" indicator-position="none" autoplay>
<el-carousel-item v-for="(item, index) in messages" :key="'message-' + index">
<p class="text-row-1" style="line-height: 32px;" :class="{'is-link': item.href}"
@click="userStore.showHomeMsg=true">{{ item.category }} {{ item.message }}</p>
<p class="text-row-1" style="line-height: 32px;" :class="{ 'is-link': item.href }"
@click="userStore.showHomeMsg = true">{{ item.category }} {{ item.message }}</p>
</el-carousel-item>
</el-carousel>
</div>
@ -17,7 +17,7 @@
</div>
<div class="header-item">
<el-icon class="text1-color" style="font-size: 26px;margin-right: 20px;">
<Calendar/>
<Calendar />
</el-icon>
<div>
<p class="text1-color f14">待办任务</p>
@ -27,22 +27,22 @@
</div>
<div class="echart-box">
<div class="echart-item">
<NumberChart/>
<NumberChart />
</div>
<div class="echart-item">
<NumberPieChart/>
<NumberPieChart />
</div>
<div class="echart-item">
<TimeChart/>
<TimeChart />
</div>
<div class="echart-item">
<TimeBarChart/>
<TimeBarChart />
</div>
</div>
</div>
<div class="right-content">
<div class="week-calendar">
<WeekCalendar/>
<WeekCalendar />
</div>
<div class="system-logs" v-if="showLogMod">
<div class="title">
@ -50,51 +50,18 @@
<span class="f14" style="cursor: pointer;" @click="router.push('./logs-manage/logs-manage')">更多</span>
</div>
<div class="content">
<SystemLogs/>
<SystemLogs />
</div>
</div>
</div>
</div>
<el-drawer
class="message-drawer-box"
v-model="userStore.showHomeMsg"
title="通知消息"
>
<div class="body">
<el-card style="margin-top: 10px;" v-for="(item, index) in messageTable">
<template #header>
<div class="card-header">
<span>{{ item.category }}</span>
</div>
</template>
<p class="text item">{{ item.message }}</p>
<template #footer>
<span>{{ item.creatorName }}</span>
<span style="float: inline-end;">{{ item.createTime }}</span>
</template>
</el-card>
</div>
<div class="footer">
<el-pagination
v-model:page-size="size"
v-model:current-page="current"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
background
layout="prev, pager, next, jumper, sizes"
:page-sizes="[10, 20, 30, 50]"
:total="total"
/>
</div>
</el-drawer>
</div>
</template>
<script lang='ts' setup>
import {onMounted, ref} from 'vue'
import {useRouter} from 'vue-router'
import {useUserStore} from '@/stores/user-info-store'
import { onMounted, ref } from 'vue'
import { useRouter } from 'vue-router'
import { useUserStore } from '@/stores/user-info-store'
import NumberChart from "./number-chart.vue";
import NumberPieChart from "./number-pie-chart.vue";
import TimeChart from "./time-chart.vue";
@ -102,7 +69,7 @@ import TimeBarChart from "./time-bar-chart.vue";
import WeekCalendar from "./week-calendar.vue";
import SystemLogs from "@/components/system-logs.vue";
import * as dailyPlanApi from "@/api/daily-plan";
import {dateFormater} from "@/utils/date-util";
import { dateFormater } from "@/utils/date-util";
import * as msgApi from "@/api/sys-message";
const router = useRouter()
@ -110,10 +77,6 @@ const userStore = useUserStore();
const userInfo = userStore.getlogin()
const showLogMod = ref(false)
const messages = ref([] as any)
const messageTable = ref([] as any)
const current = ref(1);
const size = ref(10);
const total = ref(0);
const todoTotal = ref(0) //
onMounted(() => {
@ -131,9 +94,6 @@ function init() {
});
getTodoCount();
messages.value = [];
messageTable.value = [];
current.value = 1
total.value = 0
loadMsg();
}
@ -145,25 +105,11 @@ function getTodoCount() {
});
}
function handleSizeChange() {
messageTable.value = [];
loadMsg()
}
function handleCurrentChange() {
messageTable.value = [];
loadMsg()
}
async function loadMsg() {
const res = await msgApi.page(current.value, size.value)
const res = await msgApi.page(0, 10)
if (res.code == 0) {
total.value = res.data.total
res.data.records.forEach((row: any) => {
if (current.value == 1) {
messages.value.push(row)
}
messageTable.value.push(row)
})
}
}
@ -224,7 +170,7 @@ async function loadMsg() {
flex-direction: column;
justify-content: center;
& ~ .header-item {
&~.header-item {
width: 40%;
flex-direction: row;
justify-content: flex-start;
@ -307,4 +253,5 @@ async function loadMsg() {
background: white;
}
}
}</style>
}
</style>

View File

@ -56,6 +56,39 @@
<el-drawer v-model="isShowUserInfoDrawer" size="35%" :with-header="false">
<userInfoForm @close="isShowUserInfoDrawer = false"/>
</el-drawer>
<el-drawer
class="message-drawer-box"
v-model="userStore.showHomeMsg"
title="通知消息"
>
<div class="body">
<el-card style="margin-top: 10px;" v-for="(item, index) in messageTable">
<template #header>
<div class="card-header">
<span>{{ item.category }}</span>
</div>
</template>
<p class="text item">{{ item.message }}</p>
<template #footer>
<span>{{ item.creatorName }}</span>
<span style="float: inline-end;">{{ item.createTime }}</span>
</template>
</el-card>
</div>
<div class="footer">
<el-pagination
v-model:page-size="size"
v-model:current-page="current"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
background
layout="prev, pager, next, jumper, sizes"
:page-sizes="[10, 20, 30, 50]"
:total="total"
/>
</div>
</el-drawer>
</div>
</template>
@ -67,6 +100,7 @@ import {useUserStore} from '@/stores/user-info-store'
import userInfoForm from '@/components/user-info.vue'
import {logout} from "@/api/login";
import * as hospitalApi from "@/api/hospital";
import * as msgApi from "@/api/sys-message";
const router = useRouter()
const route = useRoute()
@ -78,6 +112,10 @@ const hospitals = ref([] as any)
const menus = ref([] as any)
const isShowUserInfoDrawer = ref(false)
const menuActive = ref('/')
const messageTable = ref([] as any)
const current = ref(1);
const size = ref(10);
const total = ref(0);
router.isReady().then(() => {
menuActive.value = route.path
@ -94,6 +132,9 @@ onMounted(() => {
function init() {
getHospitalList();
handleMenu();
messageTable.value = [];
current.value = 1
total.value = 0
}
function handleMenu() {
@ -102,6 +143,26 @@ function handleMenu() {
});
}
function handleSizeChange() {
messageTable.value = [];
loadMsg()
}
function handleCurrentChange() {
messageTable.value = [];
loadMsg()
}
async function loadMsg() {
const res = await msgApi.page(current.value, size.value)
if (res.code == 0) {
total.value = res.data.total
res.data.records.forEach((row: any) => {
messageTable.value.push(row)
})
}
}
const menuToPath = (e: any) => {
menuActive.value = e.path
router.push(e.path)
@ -113,7 +174,7 @@ async function getHospitalList() {
hospitals.value = [];
if (res.code == 0 && res.data.length > 0) {
hospitals.value = res.data;
if (data.data) {
if (data.data && data.data != 'null') {
hospital.value = data.data;
}
preHospital.value = hospital.value

View File

@ -50,7 +50,8 @@ defineExpose({
})
function open(i: number) {
patientInfo.value = remoteWsStore.remoteTasks[i];
remoteWsStore.setCurrentTaskIndex(i)
patientInfo.value = remoteWsStore.getRemoteTask()[remoteWsStore.getCurrentTaskIndex()];
patientInfo.value.date = new Date();
dialogVisible.value = true;
}
@ -96,7 +97,7 @@ const unsubscribeLastTask = () => {
const lastTaskIndex = remoteWsStore.currentTaskIndex;
const lastTask: any = remoteWsStore.remoteTasks[lastTaskIndex];
if (lastTask) {
remoteWsStore.unsubscribeVital(lastTask.patient, lastTask.patientId, lastTask.date);
remoteWsStore.unsubscribeVital(lastTask.patient, lastTask.patientId, lastTask.date, lastTaskIndex);
}
}

View File

@ -77,7 +77,7 @@ onMounted(() => {
}
})
onUnmounted(() => {
remoteWsStore.unsubscribeVital(remoteTask.value.patient, remoteTask.value.patientId, remoteTask.value.date);
remoteWsStore.unsubscribeVital(remoteTask.value.patient, remoteTask.value.patientId, remoteTask.value.date, props.index);
})
function initData() {
@ -85,7 +85,7 @@ function initData() {
}
function subscribeVital() {
remoteWsStore.subscribeVital(remoteTask.value.patient, remoteTask.value.patientId, remoteTask.value.date, (res: any) => {
remoteWsStore.subscribeVital(remoteTask.value.patient, remoteTask.value.patientId, remoteTask.value.date, props.index, (res: any) => {
const data = JSON.parse(res.data);
if (data.vitalSignsList && data.vitalSignsList.length > 0) {
Object.assign(patientInfo.value, data.vitalSignsList[0]);

View File

@ -19,7 +19,7 @@
<div class="row-item">
<span class="label">手术时间</span>
<span class="input-value">{{
remoteItem.date
remoteItem?.date
}}</span>
</div>
<div class="row-item">
@ -62,11 +62,11 @@
<div class="info-box">
<div class="row-item">
<span class="label">病人名称</span>
<span class="input-value">{{ remoteItem.patient }}</span>
<span class="input-value">{{ remoteItem?.patient }}</span>
</div>
<div class="row-item">
<span class="label">住院号</span>
<span class="input-value">{{ remoteItem.patientId }}</span>
<span class="input-value">{{ remoteItem?.patientId }}</span>
</div>
</div>
<div class="row-item" :class="{ 'alarm': patientInfo.BIS_except }">
@ -90,7 +90,7 @@
<div class="row-item">
<span class="label">手术时间</span>
<span class="input-value">{{
remoteItem.date
remoteItem?.date
}}</span>
</div>
<div class="row-item">
@ -123,6 +123,7 @@ import { useRemoteWsStore } from "@/stores/remote-ws-store";
const emit = defineEmits(['addLogAfter', 'breakRemote'])
const mediaMini800 = ref(false)
const remoteItem = ref({} as any)
let currentIndex = -1;
const patientInfo = ref({} as any)
const remoteWsStore = useRemoteWsStore()
@ -139,32 +140,35 @@ onMounted(() => {
})
onUnmounted(() => {
remoteWsStore.unsubscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date);
remoteWsStore.unsubscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, currentIndex);
})
function showData(i: any) {
const lastTaskIndex = remoteWsStore.currentTaskIndex;
const lastTask: any = remoteWsStore.remoteTasks[lastTaskIndex];
const lastTaskIndex = remoteWsStore.getCurrentTaskIndex();
const lastTask: any = remoteWsStore.getRemoteTask()[lastTaskIndex];
if (lastTask) {
remoteWsStore.unsubscribeVital(lastTask.patient, lastTask.patientId, lastTask.date);
remoteWsStore.unsubscribeVital(lastTask.patient, lastTask.patientId, lastTask.date, lastTaskIndex);
}
remoteWsStore.currentTaskIndex = i
remoteItem.value = remoteWsStore.remoteTasks[remoteWsStore.currentTaskIndex]
remoteWsStore.setCurrentTaskIndex(i)
currentIndex = remoteWsStore.getCurrentTaskIndex()
remoteItem.value = remoteWsStore.getRemoteTask()[currentIndex]
getData()
}
function initData() {
const remoteTasks = remoteWsStore.getRemoteTask();
remoteItem.value = remoteTasks[remoteWsStore.getCurrentTaskIndex()]
if (remoteItem.value) {
remoteWsStore.createConnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date)
const remoteTasks = remoteWsStore.getRemoteTask()
currentIndex = remoteWsStore.getCurrentTaskIndex()
remoteItem.value = remoteTasks[currentIndex]
if (remoteItem.value && remoteItem.value.patient) {
remoteWsStore.createConnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, currentIndex)
getData()
}
}
function getData() {
remoteWsStore.unsubscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date);
remoteWsStore.subscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, (res: any) => {
if (currentIndex > -1 && remoteItem.value.patient) {
remoteWsStore.unsubscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, currentIndex);
remoteWsStore.subscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, currentIndex, (res: any) => {
if (res && res.data) {
const data = JSON.parse(res.data);
if (data.vitalSignsList && data.vitalSignsList.length > 0) {
@ -176,6 +180,7 @@ function getData() {
}
}
})
}
}
function setLog(data: any) {
@ -187,14 +192,15 @@ function setLog(data: any) {
taskName: remoteItem.value.taskName,
time: new Date(),
type: "exception"
}, remoteWsStore.currentTaskIndex);
}, currentIndex);
}
})
}
const breakRemote = () => {
remoteWsStore.disconnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date)
remoteWsStore.resetRemoteTask(remoteWsStore.currentTaskIndex)
remoteWsStore.getRemoteTask()[currentIndex]
remoteWsStore.disconnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, currentIndex)
remoteWsStore.resetRemoteTask(currentIndex)
if (remoteWsStore.getActiveRemoteTask()) {
showData(remoteWsStore.getActiveRemoteTask())
}

View File

@ -106,8 +106,8 @@
<el-dropdown-item command="速度(ml/h)">速度(ml/h)</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template> -->
</el-dropdown>
</template> -->
</el-table-column>
<el-table-column prop="total" label="累计药量(ml)" width="100">
<template #default="scope"></template>
@ -269,13 +269,15 @@ onMounted(() => {
});
onUnmounted(() => {
remoteWsStore.unsubscribeChat(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date);
remoteWsStore.unsubscribeMedicine(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date);
remoteWsStore.unsubscribeVital(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date);
const index = remoteWsStore.getCurrentTaskIndex()
remoteWsStore.unsubscribeChat(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, index);
remoteWsStore.unsubscribeMedicine(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, index);
remoteWsStore.unsubscribeVital(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, index);
})
function subscribeWS() {
remoteWsStore.subscribeVital(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date,
const index = remoteWsStore.getCurrentTaskIndex()
remoteWsStore.subscribeVital(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, index,
function (res: any) {
const data = JSON.parse(res.data);
chartDom1.value.updateChartData(data.vitalSignsList[0]);
@ -285,12 +287,12 @@ function subscribeWS() {
updateMedicineTable(data.aiMedicineList[0], data.docMedicineList[0]);
})
remoteWsStore.subscribeChat(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date,
remoteWsStore.subscribeChat(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, index,
function (res: any) {
mssageList.value.push(JSON.parse(res.data));
})
remoteWsStore.subscribeMedicine(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date,
remoteWsStore.subscribeMedicine(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, index,
function (res: any) {
const data = JSON.parse(res.data);
if (data.status != 1) {
@ -487,8 +489,9 @@ const playPause = () => {
}
const sendMsg = () => {
if (msgVal.value.trim() == '') return;
const index = remoteWsStore.getCurrentTaskIndex()
remoteWsStore.sendMsg(currentRemote.value.patient, currentRemote.value.patientId,
currentRemote.value.date, msgVal.value, function (res: any) {
currentRemote.value.date, msgVal.value, index, function (res: any) {
if (res.code == 1) {
ElMessage.error(res.msg)
}
@ -530,7 +533,8 @@ const tableItemConfirm = (e: any, tableData: any) => {
medicine: e.row.name,
value: e.row.speed
}
remoteWsStore.sendMedicine(params, function () {
const index = remoteWsStore.getCurrentTaskIndex()
remoteWsStore.sendMedicine(params, index, function () {
});
}
@ -545,7 +549,8 @@ function startAI() {
date: currentRemote.value.date,
flag: "0",
}
remoteWsStore.sendMedicine(params, function () {
const index = remoteWsStore.getCurrentTaskIndex()
remoteWsStore.sendMedicine(params, index, function () {
});
}

View File

@ -3,11 +3,11 @@
<div class="header-box">
<div class="thumbnail" @click="viewThumbnail">
<el-icon>
<Menu/>
<Menu />
</el-icon>
<span>缩略图</span>
</div>
<div class="task-btn-item" v-for="(item, index) in remoteTask" :key="'task-' + index"
<div class="task-btn-item" v-for="(item, index) in remoteWsStore.remoteTasks" :key="'task-' + index"
:class="{ 'connecting': item.patient || item.patientId, 'alarm': item.isException }"
@click="editTask(item)" @dblclick="toRemoteControl(item)">
<span>{{ item.taskName || ('新建任务' + (index + 1)) }}</span>
@ -15,29 +15,28 @@
</div>
<div class="content-box">
<div class="remote-box">
<RemotePart ref="remotePartRef" @addLogAfter="addLogAfter" @breakRemote="breakRemote"/>
<RemotePart ref="remotePartRef" @addLogAfter="addLogAfter" @breakRemote="breakRemote" />
</div>
<div class="message-box">
<MessagePart ref="messagePartRef"/>
<MessagePart ref="messagePartRef" />
</div>
</div>
</div>
<RemoteDialog ref="remoteDialogRef" @confirmRemote="confirmRemote" @errorRemote="errorRemote"/>
<RemoteDialog ref="remoteDialogRef" @confirmRemote="confirmRemote" @errorRemote="errorRemote" />
</template>
<script lang='ts' setup>
import {onMounted, ref} from 'vue'
import {useRouter} from 'vue-router'
import { onMounted, ref } from 'vue'
import { useRouter } from 'vue-router'
import RemoteDialog from './part/remote-dialog.vue'
import RemotePart from './part/remote-part.vue'
import MessagePart from './part/message-part.vue'
import {useRemoteWsStore} from "@/stores/remote-ws-store";
import { useRemoteWsStore } from "@/stores/remote-ws-store";
const router = useRouter()
const remotePartRef = ref()
const messagePartRef = ref()
const remoteDialogRef = ref()
const remoteTask = ref([] as Array<any>)
const remoteWsStore = useRemoteWsStore();
onMounted(() => {
@ -45,8 +44,8 @@ onMounted(() => {
})
function initRemoteTask() {
remoteTask.value = remoteWsStore.initRemoteTask()
remotePartRef.value.showData(remoteWsStore.currentTaskIndex);
remoteWsStore.initRemoteTask()
remotePartRef.value.showData(remoteWsStore.getCurrentTaskIndex());
}
const viewThumbnail = () => {
@ -69,6 +68,7 @@ const editTask = (item: any) => {
const toRemoteControl = (item: any) => {
//
if (item.isRemote) {
remoteWsStore.setCurrentTaskIndex(item.index)
router.push('/remote-manage/remote-control')
} else {
remoteDialogRef.value.open(item.index)
@ -133,7 +133,7 @@ const addLogAfter = () => {
font-size: 1.4em;
}
& > span {
&>span {
display: none;
margin-left: 5px;
line-height: 1;
@ -144,7 +144,7 @@ const addLogAfter = () => {
width: 160px;
transition: all .3s;
& > span {
&>span {
display: block;
}
}
@ -214,4 +214,5 @@ const addLogAfter = () => {
margin-left: 20px;
}
}
}</style>
}
</style>

View File

@ -3,15 +3,15 @@
<div class="remote-thumbnail-page">
<div class="remote-box row1">
<div class="remote-item" v-for="item in remoteTask.slice(0, 4)" :key="item.title" @click="openRemote(item)">
<RemoteItemPart :ref="'remoteItemPartRef' + item.index" :index="item.index"
@addLogAfter="addLogAfter"></RemoteItemPart>
<RemoteItemPart :ref="'remoteItemPartRef' + item.index" :index="item.index" @addLogAfter="addLogAfter">
</RemoteItemPart>
</div>
</div>
<div class="remote-box row2">
<div class="left-box">
<div class="remote-item" v-for="item in remoteTask.slice(4)" :key="item.title" @click="openRemote(item)">
<RemoteItemPart :ref="'remoteItemPartRef' + item.index" :index="item.index"
@addLogAfter="addLogAfter"></RemoteItemPart>
<RemoteItemPart :ref="'remoteItemPartRef' + item.index" :index="item.index" @addLogAfter="addLogAfter">
</RemoteItemPart>
</div>
</div>
<div class="right-box">
@ -26,11 +26,11 @@
</template>
<script lang='ts' setup>
import {onMounted, ref} from 'vue';
import {useRoute, useRouter} from 'vue-router';
import { onMounted, ref } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import RemoteItemPart from './part/remote-item-part.vue';
import MessageItemPart from './part/message-item-part.vue';
import {useRemoteWsStore} from "@/stores/remote-ws-store";
import { useRemoteWsStore } from "@/stores/remote-ws-store";
const route = useRoute();
const router = useRouter();
@ -43,6 +43,7 @@ onMounted(() => {
})
const openRemote = (params: any) => {
remoteWsStore.setCurrentTaskIndex(params.index)
router.push('/remote-manage/remote-manage');
}
const addLogAfter = (index: number) => {
@ -53,31 +54,38 @@ const addLogAfter = (index: number) => {
<style lang='scss' scoped>
$size: 20px;
.remote-thumbnail-page {
width: 100%;
height: 1010px;
overflow: auto;
.remote-box {
width: 100%;
height: 33.33%;
display: flex;
.remote-item {
width: 25%;
height: 100%;
padding: $size*0.2;
}
&.row2 {
height: 66.67%;
.left-box {
width: 75%;
height: 100%;
display: flex;
flex-wrap: wrap;
.remote-item {
width: 33.33%;
height: 50%;
}
}
.right-box {
position: relative;
width: 25%;
@ -86,6 +94,7 @@ $size: 20px;
padding-top: $size*0.2 + $size;
display: flex;
flex-wrap: wrap;
.message-title {
position: absolute;
height: $size;
@ -99,6 +108,7 @@ $size: 20px;
color: white;
font-weight: 600;
}
.message-item {
width: 50%;
height: 20%;