From 8a4dfb88efd5cc4dc8e4fcaa476242537f02da44 Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Sat, 27 Aug 2022 11:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=96=E6=8E=98=E8=AF=9D?=
 =?UTF-8?q?=E6=9C=AF=E6=89=A7=E8=A1=8C=E5=AE=8C=E6=88=90=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/consumer/consumerDetail.vue | 31 +++++---
 pages/mine/details2.vue                  | 99 ++++++++++++++++--------
 2 files changed, 87 insertions(+), 43 deletions(-)

diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue
index a143bd9..108fb39 100644
--- a/pages/center/consumer/consumerDetail.vue
+++ b/pages/center/consumer/consumerDetail.vue
@@ -212,9 +212,9 @@
 				<!-- 需求挖掘执行率 -->
 			<view class="xuqiu" v-if="activeTotal==3">
 				<view style="width: 100%;height: 80rpx;border-bottom: 1rpx solid #E0E0E0;display: flex;align-items: center;background: #fff;">
-					<view style="flex: 1;font-size: 28rpx;color: #333333;font-weight: 600;text-indent: 20rpx;">指标</view>
-					<view style="flex: 1;font-size: 28rpx;color: #333333;font-weight: 600;text-indent: 170rpx;">执行率
-					</view>
+					<view style="flex: 1;font-size: 28rpx;color: #333333;font-weight: 600;text-indent: 50rpx;">指标</view>
+					<view style="flex: 1;font-size: 28rpx;color: #333333;font-weight: 600;text-indent: 70rpx;">执行率</view>
+					<view style="flex: 1;font-size: 28rpx;color: #333333;font-weight: 600;text-indent: 70rpx;">完成</view>
 				</view>
 			<!-- 暂无数据 -->
 				<view v-if="KeyWordsfractionList.length==0" style="width: 100%;height: 100%;display: flex;align-items: center;">
@@ -229,14 +229,18 @@
 		<!-- 挖掘执行话术展示 -->
 				<view class="Level-box" v-else v-for="(item,index) in KeyWordsfractionList" :key="index">
 					<view class="Level1che" @click="changeshowlevel1(item,1)">
-						<view class="title1">{{item.name}}</view>
-						<view class="leve1-jindu">
+						<view class="title1" style="flex: 1;">{{item.name}}</view>
+						<!-- <view class="leve1-jindu">
 							<view class="jindutiao">
 								<view class="huanxing" v-if="item.selected==0" :style="{width: item.fraction+'%'}"></view>
 								<view class="huanxing" v-else style="width: 0"></view>
 								<view class="text">{{item.selected==0?item.fraction:0}}%</view>
 							</view>
-						</view>
+						</view> -->
+						<view class="Level1-middle" style="flex:2;display:flex;">
+								<view class="item" style="flex:1;text-align:center;">执行{{item.selected==0?item.fraction:0}}%</view>
+								<view class="item" style="flex:1;text-align:center;">完成{{item.modelSelected==0?item.modelFraction:0}}%</view>
+							</view>
 						<view class="jiantobox">
 							<image v-if="!item.show" class="arrow rotatearrow" src="/static/images/down.png" mode="" />
 							<image v-else class="arrow" src="/static/images/up.png" mode="" />
@@ -266,10 +270,18 @@
 						<view class="hhhbox" v-if="item.show" v-for="(subitem,i) in item.children" :key="i">
 							<view class="Level2che" @click="changeshow2(subitem,1)">
 								<view class="title1 u-line-1">{{subitem.name}}</view>
-								<view class="leve1-jindu">
+								<!-- <view class="leve1-jindu">
 									<view class="zhixing" v-if="!subitem.selected">已执行</view>
 									<view class="zhixing2" v-else>未执行</view>
