- {{siteInfo.zdrl-siteInfo.sssl}}
+
+ {{siteInfo.xdd>0?'+'+siteInfo.xdd:siteInfo.xdd}}
-
@@ -129,8 +137,8 @@
let drawPoint = [];
let areaData = {};
let selArea = null; //选中区域
- let regionData = {};
-
+ let siteData = {};
+
let showRegion = ref(false);
const iconsize = 16;
const iconcolor = "#6f7777";
@@ -156,15 +164,18 @@
const height = ref("100vh");
const opentype = ref("add"); //打开类型
let editId = ""; //编辑ID
-
- const siteInfo=ref({
- id:"",
+
+ const showSiteInfo = ref(false);
+ const siteInfo = ref({
+ id: "",
name: "",
address: "",
- zdrl:0,
- sssl:0
+ zdrl: 0,
+ sssl: 0,
+ xdd:0
})
+
//缩放
function onZoom(type) {
const i = 10;
@@ -214,60 +225,100 @@
}
drawPoint = [];
}
+
+ function closeSiteInfo(){
+ showSiteInfo.value=false;
+ }
+
+ function markerTap(e) {
+ const {
+ markerId
+ } = e.detail;
+ const index = markerId;
+ const {
+ arrCirclesData,
+ arrPolygonsData
+ } = siteData;
+ const len = arrCirclesData.length;
+ let data = null;
+ if (index <= len - 1) {
+ data = arrCirclesData[markerId];
+ } else {
+ data = arrPolygonsData[markerId - len];
+ }
+ const {
+ siteName,
+ siteRegionId,
+ siteAdress,
+ allowedParkingNum
+ } = data;
+ const site = {
+ id: siteRegionId,
+ name: siteName,
+ address: siteAdress,
+ zdrl: allowedParkingNum,
+ sssl: 0,
+ xdd:allowedParkingNum-0
+ }
+ siteInfo.value=site;
+ showSiteInfo.value = true;
+ }
function mapTap(e) {
- if (!showDraw.value) return;
const {
detail: {
latitude,
longitude
}
} = e;
+ if (!showDraw.value) return;
let inside = false;
if (!selArea) {
const {
arrCirclesData,
arrPolygonsData
} = areaData;
- for(let i=0;i
0) {
@@ -353,6 +404,13 @@
circles.value.splice(circles.value.length - 1, 1);
}
}
+
+ function openSiteInfo(){
+ const{id}=siteInfo.value;
+ uni.redirectTo({
+ url: `/pages/devops/bikesite/bikesite-info?id=${id}&&type=edit`
+ })
+ }
//完成绘制
function completeDraw() {
@@ -368,9 +426,10 @@
if (arrPoint.length > 3) {
arrPoint.push(arrPoint[0]);
}
- console.log("88888888888888888888888",arrPoint);
const points = JSON.stringify(arrPoint);
- const {operationRegionId}=selArea;
+ const {
+ operationRegionId
+ } = selArea;
uni.redirectTo({
url: `/pages/devops/bikesite/bikesite-info?id=${editId}&points=${points}&radius=${radius.value}&&type=${opentype.value}&®ionid=${operationRegionId}`
})
@@ -409,7 +468,6 @@
};
map.getRegionData(arrRegionID, (res) => {
- console.log("11111111111getRegionData", res);
const {
arrData,
arrCircles: arrCircles_region,
@@ -417,22 +475,23 @@
arrCirclesData: arrCirclesData_region,
arrPolygonsData: arrPolygonsData_region
} = res;
- regionData = {
- arrCircles:arrCircles_region,
- arrPolygons:arrPolygons_region,
+ siteData = {
+ arrCircles: arrCircles_region,
+ arrPolygons: arrPolygons_region,
arrCirclesData: arrCirclesData_region,
arrPolygonsData: arrPolygonsData_region
};
const arrMarker = [];
+ let len = 0;
arrCircles_region.map((item, index) => {
const {
latitude: lat,
longitude: lng
} = item;
- const len = arrMarker.length;
arrMarker.push(map.addMarker(len + index, lng, lat, "bikesite.png"));
});
+ len = arrMarker.length;
arrPolygons_region.map((item, index) => {
const {
points
@@ -441,7 +500,6 @@
latitude: lat,
longitude: lng
} = points[0];
- const len = arrMarker.length;
arrMarker.push(map.addMarker(len + index, lng, lat, "bikesite.png"));
});
@@ -472,15 +530,15 @@
function showMapSite(showSite) {
const {
- arrCircles=[],
- arrPolygons=[]
+ arrCircles = [],
+ arrPolygons = []
} = areaData;
const {
- arrCircles: arrCircles_region=[],
- arrPolygons: arrPolygons_region=[],
+ arrCircles: arrCircles_region = [],
+ arrPolygons: arrPolygons_region = [],
arrCirclesData,
arrPolygonsData
- } = regionData;
+ } = siteData;
const arrEditC = [];
const arrEditP = [];
if (showSite) {
@@ -512,7 +570,7 @@
}
polygons.value = [...arrPolygons, ...arrPolygons_region, ...arrEditP];
circles.value = [...arrCircles, ...arrCircles_region, ...arrEditC];
- drawPoint=[];
+ drawPoint = [];
} else {
polygons.value = arrPolygons;
circles.value = arrCircles;
@@ -545,6 +603,7 @@
+
onMounted(() => {
oMap = map.getMap("mapRef", getCurrentInstance());
isload = true;
diff --git a/ebike-maintenance/pages/mine/mine.vue b/ebike-maintenance/pages/mine/mine.vue
index 8301611..ca41814 100644
--- a/ebike-maintenance/pages/mine/mine.vue
+++ b/ebike-maintenance/pages/mine/mine.vue
@@ -178,20 +178,20 @@
const permcode = 'maintenance.applet';
const permcodes = uni.getStorageSync('permCodes');
const menus = [];
- if (permcodes.length > 0 && permcodes.includes(permcode)) {
+ if (permcodes.length > 0 ) {
btnList.forEach((item) => {
const menu = {
key: item.key,
name: item.name
}
let ipermcode = permcode + '.' + item.key.toLowerCase().replace(/-/g, '.');
- if (permcodes.includes(ipermcode)) {
+ if (permcodes.some(item => item.includes(ipermcode))) {
menus.push(menu)
if (item.children) {
item.children.forEach((child) => {
menu.children = menu.children || [];
let cpermcode = ipermcode + '.' + child.key.toLowerCase().replace(/-/g, '.');
- if (permcodes.includes(cpermcode)) {
+ if (permcodes.some(item => item.includes(cpermcode))) {
const cmenu = {
key: child.key,
name: child.name,