Browse Source

优化网络连接配置,LIS接口替换

master
LiLongLong 1 month ago
parent
commit
e184042521
  1. BIN
      dist-v0.0.23.7z
  2. BIN
      src/assets/no-data.png
  3. 12
      src/components/dialogs/AlarmModalHistory.vue
  4. 14
      src/pages/Index/Regular/Running.vue
  5. 11
      src/pages/Index/components/TestTube/Tube.vue
  6. 1
      src/services/Index/emergency.ts
  7. 5
      src/services/Index/history.ts
  8. 2
      src/services/Index/idCard.ts
  9. 1
      src/services/Index/init.ts
  10. 3
      src/services/Index/regular.ts
  11. 3
      src/services/Index/testTube.ts
  12. 6
      src/utils/getServerInfo.ts

BIN
dist-v0.0.23.7z

BIN
src/assets/no-data.png

After

Width: 492  |  Height: 354  |  Size: 20 KiB

12
src/components/dialogs/AlarmModalHistory.vue

@ -1,6 +1,6 @@
<template> <template>
<div class="status-history"> <div class="status-history">
<el-collapse v-model="callName">
<el-collapse v-if="statusList && statusList.length" v-model="callName">
<el-collapse-item v-for="(status, index) in statusList" :key="index" title="Consistency" :name="index"> <el-collapse-item v-for="(status, index) in statusList" :key="index" title="Consistency" :name="index">
<template #title> <template #title>
<div class="status-title"> <div class="status-title">
@ -13,6 +13,9 @@
<StatusDetail :currEventReport="status"/> <StatusDetail :currEventReport="status"/>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<div v-else class="no-data">
<img :src="noData" alt="" />
</div>
</div> </div>
</template> </template>
@ -21,6 +24,7 @@ import { ref, watchEffect } from 'vue'
import { useSystemStore } from '@/store/modules/useSystemStore.ts' import { useSystemStore } from '@/store/modules/useSystemStore.ts'
import { formatDate } from '@/utils/formDate.ts' import { formatDate } from '@/utils/formDate.ts'
import StatusDetail from '@/components/dialogs/StatusDetail.vue' import StatusDetail from '@/components/dialogs/StatusDetail.vue'
import noData from '@/assets/no-data.png'
const callName = ref('') const callName = ref('')
const systemStore = useSystemStore() const systemStore = useSystemStore()
@ -79,4 +83,10 @@ watchEffect(() => {
font-size: 1.5rem; font-size: 1.5rem;
height: 5rem; height: 5rem;
} }
.no-data{
display: flex;
align-items: center;
justify-content: center;
height: 40vh;
}
</style> </style>

14
src/pages/Index/Regular/Running.vue

@ -354,7 +354,7 @@ const onShowAlarmModal = () => {
} }
const onShowAlarmHistory = () => { const onShowAlarmHistory = () => {
alarmStatusVisible.value = true
alarmStatusVisible.value = true
} }
const onShowAlarmRecordModal = () => { const onShowAlarmRecordModal = () => {
@ -711,12 +711,12 @@ const onShowAlarmRecordModal = () => {
} }
.scan-main { .scan-main {
position: fixed;
top: 55rem;
right: 10px;
padding: 8px 5px;
background-color: rgb(223, 237, 248);
border-radius: 5px;
position: absolute;
top: 42vh;
right: -6vw;
padding: 0.5rem 0.3125rem;
background-color: #dfedf8;
border-radius: 0.3125rem;
height: 10.25rem; height: 10.25rem;
.scan-text{ .scan-text{
font-weight: 400; font-weight: 400;

11
src/pages/Index/components/TestTube/Tube.vue

@ -82,13 +82,16 @@ watch(
(newVal) => { (newVal) => {
tubeData.value = props.tube tubeData.value = props.tube
const projIds = projIdsOfTube(props.tube) const projIds = projIdsOfTube(props.tube)
console.log('projIds===', projIds, props.tube)
if (projIds.length > 0) { if (projIds.length > 0) {
nextTick(() => { nextTick(() => {
if (canvas.value) { if (canvas.value) {
const data = projIds.map((p, index) => ({
value: 1,
color: consumablesStore.projIdColorMap[p] || props.tube.projInfo[index].color || '#FFF',
}))
const data = projIds.map((p, index) => {
return {
value: 1,
color: consumablesStore.projIdColorMap[p] || props.tube.projInfo[index].color || '#FFF',
}
})
const ctx = canvas.value.getContext('2d') const ctx = canvas.value.getContext('2d')
drawPieChart(ctx, data) drawPieChart(ctx, data)
} }

1
src/services/Index/emergency.ts

@ -3,6 +3,7 @@ import { AddEmergencyInfo } from '../../types/Index'
//添加急诊信息 //添加急诊信息
export const insertEmergency = async (body: AddEmergencyInfo) => { export const insertEmergency = async (body: AddEmergencyInfo) => {
try { try {
console.log('addNew=========',body)
const res = await apiClient.post('/api/v1/app/emergencyTube/addNew', body) const res = await apiClient.post('/api/v1/app/emergencyTube/addNew', body)
return res.data return res.data
} catch (error) { } catch (error) {

5
src/services/Index/history.ts

@ -6,6 +6,7 @@ interface paramsType {
//获取历史记录 //获取历史记录
export const getHistoryInfo = async (params: paramsType) => { export const getHistoryInfo = async (params: paramsType) => {
try { try {
console.log('getRecords=========',params)
const res = await apiClient.post( const res = await apiClient.post(
`/api/v1/app/reactionResult/getRecords?pageNum=${params.pageNum}&pageSize=${params.pageSize}`, `/api/v1/app/reactionResult/getRecords?pageNum=${params.pageNum}&pageSize=${params.pageSize}`,
) )
@ -19,6 +20,7 @@ export const getHistoryInfo = async (params: paramsType) => {
export const deleteHistoryInfo = async (ids: string) => { export const deleteHistoryInfo = async (ids: string) => {
try { try {
console.log('deleteRecordByIds=========',ids)
const res = await apiClient.post( const res = await apiClient.post(
`/api/v1/app/reactionResult/deleteRecordByIds?ids=${ids}`, `/api/v1/app/reactionResult/deleteRecordByIds?ids=${ids}`,
) )
@ -31,6 +33,7 @@ export const deleteHistoryInfo = async (ids: string) => {
//搜索 //搜索
export const searchHistoryInfo = async (search: string) => { export const searchHistoryInfo = async (search: string) => {
try { try {
console.log('searchRecord=========',search)
const res = await apiClient.post( const res = await apiClient.post(
'/api/v1/app/reactionResult/searchRecord', '/api/v1/app/reactionResult/searchRecord',
{ search }, { search },
@ -44,6 +47,7 @@ export const searchHistoryInfo = async (search: string) => {
//打印 //打印
export const printHistoryInfo = async (ids: number[]) => { export const printHistoryInfo = async (ids: number[]) => {
try { try {
console.log('printfRecords=========',ids)
const res = await apiClient.post( const res = await apiClient.post(
`/api/v1/app/reactionResult/printfRecords`, `/api/v1/app/reactionResult/printfRecords`,
{ ids }, { ids },
@ -56,6 +60,7 @@ export const printHistoryInfo = async (ids: number[]) => {
//导出LIS //导出LIS
export const exportRecordsToLIS = async (ids: number[]) => { export const exportRecordsToLIS = async (ids: number[]) => {
try { try {
console.log('exportRecordsByLIS=========',ids)
const res = await apiClient.post( const res = await apiClient.post(
`/api/v1/app/reactionResult/exportRecordsByLIS`, `/api/v1/app/reactionResult/exportRecordsByLIS`,
{ ids }, { ids },

2
src/services/Index/idCard.ts

@ -6,6 +6,7 @@ interface idCardParams {
} }
export const getIdCardList = async (params: idCardParams) => { export const getIdCardList = async (params: idCardParams) => {
try { try {
console.log('a8kProjectCard/get=========',params)
const { pageNum, pageSize } = params const { pageNum, pageSize } = params
const res = await apiClient.post( const res = await apiClient.post(
`/api/v1/app/a8kProjectCard/get?pageNum=${pageNum}&pageSize=${pageSize}`, `/api/v1/app/a8kProjectCard/get?pageNum=${pageNum}&pageSize=${pageSize}`,
@ -42,6 +43,7 @@ export const getMountedCardInfo = async () => {
//读取已经挂载的id卡信息 //读取已经挂载的id卡信息
export const delCard = async (id) => { export const delCard = async (id) => {
try { try {
console.log('a8kProjectCard/delete=========',id)
const res = await apiClient.post( const res = await apiClient.post(
`/api/v1/app/a8kProjectCard/delete?id=${id}`, `/api/v1/app/a8kProjectCard/delete?id=${id}`,
) )

1
src/services/Index/init.ts

@ -24,6 +24,7 @@ export const getInitState = async () => {
export const confirmPromptInfo = async (eventId: string) => { export const confirmPromptInfo = async (eventId: string) => {
try { try {
console.log('confirmPromoptInfo=========',eventId)
const res = await apiClient.post( const res = await apiClient.post(
'/api/v1/app/AppEventBus/confirmPromoptInfo', '/api/v1/app/AppEventBus/confirmPromoptInfo',
null, null,

3
src/services/Index/regular.ts

@ -28,6 +28,7 @@ export type ConsumableGroupNo = 'CG1' | 'CG2' | 'CG3' | 'CG4' | 'CG5' | 'CG6'
export const unloadConsumable = async (params: { export const unloadConsumable = async (params: {
group: ConsumableGroupNo group: ConsumableGroupNo
}) => { }) => {
console.log('unInstallConsumable=========',params)
const res = await apiClient.post( const res = await apiClient.post(
'/api/v1/app/consumablesMgr/unInstallConsumable', '/api/v1/app/consumablesMgr/unInstallConsumable',
null, null,
@ -40,6 +41,7 @@ export const unloadConsumable = async (params: {
export const updateConsumables = async (data: any) => { export const updateConsumables = async (data: any) => {
const { group, num } = data const { group, num } = data
try { try {
console.log('setCounsumableNum=========',data)
const res = await apiClient.post( const res = await apiClient.post(
`/api/v1/app/consumablesMgr/setCounsumableNum?group=${group}&num=${num}`, `/api/v1/app/consumablesMgr/setCounsumableNum?group=${group}&num=${num}`,
) )
@ -52,6 +54,7 @@ export const updateConsumables = async (data: any) => {
export const updateTipsNum = async (data: any) => { export const updateTipsNum = async (data: any) => {
const { group, num } = data const { group, num } = data
try { try {
console.log('setTipNum=========',data)
const res = await apiClient.post( const res = await apiClient.post(
`/api/v1/app/consumablesMgr/setTipNum?group=${group}&num=${num}`, `/api/v1/app/consumablesMgr/setTipNum?group=${group}&num=${num}`,
) )

3
src/services/Index/testTube.ts

@ -55,6 +55,7 @@ export const addTestTube = async () => {
export const deleteTube = async (data: string) => { export const deleteTube = async (data: string) => {
try { try {
console.log('removeTubeHolderSetting=========',data)
const res = await apiClient.post( const res = await apiClient.post(
`/api/v1/app/appTubeSettingMgr/removeTubeHolderSetting?uuid=${data}`, `/api/v1/app/appTubeSettingMgr/removeTubeHolderSetting?uuid=${data}`,
) )
@ -91,6 +92,7 @@ export const updateTubeActivationStatus = async (
data: TubeActivationStatus, data: TubeActivationStatus,
) => { ) => {
try { try {
console.log('updateActiveState=========',data)
const res = await apiClient.post( const res = await apiClient.post(
'/api/v1/app/appTubeSettingMgr/updateActiveState', '/api/v1/app/appTubeSettingMgr/updateActiveState',
null, null,
@ -107,6 +109,7 @@ export const updateTubeConfig = async (config: {
setting: TubeSetting[] setting: TubeSetting[]
}) => { }) => {
try { try {
console.log('updateTubeSetting=========',config)
const res = await apiClient.post( const res = await apiClient.post(
'/api/v1/app/appTubeSettingMgr/updateTubeSetting', '/api/v1/app/appTubeSettingMgr/updateTubeSetting',
config, config,

6
src/utils/getServerInfo.ts

@ -6,12 +6,14 @@ export function getServerInfo(wsPath: string = '/api/v1/app/ws/state') {
// 获取主机名(IP 或域名)和端口号 // 获取主机名(IP 或域名)和端口号
// const host = url.hostname // 例如: "192.168.1.100" 或 "localhost" // const host = url.hostname // 例如: "192.168.1.100" 或 "localhost"
const host = window.location.hostname; const host = window.location.hostname;
// const host = window.location.host;
// const host = "192.168.8.175"; // const host = "192.168.8.175";
// const port = '8082' // 使用固定的后端端口;由于本地开发时,8080被占用导致ws连接失败,所以使用8082
const port = "80"
const port = '8082' // 使用固定的后端端口;由于本地开发时,8080被占用导致ws连接失败,所以使用8082
// const port = "80"
// 构建 WebSocket URL // 构建 WebSocket URL
const wsProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:' const wsProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
const wsUrl = `${wsProtocol}//${host}:${port}${wsPath}` const wsUrl = `${wsProtocol}//${host}:${port}${wsPath}`
// const wsUrl = `${wsProtocol}//${host}${wsPath}`
// 构建 HTTP URL // 构建 HTTP URL
const httpUrl = `${window.location.protocol}//${host}:${port}` // 例如: "http://192.168.1.100:8082" 或 "http://localhost:8082" const httpUrl = `${window.location.protocol}//${host}:${port}` // 例如: "http://192.168.1.100:8082" 或 "http://localhost:8082"

Loading…
Cancel
Save