zhengkaixin преди 4 години
родител
ревизия
721f3fff9a
променени са 2 файла, в които са добавени 28 реда и са изтрити 2 реда
  1. 16 0
      src/projects/business/views/Master/Health/Worker.vue
  2. 12 2
      src/projects/business/views/Master/Health/WorkerInfo.vue

+ 16 - 0
src/projects/business/views/Master/Health/Worker.vue

@@ -49,7 +49,11 @@
 													 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>
@@ -72,6 +76,8 @@
 													 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>
@@ -95,6 +101,7 @@
 													 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>
@@ -182,7 +189,16 @@
 			}
 
 		},
+
 		methods: {
+            countNum(num){
+              if(  this.curDate == parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')&&num ){
+                  return true;
+			  }else{
+                  return false;
+			  }
+
+            },
 			//跳转到健康码页面
 			goToCodeList(healthyCode) {
 				this.$router.push({

+ 12 - 2
src/projects/business/views/Master/Health/WorkerInfo.vue

@@ -29,10 +29,10 @@
 					<span v-text="detail.position3"></span>
 				</div>
 			</form>
-			<form class="mui-input-group vongi-editme margin10">					
+			<form class="mui-input-group vongi-editme margin10" v-if="countNum(detail.personHealthLedger.countNum,detail.personHealthLedger.createTime)">
 				<div class="mui-input-row">
 					<label style="width:70%">已连续上报天数</label>
-					<span style="width:30%">1天</span>
+					<span style="width:30%">{{detail.personHealthLedger.countNum}}天</span>
 				</div>
 				<div class="mui-content-padded color4fc5f7 mui-h5">注:此天数从连续打卡的第一天算起,而非返乡后的第一天,具体开始时间请防控专员落实。</div>
 			</form>
@@ -136,6 +136,16 @@
 			this.id = this.$route.query.id;
 		},
 		methods: {
+		    countNum(Num,creatTime){
+                var date = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+                var date2 = parseUnixTime(creatTime, '{y}-{m}-{d}');
+                if(date==date2&&Num){
+                    return true
+				}else{
+                    return false
+				}
+
+            },
             showTel(val){
                 return showTel(val);
 			},