From 5a33aa1df4ee900d7c079177e41cf7953e6958f2 Mon Sep 17 00:00:00 2001 From: zk Date: Thu, 21 Dec 2023 14:07:18 +0800 Subject: [PATCH] update --- .eslintignore | 1 + src/components/item-d/pieCharts.ts | 2 +- .../components/userInfoModal/bloodOxygen.vue | 7 ++++++- .../components/userInfoModal/heartRate.vue | 7 ++++++- .../components/userInfoModal/motion.vue | 7 ++++++- .../components/userInfoModal/pressure.vue | 7 ++++++- .../secondMap/components/userInfoModal/sleep.vue | 8 ++++++-- .../components/userInfoModal/stepNumber.vue | 7 ++++++- .../components/userInfoModal/temperature.vue | 7 ++++++- .../secondaryScreen/secondMap/secondMap.vue | 4 ++-- src/utils/socket.ts | 16 ++++++++-------- 11 files changed, 54 insertions(+), 19 deletions(-) diff --git a/.eslintignore b/.eslintignore index 787e9b3..55a9bb7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,6 +7,7 @@ node_modules .vscode .idea dist +dist.zip /public /docs .husky diff --git a/src/components/item-d/pieCharts.ts b/src/components/item-d/pieCharts.ts index 9d3a4ff..31a8079 100644 --- a/src/components/item-d/pieCharts.ts +++ b/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: { diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/bloodOxygen.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/bloodOxygen.vue index 307dcf2..f9d6744 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/bloodOxygen.vue +++ b/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 = { diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/heartRate.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/heartRate.vue index bd90846..dd8f62a 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/heartRate.vue +++ b/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 = { diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue index 8fefb4f..db5329f 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/motion.vue +++ b/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 = { diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/pressure.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/pressure.vue index 1732fea..ec6df73 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/pressure.vue +++ b/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() { diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue index 01595a9..93c58cb 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue +++ b/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(); }); } diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue index 5991081..e5f6be1 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue +++ b/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 = { diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue index edf5f0c..2ef5940 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/temperature.vue +++ b/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 = { diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue index c5f0b8b..f3d52f3 100644 --- a/src/components/secondaryScreen/secondMap/secondMap.vue +++ b/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); } ); diff --git a/src/utils/socket.ts b/src/utils/socket.ts index 3b7d68e..bdb61fb 100644 --- a/src/utils/socket.ts +++ b/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;