Merge branch 'test'

src/api/designPlatform.js

@@ -139,9 +139,9 @@ export function previewRunPlan(planId) {
 }
 
 /** 剧本预览选择角色 */
-export function loadDraftScriptNew(memberId, group) {
+export function loadDraftScriptNew(memberId, group, mode) {
     return request({
-        url: `/api/scriptSimulation/${group}/chooseMemberAndStart?memberId=${memberId}`,
+        url: `/api/scriptSimulation/${group}/chooseMemberAndStart?memberId=${memberId}&mode=${mode}`,
         method: 'put'
     });
 }

src/api/script.js

@@ -134,10 +134,3 @@ export function updateActionCondition(group, actionId, data) {
         data
     });
 }
-/** 查询剧本活动条件 */
-export function getActionCondition(group, actionId) {
-    return request({
-        url: `/api/scriptSimulation/${group}/${actionId}/condition`,
-        method: 'get'
-    });
-}

src/components/QueryListPage/QueryListPage.vue

@@ -15,7 +15,7 @@
       @disableQuery="disableQuery"
       @enableQuery="enableQuery"
     />
-    <el-card v-loading="loading">
+    <el-card v-loading="loading" :style="{padding: cardPadding+'px'}">
       <el-table
         ref="table2"
         highlight-current-row
