From eaec6c44469ee0f834a49320f6d1a8d41d3b02be Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 29 Aug 2019 13:05:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=89=A7=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=80=99=E9=87=8D=E7=BD=AE=E5=89=A7?= =?UTF-8?q?=E6=9C=AC=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scriptManage/display/tipScriptRecord.vue | 7 +++-- .../scriptManage/scriptRecord/addAction.vue | 4 +++ .../scriptManage/scriptRecord/addRole.vue | 29 +++++++++++-------- .../scriptManage/scriptRecord/getAction.vue | 13 +++++---- 4 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/views/scriptManage/display/tipScriptRecord.vue b/src/views/scriptManage/display/tipScriptRecord.vue index c5244bafd..69baf254f 100644 --- a/src/views/scriptManage/display/tipScriptRecord.vue +++ b/src/views/scriptManage/display/tipScriptRecord.vue @@ -61,7 +61,7 @@ import {saveScriptScenes, saveScriptData, dumpScriptData, updateMapLocation, scr backDisabled:false, size:{ width:350, - height:window.innerHeight-130-212, + height:window.innerHeight-342, } // isSaveStage: true, } @@ -82,7 +82,7 @@ import {saveScriptScenes, saveScriptData, dumpScriptData, updateMapLocation, scr }, methods: { resizeHandler() { - this.size = { width:350, height:window.innerHeight-130-212}; + this.size = { width:350, height:window.innerHeight-342}; }, setIsParse(isPause){ this.isPause=isPause; @@ -184,9 +184,10 @@ import {saveScriptScenes, saveScriptData, dumpScriptData, updateMapLocation, scr }, create(){ this.$refs['getAction'].loadInitData(); + // this.$refs['addRole'].resetData(data); }, setAction(row){ - debugger; + // debugger; this.$refs['addAction'].doShow(row); } } diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue index ceac09430..1050d4959 100644 --- a/src/views/scriptManage/scriptRecord/addAction.vue +++ b/src/views/scriptManage/scriptRecord/addAction.vue @@ -174,6 +174,8 @@ }, methods:{ initData(){ + this.buttonName="添加对话"; + this.operateType="add"; getScriptPlayMember(this.group).then(resp => { let roleTypeList=ConstConfig.ConstSelect.roleType; this.orginMemberList=resp.data; @@ -224,6 +226,7 @@ this.adding=false; this.$message.success('添加指令成功'); this.$emit('create'); + // this.$emit('create',[this.commandData.action.memberId]); // this.$parent.$parent.$refs['addRole'].resetData([this.commandData.action.memberId]); // this.initCommandActionData(); }).catch(error => { @@ -251,6 +254,7 @@ this.modifying=false; this.$message.success('添加对话成功'); this.$emit('create'); + // [this.modalData.actionVO.memberId] // this.initActionData(); // this.$parent.$parent.$refs['addRole'].resetData([this.modalData.actionVO.memberId,this.modalData.actionVO.targetId]); }).catch(error => { diff --git a/src/views/scriptManage/scriptRecord/addRole.vue b/src/views/scriptManage/scriptRecord/addRole.vue index 4348ed133..802ad109b 100644 --- a/src/views/scriptManage/scriptRecord/addRole.vue +++ b/src/views/scriptManage/scriptRecord/addRole.vue @@ -49,6 +49,9 @@ this.allRoleData=this.coverData(lastData); getScriptPlayMember(group).then(response=>{ let last=response.data; + // let userdata=JSON.stringify(response.data) + // let reg=new RegExp('\"id\":\"(.*?)\\\"','g'); + // let datalist=userdata.match(reg); let data=[]; last.forEach(function(element){data.push(element.id)}); this.selectRoleData=data; @@ -95,18 +98,20 @@ } } }, - resetData(data){ - // let allRoleData=this.allRoleData; - // debugger; - // data.forEach(function(element){ - // allRoleData.forEach(function(select){ - // if(select.key==element) - // { - // select.disabled=true; - // } - // }); - // }); - }, + // resetData(data){ + // debugger; + // let allRoleData=this.allRoleData; + // // debugger; + // data.forEach(function(element){ + // allRoleData.forEach(function(select){ + // if(select.key==element) + // { + // debugger; + // select.disabled="disabled"; + // } + // }); + // }); + // }, changeSex(event,id) { let group=this.$props.group; diff --git a/src/views/scriptManage/scriptRecord/getAction.vue b/src/views/scriptManage/scriptRecord/getAction.vue index da79a2ee7..98cf19448 100644 --- a/src/views/scriptManage/scriptRecord/getAction.vue +++ b/src/views/scriptManage/scriptRecord/getAction.vue @@ -81,6 +81,7 @@ this.$store.dispatch('scriptRecord/updateBgSet', response.data.bgSet); this.actionInfoList=[]; let roleTypeList=ConstConfig.ConstSelect.roleType; + let memberVOList=JSON.stringify(response.data.memberVOList); roleTypeList.forEach(function(element){ let rolename=element.value; @@ -88,15 +89,20 @@ }); memberVOList=JSON.parse(memberVOList); let actionList=response.data.actionVOList; + + + actionList.forEach(element => { + let member=memberVOList.find(elem=>{return elem.id==element.memberId}); - let memberName=member.name==undefined?"":" - "+member.name; + + let memberName=member.name?" - "+member.name:""; switch(element.type) { case "Conversation": { let target=memberVOList.find(elem=>{return elem.id==element.targetId}); - let targetName=target.name==undefined?"":" - "+target.name; + let targetName=target.name?" - "+target.name:""; this.actionInfoList.push({id:element.id,isCoversition:true,memberName:member.role+memberName,targetName:target.role+targetName,reply:element.reply,row:element,visible:true}); break; } @@ -143,9 +149,6 @@ reloadTable(){ this.loadInitData(); }, - // create(data){ - // this.reloadTable(); - // }, modifyAction(row){ this.$emit("setAction",row); }