Merge branch 'Ztext1' of http://git.quantgroup.cn/ui/recruiting-management into Ztext1

src/page/interview/interview.vue

@@ -135,7 +135,7 @@
                     <span style="color:#0092FF;display:inline-block;width:70px;" v-if=" item.previousState=='PASS'">PASS</span>
                     <span style="color:#0092FF;display:inline-block;width:70px;" v-if=" item.previousState=='TO_DO'">待处理</span>
                     <span style="color:#0092FF;display:inline-block;width:70px;" v-if=" item.previousState=='RESET'">重启面试</span>
-                     <span style="color:#0092FF;display:inline-block;width:70px;" v-if=" item.previousState=='ARRIVED'">重启面试</span>
+                     <span style="color:#0092FF;display:inline-block;width:70px;" v-if=" item.previousState=='ARRIVED'">已到达</span>
                     <span style="display:inline-block;width:50px;">变更为</span>
                     <span style="color:#0092FF" v-if=" item.afterState=='INTERVIEW_OK'">面试合适</span>
                     <span style="color:#0092FF" v-if=" item.afterState=='INTERVIEW_FAIL'">面试淘汰</span>
@@ -152,7 +152,7 @@
                     <span style="color:#0092FF" v-if=" item.afterState=='PASS'">PASS</span>
                     <span style="color:#0092FF" v-if=" item.afterState=='TO_DO'">待处理</span>
                     <span style="color:#0092FF" v-if=" item.afterState=='RESET'">重启面试</span>
-                     <span style="color:#0092FF" v-if=" item.afterState=='ARRIVED'">重启面试</span>
+                     <span style="color:#0092FF" v-if=" item.afterState=='ARRIVED'">已到达</span>
                 </p>
             </div>
             

src/page/resume/allResume.vue

@@ -48,11 +48,11 @@
                     <Button  type="primary" size="small" style="margin-left:2%;width:50px" @click="delateAll">删除</Button>
                     <Button  type="primary" size="small" style="float:right;margin-right:10px;" @click="allexport">导出列表</Button>
               </div>
-              <div style="width:100%;float:left;margin-bottom:40px;overflow-y: auto;height:598px" class="a">
+              <div style="width:100%;float:left;margin-bottom:40px;overflow-y: auto;height:595px" class="a">
               <div style="margin:50px auto;width:300px;height:200px;line-height:200px;text-align:center;font-size:20px;color:LightGray" v-show="ajaxData.length==0">暂无数据</div>
               <!-- <div style="float:left;margin-left:1%;width:99%;overflow-y: auto;height:600px;margin-bottom:40px"> -->
-              <div class="Resumecontent"  v-for='(item,i) in ajaxData' :key="i"  @mouseover="ahove($event)" >
-                 <div class="detailResume" id="a" style="">
+              <div class="Resumecontent"  v-for='(item,i) in ajaxData' :key="i"  >
+                 <div class="detailResume" id="a" style="" @mousemove="ahove(i,item.isShow)" @mouseleave="movleave(i,item.isShow)" :class="{red:item.isShow}">
                     <p>  
                       <span style="display:inline-block;height:100%;font-size: 12px;margin-top:5px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap;margin-top:5px">
                         <input type='checkbox' name='checkboxinput' class='input-checkbox'  v-model='checkboxList' :value="item.id" @click="selectInputElement(i,item.id,item.flowStatus,item.STATES)" style="margin-left:10px;cursor:pointer">
@@ -176,7 +176,7 @@
                     <span style="color:blue" v-if=" item.previousState=='PASS'">PASS</span>
                     <span style="color:blue" v-if=" item.previousState=='TO_DO'">待处理</span>
                     <span style="color:blue" v-if=" item.previousState=='RESET'">重启面试</span>
