合并主分支

pages/center/Piabodata/requireminingAnalysis.vue

@@ -2,15 +2,15 @@
 	<view class="box">
 		<!-- 选择器 -->
 		<view class="boxtittab">
-			<view class="tabbox" @click="timeshow=true">
+			<view class="tabbox" @click="timeshow=true" style="color:#409eff">
 				{{ time }}
 				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
-			<view class="tabbox" @click="deptshow=true">
+			<view class="tabbox" @click="deptshow=true" :style="dept=='部门'?'color:#666':'color:#409eff'">
 				{{ dept}}
 				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
-			<view class="tabbox" @click="guwenshow=true">
+			<view class="tabbox" @click="guwenshow=true" :style="guwen=='顾问'?'color:#666':'color:#409eff'">
 				{{ guwen}}
 				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
@@ -139,10 +139,9 @@
 				huashuVal: '',
 				guwenVal: '',
 				// 筛选文字展示
-				time: '接待时间',
+				time: '近7天',
 				dept: '部门',
 				guwen: '顾问',
-				huashu: '业务话术',
 				showDesc: false,
 				rankList: [],//排名列表
 				ringChartData: {
@@ -233,6 +232,9 @@
 					}]
 				},
 				lineOpts: {
+					// xAxis: {
+					// 	rotateLabel: true
+					// },
 					yAxis: {
 						data: [{
 							max: 100,
@@ -297,7 +299,8 @@
 									name: item.name,
 									id: item.id,
 									fraction: item.fraction,
-									selected: item.selected
+									selected: item.selected,
+									keywordsId: item.keywordsId
 								}
 							})
 						}else{
@@ -338,9 +341,9 @@
 					})
 			},
 				//跳转到接待记录
-			Toview(){
+			Toview(item,i){
 				uni.navigateTo({
-					url: '/pages/center/records/index?refresh=refresh&activeTotal='+this.activeTotal+'&staTime='+ this.startDate + '&endTime'+this.endDate+'&validInvalid=0'
+					url: '/pages/center/records/index?refresh=refresh&activeTotal='+this.activeTotal+'&staTime='+ this.startDate + '&endTime='+this.endDate+'&validInvalid=0'+'&keywordsId='+item.keywordsId
 				});
 			},
 			// 需求挖掘分析-简报
@@ -417,7 +420,7 @@
 					})
 					.then(res => {
 						if(res.first&&res.first.length){
-							categories1 = res.first.map(item=> item.statDate.substring(0,10))
+							categories1 = res.first.map(item=> item.statDate.substring(5,10))
 							this.lineOptsect.series[0].data=res.first.map(item=> item.wordFraction)
 						}else{
 							categories1= []
@@ -425,7 +428,7 @@
 						}
 						if(res.end&&res.end.length){
 							this.lineOptsect.series[1].data=res.end.map(item=> item.wordFraction)
-							categories2 = res.end.map(item => item.statDate.substring(0,10))
+							categories2 = res.end.map(item => item.statDate.substring(5,10))
 						}else{
 							categories2 = [] 
 							this.lineOptsect.series[1].data = []
@@ -486,13 +489,6 @@
 				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) {
 				this.endDate = e.endDate

pages/center/consumer/index.vue

@@ -1343,6 +1343,8 @@ export default {
           margin-top: 11rpx;
           font-weight: 500;
           color: #333333;
+          font-size: 30rpx;
+          font-family: PingFangSC-Medium, PingFang SC;
         }
       }
 

pages/center/records/index.vue

@@ -15,17 +15,17 @@
 		<!-- 选择器 -->
 		<view class="boxtittab">
 			<!-- 排序 -->
-			<view class="tabbox" @click="soltishow = true">
+			<view class="tabbox" @click="soltishow = true"  :style="sortFilter=='排序'?'color:#666':'color:#409eff'">
 				{{ sortFilter }}
 				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
 			<!-- 接待时间 -->
-			<view class="tabbox" @click="timeshow = true">
+			<view class="tabbox" @click="timeshow = true"  :style="arriveFilter=='接待时间'?'color:#666':'color:#409eff'">
 				{{ arriveFilter }}
 				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
-			<!-- //顾选择问 -->
-			<view class="tabbox" @click="selectshow = true">
+			<!-- //接待顾问 -->
+			<view class="tabbox" @click="selectshow = true"  :style="counselorName=='接待顾问'?'color:#666':'color:#409eff'">
 				{{ counselorName }}
 				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
@@ -97,9 +97,9 @@
 			</view>
 		</view>
 		<!-- 更多筛选 -->
-		<u-popup v-model="screenShow" mode="top" height="850">
+		<u-popup v-model="screenShow" mode="top" height="900">
 			<view class="screen">
-				<scroll-view scroll-y="true" style="height: 700rpx;">
+				<scroll-view scroll-y="true" style="height: 750rpx;">
 				<!-- 咨询业务 -->
 				<!-- <view class="screen-record">
 					<view class="screen-record-text" @click="zixunArrow=!zixunArrow">
@@ -447,6 +447,7 @@
 				methodsisshow: false,
 				userInfo: {},
 				totalRecords: '',
+				keywordsId: '',
 				isRefresh: false,
 				// 筛选文字展示
 				sortFilter: '排序',
@@ -469,6 +470,9 @@
 			if (options.validInvalid) {
 				this.screen.validInvalid = Number(options.validInvalid)
 			}
+			if (options.keywordsId) {
+				this.keywordsId = Number(options.keywordsId)
+			}
 			
 			if (options.staTime) {
 				this.staTime = options.staTime;
@@ -488,7 +492,7 @@
 				this.recordList = [];
 				this.nextPage = 1;
 				this.isRefresh = false;
-				this.getMyCustom()
+				this.getRecordsList()
 				this.getFreeList();
 				this.isnorefresh = '';
 			}
@@ -496,7 +500,7 @@
 		onPullDownRefresh() {
 			this.isRefresh = true;
 			this.nextPage = 1;
-			this.getMyCustom()
+			this.getRecordsList()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
@@ -511,7 +515,7 @@
 				return
 			} else {
 				this.nextPage += 1;
-				this.getMyCustom();
+				this.getRecordsList();
 				this.isRefresh = false;
 			}
 		},
@@ -526,7 +530,7 @@
 				this.nextPage = 1;
 				this.recordList = [];
 				this.isRefresh = false;
-				this.getMyCustom();
+				this.getRecordsList();
 			},
 			//时间选择 -到访-接待时间
 			tabtimetap(index, text) {
@@ -539,7 +543,7 @@
 					this.nextPage = 1;
 					this.recordList = [];
 					this.isRefresh = false;
-					this.getMyCustom();
+					this.getRecordsList();
 				}
 			},
 			//自定义时间
