DESKTOP-GBVU60Q\dell 2 年之前
父節點
當前提交
44d597cb17
共有 3 個文件被更改,包括 32 次插入21 次删除
  1. 10 10
      src/views/Map3d/components/map.vue
  2. 15 6
      src/views/Map3d/components/toolbars.vue
  3. 7 5
      src/views/Map3d/components/viewerlabel.vue

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

@@ -264,27 +264,27 @@
 			fullMap(jt3d) {
 			fullMap(jt3d) {
 				// 初始化项目区域范围视角
 				// 初始化项目区域范围视角
 				let optionsS = {
 				let optionsS = {
-					west: 121.563298,
-					south: 37.284514,
-					east: 121.565298,
-					north: 37.286514,
+					west: 118.69586,
+					south: 35.91360,
+					east: 122.70061,
+					north: 38.65489,
 					isRemove: false, //定位完成后是否删除
 					isRemove: false, //定位完成后是否删除
 					duration: 3, //飞行时间
 					duration: 3, //飞行时间
 					heading: 0,
 					heading: 0,
 					pitch: -90,
 					pitch: -90,
-					range: 115000
+					range: 315000
 				};
 				};
 
 
 				let optionsE = {
 				let optionsE = {
-					west: 121.563298,
-					south: 37.284514,
-					east: 121.565298,
-					north: 37.286514,
+					west: 118.69586,
+					south: 35.91360,
+					east: 122.70061,
+					north: 38.65489,
 					isRemove: true, //定位完成后是否删除
 					isRemove: true, //定位完成后是否删除
 					duration: 3, //飞行时间
 					duration: 3, //飞行时间
 					heading: 0,
 					heading: 0,
 					pitch: -60,
 					pitch: -60,
-					range: 115000
+					range: 315000
 				};
 				};
 
 
 				var fullMapPromise = jt3d.fullMap(optionsS);
 				var fullMapPromise = jt3d.fullMap(optionsS);

+ 15 - 6
src/views/Map3d/components/toolbars.vue

@@ -54,6 +54,12 @@
 				图层
 				图层
 			</span>
 			</span>
 		</div>
 		</div>
+		<div class="toolbar-item" @click="showWidget('viewerlabel')">
+			<i class="iconfont minsize icon-fushi"></i>
+			<span class="title">
+				视角标签
+			</span>
+		</div>
 		<el-dropdown class="toolbar-item" :hide-on-click="false" @command="handleCommand">
 		<el-dropdown class="toolbar-item" :hide-on-click="false" @command="handleCommand">
 			<span class="el-dropdown-link">
 			<span class="el-dropdown-link">
 				<i class="iconfont icon-xitong1" />
 				<i class="iconfont icon-xitong1" />
@@ -68,12 +74,12 @@
 				<span slot="slot" class="text"></span>
 				<span slot="slot" class="text"></span>
 				<el-dropdown-menu>
 				<el-dropdown-menu>
 					<el-dropdown-item command="DialogEdit"><i class="iconfont minsize icon-dituhuizhi"></i>绘制功能</el-dropdown-item>
 					<el-dropdown-item command="DialogEdit"><i class="iconfont minsize icon-dituhuizhi"></i>绘制功能</el-dropdown-item>
-					<el-dropdown-item command="navigate"><i class="iconfont icon-zhijiantou"></i>地区导航</el-dropdown-item>
-					<el-dropdown-item command="viewerlabel"><i class="iconfont minsize icon-fushi"></i>视角标签</el-dropdown-item>
+					<!-- <el-dropdown-item command="navigate"><i class="iconfont icon-zhijiantou"></i>地区导航</el-dropdown-item> -->
+					<!-- <el-dropdown-item command="viewerlabel"><i class="iconfont minsize icon-fushi"></i>视角标签</el-dropdown-item> -->
 					<el-dropdown-item v-if="store.userport=='PC'" command="printmap"><i class="iconfont maxsize icon-svgdayin"></i>打印地图</el-dropdown-item>
 					<el-dropdown-item v-if="store.userport=='PC'" command="printmap"><i class="iconfont maxsize icon-svgdayin"></i>打印地图</el-dropdown-item>
 					<el-dropdown-item command="measure"><i class="iconfont minsize icon-icon_measureTool"></i>图上量算</el-dropdown-item>
 					<el-dropdown-item command="measure"><i class="iconfont minsize icon-icon_measureTool"></i>图上量算</el-dropdown-item>
-					<el-dropdown-item command="query-graphics"><i class="iconfont icon-search"></i>图形查询</el-dropdown-item>
-					<el-dropdown-item command="analysis-data"><i class="iconfont maxsize icon-svgjiexiwenjian"></i>文件解析</el-dropdown-item>
+					<!-- <el-dropdown-item command="query-graphics"><i class="iconfont icon-search"></i>图形查询</el-dropdown-item> -->
+					<!-- <el-dropdown-item command="analysis-data"><i class="iconfont maxsize icon-svgjiexiwenjian"></i>文件解析</el-dropdown-item> -->
 					<el-dropdown-item command="analysis-space"><i class="iconfont icon-duodiankeshiyu"></i>空间分析</el-dropdown-item>
 					<el-dropdown-item command="analysis-space"><i class="iconfont icon-duodiankeshiyu"></i>空间分析</el-dropdown-item>
 					<el-dropdown-item command="analysis-terrain"><i class="iconfont icon-iconfonttubiao_dixing"></i>地形分析</el-dropdown-item>
 					<el-dropdown-item command="analysis-terrain"><i class="iconfont icon-iconfonttubiao_dixing"></i>地形分析</el-dropdown-item>
 					<el-dropdown-item command="special-effects"><i class="iconfont icon-yu"></i>特效效果</el-dropdown-item>
 					<el-dropdown-item command="special-effects"><i class="iconfont icon-yu"></i>特效效果</el-dropdown-item>
@@ -202,7 +208,10 @@
 						},
 						},
 						onError(message) {}
 						onError(message) {}
 					});
 					});
