From 6099926f910ee56c0de42fedf03eb5ba6ceb3374 Mon Sep 17 00:00:00 2001
From: huichao <hui.chao@ebiz-digits.com>
Date: Sat, 25 Jul 2020 17:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/attendance/Monthly.vue         | 31 +++++++-------
 src/views/ebiz/performance/AttendanceInfo.vue |  5 ---
 src/views/ebiz/performance/Performance.vue    | 41 +++++++++++++++----
 3 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/src/views/ebiz/attendance/Monthly.vue b/src/views/ebiz/attendance/Monthly.vue
index 3623c9ae4..e06a7bd29 100644
--- a/src/views/ebiz/attendance/Monthly.vue
+++ b/src/views/ebiz/attendance/Monthly.vue
@@ -86,14 +86,17 @@ export default {
       text:'',
       goWorkTime:'',
       offWorkTime:'',
-
+      flag:''
     }
   },
   created(){
+    this. isShowCalendar=true,
     this.date1=new Date(JSON.parse(this.$route.params.obj).time)
     this.time=JSON.parse(this.$route.params.obj).time
     this.name=JSON.parse(this.$route.params.obj).name
-    this.getMonthDetail1();
+    setTimeout(()=>{
+      this.getMonthDetail1();
+    },1000)
     this.time=utils.formatDate(this.currentDate, 'yyyy-MM-dd')
   },
   methods: {
@@ -120,8 +123,8 @@ export default {
                 this.goWorkTime=res.content.goWorkTime,
                 this.offWorkTime=res.content.offWorkTime
                 if(this.flag=='0'){
-                  this.goWorkTime=this.goWorkTime.split(' ')[0]
-                  this.offWorkTime=this.offWorkTime.split(' ')[0]
+                  this.goWorkTime=this.goWorkTime.split(' ')[1]
+                  this.offWorkTime=this.offWorkTime.split(' ')[1]
                   this.text='正常'
                 }else if(this.flag=='1'){
                   this.text='缺勤'
@@ -151,8 +154,8 @@ export default {
                 this.goWorkTime=res.content.goWorkTime,
                 this.offWorkTime=res.content.offWorkTime
                 if(this.flag=='0'){
-                   this.goWorkTime=this.goWorkTime.split(' ')[0]
-                  this.offWorkTime=this.offWorkTime.split(' ')[0]
+                   this.goWorkTime=this.goWorkTime.split(' ')[1]
+                  this.offWorkTime=this.offWorkTime.split(' ')[1]
                   this.text='正常'
                 }else if(this.flag=='1'){
                   this.text='缺勤'
@@ -172,7 +175,7 @@ export default {
         }
         if(Date.parse(this.time)<=Date.parse(utils.formatDate(new Date(), 'yyyy-MM-dd'))){
             getMonthDetail(date).then(res=>{
-            // console.log(res)
+            console.log(res)
             if(res.result == 0){
               let arr1=[]
               let obj1={}
@@ -181,15 +184,13 @@ export default {
              for(let i=0;i<res.content.rest.length;i++){
                 let workTime=res.content.rest[i].split(' ')
                 let workTime1=workTime[0]
-                if(Date.parse(workTime1)<Date.parse(utils.formatDate(new Date(), 'yyyy-MM-dd'))){
-                    let arr2=res.content.rest.slice(0,i)
+                if(Date.parse(workTime1)<=Date.parse(utils.formatDate(new Date(), 'yyyy-MM-dd'))){
+                    let arr2=res.content.rest.slice(0,i+1)
                     obj1.date=arr2
-                    // console.log(arr2)
                 }
               }
               arr1.push(obj1)
-              // console.log(obj1)
-              // this.mask=arr1
+              console.log(arr1)
               let arr=arr1
               let obj={}
               let date=[]
@@ -199,14 +200,10 @@ export default {
                  let workTime=res.content.normal[t].split(' ')
                 let workTime1=workTime[0]
                  date.push(workTime1)
-                //  console.log(date)
                  obj.date=date
               }
-              arr.push(obj)
-              // arr3=arr3.concat(arr1,arr)
-              
+              arr.push(obj)  
               this.mask=arr
-              // console.log(this.mask)
             }
         })  
         }
diff --git a/src/views/ebiz/performance/AttendanceInfo.vue b/src/views/ebiz/performance/AttendanceInfo.vue
index a822ed129..e322d6d91 100644
--- a/src/views/ebiz/performance/AttendanceInfo.vue
+++ b/src/views/ebiz/performance/AttendanceInfo.vue
@@ -239,11 +239,6 @@ export default {
     width: 154px;
   }
 }
-.main-table {
-  tr:nth-child(even) div {
-    // border: 1px solid #ccc;
-  }
-}
 .header {
   position: fixed;
   top: 10px;
diff --git a/src/views/ebiz/performance/Performance.vue b/src/views/ebiz/performance/Performance.vue
index d70abce6c..6e962f02d 100644
--- a/src/views/ebiz/performance/Performance.vue
+++ b/src/views/ebiz/performance/Performance.vue
@@ -32,10 +32,11 @@
       <span v-if="Name!==''">{{Name}}></span><span class="red">{{unitName}}</span>
     </div>
     <div class="flex align-items-c h86 content1 bg-white mt10" v-if="mask=='1'">
-      <div class="w40 h60 ml15 text-center" v-for="item in headerList" :key='item'>
-        <div @click="(InfoDetails(item.agentCode))">
+      <div class="w40 h60 ml15 text-center relative" v-for="(item, index) in headerList" :key="index">
+        <div @click="(InfoDetails(index))">
           <!-- <img v-if="item.agentHeadUrl!==null" class="h40 w40" :src="item.agentHeadUrl" alt /> -->
           <img class="h40 w40" src="@/assets/images/u188.png" alt />
+          <div :class="[item.isShowImg?'active':'']"></div>
           <div class="fs13">{{item.agentName}}</div>
         </div>
       </div>
@@ -127,7 +128,8 @@ export default {
       headerList: [],
       unitName: '',
       Name:'',
-      code:''
+      code:'',
+      isShowImg:true
     }
   },
   created() {
@@ -264,9 +266,13 @@ export default {
     getPerformanceHeader1() {
       let date = {}
       getPerformanceHeader(date).then((res) => {
-        console.log(res)
+        console.log("=="+res)
         if (res.result == 0) {
-          this.headerList = res.content
+          for(let i=0;i<res.content.length;i++){
+            res.content[i].isShowImg=true
+         }
+         this.headerList = res.content
+         console.log(this.headerList)
         }
       })
     },
@@ -278,7 +284,11 @@ export default {
       getHeader(code).then(res=>{
           console.log(res)
           if (res.result == 0) {
-          this.headerList = res.content
+          for(let i=0;i<res.content.length;i++){
+            res.content[i].isShowImg=true
+            res.content[0].isShowImg=false
+         }
+         this.headerList = res.content
         }
       })
     },
@@ -301,10 +311,15 @@ export default {
     },
     //点击头像
     InfoDetails(item) {
-      // console.log(item)
+      console.log(item)
+      for(let i=0;i<this.headerList.length;i++){
+            this.headerList[i].isShowImg=true
+         }
+        this.headerList[item].isShowImg=false
+    
       let code = {
         date: this.timeCode,
-        agentCode: item,
+        agentCode: this.headerList[item].agentCode,
       }
       getPerformanceDetail(code).then((res) => {
         console.log(res)
@@ -334,4 +349,14 @@ export default {
   width: 100%;
   overflow-x: scroll;
 }
+.active{
+     width: 40px;
+    height: 40px;
+    z-index: 100;
+    background: #ccc;
+    opacity: 0.5;
+    top: 0px;
+    border-radius: 20px;
+    position: absolute;
+}
 </style>
\ No newline at end of file