新增控制器

api/driverapi.js

@@ -33,6 +33,22 @@ let api = {
 	
 	readControl_fiveControl:'/readControl/fiveControl',//读取（五防项目）控制器
 	getcontrol_wxgetpermission:'/getcontrol/wxgetpermission',//小程序手机控制权限数据
+	
+	readControl_solenoidValve1:'/readControl/solenoidValve1',//1#电磁阀
+	readControl_solenoidValve2:'/readControl/solenoidValve2',//2#电磁阀
+	readControl_solenoidValve3:'/readControl/solenoidValve3',//3#电磁阀
+	readControl_solenoidValve4:'/readControl/solenoidValve4',//4#电磁阀
+	readControl_solenoidValve5:'/readControl/solenoidValve5',//5#电磁阀
+	readControl_solenoidValve6:'/readControl/solenoidValve6',//6#电磁阀
+	readControl_solenoidValve7:'/readControl/solenoidValve7',//7#电磁阀
+	readControl_solenoidValve8:'/readControl/solenoidValve8',//8#电磁阀
+	
+	readControl_readfilllight:'/readControl/readfilllight',//读取（补光灯）控制器
+	readControl_readcirculationfan:'/readControl/readcirculationfan',//读取（环流风扇）控制器
+	readControl_fanwetcurtain:'/readControl/fanwetcurtain',//读取（风机湿帘）控制器
+	
+	readFs_byid:'/readFs/byid',//查看用户施肥机名称信息
+
 
 	//countType计算类型 0是原数据 1是原数据-400 2是原数据/10 3是(原数据-400) / 10 4是(原数据-1000)/10
 	typeList: [{

pages/fertilizer_machine/fertilizer_machine.vue

@@ -11,7 +11,7 @@
 				</view>
 				<view class="detail">
 					<template v-for="(item,index) in 64">
-						<view class="item" v-if="centerBottom.indexOf(index) != -1">
+						<view class="item" v-if="centerBottom.indexOf(index) != -1" :key="index">
 							{{ index + 1 }}#
 						</view>
 					</template>
@@ -97,7 +97,7 @@
 				<view class="contentPop">
 					<view class="contentPop_box">
 						<view class="title">
-							灌溉组#{{indexs}}
+							<!-- 灌溉组#{{indexs}} -->{{readFs_byid_name}}
 						</view>
 						<view class="control_model">
 							<view class="control">
@@ -228,7 +228,28 @@
 				indexs: 1,
 				inputData1: [],
 
-				timer_: null
+				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:'',
 			};
 		},
 		watch: {
@@ -244,6 +265,9 @@
 			this.timer_ = setInterval(function() {
 				that.dataInit();
 			}, 5000);
+			
+			// 查看用户施肥机名称信息
+			this.getReadFs_byid()
 		},
 		onUnload() {
 			let that = this
@@ -302,6 +326,20 @@
 
 
 			},
+			
+			// 查看用户施肥机名称信息
+			getReadFs_byid(){
+				let deviceId = this.deviceId;
+				this.$http({
+					url:this.api.readFs_byid + '?deviceId=' + deviceId,
+					method:'GET'
+				}).then(res=>{
+					if(res.code == 200){
+						this.readFs_byid_name_obj = res.data;
+					}
+				})
+			},
+			
 			getReg() {
 				uni.showLoading({
 				  title: '加载中...'
@@ -590,6 +628,12 @@
 				this.show = true
 				this.indexs = index
 				this.getReg()
+				
+				this.readFs_byid_list.forEach((el,j)=>{
+					if(index == (j+1)){
+						this.readFs_byid_name = this.readFs_byid_name_obj[el]
+					}
+				})
 			},
 
 			closePop() {

pages/timeEnvironment/timeEnvironment.vue

@@ -32,7 +32,6 @@
 				<view class="detail">
 					<view class="item" v-for="(item2,index2) in item1.childList" :key="index2"
 						@click="toTarget_water_fertilizer_PH(item2.equipmentId,item2.environmentData,item2.environmentDataId,item2.equipmentNumber,item2.targetValue,getTypeList(item2.formula),item2.equipmentName)">
-						<!-- <image :src='`../../static/icon/icon${ (index2 + 1) < 9 ? (index2 + 1) : 1 }.png`' mode=""></image> -->
 						<image :src="`../../static/icon_new/icon${ item2.formula }.png`" mode=""></image>
 						<view class="info">
 							<view class="">
@@ -47,35 +46,7 @@
 					<span>*更新数据时间&nbsp;: &nbsp;{{ updateTime }}</span>
 				</view>
 			</view>
-
+			
-			<!-- <view class="testBase" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
-				<view class="nav">
-					<image src="../../static/base.png" mode=""></image>
-					<text>{{ item1.deviceTypeName }}</text>
-				</view>
-				<view class="detail">
-					<view class="item" v-for="(item2,index2) in item1.childList" :key="index2" @click="toTarget_water_fertilizer_PH(item2.equipmentId,item2.environmentData)">
-						<image :src='`../../static/icon/icon@${ item2.formula ? item2.formula : 1 }.png`' mode=""></image>
-						<view class="info">
-							<view class="">{{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }}</view>
-							<view class="">{{ item2.environmentData + getTypeList(item2.formula) }}</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
-
-			<!-- <view class="testBase1" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
-				<view class="nav">
-					<image src="../../static/testBase1.png" mode=""></image>
-					<text>{{ item1.deviceTypeName }}</text>
-					<text>温室#1</text>
-				</view>
-				<view class="item"  v-for="(item2,index2) in item1.childList" :key="index2" @click="toTarget_water_fertilizer_PH(item2.equipmentId,item2.environmentData)">
-					<image :src="`../../static/icon/${ (index2 + 1) < 5 ? (index2 + 1) : 1  }.png`" mode=""></image>
-					<text>{{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }}</text>
-					<text>{{ item2.environmentData + getTypeList(item2.formula) }}</text>
-				</view>
-			</view> -->
 		</view>
 	</view>
 </template>
@@ -214,11 +185,6 @@
 				success: function(res) {
 					that.getEquipmentInfo(uni.getStorageSync('userid'))
 				},
-				// fail:function(err){
-				// 	uni.reLaunch({
-				// 		url:'/pages/login/login'
-				// 	})
-				// }
 			})
 			this.timer = setInterval(function() {
 				uni.getStorage({
@@ -226,17 +192,24 @@
 					success: function(res) {
 						that.getEquipmentInfo(uni.getStorageSync('userid'))
 					},
-					// fail:function(err){
-					// 	uni.reLaunch({
-					// 		url:'/pages/login/login'
-					// 	})
-					// }
 				})
 			}, 60000);
 		},
-		onUnload() {
+		onShow() {
 			let that = this
-			clearTimeout(that.timer)
+			clearInterval(that.timer) && that.timer
+			this.timer = setInterval(function() {
+				uni.getStorage({
+					key: 'token',
+					success: function(res) {
+						that.getEquipmentInfo(uni.getStorageSync('userid'))
+					},
+				})
+			}, 60000);
+		},
+		onHide(){
+			let that = this
+			clearInterval(that.timer) && that.timer
 		},
 		onPullDownRefresh() {
 			uni.showLoading({
@@ -248,11 +221,6 @@
 				success: function(res) {
 					that.getEquipmentInfo(uni.getStorageSync('userid'))
 				},
-				// fail:function(err){
-				// 	uni.reLaunch({
-				// 		url:'/pages/login/login'
-				// 	})
-				// }
 			})
 		},
 		mounted() {

pages/web_view_controller/web_view_controller.vue

@@ -25,7 +25,7 @@
 					key:'userid',
 					success:function(res){
 						that.userid = res.data
-						that.src = `https://portal.lihe-control.com/#/${options.url}?token=${that.token}&userid=${that.userid}&deviceId=${options.deviceId}`
+						that.src = `https://portal.lihe-control.com/#/${options.url}?token=${that.token}&userid=${that.userid}&deviceId=${options.deviceId}`+ (options.num ? '&id=' + options.num : '')
 						console.log(that.src);
 					}
 				})

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({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      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) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8934,7 +8934,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        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) {
+        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) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8955,14 +8955,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        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){
+        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){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        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){
+        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){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9058,7 +9058,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      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) {
+      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) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -12006,7 +12006,7 @@ var api = (_api = {
   sel_user: "/api/sel/user",
   //根据id查询用户信息
   getFs_rtdata: "/getFs/rtdata"
-}, (0, _defineProperty2.default)(_api, "selFs_time", "/selFs/time"), (0, _defineProperty2.default)(_api, "sel_eqbyid", "/sel/eqbyid/"), (0, _defineProperty2.default)(_api, "chart_fsdata", "/chart/fsdata"), (0, _defineProperty2.default)(_api, "user_update_pwd", "/user/update/pwd"), (0, _defineProperty2.default)(_api, "readFs_state", "/readFs/state"), (0, _defineProperty2.default)(_api, "writeFs", "/writeFs"), (0, _defineProperty2.default)(_api, "readFs_reg", "/readFs/reg"), (0, _defineProperty2.default)(_api, "readJinHuaControl_reg", "/readJinHuaControl/reg"), (0, _defineProperty2.default)(_api, "writeJinHuaControl_write", "/writeJinHuaControl/write"), (0, _defineProperty2.default)(_api, "getcontrol_rtdata", "/getcontrol/rtdata"), (0, _defineProperty2.default)(_api, "getcontrol_fsdata", "/getcontrol/fsdata"), (0, _defineProperty2.default)(_api, "getcontrol_cpermission", '/getcontrol/cpermission'), (0, _defineProperty2.default)(_api, "getControl_getState", '/readControl/getState'), (0, _defineProperty2.default)(_api, "getReadControlliShuiControl", '/readControl/liShuiControl'), (0, _defineProperty2.default)(_api, "readControl_fiveControl", '/readControl/fiveControl'), (0, _defineProperty2.default)(_api, "getcontrol_wxgetpermission", '/getcontrol/wxgetpermission'), (0, _defineProperty2.default)(_api, "typeList", [{
+}, (0, _defineProperty2.default)(_api, "selFs_time", "/selFs/time"), (0, _defineProperty2.default)(_api, "sel_eqbyid", "/sel/eqbyid/"), (0, _defineProperty2.default)(_api, "chart_fsdata", "/chart/fsdata"), (0, _defineProperty2.default)(_api, "user_update_pwd", "/user/update/pwd"), (0, _defineProperty2.default)(_api, "readFs_state", "/readFs/state"), (0, _defineProperty2.default)(_api, "writeFs", "/writeFs"), (0, _defineProperty2.default)(_api, "readFs_reg", "/readFs/reg"), (0, _defineProperty2.default)(_api, "readJinHuaControl_reg", "/readJinHuaControl/reg"), (0, _defineProperty2.default)(_api, "writeJinHuaControl_write", "/writeJinHuaControl/write"), (0, _defineProperty2.default)(_api, "getcontrol_rtdata", "/getcontrol/rtdata"), (0, _defineProperty2.default)(_api, "getcontrol_fsdata", "/getcontrol/fsdata"), (0, _defineProperty2.default)(_api, "getcontrol_cpermission", '/getcontrol/cpermission'), (0, _defineProperty2.default)(_api, "getControl_getState", '/readControl/getState'), (0, _defineProperty2.default)(_api, "getReadControlliShuiControl", '/readControl/liShuiControl'), (0, _defineProperty2.default)(_api, "readControl_fiveControl", '/readControl/fiveControl'), (0, _defineProperty2.default)(_api, "getcontrol_wxgetpermission", '/getcontrol/wxgetpermission'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve1", '/readControl/solenoidValve1'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve2", '/readControl/solenoidValve2'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve3", '/readControl/solenoidValve3'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve4", '/readControl/solenoidValve4'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve5", '/readControl/solenoidValve5'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve6", '/readControl/solenoidValve6'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve7", '/readControl/solenoidValve7'), (0, _defineProperty2.default)(_api, "readControl_solenoidValve8", '/readControl/solenoidValve8'), (0, _defineProperty2.default)(_api, "readControl_readfilllight", '/readControl/readfilllight'), (0, _defineProperty2.default)(_api, "readControl_readcirculationfan", '/readControl/readcirculationfan'), (0, _defineProperty2.default)(_api, "readControl_fanwetcurtain", '/readControl/fanwetcurtain'), (0, _defineProperty2.default)(_api, "readFs_byid", '/readFs/byid'), (0, _defineProperty2.default)(_api, "typeList", [{
   label: '无意义的传感器',
   value: 0,
   countType: 0,
@@ -12674,7 +12674,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({"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') {
+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') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
       if (errors.every(function (e) {

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

@@ -137,6 +137,50 @@
   font-weight: bold;
   color: #333333;
 }
+.controller .valve.data-v-a456d474 {
+  width: 100%;
+  height: 100rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(153, 153, 153, 0.1);
+  border-radius: 20rpx;
+  margin-bottom: 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding: 0 20rpx;
+}
+.controller .valve image.data-v-a456d474 {
+  width: 60rpx;
+  height: 61rpx;
+  margin-right: 20rpx;
+}
+.controller .valve ._span.data-v-a456d474 {
+  font-size: 34rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #333333;
+  flex: 1;
+}
+.controller .valve view.data-v-a456d474 {
+  width: 120rpx;
+  height: 54rpx;
+  background: #F5F6FA;
+  border: 2px solid #E1E2E6;
+  border-radius: 10rpx;
+  font-size: 28rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #666666;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.controller .valve view image.data-v-a456d474 {
+  width: 12rpx;
+  height: 20rpx;
+  margin-left: 19rpx;
+}
 .controller .lishui-item.data-v-a456d474 {
   width: 100%;
   background: #FFFFFF;
@@ -238,6 +282,63 @@
   color: #24B383;
   margin-left: 15rpx;
 }
+.controller .lishui-item .lishui-content .lishui-status .btn.data-v-a456d474 {
+  width: 190rpx;
+  height: 66rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.controller .lishui-item .lishui-content .lishui-status .btn > image.data-v-a456d474 {
+  width: 30rpx;
+  height: 30rpx;
+}
+.controller .lishui-item .lishui-content .lishui-status .btn > image.fan-img.data-v-a456d474 {
+  -webkit-animation: rotate-data-v-a456d474 5s linear infinite;
+          animation: rotate-data-v-a456d474 5s linear infinite;
+  /* 持续时间为 5 秒，线性缓动，无限循环 */
+  /* 定义旋转动画 */
+}
+@-webkit-keyframes rotate-data-v-a456d474 {
+from {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+to {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+@keyframes rotate-data-v-a456d474 {
+from {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+}
+to {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+.controller .lishui-item .lishui-content .lishui-status .btn ._span.data-v-a456d474 {
+  margin-left: 10rpx;
+}
+.controller .lishui-item .lishui-content .lishui-status .btn.btn-on.data-v-a456d474 {
+  background: linear-gradient(0deg, #54CDA4, #27B584);
+  border-radius: 10rpx;
+}
+.controller .lishui-item .lishui-content .lishui-status .btn.btn-on ._span.data-v-a456d474 {
+  color: #fff !important;
+}
+.controller .lishui-item .lishui-content .lishui-status .btn.btn-off.data-v-a456d474 {
+  background: #EFFCF7;
+  border: 2px solid rgba(58, 187, 144, 0.25);
+  border-radius: 10rpx;
+  box-sizing: border-box;
+}
+.controller .lishui-item .lishui-content .lishui-status .btn.btn-off ._span.data-v-a456d474 {
+  font-weight: bold;
+  color: #24B383;
+}
 .controller .lishui-item .lishui-content .lishui-flex.data-v-a456d474 {
   display: flex;
   align-items: center;
@@ -275,7 +376,34 @@
   box-sizing: border-box;
 }
 .controller .lishui-item .lishui-content .lishui-flex .btn.btn-off ._span.data-v-a456d474 {
+  color: #24B383;
+}
+.controller .lishui-item .lishui-content .input_value.data-v-a456d474 {
+  width: 100%;
+  height: 126rpx;
+  border-top: 1rpx solid #DDDDDD;
+  border-bottom: 1rpx solid #DDDDDD;
+  font-size: 30rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
   color: #333333;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 30rpx;
+}
+.controller .lishui-item .lishui-content .input_value input.data-v-a456d474 {
+  width: 120rpx;
+  height: 66rpx;
+  background: #F5F6FA;
+  border: 2px solid #E1E2E6;
+  border-radius: 10rpx;
+  margin: 0 20rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+  padding: 0 20rpx;
 }
 .controller .lishui-item .lishui-content .model-title.data-v-a456d474 {
   font-size: 28rpx;
@@ -308,16 +436,6 @@
   /* 持续时间为 5 秒，线性缓动，无限循环 */
   /* 定义旋转动画 */
 }
-@-webkit-keyframes rotate-data-v-a456d474 {
-from {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg);
-}
-to {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg);
-}
-}
 @keyframes rotate-data-v-a456d474 {
 from {
     -webkit-transform: rotate(0deg);
@@ -346,7 +464,7 @@ to {
 }
 .controller .lishui-item .lishui-content .lishui-grid .btn.btn-off ._span.data-v-a456d474 {
   font-weight: bold;
-  color: #333333;
+  color: #24B383;
 }
 .controller.data-v-a456d474 .u-mode-center-box {
   background-color: transparent;

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

@@ -417,7 +417,10 @@ var _default = {
       topActive: 0,
       indexs: 1,
       inputData1: [],
-      timer_: null
+      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: ''
     };
   },
   watch: {},
@@ -431,6 +434,9 @@ var _default = {
     this.timer_ = setInterval(function () {
       that.dataInit();
     }, 5000);
+
+    // 查看用户施肥机名称信息
+    this.getReadFs_byid();
   },
   onUnload: function onUnload() {
     var that = this;
@@ -489,8 +495,21 @@ var _default = {
         }
       });
     },
-    getReg: function getReg() {
+    // 查看用户施肥机名称信息
+    getReadFs_byid: function getReadFs_byid() {
       var _this2 = this;
+      var deviceId = this.deviceId;
+      this.$http({
+        url: this.api.readFs_byid + '?deviceId=' + deviceId,
+        method: 'GET'
+      }).then(function (res) {
+        if (res.code == 200) {
+          _this2.readFs_byid_name_obj = res.data;
+        }
+      });
+    },
+    getReg: function getReg() {
+      var _this3 = this;
       uni.showLoading({
         title: '加载中...'
       });
@@ -509,9 +528,9 @@ var _default = {
         if (res.code == 200) {
           uni.hideLoading();
           // uni.stopPullDownRefresh();
-          _this2.inputData1 = res.data;
+          _this3.inputData1 = res.data;
-          _this2.getType00();
+          _this3.getType00();
-          _this2.inputData1[10 + (_this2.indexs - 1) + '01'] = _this2.countData10(_this2.inputData1[10 + (_this2.indexs - 1) + '01']);
+          _this3.inputData1[10 + (_this3.indexs - 1) + '01'] = _this3.countData10(_this3.inputData1[10 + (_this3.indexs - 1) + '01']);
           // console.log(this.inputData1[10 + (this.indexs - 1) + '01'], 111);
         } else {
           that.$refs.uToast.show({
@@ -631,7 +650,7 @@ var _default = {
     },
     //限制 写入停止后j*100毫秒调取函数
     delayTimer: function delayTimer(i, data) {
-      var _this3 = this;
+      var _this4 = this;
       var that = this;
       //整体接口
       var j = 5;
@@ -641,12 +660,12 @@ var _default = {
         ++i;
         if (i == j) {
           that.changeData(data);
-          clearInterval(_this3.timer);
+          clearInterval(_this4.timer);
         }
       }, 100);
     },
     changeData: function changeData(data) {
-      var _this4 = this;
+      var _this5 = this;
       var that = this;
       this.$http({
         url: this.api.writeFs,
@@ -654,7 +673,7 @@ var _default = {
       }).then(function (res) {
         if (res.code == 200) {
           uni.hideLoading();
-          _this4.getReg();
+          _this5.getReg();
           that.$refs.uToast.show({
             title: res.msg,
             type: 'success'
@@ -734,12 +753,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 _this6 = this;
     var typeList = this.$store.state.typeList;
     var countType = 0;
     typeList.forEach(function (el, index) {
-      if (el.value == _this5.inputData1[typeCode]) {
+      if (el.value == _this6.inputData1[typeCode]) {
-        console.log(_this5.inputData1[typeCode], 111, el.countType);
+        console.log(_this6.inputData1[typeCode], 111, el.countType);
         countType = el.countType;
       }
     });
@@ -755,9 +774,15 @@ var _default = {
   }), (0, _defineProperty2.default)(_methods, "signalHandler", function signalHandler(index) {
     this.signalCurrent = index;
   }), (0, _defineProperty2.default)(_methods, "showPop", function showPop(index) {
+    var _this7 = this;
     this.show = true;
     this.indexs = index;
     this.getReg();
+    this.readFs_byid_list.forEach(function (el, j) {
+      if (index == j + 1) {
+        _this7.readFs_byid_name = _this7.readFs_byid_name_obj[el];
+      }
+    });
   }), (0, _defineProperty2.default)(_methods, "closePop", function closePop() {
     // this.dataInit();
     // this.getReg();

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

@@ -252,35 +252,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 var _default = {
   data: function data() {
     return {
@@ -388,30 +359,31 @@ var _default = {
       success: function success(res) {
         that.getEquipmentInfo(uni.getStorageSync('userid'));
       }
-      // fail:function(err){
-      // 	uni.reLaunch({
-      // 		url:'/pages/login/login'
-      // 	})
-      // }
     });
-
     this.timer = setInterval(function () {
       uni.getStorage({
         key: 'token',
         success: function success(res) {
           that.getEquipmentInfo(uni.getStorageSync('userid'));
         }
-        // fail:function(err){
-        // 	uni.reLaunch({
-        // 		url:'/pages/login/login'
-        // 	})
-        // }
       });
     }, 60000);
   },
-  onUnload: function onUnload() {
+  onShow: function onShow() {
     var that = this;
-    clearTimeout(that.timer);
+    clearInterval(that.timer) && that.timer;
+    this.timer = setInterval(function () {
+      uni.getStorage({
+        key: 'token',
+        success: function success(res) {
+          that.getEquipmentInfo(uni.getStorageSync('userid'));
+        }
+      });
+    }, 60000);
+  },
+  onHide: function onHide() {
+    var that = this;
+    clearInterval(that.timer) && that.timer;
   },
   onPullDownRefresh: function onPullDownRefresh() {
     uni.showLoading({
@@ -423,11 +395,6 @@ var _default = {
       success: function success(res) {
         that.getEquipmentInfo(uni.getStorageSync('userid'));
       }
-      // fail:function(err){
-      // 	uni.reLaunch({
-      // 		url:'/pages/login/login'
-      // 	})
-      // }
     });
   },
   mounted: function mounted() {

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

@@ -164,7 +164,7 @@ var _default = {
           key: 'userid',
           success: function success(res) {
             that.userid = res.data;
-            that.src = "https://portal.lihe-control.com/#/".concat(options.url, "?token=").concat(that.token, "&userid=").concat(that.userid, "&deviceId=").concat(options.deviceId);
+            that.src = "https://portal.lihe-control.com/#/".concat(options.url, "?token=").concat(that.token, "&userid=").concat(that.userid, "&deviceId=").concat(options.deviceId) + (options.num ? '&id=' + options.num : '');
             console.log(that.src);
           }
         });