完善

src/views/Map3d/components/map.vue

@@ -264,27 +264,27 @@
 			fullMap(jt3d) {
 				// 初始化项目区域范围视角
 				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, //定位完成后是否删除
 					duration: 3, //飞行时间
 					heading: 0,
 					pitch: -90,
-					range: 115000
+					range: 315000
 				};
 
 				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, //定位完成后是否删除
 					duration: 3, //飞行时间
 					heading: 0,
 					pitch: -60,
-					range: 115000
+					range: 315000
 				};
 
 				var fullMapPromise = jt3d.fullMap(optionsS);

src/views/Map3d/components/toolbars.vue

@@ -12,7 +12,9 @@
 	import {
 		ArrowDown
 	} from '@element-plus/icons-vue';
-	import {Store} from '@/store/index';
+	import {
+		Store
+	} from '@/store/index';
 	store = Store()
 	import {
 		inject
@@ -54,6 +56,12 @@
 				图层
 			</span>
 		</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">
 			<span class="el-dropdown-link">
 				<i class="iconfont icon-xitong1" />
@@ -68,11 +76,11 @@
 				<span slot="slot" class="text"></span>
 				<el-dropdown-menu>
 					<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 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="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-terrain"><i class="iconfont icon-iconfonttubiao_dixing"></i>地形分析</el-dropdown-item>
@@ -190,7 +198,7 @@
 
 			showWidget: function(type) {
 				if (type === "layers") {
-					this.closePopup() 
+					this.closePopup()
 					this.$parent.$refs.refLayer.isshow = true;
 				} else if (type === "fullMap") {
 					this.$parent.$refs.refMap3d.fullMap(jt3d);
@@ -202,6 +210,9 @@
 						},
 						onError(message) {}
 					});
+				} else if (type == "viewerlabel") {
+					this.closePopup()
+					this.$parent.$refs.refviewerlabel.isshow = true
 				} else {
 					this.closePopup()
 					this.$parent.showbasicLayer = true
@@ -227,10 +238,10 @@
 				this.$parent.$refs.refDialogEdit.isshow = false;
 				this.$parent.showbasicLayer = false;
 				this.$parent.$refs.refLayer.isshow = false;
-				if(this.$parent.$refs._refImageLayerSplit){
+				if (this.$parent.$refs._refImageLayerSplit) {
 					this.$parent.$refs._refImageLayerSplit.removeSplitLayer(); //关闭卷帘
 				}
-				if(this.$parent.$refs._refViewerSplitScreen){
+				if (this.$parent.$refs._refViewerSplitScreen) {
 					this.$parent.$refs._refViewerSplitScreen.removeSplitScreen(); //关闭分屏
 				}
 			},
@@ -344,7 +355,7 @@
 	.toolbars {
 		position: absolute;
 		top: 80rem;
-		width: 340rem;
+		width: 450rem;
 		// width: 580rem;
 		right: 20rem;
 		cursor: pointer !important;
@@ -366,7 +377,7 @@
 		.toolbar-item {
 			display: inline-block;
 			padding: 0rem 12rem;
-			
+
 			margin: 0rem;
 			height: calc(100% - 4rem);
 			color: #fff;
@@ -381,9 +392,10 @@
 				font-size: 16rem;
 			}
 		}
-		.toolbar-item:nth-last-child(1){
+
+		.toolbar-item:nth-last-child(1) {
 			padding-right: 0rem;
-		} 
+		}
 
 		.el-icon {
 			margin-right: 5rem;

src/views/Map3d/components/viewerlabel.vue

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