Merge branch 'ZHNY_LHR' into ZHNY_DCF

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="">