Merge branch 'master' of http://49.4.49.126:3000/Gyee_web/sisMobilePhone

# Conflicts:
#	components/drawer/threeLineDrawer.vue

common/common.js

@@ -41,39 +41,44 @@ class Common {
 		//  	 }
 		//首页
 		if (page[page.length - 1].route == "pages/index/Index") {
-			page[page.length - 1].$vm.FDC= uni.getStorageSync('windPowerStationId');
+			page[page.length - 1].$vm.FDC = uni.getStorageSync('windPowerStationId');
 			page[page.length - 1].$vm.target_comprehensive_indicators();
 			page[page.length - 1].$vm.target_windSpeed_power();
 			page[page.length - 1].$vm.index_windturbine_status();
 			page[page.length - 1].$vm.index_electricQuantity();
-			page[page.length - 1].$vm.index_target_basic_indicators();	
-			
-		}else if (page[page.length - 1].route == "components/monitor/MatrixMonitor") {
-			page[page.length - 1].$vm.FDC= uni.getStorageSync('windPowerStationId');
+			page[page.length - 1].$vm.index_target_basic_indicators();
+
+		} else if (page[page.length - 1].route == "components/monitor/MatrixMonitor") {
+			page[page.length - 1].$vm.FDC = uni.getStorageSync('windPowerStationId');
 			page[page.length - 1].$vm.windStationName = windpowerstationName.replace('风电场', '');
-			
-		}else	if (page[page.length - 1].route == "pages/forecast/Forecast") {
 
-			//page[page.length-1].$refs.r1.viewUserid();
-			page[page.length - 1].$refs.r1.address=uni.getStorageSync('windpowerstationName');
+		} else if (page[page.length - 1].route == "pages/forecast/Forecast") {
+
+			//#ifdef H5
+			page[page.length - 1].$refs.r1.viewUserid();
+			page[page.length - 1].$refs.r1.address = uni.getStorageSync('windpowerstationName');
 			page[page.length - 1].$refs.r1.FDC = uni.getStorageSync('windPowerStationId');
 			page[page.length - 1].$refs.r1.windStationName = windpowerstationName.replace('风电场', '');
-			
 			page[page.length - 1].$refs.r1.getWeatherDataToday();
 			page[page.length - 1].$refs.r1.getWeatherData7();
 			page[page.length - 1].$refs.r1.getWeatherData();
 			page[page.length - 1].$refs.r1.getWeatherData40();
-		
-			
-			
-			// page[page.length - 1].$vm.$children[0].getWeatherDataToday();
-			// page[page.length - 1].$vm.$children[0].getWeatherData7();
-			// page[page.length - 1].$vm.$children[0].getWeatherData();
-			// page[page.length - 1].$vm.$children[0].getWeatherData40();
+			//#endif
 
-			
 
+			//#ifdef APP-PLUS  
+			page[page.length - 1].$vm.$children[0].address = uni.getStorageSync('windpowerstationName');
+			page[page.length - 1].$vm.$children[0].FDC = uni.getStorageSync('windPowerStationId');
+			page[page.length - 1].$vm.$children[0].windStationName = windpowerstationName.replace('风电场', '');
+			page[page.length - 1].$vm.$children[0].getWeatherDataToday();
+			page[page.length - 1].$vm.$children[0].getWeatherData7();
+			page[page.length - 1].$vm.$children[0].getWeatherData();
+			page[page.length - 1].$vm.$children[0].getWeatherData40();
+			//#endif
 			
+
+
+
 		}
 
 		//    uni.showModal({

common/dataprocessing.js

@@ -1,137 +1,248 @@
+import store from '../common/store.js'
+
 class Dataprocessing {
 	constructor() {
 
 	}
 
-	
+
 	//
 	putWindPowerStationName(windPowerStationName) {
 		uni.setStorageSync('windpowerstationName', windPowerStationName);
 	}
-	
+
 	putWindPowerStationId(windPowerStationId) {
 		uni.setStorageSync('windPowerStationId', windPowerStationId);
 	}
-	
+
 	getWindPowerStationName() {
 		return uni.getStorageSync('windpowerstationName');
 	}
-	
+
 	getWindPowerStationId() {
 		return uni.getStorageSync('windPowerStationId');
 	}
-	
-	getWindPowerStationNameById(name)
-	{
+
+	getWindPowerStationNameById(name) {
 		if (name == '宁夏新能源公司') {
-			let  wpId = '0';
+			let wpId = '0';
 			return wpId;
-		}else if (name == '麻黄山风电场') {
-		
-			let  wpId = 'MHS_FDC';
+		} else if (name == '麻黄山风电场') {
+
+			let wpId = 'MHS_FDC';
 			return wpId;
-		}else if (name == '牛首山风电场') {
-			let  wpId = 'NSS_FDC';
+		} else if (name == '牛首山风电场') {
+			let wpId = 'NSS_FDC';
 			return wpId;
-		}else if (name == '石板泉风电场') {
-			let  wpId = 'SBQ_FDC';
+		} else if (name == '石板泉风电场') {
+			let wpId = 'SBQ_FDC';
 			return wpId;
-		}else if (name == '青山风电场') {
-			let  wpId = 'QS_FDC';
+		} else if (name == '青山风电场') {
+			let wpId = 'QS_FDC';
 			return wpId;
-		}else if (name == '香山风电场') {
-			let  wpId = 'XS_FDC';
+		} else if (name == '香山风电场') {
+			let wpId = 'XS_FDC';
 			return wpId;
-		}else if (name == '河北能源集团') {
-			let  wpId = '0';
+		} else if (name == '河北能源集团') {
+			let wpId = '0';
 			return wpId;
-		}else if (name == '崇礼风电场') {
-			let  wpId = 'CL_FDC';
+		} else if (name == '崇礼风电场') {
+			let wpId = 'CL_FDC';
 			return wpId;
-		}else if (name == '康保风电场') {
-			let  wpId = 'KB_FDC';
+		} else if (name == '康保风电场') {
+			let wpId = 'KB_FDC';
 			return wpId;
-		}else if (name == '代县风电场') {
-			let  wpId = 'DX_FDC';
+		} else if (name == '代县风电场') {
+			let wpId = 'DX_FDC';
 			return wpId;
 		}
 	}
-	
-	getWindPowerStationNameByWeatherId(name)
-	{
-		
+
+	getWindPowerStationNameByWeatherId(name) {
+
 		if (name == '宁夏新能源公司') {
-			let  wpId = 'MHS_FDC';
+			let wpId = 'MHS_FDC';
 			return wpId;
-		}else if (name == '麻黄山风电场') {
-		
-			let  wpId = 'MHS_FDC';
+		} else if (name == '麻黄山风电场') {
+
+			let wpId = 'MHS_FDC';
 			return wpId;
-		}else if (name == '牛首山风电场') {
-			let  wpId = 'NSS_FDC';
+		} else if (name == '牛首山风电场') {
+			let wpId = 'NSS_FDC';
 			return wpId;
-		}else if (name == '石板泉风电场') {
-			let  wpId = 'SBQ_FDC';
+		} else if (name == '石板泉风电场') {
+			let wpId = 'SBQ_FDC';
 			return wpId;
-		}else if (name == '青山风电场') {
-			let  wpId = 'QS_FDC';
+		} else if (name == '青山风电场') {
+			let wpId = 'QS_FDC';
 			return wpId;
-		}else if (name == '香山风电场') {
-			let  wpId = 'XS_FDC';
+		} else if (name == '香山风电场') {
+			let wpId = 'XS_FDC';
 			return wpId;
-		}else if (name == '河北能源集团') {
-			let  wpId = 'CL_FDC';
+		} else if (name == '河北能源集团') {
+			let wpId = 'CL_FDC';
 			return wpId;
-		}else if (name == '崇礼风电场') {
-			let  wpId = 'CL_FDC';
+		} else if (name == '崇礼风电场') {
+			let wpId = 'CL_FDC';
 			return wpId;
-		}else if (name == '康保风电场') {
-			let  wpId = 'KB_FDC';
+		} else if (name == '康保风电场') {
+			let wpId = 'KB_FDC';
 			return wpId;
-		}else if (name == '代县风电场') {
-			let  wpId = 'DX_FDC';
+		} else if (name == '代县风电场') {
+			let wpId = 'DX_FDC';
 			return wpId;
 		}
 	}
-	
-	getWindPowerStationNameByNames(name)
-	{	
+
+	getWindPowerStationNameByNames(name) {
 		if (name == '宁夏新能源公司') {
-			
-			let  windStations=['麻黄山风电场', '牛首山风电场', '石板泉风电场', '青山风电场', '香山风电场'];
+
+			let windStations = ['麻黄山风电场', '牛首山风电场', '石板泉风电场', '青山风电场', '香山风电场'];
 			return windStations;
-		}else if (name == '麻黄山风电场') {
-			let  windStations = ['麻黄山风电场', '牛首山风电场', '石板泉风电场', '青山风电场', '香山风电场'];
+		} else if (name == '麻黄山风电场') {
+			let windStations = ['麻黄山风电场', '牛首山风电场', '石板泉风电场', '青山风电场', '香山风电场'];
 			return windStations;
-		}else if (name == '牛首山风电场') {
-			let  windStations = ['牛首山风电场', '麻黄山风电场', '石板泉风电场', '青山风电场', '香山风电场'];
+		} else if (name == '牛首山风电场') {
+			let windStations = ['牛首山风电场', '麻黄山风电场', '石板泉风电场', '青山风电场', '香山风电场'];
 			return windStations;
-		}else if (name == '石板泉风电场') {
-			let  windStations = ['石板泉风电场', '麻黄山风电场', '牛首山风电场', '青山风电场', '香山风电场'];
+		} else if (name == '石板泉风电场') {
+			let windStations = ['石板泉风电场', '麻黄山风电场', '牛首山风电场', '青山风电场', '香山风电场'];
 			return windStations;
-		}else if (name == '香山风电场') {
-			let  windStations = ['香山风电场', '麻黄山风电场', '牛首山风电场', '石板泉风电场', '青山风电场'];
+		} else if (name == '香山风电场') {
+			let windStations = ['香山风电场', '麻黄山风电场', '牛首山风电场', '石板泉风电场', '青山风电场'];
 			return windStations;
-		}else if (name == '青山风电场') {
-			let  windStations = ['青山风电场', '麻黄山风电场', '牛首山风电场', '石板泉风电场', '香山风电场'];
+		} else if (name == '青山风电场') {
+			let windStations = ['青山风电场', '麻黄山风电场', '牛首山风电场', '石板泉风电场', '香山风电场'];
 			return windStations;
-		}else if (name == '河北能源集团') {
-			let  windStations = ['崇礼风电场', '康保风电场', '代县风电场'];
+		} else if (name == '河北能源集团') {
+			let windStations = ['崇礼风电场', '康保风电场', '代县风电场'];
 			return windStations;
-		}else if (name == '崇礼风电场') {
-			let  windStations = ['崇礼风电场', '康保风电场', '代县风电场'];
+		} else if (name == '崇礼风电场') {
+			let windStations = ['崇礼风电场', '康保风电场', '代县风电场'];
 			return windStations;
-		}else if (name == '康保风电场') {
-			let  windStations = ['康保风电场', '崇礼风电场', '代县风电场'];
+		} else if (name == '康保风电场') {
+			let windStations = ['康保风电场', '崇礼风电场', '代县风电场'];
 			return windStations;
-		}else if (name == '代县风电场') {
-			let  windStations = ['代县风电场', '康保风电场', '崇礼风电场'];
+		} else if (name == '代县风电场') {
+			let windStations = ['代县风电场', '康保风电场', '崇礼风电场'];
 			return windStations;
 		}
 	}
-	
-	
 
+	viewUserid() {
+		let userid = uni.getStorageSync('userid');
+		let ip = store.state.wholeSituationBackStageIp;
+		let port = store.state.wholeSituationBackStagePort;
+		uni.request({
+			url: 'http://' + ip + ':' + port + '/GyeeorganController/GyeeOrganList?userid=' + userid,
+			data: {},
+			method: 'GET',
+			success: function(res) {
+
+				let plusDrawerList = [];
+				let plusDrawerList_weather = [];
+				for (let j = 0; j < res.data.data.length; j++) {
+
+					var obj = {};
+					obj.name = res.data.data[j].describes;
+					obj.windId = res.data.data[j].name;
+
+					plusDrawerList.push(obj);
+				}
+
+				for (let j = 0; j < res.data.data.length; j++) {
+
+					var obj = {};
+					obj.name = res.data.data[j].describes;
+
+					if (res.data.data[j].describes == '宁夏新能源公司') {
+						obj.windId = 'MHS_FDC';
+					} else if (res.data.data[j].describes == '河北能源集团') {
+						obj.windId = 'CL_FDC';
+					} else {
+						obj.windId = res.data.data[j].name;
+					}
+					plusDrawerList_weather.push(obj);
+				}
+
+				uni.setStorageSync('plusList', plusDrawerList);
+				uni.setStorageSync('plusList_we', plusDrawerList_weather);
+			}
+		})
+	}
+
+
+	monitoringAuthority() {
+		let userid = uni.getStorageSync('userid');
+		let ip = store.state.wholeSituationBackStageIp;
+		let port = store.state.wholeSituationBackStagePort;
+		uni.request({
+				url: 'http://' + ip + ':' + port + '/GyeepermissionController/GyeePermissionList?userid=' + userid,
+				data: {},
+				method: 'GET',
+				success: function(res) {
+
+					let leftlist1 = [];
+					let leftlist2 = [];
+					let leftlist3 = [];
+					let leftlist4 = [];
+					let leftlist5 = [];
+
+					for (let j = 0; j < res.data.data.length; j++) {
+
+						let gyeePermissionList = res.data.data[j].gyeePermissionList;
+
+						if (j == 0) {
+							for (let k = 0; k < gyeePermissionList.length; k++) {
+								var obj = {};
+								obj.name = gyeePermissionList[k].permisssionname;
+								obj.remark1 = gyeePermissionList[k].remark1;
+								leftlist1.push(obj);
+							}
+						} else if (j == 1) {
+
+							for (let k = 0; k < gyeePermissionList.length; k++) {
+								var obj = {};
+								obj.name = gyeePermissionList[k].permisssionname;
+								obj.remark1 = gyeePermissionList[k].remark1;
+								leftlist2.push(obj);
+							}
+						} else if (j == 2) {
+
+							for (let k = 0; k < gyeePermissionList.length; k++) {
+								var obj = {};
+								obj.name = gyeePermissionList[k].permisssionname;
+								obj.remark1 = gyeePermissionList[k].remark1;
+								leftlist3.push(obj);
+							}
+						} else if (j == 3) {
+
+							for (let k = 0; k < gyeePermissionList.length; k++) {
+								var obj = {};
+								obj.name = gyeePermissionList[k].permisssionname;
+								obj.remark1 = gyeePermissionList[k].remark1;
+								leftlist4.push(obj);
+							}
+						} else if (j == 4) {
+
+							for (let k = 0; k < gyeePermissionList.length; k++) {
+								var obj = {};
+								obj.name = gyeePermissionList[k].permisssionname;
+								obj.remark1 = gyeePermissionList[k].remark1;
+								leftlist5.push(obj);
+							}
+						}
+
+					}
+					uni.setStorageSync('leftlist1', leftlist1);
+					uni.setStorageSync('leftlist2', leftlist2);
+					uni.setStorageSync('leftlist3', leftlist3);
+					uni.setStorageSync('leftlist4', leftlist4);
+					uni.setStorageSync('leftlist5', leftlist5);
+				}
+
+		})
+	}
 }
 
 let dataprocessing = new Dataprocessing();

common/store.js

@@ -11,7 +11,11 @@ const store = new Vuex.Store({
            "宁夏新能源公司":"0","麻黄山风电场":"MHS_FDC","牛首山风电场":"NSS_FDC","青山风电场":"SBQ_FDC","石板泉风电场":"QS_FDC","香山风电场":"QS_FDC"
 		},
 		default_wpid:'0',
+		
 		default_wpname:'河北能源集团',
+		default_tourist:'2',
+		default_tourist_wpid:'CL_FDC',
+		default_tourist_wpname:'崇礼风电场',
         memberData:'',
         initName:''
     },

components/drawer/threeLineDrawer.vue

@@ -65,17 +65,19 @@
 				this.leftNavigationtitle = leftNavigationtitle;
 			},
 			closeDrawer: function() {
+
 				this.drawerIsShow = false;
-				this.drawerIsShow = false;
-				debugger;
+
 				//#ifdef H5
+				
 				   this.$root.leftbar();
+
 				//#endif
 				
 				//#ifdef APP-PLUS
 				   this.$parent.leftbar();
 				//#endif
-		
+
 			},
 			clickChangeColor: function(index) {
 				this.changeGary = index;

components/login/Login.vue

@@ -4,10 +4,10 @@
 			<view class="title">账号密码登录</view>
 			<view class="usernameAndPassword">
 				<view class="usernameContent">
-					<input type="text" v-model="username" placeholder="账号" @input="usernameInput"/>
+					<input type="text" v-model="username" placeholder="账号" @input="usernameInput" />
 				</view>
 				<view class="passwordContent">
-					<input type="text" v-model="password" :password="passwordShow" placeholder="请输入密码" @input="passwordInput"/>
+					<input type="text" v-model="password" :password="passwordShow" placeholder="请输入密码" @input="passwordInput" />
 					<sunui-password @change="showPass" />
 				</view>
 			</view>
@@ -16,7 +16,7 @@
 				<a style="float: right;color:#77A8E6;" @tap="goToIndex()">游客身份登录</a>
 			</view>
 			<button class="cu-btn bg-red lg" @tap="login" :disabled="usernameLoginDisabled" type="" :style="{ 'height': buttonHeight}">登录</button>
-			<button class="cu-btn bg-red lg" @tap="checkIsSoterEnrolledInDeviceFingerPrint"  type="" :style="{ 'height': buttonHeight}">指纹登录</button>
+			<button class="cu-btn bg-red lg" @tap="checkIsSoterEnrolledInDeviceFingerPrint" type="" :style="{ 'height': buttonHeight}">指纹登录</button>
 			<view class="bottomWord" :style="{ 'font-size': bottomWordFontSize,'margin-top':bottomWordMarginTop}">
 				点击登录，即代表已阅读并同意<a href="#">隐私政策</a>和<a href="#">用户协议</a>
 			</view>
@@ -26,13 +26,13 @@
 			<view class="usernameAndPassword">
 				<view class="phoneContent">
 					<span>+86</span>
-					<input type="text" v-model="phone" placeholder="请输入手机号码" @input="phoneInput" />					
+					<input type="text" v-model="phone" placeholder="请输入手机号码" @input="phoneInput" />
 				</view>
 				<view class="codeContent">
-					<input type="text" v-model="code" placeholder="请输入验证码" @input="codeInput"/>
+					<input type="text" v-model="code" placeholder="请输入验证码" @input="codeInput" />
 					<span :style="{ 'color': codeColor,'width':codeWidth }" @tap="getCode">获取验证码</span>
 				</view>
-			</view>			
+			</view>
 			<view class="type" :style="{ 'margin-top': typeMarginTop }">
 				<a @tap="changeType('account')">账号登录</a>
 			</view>
@@ -45,396 +45,444 @@
 </template>
 
 <script>
-	
-
-export default {
-	data: function() {
-		return {
-			passwordShow: true,
-			accountIsShow:true,
-			phoneIsShow:false,
-			usernameLoginDisabled:true,
-			codeLoginDisabled:true,
-			username: '',
-			password: '',
-			phone:"",
-			code:"",
-			codeColor:"#808080",
-			usernameFlag:false,
-			passwordFlag:false,
-			phoneFlag:false,
-			codeFlag:false,
-			getCodeFlag:false,
-			lastUserName: '',
-			lastPassWord: '',
-			windowWidth:"",
-			windowHeight:"",
-			typeMarginTop:"",
-			codeWidth:"",
-			bottomWordFontSize:"",
-			bottomWordMarginTop:"",
-			buttonHeight:"",
-			userid:'',
-		};
-	},
-	created() {
-		this.windowWidth = uni.getSystemInfoSync().windowWidth;
-		this.windowHeight = uni.getSystemInfoSync().windowHeight;
-		//console.log(this.windowWidth);
-		if (this.windowWidth >= 768) {
-			this.typeMarginTop="10%";
-			this.codeWidth="200px";
-			this.bottomWordFontSize="18px";
-			this.bottomWordMarginTop="500px";
-			this.buttonHeight="50px";
-		} else {
-			this.typeMarginTop="0";
-			this.codeWidth="100px";
-			this.bottomWordFontSize="13px";
-			this.bottomWordMarginTop="270px";
-			this.buttonHeight="40px";
-		}
-		//this.removeUsernamePassword();
-		this.getUsernamePassword();
-	},
-	computed: {
-		backStageIp: function() {
-			return this.$store.state.wholeSituationBackStageIp;
-		},
-		backStagePort: function() {
-			return this.$store.state.wholeSituationBackStagePort;
-		},
-		windpowerstationNameToId: function() {
-			return this.$store.state.windpowerstationNameToId;
-		},
-		windpowerstationName: function() {
-			return this.$store.state.default_wpname;
+	export default {
+		data: function() {
+			return {
+				passwordShow: true,
+				accountIsShow: true,
+				phoneIsShow: false,
+				usernameLoginDisabled: true,
+				codeLoginDisabled: true,
+				username: '',
+				password: '',
+				phone: "",
+				code: "",
+				codeColor: "#808080",
+				usernameFlag: false,
+				passwordFlag: false,
+				phoneFlag: false,
+				codeFlag: false,
+				getCodeFlag: false,
+				lastUserName: '',
+				lastPassWord: '',
+				windowWidth: "",
+				windowHeight: "",
+				typeMarginTop: "",
+				codeWidth: "",
+				bottomWordFontSize: "",
+				bottomWordMarginTop: "",
+				buttonHeight: "",
+				userid: '',
+			};
 		},
-		windpowerstationId: function() {
-			return this.$store.state.default_wpid;
-		}
-	},
-	methods: {
-		showPass(e) {
-			this.passwordShow = e;
-		},
-		usernameInput(e){
-			if(e.detail.value!=""){
-				this.usernameFlag=true;
-				if(this.passwordFlag){
-					this.usernameLoginDisabled=false;
-				}
-			}else{
-				this.usernameFlag=false;
-				this.usernameLoginDisabled=true;
+		created() {
+
+			this.windowWidth = uni.getSystemInfoSync().windowWidth;
+			this.windowHeight = uni.getSystemInfoSync().windowHeight;
+			//console.log(this.windowWidth);
+			if (this.windowWidth >= 768) {
+				this.typeMarginTop = "10%";
+				this.codeWidth = "200px";
+				this.bottomWordFontSize = "18px";
+				this.bottomWordMarginTop = "500px";
+				this.buttonHeight = "50px";
+			} else {
+				this.typeMarginTop = "0";
+				this.codeWidth = "100px";
+				this.bottomWordFontSize = "13px";
+				this.bottomWordMarginTop = "270px";
+				this.buttonHeight = "40px";
 			}
+			//this.removeUsernamePassword();
+			this.getUsernamePassword();
 		},
-		passwordInput(e){
-			if(e.detail.value!=""){
-				this.passwordFlag=true;
-				if(this.usernameFlag){
-					this.usernameLoginDisabled=false;
-				}
-			}else{
-				this.passwordFlag=false;
-				this.usernameLoginDisabled=true;
+		computed: {
+			backStageIp: function() {
+				return this.$store.state.wholeSituationBackStageIp;
+			},
+			backStagePort: function() {
+				return this.$store.state.wholeSituationBackStagePort;
+			},
+			windpowerstationNameToId: function() {
+				return this.$store.state.windpowerstationNameToId;
+			},
+			windpowerstationName: function() {
+				return this.$store.state.default_wpname;
+			},
+			windpowerstationId: function() {
+				return this.$store.state.default_wpid;
 			}
 		},
-		phoneInput(e){
-			// console.log(e.detail.value)
-			var phoneStr = e.detail.value;
-			    if(/^1(3|4|5|6|7|8|9)\d{9}$/.test(phoneStr)){ 
-					this.codeColor="black";
-					this.getCodeFlag=true;
-					this.phoneFlag=true;
-					if(this.codeFlag){
-						this.codeLoginDisabled=false;
+		methods: {
+			showPass(e) {
+				this.passwordShow = e;
+			},
+			usernameInput(e) {
+				if (e.detail.value != "") {
+					this.usernameFlag = true;
+					if (this.passwordFlag) {
+						this.usernameLoginDisabled = false;
 					}
-			    }
-				if(!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(phoneStr))){
-					this.codeColor="#808080";
-					this.getCodeFlag=false;
-					this.phoneFlag=false;
-					this.codeLoginDisabled=true;
+				} else {
+					this.usernameFlag = false;
+					this.usernameLoginDisabled = true;
 				}
-		},
-		codeInput(e){
-			if(e.detail.value!=""){
-				this.codeFlag=true;
-				if(this.phoneFlag){
-					this.codeLoginDisabled=false;
+			},
+			passwordInput(e) {
+				if (e.detail.value != "") {
+					this.passwordFlag = true;
+					if (this.usernameFlag) {
+						this.usernameLoginDisabled = false;
+					}
+				} else {
+					this.passwordFlag = false;
+					this.usernameLoginDisabled = true;
+				}
+			},
+			phoneInput(e) {
+				// console.log(e.detail.value)
+				var phoneStr = e.detail.value;
+				if (/^1(3|4|5|6|7|8|9)\d{9}$/.test(phoneStr)) {
+					this.codeColor = "black";
+					this.getCodeFlag = true;
+					this.phoneFlag = true;
+					if (this.codeFlag) {
+						this.codeLoginDisabled = false;
+					}
+				}
+				if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(phoneStr))) {
+					this.codeColor = "#808080";
+					this.getCodeFlag = false;
+					this.phoneFlag = false;
+					this.codeLoginDisabled = true;
+				}
+			},
+			codeInput(e) {
+				if (e.detail.value != "") {
+					this.codeFlag = true;
+					if (this.phoneFlag) {
+						this.codeLoginDisabled = false;
+					}
+				} else {
+					this.codeFlag = false;
+					this.codeLoginDisabled = true;
+				}
+			},
+			getCode: function() {
+				if (this.getCodeFlag) {
+					console.log("获取验证码")
+				} else {
+					console.log("不能获取验证码")
 				}
-			}else{
-				this.codeFlag=false;
-				this.codeLoginDisabled=true;
-			}
-		},
-		getCode:function(){
-			if(this.getCodeFlag){
-				console.log("获取验证码")
-			}else{
-				console.log("不能获取验证码")
-			}
-			
-		},
-		changeType:function(type){
-			if(type=="account"){
-				this.accountIsShow=true;
-				this.phoneIsShow=false;
-			}
-			if(type=="phone"){
-				this.phoneIsShow=true;
-				this.accountIsShow=false;
-			}
-		},
-		goToIndex:function(){
-			let _this = this;
-			_this.loginFalg = true;
-			uni.switchTab({
-			     url: '/pages/index/Index'
-			    });
-		},
-		falseLogin: function() {
-			if (this.username == 'admin' && this.password == 'admin') {
-				this.setUsernamePassword();
-				uni.switchTab({
-					url: '/pages/index/Index'
-				});
-			}else{
-				uni.showModal({
-					content: '用户名密码输入错误，请核对'
-				});
-				this.username = '';
-				this.password = '';
-			}
-		},
-		setUsernamePassword: function() {
-			uni.setStorageSync('gyeeusername', this.username);
-			uni.setStorageSync('gyeepassword', this.password);
-			this.setFingerPrintPassword();
-		},
-		setFingerPrintPassword: function() {
-			uni.setStorageSync('fingerPrintname', this.username);
-			uni.setStorageSync('fingerPrintpassword', this.password);
-		},
-		getFingerPrintPassword: function() {
 
-			if (uni.getStorageSync('fingerPrintname') != '' && uni.getStorageSync('fingerPrintpassword') != '') {
-				uni.switchTab({
-					url: '/pages/index/Index'
-				});
-			}else
-			{
-				uni.showToast({
-					title:"请先用密码登录!"
-				});
-			}
-		},
-		getUsernamePassword: function() {
-			this.lastUserName = uni.getStorageSync('gyeeusername');
-			this.lastPassWord = uni.getStorageSync('gyeepassword');
-			if (this.lastUserName != '' && this.lastPassWord != '') {
+			},
+			changeType: function(type) {
+				if (type == "account") {
+					this.accountIsShow = true;
+					this.phoneIsShow = false;
+				}
+				if (type == "phone") {
+					this.phoneIsShow = true;
+					this.accountIsShow = false;
+				}
+			},
+			goToIndex: function() {
+				let _this = this;
+				_this.loginFalg = true;
+
+				_this.dataprocessing.putWindPowerStationId(_this.$store.state.default_tourist_wpid);
+				_this.dataprocessing.putWindPowerStationName(_this.$store.state.default_tourist_wpname);
+				uni.setStorageSync('userid', _this.$store.state.default_tourist);
+
+				_this.dataprocessing.viewUserid();
+				_this.dataprocessing.monitoringAuthority();
+
 				uni.switchTab({
 					url: '/pages/index/Index'
 				});
-			}
-		},
-		removeUsernamePassword: function() {
-			uni.removeStorageSync('gyeeusername');
-			uni.removeStorageSync('gyeepassword');
-			//uni.removeStorageSync('userid');
-		},
-		login: function() {
-			let _this = this;
-			uni.request({
-				url: 'http://' + this.backStageIp + ':' + this.backStagePort + '/GyeeuserController/login?username=' + this.username + '&password=' + this.password,
-				data: {},
-				method: 'GET',
-				success: function(res) {
-					console.log(res.data);
-					_this.userid = res.data.data;
+			},
+			falseLogin: function() {
+				if (this.username == 'admin' && this.password == 'admin') {
+					this.setUsernamePassword();
+					uni.switchTab({
+						url: '/pages/index/Index'
+					});
+				} else {
+					uni.showModal({
+						content: '用户名密码输入错误，请核对'
+					});
+					this.username = '';
+					this.password = '';
+				}
+			},
+			setUsernamePassword: function() {
+				uni.setStorageSync('gyeeusername', this.username);
+				uni.setStorageSync('gyeepassword', this.password);
+				this.setFingerPrintPassword();
+			},
+			setFingerPrintPassword: function() {
+				uni.setStorageSync('fingerPrintname', this.username);
+				uni.setStorageSync('fingerPrintpassword', this.password);
+			},
+			getFingerPrintPassword: function() {
+
+				if (uni.getStorageSync('fingerPrintname') != '' && uni.getStorageSync('fingerPrintpassword') != '') {
+
+					uni.setStorageSync('gyeeusername', uni.getStorageSync('fingerPrintname'));
+					uni.setStorageSync('gyeepassword', uni.getStorageSync('fingerPrintpassword'));
+					uni.setStorageSync('userid', uni.getStorageSync('fingerPrintuserid'));
+
+
+					this.dataprocessing.viewUserid();
+					this.dataprocessing.monitoringAuthority();
 					
-					uni.setStorageSync('userid',_this.userid);
-					//sessionStorage.setItem('userid',_this.userid);
-					if (res.data.code == 200) {
-						
-						_this.dataprocessing.putWindPowerStationId(_this.$store.state.default_wpid);
-						_this.dataprocessing.putWindPowerStationName(_this.$store.state.default_wpname);
-						// if(_this.dataprocessing.getWindPowerStationId()=='')
-						// {
-						// 	//debugger
-						// 	_this.dataprocessing.putWindPowerStationId(_this.$store.state.default_wpid);
-						// }
-						
-						// if(_this.dataprocessing.getWindPowerStationName()=='')
-						// {
-						// 	//debugger
-						// 	_this.dataprocessing.putWindPowerStationName(_this.$store.state.default_wpname);
-						// }
-						_this.setUsernamePassword();
-						_this.loginFalg = true;
-						_this.lastUserName = _this.username;
-						_this.lastPassWord = _this.password;
-						uni.switchTab({
-							url: '/pages/index/Index'
-						});
-					} else {
-						uni.showModal({
-							content: '用户名密码输入错误，请核对'
-						});
-						_this.username = '';
-						_this.password = '';
-					}
-				},
-				fail: () => {
-					_this.tips = '网络错误，小程序端请检查合法域名';
+					let plusDrawerList = uni.getStorageSync('plusList');
+					
+					this.dataprocessing.putWindPowerStationId(plusDrawerList[0].windId);
+					this.dataprocessing.putWindPowerStationName(plusDrawerList[0].name);
+
+					uni.switchTab({
+						url: '/pages/index/Index'
+					});
+				} else {
+					uni.showToast({
+						title: "请先用密码登录!"
+					});
+				}
+			},
+			getUsernamePassword: function() {
+				this.lastUserName = uni.getStorageSync('gyeeusername');
+				this.lastPassWord = uni.getStorageSync('gyeepassword');
+				if (this.lastUserName != '' && this.lastPassWord != '') {
+					uni.switchTab({
+						url: '/pages/index/Index'
+					});
 				}
-			});
-		},checkIsSoterEnrolledInDeviceFingerPrint() {
+			},
+			removeUsernamePassword: function() {
+				uni.removeStorageSync('gyeeusername');
+				uni.removeStorageSync('gyeepassword');
+				//uni.removeStorageSync('userid');
+			},
+			login: function() {
 				let _this = this;
-                uni.checkIsSoterEnrolledInDevice({
-                    checkAuthMode: 'fingerPrint',
-                    success(res) {
-						
-                        uni.startSoterAuthentication({
-                            requestAuthModes: ['fingerPrint'],
-                            challenge: '123456',
-                            authContent: '请用指纹解锁',
-                            success(result) {
-					
-									if(result.errMsg=="startSoterAuthentication:ok")
-									{	
-											//_this.setUsernamePassword();
-											//_this.loginFalg = true;
-											//_this.getUser()
-											_this.getFingerPrintPassword();
-									}else {
-											uni.showToast({
-												title:"指纹登录失败！"
-											});
-											_this.username = '';
-											_this.password = '';
-										}
-                     
-								},
-                            fail(err) {
-                                console.log(err);
-                            },
-                            complete(res) {
-                                console.log(res);
-                            }
-                        })
-                    },
-                    fail(err) {
+				uni.request({
+					url: 'http://' + this.backStageIp + ':' + this.backStagePort + '/GyeeuserController/login?username=' + this.username +
+						'&password=' + this.password,
+					data: {},
+					method: 'GET',
+					success: function(res) {
+						console.log(res.data);
+						_this.userid = res.data.data;
+
+
+						uni.setStorageSync('userid', _this.userid);
+						uni.setStorageSync('fingerPrintuserid', _this.userid);
+						//sessionStorage.setItem('userid',_this.userid);
+						if (res.data.code == 200) {
+
+							
+							_this.dataprocessing.viewUserid();
+							_this.dataprocessing.monitoringAuthority();
+							
+							let plusDrawerList = uni.getStorageSync('plusList');
+							
+							_this.dataprocessing.putWindPowerStationId(plusDrawerList[0].windId);
+							_this.dataprocessing.putWindPowerStationName(plusDrawerList[0].name);
+							
+							// if(_this.dataprocessing.getWindPowerStationId()=='')
+							// {
+							// 	//debugger
+							// 	_this.dataprocessing.putWindPowerStationId(_this.$store.state.default_wpid);
+							// }
+
+							// if(_this.dataprocessing.getWindPowerStationName()=='')
+							// {
+							// 	//debugger
+							// 	_this.dataprocessing.putWindPowerStationName(_this.$store.state.default_wpname);
+							// }
+							_this.setUsernamePassword();
+							_this.loginFalg = true;
+							_this.lastUserName = _this.username;
+							_this.lastPassWord = _this.password;
+							uni.switchTab({
+								url: '/pages/index/Index'
+							});
+						} else {
+							uni.showModal({
+								content: '用户名密码输入错误，请核对'
+							});
+							_this.username = '';
+							_this.password = '';
+						}
+					},
+					fail: () => {
+						_this.tips = '网络错误，小程序端请检查合法域名';
+					}
+				});
+			},
+			checkIsSoterEnrolledInDeviceFingerPrint() {
+				let _this = this;
+				uni.checkIsSoterEnrolledInDevice({
+					checkAuthMode: 'fingerPrint',
+					success(res) {
+
+						uni.startSoterAuthentication({
+							requestAuthModes: ['fingerPrint'],
+							challenge: '123456',
+							authContent: '请用指纹解锁',
+							success(result) {
+
+								if (result.errMsg == "startSoterAuthentication:ok") {
+									//_this.setUsernamePassword();
+									//_this.loginFalg = true;
+									//_this.getUser()
+									_this.getFingerPrintPassword();
+								} else {
+									uni.showToast({
+										title: "指纹登录失败！"
+									});
+									_this.username = '';
+									_this.password = '';
+								}
+
+							},
+							fail(err) {
+								console.log(err);
+							},
+							complete(res) {
+								console.log(res);
+							}
+						})
+					},
+					fail(err) {
 						uni.showToast({
-							title:"请用手机指纹管理功能新建指纹录！"
+							title: "请用手机指纹管理功能新建指纹录！"
 						});
-                    },
-                    complete(res) {
-                        console.log(res);
-                    }
-                })
-            }
-	}
-	
-};
+					},
+					complete(res) {
+						console.log(res);
+					}
+				})
+			}
+		}
+
+	};
 </script>
 
 <style>
-page {
-	background-color: #FFFFFF;
-	height: 100%;
-	/* background: -webkit-gradient(linear, 0% 100%, 0% 0%, from(#2f698e), color-stop(0.15, #5c757c), to(#004c90)); */
-}
-.title {
-	width: 90%;
-	height: 100px;
-	font-size: 25px;
-	font-weight: bold;
-	padding-top: 50px;
-	/* margin-top: 80px; */
-	margin-left: 10%;
-}
-.usernameAndPassword {
-	width: 100%;
-	height: 100px;
-	margin-top: 50px;
-}
-.usernameContent {
-	width: 80%;
-	margin-left: 10%;
-	border-bottom: 2upx solid #D3D3D3;
-}
-.passwordContent {
-	width: 80%;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	border-bottom: 2upx solid #D3D3D3;
-	margin-top: 20px;
-	margin-left: 10%;
-}
-input {
-	width: 100%;
-	height: 30px;
-}
-.type{
-	width: 80%;
-	height: 20px;
-	line-height: 20px;
-	margin-left: 10%;
-}
-.cu-btn {
-	width: 80%;
-	height: 40px;
-	margin-left: 10%;
-	margin-top: 25px;
-}
-.phoneContent{
-	width: 80%;
-	margin-left: 10%;
-	border-bottom: 2upx solid #D3D3D3;
-	display: flex;
-}
-.phoneContent span{
-	line-height: 30px;
-	margin-right: 5px;
+	page {
+		background-color: #FFFFFF;
+		height: 100%;
+		/* background: -webkit-gradient(linear, 0% 100%, 0% 0%, from(#2f698e), color-stop(0.15, #5c757c), to(#004c90)); */
+	}
 
-}
-.codeContent{
-	width: 80%;
-	margin-left: 10%;
-	border-bottom: 2upx solid #D3D3D3;
-	display: flex;
-	margin-top: 20px;
-}
-.codeContent span{
-	width: 100px; 
-}
-.bottomWord{
-	width: 80%;
-	margin-left: 10%;
-	color: #808080;
-	font-size: 13px;
-	margin-top: 270px;
-	text-align: center;
-}
-a{
-	text-decoration: none;
-}
-.bottomWord a:link {
-	color: #5C97E4;
-}
-.bottomWord a:hover {
-	color: #5C97E4;
-}
-.bottomWord a:visited {
-	color: #5C97E4;
-}
-.bottomWord a:active {
-	color: #5C97E4;
-}
-/* .container {
+	.title {
+		width: 90%;
+		height: 100px;
+		font-size: 25px;
+		font-weight: bold;
+		padding-top: 50px;
+		/* margin-top: 80px; */
+		margin-left: 10%;
+	}
+
+	.usernameAndPassword {
+		width: 100%;
+		height: 100px;
+		margin-top: 50px;
+	}
+
+	.usernameContent {
+		width: 80%;
+		margin-left: 10%;
+		border-bottom: 2upx solid #D3D3D3;
+	}
+
+	.passwordContent {
+		width: 80%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		border-bottom: 2upx solid #D3D3D3;
+		margin-top: 20px;
+		margin-left: 10%;
+	}
+
+	input {
+		width: 100%;
+		height: 30px;
+	}
+
+	.type {
+		width: 80%;
+		height: 20px;
+		line-height: 20px;
+		margin-left: 10%;
+	}
+
+	.cu-btn {
+		width: 80%;
+		height: 40px;
+		margin-left: 10%;
+		margin-top: 25px;
+	}
+
+	.phoneContent {
+		width: 80%;
+		margin-left: 10%;
+		border-bottom: 2upx solid #D3D3D3;
+		display: flex;
+	}
+
+	.phoneContent span {
+		line-height: 30px;
+		margin-right: 5px;
+
+	}
+
+	.codeContent {
+		width: 80%;
+		margin-left: 10%;
+		border-bottom: 2upx solid #D3D3D3;
+		display: flex;
+		margin-top: 20px;
+	}
+
+	.codeContent span {
+		width: 100px;
+	}
+
+	.bottomWord {
+		width: 80%;
+		margin-left: 10%;
+		color: #808080;
+		font-size: 13px;
+		margin-top: 270px;
+		text-align: center;
+	}
+
+	a {
+		text-decoration: none;
+	}
+
+	.bottomWord a:link {
+		color: #5C97E4;
+	}
+
+	.bottomWord a:hover {
+		color: #5C97E4;
+	}
+
+	.bottomWord a:visited {
+		color: #5C97E4;
+	}
+
+	.bottomWord a:active {
+		color: #5C97E4;
+	}
+
+	/* .container {
 	border-radius: 20px;
 	width: 90%;
 	height: 700upx;

components/monitor/MatrixMonitor.vue

@@ -27,7 +27,7 @@
 		<scroll-view scroll-y class="DrawerPage" :class="modalName == 'viewModal' ? 'show' : ''">
 			<view class="windStationNameAndChoice">
 				<view class="windStationName">{{ windStationName }}</view>
-				<view class="windStationChoice"><a @click="showCenterVisible = true">其他ㅤ〉</a></view>
+				<!--<view class="windStationChoice"><a @click="showCenterVisible = true">其他ㅤ〉</a></view>-->
 				<!-- @tap="showModal" data-target="DialogModal1" -->
 				<!-- @tap="changeModalStaus" @click="showCenterVisible = true" -->
 			</view>
@@ -177,8 +177,8 @@
 		data: function() {
 			return {
 				address: '',
-				userid:'',
-				permissionsInformation:[],
+				userid: '',
+				permissionsInformation: [],
 				badge: 22,
 				drawerList: [],
 				plusDrawerList: [],
@@ -193,6 +193,7 @@
 				cardCur: 0,
 				dotStyle: false,
 				windowWidth: '',
+				leftNavigationtitle: '监视功能分组',
 				windowHeight: '',
 				spopupWrapperHeight: "",
 				windStationListHeight: '',
@@ -1183,11 +1184,13 @@
 		// 	}
 		// 	this.windStationListHeight=(this.windStation.length*50+40)+"px"
 		// },
-		onShow() {
+		onShow: function() {
 			this.address = this.dataprocessing.getWindPowerStationName();
 			this.FDC = this.dataprocessing.getWindPowerStationId();
 			this.windPowerStationId = this.dataprocessing.getWindPowerStationId();
 
+			this.viewUserid();
+			this.monitoringAuthority();
 		},
 		created: function() {
 			this.viewUserid();
@@ -1235,58 +1238,10 @@
 		},
 		methods: {
 			viewUserid: function() {
-				let _this = this;
-				_this.userid = uni.getStorageSync('userid')
-				//_this.userid = sessionStorage.getItem('userid');
-				uni.request({
-					url: 'http://' + this.backStageIp + ':' + this.backStagePort + '/GyeeorganController/GyeeOrganList?userid=' +
-						_this.userid,
-					data: {},
-					method: 'GET',
-					success: function(res) {
-						for (let i = 0; i < res.data.data.length; i++) {
-							// _this.name.push(res.data.data[i].describes);
-							// _this.windId.push(res.data.data[i].name);
-						}
-						for (let j = 0; j < res.data.data.length; j++) {
-							var a = {};
-							_this.$set(a, "name", res.data.data[j].describes);
-							_this.$set(a, "windId", res.data.data[j].name);
-							_this.plusDrawerList.push(a);
-						}
-					},
-				})
+				this.plusDrawerList = uni.getStorageSync('plusList');
 			},
 			monitoringAuthority: function() {
-				let _this = this;
-				_this.userid = uni.getStorageSync('userid')
-				uni.request({
-					url: 'http://' + this.backStageIp + ':' + this.backStagePort +
-						'/GyeepermissionController/GyeePermissionList?userid=' + _this.userid,
-					data: {},
-					method: 'GET',
-					success: function(res) {
-						console.log(res);
-						for (let i = 0; i < res.data.data.length; i++) {
-							if (res.data.data[i].describes == "监视") {
-								var b = {};
-								_this.$set(b, "gyeePermissionList", res.data.data[i].gyeePermissionList);
-								_this.permissionsInformation.push(b);
-								console.log(_this.permissionsInformation);
-								for (let k = 0; k < _this.permissionsInformation[0].gyeePermissionList.length; k++) {
-									if (_this.permissionsInformation[0].gyeePermissionList[k].parent == 1) {
-										var c = {};
-										var d = {};
-										_this.$set(c, "name", _this.permissionsInformation[0].gyeePermissionList[k].permisssionname);
-										_this.$set(c, "remark1", _this.permissionsInformation[0].gyeePermissionList[k].remark1);
-										_this.drawerList.push(c);
-									}
-								}
-								console.log(_this.drawerList)
-							}
-						}
-					}
-				})
+				this.drawerList = uni.getStorageSync('leftlist1');
 			},
 			pushWindPowerStationNameToSessionStorage(windpowerstationName) {
 				uni.setStorageSync('windpowerstationName', windpowerstationName);
@@ -1299,7 +1254,8 @@
 				return uni.getStorageSync('windpowerstationName');
 			},
 			openDrawer: function() {
-				this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList);
+				//this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList);
+				this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList, this.leftNavigationtitle);
 			},
 			openPlusDrawer(e) {
 				this.modalName = e.currentTarget.dataset.target;
@@ -1335,8 +1291,8 @@
 					_this.choiceIndex = -1;
 					_this.cardCur = index;
 				}, 1000);
-				this.FDC =this.dataprocessing.getWindPowerStationNameById(item);
-				
+				this.FDC = this.dataprocessing.getWindPowerStationNameById(item);
+
 				this.dataprocessing.putWindPowerStationId(this.FDC);
 			},
 			getWindMotorStatusCard: function() {
@@ -1472,7 +1428,6 @@
 
 						if (this.windStation[i].search('风电场') != -1) {
 
-							this.address = this.windStation[i];
 							this.windStationName = this.windStation[i].replace('风电场', '');
 						} else {
 							this.windStationName = this.windStation[i];

components/weatherProphethomepage/WeatherProphethomepage.vue

@@ -1,20 +1,20 @@
 <template>
 	<view class="content">
 		<cu-custom bgColor="bg-blacks" :isBack="false">
-		    <block slot="right">
+			<block slot="right">
 				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-left: 2%;" @tap="openDrawer"></image>
 			</block>
-			<block slot="right">	
-					<view class="icon cuIcon-notice text-white" v-if="badge != 0" style="margin-left: -70%;">
-						<view class="cu-tag looknumber" style="margin-top: -2%;">
-							<block v-if="badge != 1">{{ badge > 99 ? '99+' : badge }}</block>
-						</view>
+			<block slot="right">
+				<view class="icon cuIcon-notice text-white" v-if="badge != 0" style="margin-left: -70%;">
+					<view class="cu-tag looknumber" style="margin-top: -2%;">
+						<block v-if="badge != 1">{{ badge > 99 ? '99+' : badge }}</block>
 					</view>
+				</view>
 			</block>
 			<block slot="right">
-					
+
 			</block>
-		    <block slot="content">{{address}}</block>
+			<block slot="content">{{address}}</block>
 			<block slot="right">
 				<view class="plus" @tap="showModal" data-target="viewModal">+</view>
 			</block>
@@ -35,11 +35,13 @@
 				 @click="weatherFromeighttofifteendays()">8~15天</view>
 				<view :class="[weatherFortydaysbutton?'weatherFortydayswhite':'weatherFortydays']" @click="weatherFortydays()">40天</view>
 			</view>
-				
+
 			<!--风场选项卡-->
 			<view class="windStationNameAndChoice">
-				<view class="windStationName">{{ windStationName }}</view>
-				<view class="windStationChoice"><a @click="showCenterVisible = true">其他ㅤ〉</a></view>
+
+				<view class="windStationName"></view>
+				<!--<view class="windStationName">{{ windStationName }}</view>
+				<view class="windStationChoice"><a @click="showCenterVisible = true">其他ㅤ〉</a></view>-->
 			</view>
 			<s-popup custom-class="center-popup" position="center" v-model="showCenterVisible">
 				<view class="s-popup-wrapper" :style="{'height': spopupWrapperHeight}">
@@ -407,9 +409,9 @@
 							</view>
 						</view>
 
-						<scroll-view scroll-x scroll-with-animation :scroll-left=scrollposition class="scrollUcharts" @touchstart="topblock" @scroll="uChartsScrollEvent"
-						 :scroll-into-view="'uCharts-'+mainCur">
-							<view class="qiun-charts" >
+						<scroll-view scroll-x scroll-with-animation :scroll-left=scrollposition class="scrollUcharts" @touchstart="topblock"
+						 @scroll="uChartsScrollEvent" :scroll-into-view="'uCharts-'+mainCur">
+							<view class="qiun-charts">
 								<canvas canvas-id="canvasLineA" id="canvasLineA" class="charts"></canvas>
 							</view>
 						</scroll-view>
@@ -418,10 +420,10 @@
 				</view>
 				<div>
 
-					<scroll-view scroll-y scroll-with-animation :scroll-top=scrollpositiontmp class="scrollList" :style="{'height': scrollHeight }"  @touchstart="bottomblock"
-					 @scroll="listScrollEvent">					
+					<scroll-view scroll-y scroll-with-animation :scroll-top=scrollpositiontmp class="scrollList" :style="{'height': scrollHeight }"
+					 @touchstart="bottomblock" @scroll="listScrollEvent">
 						<weatherCalendarCardList8_15 ref="weatherCalendarCardList8_15"></weatherCalendarCardList8_15>
-					
+
 					</scroll-view>
 
 				</div>
@@ -444,8 +446,8 @@
 							</view>
 						</view>
 						<view @tap="topblock_40">
-							<scroll-view scroll-x scroll-with-animation :scroll-left=scrollposition_uCharts class="scrollUcharts40" @touchstart="topblock_40" @scroll="uChartsScrollEvent40"
-							 :scroll-into-view="'uCharts-'+mainCur40">
+							<scroll-view scroll-x scroll-with-animation :scroll-left=scrollposition_uCharts class="scrollUcharts40"
+							 @touchstart="topblock_40" @scroll="uChartsScrollEvent40" :scroll-into-view="'uCharts-'+mainCur40">
 								<view class="qiun-charts40">
 									<canvas canvas-id="canvasLineA40" id="canvasLineA40" class="charts40"></canvas>
 								</view>
@@ -455,7 +457,7 @@
 				</view>
 				<view @tap="topbottom_40">
 					<scroll-view scroll-y scroll-with-animation :scroll-top=scrollposition_list class="scrollList40" :style="{'height': scrollListHeight40 }"
-					 @scroll="listScrollEvent40" @touchstart="bottomblock_40" >
+					 @scroll="listScrollEvent40" @touchstart="bottomblock_40">
 						<weatherCalendarCardList40 ref="weatherCalendarCardList40"></weatherCalendarCardList40>
 					</scroll-view>
 				</view>
@@ -489,11 +491,11 @@
 		},
 		data() {
 			return {
-				userid:'',
-				name:[],
-				windId:[],
-				socketTaskHourId:'',
-				outThreeLineDrawerIsShow:false,
+				userid: '',
+				name: [],
+				windId: [],
+				socketTaskHourId: '',
+				outThreeLineDrawerIsShow: false,
 				badge: 22,
 				modalName: null,
 				inconList: ["form", "favor", "question", "edit"],
@@ -511,7 +513,7 @@
 				spopupWrapperHeight: "",
 				windStationListHeight: '',
 				drawerList: [],
-				leftNavigationtitle:'预测功能分组',
+				leftNavigationtitle: '预测功能分组',
 				plusDrawerList: [],
 				utils: utils,
 				margintop: '',
@@ -655,11 +657,11 @@
 				windowWidth: "",
 				windowHeight: "",
 				windowWidth7: "",
-				windowHeight7:"",
+				windowHeight7: "",
 				windowWidth8_15: "",
-				windowHeight8_15:"",
+				windowHeight8_15: "",
 				windowWidth40: "",
-				windowHeight40:"",
+				windowHeight40: "",
 				ziHeight: '',
 				fontSize: '',
 				xianHeight: '',
@@ -811,20 +813,22 @@
 				xianHeight7: '',
 				nightmarginleft7: '',
 				socketTask7: '',
-				userCanviewthewindfarm:[],
-				permissionsInformation:[],
-				timer:null
+				userCanviewthewindfarm: [],
+				permissionsInformation: [],
+				timer: null
 			}
 		},
 		created: function() {
 			// this.pushWindPowerStationNameToSessionStorage("麻黄山");
 			this.viewUserid();
 			this.monitoringAuthority();
-			
+
 			this.address = this.dataprocessing.getWindPowerStationName();
-			this.FDC=this.dataprocessing.getWindPowerStationId();
-			this.windPowerStationId =this.dataprocessing.getWindPowerStationId();
-			
+
+			this.FDC = this.dataprocessing.getWindPowerStationNameByWeatherId(this.address);
+
+
+
 			this.$nextTick(function() {
 				this.getWeatherDataToday();
 				this.getWeatherData7();
@@ -833,104 +837,109 @@
 			this.cHeight = uni.upx2px(350);
 			this.cWidth40 = uni.upx2px(5000);
 			this.cHeight40 = uni.upx2px(350);
-			
-			this.windStation =this.dataprocessing.getWindPowerStationNameByNames(this.address);
+
+			this.windStation = this.dataprocessing.getWindPowerStationNameByNames(this.address);
 			this.windStationName = this.windStation[0].replace('风电场', '');
-			
+
 			this.windStationListHeight = this.windStation.length * 50 + 40 + 'px';
 			this.spopupWrapperHeight = this.windStation.length * 50 + 90 + 'px';
 			this.windowWidth = uni.getSystemInfoSync().windowWidth;
 			this.windowHeight = uni.getSystemInfoSync().windowHeight;
 			if (this.windowWidth >= 768) {
-				this.margintop="60px";
-				this.margintopThree="80px";
-				this.messageTop="10px";
-				this.fontSize="18px";
-				this.xianHeight="168px";
-				this.marginleftBiao="50px";
+				this.margintop = "60px";
+				this.margintopThree = "80px";
+				this.messageTop = "10px";
+				this.fontSize = "18px";
+				this.xianHeight = "168px";
+				this.marginleftBiao = "50px";
 			} else {
-				this.margintop="3.5%";
-				this.margintopThree="3.5%";
-				this.fontSize="14px";
-				this.xianHeight="85%";
-				this.marginleftBiao="26px";
+				this.margintop = "3.5%";
+				this.margintopThree = "3.5%";
+				this.fontSize = "14px";
+				this.xianHeight = "85%";
+				this.marginleftBiao = "26px";
 			}
 			this.heightToday = parseInt(uni.getSystemInfoSync().windowHeight - 440) + "px";
 			this.widthToday = parseInt(uni.getSystemInfoSync().windowWidth) + "px";
-			
+
 			this.windowWidth7 = uni.getSystemInfoSync().windowWidth;
 			this.windowHeight7 = uni.getSystemInfoSync().windowHeight;
-			if(this.windowWidth7>=768){
-				this.margintop7="60px";
-				this.margintopThree7="80px";
-				this.messageTop7="10px";
-				this.fontSize7="18px";
-				this.xianHeight7="168px";
-				this.nightmarginleft7="20px";
-			}else{
-				this.margintop7="3.5%";
-				this.margintopThree7="3.5%";
-				this.fontSize7="14px";
-				this.xianHeight7="85%";
-				this.nightmarginleft7="20px";
+			if (this.windowWidth7 >= 768) {
+				this.margintop7 = "60px";
+				this.margintopThree7 = "80px";
+				this.messageTop7 = "10px";
+				this.fontSize7 = "18px";
+				this.xianHeight7 = "168px";
+				this.nightmarginleft7 = "20px";
+			} else {
+				this.margintop7 = "3.5%";
+				this.margintopThree7 = "3.5%";
+				this.fontSize7 = "14px";
+				this.xianHeight7 = "85%";
+				this.nightmarginleft7 = "20px";
 			}
 			this.height7 = parseInt(uni.getSystemInfoSync().windowHeight - 440) + "px";
 			this.width7 = parseInt(uni.getSystemInfoSync().windowWidth) + "px";
-			
+
 			this.windowWidth8_15 = uni.getSystemInfoSync().windowWidth;
 			this.windowHeight8_15 = uni.getSystemInfoSync().windowHeight;
-			if(this.windowWidth8_15>=768){
-				this.width="99";
-				this.choiceFontSize="22px";
-				this.choiceMarginTop="27.5px";
-				this.xAxisFontSize=18;
-				this.seriesTextSize=18;
-				this.cardWidth=100;
-				this.cardHeight=130;
-				this.scrollHeight=(this.windowHeight8_15-550)+"px";
-			}
-			else{
-				this.width="100";
-				this.choiceFontSize="15px";
-				this.choiceMarginTop="0";
-				this.xAxisFontSize=12;
-				this.seriesTextSize=12;
-				this.cardWidth=100;
-				this.cardHeight=100;
-				this.scrollHeight=(this.windowHeight8_15-360)+"px";
+			if (this.windowWidth8_15 >= 768) {
+				this.width = "99";
+				this.choiceFontSize = "22px";
+				this.choiceMarginTop = "27.5px";
+				this.xAxisFontSize = 18;
+				this.seriesTextSize = 18;
+				this.cardWidth = 100;
+				this.cardHeight = 130;
+				this.scrollHeight = (this.windowHeight8_15 - 550) + "px";
+			} else {
+				this.width = "100";
+				this.choiceFontSize = "15px";
+				this.choiceMarginTop = "0";
+				this.xAxisFontSize = 12;
+				this.seriesTextSize = 12;
+				this.cardWidth = 100;
+				this.cardHeight = 100;
+				this.scrollHeight = (this.windowHeight8_15 - 360) + "px";
 			}
 			this.windowWidth40 = uni.getSystemInfoSync().windowWidth;
 			this.windowHeight40 = uni.getSystemInfoSync().windowHeight;
-			if(this.windowWidth40>=768){
-				this.choiceFontSize40="22px";
-				this.choiceMarginTop40="27.5px";
-				this.xAxisFontSize40=18;
-				this.seriesTextSize40=18;
-				this.cardWidth40=100;
-				this.cardHeight40=130;
-				this.scrollListHeight40=(this.windowHeight40-550)+"px";
-			}else{
-				this.choiceFontSize40="15px";
-				this.choiceMarginTop40="0";
-				this.xAxisFontSize40=12;
-				this.seriesTextSize40=12;
-				this.cardWidth40=100;
-				this.cardHeight40=100;
-				this.scrollListHeight40=(this.windowHeight40-360)+"px";
+			if (this.windowWidth40 >= 768) {
+				this.choiceFontSize40 = "22px";
+				this.choiceMarginTop40 = "27.5px";
+				this.xAxisFontSize40 = 18;
+				this.seriesTextSize40 = 18;
+				this.cardWidth40 = 100;
+				this.cardHeight40 = 130;
+				this.scrollListHeight40 = (this.windowHeight40 - 550) + "px";
+			} else {
+				this.choiceFontSize40 = "15px";
+				this.choiceMarginTop40 = "0";
+				this.xAxisFontSize40 = 12;
+				this.seriesTextSize40 = 12;
+				this.cardWidth40 = 100;
+				this.cardHeight40 = 100;
+				this.scrollListHeight40 = (this.windowHeight40 - 360) + "px";
 			}
 		},
-		onShow() {
-			
-			this.address = this.dataprocessing.getWindPowerStationName();
-			this.FDC=this.dataprocessing.getWindPowerStationId();
-			this.windPowerStationId =this.dataprocessing.getWindPowerStationId();
+		onShow: function() {
+
+		this.viewUserid();
+		this.monitoringAuthority();
 			
 			this.getWeatherData();
 			this.getWeatherDataToday();
 			this.getWeatherData7();
 		},
 		onLoad: function() {
-			this.address = this.getWindPowerStationNameToSessionStorage();
+			this.address = this.dataprocessing.getWindPowerStationName();
+			
+			this.FDC = this.dataprocessing.getWindPowerStationNameByWeatherId(this.address);
+			
+			
+			this.viewUserid();
+			this.monitoringAuthority();
+			
 			this.cWidth = uni.upx2px(2000);
 			this.cHeight = uni.upx2px(350);
 			this.getServerData();
@@ -944,81 +953,26 @@
 			this.hideModal();
 		},
 		computed: {
-					backStageIp: function() {
-						return this.$store.state.wholeSituationBackStageIp;
-					},
-					backStagePort: function() {
-						return this.$store.state.wholeSituationBackStagePort;
-					},
-					windpowerstationNameToId: function() {
-						return this.$store.state.windpowerstationNameToId;
-					}
-				},
+			backStageIp: function() {
+				return this.$store.state.wholeSituationBackStageIp;
+			},
+			backStagePort: function() {
+				return this.$store.state.wholeSituationBackStagePort;
+			},
+			windpowerstationNameToId: function() {
+				return this.$store.state.windpowerstationNameToId;
+			}
+		},
 		methods: {
-			viewUserid:function(){
-				let _this = this;
-				_this.userid =uni.getStorageSync('userid')
-				//_this.userid = sessionStorage.getItem('userid');
-				uni.request({
-					url: 'http://' + this.backStageIp + ':' + this.backStagePort + '/GyeeorganController/GyeeOrganList?userid=' + _this.userid,
-					data: {},
-					method: 'GET',
-					success: function(res) {
-						for(let i=0;i<res.data.data.length;i++){
-							// _this.name.push(res.data.data[i].describes);
-							// _this.windId.push(res.data.data[i].name);
-						}
-						for(let j=0;j<res.data.data.length;j++){
-							var a = {};
-							_this.$set(a,"name",res.data.data[j].describes);
-							
-							if (res.data.data[j].describes == '宁夏新能源公司') {
-								_this.$set(a,"windId",'MHS_FDC');
-							}else if(res.data.data[j].describes == '河北能源集团')
-							{
-								_this.$set(a,"windId",'CL_FDC');
-							}else{
-								_this.$set(a,"windId",res.data.data[j].name);
-							}
-							
-							_this.plusDrawerList.push(a);
-						}
-					},
-					})
+			viewUserid: function() {
+				this.plusDrawerList = uni.getStorageSync('plusList_we');
 			},
-			monitoringAuthority:function(){
-				let _this = this;
-				uni.request({
-					url: 'http://' + this.backStageIp + ':' + this.backStagePort +
-						'/GyeepermissionController/GyeePermissionList?userid=' + _this.userid,
-					data: {},
-					method: 'GET',
-					success: function(res) {
-						console.log(res);
-						for (let i = 0; i < res.data.data.length; i++) {
-							if (res.data.data[i].describes == "预测") {
-								var b = {};
-								_this.$set(b, "gyeePermissionList", res.data.data[i].gyeePermissionList);
-								_this.permissionsInformation.push(b);
-								console.log(_this.permissionsInformation);
-								for (let k = 0; k < _this.permissionsInformation[0].gyeePermissionList.length; k++) {
-									if (_this.permissionsInformation[0].gyeePermissionList[k].parent == 3) {
-										var c = {};
-										var d = {};
-										_this.$set(c, "name", _this.permissionsInformation[0].gyeePermissionList[k].permisssionname);
-										_this.$set(c, "remark1",_this.permissionsInformation[0].gyeePermissionList[k].remark1);
-										_this.drawerList.push(c);
-									}
-								}
-								console.log(_this.drawerList)
-							}
-						}
-					}
-				})
+			monitoringAuthority: function() {
+				this.drawerList = uni.getStorageSync('leftlist3');
 			},
 			openDrawer: function() {
-				this.outThreeLineDrawerIsShow=true;
-				this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList,this.leftNavigationtitle);
+				this.outThreeLineDrawerIsShow = true;
+				this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList, this.leftNavigationtitle);
 			},
 			closeDrawer: function() {
 				this.drawerIsShow = false;
@@ -1050,8 +1004,8 @@
 					_this.choiceIndex = -1;
 					_this.cardCur = index;
 				}, 1000);
-				
-				this.FDC =this.dataprocessing.getWindPowerStationNameByWeatherId(item);
+
+				this.FDC = this.dataprocessing.getWindPowerStationNameByWeatherId(item);
 
 				this.dataprocessing.putWindPowerStationId(this.FDC);
 				//uni.setStorageSync('windPowerStationId',this.FDC);
@@ -1164,9 +1118,8 @@
 						//console.log("收到服务器内容：" + res.data);
 						_this.weatherProphetDataAll_17Hour = res.data;
 						_this.weatherProphetDataAll_17Hour = JSON.parse(res.data);
-						
-						if(_this.weatherProphetDataAll_17Hour.length!=0)
-						{
+
+						if (_this.weatherProphetDataAll_17Hour.length != 0) {
 							_this.weatherProphetData_17Hour = [];
 							//判断风场id 40天
 							for (let i1 = 0; i1 < _this.weatherProphetDataAll_17Hour.length; i1++) {
@@ -1178,7 +1131,7 @@
 							// console.log(_this.weatherProphetData_17Hour)
 							_this.$nextTick(function() {
 								if (_this.$refs.thermometerCard == undefined) {
-							
+
 								} else {
 									_this.$refs.thermometerCard.getHourWeatherData("90", "260", _this.weatherProphetData_17Hour, _this.weatherProphetData_1);
 								}
@@ -1637,72 +1590,72 @@
 					}
 				});
 			},
-			topblock(){
+			topblock() {
 				this.block = "top";
 			},
-			bottomblock(){
+			bottomblock() {
 				this.block = "bottom";
 			},
-			topblock_40(){
+			topblock_40() {
 				this.block_40 = "top";
 			},
-			bottomblock_40(){
+			bottomblock_40() {
 				this.block_40 = "bottom";
 			},
 			uChartsScrollEvent(e) {
 				//this.topblock();
-               if(this.block=="top"){
-				   this.scrollpositiontmp = e.detail.scrollLeft;
-			   }
-			   
+				if (this.block == "top") {
+					this.scrollpositiontmp = e.detail.scrollLeft;
+				}
+
 				// let scrollposition2 = scrollposition*0.98;
 			},
 			listScrollEvent(e) {
 				//this.bottomblock();
-				if(this.block=="bottom"){
-				   this.scrollposition = e.detail.scrollTop;
+				if (this.block == "bottom") {
+					this.scrollposition = e.detail.scrollTop;
 				}
 			},
 			uChartsScrollEvent40(e) {
-				if(this.block_40=="top"){
-				// this.scrollposition_uCharts = e.detail.scrollLeft;
-				if (e.detail.scrollLeft < 237) {
-					this.scrollposition_list = 0;
-				} else if (e.detail.scrollLeft < 487 && e.detail.scrollLeft > 237) {
-					this.scrollposition_list = 104;
-				} else if (e.detail.scrollLeft < 737 && e.detail.scrollLeft > 487) {
-					this.scrollposition_list = 208;
-				} else if (e.detail.scrollLeft < 987 && e.detail.scrollLeft > 737) {
-					this.scrollposition_list = 312;
-				} else if (e.detail.scrollLeft < 1237 && e.detail.scrollLeft > 987) {
-					this.scrollposition_list = 416;
-				} else if (e.detail.scrollLeft < 1487 && e.detail.scrollLeft > 1237) {
-					this.scrollposition_list = 520;
-				} else if (e.detail.scrollLeft < 1737 && e.detail.scrollLeft > 1487) {
-					this.scrollposition_list = 624;
-				} else if (e.detail.scrollLeft > 1737) {
-					this.scrollposition_list = 656;
-				}
+				if (this.block_40 == "top") {
+					// this.scrollposition_uCharts = e.detail.scrollLeft;
+					if (e.detail.scrollLeft < 237) {
+						this.scrollposition_list = 0;
+					} else if (e.detail.scrollLeft < 487 && e.detail.scrollLeft > 237) {
+						this.scrollposition_list = 104;
+					} else if (e.detail.scrollLeft < 737 && e.detail.scrollLeft > 487) {
+						this.scrollposition_list = 208;
+					} else if (e.detail.scrollLeft < 987 && e.detail.scrollLeft > 737) {
+						this.scrollposition_list = 312;
+					} else if (e.detail.scrollLeft < 1237 && e.detail.scrollLeft > 987) {
+						this.scrollposition_list = 416;
+					} else if (e.detail.scrollLeft < 1487 && e.detail.scrollLeft > 1237) {
+						this.scrollposition_list = 520;
+					} else if (e.detail.scrollLeft < 1737 && e.detail.scrollLeft > 1487) {
+						this.scrollposition_list = 624;
+					} else if (e.detail.scrollLeft > 1737) {
+						this.scrollposition_list = 656;
+					}
 				}
 			},
 			listScrollEvent40(e) {
-				if(this.block_40=="bottom"){
-				// this.scrollposition_list = e.detail.scrollTop;
-				if (e.detail.scrollTop < 104) {
-					this.scrollposition_uCharts = 0;
-				} else if (e.detail.scrollTop < 208 && e.detail.scrollTop > 104) {
-					this.scrollposition_uCharts = 237;
-				} else if (e.detail.scrollTop < 312 && e.detail.scrollTop > 208) {
-					this.scrollposition_uCharts = 487;
-				} else if (e.detail.scrollTop < 416 && e.detail.scrollTop > 312) {
-					this.scrollposition_uCharts = 737;
-				} else if (e.detail.scrollTop < 520 && e.detail.scrollTop > 416) {
-					this.scrollposition_uCharts = 987;
-				} else if (e.detail.scrollTop < 624 && e.detail.scrollTop > 520) {
-					this.scrollposition_uCharts = 1237;
-				} else if (e.detail.scrollTop < 656 && e.detail.scrollTop > 624) {
-					this.scrollposition_uCharts = 1487;
-				}
+				if (this.block_40 == "bottom") {
+					// this.scrollposition_list = e.detail.scrollTop;
+					if (e.detail.scrollTop < 104) {
+						this.scrollposition_uCharts = 0;
+					} else if (e.detail.scrollTop < 208 && e.detail.scrollTop > 104) {
+						this.scrollposition_uCharts = 237;
+					} else if (e.detail.scrollTop < 312 && e.detail.scrollTop > 208) {
+						this.scrollposition_uCharts = 487;
+					} else if (e.detail.scrollTop < 416 && e.detail.scrollTop > 312) {
+						this.scrollposition_uCharts = 737;
+					} else if (e.detail.scrollTop < 520 && e.detail.scrollTop > 416) {
+						this.scrollposition_uCharts = 987;
+					} else if (e.detail.scrollTop < 624 && e.detail.scrollTop > 520) {
+						this.scrollposition_uCharts = 1237;
+					} else if (e.detail.scrollTop < 656 && e.detail.scrollTop > 624) {
+						this.scrollposition_uCharts = 1487;
+					}
 				}
 			},
 			changeTap: function(item) {
@@ -1782,14 +1735,17 @@
 		overflow-x: hidden;
 		overflow-y: hidden;
 	}
+
 	.notice {
 		width: 50px;
 		height: 45px;
 		float: left;
 	}
-	.icon{
+
+	.icon {
 		font-size: 40upx;
 	}
+
 	.plus {
 		width: 30px;
 		height: 45px;
@@ -1800,7 +1756,7 @@
 		text-align: right;
 		margin-right: 2.5%;
 	}
-	
+
 	.DrawerPage {
 		position: fixed;
 		width: 100vw;
@@ -1809,14 +1765,14 @@
 		background-color: #1f1f1f;
 		transition: all 0.4s;
 	}
-	
+
 	.DrawerPage.show {
 		transform: scale(0.9, 0.9);
 		left: 85vw;
 		box-shadow: 0 0 60upx rgba(0, 0, 0, 0.2);
 		transform-origin: 0;
 	}
-	
+
 	.DrawerWindow {
 		position: absolute;
 		width: 85vw;
@@ -1829,13 +1785,13 @@
 		transition: all 0.4s;
 		padding: 100upx 0;
 	}
-	
+
 	.DrawerWindow.show {
 		transform: scale(1, 1) translateX(0%);
 		opacity: 1;
 		pointer-events: all;
 	}
-	
+
 	.DrawerClose {
 		position: absolute;
 		width: 40vw;
@@ -1854,14 +1810,14 @@
 		pointer-events: none;
 		transition: all 0.4s;
 	}
-	
+
 	.DrawerClose.show {
 		opacity: 1;
 		pointer-events: all;
 		width: 15vw;
 		color: #fff;
 	}
-	
+
 	.DrawerPage .cu-bar.tabbar .action button.cuIcon {
 		width: 64upx;
 		height: 64upx;
@@ -1869,20 +1825,20 @@
 		margin: 0;
 		display: inline-block;
 	}
-	
+
 	.DrawerPage .cu-bar.tabbar .action .cu-avatar {
 		margin: 0;
 	}
-	
+
 	.DrawerPage .nav {
 		flex: 1;
 	}
-	
+
 	.DrawerPage .nav .cu-item.cur {
 		border-bottom: 0;
 		position: relative;
 	}
-	
+
 	.DrawerPage .nav .cu-item.cur::after {
 		content: '';
 		width: 10upx;
@@ -1895,7 +1851,7 @@
 		right: 0;
 		margin: auto;
 	}
-	
+
 	.DrawerPage .cu-bar.tabbar .action {
 		flex: initial;
 	}
@@ -2111,7 +2067,7 @@
 
 	.scrollList {
 		height: 750upx;
-		margin-top: 40upx ;
+		margin-top: 40upx;
 	}
 
 	.cardContenter40 {
@@ -2322,7 +2278,7 @@
 		color: #333333;
 	}
 
-	
+
 
 	.weatherDetails {
 		margin-top: 0%;
@@ -2374,7 +2330,7 @@
 		border-right-color: #19B5BC;
 	}
 
-/* 	.scrollList {
+	/* 	.scrollList {
 		// height:20%;
 		height: 130px;
 		width: 95%;
@@ -2626,4 +2582,4 @@
 		width: 100%;
 		margin-left: -15px;
 	}
-</style>
+</style>

components/windStationCardDetail/WindStationCardDetail.vue

@@ -56,11 +56,11 @@
 				</view>
 				<view class="frameCardMiddle">
 					月利用小时(h):
-					<a class="frameCardMiddleValue"><view style="font-size: 12px;position: absolute;transform: scale(0.8);margin-left: -5.5%;margin-top: 0.3%;">{{windpowerstationdetail.windpowerstationdetail_springbox_target.ylyxs}}</view></a>
+					<a class="frameCardMiddleValue"><view style="font-size: 10px;position: absolute;transform: scale(0.8);margin-left: -5.5%;margin-top: 0.3%;">{{windpowerstationdetail.windpowerstationdetail_springbox_target.ylyxs}}</view></a>
 				</view>
 				<view class="frameCardRight">
 					综合场用电率(%):
-					<a class="frameCardRightValue"><view style="font-size: 12px;position: absolute;transform: scale(0.8);margin-left: -5.5%;margin-top: 0.3%;">{{windpowerstationdetail.windpowerstationdetail_springbox_target.zhcydl}}</view></a>
+					<a class="frameCardRightValue"><view style="font-size: 11px;position: absolute;transform: scale(0.8);margin-left: -5.5%;margin-top: 0.3%;">{{windpowerstationdetail.windpowerstationdetail_springbox_target.zhcydl}}</view></a>
 				</view>
 				<view class="frameCardLeft">
 					mtbf(h):
@@ -68,7 +68,7 @@
 				</view>
 				<view class="frameCardMiddle">
 					年利用小时(h):
-					<a class="frameCardMiddleValue"><view style="font-size: 12px;position: absolute;transform: scale(0.80);margin-left: -5.5%;margin-top: 0.3%;">{{windpowerstationdetail.windpowerstationdetail_springbox_target.nlyxs}}</view></a>
+					<a class="frameCardMiddleValue"><view style="font-size: 10px;position: absolute;transform: scale(0.80);margin-left: -5.5%;margin-top: 0.3%;">{{windpowerstationdetail.windpowerstationdetail_springbox_target.nlyxs}}</view></a>
 				</view>
 				<view class="frameCardRight">
 					设备可利用率(%):
@@ -676,7 +676,7 @@
 						position: 'top',
 						float: 'right'
 					},
-					fontSize: 11,
+					fontSize:8,
 					background: '#121212',
 					pixelRatio: _self.pixelRatio,
 					animation: true,

pages/forecast/Forecast.vue

@@ -299,8 +299,6 @@ export default {
 	},
 	mounted() {
 		//document.querySelector('body').setAttribute('style', 'background-color:#000000');
-	},onShow(){
-		this.leftbar();
 	},created: function() {
 		// this.pushWindPowerStationNameToSessionStorage("麻黄山");
 		this.viewUserid();
@@ -402,57 +400,11 @@ export default {
 	},
 	
 	methods: {
-		viewUserid:function(){
-			let _this = this;
-			_this.userid =uni.getStorageSync('userid')
-			//_this.userid = sessionStorage.getItem('userid');
-			uni.request({
-				url: 'http://' + this.backStageIp + ':' + this.backStagePort + '/GyeeorganController/GyeeOrganList?userid=' + _this.userid,
-				data: {},
-				method: 'GET',
-				success: function(res) {
-					for(let i=0;i<res.data.data.length;i++){
-						// _this.name.push(res.data.data[i].describes);
-						// _this.windId.push(res.data.data[i].name);
-					}
-					for(let j=0;j<res.data.data.length;j++){
-						var a = {};
-						_this.$set(a,"name",res.data.data[j].describes);
-						_this.$set(a,"windId",res.data.data[j].name);
-						_this.plusDrawerList.push(a);
-					}
-				},
-				})
+		viewUserid: function() {
+			this.plusDrawerList=uni.getStorageSync('plusList');
 		},
-		monitoringAuthority:function(){
-			let _this = this;
-			uni.request({
-				url: 'http://' + this.backStageIp + ':' + this.backStagePort +
-					'/GyeepermissionController/GyeePermissionList?userid=' + _this.userid,
-				data: {},
-				method: 'GET',
-				success: function(res) {
-					console.log(res);
-					for (let i = 0; i < res.data.data.length; i++) {
-						if (res.data.data[i].describes == "预测") {
-							var b = {};
-							_this.$set(b, "gyeePermissionList", res.data.data[i].gyeePermissionList);
-							_this.permissionsInformation.push(b);
-							console.log(_this.permissionsInformation);
-							for (let k = 0; k < _this.permissionsInformation[0].gyeePermissionList.length; k++) {
-								if (_this.permissionsInformation[0].gyeePermissionList[k].parent == 3) {
-									var c = {};
-									var d = {};
-									_this.$set(c, "name", _this.permissionsInformation[0].gyeePermissionList[k].permisssionname);
-									_this.$set(c, "remark1",_this.permissionsInformation[0].gyeePermissionList[k].remark1);
-									_this.drawerList.push(c);
-								}
-							}
-							console.log(_this.drawerList)
-						}
-					}
-				}
-			})
+		monitoringAuthority: function() {
+			this.drawerList=uni.getStorageSync('leftlist3');
 		},
 		mapDate(){
 			
@@ -535,9 +487,13 @@ export default {
 			this.$refs.drawer.closeDrawer();
 			this.hideModal();
 		},
-		onShow() {
+		onShow: function() {
+			this.leftbar();
 			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
 			this.address = this.getWindPowerStationNameToSessionStorage();
+			
+			this.viewUserid();
+			this.monitoringAuthority();
 		},
 		showModal(e) {
 			this.kg=false;

pages/index/Index.vue

@@ -961,21 +961,27 @@
 
 			this.timeNow();
 			
+		
 			this.viewUserid();
 			this.monitoringAuthority();
-			
 			this.address = this.dataprocessing.getWindPowerStationName();
 			this.FDC=this.dataprocessing.getWindPowerStationId();
 			this.windPowerStationId =this.dataprocessing.getWindPowerStationId();
 
 
 		},
+		
 		onLoad: function() {
 			let that = this;
 			setTimeout(function() {
 				that.loading = true;
 			}, 500);
 			_self = this;
+			
+			this.address = this.dataprocessing.getWindPowerStationName();
+			this.FDC=this.dataprocessing.getWindPowerStationId();
+			this.windPowerStationId =this.dataprocessing.getWindPowerStationId();
+			
 			this.cWidth = uni.upx2px(750);
 			this.cHeight = uni.upx2px(400);
 			this.getServerData();
@@ -1007,10 +1013,13 @@
 			this.$refs.drawer.closeDrawer();
 			this.hideModal();
 		},
-		onShow() {
+		onShow: function() {
 			this.address = this.dataprocessing.getWindPowerStationName();
 			this.FDC=this.dataprocessing.getWindPowerStationId();
 			this.windPowerStationId =this.dataprocessing.getWindPowerStationId();
+			
+			this.viewUserid();
+			this.monitoringAuthority();
 		},
 		methods: {
 			timeNow(){
@@ -1020,57 +1029,10 @@
 					this.dateNow =  new Date().Format('yyyy年MM月dd hh:mm');
 				}, 60000);
 			},viewUserid: function() {
-				let _this = this;
-				_this.userid = uni.getStorageSync('userid')
-				//_this.userid = sessionStorage.getItem('userid');
-				uni.request({
-					url: 'http://' + this.backStageIp + ':' + this.backStagePort + '/GyeeorganController/GyeeOrganList?userid=' +
-						_this.userid,
-					data: {},
-					method: 'GET',
-					success: function(res) {
-						for (let i = 0; i < res.data.data.length; i++) {
-							// _this.name.push(res.data.data[i].describes);
-							// _this.windId.push(res.data.data[i].name);
-						}
-						for (let j = 0; j < res.data.data.length; j++) {
-							var a = {};
-							_this.$set(a, "name", res.data.data[j].describes);
-							_this.$set(a, "windId", res.data.data[j].name);
-							_this.plusDrawerList.push(a);
-						}
-					},
-				})
+				this.plusDrawerList=uni.getStorageSync('plusList');
 			},
 			monitoringAuthority: function() {
-				let _this = this;
-				uni.request({
-					url: 'http://' + this.backStageIp + ':' + this.backStagePort +
-						'/GyeepermissionController/GyeePermissionList?userid=' + _this.userid,
-					data: {},
-					method: 'GET',
-					success: function(res) {
-						console.log(res);
-						for (let i = 0; i < res.data.data.length; i++) {
-							if (res.data.data[i].describes == "监视") {
-								var b = {};
-								_this.$set(b, "gyeePermissionList", res.data.data[i].gyeePermissionList);
-								_this.permissionsInformation.push(b);
-								console.log(_this.permissionsInformation);
-								for (let k = 0; k < _this.permissionsInformation[0].gyeePermissionList.length; k++) {
-									if (_this.permissionsInformation[0].gyeePermissionList[k].parent == 1) {
-										var c = {};
-										var d = {};
-										_this.$set(c, "name", _this.permissionsInformation[0].gyeePermissionList[k].permisssionname);
-										_this.$set(c, "remark1",_this.permissionsInformation[0].gyeePermissionList[k].remark1);
-										_this.drawerList.push(c);
-									}
-								}
-								console.log(_this.drawerList)
-							}
-						}
-					}
-				})
+				this.drawerList=uni.getStorageSync('leftlist1');
 			},
 			async index_curve_columnar_five_loss() {
 				Date.prototype.Format = function(fmt) {
@@ -1961,6 +1923,8 @@
 			},
 			showModal(e) {
 				this.modalName = e.currentTarget.dataset.target;
+				this.viewUserid();
+				this.monitoringAuthority();
 				this.$refs.plusDrawer.showModal(this.plusDrawerList, this.modalName);
 			},
 			hideModal() {

pages/mine/Mine.vue

@@ -47,66 +47,48 @@
 				badge: 22,
 				inconList:["form","favor","question","edit"],
 				modalName:null,
+				leftNavigationtitle:'我的功能分组',
 				buttonHeight:'',
-				address: '宁夏新能源公司',
-				drawerList: [{
-						"name": "首页"
-					},
-					{
-						"name": "状态监视"
-					},
-					{
-						"name": "矩阵监视"
-					},
-					{
-						"name": "风场监视"
-					},
-					{
-						"name": "人员监视"
-					},
-				],
-				plusDrawerList: [{
-						name: '宁夏新能源公司',
-						windPowerStationId: 'NINGXIAXINNENGYUANGONGSI'
-					},
-					{
-						name: '牛首山风电场',
-						windPowerStationId: 'NSS_FDC'
-					},
-					{
-						name: '香山风电场',
-						windPowerStationId: 'XS_FDC'
-					},
-					{
-						name: '石板泉风电场',
-						windPowerStationId: 'SBQ_FDC'
-					},
-					{
-						name: '青山风电场',
-						windPowerStationId: 'QS_FDC'
-					},
-					{
-						name: '麻黄山风电场',
-						windPowerStationId: 'MHS_FDC'
-					}
-				],
+				address: '',
+				drawerList: [],
+				plusDrawerList: [],
 				
 			}
+		},created: function() {
+
+			this.timeNow();
+			
+		
+			this.viewUserid();
+			this.monitoringAuthority();
+			this.address = this.dataprocessing.getWindPowerStationName();
+			this.FDC=this.dataprocessing.getWindPowerStationId();
+			this.windPowerStationId =this.dataprocessing.getWindPowerStationId();
+
+
 		},
 		onHide() {
 			this.$refs.drawer.closeDrawer();
 			this.hideModal();
 		},
 		onShow(){
-			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
-			this.address = this.getWindPowerStationNameToSessionStorage();
+			this.viewUserid();
+			this.monitoringAuthority();
+			this.address = this.dataprocessing.getWindPowerStationName();
+			this.FDC=this.dataprocessing.getWindPowerStationId();
+			this.windPowerStationId =this.dataprocessing.getWindPowerStationId();
 		},
 		methods:{
 			openDrawer:function(){
-				this.$refs.drawer.openDrawer(250,this.drawerList,this.inconList);
+				this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList,this.leftNavigationtitle);
 			},
 			closeDrawer:function(){
 				this.drawerIsShow=false;
+			},viewUserid: function() {
+				this.plusDrawerList=uni.getStorageSync('plusList');
+			},
+			monitoringAuthority: function() {
+				this.drawerList=uni.getStorageSync('leftlist5');
 			},
 			pushWindPowerStationNameToSessionStorage(windpowerstationName) {
 				uni.setStorageSync('windpowerstationName', windpowerstationName);