修改提交合并

pages/mine/details2.vue

@@ -677,14 +677,10 @@
 				Acquirecustomerintentlist2: [], // 人工校准数组
 				Acquirecustomerintentlist: [], // 系统分析数组
 				zhixingcenterindex: 0, // 销讲总执行率 && 禁忌执行 && 需求挖掘率 选项卡下标
-<<<<<<< HEAD
-				prohibitedlist: [], // 禁忌执行
-=======
 				prohibitedlist: {
 					guwen: [], // 顾问违禁词
 					kehu: [], // 客户违禁词
 				}, // 禁忌执行
->>>>>>> master
 
 				tablist: [], // 角色列表
 				tablists: [], // 标记顾问的角色列表
@@ -729,11 +725,6 @@
 				effectiveIndexText: '请选择', // 无效原因展示文字
 
 				effectiveitext: '', // 无效原因备注文字
-<<<<<<< HEAD
-				
-=======
-
->>>>>>> master
 				textItself: '', // 存储修改的常错字对话
 				argtextindex2: 0, // 长按单次选中的对话下标
 
@@ -1494,15 +1485,8 @@
 				} else {
 					this.roleSelectArr.push(0)
 				}
-<<<<<<< HEAD
-				this.$u.throttle(() => {
-					this.dialogList = []
-					this.fenjiaoseunfo()
-				}, 1500)
-=======
 				this.dialogList = []
 				this.fenjiaoseunfo()
->>>>>>> master
 			},
 
 			// 选中全部时互斥全部选项与角色选项
@@ -1804,12 +1788,9 @@
 									translateHtmlContent: this.messagelisy,
 								}
 								this.isshow2 = false;
-<<<<<<< HEAD
-								this.dialogList[this.argtextindex2].onebest = this.textItself.replace(this.thewrongword, this.reswrongword)
-=======
+
 								this.dialogList[this.argtextindex2].onebest = this.textItself.replace(this.thewrongword,
 									this.reswrongword)
->>>>>>> master
 								this.cancelBeast()
 								this.$u.post("/corpus/addCorrectWord", parames).then(data => {
 									this.thewrongword = "";
@@ -2092,12 +2073,6 @@
 				if (info.speakerStr) {
 					params.speakerStr = info.speakerStr
 				}
-<<<<<<< HEAD
-				if (info.voFlag) {
-					params.voFlag = info.voFlag
-				}
-=======
->>>>>>> master
 				this.$u.get(config.service.findAudioContent, params).then(res => {
 					res.forEach(che => {
 						if (che.onebest == info.onebest) {