From c1474f0c648d6e5534236b2776cb0fcf26bab753 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Wed, 27 Dec 2023 10:59:49 +0800
Subject: [PATCH 1/5] =?UTF-8?q?update=201.=E4=BD=93=E6=B8=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/userInfoModal/motion.vue       | 34 +++++++++----------
 .../components/userInfoModal/publicTitle.vue  |  4 +--
 .../components/userInfoModal/temperature.vue  | 12 +++----
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue
index db5329f..6108f91 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue
@@ -7,22 +7,22 @@
         :keyType="keyType"
         :user-id="userId"
     />
-    <div class="item-three" style="display: flex; justify-content: center">
-        <div style="width: 15%; text-align: center">
-            <div>
-                <span style="font-size: 25px"> {{ maxInfo > 1000 ? (maxInfo / 1000).toFixed(2) : maxInfo }}</span>
-                <span style="color: #aa9db6">{{ maxInfo > 1000 ? 'km' : 'm' }}</span>
-            </div>
-            <div style="color: #aa9db6">总运动距离</div>
-        </div>
-        <div style="width: 15%; text-align: center">
-            <div>
-                <span style="font-size: 25px"> {{ minInfo > 1000 ? (minInfo / 1000).toFixed(2) : minInfo }}</span>
-                <span style="color: #aa9db6">{{ minInfo > 1000 ? '千卡' : '卡' }}</span>
-            </div>
-            <div style="color: #aa9db6">总卡路里</div>
-        </div>
-    </div>
+    <!--    <div class="item-three" style="display: flex; justify-content: center">-->
+    <!--        <div style="width: 15%; text-align: center">-->
+    <!--            <div>-->
+    <!--                <span style="font-size: 25px"> {{ maxInfo > 1000 ? (maxInfo / 1000).toFixed(2) : maxInfo }}</span>-->
+    <!--                <span style="color: #aa9db6">{{ maxInfo > 1000 ? 'km' : 'm' }}</span>-->
+    <!--            </div>-->
+    <!--            <div style="color: #aa9db6">总运动距离</div>-->
+    <!--        </div>-->
+    <!--        <div style="width: 15%; text-align: center">-->
+    <!--            <div>-->
+    <!--                <span style="font-size: 25px"> {{ minInfo > 1000 ? (minInfo / 1000).toFixed(2) : minInfo }}</span>-->
+    <!--                <span style="color: #aa9db6">{{ minInfo > 1000 ? '千卡' : '卡' }}</span>-->
+    <!--            </div>-->
+    <!--            <div style="color: #aa9db6">总卡路里</div>-->
+    <!--        </div>-->
+    <!--    </div>-->
 
     <BasicTable :key="refresh" :columns="motionColumns" :api="queryExercisePageApi" :api-params="apiParams" :afterFetch="afterFetch" />
 </template>
@@ -114,4 +114,4 @@
         return params;
     }
 </script>
-<style scoped lang="less"></style>
\ No newline at end of file
+<style scoped lang="less"></style>
diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue
index 185bafc..091108b 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue
@@ -259,7 +259,7 @@
     }
 
     :deep(.ant-select) {
-        min-width: 140px;
+        width: 200px;
     }
 
     .bgc {
@@ -284,4 +284,4 @@
             box-shadow: none;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue
index 2ef5940..d98000a 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue
@@ -107,14 +107,14 @@
                 let xArr = [];
                 let yArr = [];
                 let yArr1 = [];
-                maxInfo.value = result.maxValue ? result.maxValue : '/';
-                middleInfo.value = result.avgValue ? result.avgValue : '/';
-                minInfo.value = result.minValue ? result.minValue : '/';
+                maxInfo.value = result.maxValueB ? result.maxValueB : '/';
+                middleInfo.value = result.avgValueB ? result.avgValueB : '/';
+                minInfo.value = result.minValueB ? result.minValueB : '/';
                 if (type === '1') return;
                 result.viewDataList.map((item) => {
                     xArr.push(item.date);
-                    yArr.push(item.value ? item.value : 0);
-                    yArr1.push(item.value2 ? item.value2 : 0);
+                    yArr.push(item.ydata1 ? item.ydata1 : 0);
+                    yArr1.push(item.ydata2 ? item.ydata2 : 0);
                 });
                 echart = echarts.init(chartRef.value);
                 const option = {
@@ -205,4 +205,4 @@
         initEchart('0');
     });
 </script>
-<style scoped lang="less"></style>
\ No newline at end of file
+<style scoped lang="less"></style>

From 626fbf908588e8b16bf90fa063efe63f24c398e3 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Wed, 27 Dec 2023 14:44:13 +0800
Subject: [PATCH 2/5] =?UTF-8?q?update=201.=E5=8E=8B=E5=8A=9B=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/secondaryScreen/secondMap/secondMapApi.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/secondaryScreen/secondMap/secondMapApi.ts b/src/components/secondaryScreen/secondMap/secondMapApi.ts
index ccea892..9487a54 100644
--- a/src/components/secondaryScreen/secondMap/secondMapApi.ts
+++ b/src/components/secondaryScreen/secondMap/secondMapApi.ts
@@ -45,7 +45,7 @@ export const queryHeartRateStatisticsPageApi = (params: any) => post(Api.queryHe
 export const queryBloodOxygenStatisticsApi = (params: any) => post(Api.queryBloodOxygenStatistics, params);
 export const queryBloodOxygenStatisticsPageApi = (params: any) => post(Api.queryBloodOxygenStatisticsPage, params);
 // 压力
-export const queryStressStatisticsApi = (params: any) => post(Api.queryBloodOxygenStatisticsPage, params);
+export const queryStressStatisticsApi = (params: any) => post(Api.queryStressStatistics, params);
 export const queryStressStatisticsPageApi = (params: any) => post(Api.queryStressStatisticsPage, params);
 // 睡眠
 export const querySleepStatisticsApi = (params: any) => post(Api.querySleepStatistics, params);
@@ -58,4 +58,3 @@ export const queryExercisePageApi = (params: any) => post(Api.queryExercisePage,
 // 步数
 export const queryStepStatisticsApi = (params: any) => post(Api.queryStepStatistics, params);
 export const queryStepStatisticsPageApi = (params: any) => post(Api.queryStepStatisticsPage, params);
-

From a0ffce1fa7cbba862967a6082ffba419727da2bb Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Wed, 27 Dec 2023 16:05:46 +0800
Subject: [PATCH 3/5] =?UTF-8?q?update=201.=E7=9D=A1=E7=9C=A0=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9A=E6=B7=B1=E7=9D=A1=E3=80=81=E6=B5=85=E6=B0=B4?=
 =?UTF-8?q?=E9=A2=A0=E5=80=92=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../secondMap/components/userInfoModal/sleep.vue              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue
index 93c58cb..19377a9 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue
@@ -155,7 +155,7 @@
                             if (type.value === 1) {
                                 str = tar1.value > 0 ? '深睡' : '浅睡';
                             } else {
-                                str = '浅睡' + ' : ' + (tar.value ? tar.value : 0) + '<br/>' + '深睡' + ' : ' + (tar1.value ? tar1.value : 0);
+                                str = '深睡' + ' : ' + (tar.value ? tar.value : 0) + '<br/>' + '浅睡' + ' : ' + (tar1.value ? tar1.value : 0);
                             }
                             return str;
                         },
@@ -242,4 +242,4 @@
         initEchart('0');
     });
 </script>
