Browse Source

no message

DESKTOP-GBVU60Q\dell 1 year ago
parent
commit
a17a849047

+ 1 - 1
.env.development

@@ -5,6 +5,6 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'development'
 
 # 金田基础框架/开发环境
-VITE_API_URL = 'http://218.59.194.82:13182/'
+VITE_API_URL = 'http://218.59.194.82:13293/'
 
 # 后台管理地址: http://218.59.194.82:13190/sdjt-admin/

+ 1 - 1
.env.production

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'production'
 
 # 金田基础框架/生产环境
-VITE_API_URL = 'http://218.59.194.82:13182/'
+VITE_API_URL = 'http://218.59.194.82:13293/'
 
 # 后台管理地址: http://218.59.194.82:13190/sdjt-admin/
 

+ 1 - 1
index.html

@@ -4,7 +4,7 @@
 		<meta charset="UTF-8" />
 		<link rel="icon" href="/favicon.ico" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>金田CIM三维基础平台</title>
+		<title>辽河CIM三维基础平台</title>
 		<style>
 			#app {
 				height: 100vh;

BIN
public/jt3dSDK/imgs/jijing.png


BIN
public/jt3dSDK/imgs/jijing1.png


BIN
public/jt3dSDK/imgs/wallmaterial/color.png


BIN
public/jt3dSDK/imgs/wallmaterial/jsx.png


BIN
public/jt3dSDK/imgs/wallmaterial/wl.png


File diff suppressed because it is too large
+ 0 - 0
src/assets/dataFile/features.json


+ 1 - 1
src/views/Login/Login.vue

@@ -151,7 +151,7 @@ import { set } from 'nprogress';
 							this.$router.replace({
 								path: '/login'
 							})
-						},10000)
+						},time)
 					})
 				})
 

+ 3 - 1
src/views/Map3d/components/layer.vue

@@ -205,15 +205,17 @@
 									}
 								}
 
-
+								console.log('参数',_options)
 								jt3d.layer.addBillboardByGeoJson(_options, function(serviceId) {
 
 								});
 
 							} else {
+								console.log('移除事件')
 								jt3d.layer.removeDataSources({
 									serviceId: _serviceId,
 								}).then(res => {
+									console.log('移除事件',res)
 									data.isinit = '0';
 								});
 							}

+ 31 - 18
src/views/Map3d/components/map.vue

@@ -58,7 +58,9 @@
 									// pixelOffset: new Cesium.Cartesian2(0, billboard.pixelOffset),
 									disableDepthTestDistance: Number.POSITIVE_INFINITY,
 									scale: 1,
-									scaleByDistance: new Cesium.NearFarScalar(1.5e2, 1, 2400, 0) //按距离缩放,即距离大于180米时,图标不显示  Cesium.NearFarScalar(near, nearValue, far, farValue)相机范围的下界。相机范围下界的值。相机范围的上限。该值位于摄像机范围的上界。
+									scaleByDistance: new Cesium.NearFarScalar(1.5e2, 1,
+											2400, 0
+											) //按距离缩放,即距离大于180米时,图标不显示  Cesium.NearFarScalar(near, nearValue, far, farValue)相机范围的下界。相机范围下界的值。相机范围的上限。该值位于摄像机范围的上界。
 								}
 							});
 							jt3d._viewer.entities.add(that.entity, {
@@ -119,13 +121,20 @@
 			 * 添加镇街边界线——精灵线
 			 */
 			addBoundaryLine(jt3d) {
-				jt3d.PolylineObject.drawPolylineByGeoJson(map_xzqh_zj, {
-					width: 5,
-					color: '#04FFFF',
-					isImageAlpha: true, //用图片自带颜色
-					duration: 3000,
-					imgUrl: "jt3dSDK/imgs/polylinematerial/spriteline1.png"
-				});
+				// jt3d.PolylineObject.drawPolylineByGeoJson(map_xzqh_zj, {
+				// 	width: 5,
+				// 	color: '#04FFFF',
+				// 	isImageAlpha: true, //用图片自带颜色
+				// 	duration: 3000,
+				// 	imgUrl: "jt3dSDK/imgs/polylinematerial/spriteline1.png"
+				// });
+				// jt3d.WallObject.drawWallByGeoJson('datafiles/features.json',{
+				// 	maximumHeights: 100,
+				// 	minimumHeights: 0,
+				// 	color:[0,238,255]
+				// }).then(res => {
+
+				// });
 			},
 
 			/**
@@ -198,7 +207,11 @@
 					isRetainDrawPoint: true, //绘制完成是否保留绘制点
 					iconType: 'blue',
 				});
-				jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot(jt3d._viewer);
+				// jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot({
+				// 	viewer: jt3d._viewer,
+				// 	Cesium: Cesium,
+				// });
+				// jt3d.DrawMilitaryPlot = new this.jt3dSDK.DrawMilitaryPlot(jt3d._viewer);
 
 				jt3d.LocateUtil = new this.jt3dSDK.LocateUtil(jt3d._viewer);
 
@@ -260,22 +273,22 @@
 			fullMap(jt3d) {
 				// 初始化项目区域范围视角
 				let optionsS = {
-					west: 121.563298,
-					south: 37.284514,
-					east: 121.565298,
-					north: 37.286514,
+					west: 121.612585,
+					south: 40.884155,
+					east: 122.306116,
+					north: 41.211786,
 					isRemove: false, //定位完成后是否删除
 					duration: 3, //飞行时间
 					heading: 0,
 					pitch: -90,
 					range: 115000
 				};
-				
+
 				let optionsE = {
-					west: 121.563298,
-					south: 37.284514,
-					east: 121.565298,
-					north: 37.286514,
+					west: 121.612585,
+					south: 40.884155,
+					east: 122.306116,
+					north: 41.211786,
 					isRemove: true, //定位完成后是否删除
 					duration: 3, //飞行时间
 					heading: 0,

+ 2 - 1
src/views/Map3d/components/toolbars.vue

@@ -359,7 +359,7 @@
 	.toolbars {
 		position: absolute;
 		top: 80rem;
-		width: 580rem;
+		width: 560rem;
 		right: 20rem;
 		cursor: pointer !important;
 		padding: 0rem !important;
@@ -393,6 +393,7 @@
 
 			.title {
 				font-size: 16rem;
+				// margin-right: 10rem;
 			}
 		}
 

Some files were not shown because too many files changed in this diff