修改bug

pages/center/Piabodata/requireminingAnalysis.vue

@@ -97,19 +97,17 @@
 			</view>
 		</view>
 		<u-popup v-model="timeshow" mode="bottom">
-			<view class="timeview" :style="{ color: activeTotal == 5 ? '#2B6EFF' : '#333333' }"
-				@click="tabtimetap(5, '接待时间')">
-				全部</view>
 			<view class="timeview" :style="{ color: activeTotal == 2 ? '#2B6EFF' : '#333333' }"
 				@click="tabtimetap(2, '近7天')">
 				近7天</view>
-				<view class="timeview" :style="{ color: activeTotal == 3 ? '#2B6EFF' : '#333333' }"
-				@click="tabtimetap(3, '近15天')">
+				<view class="timeview" :style="{ color: activeTotal == 5 ? '#2B6EFF' : '#333333' }"
+				@click="tabtimetap(5, '近15天')">
 				近15天</view>
 			<view class="timeview" :style="{ color: activeTotal == 6 ? '#2B6EFF' : '#333333' }"
 				@click="tabtimetap(6, '近30天')">
 				近30天</view>
-			<view class="timeview" :style="{ color: activeTotal == 4 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(4,'自定义')">
+			<view class="timeview" :style="{ color: activeTotal == 4 ? '#2B6EFF' : '#333333' }" 
+				@click="tabtimetap(4,'自定义')">
 				自定义</view>
 		</u-popup>	
 		<u-calendar v-model="calendarShow" mode="range" @change="calendarTimeChange"></u-calendar>
@@ -141,7 +139,7 @@
 				huashuVal: '',
 				guwenVal: '',
 				// 筛选文字展示
-				time: '近7天',
+				time: '接待时间',
 				dept: '部门',
 				guwen: '顾问',
 				huashu: '业务话术',
@@ -184,7 +182,7 @@
 						}
 					}
 				},
-				activeTotal: 5,
+				activeTotal: 2,
 				houseId: '',
 				// hushuList: [],// 业务话术
 				staffList: [],// 员工列表