-<style scoped lang="less"></style>
\ No newline at end of file
+<style scoped lang="less"></style>

From 63eb01d64170d861b03009f75be29ef28618f873 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Wed, 27 Dec 2023 17:55:35 +0800
Subject: [PATCH 4/5] =?UTF-8?q?update=201.=E7=94=A8=E6=88=B7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B7=A6=E4=BE=A7=E6=B2=A1=E6=9C=89=E5=B7=A5=E5=8F=B7?=
 =?UTF-8?q?=202.=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../secondMap/components/userInfoModal/userInfoModal.vue  | 5 +++--
 .../secondMap/components/watchListDialog.vue              | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue
index e90cc6f..f92c035 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue
@@ -3,7 +3,8 @@
         <template #container>
             <div class="user-info-modal" style="display: flex">
                 <div style="width: 23%; padding: 0 20px 20px" class="fff">
-                    <div style="margin-bottom: 10px; font-weight: bold"> 用户名称：{{ infoData?.username }}</div>
+                    <div style="margin-bottom: 10px; font-weight: bold"> 员工姓名：{{ infoData?.username }}</div>
+                    <div style="margin-bottom: 10px; font-weight: bold"> 员工工号：{{ infoData?.workNo }} </div>
                     <div style="margin-bottom: 10px; font-weight: bold"> 工具编码：{{ infoData?.watchNo }}</div>
                     <div style="margin-bottom: 10px; font-weight: bold"> 单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位：{{ infoData?.unit }} </div>
                     <div style="margin-bottom: 10px; font-weight: bold">
@@ -116,4 +117,4 @@
     .tabs-d {
         padding: 20px;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/secondaryScreen/secondMap/components/watchListDialog.vue b/src/components/secondaryScreen/secondMap/components/watchListDialog.vue
index cfe39f0..7fe1de7 100644
--- a/src/components/secondaryScreen/secondMap/components/watchListDialog.vue
+++ b/src/components/secondaryScreen/secondMap/components/watchListDialog.vue
@@ -5,6 +5,7 @@
                 <div class="dialog-con">
                     <a-table
                         class="ant-table-striped"
+                        :class="[dataSource.length === 0 ? 'no-bottom' : '']"
                         :dataSource="dataSource"
                         :columns="columns"
                         :scroll="{ y: '56vh' }"
@@ -73,6 +74,7 @@
         const { code, result } = await getUserListByDeptId({ orgId: id, pageSize: pageSize.value, pageNo: current.value });
         if (code == 200) {
             dataSource.value = result?.records;
+            total.value = result?.total;
         }
     }
 
@@ -199,4 +201,8 @@
     :deep(.ant-table-pagination-right) {
         margin-right: 10px !important;
     }
-</style>
\ No newline at end of file
+
+    :deep(.no-bottom .ant-table-cell) {
+        border-bottom: none !important;
+    }
+</style>

From 36f484d0286df350596c2dcf686ddb5ba0d0a330 Mon Sep 17 00:00:00 2001
From: zk <k12019@aliyun.com>
Date: Wed, 27 Dec 2023 18:00:39 +0800
Subject: [PATCH 5/5] update

---
 src/assets/images/info-modal.png              | Bin 0 -> 9619 bytes
 src/assets/less/amap-item.less                | 104 ++++++++++--------
 src/assets/mapUtils/map.ts                    |  24 ++++
 src/components/chinaMap/chinaMap.vue          |   2 +-
 src/components/item-d/pieCharts.ts            |  21 +++-
 .../components/basicTable/BasicTable.vue      |   1 +
 .../secondMap/components/footerDialog.vue     |  17 ++-
 .../components/userInfoModal/motion.vue       |  46 +-------
 .../components/userInfoModal/publicTitle.vue  |  16 ++-
 .../components/userInfoModal/temperature.vue  |   5 +-
 .../secondaryScreen/secondMap/secondMap.vue   |  49 ++++++---
 .../secondMap/secondMapHooks.ts               |  76 +++++++++----
 src/views/sys/login.vue                       |   6 +
 13 files changed, 231 insertions(+), 136 deletions(-)
 create mode 100644 src/assets/images/info-modal.png