-                    <span style="color:blue" v-if=" item.previousState=='ARRIVEW'">重启面试</span>
+                    <span style="color:blue" v-if=" item.previousState=='ARRIVED'">已到达</span>
                     <span>变更为</span>
                     <span style="color:blue" v-if=" item.afterState=='INTERVIEW_OK'">面试合适</span>
                     <span style="color:blue" v-if=" item.afterState=='INTERVIEW_FAIL'">面试淘汰</span>
@@ -193,7 +193,7 @@
                     <span style="color:blue" v-if=" item.afterState=='PASS'">PASS</span>
                     <span style="color:blue" v-if=" item.afterState=='TO_DO'">待处理</span>
                     <span style="color:blue" v-if=" item.afterState=='RESET'">重启面试</span>
-                    <span style="color:blue" v-if=" item.afterState=='ARRIVEW'">重启面试</span>
+                    <span style="color:blue" v-if=" item.afterState=='ARRIVED'">已到达</span>
                 </p>
             </div>
             
@@ -365,6 +365,7 @@ import Router from 'vue-router';
                     STATE:'',
                     delateARRALL:[],
                     delateARRALL2:[],
+                    delateARRALL3:[],
                     flowStatusarr:[],
                     flowStatusarr2:[],
                     DELATEARR:[],
@@ -671,6 +672,7 @@ import Router from 'vue-router';
                         item.optSource=item.optSource
                         item.modifier=item.modifier
                         item.STATES=false
+                        item.isShow=false
                         item.c=item.modifier==''?item.modifier:item.modifier.split('_')
                         item.d=item.c[0]
                         return item
@@ -896,12 +898,12 @@ import Router from 'vue-router';
         },
         // 可删除状态下点击
         delateR(delateid){
-           this.delateARRALL2.push(delateid)
+           this.delateARRALL3.push(delateid)
            this.modal3=true
         },
         // 删除单条简历
         delateONE(){
-          deleteREsume(this.delateARRALL2).then(res=>{
+          deleteREsume(this.delateARRALL3).then(res=>{
             if(res.data.success==true){
                 this.modal3=false
                 this.SearchList(this.pageT)
@@ -1052,8 +1054,11 @@ import Router from 'vue-router';
             this.SearchList(this.pageT)
         },
         // 鼠标滑过事件
-        ahove(e){
-        //    e.target.style.backgroundColor='#'+;  
+        ahove(index,vvv){
+            this.ajaxData[index].isShow=true
+        },
+        movleave(index,vvv){
+           this.ajaxData[index].isShow=false
         }
         
     },
@@ -1078,13 +1083,16 @@ import Router from 'vue-router';
 }
 .allResume-right{
    height: 800px;
-   /* overflow-y: auto; */
+   overflow: hidden;
    width: 70%;
    float: left;
    margin-left:1%;
   /* background:rgba(255,255,255,1); */
   
 }
+.red{
+    background: LightGray
+}
 .resumeRightContentTop{
     width: 100%;
     /* border: 1px solid black; */

src/page/resume/channel.vue

@@ -174,6 +174,7 @@
                     <span style="color:blue" v-if=" item.previousState=='PASS'">PASS</span>
                     <span style="color:blue" v-if=" item.previousState=='TO_DO'">待处理</span>
                     <span style="color:blue" v-if=" item.previousState=='RESET'">重启面试</span>
+                    <span style="color:blue" v-if=" item.previousState=='ARRIVED'">已到达</span>
                     <span>变更为</span>
                     <span style="color:blue" v-if=" item.afterState=='INTERVIEW_OK'">面试合适</span>
                     <span style="color:blue" v-if=" item.afterState=='INTERVIEW_FAIL'">面试淘汰</span>
@@ -190,6 +191,7 @@
                     <span style="color:blue" v-if=" item.afterState=='PASS'">PASS</span>
                     <span style="color:blue" v-if=" item.afterState=='TO_DO'">待处理</span>
                     <span style="color:blue" v-if=" item.afterState=='RESET'">重启面试</span>
+                    <span style="color:blue" v-if=" item.afterState=='ARRIVED'">已到达</span>
                 </p>
             </div>