diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue index 288c01f..6818279 100644 --- a/src/components/merchantManagement/memberInfo.vue +++ b/src/components/merchantManagement/memberInfo.vue @@ -33,10 +33,7 @@
默认角色（11人）
@@ -111,7 +108,7 @@
- + {{ record.aliasName || record.userName }} -
- +
+
-
- +
+
@@ -327,7 +324,7 @@ @@ -1000,7 +1022,7 @@ export default { padding-left: 16px; overflow: hidden; position: relative; - min-width: 1020px; + // min-width: 1020px; &::before { position: absolute; content: ''; diff --git a/src/components/screen/largeScreen.vue b/src/components/screen/largeScreen.vue index 61e2c2f..27a9cf0 100644 --- a/src/components/screen/largeScreen.vue +++ b/src/components/screen/largeScreen.vue @@ -57,7 +57,7 @@
- {{Number(item.transferRatio * 100).toFixed(0)}}丨{{item.funnel}}
+ {{Number(item.transferRatio * 100).toFixed(0)}}丨{{item.funnel}}
@@ -127,11 +127,11 @@ export default { el.focus(); } } - }, - trigger:{ - inserted(el,binging){ - el.click() - } + }, + trigger:{ + inserted(el,binging){ + el.click() + } } }, @@ -391,50 +391,50 @@ export default { // type 25 到面 30通过 40入职 - // 180000 - // debugger - if(e.data != '"pong"' && (timeStamp == 0 || new Date().getTime() - timeStamp >= 40000 )){ - - timeStamp = new Date().getTime(); - - var getWebsocketData = JSON.parse(e.data); - // console.log(getWebsocketData); - // console.log(getWebsocketData.list); - // that.array = [...getWebsocketData.list] - that.array = []; - var arr = [...getWebsocketData.list] - - var arrLength = arr.length; - // that.array = []; - - for (var i = 0; i < arrLength; i += that.pageSize) { - that.array.push(arr.slice(i, i + that.pageSize)); - } - - that.array.forEach((item,index)=>{ - if(getWebsocketData.type == "25" || getWebsocketData.type == 25){ //到面 - if(item.id == getWebsocketData.applyUserId){ - this.nameArray.push({ type: '1', aliasName: item.aliasName, daomianStyle: item.aliasName, indexA: index }); - } - }else if(getWebsocketData.type == "30" || getWebsocketData.type == 30){ //通过 - if(item.id == getWebsocketData.applyUserId){ - this.nameArray.push({ type: '2', aliasName: item.aliasName, tongguoStyle: item.aliasName, indexA: index }); - } - }else if(getWebsocketData.type == "40" || getWebsocketData.type == 40){ //入职 - if(item.id == getWebsocketData.applyUserId){ - this.nameArray.push({ type: '3', aliasName: item.aliasName, ruzhiStyle: item.aliasName, indexA: index }); - } - } - - }) - - console.log(this.nameArray); - if (this.nameArray.length >= 1) { - this.func(); - } - - - } + // 180000 + // debugger + if(e.data != '"pong"' && (timeStamp == 0 || new Date().getTime() - timeStamp >= 40000 )){ + + timeStamp = new Date().getTime(); + + var getWebsocketData = JSON.parse(e.data); + // console.log(getWebsocketData); + // console.log(getWebsocketData.list); + // that.array = [...getWebsocketData.list] + that.array = []; + var arr = [...getWebsocketData.list] + + var arrLength = arr.length; + // that.array = []; + + for (var i = 0; i < arrLength; i += that.pageSize) { + that.array.push(arr.slice(i, i + that.pageSize)); + } + + that.array.forEach((item,index)=>{ + if(getWebsocketData.type == "25" || getWebsocketData.type == 25){ //到面 + if(item.id == getWebsocketData.applyUserId){ + this.nameArray.push({ type: '1', aliasName: item.aliasName, daomianStyle: item.aliasName, indexA: index }); + } + }else if(getWebsocketData.type == "30" || getWebsocketData.type == 30){ //通过 + if(item.id == getWebsocketData.applyUserId){ + this.nameArray.push({ type: '2', aliasName: item.aliasName, tongguoStyle: item.aliasName, indexA: index }); + } + }else if(getWebsocketData.type == "40" || getWebsocketData.type == 40){ //入职 + if(item.id == getWebsocketData.applyUserId){ + this.nameArray.push({ type: '3', aliasName: item.aliasName, ruzhiStyle: item.aliasName, indexA: index }); + } + } + + }) + + console.log(this.nameArray); + if (this.nameArray.length >= 1) { + this.func(); + } + + + } @@ -444,69 +444,69 @@ export default { test(e) { //数据接收 - var that = this; - e.data = '{"applyUserId":122240,"list":[{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"常笑","arrived":1,"entry":2,"entryGPA":1.34,"finshedGPA":0,"funnel":3.40,"id":122240,"inAgencyStatistics":0,"nickName":"微信用户","obJob":25,"passed":2,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"19036980063","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":2,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"陶帅","arrived":2,"entry":2,"entryGPA":1.47,"finshedGPA":0,"funnel":2.80,"id":321961,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"19036980509","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"刘深圳","arrived":2,"entry":1,"entryGPA":0.67,"finshedGPA":0.30,"funnel":2.60,"id":321653,"inAgencyStatistics":0,"obJob":6,"passed":2,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"13271233701","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"刘欢欢","arrived":0,"entry":2,"entryGPA":2.00,"finshedGPA":0,"funnel":2.50,"id":321654,"inAgencyStatistics":0,"obJob":8,"passed":1,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980372","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"渠森森","arrived":0,"entry":1,"entryGPA":0.33,"finshedGPA":0,"funnel":1.70,"id":321650,"inAgencyStatistics":0,"obJob":2,"passed":1,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980059","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"张驰","arrived":2,"entry":1,"entryGPA":0.00,"finshedGPA":0,"funnel":1.70,"id":319087,"inAgencyStatistics":0,"nickName":"张驰","obJob":12,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980035","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":2,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"闫兴乐","arrived":0,"entry":1,"entryGPA":0.00,"finshedGPA":0.67,"funnel":1.30,"id":318688,"inAgencyStatistics":0,"nickName":"微信用户","obJob":20,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980028","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"申振磊","arrived":1,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.70,"id":322120,"inAgencyStatistics":0,"obJob":1,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":5,"tel":"19036980052","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"朱永辉","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.30,"id":321652,"inAgencyStatistics":0,"obJob":9,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980508","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"王尚","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.20,"id":322356,"inAgencyStatistics":0,"obJob":1,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":2,"tel":"19036980507","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"李沂航","arrived":1,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.20,"id":122379,"inAgencyStatistics":0,"nickName":"杰伦","obJob":3,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980030","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"王名扬","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":322355,"inAgencyStatistics":0,"obJob":0,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980031","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":3,"agencyTeamName":"待分组","aliasName":"徐倩林","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":321999,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980513","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"邓高琦","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0.00,"funnel":0.10,"id":321964,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980023","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"张静","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":321400,"inAgencyStatistics":0,"obJob":8,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980034","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"李林锟","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.00,"id":322206,"inAgencyStatistics":0,"obJob":0,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980061","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"王正坤","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.00,"id":318852,"inAgencyStatistics":0,"nickName":"郭星池","obJob":6,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980051","transferRatio":0.00}],"type":"25"}' - - - console.log(JSON.parse(e.data)); - console.log(e.data != '"pong"'); - console.log(timeStamp == 0 || new Date().getTime() - timeStamp2 >= 40000); - // debugger - - // && (timeStamp2 == 0 || new Date().getTime() - timeStamp2 >= 40000 ) - if(e.data != '"pong"'){ - // - timeStamp2 = new Date().getTime(); - - var getWebsocketData = JSON.parse(e.data); - console.log(getWebsocketData); - // console.log(getWebsocketData.list); - // that.array = [...getWebsocketData.list] - that.array = []; - var arr = [...getWebsocketData.list] - - var arrLength = arr.length; - // that.array = []; - - for (var i = 0; i < arrLength; i += that.pageSize) { - that.array.push(arr.slice(i, i + that.pageSize)); - } - console.log(that.array); - - arr.forEach((item,index)=>{ - console.log(getWebsocketData.type); - - if(getWebsocketData.type == "25" || getWebsocketData.type == 25){ //到面 - if(item.id - getWebsocketData.applyUserId == 0){ - this.nameArray.push({ type: '1', aliasName: item.aliasName, daomianStyle: item.aliasName, indexA: index }); - } - }else if(getWebsocketData.type == "30" || getWebsocketData.type == 30){ //通过 - if(item.id - getWebsocketData.applyUserId == 0){ - this.nameArray.push({ type: '2', aliasName: item.aliasName, tongguoStyle: item.aliasName, indexA: index }); - } - }else if(getWebsocketData.type == "40" || getWebsocketData.type == 40){ //入职 - if(item.id - getWebsocketData.applyUserId == 0){ - this.nameArray.push({ type: '3', aliasName: item.aliasName, ruzhiStyle: item.aliasName, indexA: index }); - } - } - - }) - console.log(this.nameArray); - - - // var timer = window.setInterval(function () { - // if (this.nameArray.length > 0){ - // this.func() - // }else{ - // window.clearInterval(timer); - // } - // }, 1000); - - if (this.nameArray.length >= 1) { - this.func() - } - - } + var that = this; + e.data = '{"applyUserId":122240,"list":[{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"常笑","arrived":1,"entry":2,"entryGPA":1.34,"finshedGPA":0,"funnel":3.40,"id":122240,"inAgencyStatistics":0,"nickName":"微信用户","obJob":25,"passed":2,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"19036980063","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":2,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"陶帅","arrived":2,"entry":2,"entryGPA":1.47,"finshedGPA":0,"funnel":2.80,"id":321961,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"19036980509","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"刘深圳","arrived":2,"entry":1,"entryGPA":0.67,"finshedGPA":0.30,"funnel":2.60,"id":321653,"inAgencyStatistics":0,"obJob":6,"passed":2,"resumeNum":50,"showAgencyScreen":0,"signUps":4,"tel":"13271233701","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"刘欢欢","arrived":0,"entry":2,"entryGPA":2.00,"finshedGPA":0,"funnel":2.50,"id":321654,"inAgencyStatistics":0,"obJob":8,"passed":1,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980372","transferRatio":0.04},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"渠森森","arrived":0,"entry":1,"entryGPA":0.33,"finshedGPA":0,"funnel":1.70,"id":321650,"inAgencyStatistics":0,"obJob":2,"passed":1,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980059","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"张驰","arrived":2,"entry":1,"entryGPA":0.00,"finshedGPA":0,"funnel":1.70,"id":319087,"inAgencyStatistics":0,"nickName":"张驰","obJob":12,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980035","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":2,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"闫兴乐","arrived":0,"entry":1,"entryGPA":0.00,"finshedGPA":0.67,"funnel":1.30,"id":318688,"inAgencyStatistics":0,"nickName":"微信用户","obJob":20,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980028","transferRatio":0.02},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"申振磊","arrived":1,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.70,"id":322120,"inAgencyStatistics":0,"obJob":1,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":5,"tel":"19036980052","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"朱永辉","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.30,"id":321652,"inAgencyStatistics":0,"obJob":9,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":3,"tel":"19036980508","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"王尚","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.20,"id":322356,"inAgencyStatistics":0,"obJob":1,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":2,"tel":"19036980507","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"李沂航","arrived":1,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.20,"id":122379,"inAgencyStatistics":0,"nickName":"杰伦","obJob":3,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980030","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"王名扬","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":322355,"inAgencyStatistics":0,"obJob":0,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980031","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":3,"agencyTeamName":"待分组","aliasName":"徐倩林","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":321999,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980513","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"邓高琦","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0.00,"funnel":0.10,"id":321964,"inAgencyStatistics":0,"obJob":2,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980023","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":8,"agencyTeamName":"交付一组","aliasName":"张静","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.10,"id":321400,"inAgencyStatistics":0,"obJob":8,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":1,"tel":"19036980034","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":4,"agencyTeamName":"交付三组","aliasName":"李林锟","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.00,"id":322206,"inAgencyStatistics":0,"obJob":0,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980061","transferRatio":0.00},{"agencyPermissions":"job:list,apply:add,apply:list,apply:user,user:pwd,user:tel","agencyRole":3,"agencyTeamId":5,"agencyTeamName":"交付二组","aliasName":"王正坤","arrived":0,"entry":0,"entryGPA":0,"finshedGPA":0,"funnel":0.00,"id":318852,"inAgencyStatistics":0,"nickName":"郭星池","obJob":6,"passed":0,"resumeNum":50,"showAgencyScreen":0,"signUps":0,"tel":"19036980051","transferRatio":0.00}],"type":"25"}' + + + console.log(JSON.parse(e.data)); + console.log(e.data != '"pong"'); + console.log(timeStamp == 0 || new Date().getTime() - timeStamp2 >= 40000); + // debugger + + // && (timeStamp2 == 0 || new Date().getTime() - timeStamp2 >= 40000 ) + if(e.data != '"pong"'){ + // + timeStamp2 = new Date().getTime(); + + var getWebsocketData = JSON.parse(e.data); + console.log(getWebsocketData); + // console.log(getWebsocketData.list); + // that.array = [...getWebsocketData.list] + that.array = []; + var arr = [...getWebsocketData.list] + + var arrLength = arr.length; + // that.array = []; + + for (var i = 0; i < arrLength; i += that.pageSize) { + that.array.push(arr.slice(i, i + that.pageSize)); + } + console.log(that.array); + + arr.forEach((item,index)=>{ + console.log(getWebsocketData.type); + + if(getWebsocketData.type == "25" || getWebsocketData.type == 25){ //到面 + if(item.id - getWebsocketData.applyUserId == 0){ + this.nameArray.push({ type: '1', aliasName: item.aliasName, daomianStyle: item.aliasName, indexA: index }); + } + }else if(getWebsocketData.type == "30" || getWebsocketData.type == 30){ //通过 + if(item.id - getWebsocketData.applyUserId == 0){ + this.nameArray.push({ type: '2', aliasName: item.aliasName, tongguoStyle: item.aliasName, indexA: index }); + } + }else if(getWebsocketData.type == "40" || getWebsocketData.type == 40){ //入职 + if(item.id - getWebsocketData.applyUserId == 0){ + this.nameArray.push({ type: '3', aliasName: item.aliasName, ruzhiStyle: item.aliasName, indexA: index }); + } + } + + }) + console.log(this.nameArray); + + + // var timer = window.setInterval(function () { + // if (this.nameArray.length > 0){ + // this.func() + // }else{ + // window.clearInterval(timer); + // } + // }, 1000); + + if (this.nameArray.length >= 1) { + this.func() + } + + } @@ -700,6 +700,11 @@ div{ font-size: 36px; } +/deep/ .ttd{ + text-align: center; + font-size: 28px; +} + .mmtt111{ background-image: url('http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/screen_bg.png');background-size: 100% 100%; background-repeat: no-repeat; @@ -771,7 +776,7 @@ div{ } .tth { - width: 100%; + width: 100%; padding-right: 0; } @@ -825,31 +830,31 @@ div{ \ No newline at end of file diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue index 60a2f28..e93f944 100644 --- a/src/components/userinfo/usercenter/components/dataStatistics.vue +++ b/src/components/userinfo/usercenter/components/dataStatistics.vue @@ -121,7 +121,7 @@
- + 在职人数 @@ -178,7 +178,7 @@