diff --git a/src/assets/images/info-modal.png b/src/assets/images/info-modal.png
new file mode 100644
index 0000000000000000000000000000000000000000..2be6ce46d0c1b81f9034e2b7ef8e48f7a6aaab4e
GIT binary patch
literal 9619
zcmeHN_dA>4|3;%Cs8!L{DvDM@RBP2<txb(2c4+MuZ%XYEv$Um1sG=yff><?U)1s{%
zBX+IYduzY({#@7huXz8E>&f+ubDrlu_j#T3y6@L31HDHKpc^0x3JL~I4K+gw3Q8RL
zcLjKvd}f%FUz2>G^fY{=LQ(RQ^EU;>O$tplWn&+!_4L5kYY5Y?AE&>sO%m283CV`H
z_p;-uF7wgu@LhF0jk??3WIP09Q7Qb)42o_LWN}(~ZcASZw_=E4dwffo<!o@7#}HIy
zwk?24qyi6`m&Wv+4ovyKbXauA@cii+v~>7kZ1R0Nq5g2~_?hSFhxEz!GE2K@>6>z}
zB^k^XH6>7qf{N)|h!Upd+I2p_O$zb}B_=4C^54Htl`{p9U)^Ml9PT<_rv3L`btY+F
zTalF^<Cc|DV~=HI6ZI3htF=c28|ILdTmL?^#t_=3e_f}c@8lEzb<3?kgIIK~?SA;u
z{!{mPcXPaGNzco_^K{~M?p8V6+Lmz>CY?{-)q&4@12;=veFD3Y0%v1j)lx;Fh)@c^
zO*{!87?9!q2y>*g;VodepW`v2l{2zCjR<^c`M}TkZPQBLQ@nSMMC)wr?oRMuIjkSj
zO$1r!{pe!_ALHb{z;$bBSXCYT*W;Qix!!yW9l|l#`sXUcwJRy<j<p=F2HSt5iLNmI
z3`Q!Zkmg*0nfqOu21lUHbzzN-;;Hb$TDYI}Fc|WCKX>5N?^1!^rGKUmFAtc@KznPB
z9p?8gvCp3s%sxZ!r|Splt@InLY)5`Wmhv;7Px-?6VYYfXd#B@cW8qO4Kl2mWt~2zr
zv4sJa#WCIslu<TR1rBUey#ynSA2OZv^OIqjVZY%!Lw#*|C}EQQcM)no%w0rtnCF|9
z+fnW@V3ovk`kECAgA1CezIz86?(;|9xRTWVtK2=)NRaMaqB^}<H(=IYq#@de>S9p+
zRZ!*l3EKEmkWJH`cWwr9tHd}dN63Vp?uy#URMCzVF`?;zX6L&UAxNR+g!o8dUB0mY
zAs<rM;s&=40e2Ib+TrYrbaL#|sMA3VmCMie#9mM(q<MqYfJ^+J7(MJOxTn_?=8ru+
z<>k$8UlU=Za=zb+rHD-2s;S#CW(?qRyb{WJJew78I2gPUu0^eFmTe~^0y7g;TL!^Y
zxV7a=QhLR`v<M=@kcPrZYk4_-GJiq|{7e<df+$Sn<;n9KSMD?R#E2N@=-^m33pc5?
zsn_bHrl5H|ob}y%&wIvsf@fmI{m#;cKJDLz>(yBJh}~(8uEoVS#bghQGy_}hHrPm*
zLsye+Ev66(fG9QPVUVjUT*_^MPISBjY=*L#GBJ9}`?CVXt1M&|l@r{-TstSDxb%=v
zj7mR0aZrD_s)x7G=zE2+WbGfYAW9d5hpxYXTu!`(N+rcmY=05$Fq@OP7|k_>(30x@
zALj3)smoX(Uw~64`lSU(r=MD?=$3jATHsu@`~*Gn<2Leenyp>f2dP|>=2+DLWuRHH
zpEC&QFSz<b9bASZ{IXkD(9B>aqf7xfc-?$;Q)_z15{MrQTR5<E%8H0dhLkwAhBnT$
zwy(r%FhTdr;npv9U!(Wqf^Y3_*>06I<k|T`5i&@ZyOCCdRP_5v_wz7|c*!11r*H1P
z`8z5X?cT(H03;Y56x8Bwnl;X-Pzxtjnrq+{nF<2bGa+>v;oS>mmwU=j=B(3o@joXH
z?-V>@&*d&OC~z;9qQ16b^WM>^Dw7m9eATLEE*3r#d+XNnhLrPdqH76H2HgccrkL?*
zCP2zMc0IY0(aBafF!2hzYcHk<G$e;*hgf%R(1{EcCHyHj4pTMUPqteZsQ!K%8T_|v
z#-{kI3#n}&0Lw^ICvRG&)#t{iC&eV?Uz&i`F{$6}m{MNE{2QN8cd4=})VWs2e|64w
zxo0kx2XF|&%mfYnrk|EY_`!uO{4D){bJ(-u1`mTQ+9Lpj<b_yR0v=UlX|z>7z|dY&
zqawv-ZvNTZQS2-PKVw@I`AC(_>`{LzCkMJEq%KK14O?-T>v3FEnKbEkEdxk%c~k3h
zkH_ALxx-alY2bYyxG<7k-MG>MGvk*Jrq96amVbWHh?j!{DNmSYD;KN7sSksywqq{f
z2J?#jHZ5>GehUWQp!YAWOBXS&tgKh3r#&&qWEEwDEZI0A-A&&%uKl<NA|isP>9D)y
zL-lpbv7)wBsOrke7#Pmne|aWDvR%Rr0#`TmDf^Z%TlOzOB9vBaI_#_87<Aw>y=vS|
z$W%);9N6$g2wUh%_t6r2f&(A6)Gg^1M6s(#i-ljd{2GggX{(}zQ6-~%_dBZ+ysLes
z3$DJlTXzaprUT8{toNXQssBsocqJn?NB#I04pNjxagY}dahBu7EyXTAMG;^dMskdO
zj92OJK&iiNoGY%NC4M>#kPfFZg7w6jKpWi|{!!I1poRkB{O}eMXtw!t6iVoRjjE#@
z{r`9!tCU(@u7P3_b@3)Ki^!_9pU_Ai7cqh9JHV+;hK#GDkSWPesK5o)ySJ9R#}ixW
zMrtSb!IgR&=?`nX=c8#&QtO?)T&m-5S`mXpWUSaPNEZNj@FBwTR$q8wy%Q2b8J5Rp
zE<SdbZ@hqT$KenY3MX;{RwJu>ZzEp@ix~qYZIs!sa7O-I7ilSHXxCL#uFgVQ3u9~Q
z-2@L&{dIwjRjqFSG6F$02og<mK7JhGSsIWENvbf<qm%zD%q@@rBq~W=IVB)m8HuQl
zNd@m;vi58^##`#_S%zX@OUK+ySRJ0BeLV>6jek<d0|CMt0HxjQU*|5S2nC>=H}kZ#
z;emSkitCMo49uqMtl7O<-L|?{qjlz^K~T0rgBS0NfpzgSZ#L5q_@OosZ_9Sw^ancv
zzzC+ji`aNgp87g?oUK@wX>GVgMQF;ChvlZ(^jFD^E5#S6<<Bk7I_1$zp@-8Va{Wuc
z*Mq7}^8FMp;2dsCwZ`k<pwN7ds6=7q5uj87%Mhu=$p6L-9ZCB7<0CxEJb$bFNcJL9
z#M6X+Hura#HZhxWU9y(x?M|H<zm6oHeK8ksL@#t`sk?YHuJ&vm+O3<pm)Y2@!v*p`
zL|5S^B^g&Gwo6n#2sS;Ies=AO?Qo@&b9<~eyD!w};l(ZjHFpL<crwR`W;;f>u4`@x
zM^aaf6>oHS=(_DY3#{`-RXyd1Ld=iqZl>P7<%qWPFWW2R#z?k#WnkbSZ${5bqo_b6
zesU}u3)fdp6NW2XtQ!rqIb5VCxhR$!LwvDMVOUI+e-`NZ`^w+NkyMi=gd&3%S=_`{
zG-i)=FL!<YP1~D1j4S7X6?P<_Jj*S#haj6KJ<Gflp&r1TO_J`b`jHZ?_JztDj1WI~
z8A%;T8<}w6gZoxO2bZ>0Q*o*%sjdBN8#qS>!QkJmYXji7UC21A;JQtRzLSSRx&|Q0
zTx^VgvE#aF^6g2-C-pr}T#%fh+T|`Q+~hVs!IizlP%Q1i8bDi{WP%IGqZ2~vH9%jo
z`GFp8cE4rQBov3a!0j)S!J27icJy+2`G~%r<*>77U}t~E?)Nd`E;L_Y-5ZRB)oq~{
zv`K+w5hk=h*;oQT4sm2HXAc8jCMHIuKgylLngAo^k*rgg_iw{E87KJcRmc>f1bpV2
za6FA{n}V=|@AnUMR(r4D{ov+l_n)D2Iiiz|@l)$Q8FFP{ZPpJr)R|?1NY|4M{PubT
zky$zN-p}=^wf$+$evz11UZdGOkR>6Lh1ASNRPcL7;S_)?a-ny!*&0MQ9lSh{u5ILI
zHJ$vWqS)l2`(NM(rg&WYq;4cPnkGp8o-+C4LRdBYL6OFB>8~PCT<)ZM@)uhdQ)VT6
zxj1`R1et>dqLhFl3(`H$|1SIo$$w<{ZyNj;8UBlj|E&i9Es+0h4gP;qB>fF7P^DoR
zt06Gw`oV7Q4Nj*6b&<v;X)8^CZ6nnZ@(_O33x7N}cTWO`J^vPFSe<TI53k1VT_$JX
zIV&QsmaBrl{pEmaOZ1T-h9bq^%05i3TP@DNs@g(ZDbI~;lYUB5`|kB@Ci?wC4}GFD
zWE{!mwo3A=-1yVws7e;ShCVU8+tygw?z2?iJ3!_TgHP^15z?!wPmf7zq{=qguyt4@
zZ#x?Sb+&Bwa~mZ&pjLrwz6JFjT5P^S0gB<w%NkI`tto%w)sU)?aa9Z^COIbQPtl&j
zZnhz;2x4}e8u!jx6tG1U66rsY^Q*lU^Uu8A&FI9Bk&V4HrCI{oZX<$l413;;lV)y)
z$yVio72Y@}(g;9S()Md~lAQM|SW3H9!e*ChIpVfA6)9D|e;94vp+9xwd*~hy9Hq(H
zvT~imL{N#i=h-w{xy7Ig+!;jGHMX)DY0Na-8$`v2;xj?Rm(gDFMAT1DCmDo~S+Rzq
z9{eZdRGjP76^LELU*@|+_$-67D>&)dUBpkp_6>FsShAQwtn0D#Z2`$Z_wn}u%dH`w
zm{{7|$b#Bf3pe<I#AG9o*kW~fDqf!s#4h0P-%7b^Dcu5!U=L%nelc5O_F`L9s{VS6
zs1E*ny;h8<F@ELqvdR$21HBMImT7QXtqWxVq3W{G6vM@Idut*m40MrQxl*O;D;2wE
z+6UoO#I9P@oMB>;z}82g7UYY^BEF10g@EA-4-ERmO|<1CWT<V|Fiup9kY&pTaH$c^
zp2GN<@v{kA^DYCli>OQ*ELtK=KxW(O!e&@f>W8b0A<cFgs3}H^8oA^w=Ia9ufP_{$
zME8a_l)6l-d)$&aGA1bn6``fvV^i>QL2GRPV<eTThPylR?d0Ci>+-mIMW%}+bO4{}
zixf7#af9<@$6KT%Wee}jEaHZs^bGFFn&C?-_t)=fTs(jBF<H2YG4wi6XTEun4P!d8
z4ek8^7Vzp+=xK9E5pALh?Ev1VyBmX9ZxY`gDECIVXYmma@WSU)CbU=7(hN*B`uyQ{
zqr85}q3u*KWN6DgPVqw(<t|%z6%8?L_1ANRrfL1Bq5Usl)vup;@v;Dx{xQSgI&^tN
zvkv{U$mvPrB!i;KvU|Pd9Ds3^++N4iiqto4x-$O4$S>?Ybl4aSy9ik=3I{B);wn|h
zifs0WXx)6BnzZC$aIt*_ew_f?q!7&;-Y%I_D4uNo=Bb2o0NC%od&af7CNc5p^XAy}
z0qwh@=gix5{>shkwOZivQ+n*glAJKiEO83sRd3KM48(fZYp9~{MpZ$-+Oy*rBhN5!
znnHJ{D7xw2txM#j)432}=_3ZV7>%4&!`u3ZeXka<@>fnBk=_E>8>RogHZeUxw1Uf~
zr7Qe^!{jWT&j?0ASkQRuuFMwL0ewoA_zi8i%=L-{;EfWAkQ#UY@&uxeDCej#@Byrc
zHW}tLvRcM5J!@Ybh?zksTs^QpJ~O#mL{9!@l|&kV+*ms5x;Z+wJJajglUS#UA8n_~
zX(Mte0I+YA6amyboA8ZG%WQkRU*hljVyP^z&IejUvpbx-6tQNsP0t>q<$~@}@iuV9
z!cy&PrYb<Skp0Ta2L=&6UWC3gjOz`ev+@s12@|wcr3$wT9{SbQ=M;zDx0!zAuG&#p
z!1ThV1@AQKYj*eQwF4Vdm@>kBmH;{YI^o=Ve*u<ZLK$kwkH6F(GZlQu5H#-Twc#0D
z?dgYP{b=xf$K2Oqmr4b<DA2jtt9^5QbVD^vq1w)-<wxptVctSVw^XadCRt_0UA1`k
zM5^JrWXprV-c5-Qk*XT_;j=Ga$`1?#9I4rV_30Zl#i<PYz>D>>Cz)m&a7Teas2VEf
zo6e6sS2jVNV9AAJ+h<L(2A<P(#fgUR#&E?fDwXkLzFVS9j-@|dX(_LYEUSbzn)P`(
zzpNgv2U%e^+Q|AABX0}d_h=as^yFd7$x6De_Gi~TZ^X|GAXc)`D+3#o6hXzo2<bGz
zIg8DWw+PKzD*Z6xL{Z%nDPZc>X!R+MdM;pA%xG#^Hm;%}7?d>8&r)^YcYS>*$dT^_
z={>V0=`E9@b+po9+wjxbh*FlJ)8S7$yvidBe9Ta5fl+zeb_9q!@Yvje4Hp+qK-dhr
zL+dmo8Hx<5Jdj3p7L{+=HK)OKU*AC0-qNU|#_Las#$Wb64_IK>Yp!vn2%4Fz(|raR
zUNbv-uc-QMW3_t-u1M<Kx<@M=OG71llgShD+f45*`zv3lOAtqlC^X8%sXxLkghQKD
zyv+BaLHcCpLKU_?O<|<1+bs>iWRimIWT44S<)9V=pV_zIvXy4NyjY(<CPx)<!5U}k
z>!^aQ_z0j5ByD*yH({OK>CZ61^;B%Y{*D_L%QLmEw@<`uK<KBfUz~y<XF-Q=Y<a<Q
z*QjK9Q7%M23QbW+<fZ+Wt(`XPER|X<Gd8t-sDw5{m<y8!QZ%oM?~(Pv=P|(QcLGn`
z!kQkg(+VF@mB|gsp36nZHb0K&{@Joa06d96@xfW`5Nj>tUCy(2=~zeQU<<L~Xt63+
zvZK`@6pq{7{n9fuhJ3H5^cO#v7NU==ZV;8q{J9DJ9wHRde1%qL-hNPG&Fxf68R9as
z+4h*<j4S^b*Jw3duT^L1IO3h$v{Q?#T6If*jNdp7`^+`i&JA7Vy;h=EnJSO8${*mw
z2HoC|VE^$UG_<vCd^Ta$hK@M}?*1-1sop6g<-A0l=FH4hO~kZk5bN2)Kb}+AomT8x
zO>sD66a$-Bbtew1Xot|ilrp(KAMljm#KoT7^3Jv|evdN~8<Sp>!`+AGlid=Ld>LF-
z^4U1qbYT4G{J?xP(uSRTXzQb&Sxbe7(3Pmc$f_CJXK&oTYRdTU(oE0S=1o>pC~|{B
zxtLR~W)Nw|zMuxtS)(2}=0d@Usxca|^YH5?1;6Rz(}u=Zz)ayiJW^A?Z{a`r?%V{f
zv4n2W;5VX*Z(1~Zi1{Gp&qXU8JTfp6&BNWwB6Yyr^(^&7uSVqQwmDhsuQ>es&%hQu
zqMJvErQX8v2zI9?+EUaaH`DdnMpD(w#DQW1vSKVMB9LLvLG?px6@30eQOT<zzviPm
zE9_a}SG%zHdxdC_L{{Q$t**SGW#tI{(yl>?xXmeBTBR97*3s<N;dZEZ{jzUw5vEN`
zlJTox4cw={1Z)x54<jqffA_8@x9zCdF}T%>ysu1~tTR7~&xAey=+O}EbqSbt6rIFL
z%(b$V3yxJXbAK0Ppe0!?bX-*6JE~{2gndLjK}o*%+~FRq?9)uVlmaZR42J}yO&02K
z$EuP$*YHH%C8R#Q^lTT;4n+)<Okp8z`W~itp^hS{4X9)BLp#&J+0|-xoa)z;a=%Ff
z?vo))T|3lPiN$OL$urkBcUHNWzH%_~gF8yrflZ<KGZS;6HX+C7k7-1Anji^1`{lv=
zD2#;&BS%|UI_HSJOWp9bp*bN<8+Bn@R^HZ}J-&0(?_OR%zAr++f4Esv-~r5Zku3cl
zZ0IbLM3>&D9MOqwoK?1B8(+;5940&}($0S>5qY?tPik*%8C~|+lY#8aL@6?-PPiT|
zR`2&AK&dFxvWOrzUAN+SsbZEixNZb$eYQ~ecdleFuP;dRwpdy?mn`KM4<o0+#Y$9u
zy(PcM?G=S4b|DyVS6=TODmK#C@^zJBe2lO0tnXe~F*?>bv(EETgO=IxsrZPKKfO@u
zwAo&BofQDqvx5{y)%hZ&uDW=km`WU)*57!XgwlEZ8FH5-8=vVPoju^cuOs<aIhIRH
zDkt@>U1?p|zkU8o&%IMBCQ$i%EVm;SX+iY^U#uC%#`$i9I$&+$OU|4`LCAAS7B{%W
zHKj+P;*{E_xGH_eH@t24pN-aX#Y%mdj3X<W%eg@^IzQF<$JxSkznN2ODHi4Ct~aVD
z!s>t{jgi2}4z)B23TowxT7bcdvH+hgQ#XPg*^WJUq^i-!C6q0&_9OI-(;#Wt^1Y*J
zzj_gyQR@8EhVFs~9`NK_Vl$k}7#dort}I#KH5cQf;=NiK%CvEXIlMSFW?)}lpk(tP
zKSju{*d;*SMD{BN>{97gEqq1l-q05`HZS7({=&m%q7REEUQ0Q-dL{C*s<m=*PdWdi
zR>8TP-Hv<H0lR7F{q0`C^s!<Fqh*fK2Zm~NB4_qC)9Hl4M|gAIWj>*3;=-4;D}Q{>
zQe8Hw*D`KpHn9@7)smWH;jaaC?!U~CdwNTfdRRY;SSa}CZdAE7-K9vyjfa&w-yiUH
zASIuH+Y%ofxg3h8&kk|ISvwCnX4)Qjuhx%TMU6h@-*7%HYo%=`gv#v_M}7z*!}#TE
zPdX6ajvxJT;5$B>4)*-`8df4D17R(=CakF%s+^KWTAmg@LN`w_E#s=%KRKW0V5}MD
z*oe-a(6^J*S5dD=db^g_f;%L2btPsi$0FpB%JF_tr3ru75FJLQf#2HIg!U^F6wio}
zwtsJ|Pasd~fTL5myH>fnH`ORDZt}l@-tP}zOoO@%4<)v|gUlDM1{<IBK(^hos{=H!
zr9tSkO+sAPvI^mx@@)@-@#*hqVcXNy3Ds33Ema3=Uom&yX01`@QWFoF8Z4fM7SvTa
zWbEosCYYWe6bgJIDMCU{XC(6HyYobJoBLLj&hxCz)1}Wg!4d_+3?WA#+9F-&i5%Aj
zwH*RtRCnSI1J4e1Xiun8X~o0ADksI=Lz963Yi+ML(Q?m^!lLHCpTG3_8A#H>@BPWJ
z*k1dXgvp!EoDOJ8I8oeFI4`v0R7m*D!;&}Y(CemH&nYc_8L0C>D#&K!cjN0jY&Xhm
z+lqsyJ<P(Qy-bSM!o^y<SY3K0I@=kM&zVxfng^$MM~$M+`<pZb^!?6Sny|4#n}^3F
zI7i-mFJ!*t<Wb2xiOE{){mxHyC$EfN;{Hr>!g@+oD5zMM+Cl+jvlZLCeVB2sUa->Z
z;<&Xo^4GX?DY);>E%7Ch0JXLKg>Spokn`a@N8mOiPwkT*QkuWW&RI$<1vk;6=Ex4{
zLq)Di*`;PaKJFhg^4Q=A{w>>hB&HE|d%hGK*VG(A<?_xb%CD$5aQR^6u{62cT~;Oh
zqC+SD&6^_=K?hx7|C}>0*PgTnPeE4m{&+bHJahBaEeV){)l8mM8JGIbx34U<(2#xo
z*A(cgd#-XIDvx!4{ie@_g}uLh-QyIu5aJ5Ke(3I59^YJgc<J!jb~3j@*+B&=i~``T
zN6|7aBg;)oS$puM!Wx$oG`w84*>&vp_xbJSE!1U%r4U4M&ye7&SNLWr<7{0>fnJ=P
zwJiadaOoAl-Z8}sH7!j@Xoqb}sm~Yg8~qjJnD*~`+|O#nsCbHLEX&(-llPtL)(;^A
zg1mUWYl_?ql)mHZOIGG_UxPot$%M(hsD3@dlepkweVdG-b5_S>TpF^TR)=hq&XIfR
zxV}Tr6#uI_{haRI$?z|_Jas8H9>0}cFBf8GzV-QN0SPgD=>l(LJh}OsO59f{1>Dc1
zdgUHt)nq&5x}M)UAY5{j^|jr<0#v4;s#hg{FV|Z+I>7w+^n=|&6aB`V+rsbMxYvst
zXE>@6_h+6yS3)HNZzAgf33;I*yOmS^C!T!6MMXh@=WW$I1V-VDsuHs2;~gi^3!s$w
zBfHO9wCmvJd-S$ynwo}Ou~1Kb>&b<#3UY7cTLt(+P?mgnIg$UB8;OSgrP0r1%pTG>
SaUxe)QD~~`sg<ap(EkTm1CL$+

literal 0
HcmV?d00001

diff --git a/src/assets/less/amap-item.less b/src/assets/less/amap-item.less
index 10ea617..0248f3c 100644
--- a/src/assets/less/amap-item.less
+++ b/src/assets/less/amap-item.less
@@ -1,65 +1,79 @@
 //高德信息弹窗
 .amap-info-contentContainer {
-    .amap-content-body {
-        background: #00152B;
-        border: 1px solid #129BFF;
+  .amap-content-body {
+    background: #00152B;
+    border: 1px solid #129BFF;
 
-        .amap-lib-infowindow {
-            background: #00152B;
+    .amap-lib-infowindow {
+      background: #00152B;
 
-            .amap-lib-infowindow-title {
-                color: #fff;
-                border-bottom: 1px solid #129BFF;
-                padding: 4px 0;
-            }
+      .amap-lib-infowindow-title {
+        color: #fff;
+        border-bottom: 1px solid #129BFF;
+        padding: 4px 0;
+      }
 
-            .amap-lib-infowindow-content {
-                color: #fff;
-                padding: 4px 0;
-            }
-        }
+      .amap-lib-infowindow-content {
+        color: #fff;
+        padding: 4px 0;
+      }
     }
+  }
 
-    .amap-combo-close {
-        top: 5px;
-        right: 7px;
-    }
+  .amap-combo-close {
+    top: 5px;
+    right: 7px;
+  }
 }
 
 
 /*地图元素样式---start*/
 //marker
 .amap-marker-label {
-    padding: 0;
-    border: none;
+  padding: 0;
+  border: none;
 }
 
 .alarm-content {
-    background-color: #263d5e;
+  background-color: #263d5e;
+  color: #fff;
+  font-size: 14px;
+  padding: 7px 10px;
+  border: 1px solid #1b7ef2;
+  position: relative;
+
+  .close-btn {
+    position: absolute;
+    top: -6px;
+    right: -8px;
+    width: 15px;
+    height: 15px;
+    font-size: 12px;
+    background: #ccc;
+    border-radius: 50%;
     color: #fff;
-    font-size: 14px;
-    padding: 7px 10px;
-    border: 1px solid #1b7ef2;
-    position: relative;
+    text-align: center;
+    line-height: 15px;
+    box-shadow: -1px 1px 1px rgba(10, 10, 10, 0.2);
+  }
 
-    .close-btn {
-        position: absolute;
-        top: -6px;
-        right: -8px;
-        width: 15px;
-        height: 15px;
-        font-size: 12px;
-        background: #ccc;
-        border-radius: 50%;
-        color: #fff;
-        text-align: center;
-        line-height: 15px;
-        box-shadow: -1px 1px 1px rgba(10, 10, 10, 0.2);
-    }
-
-    .close-btn:hover {
-        background: #666;
-    }
+  .close-btn:hover {
+    background: #666;
+  }
 }
 
-/*地图元素样式---end*/
\ No newline at end of file
+/*地图元素样式---end*/
+/*infoWindow*/
+.amap-info-content {
+  width: 100%;
+  height: 100%;
+  background: url("../images/info-modal.png") no-repeat center;
+  background-size: 100% 100%;
+  //padding: 16px 18px 22px 10px;
+}
+
+.amap-info-contentContainer {
+  .amap-info-sharp {
+    border-top: none;
+  }
+}
\ No newline at end of file
diff --git a/src/assets/mapUtils/map.ts b/src/assets/mapUtils/map.ts
index da5ab03..c07fa8d 100644
--- a/src/assets/mapUtils/map.ts
+++ b/src/assets/mapUtils/map.ts
@@ -16,6 +16,7 @@ export const Map = {
     airMarkerList: [], //直升机markerList
     placeSearch: null, //地点查询
     marker: null, // 健康终端报警
+    infoWindow: null, //地图弹窗
     /**
      * @desc 地图舒适化
      * @param el dom元素 id选择器
@@ -101,6 +102,7 @@ export const Map = {
             this.airMarkerList = [];
         }
         this.clearActiveHospital();
+        this.clearInfoModal();
         // this.map.remove(this.airMarkerList);
     }, //
     /**
@@ -132,6 +134,8 @@ export const Map = {
                 position: [lon, lat], // 指定点的icon，也可以是个url ，但这样就不能对图片进行设置了
                 icon: startIcon, //启用点击事件 如果需要点击事件，必须开启
                 clickable: true, //点额外携带的数据，用户自定义属性，支持JavaScript API任意数据类型
+                offset: [-18, -32],
+                maxZoom: 14,
                 extData: result[i],
                 label: {
                     content: isFunction(extData?.content) && extData?.content(result[i]),
@@ -277,4 +281,24 @@ export const Map = {
             this.marker = null;
         }
     },
+    /**
+     * @desc 创建地图详情弹窗
+     *
+     * */
+    createInfoModal({ option, content }) {
+        let { lat, lng } = option;
+        this.infoWindow = new AMap.InfoWindow({
+            position: [lng, lat],
+            offset: new AMap.Pixel(-5, -25),
+            content: content,
+            closeWhenClickMap: true,
+        });
+        this.infoWindow.open(this.map);
+    },
+    clearInfoModal() {
+        if (this.infoWindow) {
+            this.infoWindow?.setMap(null);
+            this.infoWindow = null;
+        }
+    },
 };
diff --git a/src/components/chinaMap/chinaMap.vue b/src/components/chinaMap/chinaMap.vue
index 9ca3ac3..13ebf6a 100644
--- a/src/components/chinaMap/chinaMap.vue
+++ b/src/components/chinaMap/chinaMap.vue
@@ -86,7 +86,7 @@
         Map.clearActiveHospital();
         Map.map.off('moveend', logMapinfo);
         if (TabType.diFangYiYuan == item.type) {
-            Map.clearActiveHospital();
+            Map.removeOverlayGroup();
             Map.map.on('moveend', logMapinfo);
             return;
         }
diff --git a/src/components/item-d/pieCharts.ts b/src/components/item-d/pieCharts.ts
index a104caf..9c3c1d1 100644
--- a/src/components/item-d/pieCharts.ts
+++ b/src/components/item-d/pieCharts.ts
@@ -79,18 +79,31 @@ export function circleRing(chartData, total, color) {
         series: [
             {
                 type: 'pie',
-                radius: ['50%', '82%'],
-                center: ['42%', '55%'],
+                radius: ['50%', '75%'],
+                center: ['42%', '50%'],
                 avoidLabelOverlap: false,
+                // label: {
+                //     show: true,
+                //     // position: 'inner',
+                //     formatter: '{d}%',
+                //     color: '#ffffff',
+                //     fontSize: 14,
+                // },
+                // labelLine: {
+                //     show: false,
+                // },
                 label: {
                     show: true,
-                    position: 'inner',
+                    position: 'outside',
                     formatter: '{d}%',
                     color: '#ffffff',
                     fontSize: 14,
                 },
                 labelLine: {
-                    show: false,
+                    show: true,
+                    length: 4,
+                    length2: 12,
+                    minTurnAngle: 120,
                 },
                 data: data,
             },
diff --git a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
index 58487b1..0c78b6b 100644
--- a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
+++ b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
@@ -126,6 +126,7 @@
     .ant-table-striped :deep(.table-striped) td {
         background-color: #00152b;
         border-bottom: 1px solid #2384dd;
+        padding: 10px 4px !important;
     }
 
     :deep(.ant-table-tbody > tr.ant-table-row:hover > td, .ant-table-tbody > tr > td.ant-table-cell-row-hover) {
diff --git a/src/components/secondaryScreen/secondMap/components/footerDialog.vue b/src/components/secondaryScreen/secondMap/components/footerDialog.vue
index fe1ff16..074186b 100644
--- a/src/components/secondaryScreen/secondMap/components/footerDialog.vue
+++ b/src/components/secondaryScreen/secondMap/components/footerDialog.vue
@@ -1,15 +1,21 @@
 <template>
     <div class="modal-content">
-        <!--        <div class="empty-png"></div>-->
         <div class="modal-header">
             <button type="button" aria-label="Close" class="modal-close" @click="closeDialog">X</button>
             <div class="modal-title" id="vcDialogTitle0">健康报警员工信息</div>
         </div>
         <div class="modal-body">
             <div class="info-left">
-                <div v-for="item in detailLeft" :key="item.key"
-                    ><span class="info-label">{{ item.name }}：</span><span class="info-value">{{ item.value }}</span></div
-                >
+                <div v-for="item in detailLeft" :key="item.key">
+                    <template v-if="item.customRender">
+                        <span class="info-label">{{ item.name }}：</span>
+                        <span class="info-value"> {{ item.customRender(item.value) }}</span>
+                    </template>
+                    <template v-else>
+                        <span class="info-label">{{ item.name }}：</span>
+                        <span class="info-value">{{ item.value }}</span>
+                    </template>
+                </div>
             </div>
             <div class="info-right">
                 <div v-for="item in detailRight" :key="item.key"
@@ -95,7 +101,10 @@
                 line-height: 28px;
 
                 .info-label {
+                    display: inline-flex;
                     font-weight: bold;
+                    width: 70px;
+                    justify-content: flex-end;
                 }
             }
         }
diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue
index 6108f91..1bd3f07 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue
@@ -7,23 +7,6 @@
         :keyType="keyType"
         :user-id="userId"
     />
-    <!--    <div class="item-three" style="display: flex; justify-content: center">-->
-    <!--        <div style="width: 15%; text-align: center">-->
-    <!--            <div>-->
-    <!--                <span style="font-size: 25px"> {{ maxInfo > 1000 ? (maxInfo / 1000).toFixed(2) : maxInfo }}</span>-->
-    <!--                <span style="color: #aa9db6">{{ maxInfo > 1000 ? 'km' : 'm' }}</span>-->
-    <!--            </div>-->
-    <!--            <div style="color: #aa9db6">总运动距离</div>-->
-    <!--        </div>-->
-    <!--        <div style="width: 15%; text-align: center">-->
-    <!--            <div>-->
-    <!--                <span style="font-size: 25px"> {{ minInfo > 1000 ? (minInfo / 1000).toFixed(2) : minInfo }}</span>-->
-    <!--                <span style="color: #aa9db6">{{ minInfo > 1000 ? '千卡' : '卡' }}</span>-->
-    <!--            </div>-->
-    <!--            <div style="color: #aa9db6">总卡路里</div>-->
-    <!--        </div>-->
-    <!--    </div>-->
-
     <BasicTable :key="refresh" :columns="motionColumns" :api="queryExercisePageApi" :api-params="apiParams" :afterFetch="afterFetch" />
 </template>
 <script setup lang="ts">
@@ -39,10 +22,7 @@
     const type = ref(1);
     const status = ref<boolean>(true);
     const value = ref(dayjs(new Date()).format('YYYY-MM-DD'));
-    const maxInfo = ref();
-    const minInfo = ref();
     const motionType = ref();
-
     const props = defineProps({
         userId: propTypes.string.def(''),
         keyType: propTypes.string.def('6'),
@@ -89,29 +69,5 @@
         motionType.value = s;
         tableReload();
     }
-
-    function getParams() {
-        let params = {
-            flag: type.value,
-            userId: props.userId,
-            type: motionType.value,
-        };
-        switch (type.value) {
-            case 1:
-                params['dateDay'] = value.value;
-                break;
-            case 2:
-                params['dateWeekStart'] = value.value.substring(0, value.value.indexOf('~') - 1);
-                params['dateWeekEnd'] = value.value.substring(value.value.indexOf('~') + 2);
-                break;
-            case 3:
-                params['dateMonth'] = value.value;
-                break;
-            case 4:
-                params['dateYear'] = value.value;
-                break;
-        }
-        return params;
-    }
 </script>
-<style scoped lang="less"></style>
+<style scoped lang="less"></style>
\ No newline at end of file
diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue
index 091108b..b7345a5 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/publicTitle.vue
@@ -1,4 +1,5 @@
 <template>
+    <!--周月年  -->
     <div
         class="public-title"
         style="display: flex; align-items: center; justify-content: center; position: relative"
@@ -15,12 +16,18 @@
             {{ showStatus ? '列表展示' : '图表展示' }}
         </div>
     </div>
+
     <div
         class="public-title"
         style="display: flex; justify-content: center; margin-top: 20px; align-items: center; position: relative"
         :style="{ minHeight: props.showList ? '' : '30px' }"
     >
-        <div class="fff" style="position: absolute; left: 10px; display: flex; align-items: center; color: #fff" v-if="!props.showList">
+        <!--   锻炼类型-->
+        <div
+            class="fff"
+            style="position: absolute; left: 10px; display: flex; align-items: center; color: #fff; margin-bottom: 10px"
+            v-if="!props.showList"
+        >
             锻炼类型：
             <a-select
                 v-model:value="motionType"
@@ -30,7 +37,8 @@
                 @change="changeSelect"
             ></a-select>
         </div>
-        <div style="display: flex; font-size: 20px; align-items: center" v-if="showStatus && props.showList">
+        <!--日期-->
+        <div style="display: flex; font-size: 20px; align-items: center; gap: 10px" v-if="showStatus && props.showList">
             <a-button class="btn" type="primary" size="small" @click="changeDate('0')">
                 <LeftOutlined class="icon" style="color: #fff" />
             </a-button>
@@ -51,7 +59,7 @@
                         </div>
                     </template>
                 </a-date-picker>
-                <div style="z-index: 1; min-width: 150px; text-align: center; color: #fff">{{ getDateFormat(dateInfo) }} </div>
+                <div style="z-index: 1; min-width: 150px; text-align: center; color: #fff">{{ getDateFormat(dateInfo) }}</div>
             </div>
             <a-button class="btn" type="primary" :disabled="!isRight" size="small" @click="changeDate('1')">
                 <RightOutlined class="icon" style="color: #fff" />
@@ -284,4 +292,4 @@
             box-shadow: none;
         }
     }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue
index d98000a..4c511b9 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue
@@ -139,6 +139,9 @@
                         {
                             type: 'value',
                             name: '温度',
+                            nameTextStyle: {
+                                color: '#fff',
+                            },
                             axisLabel: {
                                 color: '#fff',
                             },
@@ -205,4 +208,4 @@
         initEchart('0');
     });
 </script>
-<style scoped lang="less"></style>
+<style scoped lang="less"></style>
\ No newline at end of file
diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue
index 103dfc8..f717896 100644
--- a/src/components/secondaryScreen/secondMap/secondMap.vue
+++ b/src/components/secondaryScreen/secondMap/secondMap.vue
@@ -9,7 +9,6 @@
             </div>
             <div v-show="false" id="container"></div>
             <div v-show="false" id="panel"></div>
-            <!--            <div v-show="isShow" :class="className" class="footer-data" style="&#45;&#45;moveUp: 120px; &#45;&#45;moveDown: -80px">-->
             <div v-show="isShow" :class="className" class="footer-data" style="--moveUp: 20px; --moveDown: -80px">
                 <div
                     v-for="item in footerList"
@@ -39,10 +38,9 @@
     import $bus from '/@/utils/bus.ts';
     import FooterDialog from '/@/components/secondaryScreen/secondMap/components/footerDialog.vue';
     import WatchListDialog from '/@/components/secondaryScreen/secondMap/components/watchListDialog.vue';
-    import { useAlarmDetail, useFooterTable, useMoveClass } from '/@/components/secondaryScreen/secondMap/secondMapHooks.ts';
+    import { infoContent, useAlarmDetail, useFooterTable, useMoveClass } from '/@/components/secondaryScreen/secondMap/secondMapHooks.ts';
     import { footerApi, mapListApi } from '/@/components/secondaryScreen/secondMap/secondMapApi.ts';
     import { earlyWarning } from '/@/utils/busConstant.ts';
-    import { getToday } from '/@/utils/utils.ts';
 
     const props = defineProps({
         orgCode: String,
@@ -71,26 +69,24 @@
     const { footerList, setFooterList, setIsShowAlarm, isShowAlarm } = useFooterTable();
 
     async function getFooterTable(orgCode) {
-        const params = {
+        let params = {
             orgCode: orgCode || props.orgCode,
-            // dataDate: getToday(),
         };
         const { code, result } = await footerApi(params);
         if (code == 200) {
+            setIsShow(true);
             setFooterList(result);
         }
     }
 
     async function getMapList() {
+        let orgCode = props.orgCode?.substring(0, 6);
+        getFooterTable(orgCode);
         try {
             const { code, result } = await mapListApi({ orgCode: props.orgCode });
             if (code == 200 && result.length > 0) {
                 const newArr = result.map((item) => ({ ...item, type: '6' }));
                 mapList.value = newArr;
-                let orgCode = newArr[0].orgCode?.substring(0, 6);
-                getFooterTable(orgCode);
-                setIsShow(true);
-
                 Map.createOverlay(
                     newArr,
                     {
@@ -104,14 +100,20 @@
                             </div>`;
                         },
                     },
-                    (val) => {
-                        getFooterTable(val.orgCode?.substring(0, 6));
-                        setIsShow(true);
+                    async (val) => {
+                        let params = {
+                            orgCodeLeaf: val.orgCode,
+                            orgCode: null,
+                        };
+                        const { code, result } = await footerApi(params);
+                        if (code == 200) {
+                            Map.createInfoModal({ option: val, content: infoContent(result) });
+                            setIsShow(true);
+                        }
                     }
                 );
             } else {
                 Map.removeOverlayGroup();
-                setIsShow(false);
             }
         } catch {}
     }
@@ -246,4 +248,25 @@
             }
         }
     }
+
+    :deep(.watch-modal) {
+        width: 300px;
+        height: 190px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        padding-left: 10px;
+
+        .modal-row {
+            font-size: 16px;
+            line-height: 34px;
+            color: #fff;
+
+            .label {
+                display: inline-flex;
+                justify-content: flex-end;
+                width: 140px;
+            }
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/src/components/secondaryScreen/secondMap/secondMapHooks.ts b/src/components/secondaryScreen/secondMap/secondMapHooks.ts
index e17b130..a4886b2 100644
--- a/src/components/secondaryScreen/secondMap/secondMapHooks.ts
+++ b/src/components/secondaryScreen/secondMap/secondMapHooks.ts
@@ -80,12 +80,6 @@ export function useFooterTable() {
             key: 'userCount',
             extData: {},
         },
-        // {
-        //     name: '入库设备数量',
-        //     value: '',
-        //     key: 'deviceNum',
-        //     extData: {},
-        // },
         {
             name: '佩戴手表人数',
             value: '',
@@ -104,12 +98,6 @@ export function useFooterTable() {
             key: 'thirtyDayNum',
             extData: {},
         },
-        {
-            name: '近一年活跃人数',
-            value: '',
-            key: 'yearDayNum',
-            extData: {},
-        },
     ]);
 
     function setFooterList(res: any) {
@@ -148,6 +136,18 @@ export function useAlarmDetail() {
             value: '',
             key: 'orgName2',
         },
+        {
+            name: '位置',
+            value: '',
+            key: '',
+            customRender: (record) => {
+                if (record?.lat) {
+                    return `${record.lat},${record.lon}`;
+                } else {
+                    return '未知位置';
+                }
+            },
+        },
     ]);
     const detailRight = ref([
         {
@@ -175,10 +175,18 @@ export function useAlarmDetail() {
     function setDetail(res) {
         if (res) {
             detailLeft.value.forEach((item) => {
-                item.value = res[item.key];
+                if (item.customRender) {
+                    item.value = res;
+                } else {
+                    item.value = res[item.key];
+                }
             });
             detailRight.value.forEach((item) => {
-                item.value = res[item.key];
+                if (item.customRender) {
+                    item.value = res;
+                } else {
+                    item.value = res[item.key];
+                }
             });
         }
     }
@@ -238,7 +246,7 @@ export function useTree() {
 
 export const columns = [
     {
-        title: '员工名称',
+        title: '员工姓名',
         dataIndex: 'realName',
         align: 'center',
         key: 'realName',
@@ -248,18 +256,21 @@ export const columns = [
         dataIndex: 'orgName',
         align: 'center',
         key: 'orgName',
+        ellipsis: true,
     },
     {
         title: '部门名称',
         dataIndex: 'orgName1',
         align: 'center',
         key: 'orgName1',
+        ellipsis: true,
     },
     {
         title: '工具编码',
         dataIndex: 'watchNo',
         align: 'center',
         key: 'watchNo',
+        ellipsis: true,
     },
     {
         title: '心率（次/分）',
@@ -314,14 +325,41 @@ export const columns = [
 ];
 
 export function useChangeTable() {
-    const refresh = ref(true)
+    const refresh = ref(true);
 
     function setRefresh() {
-        refresh.value = !refresh.value
+        refresh.value = !refresh.value;
     }
 
     return {
         refresh,
-        setRefresh
-    }
+        setRefresh,
+    };
+}
+
+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?.userCount}</span>
+            </div>
+            <div class="modal-row">
+                <span class="label">佩戴手表人数：</span>
+                <span class="text">${res?.allotDeviceNum}</span>
+            </div>
+            <div class="modal-row">
+                <span class="label">近一周活跃人数：</span>
+                <span class="text">${res?.sevenDayNum}</span>
+            </div>
+            <div class="modal-row">
+                <span class="label">近一月人数：</span>
+                <span class="text">${res?.thirtyDayNum}</span>
+            </div>
+        </div>
+    `;
 }
\ No newline at end of file
diff --git a/src/views/sys/login.vue b/src/views/sys/login.vue
index ef2762d..4d88d18 100644
--- a/src/views/sys/login.vue
+++ b/src/views/sys/login.vue
@@ -99,6 +99,8 @@
     import { t } from '/@/hooks/locales/useLocales.ts';
     import { encipher } from '/@/utils/jsencrypt';
     import { useRouter } from 'vue-router';
+    import { getAuthCache } from '/@/utils/auth.ts';
+    import { TOKEN_KEY } from '/@/enum/cacheEnum.ts';
 
     const router = useRouter();
     // console.log(t('login'));
@@ -203,6 +205,10 @@
     onMounted(() => {
         //加载验证码
         handleChangeCheckCode();
+        let token = getAuthCache(TOKEN_KEY);
+        if (token) {
+            router.push({ path: '/home' });
+        }
     });
 </script>