diff --git a/App.vue b/App.vue index 685b6f6..4fd38ef 100644 --- a/App.vue +++ b/App.vue @@ -226,11 +226,12 @@ .title1 { flex: 2; - font-size: 32rpx; + font-size: 30rpx; font-weight: 500; color: #333333; line-height: 90rpx; - text-indent: 30rpx; + padding-left: 30rpx; + font-family: PingFangSC-Medium, PingFang SC; } .title3 { @@ -312,7 +313,7 @@ .jindu { width: 100%; - height: 300rpx; + min-height: 400rpx; .jindu-box { width: 100%; diff --git a/pages/center/Piabodata/Employeesstatistics.vue b/pages/center/Piabodata/Employeesstatistics.vue index 041f38e..f68b518 100644 --- a/pages/center/Piabodata/Employeesstatistics.vue +++ b/pages/center/Piabodata/Employeesstatistics.vue @@ -34,7 +34,7 @@ - + @@ -45,9 +45,9 @@ {{item.name.substring(0,4)}} - - - + + + {{item.zxl==null?0:item.zxl}}次 @@ -73,7 +73,7 @@ 人均执行率 - + @@ -87,10 +87,10 @@ --> - - - - + + + + {{item.zxl==null?0:item.zxl}}% @@ -119,7 +119,7 @@ 人均录音时长/分钟 - + @@ -130,14 +130,10 @@ {{item.name.substring(0,4)}} - - - + + + - {{item.zxl==null?0:item.zxl}}分钟 @@ -177,9 +173,9 @@ {{item.name.substring(0,4)}} - - - + + + {{item.zxl==null?0:item.zxl}}次 @@ -282,19 +278,69 @@ this.houseId = uni.getStorageSync('buildingID').id; this.init() }, - onPullDownRefresh() { + computed: { + + }, + onPullDownRefresh(){ this.init() setTimeout(function() { uni.stopPullDownRefresh(); }, 1000); }, methods: { - init() { - this.newlisttabinfo1 = { - avg: '', - count: '', - total: '', - result: [], + getPercent(num,type) { + if(this.newlisttabinfo1.result&&this.newlisttabinfo1.result.length&&type==1){ + console.log(this.newlisttabinfo1.result) + let index0 = this.newlisttabinfo1.result[0] + let percent = num/(index0.zxl) * 100 + // console.log(index0.zxl) + // console.log(index0) + // console.log('num',num) + // console.log(percent) + // console.log(percent.toFixed(2)) + return percent.toFixed(2) + + }else if(this.newlisttabinfo2.result&&this.newlisttabinfo2.result.length&&type==2){ + let index0 = this.newlisttabinfo2.result[0] + let percent = num/(index0.zxl) * 100 + return percent.toFixed(2) + + }else if(this.newlisttabinfo4.result&&this.newlisttabinfo4.result.length&&type==4){ + let index0 = this.newlisttabinfo4.result[0] + let percent = num/(index0.zxl) * 100 + return percent.toFixed(2) + }else{ + return 0 + } + }, + getPercent1(num){ + console.log(num) + return num||0 + }, + init(){ + this.newlisttabinfo1={ + avg:'', + count:'', + total:'', + result:[], + }, + this.newlisttabinfo2={ + avg:'', + count:'', + total:'', + result:[], + }, + this.newlisttabinfo3={ + avg:'', + count:'', + total:'', + result:[], + }, + this.newlisttabinfo4={ + avg:'', + count:'', + total:'', + result:[], } this.newlisttabinfo2 = { avg: '', @@ -511,9 +557,6 @@ margin-bottom: 10rpx; } } - .progress-cus{ - - } .jindu-name{ width: 180rpx; margin-left: 15rpx; diff --git a/pages/center/Piabodata/Groupcontrast.vue b/pages/center/Piabodata/Groupcontrast.vue index 5de78c3..ef07283 100644 --- a/pages/center/Piabodata/Groupcontrast.vue +++ b/pages/center/Piabodata/Groupcontrast.vue @@ -32,12 +32,12 @@ - + {{item.name.substring(0, 4)}} - + - + {{item.name.substring(0, 4)}} - + - 暂无数据 @@ -126,7 +126,7 @@ {{item.name.substring(0, 4)}} - + {{item.zxl==null?0:item.zxl}}% @@ -154,7 +154,7 @@ {{item.name.substring(0, 4)}} - + {{item.zxl==null?0:item.zxl}}% @@ -362,8 +362,10 @@ }, 1000); }, methods: { - - + getPercent(num){ + console.log(num) + return num||0 + }, // 获取员工列表 getStaffList() { this.$u.post('/cusLvStatistics/selectAllAccountIdByHouseId', { diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index adf95f2..dd326b7 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -210,6 +210,8 @@ + @@ -631,7 +633,7 @@ background: #f8f8f8; .hsnrtest { height: 36rpx; - font-size: 24rpx; + font-size: 26rpx; font-weight: 400; color: #666666; line-height: 36rpx; @@ -659,8 +661,8 @@ align-items: center; .arrow { - width: 28rpx; - height: 28rpx; + width: 32rpx; + height: 32rpx; } } } @@ -733,9 +735,9 @@ .title1 { flex: 2; - font-size: 30rpx; + font-size: 28rpx; color: #333333; - font-weight: 400; + font-weight: 500; } .leve1-jindu { @@ -871,13 +873,11 @@ } .content { - // height: 1000rpx;/ overflow: hidden; - border-top: 1px solid #E0E0E0; + border-top: 1rpx solid #E0E0E0; .content-tips { background: #fff; - // box-sizing: border-box; margin-bottom: 20rpx; overflow: hidden; @@ -886,7 +886,6 @@ display: flex; justify-content: space-between; box-sizing: border-box; - // border-top: 1px solid #E0E0E0; font-weight: 400; color: #292929; height: 90rpx; @@ -913,17 +912,17 @@ } .test { - height: 42rpx; + height: 48rpx; font-size: 30rpx; font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: #333333; - line-height: 42rpx; + line-height: 48rpx; margin-right: 16rpx; display: flex; } .clientStageName { - height: 48rpx; + // height: 48rpx; line-height: 48rpx; background: #FFFFFF; border-radius: 4rpx; @@ -1039,7 +1038,6 @@ } .tabchange { - // background: #FFFFFF; overflow: hidden; .tabactive1 { @@ -1064,7 +1062,7 @@ width: 52rpx; height: 52rpx; background: #FFFFFF; - border: 1px solid #C9C9C9; + border: 1rpx solid #C9C9C9; border-radius: 50%; text-align: center; line-height: 52rpx; @@ -1165,8 +1163,7 @@ margin-bottom: 20rpx; .tab2-first { - // height: 150rpx; - border-bottom: 1px solid #E0E0E0; + border-bottom: 1rpx solid #E0E0E0; padding: 0 30rpx; margin-top: 19rpx; box-sizing: border-box; @@ -1183,7 +1180,7 @@ width: 52rpx; height: 52rpx; background: #FFFFFF; - border: 1px solid #C9C9C9; + border: 1rpx solid #C9C9C9; border-radius: 50%; text-align: center; line-height: 52rpx; @@ -1237,8 +1234,8 @@ width: 156rpx; height: 60rpx; background: #FFFFFF; - border-radius: 4px; - border: 1px solid #2671E2; + border-radius: 4rpx; + border: 1rpx solid #2671E2; text-align: center; line-height: 60rpx; font-weight: 400; diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index ee07b1a..ac80467 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -692,6 +692,7 @@ /* 设置或检索伸缩盒对象的子元素的排列方式 */ } .activeColor{ + font-weight: bold; color: #2671E2; } diff --git a/pages/index/consumer/index.vue b/pages/index/consumer/index.vue index 48afa9f..d18c5ed 100644 --- a/pages/index/consumer/index.vue +++ b/pages/index/consumer/index.vue @@ -842,6 +842,7 @@ } .activeColor{ color: #2671E2; + font-weight: bold; } } @@ -1022,9 +1023,8 @@ } .content-sec { - border-top: 1px solid #E0E0E0; - padding: 0 30rpx; - padding-bottom: 30rpx; + border-top: 1rpx solid #E0E0E0; + padding: 0 28rpx 28rpx; position: relative; .content-sec-lab { @@ -1075,10 +1075,10 @@ } .content-last { - height: 108rpx; display: flex; justify-content: flex-end; align-items: center; + padding-bottom: 30rpx; .content-last-tab { width: 214rpx; diff --git a/pages/index/index.vue b/pages/index/index.vue index c19481f..1fae1d8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -118,7 +118,7 @@ 平均执行率 - + {{realtimeobj.receptionCount || 0}} 接待量 @@ -171,7 +171,7 @@ 平均执行率 - + {{Thisweekobj.receptionCount || 0}} 接待量 @@ -201,8 +201,9 @@ - - 接待管理 + + + 接待管理 @@ -223,7 +224,8 @@ 用户画像 - 数据分析 + + 数据分析 @@ -250,7 +252,8 @@ 员工分析 - 团队管理 + + 团队管理 @@ -776,6 +779,10 @@ uni.navigateTo({ url: '/pages/center/records/index?refresh=refresh&activeTotal=0&validInvalid=0' }); + } else if (i == 11) { + uni.navigateTo({ + url: '/pages/center/records/index?refresh=refresh&activeTotal=0' + }); } else if (i == 2) { uni.switchTab({ url: '/pages/index/customer' @@ -794,7 +801,20 @@ url: '/pages/center/records/index?refresh=refresh&activeTotal=4&validInvalid=0&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd }); } - + } else if (i == 33) { + if (this.zhixingcenterindex == 2) {// 近7天 + uni.navigateTo({ + url: '/pages/center/records/index?refresh=refresh&activeTotal=2' + }); + } else if (this.zhixingcenterindex == 6) {//近30天 + uni.navigateTo({ + url: '/pages/center/records/index?refresh=refresh&activeTotal=3' + }); + } else {// 自定义时间段 + uni.navigateTo({ + url: '/pages/center/records/index?refresh=refresh&activeTotal=4&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd + }); + } } else if (i == 6) { uni.navigateTo({ url: '/pages/center/records/index?refresh=refresh&activeTotal=0&validInvalid=0' diff --git a/pages/index/personal.vue b/pages/index/personal.vue index 99d6752..31a21c7 100644 --- a/pages/index/personal.vue +++ b/pages/index/personal.vue @@ -52,15 +52,15 @@ - + diff --git a/pages/login/index.vue b/pages/login/index.vue index 851c466..b811300 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -56,8 +56,10 @@ export default { data() { return { - username: '',//用户名 - password: '',//密码 + username: '13033782199',//用户名-测试 13388881113 1234567 + password: '123456',//密码 + // username: '13033782199',//用户名-生产 13033782199 654321 + // password: '654321',//密码 passwordType: true, agreeChecked: true }; diff --git a/pages/mine/details.vue b/pages/mine/details.vue index 4611c8a..84e1014 100644 --- a/pages/mine/details.vue +++ b/pages/mine/details.vue @@ -11,7 +11,7 @@ {{date}} 接待时长 {{alltimeStr}} - + {{userlistobj.validInvalidName||''}} @@ -51,7 +51,7 @@ :class="{active: Math.floor(item.bg/1000) <= playNow && Math.floor(item.ed/1000) > playNow && i==0}" v-for="(item,index) in dialog.message" :key="index" :data-speaker="item.speaker"> - {{ item.speaker | toCapital }} + {{ item.speaker | toCapital }} @@ -103,7 +103,7 @@ - + @@ -335,6 +335,56 @@ methods: { + borderColor(index) { + let obj = { + color: '', + borderRadius: '', + border: '' + } + switch (index) { + case 1: + obj.color = '#E6625B'; + obj.borderRadius = '8rpx'; + obj.border= '2rpx solid #E6625B'; + break; + case 2: + obj.color = '#FF981E'; + obj.borderRadius = '8rpx'; + obj.border= '2rpx solid #FF981E'; + break; + case 3: + obj.color = '#F6BD16'; + obj.borderRadius = '8rpx'; + obj.border= '2rpx solid #F6BD16'; + break; + case 5: + obj.color = '#4980C8'; + obj.borderRadius = '8rpx'; + obj.border= '2rpx solid #4980C8'; + break; + case 6: + obj.color = '#60CBEC'; + obj.borderRadius = '8rpx'; + obj.border= '2rpx solid #60CBEC'; + break; + case 7: + obj.color = '##FF981E'; + obj.borderRadius = '8rpx'; + obj.border= '2rpx solid #FF981E'; + break; + case 8: + obj.color = '#4F861E'; + obj.borderRadius = '8rpx'; + obj.border= '2rpx solid #4F861E'; + break; + default: + obj.color = '#9F61C8'; + obj.borderRadius = '8rpx'; + obj.border= '2rpx solid #9F61C8'; + break; + } + return obj + }, effectiveAdd() { if (this.effectiveindex == 4) { if (this.effectiveitext.length == 0) { @@ -1180,29 +1230,40 @@ } .call_record_time { - height: 44rpx; - font-size: 28rpx; - font-weight: 600; - color: #008EF2; - line-height: 44rpx; + height: 42rpx; + font-size: 30rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #303030; + line-height: 42rpx; + margin-bottom: 20rpx; } .call_record_time_one { + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #303030; height: 48rpx; - font-size: 24rpx; - font-weight: 500; - color: #70798d; + font-size: 28rpx; line-height: 48rpx; display: flex; justify-content: space-between; + align-items: center; position: relative; + .menu{ + width: 36rpx; + height: 36rpx; + } .audoioyouxiao { - height: 46rpx; + color: #333333; + font-size: 28rpx; + line-height: 48rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; position: absolute; top: 0rpx; - right: 140rpx; - font-size: 30rpx; + right: 126rpx; } .diangweitupian { @@ -1312,10 +1373,11 @@ } .scroll-Y .text { - margin: 50rpx 30rpx; - line-height: 80rpx; + line-height: 42rpx; display: flex; - align-items: center; + margin-top: 30rpx; + font-size: 30rpx; + color: #505050; } .scroll-Y .text[data-speaker="2"], @@ -1331,25 +1393,28 @@ } .scroll-Y .text .avatar { - width: 64rpx; - height: 64rpx; - line-height: 64rpx; - text-align: center; - font-size: 36rpx; - border-radius: 50%; - background: #F2F2F2; - color: #008EF2; - + text{ + display: block; + width: 72rpx; + height: 72rpx; + line-height: 72rpx; + text-align: center; + background: #FFFFFF; + border-radius: 8rpx; + font-size: 30rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + box-sizing: border-box; + } } .scroll-Y .text .content { margin-left: 30rpx; - line-height: 60rpx; text-align: left; - padding: 0 5px; - background: #F6F6F6; - border-radius: 8rpx; - max-width: 442rpx; + padding: 0 20rpx; + background: #f8f8f8; + border-radius: 12rpx; + max-width: 460rpx; color: #999; position: relative; @@ -1372,21 +1437,16 @@ } .scroll-Y .text.active .content { - color: #FF7538 !important; + color: #2671E2 !important; position: relative; } .scroll-Y .text.active[data-speaker="2"] .content, .scroll-Y .text.active[data-speaker="4"] .content, .scroll-Y .text.active[data-speaker="6"] .content { - color: #FF7538 !important; + color: #2671E2 !important; position: relative; } - - .scroll-Y .isGreen .contentInfo .contentMain .content { - background: #2BC805 !important; - color: #FFFFFF; - } .tab-box { width: 100%; @@ -1453,21 +1513,15 @@ } .backTop { - width: 60rpx; - height: 60rpx; - background: rgba(211, 235, 253, 1); - box-shadow: 0rpx 0rpx 2rpx 4rpx rgba(38, 161, 255, 0.04); - border-radius: 50%; + width: 112rpx; + height: 112rpx; position: fixed; - bottom: 200rpx; - right: 8rpx; - display: flex; - justify-content: center; - align-items: center; + bottom: 110rpx; + right: 40rpx; image { - width: 26rpx; - height: 34rpx; + width: 112rpx; + height: 112rpx; } } @@ -1583,7 +1637,8 @@ .dialog-block { margin: 20rpx 0; - border-bottom: 1px solid #ccc; + border-bottom: 1rpx solid #ccc; + padding-bottom: 30rpx; .fileName { text-align: center; diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 053ae08..74986de 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -25,7 +25,7 @@ + :data-guwen="roleindex" :data-speaker="item.speaker" :id="'dialog'+csdFileindex+'text'+item.bg"> @@ -306,8 +306,6 @@ - -