Acher
/
newEdition
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

合并代码

message
corala 2 years ago
parent
8b9ae1c5af c568e0f53b
commit
30c042ae80
18 changed files with 317 additions and 156 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -3
      App.vue
  2. +73
    -30
      pages/center/Piabodata/Employeesstatistics.vue
  3. +30
    -8
      pages/center/Piabodata/Groupcontrast.vue
  4. +25
    -3
      pages/center/Piabodata/Theteamcompared.vue
  5. +12
    -17
      pages/center/Piabodata/TrendAnalysis.vue
  6. +7
    -5
      pages/center/Piabodata/index.vue
  7. +16
    -19
      pages/center/consumer/consumerDetail.vue
  8. +1
    -0
      pages/center/records/index.vue
  9. +4
    -4
      pages/index/consumer/index.vue
  10. +27
    -7
      pages/index/index.vue
  11. +3
    -3
      pages/index/personal.vue
  12. +4
    -2
      pages/login/index.vue
  13. +106
    -51
      pages/mine/details.vue
  14. +5
    -4
      pages/mine/details2.vue
  15. BIN
      static/images/help-icon.png
  16. BIN
      static/images/menu.png
  17. BIN
      static/images/no-checked.png
  18. BIN
      static/images/topicon.png

+ 4
- 3
App.vue View File

@@ -226,11 +226,12 @@


.title1 { .title1 {
flex: 2; flex: 2;
font-size: 32rpx;
font-size: 30rpx;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
line-height: 90rpx; line-height: 90rpx;
text-indent: 30rpx;
padding-left: 30rpx;
font-family: PingFangSC-Medium, PingFang SC;
} }


