Commit d36958e9 authored by aifen@azjy1.onexmail.com's avatar aifen@azjy1.onexmail.com

Merge branch 'V1.6.7_feature' into develop

parents 903e0a77 8ef0f76b
...@@ -62,24 +62,24 @@ ...@@ -62,24 +62,24 @@
</view> </view>
<view class="timeSelectResults timeSelectResults_two"> <view class="timeSelectResults timeSelectResults_two">
<view class=" timeSelectResultsItem timeSelectResultsItem_three" @tap="temperatrue(3)"> <view class=" timeSelectResultsItem timeSelectResultsItem_three" @tap="temperatrue(3)">
<view class=" timeSelectResultsItemTheme"> <view class=" timeSelectResultsItemTheme">
<text>低温人数</text> <text>低温人数</text>
</view> </view>
<view class="timeSelectResultsItemNumber"> <view class="timeSelectResultsItemNumber">
<text class="specificNumber">{{numObj.lowTemperatureNum}}</text> <text class="specificNumber">{{numObj.lowTemperatureNum}}</text>
</view> </view>
</view>
<view class="timeSelectResultsItem timeSelectResultsItem_four" @tap="temperatrue(4)">
<view class="timeSelectResultsItemTheme">
<text>未检测人数</text>
</view> </view>
<view class="timeSelectResultsItemNumber"> <view class="timeSelectResultsItem timeSelectResultsItem_four" @tap="temperatrue(4)">
<text class="specificNumber">{{numObj.noTemperatureNum}}</text> <view class="timeSelectResultsItemTheme">
<text>未检测人数</text>
</view>
<view class="timeSelectResultsItemNumber">
<text class="specificNumber">{{numObj.noTemperatureNum}}</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view>
</template> </template>
<script> <script>
...@@ -205,7 +205,8 @@ ...@@ -205,7 +205,8 @@
}, { }, {
classId: this.selectClass.classId, classId: this.selectClass.classId,
gradeId: this.selectClass.gradeId, gradeId: this.selectClass.gradeId,
registDate: this.selectDate, startTime: this.selectDate,
endTime: this.selectDate,
schoolId: getQueryParams('schoolId'), schoolId: getQueryParams('schoolId'),
temperatureInterval: this.timeSelect temperatureInterval: this.timeSelect
}) })
...@@ -273,7 +274,7 @@ ...@@ -273,7 +274,7 @@
.tainer { .tainer {
.themeBox { .themeBox {
height: 221rpx; 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; background-size: cover;
padding: 66rpx 32rpx 0; padding: 66rpx 32rpx 0;
box-sizing: border-box; box-sizing: border-box;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment