From eb418e26f1227d8db7f17141f20081791a7e85e6 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Wed, 13 Nov 2024 18:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=9C=82=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/http.interceptor.js | 26 ++---
page_Beehive/add_Beehive.vue | 157 +++++++++++++++--------------
page_user/luru.vue | 10 +-
page_user/lurutwo.vue | 87 +++++++++-------
pages.json | 7 ++
pages/Apiary.vue | 58 ++---------
pages/Apiary/AddApiary.vue | 29 ++----
pages/Apiary/addrizhi.vue | 4 +-
pages/Beehive.vue | 2 -
pages/index/index.vue | 67 ++++---------
pages/login/login.vue | 51 +++++-----
pages/login/logoyzm.vue | 189 +++++++++++++++++++++++++++++++++++
pages/map.vue | 44 --------
pages/my.vue | 2 +-
14 files changed, 413 insertions(+), 320 deletions(-)
create mode 100644 pages/login/logoyzm.vue
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 5f0eb17..a62f8dc 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -9,18 +9,18 @@ const install = (Vue, vm) => {
'content-type': 'application/json;charset=UTF-8',
},
- });
+ })
// 请求拦截部分，如配置，每次请求前都会执行
Vue.prototype.$u.http.interceptor.request = (config) => {
- const token = uni.getStorageSync('token');
- config.header.Authorization = token;
+ const token = uni.getStorageSync('token')
+ config.header.Authorization = token
// #ifdef H5
- config.header.Authorization = 'Bearer '+token;
+ config.header.Authorization = 'Bearer '+token
// #endif
- if(config.url == '/user/login') config.header.noToken = true;
+ if(config.url == '/user/login') config.header.noToken = true
// 最后需要将config进行return
- return config;
+ return config
}
// 响应拦截，如配置，每次请求结束都会执行本方法
@@ -30,7 +30,7 @@ const install = (Vue, vm) => {
success: function(ret) {
console.log("main.js==>res", ret)
}
- });
+ })
wx.login({
success(res) {
if (res.code) {
@@ -45,27 +45,21 @@ const install = (Vue, vm) => {
// uni.navigateTo({
// url:'/pages/login/login'
// })
-
} else if (res.code == 200) {
uni.setStorageSync('token', res.token);
-
// console.log("老用户登录",res.data)
// uni.switchTab({
// url:'/pages/index/index'
// })
-
}
- });
+ })
}
},
-
- });
-
+ })
}
- return res;
+ return res
}
}
-
export default {
install
}
\ No newline at end of file
diff --git a/page_Beehive/add_Beehive.vue b/page_Beehive/add_Beehive.vue
index 2c85bac..2633b72 100644
--- a/page_Beehive/add_Beehive.vue
+++ b/page_Beehive/add_Beehive.vue
@@ -10,13 +10,13 @@
-
+
-
-
+
+
@@ -40,7 +40,7 @@
+ placeholder-class="my-placeholder" />
@@ -69,27 +69,26 @@
name: '',
videoStream: '',
fc: '',
- fcid:'',
+ fcid: '',
showmiyuan: false,
miyuancolumns: [],
pagesum: 1,
pagesize: 99,
- beehiveId:'',
- code:''
+ beehiveId: '',
+ code: ''
}
},
onLoad(option) {
- if(option.tit){
+ if (option.tit) {
this.title = option.tit
this.beehiveId = option.beehiveId
this.geteditxq()
- }else{
+ } else {
this.title = '添加蜂箱'
}
- this.getmiyuancolumns()
},
onShow() {
-
+ this.getmiyuancolumns()
},
methods: {
// 删除蜂箱
@@ -109,35 +108,34 @@
});
setTimeout(() => {
uni.navigateBack({
- delta:2
- });
- }, 1500);
+ delta: 2
+ })
+ }, 1500)
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
- });
+ })
}
})
.catch(error => {
- console.error('删除蜂场失败:', error);
+ console.error('删除蜂场失败:', error)
uni.showToast({
title: '删除蜂场失败，请稍后再试',
icon: 'none',
duration: 2000
- });
- });
+ })
+ })
}
}
- });
+ })
},
-
// 修改部分
- geteditxq(){
+ geteditxq() {
this.$u.get(`/farm/beehive/${this.beehiveId}`).then(res => {
if (res.code == 200) {
- this.sn = res.data.sn
+ this.sn = res.data.sn
this.name = res.data.name
this.fc = res.data.apiaryName
this.videoStream = res.data.videoStream
@@ -146,24 +144,24 @@
})
},
// 点击确认修改
- btnedit(){
+ btnedit() {
let data = {
- beehiveId:this.beehiveId,
- apiaryId:this.fcid,
- name:this.name,
- videoStream:this.videoStream
+ beehiveId: this.beehiveId,
+ apiaryId: this.fcid,
+ name: this.name,
+ videoStream: this.videoStream
}
- this.$u.put(`/farm/beehive`,data).then(res => {
+ this.$u.put(`/farm/beehive`, data).then(res => {
if (res.code == 200) {
- uni.showToast({
- title: '修改成功',
- icon: 'success',
- duration:1000
- })
- setTimeout(()=>{
- uni.navigateBack()
- },1500)
- }else{
+ uni.showToast({
+ title: '修改成功',
+ icon: 'success',
+ duration: 1000
+ })
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 1500)
+ } else {
uni.showToast({
title: res.msg,
icon: 'none',
@@ -172,19 +170,18 @@
}
})
},
-
// 修改结束// 修改结束// 修改结束// 修改结束// 修改结束
- btnqrcode(){
+ btnqrcode() {
uni.scanCode({
onlyFromCamera: true,
scanType: ['qrCode'],
success: res => {
- let url = res.result
- let sIndex = url.indexOf('s=')
- if (sIndex !== -1) {
- this.sn = url.substring(sIndex + 2);
- } else {
- this.sn = res.result
+ let url = res.result
+ let sIndex = url.indexOf('s=')
+ if (sIndex !== -1) {
+ this.sn = url.substring(sIndex + 2)
+ } else {
+ this.sn = res.result
}
},
fail: err => {
@@ -195,7 +192,7 @@
}
})
},
- confirmmy(e){
+ confirmmy(e) {
this.fc = e[0].label
this.fcid = e[0].value
},
@@ -206,10 +203,26 @@
};
this.$u.get('/farm/apiary/list', data).then((res) => {
if (res.code === 200) {
- this.miyuancolumns = res.rows.map(item => ({
- value: item.apiaryId,
- label: item.name
- }))
+ if (res.rows.length == 0 || res.rows == null) {
+ uni.showModal({
+ title: '提示',
+ content: '您暂无蜂场，是否先去添加蜂场？',
+ success: function(res) {
+ if (res.confirm) {
+ uni.navigateTo({
+ url: '/pages/Apiary/AddApiary'
+ })
+ } else if (res.cancel) {
+ uni.navigateBack()
+ }
+ }
+ })
+ } else {
+ this.miyuancolumns = res.rows.map(item => ({
+ value: item.apiaryId,
+ label: item.name
+ }))
+ }
} else {
// uni.showToast({
// title: res.msg,
@@ -222,24 +235,24 @@
// 点击确定添加
btnadd() {
let data = {
- sn:this.sn,
- name:this.name,
- apiaryId:this.fcid,
- videoStream:this.videoStream
+ sn: this.sn,
+ name: this.name,
+ apiaryId: this.fcid,
+ videoStream: this.videoStream
}
this.$u.put('farm/beehive/bind', data).then(res => {
if (res.code == 200) {
- uni.showToast({
- title: res.msg,
- icon: 'success',
- duration: 1000
- })
- setTimeout(()=>{
+ uni.showToast({
+ title: res.msg,
+ icon: 'success',
+ duration: 1000
+ })
+ setTimeout(() => {
uni.navigateBack()
- },1500)
- }else if(res.code == 401){
+ }, 1500)
+ } else if (res.code == 401) {
uni.navigateTo({
- url:'/pages/login/login'
+ url: '/pages/login/login'
})
} else {
uni.showToast({
@@ -255,18 +268,15 @@
// url:'/pages/Apiary/AddApiary'
// })
// }
-
}
}
-
\ No newline at end of file
diff --git a/page_user/luru.vue b/page_user/luru.vue
index c052317..743b042 100644
--- a/page_user/luru.vue
+++ b/page_user/luru.vue
@@ -4,7 +4,7 @@
back-icon-color="#000" height='50'>
设备录入列表
- 控制台
+ 控制台
@@ -20,11 +20,11 @@
MAC：{{item.name.substring(5)}}
-
+
蓝牙强度:{{item.RSSI}}
@@ -590,7 +590,7 @@
bottom: 112rpx;
button {
- background: #FFC107;
+ background: #ce9e10;
border-radius: 52rpx 52rpx 52rpx 52rpx;
color: #fff;
}
@@ -631,7 +631,7 @@
margin-top: 46rpx;
width: 266rpx;
height: 96rpx;
- background: #FFC107;
+ background: #ce9e10;
border-radius: 52rpx 52rpx 52rpx 52rpx;
color: #fff;
text-align: center;
diff --git a/page_user/lurutwo.vue b/page_user/lurutwo.vue
index 6260141..e04b9ae 100644
--- a/page_user/lurutwo.vue
+++ b/page_user/lurutwo.vue
@@ -18,21 +18,33 @@
MAC号：{{obj.mac == undefined ? '--' : obj.mac}}
-
+ 箱外湿度：{{obj.outerHumidity == undefined ? '--' : obj.outerHumidity + '%'}}
+
+
+ 箱外温度：{{obj.outerTemperature == undefined ? '--' : obj.outerTemperature + '%'}}
+
+
+ 剩余电量：{{obj.surplusPower == undefined ? '--' : obj.surplusPower + '%'}}
+
+
+ 箱内二氧化碳浓度：{{obj.innerCo2 == undefined ? '--' : obj.innerCo2 + '%'}}
+
+
+ 进出量(只)：{{obj.ioCount == undefined ? '--' : obj.ioCount}}
+
+
+ 频率：{{obj.volume == undefined ? '--' : obj.volume + 'hz'}}
+
网络：离线 在线
-
最后在线时间：{{obj.lastOnlineTime == undefined ? '--' : obj.lastOnlineTime}}
@@ -42,9 +54,12 @@
开启蜂鸣
-
+
+ 开启风扇
+
+
+ 关闭风扇
+
刷新
@@ -155,7 +170,7 @@
uni.navigateBack()
},
- // 开启
+ // 开启蜂鸣
btnkq(){
this.$u.put(`/app/beehive/admin/buzzer?sn=${this.storeId}`).then((res) => {
if (res.code == 200) {
@@ -176,9 +191,9 @@
}
})
},
- // 关闭
+ // 关闭风扇
btngb(){
- this.$u.put(`/app/device/admin/${this.id}/switch?open=false`).then((res) => {
+ this.$u.put(`/app/beehive/admin/fan?sn=${this.storeId}&open=false`).then((res) => {
if (res.code == 200) {
setTimeout(()=>{
this.btnsx()
@@ -197,28 +212,31 @@
}
})
},
+ // 开启风扇
+ btngbkq(){
+ this.$u.put(`/app/beehive/admin/fan?sn=${this.storeId}&open=true`).then((res) => {
+ if (res.code == 200) {
+ setTimeout(()=>{
+ this.btnsx()
+ },1000)
+ uni.showToast({
+ title: res.msg,
+ icon: 'success',
+ duration: 2000
+ })
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ },
// 刷新
btnsx(){
this.getsn()
- // this.$u.get(`/app/device/${this.storeId}/refreshIot`).then((res) => {
- // if(res.code == 200){
- // this.getsn()
- // uni.showToast({
- // title: res.msg,
- // icon: 'success',
- // duration: 2000
- // })
- // }else{
- // uni.showToast({
- // title: res.msg,
- // icon: 'none',
- // duration: 2000
- // })
- // }
- // })
}
-
-
}
}
@@ -241,18 +259,19 @@
width: 30%;
height: 90rpx;
border-radius: 20rpx;
- background-color: #FFC107;
+ background-color:#ce9e10;
color: #fff;
font-size: 32rpx;
text-align: center;
line-height: 90rpx;
+ margin: 0 10rpx;
}
}
.fanhui{
width: 658rpx;
height: 90rpx;
border-radius: 20rpx;
- background-color: #FFC107;
+ background-color: #ce9e10;
color: #fff;
font-size: 32rpx;
text-align: center;
diff --git a/pages.json b/pages.json
index 313805c..d629f3b 100644
--- a/pages.json
+++ b/pages.json
@@ -72,6 +72,13 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
+ },{
+ "path": "pages/login/logoyzm",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
},
{
"path": "pages/Apiary/AddApiary",
diff --git a/pages/Apiary.vue b/pages/Apiary.vue
index 40f8851..cd8e9fa 100644
--- a/pages/Apiary.vue
+++ b/pages/Apiary.vue
@@ -105,16 +105,11 @@
if (this.list.length < this.total) {
this.ishave();
} else {
- // uni.showToast({
- // title: '没有更多蜂场了',
- // icon: 'none',
- // duration: 1000
- // });
- this.$refs.uToast.show({
- title: '没有更多蜂场了',
- type: 'default',
- position:'bottom'
- })
+ this.$refs.uToast.show({
+ title: '没有更多蜂场了',
+ type: 'default',
+ position:'bottom'
+ })
}
},
addApiary() {
@@ -129,26 +124,23 @@
};
this.$u.get('/farm/apiary/list', data).then((res) => {
if (res.code === 200) {
- this.total = res.total;
+ this.total = res.total
if (this.total < 1) {
- this.logoflag = true;
+ this.logoflag = true
} else {
if (this.pagesum > 1) {
this.list = this.list.concat(res.rows)
} else {
this.list = res.rows
}
- this.pagesum++;
- this.logoflag = false;
- // console.log(this.list);
+ this.pagesum++
+ this.logoflag = false
}
} else {
this.logoflag = true
}
})
},
-
-
}
}
@@ -157,18 +149,14 @@
page {
background-color: #FAFDFD;
}
-
.page {
- // position: relative;
width: 750rpx;
-
.Apiary_box {
padding-left: 40rpx;
box-sizing: border-box;
padding-bottom: 230rpx;
overflow-y: auto;
height: 78vh;
-
.Apiary_card {
margin-top: 20rpx;
position: relative;
@@ -178,13 +166,11 @@
box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.15);
border-radius: 20rpx 20rpx 20rpx 20rpx;
background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), transparent);
-
image {
width: 674rpx;
height: 360rpx;
border-radius: 20rpx 20rpx 0 0;
}
-
.address {
margin-top: 18rpx;
padding: 0 24rpx;
@@ -197,7 +183,6 @@
/* 超出部分隐藏 */
text-overflow: ellipsis;
}
-
.info {
margin-top: 18rpx;
padding: 0 24rpx;
@@ -205,20 +190,17 @@
align-items: center;
flex-wrap: nowrap;
justify-content: space-between;
-
.left {
font-weight: 600;
font-size: 36rpx;
color: #3D3D3D;
}
-
.right {
font-weight: 600;
font-size: 32rpx;
color: #50565A;
}
}
-
.weather {
padding: 20rpx 24rpx;
position: absolute;
@@ -230,19 +212,16 @@
width: 674rpx;
height: 70rpx;
background-color: rgba(255, 255, 255, 0.5);
-
image {
width: 44rpx;
height: 44rpx;
}
-
.txt1 {
margin-left: 16rpx;
font-weight: 600;
font-size: 32rpx;
color: #3d3d3d;
}
-
.txt2 {
margin-left: 28rpx;
font-weight: 600;
@@ -252,16 +231,13 @@
}
}
}
-
.top_box {
margin: 42rpx auto;
display: flex;
flex-wrap: nowrap;
width: 664rpx;
align-items: center;
-
.search {
-
display: flex;
flex-wrap: nowrap;
align-items: center;
@@ -271,26 +247,18 @@
background: #FFFFFF;
box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.15);
border-radius: 20rpx 20rpx 20rpx 20rpx;
-
image {
width: 35.97rpx;
height: 35.97rpx;
}
-
.search_center {
margin-left: 34rpx;
width: 480rpx;
-
.ips {
// 基本样式设置
width: 100%; // 根据需要调整
-
- // border: 1px solid #ccc; // 根据需要调整
-
// 设置 placeholder 样式
-
}
-
.my-placeholder {
font-weight: 400;
font-size: 32rpx;
@@ -298,25 +266,21 @@
}
}
}
-
.add {
margin-left: 30rpx;
width: 66rpx;
height: 66rpx;
}
}
-
.no_cont {
margin: 152rpx auto 0;
width: 432rpx;
-
.img {
image {
width: 432rpx;
height: 432rpx;
}
}
-
.txt {
margin-top: 50rpx;
width: 100%;
@@ -326,9 +290,5 @@
color: #808080;
}
}
-
-
-
-
}
\ No newline at end of file
diff --git a/pages/Apiary/AddApiary.vue b/pages/Apiary/AddApiary.vue
index c1fca2b..6d2ef9b 100644
--- a/pages/Apiary/AddApiary.vue
+++ b/pages/Apiary/AddApiary.vue
@@ -70,13 +70,8 @@
code: '',
fengzhong:'',
miyuan:'',
- fengzhongcolumns: [
-
- ],
- miyuancolumns: [
-
-
- ],
+ fengzhongcolumns: [],
+ miyuancolumns: [],
showfengzhong:false,
showmiyuan:false,
form: {
@@ -89,7 +84,6 @@
beeType:'',
honeyType:''
},
-
userImgs: '',
token: '',
sn:'',
@@ -263,20 +257,20 @@
chooseAddress() {
uni.chooseLocation({
success: (res) => {
- console.log(res);
+ console.log(res)
let address = res.address;
- let regex = /^([\u4e00-\u9fa5]+省)([\u4e00-\u9fa5]+市)([\u4e00-\u9fa5]+市|[\u4e00-\u9fa5]+区)(.*)/;
- let match = address.match(regex);
+ let regex = /^([\u4e00-\u9fa5]+省)([\u4e00-\u9fa5]+市)([\u4e00-\u9fa5]+市|[\u4e00-\u9fa5]+区)(.*)/
+ let match = address.match(regex)
if (match && match.length > 3) {
- let province = match[1];
- let city = match[2];
- let district = match[3];
+ let province = match[1]
+ let city = match[2]
+ let district = match[3]
this.form.province = province
this.form.city = city
this.form.county = district
- // console.log(this.form);
+ // console.log(this.form)
} else {
- console.log('地址格式不匹配或无法提取省市区信息');
+ console.log('地址格式不匹配或无法提取省市区信息')
}
this.form.lng = res.longitude
this.form.lat = res.latitude
@@ -290,7 +284,7 @@
icon: 'none'
})
} else {
- console.log('选择位置失败', err);
+ console.log('选择位置失败', err)
// 处理其他失败情况
}
},
@@ -307,7 +301,6 @@
.page {
padding-bottom: 200rpx;
- // position: relative;
width: 750rpx;
.btn{
position: fixed;
diff --git a/pages/Apiary/addrizhi.vue b/pages/Apiary/addrizhi.vue
index c1ece61..262ccee 100644
--- a/pages/Apiary/addrizhi.vue
+++ b/pages/Apiary/addrizhi.vue
@@ -266,14 +266,14 @@
}
},
updateWordCount() {
- this.currentCount = this.textValue.trim().replace(/\s+/g, '').length;
+ this.currentCount = this.textValue.trim().replace(/\s+/g, '').length
},
getQiniuToken() {
this.$u.get("/common/qiniu/uploadInfo").then((res) => {
if (res.code == 200) {
this.token = res.token
}
- });
+ })
},
btn() {
let _this = this
diff --git a/pages/Beehive.vue b/pages/Beehive.vue
index 4becb55..bfbbff7 100644
--- a/pages/Beehive.vue
+++ b/pages/Beehive.vue
@@ -168,9 +168,7 @@
频率
-
-
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1f2d3df..aba114f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -202,18 +202,12 @@
onShow() {
this.getuserinfo()
-
- setTimeout(() => {
-
-
- }, 1500);
const now = new Date();
const previousDay = new Date(now)
this.yeartime.year = now.getFullYear()
this.yeartime.month = String(previousDay.getMonth() + 1).padStart(2, '0')
this.yeartime.day = String(now.getDate()).padStart(2, '0')
-
previousDay.setDate(now.getDate() - 7)
this.yeartimes.year = previousDay.getFullYear()
this.yeartimes.month = String(previousDay.getMonth() + 1).padStart(2, '0')
@@ -251,7 +245,6 @@
} else if (res.code == 10003) {
taht.logoflag = true
}
- // console.log(res,10003);
})
}
},
@@ -268,8 +261,6 @@
this.gettj()
this.getyj()
} else {
-
-
// uni.navigateTo({
// url:
// })
@@ -356,29 +347,24 @@
// console.log(e, 'aaaa');
},
getnum() {
- const currentDate = new Date();
-
+ const currentDate = new Date()
// 获取前七天的日期
const sevenDaysAgoDate = new Date();
- sevenDaysAgoDate.setDate(currentDate.getDate() - 7);
-
+ sevenDaysAgoDate.setDate(currentDate.getDate() - 7)
// 格式化日期为 'YYYY-MM-DD'
const formatDate = (date) => {
- const year = date.getFullYear();
- const month = (date.getMonth() + 1).toString().padStart(2, '0');
- const day = date.getDate().toString().padStart(2, '0');
- return `${year}-${month}-${day}`;
- };
-
- const currentDateString = formatDate(currentDate);
- const sevenDaysAgoDateString = formatDate(sevenDaysAgoDate);
-
+ const year = date.getFullYear()
+ const month = (date.getMonth() + 1).toString().padStart(2, '0')
+ const day = date.getDate().toString().padStart(2, '0')
+ return `${year}-${month}-${day}`
+ }
+ const currentDateString = formatDate(currentDate)
+ const sevenDaysAgoDateString = formatDate(sevenDaysAgoDate)
// 赋值给 data 中的 dateRange
let data = {
dateRange: `${sevenDaysAgoDateString},${currentDateString}`
};
this.$u.get('/farmer/report/ioCount?', data).then((res) => {
-
if (res.code === 200) {
this.numdata = res.data
this.$refs.canvas4.init(this.initChart4)
@@ -387,35 +373,29 @@
title: res.msg,
icon: 'none',
duration: 2000
- });
-
+ })
}
})
},
getnums() {
- const currentDate = new Date();
-
+ const currentDate = new Date()
// 获取前七天的日期
- const sevenDaysAgoDate = new Date();
- sevenDaysAgoDate.setDate(currentDate.getDate() - 7);
-
+ const sevenDaysAgoDate = new Date()
+ sevenDaysAgoDate.setDate(currentDate.getDate() - 7)
// 格式化日期为 'YYYY-MM-DD'
const formatDate = (date) => {
- const year = date.getFullYear();
- const month = (date.getMonth() + 1).toString().padStart(2, '0');
- const day = date.getDate().toString().padStart(2, '0');
- return `${year}-${month}-${day}`;
- };
-
- const currentDateString = formatDate(currentDate);
- const sevenDaysAgoDateString = formatDate(sevenDaysAgoDate);
-
+ const year = date.getFullYear()
+ const month = (date.getMonth() + 1).toString().padStart(2, '0')
+ const day = date.getDate().toString().padStart(2, '0')
+ return `${year}-${month}-${day}`
+ }
+ const currentDateString = formatDate(currentDate)
+ const sevenDaysAgoDateString = formatDate(sevenDaysAgoDate)
// 赋值给 data 中的 dateRange
let data = {
dateRange: `${sevenDaysAgoDateString},${currentDateString}`
- };
+ }
this.$u.get('/farmer/report/weightDay?', data).then((res) => {
-
if (res.code === 200) {
this.numdatas = res.data
this.$refs.canvas3.init(this.initChart3)
@@ -424,15 +404,13 @@
title: res.msg,
icon: 'none',
duration: 2000
- });
-
+ })
}
})
},
// 进出量
initChart4(canvas, width, height, canvasDpr) {
let that = this
-
const option = {
grid: {
left: '4%',
@@ -645,7 +623,6 @@
chart.setOption(option)
return chart
},
-
// 获取设备详情
}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a527980..71820d3 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -34,6 +34,9 @@
+
+ 手机号登录
+
+
+
+
+
+
+
+
+ 获取验证码
+
+
+
+
+
+ 立即登录
+
+
+
+ —————— 其他登录方式 ——————
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/map.vue b/pages/map.vue
index fd61939..b9428ad 100644
--- a/pages/map.vue
+++ b/pages/map.vue
@@ -501,9 +501,7 @@
page {
background-color: #FAFDFD;
}
-
.page {
- // position: relative;
width: 750rpx;
// 蜂场弹窗
.fxtan {
@@ -561,49 +559,40 @@
}
}
}
-
.fctq {
margin-top: 20rpx;
font-size: 28rpx;
display: flex;
color: #3D3D3D;
-
view {
margin-right: 40rpx;
}
}
-
.fcdz {
font-size: 32rpx;
color: #808080;
margin-top: 20rpx;
-
text {
margin-right: 10rpx;
}
}
-
.fcbh {
font-weight: 600;
font-size: 32rpx;
color: #3D3D3D;
}
-
.fctop {
display: flex;
justify-content: space-between;
-
.fclt {
display: flex;
align-items: center;
-
.fctit {
font-weight: 600;
font-size: 40rpx;
color: #3D3D3D;
margin-right: 32rpx;
}
-
.fcry {
width: 90rpx;
height: 42rpx;
@@ -614,24 +603,19 @@
color: #FFFFFF;
text-align: center;
}
-
image {
width: 64rpx;
height: 64rpx;
margin-right: 28rpx;
}
}
-
.fcrt {
- // font-weight: 600;
font-size: 64rpx;
padding-bottom: 10rpx;
box-sizing: border-box;
}
}
}
-
-
// 蜂箱弹窗
.fctan {
position: fixed;
@@ -688,49 +672,40 @@
}
}
}
-
.fctq {
margin-top: 20rpx;
font-size: 28rpx;
display: flex;
color: #3D3D3D;
-
view {
margin-right: 40rpx;
}
}
-
.fcdz {
font-size: 32rpx;
color: #808080;
margin-top: 20rpx;
-
text {
margin-right: 10rpx;
}
}
-
.fcbh {
font-weight: 600;
font-size: 32rpx;
color: #3D3D3D;
}
-
.fctop {
display: flex;
justify-content: space-between;
-
.fclt {
display: flex;
align-items: center;
-
.fctit {
font-weight: 600;
font-size: 40rpx;
color: #3D3D3D;
margin-right: 32rpx;
}
-
.fcry {
width: 90rpx;
height: 42rpx;
@@ -741,31 +716,24 @@
color: #FFFFFF;
text-align: center;
}
-
image {
width: 64rpx;
height: 64rpx;
margin-right: 28rpx;
}
}
-
.fcrt {
- // font-weight: 600;
font-size: 64rpx;
padding-bottom: 10rpx;
box-sizing: border-box;
}
}
}
-
-
-
.fxtongji {
position: fixed;
top: 15vh;
right: 50rpx;
z-index: 99;
-
.one {
display: flex;
align-items: center;
@@ -773,25 +741,21 @@
padding: 4rpx 20rpx;
box-sizing: border-box;
border-radius: 30rpx;
-
.wz {
color: #3D3D3D;
font-size: 32rpx;
margin: 0 15rpx;
font-weight: 600;
}
-
.shu {
color: #FFC107;
font-size: 32rpx;
}
-
image {
width: 44rpx;
height: 44rpx;
}
}
-
.two {
display: flex;
align-items: center;
@@ -800,33 +764,25 @@
padding: 4rpx 20rpx;
box-sizing: border-box;
border-radius: 30rpx;
-
.wz {
color: #3D3D3D;
font-size: 32rpx;
margin: 0 15rpx;
font-weight: 600;
}
-
.shu {
color: #FFC107;
font-size: 32rpx;
}
-
image {
width: 44rpx;
height: 44rpx;
}
}
}
-
.map {
width: 750rpx;
height: 100vh;
}
-
-
-
-
}
\ No newline at end of file
diff --git a/pages/my.vue b/pages/my.vue
index 2050ee7..28b6ecc 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -169,7 +169,7 @@
position: fixed;
top: 200rpx;
right: 20px;
- background-color: #FFC107;
+ background-color: #ce9e10;
}
page {
background-color: #FAFDFD;