Browse Source

公示墙调整

zhengkaixin 4 years ago
parent
commit
d58ccdc2d8

+ 1 - 1
src/projects/business/views/HouseKeeper/Control/CompanyList.vue

@@ -34,7 +34,7 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'MasterAttendanceInfo',
+		name: 'HouseKeeperControlCompanyList',
 		components: {
 			Common,
 			Loading,

+ 1 - 1
src/projects/business/views/HouseKeeper/Control/Health/AbnormalStatistics.vue

@@ -88,7 +88,7 @@
 		beforeTimeStamp
     } from '$project/utils'
     export default {
-        name: 'HouseKeeperAdminHealthAbnormalRecord',
+        name: 'HouseKeeperControlHealthAbnormalStatistics',
         components: {
             Common,
             Loading,

+ 15 - 13
src/projects/business/views/HouseKeeper/Control/Health/GuestTemperature.vue

@@ -1,20 +1,20 @@
 <template>
 <div>
 	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="companyName+pageTitle"></top-header>
+	<top-header :pageTitle="pageTitle"></top-header>
 
 	<div class="mui-content fyy-wall">
 			<div id="slider" class="mui-slider mui-fullscreen fyy-slider vongi-fkwall">
 				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 					<div class="mui-scroll">
 						<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>
 						<a class="mui-control-item"  :class=" nowItem=='visitor'?'mui-active':''" @click="changeItem('visitor')" style="width:34%">
-							访客测温记录
+							异常记录
 						</a>
 					</div>
 				</div>
@@ -61,13 +61,19 @@
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
+	import isReachBottom from '$project/utils/isReachBottom'
 
+	import {
+		parseUnixTime,
+		currentTimeStamp
+
+	} from '$project/utils'
 	import {
 		mapGetters,
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'MasterAttendanceInfo',
+		name: 'HouseKeeperControlHealthGuestTemperature',
 		components: {
 			Common,
 			Loading,
@@ -90,7 +96,7 @@
 					queryDate: '',
 
 					totalPage: 1,
-					type: ''
+					type: 'visitor'
 				},
 				//总访客数
 				recordsTotal: 0,
@@ -106,12 +112,8 @@
 		},
 		created() {
 			//赋值时间
-			var now = new Date();
-			var year = now.getFullYear(); //得到年份
-			var month = now.getMonth();//得到月份
-			var date = now.getDate();//得到日期
+			this.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
 
-			this.queryDate = year+"-"+month+"-"+date;
 			this.detailForm.queryDate = this.queryDate;
 			this.listForm.queryDate = this.queryDate;
 
@@ -154,7 +156,7 @@
 //item切换事件
 			changeItem(type) {
 				this.nowItem = type;
-				this.listForm.type = type;
+				//this.listForm.type = type;
 				this.listForm.pageIndex = 1;
 				this.getList();
 			},
@@ -165,7 +167,7 @@
 					if (list[index]['person'] == undefined) {
 						var voindex = this.recordsTotal - vtindex;
 						vtindex++;
-						list[index]['personName'] = list[index]['personName'] != '未识别' ? list[index]['personName'] : '访客' + voindex;
+						list[index]['personName'] = list[index]['matchStatus'] != '2' ? list[index]['personName'] : '访客' + voindex;
 						list[index]['isVistor'] = true;
 					} else {
 						list[index]['personName'] = list[index]['person']['name'];

+ 10 - 8
src/projects/business/views/HouseKeeper/Control/Health/Wall.vue

@@ -36,7 +36,7 @@
 								<div class="mui-media-body">
 									<span class="mui-icon iconfont icon-leijicishu1"></span>
 									<p class="mui-col-xs-6">当日异常</p>
-									<span class="mui-col-xs-6"><span class="colorfe616c" v-text="detail.totalCheckNum">5000</span><span class="fyy-danwei">人</span></span>
+									<span class="mui-col-xs-6"><span class="colorfe616c" v-text="detail.dayAbnormalNum">5000</span><span class="fyy-danwei">人</span></span>
 								</div>
 							</div>
 						</div>
@@ -47,15 +47,17 @@
 					<li class="mui-table-view-cell mui-media mui-col-xs-12">
 						<div class="fyy-statistics-body">
 							<div class="fyy-wall-number fyy-wall-small">
-								<div class="mui-media-body" style="margin-bottom:5px">
+								<!--<div class="mui-media-body" style="margin-bottom:5px">
 									<span class="mui-icon iconfont icon-baojing"></span>
 									<p class="mui-col-xs-8">当日异常<span style="margin:0 15px">/</span>累计异常</p>
-									<span class="mui-col-xs-4"><span class="colorfe616c" v-text="detail.dayAbnormalNum">0</span>人 <span style="margin:0 15px">/</span><span class="colorfe616c">1</span>人</span>
-								</div>
+									<span class="mui-col-xs-4"><span class="colorfe616c" v-text="detail.dayAbnormalNum">0</span>人 <span style="margin:0 15px">/</span><span class="colorfe616c" v-text="detail.totalAbnormalNum">1</span>人</span>
+								</div>-->
 								<div class="mui-media-body">
-									<span class="mui-icon iconfont icon-shijian"></span>
-									<p class="mui-col-xs-8">连续无异常天数</p>
-									<span class="mui-col-xs-4"><span class="color55f868"  v-text="detail.normalDays">6</span>天</span>
+
+
+
+									<span class="mui-col-xs-12" style="text-align:center">	<span class="mui-icon iconfont icon-shijian"></span>连续无异常<span class="color55f868"  style="font-size: 20px;margin: 0px 8px;" v-text="detail.normalDays">6</span>天</span>
+
 								</div>
 							</div>
 						</div>
@@ -132,7 +134,7 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'MasterAttendanceInfo',
+		name: 'HouseKeeperControlHealthWall',
 		components: {
 			Common,
 			Loading,

+ 1 - 1
src/projects/business/views/HouseKeeper/Control/SendNotice.vue

@@ -40,7 +40,7 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'MasterAttendanceInfo',
+		name: 'HouseKeeperControlSendNotice',
 		components: {
 			Common,
 			Loading,