Merge branch 'ZHNY_DCF' into ZHNY_WW

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

@@ -213,7 +213,7 @@
 		.middle {
 			height: calc(100% - 25rem);
 			width: 100%;
-			overflow-y: scroll;
+			overflow-y: hidden;
 			padding: 0 0 0 0;
 		}
 		

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

@@ -213,7 +213,7 @@
 		.middle {
 			height: calc(100% - 30rem);
 			width: 100%;
-			overflow-y: scroll;
+			overflow-y: hidden;
 			padding: 0 0 0 0;
 		}
 		

src/views/Map3d/components/ggsbtj.vue

@@ -70,12 +70,21 @@
 		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;
+		padding-bottom: 5rem;
 		flex:2;
+		overflow: scroll;
 		flex-wrap: wrap;
 		justify-content: space-around;
 		align-items: center;

src/views/Map3d/components/qtnhzb.vue

@@ -14,203 +14,7 @@
 
 		},
 		mounted() {
-			// const categories = (function() {
-			// 	let now = new Date();
-			// 	let res = [];
-			// 	let len = 10;
-			// 	while (len--) {
-			// 		res.unshift(now.toLocaleTimeString().replace(/^\D*/, ''));
-			// 		now = new Date(+now - 2000);
-			// 	}
-			// 	return res;
-			// })();
-			// const categories2 = (function() {
-			// 	let res = [];
-			// 	let len = 10;
-			// 	while (len--) {
-			// 		res.push(10 - len - 1);
-			// 	}
-			// 	return res;
-			// })();
-			// const data = (function() {
-			// 	let res = [];
-			// 	let len = 10;
-			// 	while (len--) {
-			// 		res.push(Math.round(Math.random() * 1000));
-			// 	}
-			// 	return res;
-			// })();
-			// const data2 = (function() {
-			// 	let res = [];
-			// 	let len = 0;
-			// 	while (len < 10) {
-			// 		res.push(+(Math.random() * 10 + 5).toFixed(1));
-			// 		len++;
-			// 	}
-			// 	return res;
-			// })();
-			// this.option = {
-			// 	title: {
-			// 		// text: '水位监测信息'
-			// 	},
-			// 	tooltip: {
-			// 		trigger: 'axis',
-			// 		axisPointer: {
-			// 			type: 'cross',
-			// 			label: {
-			// 				backgroundColor: '#283b56'
-			// 			}
-			// 		}
-			// 	},
-			// 	legend: {
-			// 		// 图例文字颜色
-			// 		textStyle: {
-			// 			color: "#fff",
-			// 		},
-			// 	},
-			// 	toolbox: {
-			// 		show: true,
-			// 		feature: {
-			// 			// dataView: {
-			// 			// 	readOnly: false
-			// 			// },
-			// 			// restore: {},
-			// 			// saveAsImage: {}
-			// 		}
-			// 	},
-			// 	dataZoom: {
-			// 		show: false,
-			// 		start: 0,
-			// 		end: 100
-			// 	},
-			// 	xAxis: [{
-			// 			type: 'category',
-			// 			boundaryGap: true,
-			// 			data: categories,
-			// 			axisLabel: {
-			// 				//x轴文字的配置
-			// 				show: true,
-			// 				textStyle: {
-			// 					color: "rgba(255,225,255,1)",
-			// 				},
-			// 			},
-			// 			splitLine: {
-			// 				show: false,
-			// 				lineStyle: {
-			// 					type: 'dashed',
-			// 					color: '#113d5e'
-			// 				}
-			// 			},
-
-			// 		},
-			// 		{
-			// 			type: 'category',
-			// 			boundaryGap: true,
-			// 			data: categories2,
-			// 			axisLabel: {
-			// 				//x轴文字的配置
-			// 				show: true,
-			// 				textStyle: {
-			// 					color: "rgba(255,225,255,1)",
-			// 				},
-			// 			},
-			// 			splitLine: {
-			// 				show: true,
-			// 				lineStyle: {
-			// 					type: 'dashed',
-			// 					color: '#113d5e'
-			// 				}
-			// 			},
-			// 		}
-			// 	],
-			// 	yAxis: [{
-			// 			type: 'value',
-			// 			scale: true,
-			// 			name: '水位/m',
-			// 			axisLabel: {
-			// 				//x轴文字的配置
-			// 				show: true,
-			// 				textStyle: {
-			// 					color: "rgba(255,225,255,1)",
-			// 				},
-			// 			},
-			// 			nameTextStyle: {
-			// 				//y轴上方单位的颜色
-			// 				color: "#fff",
-			// 			},
-			// 			nameGap: 25,
-			// 			max: 30,
-			// 			min: 0,
-			// 			boundaryGap: [0.2, 0.2],
-			// 			splitLine: {
-			// 				show: false,
-			// 			},
-			// 		},
-			// 		{
-			// 			type: 'value',
-			// 			scale: true,
-			// 			name: '预警/m',
-			// 			max: 1200,
-			// 			nameGap: 25,
-			// 			min: 0,
-			// 			boundaryGap: [0.2, 0.2],
-			// 			nameTextStyle: {
-			// 				//y轴上方单位的颜色
-			// 				color: "#fff",
-			// 			},
-			// 			axisLabel: {
-			// 				//x轴文字的配置
-			// 				show: true,
-			// 				textStyle: {
-			// 					color: "rgba(255,225,255,1)",
-			// 				},
-			// 			},
-			// 			splitLine: {
-			// 				show: false,
-			// 			},
-			// 		}
-			// 	],
-			// 	series: [{
-			// 			name: '水位高度',
-			// 			type: 'bar',
-			// 			xAxisIndex: 1,
-			// 			yAxisIndex: 1,
-			// 			data: data
-			// 		},
-			// 		{
-			// 			name: '水位预警',
-			// 			type: 'line',
-			// 			data: data2
-			// 		}
-			// 	]
-			// };
-			// this.app.count = 11;
-			// let _this = this
-			// setInterval(function() {
-			// 	let axisData = new Date().toLocaleTimeString().replace(/^\D*/, '');
-			// 	data.shift();
-			// 	data.push(Math.round(Math.random() * 1000));
-			// 	data2.shift();
-			// 	data2.push(+(Math.random() * 10 + 5).toFixed(1));
-			// 	categories.shift();
-			// 	categories.push(axisData);
-			// 	categories2.shift();
-			// 	categories2.push(_this.app.count++);
-			// 	_this.option.xAxis = [{
-			// 			data: categories
-			// 		},
-			// 		{
-			// 			data: categories2
-			// 		}
-			// 	]
-			// 	_this.option.series = [{
-			// 			data: data
-			// 		},
-			// 		{
-			// 			data: data2
-			// 		}
-			// 	]
-			// }, 2100);
+			
 			this.option = {
 				legend: {
 					/*这里是四个指标，（去年同期和本月是柱状，增减百分比是折线，平衡点是在柱状上的横线）*/

src/views/Map3d/components/sbyxjc.vue

@@ -235,8 +235,16 @@
 		font-weight: 500;
 		margin-top: -4rem
 	}
+	
+	#main5::-webkit-scrollbar {
+		width: 0px;
+		background-color: rgba(0,0,0,0);
+		// 滚动条整体样式
+		// 高宽分别对应横竖滚动条的尺寸
+	}
 
 	#main5 {
+		overflow: scroll;
 		width: calc(100% - 20rem);
 		height: calc(100% - 20rem);
 		margin: 10rem;

src/views/qixiang/components/qixiangxx.vue

@@ -0,0 +1,223 @@
+<template>
+	<jt-echarts :chartData="option" style="width: 330rem;height:275rem;margin:10rem 0 0 0;"></jt-echarts>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				option:{},
+				app:{}
+			}
+		},
+		mounted() {
+			const categories = (function() {
+				let now = new Date();
+				let res = [];
+				let len = 10;
+				while (len--) {
+					res.unshift(now.toLocaleTimeString().replace(/^\D*/, ''));
+					now = new Date(+now - 2000);
+				}
+				return res;
+			})();
+			const categories2 = (function() {
+				let res = [];
+				let len = 10;
+				while (len--) {
+					res.push(10 - len - 1);
+				}
+				return res;
+			})();
+			const data = (function() {
+				let res = [];
+				let len = 10;
+				while (len--) {
+					res.push(Math.round(Math.random() * 1000));
+				}
+				return res;
+			})();
+			const data2 = (function() {
+				let res = [];
+				let len = 0;
+				while (len < 10) {
+					res.push(+(Math.random() * 10 + 5).toFixed(1));
+					len++;
+				}
+				return res;
+			})();
+			this.option = {
+				title: {
+					// text: '水位监测信息'
+				},
+				tooltip: {
+					trigger: 'axis',
+					axisPointer: {
+						type: 'cross',
+						label: {
+							backgroundColor: '#283b56'
+						}
+					}
+				},
+				legend: {
+					// 图例文字颜色
+					textStyle: {
+						color: "#fff",
+					},
+				},
+				toolbox: {
+					show: true,
+					feature: {
+						// dataView: {
+						// 	readOnly: false
+						// },
+						// restore: {},
+						// saveAsImage: {}
+					}
+				},
+				dataZoom: {
+					show: false,
+					start: 0,
+					end: 100
+				},
+				xAxis: [{
+						type: 'category',
+						boundaryGap: true,
+						data: categories,
+						axisLabel: {
+							//x轴文字的配置
+							show: true,
+							textStyle: {
+								color: "rgba(255,225,255,1)",
+							},
+						},
+						splitLine: {
+							show: false,
+							lineStyle: {
+								type: 'dashed',
+								color: '#113d5e'
+							}
+						},
+			
+					},
+					{
+						type: 'category',
+						boundaryGap: true,
+						data: categories2,
+						axisLabel: {
+							//x轴文字的配置
+							show: true,
+							textStyle: {
+								color: "rgba(255,225,255,1)",
+							},
+						},
+						splitLine: {
+							show: true,
+							lineStyle: {
+								type: 'dashed',
+								color: '#113d5e'
+							}
+						},
+					}
+				],
+				yAxis: [{
+						type: 'value',
+						scale: true,
+						name: '水位/m',
+						axisLabel: {
+							//x轴文字的配置
+							show: true,
+							textStyle: {
+								color: "rgba(255,225,255,1)",
+							},
+						},
+						nameTextStyle: {
+							//y轴上方单位的颜色
+							color: "#fff",
+						},
+						nameGap: 25,
+						max: 30,
+						min: 0,
+						boundaryGap: [0.2, 0.2],
+						splitLine: {
+							show: false,
+						},
+					},
+					{
+						type: 'value',
+						scale: true,
+						name: '预警/m',
+						max: 1200,
+						nameGap: 25,
+						min: 0,
+						boundaryGap: [0.2, 0.2],
+						nameTextStyle: {
+							//y轴上方单位的颜色
+							color: "#fff",
+						},
+						axisLabel: {
+							//x轴文字的配置
+							show: true,
+							textStyle: {
+								color: "rgba(255,225,255,1)",
+							},
+						},
+						splitLine: {
+							show: false,
+						},
+					}
+				],
+				series: [{
+						name: '水位高度',
+						type: 'bar',
+						xAxisIndex: 1,
+						yAxisIndex: 1,
+						data: data
+					},
+					{
+						name: '水位预警',
+						type: 'line',
+						data: data2
+					}
+				]
+			};
+
+			this.app.count = 11;
+			let _this = this
+			setInterval(function() {
+				let axisData = new Date().toLocaleTimeString().replace(/^\D*/, '');
+				data.shift();
+				data.push(Math.round(Math.random() * 1000));
+				data2.shift();
+				data2.push(+(Math.random() * 10 + 5).toFixed(1));
+				categories.shift();
+				categories.push(axisData);
+				categories2.shift();
+				categories2.push(_this.app.count++);
+				_this.option.xAxis = [{
+						data: categories
+					},
+					{
+						data: categories2
+					}
+				]
+				_this.option.series = [{
+						data: data
+					},
+					{
+						data: data2
+					}
+				]
+			}, 6100);
+		}
+	}
+</script>
+
+<style scoped>
+	#main {
+		margin-left: 15rem;
+		width: calc(100% - 15rem);
+		height: 220rem;
+		margin-top: 15rem;
+	}
+</style>

src/views/qixiang/qixiang.vue

@@ -1,8 +1,41 @@
+<script setup>
+	import qixiangxx from './components/qixiangxx.vue';
+</script>
 <template>
+	<jt-popup2 title="实时气象数据">
+		<qixiangxx></qixiangxx>
+	</jt-popup2>
+
+	<jt-popup2 title="" top="calc(calc(100% - 115rem) / 3 + 90rem)">
+
+	</jt-popup2>
+
+	<jt-popup2 title="" top="calc(calc(100% - 115rem) / 3 + calc(100% - 115rem) / 3 + 90rem)">
+
+	</jt-popup2>
+
+	<jt-popup3 title="">
+
+	</jt-popup3>
+
+	<jt-popup3 title="" top="calc(calc(100% - 115rem) / 3 + 90rem)">
+
+	</jt-popup3>
+
+	<jt-popup3 title="" top="calc(calc(100% - 115rem) / 3 + calc(100% - 115rem) / 3 + 90rem)">
+
+	</jt-popup3>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+
+			}
+		}
+	}
 </script>
 
 <style>
-</style>
+</style>

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