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 19377a9..4947eda 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue
@@ -131,6 +131,9 @@
yArr1.push(item.value1);
});
echart = echarts.init(chartRef.value);
+ console.log('yArr', yArr);
+ console.log('yArr1', yArr1);
+ console.log('xArr', xArr);
const option = {
title: {},
legend: {
@@ -153,7 +156,7 @@
let tar = params[0];
let str = '';
if (type.value === 1) {
- str = tar1.value > 0 ? '深睡' : '浅睡';
+ str = tar1.value > 0 ? '浅睡' : '深睡';
} else {
str = '深睡' + ' : ' + (tar.value ? tar.value : 0) + '
' + '浅睡' + ' : ' + (tar1.value ? tar1.value : 0);
}
@@ -169,11 +172,10 @@
xAxis: {
type: 'category',
splitLine: { show: false },
- data: xArr || ['', ''],
+ data: xArr,
axisLabel: {
color: '#fff',
},
- min: 5,
},
yAxis: {
show: false,
@@ -242,4 +244,4 @@
initEchart('0');
});
-
+
\ No newline at end of file
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 `