diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 7b276fb..f1ad98d 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -1,7 +1,7 @@
const install = (Vue, vm) => {
Vue.prototype.$u.http.setConfig({
- // baseUrl: 'http://192.168.2.17:3202',
- baseUrl: 'https://fen.ccttiot.com/prod-api',
+ baseUrl: 'http://124.221.246.124:2291',
+ // baseUrl: 'https://fen.ccttiot.com/prod-api',
loadingText: '努力加载中~',
loadingTime: 800,
// 设置自定义头部content-type
@@ -37,7 +37,7 @@ const install = (Vue, vm) => {
console.log('登录！', res);
let data = {
loginCode: res.code,
- deptId: 102
+ deptId: 100
};
vm.$u.post('/app/auth/wxLogin',data).then(res=>{
uni.setStorageSync('code', res.code);
diff --git a/manifest.json b/manifest.json
index a471ff1..85567f1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,7 +51,7 @@
/* 小程序特有相关 */
"mp-weixin" : {
"libVersion" : "latest",
- "appid" : "wxb35df32d5f5440ee",
+ "appid" : "wxe092159cf34ef21a",
"setting" : {
"urlCheck" : false
},
diff --git a/page_Beehive/Beehive_detail.vue b/page_Beehive/Beehive_detail.vue
index aa825f2..8adda9b 100644
--- a/page_Beehive/Beehive_detail.vue
+++ b/page_Beehive/Beehive_detail.vue
@@ -59,11 +59,11 @@
<view class="weather_left">
<view class="txt">
<image src="https://api.ccttiot.com/smartmeter/img/static/uZqKuAjf2idHAtkknKEU" mode=""></image>
- {{obj.outerHumidity < -40 || obj.outerHumidity > 100? '--' : obj.outerHumidity}}%
+ {{obj.innerHumidity < -40 || obj.innerHumidity > 100? '--' : obj.innerHumidity}}%
</view>
<view class="txt" style="margin-left: 26rpx;">
<image src="https://api.ccttiot.com/smartmeter/img/static/uJmWnkVE9UeIhNYdPexV" mode=""></image>
- {{obj.outerTemperature < -40 || obj.outerTemperature > 100? '--' : obj.outerTemperature}}℃
+ {{obj.innerTemperature < -40 || obj.innerTemperature > 100? '--' : obj.innerTemperature}}℃
</view>
</view>
<view class="weather_right" style="font-weight: 400;font-size: 24rpx;color: #808080;">
@@ -110,21 +110,23 @@
{{obj.name == undefined ? '--' : obj.name}}
</view>
<view class="time">
- {{obj.lastOnlineTime}}
+ {{obj.lastOnlineTime == undefined ? '--' : obj.lastOnlineTime}}
</view>
<view class="ele">
- <image src="https://api.ccttiot.com/smartmeter/img/static/uWDVO6wzl5tRe8X3rmhT" mode=""></image>
- {{obj.surplusPower}}%
+ <image style="height: 25rpx;" v-if="obj.surplusPowerPoint <= 100 && obj.surplusPowerPoint > 90" src="https://api.ccttiot.com/smartmeter/img/static/uUDtZqG4vEMDSyFglw2O" mode=""></image>
+ <image style="height: 25rpx;" v-if="obj.surplusPowerPoint < 91 && obj.surplusPowerPoint > 20" src="https://api.ccttiot.com/smartmeter/img/static/uvCuPhgajbgui2Ankzwv" mode=""></image>
+ <image style="height: 25rpx;" v-if="obj.surplusPowerPoint < 21 || obj.surplusPowerPoint == 0" src="https://api.ccttiot.com/smartmeter/img/static/uVgUKpW05NMPRbdIRL8b" mode=""></image>
+ {{obj.surplusPowerPoint == undefined ? '--' : obj.surplusPowerPoint}}%
</view>
</view>
- <view class="echarts_box" @click="btnec(1)">
+ <view class="echarts_box" v-if="xnwd" @click="btnec(1)">
<view class="echarts_top">
<view class="top_left">
温度
- <image src="https://api.ccttiot.com/smartmeter/img/static/utoKXhZBoejfRZwNUMP9" mode=""></image>
+ <image style="width: 36rpx;height: 34rpx;" src="https://api.ccttiot.com/smartmeter/img/static/utoKXhZBoejfRZwNUMP9" mode=""></image>
</view>
<view class="top_cont">
- 当前 {{obj.innerTemperature}}℃
+ 当前 {{obj.innerTemperature == undefined ? '--' : obj.innerTemperature}}℃
</view>
<view class="top_right">
<view style="width: 1rpx;">
@@ -142,11 +144,11 @@
</uni-ec-canvas>
</view>
</view>
- <view class="echarts_box" @click="btnec(2)">
+ <view class="echarts_box" v-if="xnsd" @click="btnec(2)">
<view class="echarts_top">
<view class="top_left">
湿度
- <image src="https://api.ccttiot.com/smartmeter/img/static/una6Kbd2gdBZ9gG6lg44" mode=""></image>
+ <image style="width: 30rpx;height: 32rpx;" src="https://api.ccttiot.com/smartmeter/img/static/una6Kbd2gdBZ9gG6lg44" mode=""></image>
</view>
<view class="top_cont">
当前 {{obj.innerHumidity}}%
@@ -167,14 +169,14 @@
</uni-ec-canvas>
</view>
</view>
- <view class="echarts_box" @click="btnec(3)">
+ <view class="echarts_box" v-if="height" @click="btnec(3)">
<view class="echarts_top">
<view class="top_left">
重量
- <image src="https://api.ccttiot.com/smartmeter/img/static/uk7CvwzeU0ukxvS9cBtD" mode=""></image>
+ <image style="width: 28rpx;height: 33rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uk7CvwzeU0ukxvS9cBtD" mode=""></image>
</view>
<view class="top_cont">
- 当前 {{obj.totalWeight == 999999 ? '--' : obj.totalWeight}}g
+ 当前 {{obj.totalWeight == 999999 ? '--' : (obj.totalWeight / 1000).toFixed(1)}}kg
</view>
<view class="top_right">
<view style="width: 1rpx;">
@@ -192,11 +194,11 @@
</uni-ec-canvas>
</view>
</view>
- <view class="echarts_box" @click="btnec(4)">
+ <view class="echarts_box" v-if="io" @click="btnec(4)">
<view class="echarts_top">
<view class="top_left">
进出量
- <image src="https://api.ccttiot.com/smartmeter/img/static/uhsU6Y1K35jxA4aRauzy" mode=""></image>
+ <image style="width: 33rpx;height: 33rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uhsU6Y1K35jxA4aRauzy" mode=""></image>
</view>
<view class="top_cont">
当前 {{obj.ioCountDay}}只
@@ -217,14 +219,14 @@
</uni-ec-canvas>
</view>
</view>
- <view class="echarts_box" @click="btnec(5)">
+ <view class="echarts_box" v-if="sypl" @click="btnec(5)">
<view class="echarts_top">
<view class="top_left">
频率
- <image src="https://api.ccttiot.com/smartmeter/img/static/up9IaGzSg1RKhIZz3V7a" mode=""></image>
+ <image style="width: 38rpx;height: 32rpx;" src="https://api.ccttiot.com/smartmeter/img/static/up9IaGzSg1RKhIZz3V7a" mode=""></image>
</view>
<view class="top_cont">
- 当前 {{obj.volume}}
+ 当前 {{obj.volume / 1000 == 0 ? obj.volume : (obj.volume / 1000).toFixed(1)}}khz
</view>
<view class="top_right">
<view style="width: 1rpx;">
@@ -242,11 +244,11 @@
</uni-ec-canvas>
</view>
</view>
- <view class="echarts_box" @click="btnec(6)">
+ <view class="echarts_box" v-if="eyht" @click="btnec(6)">
<view class="echarts_top">
<view class="top_left">
二氧化碳
- <image src="https://api.ccttiot.com/smartmeter/img/static/um4lfl5q2O7FNM1EQc2L" mode=""></image>
+ <image style="width: 36rpx;height: 38rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uAw3ZCXnMbekNML7CTSu" mode=""></image>
</view>
<view class="top_cont">
当前 {{obj.innerCo2}}ppm
@@ -309,7 +311,7 @@
<view class="type_li" @click="btndow(1)">
去皮
</view>
- <view class="type_li" @click="btndow(2)">
+ <view class="type_li" @click="btndow(2)" v-if="beep">
蜂鸣寻箱
</view>
<view class="type_li" @click="btndow(3)">
@@ -358,7 +360,7 @@
}],
chartday: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'],
chartData: [120, 200, 150, 80, 70, 110, 130],
- showtq: true,
+ showtq: false,
beehiveId: '',
obj: {},
daily: [],
@@ -384,7 +386,16 @@
},
daytime: '',
covers: [],
- dtflag: false
+ dtflag: false,
+ modelTags:[],
+
+ height:false,
+ io:false,
+ xnwd:false,
+ xnsd:false,
+ sypl:false,
+ eyht:false,
+ beep:false
}
},
onLoad(option) {
@@ -420,6 +431,10 @@
this.getchartData6()
},
methods: {
+ // 每30秒上报数据
+
+
+
// 跳转图标详情
btnec(num) {
uni.navigateTo({
@@ -433,6 +448,9 @@
},
btngd() {
// this.gettq()
+ setTimeout(() => {
+ this.$refs.canvas7.init(this.initChart7)
+ }, 200);
this.showtq = true
},
btnyj() {
@@ -650,6 +668,23 @@
this.obj = res.data
this.latitude = res.data.lat
this.longitude = res.data.lng
+ this.modelTags = res.data.modelTags
+ this.modelTags.forEach(item => {
+ if(item == 1){
+ this.height = true
+ }else if(item == 2){
+ this.io = true
+ }else if(item == 3){
+ this.xnwd = true
+ this.xnsd = true
+ }else if(item == 10){
+ this.sypl = true
+ }else if(item == 9){
+ this.eyht = true
+ }else if(item == 13){
+ this.beep = true
+ }
+ })
if (res.data.enableFan == false) {
this.fskx = '关'
} else {
@@ -977,7 +1012,7 @@
fontSize: 11,
formatter: function(value) {
// 保留两位小数，没有小数时显示00
- return value + 'Kg'
+ return (value / 1000).toFixed(1) + 'Kg'
},
},
splitLine: {
@@ -1195,7 +1230,7 @@
fontSize: 11,
formatter: function(value) {
// 保留两位小数，没有小数时显示00
- return value + 'Hz'
+ return value / 1000 + 'khz'
},
},
splitLine: {
@@ -1664,7 +1699,7 @@
color: #3D3D3D;
image {
- margin-left: 28rpx;
+ margin-left: 10rpx;
width: 25.03rpx;
height: 34rpx;
}
diff --git a/page_Beehive/Beehive_ec.vue b/page_Beehive/Beehive_ec.vue
index 528f987..e19c2eb 100644
--- a/page_Beehive/Beehive_ec.vue
+++ b/page_Beehive/Beehive_ec.vue
@@ -3,14 +3,14 @@
<u-navbar is-back="false" title="历史走势" :border-bottom="false" :background="bgc" title-color='#000'
title-size='36' :title-bold='true' height='45' id="navbar">
</u-navbar>
- <view class="echarts_box" >
+ <view class="echarts_box" v-if="xnwd">
<view class="echarts_top">
<view class="top_left">
温度
- <image src="https://api.ccttiot.com/smartmeter/img/static/utoKXhZBoejfRZwNUMP9" mode=""></image>
+ <image style="width: 36rpx;height: 34rpx;" src="https://api.ccttiot.com/smartmeter/img/static/utoKXhZBoejfRZwNUMP9" mode=""></image>
</view>
<view class="top_cont">
- 最近30日℃
+ 最近30日
</view>
<view class="top_right">
<view style="width: 1rpx;">
@@ -28,14 +28,14 @@
</uni-ec-canvas>
</view>
</view>
- <view class="echarts_box" >
+ <view class="echarts_box" v-if="xnsd">
<view class="echarts_top">
<view class="top_left">
湿度
- <image src="https://api.ccttiot.com/smartmeter/img/static/una6Kbd2gdBZ9gG6lg44" mode=""></image>
+ <image style="width: 30rpx;height: 32rpx;" src="https://api.ccttiot.com/smartmeter/img/static/una6Kbd2gdBZ9gG6lg44" mode=""></image>
</view>
<view class="top_cont">
- 最近30日%
+ 最近30日
</view>
<view class="top_right">
<view style="width: 1rpx;">
@@ -53,14 +53,14 @@
</uni-ec-canvas>
</view>
</view>
- <view class="echarts_box" >
+ <view class="echarts_box" v-if="height">
<view class="echarts_top">
<view class="top_left">
重量
- <image src="https://api.ccttiot.com/smartmeter/img/static/uk7CvwzeU0ukxvS9cBtD" mode=""></image>
+ <image style="width: 28rpx;height: 33rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uk7CvwzeU0ukxvS9cBtD" mode=""></image>
</view>
<view class="top_cont">
- 最近30日g
+ 最近30日
</view>
<view class="top_right">
<view style="width: 1rpx;">
@@ -78,14 +78,14 @@
</uni-ec-canvas>
</view>
</view>
- <view class="echarts_box" >
+ <view class="echarts_box" v-if="io">
<view class="echarts_top">
<view class="top_left">
进出量
- <image src="https://api.ccttiot.com/smartmeter/img/static/uhsU6Y1K35jxA4aRauzy" mode=""></image>
+ <image style="width: 33rpx;height: 33rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uhsU6Y1K35jxA4aRauzy" mode=""></image>
</view>
<view class="top_cont">
- 最近30日只
+ 最近30日
</view>
<view class="top_right">
<view style="width: 1rpx;">
@@ -103,11 +103,11 @@
</uni-ec-canvas>
</view>
</view>
- <view class="echarts_box" >
+ <view class="echarts_box" v-if="sypl">
<view class="echarts_top">
<view class="top_left">
频率
- <image src="https://api.ccttiot.com/smartmeter/img/static/up9IaGzSg1RKhIZz3V7a" mode=""></image>
+ <image style="width: 38rpx;height: 32rpx;" src="https://api.ccttiot.com/smartmeter/img/static/up9IaGzSg1RKhIZz3V7a" mode=""></image>
</view>
<view class="top_cont">
最近30日
@@ -128,14 +128,14 @@
</uni-ec-canvas>
</view>
</view>
- <view class="echarts_box" >
+ <view class="echarts_box" v-if="eyht">
<view class="echarts_top">
<view class="top_left">
- 二氧化碳
- <image src="https://api.ccttiot.com/smartmeter/img/static/um4lfl5q2O7FNM1EQc2L" mode=""></image>
+ 二氧化碳
+ <image style="width: 36rpx;height: 38rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uAw3ZCXnMbekNML7CTSu" mode=""></image>
</view>
<view class="top_cont">
- 最近30日ppm
+ 最近30日
</view>
<view class="top_right">
<view style="width: 1rpx;">
@@ -193,12 +193,21 @@
day: ''
},
num:'',
- beehiveId:''
+ beehiveId:'',
+ modelTags:[],
+
+ height:false,
+ io:false,
+ xnwd:false,
+ xnsd:false,
+ sypl:false,
+ eyht:false,
}
},
onLoad(option) {
this.num = option.num
this.beehiveId = option.beehiveId
+ this.getobj()
},
onShow() {
setTimeout(() => {
@@ -211,7 +220,7 @@
// }else if(this.num == 4){
this.$refs.canvas4.init(this.initChart4)
// }else if(this.num == 5){
- this.$refs.canvas5.init(this.initChart5)
+ this.$refs.canvas5.init(this.initChart5)
// }else if(this.num == 6){
this.$refs.canvas6.init(this.initChart6)
// }
@@ -242,6 +251,36 @@
// }
},
methods: {
+ getobj() {
+ this.$u.get(`/farm/beehive/${this.beehiveId}`).then(res => {
+ if (res.code == 200) {
+ this.modelTags = res.data.modelTags
+ this.modelTags.forEach(item => {
+ if(item == 1){
+ this.height = true
+ }else if(item == 2){
+ this.io = true
+ }else if(item == 3){
+ this.xnwd = true
+ this.xnsd = true
+ }else if(item == 10){
+ this.sypl = true
+ }else if(item == 9){
+ this.eyht = true
+ }else if(item == 13){
+ this.beep = true
+ }
+ })
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ },
+
// 温度图表
getchartData1() {
let time = this.yeartime.year + '-' + this.yeartime.month + '-' + this.yeartime.day
@@ -571,7 +610,7 @@
fontSize: 11,
formatter: function(value) {
// 保留两位小数，没有小数时显示00
- return value + 'Kg'
+ return (value / 1000).toFixed(1) + 'Kg'
},
},
splitLine: {
@@ -789,7 +828,7 @@
fontSize: 11,
formatter: function(value) {
// 保留两位小数，没有小数时显示00
- return value + 'Hz'
+ return value / 1000 + 'khz'
},
},
splitLine: {
@@ -898,7 +937,7 @@
fontSize: 11,
formatter: function(value) {
// 保留两位小数，没有小数时显示00
- return value + '%'
+ return value + 'ppm'
},
},
splitLine: {
@@ -977,7 +1016,7 @@
box-sizing: border-box;
.echarts_box {
margin-top: 26rpx;
- padding: 18rpx 24rpx;
+ padding: 18rpx 36rpx;
width: 674rpx;
background: #FFFFFF;
@@ -999,15 +1038,15 @@
// justify-content: space-between;
.top_left {
- width: 33.33%;
+ width: 38.33%;
display: flex;
align-items: center;
font-weight: 500;
font-size: 36rpx;
color: #3D3D3D;
-
+ padding-left: 24rpx;
image {
- margin-left: 28rpx;
+ margin-left: 10rpx;
width: 25.03rpx;
height: 34rpx;
}
diff --git a/page_user/user_set.vue b/page_user/user_set.vue
index 4428a24..74cba22 100644
--- a/page_user/user_set.vue
+++ b/page_user/user_set.vue
@@ -165,14 +165,14 @@
},
methods: {
btncz(){
- this.miteInterval = ''
- this.minPower = ''
- this.minHeat = ''
- this.maxHeat = ''
- this.maxFan = ''
- this.minFan = ''
- this.minCo2 = ''
- this.maxCo2 = ''
+ this.miteInterval = 15
+ this.minPower = 20
+ this.minHeat = 0
+ this.maxHeat = 5
+ this.maxFan = 35
+ this.minFan = 20
+ this.minCo2 = 400
+ this.maxCo2 = 440
this.list.forEach(item => {
if (item.checked) {
item.checked = false;
diff --git a/pages/Apiary.vue b/pages/Apiary.vue
index 5e9cf7b..dacff7d 100644
--- a/pages/Apiary.vue
+++ b/pages/Apiary.vue
@@ -158,9 +158,9 @@
.Apiary_box {
padding-left: 40rpx;
box-sizing: border-box;
- padding-bottom: 300rpx;
+ padding-bottom: 230rpx;
overflow-y: auto;
- height: 100vh;
+ height: 78vh;
.Apiary_card {
margin-top: 20rpx;
diff --git a/pages/Apiary/Apiary_detail.vue b/pages/Apiary/Apiary_detail.vue
index 4737a21..5518777 100644
--- a/pages/Apiary/Apiary_detail.vue
+++ b/pages/Apiary/Apiary_detail.vue
@@ -105,6 +105,44 @@
</view>
</view>
<u-mask :show="showtq" @click="showtq = false" :z-index='100' duration='0' />
+<!-- <view class="weather_info" v-show="showtq">
+ <view class="top">
+ <view class="weather_info_tit">
+ 未来7日天气预知
+ </view>
+ <image src="https://api.ccttiot.com/smartmeter/img/static/uQK4q99a1Qb7LFD6O3Hw" mode=""
+ @click="showtq = false"></image>
+ </view>
+ <view class="top" style="margin-top: 14rpx;">
+ <view class="weather_add">
+ 蜂场位置：<span style="color: #42A5F5;">{{apiaryobj.apiaryCounty}}</span>
+ </view>
+ <view class="up_time">
+ {{daytime}}更新
+ </view>
+ </view>
+ <view class="weather_cont">
+ <view class="weather_li" v-for="(item,index) in daily" :key="index">
+ <view class="data">
+ {{item.fxDate.slice(5)}}
+ </view>
+ <view class="week">
+ {{item.textDay}}
+ </view>
+ <view class="week_weather">
+ {{item.windDirDay}}
+ </view>
+ <view class="week_weather_img">
+ <image src="https://api.ccttiot.com/smartmeter/img/static/u6wWpgZOuId6JSX8LGmz" mode=""></image>
+ </view>
+ </view>
+ </view>
+ <view class="echarts_box">
+ <uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas7" canvas-id="uni-ec-canvas"
+ :ec="ec">
+ </uni-ec-canvas>
+ </view>
+ </view> -->
<view class="weather_info" v-show="showtq">
<view class="top">
<view class="weather_info_tit">
@@ -115,7 +153,7 @@
</view>
<view class="top" style="margin-top: 14rpx;">
<view class="weather_add">
- 蜂场位置：<span style="color: #42A5F5;">{{apiaryobj.county}}</span>
+ 蜂场位置：<span style="color: #42A5F5;">{{obj.apiaryCounty}}</span>
</view>
<view class="up_time">
{{daytime}}更新
@@ -143,6 +181,7 @@
</uni-ec-canvas>
</view>
</view>
+
<u-mask :show="showwl" @click="showwl = false" :z-index='100' duration='0' />
<view class="pops" v-if='showwl'>
<image class="bgimg" src="https://api.ccttiot.com/smartmeter/img/static/uImWgTlNYBAv4SO02gSL" mode="">
@@ -410,7 +449,6 @@
showtqs() {
setTimeout(() => {
-
this.$refs.canvas7.init(this.initChart7)
}, 200);
this.showtq = true
diff --git a/pages/Beehive.vue b/pages/Beehive.vue
index 9090f05..b9cdae4 100644
--- a/pages/Beehive.vue
+++ b/pages/Beehive.vue
@@ -51,8 +51,11 @@
已认养
</view> -->
<view class="ele">
- <image src="https://api.ccttiot.com/smartmeter/img/static/uWDVO6wzl5tRe8X3rmhT" mode=""></image>
- {{item.surplusPower}}%
+ <image style="height: 25rpx;" v-if="item.surplusPowerPoint <= 100 && item.surplusPowerPoint > 90" src="https://api.ccttiot.com/smartmeter/img/static/uUDtZqG4vEMDSyFglw2O" mode=""></image>
+ <!-- <image v-if="item.surplusPowerPoint < 90 && item.surplusPowerPoint > 50" src="https://api.ccttiot.com/smartmeter/img/static/uWDVO6wzl5tRe8X3rmhT" mode=""></image> -->
+ <image style="height: 25rpx;" v-if="item.surplusPowerPoint < 91 && item.surplusPowerPoint > 20" src="https://api.ccttiot.com/smartmeter/img/static/uvCuPhgajbgui2Ankzwv" mode=""></image>
+ <image style="height: 25rpx;" v-if="item.surplusPowerPoint < 21 || item.surplusPowerPoint == 0" src="https://api.ccttiot.com/smartmeter/img/static/uVgUKpW05NMPRbdIRL8b" mode=""></image>
+ {{item.surplusPowerPoint}}%
</view>
</view>
<view class="card_top" style="margin-top: 20rpx;">
@@ -69,11 +72,11 @@
</view>
</view>
<view class="info_cont">
- <view class="info_li">
+ <view class="info_li" v-for="(val,index) in item.modelTags" :key="index" v-if="val == 1">
<view class="li_top">
<image src="https://api.ccttiot.com/smartmeter/img/static/uk7CvwzeU0ukxvS9cBtD" mode=""></image>
<view class="li_txt">
- {{item.totalWeight == 999999 ? '--' : item.totalWeight}}
+ {{item.totalWeight == 999999 ? '--' : (item.totalWeight / 1000).toFixed(1)}}
<span>kg</span>
</view>
</view>
@@ -81,7 +84,7 @@
重量
</view>
</view>
- <view class="info_li">
+ <view class="info_li" v-for="(val,index) in item.modelTags" :key="index" v-if="val == 2">
<view class="li_top">
<image src="https://api.ccttiot.com/smartmeter/img/static/uhsU6Y1K35jxA4aRauzy" mode=""></image>
<view class="li_txt">
@@ -93,11 +96,23 @@
进出量
</view>
</view>
- <view class="info_li">
+ <view class="info_li" v-for="(val,index) in item.modelTags" :key="index" v-if="val == 9">
<view class="li_top">
- <image src="https://api.ccttiot.com/smartmeter/img/static/una6Kbd2gdBZ9gG6lg44" mode=""></image>
+ <image src="https://api.ccttiot.com/smartmeter/img/static/um4lfl5q2O7FNM1EQc2L" mode=""></image>
<view class="li_txt">
- {{item.innerHumidity < -40 || item.innerHumidity > 100? '--' : item.innerHumidity}}
+ {{item.innerCo2 == 0 ? '--' : item.innerCo2}}
+ <span>ppm</span>
+ </view>
+ </view>
+ <view class="li_bot">
+ 二氧化碳
+ </view>
+ </view>
+ <view class="info_li" v-for="(val,index) in item.modelTags" :key="index" v-if="val == 3">
+ <view class="li_top">
+ <image src="https://api.ccttiot.com/smartmeter/img/static/una6Kbd2gdBZ9gG6lg44 " mode=""></image>
+ <view class="li_txt">
+ {{item.innerHumidity < -40 || item.innerHumidity > 100 || item.innerTemperature < -40 || item.innerTemperature > 100 == 0 ? '--' : item.innerHumidity}}
<span>%</span>
</view>
</view>
@@ -105,59 +120,48 @@
箱内湿度
</view>
</view>
- <view class="info_li">
+ <view class="info_li" v-for="(val,index) in item.modelTags" :key="index" v-if="val == 4">
<view class="li_top">
- <image src="https://api.ccttiot.com/smartmeter/img/static/utoKXhZBoejfRZwNUMP9" mode=""></image>
+ <image src="https://api.ccttiot.com/smartmeter/img/static/una6Kbd2gdBZ9gG6lg44" mode=""></image>
<view class="li_txt">
- {{ item.outerHumidity < -40 || item.outerHumidity > 100? '--' : item.outerHumidity}}
- <span>℃</span>
+ {{ item.outerHumidity < -40 || item.outerHumidity > 100 || item.outerTemperature < -40 || item.outerTemperature > 100 ? '--' : item.outerHumidity}}
+ <span>%</span>
</view>
</view>
<view class="li_bot">
- 箱外温度
+ 箱外湿度
</view>
</view>
- <view class="info_li">
- <view class="li_top">
- <image src="https://api.ccttiot.com/smartmeter/img/static/um4lfl5q2O7FNM1EQc2L" mode=""></image>
- <view class="li_txt">
- {{item.innerCo2}}
- <span>&</span>
- </view>
- </view>
- <view class="li_bot">
- 二氧化碳
- </view>
- </view>
- <view class="info_li">
+
+ <view class="info_li" v-for="(val,index) in item.modelTags" :key="index" v-if="val == 10">
<view class="li_top">
<image src="https://api.ccttiot.com/smartmeter/img/static/up9IaGzSg1RKhIZz3V7a" mode=""></image>
<view class="li_txt">
- {{item.volume}}
- <!-- <span>Hz</span> -->
+ {{item.volume / 1000 == 0 ? '--' : (item.volume / 1000).toFixed(1)}}
+ <span>khz</span>
</view>
</view>
<view class="li_bot">
频率
</view>
</view>
- <view class="info_li">
- <view class="li_top">
- <image src="https://api.ccttiot.com/smartmeter/img/static/ujmGWuQ8Xibi5qoOqN0B" mode=""></image>
- <view class="li_txt">
- {{item.innerHumidity}}
- <span>&</span>
- </view>
- </view>
- <view class="li_bot">
- 箱内湿度
- </view>
- </view>
- <view class="info_li">
+ <view class="info_li" v-for="(val,index) in item.modelTags" :key="index" v-if="val == 3">
<view class="li_top">
<image src="https://api.ccttiot.com/smartmeter/img/static/uWjV9HEHrP5g0B5AHD1j" mode=""></image>
<view class="li_txt">
- {{item.outerHumidity < -40 || item.outerHumidity > 100? '--' : item.outerHumidity}}
+ {{item.innerTemperature < -40 || item.innerTemperature > 100 || item.innerHumidity < -40 || item.innerHumidity > 100 ? '--' : item.innerTemperature}}
+ <span>℃</span>
+ </view>
+ </view>
+ <view class="li_bot">
+ 箱内温度
+ </view>
+ </view>
+ <view class="info_li" v-for="(val,index) in item.modelTags" :key="index" v-if="val == 4">
+ <view class="li_top">
+ <image src="https://api.ccttiot.com/smartmeter/img/static/uWjV9HEHrP5g0B5AHD1j" mode=""></image>
+ <view class="li_txt">
+ {{item.outerTemperature < -40 || item.outerTemperature > 100 || item.outerHumidity < -40 || item.outerHumidity > 100 ? '--' : item.outerTemperature}}
<span>℃</span>
</view>
</view>
@@ -237,7 +241,6 @@
this.indextab = index
this.pagesum = 1
this.apiaryId = item.value
- // this.fxlist = []
this.getlist()
},
getlist(){
@@ -253,21 +256,29 @@
this.logoflag = true
}else{
this.logoflag = false
- let oldSnSet = new Set(this.fxlist.map(item => item.sn));
- let result = [];
-
- res.rows.forEach(row => {
- if (oldSnSet.has(row.sn)) {
- result.push(row)
- oldSnSet.delete(row.sn)
- } else {
- result.push(row)
- }
- });
- result.sort((a, b) => b.onlineStatus - a.onlineStatus) // 1 在前，0 在后
- this.fxlist = result.filter(row => oldSnSet.has(row.sn))
- this.fxlist = result;
- this.pagesum++;
+
+ if(this.pagesum > 1){
+ this.fxlist = this.fxlist .concat(res.rows)
+ }else{
+ this.fxlist = res.rows
+ }
+
+ // let oldSnSet = new Set(this.fxlist.map(item => item.sn));
+ // let result = this.fxlist
+
+ // res.rows.forEach(row => {
+ // if (oldSnSet.has(row.sn)) {
+ // result.push(row)
+ // oldSnSet.delete(row.sn)
+ // } else {
+ // result.push(row)
+ // }
+ // });
+ // result.sort((a, b) => b.onlineStatus - a.onlineStatus) // 1 在前，0 在后
+ // this.fxlist = result.filter(row => oldSnSet.has(row.sn))
+ // this.fxlist = result
+
+ this.pagesum++
}
}else{
// uni.showToast({
@@ -283,7 +294,7 @@
this.getlist()
} else {
uni.showToast({
- title: '没有更多蜂场了',
+ title: '没有更多蜂箱了',
icon: 'none',
duration: 1000
});
@@ -348,8 +359,8 @@
// position: relative;
width: 750rpx;
.swiper {
- height: 100vh !important;
- padding-bottom: 300rpx;
+ height: 76vh !important;
+ padding-bottom: 230rpx;
box-sizing: border-box;
.swiper-item {
overflow: scroll;
@@ -360,7 +371,7 @@
padding: 20rpx 24rpx;
margin-top: 24rpx;
width: 674rpx;
- height: 506rpx;
+ max-height: 100%;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.15);
border-radius: 20rpx 20rpx 20rpx 20rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6f39d4e..07ad6a8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -19,7 +19,7 @@
<view class="tip_cont" style="margin-top: 48rpx;">
<image src="https://api.ccttiot.com/smartmeter/img/static/ufgkE5w8AND4eLZD94RR" mode=""></image>
<view class="txt">
- 预警数量:{{tjobj.warnCount == undefined ? '' : tjobj.warnCount}}
+ 24h预警:{{tjobj.warnCount == undefined ? '' : tjobj.warnCount}}
</view>
</view>
</view>
@@ -252,7 +252,7 @@
console.log(res.code);
let data = {
loginCode: res.code,
- deptId: 102
+ deptId: 100
}
taht.$u.post('/app/auth/wxLogin', data).then(res => {
if (res.code == 200) {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index e0915dc..46f6403 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -111,7 +111,7 @@
loginCode: res.code,
type: that.type,
mobileCode: e.detail.code,
- deptId:102,
+ deptId:100,
};
resolve(data);
} else {
diff --git a/pages/my.vue b/pages/my.vue
index 37f816d..cd0cb8a 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -162,6 +162,7 @@
font-weight: 600;
font-size: 36rpx;
color: #3D3D3D;
+ height: 50rpx;
}
.btn_li {