update

.eslintignore

@@ -7,6 +7,7 @@ node_modules
 .vscode
 .idea
 dist
+dist.zip
 /public
 /docs
 .husky

src/components/item-d/pieCharts.ts

@@ -1,7 +1,7 @@
 // 步数
 import {visibleChartLabel} from "/@/utils/utils.ts";
 
-export function screenPie(chartData, total, color, formatter) {
+export function screenPie(chartData, total, color) {
     return {
         color: color,
         tooltip: {

src/components/secondaryScreen/secondMap/components/userInfoModal/bloodOxygen.vue

@@ -52,7 +52,12 @@
         keyType: propTypes.string.def('2'),
     });
     const { refresh, setRefresh } = useChangeTable();
-    const apiParams = ref(getParams());
+    const apiParams = ref({
+        flag: 0,
+        userId: props.userId,
+        pageSize: 10,
+        pageNo: 1,
+    });
 
     function tableReload() {
         apiParams.value = {

src/components/secondaryScreen/secondMap/components/userInfoModal/heartRate.vue

@@ -53,7 +53,12 @@
         keyType: propTypes.string.def('1'),
     });
     const { refresh, setRefresh } = useChangeTable();
-    const apiParams = ref(getParams());
+    const apiParams = ref({
+        flag: 0,
+        userId: props.userId,
+        pageSize: 10,
+        pageNo: 1,
+    });
 
     function tableReload() {
         apiParams.value = {

src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue

@@ -48,7 +48,12 @@
         keyType: propTypes.string.def('6'),
     });
     const { refresh, setRefresh } = useChangeTable();
-    const apiParams = ref(getParams());
+    const apiParams = ref({
+        flag: 0,
+        userId: props.userId,
+        pageSize: 10,
+        pageNo: 1,
+    });
 
     function tableReload() {
         apiParams.value = {

src/components/secondaryScreen/secondMap/components/userInfoModal/pressure.vue

@@ -50,7 +50,12 @@
     });
 
     let echart = null;
-    const apiParams = ref(getParams());
+    const apiParams = ref({
+        flag: 0,
+        userId: props.userId,
+        pageSize: 10,
+        pageNo: 1,
+    });
     const { refresh, setRefresh } = useChangeTable();
 
     function tableReload() {

src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue

@@ -55,7 +55,12 @@
         keyType: propTypes.string.def('4'),
     });
     const { refresh, setRefresh } = useChangeTable();
-    const apiParams = ref(getParams());
+    const apiParams = ref({
+        flag: 0,
+        userId: props.userId,
+        pageSize: 10,
+        pageNo: 1,
+    });
 
     function tableReload() {
         nextTick(() => {
@@ -65,7 +70,6 @@
                 pageSize: 10,
                 pageNo: 1,
             };
-            console.log('apiParams.value', apiParams.value);
             setRefresh();
         });
     }

src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue

@@ -55,7 +55,12 @@
         keyType: propTypes.string.def('7'),
     });
     const { refresh, setRefresh } = useChangeTable();
-    const apiParams = ref(getParams());
+    const apiParams = ref({
+        flag: 0,
+        userId: props.userId,
+        pageSize: 10,
+        pageNo: 1,
+    });
 
     function tableReload() {
         apiParams.value = {

src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue

@@ -52,7 +52,12 @@
         keyType: propTypes.string.def('5'),
     });
     const { refresh, setRefresh } = useChangeTable();
-    const apiParams = ref(getParams());
+    const apiParams = ref({
+        flag: 0,
+        userId: props.userId,
+        pageSize: 10,
+        pageNo: 1,
+    });
 
     function tableReload() {
         apiParams.value = {

src/components/secondaryScreen/secondMap/secondMap.vue

@@ -83,7 +83,7 @@
 
     async function getMapList() {
         try {
-            const { code, result } = await mapListApi({});
+            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;
@@ -101,7 +101,7 @@
                         },
                     },
                     (val) => {
-                        getFooterTable(val.orgCode);
+                        getFooterTable(val.orgCode?.substring(0, 6));
                         setIsShow(true);
                     }
                 );

src/utils/socket.ts

@@ -1,4 +1,4 @@
-import { onMounted, onUnmounted, ref } from 'vue';
+import { ref } from 'vue';
 import { getAppEnvConfig } from '/@/utils/env.ts';
 import { useUserStore } from '/@/store/modules/user.ts';
 import { getAuthCache } from '/@/utils/auth.ts';
@@ -33,7 +33,7 @@ export function useSocket(p = basicPath) {
 
     //心跳检测
     const heartCheck = {
-        timeout: 1000 * 10, //1分钟发一次心跳
+        timeout: 1000 * 50, //50s发一次心跳
         timeoutObj: null,
         serverTimeoutObj: null,
         reset: function () {
@@ -47,10 +47,10 @@ export function useSocket(p = basicPath) {
                 //这里发送一个心跳，后端收到后，返回一个心跳消息，
                 //onmessage拿到返回的心跳就说明连接正常
                 if (socket.value.readyState === WebSocket.OPEN) {
-                    //console.log('p1' + new Date().toLocaleString());
+                    console.log('连接正常' + new Date().toLocaleString());
                     socket.value.send('ping');
                 } else {
-                    //console.log('p2');
+                    console.log('连接断开');
                     init();
                 }
                 self.serverTimeoutObj = setTimeout(function () {
@@ -74,20 +74,20 @@ export function useSocket(p = basicPath) {
 
             socket.value.onclose = function () {
                 reconnect(path.value);
-                //console.log('连接关闭!:', new Date().toLocaleString());
+                console.log('连接关闭', new Date().toLocaleString());
             };
             socket.value.onerror = function () {
                 reconnect(path.value);
-                //console.log('连接错误!');
+                console.log('连接错误');
             };
             socket.value.onopen = function () {
                 heartCheck.reset().start(); //心跳检测重置
-                //console.log('连接成功!' + new Date().toLocaleString());
+                console.log('连接成功:' + new Date().toLocaleString());
             };
             socket.value.onmessage = function (event) {
                 //如果获取到消息，心跳检测重置
                 heartCheck.reset().start(); //拿到任何消息都说明当前连接是正常的
-                //console.log('收到消息啦:', event);
+                console.log('收到消息:', event.data);
                 if (event.data != 'pong') {
                     let data = JSON.parse(event.data);
                     socketData.value = data;