init

pages/center/Piabodata/Groupcontrast.vue

@@ -158,6 +158,7 @@
 				    :canvas2d="true"
 					canvasId="wangxiaohuaerlingeryilingwuyib88"
 				    background="none"
+					   :loadingType="0"
 				  />
 			</view>
 		</view>
@@ -268,12 +269,9 @@
 					{name:'接待客户',zxl:'80'},
 				],
 				chartData:{
-					"categories": ["维度1","维度2","维度3","维度4","维度5","维度6"],
+					"categories": [],
 					"series": [
-						{
-							"name": "成交量",
-							"data": [90,110,165,195,187,172]
-						}
+						
 					]
 				}
 				
@@ -385,40 +383,40 @@
 			},
 			// 获取销奖能力
 			getPowerList(){
+				this.chartData={
+					categories:[],
+					series:[]
+				}
 				this.$u.post('/cusLvStatistics/groupComparisonMarketingAbility',{
 					houseIds:this.houseId,
 					timeType:this.lastEndDate?null:this.activeTotal+'',
 					lastEndDate:this.lastEndDate,
 					lastStartDate:this.lastStartDate
 				})
-				.then(res=>{
-					// console.log(res,123)
-					// 处理数据
-					// return
-					this.chartData={
-						categories:[],
-						series:[]
-					}
+				.then(res=>{			
 					let allobj={
 						categories:[],
 						series:[]
 					}
-					res.result.map((item,index)=>{
-						let obj={
-							name:item[0].houseName,
-							data:[]
-						}
-						item.map(item1=>{
-							if(index==0){
-								allobj.categories.push(item1.name)
+					if(res.result!=0){
+						res.result.map((item,index)=>{
+							let obj={
+								name:item[0].houseName,
+								data:[]
 							}
-							obj.data.push(item1.avgExecutionRate)
+							item.map(item1=>{
+								if(index==0){
+									allobj.categories.push(item1.name)
+								}
+								obj.data.push(item1.avgExecutionRate)
+							})
+							allobj.series.push(obj)
 						})
-						allobj.series.push(obj)
-					})
-					// console.log(allobj)
-					this.chartData=allobj
-					this.$forceUpdate()
+						this.chartData=allobj
+						this.$forceUpdate()
+					}
+					
+					
 				})
 			},
 			//自定义时间

pages/center/Piabodata/StaffAnalysis.vue

@@ -130,6 +130,7 @@
 				    :canvas2d="true"
 					canvasId="wangxiaohuaerlingeryilinwuycsdx"
 				    background="none"
+					 :loadingType="0"
 				  />
 			</view>
 		</view>
@@ -454,6 +455,10 @@
 			},
 			// 获取销奖能力
 			getAwardList(){
+				this.chartData={
+					categories:[],
+					series:[]
+				}
 				this.$u.post('/cusLvStatistics/employeeAnalysisLevel1Fraction',{
 					userA:this.staff1.value,
 					userB:this.staff2.value,

pages/center/Piabodata/TrendAnalysis.vue

@@ -581,10 +581,10 @@
 								color: '#7ED3F4'
 							}]
 						}
-						data.lastValue.forEach((child, zxc) => {
+						data.startList.forEach((child, zxc) => {
 							that.lineOptsect.categories.push(child.statDate.substring(5, 10))
 						})
-						that.lineOptsect.series[0].data = data.lastValue.map(item => item.fraction);
+						that.lineOptsect.series[0].data = data.startList.map(item => item.fraction);
 					} else {
 						that.lineOptsect = {
 							categories: [],
@@ -600,8 +600,8 @@
 								},
 							]
 						}
-						data.firstValue.forEach((item, sdf) => {
-							data.lastValue.forEach((child, zxc) => {
+						data.startList.forEach((item, sdf) => {
+							data.endList.forEach((child, zxc) => {
 								if (sdf == zxc) {
 									that.lineOptsect.categories.push(
 									child.statDate.substring(5,10) + 'vs' + item.statDate.substring(5, 10)
@@ -609,8 +609,8 @@
 								}
 							})
 						})
-						that.lineOptsect.series[1].data = data.firstValue.map(item => item.fraction);
-						that.lineOptsect.series[0].data = data.lastValue.map(item => item.fraction)
+						that.lineOptsect.series[1].data = data.startList.map(item => item.fraction);
+						that.lineOptsect.series[0].data = data.endList.map(item => item.fraction)
 						that.guwenFlag = false
 						// // 处理表格数据
 						let arr = [
@@ -623,7 +623,7 @@
 							// },
 						]
 						that.lineOptsect.categories.map((item, index) => {
-							let newarr = [item, data.lastValue[index].fraction, data.firstValue[index].fraction,data.contrast[index].data
+							let newarr = [item, data.endList[index].fraction, data.startList[index].fraction,data.comparedList[index].fraction
 							]
 							// obj.time=item
 							// obj.time1=data.firstValue[index].fraction

pages/center/consumer/consumerDetail.vue

@@ -395,7 +395,7 @@
 			clickaudeopal(item){
 				if(item.selected==0){
 					uni.navigateTo({
-						url: '/pages/mine/ScoringPlaylist?customerId='+this.customerId +"&id="+item.marketingId
+						url: '/pages/mine/ScoringPlaylist?customerId='+this.customerId +"&id="+item.marketingId+"&type=0"
 					})
 				}
 			},

pages/index/index.vue

@@ -540,7 +540,7 @@
 				this.Showhiddenunits = false;
 			},
 			tapjumpequipment(i){
-				if(permissions.commonly5==true){
+				if(this.permissions.commonly5==true){
 					uni.navigateTo({
 						url: '/pages/mine/equipment/index?active='+i
 					});

pages/mine/details2.vue

@@ -1215,7 +1215,6 @@
 								header: {
 									'content-type': 'application/json',
 								'Authorization': 'Bearer '+uni.getStorageSync('weapp_session_login_data').token
-										.token
 								},
 								success: (data) => {
 									if (data.data.code == 10000) {
@@ -1258,7 +1257,6 @@
 								header: {
 									'content-type': 'application/json',
 									'Authorization': 'Bearer '+uni.getStorageSync('weapp_session_login_data').token
-										.token
 								},
 								data: objdata,
 								success: (data) => {
@@ -1413,6 +1411,7 @@
 					"jjTransfer": this.changanitem.onebest, //选中对话
 					"status": 1
 				}
+				console.log(uni.getStorageSync('weapp_session_login_data').token)
 				uni.request({
 					url: config.service.addATD,
 					method: "POST",