zhengkaixin 4 år sedan
förälder
incheckning
790783d58a

+ 7 - 23
src/projects/business/views/HouseKeeper/Control/Health/GuestTemperature.vue

@@ -10,10 +10,10 @@
 						<a class="mui-control-item " :class=" nowItem==''?'mui-active':''" @click="changeItem('')"  style="width:30%">
 							全部
 						</a>
-						<a class="mui-control-item"  :class=" nowItem=='person'?'mui-active':''" @click="changeItem('person')"  style="width:36%">
+						<a class="mui-control-item"  :class=" nowItem=='1'?'mui-active':''" @click="changeItem('1')"  style="width:36%">
 							正常记录
 						</a>
-						<a class="mui-control-item"  :class=" nowItem=='visitor'?'mui-active':''" @click="changeItem('visitor')" style="width:34%">
+						<a class="mui-control-item"  :class=" nowItem=='2'?'mui-active':''" @click="changeItem('2')" style="width:34%">
 							异常记录
 						</a>
 					</div>
@@ -30,7 +30,7 @@
 
 												<img :src="item.faceImage"  >
 
-												<span class="mui-icon iconfont icon-erweima1 "  :class="item.temperature>maxTemperature?'colorfe616c':'color55f868'"></span>
+												<span class="mui-icon iconfont icon-erweima1 " v-if="item.matchStatus!=2"  :class="item.temperature>maxTemperature?'colorfe616c':'color55f868'"></span>
 											</div>
 											<div class="mui-media-body">
 												<span v-text="item.personName">冯银银</span>
@@ -94,7 +94,7 @@
 					pageIndex: 1,
 					pageSize: 15,
 					queryDate: '',
-
+					filter:'',
 					totalPage: 1,
 					type: 'visitor'
 				},
@@ -120,28 +120,12 @@
 			if (this.$route.query.companyId) {
 				this.companyId = this.$route.query.companyId;
 			}
-			this.getNumData();
+			this.getList();
 
 		},
 		methods: {
 
-			getNumData() {
-				this.isLoading = true;
-				API_ControlWall.healthShowNumData(this.detailForm).then(response => {
-					this.isLoading = false;
-
-					this.detail = response;
-
-					//访问总人数
-					this.recordsTotal = response.checkedVisitorNum;
 
-					//获取列表数据
-					this.getList();
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
 			//下拉事件
 			handleScrool() {
 				if (isReachBottom()) {
@@ -156,7 +140,7 @@
 //item切换事件
 			changeItem(type) {
 				this.nowItem = type;
-				//this.listForm.type = type;
+				this.listForm.filter = type;
 				this.listForm.pageIndex = 1;
 				this.getList();
 			},
@@ -226,7 +210,7 @@
 				_this.listForm.pageIndex = 1
 
 				//获取详情数据
-				_this.getNumData();
+				this.getList();
 
 			}, 30 * 1000);
 

+ 12 - 4
src/projects/business/views/HouseKeeper/Control/Health/Wall.vue

@@ -89,9 +89,8 @@
 										<div class="mui-content-padded">
 											<div class="mui-media-object">
 
-												<img :src="item.faceImage"  >
-
-												<span class="mui-icon iconfont icon-erweima1 "  :class="item.temperature>maxTemperature?'colorfe616c':'color55f868'"></span>
+												<img :src="item.faceImage">
+												<span class="mui-icon iconfont icon-erweima1 " v-if="!item.isVistor"  :style="'color:'+getGreenCodeColor(item['person']['healthyCode'])"></span>
 											</div>
 											<div class="mui-media-body">
 												<span v-text="item.personName">冯银银</span>
@@ -185,7 +184,16 @@
 
 		},
 		methods: {
-
+			getGreenCodeColor(healthyCode) {
+				var healthyCode = healthyCode || '11';
+				var color = {
+					"00": '#09ae47',
+					"01": '#e5aa37',
+					"10": '#fe616c',
+					"11": '#C0C0C0'
+				}
+				return color[healthyCode];
+			},
 			getNumData() {
 				this.isLoading = true;
 				API_ControlWall.healthShowNumData(this.detailForm).then(response => {