样式修改

pages/analysis/Analysis.vue

@@ -2,19 +2,19 @@
 	<view class="content">
 		<view class="top">
 			<view class="threeLine" @tap="openDrawer">
-				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 10px;margin-left: 10px;"></image>
+				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 18px;margin-left: 10px;"></image>
 			</view>
 			<view class="text">
 				<view class="notice">
 					<view class="icon cuIcon-notice text-white" v-if="badge != 0">
-						<view class="cu-tag looknumber">
+						<view class="cu-tag looknumber" style="margin-top: 10px;">
 							<block v-if="badge != 1">{{ badge > 99 ? '99+' : badge }}</block>
 						</view>
 					</view>
-				</view>				
-				宁夏新能源公司
+				</view>
+				<view class="textWindpowerstation">{{address}}</view>
 			</view>
-			<view class="plus">+</view>
+			<view class="plus" @tap="showModal" data-target="viewModal">+</view>
 		</view>
 		<!-- 抽屉组件 -->
 		<div>
@@ -37,45 +37,95 @@
 				
 			}
 		},
+		onHide() {
+			this.$refs.drawer.closeDrawer();
+			this.hideModal();
+		},
+		onShow(){
+			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
+			this.address = this.getWindPowerStationNameToSessionStorage();
+		},
 		methods:{
 			openDrawer:function(){
 				this.$refs.drawer.openDrawer(250,this.drawerList,this.inconList);
 			},
 			closeDrawer:function(){
 				this.drawerIsShow=false;
-			}
+			},
+			pushWindPowerStationNameToSessionStorage(windpowerstationName) {
+				uni.setStorageSync('windpowerstationName', windpowerstationName);
+				//sessionStorage.setItem('windpowerstationName', windpowerstationName);
+				//alert("v"+ sessionStorage.getItem("windpowerstationName"));
+				//this.common.goback('/pages/index/Index');
+			},
+			getWindPowerStationNameToSessionStorage() {
+				uni.getStorageSync('windpowerstationName');
+				return uni.getStorageSync('windpowerstationName');
+			},
+			showModal(e) {
+				this.modalName = e.currentTarget.dataset.target;
+				this.$refs.plusDrawer.showModal(this.plusDrawerList, this.modalName);
+			},
+			hideModal() {
+				this.modalName = null;
+				this.$refs.plusDrawer.hideModal(this.modalName);
+			},
 		}
 	};
 </script>
 
 <style>
-	page {
+body {
+			font-family:'方正兰亭细黑_GBK';
+			font-size: 20px;
+			color: silver;
+		}
+	@font-face {
+		font-family:'方正兰亭细黑_GBK';
+		src: url(../../static/方正兰亭细黑_GBK.TTF);
 	}
+page {
+		font-family:'方正兰亭细黑_GBK';
+		overflow-x: hidden;
+	}
+
 	.top {
 		width: 100%;
-		height: 95upx;
+		height: 130upx;
 		padding-top: 5upx;
-		background-color: #E93131;
+		background-color: #1f1f1f;
+		position: fixed;
+		top: 0px;
+		left: 0px;
+		z-index: 100;
 	}
+
 	.threeLine {
 		width: 50px;
 		height: 45px;
 		float: left;
 	}
+
 	.text {
 		width: calc(100% - 100px);
 		height: 45px;
 		float: left;
-		color: white;
+		user-select: text;
+		-webkit-user-select: text;
+		-moz-user-select: text;
+		-ms-user-select: text;
+		color: silver;
 		line-height: 45px;
-		text-align: center;
+		margin-top: 11px;
 		font-size: 18px;
 	}
-	.notice{
+
+	.notice {
 		width: 50px;
 		height: 45px;
 		float: left;
 	}
+
 	.plus {
 		width: 50px;
 		height: 45px;
@@ -84,5 +134,14 @@
 		font-size: 35px;
 		line-height: 45px;
 		text-align: center;
+		margin-top: 11px;
+	}
+	.textWindpowerstation{
+		width: 180px;
+		height: 45px;
+		float: left;
+		text-align: center;
+		margin-left: 18px;
 	}
+	
 </style>

pages/forecast/Forecast.vue

@@ -2,19 +2,19 @@
 	<view class="content">
 		<view class="top">
 			<view class="threeLine" @tap="openDrawer">
-				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 10px;margin-left: 10px;"></image>
+				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 18px;margin-left: 10px;"></image>
 			</view>
 			<view class="text">
 				<view class="notice">
 					<view class="icon cuIcon-notice text-white" v-if="badge != 0">
-						<view class="cu-tag looknumber">
+						<view class="cu-tag looknumber" style="margin-top: 10px;">
 							<block v-if="badge != 1">{{ badge > 99 ? '99+' : badge }}</block>
 						</view>
 					</view>
-				</view>				
-				宁夏新能源公司
+				</view>
+				<view class="textWindpowerstation">{{address}}</view>
 			</view>
-			<view class="plus">+</view>
+			<view class="plus" @tap="showModal" data-target="viewModal">+</view>
 		</view>
 		<!-- 抽屉组件 -->
 		<div>
@@ -37,45 +37,95 @@
 				
 			}
 		},