@@ -211,6 +211,10 @@ export default {
         queryList: {
             type: Object,
             required: true
+		},
+		cardPadding: {
+			type: Number,
+			default: 0
 		}
     },
     data() {

src/jmapNew/theme/beijing_01/planConvert.js

@@ -1,5 +1,5 @@
 import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan';
-
+import store from '@/store/index_APP_TARGET';
 export default {
     /** 边缘高度*/
     EdgeHeight: 600,
@@ -113,7 +113,11 @@ export default {
                             // pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`;
                             pointdata.name = `${service.serviceNumber}${train.tripNumber}`;
                             pointdata.color = '#000' || lineStyle.color;
-                            pointdata.directionCode = train.directionCode;
+                            pointdata.directionCode = train.right ? '2' : '1';
+                            if (!store.state.map.mapConfig.upRight) {
+                                pointdata.directionCode = train.right ? '1' : '2';
+                            }
+                            // pointdata.directionCode = train.directionCode;
                             pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
 
                             /** 给服务对象添加服务名称和标记点*/
@@ -211,8 +215,12 @@ export default {
                         if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
                             const result = serie.markPoint.data.some(ele => ele.name == `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`);
                             if (!result) {
+                                let directionCode = elem.right ? '2' : '1';
+                                if (!store.state.map.mapConfig.upRight) {
+                                    directionCode = elem.right ? '1' : '2';
+                                }
                                 serie.markPoint.data.push(createMartPoint({
-                                    directionCode: elem.directionCode,
+                                    directionCode: directionCode,
                                     coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
                                     name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`,
                                     color: lineStyle.color || '#000'

src/jmapNew/theme/chengdu_01/planConvert.js

@@ -1,5 +1,5 @@
 import { createMartPointReverse, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan';
-
+import store from '@/store/index_APP_TARGET';
 export default {
     /** 边缘高度*/
     EdgeHeight: 600,
@@ -113,7 +113,11 @@ export default {
                             // pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`;
                             pointdata.name = `${service.serviceNumber}${train.tripNumber}`;
                             pointdata.color = '#000' || lineStyle.color;
-                            pointdata.directionCode = train.directionCode;
+                            pointdata.directionCode = train.right ? '2' : '1';
+                            if (!store.state.map.mapConfig.upRight) {
+                                pointdata.directionCode = train.right ? '1' : '2';
+                            }
+                            // pointdata.directionCode = train.directionCode;
                             pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
 
                             /** 给服务对象添加服务名称和标记点*/
@@ -211,8 +215,12 @@ export default {
                         if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
                             const result = serie.markPoint.data.some(ele => ele.name == `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`);
                             if (!result) {
+                                let directionCode = elem.right ? '2' : '1';
+                                if (!store.state.map.mapConfig.upRight) {
+                                    directionCode = elem.right ? '1' : '2';
+                                }
                                 serie.markPoint.data.push(createMartPointReverse({
-                                    directionCode: elem.directionCode,
+                                    directionCode: directionCode,
                                     coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
                                     name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`,
                                     color: lineStyle.color || '#000'

src/jmapNew/theme/chengdu_03/planConvert.js

@@ -1,5 +1,5 @@
 import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan';
-
+import store from '@/store/index_APP_TARGET';
 export default {
     /** 边缘高度*/
     EdgeHeight: 600,
@@ -91,7 +91,11 @@ export default {
                             // pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`;
                             pointdata.name = `${service.serviceNumber}${train.tripNumber}`;
                             pointdata.color = '#000' || lineStyle.color;
-                            pointdata.directionCode = train.directionCode;
+                            // pointdata.directionCode = train.directionCode;
+                            pointdata.directionCode = train.right ? '2' : '1';
+                            if (!store.state.map.mapConfig.upRight) {
+                                pointdata.directionCode = train.right ? '1' : '2';
+                            }
                             pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
 
                             /** 给服务对象添加服务名称和标记点*/
@@ -186,8 +190,12 @@ export default {
                         if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
                             const result = serie.markPoint.data.some(ele => ele.name == `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`);
                             if (!result) {
+                                let directionCode = elem.right ? '2' : '1';
+                                if (!store.state.map.mapConfig.upRight) {
+                                    directionCode = elem.right ? '1' : '2';
+                                }
                                 serie.markPoint.data.push(createMartPoint({
-                                    directionCode: elem.directionCode,
+                                    directionCode: directionCode,
                                     coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
                                     name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`,
                                     color: lineStyle.color || '#000'

src/jmapNew/theme/haerbin_01/planConvert.js

@@ -168,7 +168,6 @@ export default {
                 var isBackup = true;
                 var opt = { name: '', markPointData: [], data: [] };
                 if (service.tripNumberDataList && service.tripNumberDataList.length) {
-                    debugger;
                     service.tripNumberDataList.forEach((train, j) => {
                         var pointdata = {};
                         var idx = 0;

src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue

@@ -118,6 +118,11 @@ export default {
             });
         },
         doClose() {
+            this.addModel = {
+                groupNumber: '',
+                destinationCode: '',
+                tripNumber: ''
+            };
             this.loading = false;
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');

src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue

@@ -129,6 +129,11 @@ export default {
             });
         },
         doClose() {
+            this.addModel = {
+                groupNumber: '',
+                tripNumber: '',
+                serviceNumber: ''
+            };
             this.loading = false;
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');

src/jmapNew/theme/race_01/menus/menuDialog/stationControl.vue

@@ -67,9 +67,9 @@ export default {
             stationName:'',
             message:'',
             controlProps: {
-                '03': '紧急站控',
+                '03': '请求紧急站控',
-                '02': '站控',
+                '02': '请求站控',
-                '01': '遥控'
+                '01': '请求中控'
             }
         };
     },
@@ -262,7 +262,7 @@ export default {
     }
 };
 </script>
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
+<style scoped rel="stylesheet/scss" lang="scss">
     @import "src/styles/mixin.scss";
 
     /deep/ .el-radio {

src/scripts/cmdPlugin/Config.js

@@ -38,7 +38,8 @@ export const deviceFaultType = {
     Switch: [
         {label: '失表', value: 'SPLIT'},
         {label: '定位失表', value: 'NORMAL_SPLIT'},
-        {label: '反位失表', value: 'REVERSE_SPLIT'}
+        {label: '反位失表', value: 'REVERSE_SPLIT'},
+        {label: '道岔区段计轴故障', value: 'AXLE_FAULT'}
     ],
     StationStand: [
         {label: '屏蔽门无法关闭', value: 'PSD_CANNOT_BE_CLOSED'},

src/store/modules/training.js

@@ -44,7 +44,8 @@ const training = {
         scriptOperationType: '', // 剧本操作类型
         triggerFaultCount: 0, // 触发故障计数器
         triggerFaultDevice: '', // 触发故障目标设备
-        trainingStart: false // 实训开始状态
+        trainingStart: false, // 实训开始状态
+        notifySelected: null // 场景弹窗内容
     },
 
     getters: {
@@ -283,6 +284,9 @@ const training = {
         },
         setTrainingStart: (state, flag) => {
             state.trainingStart = flag;
+        },
+        setNotifySelected: (state, data) => {
+            state.notifySelected = data;
         }
     },
 

src/utils/runPlan.js

@@ -22,7 +22,6 @@ export function createMartPoint(opt) {
 
 /** 创建一个车次数据点*/
 export function createMartPointReverse(opt) {
-    debugger;
     const rotate = opt.directionCode == '1' ? 45 : (opt.directionCode == '2' ? -45 : 0);
     const position = opt.type ? 'insideBottomLeft' : 'insideTopLeft';
     return {

src/views/drts/scene/index.vue

@@ -152,7 +152,7 @@ export default {
                 const url = urlObject.createObjectURL(content);
                 const el = document.createElement('a');
                 el.href = url;
-                el.download = `${resultData.name}.json`;
+                el.download = `场景-${resultData.name}.json`;
                 el.click();
                 urlObject.revokeObjectURL(url);
             });

src/views/drts/scene/modify.vue

@@ -2,7 +2,7 @@
   <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="doClose" top="50px" center custom-class="sceneModifyOut" fullscreen>
     <el-form ref="form" :model="formModel" label-width="120px" class="sceneModify" @submit.native.prevent>
       <!-- :rules="rules"  -->
-      <el-table :data="actionList" border style="width:1250px;margin: 0 auto;" height="500" :span-method="objectSpanMethod">
+      <el-table :data="actionList" border style="width:1320px;margin: 0 auto;" height="500" :span-method="objectSpanMethod">
         <el-table-column label="步骤名称" width="100">
           <template slot-scope="scope">
             <div v-if="stepVOs[scope.row.id]">
@@ -10,6 +10,7 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="动作id" width="70" prop="id" />
         <el-table-column label="动作内容" width="350">
           <template slot-scope="scope">
             <!-- v-model="scope.row.id"  -->
@@ -19,7 +20,7 @@
           </template>
         </el-table-column>
         <el-table-column label="语音识别关键词列表" width="350">
-          <template slot-scope="scope">
+          <template v-if="scope.row.type=='Conversation'&&scope.row.memberId=='1'" slot-scope="scope">
             <div v-if="commandEvaluationRuleVOs[scope.row.id]&&commandEvaluationRuleVOs[scope.row.id].keyWords">
               <el-tag v-for="(tag,index) in commandEvaluationRuleVOs[scope.row.id].keyWords" :key="index" closable :disable-transitions="false" @close="handleClose(scope.row.id,index)">{{ tag }}</el-tag>
               <el-input
@@ -39,7 +40,7 @@
           </template>
         </el-table-column>
         <el-table-column label="总分值" width="149">
-          <template slot-scope="scope">
+          <template v-if="scope.row.memberId=='1'&&(scope.row.type=='Conversation'||scope.row.type=='Operation')" slot-scope="scope">
             <div v-if="commandEvaluationRuleVOs[scope.row.id]&&commandEvaluationRuleVOs[scope.row.id].score!=undefined">
               <el-input-number
                 v-if="commandEvaluationRuleVOs[scope.row.id].scoreVisible"
@@ -62,7 +63,7 @@
           </template>
         </el-table-column>
         <el-table-column label="超时时间" width="150">
-          <template slot-scope="scope">
+          <template v-if="scope.row.type=='Conversation'&&scope.row.memberId=='1'" slot-scope="scope">
             <div v-if="commandEvaluationRuleVOs[scope.row.id]&&commandEvaluationRuleVOs[scope.row.id].timeOut!=undefined">
               <el-input-number
                 v-if="commandEvaluationRuleVOs[scope.row.id].timeOutVisible"
@@ -85,7 +86,7 @@
           </template>
         </el-table-column>
         <el-table-column label="扣除分值" width="150">
-          <template slot-scope="scope">
+          <template v-if="scope.row.type=='Conversation'&&scope.row.memberId=='1'" slot-scope="scope">
             <div v-if="commandEvaluationRuleVOs[scope.row.id]&&commandEvaluationRuleVOs[scope.row.id].deductScore!=undefined">
               <el-input-number
                 v-if="commandEvaluationRuleVOs[scope.row.id].deductScoreVisible"
@@ -501,6 +502,20 @@ export default {
             commandEvaluationRuleVOs = commandEvaluationRuleVOs.filter(eachData=>{
                 return (eachData.keyWords && eachData.keyWords.length > 0) || eachData.timeOut || eachData.score || eachData.deductScore;
             });
+            let count = 0;
+            let errorMessage = '';
+            commandEvaluationRuleVOs.forEach((RuleVO, index)=>{
+                if (RuleVO.keyWords) {
+                    if (!(RuleVO.keyWords.length > 0 && RuleVO.timeOut && RuleVO.score && RuleVO.deductScore)) {
+                        errorMessage += '动作id为' + RuleVO.actionId + '的表单没有填写完整, ';
+                        count++;
+                    }
+                }
+            });
+            if (count > 0) {
+                this.$messageBox(errorMessage);
+                return false;
+            }
             if (stepVOs.length > 0) {
                 stepVOs.sort(this.objectSort('startActionId'));
                 stepVOs.map((step, index)=>{
@@ -664,7 +679,7 @@ export default {
     margin-bottom:10px;
 }
 .operateStatistic{
-    width: 1250px;
+    width: 1320px;
     margin: 15px auto;
     border: 1px #EBEEF5 solid;
 }

src/views/ibp/home.vue

@@ -5,7 +5,7 @@
       <el-button size="small" type="primary" class="createScript" style="margin-top: 5px" @click="handleCreate">{{ $t('scriptRecord.scriptCreate') }}</el-button>
       <el-button size="small" type="primary" class="createScript" @click="createByPublish">发布数据创建</el-button>
     </div>
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 91%;margin-left:4%;margin-top:20px;" />
+    <QueryListPage ref="queryListPage" :cardPadding="50" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 91%;margin-left:4%;margin-top:20px;" />
     <create-ibp ref="createScript" :title="'创建数据'" @reloadTable="reloadTable" />
     <create-ibp ref="modifyScript" :title="'修改数据'" @reloadTable="reloadTable" />
     <copy-ibp ref="copyIbp" @reloadTable="reloadTable" />

src/views/lesson/home.vue

@@ -9,7 +9,7 @@
         <el-button size="mini" type="primary" @click="lessonCreate">{{ $t('lesson.newConstruction') }}</el-button>
       </div>
     </div>
-    <QueryListPage ref="queryListPage" :query-form="queryForm" :pager-config="pagerConfig" :query-list="queryList" style="width: 91%;margin-left:4%;margin-top:20px;" />
+    <QueryListPage ref="queryListPage" :cardPadding="50" :query-form="queryForm" :pager-config="pagerConfig" :query-list="queryList" style="width: 91%;margin-left:4%;margin-top:20px;" />
     <publish-create ref="publishCreate" @refresh="refresh" />
     <publish-lesson ref="publishLesson" @refresh="refresh" />
     <lesson-detail ref="lessonDetail" />

src/views/newMap/displayNew/dispatherContest/index.vue

@@ -239,6 +239,12 @@ export default {
                 const model = {initTime:this.formatTime(initTime)};
                 this.start(model);
             }
+        },
+        isScriptLoad(val) {
+            if (!val && this.$store.state.training.notifySelected) {
+                this.$store.state.training.notifySelected.close();
+                this.$store.commit('training/setNotifySelected', null);
+            }
         }
     },
     created() {

src/views/newMap/displayNew/dispatherContest/sceneList.vue

@@ -10,7 +10,11 @@
             <el-table-column label="操作">
               <template slot-scope="scope">
                 <div v-if="scope.row.result">
-                  <el-button v-for="(each,index) in scope.row.result" :key="index" type="primary" size="small" @click="handleLoad(each)">{{ each.name }}</el-button>
+                  <template v-for="(each,index) in scope.row.result">
+                    <el-tooltip :key="index" class="item" effect="dark" :content="'场景描述： '+ each.description + '\n' + '处置流程： ' +each.disposalProcesses" popper-class="tooltip-box" placement="top">
+                      <el-button type="primary" size="small" @click="handleLoad(each)">{{ each.name }}</el-button>
+                    </el-tooltip>
+                  </template>
                 </div>
               </template>
             </el-table-column>
@@ -82,17 +86,17 @@ export default {
                 });
                 list.forEach(each=>{
                     if (each.name == '场景1' || each.name == '场景2' || each.name == '场景3' || each.name == '场景7') {
-                        this.mainSceneData[1].result.push({id:each.id, name:each.name});
+                        this.mainSceneData[1].result.push({id:each.id, name:each.name, description: each.description, disposalProcesses: each.disposalProcesses});
                     } else if (each.name == '场景4') {
-                        this.mainSceneData[0].result.push({id:each.id, name:'场景4'});
+                        this.mainSceneData[0].result.push({id:each.id, name:'场景4', description: each.description, disposalProcesses: each.disposalProcesses});
                     } else if (each.name == '场景5' || each.name == '场景11') {
-                        this.mainSceneData[4].result.push({id:each.id, name:each.name});
+                        this.mainSceneData[4].result.push({id:each.id, name:each.name, description: each.description, disposalProcesses: each.disposalProcesses});
                     } else if (each.name == '场景9') {
-                        this.mainSceneData[6].result.push({id:each.id, name:'场景9'});
+                        this.mainSceneData[6].result.push({id:each.id, name:'场景9', description: each.description, disposalProcesses: each.disposalProcesses});
                     } else if (each.name == '场景8') {
-                        this.mainSceneData[5].result.push({id:each.id, name:'场景8'});
+                        this.mainSceneData[5].result.push({id:each.id, name:'场景8', description: each.description, disposalProcesses: each.disposalProcesses});
                     } else if (each.name == '场景10') {
-                        this.mainSceneData[7].result.push({id:each.id, name:'场景10'});
+                        this.mainSceneData[7].result.push({id:each.id, name:'场景10', description: each.description, disposalProcesses: each.disposalProcesses});
                     }
                 });
             }
@@ -127,6 +131,18 @@ export default {
                     const playerList = [];
                     EventBus.$emit('clearRunSeries');
                     EventBus.$emit('loadScene');
+                    const notifyData = this.$notify({
+                        title: res.data.name,
+                        dangerouslyUseHTMLString: true,
+                        message: `
+							<p><span style="color: #000;font-weight: bold;">场景描述：</span>${row.description}</p>`,
+                        customClass: 'notify_box',
+                        // position: 'top-left',
+                        showClose: false,
+                        offset: 75,
+                        duration: 0
+                    });
+                    this.$store.commit('training/setNotifySelected', notifyData);
                     if (res.data.memberList && res.data.memberList.length > 0) {
                         this.form.type = '';
                         res.data.memberList.sort((a, b) => {
@@ -228,3 +244,17 @@ export default {
     }
 };
 </script>
+
+<style lang="scss">
+.tooltip-box {
+	white-space:pre-wrap;
+}
+.notify_box{
+	width: 300px;
+	white-space: inherit;
+	&.el-notification.right{
+		right: 5px;
+		padding: 6px 0;
+	}
+}
+</style>

src/views/newMap/displayNew/index.vue

@@ -26,7 +26,7 @@
       />
       <menu-dispather-contest v-if="isContest" ref="menuDispatherContest" :offset="offset" :offset-bottom="offsetBottom" :data-error="dataError" :text-status-height="textStatusHeight" />
     </template>
-    <menu-train-list v-if="isDemon||isContest" @setCenter="setCenter" />
+    <menu-train-list v-if="isDemon||isContest||isScript" @setCenter="setCenter" />
     <menu-system-time ref="menuSystemTime" :offset="offset" :group="group" />
   </div>
 </template>

src/views/newMap/displayNew/menuTrainList.vue

@@ -136,8 +136,8 @@ export default {
 .menuTrainListOut{
     position: absolute;
     right: 0;
-    top: 15%;
+    top: 20%;
-    height: 70%;
+    height: 60%;
 	transform: translateX(400px);
 	transition: all 0.4s;
 	&.active{

src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js

@@ -76,7 +76,7 @@ export const operateEnum = {
         // }
     },
     ControlConvertMenu:{
-        type:'控制模式',
+        type:'系统/站遥控',
         CM_Apply_For_Station_Control:{
             code:'stationCodes',
             isList:true,

src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue

@@ -99,6 +99,7 @@ export default {
                 this.$notify({
                     title: this.$t('global.tips'),
                     duration: 3000,
+                    offset: 100,
                     message: h('i', { style: 'color:' + opt.color }, opt.message)
                 });
             }

src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue

@@ -17,6 +17,8 @@
         @setMemberList="setMemberList"
         @clearAllData="clearAllData"
         @setTreeData="setTreeData"
+        @changeScriptMode="changeScriptMode"
+        @setMapLocation="setMapLocation"
       />
       <script-preview-chat ref="chatbox" :group="group" :user-role="userRole" :offset="offset" />
       <menu-system-time ref="menuSystemTime" :offset="offset" :group="group" />
@@ -45,6 +47,7 @@ import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 import { mapGetters } from 'vuex';
 import { loadDraftScriptNew } from '@/api/designPlatform';
 import Vue from 'vue';
+import { ScriptMode } from '@/scripts/ConstDic';
 import ConstConfig from '@/scripts/ConstConfig';
 
 export default {
@@ -79,7 +82,8 @@ export default {
             userRole:'',
             isDrive: this.prdType == '04',
             treeData:[],
-            memberList:[]
+            memberList:[],
+            scriptMode: ScriptMode.TEACH
         };
     },
     computed: {
@@ -118,6 +122,11 @@ export default {
             // this.setMode();
         }
     },
+    beforeDestroy() {
+        this.$store.dispatch('training/setRoles', '');
+        this.$store.dispatch('training/setPrdType', '');
+        this.clearAllData();
+    },
     created() {
         this.group = this.$route.query.group || '';
     },
@@ -125,15 +134,19 @@ export default {
         back() {
             this.$refs.scriptButtonGroup.back();
         },
+        changeScriptMode(scriptMode) {
+            this.scriptMode = scriptMode;
+        },
         async selectRole(role) {
             try {
-                const res = await loadDraftScriptNew(role.id, this.group);
+                const res = await loadDraftScriptNew(role.id, this.group, this.scriptMode);
                 if (res && res.code == 200) {
-                    if (this.querymapLocation) {
+                    // if (this.querymapLocation) {
                     const newMapLocation = {'offsetX': this.mapLocation.x, 'offsetY': this.mapLocation.y, 'scaleRate': this.mapLocation.scale};
                     Vue.prototype.$jlmap.setOptions(newMapLocation);
+                    // }
                 }
-                }
+                this.$store.dispatch('scriptRecord/updateAudioPlay', false);
                 this.$store.dispatch('scriptRecord/updateBgSet', true);
                 this.$refs.scriptButtonGroup.setIsscriptRun(true);
                 if (role.type) {
@@ -223,6 +236,9 @@ export default {
                 }
             });
         },
+        setMapLocation(mapLocation) {
+            this.mapLocation = mapLocation;
+        },
         switchMode(prdType) {
             this.$store.dispatch('training/setPrdType', prdType);
         },

src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue

@@ -1,10 +1,20 @@
 <template>
   <div>
-    <!-- 左下角按钮列表 -->
+    <!-- 右下角按钮列表 -->
     <div class="display-draft">
       <el-button v-if="isscriptRun&&!dataError" type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
       <el-button type="primary" @click="back">{{ $t('display.demon.back') }}</el-button>
     </div>
+    <!-- 左上角按钮 -->
+    <div class="trainingButton" :style="{top: (offset+45)+'px'}">
+      <el-row>
+        <el-radio-group v-model="scriptMode" class="mode" size="small" @change="changeScriptMode">
+          <el-radio-button :label="scriptModeList.TEACH" :disabled="isscriptRun">{{ $t('display.lesson.teachingMode') }}</el-radio-button>
+          <el-radio-button :label="scriptModeList.PRACTICE" :disabled="isscriptRun">{{ $t('display.lesson.practiceMode') }}</el-radio-button>
+          <el-radio-button :label="scriptModeList.TEST" :disabled="isscriptRun">{{ $t('display.lesson.testMode') }}</el-radio-button>
+        </el-radio-group>
+      </el-row>
+    </div>
     <!--  右上角按钮列表 -->
     <div class="schema" :style="{top: offset+'px'}">
       <template v-if="!dataError">
@@ -33,6 +43,7 @@
   </div>
 </template>
 <script>
+import { ScriptMode } from '@/scripts/ConstDic';
 import DemonMenu from '@/views/newMap/displayNew/demonMenu';
 import { EventBus } from '@/scripts/event-bus';
 import {covertMemberData} from '@/views/newMap/displayNew/utils';
@@ -75,7 +86,9 @@ export default {
             viewDisabled: true,
             firstLoad:true,
             activeTrainList:[],
-            isscriptRun:false // 剧本是否正在加载
+            isscriptRun:false, // 剧本是否正在加载
+            scriptMode: ScriptMode.TEACH,
+            planRunning:false
         };
     },
     computed:{
@@ -96,6 +109,9 @@ export default {
         },
         isStation() {
             return this.$store.state.training.prdType == '01';
+        },
+        scriptModeList() {
+            return ScriptMode;
         }
     },
     watch:{
@@ -114,10 +130,13 @@ export default {
         await this.$store.dispatch('training/reset');
         await this.$store.dispatch('map/mapClear');
         this.$store.dispatch('scriptRecord/updateSimulationPause', false);
+        this.$store.dispatch('scriptRecord/updateAudioPlay', false);
+        this.$store.dispatch('map/resetActiveTrainList', true);
     },
     methods:{
         // 加载地图数据
         async initLoadData() {
+            this.changeScriptMode(this.scriptMode);
             this.$store.dispatch('training/setPrdType', '');
             this.setWindowSize();
             this.$store.dispatch('training/reset');
@@ -139,6 +158,7 @@ export default {
                 } else {
                     this.$store.dispatch('training/over');// 仿真按计划行车结束
                 }
+                this.planRunning = resp.data.planRunning;
                 this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
             } else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
                 this.dataError = true;
@@ -240,6 +260,8 @@ export default {
                     this.$emit('setMemberData', lastMemberList);
                 }
                 let newMemberList = [];
+                // planRunning
+                // debugger;
                 const activeMemberList = [];
                 resp.data.actionList.forEach((activeMember)=>{
                     if (!(activeMemberList.length > 0 && activeMemberList.includes(activeMember.memberId))) {
@@ -262,7 +284,7 @@ export default {
                 const lastData = JSON.stringify(playerList);
                 newMemberList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
                 if (resp.data.mapLocation) {
-                    this.mapLocation = resp.data.mapLocation;
+                    this.$emit('setMapLocation', resp.data.mapLocation);
                 }
                 const memberList = newMemberList || [];
                 memberList.unshift({ id: '', label: this.$t('display.script.none'), role: 'no', disabled:false });
@@ -320,6 +342,7 @@ export default {
                 getSimulationInfoNew(this.group).then(()=>{
                     this.isscriptRun = false;
                     this.$store.dispatch('scriptRecord/updateBgSet', false);
+                    this.$store.dispatch('scriptRecord/updateAudioPlay', false);
                     // this.userRole = '';
                     this.$store.dispatch('training/setRoles', '');
                     this.$store.dispatch('training/setPrdType', '');
@@ -372,7 +395,22 @@ export default {
                 this.$store.dispatch('config/resize', { width, height });
             // this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
             });
+        },
+        changeScriptMode(scriptMode) {
+            const ScriptModeList = {
+                TEACHING_MODE:'teach',
+                PRACTICE_MODE:'practice',
+                TEST_MODE:'test'
+            };
+            this.$store.dispatch('training/setScriptOperationType', ScriptModeList[scriptMode]);
+            this.$emit('changeScriptMode', scriptMode);
         }
     }
 };
 </script>
+<style lang="scss" scoped>
+    .trainingButton{
+        position: absolute;
+        left: 5px;
+    }
+</style>

src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue

@@ -2,9 +2,9 @@
   <div>
     <div class="display-draft">
       <el-button-group>
-        <el-button v-if="!isScriptCommand||isReplaceBg" type="success" :disabled="isDisable||dataError" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button>
-        <el-button v-if="!isScriptCommand||isReplaceBg" type="danger" :disabled="dataError" @click="end">初始化</el-button>
         <el-button v-if="!isReplaceBg" type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
+        <el-button v-if="!isScriptCommand||isReplaceBg" type="danger" :disabled="dataError" @click="end">初始化</el-button>
+        <el-button v-if="!isScriptCommand||isReplaceBg" type="success" :disabled="isDisable||dataError" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button>
       </el-button-group>
     </div>
     <demon-menu

src/views/newMap/jlmapNew/index.vue

@@ -352,12 +352,12 @@ export default {
             }
         },
         async simulationReset() {
+            await this.$store.dispatch('socket/setSimulationStart');
             await this.$store.dispatch('map/clearJlmapTrainView');
             await this.$store.dispatch('map/setTrainWindowShow', false);
             await this.$store.dispatch('training/over');
             await this.$store.dispatch('map/resetActiveTrainList');
             await this.$store.dispatch('socket/setSimulationReset'); // 清空
-            await this.$store.dispatch('socket/setSimulationStart');
             await this.$store.dispatch('training/setMapDefaultState');
         },
         // 视图缩放事件

src/views/newMap/jointTrainingNew/menuTrainList.vue

@@ -125,8 +125,8 @@ export default {
 .menuTrainListOut{
     position: absolute;
     right: 0;
-    top: 15%;
+    top: 20%;
-    height: 70%;
+    height: 60%;
 	transform: translateX(400px);
 	transition: all 0.4s;
 	&.active{

src/views/newMap/mapsystemNew/plugin/delayBox.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="delayShow">
-    <div v-for="item in stationList">
+    <div v-for="(item,i) in stationList" :key="i">
       <delay-info v-if="item.delayInfo" :delay-info-list="item.delayInfo" position="item.points" />
     </div>
   </div>

src/views/newMap/mapsystemNew/plugin/delayInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-show="showDelayBox" class="info_box" :style="{left: tPosition.x+'px', top: tPosition.y+'px' }">
     <el-scrollbal>
-      <div v-for="item in delayInfoList"><span>人解</span><span>信号机名</span><span>时间</span></div>
+      <div v-for="(item,i) in delayInfoList" :key="i"><span>人解</span><span>信号机名</span><span>时间</span></div>
     </el-scrollbal>
   </div>
 </template>

src/views/newMap/mapsystemNew/plugin/trainingtip.vue

@@ -116,9 +116,11 @@ export default {
                     });
                 }
             }
+            let subDeviceType = '';
+            if (newStep.subType) { subDeviceType = newStep.subType; } else { subDeviceType = newStep.type; }
             position = this.$jlmap.getShapeTipPoint({
                 code: newStep.code,
-                subDeviceType: newStep.type
+                subDeviceType: subDeviceType
             });
 
             if (position) {

src/views/newMap/newMapdraft/mapoperate/section/index.vue

@@ -107,7 +107,8 @@ export default {
             field: '',
             oldLeftSectionCode: '',
             oldRightSectionCode: '',
-            tipInfoList: []
+            tipInfoList: [],
+            centralizedStationList: []
         };
     },
     computed: {
@@ -369,9 +370,6 @@ export default {
                 return this.$store.state.map.map.skinVO.code === '03';
             }
             return false;
-        },
-        centralizedStationList() {
-            return this.stationList.filter(station => station.centralized);
         }
     },
     watch: {
@@ -402,9 +400,14 @@ export default {
                 this.editModel.roadType = null;
             }
         },
+        handleInit() {
+            if (this.stationList && this.stationList.length) {
+                this.centralizedStationList = this.stationList.filter(station => station.centralized);
+            }
+        },
         deviceSelect(selected) {
             // 判断是否激活选择站台
-            if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+            if (selected && selected._type === 'Section') {
                 if (this.field === 'leftSection') {
                     if (selected.type === '01' || selected.type === '03') {
                         this.editModel.leftSectionCode = selected.code;
@@ -423,6 +426,7 @@ export default {
                     return;
                 }
                 this.clear();
+                this.handleInit();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
                 this.oldPoint = selected.points;

src/views/newMap/newMapdraft/mapoperate/signal/create.vue

@@ -44,7 +44,7 @@ export default {
                 { code: true, name: '向右' }
             ],
             SignalLeftOrRightList: [],
-            CentralizedStationList:[],
+            // CentralizedStationList:[],
             mergeRules: {
                 sectionCode: [
                     { required: true, message: this.$t('rules.selectPhysicalExtentName'), trigger: 'change' }
@@ -87,6 +87,13 @@ export default {
             });
             return list;
         },
+        ciStationList() {
+            let list = [];
+            list = this.stationList.filter(station=>{
+                return station.ciStation;
+            });
+            return list;
+        },
         isButtonType() {
             return this.field == 'selectSingalCode';
         },
@@ -104,7 +111,7 @@ export default {
                             { prop: 'right', label: this.$t('map.signalDirectionTypeX'), type: 'radio', optionLabel: 'name', optionValue:'code', border:true, radioList: this.SignalDirectionList},
                             { prop: 'positionType', label: this.$t('map.positionType'), type: 'radio', optionLabel: 'name', optionValue:'code', border:true, radioList: this.SignalPositionTypeList},
                             { prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.centralizedStationList},
-                            { prop: 'interlockStationCode', label: '所属联锁站:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.centralizedStationList}
+                            { prop: 'interlockStationCode', label: '所属联锁站:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.ciStationList}
                         ]
                     }
                 }

src/views/newMap/newMapdraft/mapoperate/signal/index.vue

@@ -266,7 +266,9 @@ export default {
             },
             lampPositionModel: {
                 lampPositionType: ''
-            }
+            },
+            centralizedStationList: [], // 设备集中站列表
+            ciStationList: [] // 联锁站列表
         };
     },
     computed: {
@@ -293,20 +295,6 @@ export default {
             }
             return list;
         },
-        centralizedStationList() {
-            let list = [];
-            list = this.stationList.filter(station=>{
-                return station.centralized;
-            });
-            return list;
-        },
-        ciStationList() {
-            let list = [];
-            list = this.stationList.filter(station=> {
-                return station.ciStation;
-            });
-            return list;
-        },
         form() {
             return {
                 labelWidth: '150px',
@@ -426,6 +414,12 @@ export default {
         });
     },
     methods: {
+        handleInit() {
+            if (this.stationList && this.stationList.length) {
+                this.centralizedStationList = this.stationList.filter(station=> station.centralized);
+                this.ciStationList = this.stationList.filter(station=> station.ciStation);
+            }
+        },
         hover(field) {
             this.field = field == this.field ? '' : field;
             this.signalSectionCode(this.field);
@@ -435,12 +429,13 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
-            if (selected && selected._type.toUpperCase() == 'Signal'.toUpperCase() && (this.field != 'selectSingalCode' && this.field != 'signalCodesType' && this.field != 'signalIgnoreRouteEnd' && this.field != 'signalCodes')) {
+            if (selected && selected._type == 'Signal' && (this.field != 'selectSingalCode' && this.field != 'signalCodesType' && this.field != 'signalIgnoreRouteEnd' && this.field != 'signalCodes')) {
+                this.handleInit();
                 this.editModel = getModel('Signal');
                 this.$refs.dataform && this.$refs.dataform.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
-            } else if (selected && selected._type.toUpperCase() == 'Section'.toUpperCase() && this.field == 'selectSingalCode') {
+            } else if (selected && selected._type == 'Section' && this.field == 'selectSingalCode') {
                 if (selected.type == '01' || selected.type === '03') {
                     this.$refs.createSignal.setSectionCode(selected.code);
                 } else if (selected.type == '02') {
@@ -464,12 +459,12 @@ export default {
                     this.signalStationModel.signalLists.push(selected.code);
                 }
                 this.activeName = 'three';
-            } else if (selected && selected._type === 'Signal' && this.field == 'signalIgnoreRouteEnd') {
+            } else if (selected && selected._type == 'Signal' && this.field == 'signalIgnoreRouteEnd') {
                 if (!this.editModel.ignoreRouteEnd.includes(selected.code) && this.editModel.code != selected.code) {
                     this.editModel.ignoreRouteEnd.push(selected.code);
                 }
                 this.activeName = 'first';
-            } else if (selected && selected._type === 'Signal' && this.field == 'signalCodes') {
+            } else if (selected && selected._type == 'Signal' && this.field == 'signalCodes') {
                 if (!this.ciModelForm.signalList.includes(selected.code)) {
                     this.ciModelForm.signalList.push(selected.code);
                 }

src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue

@@ -21,7 +21,8 @@ export default {
     },
     data() {
         return {
-            editModel: getModel('Switch')
+            editModel: getModel('Switch'),
+            centralizedStationList: []
         };
     },
     computed: {
@@ -98,21 +99,27 @@ export default {
             'switchList',
             'stationList',
             'lineCode'
-        ]),
+        ])
-        centralizedStationList() {
+        // centralizedStationList() {
-            let list = [];
+        //     let list = [];
-            list = this.stationList.filter(station=>{
+        //     list = this.stationList.filter(station=>{
-                return station.centralized;
+        //         return station.centralized;
-            });
+        //     });
-            return list;
+        //     return list;
-        }
+        // }
     },
     methods:{
+        handleInit() {
+            if (this.stationList && this.stationList.length) {
+                this.centralizedStationList = this.stationList.filter(station=> station.centralized );
+            }
+        },
         deviceChange(code) {
             this.$emit('setCenter', code);
             this.setModel(this.$store.getters['map/getDeviceByCode'](code));
         },
         setModel(data) {
+            this.handleInit();
             this.$refs.dataform && this.$refs.dataform.resetFields();
             this.editModel = deepAssign(this.editModel, data);
         },

src/views/planMonitor/detail.vue

@@ -5,7 +5,7 @@
       <el-button v-if="isCreate" size="mini" type="primary" class="createRunPlan" @click="handleCreate">{{ $t('planMonitor.createRunningDiagram') }}</el-button>
     </div>
     <!--<QueryListPage ref="queryListPage" :query-form="queryForm" :pager-config="pagerConfig" :query-list="queryList" style="width: 91%;margin-left:4%;margin-top:20px;" />-->
-    <el-card v-loading="loading" style="width: 91%;margin-left:4%;margin-top:20px;">
+    <el-card v-loading="loading" style="width: 91%;margin-left:4%;margin-top:20px;padding:50px">
       <el-table
         :data="runPlanList"
         highlight-current-row

src/views/publish/publishMap/exportMap.vue

@@ -65,7 +65,7 @@ export default {
                 const url = urlObject.createObjectURL(content);
                 const el = document.createElement('a');
                 el.href = url;
-                el.download = `${this.row.name}.json`;
+                el.download = `综合-${this.row.name}.json`;
                 el.click();
                 urlObject.revokeObjectURL(url);
                 this.$set(this.row, 'loading' + this.idx, false);

src/views/publish/publishMap/index.vue

@@ -309,7 +309,7 @@ export default {
                 const url = urlObject.createObjectURL(content);
                 const el = document.createElement('a');
                 el.href = url;
-                el.download = `${resultData.name}.json`;
+                el.download = `地图-${resultData.name}.json`;
                 el.click();
                 urlObject.revokeObjectURL(url);
                 this.$set(row, 'loading' + idx, false);

src/views/scriptManage/conditionManage.vue

@@ -1,8 +1,9 @@
 <template>
   <div v-if="dialogVisible" v-quickMenuDrag class="reminder-drag">
     <div style="width: 100%;text-align: center;font-size: 18px;padding-top: 8px;">条件管理</div>
-    <i style="position: relative;top: -25px;right: -370px;font-size: 20px;" class="el-icon-close" @click="handleClose" />
+    <i style="position: relative;top: -25px;right: -370px;font-size: 20px;cursor: pointer;" class="el-icon-close" @click="handleClose" />
-    <el-tabs v-model="activeName">
+    <div @mousedown="handleMouseDown">
+      <el-tabs v-model="activeName" style="cursor: default;">
         <el-tab-pane label="列车触发" name="first">
           <div>
             <el-table
@@ -77,9 +78,10 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="延时触发" name="second">
-        <div style="text-align: center;">
+          <div style="text-align: center;height: 480px;">
-          <div style="display: inline-block;margin-right: 10px;font-size: 14px;">延时条件</div>
+            <div style="display: inline-block;margin-right: 10px;font-size: 14px;">延时时间</div>
             <el-input-number v-model="delay" size="small" controls-position="right" :min="0" />
+            <span>s</span>
             <div style="margin-top: 10px;">
               <el-button type="primary" size="mini" @click="onUpdateDelay">修改</el-button>
             </div>
@@ -87,10 +89,11 @@
         </el-tab-pane>
       </el-tabs>
     </div>
+  </div>
 </template>
 
 <script>
-import { updateActionCondition, getActionCondition } from '@/api/script';
+import { updateActionCondition } from '@/api/script';
 import { mapGetters } from 'vuex';
 export default {
     name: 'ConditionManage',
@@ -120,7 +123,8 @@ export default {
             updateIndex: '',
             field: '',
             delay: 0,
-            activeName: 'first'
+            activeName: 'first',
+            actionInfo: {}
         };
     },
     computed: {
@@ -138,21 +142,18 @@ export default {
         }
     },
     methods:{
-        doShow(actionId) {
+        doShow(actionInfo) {
-            if (this.actionId === actionId && this.dialogVisible) {
+            this.actionInfo = actionInfo;
+            if (this.actionId === actionInfo.id && this.dialogVisible) {
                 this.handleClose();
             } else {
                 this.tableData = [];
                 this.delay = 0;
-                this.actionId = actionId;
+                this.actionId = actionInfo.id;
-                getActionCondition(this.$route.query.group, this.actionId).then(resp => {
+                if (this.actionInfo.condition) {
-                    if (resp.data) {
+                    this.tableData = [...(this.actionInfo.condition.trainStatuses || [])];
-                        this.tableData = resp.data.trainStatuses;
+                    this.delay = (this.actionInfo.condition.delay || 0) / 1000;
-                        this.delay = (resp.data.delay || 0) / 1000;
                 }
-                }).catch(()=> {
-                    this.$message.error('获取条件失败');
-                });
                 this.dialogVisible = true;
             }
         },
@@ -174,6 +175,9 @@ export default {
                 return '/';
             }
         },
+        handleMouseDown(e) {
+            e.stopPropagation();
+        },
         handleEdit(index, row) {
             this.updateIndex = index;
             this.update = true;
@@ -190,6 +194,10 @@ export default {
             }
             updateActionCondition(this.$route.query.group, this.actionId, param).then(resp => {
                 this.tableData = data;
+                this.actionInfo.condition = {
+                    trainStatuses: data,
+                    delay:this.delay * 1000
+                };
                 this.initData();
                 this.$message.success('删除条件成功');
             }).catch(()=>{
@@ -207,6 +215,10 @@ export default {
                     }
                     updateActionCondition(this.$route.query.group, this.actionId, param).then(resp => {
                         this.tableData = data;
+                        this.actionInfo.condition = {
+                            trainStatuses: data,
+                            delay:this.delay * 1000
+                        };
                         this.initData();
                         this.$message.success('修改条件成功');
                     }).catch(()=>{
@@ -221,6 +233,10 @@ export default {
                 param.delay = this.delay * 1000;
             }
             updateActionCondition(this.$route.query.group, this.actionId, param).then(resp => {
+                this.actionInfo.condition = {
+                    trainStatuses: [...this.tableData],
+                    delay:this.delay * 1000
+                };
                 this.initData();
                 this.$message.success('修改条件成功');
             }).catch(()=>{
@@ -230,7 +246,10 @@ export default {
         initData() {
             this.update = false;
             this.updateIndex = '';
+            this.field = '';
             this.$refs.form && this.$refs.form.resetFields();
+            this.formModel.stop = '';
+            this.actionInfo = {};
         },
         onCommit() {
             this.$refs.form.validate((valid) => {
@@ -243,6 +262,10 @@ export default {
                     }
                     updateActionCondition(this.$route.query.group, this.actionId, param).then(resp => {
                         this.tableData = data;
+                        this.actionInfo.condition = {
+                            trainStatuses: data,
+                            delay:this.delay * 1000
+                        };
                         this.initData();
                         this.$message.success('添加条件成功');
                     }).catch(()=>{

src/views/scriptManage/getAction.vue

@@ -43,7 +43,7 @@
             </span>
           </div>
           <div class="btnGroup">
-            <el-button :type="conditionActionId === actionInfo.id? 'danger':'primary'" size="mini" @click="handleCondition(actionInfo)">{{ conditionActionId === actionInfo.id? '关闭条件':'触发条件' }}</el-button>
+            <el-button :type="conditionActionId === actionInfo.id? 'danger':'primary'" size="mini" @click="handleCondition(actionInfo)">{{ getConditionNum(actionInfo.condition) }}</el-button>
             <el-button v-if="actionInfo.visible && !actionInfo.isModify" type="primary" size="mini" style="margin-left:10px;" @click="modifyAction(actionInfo)">{{ $t('scriptRecord.modifyConversitionButton') }}</el-button>
             <el-button v-if="actionInfo.visible && actionInfo.isModify" :loading="modifyTextLoading" type="danger" size="mini" style="margin-left:10px;" @click="confirmModify(actionInfo)">确定</el-button>
             <el-button v-if="actionInfo.visible && actionInfo.isModify" type="" size="mini" style="margin-left:10px;" @click="cancleModify(actionInfo)">取消</el-button>
@@ -120,7 +120,7 @@ export default {
             } else {
                 this.conditionActionId = actionInfo.id;
             }
-            this.$emit('showConditionManage', actionInfo.id);
+            this.$emit('showConditionManage', actionInfo);
         },
         covertData(memberList, element) {
             const member = memberList.find(elem=>{ return elem.id == element.memberId; });
@@ -144,16 +144,16 @@ export default {
                     });
                 }
 
-                this.actionInfoList.push({id: element.id, isStartCoversition: true, memberName: memberName, targetName:targetNameList.toString() });
+                this.actionInfoList.push({id: element.id, isStartCoversition: true, memberName: memberName, targetName:targetNameList.toString(), condition: element.condition });
                 break;
             }
             case 'Drive': {
-                this.actionInfoList.push({id: element.id, isDrive: true, memberName: memberName, targetName:this.covertSection(element.targetSectionCode)});
+                this.actionInfoList.push({id: element.id, isDrive: true, memberName: memberName, targetName:this.covertSection(element.targetSectionCode), condition: element.condition});
                 break;
             }
             case 'Conversation':
             {
-                this.actionInfoList.push({id: element.id, isCoversition: true, memberName: memberName, reply: element.content, row: element, visible: true, isModify:false, modifyText:''});
+                this.actionInfoList.push({id: element.id, isCoversition: true, memberName: memberName, reply: element.content, row: element, visible: true, isModify:false, modifyText:'', condition: element.condition});
                 break;
             }
             // case 'Exit_Conversation': {
@@ -199,16 +199,16 @@ export default {
                     if (operateName) {
                         const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车'};
                         const operateTypeName = deviceTypeList[operateType];
-                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false});
+                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false, condition: element.condition});
                     }
                 } else {
                     // deviceFaultType
                     // element.operationParamMap.faultType;
                     // '(' + operateName.label + ')'
                     if (commandName == 'Set_Fault') {
-                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '设置故障', row: element, visible: false});
+                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '设置故障', row: element, visible: false, condition: element.condition});
                     } else if (commandName == 'Cancel_Fault') {
-                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '取消故障', row: element, visible: false});
+                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '取消故障', row: element, visible: false, condition: element.condition});
                     }
                 }
                 break;
@@ -225,7 +225,7 @@ export default {
                     Open_Or_Close_Door:'开关门',
                     Switch_Hook_Lock: '道岔钩锁'
                 };
-                this.actionInfoList.push({id: element.id, isCommand: true, memberName: memberName, command: CommandList[element.commandInitiateVO.commandType], targetName:targetName.name, row: element, visible: false});
+                this.actionInfoList.push({id: element.id, isCommand: true, memberName: memberName, command: CommandList[element.commandInitiateVO.commandType], targetName:targetName.name, row: element, visible: false, condition: element.condition});
                 break;
             }
             }
@@ -305,6 +305,16 @@ export default {
                 this.deleteLoading = false;
                 this.$messageBox('删除会话/动作失败：' + error.message);
             });
+        },
+        getConditionNum(condition) {
+            let num = 0;
+            if (condition && condition.trainStatuses) {
+                num = num + condition.trainStatuses.length;
+            }
+            if (condition && condition.delay) {
+                num = num + 1;
+            }
+            return `触发条件(${num})`;
         }
     }
 };

src/views/scriptManage/home.vue

@@ -7,7 +7,7 @@
         导入剧本
       </el-button>
     </div>
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 91%;margin-left:4%;margin-top:20px;" />
+    <QueryListPage ref="queryListPage" :card-padding="50" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 91%;margin-left:4%;margin-top:20px;" />
     <script-publish ref="publishScript" :title="$t('scriptRecord.publishScript')" @reloadTable="reloadTable" @create="handleConfirmPublish" />
     <create-script ref="createScript" :title="$t('scriptRecord.createScript')" @reloadTable="reloadTable" @create="handleConfirmCreate" />
     <create-script ref="modifyScript" :title="$t('scriptRecord.modifyScript')" @reloadTable="reloadTable" @create="handleConfirmModify" />
@@ -293,7 +293,7 @@ export default {
                 const url = urlObject.createObjectURL(content);
                 const el = document.createElement('a');
                 el.href = url;
-                el.download = `${resultData.name}.json`;
+                el.download = `剧本-${resultData.name}.json`;
                 el.click();
                 urlObject.revokeObjectURL(url);
             });

src/views/scriptManage/tipScriptRecord.vue

@@ -412,7 +412,7 @@ export default {
                 type: 'warning'
             }).then(() => {
                 dumpScriptDataNew(group).then(resp => {
-                    this.$parent.resetBeginTime();
+                    // this.$parent.resetBeginTime();
                     this.$refs['getAction'].loadInitData();
                     this.$store.dispatch('training/updateMemberListInScript',
                         {
@@ -440,6 +440,7 @@ export default {
                     this.oldMember = {id:this.orignalUserRoleId, type:new_member.type};
                     this.$message.success(this.$t('scriptRecord.resetDataSuccess'));
                 }).catch(() => {
+                    // console.log(error);
                     this.$messageBox(this.$t('scriptRecord.resetDataFail'));
                 });
             });
@@ -560,8 +561,8 @@ export default {
                 this.$messageBox(error.message);
             });
         },
-        showConditionManage(actionId) {
+        showConditionManage(actionInfo) {
-            this.$refs.conditionManage.doShow(actionId);
+            this.$refs.conditionManage.doShow(actionInfo);
         },
         clearConditionActionId() {
             this.$refs.getAction.conditionActionId = '';