样式修改

components/monitor/MatrixMonitor.vue

@@ -3,17 +3,17 @@
 		<!--导航栏-->
 		<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="openPlusDrawer" data-target="viewModal">+</view>
 		</view>
@@ -1196,7 +1196,7 @@
 			this.windStationListHeight=(this.windStation.length*50+40)+"px"
 			this.windowWidth = uni.getSystemInfoSync().windowWidth;
 			this.windowHeight = uni.getSystemInfoSync().windowHeight;
-			this.windMotorMatrixContainerHeight=(this.windowHeight-290)+"px";
+			this.windMotorMatrixContainerHeight=(this.windowHeight-300)+"px";
 			this.windMotorMatrixDetailAll=this.windMotorMatrixDetailMaHuagShan;
 			this.windMotorMatrixDetail=this.windMotorMatrixDetailAll;
 			this.windMotorMatrixListHeight="calc("+Math.ceil(this.windMotorMatrixDetail.length/4)*40+"px + "+(Math.ceil(this.windMotorMatrixDetail.length/4)*1-0.5)+"%)";
@@ -1426,10 +1426,13 @@
 	}
 	.top {
 		width: 100%;
-		height: 95upx;
-		/* margin-top: 20px; */
-		/* padding-top: 5upx; */
-		background-color: #1F1F1F;
+		height: 130upx;
+		padding-top: 5upx;
+		background-color: #1f1f1f;
+		position: fixed;
+		top: 0px;
+		left: 0px;
+		z-index: 100;
 	}
 	
 	.threeLine {
@@ -1448,7 +1451,7 @@
 		-ms-user-select: text;
 		color: silver;
 		line-height: 45px;
-		text-align: center;
+		margin-top: 11px;
 		font-size: 18px;
 	}
 	
@@ -1466,6 +1469,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;
 	}
 	.DrawerPage {
 		position: fixed;
@@ -1566,8 +1577,10 @@
 		flex: initial;
 	}
 	.windStationNameAndChoice{
+		clear: both;
 		width: 100%;
 		height: 50px;
+		margin-top: 71px;
 		/* border: 1px solid red; */
 	}
 	.windStationName{

components/windStationCardDetail/WindStationCardDetail.vue

@@ -909,15 +909,15 @@ page {
   /* overflow:auto; */
  }
 .img{
-	 width: 10px;
-	 height: 15px;
+	 width: 18px;
+	 height: 20px;
 	float: right;
 	background-color: #242424;
 	/* background-color: red; */
 	margin-top: -10px;
-/* 	 margin-right: 0px;
-	 margin-top: -15px; */
-background-image: url(../../static/picture/zuizhongsanjiao.jpg);
+	 margin-right: -10px;
+	 /* margin-top: -15px; */
+background-image: url(../../static/picture/zuizhongsanjiao2.png);
 
  }
  .value{