+		onHide() {
+			this.$refs.drawer.closeDrawer();
+			this.hideModal();
+		},
+		onShow(){
+			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
+			this.address = this.getWindPowerStationNameToSessionStorage();
+		},
 		methods:{
 			openDrawer:function(){
 				this.$refs.drawer.openDrawer(250,this.drawerList,this.inconList);
 			},
 			closeDrawer:function(){
 				this.drawerIsShow=false;
-			}
+			},
+			pushWindPowerStationNameToSessionStorage(windpowerstationName) {
+				uni.setStorageSync('windpowerstationName', windpowerstationName);
+				//sessionStorage.setItem('windpowerstationName', windpowerstationName);
+				//alert("v"+ sessionStorage.getItem("windpowerstationName"));
+				//this.common.goback('/pages/index/Index');
+			},
+			getWindPowerStationNameToSessionStorage() {
+				uni.getStorageSync('windpowerstationName');
+				return uni.getStorageSync('windpowerstationName');
+			},
+			showModal(e) {
+				this.modalName = e.currentTarget.dataset.target;
+				this.$refs.plusDrawer.showModal(this.plusDrawerList, this.modalName);
+			},
+			hideModal() {
+				this.modalName = null;
+				this.$refs.plusDrawer.hideModal(this.modalName);
+			},
 		}
 	};
 </script>
 
 <style>
