完善
This commit is contained in:
parent
883f6e41e8
commit
d23a63b694
|
@ -37,7 +37,7 @@ const install = (Vue, vm) => {
|
|||
console.log('登录!', res);
|
||||
let data = {
|
||||
loginCode: res.code,
|
||||
deptId: 100
|
||||
deptId: 102
|
||||
};
|
||||
vm.$u.post('/app/auth/wxLogin',data).then(res=>{
|
||||
uni.setStorageSync('code', res.code);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name" : "SmartBeehive",
|
||||
"appid" : "__UNI__72DD260",
|
||||
"appid" : "__UNI__CE03E97",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.0",
|
||||
"versionCode" : "100",
|
||||
|
@ -51,7 +51,7 @@
|
|||
/* 小程序特有相关 */
|
||||
"mp-weixin" : {
|
||||
"libVersion" : "latest",
|
||||
"appid" : "wxe092159cf34ef21a",
|
||||
"appid" : "wxb35df32d5f5440ee",
|
||||
"setting" : {
|
||||
"urlCheck" : false
|
||||
},
|
||||
|
|
|
@ -1086,7 +1086,7 @@
|
|||
fontSize: 11,
|
||||
formatter: function(value) {
|
||||
// 保留两位小数,没有小数时显示00
|
||||
return value + '只'
|
||||
return Math.ceil(value) + '只'
|
||||
},
|
||||
},
|
||||
splitLine: {
|
||||
|
|
1048
page_Beehive/Beehive_ec.vue
Normal file
1048
page_Beehive/Beehive_ec.vue
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -50,7 +50,7 @@
|
|||
{{item.realValue}}
|
||||
</view>
|
||||
<view class="txt" v-if="item.type == 7">
|
||||
{{item.realValue}}Km
|
||||
{{item.realValue}}km
|
||||
</view>
|
||||
<view class="txt" v-if="item.type == 8">
|
||||
异常
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
</view>
|
||||
<view class="set_li">
|
||||
每隔<view class="ipt_box"><input type="text" class="ips" v-model="miteInterval" placeholder=" "
|
||||
placeholder-class="my-placeholder" /> </view>天/次 除螨工作
|
||||
placeholder-class="my-placeholder" /> </view>天/次 除螨工作
|
||||
</view>
|
||||
<view class="tit">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/ufvwKG3vcJYtbkf0Oeij" mode=""></image>
|
||||
<view class="tit" style="margin-top: 58rpx;">
|
||||
<image style="width: 52rpx;height: 52rpx;" src="https://api.ccttiot.com/smartmeter/img/static/ulPpf3J16ARy14XH4R7r" mode=""></image>
|
||||
保护设置
|
||||
</view>
|
||||
<view class="tit1">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/utZh1saVjZgOBz3orDkL" mode=""></image>
|
||||
<image style="width: 40rpx;height: 41rpx;" src="https://api.ccttiot.com/smartmeter/img/static/ul8NIQoFMG44Nj0W1geF" mode=""></image>
|
||||
电量保护(%)
|
||||
</view>
|
||||
<view class="set_li">
|
||||
|
@ -28,7 +28,7 @@
|
|||
placeholder-class="my-placeholder" /> </view>加热板/风扇停止工作
|
||||
</view>
|
||||
<view class="tit1">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/utZh1saVjZgOBz3orDkL" mode=""></image>
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/unI3QR7NPZsPSn5ryMMH" mode=""></image>
|
||||
加热(℃)
|
||||
</view>
|
||||
<view class="set_li">
|
||||
|
@ -40,13 +40,17 @@
|
|||
placeholder-class="my-placeholder" /> </view>加热板停止工作
|
||||
</view>
|
||||
<view class="tit1">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/utZh1saVjZgOBz3orDkL" mode=""></image>
|
||||
风扇(℃)
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/urouHoLnzjyyRn0MmNoL" mode=""></image>
|
||||
风扇(℃ 、ppm)
|
||||
</view>
|
||||
<view class="set_li">
|
||||
箱内温度高于<view class="ipt_box"><input type="text" class="ips" v-model="maxFan" placeholder=" "
|
||||
placeholder-class="my-placeholder" /> </view>风扇工作
|
||||
</view>
|
||||
<view class="set_li">
|
||||
箱内温度低于<view class="ipt_box"><input type="text" class="ips" v-model="minFan" placeholder=" "
|
||||
placeholder-class="my-placeholder" /> </view>风扇停止工作
|
||||
</view>
|
||||
<!-- <view class="set_li">
|
||||
箱内温度降到<view class="ipt_box"><input type="text" class="ips" v-model="code" placeholder=" "
|
||||
placeholder-class="my-placeholder" /> </view>风扇停止工作
|
||||
|
@ -59,25 +63,25 @@
|
|||
CO₂浓度低于<view class="ipt_box"><input type="text" class="ips" v-model="minCo2" placeholder=" "
|
||||
placeholder-class="my-placeholder" /> </view>风扇停止工作
|
||||
</view>
|
||||
<view class="tit">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/ufvwKG3vcJYtbkf0Oeij" mode=""></image>
|
||||
<view class="tit" style="margin-top: 58rpx;">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/udbzkOF4S1rNec8U44KT" mode=""></image>
|
||||
震动通知
|
||||
</view>
|
||||
<view class="tit1">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/utZh1saVjZgOBz3orDkL" mode=""></image>
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/u3I0roygrn4BHJaWAT24" mode=""></image>
|
||||
单次震动
|
||||
</view>
|
||||
<view class="" style="padding-left: 50rpx;padding-top: 20rpx;box-sizing: border-box;">
|
||||
<view class="" style="padding-left: 50rpx;padding-top: 40rpx;box-sizing: border-box;">
|
||||
<u-checkbox-group>
|
||||
<u-checkbox active-color="#FFCC25" @change="checkboxChange(item.type)" v-model="item.checked"
|
||||
v-for="(item, index) in list" :key="index" :name="item.name">{{item.name}}</u-checkbox>
|
||||
</u-checkbox-group>
|
||||
</view>
|
||||
<view class="tit1">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/utZh1saVjZgOBz3orDkL" mode=""></image>
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/uG0iEjqzc5if82ocNeWo" mode=""></image>
|
||||
持续震动
|
||||
</view>
|
||||
<view class="" style="padding-left: 50rpx;padding-top: 20rpx;box-sizing: border-box;">
|
||||
<view class="" style="padding-left: 50rpx;padding-top: 40rpx;box-sizing: border-box;">
|
||||
<u-checkbox-group>
|
||||
<u-checkbox active-color="#FFCC25" @change="checkboxChanges(item.type)" v-model="item.checked"
|
||||
v-for="(item, index) in lists" :key="index" :name="item.name">{{item.name}}</u-checkbox>
|
||||
|
@ -148,6 +152,7 @@
|
|||
minHeat: '', //加热板开始工作的最低箱外温度℃
|
||||
maxHeat: '', //加热板停止工作的箱内外温差℃
|
||||
maxFan: '', //风扇开始工作的最高箱内温度℃
|
||||
minFan: '', //风扇停止工作的最低箱内温度℃
|
||||
minCo2: '', //风扇停止工作的最低二氧化碳浓度℃
|
||||
maxCo2: '', //风扇开始工作的最高二氧化碳浓度℃
|
||||
}
|
||||
|
@ -165,6 +170,7 @@
|
|||
this.minHeat = ''
|
||||
this.maxHeat = ''
|
||||
this.maxFan = ''
|
||||
this.minFan = ''
|
||||
this.minCo2 = ''
|
||||
this.maxCo2 = ''
|
||||
this.list.forEach(item => {
|
||||
|
@ -204,6 +210,7 @@
|
|||
this.minHeat = res.data.minHeat,
|
||||
this.maxHeat = res.data.maxHeat,
|
||||
this.maxFan = res.data.maxFan,
|
||||
this.minFan = res.data.minFan,
|
||||
this.minCo2 = res.data.minCo2,
|
||||
this.maxCo2 = res.data.maxCo2
|
||||
this.list.forEach(item => {
|
||||
|
@ -228,6 +235,7 @@
|
|||
minHeat: this.minHeat,
|
||||
maxHeat: this.maxHeat,
|
||||
maxFan: this.maxFan,
|
||||
minFan:this.minFan,
|
||||
minCo2: this.minCo2,
|
||||
maxCo2: this.maxCo2,
|
||||
singleNotice: this.value,
|
||||
|
@ -259,6 +267,9 @@
|
|||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
/deep/ .u-checkbox{
|
||||
margin-right: 80rpx;
|
||||
}
|
||||
page {
|
||||
background-color: #F4FAF8;
|
||||
}
|
||||
|
@ -323,7 +334,7 @@
|
|||
}
|
||||
|
||||
.tit1 {
|
||||
margin-top: 32rpx;
|
||||
margin-top: 30rpx;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
|
@ -342,14 +353,14 @@
|
|||
|
||||
.set_li {
|
||||
margin-top: 34rpx;
|
||||
margin-left: 104rpx;
|
||||
margin-left: 65rpx;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #808080;
|
||||
|
||||
|
||||
.ipt_box {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
@ -362,7 +373,8 @@
|
|||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
|
||||
.ips {
|
||||
margin-left: 15rpx;
|
||||
// margin-left: 15rpx;
|
||||
text-align: center;
|
||||
width: 100rpx;
|
||||
|
||||
}
|
||||
|
|
|
@ -174,6 +174,7 @@
|
|||
image {
|
||||
width: 674rpx;
|
||||
height: 360rpx;
|
||||
border-radius: 20rpx 20rpx 0 0;
|
||||
}
|
||||
|
||||
.address {
|
||||
|
@ -220,7 +221,7 @@
|
|||
top: 0;
|
||||
width: 674rpx;
|
||||
height: 70rpx;
|
||||
|
||||
background-color: rgba(255, 255, 255, 0.5);
|
||||
|
||||
image {
|
||||
width: 44rpx;
|
||||
|
@ -231,7 +232,7 @@
|
|||
margin-left: 16rpx;
|
||||
font-weight: 600;
|
||||
font-size: 32rpx;
|
||||
color: #3D3D3D;
|
||||
color: #3d3d3d;
|
||||
}
|
||||
|
||||
.txt2 {
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
{{daily[0].humidity == undefined ? '--' : daily[0].humidity}} %
|
||||
</view>
|
||||
</view>
|
||||
<image @click="btnedfc" style="width: 44rpx;height: 44rpx;position: absolute;top: 240rpx;right:20rpx ;"
|
||||
<image @click="btnedfc" style="width: 44rpx;height: 44rpx;position: absolute;top: 228rpx;right:36rpx ;"
|
||||
src="https://api.ccttiot.com/smartmeter/img/static/ulHBKvkXDfe9OIveIJKZ" mode=""></image>
|
||||
</view>
|
||||
<view class="info_box">
|
||||
|
@ -148,7 +148,7 @@
|
|||
<image class="bgimg" src="https://api.ccttiot.com/smartmeter/img/static/uImWgTlNYBAv4SO02gSL" mode="">
|
||||
</image>
|
||||
<view class="tit">
|
||||
电子围栏(Km)
|
||||
电子围栏(km)
|
||||
</view>
|
||||
<view class="cont">
|
||||
最大距离 <view class="ipt"><input type="text" class="ips" v-model="dzcode" placeholder=" "
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
</view>
|
||||
<view class="iptbox" @click="btnfx(3)">
|
||||
<input type="text" class="ips" v-model="form.address"
|
||||
:placeholder="'低于' + form.minWeight + 'g或高于' + form.maxWeight + 'g时'" placeholder-class="my-placeholder"
|
||||
:placeholder="'低于' + form.minWeight + 'kg或高于' + form.maxWeight + 'kg时'" placeholder-class="my-placeholder"
|
||||
disabled />
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/ugAdKZm5ZHZ4to1cDsNI" mode=""></image>
|
||||
</view>
|
||||
|
@ -69,7 +69,7 @@
|
|||
<u-switch v-model="form.enableFence" active-color="#FFC107" @change="chang"></u-switch>
|
||||
</view>
|
||||
<view class="iptbox" @click="btnfx(7)">
|
||||
<input type="text" class="ips" v-model="form.address" :placeholder="'低于' + form.minFence + 'Km时'"
|
||||
<input type="text" class="ips" v-model="form.address" :placeholder="'低于' + form.minFence + 'km时'"
|
||||
placeholder-class="my-placeholder" disabled />
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/ugAdKZm5ZHZ4to1cDsNI" mode=""></image>
|
||||
</view>
|
||||
|
@ -218,7 +218,7 @@
|
|||
this.zhong = this.form.minPower
|
||||
this.dange = false
|
||||
} else if (num == 3) {
|
||||
this.danwei = 'g'
|
||||
this.danwei = 'kg'
|
||||
this.fxtxt = '重量'
|
||||
this.di = this.form.minWeight
|
||||
this.gao = this.form.maxWeight
|
||||
|
@ -233,7 +233,7 @@
|
|||
this.di = this.form.minHz
|
||||
this.gao = this.form.maxHz
|
||||
} else if (num == 7) {
|
||||
this.danwei = 'Km'
|
||||
this.danwei = 'km'
|
||||
this.fxtxt = '范围'
|
||||
this.zhong = this.form.minFence
|
||||
this.dange = false
|
||||
|
|
|
@ -252,7 +252,7 @@
|
|||
console.log(res.code);
|
||||
let data = {
|
||||
loginCode: res.code,
|
||||
deptId: 100
|
||||
deptId: 102
|
||||
}
|
||||
taht.$u.post('/app/auth/wxLogin', data).then(res => {
|
||||
if (res.code == 200) {
|
||||
|
@ -493,7 +493,7 @@
|
|||
fontSize: 11,
|
||||
formatter: function(value) {
|
||||
// 保留两位小数,没有小数时显示00
|
||||
return value + '只'
|
||||
return Math.ceil(value) + '只'
|
||||
},
|
||||
},
|
||||
splitLine: {
|
||||
|
|
|
@ -111,7 +111,7 @@
|
|||
loginCode: res.code,
|
||||
type: that.type,
|
||||
mobileCode: e.detail.code,
|
||||
deptId:100,
|
||||
deptId:102,
|
||||
};
|
||||
resolve(data);
|
||||
} else {
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
<view class="">箱内湿度:{{fxobj.innerHumidity == undefined ? '--' : fxobj.innerHumidity}}%</view>
|
||||
</view>
|
||||
<view class="fcli">
|
||||
<view class="">蜂箱重量:{{fxobj.totalYield == undefined ? '--' : fxobj.totalYield}}g</view>
|
||||
<view class="">蜂箱重量:{{fxobj.totalYield == undefined ? '--' : fxobj.totalYield}}kg</view>
|
||||
</view>
|
||||
<view class="fcli">
|
||||
<view class="">二氧化碳浓度:{{fxobj.innerCo2 == undefined ? '--' : fxobj.innerCo2}}ppm</view>
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar is-back="false" :title="title" :border-bottom="false" :background="bgc" title-color='#000'
|
||||
title-size='36' :title-bold='true' height='45' id="navbar">
|
||||
<u-navbar :is-back="false" title="我的" :border-bottom="false" :background="bgc" title-color='#3D3D3D '
|
||||
title-size='36' height='45' id="navbar">
|
||||
</u-navbar>
|
||||
</u-navbar>
|
||||
<view class="atv">
|
||||
<button
|
||||
|
@ -176,7 +177,7 @@
|
|||
box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.15);
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
|
||||
font-weight: 600;
|
||||
font-weight: 500;
|
||||
font-size: 32rpx;
|
||||
color: #3D3D3D;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user