@@ -550,7 +554,7 @@
 				this.nextPage = 1;
 				this.recordList = [];
 				this.isRefresh = false;
-				this.getMyCustom();
+				this.getRecordsList();
 			},
 			tapThevisiting(item) {
 				uni.showLoading({
@@ -611,7 +615,7 @@
 
 			},
 			// 获取接待记录列表
-			getMyCustom() {
+			getRecordsList() {
 				this.screen.visitRecord = []
 				this.screen.jiedaiVal = []
 				this.screen.wajueVal = []
@@ -645,6 +649,7 @@
 					pageSize: 10,
 					query: {
 						projectId: this.buildingID,
+						keywordsId: this.keywordsId,
 						staTime: this.staTime,// 接待时间
 						endTime: this.endTime,// 接待时间
 						agentId: this.screen.agentId, // 顾问ID
@@ -710,7 +715,7 @@
 				this.recordList = [];
 				this.nextPage = 1;
 				this.isRefresh = false;
-				this.getMyCustom();
+				this.getRecordsList();
 			},
 			reset() {
 				this.screen.agentId =''
@@ -740,7 +745,7 @@
 				})
 				this.nextPage = 1;
 				this.recordList = [];
-				this.getMyCustom();
+				this.getRecordsList();
 			},
 			//标记顾问
 			screenvisitRecord(i) {
@@ -765,7 +770,7 @@
 				this.recordList = [];
 				this.nextPage = 1;
 				this.isRefresh = false;
-				this.getMyCustom();
+				this.getRecordsList();
 			},
 			goSearch() {
 				uni.navigateTo({
@@ -912,6 +917,7 @@
 						font-weight: 600;
 						color: #333333;
 						margin-right: 10rpx;
+						font-size: 30rpx;
 					}
 
 					.status {