From ed46bb20a6d76f51c25457e9ca167a7ca9e0594f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 16 Oct 2020 17:28:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=AE=9E=E6=93=8D?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/displayNew/dispatherContest/index.vue | 6 ++---- .../displayNew/dispatherContest/sceneList.vue | 8 +++----- .../displayNew/dispatherContest/testResult.vue | 15 ++++++--------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue index da24e692f..c156b3d0c 100644 --- a/src/views/newMap/displayNew/dispatherContest/index.vue +++ b/src/views/newMap/displayNew/dispatherContest/index.vue @@ -170,7 +170,6 @@ export default { scriptMode: ScriptMode.TEACH, mapLocation:{}, playerList:[], - actionList:[], currentPlayList:[], // formatUsedTime:'', formatScore:0, @@ -454,12 +453,11 @@ export default { // this.$refs.menuScript.initLoadPage(); // } }, - selectScript({playerList, mapLocation, actionList}) { + selectScript({playerList, mapLocation}) { this.changeScriptMode(this.scriptMode); this.isScriptLoad = true; this.playerList = playerList; this.mapLocation = mapLocation; - this.actionList = actionList; this.userRole = 'AUDIENCE'; this.$store.dispatch('training/setRoles', 'AUDIENCE'); }, @@ -474,7 +472,7 @@ export default { this.showResultData(data); }, showResultData(data) { - this.$refs.testResult.doShow({data:data, actionList:this.actionList}); + this.$refs.testResult.doShow({data:data}); }, endTraining() { competitionPracticalSceneFinish(this.group, {operationStatisticVO:{}}).then(res=>{ diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue index cb195b5ca..ca01dc10f 100644 --- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue +++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue @@ -120,7 +120,6 @@ export default { const playerList = []; EventBus.$emit('clearRunSeries'); EventBus.$emit('loadScene'); - const actionList = {}; if (res.data.memberList && res.data.memberList.length > 0) { this.form.type = ''; res.data.memberList.sort((a, b) => { @@ -129,7 +128,6 @@ export default { this.$store.dispatch('training/setMemberList', {memberList:res.data.memberList, userId:this.$store.state.user.id}); const activeMemberList = []; res.data.actionList.forEach((activeMember)=>{ - actionList[activeMember.id] = activeMember; if (!(activeMemberList.length > 0 && activeMemberList.includes(activeMember.memberId))) { activeMemberList.push(activeMember.memberId); } @@ -179,14 +177,14 @@ export default { if (res.data.mapLocation) { this.mapLocation = res.data.mapLocation; } - this.confirm(playerList, actionList); + this.confirm(playerList); } } }, - confirm(playerList, actionList) { + confirm(playerList) { // this.$store.dispatch('training/setScriptOperationType', this.operationType); // operationType:ScriptMode[this.operationType] - this.$emit('selectScript', {playerList:playerList, mapLocation:this.mapLocation, actionList:actionList}); + this.$emit('selectScript', {playerList:playerList, mapLocation:this.mapLocation}); this.doClose(); }, objectSpanMethod({ row, column, rowIndex, columnIndex }) { diff --git a/src/views/newMap/displayNew/dispatherContest/testResult.vue b/src/views/newMap/displayNew/dispatherContest/testResult.vue index 915ac66cf..de73f1d6e 100644 --- a/src/views/newMap/displayNew/dispatherContest/testResult.vue +++ b/src/views/newMap/displayNew/dispatherContest/testResult.vue @@ -20,7 +20,7 @@ @@ -110,7 +110,7 @@ export default { completed:false, // 竞赛是否已完成 fullScore:'', // 总分 userScore:'', // 用户得分 - actionList:[], // 动作列表 + // actionList:[], // 动作列表 fullScoreOfCommand:0, // 指令发布部分总分 userScoreOfCommand:0, // 关键步骤部分用户得分 fullScoreOfOperationStatistic:0, // 运营统计满分 @@ -120,7 +120,7 @@ export default { }; }, methods:{ - doShow({data, actionList}) { + doShow({data}) { this.dialogShow = true; this.completed = data.completed; this.operationStaticItemVOs = data.operationStatisticVO.itemVOS; @@ -128,7 +128,7 @@ export default { this.finalStopInSectionStatistics = data.operationIndexStatisticVO.finalStopInSectionStatistics; this.finalStoppedRunningStatistics = data.operationIndexStatisticVO.finalStoppedRunningStatistics; this.commandPublishStatisticVO = data.commandPublishStatisticVO; - this.actionList = actionList; + // this.actionList = actionList; this.fullScore = data.fullScore; this.userScore = data.userScore; this.fullScoreOfCommand = data.fullScoreOfCommand; @@ -142,12 +142,9 @@ export default { this.dialogShow = false; }, covertTime(time) { - return time.slice(0, time.length - 3); + return time ? time.slice(0, time.length - 3) : ''; }, - covert(actionId) { - // return actionId; - const element = this.actionList[actionId]; - // this.$store.state.training.memberData[memberId] + covert(element) { const member = this.$store.state.training.memberData[element.memberId]; let resultData = ''; if (element.type == 'Accept_Conversation_Invitation') { From cbb43ad06ae74dedac524a9e762f83e13f68cf49 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 16 Oct 2020 17:38:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=AE=9E=E6=93=8D?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/displayNew/dispatherContest/testResult.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/newMap/displayNew/dispatherContest/testResult.vue b/src/views/newMap/displayNew/dispatherContest/testResult.vue index de73f1d6e..b06458e7a 100644 --- a/src/views/newMap/displayNew/dispatherContest/testResult.vue +++ b/src/views/newMap/displayNew/dispatherContest/testResult.vue @@ -64,6 +64,11 @@
若竞赛未完成，运营指标不得分
+
停运列车信息
+ + + +
晚点列车信息
@@ -84,11 +89,6 @@ -
停运列车信息
- - - - {{ $t('global.confirm') }}