fix(merge): merge
merge Signed-off-by: liubaixun <liubaixun@yinxiang.com>mini-program
liubaixun
commit
2a70932008
|
|
@ -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": 71
|
||||
"regNum": 72
|
||||
}
|
||||
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)">
|
||||
<view class="right" @click="toFertilizer(item)" v-if="item.deviceState == 1">
|
||||
<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="目标水肥PH" title-color='#FFFFFF' :title-bold='true' title-size='32'></u-navbar>
|
||||
:title="titleName+echartName" 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>目标水肥PH</text>
|
||||
<text>{{ titleName+echartName }}</text>
|
||||
</view>
|
||||
<view id="echart_p">
|
||||
<qiun-data-charts type="line" :opts="opts" :chartData="chartData" :ontouch="true"
|
||||
|
|
@ -81,7 +81,11 @@
|
|||
|
||||
categoriesList:[],
|
||||
valuePH:'',
|
||||
valuePHList:[]
|
||||
valuePHList:[],
|
||||
newValuePHList:[],
|
||||
|
||||
titleName:'',
|
||||
echartName:''
|
||||
};
|
||||
},
|
||||
onReady() {
|
||||
|
|
@ -92,12 +96,15 @@
|
|||
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()
|
||||
|
|
@ -111,8 +118,8 @@
|
|||
let res = {
|
||||
categories: this.categoriesList,
|
||||
series: [{
|
||||
name: "目标水肥PH",
|
||||
data: this.valuePHList
|
||||
name: this.titleName+this.echartName,
|
||||
data: this.newValuePHList
|
||||
}, ]
|
||||
};
|
||||
this.chartData = JSON.parse(JSON.stringify(res));
|
||||
|
|
@ -125,16 +132,33 @@
|
|||
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['目标水肥PH'])
|
||||
this.valuePHList.push(i.value)
|
||||
})
|
||||
this.getServerData();
|
||||
console.log(this.categoriesList,'this.categoriesList');
|
||||
console.log(this.valuePHList,'this.valuePHList');
|
||||
// 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');
|
||||
})
|
||||
},
|
||||
|
||||
// 判断是否是平均或者目标,或者是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)">
|
||||
<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)">
|
||||
<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,6 +38,10 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="updateTime">
|
||||
<span></span>
|
||||
<span>*更新数据时间 : {{ updateTime }}</span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- <view class="testBase" v-for="(item1,index1) in waterAndFertilizerParamsList" :key="index1">
|
||||
|
|
@ -251,7 +255,8 @@
|
|||
{ label: '无线传感器信噪比（SNR）', value: 58, countType: 1,unit: 'dB' },
|
||||
],
|
||||
|
||||
timer:null
|
||||
timer:null,
|
||||
updateTime:''
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
|
|
@ -327,12 +332,14 @@
|
|||
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{
|
||||
|
||||
|
|
@ -347,9 +354,9 @@
|
|||
},
|
||||
|
||||
// 跳转到折线图
|
||||
toTarget_water_fertilizer_PH(id,data){
|
||||
toTarget_water_fertilizer_PH(id,data,name,equipmentNumber,targetValue){
|
||||
uni.navigateTo({
|
||||
url:'/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data
|
||||
url:'/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data + '&name=' + name + '&equipmentNumber=' + equipmentNumber + '&targetValue=' + targetValue
|
||||
})
|
||||
},
|
||||
|
||||
|
|
@ -484,7 +491,7 @@
|
|||
padding: 10rpx 0rpx;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-evenly;
|
||||
// justify-content: space-evenly;
|
||||
|
||||
.item {
|
||||
width: 50%;
|
||||
|
|
@ -517,6 +524,14 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
.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
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
@ -8934,7 +8934,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 + ']');
|
||||
|
|
@ -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({"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');
|
||||
|
|
@ -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({"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));
|
||||
|
|
@ -12310,7 +12310,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) {
|
||||
|
|
|
|||
|
|
@ -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": 71
|
||||
"regNum": 72
|
||||
};
|
||||
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><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>
|
||||
<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>
|
||||
|
|
@ -246,7 +246,10 @@ var _default = {
|
|||
},
|
||||
categoriesList: [],
|
||||
valuePH: '',
|
||||
valuePHList: []
|
||||
valuePHList: [],
|
||||
newValuePHList: [],
|
||||
titleName: '',
|
||||
echartName: ''
|
||||
};
|
||||
},
|
||||
onReady: function onReady() {
|
||||
|
|
@ -256,12 +259,14 @@ 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();
|
||||
|
|
@ -275,8 +280,8 @@ var _default = {
|
|||
var res = {
|
||||
categories: _this.categoriesList,
|
||||
series: [{
|
||||
name: "目标水肥PH",
|
||||
data: _this.valuePHList
|
||||
name: _this.titleName + _this.echartName,
|
||||
data: _this.newValuePHList
|
||||
}]
|
||||
};
|
||||
_this.chartData = JSON.parse(JSON.stringify(res));
|
||||
|
|
@ -289,15 +294,31 @@ 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['目标水肥PH']);
|
||||
_this2.valuePHList.push(i.value);
|
||||
});
|
||||
_this2.getServerData();
|
||||
console.log(_this2.categoriesList, 'this.categoriesList');
|
||||
console.log(_this2.valuePHList, 'this.valuePHList');
|
||||
// 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');
|
||||
});
|
||||
},
|
||||
// 判断是否是平均或者目标,或者是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="目标水肥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>
|
||||
<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>
|
||||
|
|
@ -270,6 +270,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
var _default = {
|
||||
data: function data() {
|
||||
return {
|
||||
|
|
@ -656,7 +660,8 @@ var _default = {
|
|||
countType: 1,
|
||||
unit: 'dB'
|
||||
}],
|
||||
timer: null
|
||||
timer: null,
|
||||
updateTime: ''
|
||||
};
|
||||
},
|
||||
onLoad: function onLoad() {
|
||||
|
|
@ -731,12 +736,14 @@ 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) {
|
||||
|
|
@ -747,9 +754,9 @@ var _default = {
|
|||
});
|
||||
},
|
||||
// 跳转到折线图
|
||||
toTarget_water_fertilizer_PH: function toTarget_water_fertilizer_PH(id, data) {
|
||||
toTarget_water_fertilizer_PH: function toTarget_water_fertilizer_PH(id, data, name, equipmentNumber, targetValue) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data
|
||||
url: '/pages/target_water_fertilizer_PH/target_water_fertilizer_PH?id=' + id + '&data=' + data + '&name=' + name + '&equipmentNumber=' + equipmentNumber + '&targetValue=' + targetValue
|
||||
});
|
||||
},
|
||||
// 数据单位
|
||||
|
|
|
|||
|
|
@ -1 +1,5 @@
|
|||
<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>
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
=======
|
||||
<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="../../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>
|
||||
>>>>>>> wx-program
|
||||
|
|
|
|||
|
|
@ -114,7 +114,6 @@
|
|||
padding: 10rpx 0rpx;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-evenly;
|
||||
}
|
||||
.timeEnvironment .content .waterAndFertilizerParams .detail .item.data-v-34c343d8 {
|
||||
width: 50%;
|
||||
|
|
@ -141,6 +140,14 @@
|
|||
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…
Reference in New Issue