diff --git a/pages/center/Piabodata/requireminingAnalysis.vue b/pages/center/Piabodata/requireminingAnalysis.vue
index bc77eaa..a5e1d0d 100644
--- a/pages/center/Piabodata/requireminingAnalysis.vue
+++ b/pages/center/Piabodata/requireminingAnalysis.vue
@@ -14,13 +14,10 @@
 				{{ guwen}}
 				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
-			<!-- <view class="tabbox" @click="taptimetuisshow">
+			<view class="tabbox" @click="huashushow=true">
 				{{ huashu}}
 				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
-			</view> -->
-			<!-- <view class="tabbox" @click="screenshow">
-				更多筛选<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
-			</view> -->
+			</view>
 		</view>
 		<view style="width: 100%;height: 20rpx;background: #FAFAFA;"></view>
 		<view class="boxzonglan" style="min-height: 400rpx;">
@@ -117,9 +114,11 @@
 				自定义</view>
 		</u-popup>	
 		<u-calendar v-model="calendarShow" mode="range" @change="calendarTimeChange"></u-calendar>
-		<u-select v-model="guwenshow" :list="staffList" @confirm="staffSelectCallback($event,0)"
+		<u-select v-model="guwenshow" :list="staffList" @confirm="guwenCallback"
+			:default-value='selindex'></u-select>
+		<u-select v-model="deptshow" :list="teamList" @confirm="deptCallback"
 			:default-value='selindex'></u-select>
-		<u-select v-model="deptshow" :list="teamList" @confirm="staffSelectCallback($event,1)"
+			<u-select v-model="hushushow" :list="hushuList" @confirm="huashuCallback"
 			:default-value='selindex'></u-select>
 		<!-- 加载组件  -->
 		<loading v-model="LOADING"></loading>
