Bladeren bron

游客登录调整

shilin 4 jaren geleden
bovenliggende
commit
b07687598e

+ 1 - 0
common/store.js

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

+ 405 - 384
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,405 +45,426 @@
 </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') != '') {
+			},
+			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.setStorageSync('gyeeusername', uni.getStorageSync('fingerPrintname'));
-				uni.setStorageSync('gyeepassword', uni.getStorageSync('fingerPrintpassword'));
-				this.dataprocessing.viewUserid();
-				this.dataprocessing.monitoringAuthority();
+				uni.setStorageSync('userid', _this.$store.state.default_tourist);
+				_this.dataprocessing.viewUserid();
+				_this.dataprocessing.monitoringAuthority();
+				
 				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'
-				});
-			}
-		},
-		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;
-					
-					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);
-						
-						_this.dataprocessing.viewUserid();
-						_this.dataprocessing.monitoringAuthority();
-						// 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 = '网络错误,小程序端请检查合法域名';
+			},
+			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 = '';
 				}
-			});
-		},checkIsSoterEnrolledInDeviceFingerPrint() {
+			},
+			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'));
+					this.dataprocessing.viewUserid();
+					this.dataprocessing.monitoringAuthority();
+					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'
+					});
+				}
+			},
+			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;
+
+						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);
+
+							_this.dataprocessing.viewUserid();
+							_this.dataprocessing.monitoringAuthority();
+							// 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.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;

+ 6 - 53
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>
@@ -193,6 +193,7 @@
 				cardCur: 0,
 				dotStyle: false,
 				windowWidth: '',
+				leftNavigationtitle:'监视功能分组',
 				windowHeight: '',
 				spopupWrapperHeight: "",
 				windStationListHeight: '',
@@ -1235,58 +1236,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_we');
 			},
 			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('leftlist3');
 			},
 			pushWindPowerStationNameToSessionStorage(windpowerstationName) {
 				uni.setStorageSync('windpowerstationName', windpowerstationName);
@@ -1299,7 +1252,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;
@@ -1472,7 +1426,6 @@
 
 						if (this.windStation[i].search('风电场') != -1) {
 
-							this.address = this.windStation[i];
 							this.windStationName = this.windStation[i].replace('风电场', '');
 						} else {
 							this.windStationName = this.windStation[i];

+ 4 - 2
components/weatherProphethomepage/WeatherProphethomepage.vue

@@ -38,8 +38,10 @@
 				
 			<!--风场选项卡-->
 			<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}">