From 781371d782563c6b75bc94e306762e6e17f8b092 Mon Sep 17 00:00:00 2001 From: gaozl Date: Thu, 15 Jun 2023 10:09:41 +0800 Subject: [PATCH 1/2] fix: ci --- public/static/qm/MainMap_QM.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index a2a7b74..34e7760 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -2103,7 +2103,7 @@ MainMap_QM.prototype = { TweenMax.killAll(true); Map_QM.util.pathStateObj.isPathState = false; Map_QM.controls.maxDistance = Map_QM.util.options.maxDis; - Map_QM.controls.minAzimuthAngle = -Infinity; + Map_QM.controls.minAzimuthAngle = -Infinity; Map_QM.controls.maxAzimuthAngle = Infinity; clearTimeout(Map_QM.util.timeObj.collTime); Map_QM.controls.enabled = true; @@ -4143,7 +4143,7 @@ MainMap_QM.prototype = { if (item.hasOwnProperty("wayShop") && item.wayShop) { for (let i = 0; i < item.wayShop.length; i++) { let enTlite = item.wayShop[i].shop.shopNameEn == "" ? item.wayShop[i].shop.shopName : item.wayShop[i].shop.shopNameEn; - Map_QM.util.pathStateObj.forShopArr.wayList.push({ isAddPrefix: false, shopName: "经过 " + item.wayShop[i].shop.shopName || item.wayShop[i].shop.name, shopNameEn: "PASS " + enTlite, logoPath: item.wayShop[i].shop.logoPath, code: item.wayShop[i].shop.code, shopNum: iot ? item.wayShop[i].shop.houseNumber : item.wayShop[i].shop.houseNum }); + Map_QM.util.pathStateObj.forShopArr.wayList.push({ isAddPrefix: false, shopName: "经过 " + item.wayShop[i].shop.shopName || item.wayShop[i].shop.name, shopNameEn: "PASS " + enTlite, logoPath: item.wayShop[i].shop.logoPath || item.wayShop[i].shop.logoUrl, code: item.wayShop[i].shop.code, shopNum: iot ? item.wayShop[i].shop.houseNumber : item.wayShop[i].shop.houseNum }); } } if (item.hasOwnProperty("Facilities") && item.Facilities) { //设施 @@ -5342,10 +5342,10 @@ FloorMap_QM.prototype = { show = shopData[h].shopName || shopData[h].name; showLeb = houseNum; showE = shopData[h].shopNameEn || shopData[h].nameEn; - logo = shopData[h].logoPath; + logo = shopData[h].logoPath || shopData[h].logoUrl; mapShow = shopData[h].mapShow ?? false; - if (shopData[h].navRecommend) { - navRecommend = shopData[h].navRecommend; + if (shopData[h].navRecommend || shopData[h].isPass) { + navRecommend = shopData[h].navRecommend || shopData[h].isPass; } else { navRecommend = false; } From dc837c6df093ada2cafcadf2230f1f4f4e3101e8 Mon Sep 17 00:00:00 2001 From: gaozl Date: Fri, 16 Jun 2023 17:07:35 +0800 Subject: [PATCH 2/2] fix: ci --- public/static/qm/MainMap_QM.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index 34e7760..5ae93e5 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -1211,7 +1211,7 @@ MainMap_QM = function (callBack, options) { document.getElementById(options.containerId || "mapContainer").addEventListener("touchmove", this.disPlayEvent, false); document.getElementById(options.containerId || "mapContainer").addEventListener('click', this.onMouseClickBox, false); //地图点击 - document.addEventListener('rezise', this.changeDocmentResize, false); //窗口变化 + document.addEventListener('resize', this.changeDocmentResize, false); //窗口变化 this.mapArr = []; this.selectShop; this.selectEle = null; //当前使用的电梯