DESKTOP-CRQ4N2U\jintian 2 years ago
parent
commit
bc3c0e1346

+ 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>济南市南部山区三维平台</title>
 		<style>
 			#app {
 				height: 100vh;

+ 0 - 4
src/assets/dataFile/fwx.json

@@ -1,4 +0,0 @@
-{"type":"FeatureCollection", "features": [
-{"type":"Feature","geometry":{"type":"LineString","coordinates":[[76.1850140872,39.6986668102],[76.181577798,39.6952233445],[76.1648654081,39.7060791157],[76.1641691006,39.7050397108],[76.1579101574,39.7073768566],[76.1546136304,39.7047083266],[76.153592308,39.705729402],[76.151724509,39.7072513479],[76.1491601258,39.7091312752],[76.1470535578,39.7103781204],[76.1446903169,39.7116835367],[76.1416140265,39.7132725469],[76.1388168693,39.7147547341],[76.1396474063,39.7164722407],[76.143253557,39.7183884212],[76.1468806501,39.7198897403],[76.1478142031,39.7197911843],[76.1503987521,39.7195831922],[76.1526640114,39.7204762249],[76.1670993888,39.7264422213],[76.1756000467,39.7315938888],[76.1811351552,39.735635674],[76.1822903837,39.7374436385],[76.1837140116,39.7375345786],[76.1848919359,39.7371128147],[76.1910388996,39.738605793],[76.1927014176,39.7340138276],[76.1889508761,39.7299051263],[76.1883624668,39.7300671308],[76.1862223508,39.728243912],[76.1871240859,39.7254793845],[76.1785108477,39.7225494098],[76.1830407113,39.7151994787],[76.1855685618,39.7160255025],[76.1949805531,39.7114873578],[76.1992433669,39.7036709856],[76.2027163043,39.7025033499],[76.220225461,39.7058258328],[76.224245783,39.6987120869],[76.192031455,39.6898738821],[76.184996296,39.6986987803],[76.1850551711,39.6987044277]]},"properties":{"NAME":"未命名线_1"}},
-{"type":"Feature","geometry":{"type":"LineString","coordinates":[[76.0589608542,39.6762756331],[76.0840616916,39.6863577757],[76.0906407448,39.6789383328],[76.0878529011,39.6770112816],[76.0971832367,39.6676833444],[76.0858276324,39.6600729563],[76.0821673577,39.6602930661],[76.0759433249,39.6625897125],[76.0692845075,39.6690384195],[76.0652847447,39.6724620155],[76.0615652713,39.6744606558],[76.0589069723,39.6759195247],[76.0590201526,39.6761769254]]},"properties":{"NAME":"未命名线_2"}}
-]}

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


BIN
src/assets/images/header/header-1.png


BIN
src/assets/images/header/header-1.webp


BIN
src/assets/images/header/login-title.webp


BIN
src/assets/images/login/login-title.webp


+ 1 - 1
src/views/Main/components/header.vue

@@ -137,7 +137,7 @@
 	$fontColor: #fff;
 	$fullsize: calc(100% - 0rem);
 	$header-title-bg: url(@/assets/images/header/header-title-bg.png) 0rem no-repeat;
-	$header-title: url(@/assets/images/header/header-1.png) 0rem no-repeat;
+	$header-title: url(@/assets/images/header/header-1.webp) 0rem no-repeat;
 	$header-bg: url(@/assets/images/header/header-bg.png) 0rem no-repeat;
 	$header-bg-color: linear-gradient(100deg,
 		rgb(16, 96, 210) 30%,

+ 21 - 21
src/views/Map3d/components/map.vue

@@ -9,7 +9,7 @@
 	} from '@/store/index'
 	let store = Store();
 
-	// import fwx from '@/assets/dataFile/fwx.json';
+	import xz from '@/assets/dataFile/xz.json';
 
 	let jt3d = undefined;
 	export default {
@@ -109,23 +109,23 @@
 				this.$parent.jtMap3DOnload(jt3d);
 
 				//单击事件
-				// this.clickEntity(jt3d);
+				this.clickEntity(jt3d);
 
 				//添加镇街边界线——精灵线
-				// this.addBoundaryLine(jt3d);
+				this.addBoundaryLine(jt3d);
 
 			},
 			/**
 			 * 添加镇街边界线——精灵线
 			 */
 			addBoundaryLine(jt3d) {
-				// jt3d.PolylineObject.drawPolylineByGeoJson(fwx, {
-				// 	width: 5,
-				// 	color: '#04FFFF',
-				// 	isImageAlpha: true, //用图片自带颜色
-				// 	duration: 3000,
-				// 	imgUrl: "jt3dSDK/imgs/polylinematerial/spriteline1.png"
-				// });
+				jt3d.PolylineObject.drawPolylineByGeoJson(xz, {
+					width: 5,
+					color: '#04FFFF',
+					isImageAlpha: true, //用图片自带颜色
+					duration: 3000,
+					imgUrl: "jt3dSDK/imgs/polylinematerial/spriteline1.png"
+				});
 			},
 
 			/**
@@ -260,27 +260,27 @@
 			fullMap(jt3d) {
 				// 初始化项目区域范围视角
 				let optionsS = {
-					west: 110.88459807402462,
-					south: 15.598579935800508,
-					east: 119.0687931142047,
-					north: 21.8052784272975,
+					west: 116.883783, //西
+					south: 36.573500, //南
+					east: 117.326923, //东
+					north: 36.329733, //北
 					isRemove: false, //定位完成后是否删除
 					duration: 3, //飞行时间
 					heading: 0,
 					pitch: -90,
-					range: 1052000
+					range: 60000
 				};
-
+				
 				let optionsE = {
-					west: 110.88459807402462,
-					south: 15.598579935800508,
-					east: 119.0687931142047,
-					north: 21.8052784272975,
+					west: 116.883783, //西
+					south: 36.573500, //南
+					east: 117.326923, //东
+					north: 36.329733, //北
 					isRemove: true, //定位完成后是否删除
 					duration: 3, //飞行时间
 					heading: 0,
 					pitch: -60,
-					range: 1052000
+					range: 60000
 				};
 
 				var fullMapPromise = jt3d.fullMap(optionsS);

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