From 646c2fb5d601786b8433a895913d1ffa7cde572f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 31 Aug 2022 10:55:45 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigTrainRunplanManage/stationTrack.vue     | 4 ++--
 src/views/bigTrainRunplanManage/trackInformation.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/bigTrainRunplanManage/stationTrack.vue b/src/views/bigTrainRunplanManage/stationTrack.vue
index bea9c169d..eb22a3467 100644
--- a/src/views/bigTrainRunplanManage/stationTrack.vue
+++ b/src/views/bigTrainRunplanManage/stationTrack.vue
@@ -175,9 +175,9 @@ export default {
                 'D':'上下行'
             },
             typeMap:{
-                'VAN':'客车',
+                'VAN':'客货车',
                 'GOODS_VAN':'货车',
-                'PASSENGER':'客货车'
+                'PASSENGER':'客车'
             },
             transfiniteTypeMap:{
                 'NO':'不能接发超限列车',
diff --git a/src/views/bigTrainRunplanManage/trackInformation.vue b/src/views/bigTrainRunplanManage/trackInformation.vue
index bc871ca4a..61a3c422e 100644
--- a/src/views/bigTrainRunplanManage/trackInformation.vue
+++ b/src/views/bigTrainRunplanManage/trackInformation.vue
@@ -147,9 +147,9 @@ export default {
                 {label:'上下行', value:'D'}
             ],
             typeList:[
-                {label:'客车', value:'VAN'},
+                {label:'客货车', value:'VAN'},
                 {label:'货车', value:'GOODS_VAN'},
-                {label:'客货车', value:'PASSENGER'}
+                {label:'客车', value:'PASSENGER'}
             ],
             transfiniteTypeList:[
                 {label:'不能接发超限列车', value:'NO'},

From 19a87a79dbe758357be122496cd08955a624b316 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 31 Aug 2022 11:22:58 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/designPlatform/trainingDesign.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/designPlatform/trainingDesign.vue b/src/views/designPlatform/trainingDesign.vue
index e3df62ac5..6fd1df737 100644
--- a/src/views/designPlatform/trainingDesign.vue
+++ b/src/views/designPlatform/trainingDesign.vue
@@ -6,7 +6,7 @@
     <el-button size="small" class="fault-button" :type="faultMode ? '':'primary' " @click="changeOperateMode()">{{ faultMode?'切换到普通模式':'切换到故障模式' }}</el-button>
     <div class="trainBack">
       <el-button-group>
-        <el-button type="danger" size="small" @click="init">初始化</el-button>
+        <el-button v-loading="loading" type="danger" :disabled="loading" size="small" @click="init">初始化</el-button>
         <el-button v-if="!isPause" size="small" type="primary" @click="pauseScript">暂停</el-button>
         <el-button v-else size="small" type="primary" @click="executePlayScript">恢复</el-button>
         <el-button v-if="!trainingSwitch && trainingDetail" type="success" size="small" @click="handlerStart">开始</el-button>
@@ -33,7 +33,7 @@ export default {
     },
     data() {
         return {
-            groupModel: '',
+            loading: false,
             faultMode: false
         };
     },
@@ -76,6 +76,7 @@ export default {
         this.$store.dispatch('trainingNew/clearStepOrder');
         this.$store.dispatch('trainingNew/clearOperateOrder');
         this.$store.dispatch('trainingNew/changeTeachMode', '');
+        this.$store.dispatch('trainingNew/setSimulationPause', false);
     },
     mounted() {
     },
@@ -148,7 +149,6 @@ export default {
                 this.$store.dispatch('socket/clearTrainingStepTip');
                 this.$store.dispatch('trainingNew/clearStepOrder');
                 this.$store.dispatch('trainingNew/changeTeachMode', '');
-                this.$store.dispatch('trainingNew/setSimulationPause', false);
             }).catch(() => {
                 this.$message.error('结束实训失败！');
             });
@@ -182,6 +182,6 @@ export default {
 	.fault-button{
 		position: absolute;
 		top: 15px;
-		right: 32px;
+		right: 10px;
 	}
 </style>

From e2c9fa3c3e9cd844bf96b317944c6d37a4512b76 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 31 Aug 2022 14:20:36 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/designPlatform/trainingDesign.vue | 9 ++++++---
 src/views/trainingManage/trainingList.vue   | 8 +++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/designPlatform/trainingDesign.vue b/src/views/designPlatform/trainingDesign.vue
index 6fd1df737..ee4d3bfda 100644
--- a/src/views/designPlatform/trainingDesign.vue
+++ b/src/views/designPlatform/trainingDesign.vue
@@ -6,9 +6,9 @@
     <el-button size="small" class="fault-button" :type="faultMode ? '':'primary' " @click="changeOperateMode()">{{ faultMode?'切换到普通模式':'切换到故障模式' }}</el-button>
     <div class="trainBack">
       <el-button-group>
-        <el-button v-loading="loading" type="danger" :disabled="loading" size="small" @click="init">初始化</el-button>
-        <el-button v-if="!isPause" size="small" type="primary" @click="pauseScript">暂停</el-button>
-        <el-button v-else size="small" type="primary" @click="executePlayScript">恢复</el-button>
+        <el-button v-if="record" v-loading="loading" type="danger" :disabled="loading" size="small" @click="init">初始化</el-button>
+        <el-button v-if="!isPause && record" size="small" type="primary" @click="pauseScript">暂停</el-button>
+        <el-button v-if="isPause && record" size="small" type="primary" @click="executePlayScript">恢复</el-button>
         <el-button v-if="!trainingSwitch && trainingDetail" type="success" size="small" @click="handlerStart">开始</el-button>
         <el-button v-if="trainingSwitch" type="danger" size="small" @click="handlerEnd">结束</el-button>
         <el-button type="primary" size="small" @click="back">返回</el-button>
@@ -38,6 +38,9 @@ export default {
         };
     },
     computed: {
+        record() { // 编制
+            return this.$route.query.record;
+        },
         mapId() {
             return this.$route.query.mapId;
         },
diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue
index 9d0fa359d..a1f7f4eed 100644
--- a/src/views/trainingManage/trainingList.vue
+++ b/src/views/trainingManage/trainingList.vue
@@ -182,7 +182,10 @@ export default {
             return list;
         },
         drawUp(index, row) {
-            console.log('编辑', index, row);
+            const qObj = {...this.$route.query};
+            qObj.record = true;
+            this.$router.push({ query:{...qObj}});
+            console.log('编辑', qObj, index, row);
             getTrainingAll(row.id).then(resp => {
                 this.$store.dispatch('trainingNew/setTrainingDetail', null);
                 if (resp.data && resp.data.mapLocationJson) {
@@ -239,6 +242,9 @@ export default {
                 this.$message.error('请先结束当前实训后再加载新的实训！');
                 return;
             }
+            const qObj = {...this.$route.query};
+            delete qObj.record;
+            this.$router.push({ query:{...qObj}});
             try {
                 const detailResp = await getTrainingAll(data.id);
                 this.training = detailResp.data;

From fca267fde12d9643679df122cbb646c042bdf0b6 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 31 Aug 2022 14:34:24 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trainingManage/trainingList.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue
index a1f7f4eed..74d3dd37f 100644
--- a/src/views/trainingManage/trainingList.vue
+++ b/src/views/trainingManage/trainingList.vue
@@ -182,6 +182,10 @@ export default {
             return list;
         },
         drawUp(index, row) {
+            if (this.trainingSwitch) {
+                this.$message.error('请先结束当前实训再编制！');
+                return;
+            }
             const qObj = {...this.$route.query};
             qObj.record = true;
             this.$router.push({ query:{...qObj}});

From 4f99b40a2b4204f8d889d84dd74f32caa01691b9 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 31 Aug 2022 14:49:01 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trainingManage/editDetails.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue
index c72563768..a3a9b7428 100644
--- a/src/views/trainingManage/editDetails.vue
+++ b/src/views/trainingManage/editDetails.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="editContentTab">
-      <div v-if="tabVisible" class="editContentTabLable" @click="minisize">
+      <div v-if="tabVisible && record" class="editContentTabLable" @click="minisize">
         <span class="titleStyle">{{ $t('trainingManage.editTagTitle') }}</span>
       </div>
     </div>
@@ -108,6 +108,9 @@ export default {
         };
     },
     computed: {
+        record() { // 编制
+            return this.$route.query.record;
+        },
         title() {
             const t = this.$t('trainingManage.editTagTitle');
             return t;

From 0162aa45a99384b822c453d475967f4fa400a4d0 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 31 Aug 2022 15:35:59 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trainingManage/demonMenu.vue   | 23 ++++++++++++++++++++++-
 src/views/trainingManage/editDetails.vue | 21 +++------------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/views/trainingManage/demonMenu.vue b/src/views/trainingManage/demonMenu.vue
index be0f91c88..ef858cc06 100644
--- a/src/views/trainingManage/demonMenu.vue
+++ b/src/views/trainingManage/demonMenu.vue
@@ -7,7 +7,8 @@
       </el-button-group>
     </div>
     <TrainingList ref="trainingList" @updateDetails="updateDetails" @gradeRules="gradeRules" />
-    <EditDetails ref="editDetails" v-dialogDrag :edit-data="editData" @openEditOperate="openEditOperate" />
+    <EditDetails ref="editDetails" v-dialogDrag :edit-data="editData" @openEditOperate="openEditOperate" @handleCondition="handleCondition" />
+    <EditCondition ref="editCondition" v-dialogDrag :materials-list="materialsList" @editConditionFn="editConditionFn" />
     <edit-operate ref="editOperate" v-dialogDrag @backStepList="backStepList" />
     <grade-rules ref="gradeRules" />
   </div>
@@ -15,14 +16,17 @@
 <script>
 import TrainingList from './trainingList.vue';
 import EditDetails from './editDetails.vue';
+import EditCondition from './editCondition.vue';
 import EditOperate from './editOperate.vue';
 import GradeRules from './gradeRules.vue';
+import { getTrainingMaterials } from '@/api/trainingManage';
 
 export default {
     name:'DemonMenu',
     components:{
         TrainingList,
         EditDetails,
+        EditCondition,
         EditOperate,
         GradeRules
     },
@@ -32,6 +36,7 @@ export default {
         return {
             hoverBtn: false,
             btnWidth: -600,
+            materialsList: [],
             editData: {}
         };
     },
@@ -47,8 +52,24 @@ export default {
         }
     },
     mounted() {
+        this.getMaterials();
     },
     methods:{
+        editConditionFn(data, index, key) {
+            this.$refs.editDetails.editConditionFn(data, index, key);
+        },
+        handleCondition(index, row, key) {
+            this.$refs.editCondition.doShow(row[key], index, key);
+        },
+        getMaterials() {
+            getTrainingMaterials().then(res => {
+                console.log(res, 'Materials');
+                this.materialsList = res.data;
+            }).catch(err => {
+                console.log(err, 'Materials----');
+                this.materialsList = [];
+            });
+        },
         menuClick() {
             this.hoverBtn = !this.hoverBtn;
             if (this.hoverBtn) {
diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue
index a3a9b7428..9fdec2c3c 100644
--- a/src/views/trainingManage/editDetails.vue
+++ b/src/views/trainingManage/editDetails.vue
@@ -63,22 +63,18 @@
         <el-button size="small" type="success" @click="saveStepData">{{ $t('trainingManage.saveStepData') }}</el-button>
       </span>
     </el-dialog>
-    <EditCondition ref="editCondition" v-dialogDrag :materials-list="materialsList" @editConditionFn="editConditionFn" />
   </div>
 </template>
 
 <script>
-import { updateTrainingStep, getTrainingAll, updateTrainingBackgroud, getTrainingStepList, updateTrainingMaplocation, getTrainingMaterials } from '@/api/trainingManage';
+import { updateTrainingStep, getTrainingAll, updateTrainingBackgroud, getTrainingStepList, updateTrainingMaplocation } from '@/api/trainingManage';
 import { assignUsersPlayRoles } from '@/api/jointSimulation';
 import Vue from 'vue';
 import {covertMemberData} from '@/views/newMap/displayNew/utils';
-import EditCondition from './editCondition.vue';
 
 export default {
     name: 'EditDetails',
-    components:{
-        EditCondition
-    },
+    components:{},
     props: {
         editData: {
             type: Object,
@@ -94,7 +90,6 @@ export default {
             dialogVisible: false,
             roleList: [],
             tableData: [],
-            materialsList: [],
             formModel: {
                 mapLocationJson: '',
                 // runPlanId:'',
@@ -208,7 +203,7 @@ export default {
         },
         handleCondition(index, row, key) {
             console.log(key, '条件', index, row);
-            this.$refs.editCondition.doShow(row[key], index, key);
+            this.$emit('handleCondition', index, row, key);
             this.doClose();
         },
         handleEditOperate(index, row) {
@@ -229,16 +224,6 @@ export default {
             this.getStepList(data);
             this.dialogVisible = true;
             this.tabVisible = true;
-            this.getMaterials();
-        },
-        getMaterials() {
-            getTrainingMaterials().then(res => {
-                console.log(res, 'Materials');
-                this.materialsList = res.data;
-            }).catch(err => {
-                console.log(err, 'Materials----');
-                this.materialsList = [];
-            });
         },
         saveStepData() {
             const list = [];