Procházet zdrojové kódy

Merge branch 'ZHNY_DCF' into ZHNY_WW

DESKTOP-O0K3VEC\WW před 2 roky
rodič
revize
dcd99ac01b

+ 3 - 0
src/App.vue

@@ -10,6 +10,9 @@
 </script>
 
 <style lang="scss">
+	.lk-status-bar{
+		z-index: 11;
+	}
 	// .lk-status-bar{
 	// 	font-size:16rem !important;
 	// }

+ 4 - 0
src/components/jt-popup/jt-popup.vue

@@ -78,6 +78,10 @@
 			longheader: { //是否是长背景图
 				type: String,
 				default: 0
+			},
+			top:{//距离顶端
+				type:String,
+				default:""
 			}
 		},
 		methods: {

+ 1 - 4
src/views/Main/MainView.vue

@@ -47,9 +47,6 @@
 
 <style lang="scss" scoped>
 	.Mainpage{
-		height: 100%;
-		width: 100%;
-		background: url('@/assets/images/backImg.png') no-repeat;
-		background-size: 100% 100%;
+		
 	}
 </style>

+ 10 - 10
src/views/Main/components/ZhHeader.vue

@@ -62,7 +62,7 @@
 	$fullsize: calc(100% - 0px);
 
 	.header {
-		width: 1920rem;
+		width: 100%;
 		height: 90rem;
 		background: url(src/assets/images/logo2.png) no-repeat;
 		background-repeat: no-repeat;
@@ -73,7 +73,7 @@
 
 	.YztTitle {
 		left: 10%;
-		top: 50%;
+		top: 40%;
 		width: 246rem;
 		height: 54rem;
 		background: url(src/assets/images/yztTitie.png) no-repeat;
@@ -83,7 +83,7 @@
 
 	.YztXzTitle {
 		left: 10%;
-		top: 50%;
+		top: 40%;
 		width: 246rem;
 		height: 54rem;
 		background: url(src/assets/images/yztXzTitie.png) no-repeat;
@@ -93,7 +93,7 @@
 
 	.SqTitle {
 		left: 23%;
-		top: 50%;
+		top: 40%;
 		width: 246rem;
 		height: 54rem;
 		background: url(src/assets/images/sqTitle.png) no-repeat;
@@ -103,7 +103,7 @@
 
 	.SqXzTitle {
 		left: 23%;
-		top: 50%;
+		top: 40%;
 		width: 246rem;
 		height: 54rem;
 		background: url(src/assets/images/sqXzTitle.png) no-repeat;
@@ -113,7 +113,7 @@
 
 	.GgTitle {
 		left: 65%;
-		top: 50%;
+		top: 40%;
 		width: 246rem;
 		height: 54rem;
 		background: url(src/assets/images/ggTitle.png) no-repeat;
@@ -123,7 +123,7 @@
 
 	.GgXzTitle {
 		left: 65%;
-		top: 50%;
+		top: 40%;
 		width: 246rem;
 		height: 54rem;
 		background: url(src/assets/images/ggXzTitle.png) no-repeat;
@@ -133,7 +133,7 @@
 
 	.YwTitle {
 		left: 78%;
-		top: 50%;
+		top: 40%;
 		width: 246rem;
 		height: 54rem;
 		background: url(src/assets/images/ywTitle.png) no-repeat;
@@ -142,8 +142,8 @@
 	}
 
 	.YwXzTitle {
-		left: 80%;
-		top: 50%;
+		left: 78%;
+		top: 40%;
 		width: 246rem;
 		height: 54rem;
 		background: url(src/assets/images/ywXzTitle.png) no-repeat;

+ 3 - 1
src/views/Map3d/Map3DMain.vue

@@ -496,5 +496,7 @@
 	};
 </script>
 <style lang="scss" scoped>
-
+	.jt-mapMain{
+		
+	}
 </style>

+ 2 - 157
src/views/Map3d/components/ggsbtj.vue

@@ -25,166 +25,11 @@
 			}
 		},
 		methods: {
-			//获取输入框值
-			getName() {
-				this.viewersName = document.getElementById("inputValue").value;
-			},
-
-			//跳转方法
-			flyto(options) {
-				jt3d.LocateUtil.flyToPoint(options)
-			},
-
-			//删除方法,传keyvalue以及需要修改属性
-			deleteviewer(item, index) {
-				//删除对应数组内的对象
-				this.ImgurlList.splice(index, 1)
-				if (item.id) {
-					this.$http.get('/delete', {
-						tableName: 'sys_map_angle',
-						keyValue: item.id,
-					}).then(res => {
-						console.log(res.data)
-					})
-				}
-			},
-
-			//添加视角标签,当前页存数组,向数据库传入相机参数
-			addviewer() {
-				//获取当前界面截图方法
-				html2canvas(
-					this.$parent.$parent.$refs.refMap3d.$refs.cesiumContainer, {
-						// backgroundColor: null, //画出来的图片有白色的边框,不要可设置背景为透明色(null)
-						useCORS: true, //支持图片跨域
-						scale: 1 / 8, //设置放大的倍数
-					}
-				).then(canvas => {
-					//截图用img元素承装,显示在页面的上
-					let url = canvas.toDataURL('image/png')
-					//经纬度、高度
-					// 获取 相机姿态信息
-					let heading = window["viewer"].scene.camera.heading
-					let pitch = window["viewer"].scene.camera.pitch
-					let roll = window["viewer"].scene.camera.roll
-					let position = window["viewer"].scene.camera.positionCartographic
-					let longitude = Cesium.Math.toDegrees(position.longitude) //y
-					let latitude = Cesium.Math.toDegrees(position.latitude) //x
-					let height = position.height
-					let info = {
-						latitude: latitude,
-						longitude: longitude,
-						height: height,
-						pitch: Cesium.Math.toDegrees(pitch),
-						roll: Cesium.Math.toDegrees(roll),
-						heading: Cesium.Math.toDegrees(heading)
-					}
-					//dom for循环渲染列表
-					this.ImgurlList.unshift({
-						url: url,
-						name: this.viewersName,
-						info: info
-					})
-
-					//base64转换为二进制文件
-					// let blob = base64ToBlob(url)
-					// //文件转为文件流
-					// let formData = new FormData();
-					// formData.append('file',blob)
-
-					let data = {
-						name: this.viewersName,
-						x: latitude,
-						y: longitude,
-						z: height,
-						pitch: Cesium.Math.toDegrees(pitch),
-						roll: Cesium.Math.toDegrees(roll),
-						heading: Cesium.Math.toDegrees(heading),
-						screenshot: url,
-						userId: this.id,
-						// id:0
-					}
-
-					//添加数据接口
-					this.$http.post('/postSubmit', {
-						tableName: 'sys_map_angle',
-						keyValue: '',
-						formData: data,
-					}).then(res => {
-						console.log(res)
-						if (res.success == true) {
-
-						}
-					})
-				}).catch(err => {
-					console.log(err)
-				})
-			},
-			searchviewer() {
-				this.info = JSON.parse(localStorage.getItem('person'))
-				this.id = this.info.id
-				//获取所有图片数据
-				this.$http.get('/getTableList', {
-					tableName: 'sys_map_angle', //
-					sqlWhere: "name like '%" + this.viewersName + "%'",
-					orderByField: ''
-				}).then(res => {
-					console.log('获取图片', res.data)
-					this.ImgurlList = [];
-					res.data.forEach(item => {
-						let info = {
-							latitude: item.x,
-							longitude: item.y,
-							height: item.z,
-							pitch: item.pitch,
-							roll: item.roll,
-							heading: item.heading
-						}
-						// let url = blobToBase64(item.screenshot)
-						//dom for循环渲染列表
-						this.ImgurlList.push({
-							url: item.screenshot,
-							name: item.name,
-							info: info,
-							id: item.id
-						})
-					})
-
-					// console.log('img列表',this.ImgurlList)
-				})
-			}
+			
 		},
 
 		mounted() {
-			this.info = JSON.parse(localStorage.getItem('person'))
-			this.id = this.info.id
-			//获取所有图片数据
-			this.$http.get('/getTableList', {
-				tableName: 'sys_map_angle', //
-				sqlWhere: '', //+ this.loginForm.id
-				orderByField: ''
-			}).then(res => {
-				console.log('获取图片', res.data)
-				res.data.forEach(item => {
-					let info = {
-						latitude: item.x,
-						longitude: item.y,
-						height: item.z,
-						pitch: item.pitch,
-						roll: item.roll,
-						heading: item.heading
-					}
-					// let url = blobToBase64(item.screenshot)
-					//dom for循环渲染列表
-					this.ImgurlList.push({
-						url: item.screenshot,
-						name: item.name,
-						info: info,
-						id: item.id
-					})
-				})
-
-				// console.log('img列表',this.ImgurlList)
-			})
+			
 		}
 	}
 </script>

+ 16 - 1
src/views/Map3d/components/map.vue

@@ -1,6 +1,8 @@
 <template>
 	<div id="cesiumContainer2" class="ViewerSplitScreen" style="display: none; border-right: 5rem solid #fff"></div>
-	<div id="cesiumContainer" class="jt-map" ref="cesiumContainer"></div>
+	<div id="cesiumContainer" class="jt-map" ref="cesiumContainer">
+		<div class="back"></div>
+	</div>
 </template>
 
 <script>
@@ -318,6 +320,18 @@
 	.lk-status-bar {
 		font-size: 16rem !important;
 	}
+	
+	.back{
+		background: url('@/assets/images/backImg.png') no-repeat;
+		background-size: 100% 100%;
+		height: 100%;
+		width: 100%;
+		pointer-events: none;
+		position: absolute;
+		z-index: 10;
+		// background-color: rgba(0,0,0,0);
+		// opacity: 0.1;
+	}
 
 	.jt-map {
 		// width: calc(100% - 0rem);
@@ -328,6 +342,7 @@
 		overflow: hidden;
 		background-color: blue;
 		border: 0rem solid red;
+		
 	}
 
 	//分屏样式