1

pages/fertilizer_machine/fertilizer_machine.vue

@@ -148,6 +148,65 @@
 							次施肥
 						</view>
 								<view class="line_pop"></view>
+						<view class="irrigate_time3">
+							<view class="input-text">
+								电磁阀控制通道
+							</view>
+							<view class="input-view">
+								<view class="irrigate_input">
+									 <input v-model="inputData1[10 + (indexs - 1) + '54']" @blur="change(10 + (indexs - 1) + '54', $event)" 
+									     type="number" placeholder="0" />
+								</view>
+								<view class="irrigate_input">
+									 <input v-model="inputData1[10 + (indexs - 1) + '55']" @blur="change(10 + (indexs - 1) + '55', $event)" 
+									     type="number" placeholder="0" />
+								</view>
+								<view class="irrigate_input">
+									 <input v-model="inputData1[10 + (indexs - 1) + '56']" @blur="change(10 + (indexs - 1) + '56', $event)" 
+									     type="number" placeholder="0" />
+								</view>
+								<view class="irrigate_input">
+									 <input v-model="inputData1[10 + (indexs - 1) + '57']" @blur="change(10 + (indexs - 1) + '57', $event)" 
+									     type="number" placeholder="0" />
+								</view>
+								<view class="irrigate_input">
+									 <input v-model="inputData1[10 + (indexs - 1) + '60']" @blur="change(10 + (indexs - 1) + '60', $event)" 
+									     type="number" placeholder="0" />
+								</view>
+							</view>
+							<view class="input-view">
+								<view class="irrigate_input">
+									 <input v-model="inputData1[10 + (indexs - 1) + '61']" @blur="change(10 + (indexs - 1) + '61', $event)" 
+									     type="number" placeholder="0" />
+								</view>
+								<view class="irrigate_input">
+									 <input v-model="inputData1[10 + (indexs - 1) + '62']" @blur="change(10 + (indexs - 1) + '62', $event)" 
+									     type="number" placeholder="0" />
+								</view>
+								<view class="irrigate_input">
+									 <input v-model="inputData1[10 + (indexs - 1) + '63']" @blur="change(10 + (indexs - 1) + '63', $event)" 
+									     type="number" placeholder="0" />
+								</view>
+								<view class="irrigate_input">
+									 <input v-model="inputData1[10 + (indexs - 1) + '64']" @blur="change(10 + (indexs - 1) + '64', $event)" 
+									     type="number" placeholder="0" />
+								</view>
+								<view class="irrigate_input">
+									 <input v-model="inputData1[10 + (indexs - 1) + '65']" @blur="change(10 + (indexs - 1) + '65', $event)" 
+									     type="number" placeholder="0" />
+								</view>
+							</view>
+						</view>
+						<view class="line_pop"></view>
+						
+						<view class="irrigate_time2">
+							轮灌模式开关
+							<view class="btn" @click="changeIndexOpen(2)" :class="actList1[2]=='1'?'btn-on':'btn-off'">
+								<span>轮灌模式</span>
+							</view>
+						</view>
+						
+						<view class="line_pop"></view>
 						<view class="changeMoreBtn" @click="toWebView(indexs)">
 							<image src="../../static/changeMore.png" mode=""></image>
 							<text>修改更多参数</text>
@@ -252,6 +311,7 @@
 					'solenoidSixteen'
 				],
 				readFs_byid_name:'',
+				actList1:["0","0","0","0"]
 			};
 		},
 		watch: {
@@ -282,6 +342,7 @@
 			this.dataInit();
 		},
 		methods: {
+			
 			toWebView(id) {
 				// console.log(id);
 				uni.navigateTo({
@@ -341,7 +402,58 @@
 					}
 				})
 			},
