Merge branch 'test' into dev

# Conflicts:
#	src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue

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');
     });
 </script>
-<style scoped lang="less"></style>
+<style scoped lang="less"></style>

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;
         });
     }

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;

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',
     // 心率

src/components/secondaryScreen/secondMap/secondMapHooks.ts

@@ -340,9 +340,13 @@ export function useChangeTable() {
 export function infoContent(res) {
     return `
         <div class="watch-modal">
+         <div class="modal-row">
+                <span class="label">单位名称：</span>
+                <span class="text">${res?.orgName || ''}</span>
+            </div>
             <div class="modal-row">
                 <span class="label">部门名称：</span>
-                <span class="text">${res?.orgName}</span>
+                <span class="text">${res?.deptName || ''}</span>
             </div>
             <div class="modal-row">
                 <span class="label">部门人数：</span>

src/router/index.ts

@@ -4,7 +4,7 @@ const routes: Array<RouteRecordRaw> = [
     {
         path: '/',
         name: 'default',
-        component: () => import('/@/views/sys/login.vue'),
+        component: () => import('/@/views/index.vue'),
     },
     {
         path: '/login',
@@ -37,4 +37,5 @@ const router: Router = createRouter({
     routes: [...routes],
 });
 
+
 export default router;

src/views/sys/login.vue

@@ -205,10 +205,6 @@
     onMounted(() => {
         //加载验证码
         handleChangeCheckCode();
-        let token = getAuthCache(TOKEN_KEY);
-        if (token) {
-            router.push({ path: '/home' });
-        }
     });
 </script>