Merge branch 'ZHNY_DCF' into ZHNY_WW

src/App.vue

@@ -22,7 +22,7 @@
 	}
 
 	.ScriconList {
-		margin-top: 6rem;
+		margin-top: 10rem;
 		height: 20rem;
 		width: 20rem;
 		background: url('@/assets/images/info.png') no-repeat;

src/views/Main/components/map.vue

@@ -149,7 +149,11 @@
 				// 	duration: 3000,
 				// 	imgUrl: "/jt3dSDK/imgs/polylinematerial/spriteline1.png"
 				// });
-				jt3d.WallObject.drawWallByGeoJson('/datafiles/fanweixian2.json').then(res => {
+				jt3d.WallObject.drawWallByGeoJson('/datafiles/fanweixian2.json',{
+					maximumHeights: 100,
+					minimumHeights: 0,
+					color:[0,238,255]
+				}).then(res => {
 				
 				});
 			},
@@ -273,7 +277,7 @@
 				jt3d.TrackRoam = new this.jt3dSDK.TrackRoam(jt3d._viewer);
 				jt3d.PolylineObject = new this.jt3dSDK.PolylineObject(jt3d._viewer);
 				jt3d.WallObject = new this.jt3dSDK.WallObject(jt3d._viewer);
-				jt3d.CircleObject = new this.jt3dSDK.CircleObject(jt3d._viewer);
+				// jt3d.CircleObject = 
 				jt3d.PointObject = new this.jt3dSDK.PointObject(jt3d._viewer);
 				jt3d.PolygonObject = new this.jt3dSDK.PolygonObject(jt3d._viewer);
 

src/views/Map3d/components/sbyxjc.vue

@@ -114,7 +114,7 @@
 				var LocateUtil = new this.jt3dSDK.LocateUtil(window["viewer"]);
 				let Drawtools = new this.jt3dSDK.DrawTools(window.viewer)
 				//_createCircle
-				PointObject.addBillboard([120.623, 36.9157, 0], {
+				PointObject.addBillboard([117.47349486,36.33949225, 0], {
 					billboard: {
 						imgUrl: 'jt3dSDK/imgs/jijing1.png',
 						scale: 0.2,
@@ -146,10 +146,9 @@
 							"<span style='width:100rem'>流量：</span>" + "<span>80m³/h</span>" +
 							"</div>";
 						html += "</div>";
-						let popup = new that.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], [120.623,
-							36.9157
-						], "设备信息", html, 50);
-						jt3d.CircleObject.drawCircle([120.623, 36.9157], 50, {
+						let popup = new that.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], [117.47349486,36.33949225], "设备信息", html, 50);
+						let circleObject = new this.jt3dSDK.CircleObject(jt3d._viewer);
+						circleObject.drawCircle([117.47349486,36.33949225], 50, {
 							// color: [255, 255, 0, 0.8]
 							color: [255, 0, 0, 1],
 							outline: true,
@@ -157,7 +156,7 @@
 							outlineWidth: 20,
 							CircleType: 'DynamicCircle',
 							count: 2,
-							duration: 1000
+							duration: 4000
 						})
 					})
 				})

src/views/test/components/ScrolledList.vue

@@ -26,9 +26,10 @@
 					   ['设备五', 'B400', '正常'],
 					   ['设备六', 'F300', '正常'],
 					 ],
-					align:['center'],
+					align:['center','center','center'],
 					headerBGC:'rgba(61, 198, 255, 0.4)',
 					oddRowBGC:'rgba(0, 37, 98, 0.4)',
+					evenRowBGC:'rgba(0, 37, 98, 0)'
 					
 				
 				}
@@ -37,13 +38,13 @@
 		},
 		methods: {
 			clickInfo(config){
-				console.log()
+				console.log(config.row)
 				
 			}
 			
 			
 		},
-		mounted() {
+		created() {
 			this.config.data = this.config.data.map((item) => {
 			        item.push("<div style='color:#08C8B7' class='ScriconList'></div>");
 			        return item;

src/views/test/components/cqjcyj.vue

@@ -14,8 +14,8 @@
 	</div>
 	<div class="main">
 		<span>设备名称：13号地1区太阳能测报灯&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-		<span><button class="dwbutton" @click="sbdw">定位</button></span>
-		<div>检测区域：13号地东区</div>
+		
+		<div>检测区域：13号地东区</div><button class="dwbutton" @click="sbdw">定位</button>
 		<div>识别数量：7</div>
 		<div>识别种类：5</div>
 		<div>采集时间：2023年4月24日17:07:45</div>
@@ -128,25 +128,29 @@
 	}
 
 	.dwbutton {
+		width: 50rem;
+		height: 25rem;
 		display: inline-block;
+		position:fixed;
+		left: 300rem;
+		top:530rem;
 		font-size: 14rem;
 		cursor: pointer;
 		text-align: center;
-		text-decoration: none;
-		outline: none;
+		/* text-decoration: none;
+		outline: none; */
 		color: #fff;
 		background-color: rgba(29,191,205,1);
 		border: none;
-		border-radius: 15rem;
-		box-shadow: 0 4rem #ffff00;
+		border-radius: 5rem;
 	}
 
 	.dwbutton:hover {
-		background-color: rgb(255, 0, 0);
+		background-color: rgba(29,191,205,0.7);
 	}
 
 	.dwbutton:active {
-		background-color: rgb(255, 0, 0);
+		background-color: rgba(29,191,205,0.7);
 		box-shadow: 0 4rem #666;
 		transform: translateY(4rem);
 	}

src/views/turang/components/FacilityInfor.vue

@@ -0,0 +1,9 @@
+<template>
+	<!-- <dv-decoration-9 style="width:150px;height:150px;">66%</dv-decoration-9> -->
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/turang/turang.vue

@@ -1,4 +1,44 @@
+<script setup>
+	import FacilityInfor from './components/FacilityInfor.vue'
+</script>
+
 <template>
+	<jt-popup2 title="设备信息" ref="FacilityInfor">
+		<FacilityInfor></FacilityInfor>
+	</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="">
+		
+	</jt-popup2>
+	
+	
+	<!-- <jt-popup3 title="用水量统计" ref="ysltj">
+	
+	</jt-popup3>
+	
+	<jt-popup3 title="能耗同比统计" top="calc(calc(100% - 115rem) / 3 + 90rem)" ref="nhtbtj">
+	
+	</jt-popup3>
+	
+	<jt-popup3 title="智能监控" top="calc(calc(100% - 115rem) / 3 + calc(100% - 115rem) / 3 + 90rem)" ref="znjk"> -->
+	
+	
+	
+	<jt-popup3  title="" ref="">
+		
+	</jt-popup3>
+	
+	<jt-popup3  title="" top="calc(calc(100% - 115rem) / 3 + 90rem)" ref="">
+		
+	</jt-popup3>
+	
+	<jt-popup3  title="" top="calc(calc(100% - 115rem) / 3 + calc(100% - 115rem) / 3 + 90rem)" ref="">
+		
+	</jt-popup3>
 </template>
 
 <script>