Merge branch 'ZHNY_LHR' into ZHNY_DCF

src/views/test/components/SeedlingMonitor.vue

@@ -1,4 +1,4 @@
-<!--<script setup>
+<script setup>
 	import videofarm1 from '@/assets/video/videofarm1.mp4';
 	import videofarm2 from '@/assets/video/videofarm2.mp4';
 	import nongye from '@/assets/images/farm.jpg';
@@ -152,54 +152,7 @@
 		background-size: 11%, 11%;
 	}
 </style>
--->
-<template>
-  <div id="data-view">
-    <!-- 轮播列表 -->
-    <div>
-      <div class="title"><i class="el-icon-location-information"></i>{{title}}</div>
-      <scrollBoard
-       :config="config"/>
-    </div>
-  </div>
-</template>
 
-<script>
-import scrollBoard from "./ScrolledList.vue"
-export default {
-  components: { scrollBoard },
-  mounted() {
-    this.config.data = [
-      ["行1列1", "行1列2", "行1列3"],
-      ["行2列1", "行2列2", "行2列3"],
-      ["行3列1", "行3列2", "行3列3"],
-      ["行4列1", "行4列2", "行4列3"],
-      ["行5列1", "行5列2", "行5列3"],
-      ["行6列1", "行6列2", "行6列3"],
-      ["行7列1", "行7列2", "行7列3"],
-      ["行8列1", "行8列2", "行8列3"],
-    ];
-    this.config.header = ["品种", "销量", "供销商", "详情"],
-       this.config.datat = this.scrollList.map((item) => {
-        item.push("<i style='color:#08C8B7' class='el-icon-view'></i>");
-        return item;
-      });
-  },
-  data() {
-    return {
-      scrollList: [], //轮播列表内容
-	  config:{
-		  data:[],
-		  header:[]
-	  },
-      headerList: [], //轮播表头数据
-      title: "最新一周供货情况", //轮播列表标题
-    };
-  },
-};
-</script>
-<style  scoped>
 
-</style>
 
 

src/views/test/components/SoilMoisture.vue

@@ -284,7 +284,7 @@
 <style>
 </style> -->
 <template>
-	<div id="mains" style="display: inline-block;height: 200rem;width: 320rem;margin-top:20rem"></div>
+	<div id="mains" style="height: 200rem;width: 320rem;margin-top:20rem;margin-left: 30rem;"></div>
 </template>
 <script>
 	export default {
@@ -537,7 +537,7 @@
 </script>
 <style scoped>
 	.mains {
-		width: 100rem;
+		width: 100%;
 		height: 220rem;
 		margin-top: 15rem;
 	}

src/views/turang/components/FacilityInfor.vue

@@ -1,9 +1,15 @@
 <template>
-	<!-- <dv-decoration-9 style="width:150px;height:150px;">66%</dv-decoration-9> -->
+	<div class="chart">
+		<dv-decoration-9 style="width:150px;height:150px;">66%</dv-decoration-9>
+	</div>
+
 </template>
 
 <script>
 </script>
 
-<style>
-</style>
+<style scoped>
+	.chart {
+		margin-top: 30rem;
+	}
+</style>

src/views/turang/components/MoniInfor.vue

@@ -0,0 +1,127 @@
+<template>
+	<div class="main">
+		<div class="top">
+			<div class="topLeft">
+				<div class="icon">
+					<img class="icon-shuiwen" src="@/assets/images/shuiwentu.png" s />
+				</div>
+				<div class="title">
+					<div>温度（℃）</div>
+					<div>36</div>
+				</div>
+			</div>
+			<div class="topRight">
+				<div class="icon">
+					<img class="icon-shuiwen" src="@/assets/images/shuiwentu.png" s />
+				</div>
+				<div class="title">
+					<div>湿度（%RH）</div>
+					<div>---</div>
+				</div>
+			</div>
+			<div class="topLeft">
+				<div class="icon">
+					<img class="icon-shuiwen" src="@/assets/images/shuishi.png" s />
+				</div>
+				<div class="title">
+					<div>水势（KPa）</div>
+					<div>--</div>
+				</div>
+			</div>
+			<div class="topRight">
+				<div class="icon">
+					<img class="icon-shuiwen" src="@/assets/images/PH.png" s />
+				</div>
+				<div class="title">
+					<div>PH值</div>
+					<div>---</div>
+				</div>
+			</div>
+		</div>
+		<div class="bottom">
+			<div style="text-align:left;margin-left: 20rem; color: rgb(200, 250, 255); ">墒情评价</div>
+			<div class="ref000">
+				适宜：土壤水分满足作物播种出苗或生长发育需求《土壤相含水量60%~80%)，有利于作物正常生长。
+			</div>
+		</div>
+
+	</div>
+</template>
+
+<script>
+</script>
+
+<style scoped>
+	.main{
+		overflow: hidden;
+	}
+	.top {
+		height: 60rem;
+		width: 350rem;
+		margin-top: 20rem;
+		position: relative;
+
+	}
+
+	.topLeft {
+
+		margin-left: 20rem;
+		height: 60rem;
+		width: 100rem;
+		position: absolute;
+
+
+	}
+
+	.topRight {
+		margin-left: 100rem;
+		height: 60rem;
+		width: 100rem;
+		display: inline-block;
+
+
+
+	}
+
+	.icon {
+		height: 50rem;
+		width: 50rem;
+		background: url("@/assets/images/beijingtu.png") no-repeat;
+		background-size: 100% 100%;
+		position: absolute;
+	}
+
+	.icon-shuiwen {
+		margin-top: 10rem;
+		height: 30rem;
+		width: 30rem;
+
+	}
+
+	.title {
+		font-size: 14rem;
+		margin-top: 5rem;
+		margin-left: 20rem;
+		height: 50rem;
+		width: 150rem;
+		color: rgb(200, 250, 255);
+	}
+
+	.bottom {
+		margin-top: 60rem;
+	}
+
+	.ref000 {
+
+		height: 75rem;
+		width: 300rem;
+		right: 0;
+		margin-top: 10rem;
+		text-indent: 30rem;
+		/* margin-left: 100rem; */
+		display: inline-block;
+		text-align: left;
+		font-size: 14rem !important;
+		overflow-y: auto
+	}
+</style>

src/views/turang/turang.vue

@@ -1,10 +1,12 @@
 <script setup>
 	import FacilityInfor from './components/FacilityInfor.vue'
+	import MoniInfor from './components/MoniInfor.vue'
 </script>
 
 <template>
-	<jt-popup2 title="设备信息" ref="FacilityInfor">
-		<FacilityInfor></FacilityInfor>
+	<jt-popup2 title="土壤墒情监测" ref="FacilityInfor">
+		<!-- <FacilityInfor></FacilityInfor> -->
+		<MoniInfor></MoniInfor>
 	</jt-popup2>
 	
 	<jt-popup2 title="" top="calc(calc(100% - 115rem) / 3 + 90rem)" ref="">