-	page {
+	body {
+			font-family:'方正兰亭细黑_GBK';
+			font-size: 20px;
+			color: silver;
+		}
+	@font-face {
+		font-family:'方正兰亭细黑_GBK';
+		src: url(../../static/方正兰亭细黑_GBK.TTF);
 	}
+page {
+		font-family:'方正兰亭细黑_GBK';
+		overflow-x: hidden;
+	}
+
 	.top {
 		width: 100%;
-		height: 95upx;
+		height: 130upx;
 		padding-top: 5upx;
-		background-color: #E93131;
+		background-color: #1f1f1f;
+		position: fixed;
+		top: 0px;
+		left: 0px;
+		z-index: 100;
 	}
+
 	.threeLine {
 		width: 50px;
 		height: 45px;
 		float: left;
 	}
+
 	.text {
 		width: calc(100% - 100px);
 		height: 45px;
 		float: left;
-		color: white;
+		user-select: text;
+		-webkit-user-select: text;
+		-moz-user-select: text;
+		-ms-user-select: text;
+		color: silver;
 		line-height: 45px;
-		text-align: center;
+		margin-top: 11px;
 		font-size: 18px;
 	}
-	.notice{
+
+	.notice {
 		width: 50px;
 		height: 45px;
 		float: left;
 	}
+
 	.plus {
 		width: 50px;
 		height: 45px;
@@ -84,5 +134,14 @@
 		font-size: 35px;
 		line-height: 45px;
 		text-align: center;
+		margin-top: 11px;
+	}
+	.textWindpowerstation{
+		width: 180px;
+		height: 45px;
+		float: left;
+		text-align: center;
+		margin-left: 18px;
 	}
+	
 </style>

pages/index/Index.vue

@@ -2,17 +2,17 @@
 	<view class="content">
 		<view class="top">
 			<view class="threeLine" @tap="openDrawer">
-				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 8px;margin-left: 10px;"></image>
+				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 18px;margin-left: 10px;"></image>
 			</view>
 			<view class="text">
 				<view class="notice">
 					<view class="icon cuIcon-notice text-white" v-if="badge != 0">
-						<view class="cu-tag looknumber">
+						<view class="cu-tag looknumber" style="margin-top: 10px;">
 							<block v-if="badge != 1">{{ badge > 99 ? '99+' : badge }}</block>
 						</view>
 					</view>
 				</view>
-				{{address}}
+				<view class="textWindpowerstation">{{address}}</view>
 			</view>
 			<view class="plus" @tap="showModal" data-target="viewModal">+</view>
 		</view>
@@ -50,12 +50,12 @@
 					</view>
 				</view>
 				<view class="informationCardTextTwo">
-					<view class="informationCardText2">
+					<view class="informationCardTextNo1">
 						<view class="textSilver" @tap="common.navTo('/components/detail/Detail')">日发电量</view>
 						<view class="textWhite">(kwh)</view>
 						:150
 					</view>
-					<view class="informationCardText2">
+					<view class="informationCardText3">
 						<view class="textSilver" @tap="common.navTo('/components/detail/Detail')">预测发电量</view>
 						<view class="textWhite">(kwh)</view>
 						:15
@@ -267,7 +267,7 @@
 		<view class="windStation">
 			<scroll-view scroll-x class="scrollWindStationCard">
 				<view class="windStationCardContainer">
-					<view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '麻黄山')">
+					<view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '麻黄山风电场')">
 						<view class="windStationTitle">麻黄山风电场</view>
 						<view class="powerAndSpeedContainer">
 							<view class="powerAndSpeedRed">
