From 189516b59d9b2270f20b3e378798d25ad4d4274d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F?= <736883394@qq.com>
Date: Tue, 29 Apr 2025 17:42:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ebike-maintenance/static/iconfont.css |  18 +++++++++++++++++-
 ebike-maintenance/static/iconfont.ttf | Bin 19412 -> 20572 bytes
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ebike-maintenance/static/iconfont.css b/ebike-maintenance/static/iconfont.css
index 34c6309..90f4090 100644
--- a/ebike-maintenance/static/iconfont.css
+++ b/ebike-maintenance/static/iconfont.css
@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4868066 */
-  src: url('iconfont.ttf?t=1745225351472') format('truetype');
+  src: url('iconfont.ttf?t=1745572982146') format('truetype');
 }
 
 .iconfont {
@@ -11,6 +11,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-ebikebianji:before {
+  content: "\e649";
+}
+
+.icon-ebikeshanchu:before {
+  content: "\e6d3";
+}
+
+.icon-ebikesanjiaoxing:before {
+  content: "\e617";
+}
+
+.icon-ebikesanjiaoxing-copy:before {
+  content: "\eb34";
+}
+
 .icon-ebikecheliangguanli:before {
   content: "\e622";
 }
diff --git a/ebike-maintenance/static/iconfont.ttf b/ebike-maintenance/static/iconfont.ttf
index e9f9d927003e51d3d64ba02f9267459975097ec7..30a11f8e47519f680a726926075a393e18410d75 100644
GIT binary patch
delta 2568
zcmaKtYiJzT703Vg&SQ7>rQOwPW_M*tyIN`2u^ub0q?J|6auSjvn+7*RiR%)GH%ekz
z^{cT0vJ2ThQl}rBkf64vj}IlKK@g{pgq8+OWI|t`+@?y?VA|re=1L}|7>dCz)~f%j
ziEC3xX7)F8@7z0c&OPUU?!J3Q{N)GY#X>y*h|>V}Pam!wyX(*8uK@BgU|l_M=){vo
z>#1?TnF8*4eCCPT<2^SX_y^}+BGnl_2<|n9**-_QW)9EIUte1PH^28!_OBm0I$c{{
zS$YZxzRUhIhimi4#39kc@ihCnBela%#DAC_`zf&dmo$3d*wN#2v#)>aS>S;jU~GTs
zTw&)p1m}`HFI_YqZ5q3Vu*nC&<*nwmTle*A>rb0sGoE8V2&td)(C>{ew2PmKp@lz)
z;e|FCU$Eo{j~M305JUsUMyr?i5bc>T#UJ_7B<_ZVq>88}<*BU7sZQ0Uwy3fiRKseA
zx=-y=d(@<wQhU`tRa5iojCxhQrY@-Eg}aSbntR0P5W5ym8egw#HzqO5^C`^Tan9qD
z&y)E06WERpY=Va-v>{60gD9g1TaiXH3g|)}VXi5L9aC_)6c;7*BaQ@;=tC<qbm}e)
zV+>ieAcY)0h0WLk8&yVc0PW~S1)~UH8%8jML3E-U5fs7D3wz-m^ZLShBV3Q@FiV|l
zee3`fZyGuX#rSLJDim{~q0>-?58a32_cUAxl;y)ELD@cB92E7b(J4|vA1)ZmVQ`hh
zfimxUkT42RVIRf=iY{sx87OUpFh)=x!DvCHd>A*V79U0s%JpF^p|rDvQH9F*pdMo*
z>$9=?9NUC3hwAiU^r7^J3G)E8#fKSz(vB1621+|im?fx+5Ay{z=)=rGvC=fmArzxs
z*B7P}>OLPP7HXG|R<_#X!(>BE`Y`QKEN2Y`0JYbLQh?g$Ls3B0d?*j7c^~9>KjTBm
z)S+HwhfqCGulZ0%P#1itC@7YchT4K!_R%$}F8fe#Sm8=FR328keW*dK^!QMXSb5!t
zy2Q%QHOxOHik08`P^?&e$cM7U>KA+{V61+_hf>BW_ZkgFjVp9eLwV!Mw|yvde8_nk
zN**8beT^1BkE`NY@wRBlMOnXT{Mg)PzHgb<HtR*}yuHo-jJ+6022KaA20tB~3w||t
z&Y5-o6Y2^rhTn_)F1jUV#=aX*$1f!M6Q`50<ma1n&9kX&YBu$^mPvQYearj4x0-$-
zeJ(qYJ=NOV`pwpxoA$R|Z-2O>+HpR|_3P!XFBxwe_cA&Yb?n2J@jSkRAF(WpWzjE7
zh0cK8B)x!r>vRW4sw35%VqEYl$Hj25N!o#!_-MS)S=6J|k#Vt8cq4X`D6zR+v`epD
z3XTpZhN^@4irXeqZl$_I4E2jbzB49T5~+GSCswLMMKM(5GdtySV%56U;KM*ccl=4l
zk~BrAz2q6uNK-Uk7VpFz%LoPyX?3<moLD%qDeQ(~kxOmikXY^>wQVD2J5Dz1I94zy
zr4ciw5eWSLp?js3emHAK?YfAzc(#;c?b1@ZP)N%Y=|VD-$c^OIp5ukTrARU<_9vo^
zDK;YFY&6lRMiXq6qRC{mzNp)add_2^kZ9?2g=vLiee(TyODLRejYM-jLYjsZGDE>|
z^h#@VQ&ad?rR}z5gbmYl>h#KqghG{w83+a5+cy!g(w|FPmI!BKW+c-1MOQ{XpXut#
zyrQkWk{`|Uw|1PDWHu?kM7x<}a-MDeenOfvNi8t$ZR@`_-ZVy8Zbfcl72Jc*;!*5p
zk{S40F-_Qvzn34ErNp34LJ!j)7#9`S6FO`8M9MDYw=$Wf;cCBr(QC0??~}XIE<ZRR
zKWNTon=3}w{XODL&;4CSpYAWqfd@~^>h58qvFvrrrf#oMKRA|jrQxK!lw(NudkI%a
zr#YQsSlpNI>?DoRp51-vLZ;EZd7|Gm`zJPwi<v^EcX#j0g>t#D_RK&*Tx@g~%1_E{
z{6;txjkJVs#Iy2adx;Epkov~IH;msH1-*}pVyQ^=Q~yHPDX(302-mAnl7lROk?K%M
zl!~&)bgZ-;G@X#uIO#YPR3I2I!v-Rj!<;!z<CGmT+DyU2w4(OfR4gA2ScYLrY1)x!
zJ|@rF{8yqm+F$>x@us|~ja#ngR{Tm6G}SN4bf=S5QP`-&lqWn_{OPuFaq715wf`9x
zC+*N}+w$!H+g_WZZM|K=cuW5M4cl2^VK4k^Vs2QBi5;x*ov<G}SUWO%FmQaPc4T_y
d>F{ygs~w#`c;rC*j&|Sl(PJmxnBMh8`CqTF@b&-z

delta 1376
zcmbW0PiPcp7{;I3nVsF3O?I<px5?&D(<D`!q(-wwlf{r?rOm}Qh^-X_yZ&A1#>6(2
z^t1;9^-!YifH|~?&|69&YKtDkmRt&@l+b#p;vofjcWp$_Du{^b^X9#H?hL>A=KE&8
z`QGn&p1FO&xiRaU?I`(x^96tp4~^v~hTpDP4}@+2;rV05&yIdQ{^l|eeFh8_3P<vX
zyYF9$@ZBY{RR^Mbz0JJ8Mmh^)lT($SR{rJp?y+Afjvva;j!$pk{Au=2j^(E&oPyKM
z=MC()9nX&)Nqn2xJ`cQgn2R2p82@DQ$(ih*z{qca8~O5D$8Zh~-z6swY`b|NzWp((
zJq`eOy02&@tL@6;l~27>?&s`A5z<i}IxiQrIv1U6u;}y$snFj$LXTF5;oOJ2de_5t
z4cC4I&spGvQM`dL5)zZRq$MM5(k`9SCB2fBei@RT!Hhc)eC##_XWZ$M!}kk3k7MG6
za}xje1h%0G4Ook6G@=SVJal6{UPnFRco}VIL4@@VvPK8V5p<vnG1Q<Iui+)6@G3TA
z0BO`Afo5z)C)QDqKJ*}i4cLf&Zg&f^*o0oR;uWgZPNDqZf%ha>a;r-*6)vQ1>M;li
z8-;~IsHnmcAyipmu@Ki_*$|qea08IA!L2};GKHIh&^LwKgG3E(6jD{v3m-5dLRS>-
z9-<#3)B(a06)FOW8`K7(ixa8@(PxBuK~e^lgQN{=2+^X5x-S_6CEc-3B9s_Hbrg+?
zbQ(yq?J}r8q}QMm5dI4aJ%RKYbO(|(=o6&hpkt6BgWf@Q0wulBM##Gc4TbDBXf0%q
zL6aeS4cZOaXV7>^-e3eEQwGBTnKc*-$ae+<0{PxxR7#NF*&+HD$sY#u1G!@`Nhos>
zg_%N`1u9Gz%Ct>k&QQK&FmWjVXfS&y|6(wOsJv$|kEnd4(0@h~mD2`8ipo`kam8H*
zMqzMq_ng59W0@aNG|W8a@Z6aX<wCby-_5ySxeH#-d&ip#*N11q5B(AUq(ALnj}#-%
zqU)k_Re!DdwYn$f$G)k})DAAjH^pZXiNyZ8_PS!SIay3Dt=&`qe*Mp>^QnK*XVcdk
t`Wj9*Zfrc)_&js4>1p!^EdwnJtv>*lM{6DoJGo%Tu1N=%mv@~A{Rj12DR=+?


From fca0a4a3fee2cd22dabaf355082cc3678af0bbe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F?= <736883394@qq.com>
Date: Tue, 29 Apr 2025 18:34:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AB=99=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/devops/bikesite/bikesite-info.vue   | 37 +++++------
 ebike-maintenance/pages/map/map-bikesite.vue  | 62 +++++++++++--------
 2 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/ebike-maintenance/pages/devops/bikesite/bikesite-info.vue b/ebike-maintenance/pages/devops/bikesite/bikesite-info.vue
index 36633e3..7e89b47 100644
--- a/ebike-maintenance/pages/devops/bikesite/bikesite-info.vue
+++ b/ebike-maintenance/pages/devops/bikesite/bikesite-info.vue
@@ -1,45 +1,44 @@
 <template>
 	<scroll-view class="divForm" :style="{height}" scroll-y show-scrollbar>
-		<uni-forms ref="formRef" :label-width="100">
-			<uni-forms-item label="站点名称" required>
+		<uni-forms ref="formRef" :model="formData" :label-width="100">
+			<uni-forms-item label="站点名称" name="name" required :rules="[{'required': true,errorMessage: '请填写站点名称'}]">
 				<uni-easyinput v-model="formData.name" />
 			</uni-forms-item>
-			<uni-forms-item label="站点类型:" required>
+			<uni-forms-item label="站点类型:" name="zdlx" required :rules="[{'required': true,errorMessage: '请选择站点类型'}]">
 				<uni-data-select v-model="formData.zdlx" :localdata="arrZDLX" />
 
 			</uni-forms-item>
-			<uni-forms-item label="站点级别:" required>
+			<uni-forms-item label="站点级别:" name="zdjb" required :rules="[{'required': true,errorMessage: '请选择站点级别'}]">
 				<div class="divRow">
 					<uni-data-checkbox v-model="formData.zdjb" :localdata="arrZDJB" />
 				</div>
 			</uni-forms-item>
-			<uni-forms-item label="调度投放:" required>
+	<!-- 		<uni-forms-item label="调度投放:" name="ddtf" required :rules="[{'required': true,errorMessage: '请选择调度投放'}]">
 				<div class="divRow">
 					<uni-data-checkbox v-model="formData.ddtf" :localdata="arrDDTF" />
 				</div>
 
 			</uni-forms-item>
-			<uni-forms-item label="用户端显示:" required>
+			<uni-forms-item label="用户端显示:" name="zdxs" required :rules="[{'required': true,errorMessage: '请选择用户端显示'}]">
 				<div class="divRow">
 					<uni-data-checkbox v-model="formData.zdxs" :localdata="arrZDXS" />
 					<label style="margin-left: 10px;" @click="showTip('开启后在用户端小程序地图上不会显示站点,但不影响用户在该站点范围内还车')">
 						<uni-icons type="info" size="20" color="#5892E3" /></label>
-				</div>
-				<!-- <div class="divRow" style="font-size: 12px;">用户端站点隐藏显示</div> -->
-			</uni-forms-item>
-			<uni-forms-item label="可停车辆:" required>
+				</div> 
+			</uni-forms-item>-->
+			<uni-forms-item label="可停车辆:" name="ktcl" required :rules="[{'required': true,errorMessage: '请填写可停车辆'}]">
 				<div class="divRow">
 					<uni-easyinput v-model="formData.ktcl" />
 					<label>辆</label>
 				</div>
 			</uni-forms-item>
-			<uni-forms-item label="最大可停:" required>
+			<uni-forms-item label="最大可停:" name="zdkt" required :rules="[{'required': true,errorMessage: '请填写最大可停'}]">
 				<div class="divRow">
 					<uni-easyinput v-model="formData.zdkt" />
 					<label>辆</label>
 				</div>
 			</uni-forms-item>
-			<uni-forms-item label="还车半径:">
+			<uni-forms-item label="还车半径:" >
 				<div class="divRow">
 					<uni-easyinput v-model="formData.hcbj" />
 					<label>米</label>
@@ -52,7 +51,7 @@
 				</div>
 			</uni-forms-item>
 			<uni-forms-item label="站点描述:">
-				<uni-easyinput opentype="textarea" v-model="formData.zdms" />
+				<uni-easyinput type="textarea" v-model="formData.zdms" />
 			</uni-forms-item>
 			<uni-forms-item label="站点标签:">
 				<uni-data-checkbox mode="button" multiple v-model="formData.zdbq" :localdata="arrZDBQ" />
@@ -158,7 +157,8 @@
 		}
 		if (type == "edit") {
 			const id = formData.value.id;
-			const points = JSON.stringify(arrPoint);
+			//const points = JSON.stringify(arrPoint);
+			const points='[{"latitude":30.571833529690217,"longitude":104.06370857334673},{"latitude":30.571476489584985,"longitude":104.06382896516845},{"latitude":30.571211588676054,"longitude":104.0681363214153},{"latitude":30.571845047283958,"longitude":104.06805606033697},{"latitude":30.571833529690217,"longitude":104.06370857334673}]';
 			uni.navigateTo({
 				url: `/pages/map/map-bikesite?type=edit&id=${id}&points=${points}&k=${Date.now()}`
 			})
@@ -166,9 +166,10 @@
 	}
 
 	function SaveData() {
-		debugger;
 		formRef.value.validate().then(res=>{
 			console.log("66666666666666666666666666666",res);
+		}).catch(res=>{
+			console.log("7777777777777777777777",res);
 		})
 	}
 
@@ -230,9 +231,9 @@
 		padding: 10px 10px;
 	}
 
-	.divForm /deep/ .uni-forms-item {
+	/* .divForm /deep/ .uni-forms-item {
 		margin-bottom: 10px !important;
-	}
+	} */
 
 	.divFontColor {
 		color: #606266;
@@ -252,7 +253,7 @@
 
 	.divBottom {
 		position: absolute;
-		bottom: 0px;
+		bottom: 10px;
 		background-color: white;
 		padding: 10px;
 		display: flex;
diff --git a/ebike-maintenance/pages/map/map-bikesite.vue b/ebike-maintenance/pages/map/map-bikesite.vue
index 88e81d3..fbcbc3a 100644
--- a/ebike-maintenance/pages/map/map-bikesite.vue
+++ b/ebike-maintenance/pages/map/map-bikesite.vue
@@ -113,10 +113,10 @@
 	const selDraw = ref("1");
 	const drawId = 10000000;
 	const drawColor = "#e58b04";
-	const drawFillColor = "rgba(229,139,4,0.1)";
+	const drawFillColor = "#e58b041a";
 	const height = ref("100vh");
 	const opentype = ref("add"); //打开类型
-	const editId = ""; //编辑ID
+	let editId = ""; //编辑ID
 
 	//缩放
 	function onZoom(type) {
@@ -143,7 +143,8 @@
 			latitude,
 			longitude
 		} = drawPoint[0];
-		circles.value[circles.value.length-1] = map.addCirle(drawColor, drawFillColor, longitude, latitude, radius.value);
+		circles.value[circles.value.length - 1] = map.addCirle(drawColor, drawFillColor, longitude, latitude, radius
+			.value);
 	}
 
 	//切换绘制类型
@@ -213,10 +214,12 @@
 	//绘制圆形
 	function drawCircle(latitude, longitude) {
 		const circle = map.addCirle(drawColor, drawFillColor, longitude, latitude, radius.value);
+		const marker = map.addMarker(drawId, longitude, latitude, "point.png");
 		if (drawPoint.length > 0) {
 			circles.value[circles.value.length - 1] = circle;
+			markers.value[markers.value.length - 1] = markers;
 		} else {
-			const marker = map.addMarker(drawId, longitude, latitude, "point.png");
+
 			markers.value.push(marker);
 			circles.value.push(circle);
 		}
@@ -297,10 +300,11 @@
 	}
 
 	function loadOperation(callback) {
-		console.log("666666666666666666666", "行政区划", zoneId)
+		console.log("666666666666666666666", "行政区划", zoneId);
+		
 		map.getOperation(zoneId, (res) => {
 			if (!res) {
-				callback();
+			 if(callback)	callback();
 				return;
 			}
 			const {
@@ -310,7 +314,7 @@
 				arrData
 			} = res;
 			if (arrRegionID.length == 0) {
-				callback();
+			 if(callback)	callback();
 				return;
 			}
 
@@ -321,6 +325,7 @@
 			};
 
 			map.getRegionData(arrRegionID, (res) => {
+				console.log("11111111111getRegionData",res);
 				const {
 					arrData,
 					arrCircles: arrCircles_region,
@@ -344,7 +349,7 @@
 					arrMarker.push(map.addMarker(len + index, lng, lat, "bikesite.png"));
 				});
 
-				arrPolygons.map((item, index) => {
+				arrPolygons_region.map((item, index) => {
 					const {
 						points
 					} = item;
@@ -358,7 +363,7 @@
 
 				markers.value = arrMarker;
 				showMapSite(showRegion.value);
-				callback();
+				 if(callback) callback();
 			})
 		})
 	}
@@ -389,30 +394,40 @@
 			arrCirclesData,
 			arrPolygonsData
 		} = regionData;
+		const arrEditC=[];
+		const arrEditP=[];
 		if (showSite) {
-			if (editId) {
+			if (editId) { //编辑
 				const obj = {
 					regionid: editId
 				};
-				console.log("9999999999999999999999", arrCirclesData, arrPolygonsData);
+				console.log("9999999999999999999999arrCirclesData, arrPolygonsData", arrCirclesData, arrPolygonsData);
 				let index = findIndex(arrCirclesData, obj);
+				
 				if (index > -1) {
+					const {latitude,longitude}=arrCircles_region[index];
 					arrCirclesData.splice(index, 1);
 					arrCircles_region.splice(index, 1);
+					arrEditC.push(map.addCirle(drawColor,drawFillColor,longitude,latitude,radius.value));
 				} else {
 					index = findIndex(arrPolygonsData, obj);
-					arrPolygonsData.splice(index, 1);
-					arrPolygons_region.splice(index, 1);
+					if(index>-1){
+						const {points:arrPoint}=arrPolygons_region[index];
+						arrPolygonsData.splice(index, 1);
+						arrPolygons_region.splice(index, 1);
+						arrEditP.push(map.addPolygon(drawColor,drawFillColor,arrPoint))
+					}
 				}
-
 			}
-			polygons.value = [...arrPolygons, ...arrPolygons_region];
-			circles.value = [...arrCircles, ...arrCircles_region];
+			polygons.value = [...arrPolygons, ...arrPolygons_region,...arrEditP];
+			circles.value = [...arrCircles, ...arrCircles_region,...arrEditC];
 		} else {
 			polygons.value = arrPolygons;
 			circles.value = arrCircles;
 		}
 	}
+	
+
 
 	function defualtZoom() {
 		if (polygons.value.length == 0) return;
@@ -426,17 +441,7 @@
 
 	//加载数据
 	function loadData() {
-
-		showRegion.value = false;
-
 		loadOperation(() => {
-			switch (opentype.value) {
-				case "add":
-				case "edit":
-					showRegion.value = true;
-					showDraw.value = true;
-					break;
-			}
 			showMapSite(showRegion.value);
 			if (isload) {
 				defualtZoom();
@@ -454,6 +459,7 @@
 	});
 
 	onLoad(options => {
+		console.log("33333333333333333","options",options)
 		let title = "站点地图";
 		const {
 			type,
@@ -472,9 +478,13 @@
 		switch (type) {
 			case "add":
 				title = "新建站点";
+				showRegion.value = true;
+				showDraw.value = true;
 				break;
 			case "edit":
 				title = "编辑站点";
+				showRegion.value = true;
+				showDraw.value = true;
 				break;
 		}
 		getScreenHeightNoTabBar(res => {