diff --git a/pages/center/Piabodata/Theteamcompared.vue b/pages/center/Piabodata/Theteamcompared.vue
index acdd2a1..2f3f922 100644
--- a/pages/center/Piabodata/Theteamcompared.vue
+++ b/pages/center/Piabodata/Theteamcompared.vue
@@ -161,20 +161,34 @@
销讲能力
-
+
团队
-
+
+
+
+
+
+
+ 暂无数据
+
+
@@ -425,11 +439,11 @@
this.LOADING = true
this.getMarketingBusiness()
let that = this
- uni.$on('update', function(data) {
+ uni.$on('update', (data) => {
// console.log(data)
- that.deptids = data.arr.join(',')
+ this.deptids = data.arr.join(',')
// 获取销奖能力
- that.getPowerList()
+ this.getPowerList()
})
// 获取项目id
this.houseId = uni.getStorageSync('buildingID').id;
@@ -705,12 +719,10 @@
marketingBusiness: this.marketingBusiness,
})
.then(res => {
- console.log('我再此')
let result = res.result
this['newTeam' + index] = res.avg[0]
this['newAvg' + index] = res.avg[1]
if (idx == 0) {
- console.log(idx, index, url, '打卡记录撒橘红颗粒大健康1 ')
// 当选择的是牌名时
// 处理数据
// 先处理牌名数据,需要进行判断全部还是单个
@@ -752,7 +764,6 @@
arr = this.dealData(arr)
this['newlisttabinfo' + index] = arr
} else {
- console.log(3, '啥大上课了就可领取诶去玩害偶尔UI哦请勿诶哦')
// 当两个都选择的时候
result[0].map(item => {
let obj = {}
@@ -770,7 +781,6 @@
this['newlisttabinfo' + index] = arr
}
} else {
- console.log(idx, index, url, '1231231231289123132UI哦23UI哦23UI哦1 ')
// 当选择趋势时
this['lineOptsect' + index] = {}
let allobj = {
@@ -796,7 +806,6 @@
}
// 当选择只有一个时
else if (this.staff1.value && !this.staff2.value) {
- // console.log(2)
let obj = {}
obj.data = []
obj.name = result[0][0].deptName
@@ -817,7 +826,6 @@
allobj.series.push(obj)
}
} else {
- // console.log(3)
// 当两个都选择的时候
let obj = {}
let obj1 = {}
@@ -835,7 +843,6 @@
allobj.series.push(obj)
allobj.series.push(obj1)
}
- // console.log(allobj)
// return
// this.lineOptsect1=allobj
this['lineOptsect' + index] = allobj
@@ -854,11 +861,10 @@
timeType: this.lastEndDate ? null : this.activeTotal + '',
lastEndDate: this.lastEndDate,
lastStartDate: this.lastStartDate,
- marketingBusiness: this.marketingBusinessId,
+ marketingBusiness: this.marketingBusiness,
})
.then(res => {
this.LOADING = false
- // console.log(res)
// 处理数据
this.chartData1 = {
categories: [],
@@ -870,6 +876,7 @@
}
// 当选择全部时
if (!this.staff1.value && !this.staff2.value) {
+ console.log('!this.staff1.value && !this.staff2.value')
// let first=res.first
res.first.map((item, index) => {
let obj = {
@@ -884,9 +891,11 @@
})
allobj.series.push(obj)
})
+
}
// 当选择只有一个时
else if (this.staff1.value && !this.staff2.value) {
+ console.log('this.staff1.value && !this.staff2.value')
res.first.map((item, index) => {
let obj = {
name: item[0].deptName,
@@ -931,8 +940,8 @@
allobj.series.push(obj)
})
}
- // console.log(allobj)
this.chartData1 = allobj
+ console.log(this.chartData1, 'this.chartData1')
this.$forceUpdate()
}).catch(e => {
this.LOADING = false
diff --git a/pages/center/Piabodata/TrendAnalysis.vue b/pages/center/Piabodata/TrendAnalysis.vue
index af2e6be..39b0a17 100644
--- a/pages/center/Piabodata/TrendAnalysis.vue
+++ b/pages/center/Piabodata/TrendAnalysis.vue
@@ -1,6 +1,15 @@
-
+
+ {{ showTimeText }}
+
+
+ {{ showBeText }}
+
+
+
+
+
@@ -86,12 +95,12 @@
-
+
@@ -212,13 +221,36 @@
-
+
+
+
+
+
+
+
+
+
+
+ 7天
+
+
+ 15天
+
+
+ 30天
+
+
+
+
+
+