From 6406a01a9a197f66e9ecc12fca74fb8217f30b94 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Sat, 26 Oct 2024 10:50:08 +0800
Subject: [PATCH] 1111
---
page_Beehive/Beehive_detail.vue | 10 ++++------
page_Beehive/Beehive_woring.vue | 6 +++---
pages.json | 8 ++++++++
pages/Apiary/addrizhi.vue | 6 +++---
pages/Beehive.vue | 4 ++--
pages/map.vue | 8 ++++----
pages/my.vue | 35 ++++++++++++++++++++++-----------
7 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/page_Beehive/Beehive_detail.vue b/page_Beehive/Beehive_detail.vue
index b96668e..d7542c5 100644
--- a/page_Beehive/Beehive_detail.vue
+++ b/page_Beehive/Beehive_detail.vue
@@ -15,7 +15,7 @@
</view> -->
</view>
<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">
<!-- <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"
@@ -107,7 +107,8 @@
</view>
<view class="card_top">
<view class="name">
- {{obj.name == undefined ? '--' : obj.name}}
+ <!-- {{obj.name == undefined ? '--' : obj.name}} -->
+ 箱内环境
</view>
<view class="time">
{{obj.lastOnlineTime == undefined ? '--' : obj.lastOnlineTime}}
@@ -434,7 +435,6 @@
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')
@@ -513,8 +513,7 @@
// 点击跳转到操作详情
btnvideo() {
uni.navigateTo({
- url: '/page_Beehive/Beehive_log?apiaryId=' + this.obj.apiaryId + ' &name=' + this.obj
- .apiaryName
+ url: '/page_Beehive/Beehive_log?apiaryId=' + this.obj.apiaryId + ' &name=' + this.obj.apiaryName
})
},
// 点击展开天气
@@ -820,7 +819,6 @@
},
-
// 温度
initChart(canvas, width, height, canvasDpr) {
let that = this
diff --git a/page_Beehive/Beehive_woring.vue b/page_Beehive/Beehive_woring.vue
index 65cb040..c9052e8 100644
--- a/page_Beehive/Beehive_woring.vue
+++ b/page_Beehive/Beehive_woring.vue
@@ -66,11 +66,11 @@
</view>
<view class="cont">
<image src="https://api.ccttiot.com/smartmeter/img/static/uelHshjG1nuq3RacsYEY" mode=""></image>
- <view class="txt1" v-if="title == '蜂箱预警记录'">
- {{item.apiaryName}}
+ <view class="txt1" v-if="title == '蜂场预警记录'">
+ {{item.apiaryName == null ? '--' : item.apiaryName}}-{{item.beehiveName == null ? '--' : item.beehiveName}}
</view>
<view class="txt1" v-else>
- {{item.beehiveName}}
+ {{item.apiaryName == null ? '--' : item.apiaryName}}-{{item.beehiveName == null ? '--' : item.beehiveName}}
</view>
</view>
<view class="cont">
diff --git a/pages.json b/pages.json
index 8178612..69fdf6e 100644
--- a/pages.json
+++ b/pages.json
@@ -173,6 +173,14 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
+ },{
+ "path" : "luru",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
},
{
"path" : "about",
diff --git a/pages/Apiary/addrizhi.vue b/pages/Apiary/addrizhi.vue
index 0fe6405..49b98e2 100644
--- a/pages/Apiary/addrizhi.vue
+++ b/pages/Apiary/addrizhi.vue
@@ -3,11 +3,11 @@
<u-navbar :title="title" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
:title-bold='true' height='45' id="navbar">
</u-navbar>
- <view class="top">
+ <view class="top" @click="showmiyuan = true">
<view class="top_left">
{{apiaryName}}
</view>
- <view class="top_right" @click="showmiyuan = true">
+ <view class="top_right">
其他蜂箱 <view class="iconfont icon-xiangyou1" style="font-size: 40rpx;">
</view>
@@ -60,7 +60,7 @@
确认修改
</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>
</template>
diff --git a/pages/Beehive.vue b/pages/Beehive.vue
index f6152b5..4193e96 100644
--- a/pages/Beehive.vue
+++ b/pages/Beehive.vue
@@ -505,8 +505,8 @@
background: #FFC107;
border-radius: 50%;
position: absolute;
- top: 4rpx;
- right: -14rpx;
+ top: 2rpx;
+ left: 0rpx;
opacity: .7;
display: none;
}
diff --git a/pages/map.vue b/pages/map.vue
index cac3bf1..fd61939 100644
--- a/pages/map.vue
+++ b/pages/map.vue
@@ -393,7 +393,7 @@
fail: (error) => {
// console.error('获取地图缩放级别失败：', error);
},
- });
+ })
},
addMarkersWithoutLabels() {
this.listmap.forEach((item) => {
@@ -427,7 +427,7 @@
type: 2,
}
})
- });
+ })
},
addMarkersWithLabels() {
this.listmap.forEach((item) => {
@@ -451,7 +451,7 @@
borderRadius: 5,
}
})
- });
+ })
this.listmaps.forEach((item) => {
let id = "2" + item.beehiveId
this.covers.push({
@@ -473,7 +473,7 @@
borderRadius: 5,
}
})
- });
+ })
},
calculateAnchorX(name) {
diff --git a/pages/my.vue b/pages/my.vue
index e4d3427..1336299 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -3,7 +3,9 @@
<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="sblr" @click="btnluru">
+ 设备录入
+ </view> -->
<view class="atv">
<button
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: {
+ btnluru(){
+ uni.navigateTo({
+ url:'/page_user/luru'
+ })
+ },
btnpage(num){
if(num == 1){
uni.navigateTo({
@@ -109,7 +116,6 @@
console.log(str.key)
let img = 'https://api.ccttiot.com/' + str.key
_this.imglist = img
-
let data = {
avatar:_this.imglist
}
@@ -130,14 +136,28 @@
if (res.code == 200) {
this.token = res.token
}
- });
+ })
},
+
}
}
</script>
<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 {
background-color: #FAFDFD;
}
@@ -145,24 +165,19 @@
color: red;
}
.page {
- // position: relative;
width: 750rpx;
-
.atv {
width: 206rpx;
height: 206rpx;
background: #D8D8D8;
border-radius: 50%;
margin: 100rpx auto 0;
-
image {
width: 222rpx;
height: 222rpx;
border-radius: 50%;
}
-
}
-
.change {
width: 100%;
text-align: center;
@@ -172,7 +187,6 @@
color: #3D3D3D;
height: 50rpx;
}
-
.btn_li {
margin: 38rpx auto 0;
padding: 22rpx;
@@ -185,12 +199,9 @@
background: #FFFFFF;
box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.15);
border-radius: 20rpx 20rpx 20rpx 20rpx;
-
font-weight: 500;
font-size: 32rpx;
color: #3D3D3D;
}
-
-
}
</style>
\ No newline at end of file