处理bug

pages/center/Piabodata/index.vue

@@ -46,12 +46,12 @@
 				</view>
 				<view class="Piabodata-text">集团对比</view>
 			</view>
-			<!-- <view class="Piabodata" @click="towajue()">
+			<view class="Piabodata" @click="towajue()">
 				<view class="Piabodata-img">
 					<image class="Piabodata-img1" src="../../../static/images/qushi.png" mode=""></image>
 				</view>
 				<view class="Piabodata-text">需求挖掘分析</view>
-			</view> -->
+			</view>
 
 		</view>
 

pages/center/Piabodata/requireminingAnalysis.vue

@@ -343,7 +343,7 @@
 				//跳转到接待记录
 			Toview(item,i){
 				uni.navigateTo({
-					url: '/pages/center/records/index?refresh=refresh&activeTotal='+this.activeTotal+'&staTime='+ this.startDate + '&endTime='+this.endDate+'&validInvalid=0'+'&keywordsId='+item.keywordsId
+					url: '/pages/center/records/index?refresh=refresh&activeTotal='+this.activeTotal+'&staTime='+ this.startDate + '&endTime='+this.endDate+'&validInvalid=0'+'&keywordsId='+item.keywordsId+'&source=wajue'
 				});
 			},
 			// 需求挖掘分析-简报

pages/center/records/index.vue

@@ -453,12 +453,16 @@
 				sortFilter: '排序',
 				arriveFilter: '接待时间',
 				counselorName: '接待顾问',
+				source: ''//从挖掘分析页跳转来的
 			}
 		},
 		onLoad(options) {
 			this.LOADING = true
 			this.isnorefresh = options.refresh;
-			
+
+			if (options.source) {
+				this.source = options.source
+			}
 			if (options.activeTotal) {
 				this.activeTotal = Number(options.activeTotal)
 			}
@@ -478,6 +482,9 @@
 				this.staTime = options.staTime;
 				this.endTime = options.endtime;
 			}
+			if(this.keywordsName){
+
+			}
 		},
 		onShow() {
 			this.userInfo = uni.getStorageSync('weapp_session_userInfo_data');
@@ -571,6 +578,20 @@
 					})
 					return
 				} else {
+					// if(this.source=='wajue'){
+					// 	let parames1 = {
+					// 			marketingId: this.keywordsId,
+					// 			customerId: item.id,
+					// 			type: '1'
+					// 		}
+					// 	this.$u.post("/corpus/pinWordMatching", parames1).then(res => {
+					// 		let items = JSON.parse(res[0].transferContent)
+					// 		uni.setStorageSync("searchobj", items); //写入缓存
+					// 	}).catch(e => {
+							
+					// 	})
+					// }
+					
 					const parames = {
 						pageNum: 1,
 						pageSize: 100,
@@ -578,12 +599,13 @@
 							customerId: item.id,
 						}
 					}
