From 6cc781380b7d008f9b9fc0ba73f203129d504f34 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Tue, 6 Sep 2022 20:02:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/center/Piabodata/StaffAnalysis.vue | 73 +++++++++++++++++-------
pages/learning/Thefulltext/index2.vue | 1 -
pages/mine/details2.vue | 6 +-
3 files changed, 56 insertions(+), 24 deletions(-)
diff --git a/pages/center/Piabodata/StaffAnalysis.vue b/pages/center/Piabodata/StaffAnalysis.vue
index 7282e46..15eca78 100644
--- a/pages/center/Piabodata/StaffAnalysis.vue
+++ b/pages/center/Piabodata/StaffAnalysis.vue
@@ -137,7 +137,7 @@
-
+
@@ -187,7 +187,7 @@
fontSize: 10,
extra: {
radar: {
- max: ''
+ max: 100
}
}
},
@@ -306,7 +306,9 @@
this.activeTotal = 3;
this.lastEndDate = option.endDate
this.lastStartDate = option.startDate
- let obj = this.staffList1.find(item => {return item.value == option.id })
+ let obj = this.staffList1.find(item => {
+ return item.value == option.id
+ })
console.log(obj, 'obj')
this.staff1.label = obj.label
this.staff1.value = option.id
@@ -489,7 +491,17 @@
// console.log(res)
let first = res.first
let second = res.second
- let max = first[0].avgExecutionRate
+ let xAxis = [] // 制作雷达图的x轴
+ first.forEach(item => {
+ if (xAxis.findIndex(res => res.marketingId == item.marketingId) == -1) {
+ xAxis.push(item)
+ }
+ })
+ second.forEach(item => {
+ if (xAxis.findIndex(res => res.marketingId == item.marketingId) == -1) {
+ xAxis.push(item)
+ }
+ })
this.chartData.categories = []
if (!this.timepickpickisshow) {
this.chartData.series = [{
@@ -497,9 +509,14 @@
data: []
}]
first.map(item => {
- if (max < item.avgExecutionRate) max = item.avgExecutionRate;
this.chartData.categories.push(item.name)
- this.chartData.series[0].data.push(item.avgExecutionRate)
+ if (item.avgExecutionRate < 0) {
+ this.chartData.series[0].data.push(0)
+ } else if (item.avgExecutionRate > 100) {
+ this.chartData.series[0].data.push(100)
+ } else {
+ this.chartData.series[0].data.push(item.avgExecutionRate)
+ }
})
} else {
this.chartData.series = [{
@@ -507,29 +524,45 @@
data: []
},
{
- "name": second[0].accountName,
- "data": []
+ name: second[0].accountName,
+ data: []
}
]
- first.map(item => {
+ console.log(xAxis, 'sdaklijdklsajdklasjkdlsjal')
+ xAxis.map(item => {
this.chartData.categories.push(item.name)
- this.chartData.series[0].data.push(item.avgExecutionRate)
- })
- second.map(item => {
- this.chartData.series[1].data.push(item.avgExecutionRate)
- })
-
- let all = [...first, ...second]
- all.map(item => {
- if (max < item.avgExecutionRate) max = item.avgExecutionRate;
+ let obj1 = first.find(res => res.marketingId == item.marketingId)
+ let obj2 = second.find(res => res.marketingId == item.marketingId)
+ if (obj1 && Object.keys(obj1).length > 0) {
+ this.chartData.series[0].data.push(this.checkRange(obj1.avgExecutionRate))
+ } else {
+ this.chartData.series[0].data.push(0)
+ }
+ if (obj2 && Object.keys(obj2).length > 0) {
+ this.chartData.series[1].data.push(this.checkRange(obj2.avgExecutionRate))
+ } else {
+ this.chartData.series[1].data.push(0)
+ }
})
+
+ this.$forceUpdate()
}
- this.opts.extra.radar.max = max + 25
-
}).catch(e => {
this.LOADING = false
})
},
+
+ // 检测范围
+ checkRange(num) {
+ if (num < 0) {
+ return 0
+ } else if (num > 100) {
+ return 100
+ } else {
+ return num
+ }
+ },
+
tabtimetap(index) {
if (index == 3) {
this.totalTimeShow = true;
diff --git a/pages/learning/Thefulltext/index2.vue b/pages/learning/Thefulltext/index2.vue
index 9b61163..1b4317a 100644
--- a/pages/learning/Thefulltext/index2.vue
+++ b/pages/learning/Thefulltext/index2.vue
@@ -246,7 +246,6 @@
methods: {
toKeywordsearch(){
- this.innerAudioContext.destroy();
uni.navigateTo({
url: '/pages/learning/Thefulltext/search?customerId='+this.customerId +"&status="+this.status+"&skpl="+"2" + '&UpDateEvent=THEFULLTEXT2'
})
diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue
index 39adfe0..4281bbf 100644
--- a/pages/mine/details2.vue
+++ b/pages/mine/details2.vue
@@ -155,7 +155,7 @@
话术内容：
-
@@ -168,7 +168,7 @@
常错词：
-
@@ -176,7 +176,7 @@
正确词：
-