-								</view>
+								</view> -->
+								<view class="leve1-jindu">
+										<view class="zhixing" v-if="subitem.selected==0">已执行</view>
+										<view class="zhixing2" v-else>未执行</view>
+									</view>
+									<view class="leve1-jindu">
+										<view class="zhixing" v-if="subitem.modelSelected==0">已完成</view>
+										<view class="zhixing2" v-else>未完成</view>
+									</view>
 								<view class="jiantobox">
 									<image v-if="!subitem.show" class="arrow rotatearrow" src="/static/images/down.png"
 										mode="" />
@@ -385,8 +397,9 @@
 				this.$u.get("/cusLvStatistics/findKeyWordsBycusId?cusId=" + this.customerId).then(res => {
 					// console.log(res)
 					if(res.length){
-						 res.forEach(item=>{
+						 res.forEach((item,index)=>{
 							item.show = false
+							if(index==0){item.show=true}
 							item.children.forEach(obj=>{
 								obj.show = false
 								if(obj.questionList.length){
diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue
index f790fd2..a99950a 100644
--- a/pages/mine/details2.vue
+++ b/pages/mine/details2.vue
@@ -72,7 +72,7 @@
 										style="font-size: 24rpx;text-align: center;margin-left: 14rpx;">修改角色
 									</view>
 								</view>
-								<!-- ----------新加标签标识------------ -->
+								<!-- ----------对话下方新加话术标签标识------------ -->
 								<view class="newmark">
 									<!-- 1 客户画像 2销讲词 3违禁 4 需求挖掘 -->
 									<image v-if="(dealTypes(item.types))[0]==1" class="markicon" src="https://static.quhouse.com/37e0de3f8d1c421dac8bf699d5e7992d.png"></image>
@@ -269,7 +269,7 @@
 					<view v-if="methodsisshow" :class="{ activecllasscet: zhixingcenterindex == 1 }"
 						@click="recordclick(1)">禁忌执行</view>
 					<view :class="{ activecllasscet: zhixingcenterindex == 2 }" @click="recordclick(2)">
-						需求挖掘率{{KeyWordsfraction||0}}%</view>
+						需求挖掘率</view>
 				</view>
 				<!-- 销讲执行率 -->
 				<view v-if="zhixingcenterindex == 0" class="cenisbox">
@@ -340,23 +340,24 @@
 				</view>
 				<!-- 需求挖掘率 -->
 				<view v-if="zhixingcenterindex == 2" class="cenisbox">
-					<view
-						style="width: 100%;height: 80rpx;border-bottom: 1rpx solid #E0E0E0;display: flex;align-items: center;">
+					<view class="top-box">
+						<view style="width:50%;text-align:center">挖掘执行:{{KeyWordsfraction||0}}%</view>
+						<view style="width:50%;text-align:center">挖掘成功:{{percent||0}}%</view>
+					</view>
+					<view style="width: 100%;height: 80rpx;border-bottom: 1rpx solid #E0E0E0;display: flex;align-items: center;">
 						<view style="flex: 1;font-size: 28rpx;color: #333333;font-weight: 600;text-indent: 20rpx;">指标
 						</view>
-						<view style="flex: 1;font-size: 28rpx;color: #333333;font-weight: 600;text-indent: 170rpx;">执行率
+						<view style="flex: 1;font-size: 28rpx;color: #333333;font-weight: 600;text-align:center">执行率
+						</view>
+						<view style="flex: 1;font-size: 28rpx;color: #333333;font-weight: 600;text-align:center">完成
 						</view>
 					</view>
 					<view class="Level-box" v-for="(item,index) in KeyWordsfractionList" :key="index">
 						<view class="Level1che" @click="hangeshow2(item,1)">
-							<view class="title1">{{item.name}}</view>
-							<view class="leve1-jindu">
-								<view class="jindutiao">
-									<view class="huanxing" v-if="item.selected==0" :style="{width: item.fraction+'%'}">
-									</view>
-									<view class="huanxing" v-else style="width: 0"></view>
-									<view class="text">{{item.selected==0?item.fraction:0}}%</view>
-								</view>
+							<view class="title1" style="flex:1">{{item.showLevel==2?('222'+item.name):item.name}}</view>
+							<view class="Level1-middle" style="flex:2;display:flex;">
+								<view class="item" style="flex:1;text-align:center;">执行{{item.selected==0?item.fraction:0}}%</view>
+								<view class="item" style="flex:1;text-align:center;">完成{{item.modelSelected==0?item.modelFraction:0}}%</view>
 							</view>
 							<view class="jiantobox">
 								<image v-if="!item.show" class="arrow rotatearrow" src="/static/images/down.png"
@@ -389,9 +390,13 @@
 								<view class="Level2che" @click="hangeshow2(subitem,1)">
 									<view class="title1 u-line-1">{{subitem.name}}</view>
 									<view class="leve1-jindu">
-										<view class="zhixing" v-if="!subitem.selected">已执行</view>
+										<view class="zhixing" v-if="subitem.selected==0">已执行</view>
 										<view class="zhixing2" v-else>未执行</view>
 									</view>
+									<view class="leve1-jindu">
+										<view class="zhixing" v-if="subitem.modelSelected==0">已完成</view>
+										<view class="zhixing2" v-else>未完成</view>
+									</view>
 									<view class="jiantobox">
 										<image v-if="!subitem.show" class="arrow rotatearrow"
 											src="/static/images/down.png" mode="" />
@@ -453,14 +458,14 @@
 						<view class="jianbox-cen">
 							<view class="jianboxtext">{{item.name}}</view>
 							<view class="jianboxjian" @click="Acquishow(index)">
-								<image v-if="item.isshow==false" class="jiantop" src="../../static/images/jiantop.png"
-									mode=""></image>
-								<image v-if="item.isshow==true" class="jiantop1"
+								<image v-if="item.isshow" class="jiantop1"
 									src="../../static/images/jianbutton.png" mode=""></image>
+									<image v-else class="jiantop" src="../../static/images/jiantop.png"
+									mode=""></image>
 							</view>
 						</view>
 						<view style="width: 690rpx;margin: 0 auto;display: flex;flex-wrap: wrap;"
-							v-if="item.isshow==true">
+							v-if="item.isshow">
 							<view class="sdfsaf" v-if="chend.showType==0" @click="argece(chend)"
 								v-for="(chend,i) in item.children" :key='i'>
 								<view class="jiangshang sdfsaf">{{chend.text}}</view>
@@ -478,18 +483,18 @@
 						v-if="Acquirecustomerintentlist2.length==0">
 						暂无数据
 					</view>
-					<view class="jianbox" v-if="Acquirecustomerintentlist2.length!=0"
+					<view class="jianbox" v-if="Acquirecustomerintentlist2.length"
 						v-for="(item,index) in Acquirecustomerintentlist2" :key='index'>
 						<view class="jianbox-cen">
 							<view class="jianboxtext">{{item.name}}</view>
 							<view class="jianboxjian" @click="Acquishow2(index)">
-								<image v-if="item.isshow==false" class="jiantop" src="../../static/images/jiantop.png"
-									mode=""></image>
-								<image v-if="item.isshow==true" class="jiantop1"
+								<image v-if="item.isshow" class="jiantop1"
 									src="../../static/images/jianbutton.png" mode=""></image>
+								<image v-else class="jiantop" src="../../static/images/jiantop.png"
+									mode=""></image>
 							</view>
 						</view>
-						<view class="bioqianwayl" v-if="item.isshow==true">
+						<view class="bioqianwayl" v-if="item.isshow">
 							<view class="jiangshang" v-for="(chend,i) in item.children" :key='i'
 								v-if="chend.selected==0">
 								{{chend.text}}
@@ -559,7 +564,6 @@
 </template>
 
 <script>
-	var util = require("../../utils/util.js");
 	var config = require("../../config");
 
 	import zaudio from '@/components/uniapp-zaudio/zaudio';
@@ -689,6 +693,7 @@
 				isBand: false, // 阻止二次提交
 				refined: false,
 				eqLog: 0,
+				percent: 0
 			};
 		},
 		computed: {
@@ -779,10 +784,18 @@
 		},
 
 		methods: {
+			// 计算挖掘执行的完成率
+			getPercent(){
+				let countArr = this.KeyWordsfractionList.filter(item=> item.selected==0)
+				console.log(countArr)
+					this.percent = (countArr.length / this.KeyWordsfractionList.length)*100
+					console.log(this.percent.toFixed(0))
+					this.percent = this.percent.toFixed(0)
+
+			},
 			dealTypes(type){
 				if(type){
 					let tem = type.split('-')
-					console.log(tem);
 					return tem
 				}else{
 					return [0,'']
@@ -1447,6 +1460,15 @@
 				}
 				this.$forceUpdate()
 			},
+			formatSecond(seconds){
+			var result = typeof seconds === "string" ? parseFloat(seconds) : seconds;
+			if (isNaN(result)) return "";
+			let h = Math.floor(result / 3600) < 10 ? "0" + Math.floor(result / 3600) : Math.floor(result / 3600);
+			let m = Math.floor((result / 60) % 60) < 10 ? "0" + Math.floor((result / 60) % 60) : Math.floor((result / 60) % 60);
+			let s = Math.floor(result % 60) < 10 ? "0" + Math.floor(result % 60) : Math.floor(result % 60);
+			
+			return `${h}:${m}:${s}`;
+		},
 
 
 			init(info) {
@@ -1815,8 +1837,9 @@
 				this.$u.get("/cusLvStatistics/findKeyWordsBycusId?cusId=" + this.customerId).then(res => {
 					// console.log(res)
 					if (res.length) {
-						res.forEach(item => {
+						res.forEach((item,index) => {
 							item.show = false
+							if(index==0){item.show = true}
 							item.children.forEach(obj => {
 								obj.show = false
 								if (obj.questionList.length) {
@@ -1832,6 +1855,7 @@
 							}
 						})
 						this.KeyWordsfractionList = res
+						this.getPercent()
 					} else {
 						this.KeyWordsfractionList = []
 					}
@@ -1972,7 +1996,7 @@
 			},
 
 			getTime(time) {
-				return util.formatSecond(time)
+				return this.formatSecond(time)
 			},
 
 			//音频前进回退
@@ -2020,7 +2044,6 @@
 						this.textindex = data.data.data.index;
 						this.toptextindex = data.data.data.index;
 						this.dialogList.push(this.newluyinList[data.data.data.index])
-						console.log(newtime)
 						this.stepPlay(newtime);
 					}
 				})
@@ -2389,12 +2412,20 @@
 					font-size: 30rpx;
 					font-weight: 600;
 				}
+				
 			}
 		}
 
 		.cenisbox {
 			flex: 1;
 			overflow: auto;
+			.top-box{
+					height: 80rpx;
+					line-height: 80rpx;
+					display: flex;
+					color: #2671E2;
+					border-bottom: 1rpx solid #ccc;
+				}
 
 			.jianbox {
 				width: 100%;
@@ -2770,8 +2801,8 @@
 				text-align: center;
 				height: 36rpx;
 				line-height: 36rpx;
-				border-radius: 4rpx;
-				border: 1rpx solid #3E50E8;
+				border-radius: 4px;
+				border: 1px solid #3E50E8;
 			}
 		}	
 		.tankuangcss {
@@ -3080,8 +3111,8 @@
 		position: relative;
 	}
 
-	.scroll-Y .isGreen .contentInfo .contentMain .content {
-		background: #2BC805 !important;
-		color: #FFFFFF;
-	}
+	// .scroll-Y .isGreen .contentInfo .contentMain .content {
+	// 	background: #2BC805 !important;
+	// 	color: #FFFFFF;
+	// }
 </style>