Merge branch 'V1.6.7_feature' into develop

src/pages/TemperatureRecords/TemperatureStatistics/TemperatureStatistics.vue

@@ -62,24 +62,24 @@
 			</view>
 			<view class="timeSelectResults timeSelectResults_two">
 				<view class=" timeSelectResultsItem timeSelectResultsItem_three" @tap="temperatrue(3)">
-				<view class=" timeSelectResultsItemTheme">
-					<text>低温人数</text>
-				</view>
-				<view class="timeSelectResultsItemNumber">
-					<text class="specificNumber">{{numObj.lowTemperatureNum}}</text>人
-				</view>
-			</view>
-			<view class="timeSelectResultsItem timeSelectResultsItem_four" @tap="temperatrue(4)">
-				<view class="timeSelectResultsItemTheme">
-					<text>未检测人数</text>
+					<view class=" timeSelectResultsItemTheme">
+						<text>低温人数</text>
+					</view>
+					<view class="timeSelectResultsItemNumber">
+						<text class="specificNumber">{{numObj.lowTemperatureNum}}</text>人
+					</view>
 				</view>
-				<view class="timeSelectResultsItemNumber">
-					<text class="specificNumber">{{numObj.noTemperatureNum}}</text>人
+				<view class="timeSelectResultsItem timeSelectResultsItem_four" @tap="temperatrue(4)">
+					<view class="timeSelectResultsItemTheme">
+						<text>未检测人数</text>
+					</view>
+					<view class="timeSelectResultsItemNumber">
+						<text class="specificNumber">{{numObj.noTemperatureNum}}</text>人
+					</view>
 				</view>
 			</view>
 		</view>
 	</view>
-	</view>
 </template>
 
 <script>
@@ -205,7 +205,8 @@
 					}, {
 						classId: this.selectClass.classId,
 						gradeId: this.selectClass.gradeId,
-						registDate: this.selectDate,
+						startTime: this.selectDate,
+						endTime: this.selectDate,
 						schoolId: getQueryParams('schoolId'),
 						temperatureInterval: this.timeSelect
 					})
@@ -273,7 +274,7 @@
 	.tainer {
 		.themeBox {
 			height: 221rpx;
-			background:  url(../../../static/images/temperatureRecords.png) center -152rpx no-repeat;
+			background: url(../../../static/images/temperatureRecords.png) center -152rpx no-repeat;
 			background-size: cover;
 			padding: 66rpx 32rpx 0;
 			box-sizing: border-box;