From 147e82c3947f1706a27c900a15f077fb9b8d5526 Mon Sep 17 00:00:00 2001 From: yy <11@11.com> Date: Fri, 17 May 2024 12:06:29 +0800 Subject: [PATCH] i --- package.json | 8 +- src/api/dict.ts | 99 ++++ src/api/hospital.ts | 126 ++++- src/api/medicine.ts | 57 +++ src/api/menu.ts | 114 ++--- src/api/sys-message.ts | 60 +-- src/api/user.ts | 12 + src/components/user-info.vue | 10 +- src/main.ts | 13 +- src/router/index.ts | 127 ++--- src/router/routes.ts | 263 +++++----- src/stores/hospital-store.ts | 0 src/stores/remote-ws-store.ts | 2 +- src/stores/user-info-store.ts | 69 ++- src/utils/date-util.ts | 154 +++--- src/utils/other.ts | 20 + src/utils/request.ts | 14 +- src/views/404/404.vue | 11 + src/views/home/index.vue | 448 +++++++++++------- src/views/home/number-chart.vue | 324 +++++++------ src/views/home/number-pie-chart.vue | 291 ++++++------ src/views/home/time-bar-chart.vue | 345 +++++++------- src/views/home/time-chart.vue | 313 ++++++------ src/views/index.vue | 138 +++--- src/views/login/login.vue | 321 +++++++------ src/views/logs-manage/dict-manage.vue | 185 ++++++++ src/views/logs-manage/form/dict-form.vue | 114 +++++ src/views/logs-manage/form/dict-item-form.vue | 138 ++++++ src/views/logs-manage/index.vue | 108 ++--- src/views/logs-manage/logs-manage.vue | 2 + .../form/empower-dialog.vue | 23 +- .../permissions-manage/form/menu-form.vue | 308 ++++++------ .../permissions-manage/form/role-form.vue | 7 +- src/views/permissions-manage/index.vue | 4 +- src/views/permissions-manage/menu-manage.vue | 215 +++++---- src/views/permissions-manage/role-manage.vue | 253 +++++----- .../remote-manage/part/remote-dialog.vue | 7 +- src/views/remote-manage/part/remote-part.vue | 2 +- src/views/remote-manage/remote-control.vue | 12 +- .../system-manage/form/hospital-form.vue | 369 +++++++++------ src/views/system-manage/hospitals.vue | 249 +++++----- 41 files changed, 3201 insertions(+), 2134 deletions(-) create mode 100644 src/api/dict.ts create mode 100644 src/api/medicine.ts create mode 100644 src/stores/hospital-store.ts create mode 100644 src/views/404/404.vue create mode 100644 src/views/logs-manage/dict-manage.vue create mode 100644 src/views/logs-manage/form/dict-form.vue create mode 100644 src/views/logs-manage/form/dict-item-form.vue diff --git a/package.json b/package.json index 776823d..aa6d78f 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,11 @@ "type-check": "vue-tsc --noEmit" }, "dependencies": { - "@stomp/stompjs": "^7.0.0", "axios": "^1.3.3", "crypto-js": "^4.2.0", "echarts": "^5.4.1", - "element-plus": "2.3.1", + "element-china-area-data": "^6.1.0", + "element-plus": "2.7.2", "js-cookie": "^3.0.5", "nprogress": "^0.2.0", "pinia": "^2.1.7", @@ -22,8 +22,8 @@ "sass": "^1.58.3", "uuid": "^9.0.1", "vant": "^4.8.3", - "vue": "^3.2.45", - "vue-router": "^4.1.6", + "vue": "^3.4.21", + "vue-router": "^4.3.0", "xlsx": "^0.18.5" }, "devDependencies": { diff --git a/src/api/dict.ts b/src/api/dict.ts new file mode 100644 index 0000000..cefa011 --- /dev/null +++ b/src/api/dict.ts @@ -0,0 +1,99 @@ +import request from "@/utils/request"; + +const dictUrl = "/admin/dict"; +const dictPageUrl = "/admin/dict/tree"; +const dictItemUrl = "/admin/dict/item"; +const dictItemPageUrl = "/admin/dict/item/page"; + +export function dictPage(current: number, size: number, name?: string) { + return new Promise(resolve => { + request.get(dictPageUrl, { + params: { + current, + size, + name + } + }).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function dictItemPage(dictId: string, name?: string) { + return new Promise(resolve => { + request.get(dictItemPageUrl, { + params: { + dictId, + name + } + }).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function saveDict(dict: any): Promise { + return new Promise(resolve => { + request.post(dictUrl, dict).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function updateDict(dict: any): Promise { + return new Promise(resolve => { + request.put(dictUrl, dict).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function saveDictItem(item: any): Promise { + return new Promise(resolve => { + request.post(dictItemUrl, item).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function updateDictItem(item: any): Promise { + return new Promise(resolve => { + request.put(dictItemUrl, item).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function deleteDict(ids: any[]): Promise { + return new Promise(resolve => { + request.delete(dictUrl, { + data: ids + }).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function deleteDictItem(id: string): Promise { + return new Promise(resolve => { + request.delete(dictItemUrl + "/" + id).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} \ No newline at end of file diff --git a/src/api/hospital.ts b/src/api/hospital.ts index 7197055..73329b1 100644 --- a/src/api/hospital.ts +++ b/src/api/hospital.ts @@ -1,18 +1,122 @@ import request, {CommonHeaderEnum} from "@/utils/request"; const getHospitalListUrl = "/admin/hospital/getHospitalList" -const getHospitalPageUrl = "/admin/hospital/getHospitalPage" +const getMyHospitalListUrl = "/admin/hospital/getMyHospitalList"; +const saveHospitalUrl = "/admin/hospital/saveHospital"; +const getHospitalPageUrl = "/admin/hospital/getHospitalPage"; +const deleteHospitalByIdsUrl = "/admin/hospital/deleteHospitalByIds"; +const saveHospitalManagerUrl = "/admin/hospital/saveHospitalManager"; +const updateHospitalUrl = "/admin/hospital/updateHospital"; +const getHospitalManagerUrl = "/admin/hospital/getHospitalManager"; +const changeHospitalUrl = "/admin/hospital/changeHospital"; +const getCurrentHospitalUrl = "/admin/hospital/getCurrentHospital"; export const getHospitalList = () => { - return new Promise(resolve => { - request({ - url: getHospitalListUrl, - method: 'post', - headers: { - 'Content-Type': CommonHeaderEnum.FORM_CONTENT_TYPE, - }, - }).then(res => { - resolve(res.data); - }) + return new Promise(resolve => { + request({ + url: getHospitalListUrl, + method: 'post', + headers: { + 'Content-Type': CommonHeaderEnum.FORM_CONTENT_TYPE, + }, + }).then(res => { + resolve(res.data); }) + }) +} + +export function getMyHospitalList() { + return new Promise(resolve => { + request.post(getMyHospitalListUrl).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function saveHospital(hospital: any) { + return new Promise(resolve => { + request.postForm(saveHospitalUrl, hospital).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) +} + +export function getHospitalPage(current: number, size: number, name?: string) { + return new Promise(resolve => { + request.postForm(getHospitalPageUrl, { + offset: current, + limit: size, + name: name + }).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) +} + +export function deleteHospitalByIds(ids: string) { + return new Promise(resolve => { + request.postForm(deleteHospitalByIdsUrl, {ids}).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) +} + +export function saveHospitalManager(hospitalId: string, userId: string) { + return new Promise(resolve => { + request.postForm(saveHospitalManagerUrl, {hospitalId, userId}).then((res: any) => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) +} + +export function updateHospital(form: any) { + return new Promise(resolve => { + request.postForm(updateHospitalUrl, form).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function getHospitalManager(hospitalId: string) { + return new Promise(resolve => { + request.postForm(getHospitalManagerUrl, { + hospitalId + }).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function changeHospital(id: string) { + return new Promise(resolve => { + request.postForm(changeHospitalUrl, {id}).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err); + }) + }) +} + +export function getCurrentHospital() { + return new Promise(resolve => { + request.post(getCurrentHospitalUrl).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) } \ No newline at end of file diff --git a/src/api/medicine.ts b/src/api/medicine.ts new file mode 100644 index 0000000..15e33a4 --- /dev/null +++ b/src/api/medicine.ts @@ -0,0 +1,57 @@ +import request from "@/utils/request"; + +const getDatabaseListUrl = "/admin/medicine/getDatabaseList"; +const getSurgeryCountUrl = "/admin/medicine/getSurgeryCount"; +const getSurgeryDurationUrl = "/admin/medicine/getSurgeryDuration"; +const getSurgeryTypeProportionUrl = "/admin/medicine/getSurgeryTypeProportion"; +const getSurgeryOtherDurationUrl = "/admin/medicine/getSurgeryOtherDuration"; + +export function getDatabaseList() { + return new Promise(resolve => { + request.post(getDatabaseListUrl).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err) + }) + }) +} + +export function getSurgeryCount(start: string, end: string): Promise { + return new Promise(resolve => { + request.postForm(getSurgeryCountUrl, {start, end}).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err) + }) + }) +} + +export function getSurgeryDuration(start: string, end: string): Promise { + return new Promise(resolve => { + request.postForm(getSurgeryDurationUrl, {start, end}).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) +} + +export function getSurgeryTypeProportion(start: string, end: string): Promise { + return new Promise(resolve => { + request.postForm(getSurgeryTypeProportionUrl, {start, end}).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} + +export function getSurgeryOtherDuration(start: string, end: string): Promise { + return new Promise(resolve => { + request.postForm(getSurgeryOtherDurationUrl, {start, end}).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err) + }) + }) +} \ No newline at end of file diff --git a/src/api/menu.ts b/src/api/menu.ts index 1b432e5..f76c129 100644 --- a/src/api/menu.ts +++ b/src/api/menu.ts @@ -4,76 +4,76 @@ const getMenuTreeUrl = "/admin/menu/tree"; const menuUrl = "/admin/menu"; export function getMenuTree(menuName?: string, parent?: string, type?: string) { - return new Promise((resolve, reject) => { - const params: any = []; - if (parent) { - params.push("parent=" + parent); - } - if (menuName) { - params.push("menuName=" + menuName); - } - if (type) { - params.push("type=" + type); - } - request.get(getMenuTreeUrl + (params.length > 0 ? "?" + params.join("&") : "")) - .then((res) => { - resolve(res.data); - }).catch(err => { - reject(err); - }) - }) + return new Promise((resolve, reject) => { + const params: any = []; + if (parent) { + params.push("parent=" + parent); + } + if (menuName) { + params.push("menuName=" + menuName); + } + if (type) { + params.push("type=" + type); + } + request.get(getMenuTreeUrl + (params.length > 0 ? "?" + params.join("&") : "")) + .then((res) => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) } export function getRoleTree(roleId: string) { - return new Promise(resolve => { - request.get(getMenuTreeUrl + "/" + roleId).then(res => { - resolve(res.data); - }).catch(err => { - resolve(err); - }); - }) + return new Promise(resolve => { + request.get(getMenuTreeUrl + "/" + roleId).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); + }); + }) } export function saveMenu(menu: any) { - return new Promise((resolve, reject) => { - request.post(menuUrl, menu).then((res: any) => { - resolve(res.data); - }).catch(err => { - reject(err); - }) - }) + return new Promise((resolve, reject) => { + request.post(menuUrl, menu).then((res: any) => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) } export function updateMenu(menu: any) { - return new Promise((resolve, reject) => { - request.put(menuUrl, menu).then((res: any) => { - resolve(res); - }).catch(err => { - reject(err); - }) - }) + return new Promise((resolve, reject) => { + request.put(menuUrl, menu).then((res: any) => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) } export function deleteById(id: string) { - return new Promise((resolve) => { - request.delete(menuUrl + "/" + id).then((res: any) => { - resolve(res.data); - }).catch(err => { - resolve(err); - }) - }) + return new Promise((resolve) => { + request.delete(menuUrl + "/" + id).then((res: any) => { + resolve(res.data); + }).catch(err => { + resolve(err); + }) + }) } export function getUserMenu(type?: string, parentId?: string) { - return new Promise(resolve => { - const params: string[] = []; - if (type) params.push("type=" + type); - if (parentId) params.push("parentId=" + parentId); - request.get(menuUrl + (params.length > 0 ? "?" + params.join("&") : "")) - .then((res: any) => { - resolve(res.data); - }).catch(err => { - resolve(err); - }); - }) + return new Promise(resolve => { + const params: string[] = []; + if (type) params.push("type=" + type); + if (parentId) params.push("parentId=" + parentId); + request.get(menuUrl + (params.length > 0 ? "?" + params.join("&") : "")) + .then((res: any) => { + resolve(res.data); + }).catch(err => { + resolve(err); + }); + }) } \ No newline at end of file diff --git a/src/api/sys-message.ts b/src/api/sys-message.ts index 783a761..cf08fb3 100644 --- a/src/api/sys-message.ts +++ b/src/api/sys-message.ts @@ -6,46 +6,46 @@ const updateUrl = "/admin/sysMessage/update"; const deleteUrl = "/admin/sysMessage/delete"; export function save(message: any, organization?: [], permissions?: []) { - return new Promise(resolve => { - request.postForm(saveUrl, message).then(res => { - resolve(res.data); - }).catch(err => { - resolve(err); - }) + return new Promise(resolve => { + request.postForm(saveUrl, message).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); }) + }) } export function update(message: any) { - return new Promise(resolve => { - request.postForm(updateUrl, message).then(res => { - resolve(res.data); - }).catch(err => { - resolve(err); - }) + return new Promise(resolve => { + request.postForm(updateUrl, message).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); }) + }) } export function deleteByIds(ids: string[]) { - return new Promise(resolve => { - request.postForm(deleteUrl, {ids: ids.join(",")}).then(res => { - resolve(res.data); - }).catch(err => { - resolve(err); - }) + return new Promise(resolve => { + request.postForm(deleteUrl, {ids: ids.join(",")}).then(res => { + resolve(res.data); + }).catch(err => { + resolve(err); }) + }) } -export function page(current: number, size: number, condition?: { category: string, message: string }) { - return new Promise(resolve => { - request.postForm(pageUrl, { - current: current, - size: size, - category: condition?.category, - message: condition?.message - }).then(res => { - resolve(res.data) - }).catch(err => { - resolve(err); - }) +export function page(current: number, size: number, condition?: { category: string, message: string }): Promise { + return new Promise(resolve => { + request.postForm(pageUrl, { + current: current, + size: size, + category: condition?.category, + message: condition?.message + }).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err); }) + }) } \ No newline at end of file diff --git a/src/api/user.ts b/src/api/user.ts index ce5e406..db3b0a2 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -12,6 +12,8 @@ const userUrl = '/admin/user' const modifyPwUrl = "/admin/user/modifyPw" +const getUserListByHospitalUrl = "/admin/user/getUserListByHospital"; + export function getUserInfo() { return new Promise(resolve => { getData(userInfoUrl).then((data: any) => { @@ -117,3 +119,13 @@ export function deleteU(ids: any[]) { }) }) } + +export function getUserListByHospital(hospitalId: string) { + return new Promise(resolve => { + request.postForm(getUserListByHospitalUrl, {hospitalId}).then(res => { + resolve(res.data) + }).catch(err => { + resolve(err); + }) + }) +} diff --git a/src/components/user-info.vue b/src/components/user-info.vue index 847a60e..e0f2958 100644 --- a/src/components/user-info.vue +++ b/src/components/user-info.vue @@ -51,16 +51,16 @@ + + + + \ No newline at end of file diff --git a/src/views/home/index.vue b/src/views/home/index.vue index befb5a5..d52818c 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,67 +1,100 @@ diff --git a/src/views/home/number-chart.vue b/src/views/home/number-chart.vue index 335b818..e15423b 100644 --- a/src/views/home/number-chart.vue +++ b/src/views/home/number-chart.vue @@ -1,21 +1,27 @@ diff --git a/src/views/home/number-pie-chart.vue b/src/views/home/number-pie-chart.vue index 8f14c63..4c86092 100644 --- a/src/views/home/number-pie-chart.vue +++ b/src/views/home/number-pie-chart.vue @@ -1,27 +1,30 @@ diff --git a/src/views/home/time-bar-chart.vue b/src/views/home/time-bar-chart.vue index ae7fd58..f781027 100644 --- a/src/views/home/time-bar-chart.vue +++ b/src/views/home/time-bar-chart.vue @@ -1,200 +1,211 @@ diff --git a/src/views/home/time-chart.vue b/src/views/home/time-chart.vue index 21efa0b..a6477f4 100644 --- a/src/views/home/time-chart.vue +++ b/src/views/home/time-chart.vue @@ -1,25 +1,27 @@ diff --git a/src/views/index.vue b/src/views/index.vue index b08d9e2..3908d9b 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -7,23 +7,22 @@
  • {{ - item.label + @click="menuToPath(item)">{{ + item.name }}
- - + + - {{ userInfo.hospital }} - - - - - - + + @@ -36,12 +35,12 @@ - - {{ userInfo.name }} - - - - + + {{ userInfo.name }} + + + + @@ -405,6 +397,11 @@ const loginPost = (data: any) => { position: absolute; top: 25px; right: 25px; + + .select-hospital { + width: 12rem; + margin-right: 20px; + } } .logo { diff --git a/src/views/logs-manage/dict-manage.vue b/src/views/logs-manage/dict-manage.vue new file mode 100644 index 0000000..d74846e --- /dev/null +++ b/src/views/logs-manage/dict-manage.vue @@ -0,0 +1,185 @@ + + + + + \ No newline at end of file diff --git a/src/views/logs-manage/form/dict-form.vue b/src/views/logs-manage/form/dict-form.vue new file mode 100644 index 0000000..9d0da74 --- /dev/null +++ b/src/views/logs-manage/form/dict-form.vue @@ -0,0 +1,114 @@ + + + + + \ No newline at end of file diff --git a/src/views/logs-manage/form/dict-item-form.vue b/src/views/logs-manage/form/dict-item-form.vue new file mode 100644 index 0000000..6034dd7 --- /dev/null +++ b/src/views/logs-manage/form/dict-item-form.vue @@ -0,0 +1,138 @@ + + + + + \ No newline at end of file diff --git a/src/views/logs-manage/index.vue b/src/views/logs-manage/index.vue index 12bedb4..8d0cdf9 100644 --- a/src/views/logs-manage/index.vue +++ b/src/views/logs-manage/index.vue @@ -1,76 +1,78 @@ diff --git a/src/views/logs-manage/logs-manage.vue b/src/views/logs-manage/logs-manage.vue index e0ae4e6..dcf8990 100644 --- a/src/views/logs-manage/logs-manage.vue +++ b/src/views/logs-manage/logs-manage.vue @@ -93,6 +93,8 @@ onMounted(() => { function init() { loading.value = true; + current = 0; + total.value = 0; getList(); loading.value = false; } diff --git a/src/views/permissions-manage/form/empower-dialog.vue b/src/views/permissions-manage/form/empower-dialog.vue index e85c4c7..7a6404b 100644 --- a/src/views/permissions-manage/form/empower-dialog.vue +++ b/src/views/permissions-manage/form/empower-dialog.vue @@ -27,7 +27,8 @@ const props = { label: 'name', children: 'children' } -const treeIds: Array = [] +// 用于全选 +const treeIds: Array = []; const treeRef = ref() const dialogVisible = ref(false) const toggleExpand = ref(false) @@ -45,7 +46,6 @@ function open(role: any) { dialogVisible.value = true roleObj = role; getMenuTree(); - getRoleMenu(); } function close() { @@ -56,11 +56,25 @@ const getMenuTree = () => { menuApi.getMenuTree().then((res: any) => { treeData.value = res.data; setTreeIds(res.data, treeIds); + getRoleMenu(); }); } const getRoleMenu = () => { menuApi.getRoleTree(roleObj.roleId).then((res: any) => { + treeData.value.forEach((row: any) => { + let childrenCount = 0; + if (res.data.indexOf(row.id) != -1) { + row.children.forEach((child: any) => { + if (res.data.indexOf(child.id) != -1) { + childrenCount++; + } + }) + if (row.children.length != childrenCount) { + res.data.splice(res.data.indexOf(row.id), 1); + } + } + }) treeRef.value.setCheckedKeys(res.data); }) } @@ -93,8 +107,9 @@ const toggleSelectAllChange = (e: boolean) => { } const updateData = () => { - const menuIds = treeRef.value.getCheckedKeys().join(","); - roleApi.saveRoleMenus(roleObj.roleId, menuIds) + const menuIds = treeRef.value.getCheckedKeys(); + const halfMenuIds = treeRef.value.getHalfCheckedKeys(); + roleApi.saveRoleMenus(roleObj.roleId, menuIds.concat(halfMenuIds).join(',')) .then((res: any) => { if (res.code == 0) { ElMessage.success('更新成功'); diff --git a/src/views/permissions-manage/form/menu-form.vue b/src/views/permissions-manage/form/menu-form.vue index 974e42a..f4649c2 100644 --- a/src/views/permissions-manage/form/menu-form.vue +++ b/src/views/permissions-manage/form/menu-form.vue @@ -1,61 +1,73 @@ diff --git a/src/views/permissions-manage/form/role-form.vue b/src/views/permissions-manage/form/role-form.vue index 71ae55c..2962323 100644 --- a/src/views/permissions-manage/form/role-form.vue +++ b/src/views/permissions-manage/form/role-form.vue @@ -3,8 +3,11 @@ - - + + {{formData.roleCode}} + + + diff --git a/src/views/permissions-manage/index.vue b/src/views/permissions-manage/index.vue index 0ce1f5a..e262c95 100644 --- a/src/views/permissions-manage/index.vue +++ b/src/views/permissions-manage/index.vue @@ -17,8 +17,8 @@ diff --git a/src/views/permissions-manage/role-manage.vue b/src/views/permissions-manage/role-manage.vue index 93d466b..65c3cb9 100644 --- a/src/views/permissions-manage/role-manage.vue +++ b/src/views/permissions-manage/role-manage.vue @@ -1,68 +1,61 @@ diff --git a/src/views/remote-manage/part/remote-dialog.vue b/src/views/remote-manage/part/remote-dialog.vue index 6ec1bab..2ed46e1 100644 --- a/src/views/remote-manage/part/remote-dialog.vue +++ b/src/views/remote-manage/part/remote-dialog.vue @@ -49,9 +49,10 @@ defineExpose({ close, }) -function open(e: number) { - patientInfo.value = remoteWsStore.remoteTasks[e] - dialogVisible.value = true +function open(i: number) { + patientInfo.value = remoteWsStore.remoteTasks[i]; + patientInfo.value.date = new Date(); + dialogVisible.value = true; } function close() { diff --git a/src/views/remote-manage/part/remote-part.vue b/src/views/remote-manage/part/remote-part.vue index f0201fd..e1831be 100644 --- a/src/views/remote-manage/part/remote-part.vue +++ b/src/views/remote-manage/part/remote-part.vue @@ -138,7 +138,7 @@ onUnmounted(() => { remoteWsStore.unsubscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date); }) -function showData(i: number) { +function showData(i: any) { const lastTaskIndex = remoteWsStore.currentTaskIndex; const lastTask: any = remoteWsStore.remoteTasks[lastTaskIndex]; if (lastTask) { diff --git a/src/views/remote-manage/remote-control.vue b/src/views/remote-manage/remote-control.vue index 73434d2..3df9679 100644 --- a/src/views/remote-manage/remote-control.vue +++ b/src/views/remote-manage/remote-control.vue @@ -130,7 +130,7 @@ :disabled="tableDataStore[scope.$index].speed === scope.row.speed">确定--> 确定 - 取消 + 取消
@@ -163,7 +163,7 @@ 确定 - 取消 + 取消 @@ -203,7 +203,7 @@ import imgHeart from '@/assets/imgs/heart.png'; import imgLungAlarm from '@/assets/imgs/lung_alarm.png'; import imgHeartAlarm from '@/assets/imgs/heart_alarm.png'; import {useRemoteWsStore} from "@/stores/remote-ws-store"; -import {useLoginStore} from "@/stores/user-info-store"; +import {useUserStore} from "@/stores/user-info-store"; import {getPatientInfo} from "@/api/patient"; @@ -222,7 +222,7 @@ const medicineCustom: any[] = [ ] const remoteWsStore = useRemoteWsStore() const currentRemote = ref(remoteWsStore.remoteTasks[remoteWsStore.currentTaskIndex]) -const userInfo = useLoginStore() +const userInfo = useUserStore() const chartDom1 = ref(), chartDom2 = ref(), @@ -237,7 +237,7 @@ const isPatientDialog = ref(false) const database = ref('') const databaseOptions = ref([] as { value: string, label: string }[]) const messageSum = ref(10) -const userName = ref(userInfo.login.name) +const userName = ref(userInfo.userInfo.name) const setDatabaseDialog = ref(false); const featureTable = ref([] as any[]); let chartNowData = reactive({ID: 0}); @@ -546,7 +546,7 @@ const tableItemCancel = (e: any) => { } function startAI() { - const params = { + const params: any = { name: currentRemote.value.patient, id: currentRemote.value.patientId, date: currentRemote.value.date, diff --git a/src/views/system-manage/form/hospital-form.vue b/src/views/system-manage/form/hospital-form.vue index cb86272..e4350b9 100644 --- a/src/views/system-manage/form/hospital-form.vue +++ b/src/views/system-manage/form/hospital-form.vue @@ -1,180 +1,277 @@ diff --git a/src/views/system-manage/hospitals.vue b/src/views/system-manage/hospitals.vue index 3937b11..310fc89 100644 --- a/src/views/system-manage/hospitals.vue +++ b/src/views/system-manage/hospitals.vue @@ -1,71 +1,76 @@