样式修改

colorui/main.css

@@ -3576,7 +3576,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .bg-gradual-sisBlack {
-	background-color: #242424;
+	background-color: #211E21;
 	color:white;
 }
 

components/detail/Detail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="contentike">
 		<view class="fixed" style="color: #FFFDEF;">
-			<cu-custom bgColor="bg-gradual-black" :isBack="true">
+			<cu-custom bgColor="background-color: #1f1f1f;" :isBack="true">
 				<block slot="backText">
 					<view style="height: 80rpx;line-height: 80rpx; color: #FFFDEF;" @tap="goToIndex()">返回</view>
 					<view class="addressName">{{address}}</view>
@@ -306,12 +306,12 @@ created: function() {
 </script>
 <style>
 	page {
-		background-color: #1F1F1F;
+		/* background-color: #FFFFFF; */
 		font-family:'方正兰亭细黑_GBK';
 	}
 
 	body {
-		background: #000;
+		background: #1F1F1F;
 		font-family:'方正兰亭细黑_GBK';
 		font-size: 14px;
 		color: silver;

components/windStationCardDetail/WindStationCardDetail.vue

@@ -2,9 +2,9 @@
 	<view>
 		<!--导航栏-->
 		<view  @tap="closeFrame">
-			<cu-custom bgColor="#020202" :isBack="true">
-				<block slot="backText"><view style="height: 80rpx;line-height: 80rpx;">返回</view></block>
-				<block slot="content">{{ windStationName }}</block>
+			<cu-custom bgColor="bg-gradual-sisBlack" :isBack="true">
+				<block slot="backText"><view style="height: 80rpx;line-height: 80rpx;color: silver;">返回</view></block>
+				<block slot="content"><view style="color: silver;">{{ windStationName }}</view></block>
 			</cu-custom>
 		</view>
 		<!--电量卡片-->
@@ -76,7 +76,7 @@
 			<view class="cardinstallredSpeed">
 				<view class="cardinstalltitlegreen">
 					平均风速
-					<view class="textWhitekuangSpeed">(km/h)</view>
+					<span>(km/h)</span>
 				</view>
 				<view class="cardinstallnumbergreen">5</view>
 				<view class="cardinstallnumbergreenmin"><view class="greenMinText">min: 5</view></view>
@@ -85,7 +85,7 @@
 			<view class="cardinstallredSpeed">
 				<view class="cardinstalltitlegreen">
 					预测风速
-					<view class="textWhitekuangSpeed">(km/h)</view>
+					<span>(km/h)</span>
 				</view>
 				<view class="cardinstallnumbergreen">48</view>
 				<view class="cardinstallnumbergreenmin"><view class="greenMinText">min: 4</view></view>
@@ -94,7 +94,7 @@
 			<view class="cardinstallredSpeed">
 				<view class="cardinstalltitleRed">
 					实际功率
-					<view class="textWhitekuang">(kw)</view>
+					<span>(kw)</span>
 				</view>
 				<view class="cardinstallnumberred">15</view>
 				<view class="cardinstallnumberredmin"><view class="redMinText">min: 566</view></view>
@@ -103,7 +103,7 @@
 			<view class="cardinstallredSpeed">
 				<view class="cardinstalltitleRed">
 					理论功率
-					<view class="textWhitekuang">(kw)</view>
+					<span>(kw)</span>
 				</view>
 				<view class="cardinstallnumberred">14</view>
 				<view class="cardinstallnumberredmin"><view class="redMinText">min: 589</view></view>
@@ -120,8 +120,10 @@
 		</view>
 		<!--柱状图-->		
 		<view class="Histogram" @tap="closeFrame">
+			<view class="qiun-charts">
 		   <view class="PowerColunm">发电量柱状图</view>
 		   <canvas canvas-id="canvasColumn" id="canvasColumn" class="charts" disable-scroll=true @touchstart="touchColumn" @touchmove="moveColumn" @touchend="touchEndColumn"></canvas>
+			</view>
 		</view>
 	</view>
 </template>
@@ -494,7 +496,7 @@ body {
 	src: url(../../static/方正兰亭细黑_GBK.TTF);
 }
 page {
-	background-color:#020202;
+	background-color:#1f1f1f;
 	font-family:'方正兰亭细黑_GBK';
 	color: silver;
 }
@@ -502,13 +504,14 @@ page {
 	/* margin-top: 10px; */
 	width: 100%;
 	height: 85px;
-	background-color:#121212;
+	background-color:#242424;
 	float: left;
 	color: #A1A1A1;
 }
 .informationCardAll {
-	width: 100%;
+	width: calc(100% - 18px);
 	margin-top: 10px;
+	margin-left: 9px;
 	height: 60px;
 	float: left;
 	color: #A1A1A1;
@@ -533,7 +536,8 @@ page {
 	float: left;
 }
 .informationCardTextzj {
-	margin-left: 140px;
+	/* margin-left: 140px; */
+	margin-right: 9px;
 	width: 120px;
 	height: 35px;
 	line-height: 35px;
@@ -543,7 +547,7 @@ page {
 	-ms-user-select: text;
 	color: #A1A1A1;
 	font-size: 14px;
-	float: left;
+	float: right;
 }
 .informationCardTextTwo {
 	width: 100%;
@@ -569,7 +573,7 @@ page {
 	font-size: 14px;
 	line-height: 35px;
 	float: left;
-	margin-left: 5px;
+	margin-left: 11px;
 }
 .textWhite {
 	color: #A1A1A1;
@@ -587,9 +591,10 @@ page {
 .speedPower {
 	width: 100%;
 	height: 180px;
-	background-color: #121212;
+	background-color: #242424;
 	float: left;
-	margin-top: 40rpx;
+	margin-top: 20rpx;
+	margin-bottom: 10px;
 
 }
 .cardinstallredSpeed {
@@ -597,15 +602,16 @@ page {
 	margin-left: 9px;
 	width: 46%;
 	height: 78px;
-	background-color: #242424;
+	background-color: #1f1f1f;
 	/* background: -webkit-linear-gradient(top, rgba(159, 131, 111, 0.1) 0%, rgba(193, 94, 21, 0.2) 100%); */
 	border-radius: 5px;
 	float: left;
 }
 .cardinstalltitlegreen {
-	width: 100%;
+	width: 80%;
 	height: 25px;
-	margin-left: 37px;
+	text-align: center;
+	margin-left: 10%;
 	user-select: text;
 	-webkit-user-select: text;
 	-moz-user-select: text;
@@ -615,10 +621,10 @@ page {
 	line-height: 25px;
 	float: left;
 }
-.textWhitekuangSpeed {
+.cardinstalltitlegreen span {
 	color: white;
-	float: right;
-	margin-right: 70px;
+	/* float: right; */
+	/* margin-right: 70px; */
 }
 .cardinstallnumbergreen {
 	width: 100%;
@@ -670,9 +676,10 @@ page {
 	float: left;
 }
 .cardinstalltitleRed {
-	width: 100%;
+	width: 80%;
 	height: 25px;
-	margin-left: 45px;
+	text-align: center;
+	margin-left: 10%;
 	user-select: text;
 	-webkit-user-select: text;
 	-moz-user-select: text;
@@ -682,10 +689,10 @@ page {
 	line-height: 25px;
 	float: left;
 }
-.textWhitekuang {
+.cardinstalltitleRed span {
 	color: white;
-	float: right;
-	margin-right: 85px;
+	/* float: right;
+	margin-right: 85px; */
 }
 .cardinstallnumberred {
 	width: 100%;
@@ -863,7 +870,7 @@ page {
 }
 .qiun-charts {
 	width: 750upx;
-	height: 500upx;
+	height: 400upx;
 }
 
 .charts {
@@ -872,21 +879,21 @@ page {
 }
 
 .lineChart {
+	clear: both;
 	width: 100%;
-	height: 200px;
-	background-color: #121212;
-	margin-top: 10px;
-	float: left;
+	height: 225px;
+	background-color: #242424;
 }
 .Histogram {
-	/* clear: both; */
-	width: 750upx;
-	height: 400upx;
-	margin-top: 420px;
-	background-color: #121212;
+	width: 100%;
+	height: 225px;
+	clear: both;
+	background-color: #242424;
+	margin-top: 10px;
+	margin-bottom: 20px;
 }
 .PowerColunm {
-  width: 375px;
+  width: 130px;
   height: 30px;
 /* user-select: text;
   -webkit-user-select: text;
@@ -905,11 +912,12 @@ page {
 	 width: 10px;
 	 height: 15px;
 	float: right;
+	background-color: #242424;
 	/* background-color: red; */
 	margin-top: -10px;
 /* 	 margin-right: 0px;
 	 margin-top: -15px; */
-	 background-image: url(../../static/picture/zuizhongsanjiao.jpg);
+background-image: url(../../static/picture/zuizhongsanjiao.jpg);
 
  }
  .value{
@@ -927,8 +935,9 @@ page {
 	 height: 35px;
 	 font-size: 14px;
 	 line-height: 35px;
-	 float: left;
-	 margin-left: 4px;
+	 float: right;
+	 /* margin-left: 4px; */
+	 margin-right: 9px;
  }
  .textSilverDay{
 	 user-select: text;

pages/index/Index.vue

@@ -228,6 +228,7 @@
 		</view>
 		<!-- 柱状图 -->
 		<view class="Histogram">
+			<view class="HistogramTitle">五项损失柱状图</view>
 			<view class="choice">
 				<view class="directGeneration">
 					<image src="../../static/picture/dianliang/dianlianglan.png" style="width: 18px;height: 18px;float: left;margin-top: 4px;"></image>
@@ -1798,13 +1799,14 @@ created: function() {
 	.monthlyUtilizationHours {
 		width: 160px;
 		height: 30px;
-		margin-top: 20px;
+		margin-top: 15px;
 		/* background-color: #161616; */
 		background: -webkit-linear-gradient(top, rgba(159, 131, 111, 0.1) 0%, rgba(193, 94, 21, 0.2) 100%);
 		color: silver;
 		margin-left: 20px;
 		text-align: center;
-		padding-top: 5px;
+		padding-top: 7px;
+		font-size: 12px;
 	}
 
 	.yearlyUtilizationHours {
@@ -1816,7 +1818,8 @@ created: function() {
 		color: silver;
 		margin-left: 20px;
 		text-align: center;
-		padding-top: 5px;
+		padding-top: 7px;
+		font-size: 12px;
 	}
 
 	.comprehensiveServicePowerConsumptionRate {
@@ -1829,8 +1832,9 @@ created: function() {
 		margin-left: 200px;
 		margin-top: -70px;
 		text-align: center;
-		padding-top: 5px;
+		padding-top: 7px;
 		float: left;
+		font-size: 12px;
 	}
 
 	.equipmentAvailability {
@@ -1843,8 +1847,9 @@ created: function() {
 		margin-left: 200px;
 		margin-top: -30px;
 		text-align: center;
-		padding-top: 5px;
+		padding-top: 7px;
 		float: left;
+		font-size: 12px;
 	}
 
 	.sulfurDioxideEmissionReduction {
@@ -1857,8 +1862,9 @@ created: function() {
 		margin-left: 380px;
 		margin-top: -70px;
 		text-align: center;
-		padding-top: 5px;
+		padding-top: 7px;
 		float: left;
+		font-size: 12px;
 	}
 
 	.carbonDioxideReduction {
@@ -1871,8 +1877,9 @@ created: function() {
 		margin-left: 380px;
 		margin-top: -30px;
 		text-align: center;
-		padding-top: 5px;
+		padding-top: 7px;
 		float: left;
+		font-size: 12px;
 	}
 
 	.waterSaving {
@@ -1885,8 +1892,9 @@ created: function() {
 		margin-left: 560px;
 		margin-top: -70px;
 		text-align: center;
-		padding-top: 5px;
+		padding-top: 7px;
 		float: left;
+		font-size: 12px;
 	}
 
 	.saveStandardCoal {
@@ -1899,8 +1907,9 @@ created: function() {
 		margin-left: 560px;
 		margin-top: -30px;
 		text-align: center;
-		padding-top: 5px;
+		padding-top: 7px;
 		float: left;
+		font-size: 12px;
 	}
 
 	.mttr {
@@ -1913,8 +1922,9 @@ created: function() {
 		margin-left: 740px;
 		margin-top: -70px;
 		text-align: center;
-		padding-top: 5px;
+		padding-top: 7px;
 		float: left;
+		font-size: 12px;
 	}
 
 	.mtbf {
@@ -1927,8 +1937,9 @@ created: function() {
 		margin-left: 740px;
 		margin-top: -30px;
 		text-align: center;
-		padding-top: 5px;
+		padding-top: 7px;
 		float: left;
+		font-size: 12px;
 	}
 
 	.horizontalSlider {
@@ -1937,7 +1948,7 @@ created: function() {
 		height: 100px;
 		background-color: #242424;
 		clear: both;
-		/* margin-top: 540px; */
+		margin-top: 510px;
 	}
 
 	.slide {
@@ -1970,11 +1981,20 @@ created: function() {
 
 	.Histogram {
 		width: 100%;
-		height: 250px;
+		height: 280px;
 		background-color: #242424;
 		margin-top: 10px;
 		float: left;
 	}
+	
+	.HistogramTitle{
+		width: calc(100% - 9px);
+		height: 30px;
+		line-height: 30px;
+		font-size: 11px;
+		color: silver;
+		margin-left: 9px;
+	}
 
 	.lineChart {
 		width: 100%;
@@ -2613,8 +2633,10 @@ created: function() {
 		clear: both;
 		width: calc(100% - 18px);
 		margin-left: 9px;
-		height: 300px;
+		height: 320px;
 		color: silver;
+		margin-bottom: 120px;
+		
 		/* background-color: #242424; */
 	}