Merge branch 'ZHNY_WW' into ZHNY_DCF

src/views/Map3d/components/sbyxjc.vue

@@ -114,7 +114,7 @@
 				var LocateUtil = new this.jt3dSDK.LocateUtil(window["viewer"]);
 				let Drawtools = new this.jt3dSDK.DrawTools(window.viewer)
 				//_createCircle
-				PointObject.addBillboard([117.47349486,36.33949225, 0], {
+				PointObject.addBillboard([117.47510856,36.33764451, 0], {
 					billboard: {
 						imgUrl: 'jt3dSDK/imgs/point.png',
 						scale: 0.2,
@@ -146,9 +146,9 @@
 							"<span style='width:100rem'>流量：</span>" + "<span>80m³/h</span>" +
 							"</div>";
 						html += "</div>";
-						let popup = new that.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], [117.47349486,36.33949225], "设备信息", html, 50);
+						let popup = new that.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], [117.47510856,36.33764451], "设备信息", html, 50);
 						let circleObject = new this.jt3dSDK.CircleObject(jt3d._viewer);
-						circleObject.drawCircle([117.47349486,36.33949225], 50, {
+						circleObject.drawCircle([117.47510856,36.33764451], 50, {
 							// color: [255, 255, 0, 0.8]
 							color: [255, 0, 0, 1],
 							outline: true,

src/views/test/components/cqjcyj.vue

@@ -57,9 +57,9 @@
 				var LocateUtil = new this.jt3dSDK.LocateUtil(window["viewer"]);
 				let Drawtools = new this.jt3dSDK.DrawTools(window.viewer)
 				//_createCircle
-				PointObject.addBillboard([117.47464039,36.33623582, 0], {
+				PointObject.addBillboard([117.47793273,36.33847531, 0], {
 					billboard: {
-						imgUrl: 'jt3dSDK/imgs/jijing1.png',
+						imgUrl: 'jt3dSDK/imgs/point.png',
 						scale: 0.2,
 					}
 				}).then(res1 => {
@@ -89,9 +89,9 @@
 							"<span style='width:100rem'>流量：</span>" + "<span>80m³/h</span>" +
 							"</div>";
 						html += "</div>";
-						let popup = new that.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], [117.47464039,36.33623582], "设备信息", html, 50);
+						let popup = new that.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], [117.47793273,36.33847531], "设备信息", html, 50);
 						let circleObject = new this.jt3dSDK.CircleObject(jt3d._viewer);
-						circleObject.drawCircle([117.47464039,36.33623582], 50, {
+						circleObject.drawCircle([117.47793273,36.33847531], 50, {
 							// color: [255, 255, 0, 0.8]
 							color: [255, 0, 0, 1],
 							outline: true,