feat:墒情监测菜单兼容

pages/distribution/index.vue

@@ -3,8 +3,8 @@
 		<view class="page-body">
 			<view class="utabs">
 				<view style="width: 95%;margin: 0 auto;">
-					<u-tabs :list="list" :is-scroll="true" :current="current" @change="change" 
-						font-size="24" gutter="20" bar-width="60" active-color="#42b983"></u-tabs>
+					<u-tabs :list="list" :is-scroll="true" :current="current" @change="change" font-size="24"
+						gutter="20" bar-width="60" active-color="#42b983"></u-tabs>
 				</view>
 			</view>
 			<view class="LocationAndDetails">
@@ -119,10 +119,10 @@
 						obj.title = res[i].device_name || res[i].device_id
 						obj.width = 30
 						obj.height = 30
-						obj.iconPath = '/static/images/distribution/'+res[i].device_type_id +".png"
+						obj.iconPath = '/static/images/distribution/' + res[i].device_type_id + ".png"
 						// obj.iconPath =
-							// "https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/image/distribution/" + res[
-							// 	i].device_type_id + ".png"
+						// "https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/image/distribution/" + res[
+						// 	i].device_type_id + ".png"
 						arr.push(obj)
 						console.log(obj)
 					}
@@ -238,10 +238,10 @@
 					}
 					switch (this.punctuation_type) {
 						case 15:
-						uni.navigateTo({
-						  url: '../environment/gsequipment?shebei=' + JSON.stringify(itemDefault),
-						});
-						break;
+							uni.navigateTo({
+								url: '../environment/gsequipment?shebei=' + JSON.stringify(itemDefault),
+							});
+							break;
 						case 2:
 							uni.navigateTo({
 								url: "../prevention/equipmentdetails?shebei=" + JSON.stringify(itemDefault)
@@ -256,25 +256,53 @@
 							// 	break;
 						case 5:
 							const res = await this.$myRequest({
-							  url: '/api/api_gateway?method=weather.weather.qxz_page',
-							  data: {
-							    page: 1,
-							    device_status: '',
-							    page_size: 10,
-							    device_id: item.device_id,
-							  },
+								url: '/api/api_gateway?method=weather.weather.qxz_page',
+								data: {
+									page: 1,
+									device_status: '',
+									page_size: 10,
+									device_id: item.device_id,
+								},
 							})
-							let items = {...item}
-							if(res.nums==1){
-								items = {...item,...res.ids[0]}
+							let items = {
+								...item
+							}
+							if (res.nums == 1) {
+								items = {
+									...item,
+									...res.ids[0]
+								}
 							}
 							uni.navigateTo({
 								url: "../environment/equipment?shebei=" + JSON.stringify(items)
 							})
 							break;
+						case 45:
+							const res45 = await this.$myRequest({
+								url: '/api/api_gateway?method=weather.weather.shang_qing_qxz_page',
+								data: {
+									page: 1,
+									page_size: "10",
+									device_id: item.device_id,
+								}
+							})
+							let item45 = {
+								...item
+							}
+							if (res45.nums == 1) {
+								item45 = {
+									...items,
+									...res45.ids[0]
+								}
+							}
+							uni.navigateTo({
+								url: "../environment/equipment?shebei=" + JSON.stringify(item45)
+							})
+							break;
 						case 6:
 							uni.navigateTo({
-								url: "/pages/webview?device_id=" + item.device_id + "&accessToken="+uni.getStorageSync('session_key')
+								url: "/pages/webview?device_id=" + item.device_id + "&accessToken=" + uni
+									.getStorageSync('session_key')
 							})
 							break;
 						case 43:
@@ -284,7 +312,8 @@
 							break;
 						case 44:
 							uni.navigateTo({
-								url: "/pages/webview?device_id=" + item.device_id + "&accessToken=" +uni.getStorageSync('session_key')+
+								url: "/pages/webview?device_id=" + item.device_id + "&accessToken=" + uni
+									.getStorageSync('session_key') +
 									'&type=dgp'
 							})
 							break;

pages/environment/equipment.vue

@@ -216,7 +216,7 @@
 				});
 			},
 			repairs() {
-				console.log(this.eqinfo.item)
+				console.log(this.eqinfo.item,'repairs')
 				var device_id = this.eqinfo.item.equip_id || this.eqinfo.item.device_id
 				uni.navigateTo({
 					url: "../afterSale/addafter?device_id=" + device_id + "&device_type=" + 5
@@ -341,14 +341,19 @@
 				})
 			},
 			async getbaseinfo(id) {
+				let url = '/api/api_gateway?method=weather.weather.qxz_page'
+				if(this.eqinfo.item.equip_type==45){
+					url = '/api/api_gateway?method=weather.weather.shang_qing_qxz_page'
+				}
 				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=weather.weather.qxz_page',
+					url:url ,
 					data: {
 						page: 1,
 						page_size: 10,
 						device_id: id,
 					}
 				})
