Merge pull request 'wx-program' (#1) from wx-program into mini-program

Reviewed-on: #1

main.js

@@ -29,16 +29,4 @@ import api from '@/api/driverapi.js'
 Vue.prototype.api = api;
 //
 import {myRequest} from "./api/nvuerequest"
-Vue.prototype.$http=myRequest 
+Vue.prototype.$http=myRequest 
-
-// 图片前缀
-Vue.prototype.$getImgUrl = function(imgUrl) {
-    if(imgUrl){
-        var newStr = imgUrl.indexOf("http")
-        if (imgUrl.indexOf("http") !== -1) {
-            return imgUrl
-        } else {
-            return config.cdnUrl + imgUrl || ''
-        }
-    }    
-}

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "greenhouse-wisdom-applet",
-    "appid" : "__UNI__A71060E",
+    "appid" : "__UNI__1066059",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -50,15 +50,11 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx0518521f67048cc8",
+        "appid" : "wx05b45a2699f02a2b",
         "setting" : {
-            "urlCheck" : false,
+            "urlCheck" : false
-            "minified" : true
         },
-        "usingComponents" : true,
+        "usingComponents" : true
-        "secureNetwork" : {
-            "enable" : false
-        }
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -108,7 +108,6 @@
                 "navigationBarTitleText": "",
                 "navigationStyle": "custom"
             }