+			changeIndexOpen(active) {
+				if (this.actList1[active] == '1') {
+					this.actList1[active] = '0'
+				} else {
+					this.actList1[active] = '1'
+				}
+				var revList = this.actList1.slice().reverse()
+				var num = revList.join("");
+				var dataNum = {
+					target: {
+						value: parseInt(num, 2),
+					},
+				};
+				this.$forceUpdate()
+				this.changeBtn(10 + (this.indexs - 1) + "59", dataNum);
+					// this.change(10 + (this.indexs - 1) + "59", dataNum);
+			},
+			changeBtn(code, el) {
 			
+				var data = {
+					equipmentId: this.deviceId,
+					regAddress: code,
+					num: el.target.value,
+				};
+				this.delayTimerBtn(0, data);
+			},
+			//切换btn的限制 写入停止后j*100毫秒调取函数
+			delayTimerBtn(i, data) {
+				const that = this;
+				//整体接口
+				let j = 10;
+				//避免开启多个计时器
+				this.timer && clearInterval(this.timer);
+			
+				this.timer = setInterval(() => {
+					++i;
+					if (i == j) {
+						that.changeData(data);
+						clearInterval(this.timer);
+					}
+				}, 100);
+			},
+			get59(){
+					this.actList1 = []
+					var num = this.inputData1[10 + (this.indexs - 1) + "59"]
+					var num1 = this.padString(num.toString(2), 4)
+					var openListNew = []
+					openListNew = num1.split("")
+					openListNew.forEach((el, index) => {
+						this.actList1.push(openListNew[openListNew.length - index - 1])
+					})
+			},
 			getReg() {
 				uni.showLoading({
 				  title: '加载中...'
@@ -350,7 +462,7 @@
 				var data = {
 					equipmentId: this.deviceId,
 					pattern: 10 + (this.indexs - 1) + "00", //需要根据文档填写 //6目标ph-数值
-					regNum: 61,
+					regNum: 75,
 				};
 
 				this.$http({
@@ -363,6 +475,7 @@
 						// uni.stopPullDownRefresh();
 						this.inputData1 = res.data;
 						this.getType00();
+						this.get59()
 						this.inputData1[10 + (this.indexs - 1) + '01'] = this.countData10(this.inputData1[10 + (
 							this.indexs - 1) + '01'])
 						// console.log(this.inputData1[10 + (this.indexs - 1) + '01'], 111);
@@ -666,7 +779,60 @@
 		width: 100%;
 		min-height: 100vh;
 		background-color: #F5F6FA;
+		.btn {
+			width: 190rpx;
+			height: 66rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 		
+			>image {
+				width: 30rpx;
+				height: 30rpx;
+		
+				&.fan-img {
+					animation: rotate 5s linear infinite;
+					/* 持续时间为 5 秒，线性缓动，无限循环 */
+					/* 定义旋转动画 */
+				}
+		
+				@keyframes rotate {
+					from {
+						transform: rotate(0deg);
+					}
+		
+					to {
+						transform: rotate(360deg);
+					}
+				}
+			}
+		
+			span {
+				margin-left: 10rpx;
+			}
+		
+			&.btn-on {
+				background: linear-gradient(0deg, #54CDA4, #27B584);
+				border-radius: 10rpx;
+		
+				span {
+					color: #fff !important;
+				}
+			}
+		
+			&.btn-off {
+				background: #EFFCF7;
+				border: 2px solid rgba(58, 187, 144, 0.25);
+				border-radius: 10rpx;
+				box-sizing: border-box;
+		
+				span {
+		
+					font-weight: bold;
+					color: #24B383;
+				}
+			}
+		}
 		.content {
 			box-sizing: border-box;
 			padding: 20rpx 30rpx;
@@ -999,6 +1165,50 @@
 			/deep/.u-mode-center-box {
 				background-color: transparent;
 			}
+			.irrigate_time1,
+			.irrigate_time2,
+			.irrigate_time3 {
+				height: 126rpx;
+				display: flex;
+				align-items: center;
+				// border-bottom: 1rpx solid #DDDDDD;
+				font-size: 30rpx;
+				font-family: PingFang-SC-Bold;
+				font-weight: bold;
+				color: #333333;
+				box-sizing: border-box;
+				padding-left: 30rpx;
+			
+				.irrigate_input {
+					width: 90rpx;
+					height: 66rpx;
+					background: #F5F6FA;
+					border: 2px solid #E1E2E6;
+					border-radius: 10rpx;
+					margin: 0 15rpx;
+			
+					>input {
+						width: 100%;
+						height: 100%;
+						text-align: center;
+					}
+				}
+			}
+			.irrigate_time3{
+				flex-wrap: wrap;
+				height: auto;
+				padding: 20rpx 0 20rpx 30rpx;
+				>view{
+					width: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					&.input-text{
+						justify-content: flex-start;
+					}
+					flex-shrink: 0;
+				}
+			}
 			
 			.contentPop {
 				width: 100%;
@@ -1104,34 +1314,6 @@
 						}
 					}
 
-					.irrigate_time1,
-					.irrigate_time2 {
-						height: 126rpx;
-						display: flex;
-						align-items: center;
-						// border-bottom: 1rpx solid #DDDDDD;
-						font-size: 30rpx;
-						font-family: PingFang-SC-Bold;
-						font-weight: bold;
-						color: #333333;
-						box-sizing: border-box;
-						padding-left: 30rpx;
-
-						.irrigate_input {
-							width: 90rpx;
-							height: 66rpx;
-							background: #F5F6FA;
-							border: 2px solid #E1E2E6;
-							border-radius: 10rpx;
-							margin: 0 15rpx;
-
-							>input {
-								width: 100%;
-								height: 100%;
-								text-align: center;
-							}
-						}
-					}
 					
 					.changeMoreBtn {
 						width: 340rpx;

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8923,7 +8923,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8944,14 +8944,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9047,7 +9047,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -12647,7 +12647,7 @@ function _extends() {
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
+if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
       if (errors.every(function (e) {

unpackage/dist/dev/mp-weixin/pages/fertilizer_machine/fertilizer_machine.js

@@ -379,6 +379,65 @@ var _methods;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -431,7 +490,8 @@ var _default = {
       timer_: null,
       readFs_byid_name_obj: {},
       readFs_byid_list: ['solenoidOne', 'solenoidTwo', 'solenoidThree', 'solenoidFour', 'solenoidFive', 'solenoidSix', 'solenoidSeven', 'solenoidEight', 'solenoidNine', 'solenoidTen', 'solenoidElven', 'solenoidTwelve', 'solenoidThirteen', 'solenoidFourteen', 'solenoidFifteen', 'solenoidSixteen'],
-      readFs_byid_name: ''
+      readFs_byid_name: '',
+      actList1: ["0", "0", "0", "0"]
     };
   },
   watch: {},
@@ -519,8 +579,60 @@ var _default = {
         }
       });
     },
-    getReg: function getReg() {
+    changeIndexOpen: function changeIndexOpen(active) {
+      if (this.actList1[active] == '1') {
+        this.actList1[active] = '0';
+      } else {
+        this.actList1[active] = '1';
+      }
+      var revList = this.actList1.slice().reverse();
+      var num = revList.join("");
+      var dataNum = {
+        target: {
+          value: parseInt(num, 2)
+        }
+      };
+      this.$forceUpdate();
+      this.changeBtn(10 + (this.indexs - 1) + "59", dataNum);
+      // this.change(10 + (this.indexs - 1) + "59", dataNum);
+    },
+    changeBtn: function changeBtn(code, el) {
+      var data = {
+        equipmentId: this.deviceId,
+        regAddress: code,
+        num: el.target.value
+      };
+      this.delayTimerBtn(0, data);
+    },
+    //切换btn的限制 写入停止后j*100毫秒调取函数
+    delayTimerBtn: function delayTimerBtn(i, data) {
       var _this3 = this;
+      var that = this;
+      //整体接口
+      var j = 10;
+      //避免开启多个计时器
+      this.timer && clearInterval(this.timer);
+      this.timer = setInterval(function () {
+        ++i;
+        if (i == j) {
+          that.changeData(data);
+          clearInterval(_this3.timer);
+        }
+      }, 100);
+    },
+    get59: function get59() {
+      var _this4 = this;
+      this.actList1 = [];
+      var num = this.inputData1[10 + (this.indexs - 1) + "59"];
+      var num1 = this.padString(num.toString(2), 4);
+      var openListNew = [];
+      openListNew = num1.split("");
+      openListNew.forEach(function (el, index) {
+        _this4.actList1.push(openListNew[openListNew.length - index - 1]);
+      });
+    },
+    getReg: function getReg() {
+      var _this5 = this;
       uni.showLoading({
         title: '加载中...'
       });
@@ -529,7 +641,7 @@ var _default = {
         equipmentId: this.deviceId,
         pattern: 10 + (this.indexs - 1) + "00",
         //需要根据文档填写 //6目标ph-数值
-        regNum: 61
+        regNum: 75
       };
       this.$http({
         url: this.api.readFs_reg,
@@ -539,9 +651,10 @@ var _default = {
         if (res.code == 200) {
           uni.hideLoading();
           // uni.stopPullDownRefresh();
-          _this3.inputData1 = res.data;
+          _this5.inputData1 = res.data;
-          _this3.getType00();
+          _this5.getType00();
-          _this3.inputData1[10 + (_this3.indexs - 1) + '01'] = _this3.countData10(_this3.inputData1[10 + (_this3.indexs - 1) + '01']);
+          _this5.get59();
+          _this5.inputData1[10 + (_this5.indexs - 1) + '01'] = _this5.countData10(_this5.inputData1[10 + (_this5.indexs - 1) + '01']);
           // console.log(this.inputData1[10 + (this.indexs - 1) + '01'], 111);
         } else {
           that.$refs.uToast.show({
@@ -675,7 +788,7 @@ var _default = {
     },
     //限制 写入停止后j*100毫秒调取函数
     delayTimer: function delayTimer(i, data) {
-      var _this4 = this;
+      var _this6 = this;
       var that = this;
       //整体接口
       var j = 5;
@@ -685,7 +798,7 @@ var _default = {
         ++i;
         if (i == j) {
           that.changeData(data);
-          clearInterval(_this4.timer);
+          clearInterval(_this6.timer);
         }
       }, 100);
     },
@@ -778,12 +891,12 @@ var _default = {
   }), (0, _defineProperty2.default)(_methods, "countType3", function countType3(data) {
     return (data - 400) / 10;
   }), (0, _defineProperty2.default)(_methods, "getTypeData", function getTypeData(dataCode, typeCode) {
-    var _this5 = this;
+    var _this7 = this;
     var typeList = this.$store.state.typeList;
     var countType = 0;
     typeList.forEach(function (el, index) {
-      if (el.value == _this5.inputData1[typeCode]) {
+      if (el.value == _this7.inputData1[typeCode]) {
-        console.log(_this5.inputData1[typeCode], 111, el.countType);
+        console.log(_this7.inputData1[typeCode], 111, el.countType);
         countType = el.countType;
       }
     });
@@ -799,13 +912,13 @@ var _default = {
   }), (0, _defineProperty2.default)(_methods, "signalHandler", function signalHandler(index) {
     this.signalCurrent = index;
   }), (0, _defineProperty2.default)(_methods, "showPop", function showPop(index) {
-    var _this6 = this;
+    var _this8 = this;
     this.show = true;
     this.indexs = index;
     this.getReg();
     this.readFs_byid_list.forEach(function (el, j) {
       if (index == j + 1) {
-        _this6.readFs_byid_name = _this6.readFs_byid_name_obj[el];
+        _this8.readFs_byid_name = _this8.readFs_byid_name_obj[el];
       }
     });
   }), (0, _defineProperty2.default)(_methods, "closePop", function closePop() {

unpackage/dist/dev/mp-weixin/pages/fertilizer_machine/fertilizer_machine.wxss

@@ -29,6 +29,63 @@
   min-height: 100vh;
   background-color: #F5F6FA;
 }
+.fertilizer_machine .btn.data-v-04917a06 {
+  width: 190rpx;
+  height: 66rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.fertilizer_machine .btn > image.data-v-04917a06 {
+  width: 30rpx;
+  height: 30rpx;
+}
+.fertilizer_machine .btn > image.fan-img.data-v-04917a06 {
+  -webkit-animation: rotate-data-v-04917a06 5s linear infinite;
+          animation: rotate-data-v-04917a06 5s linear infinite;
+  /* 持续时间为 5 秒，线性缓动，无限循环 */
+  /* 定义旋转动画 */
+}
+@-webkit-keyframes rotate-data-v-04917a06 {
+from {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+to {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+@keyframes rotate-data-v-04917a06 {
+from {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+to {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+.fertilizer_machine .btn ._span.data-v-04917a06 {
+  margin-left: 10rpx;
+}
+.fertilizer_machine .btn.btn-on.data-v-04917a06 {
+  background: linear-gradient(0deg, #54CDA4, #27B584);
+  border-radius: 10rpx;
+}
+.fertilizer_machine .btn.btn-on ._span.data-v-04917a06 {
+  color: #fff !important;
+}
+.fertilizer_machine .btn.btn-off.data-v-04917a06 {
+  background: #EFFCF7;
+  border: 2px solid rgba(58, 187, 144, 0.25);
+  border-radius: 10rpx;
+  box-sizing: border-box;
+}
+.fertilizer_machine .btn.btn-off ._span.data-v-04917a06 {
+  font-weight: bold;
+  color: #24B383;
+}
 .fertilizer_machine .content.data-v-04917a06 {
   box-sizing: border-box;
   padding: 20rpx 30rpx;
@@ -310,6 +367,51 @@
 .fertilizer_machine .content.data-v-04917a06 .u-mode-center-box {
   background-color: transparent;
 }
+.fertilizer_machine .content .irrigate_time1.data-v-04917a06,
+.fertilizer_machine .content .irrigate_time2.data-v-04917a06,
+.fertilizer_machine .content .irrigate_time3.data-v-04917a06 {
+  height: 126rpx;
+  display: flex;
+  align-items: center;
+  font-size: 30rpx;
+  font-family: PingFang-SC-Bold;
+  font-weight: bold;
+  color: #333333;
+  box-sizing: border-box;
+  padding-left: 30rpx;
+}
+.fertilizer_machine .content .irrigate_time1 .irrigate_input.data-v-04917a06,
+.fertilizer_machine .content .irrigate_time2 .irrigate_input.data-v-04917a06,
+.fertilizer_machine .content .irrigate_time3 .irrigate_input.data-v-04917a06 {
+  width: 90rpx;
+  height: 66rpx;
+  background: #F5F6FA;
+  border: 2px solid #E1E2E6;
+  border-radius: 10rpx;
+  margin: 0 15rpx;
+}
+.fertilizer_machine .content .irrigate_time1 .irrigate_input > input.data-v-04917a06,
+.fertilizer_machine .content .irrigate_time2 .irrigate_input > input.data-v-04917a06,
+.fertilizer_machine .content .irrigate_time3 .irrigate_input > input.data-v-04917a06 {
+  width: 100%;
+  height: 100%;
+  text-align: center;
+}
+.fertilizer_machine .content .irrigate_time3.data-v-04917a06 {
+  flex-wrap: wrap;
+  height: auto;
+  padding: 20rpx 0 20rpx 30rpx;
+}
+.fertilizer_machine .content .irrigate_time3 > view.data-v-04917a06 {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+.fertilizer_machine .content .irrigate_time3 > view.input-text.data-v-04917a06 {
+  justify-content: flex-start;
+}
 .fertilizer_machine .content .contentPop.data-v-04917a06 {
   width: 100%;
   min-height: calc(100% - 70rpx);
@@ -404,33 +506,6 @@
   align-items: center;
   justify-content: center;
 }
-.fertilizer_machine .content .contentPop .contentPop_box .irrigate_time1.data-v-04917a06,
-.fertilizer_machine .content .contentPop .contentPop_box .irrigate_time2.data-v-04917a06 {
-  height: 126rpx;
-  display: flex;
-  align-items: center;
-  font-size: 30rpx;
-  font-family: PingFang-SC-Bold;
-  font-weight: bold;
-  color: #333333;
-  box-sizing: border-box;
-  padding-left: 30rpx;
-}
-.fertilizer_machine .content .contentPop .contentPop_box .irrigate_time1 .irrigate_input.data-v-04917a06,
-.fertilizer_machine .content .contentPop .contentPop_box .irrigate_time2 .irrigate_input.data-v-04917a06 {
-  width: 90rpx;
-  height: 66rpx;
-  background: #F5F6FA;
-  border: 2px solid #E1E2E6;
-  border-radius: 10rpx;
-  margin: 0 15rpx;
-}
-.fertilizer_machine .content .contentPop .contentPop_box .irrigate_time1 .irrigate_input > input.data-v-04917a06,
-.fertilizer_machine .content .contentPop .contentPop_box .irrigate_time2 .irrigate_input > input.data-v-04917a06 {
-  width: 100%;
-  height: 100%;
-  text-align: center;
-}
 .fertilizer_machine .content .contentPop .contentPop_box .changeMoreBtn.data-v-04917a06 {
   width: 340rpx;
   height: 80rpx;