Merge branch 'ZHNY_LHR' into ZHNY_DCF

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/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,7 +38,7 @@
 		},
 		methods: {
 			clickInfo(config){
-				console.log()
+				console.log(config.row)
 				
 			}
 			

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>