-					var item = {
+					var item1 = {
 						bg: 0,
 						customerId: item.id,
 						wordFraction: item.wordFraction
 					}
-					uni.setStorageSync("searchobj", item); //写入缓存
+					
+					uni.setStorageSync("searchobj", item1); //写入缓存
 					uni.setStorageSync("entrance", 1); //写入缓存
 					this.$u.post("/corpus/findByPage", parames).then(res => {
 						if (res == null) {
@@ -645,25 +667,25 @@
 					if(i.isShow) this.screen.xiaojiangVal.push(i.value)
 				})
 				var parames = {
-					pageNum: this.nextPage,
-					pageSize: 10,
-					query: {
-						projectId: this.buildingID,
-						keywordsId: this.keywordsId,
-						staTime: this.staTime,// 接待时间
-						endTime: this.endTime,// 接待时间
-						agentId: this.screen.agentId, // 顾问ID
-						visitRecordNum: this.screen.visitRecord.length?this.screen.visitRecord.join(','):'',//到访次数
-						wordFractions: this.screen.wajueVal.length?this.screen.wajueVal.join(','):'',//挖掘
-						duractionNums: this.screen.jiedaiVal.length?this.screen.jiedaiVal.join(','):'',//接待时长
-						fractions: this.screen.xiaojiangVal.length?this.screen.xiaojiangVal.join(','):'',//销讲
-						markAdvisor: this.screen.markAdvisor,//标记顾问
-						dateType: dateType,//时间类型
-						orderBy: this.screen.orderBy==''?'':this.screen.orderBy,//排序
-						validInvalid: this.screen.validInvalid,//录音标识
-						clientStage: this.screen.clientStage,// 客户阶段
-						recording: this.screen.validInvalid == 2 ? 0 : null // 录音
-					}
+				pageNum: this.nextPage,
+				pageSize: 10,
+				query: {
+					projectId: this.buildingID,
+					keywordsId: this.keywordsId,
+					staTime: this.staTime,// 接待时间
+					endTime: this.endTime,// 接待时间
+					agentId: this.screen.agentId, // 顾问ID
+					visitRecordNum: this.screen.visitRecord.length?this.screen.visitRecord.join(','):'',//到访次数
+					wordFractions: this.screen.wajueVal.length?this.screen.wajueVal.join(','):'',//挖掘
+					duractionNums: this.screen.jiedaiVal.length?this.screen.jiedaiVal.join(','):'',//接待时长
+					fractions: this.screen.xiaojiangVal.length?this.screen.xiaojiangVal.join(','):'',//销讲
+					markAdvisor: this.screen.markAdvisor,//标记顾问
+					dateType: dateType,//时间类型
+					orderBy: this.screen.orderBy==''?'':this.screen.orderBy,//排序
+					validInvalid: this.screen.validInvalid,//录音标识
+					clientStage: this.screen.clientStage,// 客户阶段
+					recording: this.screen.validInvalid == 2 ? 0 : null // 录音
+				}
 				};
 				if (this.screen.agentId) {
 					parames.query.agentId = this.screen.agentId

pages/index/index.vue

@@ -150,7 +150,7 @@
 					<view class="realtext">有效接待</view>
 				</view>
 				<view class="real" @click="tapjumpreception(checkParams('333'))">
-					<view class="realnum">{{Thisweekobj.fraction || 0}}%</view>
+					<view class="realnum">{{Thisweekobj.fraction>100?100:(Thisweekobj.fraction||0)}}%</view>
 					<view class="realtext">平均执行率</view>
 				</view>
 			</view>

pages/learning/Keywordsearch.vue

@@ -65,19 +65,19 @@
 				if(this.keyword.length==0){
 					return
 				}else{
-						let parames={
-							keyword:this.keyword,
-							customerId:this.customerId
-						}
-						this.$u.post("/corpus/keyWordsMatching", parames).then(res => {
-							res.forEach(item=>{
-								item.Content=JSON.parse(item.transferContent)
+					let parames={
+						keyword:this.keyword,
+						customerId:this.customerId
+					}
+					this.$u.post("/corpus/keyWordsMatching", parames).then(res => {
+						res.forEach(item=>{
+							item.Content=JSON.parse(item.transferContent)
 						})	
 						res.forEach(cet=>{
 							cet.Content.time=this.formatTime(cet.Content.bg/1000)
 							cet.Content.text=this.brightKeyword(cet.Content.onebest)
 						})
-						this.listarr=res;
+					this.listarr=res;
 					})
 				}
 			},

pages/mine/details2.vue

@@ -242,7 +242,7 @@
 			</view>
 		</view>
 
-		<!-- 销讲执行 -->
+		<!-- 销讲执行/挖掘执行 -->
 		<template v-if="Pinspeak">
 			<view class="zhezhao" @click="clenReceivedetailsabout()"></view>
 			<view class="followingpop-up">
@@ -258,7 +258,7 @@
 				<view class="pingfenbox">
 					<view :class="{ activecllasscet: zhixingcenterindex == 0 }" @click="recordclick(0)">
 						销讲执行率{{totalRate||0}}%</view>
-					<view v-if="methodsisshow==true" :class="{ activecllasscet: zhixingcenterindex == 1 }"
+					<view v-if="methodsisshow" :class="{ activecllasscet: zhixingcenterindex == 1 }"
 						@click="recordclick(1)">禁忌执行</view>
 					<view :class="{ activecllasscet: zhixingcenterindex == 2 }" @click="recordclick(2)">
 						需求挖掘率{{KeyWordsfraction||0}}%</view>
@@ -360,9 +360,8 @@
 						<view v-if="item.showLevel==1">
 							<view class="hhhbox" v-if="item.show" style="padding: 30rpx;">
 								<view class="hsnrtest">话术内容</view>
-								<view class="Level3che" v-for="(che,inc) in item.questionList" :key='inc'>
-									<view class="title1"
-										:style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">
+								<view class="Level3che" @click="clickWajue(che)" v-for="(che,inc) in item.questionList" :key='inc'>
+									<view class="title1" :style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">
 										{{inc+1}}.{{che.question}}
 									</view>
 									<view class="jiantobox">
@@ -393,9 +392,8 @@
 								</view>
 								<view v-if="subitem.show" style="padding: 30rpx 0;">
 									<view class="hsnrtest">话术内容</view>
-									<view class="Level3che" v-for="(che,inc) in subitem.questionList" :key='inc'>
-										<view class="title1"
-											:style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">
+									<view class="Level3che" @click="clickWajue(che)" v-for="(che,inc) in subitem.questionList" :key='inc'>
+										<view class="title1" :style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">
 											{{inc+1}}.{{che.question}}
 										</view>
 										<view class="jiantobox">
@@ -694,7 +692,6 @@
 			this.LOADING = true
 			let menu = uni.getStorageSync('weapp_session_Menu_data');
 			this.eqLog = menu.findIndex(item => item.name == '设备日志');
-
 			this.status = options.status;
 			this.customerId = options.customerId;
 			this.KeyWordsfraction = options.wordFraction == 'undefined' ? 0 : options.wordFraction;
@@ -772,6 +769,15 @@
 		},
 
 		methods: {
+			clickWajue(item){
+				if(item.selected==0){
+					this.Pinspeak = false
+					uni.navigateTo({
+						url: '/pages/learning/Keywordsearch?customerId=' + this.customerId + "&keyword=" + item.question +
+							"&skpl=" + "2" + '&UpDateEvent=DETAILS2INIT'
+						}) 
+					}
+			},
 			//获取画像标签
 			getWordMiningList() {
 				this.treelist = [];
@@ -1784,11 +1790,7 @@
 				this.$u.get("/cusLvStatistics/findKeyWordsBycusId?cusId=" + this.customerId).then(res => {
 					// console.log(res)
 					if (res.length) {
-						// this.KeyWordsfraction = 0
 						res.forEach(item => {
-							// if(item.selected==0){
-							// 	this.KeyWordsfraction += +item.fraction // 总执行率
-							// }
 							item.show = false
 							item.children.forEach(obj => {
 								obj.show = false
@@ -1890,7 +1892,7 @@
 				uni.request({
 					url: config.service.getCorpusAnal + '?corpusId=' + this.luyinList[this.csdFileindex].id +
 						"&bg=" + info.bg + "&speaker=" + this.roleindex + '&voFlag=0' +
-						'&num=50', //仅为示例，并非真实接口地址。	
+						'&num=50',	
 					method: "GET",
 					header: {
 						'content-type': 'application/json',