@@ -275,13 +273,21 @@
 			},
 			// 需求挖掘排行
 			getwordMiningRank(){
+				let dateType = 0;
+				if (this.activeTotal == 4) {// 选择全部和自定义
+					dateType = null;
+				}else {
+					dateType = this.activeTotal;
+					this.startDate = ''
+					this.endDate = ''
+				}
 				this.$u.post('/cusLvStatistics/wordMiningRank', {
 						"houseId": this.houseId,
 						"deptId": this.deptVal,
 						"createUser": this.guwenVal,
-						"dateType":this.activeTotal,
-						"firstStartDate":!this.activeTotal?this.startDate:'',
-						"firstEndDate":!this.activeTotal?this.endDate:''
+						"dateType":dateType,
+						"firstStartDate":this.startDate,
+						"firstEndDate":this.endDate
 					})
 					.then(res => {
 						// console.log(res)
@@ -301,13 +307,21 @@
 			},
 			// 需求挖掘分布图
 			getRingData(){
+				let dateType = 0;
+				if (this.activeTotal == 4) {// 选择自定义
+					dateType = null;
+				}else {
+					dateType = this.activeTotal;
+					this.startDate = ''
+					this.endDate = ''
+				}
 				this.$u.post('/cusLvStatistics/wordMiningAnalyzeFenbu', {
 						"houseId": this.houseId,
 						"deptId": this.deptVal,
 						"createUser": this.guwenVal,
-						"firstStartDate":!this.activeTotal?this.startDate:'',
-						"firstEndDate":!this.activeTotal?this.endDate:'',
-						"dateType":this.activeTotal
+						"dateType":dateType,
+						"firstStartDate":this.startDate,
+						"firstEndDate":this.endDate
 					})
 					.then(res => {
 						// console.log(res)
@@ -331,13 +345,21 @@
 			},
 			// 需求挖掘分析-简报
 			wordMiningAnalyze() {
+				let dateType = 0;
+				if (this.activeTotal == 4) {// 选择全部和自定义
+					dateType = null;
+				}else {
+					dateType = this.activeTotal;
+					this.startDate = ''
+					this.endDate = ''
+				}
 				let params = {
-					"houseId":this.houseId,
-					"deptId": this.deptVal,
-					"userId": this.guwenVal,
-					"dateType": this.activeTotal,
-					"firstStartDate":!this.activeTotal?this.startDate:'',
-					"firstEndDate":!this.activeTotal?this.endDate:''
+					"houseId": this.houseId,
+						"deptId": this.deptVal,
+						"createUser": this.guwenVal,
+						"dateType":dateType,
+						"firstStartDate":this.startDate,
+						"firstEndDate":this.endDate
 				}
 					this.$u.post("/cusLvStatistics/wordMiningAnalyze",params).then(res => {
 						// console.log(res.contrast)
@@ -377,13 +399,21 @@
 				let categories1 = []
 				let categories2 = []
 				let categories3 = []
+				let dateType = 0;
+				if (this.activeTotal == 4) {// 选择全部和自定义
+					dateType = null;
+				}else {
+					dateType = this.activeTotal;
+					this.startDate = ''
+					this.endDate = ''
+				}
 				this.$u.post('/cusLvStatistics/wordMiningAnalyzePercentage', {
 						"houseId": this.houseId,
 						"deptId": this.deptVal,
 						"createUser": this.guwenVal,
-						"dateType": this.activeTotal,
-						"firstStartDate":!this.activeTotal?this.startDate:'',
-						"firstEndDate":!this.activeTotal?this.endDate:''
+						"dateType":dateType,
+						"firstStartDate":this.startDate,
+						"firstEndDate":this.endDate
 					})
 					.then(res => {
 						if(res.first&&res.first.length){
@@ -431,16 +461,15 @@
 			},
 			//时间切换
 			tabtimetap(index, text) {
-				if (index == 3) {
+				if (index == 4) {
 					this.calendarShow = true;
-					this.activeTotal = null
 				} else {
-					this.activeTotal = index;
 					this.endDate = ''
 					this.startDate = ''
 					this.time = text
 					this.getdata()
 				}
+				this.activeTotal = index;
 				this.timeshow = false
 			},
 			// 顾问选择
@@ -466,8 +495,6 @@
 			},
 			//自定义时间
 			calendarTimeChange(e) {
-				// console.log(e.startDate, e.endDate)
-				this.activeTotal = null;
 				this.endDate = e.endDate
 				this.startDate = e.startDate
 				this.time = '自定义'

pages/center/records/index.vue

@@ -232,8 +232,8 @@
 		<u-calendar v-model="totalTimeShow" mode="range" @change="totalTimeChange"></u-calendar>
 			<!-- 接待时间 -到访时间-->
 		<u-popup v-model="timeshow" mode="bottom">
-			<view class="timeview" :style="{ color: activeTotal == 5 ? '#2B6EFF' : '#333333' }"
-				@click="tabtimetap(5, '接待时间')">
+			<view class="timeview" :style="{ color: activeTotal == 15 ? '#2B6EFF' : '#333333' }"
+				@click="tabtimetap(15, '接待时间')">
 				全部</view>
 			<view class="timeview" :style="{ color: activeTotal == 0 ? '#2B6EFF' : '#333333' }"
 				@click="tabtimetap(0, '今天')">
@@ -244,6 +244,9 @@
 			<view class="timeview" :style="{ color: activeTotal == 2 ? '#2B6EFF' : '#333333' }"
 				@click="tabtimetap(2, '近7天')">
 				近7天</view>
+				<view class="timeview" :style="{ color: activeTotal == 5 ? '#2B6EFF' : '#333333' }"
+				@click="tabtimetap(5, '近15天')">
+				近15天</view>
 			<view class="timeview" :style="{ color: activeTotal == 6 ? '#2B6EFF' : '#333333' }"
 				@click="tabtimetap(6, '近30天')">
 				近30天</view>
@@ -414,7 +417,7 @@
 					value: 4,
 					isShow: false,
 				}],
-				activeTotal: 5,
+				activeTotal:15,
 				value: '',
 				screenShow: false,//更多筛选
 				selectshow: false,//选择顾问的选择框
@@ -455,7 +458,7 @@
 			this.LOADING = true
 			this.isnorefresh = options.refresh;
 			if (options.activeTotal) {
-				this.activeTotal = options.activeTotal
+				this.activeTotal = Number(options.activeTotal)
 			}
 			if (options.markAdvisor) {
 				this.screen.markAdvisor = options.markAdvisor
@@ -608,10 +611,9 @@
 				this.screen.visitRecord = []
 				this.screen.jiedaiVal = []
 				this.screen.wajueVal = []
-				// this.screen.zixunVal = []
 				this.screen.xiaojiangVal = []
 				let dateType = 0;
-				if ((this.activeTotal == 5)||(this.activeTotal == 4)) {// 选择全部和自定义
+				if ((this.activeTotal == 15)||(this.activeTotal == 4)) {// 选择全部和自定义
 					dateType = null;
 				}else {
 					dateType = this.activeTotal;
@@ -630,10 +632,6 @@
 				this.wajueList.forEach(i => {
 					if(i.isShow) this.screen.wajueVal.push(i.value)
 				})
-				// // 咨询业务
-				// this.zixunList.forEach(i => {
-				// 	if(i.isShow) this.screen.zixunVal.push(i.value)
-				// })
 				// 销讲执行率
 				this.xiaojiangList.forEach(i => {
 					if(i.isShow) this.screen.xiaojiangVal.push(i.value)
@@ -713,7 +711,7 @@
 				this.staTime = '';
 				this.endTime = '';
 				this.nextPage = 1;
-				this.activeTotal = 5;
+				this.activeTotal = 15;
 				this.recordList = [];
 				this.counselorName = '接待顾问';
 				this.visitList.map(i => {
@@ -722,9 +720,6 @@
 				this.jiedaiList.map(i => {
 					i.isShow = false
 				})
-				// this.zixunList.map(i => {
-				// 	i.isShow = false
-				// })
 				this.wajueList.map(i => {
 					i.isShow = false
 				})