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

monitorMobile/components/cell.vue

@@ -41,6 +41,9 @@
 		background: #fff;
 		border-radius: 20rpx;
 		height: 90rpx;
+		::v-deep .u-cell__body {
+			height: 100%;
+		}
 	}
 	.selectedBox{
 		display: flex;

monitorMobile/pages/login.vue

@@ -19,8 +19,10 @@
 					<u--input v-model="form.password" :type="passType" border="none" placeholder="请输入密码"
 						:customStyle="{backgroundColor:'#F5F5F5',height:'98rpx',borderRadius:'20rpx',padding:'0rpx 30rpx'}">
 						<view slot="suffix">
-							<u-icon v-show="passType=='text'" name="eye" color="#777777" size="38rpx"
-								@click="passType='password'"></u-icon>
+							<view :style="{opacity:passType=='text'?'1':'0',height:passType=='text'?'auto':'0'}">
+								<u-icon name="eye" color="#777777" size="38rpx"
+									@click="passType='password'"></u-icon>
+							</view>
 							<image v-show="passType=='password'" src="/static/image/eyeclose.png"
 								style="width: 38rpx;height: 38rpx;margin-top: 12rpx;" @click="passType='text'">
 							</image>

monitorMobile/pages/work/returnBed/detail.vue

@@ -10,6 +10,9 @@
 			已归寝
 		</view>
 		<view class="list">
+			<view v-show="info.name&&!list.length" style="color: rgb(96, 98, 102);margin-top:36rpx;font-size: 26rpx;text-align: center;">
+				暂无数据
+			</view>
 			<view v-for="(item, index) in list" :key="index" class="item" v-show="item.tick">
 				<view class="topBox">
 					<image :src="item.faceUrl" mode="aspectFill" style="width: 160rpx;height: 160rpx;border-radius:10rpx">

monitorMobile/pages/work/rollCall/detail.vue

@@ -1,14 +1,22 @@
 <template>
 	<view style="height: 100%;">
 		<view class="title">
-			应到：{{list.length}}人
+			<view>
+				应到：{{list.length}}人
+			</view>
+			<view>
+				实到：{{list.filter(e=>e.alarmTypes.includes('class_room_call')).length}}人
+			</view>
 		</view>
 		<view style="padding: 26rpx;overflow: hidden;">
 			<view class="cate">
-				<view class="cateList">
+				<view :class="{cateList:true,more:cateList.length>3}">
 					<view v-for="item in cateList" :class="{active:item.value == cate}" :key="item.value" class="item"
 						@click="cateItemClick(item)">
-						{{item.label}}({{item.num}})
+						<view class="itemContent">
+							{{item.label}}
+							<!-- ({{item.num}}) -->
+						</view>
 					</view>
 				</view>
 			</view>
@@ -224,6 +232,7 @@
 
 	.title {
 		display: flex;
+		justify-content: space-between;
 		color: #333333;
 		padding: 26rpx;
 		background: #fff;
@@ -237,22 +246,36 @@
 
 		.cateList {
 			display: flex;
-			width: auto;
-
-			.item {
-				background-color: #fff;
-				border-radius: 37rpx;
-				padding: 0 56rpx;
-				line-height: 74rpx;
-				margin-right: 30rpx;
-				white-space: nowrap;
-				color: #333;
-
-				&.active {
+			flex-wrap: nowrap;
+			
+			.item{
+				padding-right: 28rpx;
+				&:last-child{
+					padding-right: 0;
+				}
+				.itemContent {
+					background-color: #fff;
+					border-radius: 37rpx;
+					line-height: 74rpx;
+					white-space: nowrap;
+					color: #333;
+					text-align: center;
+					width: 214rpx;
+				}
+				&.active .itemContent{
 					background-color: #2388FF;
 					color: #fff;
 				}
 			}
+			
+			&.more{
+				.item{
+					display: inline-block;
+					.itemContent{
+						width: 200rpx;
+					}
+				}
+			}
 		}
 	}