@@ -1978,7 +1978,7 @@ created: function() {
 
 	.lineChart {
 		width: 100%;
-		height: 200px;
+		height: 225px;
 		background-color: #242424;
 		margin-top: 10px;
 		float: left;
@@ -2002,7 +2002,7 @@ created: function() {
 
 	.top {
 		width: 100%;
-		height: 95upx;
+		height: 130upx;
 		padding-top: 5upx;
 		background-color: #1f1f1f;
 		position: fixed;
@@ -2027,7 +2027,7 @@ created: function() {
 		-ms-user-select: text;
 		color: silver;
 		line-height: 45px;
-		text-align: center;
+		margin-top: 11px;
 		font-size: 18px;
 	}
 
@@ -2045,12 +2045,19 @@ created: function() {
 		font-size: 35px;
 		line-height: 45px;
 		text-align: center;
+		margin-top: 11px;
+	}
+	.textWindpowerstation{
+		width: 180px;
+		height: 45px;
+		float: left;
+		text-align: center;
+		margin-left: 18px;
 	}
-
 	.time {
 		clear: both;
 		background-color: #242424;
-		margin-top: 50px;
+		margin-top: 80px;
 		width: 100%;
 		height: 30px;
 		/* float: left; */
@@ -2329,7 +2336,7 @@ created: function() {
 
 	.cardinstallredSpeed {
 		margin-top: 8px;
-		margin-left: 9px;
+		margin-left: 2.5%;
 		width: 46%;
 		height: 78px;
 		background: -webkit-linear-gradient(top, rgba(159, 131, 111, 0.1) 0%, rgba(193, 94, 21, 0.2) 100%);
@@ -2398,54 +2405,69 @@ created: function() {
 		float: left;
 	}
 
-	.informationCardText {
-		margin-left: 15px;
-		width: 110px;
-		height: 35px;
-		line-height: 35px;
-		user-select: text;
-		-webkit-user-select: text;
-		-moz-user-select: text;
-		-ms-user-select: text;
-		color: silver;
-		font-size: 12px;
-		float: left;
-	}
-
-	.informationCardTextzj {
-		margin-left: 141px;
-		width: 100px;
-		height: 35px;
-		line-height: 35px;
-		user-select: text;
-		-webkit-user-select: text;
-		-moz-user-select: text;
-		-ms-user-select: text;
-		color: silver;
-		font-size: 12px;
-		float: left;
-	}
-
-	.informationCardTextTwo {
-		width: 100%;
-		height: 35px;
-		float: left;
-		user-select: text;
-		-webkit-user-select: text;
-		-moz-user-select: text;
-		-ms-user-select: text;
-		color: silver;
-	}
-
-	.informationCardText2 {
-		margin-left: 15px;
-		width: 110px;
-		height: 35px;
-		font-size: 12px;
-		line-height: 35px;
-		float: left;
-	}
-
+	.informationCardTextNo1{
+			margin-left: 2%;
+			width: 115px;
+			height: 35px;
+			font-size: 13px;
+			line-height: 35px;
+			float: left;
+		}
+		.informationCardText {
+			margin-left: 2%;
+			width: 110px;
+			height: 35px;
+			line-height: 35px;
+			user-select: text;
+			-webkit-user-select: text;
+			-moz-user-select: text;
+			-ms-user-select: text;
+			color: silver;
+			font-size: 13px;
+			float: left;
+		}
+	
+		.informationCardTextzj {
+			margin-left: 43%;
+			width: 105px;
+			height: 35px;
+			line-height: 35px;
+			user-select: text;
+			-webkit-user-select: text;
+			-moz-user-select: text;
+			-ms-user-select: text;
+			color: silver;
+			font-size: 13px;
+			float: left;
+		}
+	
+		.informationCardTextTwo {
+			width: 100%;
+			height: 35px;
+			float: left;
+			user-select: text;
+			-webkit-user-select: text;
+			-moz-user-select: text;
+			-ms-user-select: text;
+			color: silver;
+		}
+	
+		.informationCardText2 {
+			margin-left: 6%;
+			width: 110px;
+			height: 35px;
+			font-size: 13px;
+			line-height: 35px;
+			float: left;
+		}
+		.informationCardText3 {
+			margin-left: 6%;
+			width: 120px;
+			height: 35px;
+			font-size: 13px;
+			line-height: 35px;
+			float: left;
+		}
 	.AccessCardNumber {
 		width: 30%;
 		height: 35px;
@@ -2535,7 +2557,7 @@ created: function() {
 
 	.progressBarAll {
 		margin-left: 9px;
-		width: 355px;
+		width: calc(100% - 5%);
 		height: 60px;
 		float: left;
 	}
@@ -2603,6 +2625,7 @@ created: function() {
 	.windStationCardContainer {
 		width: 1295px;
 		height: 350px;
+		margin-top: 10%;
 	}
 
 	.windStationCard {
@@ -2720,100 +2743,101 @@ created: function() {
 		font-size: 12px;
 	}
 	.AffectedPowerText{
-			width: 55px;
-			height: 25px;
-			float: left;
-			margin-left: 2px;
-			line-height: 25px;
-		}
-		.AffectedPower{
-			margin-left: 11px;
-			width: 20%;
-			height: 25px;
-			float: left;
-		}
-		.performancePowerText{
-			width: 55px;
-			height: 25px;
-			float: left;
-			margin-left: 2px;
-			line-height: 25px;
-		}
-		.performancePower{
-			margin-left: 11px;
-			width: 20%;
-			height: 25px;
-			float: left;
-		}
-		.limitedPowerText{
-			width: 55px;
-			height: 25px;
-			float: left;
-			margin-left: 2px;
-			line-height: 25px;
-		}
-		.limitedPower{
-			margin-left: 9px;
-			width: 20%;
-			height: 25px;
-			float: left;
-		}
-		.maintenancePowerText{
-			width: 55px;
-			height: 25px;
-			float: left;
-			margin-left: 2px;
-			line-height: 25px;
-		}
-		.maintenancePower{
-			margin-left: 30px;
-			width: 20%;
-			height: 25px;
-			float: left;
-		}
-		.faultPowerText{
-			width: 55px;
-			height: 25px;
-			float: left;
-			margin-left: 2px;
-			line-height: 25px;
-		}
-		.faultPower{
-			margin-left: 30px;
-			width: 20%;
-			height: 25px;
-			float: left;
-		}
-		.powerGenerationText {
-			width: 30px;
-			height: 25px;
-			float: left;
-			margin-left: 2px;
-			line-height: 25px;
-		}
-	
-		.powerGeneration {
-			margin-left: 30px;
-			width: 15%;
-			height: 25px;
-			float: left;
-		}
-	
-		.directGenerationText {
-			width: 30px;
-			height: 25px;
-			float: left;
-			margin-left: 2px;
-			line-height: 25px;
-		}
-	
-		.directGeneration {
-			width: 15%;
-			height: 25px;
-			float: left;
-			margin-left: 9px;
+				width: 55px;
+				height: 25px;
+				float: left;
+				margin-left: 2px;
+				line-height: 25px;
+			}
+			.AffectedPower{
+				margin-left: 11px;
+				width: 20%;
+				height: 25px;
+				float: left;
+			}
+			.performancePowerText{
+				width: 55px;
+				height: 25px;
+				float: left;
+				margin-left: 2px;
+				line-height: 25px;
+			}
+			.performancePower{
+				margin-left: 11px;
+				width: 20%;
+				height: 25px;
+				float: left;
+			}
+			.limitedPowerText{
+				width: 55px;
+				height: 25px;
+				float: left;
+				margin-left: 2px;
+				line-height: 25px;
+			}
+			.limitedPower{
+				margin-left: 9px;
+				width: 20%;
+				height: 25px;
+				float: left;
+			}
+			.maintenancePowerText{
+				width: 55px;
+				height: 25px;
+				float: left;
+				margin-left: 2px;
+				line-height: 25px;
+			}
+			.maintenancePower{
+				margin-left: 30px;
+				width: 20%;
+				height: 25px;
+				float: left;
+			}
+			.faultPowerText{
+				width: 55px;
+				height: 25px;
+				float: left;
+				margin-left: 2px;
+				line-height: 25px;
+			}
+			.faultPower{
+				width: 20%;
+				height: 25px;
+				float: left;
+				margin-left: 11px;
+			}
+			.powerGenerationText {
+				width: 30px;
+				height: 25px;
+				float: left;
+				margin-left: 2px;
+				line-height: 25px;
+			}
+		
+			.powerGeneration {
+				width: 20%;
+				height: 25px;
+				float: left;
+				margin-left: 11px;
+			}
+		
+			.directGenerationText {
+				width: 30px;
+				height: 25px;
+				float: left;
+				margin-left: 2px;
+				line-height: 25px;
+			}
+		
+			.directGeneration {
+				width: 20%;
+				height: 25px;
+				float: left;
+				margin-left: 9px;
+		
+			}
 	
-		}
 	
 		.choice {
 			width: 100%;

pages/mine/Mine.vue

@@ -2,19 +2,19 @@
 	<view class="content">
 		<view class="top">
 			<view class="threeLine" @tap="openDrawer">
-				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 10px;margin-left: 10px;"></image>
+				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 18px;margin-left: 10px;"></image>
 			</view>
 			<view class="text">
 				<view class="notice">
 					<view class="icon cuIcon-notice text-white" v-if="badge != 0">
-						<view class="cu-tag looknumber">
+						<view class="cu-tag looknumber" style="margin-top: 10px;">
 							<block v-if="badge != 1">{{ badge > 99 ? '99+' : badge }}</block>
 						</view>
 					</view>
-				</view>				
-				宁夏新能源公司
+				</view>
+				<view class="textWindpowerstation">{{address}}</view>
 			</view>
-			<view class="plus">+</view>
+			<view class="plus" @tap="showModal" data-target="viewModal">+</view>
 		</view>
 		<!-- 抽屉组件 -->
 		<div>
@@ -37,45 +37,95 @@
 				
 			}
 		},
+		onHide() {
+			this.$refs.drawer.closeDrawer();
+			this.hideModal();
+		},
+		onShow(){
+			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
+			this.address = this.getWindPowerStationNameToSessionStorage();
+		},
 		methods:{
 			openDrawer:function(){
 				this.$refs.drawer.openDrawer(250,this.drawerList,this.inconList);
 			},
 			closeDrawer:function(){
 				this.drawerIsShow=false;
-			}
+			},
+			pushWindPowerStationNameToSessionStorage(windpowerstationName) {
+				uni.setStorageSync('windpowerstationName', windpowerstationName);
+				//sessionStorage.setItem('windpowerstationName', windpowerstationName);
+				//alert("v"+ sessionStorage.getItem("windpowerstationName"));
+				//this.common.goback('/pages/index/Index');
+			},
+			getWindPowerStationNameToSessionStorage() {
+				uni.getStorageSync('windpowerstationName');
+				return uni.getStorageSync('windpowerstationName');
+			},
+			showModal(e) {
+				this.modalName = e.currentTarget.dataset.target;
+				this.$refs.plusDrawer.showModal(this.plusDrawerList, this.modalName);
+			},
+			hideModal() {
+				this.modalName = null;
+				this.$refs.plusDrawer.hideModal(this.modalName);
+			},
 		}
 	};
 </script>
 
 <style>
-	page {
+body {
+			font-family:'方正兰亭细黑_GBK';
+			font-size: 20px;
+			color: silver;
+		}
+	@font-face {
+		font-family:'方正兰亭细黑_GBK';
+		src: url(../../static/方正兰亭细黑_GBK.TTF);
 	}
+page {
+		font-family:'方正兰亭细黑_GBK';
+		overflow-x: hidden;
+	}
+
 	.top {
 		width: 100%;
-		height: 95upx;
+		height: 130upx;
 		padding-top: 5upx;
-		background-color: #E93131;
+		background-color: #1f1f1f;
+		position: fixed;
+		top: 0px;
+		left: 0px;
+		z-index: 100;
 	}
+
 	.threeLine {
 		width: 50px;
 		height: 45px;
 		float: left;
 	}
+
 	.text {
 		width: calc(100% - 100px);
 		height: 45px;
 		float: left;
-		color: white;
+		user-select: text;
+		-webkit-user-select: text;
+		-moz-user-select: text;
+		-ms-user-select: text;
+		color: silver;
 		line-height: 45px;
-		text-align: center;
+		margin-top: 11px;
 		font-size: 18px;
 	}
-	.notice{
+
+	.notice {
 		width: 50px;
 		height: 45px;
 		float: left;
 	}
+
 	.plus {
 		width: 50px;
 		height: 45px;
@@ -84,5 +134,14 @@
 		font-size: 35px;
 		line-height: 45px;
 		text-align: center;
+		margin-top: 11px;
+	}
+	.textWindpowerstation{
+		width: 180px;
+		height: 45px;
+		float: left;
+		text-align: center;
+		margin-left: 18px;
 	}
+	
 </style>

pages/task/Task.vue

@@ -2,19 +2,19 @@
 	<view class="content">
 		<view class="top">
 			<view class="threeLine" @tap="openDrawer">
-				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 10px;margin-left: 10px;"></image>
+				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 18px;margin-left: 10px;"></image>
 			</view>
 			<view class="text">
 				<view class="notice">
 					<view class="icon cuIcon-notice text-white" v-if="badge != 0">
-						<view class="cu-tag looknumber">
+						<view class="cu-tag looknumber" style="margin-top: 10px;">
 							<block v-if="badge != 1">{{ badge > 99 ? '99+' : badge }}</block>
 						</view>
 					</view>
-				</view>				
-				宁夏新能源公司
+				</view>
+				<view class="textWindpowerstation">{{address}}</view>
 			</view>
-			<view class="plus">+</view>
+			<view class="plus" @tap="showModal" data-target="viewModal">+</view>
 		</view>
 		<!-- 抽屉组件 -->
 		<div>
@@ -37,45 +37,95 @@
 				
 			}
 		},
+		onHide() {
+			this.$refs.drawer.closeDrawer();
+			this.hideModal();
+		},
+		onShow(){
+			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
+			this.address = this.getWindPowerStationNameToSessionStorage();
+		},
 		methods:{
 			openDrawer:function(){
 				this.$refs.drawer.openDrawer(250,this.drawerList,this.inconList);
 			},
 			closeDrawer:function(){
 				this.drawerIsShow=false;
-			}
+			},
+			pushWindPowerStationNameToSessionStorage(windpowerstationName) {
+				uni.setStorageSync('windpowerstationName', windpowerstationName);
+				//sessionStorage.setItem('windpowerstationName', windpowerstationName);
+				//alert("v"+ sessionStorage.getItem("windpowerstationName"));
+				//this.common.goback('/pages/index/Index');
+			},
+			getWindPowerStationNameToSessionStorage() {
+				uni.getStorageSync('windpowerstationName');
+				return uni.getStorageSync('windpowerstationName');
+			},
+			showModal(e) {
+				this.modalName = e.currentTarget.dataset.target;
+				this.$refs.plusDrawer.showModal(this.plusDrawerList, this.modalName);
+			},
+			hideModal() {
+				this.modalName = null;
+				this.$refs.plusDrawer.hideModal(this.modalName);
+			},
 		}
 	};
 </script>
 
 <style>
-	page {
+body {
+			font-family:'方正兰亭细黑_GBK';
+			font-size: 20px;
+			color: silver;
+		}
+	@font-face {
+		font-family:'方正兰亭细黑_GBK';
+		src: url(../../static/方正兰亭细黑_GBK.TTF);
 	}
+page {
+		font-family:'方正兰亭细黑_GBK';
+		overflow-x: hidden;
+	}
+
 	.top {
 		width: 100%;
-		height: 95upx;
+		height: 130upx;
 		padding-top: 5upx;
-		background-color: #E93131;
+		background-color: #1f1f1f;
+		position: fixed;
+		top: 0px;
+		left: 0px;
+		z-index: 100;
 	}
+
 	.threeLine {
 		width: 50px;
 		height: 45px;
 		float: left;
 	}
+
 	.text {
 		width: calc(100% - 100px);
 		height: 45px;
 		float: left;
-		color: white;
+		user-select: text;
+		-webkit-user-select: text;
+		-moz-user-select: text;
+		-ms-user-select: text;
+		color: silver;
 		line-height: 45px;
-		text-align: center;
+		margin-top: 11px;
 		font-size: 18px;
 	}
-	.notice{
+
+	.notice {
 		width: 50px;
 		height: 45px;
 		float: left;
 	}
+
 	.plus {
 		width: 50px;
 		height: 45px;
@@ -84,5 +134,14 @@
 		font-size: 35px;
 		line-height: 45px;
 		text-align: center;
+		margin-top: 11px;
+	}
+	.textWindpowerstation{
+		width: 180px;
+		height: 45px;
+		float: left;
+		text-align: center;
+		margin-left: 18px;
 	}
+	
 </style>