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

1111

Browse Source
This commit is contained in:
3321822538@qq.com 2024-10-26 10:50:08 +08:00
parent 610ca6051b
commit 6406a01a9a
7 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
page_Beehive/Beehive_detail.vue
View File

@ -15,7 +15,7 @@
</view> --> </view> -->
</view> </view>
<view class="tit"> <view class="tit">
{{obj.name == undefined ? '--' : obj.name}}-{{obj.sn == undefined ? '--' : obj.sn}} {{obj.apiaryName == undefined ? '--' : obj.apiaryName}}-{{obj.name == undefined ? '--' : obj.name}}
<view class="sets"> <view class="sets">
<!-- <image @click="btnmenu" src="https://api.ccttiot.com/smartmeter/img/static/ulHBKvkXDfe9OIveIJKZ" mode=""></image> --> <!-- <image @click="btnmenu" src="https://api.ccttiot.com/smartmeter/img/static/ulHBKvkXDfe9OIveIJKZ" mode=""></image> -->
<image @click="btnedit" src="https://api.ccttiot.com/smartmeter/img/static/ulHBKvkXDfe9OIveIJKZ" <image @click="btnedit" src="https://api.ccttiot.com/smartmeter/img/static/ulHBKvkXDfe9OIveIJKZ"
@ -107,7 +107,8 @@
</view> </view>
<view class="card_top"> <view class="card_top">
<view class="name"> <view class="name">
{{obj.name == undefined ? '--' : obj.name}} <!-- {{obj.name == undefined ? '--' : obj.name}} -->
箱内环境
</view> </view>
<view class="time"> <view class="time">
{{obj.lastOnlineTime == undefined ? '--' : obj.lastOnlineTime}} {{obj.lastOnlineTime == undefined ? '--' : obj.lastOnlineTime}}
@ -434,7 +435,6 @@
this.yeartime.month = String(previousDay.getMonth() + 1).padStart(2, '0') this.yeartime.month = String(previousDay.getMonth() + 1).padStart(2, '0')
this.yeartime.day = String(now.getDate()).padStart(2, '0') this.yeartime.day = String(now.getDate()).padStart(2, '0')
previousDay.setDate(now.getDate() - 7) previousDay.setDate(now.getDate() - 7)
this.yeartimes.year = previousDay.getFullYear() this.yeartimes.year = previousDay.getFullYear()
this.yeartimes.month = String(previousDay.getMonth() + 1).padStart(2, '0') this.yeartimes.month = String(previousDay.getMonth() + 1).padStart(2, '0')
@ -513,8 +513,7 @@
// 点击跳转到操作详情 // 点击跳转到操作详情
btnvideo() { btnvideo() {
uni.navigateTo({ uni.navigateTo({
url: '/page_Beehive/Beehive_log?apiaryId=' + this.obj.apiaryId + ' &name=' + this.obj url: '/page_Beehive/Beehive_log?apiaryId=' + this.obj.apiaryId + ' &name=' + this.obj.apiaryName
.apiaryName
}) })
}, },
// 点击展开天气 // 点击展开天气
@ -820,7 +819,6 @@
}, },
// 温度 // 温度
initChart(canvas, width, height, canvasDpr) { initChart(canvas, width, height, canvasDpr) {
let that = this let that = this

6
page_Beehive/Beehive_woring.vue
View File

@ -66,11 +66,11 @@
</view> </view>
<view class="cont"> <view class="cont">
<image src="https://api.ccttiot.com/smartmeter/img/static/uelHshjG1nuq3RacsYEY" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uelHshjG1nuq3RacsYEY" mode=""></image>
<view class="txt1" v-if="title == '蜂箱预警记录'"> <view class="txt1" v-if="title == '蜂场预警记录'">
{{item.apiaryName}} {{item.apiaryName == null ? '--' : item.apiaryName}}-{{item.beehiveName == null ? '--' : item.beehiveName}}
</view> </view>
<view class="txt1" v-else> <view class="txt1" v-else>
{{item.beehiveName}} {{item.apiaryName == null ? '--' : item.apiaryName}}-{{item.beehiveName == null ? '--' : item.beehiveName}}
</view> </view>
</view> </view>
<view class="cont"> <view class="cont">

8
pages.json
View File

@ -173,6 +173,14 @@
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path" : "luru",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, },
{ {
"path" : "about", "path" : "about",

6
pages/Apiary/addrizhi.vue
View File

@ -3,11 +3,11 @@
<u-navbar :title="title" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' <u-navbar :title="title" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
:title-bold='true' height='45' id="navbar"> :title-bold='true' height='45' id="navbar">
</u-navbar> </u-navbar>
<view class="top"> <view class="top" @click="showmiyuan = true">
<view class="top_left"> <view class="top_left">
{{apiaryName}} {{apiaryName}}
</view> </view>
<view class="top_right" @click="showmiyuan = true"> <view class="top_right">
其他蜂箱 <view class="iconfont icon-xiangyou1" style="font-size: 40rpx;"> 其他蜂箱 <view class="iconfont icon-xiangyou1" style="font-size: 40rpx;">
</view> </view>
@ -60,7 +60,7 @@
确认修改 确认修改
</view> </view>
</view> </view>
<u-select v-model="showmiyuan" :list="fclist" title='选择蜂场' @confirm="confirmmy"></u-select> <u-select v-model="showmiyuan" :list="fclist" title='选择蜂箱' @confirm="confirmmy"></u-select>
</view> </view>
</template> </template>

4
pages/Beehive.vue
View File

@ -505,8 +505,8 @@
background: #FFC107; background: #FFC107;
border-radius: 50%; border-radius: 50%;
position: absolute; position: absolute;
top: 4rpx; top: 2rpx;
right: -14rpx; left: 0rpx;
opacity: .7; opacity: .7;
display: none; display: none;
} }

8
pages/map.vue
View File

@ -393,7 +393,7 @@
fail: (error) => { fail: (error) => {
// console.error('获取地图缩放级别失败：', error); // console.error('获取地图缩放级别失败：', error);
}, },
}); })
}, },
addMarkersWithoutLabels() { addMarkersWithoutLabels() {
this.listmap.forEach((item) => { this.listmap.forEach((item) => {
@ -427,7 +427,7 @@
type: 2, type: 2,
} }
}) })
}); })
}, },
addMarkersWithLabels() { addMarkersWithLabels() {
this.listmap.forEach((item) => { this.listmap.forEach((item) => {
@ -451,7 +451,7 @@
borderRadius: 5, borderRadius: 5,
} }
}) })
}); })
this.listmaps.forEach((item) => { this.listmaps.forEach((item) => {
let id = "2" + item.beehiveId let id = "2" + item.beehiveId
this.covers.push({ this.covers.push({
@ -473,7 +473,7 @@
borderRadius: 5, borderRadius: 5,
} }
}) })
}); })
}, },
calculateAnchorX(name) { calculateAnchorX(name) {

35
pages/my.vue
View File

@ -3,7 +3,9 @@
<u-navbar :is-back="false" title="我的" :border-bottom="false" :background="bgc" title-color='#3D3D3D ' <u-navbar :is-back="false" title="我的" :border-bottom="false" :background="bgc" title-color='#3D3D3D '
title-size='36' height='45' id="navbar"> title-size='36' height='45' id="navbar">
</u-navbar> </u-navbar>
</u-navbar> <!-- <view class="sblr" @click="btnluru">
设备录入
</view> -->
<view class="atv"> <view class="atv">
<button <button
v-if="imglist == ''" style="border: 0;outline: none;width: 220rpx;padding-left: 0rpx;height: 220rpx;border-radius: 50%;background: #D8D8D8;" v-if="imglist == ''" style="border: 0;outline: none;width: 220rpx;padding-left: 0rpx;height: 220rpx;border-radius: 50%;background: #D8D8D8;"
@ -64,6 +66,11 @@
}, },
methods: { methods: {
btnluru(){
uni.navigateTo({
url:'/page_user/luru'
})
},
btnpage(num){ btnpage(num){
if(num == 1){ if(num == 1){
uni.navigateTo({ uni.navigateTo({
@ -109,7 +116,6 @@
console.log(str.key) console.log(str.key)
let img = 'https://api.ccttiot.com/' + str.key let img = 'https://api.ccttiot.com/' + str.key
_this.imglist = img _this.imglist = img
let data = { let data = {
avatar:_this.imglist avatar:_this.imglist
} }
@ -130,14 +136,28 @@
if (res.code == 200) { if (res.code == 200) {
this.token = res.token this.token = res.token
} }
}); })
}, },
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.sblr{
width: 180rpx;
height: 80rpx;
line-height: 80rpx;
border-radius: 20rpx;
text-align: center;
color: #fff;
font-size: 32rpx;
position: fixed;
top: 200rpx;
right: 20px;
background-color: #D8D8D8;
}
page { page {
background-color: #FAFDFD; background-color: #FAFDFD;
} }
@ -145,24 +165,19 @@
color: red; color: red;
} }
.page { .page {
// position: relative;
width: 750rpx; width: 750rpx;
.atv { .atv {
width: 206rpx; width: 206rpx;
height: 206rpx; height: 206rpx;
background: #D8D8D8; background: #D8D8D8;
border-radius: 50%; border-radius: 50%;
margin: 100rpx auto 0; margin: 100rpx auto 0;
image { image {
width: 222rpx; width: 222rpx;
height: 222rpx; height: 222rpx;
border-radius: 50%; border-radius: 50%;
} }
} }
.change { .change {
width: 100%; width: 100%;
text-align: center; text-align: center;
@ -172,7 +187,6 @@
color: #3D3D3D; color: #3D3D3D;
height: 50rpx; height: 50rpx;
} }
.btn_li { .btn_li {
margin: 38rpx auto 0; margin: 38rpx auto 0;
padding: 22rpx; padding: 22rpx;
@ -185,12 +199,9 @@
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;
font-weight: 500; font-weight: 500;
font-size: 32rpx; font-size: 32rpx;
color: #3D3D3D; color: #3D3D3D;
} }
} }
</style> </style>