diff --git a/pages/center/Piabodata/Groupcontrast.vue b/pages/center/Piabodata/Groupcontrast.vue index 51fe65f..fee02fd 100644 --- a/pages/center/Piabodata/Groupcontrast.vue +++ b/pages/center/Piabodata/Groupcontrast.vue @@ -159,6 +159,7 @@ canvasId="wangxiaohuaerlingeryilingwuyib88" background="none" :loadingType="0" + :opts="opts" /> @@ -273,6 +274,15 @@ "series": [ ] + }, + + opts: { + fontSize: 10, + extra: { + radar: { + max: 100 + } + } } }; diff --git a/pages/center/Piabodata/Theteamcompared.vue b/pages/center/Piabodata/Theteamcompared.vue index 62dbeaf..d1d4394 100644 --- a/pages/center/Piabodata/Theteamcompared.vue +++ b/pages/center/Piabodata/Theteamcompared.vue @@ -14,7 +14,7 @@ 自定义 - + {{staff1.label}} @@ -23,10 +23,11 @@ - - - - 对比 + + + + 对比 {{staff2.label}} @@ -35,145 +36,124 @@ - + - - - 接待量 - - - 排名 - - - 趋势 + + - - - 接待时长 - - - 排名 - - - 趋势 - - + + + - - - 销讲执行率 - - - 排名 - - - 趋势 - - + + - + @@ -215,21 +195,16 @@ - + - + - - - - + + + + - + - + - + - - + + + + @@ -317,140 +294,171 @@ data() { return { activeTotal: 4, - eharTab:{ + eharTab: { active1: 0, - active2:0, - active3:0, - active4:0, + active2: 0, + active3: 0, + active4: 0, }, - deptids:'', - bocindex:0, - timepickpickisshow:false, + deptids: '', + bocindex: 0, + timepickpickisshow: false, totalTimeShow: false, // 楼盘id - houseId:'', - staffList:[], - staffList1:[], - staffShow:false, - staffShow1:false, - staff1:{ - value:'', - label:'' + houseId: '', + staffList: [], + staffList1: [], + staffShow: false, + staffShow1: false, + staff1: { + value: '', + label: '' }, - staff2:{ - value:'', - label:'平均' + staff2: { + value: '', + label: '平均' }, - lastStartDate:'', - lastEndDate :'', - selindex:[0], - choseStaffFlag:false, - lineOptsect1:{ - "categories": ["2016","2017","2018","2019","2020","2021"], - "series": [ - { + lastStartDate: '', + lastEndDate: '', + selindex: [0], + choseStaffFlag: false, + lineOptsect1: { + "categories": ["2016", "2017", "2018", "2019", "2020", "2021"], + "series": [{ "name": "成交量1", - "data": [35,8,25,37,4,20] + "data": [35, 8, 25, 37, 4, 20] }, { "name": "成交量2", - "data": [40,18,45,44,10,60] + "data": [40, 18, 45, 44, 10, 60] } ] }, - lineOptsect2:{ - "categories": ["2016","2017","2018","2019","2020","2021"], - "series": [ - { + lineOptsect2: { + "categories": ["2016", "2017", "2018", "2019", "2020", "2021"], + "series": [{ "name": "成交量1", - "data": [35,8,25,37,4,20] + "data": [35, 8, 25, 37, 4, 20] }, { "name": "成交量2", - "data": [40,18,45,44,10,60] + "data": [40, 18, 45, 44, 10, 60] } ] }, - lineOptsect3:{ - "categories": ["2016","2017","2018","2019","2020","2021"], - "series": [ - { + lineOptsect3: { + "categories": ["2016", "2017", "2018", "2019", "2020", "2021"], + "series": [{ "name": "成交量1", - "data": [35,8,25,37,4,20] + "data": [35, 8, 25, 37, 4, 20] }, { "name": "成交量2", - "data": [40,18,45,44,10,60] + "data": [40, 18, 45, 44, 10, 60] } ] }, - lineOptsect4:{ - "categories": ["2016","2017","2018","2019","2020","2021"], - "series": [ - { + lineOptsect4: { + "categories": ["2016", "2017", "2018", "2019", "2020", "2021"], + "series": [{ "name": "成交量1", - "data": [35,8,25,37,4,20] + "data": [35, 8, 25, 37, 4, 20] }, { "name": "成交量2", - "data": [40,18,45,44,10,60] + "data": [40, 18, 45, 44, 10, 60] } ] }, - newlisttabinfo1:[ - {name:'接待量',zxl:'10'}, - {name:'平均执行率',zxl:'50'}, - {name:'接待客户',zxl:'80'}, + newlisttabinfo1: [{ + name: '接待量', + zxl: '10' + }, + { + name: '平均执行率', + zxl: '50' + }, + { + name: '接待客户', + zxl: '80' + }, ], - newlisttabinfo2:[ - {name:'接待量',zxl:'10'}, - {name:'平均执行率',zxl:'50'}, - {name:'接待客户',zxl:'80'}, + newlisttabinfo2: [{ + name: '接待量', + zxl: '10' + }, + { + name: '平均执行率', + zxl: '50' + }, + { + name: '接待客户', + zxl: '80' + }, ], - newlisttabinfo3:[ - {name:'接待量',zxl:'10'}, - {name:'平均执行率',zxl:'50'}, - {name:'接待客户',zxl:'80'}, + newlisttabinfo3: [{ + name: '接待量', + zxl: '10' + }, + { + name: '平均执行率', + zxl: '50' + }, + { + name: '接待客户', + zxl: '80' + }, ], - newlisttabinfo4:[ - {name:'接待量',zxl:'10'}, - {name:'平均执行率',zxl:'50'}, - {name:'接待客户',zxl:'80'}, + newlisttabinfo4: [{ + name: '接待量', + zxl: '10' + }, + { + name: '平均执行率', + zxl: '50' + }, + { + name: '接待客户', + zxl: '80' + }, ], - newTeam1:'', - newAvg1:'', - newTeam2:'', - newAvg2:'', - newTeam3:'', - newAvg3:'', - newTeam4:'', - newAvg4:'', - chartData1:{ - "categories": ["维度1","维度2","维度3","维度4","维度5","维度6"], - "series": [ - { - "name": "成交量", - "data": [90,110,165,195,187,172] - } - ] + newTeam1: '', + newAvg1: '', + newTeam2: '', + newAvg2: '', + newTeam3: '', + newAvg3: '', + newTeam4: '', + newAvg4: '', + chartData1: { + "categories": ["维度1", "维度2", "维度3", "维度4", "维度5", "维度6"], + "series": [{ + "name": "成交量", + "data": [90, 110, 165, 195, 187, 172] + }] }, - chartData2:{ - "categories": ["维度1","维度2","维度3","维度4","维度5","维度6"], - "series": [ - { - "name": "成交量", - "data": [90,110,165,195,187,172] + chartData2: { + "categories": ["维度1", "维度2", "维度3", "维度4", "维度5", "维度6"], + "series": [{ + "name": "成交量", + "data": [90, 110, 165, 195, 187, 172] + }] + }, + opts: { + fontSize: 10, + extra: { + radar: { + max: 100 } - ] - } - + } + }, }; }, onLoad() { - let that=this - uni.$on('update',function(data){ + let that = this + uni.$on('update', function(data) { // console.log(data) - that.deptids=data.arr.join(',') + that.deptids = data.arr.join(',') // 获取销奖能力 that.getPowerList() }) @@ -463,63 +471,65 @@ }, methods: { //是否对比 - checkboxChange(){ - this.timepickpickisshow=!this.timepickpickisshow; - this.staff2.label='平均' - this.staff2.value='' + checkboxChange() { + this.timepickpickisshow = !this.timepickpickisshow; + this.staff2.label = '平均' + this.staff2.value = '' // 团队对比接待量 - this.receptionCountList(this.eharTab.active1,1,'/cusLvStatistics/teamAnalysisReception') + this.receptionCountList(this.eharTab.active1, 1, '/cusLvStatistics/teamAnalysisReception') // 团队对比接待时长 - this.receptionCountList(this.eharTab.active2,2,'/cusLvStatistics/teamAnalysisReceptionTime') + this.receptionCountList(this.eharTab.active2, 2, '/cusLvStatistics/teamAnalysisReceptionTime') /* 销奖执行率 */ - this.receptionCountList(this.eharTab.active3,3,'/cusLvStatistics/teamAnalysisExecutionRate') + this.receptionCountList(this.eharTab.active3, 3, '/cusLvStatistics/teamAnalysisExecutionRate') // 获取销奖能力 this.getPowerList() }, // 获取部门列表 - getSectionList(){ - this.$u.post('/cusLvStatistics/findAllDeptIdByHouseId',{houseId:this.houseId}) - .then(res=>{ - this.staffList=[] - this.staffList1=[] - res.map(item=>{ - let obj={} - obj.value=item.deptId - obj.label=item.deptName - this.staffList.push(obj) + getSectionList() { + this.$u.post('/cusLvStatistics/findAllDeptIdByHouseId', { + houseId: this.houseId }) - this.staffList1=[...this.staffList] - this.staffList.unshift({ - value:'', - label:'全部' + .then(res => { + this.staffList = [] + this.staffList1 = [] + res.map(item => { + let obj = {} + obj.value = item.deptId + obj.label = item.deptName + this.staffList.push(obj) }) - this.staffList1.unshift({ - value:'', - label:'平均' + this.staffList1 = [...this.staffList] + this.staffList.unshift({ + value: '', + label: '全部' }) - this.staff1=this.staffList[0] - // 团队对比接待量 - this.receptionCountList(0,1,'/cusLvStatistics/teamAnalysisReception') - // 团队对比接待时长 - this.receptionCountList(0,2,'/cusLvStatistics/teamAnalysisReceptionTime') - /* 销奖执行率 */ - this.receptionCountList(0,3,'/cusLvStatistics/teamAnalysisExecutionRate') - // 获取销奖能力 - this.getPowerList() - - }) + this.staffList1.unshift({ + value: '', + label: '平均' + }) + this.staff1 = this.staffList[0] + // 团队对比接待量 + this.receptionCountList(0, 1, '/cusLvStatistics/teamAnalysisReception') + // 团队对比接待时长 + this.receptionCountList(0, 2, '/cusLvStatistics/teamAnalysisReceptionTime') + /* 销奖执行率 */ + this.receptionCountList(0, 3, '/cusLvStatistics/teamAnalysisExecutionRate') + // 获取销奖能力 + this.getPowerList() + + }) }, // 点击部门对比 - chiocStaff(idx){ - if(idx==0){ + chiocStaff(idx) { + if (idx == 0) { // 当选择了第一个的时候 - this.choseStaffFlag=false - this.staffShow=true - }else{ - this.choseStaffFlag=true - this.staffShow1=true + this.choseStaffFlag = false + this.staffShow = true + } else { + this.choseStaffFlag = true + this.staffShow1 = true } - + }, //时间切换 tabtimetap(index) { @@ -527,54 +537,54 @@ this.totalTimeShow = true; } else { this.activeTotal = index; - this.lastEndDate='' - this.lastStartDate='' + this.lastEndDate = '' + this.lastStartDate = '' // 获取数据 // 团队对比接待量 - this.receptionCountList(this.eharTab.active1,1,'/cusLvStatistics/teamAnalysisReception') + this.receptionCountList(this.eharTab.active1, 1, '/cusLvStatistics/teamAnalysisReception') // 团队对比接待时长 - this.receptionCountList(this.eharTab.active2,2,'/cusLvStatistics/teamAnalysisReceptionTime') + this.receptionCountList(this.eharTab.active2, 2, '/cusLvStatistics/teamAnalysisReceptionTime') /* 销奖执行率 */ - this.receptionCountList(this.eharTab.active3,3,'/cusLvStatistics/teamAnalysisExecutionRate') + this.receptionCountList(this.eharTab.active3, 3, '/cusLvStatistics/teamAnalysisExecutionRate') // 获取销奖能力 this.getPowerList() } }, // 接待量 - tabtimetap1(idx){ - this.eharTab.active1=idx + tabtimetap1(idx) { + this.eharTab.active1 = idx // 调用方法 - this.receptionCountList(idx,1,'/cusLvStatistics/teamAnalysisReception') + this.receptionCountList(idx, 1, '/cusLvStatistics/teamAnalysisReception') }, // 接待时长 - tabtimetap2(idx){ - this.eharTab.active2=idx + tabtimetap2(idx) { + this.eharTab.active2 = idx // 调用方法 - this.receptionCountList(idx,2,'/cusLvStatistics/teamAnalysisReceptionTime') + this.receptionCountList(idx, 2, '/cusLvStatistics/teamAnalysisReceptionTime') }, - tabtimetap3(idx){ - this.eharTab.active3=idx + tabtimetap3(idx) { + this.eharTab.active3 = idx // 调用方法 - this.receptionCountList(idx,3,'/cusLvStatistics/teamAnalysisExecutionRate') + this.receptionCountList(idx, 3, '/cusLvStatistics/teamAnalysisExecutionRate') }, - tabtimetap4(idx){ - this.eharTab.active4=idx + tabtimetap4(idx) { + this.eharTab.active4 = idx // 调用方法 // this.getRecordList() }, //自定义时间 totalTimeChange(e) { console.log(e.startDate, e.endDate) - this.activeTotal=3; - this.lastEndDate=e.endDate - this.lastStartDate=e.startDate + this.activeTotal = 3; + this.lastEndDate = e.endDate + this.lastStartDate = e.startDate // 获取数据 // 团队对比接待量 - this.receptionCountList(this.eharTab.active1,1,'/cusLvStatistics/teamAnalysisReception') + this.receptionCountList(this.eharTab.active1, 1, '/cusLvStatistics/teamAnalysisReception') // 团队对比接待时长 - this.receptionCountList(this.eharTab.active2,2,'/cusLvStatistics/teamAnalysisReceptionTime') + this.receptionCountList(this.eharTab.active2, 2, '/cusLvStatistics/teamAnalysisReceptionTime') /* 销奖执行率 */ - this.receptionCountList(this.eharTab.active3,3,'/cusLvStatistics/teamAnalysisExecutionRate') + this.receptionCountList(this.eharTab.active3, 3, '/cusLvStatistics/teamAnalysisExecutionRate') // 获取销奖能力 this.getPowerList() }, @@ -583,50 +593,50 @@ this.bocindex = index; }, //集团对比 - Groupcontrast(){ + Groupcontrast() { uni.navigateTo({ - url: '/pages/center/Piabodata/Groupcontrast' + url: '/pages/center/Piabodata/Groupcontrast' }); }, // 去选择团队 - goTeam(){ + goTeam() { uni.navigateTo({ - url:`/pages/center/Piabodata/selectTeam?ids=${this.deptids}` + url: `/pages/center/Piabodata/selectTeam?ids=${this.deptids}` }) }, - staffSelectCallback(e){ - if(this.choseStaffFlag){ + staffSelectCallback(e) { + if (this.choseStaffFlag) { // 第二个客户 // console.log(e,'第二个') - this.staff2=e[0] - }else{ + this.staff2 = e[0] + } else { // 第一个客户 // console.log(e,'第一个') // 当选择全部时 - if(!e.value){ - this.timepickpickisshow=false - this.staff2.label='平均' - this.staff2.value='' + if (!e.value) { + this.timepickpickisshow = false + this.staff2.label = '平均' + this.staff2.value = '' } - this.staff1=e[0] + this.staff1 = e[0] } - if(this.staff1.label==this.staff2.label){ + if (this.staff1.label == this.staff2.label) { uni.showToast({ - title:'请勿选择重复', - icon:'none' + title: '请勿选择重复', + icon: 'none' }) - this.staff2.label='请选择' + this.staff2.label = '请选择' // this.staff2.label='平均' // this.staff2.value='' return - }else{ + } else { // 获取数据 // 团队对比接待量 - this.receptionCountList(this.eharTab.active1,1,'/cusLvStatistics/teamAnalysisReception') + this.receptionCountList(this.eharTab.active1, 1, '/cusLvStatistics/teamAnalysisReception') // 团队对比接待时长 - this.receptionCountList(this.eharTab.active2,2,'/cusLvStatistics/teamAnalysisReceptionTime') + this.receptionCountList(this.eharTab.active2, 2, '/cusLvStatistics/teamAnalysisReceptionTime') /* 销奖执行率 */ - this.receptionCountList(this.eharTab.active3,3,'/cusLvStatistics/teamAnalysisExecutionRate') + this.receptionCountList(this.eharTab.active3, 3, '/cusLvStatistics/teamAnalysisExecutionRate') // 获取销奖能力 this.getPowerList() } @@ -773,260 +783,262 @@ // }) // }, // 接待时长 - receptionCountList(idx,index,url){ - this.$u.post(url,{ - // userA:this.staff1.value, - // userB:this.staff2.value, - deptIds:[this.staff1.value,this.staff2.value].filter(item=>item).join(','), - showRank:idx, - houseId:this.houseId, - timeType:this.lastEndDate?null:this.activeTotal+'', - lastEndDate:this.lastEndDate, - lastStartDate:this.lastStartDate - }) - .then(res=>{ - // console.log(res) - let result=res.result - this['newTeam'+index]=res.avg[0] - this['newAvg'+index]=res.avg[1] - if(idx==0){ - // 当选择的是牌名时 - // 处理数据 - // 先处理牌名数据,需要进行判断全部还是单个 - // 当为全部时 - this['newlisttabinfo'+index]=[] - let arr=[] - // 当选择全部时 - if(!this.staff1.value&&!this.staff2.value){ - // console.log(1) - result[0].map(item=>{ - let obj={} - obj.name=item.deptName - obj.zxl=item.data - arr.push(obj) - - }) - arr=this.dealData(arr) - this['newlisttabinfo'+index]=arr - } - // 当选择只有一个时 - else if(this.staff1.value&&!this.staff2.value){ - // console.log(2) - result[0].map(item=>{ - let obj={} - obj.name=item.deptName - obj.zxl=item.data - arr.push(obj) - }) - // 判断是否显示平均 - // 如果显示对比 - if(this.timepickpickisshow){ - result[1].map(item=>{ - let obj={} - obj.name='平均' - obj.zxl=item.data + receptionCountList(idx, index, url) { + this.$u.post(url, { + // userA:this.staff1.value, + // userB:this.staff2.value, + deptIds: [this.staff1.value, this.staff2.value].filter(item => item).join(','), + showRank: idx, + houseId: this.houseId, + timeType: this.lastEndDate ? null : this.activeTotal + '', + lastEndDate: this.lastEndDate, + lastStartDate: this.lastStartDate + }) + .then(res => { + // console.log(res) + let result = res.result + this['newTeam' + index] = res.avg[0] + this['newAvg' + index] = res.avg[1] + if (idx == 0) { + // 当选择的是牌名时 + // 处理数据 + // 先处理牌名数据,需要进行判断全部还是单个 + // 当为全部时 + this['newlisttabinfo' + index] = [] + let arr = [] + // 当选择全部时 + if (!this.staff1.value && !this.staff2.value) { + // console.log(1) + result[0].map(item => { + let obj = {} + obj.name = item.deptName + obj.zxl = item.data arr.push(obj) + }) + arr = this.dealData(arr) + this['newlisttabinfo' + index] = arr } - arr=this.dealData(arr) - this['newlisttabinfo'+index]=arr - }else{ - // console.log(3) - // 当两个都选择的时候 - result[0].map(item=>{ - let obj={} - obj.name=item.deptName - obj.zxl=item.data - arr.push(obj) - }) - result[1].map(item=>{ - let obj={} - obj.name=item.deptName - obj.zxl=item.data - arr.push(obj) - }) - arr=this.dealData(arr) - this['newlisttabinfo'+index]=arr + // 当选择只有一个时 + else if (this.staff1.value && !this.staff2.value) { + // console.log(2) + result[0].map(item => { + let obj = {} + obj.name = item.deptName + obj.zxl = item.data + arr.push(obj) + }) + // 判断是否显示平均 + // 如果显示对比 + if (this.timepickpickisshow) { + result[1].map(item => { + let obj = {} + obj.name = '平均' + obj.zxl = item.data + arr.push(obj) + }) + } + arr = this.dealData(arr) + this['newlisttabinfo' + index] = arr + } else { + // console.log(3) + // 当两个都选择的时候 + result[0].map(item => { + let obj = {} + obj.name = item.deptName + obj.zxl = item.data + arr.push(obj) + }) + result[1].map(item => { + let obj = {} + obj.name = item.deptName + obj.zxl = item.data + arr.push(obj) + }) + arr = this.dealData(arr) + this['newlisttabinfo' + index] = arr + } + } else { + // 当选择趋势时 + this['lineOptsect' + index] = {} + let allobj = { + categories: [], + series: [] + } + // 先处理时间 + // 当选择全部时 + if (!this.staff1.value && !this.staff2.value) { + result.map((item, idx) => { + let obj = {} + obj.name = item[0].deptName + obj.data = [] + item.map(item1 => { + // 时间的处理 + if (idx == 0) { + allobj.categories.push(item1.statDate.slice(5, 10)) + } + obj.data.push(item1.data) + }) + allobj.series.push(obj) + }) + } + // 当选择只有一个时 + else if (this.staff1.value && !this.staff2.value) { + // console.log(2) + let obj = {} + obj.data = [] + obj.name = result[0][0].deptName + result[0].map(item => { + allobj.categories.push(item.statDate.slice(5, 10)) + obj.data.push(item.data) + }) + allobj.series.push(obj) + // 判断是否显示平均 + // 如果显示对比 + if (this.timepickpickisshow) { + let obj = {} + obj.data = [] + obj.name = '平均' + result[1].map(item => { + obj.data.push(item.data) + }) + allobj.series.push(obj) + } + } else { + // console.log(3) + // 当两个都选择的时候 + let obj = {} + let obj1 = {} + obj.data = [] + obj1.data = [] + obj.name = result[0][0].deptName + obj1.name = result[1][0].deptName + result[0].map(item => { + allobj.categories.push(item.statDate.slice(5, 10)) + obj.data.push(item.data) + }) + result[1].map(item => { + obj1.data.push(item.data) + }) + allobj.series.push(obj) + allobj.series.push(obj1) + } + // console.log(allobj) + // return + // this.lineOptsect1=allobj + this['lineOptsect' + index] = allobj + // this['lineOptsect'+index].series=allobj.series + // this['lineOptsect'+index].categories=allobj.categories } - }else{ - // 当选择趋势时 - this['lineOptsect'+index]={} - let allobj={ - categories:[], - series:[] + }) + }, + // 获取销奖能力 + getPowerList() { + this.$u.post('/cusLvStatistics/teamAnalysisMarketingAbility', { + deptIds: this.deptids || [this.staff1.value, this.staff2.value].filter(item => item).join(','), + houseId: this.houseId, + timeType: this.lastEndDate ? null : this.activeTotal + '', + lastEndDate: this.lastEndDate, + lastStartDate: this.lastStartDate + }) + .then(res => { + // console.log(res) + // 处理数据 + this.chartData1 = { + categories: [], + series: [] + } + let allobj = { + categories: [], + series: [] } - // 先处理时间 // 当选择全部时 - if(!this.staff1.value&&!this.staff2.value){ - result.map((item,idx)=>{ - let obj={} - obj.name=item[0].deptName - obj.data=[] - item.map(item1=>{ - // 时间的处理 - if(idx==0){ - allobj.categories.push(item1.statDate.slice(5,10)) + if (!this.staff1.value && !this.staff2.value) { + // let first=res.first + res.first.map((item, index) => { + let obj = { + name: item[0].deptName, + data: [] + } + item.map((item1) => { + if (index == 0) { + allobj.categories.push(item1.name) } - obj.data.push(item1.data) + obj.data.push(item1.avgExecutionRate) }) allobj.series.push(obj) }) } // 当选择只有一个时 - else if(this.staff1.value&&!this.staff2.value){ - // console.log(2) - let obj={} - obj.data=[] - obj.name=result[0][0].deptName - result[0].map(item=>{ - allobj.categories.push(item.statDate.slice(5,10)) - obj.data.push(item.data) + else if (this.staff1.value && !this.staff2.value) { + res.first.map((item, index) => { + let obj = { + name: item[0].deptName, + data: [] + } + item.map((item1) => { + if (index == 0) { + allobj.categories.push(item1.name) + } + obj.data.push(item1.avgExecutionRate) + }) + allobj.series.push(obj) }) - allobj.series.push(obj) // 判断是否显示平均 // 如果显示对比 - if(this.timepickpickisshow){ - let obj={} - obj.data=[] - obj.name='平均' - result[1].map(item=>{ - obj.data.push(item.data) + if (this.timepickpickisshow) { + res.second.map((item, index) => { + let obj = { + name: '平均', + data: [] + } + item.map((item1) => { + obj.data.push(item1.avgExecutionRate) + }) + allobj.series.push(obj) }) - allobj.series.push(obj) } - }else{ + } else { // console.log(3) // 当两个都选择的时候 - let obj={} - let obj1={} - obj.data=[] - obj1.data=[] - obj.name=result[0][0].deptName - obj1.name=result[1][0].deptName - result[0].map(item=>{ - allobj.categories.push(item.statDate.slice(5,10)) - obj.data.push(item.data) - }) - result[1].map(item=>{ - obj1.data.push(item.data) - }) - allobj.series.push(obj) - allobj.series.push(obj1) - } - // console.log(allobj) - // return - // this.lineOptsect1=allobj - this['lineOptsect'+index]=allobj - // this['lineOptsect'+index].series=allobj.series - // this['lineOptsect'+index].categories=allobj.categories - } - }) - }, - // 获取销奖能力 - getPowerList(){ - this.$u.post('/cusLvStatistics/teamAnalysisMarketingAbility',{ - deptIds:this.deptids||[this.staff1.value,this.staff2.value].filter(item=>item).join(','), - houseId:this.houseId, - timeType:this.lastEndDate?null:this.activeTotal+'', - lastEndDate:this.lastEndDate, - lastStartDate:this.lastStartDate - }) - .then(res=>{ - // console.log(res) - // 处理数据 - this.chartData1={ - categories:[], - series:[] - } - let allobj={ - categories:[], - series:[] - } - // 当选择全部时 - if(!this.staff1.value&&!this.staff2.value){ - // let first=res.first - res.first.map((item,index)=>{ - let obj={ - name:item[0].deptName, - data:[] - } - item.map((item1)=>{ - if(index==0){ - allobj.categories.push(item1.name) + res.first.map((item, index) => { + let obj = { + name: item[0].deptName, + data: [] } - obj.data.push(item1.avgExecutionRate) - }) - allobj.series.push(obj) - }) - } - // 当选择只有一个时 - else if(this.staff1.value&&!this.staff2.value){ - res.first.map((item,index)=>{ - let obj={ - name:item[0].deptName, - data:[] - } - item.map((item1)=>{ - if(index==0){ - allobj.categories.push(item1.name) - } - obj.data.push(item1.avgExecutionRate) - }) - allobj.series.push(obj) - }) - // 判断是否显示平均 - // 如果显示对比 - if(this.timepickpickisshow){ - res.second.map((item,index)=>{ - let obj={ - name:'平均', - data:[] - } - item.map((item1)=>{ + item.map((item1) => { + if (index == 0) { + allobj.categories.push(item1.name) + } obj.data.push(item1.avgExecutionRate) }) allobj.series.push(obj) }) } - }else{ - // console.log(3) - // 当两个都选择的时候 - res.first.map((item,index)=>{ - let obj={ - name:item[0].deptName, - data:[] - } - item.map((item1)=>{ - if(index==0){ - allobj.categories.push(item1.name) - } - obj.data.push(item1.avgExecutionRate) - }) - allobj.series.push(obj) - }) - } - // console.log(allobj) - this.chartData1=allobj - this.$forceUpdate() - }) + // console.log(allobj) + this.chartData1 = allobj + this.$forceUpdate() + }) }, // 定义一个公共方法对数据进行处理 - dealData(arr){ + dealData(arr) { // 获取最大值 - let num=Math.max.apply(Math, arr.map(function (o) { return o.zxl })) //结果:3 + let num = Math.max.apply(Math, arr.map(function(o) { + return o.zxl + })) //结果:3 // console.log(num) - if(num>100){ + if (num > 100) { // 获取最大值的下标 // let idx=arr.findIndex(item=>item.zxl==num) // console.log(idx,123) - arr.map(item=>{ - item.zxl1=Math.floor(item.zxl/num*100) + arr.map(item => { + item.zxl1 = Math.floor(item.zxl / num * 100) }) // console.log(arr) return arr - }else{ - arr.map(item=>{ - item.zxl1=item.zxl + } else { + arr.map(item => { + item.zxl1 = item.zxl }) return arr } @@ -1041,15 +1053,17 @@ background: #FAFAFA; padding-bottom: 60rpx; } + // 对比时间切换 - .timepick{ + .timepick { width: 100%; height: 90rpx; display: flex; align-items: center; background: #FAFAFA; } - .timepicktime{ + + .timepicktime { width: 260rpx; height: 50rpx; border: 1rpx solid #E0E0E0; @@ -1057,7 +1071,8 @@ display: flex; background: #FFFFFF; } - .timepicktime>view:nth-of-type(1){ + + .timepicktime>view:nth-of-type(1) { width: 210rpx; height: 100%; line-height: 50rpx; @@ -1065,21 +1080,24 @@ font-weight: 400; text-align: center; } - .timepicktime>view:nth-of-type(2){ + + .timepicktime>view:nth-of-type(2) { width: 49rpx; height: 100%; // border-left: 1px solid #E0E0E0; } - .timepickpick{ + + .timepickpick { width: 110rpx; height: 50rpx; margin-left: 30rpx; display: flex; align-items: center; } - .Underimg{ + + .Underimg { width: 50rpx; - height:50rpx; + height: 50rpx; margin-top: -2rpx; } diff --git a/pages/center/Piabodata/index.vue b/pages/center/Piabodata/index.vue index 4854f31..318b0c9 100644 --- a/pages/center/Piabodata/index.vue +++ b/pages/center/Piabodata/index.vue @@ -279,7 +279,7 @@ }, newlistoj: [], newlistoj1: [{ - name: "接待量", + name: "接待客户", id: 1 }, { @@ -287,7 +287,7 @@ id: 2 }, { - name: "接待客户", + name: "接待量", id: 3 }, { diff --git a/pages/mine/equipment/index.vue b/pages/mine/equipment/index.vue index f4d8e65..a88f1d8 100644 --- a/pages/mine/equipment/index.vue +++ b/pages/mine/equipment/index.vue @@ -20,7 +20,7 @@ - 领用人:{{item.accName}} + 领用人:{{item.accName || '--'}}