From cf129e6d23b1335dd5dc35d0595a9eef7ea1d7c4 Mon Sep 17 00:00:00 2001 From: wx <645899409@qq.com> Date: Wed, 9 Jul 2025 17:33:51 +0800 Subject: [PATCH] =?UTF-8?q?update=201.=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 8 ---- src/api/request.ts | 1 - src/assets/mapUtils/map.ts | 4 +- src/components/body-d-right/oneR.vue | 1 - src/components/item-d/item-d.vue | 1 + .../screen-left/screenLeft.vue | 15 +++++-- src/components/xianMap/xianMap.vue | 4 -- src/hooks/autoRefresh/pageRefreshTime.ts | 2 +- src/store/modules/user.ts | 1 - src/utils/socket.ts | 1 - src/utils/utils.ts | 2 +- src/views/components/employeeDialog.vue | 1 - src/views/index.api.ts | 2 + src/views/indexSon.vue | 41 +++++++++++-------- src/views/indexSun.vue | 2 - src/views/indexSun/centerMap.vue | 16 +++----- src/views/indexSun/indexModal.vue | 1 - src/views/indexSun/indexSun.ts | 5 +-- 18 files changed, 48 insertions(+), 60 deletions(-) diff --git a/src/App.vue b/src/App.vue index 17141fd..73324fa 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,24 +10,16 @@ import { onMounted, watch } from 'vue'; import { getEmergencyCenterApi } from '/@/api/user.ts'; import { useUserStore } from '/@/store/modules/user.ts'; - import { useRouter } from 'vue-router'; - import { getBaseLogin } from '/@/enum/pageEnum.ts'; dayjs.locale('zh-cn'); const locle = zhCN; const userStore = useUserStore(); - const router = useRouter(); onMounted(async () => { try { if (userStore.getToken) { const { result } = await getEmergencyCenterApi(); - if (result?.screenPath) { - router.replace(result?.screenPath); - } else { - router.replace('/home'); - } userStore.setCenterInfo(result); } } catch (e) {} diff --git a/src/api/request.ts b/src/api/request.ts index 96f1a24..33ef3ff 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -31,7 +31,6 @@ service.interceptors.response.use( }, (error) => { if (error.response) { - console.log('response', error.response); switch (error.response.data.code) { case 401: // debugger; diff --git a/src/assets/mapUtils/map.ts b/src/assets/mapUtils/map.ts index 78fcb51..4464c4e 100644 --- a/src/assets/mapUtils/map.ts +++ b/src/assets/mapUtils/map.ts @@ -155,7 +155,7 @@ export const Map = { if (lng) { lon = lng; } - if (!longitude || !latitude || !type) { + if (!lon || !lat || !type) { continue; } // 创建一个 Icon @@ -394,7 +394,6 @@ export const Map = { }); this.driveLine.on('error', function (result) { let str = '定位失败：'; - console.log('error', result); switch (result.info) { case 'PERMISSION_DENIED': str += '浏览器阻止了定位操作'; @@ -409,7 +408,6 @@ export const Map = { str += '未知错误'; break; } - console.log(str); return false; }); }, diff --git a/src/components/body-d-right/oneR.vue b/src/components/body-d-right/oneR.vue index b2f8d13..76e01f9 100644 --- a/src/components/body-d-right/oneR.vue +++ b/src/components/body-d-right/oneR.vue @@ -153,7 +153,6 @@ }); async function getScrollList() { - console.log(dayjs()); try { const { code, result } = await getMonitorList({ pageSize: 10, diff --git a/src/components/item-d/item-d.vue b/src/components/item-d/item-d.vue index 36de752..0d670fd 100644 --- a/src/components/item-d/item-d.vue +++ b/src/components/item-d/item-d.vue @@ -65,6 +65,7 @@ function initChart(chartData, total, color) { let myChart = echarts.init(healthChart.value); let options = circleRing(chartData, total, color); + console.log(options); myChart.setOption(options); window.addEventListener('resize', () => { myChart.resize(); diff --git a/src/components/secondaryScreen/screen-left/screenLeft.vue b/src/components/secondaryScreen/screen-left/screenLeft.vue index fc0a379..998abc6 100644 --- a/src/components/secondaryScreen/screen-left/screenLeft.vue +++ b/src/components/secondaryScreen/screen-left/screenLeft.vue @@ -79,8 +79,14 @@ orgCode: String, type: String, themeType: String, + refreshState: { + type: Boolean, + default: () => false, + }, + }); + onMounted(() => { + init(); }); - onMounted(() => {}); watch(props, () => { init(); }); @@ -91,11 +97,12 @@ const { code, result } = await getWatchDataByOrgCode(props); if (code == 200) { setValue(result); - setSession(PAGE2_LEFT, JSON.stringify(result)); + // setSession(PAGE2_LEFT, JSON.stringify(result)); } + console.log(dataList.value); } catch { - const result = JSON.parse(getSession(PAGE2_LEFT)); - setValue(result); + // const result = JSON.parse(getSession(PAGE2_LEFT)); + // setValue(result); } } diff --git a/src/components/xianMap/xianMap.vue b/src/components/xianMap/xianMap.vue index b4680d2..eade94f 100644 --- a/src/components/xianMap/xianMap.vue +++ b/src/components/xianMap/xianMap.vue @@ -208,11 +208,9 @@ } onMounted(() => { - console.log(props.mapOptions); const op = { el: 'xianmapContainer', option: props.mapOptions, innerLineOption: innerLineLight, outerLineOption: outerLineOption }; Map.initMap(op).then(() => { getMapData(tabList[0].type); - console.log(getMapData(tabList[0].type), 123); Map.map && Map.map.on('zoomend', setLevel); Map.map && Map.map.on('zoomend', setLevel); }); @@ -266,14 +264,12 @@ // console.log('绘制驾车路线完成'); searchFlag.value = false; } else { - console.log('获取驾车数据失败：', result); searchFlag.value = false; } }); AMap.Event.addListener(driving, 'complete', (res) => { const data = JSON.parse(JSON.stringify(res)); searchFlag.value = false; - console.log('查询结果', data); if (data.info == 'OK') { const { routes } = data; setTitle(routes[0]); diff --git a/src/hooks/autoRefresh/pageRefreshTime.ts b/src/hooks/autoRefresh/pageRefreshTime.ts index 9209bc0..28c642a 100644 --- a/src/hooks/autoRefresh/pageRefreshTime.ts +++ b/src/hooks/autoRefresh/pageRefreshTime.ts @@ -2,6 +2,6 @@ const BASIC_MIN = 60 * 1000; //1min const BASIC_SECOND = 1000; //1s //副屏 心率、血氧、压力、睡眠、步数 -export const DEFAULT_TIME = BASIC_MIN * 10; +export const DEFAULT_TIME = BASIC_MIN * 0.1; //预警分页切换 export const PAGE_SWITCH = BASIC_SECOND * 3; diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 23d0f4c..1f5174c 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -163,7 +163,6 @@ export const useUserStore = defineStore({ this.setToken(''); this.setUserInfo(null); this.setLoginInfo(null); - console.log('goLogin', goLogin); let path = getBaseLogin(); goLogin && router.replace({ path: path }); }, diff --git a/src/utils/socket.ts b/src/utils/socket.ts index 196c875..08cbc40 100644 --- a/src/utils/socket.ts +++ b/src/utils/socket.ts @@ -104,7 +104,6 @@ export function useSocket(p = basicPath, hasTimestamp: boolean = true) { socket.value.onmessage = function (event) { //如果获取到消息，心跳检测重置 heartCheck.reset().start(); //拿到任何消息都说明当前连接是正常的 - console.log('收到消息:', event.data); if (event.data != 'pong') { let data = JSON.parse(event.data); // socketData.value = data; diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 362504d..e2349db 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -50,7 +50,7 @@ export function visibleChartLabel(chartData) { if (!flag) { data.forEach((val) => { if (val.value == 0) { - val.value = null; + val.value = 0; } }); } diff --git a/src/views/components/employeeDialog.vue b/src/views/components/employeeDialog.vue index 554467c..5623183 100644 --- a/src/views/components/employeeDialog.vue +++ b/src/views/components/employeeDialog.vue @@ -50,7 +50,6 @@ watch( () => props.record, (nVal) => { - console.log('健康报警'); userInfo.value = nVal; } ); diff --git a/src/views/index.api.ts b/src/views/index.api.ts index 48a93ed..bd1acba 100644 --- a/src/views/index.api.ts +++ b/src/views/index.api.ts @@ -4,6 +4,7 @@ export enum Api { organizationTree = '', getDictByCode = '/sys/dict/getDictItems', getDictByCode2 = '/sys/api/getDictItems', + mapList = '/health-watch/watch/watchDevice/selectDeptMapList', } // 组织机构tree @@ -11,3 +12,4 @@ export const getOrganizationTree = () => get(Api.organizationTree); export const getDictByCode = (params) => get(Api.getDictByCode + `/${params.code}`); export const getDictByCode2 = (params) => Dictget(Api.getDictByCode2, params); +export const mapListApi = (params) => get(Api.mapList, params); diff --git a/src/views/indexSon.vue b/src/views/indexSon.vue index 514c82e..4892763 100644 --- a/src/views/indexSon.vue +++ b/src/views/indexSon.vue @@ -35,14 +35,15 @@