-            
         }
     ],
 	"globalStyle": {

pages/add_irrigation_group/add_irrigation_group.vue

@@ -15,7 +15,7 @@
 			
 		<view class="save">
 			<view class="save_btn">
-				<image src="https://cdn.lihe-control.com/static/save_image.png" mode=""></image>
+				<image src="../../static/save_image.png" mode=""></image>
 				保存
 			</view>
 		</view>

pages/editSite/editSite.vue

@@ -28,7 +28,7 @@
 				</view>
 				<view class="btn">
 					<view class="edit">
-						<image src="https://cdn.lihe-control.com/static/edit.png" mode=""></image>
+						<image src="../../static/edit.png" mode=""></image>
 						<text>编辑</text>
 					</view>
 					<view class="delete">
@@ -40,7 +40,7 @@
 			<view class="camera">
 				<text class="left">摄像机</text>
 				<view class="right">
-					<image src="https://cdn.lihe-control.com/static/add_camera.png" mode=""></image>
+					<image src="../../static/add_camera.png" mode=""></image>
 					<text>摄像机</text>
 				</view>
 			</view>
@@ -67,7 +67,7 @@
 				<text class="left">主摄像机</text>
 				<view class="right">
 					摄像机#2
-					<image src="https://cdn.lihe-control.com/static/downArrow.png" mode=""></image>
+					<image src="../../static/downArrow.png" mode=""></image>
 				</view>
 			</view>
 			
@@ -76,7 +76,7 @@
 		
 		<view class="save">
 			<view class="save_btn">
-				<image src="https://cdn.lihe-control.com/static/save_image.png" mode=""></image>
+				<image src="../../static/save_image.png" mode=""></image>
 				保存
 			</view>
 		</view>

pages/fertilizer_machine/fertilizer_machine.vue

@@ -6,7 +6,7 @@
 		<view class="content">
 			<view class="output_valve">
 				<view class="title">
-					<image src="https://cdn.lihe-control.com/static/output_valve.png" mode=""></image>
+					<image src="../../static/output_valve.png" mode=""></image>
 					<text>输出电磁阀</text>
 				</view>
 				<view class="detail">
@@ -21,31 +21,31 @@
 			<view class="dataInfo1">
 				<view class="item">
 					<view class="img">
-						<image src="https://cdn.lihe-control.com/static/PH1.png" mode=""></image>
+						<image src="../../static/PH1.png" mode=""></image>
 					</view>
 					<text>目标PH</text>
 					<text>{{ countData100(inputData['6']) }}</text>
 				</view>
 				<view class="item">
 					<view class="img">
-						<image src="https://cdn.lihe-control.com/static/PH1.png" mode=""></image>
+						<image src="../../static/PH1.png" mode=""></image>
 					</view>
 					<text>实测PH</text>
 					<text>{{ countData100(inputData['8']) }}</text>
 				</view>
 				<view class="item1">
 					<view class="img">
-						<image src="https://cdn.lihe-control.com/static/EC.png" mode=""></image>
+						<image src="../../static/EC.png" mode=""></image>
 					</view>
 					<text>目标EC</text>
-					<text>{{ countData100(inputData['7']) }}</text>
+					<text>{{ countData100(inputData['7']) + 'mS/cm' }}</text>
 				</view>
 				<view class="item1">
 					<view class="img">
-						<image src="https://cdn.lihe-control.com/static/EC.png" mode=""></image>
+						<image src="../../static/EC.png" mode=""></image>
 					</view>
 					<text>实测EC</text>
-					<text>{{ countData100(inputData['9']) }}</text>
+					<text>{{ countData100(inputData['9']) + 'mS/cm' }}</text>
 				</view>
 			</view>
 
@@ -59,13 +59,13 @@
 				</view>
 				<view class="bottom">
 					<view class="btn-1" :class="left1Act == 0 ? 'in' : 'out'">
-						<image v-if="left1Act == 0" src="https://cdn.lihe-control.com/static/in-sel.png" mode=""></image>
+						<image v-if="left1Act == 0" src="../../static/in-sel.png" mode=""></image>
-						<image v-else src="https://cdn.lihe-control.com/static/in.png" mode=""></image>
+						<image v-else src="../../static/in.png" mode=""></image>
 						<text>进水泵</text>
 					</view>
 					<view class="btn-2" :class="left1Act == 1 ? 'in' : 'out'">
-						<image v-if="left1Act == 1" src="https://cdn.lihe-control.com/static/out-sel.png" mode=""></image>
+						<image v-if="left1Act == 1" src="../../static/out-sel.png" mode=""></image>
-						<image v-else src="https://cdn.lihe-control.com/static/out.png" mode=""></image>
+						<image v-else src="../../static/out.png" mode=""></image>
 						<text>配肥泵</text>
 					</view>
 				</view>
@@ -85,16 +85,16 @@
 					</view>
 					<view class="right">
 						<text>设置</text>
-						<image src="https://cdn.lihe-control.com/static/downArrow.png" mode=""></image>
+						<image src="../../static/downArrow.png" mode=""></image>
 					</view>
 				</view>
 			</view>
 
-			<u-popup v-model="show" mode="center" width="640rpx" height="860rpx" :closeable='false'>
+			<u-popup v-model="show" mode="center" :mask-close-able='false' width="640rpx" height="880rpx" :closeable='false'>
 				<view class="contentPop">
 					<view class="contentPop_box">
 						<view class="title">
-							灌溉组#{{indexs+1}}
+							灌溉组#{{indexs}}
 						</view>
 						<view class="control_model">
 							<view class="control">
@@ -112,7 +112,7 @@
 							手动启动时间
 							<view class="irrigate_input">
 								<input v-model="inputData1[10 + (indexs - 1) + '01']"
-									@input="changeData10(10 + (indexs - 1) + '01', $event)" type="number" placeholder="0" />
+									@blur="changeData10(10 + (indexs - 1) + '01', $event)" type="digit" placeholder="0" step="0.1" />
 								<!-- <u-input v-model="inputData[10 + (indexs - 1) + '01']" type="text" :border="false" input-align='center'
 									height='66' :clearable='false' /> -->
 							</view>
@@ -122,7 +122,7 @@
 							灌溉
 							<view class="irrigate_input">
 								<input v-model="inputData1[10 + (indexs - 1) + '51']"
-									@input="change(10 + (indexs - 1) + '51', $event)" type="number" placeholder="0" />
+									@blur="change(10 + (indexs - 1) + '51', $event)" type="number" placeholder="0" />
 								<!-- 		<u-input v-model="inputData[10 + (indexs - 1) + '51']" type="text" :border="false" input-align='center'
 									height='66' :clearable='false' /> -->
 							</view>
@@ -132,19 +132,19 @@
 							间隔灌溉
 							<view class="irrigate_input">
 								<input v-model="inputData1[10 + (indexs - 1) + '52']"
-									@input="change(10 + (indexs - 1) + '52', $event)" type="number" placeholder="0" />
+									@blur="change(10 + (indexs - 1) + '52', $event)" type="number" placeholder="0" />
 								<!-- 	<u-input v-model="inputData[10 + (indexs - 1) + '52']" type="text" input-align='center' height='66'
 									:clearable='false' /> -->
 							</view>
 							次施肥
 						</view>
-						<!-- 						<view class="changeMoreBtn">
+						<view class="changeMoreBtn">
-							<image src="https://cdn.lihe-control.com/static/changeMore.png" mode=""></image>
+							<image src="../../static/changeMore.png" mode=""></image>
 							<text>修改更多参数</text>
-						</view> -->
+						</view>
 					</view>
 
-					<image src="https://cdn.lihe-control.com/static/closed.png" mode="" @click="closePop"></image>
+					<image src="../../static/closed.png" mode="" @click="closePop"></image>
 				</view>
 			</u-popup>
 		</view>
@@ -163,32 +163,32 @@
 				// 输出电磁阀
 
 				dataInfo2_list: [{
-						image: 'https://cdn.lihe-control.com/static/icon_1.png',
+						image: '../../static/icon_1.png',
 						title: '灌溉剩余时长',
 						timer: '0min'
 					},
 					{
-						image: 'https://cdn.lihe-control.com/static/icon_2.png',
+						image: '../../static/icon_2.png',
 						title: '灌溉瞬时流量',
 						timer: '0L/h'
 					},
 					{
-						image: 'https://cdn.lihe-control.com/static/icon_3.png',
+						image: '../../static/icon_3.png',
 						title: '本次灌溉量',
 						timer: '0L'
 					},
 					{
-						image: 'https://cdn.lihe-control.com/static/icon_4.png',
+						image: '../../static/icon_4.png',
 						title: '启动方式',
 						timer: '无'
 					},
 					{
-						image: 'https://cdn.lihe-control.com/static/icon_5.png',
+						image: '../../static/icon_5.png',
 						title: '使用灌溉配方号',
 						timer: '0'
 					},
 					{
-						image: 'https://cdn.lihe-control.com/static/icon_6.png',
+						image: '../../static/icon_6.png',
 						title: '执行灌溉组号',
 						timer: '0'
 					},
@@ -227,17 +227,20 @@
 		onLoad(option) {
 			this.deviceId = option.id
 			this.dataInit()
-
+      
 		},
 		methods: {
-  countData10(data){
+      countData10(data){
             if(data){
                 return data/10
             }else{
                 return 0
             }
-        },
+      },
 			dataInit() {
+        uni.showLoading({
+          title: '加载中...'
+        })
 				const that= this
 				var deviceId = this.deviceId
 				var data = {
@@ -250,6 +253,7 @@
 					data: data
 				}).then(res => {
 					if (res.code == 200) {
+            uni.hideLoading()
 						this.inputData = res.data;
 						this.getData30() //数据30/进水出水泵
 						this.getData29() //数据29 启动方式/信号
@@ -266,6 +270,9 @@
 
 			},
 			getReg() {
+        uni.showLoading({
+          title: '加载中...'
+        })
 				const that= this
 				var data = {
 					equipmentId: this.deviceId,
@@ -279,6 +286,7 @@
 				}).then((res) => {
 					console.log(res, 11);
 					if (res.code == 200) {
+            uni.hideLoading()
 						this.inputData1 = res.data;
 						this.getType00();
 						     this.inputData1[10 + (this.indexs - 1) + '01']=this.countData10(this.inputData1[10 + (this.indexs - 1) + '01'])
@@ -356,7 +364,7 @@
 				this.dataInfo2_list[3].timer = this.getType29(typeNumber)
 				var statusIndex = 8
 				for (var j = 0; j < statusIndex; j++) {
-					if (Number(number[number.length - j])) {
+					if (Number(number[number.length - 1 - j])) {
 						this.right2Index.push(j)
 					}
 				}
@@ -408,7 +416,7 @@
 				}, 100);
 			},
 			changeData(data) {
-const that= this
+        const that= this
 				this.$http({
 					url: this.api.writeFs,
 					data: data
@@ -541,6 +549,8 @@ const that= this
 			},
 
 			closePop() {
+        this.dataInit();
+        this.getReg();
 				this.show = false
 			}
 		}
@@ -622,10 +632,12 @@ const that= this
 
 				.item,
 				.item1 {
+          width: 25%;
 					display: flex;
 					flex-direction: column;
 					align-items: center;
 					justify-content: center;
+          flex-shrink: 0;
 
 
 					>text:nth-child(2) {
@@ -637,7 +649,7 @@ const that= this
 					}
 
 					>text:nth-child(3) {
-						font-size: 38rpx;
+						font-size: 28rpx;
 						font-family: PingFang-SC-Bold;
 						font-weight: bold;
 

pages/login/login.vue

@@ -4,7 +4,7 @@
 			title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
 
 		<view class="navbar">
-			<image src="https://cdn.lihe-control.com/static/login.png" mode=""></image>
+			<image src="../../static/login.png" mode=""></image>
 		</view>
 
 		<view class="content">
@@ -15,14 +15,14 @@
 				<view class="userInfo">
 					<u-form :model="form" ref="uForm">
 						<view class="input">
-							<image src="https://cdn.lihe-control.com/static/userName.png" mode=""
+							<image src="../../static/userName.png" mode=""
 								style="width: 33rpx;height: 35rpx;margin-right: 29rpx;">
 							</image>
 							<u-form-item label="姓名" prop="name"><u-input v-model="form.name" :clearable='false'
 									placeholder='请输入用户名' /></u-form-item>
 						</view>
 						<view class="input">
-							<image src="https://cdn.lihe-control.com/static/passWord.png" mode=""
+							<image src="../../static/passWord.png" mode=""
 								style="width: 29rpx;height: 36rpx;margin-right: 31rpx;">
 							</image>
 							<u-form-item class="no-cross" label="密码" prop="password"><u-input v-model="form.password"
@@ -163,7 +163,7 @@
 
 			.log_in {
 				width: 690rpx;
-				height: 1000rpx;
+				height: 800rpx;
 				background: #FFFFFF;
 				box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(153, 153, 153, 0.1);
 				border-radius: 20rpx;
@@ -224,7 +224,7 @@
 						color: #E5EBFC;
 						text-align: center;
 						line-height: 100rpx;
-						margin-top: 350rpx;
+						margin-top: 150rpx;
 					}
 
 

pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer.vue

@@ -5,14 +5,14 @@
 			
 		<view class="content">
 			<view class="item" v-for="item,index in deviceList" :key="index">
-				<image src="https://cdn.lihe-control.com/static/icon_precise.png" mode=""></image>
+				<image src="../../static/icon_precise.png" mode=""></image>
 				<view class="center">
 					<text>{{item.deviceTypeName}}</text>
 					<text>在线</text>
 				</view>
 				<view class="right" @click="toFertilizer(item)">
 					<text>状态</text>
-					<image src="https://cdn.lihe-control.com/static/right-arrow.png" mode=""></image>
+					<image src="../../static/right-arrow.png" mode=""></image>
 				</view>
 			</view>
 		</view>

pages/siteAdmin/siteAdmin.vue

@@ -10,7 +10,7 @@
 				</view>
 				<view class="right">
 					<view class="edit" @click="toEditSite">
-						<image class="editImage" src="https://cdn.lihe-control.com/static/edit.png" mode=""></image>
+						<image class="editImage" src="../../static/edit.png" mode=""></image>
 						<text>编辑</text>
 					</view>
 					<text class="delete">删除</text>

pages/target_water_fertilizer_PH/target_water_fertilizer_PH.vue

@@ -5,7 +5,7 @@
 			title="目标水肥PH" title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
 
 		<view class="navbar">
-			<image src="https://cdn.lihe-control.com/static/PH_bg.png" mode=""></image>
+			<image src="../../static/PH_bg.png" mode=""></image>
 		</view>
 
 		<view class="content">
@@ -13,12 +13,12 @@
 				{{ valuePH }}
 			</view>
 			<view class="data_analysis">
-				<image src="https://cdn.lihe-control.com/static/data_analysis.png" mode=""></image>
+				<image src="../../static/data_analysis.png" mode=""></image>
 				<text>数据分析</text>
 			</view>
 			<view class="echart">
 				<view class="title">
-					<image src="https://cdn.lihe-control.com/static/icon_ph.png" mode=""></image>
+					<image src="../../static/icon_ph.png" mode=""></image>
 					<text>目标水肥PH</text>
 				</view>
 				<view id="echart_p">

pages/timeEnvironment/timeEnvironment.vue

@@ -4,12 +4,12 @@
 			title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
 
 		<view class="navbar">
-			<image src="https://cdn.lihe-control.com/static/timeEnvironment_bg.png" mode=""></image>
+			<image src="../../static/timeEnvironment_bg.png" mode=""></image>
 		</view>
 
 		<view class="content">
 			<view class="title">
-				<image src="https://cdn.lihe-control.com/static/logo_1.png" mode=""></image>
+				<image src="../../static/logo_1.png" mode=""></image>
 				<view class="right">
 					<view class="">
 						温室智慧云
@@ -26,15 +26,15 @@
 
 			<view class="waterAndFertilizerParams" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
 				<view class="nav">
-					<image src="https://cdn.lihe-control.com/static/PH.png" mode=""></image>
+					<image src="../../static/PH.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='`https://cdn.lihe-control.com/static/icon${ (index2 + 1) < 9 ? (index2 + 1) : 1 }.png`' mode=""></image>
+						<image :src='`../../static/icon/icon${ (index2 + 1) < 9 ? (index2 + 1) : 1 }.png`' mode=""></image>
 						<view class="info">
-							<view class="">{{ item2.environmentDataId }}</view>
+							<view class="">{{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }}</view>
-							<view class="">{{ item2.environmentData }}</view>
+							<view class="">{{ item2.environmentData + getTypeList(item2.formula) }}</view>
 						</view>
 					</view>
 				</view>
@@ -42,15 +42,15 @@
 
 			<view class="testBase" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
 				<view class="nav">
-					<image src="https://cdn.lihe-control.com/static/base.png" mode=""></image>
+					<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='`https://cdn.lihe-control.com/static/base${ (index2 + 1) < 16 ? (index2 + 1) : 1 }.png`' mode=""></image>
+						<image :src='`../../static/icon/icon@${ item2.formula ? item2.formula : 1 }.png`' mode=""></image>
 						<view class="info">
-							<view class="">{{ item2.environmentDataId }}</view>
+							<view class="">{{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }}</view>
-							<view class="">{{ item2.environmentData }}</view>
+							<view class="">{{ item2.environmentData + getTypeList(item2.formula) }}</view>
 						</view>
 					</view>
 				</view>
@@ -58,14 +58,14 @@
 
 			<view class="testBase1" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
 				<view class="nav">
-					<image src="https://cdn.lihe-control.com/static/testBase1.png" mode=""></image>
+					<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="`https://cdn.lihe-control.com/static/${ (index2 + 1) < 5 ? (index2 + 1) : 1  }.png`" mode=""></image>
+					<image :src="`../../static/icon/${ (index2 + 1) < 5 ? (index2 + 1) : 1  }.png`" mode=""></image>
-					<text>{{ item2.environmentDataId }}</text>
+					<text>{{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }}</text>
-					<text>{{ item2.environmentData }}</text>
+					<text>{{ item2.environmentData + getTypeList(item2.formula) }}</text>
 				</view>
 			</view>
 		</view>
@@ -87,77 +87,77 @@
 
 				// 测试基地
 				testBaseList: [{
-						img: "https://cdn.lihe-control.com/static/base1.png",
+						img: "../../static/base1.png",
 						name: '空气温度',
 						value: "38.8klux"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base2.png",
+						img: "../../static/base2.png",
 						name: '光亮度',
 						value: "38.8klux"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base3.png",
+						img: "../../static/base3.png",
 						name: '二氧化碳',
 						value: "二氧化碳"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base3.png",
+						img: "../../static/base3.png",
 						name: '二氧化碳',
 						value: "678PPM"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base4.png",
+						img: "../../static/base4.png",
 						name: '土壤温度',
 						value: "20℃"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base4.png",
+						img: "../../static/base4.png",
 						name: '土壤温度',
 						value: "30.1℃"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base5.png",
+						img: "../../static/base5.png",
 						name: '土壤湿度',
 						value: "18.5%"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base5.png",
+						img: "../../static/base5.png",
 						name: '土壤湿度',
 						value: "18.5%"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base6.png",
+						img: "../../static/base6.png",
 						name: '水肥PH',
 						value: "0"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base6.png",
+						img: "../../static/base6.png",
 						name: '水肥EC',
 						value: "0.2mS/cm"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base7.png",
+						img: "../../static/base7.png",
 						name: '3#空气温度',
 						value: "29.8C"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base8.png",
+						img: "../../static/base8.png",
 						name: '3#空气湿度',
 						value: "80.6%"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base2.png",
+						img: "../../static/base2.png",
 						name: '3#光亮度',
 						value: "34.6 klux"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base3.png",
+						img: "../../static/base3.png",
 						name: '3#二氧化碳',
 						value: "29.8C"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/base5.png",
+						img: "../../static/base5.png",
 						name: '3#土壤温度',
 						value: "31℃"
 					},
@@ -165,27 +165,91 @@
 
 				// 测试基地
 				testBaseList1: [{
-						img: "https://cdn.lihe-control.com/static/1.png",
+						img: "../../static/1.png",
 						name: '4#光亮度',
 						value: "43 klux"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/2.png",
+						img: "../../static/2.png",
 						name: '4#二氧化碳',
 						value: "742 PPM"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/3.png",
+						img: "../../static/3.png",
 						name: '4#土壤温度',
 						value: "29.3C"
 					},
 					{
-						img: "https://cdn.lihe-control.com/static/4.png",
+						img: "../../static/4.png",
 						name: '4#土壤湿度',
 						value: "4%"
 					},
 				],
-
+				
+				
+				//label是名称  value是code码  
+				//countType计算类型 0是原数据 1是原数据-400 2是原数据/10 3是(原数据-400) / 10
+				typeList: [
+					{ label: '无意义的传感器', value: 0, countType: 0 },
+					{ label: '空气温度', value: 1, countType: 3,unit: '℃' },
+					{ label: '空气湿度', value: 2, countType: 2,unit: '%' },
+					{ label: '光亮度', value: 3, countType: 2,unit: 'Klux' },
+					{ label: '二氧化碳', value: 4, countType: 0,unit: 'ppm' },
+					{ label: '土壤温度', value: 5, countType: 3,unit: '℃' },
+					{ label: '土壤湿度', value: 6, countType: 2,unit: '%' },
+					{ label: '水温', value: 7, countType: 3,unit: '℃' },
+					{ label: '水肥PH', value: 8, countType: 2,unit: '' },
+					{ label: '水肥EC', value: 9, countType: 2,unit: 'mS/cm' },
+					{ label: '压差', value: 10, countType: 0,unit: 'Pa' },
+					{ label: '风速', value: 11, countType: 2,unit: 'm/s' },
+					{ label: '风向', value: 12, countType: 0,unit: '°' },
+					{ label: '雨雪信号', value: 13, countType: 0,unit: '' },
+					{ label: '降雨量', value: 14, countType: 2,unit: 'mm' },
+					{ label: '光合有效辐射', value: 15, countType: 2,unit: 'umol/m2.s' },
+					{ label: '太阳总辐射', value: 16, countType: 0,unit: 'W/m2' },
+					{ label: '流量', value: 17, countType: 0,unit: 'L/H' },
+					{ label: '大气压强', value: 18, countType: 2,unit: 'KPa' },
+					{ label: '土壤PH', value: 19, countType: 2,unit: '' },
+					{ label: '土壤EC', value: 20, countType: 0,unit: 'uS/cm' },
+					{ label: '叶面温度', value: 21, countType: 3,unit: '℃'},
+					{ label: '叶面湿度', value: 22, countType: 2,unit: '%' },
+					{ label: '果实直径', value: 23, countType: 0,unit: 'mm' },
+					{ label: '茎秆直径', value: 24, countType: 0,unit: 'mm' },
+					{ label: '流速', value: 25, countType: 2,unit: 'm/s' },
+					{ label: '瞬时流量', value: 26, countType: 2,unit: 'm3' },
+					{ label: '当日流量', value: 27, countType: 2,unit: 'T' },
+					{ label: '累计流量', value: 28, countType: 0,unit: 'T' },
+					{ label: '无线气象站电池电压', value: 29, countType: 2,unit: 'V' },
+					{ label: '无线气象站无线信号强度', value: 30, countType: 1,unit: 'dBm' },
+					{ label: '无线气象站信噪比（SNR）', value: 31, countType: 1,unit: 'dB' },
+					{ label: 'PM1.0', value: 32, countType: 0,unit: 'μg/m2' },
+					{ label: 'PM2.5', value: 33, countType: 0,unit: 'μg/m2' },
+					{ label: 'PM10', value: 34, countType: 0,unit: 'μg/m2' },
+					{ label: '紫外辐射', value: 35, countType: 0,unit: 'W/m2' },
+					{ label: '蒸发量', value: 36, countType: 2,unit: 'mm' },
+					{ label: '负氧离子', value: 37, countType: 0,unit: '个/cm3' },
+					{ label: '露点温度', value: 38, countType: 3,unit: '℃'},
+					{ label: '设备电压', value: 39, countType: 2,unit: 'V' },
+					{ label: '设备电流', value: 40, countType: 2,unit: 'A' },
+					{ label: '土壤氮含量', value: 41, countType: 0,unit: 'mg/kg' },
+					{ label: '土壤磷含量', value: 42, countType: 0,unit: 'mg/kg' },
+					{ label: '土壤钾含量', value: 43, countType: 0,unit: 'mg/kg' },
+					{ label: '臭氧', value: 44, countType: 0,unit: 'ppm' },
+					{ label: '一氧化碳', value: 45, countType: 0,unit: 'ppm' },
+					{ label: '氨气', value: 46, countType: 0,unit: 'ppm' },
+					{ label: '硫化氢', value: 47, countType: 0,unit: 'ppm' },
+					{ label: '氧气', value: 48, countType: 2,unit: '%vol' },
+					{ label: '甲烷', value: 49, countType: 2,unit: '%vol' },
+					{ label: '铜（CU）', value: 50, countType: 0,unit: 'mg/kg' },
+					{ label: '镉（CD）', value: 51, countType: 2,unit: 'mg/kg' },
+					{ label: '铅（PB）', value: 52, countType: 0,unit: 'mg/kg' },
+					{ label: '噪声', value: 53, countType: 0,unit: 'dB' },
+					{ label: '叶面面积', value: 54, countType: 0,unit: 'mm' },
+					{ label: '虫数量', value: 55, countType: 0,unit: '个' },
+					{ label: '无线传感器电池电压', value: 56, countType: 2,unit: 'V' },
+					{ label: '无线传感器无线信号强度', value: 57, countType: 1,unit: 'dBm' },
+					{ label: '无线传感器信噪比（SNR）', value: 58, countType: 1,unit: 'dB' },
+				],
 			}
 		},
 		onShow() {
@@ -204,7 +268,6 @@
 					})
 				}
 			})
-
 		},
 		methods: {
 			// 根据用户id查询对应的设备数据
@@ -253,12 +316,27 @@
 				})
 			},
 			
-			// 根据数据formula返回的图标
+			
-			getIconNum(str){
+			
-				if(str == '8'){
+			// 数据单位
-					return '1'
+			getTypeList(val){
-				}else if(str == '9'){
+				let typeList1 = []
-					return '2'
+				typeList1 = this.typeList.filter(item=> {
+				   return item.value == val
+				})
+				return typeList1[0].unit
+			},
+			
+			// 判断是否是平均或者目标,或者是1#
+			getStatus(equipmentNumber,targetValue){
+				if(targetValue == 1){
+					return '目标'
+				}else if(targetValue == 0 && equipmentNumber == 0){
+					return '1#平均'
+				}else if(targetValue == 0 && equipmentNumber == 15){
+					return '2#平均'
+				}else if(targetValue == 0 && equipmentNumber != 0 && equipmentNumber != 15){
+					return (equipmentNumber + 1) + '#'
 				}
 			}
 		}

pages/timeVideo/timeVideo.vue

@@ -6,19 +6,19 @@
 			<view class="content">
 				<view class="item" v-for="(item,index) in 3" :key="index">
 					<view class="nav">
-						<image src="https://cdn.lihe-control.com/static/video.png" mode=""></image>
+						<image src="../../static/video.png" mode=""></image>
 						<text>温室#2-摄像机#2</text>
 					</view>
 					<view class="video">
-						<image src="https://cdn.lihe-control.com/static/video1.png" mode=""></image>
+						<image src="../../static/video1.png" mode=""></image>
 					</view>
 					<view class="timer">
 						<view class="left">
-							<image src="https://cdn.lihe-control.com/static/timer.png" mode=""></image>
+							<image src="../../static/timer.png" mode=""></image>
 							<text>2023-09-20 14:00:55</text>
 						</view>
 						<view class="right" @click="toVideoLive">
-							<image src="https://cdn.lihe-control.com/static/play.png" mode=""></image>
+							<image src="../../static/play.png" mode=""></image>
 							<text>现场实况</text>
 						</view>
 					</view>

pages/userCenter/userCenter.vue

@@ -4,7 +4,7 @@
 			title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
 
 		<view class="navbar">
-			<image src="https://cdn.lihe-control.com/static/userCenter.png" mode=""></image>
+			<image src="../../static/userCenter.png" mode=""></image>
 		</view>
 
 		<view class="content">
@@ -16,47 +16,47 @@
 			<view class="userAbility">
 				<view class="item">
 					<view class="left">
-						<image src="https://cdn.lihe-control.com/static/ability1.png" mode=""></image>
+						<image src="../../static/ability1.png" mode=""></image>
 					</view>
 					<view class="right">
 						<text>产品百科</text>
-						<image src="https://cdn.lihe-control.com/static/arrow.png" mode=""></image>
+						<image src="../../static/arrow.png" mode=""></image>
 					</view>
 				</view>
 				<view class="item" @click="toChange_password">
 					<view class="left">
-						<image src="https://cdn.lihe-control.com/static/ability2.png" mode="" style="width: 30rpx;height: 40rpx;"></image>
+						<image src="../../static/ability2.png" mode="" style="width: 30rpx;height: 40rpx;"></image>
 					</view>
 					<view class="right">
 						<text>修改密码</text>
-						<image src="https://cdn.lihe-control.com/static/arrow.png" mode=""></image>
+						<image src="../../static/arrow.png" mode=""></image>
 					</view>
 				</view>
 				<view class="item">
 					<view class="left">
-						<image src="https://cdn.lihe-control.com/static/ability3.png" mode="" style="width: 35rpx;height: 40rpx;"></image>
+						<image src="../../static/ability3.png" mode="" style="width: 35rpx;height: 40rpx;"></image>
 					</view>
 					<view class="right">
 						<text>关于我们</text>
-						<image src="https://cdn.lihe-control.com/static/arrow.png" mode=""></image>
+						<image src="../../static/arrow.png" mode=""></image>
 					</view>
 				</view>
 				<view class="item" @click="toSiteAdmin">
 					<view class="left">
-						<image src="https://cdn.lihe-control.com/static/ability4.png" mode="" style="width: 40rpx;height: 36rpx;"></image>
+						<image src="../../static/ability4.png" mode="" style="width: 40rpx;height: 36rpx;"></image>
 					</view>
 					<view class="right">
 						<text>站点管理</text>
-						<image src="https://cdn.lihe-control.com/static/arrow.png" mode=""></image>
+						<image src="../../static/arrow.png" mode=""></image>
 					</view>
 				</view>
 				<view class="item" @click="toLogout">
 					<view class="left">
-						<image src="https://cdn.lihe-control.com/static/ability5.png" mode="" style="width: 35rpx;height: 36rpx;"></image>
+						<image src="../../static/ability5.png" mode="" style="width: 35rpx;height: 36rpx;"></image>
 					</view>
 					<view class="right">
 						<text>退出登录</text>
-						<image src="https://cdn.lihe-control.com/static/arrow.png" mode=""></image>
+						<image src="../../static/arrow.png" mode=""></image>
 					</view>
 				</view>
 			</view>
@@ -72,7 +72,7 @@
 				background: {
 					backgroundColor: 'transparent',
 				},
-				src: 'https://cdn.lihe-control.com/static/logo.png',
+				src: '../../static/logo.png',
 				userName: '',
 				admin: '',
 				userid:''

pages/videoLive/videoLive.vue

@@ -5,55 +5,55 @@
 			
 		<view class="center">
 			<view class="video_live">
-				<image src="https://cdn.lihe-control.com/static/videoLive.png" mode=""></image>
+				<image src="../../static/videoLive.png" mode=""></image>
 			</view>
 			
 			<view class="skills">
 				<view class="left">
-					<image src="https://cdn.lihe-control.com/static/direction_keys.png" mode=""></image>
+					<image src="../../static/direction_keys.png" mode=""></image>
-					<image class="left_arrow" src="https://cdn.lihe-control.com/static/left_arrow.png" mode=""></image>
+					<image class="left_arrow" src="../../static/left_arrow.png" mode=""></image>
-					<image class="right_arrow" src="https://cdn.lihe-control.com/static/right_arrow.png" mode=""></image>
+					<image class="right_arrow" src="../../static/right_arrow.png" mode=""></image>
-					<image class="up_arrow" src="https://cdn.lihe-control.com/static/up_arrow.png" mode=""></image>
+					<image class="up_arrow" src="../../static/up_arrow.png" mode=""></image>
-					<image class="down_arrow" src="https://cdn.lihe-control.com/static/down_arrow.png" mode=""></image>
+					<image class="down_arrow" src="../../static/down_arrow.png" mode=""></image>
 				</view>
 				<view class="right">
 					<view class="right_item">
 						<view :class="flag1?'add_act':'add'" @click="focus_addClick">
-							<image src="https://cdn.lihe-control.com/static/add_act.png" mode="" v-if="flag1==true"></image>
+							<image src="../../static/add_act.png" mode="" v-if="flag1==true"></image>
-							<image src="https://cdn.lihe-control.com/static/add.png" mode="" v-if="flag1==false"></image>
+							<image src="../../static/add.png" mode="" v-if="flag1==false"></image>
 						</view>
 						<view class="focus">
 							焦距
 						</view>
 						<view :class="flag1?'subtract':'subtract_act'" @click="focus_subtractClick">
-							<image src="https://cdn.lihe-control.com/static/subtract.png" mode="" v-if="flag1==true"></image>
+							<image src="../../static/subtract.png" mode="" v-if="flag1==true"></image>
-							<image src="https://cdn.lihe-control.com/static/subtract_act.png" mode="" v-if="flag1==false"></image>
+							<image src="../../static/subtract_act.png" mode="" v-if="flag1==false"></image>
 						</view>
 					</view>
 					<view class="right_item">
 						<view :class="flag2?'add_act':'add'" @click="scale_addClick">
-							<image src="https://cdn.lihe-control.com/static/add_act.png" mode="" v-if="flag2==true"></image>
+							<image src="../../static/add_act.png" mode="" v-if="flag2==true"></image>
-							<image src="https://cdn.lihe-control.com/static/add.png" mode="" v-if="flag2==false"></image>
+							<image src="../../static/add.png" mode="" v-if="flag2==false"></image>
 						</view>
 						<view class="focus">
 							缩放
 						</view>
 						<view :class="flag2?'subtract':'subtract_act'" @click="scale_subtractClick">
-							<image src="https://cdn.lihe-control.com/static/subtract.png" mode="" v-if="flag2==true"></image>
+							<image src="../../static/subtract.png" mode="" v-if="flag2==true"></image>
-							<image src="https://cdn.lihe-control.com/static/subtract_act.png" mode="" v-if="flag2==false"></image>
+							<image src="../../static/subtract_act.png" mode="" v-if="flag2==false"></image>
 						</view>
 					</view>
 					<view class="right_item">
 						<view :class="flag3?'add_act':'add'" @click="aperture_addClick">
-							<image src="https://cdn.lihe-control.com/static/add_act.png" mode="" v-if="flag3==true"></image>
+							<image src="../../static/add_act.png" mode="" v-if="flag3==true"></image>
-							<image src="https://cdn.lihe-control.com/static/add.png" mode="" v-if="flag3==false"></image>
+							<image src="../../static/add.png" mode="" v-if="flag3==false"></image>
 						</view>
 						<view class="focus">
 							光圈
 						</view>
 						<view :class="flag3?'subtract':'subtract_act'" @click="aperture_subtractClick">
-							<image src="https://cdn.lihe-control.com/static/subtract.png" mode="" v-if="flag3==true"></image>
+							<image src="../../static/subtract.png" mode="" v-if="flag3==true"></image>
-							<image src="https://cdn.lihe-control.com/static/subtract_act.png" mode="" v-if="flag3==false"></image>
+							<image src="../../static/subtract_act.png" mode="" v-if="flag3==false"></image>
 						</view>
 					</view>
 				</view>

project.config.json

@@ -25,6 +25,5 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wx0518521f67048cc8",
+  "appid": "wx05b45a2699f02a2b"
-  "cdnUrl": "https://cdn.lihe-control.com"
 }

project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "mini-program",
+  "projectname": "greenhouse-wisdom-applet",
   "setting": {
     "compileHotReLoad": true
   }