From d23a63b6949d14ae06ca23e4a41523b27a6705a3 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Wed, 10 Jul 2024 17:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.interceptor.js      |    2 +-
 manifest.json                   |    4 +-
 page_Beehive/Beehive_detail.vue |    2 +-
 page_Beehive/Beehive_ec.vue     | 1048 +++++++++++++++++++++++++++++++
 page_Beehive/Beehive_woring.vue |    2 +-
 page_user/user_set.vue          |   46 +-
 pages/Apiary.vue                |    5 +-
 pages/Apiary/Apiary_detail.vue  |    4 +-
 pages/Apiary/early_Set .vue     |    8 +-
 pages/index/index.vue           |    4 +-
 pages/login/login.vue           |    2 +-
 pages/map.vue                   |    2 +-
 pages/my.vue                    |    7 +-
 13 files changed, 1099 insertions(+), 37 deletions(-)
 create mode 100644 page_Beehive/Beehive_ec.vue

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 289cc1f..7b276fb 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -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);
diff --git a/manifest.json b/manifest.json
index 471ff5b..a471ff1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -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
         },
diff --git a/page_Beehive/Beehive_detail.vue b/page_Beehive/Beehive_detail.vue
index 4597a4f..aa825f2 100644
--- a/page_Beehive/Beehive_detail.vue
+++ b/page_Beehive/Beehive_detail.vue
@@ -1086,7 +1086,7 @@
 							fontSize: 11,
 							formatter: function(value) {
 								// 保留两位小数，没有小数时显示00
-								return value + '只'
+								return Math.ceil(value) + '只'
 							},
 						},
 						splitLine: {
diff --git a/page_Beehive/Beehive_ec.vue b/page_Beehive/Beehive_ec.vue
new file mode 100644
index 0000000..528f987
--- /dev/null
+++ b/page_Beehive/Beehive_ec.vue
@@ -0,0 +1,1048 @@
+<template>
+	<view class="page">
+		<u-navbar is-back="false" title="历史走势" :border-bottom="false" :background="bgc" title-color='#000'
+			title-size='36' :title-bold='true' height='45' id="navbar">
+		</u-navbar>
+	    <view class="echarts_box" >
+	    	<view class="echarts_top">
+	    		<view class="top_left">
+	    			温度
+	    			<image src="https://api.ccttiot.com/smartmeter/img/static/utoKXhZBoejfRZwNUMP9" mode=""></image>
+	    		</view>
+	    		<view class="top_cont">
+	    			最近30日℃
+	    		</view>
+	    		<view class="top_right">
+	    			<view style="width: 1rpx;">
+	    
+	    			</view>
+	    			<view class="txt">
+	    				<!-- 历史走势<view class="iconfont icon-xiangyou1"></view> -->
+	    			</view>
+	    
+	    		</view>
+	    	</view>
+	    	<view class="echarts">
+	    		<uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas1" canvas-id="uni-ec-canvas"
+	    			:ec="ec">
+	    		</uni-ec-canvas>
+	    	</view>
+	    </view>
+	    <view class="echarts_box" >
+	    	<view class="echarts_top">
+	    		<view class="top_left">
+	    			湿度
+	    			<image src="https://api.ccttiot.com/smartmeter/img/static/una6Kbd2gdBZ9gG6lg44" mode=""></image>
+	    		</view>
+	    		<view class="top_cont">
+	    			最近30日%
+	    		</view>
+	    		<view class="top_right">
+	    			<view style="width: 1rpx;">
+	    
+	    			</view>
+	    			<view class="txt">
+	    				<!-- 历史走势<view class="iconfont icon-xiangyou1"></view> -->
+	    			</view>
+	    
+	    		</view>
+	    	</view>
+	    	<view class="echarts">
+	    		<uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas2" canvas-id="uni-ec-canvas"
+	    			:ec="ec">
+	    		</uni-ec-canvas>
+	    	</view>
+	    </view>
+	    <view class="echarts_box" >
+	    	<view class="echarts_top">
+	    		<view class="top_left">
+	    			重量
+	    			<image src="https://api.ccttiot.com/smartmeter/img/static/uk7CvwzeU0ukxvS9cBtD" mode=""></image>
+	    		</view>
+	    		<view class="top_cont">
+	    			最近30日g
+	    		</view>
+	    		<view class="top_right">
+	    			<view style="width: 1rpx;">
+	    
+	    			</view>
+	    			<view class="txt">
+	    				<!-- 历史走势<view class="iconfont icon-xiangyou1"></view> -->
+	    			</view>
+	    
+	    		</view>
+	    	</view>
+	    	<view class="echarts">
+	    		<uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas3" canvas-id="uni-ec-canvas"
+	    			:ec="ec">
+	    		</uni-ec-canvas>
+	    	</view>
+	    </view>
+	    <view class="echarts_box" >
+	    	<view class="echarts_top">
+	    		<view class="top_left">
+	    			进出量
+	    			<image src="https://api.ccttiot.com/smartmeter/img/static/uhsU6Y1K35jxA4aRauzy" mode=""></image>
+	    		</view>
+	    		<view class="top_cont">
+	    			最近30日只
+	    		</view>
+	    		<view class="top_right">
+	    			<view style="width: 1rpx;">
+	    
+	    			</view>
+	    			<view class="txt">
+	    				<!-- 历史走势<view class="iconfont icon-xiangyou1"></view> -->
+	    			</view>
+	    
+	    		</view>
+	    	</view>
+	    	<view class="echarts">
+	    		<uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas4" canvas-id="uni-ec-canvas"
+	    			:ec="ec">
+	    		</uni-ec-canvas>
+	    	</view>
+	    </view>
+	    <view class="echarts_box" >
+	    	<view class="echarts_top">
+	    		<view class="top_left">
+	    			频率
+	    			<image src="https://api.ccttiot.com/smartmeter/img/static/up9IaGzSg1RKhIZz3V7a" mode=""></image>
+	    		</view>
+	    		<view class="top_cont">
+	    			最近30日
+	    		</view>
+	    		<view class="top_right">
+	    			<view style="width: 1rpx;">
+	    
+	    			</view>
+	    			<view class="txt">
+	    				<!-- 历史走势<view class="iconfont icon-xiangyou1"></view> -->
+	    			</view>
+	    
+	    		</view>
+	    	</view>
+	    	<view class="echarts">
+	    		<uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas5" canvas-id="uni-ec-canvas"
+	    			:ec="ec">
+	    		</uni-ec-canvas>
+	    	</view>
+	    </view>
+	    <view class="echarts_box" >
+	    	<view class="echarts_top">
+	    		<view class="top_left">
+	    			二氧化碳
+	    			<image src="https://api.ccttiot.com/smartmeter/img/static/um4lfl5q2O7FNM1EQc2L" mode=""></image>
+	    		</view>
+	    		<view class="top_cont">
+	    			最近30日ppm
+	    		</view>
+	    		<view class="top_right">
+	    			<view style="width: 1rpx;">
+	    
+	    			</view>
+	    			<view class="txt">
+	    				<!-- 历史走势<view class="iconfont icon-xiangyou1"></view> -->
+	    			</view>
+	    
+	    		</view>
+	    	</view>
+	    	<view class="echarts">
+	    		<uni-ec-canvas class="uni-ec-canvas" id="uni-ec-canvas" ref="canvas6" canvas-id="uni-ec-canvas"
+	    			:ec="ec">
+	    		</uni-ec-canvas>
+	    	</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas.vue'
+	import * as echarts from '@/components/uni-ec-canvas/echarts'
+	let chart = null
+	export default {
+		components: {
+			uniEcCanvas
+		},
+		data() {
+			return {
+				bgc: {
+					backgroundColor: " #F4FAF8",
+				},
+				ec: {
+					lazyLoad: true
+				},
+                chartday: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'],
+                chartData: [120, 200, 150, 80, 70, 110, 130],
+				chartData1: [],
+				chartData2: [],
+				chartData3: [],
+				chartData4: [],
+				chartData5: [],
+				chartData6: [],
+				chartData7: [],
+				chartData8: [],
+				yeartime: {
+					year: '',
+					month: '',
+					day: ''
+				},
+				yeartimes: {
+					year: '',
+					month: '',
+					day: ''
+				},
+				num:'',
+				beehiveId:''
+			}
+		},
+		onLoad(option) {
+			this.num = option.num
+			this.beehiveId = option.beehiveId
+		},
+		onShow() {
+            setTimeout(() => {
+				// if(this.num == 1){
+					this.$refs.canvas1.init(this.initChart)
+				// }else if(this.num == 2){
+					this.$refs.canvas2.init(this.initChart2)
+				// }else if(this.num == 3){
+					this.$refs.canvas3.init(this.initChart3)
+				// }else if(this.num == 4){
+					this.$refs.canvas4.init(this.initChart4)
+				// }else if(this.num == 5){
+					this.$refs.canvas5.init(this.initChart5)
+				// }else if(this.num == 6){
+					this.$refs.canvas6.init(this.initChart6)
+				// }
+            }, 1000)
+            let now = new Date();
+            let 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() - 30)
+            this.yeartimes.year = previousDay.getFullYear()
+            this.yeartimes.month = String(previousDay.getMonth() + 1).padStart(2, '0')
+            this.yeartimes.day = String(previousDay.getDate()).padStart(2, '0')
+			// if(this.num == 1){
+				this.getchartData1()
+			// }else if(this.num == 2){
+				this.getchartData2()
+			// }else if(this.num == 3){
+				this.getchartData3()
+			// }else if(this.num == 4){
+				this.getchartData4()
+			// }else if(this.num == 5){
+				this.getchartData5()
+			// }else if(this.num == 6){
+				this.getchartData6()
+			// }
+		},
+		methods: {
+			// 温度图表
+			getchartData1() {
+				let time = this.yeartime.year + '-' + this.yeartime.month + '-' + this.yeartime.day
+				let times = this.yeartimes.year + '-' + this.yeartimes.month + '-' + this.yeartimes.day
+				this.$u.get(`/farmer/report/tempN?dateRange=${times},${time}&beehiveId=${this.beehiveId}`).then(res => {
+					if (res.code == 200) {
+						this.chartData1 = res.data.map(item => item.value)
+					}
+				})
+			},
+			// 湿度图表
+			getchartData2() {
+				let time = this.yeartime.year + '-' + this.yeartime.month + '-' + this.yeartime.day
+				let times = this.yeartimes.year + '-' + this.yeartimes.month + '-' + this.yeartimes.day
+				this.$u.get(`/farmer/report/hpN?dateRange=${times},${time}&beehiveId=${this.beehiveId}`).then(res => {
+					if (res.code == 200) {
+						this.chartData2 = res.data.map(item => item.value)
+					}
+				})
+			},
+			// 重量图表
+			getchartData3() {
+				let time = this.yeartime.year + '-' + this.yeartime.month + '-' + this.yeartime.day
+				let times = this.yeartimes.year + '-' + this.yeartimes.month + '-' + this.yeartimes.day
+				this.$u.get(`/farmer/report/weightDay?dateRange=${times},${time}&beehiveId=${this.beehiveId}`).then(
+				res => {
+					if (res.code == 200) {
+						this.chartData3 = res.data.map(item => item.value)
+					}
+				})
+			},
+			// 进出量图表
+			getchartData4() {
+				let time = this.yeartime.year + '-' + this.yeartime.month + '-' + this.yeartime.day
+				let times = this.yeartimes.year + '-' + this.yeartimes.month + '-' + this.yeartimes.day
+				this.$u.get(`/farmer/report/ioCount?dateRange=${times},${time}&beehiveId=${this.beehiveId}`).then(res => {
+					if (res.code == 200) {
+						this.chartData4 = res.data.map(item => item.value)
+					}
+				})
+			},
+			// 频率图表
+			getchartData5() {
+				let time = this.yeartime.year + '-' + this.yeartime.month + '-' + this.yeartime.day
+				let times = this.yeartimes.year + '-' + this.yeartimes.month + '-' + this.yeartimes.day
+				this.$u.get(`/farmer/report/mic?dateRange=${times},${time}&beehiveId=${this.beehiveId}`).then(res => {
+					if (res.code == 200) {
+						this.chartData5 = res.data.map(item => item.value)
+					}
+				})
+			},
+			// 二氧化碳图表
+			getchartData6() {
+				let time = this.yeartime.year + '-' + this.yeartime.month + '-' + this.yeartime.day
+				let times = this.yeartimes.year + '-' + this.yeartimes.month + '-' + this.yeartimes.day
+				this.$u.get(`/farmer/report/co2?dateRange=${times},${time}&beehiveId=${this.beehiveId}`).then(res => {
+					if (res.code == 200) {
+						this.chartData6 = res.data.map(item => item.value)
+					}
+				})
+			},
+			
+			// 温度
+			initChart(canvas, width, height, canvasDpr) {
+				let that = this
+			
+				const option = {
+					grid: {
+						left: '4%',
+						right: '4%',
+						bottom: '3%',
+						top: '4%',
+						containLabel: true
+					},
+					xAxis: {
+						show: true,
+						type: 'category',
+						boundaryGap: false,
+						axisLine: {
+							show: false // 隐藏X轴线
+						},
+						axisTick: {
+							show: false // 隐藏X轴刻度
+						},
+						axisLabel: {
+							show: false // 隐藏X轴标签
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							rotate: 0,
+						},
+						splitLine: {
+							show: false,
+						},
+						// data: that.chartday,
+					},
+					yAxis: {
+						show: true,
+						axisLine: {
+							show: false,
+						},
+						axisTick: {
+							show: false,
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							formatter: function(value) {
+								// 保留两位小数，没有小数时显示00
+								return value + '℃'
+							},
+						},
+						splitLine: {
+							show: true, // 显示X轴网格线
+							lineStyle: {
+								type: 'dashed', // 设置网格线为虚线
+								color: '#ccc', // 可以设置虚线的颜色
+								width: 1 // 可以设置虚线的宽度
+							}
+						}
+					},
+					visualMap: {
+						type: 'piecewise',
+						show: false,
+						dimension: 0,
+						seriesIndex: 0,
+						pieces: [{
+								gt: 1,
+								lt: 3,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+							{
+								gt: 5,
+								lt: 7,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+						],
+					},
+					series: [{
+						type: 'line',
+						smooth: 0.6,
+						symbol: 'none',
+						lineStyle: {
+							color: '#FFE28C',
+							width: 4,
+						},
+						areaStyle: {
+							normal: {
+								color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+									offset: 0,
+									color: '#FFF1C9'
+								}, ]),
+							},
+						},
+						data: that.chartData1,
+					}],
+				};
+				chart = echarts.init(canvas, null, {
+					width: width,
+					height: height,
+					devicePixelRatio: canvasDpr
+				})
+				option.series[0].data = that.chartData1
+				canvas.setChart(chart)
+				chart.setOption(option)
+				return chart
+			},
+			// 湿度
+			initChart2(canvas, width, height, canvasDpr) {
+				let that = this
+			
+				const option = {
+					grid: {
+						left: '4%',
+						right: '4%',
+						bottom: '3%',
+						top: '4%',
+						containLabel: true
+					},
+					xAxis: {
+						show: true,
+						type: 'category',
+						boundaryGap: false,
+						axisLine: {
+							show: false // 隐藏X轴线
+						},
+						axisTick: {
+							show: false // 隐藏X轴刻度
+						},
+						axisLabel: {
+							show: false // 隐藏X轴标签
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							rotate: 0,
+						},
+						splitLine: {
+							show: false,
+						},
+						// data: that.chartday,
+					},
+					yAxis: {
+						show: true,
+						axisLine: {
+							show: false,
+						},
+						axisTick: {
+							show: false,
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							formatter: function(value) {
+								// 保留两位小数，没有小数时显示00
+								return value + '%'
+							},
+						},
+						splitLine: {
+							show: true, // 显示X轴网格线
+							lineStyle: {
+								type: 'dashed', // 设置网格线为虚线
+								color: '#ccc', // 可以设置虚线的颜色
+								width: 1 // 可以设置虚线的宽度
+							}
+						}
+					},
+					visualMap: {
+						type: 'piecewise',
+						show: false,
+						dimension: 0,
+						seriesIndex: 0,
+						pieces: [{
+								gt: 1,
+								lt: 3,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+							{
+								gt: 5,
+								lt: 7,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+						],
+					},
+					series: [{
+						type: 'line',
+						smooth: 0.6,
+						symbol: 'none',
+						lineStyle: {
+							color: '#FFE28C',
+							width: 4,
+						},
+						areaStyle: {
+							normal: {
+								color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+									offset: 0,
+									color: '#FFF1C9'
+								}, ]),
+							},
+						},
+						data: that.chartData2,
+					}],
+				};
+				chart = echarts.init(canvas, null, {
+					width: width,
+					height: height,
+					devicePixelRatio: canvasDpr
+				})
+			
+				option.series[0].data = that.chartData2
+				canvas.setChart(chart)
+				chart.setOption(option)
+				return chart
+			},
+			//重量
+			initChart3(canvas, width, height, canvasDpr) {
+				let that = this
+			
+				const option = {
+					grid: {
+						left: '4%',
+						right: '4%',
+						bottom: '3%',
+						top: '4%',
+						containLabel: true
+					},
+					xAxis: {
+						show: true,
+						type: 'category',
+						boundaryGap: false,
+						axisLine: {
+							show: false // 隐藏X轴线
+						},
+						axisTick: {
+							show: false // 隐藏X轴刻度
+						},
+						axisLabel: {
+							show: false // 隐藏X轴标签
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							rotate: 0,
+						},
+						splitLine: {
+							show: false,
+						},
+						// data: that.chartday,
+					},
+					yAxis: {
+						show: true,
+						axisLine: {
+							show: false,
+						},
+						axisTick: {
+							show: false,
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							formatter: function(value) {
+								// 保留两位小数，没有小数时显示00
+								return value + 'Kg'
+							},
+						},
+						splitLine: {
+							show: true, // 显示X轴网格线
+							lineStyle: {
+								type: 'dashed', // 设置网格线为虚线
+								color: '#ccc', // 可以设置虚线的颜色
+								width: 1 // 可以设置虚线的宽度
+							}
+						}
+					},
+					visualMap: {
+						type: 'piecewise',
+						show: false,
+						dimension: 0,
+						seriesIndex: 0,
+						pieces: [{
+								gt: 1,
+								lt: 3,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+							{
+								gt: 5,
+								lt: 7,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+						],
+					},
+					series: [{
+						type: 'line',
+						smooth: 0.6,
+						symbol: 'none',
+						lineStyle: {
+							color: '#FFE28C',
+							width: 4,
+						},
+						areaStyle: {
+							normal: {
+								color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+									offset: 0,
+									color: '#FFF1C9'
+								}, ]),
+							},
+						},
+						data: that.chartData3,
+					}],
+				};
+				chart = echarts.init(canvas, null, {
+					width: width,
+					height: height,
+					devicePixelRatio: canvasDpr
+				})
+			
+				option.series[0].data = that.chartData3
+				canvas.setChart(chart)
+				chart.setOption(option)
+				return chart
+			},
+			// 进出量
+			initChart4(canvas, width, height, canvasDpr) {
+				let that = this
+			
+				const option = {
+					grid: {
+						left: '4%',
+						right: '4%',
+						bottom: '3%',
+						top: '4%',
+						containLabel: true
+					},
+					xAxis: {
+						show: true,
+						type: 'category',
+						boundaryGap: false,
+						axisLine: {
+							show: false // 隐藏X轴线
+						},
+						axisTick: {
+							show: false // 隐藏X轴刻度
+						},
+						axisLabel: {
+							show: false // 隐藏X轴标签
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							rotate: 0,
+						},
+						splitLine: {
+							show: false,
+						},
+						// data: that.chartday,
+					},
+					yAxis: {
+						show: true,
+						axisLine: {
+							show: false,
+						},
+						axisTick: {
+							show: false,
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							formatter: function(value) {
+								// 保留两位小数，没有小数时显示00
+								return Math.ceil(value) + '只'
+							},
+						},
+						splitLine: {
+							show: true, // 显示X轴网格线
+							lineStyle: {
+								type: 'dashed', // 设置网格线为虚线
+								color: '#ccc', // 可以设置虚线的颜色
+								width: 1 // 可以设置虚线的宽度
+							}
+						}
+					},
+					visualMap: {
+						type: 'piecewise',
+						show: false,
+						dimension: 0,
+						seriesIndex: 0,
+						pieces: [{
+								gt: 1,
+								lt: 3,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+							{
+								gt: 5,
+								lt: 7,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+						],
+					},
+					series: [{
+						type: 'line',
+						smooth: 0.6,
+						symbol: 'none',
+						lineStyle: {
+							color: '#FFE28C',
+							width: 4,
+						},
+						areaStyle: {
+							normal: {
+								color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+									offset: 0,
+									color: '#FFF1C9'
+								}, ]),
+							},
+						},
+						data: that.chartData4,
+					}],
+				};
+				chart = echarts.init(canvas, null, {
+					width: width,
+					height: height,
+					devicePixelRatio: canvasDpr
+				})
+			
+				option.series[0].data = that.chartData4
+				canvas.setChart(chart)
+				chart.setOption(option)
+				return chart
+			},
+			// 频率
+			initChart5(canvas, width, height, canvasDpr) {
+				let that = this
+			
+				const option = {
+					grid: {
+						left: '4%',
+						right: '4%',
+						bottom: '3%',
+						top: '4%',
+						containLabel: true
+					},
+					xAxis: {
+						show: true,
+						type: 'category',
+						boundaryGap: false,
+						axisLine: {
+							show: false // 隐藏X轴线
+						},
+						axisTick: {
+							show: false // 隐藏X轴刻度
+						},
+						axisLabel: {
+							show: false // 隐藏X轴标签
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							rotate: 0,
+						},
+						splitLine: {
+							show: false,
+						},
+						// data: that.chartday,
+					},
+					yAxis: {
+						show: true,
+						axisLine: {
+							show: false,
+						},
+						axisTick: {
+							show: false,
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							formatter: function(value) {
+								// 保留两位小数，没有小数时显示00
+								return value + 'Hz'
+							},
+						},
+						splitLine: {
+							show: true, // 显示X轴网格线
+							lineStyle: {
+								type: 'dashed', // 设置网格线为虚线
+								color: '#ccc', // 可以设置虚线的颜色
+								width: 1 // 可以设置虚线的宽度
+							}
+						}
+					},
+					visualMap: {
+						type: 'piecewise',
+						show: false,
+						dimension: 0,
+						seriesIndex: 0,
+						pieces: [{
+								gt: 1,
+								lt: 3,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+							{
+								gt: 5,
+								lt: 7,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+						],
+					},
+					series: [{
+						type: 'line',
+						smooth: 0.6,
+						symbol: 'none',
+						lineStyle: {
+							color: '#FFE28C',
+							width: 4,
+						},
+						areaStyle: {
+							normal: {
+								color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+									offset: 0,
+									color: '#FFF1C9'
+								}, ]),
+							},
+						},
+						data: that.chartData5,
+					}],
+				};
+				chart = echarts.init(canvas, null, {
+					width: width,
+					height: height,
+					devicePixelRatio: canvasDpr
+				})
+			
+				option.series[0].data = that.chartData5
+				canvas.setChart(chart)
+				chart.setOption(option)
+				return chart
+			},
+			// 二氧化碳
+			initChart6(canvas, width, height, canvasDpr) {
+				let that = this
+			
+				const option = {
+					grid: {
+						left: '4%',
+						right: '4%',
+						bottom: '3%',
+						top: '4%',
+						containLabel: true
+					},
+					xAxis: {
+						show: true,
+						type: 'category',
+						boundaryGap: false,
+						axisLine: {
+							show: false // 隐藏X轴线
+						},
+						axisTick: {
+							show: false // 隐藏X轴刻度
+						},
+						axisLabel: {
+							show: false // 隐藏X轴标签
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							rotate: 0,
+						},
+						splitLine: {
+							show: false,
+						},
+						// data: that.chartday,
+					},
+					yAxis: {
+						show: true,
+						axisLine: {
+							show: false,
+						},
+						axisTick: {
+							show: false,
+						},
+						axisLabel: {
+							show: true,
+							color: '#ccc',
+							fontSize: 11,
+							formatter: function(value) {
+								// 保留两位小数，没有小数时显示00
+								return value + '%'
+							},
+						},
+						splitLine: {
+							show: true, // 显示X轴网格线
+							lineStyle: {
+								type: 'dashed', // 设置网格线为虚线
+								color: '#ccc', // 可以设置虚线的颜色
+								width: 1 // 可以设置虚线的宽度
+							}
+						}
+					},
+					visualMap: {
+						type: 'piecewise',
+						show: false,
+						dimension: 0,
+						seriesIndex: 0,
+						pieces: [{
+								gt: 1,
+								lt: 3,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+							{
+								gt: 5,
+								lt: 7,
+								color: 'RGBA(255, 241, 201, 1)',
+							},
+						],
+					},
+					series: [{
+						type: 'line',
+						smooth: 0.6,
+						symbol: 'none',
+						lineStyle: {
+							color: '#FFE28C',
+							width: 4,
+						},
+						areaStyle: {
+							normal: {
+								color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+									offset: 0,
+									color: '#FFF1C9'
+								}, ]),
+							},
+						},
+						data: that.chartData6,
+					}],
+				};
+				chart = echarts.init(canvas, null, {
+					width: width,
+					height: height,
+					devicePixelRatio: canvasDpr
+				})
+			
+				option.series[0].data = that.chartData6
+				canvas.setChart(chart)
+				chart.setOption(option)
+				return chart
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #FAFDFD;
+	}     
+    .input-placeholder{
+		color: red;
+	}
+	.page {
+		// position: relative;
+		width: 750rpx;
+		// padding-bottom: 200rpx;
+		padding: 38rpx;
+		box-sizing: border-box;
+        .echarts_box {
+        	margin-top: 26rpx;
+        	padding: 18rpx 24rpx;
+        	width: 674rpx;
+        
+        	background: #FFFFFF;
+        	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.15);
+        	border-radius: 28rpx 28rpx 28rpx 28rpx;
+        
+        	.echarts {
+        
+        		margin-top: 24rpx;
+        		// width: 100%;
+        		// height: 80%;
+        		width: 100%;
+        		height: 330rpx;
+        	}
+        
+        	.echarts_top {
+        		display: flex;
+        		align-items: center;
+        
+        		// justify-content: space-between;
+        		.top_left {
+        			width: 33.33%;
+        			display: flex;
+        			align-items: center;
+        			font-weight: 500;
+        			font-size: 36rpx;
+        			color: #3D3D3D;
+        
+        			image {
+        				margin-left: 28rpx;
+        				width: 25.03rpx;
+        				height: 34rpx;
+        			}
+        		}
+        
+        		.top_cont {
+        			width: 33.33%;
+        			text-align: center;
+        			font-weight: 600;
+        			font-size: 36rpx;
+        			color: #3D3D3D;
+        		}
+        
+        		.top_right {
+        			width: 33.33%;
+        			display: flex;
+        			align-items: center;
+        
+        			.txt {
+        				display: flex;
+        				align-items: center;
+        				flex-wrap: nowrap;
+        				margin-left: auto;
+        				font-weight: 400;
+        				font-size: 32rpx;
+        				color: #4D4D4D;
+        
+        				.icon-xiangyou1 {
+        					margin-top: 4rpx;
+        					margin-left: 8rpx;
+        				}
+        			}
+        		}
+        	}
+        }
+
+	}
+</style>
\ No newline at end of file
diff --git a/page_Beehive/Beehive_woring.vue b/page_Beehive/Beehive_woring.vue
index 3b315e0..2914984 100644
--- a/page_Beehive/Beehive_woring.vue
+++ b/page_Beehive/Beehive_woring.vue
@@ -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">
 								异常