+				
 				// console.log(res.ids.id)
 				this.eqinfo.item = res.ids[0]
 			}

pages/equipList/index.vue

@@ -378,6 +378,7 @@ export default {
               '../prevention/equipmentdetails?shebei=' + JSON.stringify(item),
           });
           break;
+		case 45:
         case 5:
           console.log(item);
           var obj = {};
@@ -388,10 +389,12 @@ export default {
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
           obj.uptime = item.uptime;
+		  obj.equip_type = this.type_id
           uni.navigateTo({
             url: '../environment/equipment?shebei=' + JSON.stringify(obj),
           });
           break;
+		  
 		  case 44:
 		  console.log(uni.getStorageSync('session_key'),'----')
 		  uni.navigateTo({

pages/fourBase/basefacility.vue

@@ -107,42 +107,54 @@
 				var item = JSON.stringify(items)
 				switch (items.equip_type) {
 					case 5:
+					
 						const res = await this.$myRequest({
-						  url: '/api/api_gateway?method=weather.weather.qxz_page',
-						  data: {
-						    page: 1,
-						    device_status: '',
-						    page_size: 10,
-						    device_id: items.device_id,
-						  },
+							url: '/api/api_gateway?method=weather.weather.qxz_page',
+							data: {
+								page: 1,
+								device_status: '',
+								page_size: 10,
+								device_id: items.device_id,
+							},
 						})
-						let item = {...items}
-						if(res.nums==1){
-							item = {...items,...res.ids[0]}
+						let item = {
+							...items
 						}
-						
+						if (res.nums == 1) {
+							item = {
+								...items,
+								...res.ids[0]
+							}
+						}
+
 						uni.navigateTo({
 							url: "../environment/equipment?shebei=" + JSON.stringify(item)
 						})
 						break
 					case 6:
 						uni.navigateTo({
-							url: "/pages/webview?device_id=" + items.device_id + "&accessToken=" + uni.getStorageSync('session_key')
+							url: "/pages/webview?device_id=" + items.device_id + "&accessToken=" + uni
+								.getStorageSync('session_key')
 						})
 						break
 					case 43:
 						const resFm = await this.$myRequest({
 							url: '/api/api_gateway?method=forecast.worm_lamp.lamp_list',
 							data: {
-								device_type_id:43,
+								device_type_id: 43,
 								page: 1,
 								page_size: "10",
 								device_id: items.device_id,
 							}
 						})
-						let item43 = {...items}
-						if(resFm.counts==1){
-							item43 = {...items,...resFm.data[0]}
+						let item43 = {
+							...items
+						}
+						if (resFm.counts == 1) {
+							item43 = {
+								...items,
+								...resFm.data[0]
+							}
 						}
 						uni.navigateTo({
 							url: "../fmSys/details?info=" + JSON.stringify(item43)
@@ -150,7 +162,8 @@
 						break;
 					case 44:
 						uni.navigateTo({
-							url: "/pages/webview?device_id=" + items.device_id + "&accessToken="  +uni.getStorageSync('session_key') + '&type=dgp'
+							url: "/pages/webview?device_id=" + items.device_id + "&accessToken=" + uni
+								.getStorageSync('session_key') + '&type=dgp'
 						})
 						break
 					case 10:
@@ -158,51 +171,82 @@
 							url: '/pages/cb/xy2.0/particulars?info=' + item
 						});
 						break
-						case 26:
-						case 11:
+					case 26:
+					case 11:
 						const res26 = await this.$myRequest({
 							url: '/api/api_gateway?method=forecast.worm_lamp.lamp_list',
 							data: {
-								device_type_id:items.equip_type,
+								device_type_id: items.equip_type,
 								page: 1,
 								page_size: "10",
 								device_id: items.device_id,
 							}
 						})
-						let item26 = {...items}
-						if(res26.counts==1){
-							item26 = {...items,...res26.data[0]}
+						let item26 = {
+							...items
 						}
-					
-							uni.navigateTo({
-													  url: '../disease/cmb?shebei=' + JSON.stringify(item26),
-													});
-							break
-						
+						if (res26.counts == 1) {
+							item26 = {
+								...items,
+								...res26.data[0]
+							}
+						}
+
+						uni.navigateTo({
+							url: '../disease/cmb?shebei=' + JSON.stringify(item26),
+						});
+						break;
+						case 45:
+						const res45 = await this.$myRequest({
+							url: '/api/api_gateway?method=weather.weather.shang_qing_qxz_page',
+							data: {
+								page: 1,
+								page_size: "10",
+								device_id: items.device_id,
+							}
+						})
+						let item45 = {
+							...items
+						}
+						if (res45.nums == 1) {
+							item45 = {
+								...items,
+								...res45.ids[0]
+							}
+						}
+						uni.navigateTo({
+							url: "../environment/equipment?shebei=" + JSON.stringify(item45)
+						})
+						break;
 					default:
 						const resDefault = await this.$myRequest({
 							url: '/api/api_gateway?method=forecast.worm_lamp.lamp_list',
 							data: {
-								device_type_id:items.equip_type,
+								device_type_id: items.equip_type,
 								page: 1,
 								page_size: "10",
 								device_id: items.device_id,
 							}
 						})
-						let itemDefault = {...items}
-						if(resDefault.counts==1){
-							itemDefault = {...items,...resDefault.data[0]}
+						let itemDefault = {
+							...items
+						}
+						if (resDefault.counts == 1) {
+							itemDefault = {
+								...items,
+								...resDefault.data[0]
+							}
 						}
-						
+
 						uni.navigateTo({
-							url: '/pages/cb/equip-detail/equip-detail?info=' + JSON.stringify(itemDefault) 
+							url: '/pages/cb/equip-detail/equip-detail?info=' + JSON.stringify(itemDefault)
 						});
 						break
 				}
 			}
 		},
 		onLoad(option) {
-			console.log('加载了',option)
+			console.log('加载了', option)
 			this.base_id = option.id
 			this.ybase(option.id)
 			this.camera()
@@ -282,6 +326,7 @@
 					color: #42b983;
 
 				}
+
 				.equipment_state2 {
 					position: absolute;
 					top: 20rpx;
@@ -291,7 +336,7 @@
 					text-align: center;
 					line-height: 100rpx;
 					color: #ff5951;
-				
+
 				}
 			}
 		}

pages/index/index.vue

@@ -76,7 +76,7 @@
 				</view>
 				<view class="functionbox_text_item" v-if="jurisdiction.sbtf"
 					@click="tabequipment('../equipMange/index/index')">
-					<image :src="$imageURL+'/bigdata_app/newindex/user.png'" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/user2.png'" mode="" class="itemimg">
 					</image>
 					<view class="">
 						用户管理

pages/monitor/dgpImagelist.vue

@@ -106,11 +106,11 @@ export default {
 	  active:0,
 	  equipArr:[
 		          { name: '全部', value: '全部' },
-		          { name: 'NDVI', value: 'NDVI' },
-		          { name: 'GNDVI', value: 'GNDVI' },
-		          { name: 'OSAVI', value: 'OSAVI' },
-		          { name: 'LCI', value: 'LCI' },
-		          { name: 'NDRE', value: 'NDRE' }
+		        { name: 'NDVI（归一化差值植被指数）', value: 'NDVI' },
+		             { name: 'GNDVI（绿度归一化差值植被指数）', value: 'GNDVI' },
+		             { name: 'OSAVI（优化土壤调节植被指数）', value: 'OSAVI' },
+		             { name: 'LCI（叶叶绿素指数）', value: 'LCI' },
+		             { name: 'NDRE（红边归一化差值植被指数）', value: 'NDRE' }
 	  ],
 	  device_type:''
     };

pages/my/index/index.vue

@@ -3,9 +3,9 @@
 		<view class="subject">
 			<view style="width: 100%;background-color: #FFFFFF;position: relative;">
 				<view class="personal" v-if="isLogin">
-					<view class="personal_left">
+					<!-- <view class="personal_left">
 						<image :src="userinfos.image" mode=""></image>
-					</view>
+					</view> -->
 					<view class="personal_center">
 						<p>{{usernames}}</p>
 						<p>{{ userinfos.email || userinfos.mobile }}</p>

pages/my/user-info/user-info.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="user-info">
-		<view class="info-item">
+<!-- 		<view class="info-item">
 			<text class="tit">头像</text>
 			<view class="avater" @click="gainimg">
 				<image :src="userinfos.image" mode="aspectFill" class="user"></image>
@@ -8,7 +8,7 @@
 					<image src="../../../static/images/cb/6286299.gif" mode="" class="img"></image>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="info-item">
 			<text class="tit">用户名</text>
 			<text class="val">{{userinfos.username}}</text>