chuangte/SmartBeehive
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aaa

Browse Source
This commit is contained in:
3321822538@qq.com 2024-07-08 18:16:58 +08:00
parent 7282664846
commit 883f6e41e8
12 changed files with 476 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/tab-bar/tab-bar.vue
View File

@ -134,7 +134,8 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.cont { .cont {
position: fixed; position: fixed;
left: 60rpx; left: 50%;
transform: translateX(-50%);
bottom: 78rpx; bottom: 78rpx;
width: 664rpx; width: 664rpx;
height: 122rpx; height: 122rpx;

624
page_Beehive/Beehive_detail.vue
View File

File diff suppressed because it is too large Load Diff

24
page_Beehive/Beehive_log.vue
View File

@ -140,7 +140,7 @@
type: 3 type: 3
}, },
{ {
title: '加牌', title: '加脾',
type: 4 type: 4
}, },
{ {
@ -391,13 +391,25 @@
width: 750rpx; width: 750rpx;
.no_cont { .no_cont {
margin: 152rpx auto 0; // margin: 152rpx auto 0;
width: 432rpx; // width: 432rpx;
padding: 16rpx;
margin-left: -10rpx;
width: 100%;
height: 82vh;
background: #fff;
padding-left: 50rpx;
padding-top: 200rpx;
// overflow: scroll;
padding-bottom: 200rpx;
box-sizing: border-box;
.img { .img {
padding-left: 50rpx;
box-sizing: border-box;
image { image {
width: 432rpx; width: 350rpx;
height: 432rpx; height: 350rpx;
} }
} }

23
page_Beehive/Beehive_woring.vue
View File

@ -20,8 +20,7 @@
<view class="left_cont" :class="[ <view class="left_cont" :class="[
index=== currentIndex? 'act1' : '', index=== currentIndex? 'act1' : '',
index + 1 === currentIndex? 'act2' : '', index + 1 === currentIndex? 'act2' : '',
index- 1 === currentIndex? 'act3' : '' index- 1 === currentIndex? 'act3' : '']">
]">
{{item.title}} {{item.title}}
</view> </view>
</view> </view>
@ -177,7 +176,7 @@
this.pageNum = 1 this.pageNum = 1
this.rzlist = [] this.rzlist = []
if (this.title == '蜂箱预警记录') { if (this.title == '蜂箱预警记录') {
this.yjtxt = '该蜂场其他蜂箱' this.yjtxt = '其他蜂箱'
this.getfx() this.getfx()
this.getyuj() this.getyuj()
} else { } else {
@ -401,13 +400,23 @@
width: 750rpx; width: 750rpx;
.no_cont { .no_cont {
margin: 152rpx auto 0; padding: 16rpx;
width: 432rpx; margin-left: -10rpx;
width: 100%;
height: 82vh;
background: #fff;
padding-left: 50rpx;
padding-top: 200rpx;
// overflow: scroll;
padding-bottom: 200rpx;
box-sizing: border-box;
.img { .img {
padding-left: 50rpx;
box-sizing: border-box;
image { image {
width: 432rpx; width: 350rpx;
height: 432rpx; height: 350rpx;
} }
} }

9
pages.json
View File

@ -30,6 +30,7 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
// 蜂场 // 蜂场
{ {
"path": "pages/Apiary", "path": "pages/Apiary",
@ -202,6 +203,14 @@
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, {
"path" : "Beehive_ec",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, },
{ {
"path" : "share_Beehive", "path" : "share_Beehive",

11
pages/Apiary.vue
View File

@ -27,7 +27,7 @@
<view class="Apiary_card" v-for="(item,index) in list" :key="index" @click="btnapiaryxq(item.apiaryId)"> <view class="Apiary_card" v-for="(item,index) in list" :key="index" @click="btnapiaryxq(item.apiaryId)">
<image :src="item.picture" mode=""></image> <image :src="item.picture" mode=""></image>
<view class="weather"> <view class="weather">
<image src="https://api.ccttiot.com/smartmeter/img/static/u6wWpgZOuId6JSX8LGmz" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/u6wWpgZOuId6JSX8LGmz" mode="scaleToFill"></image>
<view class="txt1"> <view class="txt1">
多云 多云
</view> </view>
@ -66,11 +66,11 @@
total: '', total: '',
pagesize: 10, pagesize: 10,
logoflag: false, logoflag: false,
code: '' code: '',
} }
}, },
onLoad() { onLoad() {
}, },
onShow() { onShow() {
this.pagesum = 1 this.pagesum = 1
@ -170,7 +170,7 @@
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.15); box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.15);
border-radius: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx;
background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), transparent);
image { image {
width: 674rpx; width: 674rpx;
height: 360rpx; height: 360rpx;
@ -221,7 +221,6 @@
width: 674rpx; width: 674rpx;
height: 70rpx; height: 70rpx;
background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), transparent);
image { image {
width: 44rpx; width: 44rpx;
@ -250,7 +249,7 @@
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
width: 664rpx; width: 664rpx;
align-items: center;
.search { .search {
display: flex; display: flex;

2
pages/Apiary/AddApiary.vue
View File

@ -43,7 +43,7 @@
<view class=""> <view class="">
</view> </view>
<image src="https://api.ccttiot.com/smartmeter/img/static/uLpiGDDDvBwk7hOhOtVp" mode="" v-if=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uLpiGDDDvBwk7hOhOtVp" mode="scaleToFill" v-if=""></image>
</view> </view>
<view class="imgbox" v-else> <view class="imgbox" v-else>

2
pages/Apiary/Apiary_detail.vue
View File

@ -302,7 +302,7 @@
}, },
btnpage() { btnpage() {
uni.switchTab({ uni.switchTab({
url: '/pages/Beehive' url: '/pages/Beehive?apiaryId=' + this.apiaryId
}) })
}, },
gettq() { gettq() {

113
pages/Apiary/addrizhi.vue
View File

@ -88,7 +88,7 @@
type: 3 type: 3
}, },
{ {
title: '加牌', title: '加脾',
type: 4 type: 4
}, },
{ {
@ -118,7 +118,7 @@
token: '', token: '',
checked: false, checked: false,
id: '', id: '',
arrimg:[] arrimg: []
} }
}, },
onLoad(option) { onLoad(option) {
@ -131,7 +131,7 @@
this.getfc() this.getfc()
}, },
onShow() { onShow() {
this.imglist = []
}, },
methods: { methods: {
// 编辑 // 编辑
@ -144,71 +144,34 @@
this.apiaryName = res.data.beehiveName this.apiaryName = res.data.beehiveName
this.textValue = res.data.content this.textValue = res.data.content
this.checked = res.data.apiaryLog this.checked = res.data.apiaryLog
if(res.data.picture.length > 0){ if (res.data.picture.length > 0) {
this.imglist = res.data.picture.split(',') this.imglist = res.data.picture.split(',')
}else{ } else {
this.imglist = [] this.imglist = []
} }
} }
}) })
}, },
imgdel(indexToRemove){ imgdel(indexToRemove) {
this.imglist = this.imglist.filter((item, index) => index !== indexToRemove) this.imglist = this.imglist.filter((item, index) => index !== indexToRemove)
}, },
btnedit(){ btnedit() {
if (this.imglist) { if (this.imglist) {
let validUrls = this.imglist.filter(item => typeof item === 'string') let validUrls = this.imglist.filter(item => typeof item === 'string')
this.arrimg = validUrls.join(',') this.arrimg = validUrls.join(',')
} }
let data = { let data = {
id:this.id, id: this.id,
beehiveId: this.apiaryId, beehiveId: this.apiaryId,
type: this.type, type: this.type,
content: this.textValue, content: this.textValue,
picture: this.arrimg, picture: this.arrimg,
apiaryLog: this.checked apiaryLog: this.checked
} }
this.$u.put(`/farm/beehive/log`,data).then(res => { this.$u.put(`/farm/beehive/log`, data).then(res => {
if(res.code == 200){
uni.showToast({
title: '编辑成功',
icon: 'success',
duration: 1000
})
setTimeout(() => {
uni.navigateBack()
}, 1500)
}else{
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
})
}
})
},
checkboxChange(e) {
this.checked = e
},
btnadd() {
if (this.imglist) {
let validUrls = this.imglist.filter(item => typeof item === 'string')
this.imglist = validUrls.join(',')
}
let data = {
beehiveId: this.apiaryId,
type: this.type,
content: this.textValue,
picture: this.imglist,
apiaryLog: this.checked
}
this.$u.post(`/farm/beehive/log`, data).then(res => {
if (res.code == 200) { if (res.code == 200) {
uni.showToast({ uni.showToast({
title: '创建成功', title: '编辑成功',
icon: 'success', icon: 'success',
duration: 1000 duration: 1000
}) })
@ -225,6 +188,54 @@
}) })
}, },
checkboxChange(e) {
this.checked = e
},
btnadd() {
if (this.apiaryId == '') {
uni.showToast({
title: '请选择蜂箱',
icon: 'none',
duration: 1000
})
} else {
if (this.imglist.length > 80) {
let validUrls = this.imglist.filter(item => typeof item == 'string')
this.imglist = validUrls.join(',')
console.log(this.imglist.length);
}else{
this.imglist = this.imglist[0]
}
let data = {
beehiveId: this.apiaryId,
type: this.type,
content: this.textValue,
picture: this.imglist,
apiaryLog: this.checked
}
this.$u.post(`/farm/beehive/log`, data).then(res => {
if (res.code == 200) {
uni.showToast({
title: '创建成功',
icon: 'success',
duration: 1000
})
setTimeout(() => {
uni.navigateBack()
}, 1500)
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
})
}
})
}
},
confirmmy(e) { confirmmy(e) {
this.apiaryId = e[0].value this.apiaryId = e[0].value
this.apiaryName = e[0].label this.apiaryName = e[0].label
@ -463,8 +474,9 @@
width: 33%; width: 33%;
padding-right: 10rpx; padding-right: 10rpx;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
.xx{
.xx {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
border-radius: 50%; border-radius: 50%;
@ -477,6 +489,7 @@
top: -8rpx; top: -8rpx;
right: 0; right: 0;
} }
image { image {
height: 212rpx; height: 212rpx;
border-radius: 20rpx; border-radius: 20rpx;

50
pages/Beehive.vue
View File

@ -17,8 +17,9 @@
</view> </view>
</view> </view>
<view class="tabbar"> <view class="tabbar">
<view class="cont" :id="indextab == index ? 'active' : ''" v-for="(item,index) in miyuancolumns" :key="index" @click="btntab(index,item)"> <view class="cont" v-for="(item,index) in miyuancolumns" :key="index" @click="btntab(index,item)">
{{item.label}} {{item.label}} <text v-if="item.count != '-1'">({{item.count}})</text>
<view class="gl" :id="indextab == index ? 'active' : ''"></view>
</view> </view>
</view> </view>
</view> </view>
@ -191,7 +192,7 @@
code: '', code: '',
swiperHeight:554, swiperHeight:554,
curtitidx:0, curtitidx:0,
miyuancolumns: [{label:'全部'}], miyuancolumns: [{label:'全部',count:'a'}],
pagesum: 1, pagesum: 1,
pagesize: 99, pagesize: 99,
pagesizes: 5, pagesizes: 5,
@ -203,9 +204,10 @@
} }
}, },
onLoad() { onLoad() {
// this.apiaryId = this.miyuancolumns[0].value
}, },
onShow() { onShow() {
this.indextab = 0
this.pagesum = 1 this.pagesum = 1
// this.fxlist = [] // this.fxlist = []
this.getmiyuancolumns() this.getmiyuancolumns()
@ -251,23 +253,21 @@
this.logoflag = true this.logoflag = true
}else{ }else{
this.logoflag = false this.logoflag = false
// let uniqueIds = new Set(this.fxlist.map(item => item.sn))
// let uniqueRows = res.rows.filter(row => !uniqueIds.has(row.sn))
// uniqueRows.forEach(row => uniqueIds.add(row.sn))
// this.fxlist = this.fxlist.concat(uniqueRows)
let oldSnSet = new Set(this.fxlist.map(item => item.sn)); let oldSnSet = new Set(this.fxlist.map(item => item.sn));
let result = []; let result = [];
res.rows.forEach(row => { res.rows.forEach(row => {
if (oldSnSet.has(row.sn)) { if (oldSnSet.has(row.sn)) {
result.push(row) result.push(row)
oldSnSet.delete(row.sn); oldSnSet.delete(row.sn)
} else { } else {
result.push(row); result.push(row)
} }
}) });
this.fxlist = this.fxlist.filter(item => oldSnSet.has(item.sn)); result.sort((a, b) => b.onlineStatus - a.onlineStatus) // 1 在前，0 在后
this.fxlist = result; this.fxlist = result.filter(row => oldSnSet.has(row.sn))
this.pagesum++ this.fxlist = result;
this.pagesum++;
} }
}else{ }else{
// uni.showToast({ // uni.showToast({
@ -298,9 +298,10 @@
if (res.code === 200) { if (res.code === 200) {
this.miyuancolumns = res.rows.map(item => ({ this.miyuancolumns = res.rows.map(item => ({
value: item.apiaryId, value: item.apiaryId,
label: item.name label: item.name,
count:item.beehiveCount
})) }))
this.miyuancolumns.unshift({ label: '全部',value:''}) this.miyuancolumns.unshift({ label: '全部',value:'',count:'-1'})
this.apiaryId = this.miyuancolumns[0].value this.apiaryId = this.miyuancolumns[0].value
this.logoflag = false this.logoflag = false
this.getlist() this.getlist()
@ -334,6 +335,7 @@
border-bottom: 3px solid #FFC107; border-bottom: 3px solid #FFC107;
font-weight: 600; font-weight: 600;
font-size: 40rpx; font-size: 40rpx;
display: block !important;
} }
#status{ #status{
background-color: #808080; background-color: #808080;
@ -477,6 +479,18 @@
font-weight: 400; font-weight: 400;
font-size: 36rpx; font-size: 36rpx;
color: #3D3D3D; color: #3D3D3D;
position: relative;
.gl{
width: 46rpx;
height: 46rpx;
background: #FFC107;
border-radius: 50%;
position: absolute;
top: 2rpx;
right: -10rpx;
opacity: .7;
display: none;
}
} }
} }
@ -487,7 +501,7 @@
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
width: 664rpx; width: 664rpx;
align-items: center;
.search { .search {
display: flex; display: flex;

4
pages/index/index.vue
View File

@ -52,7 +52,7 @@
</view> </view>
<view class="txt"> <view class="txt">
<view class="iconfont icon-xiangyou1"></view> <!-- <view class="iconfont icon-xiangyou1"></view> -->
</view> </view>
</view> </view>
@ -89,7 +89,7 @@
</view> </view>
<view class="txt"> <view class="txt">
<view class="iconfont icon-xiangyou1"></view> <!-- <view class="iconfont icon-xiangyou1"></view> -->
</view> </view>
</view> </view>

10
pages/map.vue
View File

@ -25,7 +25,7 @@
<view class="fclt"> <view class="fclt">
<image src="https://api.ccttiot.com/smartmeter/img/static/ukbyhyrDcp3VzgyeJo2G" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/ukbyhyrDcp3VzgyeJo2G" mode=""></image>
<view class="fctit">{{fxobj.name == undefined ? '--' : fxobj.name}}</view> <view class="fctit">{{fxobj.name == undefined ? '--' : fxobj.name}}</view>
<view class="fcry">已认养</view> <!-- <view class="fcry">已认养</view> -->
</view> </view>
<view class="fcrt" @click="fxslag = false"> <view class="fcrt" @click="fxslag = false">
x x
@ -80,7 +80,7 @@
<view class="fclt"> <view class="fclt">
<image src="https://api.ccttiot.com/smartmeter/img/static/uB2k1NNeN2QUuSZIAf5r" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uB2k1NNeN2QUuSZIAf5r" mode=""></image>
<view class="fctit">{{fcobj.name == undefined ? '--' : fcobj.name}}</view> <view class="fctit">{{fcobj.name == undefined ? '--' : fcobj.name}}</view>
<view class="fcry">已认养</view> <!-- <view class="fcry">已认养</view> -->
</view> </view>
<view class="fcrt" @click="fcflag = false"> <view class="fcrt" @click="fcflag = false">
x x
@ -112,7 +112,7 @@
<view class="">当前湿度：{{nowtqobj.humidity == undefined ? '--' : nowtqobj.humidity}}%</view> <view class="">当前湿度：{{nowtqobj.humidity == undefined ? '--' : nowtqobj.humidity}}%</view>
</view> </view>
<view class="fcli"> <view class="fcli">
<view class="">在线数：{{fcobj.beehiveCount == undefined ? '--' : fcobj.beehiveCount}}箱</view> <view class="">总蜂箱数：{{fcobj.beehiveCount == undefined ? '--' : fcobj.beehiveCount}}箱</view>
</view> </view>
</view> </view>
<view class="btncha" @click="btnpage(2)"> <view class="btncha" @click="btnpage(2)">
@ -162,9 +162,7 @@
}, },
onShow() { onShow() {
this.getMyLocation() this.getMyLocation()
this.getMyLocations() this.getMyLocations()
}, },
onReady() { onReady() {
this.mapContext = uni.createMapContext('map', this) this.mapContext = uni.createMapContext('map', this)