diff --git a/page_user/user_set.vue b/page_user/user_set.vue
index 05934a2..4428a24 100644
--- a/page_user/user_set.vue
+++ b/page_user/user_set.vue
@@ -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>天/次   &nbsp;&nbsp;   除螨工作
 		</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;
 
 				}
diff --git a/pages/Apiary.vue b/pages/Apiary.vue
index 74b73ca..5e9cf7b 100644
--- a/pages/Apiary.vue
+++ b/pages/Apiary.vue
@@ -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 {
diff --git a/pages/Apiary/Apiary_detail.vue b/pages/Apiary/Apiary_detail.vue
index 0e5eb8e..4737a21 100644
--- a/pages/Apiary/Apiary_detail.vue
+++ b/pages/Apiary/Apiary_detail.vue
@@ -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=" "
diff --git a/pages/Apiary/early_Set .vue b/pages/Apiary/early_Set .vue
index ecee6d1..8df89d6 100644
--- a/pages/Apiary/early_Set .vue	
+++ b/pages/Apiary/early_Set .vue	
@@ -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
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 643e1ef..6f39d4e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -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: {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 46f6403..e0915dc 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -111,7 +111,7 @@
 										loginCode: res.code,
 			                            type: that.type,
 			                            mobileCode: e.detail.code,
-										deptId:100,
+										deptId:102,
 			                        };
 			                        resolve(data);
 			                    } else {
diff --git a/pages/map.vue b/pages/map.vue
index 52a4676..25af0e5 100644
--- a/pages/map.vue
+++ b/pages/map.vue
@@ -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>
diff --git a/pages/my.vue b/pages/my.vue
index 318fef3..37f816d 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -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;
 		}