Merge branch 'master' of http://8.140.50.127:3000/JSY/jsy-app

components/custom-index-mp/custom-index-mp.vue

@@ -0,0 +1,38 @@
+<template>
+	<u-popup :show="open" mode="bottom" @close="close" closeable>
+		<view style="width: 100vw;height: calc(100vh - 100px);border: 1px solid red;"></view>f
+	</u-popup>
+</template>
+
+<script>
+	export default {
+		name: "Mp",
+		components: {},
+		props: {},
+		data() {
+			return {
+				title: "土壤墒情",
+				open: false,
+			}
+		},
+		created() {},
+		mounted() {},
+		methods: {
+			/**
+			 * 显示方法
+			 * @param type 1基站 2阀门
+			 * @param row
+			 * @param data 
+			 */
+			async show() {
+				this.open = true;
+			},
+			close() {
+				this.open = false;
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>

pages/index.vue

@@ -497,9 +497,11 @@
 		@select="landChange" />
 	<!-- 角度 -->
 	<custom-angle-slider ref="refAngleSlider" mode="bottom" @close="" @confirm="swiperConfirm" />
-	<!-- 墒情 -->
+	<!-- ADC -->
 	<custom-index-adc ref="adcRef" />
 
+	<custom-index-mp ref="mpRef" />
+
 </template>
 
 <script>
@@ -609,15 +611,15 @@
 					// case "wo":
 					// 	this.$refs.woRemarkRef.show(row);
 					// 	break;
-					// case "mp": //墒情
-					// 	this.$refs.mpRef.show(this.land);
-					// 	break;
 					// case "wh": //浇灌履历
 					// 	this.$refs.wateringHistoryRef.show(this.land, row);
 					// 	break;
 					// case "log": //日志
 					// 	this.$refs.deviceLogRef.show(this.land, row);
 					// 	break;
+					case "mp": //墒情
+						this.$refs.mpRef.show(this.land);
+						break;
 					case "adc": //设备adc
 						this.$refs.adcRef.show(2, row, this.dc.dataObj[row.dataKey]);
 						break;