Compare commits
No commits in common. "5206478e4a6069dae05e72564cd29c5084a527cf" and "4e2f0850af994b5cfc404925e28c961dbafd07c9" have entirely different histories.
5206478e4a
...
4e2f0850af
45
App.vue
45
App.vue
@ -1,50 +1,13 @@
|
||||
<script>
|
||||
export default {
|
||||
onLaunch: function() {
|
||||
// console.log('App Launch')
|
||||
const updateManager = uni.getUpdateManager();
|
||||
//检测版本更新
|
||||
updateManager.onCheckForUpdate(function(res) {
|
||||
// 请求完新版本信息的回调
|
||||
if (res.hasUpdate) {
|
||||
//监听小程序有版本更新事件
|
||||
updateManager.onUpdateReady(function() {
|
||||
uni.showModal({
|
||||
title: '更新提示',
|
||||
content: '新版本已经准备好，是否重启应用？',
|
||||
showCancel: false,
|
||||
success(res) {
|
||||
// console.log(res)
|
||||
if (res.confirm) {
|
||||
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
|
||||
updateManager.applyUpdate();
|
||||
}
|
||||
// if (res.cancel) {
|
||||
// // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
|
||||
// uni.showModal({
|
||||
// title: '取消更新将会无法体验新功能',
|
||||
// content: '请您删除当前小程序，到微信 “发现-小程序” 页，重新搜索打开。',
|
||||
// })
|
||||
// }
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
updateManager.onUpdateFailed(function() {
|
||||
// 新版本下载失败
|
||||
uni.showModal({
|
||||
title: '已经有新版本啦！',
|
||||
content: '请您删除当前小程序，到微信 “发现-小程序” 页，重新搜索打开。',
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
console.log('App Launch')
|
||||
},
|
||||
onShow: function() {
|
||||
// console.log('App Show')
|
||||
console.log('App Show')
|
||||
},
|
||||
onHide: function() {
|
||||
// console.log('App Hide')
|
||||
console.log('App Hide')
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -52,4 +15,4 @@
|
||||
<style lang="scss">
|
||||
/*每个页面公共css */
|
||||
@import "uview-ui/index.scss";
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@ -224,7 +224,7 @@
|
||||
indexs: 1,
|
||||
inputData1: [],
|
||||
|
||||
timer_: null
|
||||
timer: null
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
@ -234,13 +234,13 @@
|
||||
this.deviceId = option.id
|
||||
this.dataInit()
|
||||
let that = this
|
||||
this.timer_ = setInterval(function() {
|
||||
this.timer = setInterval(function() {
|
||||
that.dataInit();
|
||||
}, 5000);
|
||||
},
|
||||
onUnload() {
|
||||
let that = this
|
||||
clearTimeout(that.timer_)
|
||||
clearTimeout(that.timer)
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
// uni.showLoading({
|
||||
@ -271,7 +271,7 @@
|
||||
var data = {
|
||||
"equipmentId": deviceId,
|
||||
"pattern": 0, //需要根据文档填写 //6目标ph-数值
|
||||
"regNum": 72
|
||||
"regNum": 71
|
||||
}
|
||||
this.$http({
|
||||
url: this.api.readFs_state,
|
||||
@ -586,8 +586,8 @@
|
||||
},
|
||||
|
||||
closePop() {
|
||||
// this.dataInit();
|
||||
// this.getReg();
|
||||
this.dataInit();
|
||||
this.getReg();
|
||||
this.show = false
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<text
|
||||
:class="item.deviceState == 1 ? 'state' : 'state_act'">{{ item.deviceState == 1 ? "在线" : "离线"}}</text>
|
||||
</view>
|
||||
<view class="right" @click="toFertilizer(item)" v-if="item.deviceState == 1">
|
||||
<view class="right" @click="toFertilizer(item)">
|
||||
<text>状态</text>
|
||||
<image src="../../static/right-arrow.png" mode=""></image>
|
||||
</view>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<view class="target_water_fertilizer_PH">
|
||||
<!-- 目标水肥PH -->
|
||||
<u-navbar :background="background" :is-back='true' back-icon-color='#FFFFFF' :border-bottom="false"
|
||||
:title="titleName+echartName" title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
|
||||
title="目标水肥PH" title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
|
||||
|
||||
<view class="navbar">
|
||||
<image src="../../static/PH_bg.png" mode=""></image>
|
||||
@ -19,7 +19,7 @@
|
||||
<view class="echart">
|
||||
<view class="title">
|
||||
<image src="../../static/icon_ph.png" mode=""></image>
|
||||
<text>{{ titleName+echartName }}</text>
|
||||
<text>目标水肥PH</text>
|
||||
</view>
|
||||
<view id="echart_p">
|
||||
<qiun-data-charts type="line" :opts="opts" :chartData="chartData" :ontouch="true"
|
||||
@ -81,11 +81,7 @@
|
||||
|
||||
categoriesList:[],
|
||||
valuePH:'',
|
||||
valuePHList:[],
|
||||
newValuePHList:[],
|
||||
|
||||
titleName:'',
|
||||
echartName:''
|
||||
valuePHList:[]
|
||||
};
|
||||
},
|
||||
onReady() {
|
||||
@ -96,15 +92,12 @@
|
||||
onLoad(option) {
|
||||
if(option.id){
|
||||
this.equipmentId = option.id
|
||||
console.log(this.equipmentId);
|
||||
}
|
||||
if(option.data){
|
||||
this.valuePH = option.data
|
||||
console.log(this.valuePH);
|
||||
}
|
||||
if(option.name){
|
||||
this.echartName = option.name
|
||||
}
|
||||
|
||||
this.titleName = this.getStatus(option.equipmentNumber,option.targetValue)
|
||||
},
|
||||
mounted() {
|
||||
this.getEchartsData()
|
||||
@ -118,8 +111,8 @@
|
||||
let res = {
|
||||
categories: this.categoriesList,
|
||||
series: [{
|
||||
name: this.titleName+this.echartName,
|
||||
data: this.newValuePHList
|
||||
name: "目标水肥PH",
|
||||
data: this.valuePHList
|
||||
}, ]
|
||||
};
|
||||
this.chartData = JSON.parse(JSON.stringify(res));
|
||||
@ -132,33 +125,16 @@
|
||||
url:this.api.chart_fsdata + '?equipmentId=' + this.equipmentId,
|
||||
method:'POST'
|
||||
}).then(res=>{
|
||||
// console.log(res,'获取折线图数据');
|
||||
console.log(res,'获取折线图数据');
|
||||
res.data.forEach((i,index)=>{
|
||||
this.categoriesList.push(i.time);
|
||||
this.valuePHList.push(i.value)
|
||||
this.valuePHList.push(i.value['目标水肥PH'])
|
||||
})
|
||||
this.getServerData();
|
||||
// console.log(this.categoriesList,'this.categoriesList');
|
||||
// console.log(this.valuePHList,'this.valuePHList');
|
||||
this.newValuePHList = this.valuePHList.map((e,index)=>{
|
||||
return e[this.titleName+this.echartName]
|
||||
})
|
||||
// console.log(this.newValuePHList,'121212212121211111111');
|
||||
console.log(this.categoriesList,'this.categoriesList');
|
||||
console.log(this.valuePHList,'this.valuePHList');
|
||||
})
|
||||
},
|
||||
|
||||
// 判断是否是平均或者目标,或者是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 + '#'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
<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,item2.environmentDataId,item2.equipmentNumber,item2.targetValue)">
|
||||
<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${ (index2 + 1) < 9 ? (index2 + 1) : 1 }.png`' mode=""></image>
|
||||
<view class="info">
|
||||
<view class="">{{ getStatus(item2.equipmentNumber,item2.targetValue) + item2.environmentDataId }}</view>
|
||||
@ -38,10 +38,6 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="updateTime">
|
||||
<span></span>
|
||||
<span>*更新数据时间 : {{ updateTime }}</span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- <view class="testBase" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
|
||||
@ -255,8 +251,7 @@
|
||||
{ label: '无线传感器信噪比（SNR）', value: 58, countType: 1,unit: 'dB' },
|
||||
],
|
||||
|
||||
timer:null,
|
||||
updateTime:''
|
||||
timer:null
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
@ -332,14 +327,12 @@
|
||||
method: 'post',
|
||||
}).then(res => {
|
||||
// console.log(res, '主页查看施肥机实时数据');
|
||||
|
||||
if(res.code == 200){
|
||||
uni.hideLoading({
|
||||
title: '完成'
|
||||
});
|
||||
uni.stopPullDownRefresh();
|
||||
i.childList= res.data;
|
||||
this.updateTime = res.data[0].updateTime
|
||||
// console.log(this.waterAndFertilizerParamsList);
|
||||
}else{
|
||||
|
||||
@ -354,9 +347,9 @@
|
||||
},
|
||||
|
||||
// 跳转到折线图
|
||||
toTarget_water_fertilizer_PH(id,data,name,equipmentNumber,targetValue){
|
||||
toTarget_water_fertilizer_PH(id,data){
|
||||
uni.navigateTo({
|
||||
url:'/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data + '&name=' + name + '&equipmentNumber=' + equipmentNumber + '&targetValue=' + targetValue
|
||||
url:'/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data
|
||||
})
|
||||
},
|
||||
|
||||
@ -491,7 +484,7 @@
|
||||
padding: 10rpx 0rpx;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
// justify-content: space-evenly;
|
||||
justify-content: space-evenly;
|
||||
|
||||
.item {
|
||||
width: 50%;
|
||||
@ -524,14 +517,6 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.updateTime{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 20rpx;
|
||||
font-size: 22rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.testBase {
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
46
unpackage/dist/dev/mp-weixin/common/main.js
vendored
46
unpackage/dist/dev/mp-weixin/common/main.js
vendored
@ -103,7 +103,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
/* WEBPACK VAR INJECTION */(function(uni) {
|
||||
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
@ -111,54 +111,16 @@ Object.defineProperty(exports, "__esModule", {
|
||||
exports.default = void 0;
|
||||
var _default = {
|
||||
onLaunch: function onLaunch() {
|
||||
// console.log('App Launch')
|
||||
var updateManager = uni.getUpdateManager();
|
||||
//检测版本更新
|
||||
updateManager.onCheckForUpdate(function (res) {
|
||||
// 请求完新版本信息的回调
|
||||
if (res.hasUpdate) {
|
||||
//监听小程序有版本更新事件
|
||||
updateManager.onUpdateReady(function () {
|
||||
uni.showModal({
|
||||
title: '更新提示',
|
||||
content: '新版本已经准备好，是否重启应用？',
|
||||
showCancel: false,
|
||||
success: function success(res) {
|
||||
// console.log(res)
|
||||
if (res.confirm) {
|
||||
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
|
||||
updateManager.applyUpdate();
|
||||
}
|
||||
// if (res.cancel) {
|
||||
// // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
|
||||
// uni.showModal({
|
||||
// title: '取消更新将会无法体验新功能',
|
||||
// content: '请您删除当前小程序，到微信 “发现-小程序” 页，重新搜索打开。',
|
||||
// })
|
||||
// }
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
updateManager.onUpdateFailed(function () {
|
||||
// 新版本下载失败
|
||||
uni.showModal({
|
||||
title: '已经有新版本啦！',
|
||||
content: '请您删除当前小程序，到微信 “发现-小程序” 页，重新搜索打开。'
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
console.log('App Launch');
|
||||
},
|
||||
onShow: function onShow() {
|
||||
// console.log('App Show')
|
||||
console.log('App Show');
|
||||
},
|
||||
onHide: function onHide() {
|
||||
// console.log('App Hide')
|
||||
console.log('App Hide');
|
||||
}
|
||||
};
|
||||
exports.default = _default;
|
||||
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
|
||||
|
||||
/***/ }),
|
||||
|
||||
|
||||
@ -413,7 +413,7 @@ var _default = {
|
||||
topActive: 0,
|
||||
indexs: 1,
|
||||
inputData1: [],
|
||||
timer_: null
|
||||
timer: null
|
||||
};
|
||||
},
|
||||
watch: {},
|
||||
@ -421,13 +421,13 @@ var _default = {
|
||||
this.deviceId = option.id;
|
||||
this.dataInit();
|
||||
var that = this;
|
||||
this.timer_ = setInterval(function () {
|
||||
this.timer = setInterval(function () {
|
||||
that.dataInit();
|
||||
}, 5000);
|
||||
},
|
||||
onUnload: function onUnload() {
|
||||
var that = this;
|
||||
clearTimeout(that.timer_);
|
||||
clearTimeout(that.timer);
|
||||
},
|
||||
onPullDownRefresh: function onPullDownRefresh() {
|
||||
// uni.showLoading({
|
||||
@ -460,7 +460,7 @@ var _default = {
|
||||
"equipmentId": deviceId,
|
||||
"pattern": 0,
|
||||
//需要根据文档填写 //6目标ph-数值
|
||||
"regNum": 72
|
||||
"regNum": 71
|
||||
};
|
||||
this.$http({
|
||||
url: this.api.readFs_state,
|
||||
@ -752,8 +752,8 @@ var _default = {
|
||||
this.indexs = index;
|
||||
this.getReg();
|
||||
}), (0, _defineProperty2.default)(_methods, "closePop", function closePop() {
|
||||
// this.dataInit();
|
||||
// this.getReg();
|
||||
this.dataInit();
|
||||
this.getReg();
|
||||
this.show = false;
|
||||
}), _methods)
|
||||
};
|
||||
|
||||
@ -1 +1 @@
|
||||
<view class="preciseWaterAndFertilizer"><u-navbar vue-id="cdd718f8-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="精准水肥" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" bind:__l="__l"></u-navbar><view class="content"><block wx:for="{{deviceList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item"><image src="../../static/icon_precise.png" mode></image><view class="center"><text>{{item.deviceTypeName}}</text><text class="{{[item.deviceState==1?'state':'state_act']}}">{{item.deviceState==1?"在线":"离线"}}</text></view><block wx:if="{{item.deviceState==1}}"><view data-event-opts="{{[['tap',[['toFertilizer',['$0'],[[['deviceList','',index]]]]]]]}}" class="right" bindtap="__e"><text>状态</text><image src="../../static/right-arrow.png" mode></image></view></block></view></block></view></view>
|
||||
<view class="preciseWaterAndFertilizer"><u-navbar vue-id="cdd718f8-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="精准水肥" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" bind:__l="__l"></u-navbar><view class="content"><block wx:for="{{deviceList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item"><image src="../../static/icon_precise.png" mode></image><view class="center"><text>{{item.deviceTypeName}}</text><text class="{{[item.deviceState==1?'state':'state_act']}}">{{item.deviceState==1?"在线":"离线"}}</text></view><view data-event-opts="{{[['tap',[['toFertilizer',['$0'],[[['deviceList','',index]]]]]]]}}" class="right" bindtap="__e"><text>状态</text><image src="../../static/right-arrow.png" mode></image></view></view></block></view></view>
|
||||
@ -246,10 +246,7 @@ var _default = {
|
||||
},
|
||||
categoriesList: [],
|
||||
valuePH: '',
|
||||
valuePHList: [],
|
||||
newValuePHList: [],
|
||||
titleName: '',
|
||||
echartName: ''
|
||||
valuePHList: []
|
||||
};
|
||||
},
|
||||
onReady: function onReady() {
|
||||
@ -259,14 +256,12 @@ var _default = {
|
||||
onLoad: function onLoad(option) {
|
||||
if (option.id) {
|
||||
this.equipmentId = option.id;
|
||||
console.log(this.equipmentId);
|
||||
}
|
||||
if (option.data) {
|
||||
this.valuePH = option.data;
|
||||
console.log(this.valuePH);
|
||||
}
|
||||
if (option.name) {
|
||||
this.echartName = option.name;
|
||||
}
|
||||
this.titleName = this.getStatus(option.equipmentNumber, option.targetValue);
|
||||
},
|
||||
mounted: function mounted() {
|
||||
this.getEchartsData();
|
||||
@ -280,8 +275,8 @@ var _default = {
|
||||
var res = {
|
||||
categories: _this.categoriesList,
|
||||
series: [{
|
||||
name: _this.titleName + _this.echartName,
|
||||
data: _this.newValuePHList
|
||||
name: "目标水肥PH",
|
||||
data: _this.valuePHList
|
||||
}]
|
||||
};
|
||||
_this.chartData = JSON.parse(JSON.stringify(res));
|
||||
@ -294,31 +289,15 @@ var _default = {
|
||||
url: this.api.chart_fsdata + '?equipmentId=' + this.equipmentId,
|
||||
method: 'POST'
|
||||
}).then(function (res) {
|
||||
// console.log(res,'获取折线图数据');
|
||||
console.log(res, '获取折线图数据');
|
||||
res.data.forEach(function (i, index) {
|
||||
_this2.categoriesList.push(i.time);
|
||||
_this2.valuePHList.push(i.value);
|
||||
_this2.valuePHList.push(i.value['目标水肥PH']);
|
||||
});
|
||||
_this2.getServerData();
|
||||
// console.log(this.categoriesList,'this.categoriesList');
|
||||
// console.log(this.valuePHList,'this.valuePHList');
|
||||
_this2.newValuePHList = _this2.valuePHList.map(function (e, index) {
|
||||
return e[_this2.titleName + _this2.echartName];
|
||||
});
|
||||
// console.log(this.newValuePHList,'121212212121211111111');
|
||||
console.log(_this2.categoriesList, 'this.categoriesList');
|
||||
console.log(_this2.valuePHList, 'this.valuePHList');
|
||||
});
|
||||
},
|
||||
// 判断是否是平均或者目标,或者是1#
|
||||
getStatus: function 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 +1 @@
|
||||
<view class="target_water_fertilizer_PH data-v-3d983434"><u-navbar vue-id="454957e0-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="{{titleName+echartName}}" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" class="data-v-3d983434" bind:__l="__l"></u-navbar><view class="navbar data-v-3d983434"><image src="../../static/PH_bg.png" mode class="data-v-3d983434"></image></view><view class="content data-v-3d983434"><view class="number data-v-3d983434">{{''+valuePH+''}}</view><view class="data_analysis data-v-3d983434"><image src="../../static/data_analysis.png" mode class="data-v-3d983434"></image><text class="data-v-3d983434">数据分析</text></view><view class="echart data-v-3d983434"><view class="title data-v-3d983434"><image src="../../static/icon_ph.png" mode class="data-v-3d983434"></image><text class="data-v-3d983434">{{titleName+echartName}}</text></view><view id="echart_p" class="data-v-3d983434"><qiun-data-charts vue-id="454957e0-2" type="line" opts="{{opts}}" chartData="{{chartData}}" ontouch="{{true}}" background="none" class="data-v-3d983434" bind:__l="__l"></qiun-data-charts></view></view></view></view>
|
||||
<view class="target_water_fertilizer_PH data-v-3d983434"><u-navbar vue-id="454957e0-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="目标水肥PH" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" class="data-v-3d983434" bind:__l="__l"></u-navbar><view class="navbar data-v-3d983434"><image src="../../static/PH_bg.png" mode class="data-v-3d983434"></image></view><view class="content data-v-3d983434"><view class="number data-v-3d983434">{{''+valuePH+''}}</view><view class="data_analysis data-v-3d983434"><image src="../../static/data_analysis.png" mode class="data-v-3d983434"></image><text class="data-v-3d983434">数据分析</text></view><view class="echart data-v-3d983434"><view class="title data-v-3d983434"><image src="../../static/icon_ph.png" mode class="data-v-3d983434"></image><text class="data-v-3d983434">目标水肥PH</text></view><view id="echart_p" class="data-v-3d983434"><qiun-data-charts vue-id="454957e0-2" type="line" opts="{{opts}}" chartData="{{chartData}}" ontouch="{{true}}" background="none" class="data-v-3d983434" bind:__l="__l"></qiun-data-charts></view></view></view></view>
|
||||
@ -270,10 +270,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
var _default = {
|
||||
data: function data() {
|
||||
return {
|
||||
@ -660,8 +656,7 @@ var _default = {
|
||||
countType: 1,
|
||||
unit: 'dB'
|
||||
}],
|
||||
timer: null,
|
||||
updateTime: ''
|
||||
timer: null
|
||||
};
|
||||
},
|
||||
onLoad: function onLoad() {
|
||||
@ -736,14 +731,12 @@ var _default = {
|
||||
method: 'post'
|
||||
}).then(function (res) {
|
||||
// console.log(res, '主页查看施肥机实时数据');
|
||||
|
||||
if (res.code == 200) {
|
||||
uni.hideLoading({
|
||||
title: '完成'
|
||||
});
|
||||
uni.stopPullDownRefresh();
|
||||
i.childList = res.data;
|
||||
_this.updateTime = res.data[0].updateTime;
|
||||
// console.log(this.waterAndFertilizerParamsList);
|
||||
} else {}
|
||||
}).catch(function (err) {
|
||||
@ -754,9 +747,9 @@ var _default = {
|
||||
});
|
||||
},
|
||||
// 跳转到折线图
|
||||
toTarget_water_fertilizer_PH: function toTarget_water_fertilizer_PH(id, data, name, equipmentNumber, targetValue) {
|
||||
toTarget_water_fertilizer_PH: function toTarget_water_fertilizer_PH(id, data) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data + '&name=' + name + '&equipmentNumber=' + equipmentNumber + '&targetValue=' + targetValue
|
||||
url: '/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data
|
||||
});
|
||||
},
|
||||
// 数据单位
|
||||
|
||||
@ -1 +1 @@
|
||||
<view class="timeEnvironment data-v-34c343d8"><u-navbar vue-id="63a4351c-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="实时环境" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" class="data-v-34c343d8" bind:__l="__l"></u-navbar><view class="navbar data-v-34c343d8"><image src="https://cdn.lihe-control.com/static/timeEnvironment_bg.png" mode class="data-v-34c343d8"></image></view><view class="content data-v-34c343d8"><view class="title data-v-34c343d8"><image src="../../static/logo_1.png" mode class="data-v-34c343d8"></image><view class="right data-v-34c343d8"><view class="data-v-34c343d8">温室智慧云</view><view class="data-v-34c343d8">Greenhouse wisdom Cloud</view></view></view><view class="subtitle data-v-34c343d8">欢迎使用温室智慧云数据统计</view><block wx:for="{{$root.l1}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><view class="waterAndFertilizerParams data-v-34c343d8"><view class="nav data-v-34c343d8"><image src="../../static/PH.png" mode class="data-v-34c343d8"></image><text class="data-v-34c343d8">{{item1.$orig.deviceTypeName}}</text></view><view class="detail data-v-34c343d8"><block wx:for="{{item1.l0}}" wx:for-item="item2" wx:for-index="index2" wx:key="index2"><view data-event-opts="{{[['tap',[['toTarget_water_fertilizer_PH',['$0','$1','$2','$3','$4'],[[['waterAndFertilizerParamsList','',index1],['childList','',index2,'equipmentId']],[['waterAndFertilizerParamsList','',index1],['childList','',index2,'environmentData']],[['waterAndFertilizerParamsList','',index1],['childList','',index2,'environmentDataId']],[['waterAndFertilizerParamsList','',index1],['childList','',index2,'equipmentNumber']],[['waterAndFertilizerParamsList','',index1],['childList','',index2,'targetValue']]]]]]]}}" class="item data-v-34c343d8" bindtap="__e"><image src="{{'../../static/icon/icon'+(index2+1<9?index2+1:1)+'.png'}}" mode class="data-v-34c343d8"></image><view class="info data-v-34c343d8"><view class="data-v-34c343d8">{{item2.m0+item2.$orig.environmentDataId}}</view><view class="data-v-34c343d8">{{item2.$orig.environmentData+item2.m1}}</view></view></view></block></view><view class="updateTime data-v-34c343d8"><label class="_span data-v-34c343d8"></label><label class="_span data-v-34c343d8">{{"*更新数据时间 : "+updateTime}}</label></view></view></block></view></view>
|
||||
<view class="timeEnvironment data-v-34c343d8"><u-navbar vue-id="63a4351c-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="实时环境" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" class="data-v-34c343d8" bind:__l="__l"></u-navbar><view class="navbar data-v-34c343d8"><image src="https://cdn.lihe-control.com/static/timeEnvironment_bg.png" mode class="data-v-34c343d8"></image></view><view class="content data-v-34c343d8"><view class="title data-v-34c343d8"><image src="../../static/logo_1.png" mode class="data-v-34c343d8"></image><view class="right data-v-34c343d8"><view class="data-v-34c343d8">温室智慧云</view><view class="data-v-34c343d8">Greenhouse wisdom Cloud</view></view></view><view class="subtitle data-v-34c343d8">欢迎使用温室智慧云数据统计</view><block wx:for="{{$root.l1}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><view class="waterAndFertilizerParams data-v-34c343d8"><view class="nav data-v-34c343d8"><image src="../../static/PH.png" mode class="data-v-34c343d8"></image><text class="data-v-34c343d8">{{item1.$orig.deviceTypeName}}</text></view><view class="detail data-v-34c343d8"><block wx:for="{{item1.l0}}" wx:for-item="item2" wx:for-index="index2" wx:key="index2"><view data-event-opts="{{[['tap',[['toTarget_water_fertilizer_PH',['$0','$1'],[[['waterAndFertilizerParamsList','',index1],['childList','',index2,'equipmentId']],[['waterAndFertilizerParamsList','',index1],['childList','',index2,'environmentData']]]]]]]}}" class="item data-v-34c343d8" bindtap="__e"><image src="{{'../../static/icon/icon'+(index2+1<9?index2+1:1)+'.png'}}" mode class="data-v-34c343d8"></image><view class="info data-v-34c343d8"><view class="data-v-34c343d8">{{item2.m0+item2.$orig.environmentDataId}}</view><view class="data-v-34c343d8">{{item2.$orig.environmentData+item2.m1}}</view></view></view></block></view></view></block></view></view>
|
||||
@ -114,6 +114,7 @@
|
||||
padding: 10rpx 0rpx;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-evenly;
|
||||
}
|
||||
.timeEnvironment .content .waterAndFertilizerParams .detail .item.data-v-34c343d8 {
|
||||
width: 50%;
|
||||
@ -140,14 +141,6 @@
|
||||
font-weight: bold;
|
||||
color: #333333;
|
||||
}
|
||||
.timeEnvironment .content .waterAndFertilizerParams .updateTime.data-v-34c343d8 {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 20rpx;
|
||||
font-size: 22rpx;
|
||||
}
|
||||
.timeEnvironment .content .testBase.data-v-34c343d8 {
|
||||
width: 690rpx;
|
||||
height: auto;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user