@@ -88,7 +88,7 @@ | |||||
</view> | </view> | ||||
<view class="tableBox"> | <view class="tableBox"> | ||||
<u-empty marginTop="100rpx" :show="warnList.length == 0" mode="list" text="暂无数据"></u-empty> | |||||
<u-empty marginTop="100rpx" :show="warnList.length == 0&&status == 'nomore'" mode="list" text="暂无数据"></u-empty> | |||||
<!-- <u-pull-refresh :refreshing="refreshing" @refresh="onRefresh"> --> | <!-- <u-pull-refresh :refreshing="refreshing" @refresh="onRefresh"> --> | ||||
<!-- <scroll-view class="scroll-view" scroll-y="true" refresher-enabled="true" | <!-- <scroll-view class="scroll-view" scroll-y="true" refresher-enabled="true" | ||||
@refresher-pull="onRefresh" @refresher-refresh="doRefresh" @refresher-restore="restore" | @refresher-pull="onRefresh" @refresher-refresh="doRefresh" @refresher-restore="restore" | ||||
@@ -78,7 +78,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class="tableBox"> | <view class="tableBox"> | ||||
<u-empty marginTop="100rpx" :show="monitorList.length == 0" mode="list" text="暂无数据"></u-empty> | |||||
<u-empty marginTop="100rpx" :show="monitorList.length == 0&&status == 'nomore'" mode="list" text="暂无数据"></u-empty> | |||||
<u-list @scrolltolower="scrolltolower" style="height: calc(100% - 0rpx);"> | <u-list @scrolltolower="scrolltolower" style="height: calc(100% - 0rpx);"> | ||||
<u-list-item v-for="(item, index) in monitorList" :key="index"> | <u-list-item v-for="(item, index) in monitorList" :key="index"> | ||||
<view class="liBox"> | <view class="liBox"> | ||||
@@ -1,6 +1,6 @@ | |||||
<template> | <template> | ||||
<view style="height: 100%;"> | <view style="height: 100%;"> | ||||
<u-empty marginTop="100rpx" :show="false" mode="list" text="暂无数据"></u-empty> | |||||
<u-empty marginTop="100rpx" :show="list.length == 0&&status == 'nomore'" mode="list" text="暂无数据"></u-empty> | |||||
<u-list @scrolltolower="scrolltolower" style="height: calc(100% - 29rpx);padding-top:29rpx"> | <u-list @scrolltolower="scrolltolower" style="height: calc(100% - 29rpx);padding-top:29rpx"> | ||||
<u-list-item v-for="(item, index) in list" :key="index"> | <u-list-item v-for="(item, index) in list" :key="index"> | ||||
<view class="whiteCard"> | <view class="whiteCard"> | ||||
@@ -86,7 +86,9 @@ | |||||
}, | }, | ||||
mounted() { | mounted() { | ||||
const {id,ReturnTime} = this.options | const {id,ReturnTime} = this.options | ||||
this.LOADING('加载中...') | |||||
returnInfo({id,ReturnTime}).then(res=>{ | returnInfo({id,ReturnTime}).then(res=>{ | ||||
this.HIDE_LOADING() | |||||
if(res.code != 200)return | if(res.code != 200)return | ||||
this.info = res.data | this.info = res.data | ||||
this.list = res.data.personInfos || [] | this.list = res.data.personInfos || [] | ||||
@@ -6,7 +6,7 @@ | |||||
:options="list.map(e=>{return {...e,label:'寝室'+e.label}})" placeholder="请选择寝室" | :options="list.map(e=>{return {...e,label:'寝室'+e.label}})" placeholder="请选择寝室" | ||||
popupTitle="选择寝室" search-placeholder="请输入宿舍号" /> | popupTitle="选择寝室" search-placeholder="请输入宿舍号" /> | ||||
</view> | </view> | ||||
<u-empty marginTop="100rpx" :show="false" mode="list" text="暂无数据"></u-empty> | |||||
<u-empty marginTop="100rpx" :show="list.length == 0&&status == 'nomore'" mode="list" text="暂无数据"></u-empty> | |||||
<u-list @scrolltolower="scrolltolower" style="height: calc(100% - 220rpx);"> | <u-list @scrolltolower="scrolltolower" style="height: calc(100% - 220rpx);"> | ||||
<u-list-item v-for="(item, index) in list" :key="index" v-show="!room || room == item.id"> | <u-list-item v-for="(item, index) in list" :key="index" v-show="!room || room == item.id"> | ||||
<view class="whiteCard"> | <view class="whiteCard"> | ||||
@@ -95,22 +95,26 @@ | |||||
} = this.options | } = this.options | ||||
// 班级人员 | // 班级人员 | ||||
if (personSetId) { | if (personSetId) { | ||||
this.LOADING('加载中...') | |||||
await detail({ | await detail({ | ||||
personSetId, | personSetId, | ||||
pageSize: 1000, | pageSize: 1000, | ||||
pageNum: 1 | pageNum: 1 | ||||
}).then(res => { | }).then(res => { | ||||
this.HIDE_LOADING() | |||||
if (res.code != 200) return | if (res.code != 200) return | ||||
this.list = res.data.list | this.list = res.data.list | ||||
}) | }) | ||||
} | } | ||||
// 监控行为列表 | // 监控行为列表 | ||||
if (taskId) { | if (taskId) { | ||||
this.LOADING('加载中...') | |||||
page({ | page({ | ||||
taskId, | taskId, | ||||
pageSize: 1000, | pageSize: 1000, | ||||
pageNum: 1 | pageNum: 1 | ||||
}).then(res => { | }).then(res => { | ||||
this.HIDE_LOADING() | |||||
if (res.code != 200) return | if (res.code != 200) return | ||||
this.alarmList = res.data.list | this.alarmList = res.data.list | ||||
this.list = this.list.map(e => { | this.list = this.list.map(e => { | ||||
@@ -4,7 +4,7 @@ | |||||
<SelectRadio v-model="search.CameraId" align="center" placeholder="请选择摄像头" @change="refresh" | <SelectRadio v-model="search.CameraId" align="center" placeholder="请选择摄像头" @change="refresh" | ||||
:options="allOptions.monitorList" /> | :options="allOptions.monitorList" /> | ||||
</view> | </view> | ||||
<u-empty marginTop="100rpx" :show="false" mode="list" text="暂无数据"></u-empty> | |||||
<u-empty marginTop="100rpx" :show="list.length == 0&&status == 'nomore'" mode="list" text="暂无数据"></u-empty> | |||||
<u-list @scrolltolower="scrolltolower" style="height: calc(100% - 150rpx);"> | <u-list @scrolltolower="scrolltolower" style="height: calc(100% - 150rpx);"> | ||||
<u-list-item v-for="(item, index) in list" :key="index"> | <u-list-item v-for="(item, index) in list" :key="index"> | ||||
<u-checkbox v-if="isManage" :name="item.name" shape="circle" label=""></u-checkbox> | <u-checkbox v-if="isManage" :name="item.name" shape="circle" label=""></u-checkbox> | ||||