diff --git a/.env.development b/.env.development index 973d9d4..cc3b3f1 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 王昊地址 -#VITE_GLOB_API_URL=http://192.168.1.3 +#VITE_GLOB_API_URL=http://192.168.1.23 #开发环境 VITE_GLOB_API_URL=http://cqyt.dev.yg.dt.io diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue index 47540f2..34d1190 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue +++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue @@ -178,11 +178,10 @@ xAxis: { type: 'category', splitLine: { show: false }, - data: xArr || ['', ''], + data: xArr, axisLabel: { color: '#fff', }, - min: 5, }, yAxis: { show: false, @@ -251,4 +250,4 @@ initEchart('0'); }); - + \ No newline at end of file diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue index f92c035..1e79072 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue +++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue @@ -84,7 +84,7 @@ } async function getInfo() { - await queryAllStatisticsApi({ type: paramsDate.value, userId: infoData.value?.userid || '1692086437685014530' }).then((res) => { + await queryAllStatisticsApi({ type: paramsDate.value, userId: infoData.value?.userid }).then((res) => { info.value = res?.result; }); } diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue index f717896..c6f1155 100644 --- a/src/components/secondaryScreen/secondMap/secondMap.vue +++ b/src/components/secondaryScreen/secondMap/secondMap.vue @@ -251,7 +251,7 @@ :deep(.watch-modal) { width: 300px; - height: 190px; + height: 210px; display: flex; flex-direction: column; justify-content: center; diff --git a/src/components/secondaryScreen/secondMap/secondMapApi.ts b/src/components/secondaryScreen/secondMap/secondMapApi.ts index 9487a54..a0ca62b 100644 --- a/src/components/secondaryScreen/secondMap/secondMapApi.ts +++ b/src/components/secondaryScreen/secondMap/secondMapApi.ts @@ -2,7 +2,7 @@ import { get, post } from '/@/api/request.ts'; export enum Api { footerStatistic = '/health-watch/watch/deptStatisticData/listByorgCode', - mapListApi = '/health-watch/watch/watchDevice/getMapList', + mapListApi = '/health-watch/watch/watchDevice/selectDeptMapList', getUserListByDeptId = '/health-watch/watch/watchDevice/getUserListByDeptId', queryAllStatistics = '/health-watch/watch/watchData/queryAllStatistics', // 心率 diff --git a/src/components/secondaryScreen/secondMap/secondMapHooks.ts b/src/components/secondaryScreen/secondMap/secondMapHooks.ts index a4886b2..a5fe337 100644 --- a/src/components/secondaryScreen/secondMap/secondMapHooks.ts +++ b/src/components/secondaryScreen/secondMap/secondMapHooks.ts @@ -340,9 +340,13 @@ export function useChangeTable() { export function infoContent(res) { return `
+