.title3 { .title3 {
@@ -312,7 +313,7 @@


.jindu { .jindu {
width: 100%; width: 100%;
height: 300rpx;
min-height: 400rpx;


.jindu-box { .jindu-box {
width: 100%; width: 100%;


+ 73
- 30
pages/center/Piabodata/Employeesstatistics.vue View File

@@ -34,7 +34,7 @@
</view> </view>
</view> </view>
<view class="jindu" style="margin-top: 20rpx;min-height: 300rpx;">
<view class="jindu" style="margin-top: 20rpx;">
<view v-if="newlisttabinfo1.result.length" class="jindu-box" v-for="(item,index) in newlisttabinfo1.result" :key="index"> <view v-if="newlisttabinfo1.result.length" class="jindu-box" v-for="(item,index) in newlisttabinfo1.result" :key="index">
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name u-flex" style='width: 170rpx' v-if="item.name"> <view class="jindu-name u-flex" style='width: 170rpx' v-if="item.name">
@@ -45,9 +45,9 @@
{{item.name.substring(0,4)}}</view> {{item.name.substring(0,4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color1" v-if="index==0" :style="'width:'+ item.zxl||0 + '%'" ></view> <view class="color1" v-if="index==0" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color2" v-if="index==1" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color3" v-if="index==2" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color4" v-if="index>2" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color2" v-if="index==1" :style="'width:'+ getPercent(item.zxl,1) + '%'" ></view>
<view class="color3" v-if="index==2" :style="'width:'+ getPercent(item.zxl,1) + '%'" ></view>
<view class="color4" v-if="index>2" :style="'width:'+ getPercent(item.zxl,1) + '%'" ></view>
</view> </view>
<view class="jindu-zxl" >{{item.zxl==null?0:item.zxl}}次</view> <view class="jindu-zxl" >{{item.zxl==null?0:item.zxl}}次</view>
</view> </view>
@@ -73,7 +73,7 @@
<view class="text1-1">人均执行率</view> <view class="text1-1">人均执行率</view>
</view> </view>
</view> </view>
<view class="jindu" style="margin-top: 20rpx;min-height: 300rpx;">
<view class="jindu" style="margin-top: 20rpx;">
<view v-if="newlisttabinfo3.result.length" class="jindu-box" v-for="(item,index) in newlisttabinfo3.result" :key="index"> <view v-if="newlisttabinfo3.result.length" class="jindu-box" v-for="(item,index) in newlisttabinfo3.result" :key="index">
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name u-flex" style='width: 170rpx' v-if="item.name"> <view class="jindu-name u-flex" style='width: 170rpx' v-if="item.name">
@@ -87,10 +87,10 @@
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view> <view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
</view> --> </view> -->
<view class="progress-cus"> <view class="progress-cus">
<view class="color1" v-if="index==0" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color2" v-if="index==1" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color3" v-if="index==2" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color4" v-if="index>2" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color1" v-if="index==0" :style="'width:'+ getPercent1(item.zxl) + '%'" ></view>
<view class="color2" v-if="index==1" :style="'width:'+ getPercent1(item.zxl) + '%'" ></view>
<view class="color3" v-if="index==2" :style="'width:'+ getPercent1(item.zxl) + '%'" ></view>
<view class="color4" v-if="index>2" :style="'width:'+ getPercent1(item.zxl) + '%'" ></view>
</view> </view>
<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view> <view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view>
</view> </view>
@@ -119,7 +119,7 @@
<view class="text1-1">人均录音时长/分钟</view> <view class="text1-1">人均录音时长/分钟</view>
</view> </view>
</view> </view>
<view class="jindu" style="margin-top: 20rpx;min-height: 300rpx;">
<view class="jindu" style="margin-top: 20rpx;">
<view v-if="newlisttabinfo2.result.length" class="jindu-box" v-for="(item,index) in newlisttabinfo2.result" :key="index"> <view v-if="newlisttabinfo2.result.length" class="jindu-box" v-for="(item,index) in newlisttabinfo2.result" :key="index">
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name u-flex" style='width: 170rpx' v-if="item.name"> <view class="jindu-name u-flex" style='width: 170rpx' v-if="item.name">
@@ -130,14 +130,10 @@
{{item.name.substring(0,4)}}</view> {{item.name.substring(0,4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color1" v-if="index==0" :style="'width:'+ item.zxl||0 + '%'" ></view> <view class="color1" v-if="index==0" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color2" v-if="index==1" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color3" v-if="index==2" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color4" v-if="index>2" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color2" v-if="index==1" :style="'width:'+ getPercent(item.zxl,2)+ '%'" ></view>
<view class="color3" v-if="index==2" :style="'width:'+ getPercent(item.zxl,2)+ '%'" ></view>
<view class="color4" v-if="index>2" :style="'width:'+ getPercent(item.zxl,2)+ '%'" ></view>
</view> </view>
<!-- <view class="jindu-name" v-if="item.name">{{item.name.substring(0,4)}}</view>
<view class="progress-cus">
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
</view> -->
<view class="jindu-zxl u-line-1">{{item.zxl==null?0:item.zxl}}分钟</view> <view class="jindu-zxl u-line-1">{{item.zxl==null?0:item.zxl}}分钟</view>
</view> </view>
</view> </view>
@@ -177,9 +173,9 @@
{{item.name.substring(0,4)}}</view> {{item.name.substring(0,4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color1" v-if="index==0" :style="'width:'+ item.zxl||0 + '%'" ></view> <view class="color1" v-if="index==0" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color2" v-if="index==1" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color3" v-if="index==2" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color4" v-if="index>2" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color2" v-if="index==1" :style="'width:'+ getPercent(item.zxl,4)+ '%'" ></view>
<view class="color3" v-if="index==2" :style="'width:'+ getPercent(item.zxl,4) + '%'" ></view>
<view class="color4" v-if="index>2" :style="'width:'+ getPercent(item.zxl,4)+ '%'" ></view>
</view> </view>
<view class="jindu-zxl" >{{item.zxl==null?0:item.zxl}}次</view> <view class="jindu-zxl" >{{item.zxl==null?0:item.zxl}}次</view>
</view> </view>
@@ -282,19 +278,69 @@
this.houseId = uni.getStorageSync('buildingID').id; this.houseId = uni.getStorageSync('buildingID').id;
this.init() this.init()
}, },
onPullDownRefresh() {
computed: {
},
onPullDownRefresh(){
this.init() this.init()
setTimeout(function() { setTimeout(function() {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
}, 1000); }, 1000);
}, },
methods: { 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 = { this.newlisttabinfo2 = {
avg: '', avg: '',
@@ -511,9 +557,6 @@
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
} }
.progress-cus{

}
.jindu-name{ .jindu-name{
width: 180rpx; width: 180rpx;
margin-left: 15rpx; margin-left: 15rpx;


+ 30
- 8
pages/center/Piabodata/Groupcontrast.vue View File

@@ -32,12 +32,12 @@
</view> </view>
</view> </view>
<view class="jindu"> <view class="jindu">
<scroll-view style="height: 300rpx;" scroll-y="true" >
<scroll-view scroll-y="true" >
<view class="jindu-box" v-for="(item,index) in newlisttabinfo1" :key="index"> <view class="jindu-box" v-for="(item,index) in newlisttabinfo1" :key="index">
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name">{{item.name.substring(0, 4)}}</view> <view class="jindu-name">{{item.name.substring(0, 4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color" :style="'width:'+ getPercent(item.zxl,1) + '%'" ></view>
</view> </view>
<!-- <view style="width: 440rpx;margin-left: 10rpx;"> <!-- <view style="width: 440rpx;margin-left: 10rpx;">
<u-line-progress height="24" :show-percent="false" active-color="#FBA448" :percent="item.zxl1"></u-line-progress> <u-line-progress height="24" :show-percent="false" active-color="#FBA448" :percent="item.zxl1"></u-line-progress>
@@ -65,12 +65,12 @@
</view> </view>
</view> </view>
<view class="jindu"> <view class="jindu">
<scroll-view style="height: 300rpx;" scroll-y="true" >
<scroll-view scroll-y="true" >
<view class="jindu-box" v-for="(item,index) in newlisttabinfo2" :key="index"> <view class="jindu-box" v-for="(item,index) in newlisttabinfo2" :key="index">
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name">{{item.name.substring(0, 4)}}</view> <view class="jindu-name">{{item.name.substring(0, 4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color" :style="'width:'+ getPercent(item.zxl,2) + '%'" ></view>
</view> </view>
<!-- <view style="width: 440rpx;margin-left: 10rpx;"> <!-- <view style="width: 440rpx;margin-left: 10rpx;">
<u-line-progress height="24" :show-percent="false" active-color="#4FC78F" :percent="item.zxl1"></u-line-progress> <u-line-progress height="24" :show-percent="false" active-color="#4FC78F" :percent="item.zxl1"></u-line-progress>
@@ -106,12 +106,12 @@
</view> </view>
</view> </view>
<view class="jindu"> <view class="jindu">
<scroll-view style="height: 300rpx;" scroll-y="true" >
<scroll-view scroll-y="true" >
<view class="jindu-box" v-for="(item,index) in newlisttabinfo3" :key="index"> <view class="jindu-box" v-for="(item,index) in newlisttabinfo3" :key="index">
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name">{{item.name.substring(0, 4)}}</view> <view class="jindu-name">{{item.name.substring(0, 4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color" :style="'width:'+ getPercent1(item.zxl)+ '%'" ></view>
</view> </view>
<!-- <view style="width: 440rpx;margin-left: 10rpx;"> <!-- <view style="width: 440rpx;margin-left: 10rpx;">
<u-line-progress height="24" :show-percent="false" active-color="#9B6BDF" :percent="item.zxl1"></u-line-progress> <u-line-progress height="24" :show-percent="false" active-color="#9B6BDF" :percent="item.zxl1"></u-line-progress>
@@ -142,12 +142,12 @@
<view class="heji">均值：{{newAvg4||0}}</view> <view class="heji">均值：{{newAvg4||0}}</view>
</view> --> </view> -->
<view class="jindu"> <view class="jindu">
<scroll-view style="height: 300rpx;" scroll-y="true" >
<scroll-view scroll-y="true" >
<view class="jindu-box" v-for="(item,index) in newlisttabinfo4" :key="index"> <view class="jindu-box" v-for="(item,index) in newlisttabinfo4" :key="index">
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name">{{item.name.substring(0, 4)}}</view> <view class="jindu-name">{{item.name.substring(0, 4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color" :style="'width:'+getPercent1(item.zxl) + '%'" ></view>
</view> </view>
<!-- <view style="width: 440rpx;margin-left: 10rpx;"> <!-- <view style="width: 440rpx;margin-left: 10rpx;">
<u-line-progress height="24" :show-percent="false" active-color="#9B6BDF" :percent="item.zxl1"></u-line-progress> <u-line-progress height="24" :show-percent="false" active-color="#9B6BDF" :percent="item.zxl1"></u-line-progress>
@@ -337,6 +337,28 @@
}, 1000); }, 1000);
}, },
methods: { methods: {
getPercent(num,type) {
if(this.newlisttabinfo1&&this.newlisttabinfo1.length&&type==1){
console.log(this.newlisttabinfo1)
let index0 = this.newlisttabinfo1[0]
let percent = num/(index0.zxl) * 100
return percent.toFixed(2)
}else if(this.newlisttabinfo2&&this.newlisttabinfo2.length&&type==2){
let index0 = this.newlisttabinfo2[0]
let percent = num/(index0.zxl) * 100
return percent.toFixed(2)
}else if(this.newlisttabinfo3&&this.newlisttabinfo3.length&&type==3){
let index0 = this.newlisttabinfo3[0]
let percent = num/(index0.zxl) * 100
return percent.toFixed(2)
}else{
return 0
}
},
getPercent1(num){
console.log(num)
return num||0
},
// 获取部门列表 // 获取部门列表
getSectionList(){ getSectionList(){
this.$u.post('/user/getHouseByToken',) this.$u.post('/user/getHouseByToken',)


+ 25
- 3
pages/center/Piabodata/Theteamcompared.vue View File

@@ -68,7 +68,7 @@
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name">{{item.name.substring(0, 4)}}</view> <view class="jindu-name">{{item.name.substring(0, 4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color" :style="'width:'+ getPercent(item.zxl,1) + '%'" ></view>
</view> </view>
<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}</view> <view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}</view>
</view> </view>
@@ -116,7 +116,7 @@
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name">{{item.name.substring(0, 4)}}</view> <view class="jindu-name">{{item.name.substring(0, 4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color" :style="'width:'+ getPercent(item.zxl,2) + '%'" ></view>
</view> </view>
<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}</view> <view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}</view>
</view> </view>
@@ -151,7 +151,7 @@
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name">{{item.name.substring(0, 4)}}</view> <view class="jindu-name">{{item.name.substring(0, 4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color" :style="'width:'+ getPercent1(item.zxl) + '%'" ></view>
</view> </view>
<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view> <view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view>
</view> </view>
@@ -400,6 +400,28 @@
}, 1000); }, 1000);
}, },
methods: { methods: {
getPercent1(num){
console.log(num)
return num||0
},
getPercent(num,type) {
if(this.newlisttabinfo1&&this.newlisttabinfo1.length&&type==1){
console.log(this.newlisttabinfo1)
let index0 = this.newlisttabinfo1[0]
let percent = num/(index0.zxl) * 100
return percent.toFixed(2)
}else if(this.newlisttabinfo2&&this.newlisttabinfo2.length&&type==2){
let index0 = this.newlisttabinfo2[0]
let percent = num/(index0.zxl) * 100
return percent.toFixed(2)
}else if(this.newlisttabinfo3&&this.newlisttabinfo3.length&&type==3){
let index0 = this.newlisttabinfo3[0]
let percent = num/(index0.zxl) * 100
return percent.toFixed(2)
}else{
return 0
}
},
//是否对比 //是否对比
checkboxChange() { checkboxChange() {
this.timepickpickisshow = !this.timepickpickisshow; this.timepickpickisshow = !this.timepickpickisshow;


+ 12
- 17
pages/center/Piabodata/TrendAnalysis.vue View File

@@ -102,12 +102,6 @@
<view class="tabbox"> <view class="tabbox">
<view :class="{ activecllasscet2: newactiveTotal == 4 }" @click="tabxuanxiangtap(4)">销讲二级</view> <view :class="{ activecllasscet2: newactiveTotal == 4 }" @click="tabxuanxiangtap(4)">销讲二级</view>
</view> </view>
<view class="tabbox">
<view :class="{ activecllasscet2: newactiveTotal == 4 }" @click="tabxuanxiangtap(4)">销讲二级</view>
</view>
<view class="tabbox">
<view :class="{ activecllasscet2: newactiveTotal == 4 }" @click="tabxuanxiangtap(4)">销讲二级</view>
</view>
</view> </view>




@@ -1193,6 +1187,10 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.boxtittab .tabbox{
flex: none;
padding: 0 35rpx;
}
.uchaserbox { .uchaserbox {
height: 500rpx; height: 500rpx;
} }
@@ -1292,26 +1290,23 @@
height: 98rpx; height: 98rpx;
display: flex; display: flex;
align-items: center; align-items: center;
border-bottom: 1px solid #E0E0E0;
border-bottom: 1rpx solid #E0E0E0;
color: #666;
} }


.timetabctview { .timetabctview {
flex: 1; flex: 1;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}

.timetabct view {
width: 94rpx;
text-align: center; text-align: center;
height: 100%;
line-height: 98rpx; line-height: 98rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666;
height: 100%;
display: flex;
justify-content: center;
}
.timetabctview view{
width: 100rpx;
} }


.activecllasscet { .activecllasscet {


+ 7
- 5
pages/center/Piabodata/index.vue View File

@@ -118,7 +118,7 @@
<view class="heji">合计：50</view> <view class="heji">合计：50</view>
<view class="heji">均值：25</view> <view class="heji">均值：25</view>
</view> --> </view> -->
<view style="width: 100%;height: 300rpx;text-align: center;line-height: 300rpx;"
<view style="width: 100%;text-align: center;line-height: 300rpx;"
v-if="newlisttabinfo.length==0">暂无数据</view> v-if="newlisttabinfo.length==0">暂无数据</view>
<view v-else class="jindu" style="margin-top: 20rpx;"> <view v-else class="jindu" style="margin-top: 20rpx;">
<scroll-view style="height: 300rpx;" scroll-y="true"> <scroll-view style="height: 300rpx;" scroll-y="true">
@@ -126,7 +126,7 @@
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name">{{item.name.substring(0, 4)}}</view> <view class="jindu-name">{{item.name.substring(0, 4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color" :style="'width:'+ getPercent(item.zxl) + '%'" ></view>
</view> </view>
<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view> <view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view>
</view> </view>
@@ -154,7 +154,7 @@
<view class="jindu-boxche"> <view class="jindu-boxche">
<view class="jindu-name">{{item.name.substring(0, 4)}}</view> <view class="jindu-name">{{item.name.substring(0, 4)}}</view>
<view class="progress-cus"> <view class="progress-cus">
<view class="color" :style="'width:'+ item.zxl||0 + '%'" ></view>
<view class="color" :style="'width:'+ getPercent(item.zxl) + '%'" ></view>
</view> </view>
<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view> <view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view>
</view> </view>
@@ -362,8 +362,10 @@
}, 1000); }, 1000);
}, },
methods: { methods: {


getPercent(num){
console.log(num)
return num||0
},
// 获取员工列表 // 获取员工列表
getStaffList() { getStaffList() {
this.$u.post('/cusLvStatistics/selectAllAccountIdByHouseId', { this.$u.post('/cusLvStatistics/selectAllAccountIdByHouseId', {


+ 16
- 19
pages/center/consumer/consumerDetail.vue View File

@@ -210,6 +210,8 @@
<view class="jiantobox"> <view class="jiantobox">
<image v-if="che.selected==0" class="arrow" src="/static/images/rate-checked.png" <image v-if="che.selected==0" class="arrow" src="/static/images/rate-checked.png"
mode="" /> mode="" />
<image v-else class="arrow" src="/static/images/no-checked.png"
mode="" />
</view> </view>
</view> </view>
<view v-if="subitem.show" style="width: 100%;height: 30rpx;"></view> <view v-if="subitem.show" style="width: 100%;height: 30rpx;"></view>
@@ -631,7 +633,7 @@
background: #f8f8f8; background: #f8f8f8;
.hsnrtest { .hsnrtest {
height: 36rpx; height: 36rpx;
font-size: 24rpx;
font-size: 26rpx;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
line-height: 36rpx; line-height: 36rpx;
@@ -659,8 +661,8 @@
align-items: center; align-items: center;


.arrow { .arrow {
width: 28rpx;
height: 28rpx;
width: 32rpx;
height: 32rpx;
} }
} }
} }
@@ -733,9 +735,9 @@


.title1 { .title1 {
flex: 2; flex: 2;
font-size: 30rpx;
font-size: 28rpx;
color: #333333; color: #333333;
font-weight: 400;
font-weight: 500;
} }


.leve1-jindu { .leve1-jindu {
@@ -871,13 +873,11 @@
} }


.content { .content {
// height: 1000rpx;/
overflow: hidden; overflow: hidden;
border-top: 1px solid #E0E0E0;
border-top: 1rpx solid #E0E0E0;


.content-tips { .content-tips {
background: #fff; background: #fff;
// box-sizing: border-box;
margin-bottom: 20rpx; margin-bottom: 20rpx;
overflow: hidden; overflow: hidden;


@@ -886,7 +886,6 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
// border-top: 1px solid #E0E0E0;
font-weight: 400; font-weight: 400;
color: #292929; color: #292929;
height: 90rpx; height: 90rpx;
@@ -913,17 +912,17 @@
} }


.test { .test {
height: 42rpx;
height: 48rpx;
font-size: 30rpx; font-size: 30rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
line-height: 42rpx;
line-height: 48rpx;
margin-right: 16rpx; margin-right: 16rpx;
display: flex; display: flex;
} }
.clientStageName { .clientStageName {
height: 48rpx;
// height: 48rpx;
line-height: 48rpx; line-height: 48rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 4rpx; border-radius: 4rpx;
@@ -1039,7 +1038,6 @@
} }


.tabchange { .tabchange {
// background: #FFFFFF;
overflow: hidden; overflow: hidden;


.tabactive1 { .tabactive1 {
@@ -1064,7 +1062,7 @@
width: 52rpx; width: 52rpx;
height: 52rpx; height: 52rpx;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #C9C9C9;
border: 1rpx solid #C9C9C9;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
line-height: 52rpx; line-height: 52rpx;
@@ -1165,8 +1163,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;


.tab2-first { .tab2-first {
// height: 150rpx;
border-bottom: 1px solid #E0E0E0;
border-bottom: 1rpx solid #E0E0E0;
padding: 0 30rpx; padding: 0 30rpx;
margin-top: 19rpx; margin-top: 19rpx;
box-sizing: border-box; box-sizing: border-box;
@@ -1183,7 +1180,7 @@
width: 52rpx; width: 52rpx;
height: 52rpx; height: 52rpx;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #C9C9C9;
border: 1rpx solid #C9C9C9;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
line-height: 52rpx; line-height: 52rpx;
@@ -1237,8 +1234,8 @@
width: 156rpx; width: 156rpx;
height: 60rpx; height: 60rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px;
border: 1px solid #2671E2;
border-radius: 4rpx;
border: 1rpx solid #2671E2;
text-align: center; text-align: center;
line-height: 60rpx; line-height: 60rpx;
font-weight: 400; font-weight: 400;


+ 1
- 0
pages/center/records/index.vue View File

@@ -692,6 +692,7 @@
/* 设置或检索伸缩盒对象的子元素的排列方式 */ /* 设置或检索伸缩盒对象的子元素的排列方式 */
} }
.activeColor{ .activeColor{
font-weight: bold;
color: #2671E2; color: #2671E2;
} }




+ 4
- 4
pages/index/consumer/index.vue View File

@@ -842,6 +842,7 @@
} }
.activeColor{ .activeColor{
color: #2671E2; color: #2671E2;
font-weight: bold;
} }
} }


@@ -1022,9 +1023,8 @@
} }


.content-sec { .content-sec {
border-top: 1px solid #E0E0E0;
padding: 0 30rpx;
padding-bottom: 30rpx;
border-top: 1rpx solid #E0E0E0;
padding: 0 28rpx 28rpx;
position: relative; position: relative;


.content-sec-lab { .content-sec-lab {
@@ -1075,10 +1075,10 @@
} }


.content-last { .content-last {
height: 108rpx;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
padding-bottom: 30rpx;


.content-last-tab { .content-last-tab {
width: 214rpx; width: 214rpx;


+ 27
- 7
pages/index/index.vue View File

@@ -118,7 +118,7 @@
</view> </view>
<view class="realtext">平均执行率</view> <view class="realtext">平均执行率</view>
</view> </view>
<view class="real" @click="tapjumpreception('1')">
<view class="real" @click="tapjumpreception('11')">
<view class="realnum">{{realtimeobj.receptionCount || 0}}</view> <view class="realnum">{{realtimeobj.receptionCount || 0}}</view>
<view class="realtext">接待量</view> <view class="realtext">接待量</view>
</view> </view>
@@ -171,7 +171,7 @@
</view> </view>
<view class="realtext">平均执行率</view> <view class="realtext">平均执行率</view>
</view> </view>
<view class="real" @click="tapjumpreception('3')">
<view class="real" @click="tapjumpreception('33')">
<view class="realnum">{{Thisweekobj.receptionCount || 0}}</view> <view class="realnum">{{Thisweekobj.receptionCount || 0}}</view>
<view class="realtext">接待量</view> <view class="realtext">接待量</view>
</view> </view>
@@ -201,8 +201,9 @@
</view> </view>
</view> </view>
<!-- 常用功能 --> <!-- 常用功能 -->
<view class="contbox">
<view class="title"><image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />接待管理</view>
<view class="contbox" >
<view class="title" v-if="permissions.commonly2||permissions.commonly3||permissions.commonly10">
<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />接待管理</view>
<view class="commonly-box"> <view class="commonly-box">
<view class="commonly" @click="Piabodata('接待记录')" v-if="permissions.commonly2"> <view class="commonly" @click="Piabodata('接待记录')" v-if="permissions.commonly2">
<view class="commonly-img"> <view class="commonly-img">
@@ -223,7 +224,8 @@
<view class="commonly-text">用户画像</view> <view class="commonly-text">用户画像</view>
</view> </view>
</view> </view>
<view class="title"><image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />数据分析</view>
<view class="title" v-if="permissions.commonly4||permissions.commonly8||permissions.commonly7||permissions.commonly9">
<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />数据分析</view>
<view class="commonly-box"> <view class="commonly-box">
<view class="commonly" @click="Piabodata('销讲分析')" v-if="permissions.commonly4"> <view class="commonly" @click="Piabodata('销讲分析')" v-if="permissions.commonly4">
<view class="commonly-img"> <view class="commonly-img">
@@ -250,7 +252,8 @@
<view class="commonly-text">员工分析</view> <view class="commonly-text">员工分析</view>
</view> </view>
</view> </view>
<view class="title"><image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />团队管理</view>
<view class="title" v-if="permissions.commonly11||permissions.commonly12||permissions.commonly5||permissions.commonly6">
<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />团队管理</view>
<view class="commonly-box"> <view class="commonly-box">
<view class="commonly" @click="Theteamcompared()" v-if="permissions.commonly11"> <view class="commonly" @click="Theteamcompared()" v-if="permissions.commonly11">
<view class="commonly-img"> <view class="commonly-img">
@@ -776,6 +779,10 @@
uni.navigateTo({ uni.navigateTo({
url: '/pages/center/records/index?refresh=refresh&activeTotal=0&validInvalid=0' 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) { } else if (i == 2) {
uni.switchTab({ uni.switchTab({
url: '/pages/index/customer' 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 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) { } else if (i == 6) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/center/records/index?refresh=refresh&activeTotal=0&validInvalid=0' url: '/pages/center/records/index?refresh=refresh&activeTotal=0&validInvalid=0'


+ 3
- 3
pages/index/personal.vue View File

@@ -52,15 +52,15 @@
<image src="/static/images/right-arrow.png" mode=""></image> <image src="/static/images/right-arrow.png" mode=""></image>
</view> </view>
</view> </view>
<!-- <view class="line" @click="help">
<view class="line" @click="help">
<view class="title"> <view class="title">
<image src="/static/images/concat.png" mode=""></image>
<image src="/static/images/help-icon.png" mode=""></image>
帮助中心 帮助中心
</view> </view>
<view class="right"> <view class="right">
<image src="/static/images/right-arrow.png" mode=""></image> <image src="/static/images/right-arrow.png" mode=""></image>
</view> </view>
</view> -->
</view>
<view class="line" @click="scan"> <view class="line" @click="scan">
<view class="title"> <view class="title">
<image src="/static/images/visitCode.png" mode=""></image> <image src="/static/images/visitCode.png" mode=""></image>


+ 4
- 2
pages/login/index.vue View File

@@ -56,8 +56,10 @@
export default { export default {
data() { data() {
return { return {
username: '',//用户名
password: '',//密码
username: '13033782199',//用户名-测试 13388881113 1234567
password: '123456',//密码
// username: '13033782199',//用户名-生产 13033782199 654321
// password: '654321',//密码
passwordType: true, passwordType: true,
agreeChecked: true agreeChecked: true
}; };


+ 106
- 51
pages/mine/details.vue View File

@@ -11,7 +11,7 @@
<view class="call_record_time">{{date}}</view> <view class="call_record_time">{{date}}</view>
</view> </view>
<view class="call_record_time_one">接待时长 {{alltimeStr}} <view class="call_record_time_one">接待时长 {{alltimeStr}}
<u-icon name="list-dot" color="#333" size="48" @click="showFile"></u-icon>
<image src="/static/images/menu.png" @click="showFile" class="menu" mode="" />
<view class="audoioyouxiao" @click="alllogo()" v-if="permissions.commonly2"> <view class="audoioyouxiao" @click="alllogo()" v-if="permissions.commonly2">
{{userlistobj.validInvalidName||''}} {{userlistobj.validInvalidName||''}}
</view> </view>
@@ -51,7 +51,7 @@
:class="{active: Math.floor(item.bg/1000) <= playNow && Math.floor(item.ed/1000) > playNow && i==0}" :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"> v-for="(item,index) in dialog.message" :key="index" :data-speaker="item.speaker">
<view class="avatar"> <view class="avatar">
<text :style="[SPEAKERSTYLE(item.speaker)]">{{ item.speaker | toCapital }}</text>
<text :style="[borderColor(item.speaker)]">{{ item.speaker | toCapital }}</text>
</view> </view>
<view class="content"> <view class="content">
<view @longpress="changanxiaoguo(item,index,i)" v-html="item.onebest"></view> <view @longpress="changanxiaoguo(item,index,i)" v-html="item.onebest"></view>
@@ -103,7 +103,7 @@


<!-- 回到顶部 --> <!-- 回到顶部 -->
<view class="backTop" @click="gotoTop"> <view class="backTop" @click="gotoTop">
<image src="/static/images/backTop.png" mode=""></image>
<image src="/static/images/topicon.png" mode=""></image>
</view> </view>
<!-- 加入常错词 --> <!-- 加入常错词 -->
<view class="zhezhoa" v-if="isshow2" @tap="Cancelout"></view> <view class="zhezhoa" v-if="isshow2" @tap="Cancelout"></view>
@@ -335,6 +335,56 @@


methods: { 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() { effectiveAdd() {
if (this.effectiveindex == 4) { if (this.effectiveindex == 4) {
if (this.effectiveitext.length == 0) { if (this.effectiveitext.length == 0) {
@@ -1180,29 +1230,40 @@
} }


.call_record_time { .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 { .call_record_time_one {
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #303030;
height: 48rpx; height: 48rpx;
font-size: 24rpx;
font-weight: 500;
color: #70798d;
font-size: 28rpx;
line-height: 48rpx; line-height: 48rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center;
position: relative; position: relative;
.menu{
width: 36rpx;
height: 36rpx;
}


.audoioyouxiao { .audoioyouxiao {
height: 46rpx;
color: #333333;
font-size: 28rpx;
line-height: 48rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
position: absolute; position: absolute;
top: 0rpx; top: 0rpx;
right: 140rpx;
font-size: 30rpx;
right: 126rpx;
} }


.diangweitupian { .diangweitupian {
@@ -1312,10 +1373,11 @@
} }


.scroll-Y .text { .scroll-Y .text {
margin: 50rpx 30rpx;
line-height: 80rpx;
line-height: 42rpx;
display: flex; display: flex;
align-items: center;
margin-top: 30rpx;
font-size: 30rpx;
color: #505050;
} }


.scroll-Y .text[data-speaker="2"], .scroll-Y .text[data-speaker="2"],
@@ -1331,25 +1393,28 @@
} }


.scroll-Y .text .avatar { .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 { .scroll-Y .text .content {
margin-left: 30rpx; margin-left: 30rpx;
line-height: 60rpx;
text-align: left; 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; color: #999;
position: relative; position: relative;


@@ -1372,21 +1437,16 @@
} }


.scroll-Y .text.active .content { .scroll-Y .text.active .content {
color: #FF7538 !important;
color: #2671E2 !important;
position: relative; position: relative;
} }


.scroll-Y .text.active[data-speaker="2"] .content, .scroll-Y .text.active[data-speaker="2"] .content,
.scroll-Y .text.active[data-speaker="4"] .content, .scroll-Y .text.active[data-speaker="4"] .content,
.scroll-Y .text.active[data-speaker="6"] .content { .scroll-Y .text.active[data-speaker="6"] .content {
color: #FF7538 !important;
color: #2671E2 !important;
position: relative; position: relative;
} }
.scroll-Y .isGreen .contentInfo .contentMain .content {
background: #2BC805 !important;
color: #FFFFFF;
}


.tab-box { .tab-box {
width: 100%; width: 100%;
@@ -1453,21 +1513,15 @@
} }


.backTop { .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; position: fixed;
bottom: 200rpx;
right: 8rpx;
display: flex;
justify-content: center;
align-items: center;
bottom: 110rpx;
right: 40rpx;


image { image {
width: 26rpx;
height: 34rpx;
width: 112rpx;
height: 112rpx;
} }
} }


@@ -1583,7 +1637,8 @@


.dialog-block { .dialog-block {
margin: 20rpx 0; margin: 20rpx 0;
border-bottom: 1px solid #ccc;
border-bottom: 1rpx solid #ccc;
padding-bottom: 30rpx;


.fileName { .fileName {
text-align: center; text-align: center;


+ 5
- 4
pages/mine/details2.vue View File

@@ -25,7 +25,7 @@
<block v-for="(item,index) in dialog.message" :key="index"> <block v-for="(item,index) in dialog.message" :key="index">
<view class="text" <view class="text"
:class="{active: Math.floor(item.bg/1000) <= playNow && Math.floor(item.ed/1000) > playNow, isGreen: item.isShow == 0}" :class="{active: Math.floor(item.bg/1000) <= playNow && Math.floor(item.ed/1000) > playNow, isGreen: item.isShow == 0}"
:data-speaker="item.speaker" :id="'dialog'+csdFileindex+'text'+item.bg">
:data-guwen="roleindex" :data-speaker="item.speaker" :id="'dialog'+csdFileindex+'text'+item.bg">
<view class="avatar"> <view class="avatar">
<view > <view >
<image v-if="item.isShow == 0" src="https://static.quhouse.com/b11a7e1ccf914020b3ee23d3e4862637.png" mode="widthFix"> <image v-if="item.isShow == 0" src="https://static.quhouse.com/b11a7e1ccf914020b3ee23d3e4862637.png" mode="widthFix">
@@ -306,8 +306,6 @@
<view v-if="subitem.show" style="width: 100%;height: 30rpx;"></view> <view v-if="subitem.show" style="width: 100%;height: 30rpx;"></view>
</view> </view>
</view> </view>


</view> </view>
<view v-if="zhixingcenterindex == 1"> <view v-if="zhixingcenterindex == 1">
<view v-if="prohibitedlist.length!=0" class="title1-12" @click="tapbadge(item)" <view v-if="prohibitedlist.length!=0" class="title1-12" @click="tapbadge(item)"
@@ -2404,7 +2402,10 @@
display: flex; display: flex;
} }


.scroll-Y .text[data-speaker="2"],
.scroll-Y .text[data-guwen="2"],

// .scroll-Y .text[data-speaker="2"],

.scroll-Y .text[data-speaker="4"], .scroll-Y .text[data-speaker="4"],
.scroll-Y .text[data-speaker="6"] { .scroll-Y .text[data-speaker="6"] {
flex-direction: row-reverse; flex-direction: row-reverse;


BIN
static/images/help-icon.png View File

Before After
Width: 36  |  Height: 36  |  Size: 1.2 KiB

BIN
static/images/menu.png View File

Before After
Width: 36  |  Height: 36  |  Size: 171 B

BIN
static/images/no-checked.png View File

Before After
Width: 32  |  Height: 32  |  Size: 532 B

BIN
static/images/topicon.png View File

Before After
Width: 112  |  Height: 112  |  Size: 4.3 KiB

Write Preview
Loading…
Cancel
Save