首页手环样式

components/bracelet/raceletDetails/heartbeatDetails.vue

@@ -12,7 +12,7 @@
 			</cu-custom>
 		</view>
 		
-		<view class="All">
+		<view class="bc">
 		<!-- 心跳标签 -->
 		
 			<view class="heartbeatLabel">
@@ -26,21 +26,13 @@
 		
 			<view class="chooseTime">
 					<view class="timeSelector">
-						<!-- <view>日期选择 - 示例</view>
-						{{date}}
-						<button type="primary" @click="onShowDatePicker('date')">选择日期</button>
-						{{time}}
-						<button type="primary" @click="onShowDatePicker('time')">选择时间</button>
-						{{datetime}}
-						<button type="primary" @click="onShowDatePicker('datetime')">选择日期时间</button>
-						{{range[0]}} - {{range[1]}}
-						<button type="primary" @click="onShowDatePicker('range')">选择日期范围</button> -->
+						
 						<div class="zhiti">{{rangetime[0]}} - {{rangetime[1]}}</div>  
 						<button type="primary" @click="onShowDatePicker('rangetime')">选择日期时间范围</button>
 					</view>
 					<mx-date-picker :show="showPicker" :type="type" :value="value" :show-tips="false" :begin-text="'运动开始'" :end-text="'运动结束'" :show-seconds="true" @confirm="onSelected" @cancel="onSelected" />
 			</view>
-			
+			<!-- 曲线图标题 -->
 			<view titleC>
 				<view class="curveTitle">{{name}}曲线图</view>
 				<view class="garden" style="background-color:;"></view>
@@ -52,7 +44,9 @@
 				<view class="graphHeartbeat">
 					
 					<view class="qiun-charts">
-						<!-- <canvas canvas-id="canvasLineC" id="canvasLineC" class="charts" :width="cWidth*pixelRatio" :height="cHeight*pixelRatio" :style="{'width':cWidth+'px','height':cHeight+'px'}" disable-scroll=true @ontouchstart="touchLineC" @ontouchmove="moveLineC" @ontouchend="touchEndLineC"></canvas> -->
+					
+						<!-- 没用 <canvas canvas-id="canvasLineC" id="canvasLineC" class="charts" :width="cWidth*pixelRatio" :height="cHeight*pixelRatio" :style="{'width':cWidth+'px','height':cHeight+'px'}" disable-scroll=true @ontouchstart="touchLineC" @ontouchmove="moveLineC" @ontouchend="touchEndLineC"></canvas> -->
+						
 						<canvas canvas-id="canvasLineC" id="canvasLineC" class="charts" @touchstart="touchLineC" ></canvas>
 					</view>
 				</view>
@@ -113,7 +107,7 @@
 		mounted() {
 			document.querySelector('body').setAttribute('style', 'background-color:#242424');
 		},
-		beforeCreate () {
+		/* beforeCreate () {
 		
 		  document.querySelector('body').setAttribute('style', 'background-color:#242424')
 		
@@ -123,7 +117,7 @@
 		
 		  document.querySelector('body').removeAttribute('style')
 		
-		},
+		}, */
 		
 		onShow:function(){
 		},
@@ -219,10 +213,11 @@
 								/* console.log('date => ' + e.date); */
 								LineC.categories = [];
 								LineC.series[0].data = [];
-								for(var i=0;i<this.braceletCurve_XTPL.length;i++){
+								var j=Math.ceil(this.braceletCurve_XTPL.length/10);
+								for(var i=0;i<this.braceletCurve_XTPL.length;i+=j){
 									if(this.braceletCurve_XTPL[i].ts<this.endTime&&this.braceletCurve_XTPL[i].ts>this.beginTime){
 										LineC.series[0].data.push(this.braceletCurve_XTPL[i].value);
-										LineC.categories.push(new Date(this.braceletCurve_XTPL[i].ts).Format('MM/dd mm:ss'));
+										LineC.categories.push(new Date(this.braceletCurve_XTPL[i].ts).Format('MM/dd hh:mm'));
 										
 									}
 									
@@ -333,7 +328,7 @@
 				 } */
 				for(let i=_this.braceletCurve_XTPL.length-7;i<_this.braceletCurve_XTPL.length;i++){
 					
-					LineC.categories.push(new Date(_this.braceletCurve_XTPL[i].ts).Format('MM/dd mm:ss'));
+					LineC.categories.push(new Date(_this.braceletCurve_XTPL[i].ts).Format('MM/dd hh:mm'));
 				 }
 		    	this.showLineC('canvasLineC', LineC);
 		    },
@@ -345,7 +340,7 @@
 							canvasId: canvasId,
 							type: 'line',
 					
-							fontSize: 11,
+							fontSize: 8,
 							legend: {
 								
 								show: false,
@@ -448,7 +443,7 @@
 	.horizontalSlider {
 		white-space: nowrap;
 		width: 100%;
-		height: 390px;
+		height: 400px;
 		background-color: #242424;
 		/* margin-top: 540px; */
 	}
@@ -478,7 +473,8 @@ button{
 			margin: 20upx;
 			font-size: 28upx;
 		}
-.All{
+.bc{
+	height: 673px;
 	width: 100%;
 	background-color: #242424;
 }

components/detail/Detail.vue

@@ -412,7 +412,7 @@ export default {
 					],
 
 					gridColor: '#2E2E2E',
-					splitNumber: 4,
+					splitNumber: 5,
 					gridType: 'solid',
 					dashLength: 8,
 					showTitle: 'true',

pages/index/Index.vue

@@ -182,6 +182,7 @@
 						<view class="redMaxText">max: {{ windpowerstationdetail.target_windSpeed_power.llglMax }}</view>
 					</view>
 				</view>
+				
 			</view>
 			<!--接入卡片-->
 			<view class="interfaceCard">
@@ -818,6 +819,8 @@
 						</view> -->
 					</view>
 				</scroll-view>
+				<!-- 底导航栏挡住部分显示 -->
+				<view style="width: 100%; height: 60px; background-color: #242424;"></view>
 			</view>
 		</scroll-view>
 
@@ -4299,7 +4302,7 @@
 	.windStationCardContainer {
 		width: 1295px;
 		height: 350px;
-		margin-top: 10%;
+		margin-top: 10px;
 	}
 
 	.windStationCard {
@@ -4656,4 +4659,5 @@
 	.DrawerPage .cu-bar.tabbar .action {
 		flex: initial;
 	}
+	
 </style>