@@ -137,19 +136,21 @@
 		data() {
 			return {
 				selindex: '',
+				huashushow: false,
 				guwenshow: false,
 				timeshow: false,
 				selectshow: false,
 				deptshow: false,
 				deptVal: '',
+				huashuVal: '',
 				guwenVal: '',
 				// 筛选文字展示
 				time: '近7天',
 				dept: '部门',
 				guwen: '顾问',
-				huashu: '话术',
+				huashu: '业务话术',
 				showDesc: false,
-				sortList: [],
+				sortList: [],//排名列表
 				ringChartData: {
 				},
 				// ring图 分布图
@@ -189,10 +190,9 @@
 				},
 				activeTotal: 4,
 				houseId: '',
-				// 员工列表
-				staffList: [],
-				// 团队列表
-				teamList: [],
+				hushuList: [],// 业务话术
+				staffList: [],// 员工列表
+				teamList: [],// 团队列表
 				team: {
 					value: '',
 					label: ''
@@ -200,7 +200,6 @@
 				startDate: '',
 				endDate: '',
 				calendarShow: false,
-				activeTab: 0,
 				numlist: [{
 						name: '平均需求挖掘率',
 						firstnum: '',
@@ -240,9 +239,6 @@
 					}
 					]
 				},
-				Theteamcomparedisshow: false,
-				Groupcontrastisshow: false,
-				allList: [],
 				lineOpts: {
 					yAxis: {
 						data: [{
@@ -255,6 +251,15 @@
 		},
 		onShow() {
 			// this.LOADING = true
+			// 获取项目id
+			// this.houseId = uni.getStorageSync('buildingID').id;
+			// // 获取员工
+			// this.getStaffList()
+			// // 获取团队
+			// this.getSectionList()
+			// this.getdata()
+		},
+		onReady: function(){
 			// 获取项目id
 			this.houseId = uni.getStorageSync('buildingID').id;
 			// 获取员工
@@ -262,9 +267,8 @@
 			// 获取团队
 			this.getSectionList()
 			this.getdata()
-		},
-		onReady: function(){
-			this.getRingData()
+			// this.getRingData()
+			// this.getwordMiningAnalyzePercentage()
 		},
 		onPullDownRefresh() {
 		},
@@ -282,9 +286,9 @@
 			// 需求挖掘排行
 			getwordMiningRank(){
 				this.$u.post('/cusLvStatistics/wordMiningRank', {
-						houseId: this.houseId,
-						deptId: this.deptVal,
-						createUser: this.guwenVal,
+						"houseId": this.houseId,
+						"deptId": this.deptVal,
+						"createUser": this.guwenVal,
 						"dateType":this.activeTotal,
 						"firstStartDate":!this.activeTotal?this.startDate:'',
 						"firstEndDate":!this.activeTotal?this.endDate:''
@@ -306,9 +310,9 @@
 			// 需求挖掘分布图
 			getRingData(){
 				this.$u.post('/cusLvStatistics/wordMiningAnalyzeFenbu', {
-						houseId: this.houseId,
-						deptId: this.deptVal,
-						createUser: this.guwenVal,
+						"houseId": this.houseId,
+						"deptId": this.deptVal,
+						"createUser": this.guwenVal,
 						"firstStartDate":!this.activeTotal?this.startDate:'',
 						"firstEndDate":!this.activeTotal?this.endDate:'',
 						"dateType":this.activeTotal
@@ -337,8 +341,8 @@
 			wordMiningAnalyze() {
 				let params = {
 					"houseId":this.houseId,
-					deptId: this.deptVal,
-					userId: this.guwenVal,
+					"deptId": this.deptVal,
+					"userId": this.guwenVal,
 					"dateType": this.activeTotal,
 					"firstStartDate":!this.activeTotal?this.startDate:'',
 					"firstEndDate":!this.activeTotal?this.endDate:''
@@ -369,15 +373,19 @@
 									value: item.accountId
 								}
 							})
+							this.staffList.unshift({
+								label: '全部',
+								value: ''
+							})
 						}
 					})
 			},
 			// 需求挖掘率趋势图
 			getwordMiningAnalyzePercentage() {
 				this.$u.post('/cusLvStatistics/wordMiningAnalyzePercentage', {
-						houseId: this.houseId,
-						deptId: this.deptVal,
-						createUser: this.guwenVal,
+						"houseId": this.houseId,
+						"deptId": this.deptVal,
+						"createUser": this.guwenVal,
 						"dateType": this.activeTotal,
 						"firstStartDate":!this.activeTotal?this.startDate:'',
 						"firstEndDate":!this.activeTotal?this.endDate:''
@@ -419,6 +427,10 @@
 									value: item.deptId
 								}
 							})
+							this.teamList.unshift({
+								label: '全部',
+								value: ''
+							})
 						}
 					})
 			},
@@ -436,16 +448,26 @@
 				}
 				this.timeshow = false
 			},
-			staffSelectCallback(e, idx) {
-				if (idx == 0) {
-					this.guwenVal = e[0].value
-					this.guwen = e[0].label
-				} else { // 部门
-					this.dept = e[0].label
-					this.deptVal = e[0].value
-				}
+			// 顾问选择
+			guwenCallback(e){
+				console.log(e)
+				this.guwenVal = e[0].value
+				this.guwen = e[0].label
+				this.getdata()
+			},
+			// 部门选择
+			deptCallback(e){
+				console.log(e)
+				this.deptVal = e[0].value
+				this.dept = e[0].label
+				this.getdata()
+			},
+			// 话术选择
+			huashuCallback(e){
+				console.log(e)
+				this.huashuVal = e[0].value
+				this.huashu = e[0].label
 				this.getdata()
-
 			},
 			//自定义时间
 			calendarTimeChange(e) {
diff --git a/pages/center/consumer/index.vue b/pages/center/consumer/index.vue
index 8d257dd..bb7d205 100644
--- a/pages/center/consumer/index.vue
+++ b/pages/center/consumer/index.vue
@@ -1086,6 +1086,10 @@ export default {
             item.label = item.name;
             item.value = item.accountId;
           });
+          this.freeList.unshift({
+            label: '全部',
+            value: '',
+          })
         });
     },
     // 获取客户阶段数据