首页修改

pages/index/Index.vue

@@ -41,29 +41,29 @@
 					<view class="informationCardText">
 						<view class="textSilver" @tap="common.navTo('/components/detail/Detail?callTargetName=安全天数&callTargetUnit=天&pointKey='+windpowerstationdetail.target_comprehensive_indicators.aqts_real.ednaId)">
 							安全天数(&nbsp;天&nbsp;)&nbsp;:</view>						
-						<view class="textWhite">  {{windpowerstationdetail.target_comprehensive_indicators.aqts}}</view>
+						<view class="textWhite"> <view class="textSmail" > {{windpowerstationdetail.target_comprehensive_indicators.aqts}}</view></view>
 					</view>
 					<view class="informationCardTextzj">
 						<view class="textSilver" @tap="common.navTo('/components/detail/Detail?callTargetName=装机容量&callTargetUnit=mv&pointKey='+windpowerstationdetail.target_comprehensive_indicators.zjrl_real.ednaId)">
 							装机容量(mv):</view>					
-						<view class="textWhite"><view class="textSmail" v-if="windpowerstationdetail.target_comprehensive_indicators.zjrl>=100">{{windpowerstationdetail.target_comprehensive_indicators.zjrl}}</view></view>
+						<view class="textWhite"> <view class="textSmail" > {{windpowerstationdetail.target_comprehensive_indicators.zjrl}}</view></view>
 					</view>
 				</view>
 				<view class="informationCardTextTwo">
 					<view class="informationCardTextNo1">
 						<view class="textSilver" @tap="common.navTo('/components/detail/Detail?callTargetName=日发电量&callTargetUnit=kwh&pointKey='+windpowerstationdetail.target_comprehensive_indicators.rfdl_real.ednaId)">
 							日发电量(kwh):</view>
-						<view class="textWhite"><view class="textSmail" v-if="windpowerstationdetail.target_comprehensive_indicators.rfdl>=100">{{windpowerstationdetail.target_comprehensive_indicators.rfdl}}</view></view>				
+						<view class="textWhite"><view class="textSmail">{{windpowerstationdetail.target_comprehensive_indicators.rfdl}}</view></view>				
 					</view>
 					<view class="informationCardText3">
 						<view class="textSilver" @tap="common.navTo('/components/detail/Detail?callTargetName=预测发电量&callTargetUnit=kwh&pointKey='+windpowerstationdetail.target_comprehensive_indicators.ycfdl_real.ednaId)">
 							预测发电量(kwh):</view>
-						<view class="textWhite2">{{windpowerstationdetail.target_comprehensive_indicators.ycfdl}}</view>			
+						<view class="textWhite2"><view class="textSmail">{{windpowerstationdetail.target_comprehensive_indicators.ycfdl}}</view></view>			
 					</view>
 					<view class="informationCardText2">
 						<view class="textSilver" @tap="common.navTo('/components/detail/Detail?callTargetName=上网电量&callTargetUnit=kwh&pointKey='+windpowerstationdetail.target_comprehensive_indicators.swdl_real.ednaId)">
 							上网电量(kwh):</view>
-						<view class="textWhite">{{windpowerstationdetail.target_comprehensive_indicators.swdl}}</view>
+						<view class="textWhite"><view class="textSmail">{{windpowerstationdetail.target_comprehensive_indicators.swdl}}</view></view>
 					</view>
 				</view>
 			</view>
@@ -181,7 +181,7 @@
 					</view>
 					<view class="progressBarText">月计划发电量进度条</view>
 					<view class="progressBarRight">
-						<view class="progressBarRightText">10000kwh</view>
+						<view class="progressBarRightText">{{windpowerstationdetail.index_electricQuantity.yjhfdl}}kwh</view>
 					</view>
 				</view>
 				<view class="cu-progress round radius striped active">
@@ -196,7 +196,7 @@
 					</view>
 					<view class="progressBarText">年计划发电量进度条</view>
 					<view class="progressBarRight">
-						<view class="progressBarRightText">100000kwh</view>
+						<view class="progressBarRightText">{{windpowerstationdetail.index_electricQuantity.njhfdl}}kwh</view>
 					</view>
 				</view>
 				<view class="cu-progress round radius striped active">
@@ -2251,7 +2251,7 @@
 				canvaColumn.showToolTip(e, {
 					format: function(item, category) {
 						if (item.name == "应发电量(万kwh)") {
-							return category + ' ' + item.name + ':' + 50;
+							return "";
 						} else {
 							return category + ' ' + item.name + ':' + item.data
 						}