Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -59,7 +59,7 @@ body {
 	color: #375cf5
 }
 
-.color999{
+.color999 {
 	color: #999
 }
 
@@ -82,12 +82,15 @@ body {
 .margin10 {
 	margin-bottom: 10px
 }
+
 .margint10 {
 	margin: 10px 0
 }
-.marginl5{
-	margin-left:5px
+
+.marginl5 {
+	margin-left: 5px
 }
+
 .marginbo,
 .vongi-notice.marginbo {
 	margin-bottom: 0
@@ -411,16 +414,19 @@ body {
 .mui-segmented-control.mui-scroll-wrapper .mui-control-item {
 	width: 50%
 }
+
 .vongi-ygjkma .mui-segmented-control.mui-scroll-wrapper .mui-control-item {
 	width: 25%;
-	padding:0;
-	font-size:14px;
+	padding: 0;
+	font-size: 14px;
 }
-.vongi-ygjkma .mui-badge{
-	font-size:80%
+
+.vongi-ygjkma .mui-badge {
+	font-size: 80%
 }
-.vongi-ygjkma .mui-segmented-control.mui-scroll-wrapper .mui-scroll{
-	padding:0 15px
+
+.vongi-ygjkma .mui-segmented-control.mui-scroll-wrapper .mui-scroll {
+	padding: 0 15px
 }
 
 .mui-segmented-control.mui-scroll-wrapper {
@@ -499,13 +505,16 @@ body {
 .fyy-footer button {
 	font-size: 16px
 }
-.fyy-footer.vongi-footer button{
-	font-size:14px;
-	padding:5px 20px
+
+.fyy-footer.vongi-footer button {
+	font-size: 14px;
+	padding: 5px 20px
 }
-.fyy-footer.vongi-footer .mui-right{
+
+.fyy-footer.vongi-footer .mui-right {
 	text-align: right;
 }
+
 .fyy-footer .bindfyy-btn {
 	width: 100%;
 	margin: 0 auto
@@ -1408,8 +1417,6 @@ h3 {
 	background: 0;
 }
 
-
-
 .vongi-wordcard-sp .mui-media-object {
 	width: 42px;
 	min-height: 42px;
@@ -1468,11 +1475,13 @@ h3 {
 .vongi-wordcard-sp .mui-input-group .mui-input-row {
 	background: 0;
 	height: auto;
-	margin-top:10px
+	margin-top: 10px
 }
-.vongi-wordcard-sp .fyy-bindfyy-btn .mui-input-group .mui-input-row{
-	margin-top:0
+
+.vongi-wordcard-sp .fyy-bindfyy-btn .mui-input-group .mui-input-row {
+	margin-top: 0
 }
+
 .vongi-wordcard-sp .fyy-checkbox .mui-checkbox.mui-left input[type=checkbox],
 .vongi-wordcard-sp .fyy-checkbox .mui-radio.mui-left input[type=radio] {
 	top: 29px;
@@ -1557,7 +1566,7 @@ h3 {
 	border-radius: 4px;
 }
 
-.vongi-wordcard-sp .mui-table-view-cell:after{
+.vongi-wordcard-sp .mui-table-view-cell:after {
 	background: 0
 }
 
@@ -1659,12 +1668,12 @@ h3 {
 	color: #999
 }
 
-.vongi-archives .mui-segmented-control.mui-scroll-wrapper .mui-control-item.mui-active{
+.vongi-archives .mui-segmented-control.mui-scroll-wrapper .mui-control-item.mui-active {
 	position: relative;
 	color: #3385FF
 }
 
-.vongi-archives .mui-segmented-control.mui-scroll-wrapper .mui-control-item.mui-active:after{
+.vongi-archives .mui-segmented-control.mui-scroll-wrapper .mui-control-item.mui-active:after {
 	content: "";
 	position: absolute;
 	bottom: 0;
@@ -2111,7 +2120,7 @@ h3 {
 
 .vongi-meform-pho textarea {
 	padding: 0;
-	margin-top:5px
+	margin-top: 5px
 }
 
 .vongi-meform-pho h5 {
@@ -2638,30 +2647,36 @@ h3 {
 .vongi-over .mui-scroll {
 	margin-bottom: 60px;
 }
-.vongi-zctj .vongi-over .mui-scroll{
-	margin-bottom:0
+
+.vongi-zctj .vongi-over .mui-scroll {
+	margin-bottom: 0
 }
+
 .vongi-over-hei {
 	min-height: 100%;
 }
-.vongi-zctj.vongi-wordcard-sp .mui-slider-group .mui-scroll-wrapper{
+
+.vongi-zctj.vongi-wordcard-sp .mui-slider-group .mui-scroll-wrapper {
 	margin-top: 89px;
 }
-.vongi-wordcard-sp.vongi-zctj .vongi-bagfff{
+
+.vongi-wordcard-sp.vongi-zctj .vongi-bagfff {
 	width: 100%;
 	background: #fff;
 	z-index: 99;
-	position:fixed
+	position: fixed
 }
 
-.vongi-wordcard-sp.vongi-zctj .vongi-over .mui-scroll form{
-	margin-bottom:10px
+.vongi-wordcard-sp.vongi-zctj .vongi-over .mui-scroll form {
+	margin-bottom: 10px
 }
-.vongi-wordcard-sp.vongi-zctj .mui-slider-indicator.mui-segmented-control{
+
+.vongi-wordcard-sp.vongi-zctj .mui-slider-indicator.mui-segmented-control {
 	position: fixed;
 	top: 99px;
 	z-index: 99;
 }
+
 .vongi-editme .mui-input-row.vongi-yzm input,
 .vongi-yzm input {
 	width: 60%;
@@ -4145,281 +4160,397 @@ h3 {
 .vongi-slot-content {
 	margin-left: 45px;
 }
-.vongi-slot-content a{
-	padding-right:15px;
-	font-size:12px;
+
+.vongi-slot-content a {
+	padding-right: 15px;
+	font-size: 12px;
 	line-height: initial;
 }
-.vongi-slot{
-	background:#ffffff
+
+.vongi-slot {
+	background: #ffffff
 }
+
 .vongi-wordcard-sp .vongi-cchai .mui-slider-item .mui-h6 {
-    margin-right: 0;
+	margin-right: 0;
 }
-.vongi-cchai .mui-input-row p{
-	padding-right:0
+
+.vongi-cchai .mui-input-row p {
+	padding-right: 0
 }
-.vongi-cchai .mui-btn{
-	width:auto;
-	padding:2px 10px;
+
+.vongi-cchai .mui-btn {
+	width: auto;
+	padding: 2px 10px;
 	line-height: inherit;
-	font-size:12px
+	font-size: 12px
 }
-.vongi-cchai .mui-btn-primary{
+
+.vongi-cchai .mui-btn-primary {
 	border: 1px solid #3385FF;
 }
-.vongi-cchai h4{
-	margin-bottom:10px
+
+.vongi-cchai h4 {
+	margin-bottom: 10px
 }
-.vongi-cchai .mui-table-view-chevron .mui-table-view-cell > a:not(.mui-btn){
-	padding:15px
+
+.vongi-cchai .mui-table-view-chevron .mui-table-view-cell>a:not(.mui-btn) {
+	padding: 15px
 }
-.vongi-zdto{
-	padding:10px 15px;
-	background:#ffffff;
-	border-bottom:1px #eee solid
+
+.vongi-zdto {
+	padding: 10px 15px;
+	background: #ffffff;
+	border-bottom: 1px #eee solid
 }
-.vongi-pay-list.openfyy-list li{
-	padding:0 10px;
-	margin-bottom:10px
+
+.vongi-pay-list.openfyy-list li {
+	padding: 0 10px;
+	margin-bottom: 10px
 }
+
 .vongi-pay-list li .mui-card-content-inner,
-.vongi-pay-list li .mui-card-footer{ 
-	padding:10px 0
+.vongi-pay-list li .mui-card-footer {
+	padding: 10px 0
 }
-.vongi-pay-list li .mui-card-footer{
-	min-height:initial
+
+.vongi-pay-list li .mui-card-footer {
+	min-height: initial
 }
-.vongi-pay-list .mui-card-footer::before{
-	background:#eee
+
+.vongi-pay-list .mui-card-footer::before {
+	background: #eee
 }
-.vongi-pay .vongi-zd{
+
+.vongi-pay .vongi-zd {
 	justify-content: center;
-	background:0;
+	background: 0;
 }
-.vongi-pay .mui-collapse-content .mui-table-view{
-	margin:0
+
+.vongi-pay .mui-collapse-content .mui-table-view {
+	margin: 0
 }
-.vongi-pay .mui-table-view-cell.mui-collapse .mui-table-view .mui-table-view-cell{
-	padding:0 15px;
-	background:#ffffff
+
+.vongi-pay .mui-table-view-cell.mui-collapse .mui-table-view .mui-table-view-cell {
+	padding: 0 15px;
+	background: #ffffff
 }
-.vongi-pay .mui-table-view-cell.mui-collapse a{
-	background:#eee
+
+.vongi-pay .mui-table-view-cell.mui-collapse a {
+	background: #eee
 }
+
 .vongi-pay .openfyy-list .mui-table-view-cell.mui-collapse,
 .vongi-pay .mui-table-view-cell.mui-collapse .mui-collapse-content,
-.vongi-pay .mui-table-view-cell.mui-collapse .mui-table-view .mui-table-view-cell::after{
-	background:0
+.vongi-pay .mui-table-view-cell.mui-collapse .mui-table-view .mui-table-view-cell::after {
+	background: 0
 }
 
-.vongi-pay .mui-table-view-cell.mui-collapse .mui-collapse-content{
-	padding:0;
+.vongi-pay .mui-table-view-cell.mui-collapse .mui-collapse-content {
+	padding: 0;
 }
-.vongi-zdlist.vongi-zd .mui-table-view-cell{
-	margin:0;
+
+.vongi-zdlist.vongi-zd .mui-table-view-cell {
+	margin: 0;
 	border-radius: initial;
-	border-bottom:1px #eee solid
+	border-bottom: 1px #eee solid
 }
-.vongi-dw span input{
-	padding:0 10px 0 0;
-	width:80%
+
+.vongi-dw span input {
+	padding: 0 10px 0 0;
+	width: 80%
 }
 
-.vongi-top-bread a{
-	padding:5px 10px
+.vongi-top-bread a {
+	padding: 5px 10px
 }
-.vongi-top-bread .mui-active{
-	color:#3385FF
+
+.vongi-top-bread .mui-active {
+	color: #3385FF
 }
-.vongi-flxtop{
-	position:fixed;
-	width:100%;
+
+.vongi-flxtop {
+	position: fixed;
+	width: 100%;
 	z-index: 9;
 }
-.vongi-kqtj-tab{
-	margin-top:41px;
-	background:#ffffff;
+
+.vongi-kqtj-tab {
+	margin-top: 41px;
+	background: #ffffff;
 }
-.vongi-tab-top{
-	margin-top:82px
+
+.vongi-tab-top {
+	margin-top: 82px
 }
-.vongi-top-bread.vongi-bread{
+
+.vongi-top-bread.vongi-bread {
 	overflow-x: initial;
-    padding: 5px 38px 5px 0;
-    background: #ffffff;
-    position: relative;
-    overflow: hidden;
-    display: flex;
-    flex-wrap: wrap;
-    height: 41px;
-    border-top: 1px #eee solid;
-}
-.vongi-top-bread button{
-	position:absolute;
-	right:0;
-	top:1px;
-	height:40px;
-	border:0;
+	padding: 5px 38px 5px 0;
+	background: #ffffff;
+	position: relative;
+	overflow: hidden;
+	display: flex;
+	flex-wrap: wrap;
+	height: 41px;
+	border-top: 1px #eee solid;
+}
+
+.vongi-top-bread button {
+	position: absolute;
+	right: 0;
+	top: 1px;
+	height: 40px;
+	border: 0;
 	border-radius: initial;
 	-webkit-box-shadow: 0 1px 6px #ccc;
 	box-shadow: 0 1px 6px #ccc;
 }
-.vongi-top-bread-list{
-	background:rgba(0,0,0,0.6);
-	height:100%;
-	position:fixed;
-	top:82px;
+
+.vongi-top-bread-list {
+	background: rgba(0, 0, 0, 0.6);
+	height: 100%;
+	position: fixed;
+	top: 82px;
 }
-.vongi-top-bread.flew{
+
+.vongi-top-bread.flew {
 	flex-wrap: wrap;
-	background:#ffffff;
-	border-top:1px #eee solid;
+	background: #ffffff;
+	border-top: 1px #eee solid;
 	padding: 5px 38px 5px 0;
-	width:100%
+	width: 100%
 }
-.vongi-top-bread-list .vongi-top-bread button{
+
+.vongi-top-bread-list .vongi-top-bread button {
 	box-shadow: initial;
 }
-.vongi-ad-fix{
-	position:fixed;
-	bottom:0;
-	width:100%;
+
+.vongi-ad-fix {
+	position: fixed;
+	bottom: 0;
+	width: 100%;
 	z-index: 9999;
 }
-.vongi-ad-fix .fyy-bindfyy-btn{
-	position:initial;
+
+.vongi-ad-fix .fyy-bindfyy-btn {
+	position: initial;
 	z-index: initial;
 }
-.vongi-wordcard-sp .vongi-ad-fix .mui-input-group .mui-input-row{
-	background:#ffffff;
-	border-top:1px #eee solid;
-	border-bottom:1px #eee solid
+
+.vongi-wordcard-sp .vongi-ad-fix .mui-input-group .mui-input-row {
+	background: #ffffff;
+	border-top: 1px #eee solid;
+	border-bottom: 1px #eee solid
 }
-.vongi-over .vongi-cchai .mui-scroll{
-	margin-bottom:110px
+
+.vongi-over .vongi-cchai .mui-scroll {
+	margin-bottom: 110px
 }
-.vongi-zctj .mui-fullscreen{
-	position:initial
+
+.vongi-zctj .mui-fullscreen {
+	position: initial
 }
-.vongi-zctj .vongi-archives .mui-table-view .mui-media-object{
-	margin-right:5px
+
+.vongi-zctj .vongi-archives .mui-table-view .mui-media-object {
+	margin-right: 5px
 }
-.vongi-zctj .mui-slider-group{
-	padding-top:10px
+
+.vongi-zctj .mui-slider-group {
+	padding-top: 10px
 }
+
 .vongi-zctj .mui-table-view::before,
-.vongi-zctj .mui-table-view::after{
-	background:0
+.vongi-zctj .mui-table-view::after {
+	background: 0
 }
-.vongi-zctj .mui-slider .mui-segmented-control.mui-segmented-control-inverted ~ .mui-slider-group .mui-slider-item{
-	border:0
+
+.vongi-zctj .mui-slider .mui-segmented-control.mui-segmented-control-inverted~.mui-slider-group .mui-slider-item {
+	border: 0
 }
-.vongi-zctj .vongi-archives .mui-table-view .mui-pull-right{
-	color:#888
+
+.vongi-zctj .vongi-archives .mui-table-view .mui-pull-right {
+	color: #888
 }
+
 .vongi-fx-yzm,
-.vongi-fx-radio{
+.vongi-fx-radio {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
 }
+
 .vongi-fx-yzm label,
 .vongi-fx-yzm a,
-.vongi-fx-yzm input{
+.vongi-fx-yzm input {
 	flex-shrink: 0;
 }
-.vongi-editme .mui-input-row.vongi-fx-yzm input{
-	width:40%
+
+.vongi-editme .mui-input-row.vongi-fx-yzm input {
+	width: 40%
 }
-.vongi-fx-yzm a{
-	color:#3385FF;
-	padding-right:15px
+
+.vongi-fx-yzm a {
+	color: #3385FF;
+	padding-right: 15px
 }
-.vongi-fx-yzm .mui-radio.mui-left label{
-	padding:0 0 0 20px
+
+.vongi-fx-yzm .mui-radio.mui-left label {
+	padding: 0 0 0 20px
 }
-.vongi-fx-yzm .mui-radio input[type="radio"]::before{
-	font-size:20px;
-	
+
+.vongi-fx-yzm .mui-radio input[type="radio"]::before {
+	font-size: 20px;
 }
-.vongi-fx-yzm .mui-radio.mui-left input[type="radio"]{
-	left:0;
-	width:auto;
-	top:0
+
+.vongi-fx-yzm .mui-radio.mui-left input[type="radio"] {
+	left: 0;
+	width: auto;
+	top: 0
 }
-.vongi-fx .vongi-editme .mui-input-row .mui-btn img{
+
+.vongi-fx .vongi-editme .mui-input-row .mui-btn img {
 	border-radius: initial
 }
-.vongi-fx h1{
-	margin:20px 0 15px;
+
+.vongi-fx h1 {
+	margin: 20px 0 15px;
 	font-weight: initial;
 }
-.vongi-fx p{
+
+.vongi-fx p {
 	text-align: justify;
-	color:#101010;
-	font-size:14px
+	color: #101010;
+	font-size: 14px
 }
-.vongi-fx-list .mui-pull-left span{
-	margin:0 5px
+
+.vongi-fx-list .mui-pull-left span {
+	margin: 0 5px
 }
-.vongi-fx-card{
-	background:#3385FF;
+
+.vongi-fx-card {
+	background: #3385FF;
 	border-radius: 5px;
-	padding:15px;
-	color:#ffffff;
+	padding: 15px;
+	color: #ffffff;
 	line-height: 1.5;
 }
-.vongi-fx-card h4{
+
+.vongi-fx-card h4 {
 	line-height: 1.2;
 }
-.vongi-fx-card h1{
-	margin-bottom:10px;
+
+.vongi-fx-card h1 {
+	margin-bottom: 10px;
 	font-weight: initial;
 }
-.vongi-fx-card .iconfont{
+
+.vongi-fx-card .iconfont {
 	display: block;
-	float:left;
-	margin-right:5px
+	float: left;
+	margin-right: 5px
 }
-.vongi-fx-dattop{
-	position:relative;
-	margin:10px
+
+.vongi-fx-dattop {
+	position: relative;
+	margin: 10px
 }
-.vongi-fx-dattop a{
-	position:absolute;
-	right:15px;
-	top:30px;
+
+.vongi-fx-dattop a {
+	position: absolute;
+	right: 15px;
+	top: 30px;
 	text-align: center;
-	color:#ffffff;
-	font-size:12px
+	color: #ffffff;
+	font-size: 12px
 }
-.vongi-fx-dattop a .iconfont{
-	font-size:36px
+
+.vongi-fx-dattop a .iconfont {
+	font-size: 36px
 }
-.vongi-fx-dat .mui-input-row label{
-	width:100%;
-	color:#888
+
+.vongi-fx-dat .mui-input-row label {
+	width: 100%;
+	color: #888
 }
-.vongi-fx-datpot .mui-table-view.mui-grid-view .mui-table-view-cell .mui-media-object{
-	width:100%;
-	height:100px;	
+
+.vongi-fx-datpot .mui-table-view.mui-grid-view .mui-table-view-cell .mui-media-object {
+	width: 100%;
+	height: 100px;
 	display: flex;
 	overflow: hidden;
 }
-.vongi-fx-datpot .mui-media-object img{
+
+.vongi-fx-datpot .mui-media-object img {
 	object-fit: cover;
-	width:100%;
+	width: 100%;
 	min-height: 100%;
 }
+
 .vongi-fx-datpot {
-	background:#ffffff;
-	padding:10px 10px 0
+	background: #ffffff;
+	padding: 10px 10px 0
 }
-.mui-grid-view.mui-grid-9 .mui-table-view-cell{
-	padding:0 5px
+
+.mui-grid-view.mui-grid-9 .mui-table-view-cell {
+	padding: 0 5px
 }
-.von-fx-content img{
+
+.von-fx-content img {
 	display: flex;
-	width:100%
-	}
+	width: 100%
+}
+
+.vongi-archives .mui-table-view .vongi-dktz-t h4 {
+	margin: 0;
+	margin-bottom: 5px
+}
+
+.vongi-dktz-t {
+	margin-left: 5px
+}
+
+.vongi-dktz-t .mui-h6 {
+	line-height: 1;
+}
+
+.vongi-dktz-t .iconfont {
+	margin-left: 5px;
+	font-size: 14px
+}
+
+.vongi-dktz-bage.mui-btn {
+	padding: 0 6px;
+	margin-right: 5px;
+	font-size: 12px
+}
+.fyy-temper-date a {
+    color: #333;
+    display: block;
+    text-align: center;
+}
+.fyy-temper-date {
+    background: #ffffff;
+    padding: 10px;
+    display: flex;
+}
+.fyy-temper-date .mui-icon {
+    font-size: 12px;
+    margin-left: 5px;
+    color: #999;
+}
+.fyy-temper-date span {
+    text-align: center;
+}
+.vongi-dktz-c .mui-table-view-cell::after,
+.vongi-dktz-c .mui-table-view::before,
+.vongi-dktz-c .mui-table-view::after{
+	background:#eee;
+	left:0
+}
+.vongi-dktz-c .vongi-clasadmin{
+	margin-bottom:0
+}
+.vongi-dktz-c .vongi-clasadmin-list{
+	border-bottom:1px solid #eee
+}

src/projects/business/apis/Master/health.js

@@ -124,6 +124,14 @@ export function getHealthyCodeStat(companyId, popedom) {
 	})
 }
 
+export function query(queryModel) {
+    return request({
+        url: '/mobile/personHealthLedgerApi/query',
+        data: Qs.stringify(queryModel),
+        method: 'post',
+        timeout: 30000
+    })
+}
 export function workerPageList(queryModel) {
 	return request({
 		url: '/mobile/personHealthLedgerApi/workerPageList',

src/projects/business/views/Master/Health/Worker.vue

@@ -3,120 +3,49 @@
 		<common @asynCallBack="asynCallBack"></common>
 		<top-header :pageTitle="pageTitle"></top-header>
 
-		<div class="mui-content fyy-wall vongi-zgtz">
-			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>{{person_data.companyName}}
-					<a class="mui-navigate-right mui-pull-right" v-text="curDate" @click="selectDate()">2020-03-19</a>
-				</h5>
+		<div class="mui-content vongi-archives vongi-dktz-c">
+			<div class="fyy-temper-date margin10">
+				<a href="" class="mui-col-xs-4"  @click="selectDate" >{{curDate}}<span class="mui-icon mui-icon-arrowdown"></span></a>
+				<a href="" class="mui-col-xs-4"  @click="selectIndexOf">{{selectedIndex==0?'上报情况':selectedType[selectedIndex]}}<span class="mui-icon mui-icon-arrowdown" ></span></a>
+				<a href="" class="mui-col-xs-4"  @click="selectAddress">{{address==''?'打卡区域':addressType[address]}}<span class="mui-icon mui-icon-arrowdown" ></span></a>
 			</div>
-			<div class="vongi-clasadmin">
+			<div class="vongi-clasadmin vongi-bagfff">
 				<h4>健康码统计</h4>
 				<div class="vongi-clasadmin-list">
 					<div class="vongi-clasadmin-ma mui-col-xs-3" v-for="(item,index) in statList" :key="index" @click="goToCodeList(item.healthyCode)">
 						<span :style="'color:'+getGreenCodeColor(item.healthyCode)" v-text="item.total">2953</span>
 						<div class="mui-media-body" v-text="getCodeStatusName(item.healthyCode)">绿码</div>
 					</div>
-
 				</div>
-				<div class="vongi-zgtz-search">
-					<div class="mui-input-row mui-search">
-						<input type="search" class="setinput" placeholder="请输入姓名" v-model="setinput" @change="searchK">
-					</div>
+				<div class="vongi-xzdw-search">
+					<input type="search" placeholder="请输入姓名" v-model="setinput" @change="searchK">
+					<span class="mui-icon mui-icon-search"></span>
 				</div>
 			</div>
-			<div class="mui-slider">
-				<div class="mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
-					<a class="mui-control-item " :class="selectedIndex==0?'mui-active':''" @click="selectedIndex=0">
-						全部<span class="mui-badge" v-html="allCount"></span>
-					</a>
-					<a class="mui-control-item" :class="selectedIndex==1?'mui-active':''" @click="selectedIndex=1">
-						已上报<span class="mui-badge" v-html="doneCount"></span>
-					</a>
-					<a class="mui-control-item" :class="selectedIndex==2?'mui-active':''" @click="selectedIndex=2">
-						未上报<span class="mui-badge" v-html="undoCount"></span>
-					</a>
-				</div>
-				<div class="mui-slider-group">
-					<div :class="allGroup" class="mui-slider-item mui-control-content" v-show="selectedIndex==0">
-						<div id="scroll1" class="mui-scroll-wrapper">
-							<div class="mui-scroll ">
-								<ul class="mui-table-view">
-									<li class="mui-table-view-cell vongi-wordcard vongi-meform-pho" style="    border-bottom: 1px solid #c8c7cc;"
-									 v-for="(item,index) in allList" :key="index">
-										<a @click="viewDetail(item)" :class="item.upLoad?'mui-navigate-right':''">
-											<div class="mui-pull-left flew-items">
-												<div class="mui-media-object flew"><img v-if="item.faceImageUrl!=null" :src="item.faceImageUrl + '?x-oss-process=image/resize,m_fill,w_64'"
-													 width="50" /></div>
-												<h4 v-text="item.name"></h4>
-												<span class="mui-icon iconfont icon-erweima1  " :style="'color:'+getGreenCodeColor(item.healthyCode)"></span>
-												<span class="iconfont color999" style =" font-size: 14px;" v-if="countNum(item.countNum)">已连续上报{{item.countNum}}天</span>
-
-
-											</div>
-
-											<div class="mui-pull-right color55f868" style="padding: inherit;" v-if="item.upLoad">已上报</div>
-											<div class="mui-pull-right colorfe616c" style="padding: inherit;" v-if="!item.upLoad">未上报</div>
-										</a>
-									</li>
-								</ul>
-
+			<ul class="mui-table-view">
+				<li class="mui-table-view-cell"  v-for="(item,index) in allList" :key="index">
+					<a @click="viewDetail(item)" :class="item.upLoad?'mui-navigate-right':''">
+						<div class="mui-pull-left flew-items">
+							<div class="mui-media-object flew"><img   v-if="item.faceImageUrl!=null" :src="item.faceImageUrl + '?x-oss-process=image/resize,m_fill,w_64'" width="50" /></div>
+							<div class="vongi-dktz-t">
+								<h4 class='flew-items'>{{item.name}}<span class="mui-icon iconfont icon-erweima1  "  :style="'color:'+getGreenCodeColor(item.healthyCode)"></span></h4>
+								<div class="mui-h6" v-if="countNum(item.countNum)">已连续上报{{item.countNum}}天</div>
 							</div>
 						</div>
-					</div>
-					<div :class="doneGroup" class="mui-slider-item mui-control-content" v-show="selectedIndex==1">
-						<div id="scroll2" class="mui-scroll-wrapper">
-
-							<div class="mui-scroll ">
-								<ul class="mui-table-view">
-									<li class="mui-table-view-cell vongi-wordcard vongi-meform-pho" style="    border-bottom: 1px solid #c8c7cc;"
-									 v-for="(item,index) in doneList" :key="index">
-										<a @click="viewDetail(item)" :class="item.upLoad?'mui-navigate-right':''">
-											<div class="mui-pull-left flew-items">
-												<div class="mui-media-object flew"><img v-if="item.faceImageUrl!=null" :src="item.faceImageUrl + '?x-oss-process=image/resize,m_fill,w_64'"
-													 width="50" /></div>
-												<h4 v-text="item.name"></h4>
-												<span class="mui-icon iconfont icon-erweima1  " :style="'color:'+getGreenCodeColor(item.healthyCode)"></span>
-												<span class="iconfont color999" style =" font-size: 14px;" v-if="countNum(item.countNum)">已连续上报{{item.countNum}}天</span>
-
-											</div>
-											<div class="mui-pull-right color55f868" style="padding: inherit;" v-if="item.upLoad">已上报</div>
-											<div class="mui-pull-right colorfe616c" style="padding: inherit;" v-if="!item.upLoad">未上报</div>
-										</a>
-									</li>
-								</ul>
+						<div class="mui-pull-right flew-items">
+							<template  v-if="item.address">
+								<div class="mui-btn mui-btn-primary mui-btn-outlined vongi-dktz-bage " v-if="addressIf(item.address)" >市内</div>
+								<div class="mui-btn  mui-btn-outlined vongi-dktz-bage mui-btn-yellow"  v-else >{{addressIf2(item.address)}}</div>
+							</template>
 
-							</div>
+							<span :class="item.upLoad?'color55f868':'colorfe616c'">{{item.upLoad?'已上报':'未上报'}}</span>
 						</div>
-					</div>
-					<div :class="undoGroup" class="mui-slider-item mui-control-content" v-show="selectedIndex==2">
-						<div id="scroll3" class="mui-scroll-wrapper">
-
-							<div class="mui-scroll ">
-								<ul class="mui-table-view">
-									<li class="mui-table-view-cell vongi-wordcard vongi-meform-pho" style="    border-bottom: 1px solid #c8c7cc;"
-									 v-for="(item,index) in undoList" :key="index">
-										<a @click="viewDetail(item)" :class="item.upLoad?'mui-navigate-right':''">
-											<div class="mui-pull-left flew-items">
-												<div class="mui-media-object flew"><img v-if="item.faceImageUrl!=null" :src="item.faceImageUrl + '?x-oss-process=image/resize,m_fill,w_64'"
-													 width="50" /></div>
-												<h4 v-text="item.name"></h4>
-												<span class="mui-icon iconfont icon-erweima1  " :style="'color:'+getGreenCodeColor(item.healthyCode)"></span>
-												<span class="iconfont color999" style =" font-size: 14px;" v-if="countNum(item.countNum)">已连续上报{{item.countNum}}天</span>
-											</div>
-											<div class="mui-pull-right color55f868" style="padding: inherit;" v-if="item.upLoad">已上报</div>
-											<div class="mui-pull-right colorfe616c" style="padding: inherit;" v-if="!item.upLoad">未上报</div>
-										</a>
-									</li>
-								</ul>
-
-							</div>
-
+					</a>
+				</li>
 
-						</div>
+			</ul>
 
-					</div>
-				</div>
-			</div>
+		
 		</div>
 
 
@@ -161,6 +90,7 @@
 				id: '',
 				detail: [],
 				curDate: '',
+
 				isLoading: false,
 				allList: [],
 				allCount: 0,
@@ -169,12 +99,15 @@
 				doneList: [],
 				doneCount: 0,
 				selectedIndex: 0,
-				pageIndexArr: [1, 1, 1],
-				totalPageArr: [1, 1, 1],
-				setinput: "",
+                selectedType: ['全部','已上报','未上报'],
+                addressType: ['市内','市外','省外'],
+                address:'',
+                pageIndex: 1,
 				totalPage: 1,
+				setinput: "",
 				sortType: '1',
 				statList: [],
+				obj:{}
 			}
 		},
 		created() {
@@ -191,6 +124,20 @@
 		},
 
 		methods: {
+            addressIf(val){
+                if(val.indexOf('湖北省荆州市')<0){
+                    return false;
+				}else{
+                    return true;
+				}
+			},
+            addressIf2(val){
+                if(val.indexOf('湖北省')<0){
+                     return '省外';
+                }else{
+                    return '市外';
+                }
+            },
             countNum(num){
               if(  this.curDate == parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')&&num ){
                   return true;
@@ -218,85 +165,89 @@
 				//created 传trye, 其他传null
 				if (isFirst) {
 
-					this.pageIndexArr[0] = 1;
-					this.pageIndexArr[1] = 1;
-					this.pageIndexArr[2] = 1;
+					this.pageIndex = 1;
+
 					//  this.totalPageArr=[1,1,1]
 					this.allList = [];
-					this.doneList = [];
-					this.undoList = [];
+
 
 				}
 
 
 				this.isLoading = true;
-				if (isFirst || this.selectedIndex == '0') {
-					await this.pageList('', this.pageIndexArr[0]).then(page => {
-						this.allCount = page.recordsTotal;
-
-						if (this.pageIndexArr[0] == 1) {
-							this.allList = page.data;
-							this.totalPageArr[0] = page.totalPage;
-						} else {
-							this.allList = [
-								...this.allList,
-								...page.data
-							];
-						}
 
-						if (this.selectedIndex == 0) {
-							this.isLoading = false;
-						}
 
-						this.pageIndexArr[0]++;
-					});
-				}
-				if (isFirst || this.selectedIndex == '1') {
-					await this.pageList('1', this.pageIndexArr[1]).then(page => {
-						this.doneCount = page.recordsTotal;
-
-						if (this.pageIndexArr[1] == 1) {
-							this.doneList = page.data;
-							this.totalPageArr[1] = page.totalPage;
-
-						} else {
-							this.doneList = [
-								...this.doneList,
-								...page.data
-							];
-						}
-						if (this.selectedIndex == 1) {
-							this.isLoading = false;
-						}
+                this.pageList(this.selectedIndex, this.pageIndex).then(page => {
+                    if(this.allCount==0){
+                        this.allCount = page.recordsTotal;
+                    }
 
-						this.pageIndexArr[1]++;
-					});
-				}
+                    if (this.pageIndex  == 1) {
+                        this.allList = page.data;
+                        this.totalPage = page.totalPage;
+                    } else {
+                        this.allList = [
+                            ...this.allList,
+                            ...page.data
+                        ];
+                    }
 
+                    this.isLoading = false;
 
-				if (isFirst || this.selectedIndex == '2') {
-					await this.pageList('2', this.pageIndexArr[2]).then(page => {
-						this.undoCount = page.recordsTotal;
+                    this.pageIndex++;
+                });
 
-						if (this.pageIndexArr[2] == 1) {
-							this.undoList = page.data;
-							this.totalPageArr[2] = page.totalPage;
 
-						} else {
-							this.undoList = [
-								...this.undoList,
-								...page.data
-							];
-						}
-						if (this.selectedIndex == 2) {
-							this.isLoading = false;
-						}
-
-						this.pageIndexArr[2]++;
-					});
-				}
 				//this.pageIndex++;
 			},
+            selectIndexOf(){
+                var picker = new mui.PopPicker();
+
+                picker.setData([{
+                    text: "全部（"+this.allCount+"）",
+                    value: 0
+                },
+                    {
+                        text: "已上报（"+this.obj.total+"）",
+                        value: 1
+                    },
+                    {
+                        text: "未上报（"+(this.allCount-this.obj.total)+"）",
+                        value: 2
+                    }
+                ]);
+
+                picker.show((selectItems) => {
+                    this.selectedIndex = selectItems[0].value;
+                    this.queryList(true);
+                });
+			},
+            selectAddress(){
+                var picker = new mui.PopPicker();
+
+                picker.setData([{
+                    text: "全部（"+this.allCount+"）",
+                    value: ''
+                },
+                    {
+                        text: "市内（"+this.obj.count1+"）",
+                        value: '0'
+                    },
+                    {
+                        text: "市外（"+(this.obj.count0-this.obj.count1)+"）",
+                        value: '1'
+                    },
+                    {
+                        text: "省外（"+(this.obj.total-this.obj.count0)+"）",
+                        value: '2'
+                    }
+                ]);
+
+                picker.show((selectItems) => {
+                    this.address = selectItems[0].value;
+                    this.queryList(true);
+                });
+			},
 			selectDate() {
 				var _this = this;
 				var dtPicker = new mui.DtPicker({
@@ -314,6 +265,10 @@
 					this.curDate = year + "-" + month + "-" + day;
 
 					this.queryList(true);
+                    this.query().then(page => {
+                        console.log(page)
+                        this.obj=page;
+                    });
 				});
 			},
 
@@ -323,11 +278,19 @@
 					companyId: this.person_data.companyId,
 					queryDate: this.curDate,
 					status: status,
+                    address: this.address,
 					pageIndex: pageIndex,
 					pageSize: 50
 					//sortType:this.sortType,
 				});
 			},
+            query() {
+                return API_Health.query({
+                    companyId: this.person_data.companyId,
+                    queryDate: this.curDate,
+                    //sortType:this.sortType,
+                });
+            },
 			//获取绿码统计数据
 			getHealthyCodeStat() {
 				this.isLoading = true;
@@ -381,7 +344,7 @@
 				//if ((window.screen.height + document.body.scrollTop) > (document.body.clientHeight)) {
 				if (isReachBottom()) {
 					console.log('到达底部')
-					if (this.pageIndexArr[this.selectedIndex] <= this.totalPageArr[this.selectedIndex] && this.isLoading == false) {
+					if (this.pageIndex  <= this.totalPage  && this.isLoading == false) {
 						this.queryList(false);
 					} else {
 						return;
@@ -399,26 +362,16 @@
 				token: 'token',
 				person_data: 'person_data',
 				person_popedom: 'person_popedom',
-			}),
-			allGroup() {
-				return {
-					"mui-active": this.selectedIndex == 0
-				};
-			},
-			doneGroup() {
-				return {
-					"mui-active": this.selectedIndex == 1
-				};
-			},
-			undoGroup() {
-				return {
-					"mui-active": this.selectedIndex == 2
-				};
-			}
+			})
 		},
 		mounted() {
 			var _this = this;
 			this.queryList(true);
+			 this.query().then(page => {
+                	console.log(page)
+                 this.obj=page;
+             });
+
 			//获取绿码统计数据
 			this.getHealthyCodeStat();
 			window.addEventListener('scroll', _this.handleScrool);