Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

monitorMobile/components/selectSearch.vue

@@ -21,9 +21,13 @@
 						v-for="(item, index) in options" :key="index" :label="item.label" :name="item.value">
 					</u-checkbox>
 				</u-checkbox-group>
-				<view style="padding: 36rpx 50rpx">
+				<view style="padding: 36rpx 50rpx;display:flex">
+					<u-button @click="cancel" type="info"
+						customStyle="border-radius: 45rpx;height: 90rpx;font-weight: 700;font-size: 32rpx;color:#666;"
+						text="取消选择" v-if="value_"></u-button>
+						<view style="width: 36rpx;" v-if="value_"></view>
 					<u-button @click="cofirm" type="primary"
-						style="border-radius: 45rpx;height: 90rpx;font-weight: 700;font-size: 32rpx;"
+						customStyle="border-radius: 45rpx;height: 90rpx;font-weight: 700;font-size: 32rpx;"
 						text="确定"></u-button>
 				</view>
 			</view>
@@ -135,6 +139,21 @@
 				}
 				this.close()
 			},
+			cancel(){
+				if (!this.multiple) {
+					this.value_ = ''
+					this.$emit("input", this.value_)
+					this.$emit("change", this.value_)
+					let obj = this.options.find(e1 => e1.value == this.value_)
+					if (obj) {
+						this.$emit("update:title", this.title_)
+					} else {
+						this.$emit("update:title", '')
+					}
+				} else {
+					this.value_ = []
+				}
+			}
 		}
 	}
 </script>

monitorMobile/pages/login.vue

@@ -162,6 +162,7 @@
 		height: calc(100% - 880rpx);
 		margin-top: 46rpx;
 		padding: 60rpx 60rpx 0 60rpx;
+		min-height: 450rpx;
 
 		.title {
 			color: #333;

monitorMobile/pages/work/rollCall/detail.vue

@@ -15,6 +15,9 @@
 		</view>
 		<view style="height:calc(100% - 200rpx);overflow: auto;">
 			<view class="list">
+				<view v-show="cateList.length&&!list.find(e=>cateList[cate].show(e))" style="color: rgb(96, 98, 102);margin-top:36rpx;font-size: 26rpx;text-align: center;">
+					暂无数据
+				</view>
 				<template v-for="(item, index) in list">
 					<view class="item" @click="popupShow(item)" :key="index" v-show="cateList.length&&cateList[cate].show(item)">
 						<view class="right">
@@ -45,8 +48,10 @@
 		</view>
 		<u-popup :show="show" mode="center" :round="10">
 			<view class="popupInfo">
-				<image :src="popupInfo.faceUrl" mode="widthFix" style="width: 480rpx;border-radius:10rpx">
-				</image>
+				<view style="width: 480rpx;overflow-y: auto;max-height: 660rpx;">
+					<image :src="popupInfo.faceUrl" mode="widthFix" style="width: 480rpx;border-radius:10rpx;">
+					</image>
+				</view>
 				<view class="top">
 					<view class="status" :style="{backgroundColor:cate == 0?'#0FAF76':cate == 1?'#EF2D2D':'#F49D19' }">
 						{{cateList.find(e=>e.value == cate)?cateList.find(e=>e.value == cate).label:''}}

monitorMobile/pages/work/rollCall/index.vue

@@ -2,7 +2,7 @@
 	<view style="height: 100%;">
 		<view class="topBox">
 			<SelectRadio v-model="search.CameraId" align="center" placeholder="请选择摄像头" @change="refresh"
-				:options="allOptions.monitorList" />
+				:options="[{value:'',label:'全部'},...allOptions.monitorList]" />
 		</view>
 		<u-empty marginTop="100rpx" :show="list.length == 0&&status == 'nomore'" mode="list" text="暂无数据"></u-empty>
 		<u-list @scrolltolower="scrolltolower" style="height: calc(100% - 150rpx);">