-				} else {
+				} else if(type == "viewerlabel"){
+					this.closePopup() 
+					this.$parent.$refs.refviewerlabel.isshow = true
+				}else {
 					this.closePopup()
 					this.closePopup()
 					this.$parent.showbasicLayer = true
 					this.$parent.showbasicLayer = true
 				}
 				}
@@ -344,7 +353,7 @@
 	.toolbars {
 	.toolbars {
 		position: absolute;
 		position: absolute;
 		top: 80rem;
 		top: 80rem;
-		width: 340rem;
+		width: 450rem;
 		// width: 580rem;
 		// width: 580rem;
 		right: 20rem;
 		right: 20rem;
 		cursor: pointer !important;
 		cursor: pointer !important;

+ 7 - 5
src/views/Map3d/components/viewerlabel.vue

@@ -61,7 +61,7 @@
 				this.ImgurlList.splice(index, 1)
 				this.ImgurlList.splice(index, 1)
 				if (item.id) {
 				if (item.id) {
 					this.$http.get('/delete', {
 					this.$http.get('/delete', {
-						tableName: 'sys_map_angle',
+						tableName: 'map_angle',
 						keyValue: item.id,
 						keyValue: item.id,
 					}).then(res => {
 					}).then(res => {
 						console.log(res.data)
 						console.log(res.data)
@@ -120,19 +120,21 @@
 						roll: Cesium.Math.toDegrees(roll),
 						roll: Cesium.Math.toDegrees(roll),
 						heading: Cesium.Math.toDegrees(heading),
 						heading: Cesium.Math.toDegrees(heading),
 						screenshot: url,
 						screenshot: url,
+						// screenshot: '',
 						userId: this.id,
 						userId: this.id,
 						// id:0
 						// id:0
 					}
 					}
 
 
 					//添加数据接口
 					//添加数据接口
 					this.$http.post('/postSubmit', {
 					this.$http.post('/postSubmit', {
-						tableName: 'sys_map_angle',
+						tableName: 'map_angle',
 						keyValue: '',
 						keyValue: '',
 						formData: data,
 						formData: data,
 					}).then(res => {
 					}).then(res => {
 						console.log(res)
 						console.log(res)
 						if (res.success == true) {
 						if (res.success == true) {
-
+							console.log('添加成功')
+							document.getElementById("inputValue").value = ''
 						}
 						}
 					})
 					})
 				}).catch(err => {
 				}).catch(err => {
@@ -144,7 +146,7 @@
 				this.id = this.info.id
 				this.id = this.info.id
 				//获取所有图片数据
 				//获取所有图片数据
 				this.$http.get('/getTableList', {
 				this.$http.get('/getTableList', {
-					tableName: 'sys_map_angle', //
+					tableName: 'map_angle', //
 					sqlWhere: "name like '%" + this.viewersName + "%'",
 					sqlWhere: "name like '%" + this.viewersName + "%'",
 					orderByField: ''
 					orderByField: ''
 				}).then(res => {
 				}).then(res => {
@@ -179,7 +181,7 @@
 			this.id = this.info.id
 			this.id = this.info.id
 			//获取所有图片数据
 			//获取所有图片数据
 			this.$http.get('/getTableList', {
 			this.$http.get('/getTableList', {
-				tableName: 'sys_map_angle', //
+				tableName: 'map_angle', //
 				sqlWhere: '', //+ this.loginForm.id
 				sqlWhere: '', //+ this.loginForm.id
 				orderByField: ''
 				orderByField: ''
 			}).then(res => {
 			}).then(res => {