From 1bf6166f3a2b44be6aae3ed8250ab7550eff2d04 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Sat, 18 Nov 2023 14:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                 |  2 +-
 src/pages/device/warning.vue                |  2 +-
 src/pages/index/components/pests-chart.vue  | 11 ++++-
 src/pages/index/components/pests-images.vue |  6 ++-
 src/pages/index/insect-monitors.vue         |  4 +-
 src/pages/index/insecticidal-lamp.vue       |  4 +-
 src/pages/index/meteorological.vue          |  6 +++
 src/pages/index/monitor.vue                 |  5 +++
 src/pages/index/soil-monitoring.vue         | 45 +++++++++++++++++----
 src/pages/index/water-quality.vue           | 43 ++++++++++++++++----
 10 files changed, 105 insertions(+), 23 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index efbd490..1776d82 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -296,7 +296,7 @@ uni-page-body {
     align-items: center;
     justify-content: space-between;
     padding: 24rpx 30rpx;
-    margin-bottom: 20rpx;
+    // margin-bottom: 20rpx;
     font-size: 28rpx;
     .tit {
       font-size: 28rpx;
diff --git a/src/pages/device/warning.vue b/src/pages/device/warning.vue
index 1694d3f..9c1f728 100644
--- a/src/pages/device/warning.vue
+++ b/src/pages/device/warning.vue
@@ -76,7 +76,7 @@
 						<view class="flex-1">{{formInfo.created_at|timeFormat}}</view>
 					</view>
 					<view class="plist u-border-bottom">
-						<view class="label_t">地址</view>
+						<view class="label_t">内容</view>
 						<view class="flex-1">{{formInfo.content}}</view>
 					</view>
 				</view>
diff --git a/src/pages/index/components/pests-chart.vue b/src/pages/index/components/pests-chart.vue
index 5ff4d83..774ca03 100644
--- a/src/pages/index/components/pests-chart.vue
+++ b/src/pages/index/components/pests-chart.vue
@@ -8,7 +8,11 @@
     </view>
     <view class="h-80vh flex-center">
       <view class="w-full">
-        <qiun-data-charts type="column" :opts="opts" :chartData="chartData" />
+        <qiun-data-charts
+          type="column"
+          :opts="opts"
+          :chartData="chartData"
+        />
       </view>
     </view>
   </view>
@@ -212,7 +216,10 @@ export default {
       this.getData()
     },
     async getData() {
-      if (!this.filterParmas.device_id) return
+      if (!this.filterParmas.device_id) {
+        this.$u.toast('没有关联基地')
+        return (this.chartData = { series: [] })
+      }
       try {
         const { data } = await http.get(
           `/api/devices/${this.filterParmas.device_id}/worm-statics`,
diff --git a/src/pages/index/components/pests-images.vue b/src/pages/index/components/pests-images.vue
index 88ceb83..a5821dc 100644
--- a/src/pages/index/components/pests-images.vue
+++ b/src/pages/index/components/pests-images.vue
@@ -148,7 +148,11 @@ export default {
       this.mescroll.resetUpScroll()
     },
     async getData(e) {
-      if (!e.device_id) return
+      if (!e.device_id) {
+        this.mescroll.endByPage(0, 0)
+        
+        return this.$u.toast('没有关联基地')
+      }
       try {
         const { data } = await http.get(
           `/api/devices/${e.device_id}/worm-photos`,
diff --git a/src/pages/index/insect-monitors.vue b/src/pages/index/insect-monitors.vue
index 29d82d1..523ee20 100644
--- a/src/pages/index/insect-monitors.vue
+++ b/src/pages/index/insect-monitors.vue
@@ -148,7 +148,9 @@ export default {
       this.mescroll.resetUpScroll()
     },
     async getData(e) {
-      if (!e.device_id) return
+      if (!e.device_id) {
+        return this.$u.toast('没有关联基地')
+      }
       try {
         const { data } = await http.get(
           `/api/devices/${e.device_id}/worm-photos`,
diff --git a/src/pages/index/insecticidal-lamp.vue b/src/pages/index/insecticidal-lamp.vue
index b179896..6da6685 100644
--- a/src/pages/index/insecticidal-lamp.vue
+++ b/src/pages/index/insecticidal-lamp.vue
@@ -190,7 +190,9 @@ export default {
     },
     async getData() {
       this.chatList = []
-      if (!this.filterParmas.device_id) return
+      if (!this.filterParmas.device_id){
+        return this.$u.toast('没有关联基地')
+      }
       const { data } = await http.get('/api/monitoring-data', {
         params: this.filterParmas,
       })
diff --git a/src/pages/index/meteorological.vue b/src/pages/index/meteorological.vue
index c1ca965..c118c38 100644
--- a/src/pages/index/meteorological.vue
+++ b/src/pages/index/meteorological.vue
@@ -399,15 +399,21 @@
 				}
 				this.$http.get('/api/agricultural-device-basic',{params:params}).then(({data})=>{
 					console.log(data);
+				
 					if(data.code==200){
 						let _data = data.data;
+						if(_data.length==0){
+							return this.$u.toast('没有关联基地');
+						}
 						for(let item of _data){
 							item['label'] = item.name;
 							item['value'] = item.id;
 						}
+					 
 						this.deviceAddressList = _data;
 						this.addressValue = _data[0].id;
 						this.addressName = _data[0].name;
+						
 						this.queryAddressDevicePoints(this.addressValue);
 					}
 				}).catch(()=>{
diff --git a/src/pages/index/monitor.vue b/src/pages/index/monitor.vue
index 80d1a94..cc8aa1f 100644
--- a/src/pages/index/monitor.vue
+++ b/src/pages/index/monitor.vue
@@ -406,6 +406,7 @@ export default {
         params['is_recommend'] = this.is_recommend
       }
       this.loading = 'loading'
+   
       this.$http
         .get('/api/devices', { params: params })
         .then(async ({ data }) => {
@@ -533,6 +534,10 @@ export default {
           console.log(data)
           if (data.code == 200) {
             let _data = data.data
+            if(_data.length==0){
+              this.loading = 'nomore'
+              return this.$u.toast('没有关联基地')
+            }
             for (let item of _data) {
               item['label'] = item.name
               item['value'] = item.id
diff --git a/src/pages/index/soil-monitoring.vue b/src/pages/index/soil-monitoring.vue
index 55028ad..aab8347 100644
--- a/src/pages/index/soil-monitoring.vue
+++ b/src/pages/index/soil-monitoring.vue
@@ -41,12 +41,17 @@
 				</view>
 			</view>
 			<view class="warning-section">
-				<view class="top_box u-border-bottom">
+				<view class="flex justify-between items-center">
 					<view class="tit">预警数据统计</view>
 					<view class="set_warning">
 						<u-button v-auth="['endpoint.soil.setting','endpoint.soil.setting_edit']" class="set_btn" @click="setWarnInfo()" size="mini">设置</u-button>
 					</view>
 				</view>
+				<view class="my-20rpx">
+					<u-line></u-line>
+				</view>
+				
+				
 				<view class="cont-box">
 					<view class="warning-item" @click="warningClickFn(1)">
 						<view class="name">Ⅰ级预警</view>
@@ -68,10 +73,13 @@
 			</view>
 			<!-- 电导率 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">电导率<text class="unit">us/cm</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -82,10 +90,13 @@
 			</view>
 			<!-- 湿度 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">湿度<text class="unit">%RH</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -96,10 +107,13 @@
 			</view>
 			<!-- 温度 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">温度<text class="unit">℃</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -110,10 +124,13 @@
 			</view>
 			<!-- 氮 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">氮<text class="unit">mg/kg</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -124,10 +141,13 @@
 			</view>
 			<!-- 磷 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">磷<text class="unit">mg/kg</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -138,10 +158,13 @@
 			</view>
 			<!-- 钾 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">钾<text class="unit">mg/kg</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -405,6 +428,9 @@
 					console.log(data);
 					if(data.code==200){
 						let _data = data.data;
+						if(_data.length==0){
+							return this.$u.toast('没有关联基地');
+						}
 						for(let item of _data){
 							item['label'] = item.name;
 							item['value'] = item.id;
@@ -429,6 +455,9 @@
 					console.log(data);
 					if(data.code==200){
 						let _data = data.data;
+						if(_data.length==0){
+							// return this.$u.toast('监测点为空');
+						}
 						let options = [];
 						for(let k in _data){
 							let item = {};
@@ -646,7 +675,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		margin-bottom: 24rpx;
+		// margin-bottom: 24rpx;
 		padding-bottom: 20rpx;
 		.tit{
 			font-weight: bold;
diff --git a/src/pages/index/water-quality.vue b/src/pages/index/water-quality.vue
index 4377424..f847557 100644
--- a/src/pages/index/water-quality.vue
+++ b/src/pages/index/water-quality.vue
@@ -41,12 +41,15 @@
 				</view>
 			</view>
 			<view class="warning-section">
-				<view class="top_box u-border-bottom">
+				<view class="top_box">
 					<view class="tit">预警数据统计</view>
 					<view class="set_warning">
 						<u-button v-auth="['endpoint.water.setting','endpoint.water.setting_edit']" class="set_btn" @click="setWarnInfo()" size="mini">设置</u-button>
 					</view>
 				</view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 				<view class="cont-box">
 					<view class="warning-item" @click="warningClickFn(1)">
 						<view class="name">Ⅰ级预警</view>
@@ -68,10 +71,13 @@
 			</view>
 			<!-- 氯 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">氯<text class="unit">mg/L</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -82,10 +88,13 @@
 			</view>
 			<!-- 电导率 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">电导率<text class="unit">us/cm</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -97,10 +106,13 @@
 			
 			<!-- 氧气 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">氧气<text class="unit">mg/L</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -111,10 +123,13 @@
 			</view>
 			<!-- PH -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">PH<text class="unit"></text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -125,10 +140,13 @@
 			</view>
 			<!-- 温度 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">温度<text class="unit">℃</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -139,10 +157,13 @@
 			</view>
 			<!-- 浊度 -->
 			<view class="chart_section">
-			  <view class="top_box u-border-bottom">
+			  <view class="top_box">
 				  <view class="tit">浊度<text class="unit">NTU</text></view>
 				  <view class="name">{{addressName}}</view>
 			  </view>
+				<view class="mb-20rpx">
+					<u-line></u-line>
+				</view>
 			  <view class="cart_box">
 				  <qiun-data-charts 
 					type="area"
@@ -407,6 +428,9 @@
 					console.log(data);
 					if(data.code==200){
 						let _data = data.data;
+						if(_data.length==0){
+							return this.$u.toast('没有关联基地');
+						}
 						for(let item of _data){
 							item['label'] = item.name;
 							item['value'] = item.id;
@@ -432,6 +456,9 @@
 					console.log(data);
 					if(data.code==200){
 						let _data = data.data;
+						if(_data.length==0){
+							// return this.$u.toast('监测点为空');
+						}
 						let options = [];
 						for(let k in _data){
 							let item = {};
@@ -652,7 +679,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		margin-bottom: 24rpx;
+		// margin-bottom: 24rpx;
 		padding-bottom: 20rpx;
 		.tit{
 			font-weight: bold;