diff --git a/ebike-maintenance/components/devops-home-bikeinfo/devops-home-bikeinfo.vue b/ebike-maintenance/components/devops-home-bikeinfo/devops-home-bikeinfo.vue index dc71a2b..cb61be1 100644 --- a/ebike-maintenance/components/devops-home-bikeinfo/devops-home-bikeinfo.vue +++ b/ebike-maintenance/components/devops-home-bikeinfo/devops-home-bikeinfo.vue @@ -37,8 +37,8 @@
- - + + diff --git a/ebike-maintenance/pages/home/home.vue b/ebike-maintenance/pages/home/home.vue index 79230de..e2088b0 100644 --- a/ebike-maintenance/pages/home/home.vue +++ b/ebike-maintenance/pages/home/home.vue @@ -746,7 +746,8 @@ } dataBikeInfo.value={}; polylines.value=[]; - showMarker(); + const countData=showMarker(); + showCountData(countData); } //关闭电量信息 @@ -857,7 +858,7 @@ minLng = region.southwest.longitude; maxLng = region.northeast.longitude; const l=Math.floor((Date.now()-loadeTime)/1000); - if(l>=1){ + if(l>=2){ showMarker(); } @@ -940,7 +941,6 @@ let icnt_2 = 0; let showCount=0; let arrPoints=[]; - let ordercnt=0; arrMakers.map((item,index) => { const { bikeId, @@ -950,10 +950,10 @@ inParking, intervalTime } = item; - if(inOperation) { + if(!inOperation) { icnt_1++; } - else if(inParking) { + else if(!inParking) { icnt_2++; } else{ @@ -971,7 +971,7 @@ arrPoints[i]={...arrPoints[i],joinCluster:true} } } - return {icnt_2,icnt_0,icnt_1,showCount,ordercnt,arrPoints}; + return {icnt_2,icnt_0,icnt_1,showCount,ordercnt:showCount,arrPoints}; } //调度 diff --git a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue index c84b895..bc8dcf2 100644 --- a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue +++ b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue @@ -114,6 +114,7 @@ getInfoList(); }) const getInfoList = () => { + if(!orderId.value) return; api.callEbikeInfo("getDispatchVehicleByOrderId?orderId=" + orderId.value, {}, "get").then( res => { if (res.code == 200) { diff --git a/ebike-maintenance/utils/config.js b/ebike-maintenance/utils/config.js index fca2140..2c49079 100644 --- a/ebike-maintenance/utils/config.js +++ b/ebike-maintenance/utils/config.js @@ -1,6 +1,6 @@ const config = { - apiUrl: "http://192.168.2.151:10010/", - //apiUrl: "https://www.cdzhuojing.cn/", + apiUrl: "http://192.168.2.147:10010/", + //apiUrl: "https://www.cdzhuojing.cn/ebike/", cdnPath: "/", ERR_OK: 200, sm2PublicKey: "04f5084ee12767d932f293508e30e3b0100185042ec0f061dedaf92b793b93f79fd6179d5e47e25b7aec98e00cf90dd56df1f8191012537187e7bbfd2d1de299fc", //f8209a2ebe6691e41e1f2b667bfe71f0b511716cc0f7c4452502fc12ec3957e4 diff --git a/ebike-maintenance/utils/map.js b/ebike-maintenance/utils/map.js index 73cac3d..16b7843 100644 --- a/ebike-maintenance/utils/map.js +++ b/ebike-maintenance/utils/map.js @@ -478,10 +478,10 @@ export function addMarker_Q(id, data, joinCluster, lx) { break; case "dd": icon = "bike_0.png"; - if(inOperation){ + if(!inOperation){ lbContent="超"; } - else if(inParking){ + else if(!inParking){ lbContent=`${intervalTime}H`; } break; diff --git a/ebike-user/utils/config.js b/ebike-user/utils/config.js index 905c69c..c24e065 100644 --- a/ebike-user/utils/config.js +++ b/ebike-user/utils/config.js @@ -1,6 +1,6 @@ const config = { - apiUrl: "http://192.168.2.4:10010/", - //apiUrl: "https://www.cdzhuojing.cn/", + apiUrl: "http://192.168.2.147:10010/", + //apiUrl: "https://www.cdzhuojing.cn/ebike/", cdnPath: "/", ERR_OK: 200, sm2PublicKey: "04f5084ee12767d932f293508e30e3b0100185042ec0f061dedaf92b793b93f79fd6179d5e47e25b7aec98e00cf90dd56df1f8191012537187e7bbfd2d1de299fc", //f8209a2ebe6691e41e1f2b667bfe71f0b511716cc0f7c4452502fc12ec3957e4