From 59f3f8c908a29b249f5c68ab2d9d39c3a22a2480 Mon Sep 17 00:00:00 2001 From: 5g0Wp7Zy Date: Thu, 24 Jul 2025 14:42:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ebike-maintenance/pages/home/home.vue | 28 ++++++++++++++----- .../warehouse/detectionecu/detectionecu.vue | 16 +++++++---- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/ebike-maintenance/pages/home/home.vue b/ebike-maintenance/pages/home/home.vue index e001cde..0eac9dc 100644 --- a/ebike-maintenance/pages/home/home.vue +++ b/ebike-maintenance/pages/home/home.vue @@ -606,7 +606,7 @@ function changeArea(data, refresh) { loadeTime = Date.now(); if (!refresh) { if (mapDataIndex > -1) { - console.log(mapData_opt); + console.log(mapData_opt, "mapData_opt"); loadMapData(mapData_opt[mapDataIndex]); return; @@ -666,12 +666,27 @@ function changeArea(data, refresh) { }); } +// 初始化地图数据 +function initMapData() { + q_cnt0.value = 0; + q_cnt1.value = 0; + q_cnt2.value = 0; + markers.value = []; + polylines.value = []; + circles.value = []; + polygons.value = []; + arrMakers = []; +} + //地图数据 function loadMapData(data) { - const { - bikeData: { arrData }, - } = data; - arrMakers = arrData; + console.log(data, "loadMapData"); + const { bikeData } = data; + if (!bikeData || bikeData["arrData"]?.length == 0) { + initMapData(); + return; + } + arrMakers = bikeData["arrData"]; const countData = showMarker(); showCountData(countData); loadMapBikeData(showBike.value, data); @@ -1000,6 +1015,7 @@ function showMarker_HD(lx, maxcnt) { let arrPoints = []; let ordercnt = 0; let changeBattery = []; //需要换电车辆 + console.log(arrMakers); arrMakers.map((item, index) => { item = { @@ -1242,8 +1258,6 @@ onMounted(() => { latitude: lat, longitude: lng, }; - console.log(amapsdk); - map.reverseGeocoder( amapsdk, lng, diff --git a/ebike-maintenance/pages/warehouse/detectionecu/detectionecu.vue b/ebike-maintenance/pages/warehouse/detectionecu/detectionecu.vue index a91954e..2e44953 100644 --- a/ebike-maintenance/pages/warehouse/detectionecu/detectionecu.vue +++ b/ebike-maintenance/pages/warehouse/detectionecu/detectionecu.vue @@ -706,10 +706,6 @@ const contentText = ref({ contentnomore: "", }); -const showClick = () => { - modelShow.value = !modelShow.value; -}; - const navButtonGroup = reactive([ { text: "自动测试", @@ -741,6 +737,11 @@ const initStatus = () => { navButtonGroup[0].disable = true; }; +const showClick = () => { + modelShow.value = !modelShow.value; + initStatus(); +}; + const bikeCodeScanChange = (data) => { initStatus(); api.callEbikeInfo("getBikeINfoData?bikeCode=" + data).then((res) => { @@ -864,8 +865,6 @@ const recursionExecDetection = () => { ecuSn: ebikeInfo.value.ecuSn, }, (res) => { - console.log(urlList.value[0]["url"]); - if (res.code !== 200) { showModelMessage(res.message); } @@ -908,6 +907,11 @@ const recursionExecDetection = () => { } else { detectionInfo.value[urlList.value[0]["url"]].detectionState = "error"; } + + //如果设备不在线直接不进行后面的操作 + if (res.data.code != 200 && urlList.value[0]["url"] === "online") + return; + urlList.value.shift(); if (urlList.value.length > 0) { recursionExecDetection();