src/components/jt-popup/jt-popup.vue

@@ -312,8 +312,9 @@
 	@keyframes slide-bottom {
 		0% {
 			opacity: 0;
-			transform: translateY(100%)
+			transform: translateY(-100%)
 		}
+		
 
 		100% {
 			opacity: 1;

src/views/Main/components/layer.vue

@@ -436,11 +436,12 @@
 										if (parameterset.roll) { //以弧度为单位的滚动分量
 											_options.roll = parameterset.roll;
 										}
-
+										console.log('参数设置',_options)
 										jt3d.layer.addEntitiesGltf(_options, function(serviceId) {
 											// let flyToEntity = jt3d.LocateUtil.flyToEntityByPoints([
 											// 	parameterset.points,
 											// ], 'point');
+											console.log('添加完成')
 										});
 
 									} else {

src/views/Main/components/map.vue

@@ -314,27 +314,27 @@
 			fullMap(jt3d) {
 				// 初始化项目区域范围视角
 				let optionsS = {
-					west: 118.0361,
-					south: 36.6357,
-					east: 117.081,
-					north: 35.999,
+					west: 117.48752,
+					south: 36.35078,
+					east: 117.45454,
+					north: 36.32105,
 					isRemove: false, //定位完成后是否删除
 					duration: 3, //飞行时间
 					heading: 0,
 					pitch: -90,
-					range: 155000
+					range: 5000
 				};
 
 				let optionsE = {
-					west: 118.0361,
-					south: 36.6357,
-					east: 117.081,
-					north: 35.999,
+					west: 117.48752,
+					south: 36.35078,
+					east: 117.45454,
+					north: 36.32105,
 					isRemove: true, //定位完成后是否删除
 					duration: 3, //飞行时间
 					heading: 0,
-					pitch: -60,
-					range: 155000
+					pitch: -40,
+					range: 5000
 				};
 
 				var fullMapPromise = jt3d.fullMap(optionsS);
@@ -353,33 +353,7 @@
 		},
 
 		mounted() {
-			// let that = this
-			// that.entity1 = new Cesium.Entity({
-			// 	name: "add billboard",
-			// 	//位置
-			// 	position: Cesium.Cartesian3.fromDegrees(120.623, 36.9157, 100),
-			// 	//图片标签
-			// 	billboard: {
-			// 		image: 'jt3dSDK/imgs/jijing1.png',
-			// 		horizontalOrigin: Cesium.HorizontalOrigin.CENTER, //水平
-			// 		verticalOrigin: Cesium.VerticalOrigin.BOTTOM, //垂直位置
-			// 		// scale: billboard.scale, //尺寸
-			// 		// pixelOffset: new Cesium.Cartesian2(0, billboard.pixelOffset),
-			// 		disableDepthTestDistance: Number.POSITIVE_INFINITY,
-			// 		scale: 0.2,
-			// 		scaleByDistance: new Cesium.NearFarScalar(1.5e2, 1, 2400,
-			// 			1
-			// 		) //按距离缩放，即距离大于180米时，图标不显示  Cesium.NearFarScalar(near, nearValue, far, farValue)相机范围的下界。相机范围下界的值。相机范围的上限。该值位于摄像机范围的上界。
-			// 	}
-			// });
-			// setInterval(res => {
-			// 	this.isflyto = store.isflyto
-			// 	if (this.isflyto) {
-			// 		setTimeout(res => {
-			// 			this.isflyto = false
-			// 			store.isflyto = false
-			// 		})
-			// 	}
+			
 			// }, 1000)
 
 			this.init("cesiumContainer");

src/views/Map3d/components/sbyxjc.vue

@@ -121,7 +121,7 @@
 					}
 				}).then(res1 => {
 					var LocateUtil = new this.jt3dSDK.LocateUtil(window["viewer"]);
-					LocateUtil.flyToEntity(res1).then(res2 => {
+					LocateUtil.flyToEntity(res1,{range:500}).then(res2 => {
 						let html = "";
 						html +=
 							"<div style='text-align: left;backfround-color:rgba(61, 198, 205, 0.6);width:300rem;height:150rem;font-family: TTTGB-Medium, sans-serif !important;'>";

src/views/test/components/WeatherWatch.vue

@@ -91,11 +91,19 @@
 		margin-left: 38rem;
 	}
 	
+	.main::-webkit-scrollbar {
+		width: 0px;
+		background-color: rgba(0,0,0,0);
+		// 滚动条整体样式
+		// 高宽分别对应横竖滚动条的尺寸
+	}
+	
 	.main{
 		width:100%;
 		height:100%;
 		display:flex;
 		margin-top: 10rem;
+		overflow:scroll;
 		flex:2;
 		flex-wrap: wrap;
 		justify-content: space-around;

src/views/test/components/cqjcyj.vue

@@ -64,7 +64,7 @@
 					}
 				}).then(res1 => {
 					var LocateUtil = new this.jt3dSDK.LocateUtil(window["viewer"]);
-					LocateUtil.flyToEntity(res1).then(res2 => {
+					LocateUtil.flyToEntity(res1,{range:500}).then(res2 => {
 						let html = "";
 						html +=
 							"<div style='text-align: left;backfround-color:rgba(61, 198, 205, 0.6);width:300rem;height:150rem;font-family: TTTGB-Medium, sans-serif !important;'>";
@@ -134,6 +134,7 @@
 	}
 
 	.main {
+		position: relative;
 		margin: 0 15rem;
 		color: rgb(200, 250, 255);
 		font-weight: 500;
@@ -144,10 +145,9 @@
 	.dwbutton {
 		width: 50rem;
 		height: 25rem;
-		display: inline-block;
-		position:fixed;
-		left: 300rem;
-		top:530rem;
+		position:absolute;
+		right: 5rem;
+		top:0rem;
 		font-size: 14rem;
 		cursor: pointer;
 		text-align: center;

src/views/turang/components/FacilityInfor.vue

@@ -1,11 +1,49 @@
 <template>
 	<div class="chart">
-		<dv-decoration-9 style="width:150px;height:150px;">66%</dv-decoration-9>
+		
+			<dv-capsule-chart :config="config" style="width:300px;height:200px" />
+	
+		
 	</div>
 
 </template>
 
 <script>
+		export default {
+	data() {
+		return {
+			// viewersName: '', //视角标签名称
+			// ImgurlList: [], //截图地址列表
+			config:{
+				 data: [
+				     {
+				       name: '区域一',
+				       value: 1
+				     },
+				     {
+				       name: '区域二',
+				       value: 3
+				     },
+				     {
+				       name: '区域三',
+				       value: 2
+				     },
+				     {
+				       name: '区域四',
+				       value: 1
+				     },
+				     {
+				       name: '区域五',
+				       value: 3
+				     }
+				   ]
+				
+			
+			}
+			
+		}
+	},
+	}
 </script>
 
 <style scoped>

src/views/turang/components/MoniInfor.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="main">
+		
 		<div class="top">
 			<div class="topLeft">
 				<div class="icon">

src/views/turang/turang.vue

@@ -5,12 +5,12 @@
 
 <template>
 	<jt-popup2 title="土壤墒情监测" ref="FacilityInfor">
-		<!-- <FacilityInfor></FacilityInfor> -->
+		
 		<MoniInfor></MoniInfor>
 	</jt-popup2>
 	
 	<jt-popup2 title="" top="calc(calc(100% - 115rem) / 3 + 90rem)" ref="">
-	
+    
 	</jt-popup2>
 	
 	<jt-popup2 title="" top="calc(calc(100% - 115rem) / 3 + calc(100% - 115rem) / 3 + 90rem)" ref="">
@@ -30,8 +30,8 @@
 	
 	
 	
-	<jt-popup3  title="" ref="">
-		
+	<jt-popup3  title="设备数量统计" ref="FacilityInfor">
+		 <FacilityInfor></FacilityInfor> 
 	</jt-popup3>
 	
 	<jt-popup3  title="" top="calc(calc(100% - 115rem) / 3 + 90rem)" ref="">