diff --git a/package.json b/package.json
index 4373cc9e3..80eb50f30 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
   },
   "dependencies": {
     "axios": "^0.18.0",
+    "dayjs": "^1.11.5",
     "echarts": "^4.7.0",
     "element-ui": "^2.12.0",
     "file-saver": "^1.3.3",
diff --git a/src/App.vue b/src/App.vue
index 358854bc8..f470f2486 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import { getToken } from '@/utils/auth';
+import { getToken, getUserIdKey } from '@/utils/auth';
 import { getSessionStorage } from '@/utils/auth';
 import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig';
 import DeomonTopic from '@/views/demonstration/deomonTopic';
@@ -88,6 +88,15 @@ export default {
                 await this.$store.dispatch('preLogout');
             }
         });
+        window.addEventListener('storage', e => {
+            if (this.$route.path.includes('trainingDesign') || this.$route.path.includes('trainingPreview')) {
+                if (e.key == getUserIdKey('nextNew')) {
+                    const operate = JSON.parse(e.newValue);
+                    this.$store.dispatch('training/nextNew', operate);
+                }
+            }
+
+        });
         this.$nextTick(() => {
             openIndexedDB();
         });
diff --git a/src/api/audioResources.js b/src/api/audioResources.js
index 8e35efc71..efb1ef4da 100644
--- a/src/api/audioResources.js
+++ b/src/api/audioResources.js
@@ -47,3 +47,11 @@ export function uploadAudio(file) {
         upload: true
     });
 }
+// 生成音频文件
+export function generateAudio(data) {
+    return request({
+        url: `/api/audioResources/generate`,
+        method: 'post',
+        data
+    });
+}
diff --git a/src/api/disStation.js b/src/api/disStation.js
new file mode 100644
index 000000000..06e66e04a
--- /dev/null
+++ b/src/api/disStation.js
@@ -0,0 +1,33 @@
+import request from '@/utils/request';
+
+// 创建调度台逻辑数据
+export function createDisStation(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/disStation`,
+        method: 'post',
+        data
+    });
+}
+// 更新调度台逻辑数据
+export function updateDisStation(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/disStation`,
+        method: 'put',
+        data
+    });
+}
+// 删除调度台逻辑数据
+export function deleteDisStation(mapId, code) {
+    return request({
+        url: `/api/draftMap/${mapId}/disStation/${code}`,
+        method: 'delete'
+    });
+}
+// 获取调度台逻辑数据
+export function getDisStationList(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/disStation/page`,
+        method: 'post',
+        data
+    });
+}
diff --git a/src/api/jmap/training.js b/src/api/jmap/training.js
index 144fa9c0d..a721b0a3d 100644
--- a/src/api/jmap/training.js
+++ b/src/api/jmap/training.js
@@ -221,7 +221,7 @@ export function loadPublishTraining(group, trainingId) {
 /** 加载草稿实训 */
 export function loadDraftTraining(group, trainingId) {
     return request({
-        url: ` /api/training2Simulation/${group}/load/draft/${trainingId}`,
+        url: `/api/training2Simulation/${group}/load/draft/${trainingId}`,
         method: 'post'
     });
 }
@@ -247,3 +247,10 @@ export function endTrainingStep(group, stepId) {
         method: 'put'
     });
 }
+/** 编制剧本的时候加载背景 */
+export function loadTrainingBg(group, trainingId) {
+    return request({
+        url: `/api/training2Simulation/${group}/draw/${trainingId}`,
+        method: 'post'
+    });
+}
diff --git a/src/api/management/user.js b/src/api/management/user.js
index d60c532ae..6de390470 100644
--- a/src/api/management/user.js
+++ b/src/api/management/user.js
@@ -238,3 +238,34 @@ export function registerUser(data) {
         data
     });
 }
+/** 超管重置用户密码 */
+export function adminResetUserPassword(userId) {
+    return request({
+        url: `/api/userinfo/${userId}/reset/pwd`,
+        method: 'put'
+    });
+}
+/** 找回密码 */
+export function findPassword(data) {
+    return request({
+        url: `/api/userinfo/retrieve/pwd`,
+        method: 'put',
+        data
+    });
+}
+/** 发送手机验证码 */
+export function sendPhoneVfcode(data) {
+    return request({
+        url: '/api/userinfo/mobile/code',
+        method: 'post',
+        data
+    });
+}
+/** 发送邮箱验证码 */
+export function sendEmailVfcode(params) {
+    return request({
+        url: '/api/userinfo/email/code',
+        method: 'post',
+        params
+    });
+}
diff --git a/src/api/simulation.js b/src/api/simulation.js
index c57475dd0..9d14b4848 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -529,3 +529,11 @@ export function getRobotDrivingParam(simulationId, groupNumber) {
         method: 'get'
     });
 }
+/** 查询所有pa系统的定时播放任务 */
+export function queryPaTimedList(group, params) {
+    return request({
+        url: `/simulation/${group}/iscs/paTimedPlay`,
+        method: 'get',
+        params
+    });
+}
diff --git a/src/api/trainingManage.js b/src/api/trainingManage.js
index 9af992810..4d087f9ef 100644
--- a/src/api/trainingManage.js
+++ b/src/api/trainingManage.js
@@ -40,9 +40,10 @@ export function getTrainingStepList(trainingId) {
     });
 }
 /** 修改实训所有步骤 */
-export function updateTrainingStep(id, data) {
+export function updateTrainingStep(group, trainingId, data) {
+    console.log(group, trainingId, '*******');
     return request({
-        url: `/api/v2/draft/training/${id}/step/update`,
+        url: `/api/v2/draft/training/${group}/${trainingId}/step/update`,
         method: 'put',
         data: data
     });
@@ -63,6 +64,22 @@ export function publishTraining(data) {
         data
     });
 }
+/** 查询实现草稿发布轨迹 */
+export function draftPubTrace(data) {
+    return request({
+        url: `/api/v2/training/draft/pub/trace/find/page`,
+        method: 'post',
+        data
+    });
+}
+/** 删除草稿发布轨迹 */
+export function deleteTrace(data) {
+    return request({
+        url: `/api/v2/training/draft/pub/trace`,
+        method: 'delete',
+        data
+    });
+}
 /** 更新当前用户的某个实训草稿的大字段信息 */
 export function updateTrainingContent(data) {
     return request({
@@ -81,7 +98,7 @@ export function getTrainingAll(trainingId) {
 /** 单独更新当前用户的某个实训草稿的初始背景 */
 export function updateTrainingBackgroud(data) {
     return request({
-        url: `/api/v2/draft/training/update/content/backgroud`,
+        url: `/api/v2/draft/training/update/content/background`,
         method: 'post',
         data
     });
@@ -94,3 +111,51 @@ export function updateTrainingMaplocation(data) {
         data
     });
 }
+
+/** 获取实训表达式条件素材 */
+export function getTrainingMaterials() {
+    return request({
+        url: `/api/v2/draft/training/expression/materials`,
+        method: 'get'
+    });
+}
+
+/** 获取实训所有成员 */
+export function getTrainingMmembers(trainingId) {
+    return request({
+        url: `/api/v2/draft/training/${trainingId}/member/list`,
+        method: 'get'
+    });
+}
+
+/** 获取实训所有参与者 */
+export function getTrainingPlayers(trainingId) {
+    return request({
+        url: `/api/v2/draft/training/${trainingId}/player/list`,
+        method: 'get'
+    });
+}
+
+/** 更新所有评分规则*/
+export function updateTrainingGradeRules(trainingId, data) {
+    return request({
+        url: `/api/v2/draft/training/${trainingId}/scoringRule/list`,
+        method: 'put',
+        data: data
+    });
+}
+
+/** 获取所有评分规则 */
+export function getTrainingGradeRules(trainingId) {
+    return request({
+        url: `/api/v2/draft/training/${trainingId}/scoringRule/list`,
+        method: 'get'
+    });
+}
+/** 清空步骤 */
+export function clearTrainingStep(trainingId) {
+    return request({
+        url: `/api/v2/draft/training/${trainingId}/step/clear`,
+        method: 'delete'
+    });
+}
diff --git a/src/assets/icon/favicon_hhzy.png b/src/assets/icon/favicon_hhzy.png
new file mode 100644
index 000000000..5fd6d6d7c
Binary files /dev/null and b/src/assets/icon/favicon_hhzy.png differ
diff --git a/src/assets/pis/train.png b/src/assets/pis/train.png
new file mode 100644
index 000000000..7926be040
Binary files /dev/null and b/src/assets/pis/train.png differ
diff --git a/src/i18n/langs/en/trainingManage.js b/src/i18n/langs/en/trainingManage.js
index 4c414f914..e4347f399 100644
--- a/src/i18n/langs/en/trainingManage.js
+++ b/src/i18n/langs/en/trainingManage.js
@@ -10,6 +10,7 @@ export default {
     modify: 'modify',
     delete: 'delete',
     publish: 'publish',
+    publishTrack: 'track',
     preview: 'preview',
     mapLocation: 'Save map positioning',
     saveBackground: 'Save Background',
@@ -21,5 +22,11 @@ export default {
     createStepInfo: 'Creating Procedure Information',
     editStepInfo: 'Modifying Step Information',
     saveStepData: 'Save Step Information',
-    roleSelect: 'role choices'
+    roleSelect: 'role choices',
+    triggerCondition: 'triggering condition',
+    operateCondition: 'Associated operation',
+    completionCondition: 'completion conditions',
+    editCompletionCondition: 'Edit completion conditions',
+    editOperationCondition: 'Edit operation condition',
+    gradeRules:'Grade rules'
 };
diff --git a/src/i18n/langs/zh/trainingManage.js b/src/i18n/langs/zh/trainingManage.js
index b84cbb897..af18d55a5 100644
--- a/src/i18n/langs/zh/trainingManage.js
+++ b/src/i18n/langs/zh/trainingManage.js
@@ -10,6 +10,7 @@ export default {
     modify: '修改',
     delete: '删除',
     publish: '发布',
+    publishTrack: '发布轨迹',
     preview: '预览',
     mapLocation: '保存地图定位',
     saveBackground: '保存背景',
@@ -21,5 +22,11 @@ export default {
     createStepInfo: '创建步骤信息',
     editStepInfo: '修改步骤信息',
     saveStepData: '保存步骤',
-    roleSelect: '角色选择'
+    roleSelect: '角色选择',
+    triggerCondition: '触发条件',
+    operateCondition: '关联操作',
+    completionCondition: '完成条件',
+    editCompletionCondition: '编辑完成条件',
+    editOperationCondition: '编辑运算条件',
+    gradeRules:'评分'
 };
diff --git a/src/ibp/shape/clock.js b/src/ibp/shape/clock.js
index 259f9727e..84b268d68 100644
--- a/src/ibp/shape/clock.js
+++ b/src/ibp/shape/clock.js
@@ -1,258 +1,159 @@
-import Group from 'zrender/src/container/Group';
-import Image from 'zrender/src/graphic/Image';
-import clock0 from '@/assets/ibp_images/clock/clock_0.png';
-import clock1 from '@/assets/ibp_images/clock/clock_1.png';
-import clock2 from '@/assets/ibp_images/clock/clock_2.png';
-import clock3 from '@/assets/ibp_images/clock/clock_3.png';
-import clock4 from '@/assets/ibp_images/clock/clock_4.png';
-import clock5 from '@/assets/ibp_images/clock/clock_5.png';
-import clock6 from '@/assets/ibp_images/clock/clock_6.png';
-import clock7 from '@/assets/ibp_images/clock/clock_7.png';
-import clock8 from '@/assets/ibp_images/clock/clock_8.png';
-import clock9 from '@/assets/ibp_images/clock/clock_9.png';
-import clockBg from '@/assets/ibp_images/clock/clock_bg.png';
-import clockColon from '@/assets/ibp_images/clock/clock_colon.png';
+import Group from 'zrender/src/container/Group'
+import Image from 'zrender/src/graphic/Image'
+import clock0 from '@/assets/ibp_images/clock/clock_0.png'
+import clock1 from '@/assets/ibp_images/clock/clock_1.png'
+import clock2 from '@/assets/ibp_images/clock/clock_2.png'
+import clock3 from '@/assets/ibp_images/clock/clock_3.png'
+import clock4 from '@/assets/ibp_images/clock/clock_4.png'
+import clock5 from '@/assets/ibp_images/clock/clock_5.png'
+import clock6 from '@/assets/ibp_images/clock/clock_6.png'
+import clock7 from '@/assets/ibp_images/clock/clock_7.png'
+import clock8 from '@/assets/ibp_images/clock/clock_8.png'
+import clock9 from '@/assets/ibp_images/clock/clock_9.png'
+import clockBg from '@/assets/ibp_images/clock/clock_bg.png'
+import clockColon from '@/assets/ibp_images/clock/clock_colon.png'
+import { timestampFormat } from '@/utils/date'
+
+const pics = [clock0, clock1, clock2, clock3, clock4, clock5, clock6, clock7, clock8, clock9]
 
 export default class clock extends Group {
-    constructor(device) {
-        super();
-        this._type = device.model._type;
-        this._code = device.model.code;
-        this.model = device.model;
-        this.zlevel = device.model.zlevel;
-        this.z = device.model.z;
-        this.initTime = 0;
-        this.create();
-
-    }
-    create() {
-        this.grouper = new Group({
-            id: this.model.code,
-            position: [this.model.point.x, this.model.point.y]
-        });
-        this.clockBg = new Image({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                image: clockBg,
-                x: 0,
-                y: 0,
-                width: this.model.width,
-                height: this.model.width / 493 * 156
-            }
-        });
-        this.num1 = new Image({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                image: this.getImagePic('0'),
-                x: this.model.width * 0.098,
-                y: this.model.width * 0.062,
-                width: this.model.width * 0.095,
-                height: this.model.width * 0.095 / 37 * 74
-            }
-        });
-        this.num2 = new Image({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                image: this.getImagePic('0'),
-                x: this.model.width * 0.22,
-                y: this.model.width * 0.062,
-                width: this.model.width * 0.095,
-                height: this.model.width * 0.095 / 37 * 74
-            }
-        });
-        this.num3 = new Image({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                image: this.getImagePic('0'),
-                x: this.model.width * 0.395,
-                y: this.model.width * 0.062,
-                width: this.model.width * 0.095,
-                height: this.model.width * 0.095 / 37 * 74
-            }
-        });
-        this.num4 = new Image({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                image: this.getImagePic('0'),
-                x: this.model.width * 0.52,
-                y: this.model.width * 0.062,
-                width: this.model.width * 0.095,
-                height: this.model.width * 0.095 / 37 * 74
-            }
-        });
-        this.num5 = new Image({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                image: this.getImagePic('0'),
-                x: this.model.width * 0.69,
-                y: this.model.width * 0.062,
-                width: this.model.width * 0.095,
-                height: this.model.width * 0.095 / 37 * 74
-            }
-        });
-        this.num6 = new Image({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                image: this.getImagePic('0'),
-                x: this.model.width * 0.816,
-                y: this.model.width * 0.062,
-                width: this.model.width * 0.095,
-                height: this.model.width * 0.095 / 37 * 74
-            }
-        });
-        this.clockColon1 = new Image({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                image: clockColon,
-                x: +this.model.width * 0.183,
-                y: -this.model.width * 0.017,
-                width: this.model.width * 0.34,
-                height: this.model.width / 1 * 0.34
-            }
-        });
-        this.clockColon2 = new Image({
-            zlevel: this.zlevel,
-            z: this.z,
-            style: {
-                image: clockColon,
-                x: +this.model.width * 0.48,
-                y: -this.model.width * 0.017,
-                width: this.model.width * 0.34,
-                height: this.model.width / 1 * 0.34
-            }
-        });
-        this.grouper.add(this.clockBg);
-        this.grouper.add(this.num1);
-        this.grouper.add(this.num2);
-        this.grouper.add(this.num3);
-        this.grouper.add(this.num4);
-        this.grouper.add(this.num5);
-        this.grouper.add(this.num6);
-        this.grouper.add(this.clockColon1);
-        this.grouper.add(this.clockColon2);
-        this.add(this.grouper);
-    }
-    getImagePic(context) {
-        let pic = clock0;
-        switch (context) {
-        case '0':
-            pic = clock0;
-            break;
-        case '1':
-            pic = clock1;
-            break;
-        case '2':
-            pic = clock2;
-            break;
-        case '3':
-            pic = clock3;
-            break;
-        case '4':
-            pic = clock4;
-            break;
-        case '5':
-            pic = clock5;
-            break;
-        case '6':
-            pic = clock6;
-            break;
-        case '7':
-            pic = clock7;
-            break;
-        case '8':
-            pic = clock8;
-            break;
-        case '9':
-            pic = clock9;
-            break;
-        }
-        return pic;
-    }
-    setClockStart(started) {
-        const _this = this;
-        if (started) {
-            this.timer && clearInterval(this.timer);
-            this.timer = setInterval(() => {
-                _this.handleClock(_this);
-            }, 1000);
-        } else {
-            this.timer && clearInterval(this.timer);
-        }
-    }
-    handleClock(_this) {
-        _this.initTime += 1;
-        let seconds = this.initTime % 60 + '';
-        let minutes = Math.floor(this.initTime / 60) % 60 + '';
-        let hours = Math.floor(this.initTime / 3600) + '';
-        if (seconds.length < 2) {
-            seconds = '0' + seconds;
-        }
-        if (minutes.length < 2) {
-            minutes = '0' + minutes;
-        }
-        if (hours.length < 2) {
-            hours = '0' + hours;
-        }
-        _this.setNumPic(6, seconds.charAt(1));
-        _this.setNumPic(5, seconds.charAt(0));
-        _this.setNumPic(4, minutes.charAt(1));
-        _this.setNumPic(3, minutes.charAt(0));
-        _this.setNumPic(2, hours.charAt(1));
-        _this.setNumPic(1, hours.charAt(0));
-    }
-    setNumPic(num, context) {
-        switch (num) {
-        case 1:
-            this.num1.setStyle('image', this.getImagePic(context));
-            break;
-        case 2:
-            this.num2.setStyle('image', this.getImagePic(context));
-            break;
-        case 3:
-            this.num3.setStyle('image', this.getImagePic(context));
-            break;
-        case 4:
-            this.num4.setStyle('image', this.getImagePic(context));
-            break;
-        case 5:
-            this.num5.setStyle('image', this.getImagePic(context));
-            break;
-        case 6:
-            this.num6.setStyle('image', this.getImagePic(context));
-        }
-    }
-    setClockTime(initTime) {
-        this.initTime = initTime;
-        let seconds = this.initTime % 60 + '';
-        let minutes = Math.floor(this.initTime / 60) % 60 + '';
-        let hours = Math.floor(this.initTime / 3600) + '';
-        if (seconds.length < 2) {
-            seconds = '0' + seconds;
-        }
-        if (minutes.length < 2) {
-            minutes = '0' + minutes;
-        }
-        if (hours.length < 2) {
-            hours = '0' + hours;
-        }
-        this.setNumPic(6, seconds.charAt(1));
-        this.setNumPic(5, seconds.charAt(0));
-        this.setNumPic(4, minutes.charAt(1));
-        this.setNumPic(3, minutes.charAt(0));
-        this.setNumPic(2, hours.charAt(1));
-        this.setNumPic(1, hours.charAt(0));
-        this.setClockStart(true);
-    }
-    setModel(dx, dy) {
-        this.model.point.x += dx;
-        this.model.point.y += dy;
-    }
+  constructor(device) {
+    super()
+    this._type = device.model._type
+    this._code = device.model.code
+    this.model = device.model
+    this.zlevel = device.model.zlevel
+    this.z = device.model.z
+    this.initTime = 0
+    this.create()
+  }
+  create() {
+    this.grouper = new Group({
+      id: this.model.code,
+      position: [this.model.point.x, this.model.point.y],
+    })
+    this.clockBg = new Image({
+      zlevel: this.zlevel,
+      z: this.z,
+      style: {
+        image: clockBg,
+        x: 0,
+        y: 0,
+        width: this.model.width,
+        height: (this.model.width / 493) * 156,
+      },
+    })
+    this.num1 = new Image({
+      zlevel: this.zlevel,
+      z: this.z,
+      style: {
+        image: pics[0],
+        x: this.model.width * 0.098,
+        y: this.model.width * 0.062,
+        width: this.model.width * 0.095,
+        height: ((this.model.width * 0.095) / 37) * 74,
+      },
+    })
+    this.num2 = new Image({
+      zlevel: this.zlevel,
+      z: this.z,
+      style: {
+        image: pics[0],
+        x: this.model.width * 0.22,
+        y: this.model.width * 0.062,
+        width: this.model.width * 0.095,
+        height: ((this.model.width * 0.095) / 37) * 74,
+      },
+    })
+    this.num3 = new Image({
+      zlevel: this.zlevel,
+      z: this.z,
+      style: {
+        image: pics[0],
+        x: this.model.width * 0.395,
+        y: this.model.width * 0.062,
+        width: this.model.width * 0.095,
+        height: ((this.model.width * 0.095) / 37) * 74,
+      },
+    })
+    this.num4 = new Image({
+      zlevel: this.zlevel,
+      z: this.z,
+      style: {
+        image: pics[0],
+        x: this.model.width * 0.52,
+        y: this.model.width * 0.062,
+        width: this.model.width * 0.095,
+        height: ((this.model.width * 0.095) / 37) * 74,
+      },
+    })
+    this.num5 = new Image({
+      zlevel: this.zlevel,
+      z: this.z,
+      style: {
+        image: pics[0],
+        x: this.model.width * 0.69,
+        y: this.model.width * 0.062,
+        width: this.model.width * 0.095,
+        height: ((this.model.width * 0.095) / 37) * 74,
+      },
+    })
+    this.num6 = new Image({
+      zlevel: this.zlevel,
+      z: this.z,
+      style: {
+        image: pics[0],
+        x: this.model.width * 0.816,
+        y: this.model.width * 0.062,
+        width: this.model.width * 0.095,
+        height: ((this.model.width * 0.095) / 37) * 74,
+      },
+    })
+    this.clockColon1 = new Image({
+      zlevel: this.zlevel,
+      z: this.z,
+      style: {
+        image: clockColon,
+        x: +this.model.width * 0.183,
+        y: -this.model.width * 0.017,
+        width: this.model.width * 0.34,
+        height: (this.model.width / 1) * 0.34,
+      },
+    })
+    this.clockColon2 = new Image({
+      zlevel: this.zlevel,
+      z: this.z,
+      style: {
+        image: clockColon,
+        x: +this.model.width * 0.48,
+        y: -this.model.width * 0.017,
+        width: this.model.width * 0.34,
+        height: (this.model.width / 1) * 0.34,
+      },
+    })
+    this.grouper.add(this.clockBg)
+    this.grouper.add(this.num1)
+    this.grouper.add(this.num2)
+    this.grouper.add(this.num3)
+    this.grouper.add(this.num4)
+    this.grouper.add(this.num5)
+    this.grouper.add(this.num6)
+    this.grouper.add(this.clockColon1)
+    this.grouper.add(this.clockColon2)
+    this.add(this.grouper)
+  }
+  setNumPic(position, num) {
+    this[`num${position}`].setStyle(`image`, pics[num])
+  }
+  setClockTime(initTime) {
+    this.initTime = initTime
+    let timeStr = timestampFormat('HHmmss', this.initTime)
+    timeStr.split('').forEach((digit, index) => {
+      this.setNumPic(index + 1, Number(digit))
+    })
+  }
+  setModel(dx, dy) {
+    this.model.point.x += dx
+    this.model.point.y += dy
+  }
 }
diff --git a/src/iscs/iscs.js b/src/iscs/iscs.js
index 59b895486..4b5fa2b43 100644
--- a/src/iscs/iscs.js
+++ b/src/iscs/iscs.js
@@ -299,6 +299,44 @@ class Iscs {
                         this.$painter.update(this.iscsDevice[psdCode]);
                     }
                 });
+            } else if (elem.deviceType === 'GATE') {
+                const checkArrowDoubleCodeList = ['IscsPicture_2', 'IscsPicture_8', 'IscsPicture_27', 'IscsPicture_33'];
+                const checkArrowLeftCodeList = ['IscsPicture_3', 'IscsPicture_4', 'IscsPicture_5', 'IscsPicture_6', 'IscsPicture_7', 'IscsPicture_28', 'IscsPicture_29',
+                    'IscsPicture_30', 'IscsPicture_31', 'IscsPicture_34', 'IscsPicture_35', 'IscsPicture_36', 'IscsPicture_37'];
+                const checkArrowRightCodeList = ['IscsPicture_10', 'IscsPicture_11', 'IscsPicture_12', 'IscsPicture_13', 'IscsPicture_14'];
+
+                [...checkArrowDoubleCodeList, ...checkArrowLeftCodeList, ...checkArrowRightCodeList].forEach(checkCode => {
+                    let picture = '';
+                    if (elem.status === 1) {
+                        if (checkArrowDoubleCodeList.includes(checkCode)) {
+                            picture = 'checkArrowDoubleLv';
+                        } else if (checkArrowLeftCodeList.includes(checkCode)) {
+                            picture = 'checkArrowLeftLv';
+                        } else if (checkArrowRightCodeList.includes(checkCode)) {
+                            picture = 'checkArrowRightLv';
+                        }
+                    } else if (elem.status === 0) {
+                        if (checkArrowDoubleCodeList.includes(checkCode)) {
+                            picture = 'checkArrowDoubleHong';
+                        } else if (checkArrowLeftCodeList.includes(checkCode)) {
+                            picture = 'checkArrowLeftHong';
+                        } else if (checkArrowRightCodeList.includes(checkCode)) {
+                            picture = 'checkArrowRightHong';
+                        }
+                    } else if (elem.status === -1) {
+                        if (checkArrowDoubleCodeList.includes(checkCode)) {
+                            picture = 'checkArrowDouble';
+                        } else if (checkArrowLeftCodeList.includes(checkCode)) {
+                            picture = 'checkArrowLeft';
+                        } else if (checkArrowRightCodeList.includes(checkCode)) {
+                            picture = 'checkArrowRight';
+                        }
+                    }
+                    if (picture) {
+                        this.iscsDevice[checkCode].model.picture = picture;
+                        this.$painter.update(this.iscsDevice[checkCode]);
+                    }
+                });
             } else {
                 const oDevice = this.iscsDevice[code];
                 if (oDevice && elem.dispose) {
diff --git a/src/iscs/shape/picture.js b/src/iscs/shape/picture.js
index 061d0d124..141683c03 100644
--- a/src/iscs/shape/picture.js
+++ b/src/iscs/shape/picture.js
@@ -62,7 +62,7 @@ import checkSell from '@/assets/iscs_picture/check_sell.png';
 import checkSell2 from '@/assets/iscs_picture/check_sell2.png';
 import checkSell2Lv from '@/assets/iscs_picture/check_sell2_lv.png';
 import checkSell2Hong from '@/assets/iscs_picture/check_sell2_hong.png';
-import checkSell3 from '@/assets/iscs_picture/check_sell3.png';
+// import checkSell3 from '@/assets/iscs_picture/check_sell3.png';
 import bgShowRoom from '@/assets/iscs_picture/bg-showroom.jpg';
 import bgStand from '@/assets/iscs_picture/bg-stand.jpg';
 import bgFasPlatformA from '@/assets/iscs_picture/fas_platform_a_bg.png';
@@ -146,6 +146,8 @@ const pictureObj = {
     checkArrowRightLv,
     checkArrowRightHong,
     checkArrowDouble,
+    checkArrowDoubleLv,
+    checkArrowDoubleHong,
     checkFlowCumulative,
     checkSell,
     checkSell2,
@@ -190,6 +192,7 @@ export default class Picture extends Group {
         this._function = device.model.function;
         this.z = device.model.z;
         this.create();
+        this.setState(this.model);
         if (this.model.groupId) {
             this.createMouseEvent();
         }
@@ -232,6 +235,11 @@ export default class Picture extends Group {
         this.model.point.x += dx;
         this.model.point.y += dy;
     }
+    setState(model) {
+        if (model.picture) {
+            this.imageButton && this.imageButton.setStyle({image: pictureObj[model.picture]});
+        }
+    }
     getBoundingRect() {
         const rect = this.imageButton.getBoundingRect().clone();
         rect.x = rect.x + this.model.point.x;
diff --git a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
index 3a98585cb..6ddd243a2 100644
--- a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
+++ b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
@@ -166,7 +166,8 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 
 	let teststomp = new StompClient();
 	// let topic = '/user/topic/simulation/assistant/'+group;
-	let topic = '/user/queue/simulation/jl3d/'+group;
+	// let topic = '/user/queue/simulation/jl3d/'+group;
+	let topic = '/user/queue/simulation/'+group+'/jl3d';
 	let header = {'X-Token': token};
 	try {
 		teststomp.subscribe(topic, callback, header);
diff --git a/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js b/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js
index 0c1c30470..985f45cfe 100644
--- a/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js
+++ b/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js
@@ -102,7 +102,8 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
 
 	let teststomp = new StompClient();
 	// let topic = '/user/topic/simulation/assistant/'+group;
-	let topic = '/user/queue/simulation/jl3d/'+group;
+	// let topic = '/user/queue/simulation/jl3d/'+group;
+	let topic = '/user/queue/simulation/'+ group +'/jl3d';
 	let header = {'X-Token': token};
 	try {
 		// console.log("teststomp");
diff --git a/src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/jl3dFaultDeviceVr.js b/src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/jl3dFaultDeviceVr.js
index f88be5cd3..6395eec24 100644
--- a/src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/jl3dFaultDeviceVr.js
+++ b/src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/jl3dFaultDeviceVr.js
@@ -177,7 +177,8 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
 	let connectmsg = {
 		type:'init',
 		baseurl:store.state.user.baseUrl,
-		topic:'/user/queue/simulation/jl3d/'+group,
+		// topic:'/user/queue/simulation/jl3d/'+group,
+		topic : '/user/queue/simulation/'+ group +'/jl3d',
 		token:getToken(),
 	};
 	vrwebworker.postMessage(connectmsg);
diff --git a/src/jlmap3d/jl3dmaintainer/jl3dOtherVr/Jl3dothervr.js b/src/jlmap3d/jl3dmaintainer/jl3dOtherVr/Jl3dothervr.js
index 5a1b554d0..6a57c27ab 100644
--- a/src/jlmap3d/jl3dmaintainer/jl3dOtherVr/Jl3dothervr.js
+++ b/src/jlmap3d/jl3dmaintainer/jl3dOtherVr/Jl3dothervr.js
@@ -175,7 +175,8 @@ export function Jl3dOtherVR(dom,group,skinCode) {
 	let connectmsg = {
 		type:'init',
 		baseurl:store.state.user.baseUrl,
-		topic:'/user/queue/simulation/jl3d/'+group,
+		// topic:'/user/queue/simulation/jl3d/'+group,
+		topic : '/user/queue/simulation/'+ group +'/jl3d',
 		token:getToken(),
 	};
 	otherVrViewWorker.postMessage(connectmsg);
diff --git a/src/jlmap3d/jl3dmaintainer/jl3dTrainRescue/jl3dTrainRescueVr.js b/src/jlmap3d/jl3dmaintainer/jl3dTrainRescue/jl3dTrainRescueVr.js
index 2ecaba81b..c4c9ae801 100644
--- a/src/jlmap3d/jl3dmaintainer/jl3dTrainRescue/jl3dTrainRescueVr.js
+++ b/src/jlmap3d/jl3dmaintainer/jl3dTrainRescue/jl3dTrainRescueVr.js
@@ -171,7 +171,8 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
 	let connectmsg = {
 		type:'init',
 		baseurl:store.state.user.baseUrl,
-		topic:'/user/queue/simulation/jl3d/'+group,
+		// topic:'/user/queue/simulation/jl3d/'+group,
+		topic : '/user/queue/simulation/'+ group +'/jl3d',
 		token:getToken(),
 	};
 	vrwebworker.postMessage(connectmsg);
diff --git a/src/jlmap3d/jl3dmaintainer/maintainerconnect.js b/src/jlmap3d/jl3dmaintainer/maintainerconnect.js
index 4b43a0db6..a84a8a59d 100644
--- a/src/jlmap3d/jl3dmaintainer/maintainerconnect.js
+++ b/src/jlmap3d/jl3dmaintainer/maintainerconnect.js
@@ -41,7 +41,8 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
 
 	var datatype = '00';
 	this.teststomp = new StompClient();
-	this.topic = '/user/queue/simulation/jl3d/'+routegroup;
+	// this.topic = '/user/queue/simulation/jl3d/'+routegroup;
+	this.topic = '/user/queue/simulation/'+routegroup+'/jl3d';
 	let header = {'X-Token': getToken() };
 	let connectmsg = {
 		type:'init',
diff --git a/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js b/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
index 3c98dbae5..7efe6acf5 100644
--- a/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
+++ b/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
@@ -7,7 +7,8 @@ export function PassflowConnect(deviceaction,toptrain,downtrain,routegroup,passe
 	const scope = this;
 	this.teststomp = new StompClient();
 
-	let topic = '/user/queue/simulation/jl3d/'+routegroup;
+	// let topic = '/user/queue/simulation/jl3d/'+routegroup;
+	let topic = '/user/queue/simulation/'+ routegroup +'/jl3d';
 	let header = {'X-Token': getToken() };
 
 	socketon(topic);
diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
index 31ef4699b..3a6cdffb6 100644
--- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
+++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
@@ -42,7 +42,8 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 
 	var datatype = '00';
 	this.teststomp = new StompClient();
-	this.topic = '/user/queue/simulation/jl3d/'+routegroup;
+	// this.topic = '/user/queue/simulation/jl3d/'+routegroup;
+	this.topic = '/user/queue/simulation/'+ routegroup +'/jl3d';
 	let header = {'X-Token': getToken() };
 	let connectmsg = {
 		type:'init',
diff --git a/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js b/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js
index 404c824ea..02a064b33 100644
--- a/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js
+++ b/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js
@@ -7,7 +7,8 @@ export function silumationConnect(deviceaction,toptrain,downtrain,routegroup,pas
 	const scope = this;
 	this.teststomp = new StompClient();
 	let start = true;
-	let topic = '/user/queue/simulation/jl3d/'+routegroup;
+	// let topic = '/user/queue/simulation/jl3d/'+routegroup;
+	let topic = '/user/queue/simulation/'+ routegroup +'/jl3d';
 	let header = {'X-Token': getToken() };
 	// scope.socketon(topic);
 
diff --git a/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js b/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js
index 8f7dd3303..19168f9ba 100644
--- a/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js
+++ b/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js
@@ -7,7 +7,8 @@ export function PassflowConnect(deviceaction,toptrain,downtrain,routegroup,passe
 	const scope = this;
 	this.teststomp = new StompClient();
 	let start = true;
-	let topic = '/user/queue/simulation/jl3d/'+routegroup;
+	// let topic = '/user/queue/simulation/jl3d/'+routegroup;
+	let topic = '/user/queue/simulation/'+ routegroup +'/jl3d';
 	let header = {'X-Token': getToken() };
 	socketon(topic);
 
diff --git a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
index 652c864a8..88a9fb42a 100644
--- a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
+++ b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
@@ -7,7 +7,8 @@ export function TrainConnect(trafficTrain,deviceaction,toptrain,routegroup,passe
 	const scope = this;
 	this.teststomp = new StompClient();
 
-	let topic = '/user/queue/simulation/jl3d/'+routegroup;//
+	// let topic = '/user/queue/simulation/jl3d/'+routegroup;//
+	let topic = '/user/queue/simulation/'+ routegroup +'/jl3d';
 	let header = {'X-Token': getToken() };
 	let restart = false;
 	socketon(topic);
diff --git a/src/jlmap3d/jl3dtrafficplan/sandbox/sandboxconnect.js b/src/jlmap3d/jl3dtrafficplan/sandbox/sandboxconnect.js
index b63cd13d1..1d4df9681 100644
--- a/src/jlmap3d/jl3dtrafficplan/sandbox/sandboxconnect.js
+++ b/src/jlmap3d/jl3dtrafficplan/sandbox/sandboxconnect.js
@@ -8,7 +8,8 @@ export function sandBoxConnect(manager,routegroup,section,signal,station,train )
 	let scope = this;
 	this.teststomp = new StompClient();
 	let start = true;
-	let topic = '/user/queue/simulation/jl3d/'+routegroup;
+	// let topic = '/user/queue/simulation/jl3d/'+routegroup;
+	let topic = '/user/queue/simulation/'+ routegroup +'/jl3d';
 	let header = {'X-Token': getToken() };
 	let topswitch = false;
 	let downswitch = false;
diff --git a/src/jmapNew/config/skinCode/ningbo_03.js b/src/jmapNew/config/skinCode/ningbo_03.js
index a2ccbcd7c..61c9e68b6 100644
--- a/src/jmapNew/config/skinCode/ningbo_03.js
+++ b/src/jmapNew/config/skinCode/ningbo_03.js
@@ -85,7 +85,7 @@ class SkinCode extends defaultStyle {
                 invadeColor: '#FFFFFF', 					// 区段侵入颜色
                 spareColor: '#C0C0C0', 						// 区段空闲颜色
                 communicationOccupiedColor: '#FE0000',		// 区段通信车占用颜色 // 调整 未确定
-                unCommunicationOccupiedColor: '#EF72A7', 	// 区段非通讯车占用颜色
+                unCommunicationOccupiedColor: '#FE0000', 	// 区段非通讯车占用颜色
                 routeLockColor: '#C0C0C0',					// 区段进路锁定颜色
                 faultLockColor: '#81007F', 					// 区段故障锁定颜色
                 undefinedColor: '#0071C1', 					// 区段未定义颜色
@@ -158,7 +158,7 @@ class SkinCode extends defaultStyle {
                 display: true, // 列车实时位置显示
                 specialShow: true,		// 列车特殊显示
                 specialBackground: 'rgba(36, 219, 219, 0.8)',
-                specialRectWidth: 14,
+                specialRectWidth: 25,
                 stopTrainRectWidth: 7
             }
         };
@@ -740,12 +740,12 @@ class SkinCode extends defaultStyle {
                 trainTargetTextAlign: 'right' // 车次号文字显示位置
             },
             trainTargetNumber: {
-                groupNumberPrefix: '00000', // 车组号前缀
-                defaultGroupNumber: 'EEEEE', // 默认车组号
+                groupNumberPrefix: '000', // 车组号前缀
+                defaultGroupNumber: 'EEE', // 默认车组号
                 trainTargetNumberOffset: {x: -4, y: 4}, // 车组号偏移量
-                lineNumber: '01', // 线路号在人工车时车组号拼接线路号
-                manualTypeColor: '#FA7FD7', // 人工车车组号显示颜色
-                maskText: '0' // 车组号遮罩
+                lineNumber: '', // 线路号在人工车时车组号拼接线路号
+                manualTypeColor: '#FA7FD7' // 人工车车组号显示颜色
+                // maskText: '0' // 车组号遮罩
             },
             trainHead: {
                 trainConntWidth: 0, // 列车竖杠的宽度
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 4c98fb75d..48d773580 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -409,6 +409,7 @@ class Jlmap {
             const code = elem.code;
             const type = elem._type;
             const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
+            oDevice._pictureHide = false;
             this.$painter.update(oDevice);
         });
         this.$painter.$transformHandle.revisibleAll();
@@ -435,11 +436,11 @@ class Jlmap {
             const device = this.mapDevice[item];
             if (device && device._type !== deviceType.Switch && device._type !== deviceType.Train) {
                 const pictureDevice = store.getters['map/getPictureDeviceByCode'](item);
-                device._dispose = pictureDevice ? pictureDevice.pictureHide : false;
+                device._pictureHide = pictureDevice ? pictureDevice.pictureHide : false;
                 this.$painter.updatePicture(device);
                 try {
                     if (device._type === deviceType.Section && device.type === '03') {
-                        this.mapDevice[device.switch.code]._dispose = pictureDevice ? pictureDevice.pictureHide : false;
+                        this.mapDevice[device.switch.code]._pictureHide = pictureDevice ? pictureDevice.pictureHide : false;
                         this.computedSwitch(device.switch);
                         this.$painter.updatePicture(this.mapDevice[device.switch.code]);
                     }
diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js
index 6841f27d5..271c5f914 100644
--- a/src/jmapNew/painter.js
+++ b/src/jmapNew/painter.js
@@ -166,7 +166,7 @@ class Painter {
     updatePicture(device) {
         if (device) {
             try {
-                if (device._dispose) {
+                if (device._pictureHide) {
                     this.delete(device);
                 } else {
                     device.instance && this.mapInstanceLevel[device._type].remove(device.instance);
diff --git a/src/jmapNew/shape/graph/Arrow/index.js b/src/jmapNew/shape/graph/Arrow/index.js
index 1a916d3b7..6fd4c135e 100644
--- a/src/jmapNew/shape/graph/Arrow/index.js
+++ b/src/jmapNew/shape/graph/Arrow/index.js
@@ -48,6 +48,8 @@ export default class Arrow extends Group {
         // if (!this.isShowShape) return;
         this.recover();
         if (!store.getters['map/checkDeviceShow'](this._code)) {
+            this.arrow && this.arrow.hide();
+        } else {
             this.arrow && this.arrow.show();
         }
     }
diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js
index 92ce192ec..2cc288844 100644
--- a/src/jmapNew/shape/graph/SignalButton/index.js
+++ b/src/jmapNew/shape/graph/SignalButton/index.js
@@ -440,4 +440,7 @@ export default class SignalButton extends Group {
         }
     }
     getAnchorPoint() {}
+    getShapeTipPoint() {
+        return this.computedPosition;
+    }
 }
diff --git a/src/jmapNew/shape/graph/Train/ETriangle.js b/src/jmapNew/shape/graph/Train/ETriangle.js
index f7f5f4ebf..ce3fbf8b3 100644
--- a/src/jmapNew/shape/graph/Train/ETriangle.js
+++ b/src/jmapNew/shape/graph/Train/ETriangle.js
@@ -17,13 +17,13 @@ export default class ETriangle extends Group {
         if (model && model.point) {
             const right = model.right == 1 ? 1 : -1;
             if (this.style.Section.trainPosition.specialShow) {
-                this.stopRect = new Rect({ // 停车标识
+                this.openDoorRect = new Rect({ // 停车标识
                     zlevel: model.zlevel,
                     z: model.z,
                     shape: {
                         x: model.point.x - this.style.Section.trainPosition.stopTrainRectWidth,
                         y: model.point.y - this.style.Section.line.width / 4,
-                        width: this.style.Section.trainPosition.stopTrainRectWidth,
+                        width: this.style.Section.line.width - 2,
                         height: this.style.Section.line.width - 2
                     },
                     style: {
@@ -31,6 +31,20 @@ export default class ETriangle extends Group {
                         fill: 'rgba(26, 54, 88, 0.7)'
                     }
                 });
+                this.stopRect = new Rect({
+                    zlevel: model.zlevel,
+                    z: model.z,
+                    shape: {
+                        x: model.point.x - this.style.Section.trainPosition.stopTrainRectWidth,
+                        y: model.point.y - this.style.Section.line.width / 4,
+                        width: 4,
+                        height: this.style.Section.line.width + 2
+                    },
+                    style: {
+                        lineWidth: 0,
+                        fill: 'rgba(255,0,0,0.7)'
+                    }
+                });
                 this.angle1 = new Rect({
                     zlevel: model.zlevel,
                     z: model.z,
@@ -64,8 +78,9 @@ export default class ETriangle extends Group {
                 });
                 this.add(this.angle1);
                 this.add(this.angle);
+                this.add(this.openDoorRect);
                 this.add(this.stopRect);
-                this.stopRect.hide();
+                this.openDoorRect.hide();
             } else {
                 this.angle = new Polygon({
                     zlevel: model.zlevel,
@@ -136,18 +151,38 @@ export default class ETriangle extends Group {
             });
             this.angle1.dirty();
         }
-        if (this.stopRect) {
-            const offset = (this.style.Section.trainPosition.specialRectWidth - this.style.Section.trainPosition.stopTrainRectWidth) / 2;
+        if (this.openDoorRect) {
+            const offset = (this.style.Section.trainPosition.specialRectWidth - this.style.Section.line.width) / 2;
             let trainRight = model.x + offset;
             if (right == 1) {
-                trainRight = model.x - offset - this.style.Section.trainPosition.stopTrainRectWidth;
+                trainRight = model.x - offset - this.style.Section.line.width + 2;
             }
             const pointsData = {
                 x: trainRight,
-                y: model.y - this.style.Section.line.width / 4,
-                width: this.style.Section.trainPosition.stopTrainRectWidth,
+                y: model.y - this.style.Section.line.width / 4 - 1,
+                width: this.style.Section.line.width - 2,
                 height: this.style.Section.line.width - 2
             };
+            this.openDoorRect.attr({
+                shape: pointsData
+            });
+            this.openDoorRect.animateTo({
+                shape: pointsData
+            }, 10, 0, 'elasticOut', function () {
+            });
+            this.openDoorRect.dirty();
+        }
+        if (this.stopRect) {
+            let trainRight = model.x + this.style.Section.trainPosition.specialRectWidth;
+            if (right == 1) {
+                trainRight = model.x - this.style.Section.trainPosition.specialRectWidth - 4;
+            }
+            const pointsData = {
+                x: trainRight,
+                y: model.y - this.style.Section.line.width / 2,
+                width: 4,
+                height: this.style.Section.line.width + 2
+            };
             this.stopRect.attr({
                 shape: pointsData
             });
@@ -161,7 +196,6 @@ export default class ETriangle extends Group {
             trainB.setPositionText(model, right);
         }
     }
-
     setStopShow(flag) {
         if (flag) {
             this.stopRect && this.stopRect.show();
@@ -169,4 +203,11 @@ export default class ETriangle extends Group {
             this.stopRect && this.stopRect.hide();
         }
     }
+    setOpenDoorShow(flag) {
+        if (flag) {
+            this.openDoorRect && this.openDoorRect.show();
+        } else {
+            this.openDoorRect && this.openDoorRect.hide();
+        }
+    }
 }
diff --git a/src/jmapNew/shape/graph/Train/TrainBody.js b/src/jmapNew/shape/graph/Train/TrainBody.js
index f0638ec8a..ae4acceaf 100644
--- a/src/jmapNew/shape/graph/Train/TrainBody.js
+++ b/src/jmapNew/shape/graph/Train/TrainBody.js
@@ -6,7 +6,7 @@ import EMouse from './EMouse';
 import store from '@/store/index';
 import Circle from 'zrender/src/graphic/shape/Circle';
 import BoundingRect from 'zrender/src/core/BoundingRect';
-import Vue from 'vue';
+// import Vue from 'vue';
 
 /** 车身*/
 export default class TrainBody extends Group {
@@ -301,8 +301,8 @@ export default class TrainBody extends Group {
         // Style('fill', color);
     }
     setTrainBorderColor(color) {
-		this.trainBodyBox && this.trainBodyBox.setColor('stroke', color);
-	}
+        this.trainBodyBox && this.trainBodyBox.setColor('stroke', color);
+    }
     setHShow(isShow) {
         if (this.textH) {
             isShow ? this.textH.show() : this.textH.hide();
@@ -527,6 +527,9 @@ export default class TrainBody extends Group {
             this.textTrainTrip.dirty();
         }
         if (this.textTrainGroup) {
+            if (store.state.training.prdType === '10') {
+                widthText = 0;
+            }
             this.textTrainGroup.attr({
                 style: {
                     x: parseInt(point.x + widthText),
diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js
index 882ac0511..4bd545f5c 100644
--- a/src/jmapNew/shape/graph/Train/index.js
+++ b/src/jmapNew/shape/graph/Train/index.js
@@ -21,7 +21,9 @@ export default class Train extends Group {
         this.fontSize = model.nameFontSize || style.Train.common.trainTextFontSize;
         this.newScale = this.fontSize / style.Train.common.trainTextFontSize;
         this.nameFormat = model.nameFormat || style.Train.trainBody.trainNameFormat;
-        if (style.Train.trainBody.specialTrainType.length > 0) {
+        if (store.state.training.prdType === '10') {
+            this.nameFormat = 'groupNumber';
+        } else if (style.Train.trainBody.specialTrainType.length > 0) {
             style.Train.trainBody.specialTrainType.some((item) => {
                 if (model.type === item.type) {
                     this.nameFormat = item.nameFormat;
@@ -345,11 +347,14 @@ export default class Train extends Group {
         if (status != undefined) {
             if (status) {
                 this.trainB && this.trainB.setDShow(false);
+                this.triangle && this.triangle.setOpenDoorShow(false);
             } else {
                 this.trainB && this.trainB.setDShow(true);
+                this.triangle && this.triangle.setOpenDoorShow(true);
             }
         } else {
             this.trainB && this.trainB.setDShow(false);
+            this.triangle && this.triangle.setOpenDoorShow(false);
         }
     }
     // 设置通信状态类型
diff --git a/src/jmapNew/theme/beijing_01/menus/menuTool.vue b/src/jmapNew/theme/beijing_01/menus/menuTool.vue
index d278e2adf..155232fee 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuTool.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuTool.vue
@@ -10,7 +10,7 @@
   </div>
 </template>
 <script>
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
 
@@ -126,8 +126,7 @@ export default {
 	},
 	watch: {
 		'$store.state.training.initTime': function (initTime) {
-			const date = new Date(initTime);
-			this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+			this.time = timestampFormat('HH:mmss', initTime)
 		}
 	},
 	mounted() {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTool.vue b/src/jmapNew/theme/chengdu_03/menus/menuTool.vue
index 95bc382b2..acc5e6798 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuTool.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuTool.vue
@@ -19,7 +19,7 @@
   </div>
 </template>
 <script>
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
 
@@ -135,8 +135,7 @@ export default {
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+			this.time = timestampFormat('HH:mmss', initTime)
         }
     },
     mounted() {
diff --git a/src/views/dispatcherStationManage/cmdManage.vue b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue
similarity index 100%
rename from src/views/dispatcherStationManage/cmdManage.vue
rename to src/jmapNew/theme/components/menus/dialog/cmdManage.vue
diff --git a/src/views/dispatcherStationManage/signedCmd.vue b/src/jmapNew/theme/components/menus/dialog/signedCmd.vue
similarity index 100%
rename from src/views/dispatcherStationManage/signedCmd.vue
rename to src/jmapNew/theme/components/menus/dialog/signedCmd.vue
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index d35626233..74342d199 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -750,17 +750,36 @@ export const menuOperate = {
             operation: OperationEvent.CTCCommand.setEndRunplan.menu.operation,
             cmdType: CMD.CTC.CTC_LOG_SET_END_RUN_PLAN
         },
-
+        // 修改列车固定径路
+        modifyTrainFixedPath:{
+            operation: OperationEvent.CTCCommand.modifyTrainFixedPath.menu.operation,
+            cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_EDIT
+        },
         // 增加列车固定径路
         addTrainFixedPath:{
             operation: OperationEvent.CTCCommand.addTrainFixedPath.menu.operation,
-            cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_EDIT
+            cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_SAVE
         },
         // 批量增加列车固定径路
         batchTrainFixedPath:{
             operation: OperationEvent.CTCCommand.batchTrainFixedPath.menu.operation,
             cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_BATCH
         },
+        // 固定列车径路从生效区更新
+        updateTrainFixedPath2Station:{
+            operation: OperationEvent.CTCCommand.updateTrainFixedPath2Station.menu.operation,
+            cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_STATION_UPDATE
+        },
+        // 固定列车经路更新列表
+        getStationTrainFixedPath:{
+            operation: OperationEvent.CTCCommand.getStationTrainFixedPath.menu.operation,
+            cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_STATION_UPDATE_LIST
+        },
+        // 固定列车经路更新加载到计划
+        loadUpdateStationTrainFixedPath:{
+            operation: OperationEvent.CTCCommand.loadUpdateStationTrainFixedPath.menu.operation,
+            cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_STATION_UPDATE_LOAD
+        },
 
         // 导入列车固定径路
         importTrainFixedPath:{
@@ -792,6 +811,11 @@ export const menuOperate = {
             operation: OperationEvent.CTCCommand.modifyStationTrack.menu.operation,
             cmdType: CMD.CTC.CTC_STATION_DETAIL_EDIT
         },
+        // 编辑股道信息
+        editStationTrack:{
+            operation: OperationEvent.CTCCommand.modifyStationTrack.edit.operation,
+            cmdType: CMD.CTC.CTC_STATION_DETAIL_EDIT
+        },
         // 股道发布生效区
         releaseStationTrack:{
             operation: OperationEvent.CTCCommand.releaseStationTrack.menu.operation,
@@ -878,6 +902,12 @@ export const menuOperate = {
             operation: OperationEvent.RailCommand.railQueryRegister.menu.operation,
             cmdType: CMD.RAIL.CMD_RAIL_QUERY_REGISTER
         }
+    },
+    Conversation: {
+        Chat: {
+            operation: OperationEvent.Conversation.Chat.menu.operation,
+            cmdType: CMD.Conversation.CMD_Conversation_Chat_Text
+        }
     }
 
 };
@@ -892,6 +922,7 @@ export const menuOperate = {
 export function commitOperate(operate, paramList, over, fillStep = {}) {
     const step = {
         start: true,
+        userOperationType: operate.userOperationType || 'leftClick',
         operation: operate.operation,
         param:{}
     };
diff --git a/src/jmapNew/theme/datie_01/menus/menuButton.vue b/src/jmapNew/theme/datie_01/menus/menuButton.vue
index de05fca98..31e7f0bb8 100644
--- a/src/jmapNew/theme/datie_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuButton.vue
@@ -232,10 +232,10 @@ export default {
             this.guideLockLeftFlag = false;
         },
         '$store.state.socket.simulationTimeSync': function (val) {
-            if (this.timeNode && val - this.timeNode >= 15) {
+            if (this.timeNode && val - this.timeNode >= 15000) {
                 this.clearOperate();
             }
-            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15) {
+            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15000) {
                 if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
                     this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0}]);
                 } else if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'Signal' && this.deviceList[0].type === 'SHUNTING') {
@@ -243,6 +243,19 @@ export default {
                 }
                 this.deviceList = [];
             }
+        },
+        '$store.state.socket.simulationReset': function(val) {
+            if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
+                this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0}]);
+            } else if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'Signal' && this.deviceList[0].type === 'SHUNTING') {
+                this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'Signal', hasSelected: 0}]);
+            }
+            this.deviceList = [];
+            this.commandTypeList = [];
+            this.$store.dispatch('menuOperation/setButtonOperation', null);
+            this.clearOperate();
+            this.guideLockRightFlag = false;
+            this.guideLockLeftFlag = false;
         }
     },
     beforeDestroy() {
@@ -404,7 +417,7 @@ export default {
             if (!this.routeDataMap) { this.handleRouteDataMap(); }
 
             if (!this.checkHaveRoute(deviceList)) { // 无效的进路按钮选择 清除deviceList
-                this.$message.error('无效的进路按钮');
+                // this.$message.error('无效的进路按钮');
                 this.clearOperate();
                 return;
             }
diff --git a/src/jmapNew/theme/datie_01/menus/menuTool.vue b/src/jmapNew/theme/datie_01/menus/menuTool.vue
index 95bc382b2..acc5e6798 100644
--- a/src/jmapNew/theme/datie_01/menus/menuTool.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuTool.vue
@@ -19,7 +19,7 @@
   </div>
 </template>
 <script>
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
 
@@ -135,8 +135,7 @@ export default {
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+			this.time = timestampFormat('HH:mmss', initTime)
         }
     },
     mounted() {
diff --git a/src/jmapNew/theme/datie_02/menus/bottomTable.vue b/src/jmapNew/theme/datie_02/menus/bottomTable.vue
index 9958410c1..35e5aa61c 100644
--- a/src/jmapNew/theme/datie_02/menus/bottomTable.vue
+++ b/src/jmapNew/theme/datie_02/menus/bottomTable.vue
@@ -196,9 +196,6 @@ export default {
         EventBus.$on('bottomTableShowOrHidden', () => {
             this.showTable = !this.showTable;
         });
-        // if (this.stationList && this.stationList.length) {
-        //     this.stationCode = this.stationList[0].code;
-        // }
     },
     methods: {
         doShow() {
@@ -211,16 +208,18 @@ export default {
         initShowStationList(val) {
             if (val) {
                 const centralizedStation = this.$store.getters['map/getDeviceByCode'](val);
-                const sn = centralizedStation.sn;
-                this.showStationList = [centralizedStation];
-                this.stationCode = centralizedStation.code;
-                this.stationList.forEach(station => {
-                    if (station.sn === sn - 1) {
-                        this.showStationList.unshift(station);
-                    } else if (station.sn === sn + 1) {
-                        this.showStationList.push(station);
-                    }
-                });
+                if (centralizedStation) {
+                    const sn = centralizedStation.sn;
+                    this.showStationList = [centralizedStation];
+                    this.stationCode = centralizedStation.code;
+                    this.stationList.forEach(station => {
+                        if (station.sn === sn - 1) {
+                            this.showStationList.unshift(station);
+                        } else if (station.sn === sn + 1) {
+                            this.showStationList.push(station);
+                        }
+                    });
+                }
             }
         },
         getRouteStatus(status) {
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/blockDevice.vue b/src/jmapNew/theme/datie_02/menus/dialog/blockDevice.vue
new file mode 100644
index 000000000..d960ada1e
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/blockDevice.vue
@@ -0,0 +1,128 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    title="封锁操作对话框"
+    :visible.sync="show"
+    width="600px"
+    :before-close="doClose"
+    :z-index="3000"
+    :append-to-body="true"
+    :modal="true"
+  >
+    <div class="content">
+      <el-tree
+        style="height: 50%; overflow-y: scroll;"
+        :data="treeData"
+        node-key="id"
+        show-checkbox
+        :expand-on-click-node="true"
+        default-expand-all
+      >
+        <span class="custom-node" slot-scope="{ node, data }">
+          <span>{{ node.label }}</span>
+          <span v-if="data.id <= 2">封锁状态</span>
+          <span v-else>{{ getBlockState(data.id) ? '√' : '' }}</span>
+        </span>
+      </el-tree>
+      <div class="info">
+        <div class="item">14:36:18 操作成功</div>
+        <div class="item">14:36:18 操作成功</div>
+      </div>
+    </div>
+    <div class="btn-bar">
+      <el-button>设置封锁</el-button>
+      <el-button>解除封锁</el-button>
+      <el-button>保存</el-button>
+      <el-button @click="doClose">关闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'BlockDevice',
+  data() {
+    return {
+      show: false,
+      treeData: [
+        {
+          label: '沈阳',
+          id: 1,
+          children: [
+            {
+              id: 3,
+              label: '股道',
+              children: [
+                {
+                  id: 5,
+                  label: '11G',
+                },
+                {
+                  id: 6,
+                  label: '12G',
+                },
+                {
+                  id: 7,
+                  label: 'XIIIG',
+                },
+                {
+                  id: 8,
+                  label: '14G',
+                },
+                {
+                  id: 9,
+                  label: '15G',
+                },
+                {
+                  id: 10,
+                  label: 'XVIG',
+                },
+                {
+                  id: 11,
+                  label: 'XVIIG',
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    }
+  },
+  methods: {
+    doShow() {
+      this.show = true
+    },
+    doClose() {
+      this.show = false
+    },
+    getBlockState(id) {
+      return true
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  height: 400px;
+  .custom-node {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding-right: 2rem;
+  }
+  .info {
+    background-color: #fff;
+    margin-top: 6px;
+    padding: 8px;
+    height: 50%;
+  }
+}
+.btn-bar {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 16px;
+}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
index 03c8e7432..36cef2924 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
@@ -9,7 +9,6 @@
     :modal="false"
     :title="title"
     :close-on-click-modal="false"
-    append-to-body
   >
     <!-- 密码校验 -->
     <el-row>
@@ -130,9 +129,11 @@ export default {
         doShow(operate, title) {
             this.title = title;
             this.operate = operate || {};
-            this.operation = operate.operation;
             if (operate.operateNext) {
+				console.log(this.operation , operate.operation)
                 this.operation = operate.operateNext;
+            } else {
+                this.operation = operate.operation;
             }
             this.dialogShow = true;
             this.checkHasInput = false;
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue b/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue
index 2d2491d3f..d559b0d71 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue
@@ -10,11 +10,11 @@
     :modal="false"
     :close-on-click-modal="false"
   >
-    <div class="table">
+    <div :id="domIdChange" class="table">
       <div v-for="(temp,index) in tempTable" :key="index" class="eachShunt">
         <div class="shuntingName">{{ temp.name }}</div>
         <div class="shuntingSelected">
-          <el-checkbox v-model="temp.selected" size="medium" />
+          <el-checkbox v-model="temp.selected" size="medium" @change="changeShuntingTypeList" />
         </div>
       </div>
     </div>
@@ -56,6 +56,9 @@ export default {
         },
         domIdConfirm() {
             return this.dialogShow ? OperationEvent.Section.defectiveShunting.confirm.domId : '';
+        },
+        domIdChange() {
+            return this.dialogShow ? OperationEvent.Section.defectiveShunting.shuntingTypeListChange.domId : '';
         }
     },
     methods:{
@@ -84,6 +87,22 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
         },
+        changeShuntingTypeList(val) {
+            const shuntingTypeList = [];
+            this.tempTable.forEach(each=>{
+                if (each.selected) {
+                    shuntingTypeList.push(each.value);
+                }
+            });
+            const operate = {
+                operation: OperationEvent.Section.defectiveShunting.shuntingTypeListChange.operation,
+                userOperationType: 'leftClick',
+                shuntingTypeList: shuntingTypeList
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                // if (valid) {}
+            }).catch((error) => { console.error(error); });
+        },
         commit() {
             const shuntingTypeList = [];
             this.tempTable.forEach(each=>{
@@ -93,9 +112,9 @@ export default {
             });
             const operate = {
                 over: true,
-                code:this.sectionCode,
                 cmdType:CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING,
                 operation: OperationEvent.Section.defectiveShunting.confirm.operation,
+                userOperationType: 'leftClick',
                 param:{
                     sectionCode:this.sectionCode,
                     shuntingTypeList:shuntingTypeList
@@ -104,6 +123,7 @@ export default {
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
+                    this.$emit('clearOperate');
                 }
             }).catch((error) => { this.doClose(); this.$refs.noticeInfo.doShow(); console.log(error); });
         },
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/infoDialog.vue b/src/jmapNew/theme/datie_02/menus/dialog/infoDialog.vue
new file mode 100644
index 000000000..4b6e63ee9
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/infoDialog.vue
@@ -0,0 +1,54 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    title="信息窗口"
+    :visible.sync="show"
+    width="800px"
+    :before-close="doClose"
+    :z-index="3000"
+    :append-to-body="true"
+    :modal="true"
+  >
+    <div class="info-content">
+      <div class="item" v-for="item in info" :key="item">
+        {{ item }}
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'InfoDialog',
+  data() {
+    return {
+      show: false,
+      info: [
+        '系统定时提醒>请检查股道 上行防溜设施: II道 > 上次确认时间: 2017-05-02 08:57:12',
+        '系统定时提醒>请检查股道 上行防溜设施: 3道 > 上次确认时间: 2017-05-02 08:57:12.请检查股道 上行防溜设施: II道 > 上次确认时间: 2017-05-02 08:57:12',
+        '系统定时提醒>请检查股道 上行防溜设施: 4道 > 上次确认时间: 2017-05-02 08:57:12',
+      ],
+    }
+  },
+  methods: {
+    doShow() {
+      this.show = true
+    },
+    doClose() {
+      this.show = false
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.info-content {
+  background-color: #fff;
+  overflow-x: scroll;
+  .item {
+    line-height: 1.5em;
+    white-space: nowrap;
+  }
+}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue b/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue
index 6f0e8d119..c2073391e 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue
@@ -113,6 +113,7 @@ export default {
             if (this.mapData && this.mapData.skinVO) {
                 const parser = parserFactory(ParserType.Graph.value);
                 this.mapDevice = parser.parser(this.mapData, this.mapData.skinVO.code, this.map.getShowConfig());
+                console.log('parsed mapDevice', this.mapDevice)
             }
         },
         loadData() {
@@ -154,7 +155,7 @@ export default {
                 const type = elem._type;
                 // 列车不需要设置默认状态
                 type != deviceType.Train &&
-          list.push({ code, _type: type, _free: true });
+                    list.push({ code, _type: type, _free: true });
             });
 
             this.map.update(list, false);
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue b/src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue
new file mode 100644
index 000000000..f679a8b83
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue
@@ -0,0 +1,90 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    title="操作日志查询"
+    :visible.sync="show"
+    width="1100px"
+    :before-close="doClose"
+    :z-index="3000"
+    :append-to-body="true"
+    :modal="true"
+  >
+    <el-form :model="formData" inline>
+      <el-form-item label="关键字" prop="keyword">
+        <el-input v-model="formData.keyword"></el-input>
+      </el-form-item>
+      <el-form-item label="起始" prop="startTime">
+        <el-date-picker v-model="formData.startTime" type="datetime"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="终止" prop="endTime">
+        <el-date-picker v-model="formData.endTime" type="datetime"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button>查询</el-button>
+        <el-button>选择文件</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="content">
+      <el-table stripe :data="tableData">
+        <el-table-column prop="order" label="序号" width="50px" />
+        <el-table-column prop="time" label="时间" width="120px" />
+        <el-table-column prop="origin" label="来源" width="120px" />
+        <el-table-column prop="desc" label=""> </el-table-column>
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'OperationLogQuery',
+  data() {
+    return {
+      show: false,
+      formData: {
+        keyword: '',
+        startTime: '',
+        endTime: '',
+      },
+      tableData: [
+        {
+          order: 0,
+          time: '2017-05-09 08:53:11',
+          origin: '<12>12',
+          desc: '设置股道3防溜，上行.铁鞋（无编号）；下行.无防溜措施',
+        },
+        {
+          order: 1,
+          time: '2017-05-09 08:53:11',
+          origin: '<12>12',
+          desc: '设置股道3防溜，上行.铁鞋（无编号）；下行.无防溜措施',
+        },
+        {
+          order: 2,
+          time: '2017-05-09 08:53:11',
+          origin: '<12>12',
+          desc: '设置股道3防溜，上行.铁鞋（无编号）；下行.无防溜措施',
+        },
+      ],
+    }
+  },
+  methods: {
+    doShow() {
+      this.show = true
+    },
+    doClose() {
+      this.show = false
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/ .el-input {
+  width: 200px;
+}
+/deep/.el-input__icon {
+  line-height: 25px;
+}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/powerSupplyArmSetting.vue b/src/jmapNew/theme/datie_02/menus/dialog/powerSupplyArmSetting.vue
new file mode 100644
index 000000000..80d49c381
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/powerSupplyArmSetting.vue
@@ -0,0 +1,114 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    title="电力臂状态操作"
+    :visible.sync="show"
+    width="600px"
+    :before-close="doClose"
+    :z-index="3000"
+    :append-to-body="true"
+    :modal="true"
+  >
+    <el-tree :data="treeData" node-key="id" show-checkbox :expand-on-click-node="true" default-expand-all>
+      <span class="custom-node" slot-scope="{ node, data }">
+        <span>{{ node.label }}</span>
+        <span v-if="data.id <= 2">状态</span>
+        <span v-else>{{ getPowerState(data.id) ? '有电' : '无电' }}</span>
+      </span>
+    </el-tree>
+    <div class="btn-bar">
+      <el-button>设置有电</el-button>
+      <el-button>设置停电</el-button>
+      <el-button>刷新状态</el-button>
+      <el-button @click="doClose">关闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'PowerSupplyArmSetting',
+  data() {
+    return {
+      show: false,
+      treeData: [
+        {
+          id: 1,
+          label: '沈阳',
+          children: [
+            {
+              id: 3,
+              label: '三线14、15、16道',
+            },
+            {
+              id: 4,
+              label: '浑下、17、18、19道、机务段、机26、揽、皇',
+            },
+            {
+              id: 5,
+              label: '浑上、11、12、13道',
+            },
+            {
+              id: 6,
+              label: '沈北下行',
+            },
+            {
+              id: 7,
+              label: '沈北上行',
+            },
+            {
+              id: 8,
+              label: '沈阳站库线',
+            },
+          ],
+        },
+        {
+          id: 2,
+          label: '沈阳北',
+          children: [
+            {
+              id: 9,
+              label: '沈北下行',
+            },
+            {
+              id: 10,
+              label: '沈北上行',
+            },
+            {
+              id: 11,
+              label: '沈阳北客技库',
+            },
+          ],
+        },
+      ],
+    }
+  },
+  methods: {
+    doShow() {
+      this.show = true
+    },
+    doClose() {
+      this.show = false
+    },
+    getPowerState(id) {
+      return true
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.custom-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-right: 2rem;
+}
+.btn-bar {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue b/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue
index 6a3a8986f..31f54c8c8 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue
@@ -31,7 +31,10 @@
         </div>
         <div class="row">
           车站
-          <el-select style="width: 60%;"></el-select>
+          <el-select v-model="form.station" style="width: 60%;">
+            <el-option value="shenyang" label="沈阳"></el-option>
+            <el-option value="shenyangbei" label="沈阳北"></el-option>
+          </el-select>
         </div>
         <div class="wrapper">
           <div class="list" style="width: 60%;">
@@ -92,6 +95,9 @@ export default {
   data() {
     return {
       show: false,
+      form: {
+        station: 'shenyang',
+      },
     }
   },
   methods: {
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue b/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue
new file mode 100644
index 000000000..0ddcd4775
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue
@@ -0,0 +1,152 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    title="区域批量操作"
+    :visible.sync="show"
+    width="1400px"
+    :before-close="doClose"
+    :z-index="3000"
+    :append-to-body="true"
+    :modal="true"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="16">
+        <map-visual :mapData="mapData" :width="870" :height="600" ref="mapVisual" />
+      </el-col>
+      <el-col :span="8">
+        <div class="form-area">
+          <div class="top">
+            <el-select v-model="workspaceName"></el-select>
+            <el-button>重命名</el-button>
+            <el-checkbox v-model="isEdit">编辑</el-checkbox>
+          </div>
+          <div class="mid">
+            <el-tree :data="treeData" node-key="id" show-checkbox :expand-on-click-node="true" default-expand-all>
+              <span class="custom-node" slot-scope="{ node, data }">
+                <span>{{ node.label }}</span>
+                <span v-if="data.id <= 2">操作</span>
+                <span v-if="data.id <= 2">状态</span>
+                <span v-if="data.id > 2">{{ data.operation }}</span>
+                <span v-if="data.id > 2">{{ data.state }}</span>
+              </span>
+            </el-tree>
+          </div>
+          <div class="bottom">
+            <div class="line">
+              <el-button>增加分区</el-button>
+              <el-button>删除分区</el-button>
+              <el-button>保存分区</el-button>
+              <el-button>上传分区定义</el-button>
+            </div>
+            <div class="line">
+              <el-button>封锁/单锁</el-button>
+              <el-button>解封/解锁</el-button>
+              <el-button>刷新状态</el-button>
+              <el-button @click="doClose">关闭</el-button>
+            </div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import MapVisual from './mapVisual.vue'
+export default {
+  name: 'RegionBatchOperation',
+  components: { MapVisual },
+  data() {
+    return {
+      show: false,
+      workspaceName: '',
+      isEdit: false,
+      treeData: [
+        {
+          label: '临时批量工作区',
+          id: 1,
+          children: [
+            {
+              id: 3,
+              label: '道岔',
+              operation: '定',
+              state: '反位',
+            },
+            {
+              id: 4,
+              label: '股道/无岔',
+            },
+            {
+              id: 5,
+              label: '区间',
+            },
+            {
+              id: 6,
+              label: '信号机',
+            },
+          ],
+        },
+      ],
+      mapData: null,
+    }
+  },
+  created() {
+    this.mapData = JSON.parse(JSON.stringify(this.$store.state.map.map))
+  },
+  methods: {
+    doShow(stationCode) {
+      this.show = true
+      this.$nextTick(() => {
+        const picData = this.mapData.pictureList.find(pic => pic.stationCode === stationCode && pic.type === 'regionBatchOperation')
+        this.$store.dispatch('map/setPictureDeviceMap', picData.deviceMap)
+        const list = []
+        for (const deviceCode in picData.deviceMap) {
+          list.push(deviceCode)
+        }
+        this.$refs.mapVisual.loadData()
+        this.$refs.mapVisual.map.updatePicture(list)
+        this.$refs.mapVisual.map.updateTransform(picData.scaling, picData.origin)
+      })
+    },
+    doClose() {
+      this.show = false
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.form-area {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 600px;
+  .top {
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+  }
+  .mid {
+    flex: 1;
+    padding: 10px 0;
+    .el-tree {
+      height: 100%;
+      .custom-node {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding-right: 2rem;
+      }
+    }
+  }
+  .bottom {
+    .line {
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue
index 9b135292b..8b84cf582 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue
@@ -266,8 +266,8 @@ export default {
         commit() {
             if (this.route) {
                 this.loading = true;
-                const type = this.route.lock ? menuOperate.Signal.cancelTrainRoute : menuOperate.Signal.arrangementRoute;
-                const param = this.route.lock ? { signalCode: this.route.startSignalCode } : { routeCode:this.route.code };
+                const type = this.route.lock ? menuOperate.Signal.cancelTrainRoute : menuOperate.CTC.setRoute;
+                const param = this.route.lock ? { signalCode: this.route.startSignalCode } : { routeCode:this.route.code, tripNumber: this.selected.tripNumber, force: false, duration: null };
                 commitOperate(type, param, 3).then(({valid, operate})=>{
                     this.loading = false;
                     if (valid) {
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/stationTrainManage.vue b/src/jmapNew/theme/datie_02/menus/dialog/stationTrainManage.vue
new file mode 100644
index 000000000..53f76963b
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/stationTrainManage.vue
@@ -0,0 +1,253 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    title="站存车管理"
+    :visible.sync="show"
+    width="800px"
+    :before-close="doClose"
+    :z-index="3000"
+    :append-to-body="true"
+    :modal="true"
+    :close-on-click-modal="false"
+  >
+    <div class="top">
+      <div class="send">
+        <div class="edittime">修改时间: 11月14日16时49分</div>
+        <div class="title">发送时间:</div>
+        <div class="table">
+          <el-table height="100%" :data="sendTableData">
+            <el-table-column prop="name" label="股道名称" />
+            <el-table-column prop="info" label="现在存车信息" width="240" />
+            <el-table-column prop="subtotal" label="小计" width="50" />
+          </el-table>
+        </div>
+      </div>
+      <div class="receive">
+        <div class="title">接收时间:</div>
+        <div class="table">
+          <el-table height="100%" :data="receiveTableData">
+            <el-table-column prop="type" label="车种" />
+            <el-table-column prop="emptyNum" label="空车" />
+            <el-table-column prop="duplicateNum" label="重车" />
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <div class="bottom">
+      <div class="saveInfo">
+        <div class="title">存车信息</div>
+        <div class="table">
+          <el-table height="100%" :data="savedData">
+            <el-table-column prop="type" label="车厢类型" />
+            <el-table-column prop="count" label="辆数" width="50px" />
+            <el-table-column prop="desc" label="说明/去向" />
+            <el-table-column prop="flag" label="运用标记" />
+          </el-table>
+        </div>
+      </div>
+      <div class="edit">
+        <div class="title">编辑站存车</div>
+        <el-form class="form" inline>
+          <div class="row">
+            <el-form-item label="类别">
+              <el-select v-model="editFormData.type"></el-select>
+            </el-form-item>
+            <el-form-item label="车种">
+              <el-select v-model="editFormData.trainType"></el-select>
+            </el-form-item>
+            <el-form-item label="作业说明">
+              <el-select v-model="editFormData.description"></el-select>
+            </el-form-item>
+          </div>
+          <div class="row">
+            <el-form-item label="辆数">
+              <el-input-number style="width: 90px;" v-model="editFormData.count" :controls="false"></el-input-number>
+            </el-form-item>
+            <el-form-item label="运用标记">
+              <el-select style="width: 220px;" v-model="editFormData.flag"></el-select>
+            </el-form-item>
+          </div>
+          <div class="row">
+            <el-form-item label="说明/去向">
+              <el-input style="width: 366px;" v-model="editFormData.destination"></el-input>
+            </el-form-item>
+          </div>
+          <div class="row">
+            <el-button>插入</el-button>
+            <el-button>增加</el-button>
+            <el-button>修改</el-button>
+            <el-button>删除</el-button>
+          </div>
+        </el-form>
+      </div>
+    </div>
+    <div class="btn-area">
+      <div class="total">合计: 5</div>
+      <div class="btngroup">
+        <el-button>上报调度所</el-button>
+        <el-button @click="doClose">关闭</el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'StationManage',
+  data() {
+    return {
+      show: false,
+      sendTableData: [
+        {
+          name: '7道',
+          info: '空保留P5',
+          subtotal: 5,
+        },
+        {
+          name: 'V道',
+          info: '',
+          subtotal: 0,
+        },
+        {
+          name: '3道',
+          info: '',
+          subtotal: 0,
+        },
+        {
+          name: 'I道',
+          info: '',
+          subtotal: 0,
+        },
+        {
+          name: 'II道',
+          info: '',
+          subtotal: 0,
+        },
+        {
+          name: '4道',
+          info: '',
+          subtotal: 0,
+        },
+        {
+          name: '3道',
+          info: '',
+          subtotal: 0,
+        },
+      ],
+      receiveTableData: [
+        {
+          type: '棚车',
+          emptyNum: 5,
+          duplicateNum: 0,
+        },
+        {
+          type: '敞车',
+          emptyNum: 0,
+          duplicateNum: 0,
+        },
+        {
+          type: '平板车',
+          emptyNum: 0,
+          duplicateNum: 0,
+        },
+      ],
+      savedData: [
+        {
+          type: '空保留棚车',
+          count: 5,
+          desc: '八盘峡',
+          flag: '运用',
+        },
+      ],
+      editFormData: {
+        type: '',
+        trainType: '',
+        description: '',
+        count: 0,
+        flag: '',
+        destination: '',
+      },
+    }
+  },
+  methods: {
+    doShow(stationCode) {
+      this.show = true
+    },
+    doClose() {
+      this.show = false
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.top,
+.bottom {
+  height: 200px;
+}
+.top {
+  display: flex;
+  position: relative;
+  .send {
+    width: 66.7%;
+    height: 100%;
+    .edittime {
+      position: absolute;
+      top: 0%;
+      left: 0%;
+      line-height: 40px;
+    }
+  }
+  .receive {
+    width: 33.3%;
+    height: 100%;
+  }
+  .send,
+  .receive {
+    .title {
+      width: 100%;
+      text-align: center;
+    }
+    .table {
+      height: calc(100% - 40px);
+    }
+  }
+}
+.bottom {
+  display: flex;
+  .saveInfo {
+    width: 40%;
+    height: 100%;
+    .table {
+      height: calc(100% - 40px);
+    }
+  }
+  .edit {
+    width: 60%;
+    height: 100%;
+    .row {
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+  .saveInfo,
+  .edit {
+    .title {
+      width: 100%;
+      text-align: center;
+      float: none;
+    }
+    /deep/ .el-select {
+      width: 90px;
+    }
+    /deep/ .el-form-item {
+      margin-bottom: 0;
+    }
+  }
+}
+.btn-area {
+  display: flex;
+  justify-content: space-between;
+}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
index a3f33f84c..f3204e77a 100644
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ b/src/jmapNew/theme/datie_02/menus/index.vue
@@ -33,7 +33,7 @@
         <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">与中心通信正常</div>
       </div>
     </div>
-    <div v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1560px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
+    <div id="tipInfoBox" v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1560px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
       <div style="width: 60%;height: 30px;line-height: 30px;text-align: center;">提示信息窗</div>
       <div style="width: 40%;height: 30px;line-height: 30px;text-align: center;border-left: 2px #ccc solid;">{{ '操控A:主机' + '  ' + dateString + '  ' + time }}</div>
     </div>
@@ -96,8 +96,7 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
 import PassiveTimeout from './passiveDialog/timeout';
-import { timeFormat } from '@/utils/date';
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import BottomTable from './bottomTable';
 import MenuPanel from './menuPanel';
 import CtcBarIcon1 from '@/assets/ctc_icon/pic1.png';
@@ -118,8 +117,8 @@ import CtcBarIcon15 from '@/assets/ctc_icon/pic15.png';
 import CtcBarIcon16 from '@/assets/ctc_icon/pic16.png';
 import CtcBarIcon17 from '@/assets/ctc_icon/pic17.png';
 import CtcBarIcon18 from '@/assets/ctc_icon/pic18.png';
-import cmdManage from '@/views/dispatcherStationManage/cmdManage.vue';
-import signedCmd from '@/views/dispatcherStationManage/signedCmd.vue';
+import cmdManage from '@/jmapNew/theme/components/menus/dialog/cmdManage.vue';
+import signedCmd from '@/jmapNew/theme/components/menus/dialog/signedCmd.vue';
 import {getRunplanInStation} from '@/api/runplan';
 import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
 
@@ -227,14 +226,13 @@ export default {
             return this.$route.query.dispatcherStation;
         }
     },
-    watch: {
+    watch: { // tipContentList
         isShowBar(val) {
             val && this.$store.dispatch('config/updateMenuBar');
         },
         '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            this.initDate(date);
+            this.$store.dispatch('training/setInitTime', time);
+            this.initDate(time);
         },
         '$store.state.socket.railwaySimulationRunplanSendChange': function (val) {
             if (this.isCtc) {
@@ -271,6 +269,9 @@ export default {
                     }
                 }
             });
+        },
+        '$store.state.socket.simulationReset':function(val) {
+            this.tipContentList = [];
         }
         // // 地图加载完成
         // '$store.state.map.mapViewLoadedCount': function (val) { // 地图数据加载完成
@@ -305,12 +306,12 @@ export default {
         this.$store.dispatch('map/setPictureDeviceMap', {});
     },
     methods: {
-        changeSignedStatus(info) {
-            this.$refs.cmdManage.changeSignedStatus(info);
-        },
-        signedCmdClose() {
-            this.$refs.cmdManage.doShow();
-        },
+        // changeSignedStatus(info) {
+        //     this.$refs.cmdManage.changeSignedStatus(info);
+        // },
+        // signedCmdClose() {
+        //     this.$refs.cmdManage.doShow();
+        // },
         getRunplanInStationData() {
             getRunplanInStation(this.group).then(response => {
                 // debugger;
@@ -424,14 +425,9 @@ export default {
             }
         },
         initDate(date) {
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
-            const years = date.getFullYear() + '';
-            let months = date.getMonth() + 1 + '';
-            let dates = date.getDate() + '';
-            if (months.length < 2) { months = '0' + months; }
-            if (dates.length < 2) { dates = '0' + dates; }
-            this.dateString = years + months + dates;
-            this.dateString1 = years + '年' + months + '月' + dates + '日';
+            this.time = timestampFormat('HH:mm:ss', date)
+            this.dateString = timestampFormat('YYYYMMDD', date)
+            this.dateString1 = timestampFormat('YYYY年MM月DD日', date)
         },
         handleRunplan() {
             this.$refs.runplanPane.doShow();
@@ -1066,7 +1062,7 @@ export default {
     .simulationDeviceInfo{
         position: absolute;
         width: 328px;
-        height: 100px; 
+        height: 100px;
         top: 83px;
         right:10px;
         padding: 5px;
diff --git a/src/jmapNew/theme/datie_02/menus/menuBar.vue b/src/jmapNew/theme/datie_02/menus/menuBar.vue
index d16b8bc18..6781eaf23 100644
--- a/src/jmapNew/theme/datie_02/menus/menuBar.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuBar.vue
@@ -10,12 +10,14 @@
     <manage-user ref="manageUser" />
     <help-about ref="helpAbout" />
     <set-limit-speed ref="setLimitSpeed" />
+    <train-fixed-path-pane ref="trainFixedPathPane" />
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import MenuBar from '@/jmapNew/theme/components/menus/menuBar';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import StationControlConvert from './menuDialog/stationControlConvert';
 import TrainAdd from './menuDialog/trainAdd';
 import TrainTranstalet from './menuDialog/trainTranstalet';
@@ -25,6 +27,7 @@ import ViewName from './menuDialog/viewName';
 import ManageUser from './menuDialog/manageUser';
 import HelpAbout from './menuDialog/helpAbout';
 import SetLimitSpeed from './menuDialog/setLimitSpeed';
+import TrainFixedPathPane from './menuDialog/trainFixedPathPane';
 import { EventBus } from '@/scripts/event-bus';
 
 export default {
@@ -39,7 +42,8 @@ export default {
         TrainDelete,
         ManageUser,
         HelpAbout,
-        SetLimitSpeed
+        SetLimitSpeed,
+        TrainFixedPathPane
     },
     props: {
         dateString: {
@@ -168,11 +172,11 @@ export default {
                             },
                             {
                                 title: '更新数据',
-                                click: this.undeveloped
+                                click: this.updateTrainFixedPath
                             },
                             {
                                 title: '列车固定径路',
-                                click: this.undeveloped
+                                click: this.trainFixedPathPane
                             },
                             {
                                 type: 'separator'
@@ -306,6 +310,20 @@ export default {
                 }
             });
         },
+        updateTrainFixedPath() {
+            const stationCode = this.$store.state.training.roleDeviceCode;
+            commitOperate(menuOperate.CTC.updateTrainFixedPath2Station, { stationCode: stationCode }, 3).then(({valid, response}) => {
+                if (valid) {
+                    this.$nextTick(function () {
+                        this.$store.dispatch('training/emitTipFresh');
+                    });
+                }
+            });
+        },
+        trainFixedPathPane() {
+            const stationCode = this.$store.state.training.roleDeviceCode;
+            this.$refs.trainFixedPathPane.doShow(stationCode);
+        },
         bottomTableShowOrHidden() {
             EventBus.$emit('bottomTableShowOrHidden');
         },
diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 599a2d68d..393e15250 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -1,6 +1,7 @@
 <template>
   <div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height:40px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
-    <button :id="Station.stationMasterLock.rightButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: xGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockRightButtonDown()">
+    <!-- backgroundColor: xGuideMasterLock? guideColorDown: guideColorUp -->
+    <button :id="Station.stationMasterLock.rightButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="guideLockRightButtonDown()">
       <span style="color: #800000">
         <center><b>X引导总锁</b></center>
       </span>
@@ -71,7 +72,7 @@
         <center><b>道岔解封</b></center>
       </span>
     </button>
-    <button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['Signal'])">
+    <button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['SignalButton'])">
       <span style="color: black">
         <center><b>点灯</b></center>
       </span>
@@ -86,7 +87,8 @@
         <center><b>S引导总锁</b></center>
       </span>
     </button>
-    <button :id="Station.powerUnLock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="powerOnUnlock()">
+    <!-- powerOnUnlock -->
+    <button :id="Station.powerUnLock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Station.powerUnLock.button.operation,['Station'])">
       <!--<span style="color:black">-->
       <span style="color:#800000">
         <center><b>上电解锁</b></center>
@@ -117,7 +119,7 @@
     <!--</button>-->
     <password-box ref="password" @checkOver="passWordCommit" @checkCancel="clearOperate" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-    <defective-shunting ref="defectiveShunting" />
+    <defective-shunting ref="defectiveShunting" @clearOperate="clearOperate" />
   </div>
 </template>
 
@@ -131,7 +133,6 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { MouseEvent } from '@/scripts/ConstDic';
-// import { OperateMode } from '@/scripts/ConstDic';
 
 export default {
     name: 'MapButtonMenu',
@@ -150,10 +151,6 @@ export default {
     },
     data() {
         return {
-            // point: {
-            //     x: 0,
-            //     y: 30
-            // },
             operation: '0',
             buttonName: '',
             guideColorDown: '#FEEE1A',
@@ -266,10 +263,10 @@ export default {
             this.guideLockLeftFlag = false;
         },
         '$store.state.socket.simulationTimeSync': function (val) {
-            if (this.timeNode && val - this.timeNode >= 15) {
+            if (this.timeNode && val - this.timeNode >= 15000) {
                 this.clearOperate();
             }
-            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15) {
+            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15000) {
                 if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
                     this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0}]);
                 } else if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'Signal' && this.deviceList[0].type === 'SHUNTING') {
@@ -283,6 +280,19 @@ export default {
                 const station = this.$store.getters['map/getDeviceByCode'](val);
                 this.$store.getters['map/checkStationGuideMaster'](station.code, station.sGuideMasterLock, station.xGuideMasterLock);
             }
+        },
+        '$store.state.socket.simulationReset': function(val) {
+            if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
+                this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0}]);
+            } else if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'Signal' && this.deviceList[0].type === 'SHUNTING') {
+                this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'Signal', hasSelected: 0}]);
+            }
+            this.deviceList = [];
+            this.commandTypeList = [];
+            this.$store.dispatch('menuOperation/setButtonOperation', null);
+            this.clearOperate();
+            this.guideLockRightFlag = false;
+            this.guideLockLeftFlag = false;
         }
     },
     beforeDestroy() {
@@ -299,14 +309,17 @@ export default {
                 }
                 operate = {
                     over: true,
-                    operation: data.operation,
+                    operation: data.operateNext,
+                    operationPre: data.operation,
                     cmdType: data.nextCmdType,
+                    userOperationType: 'leftClick',
                     param: data.param
                 };
             } else {
                 operate = {
                     operationPre: data.operation,
-                    operation: data.operateNext
+                    operation: data.operateNext,
+                    userOperationType: 'leftClick'
                 };
             }
             this.trainingOperation(operate);
@@ -321,6 +334,9 @@ export default {
                     } else if (operate.operationPre === this.Switch.guideLock.rightButton.operation || operate.operation === this.Switch.guideLock.rightButton.operation) {
                         this.guideLockRightFlag = !this.guideLockRightFlag;
                     }
+                    if (operate.operationPre == this.Station.powerUnLock.button.operation) {
+                        this.clearOperate();
+                    }
                     // debugger;
                     // this.$store.dispatch('menuOperation/setButtonOperation', operate.operation); // 按钮菜单是否被按下
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -353,37 +369,59 @@ export default {
                 }
             }
         },
-        // 上电解锁 大铁线路
-        powerOnUnlock() {
-            const operate = {
-                over:true,
-                operation:this.Station.powerUnLock.button.operation,
-                cmdType:CMD.Station.CMD_STATION_POWER_ON_UNLOCK,
-                code:this.$store.state.map.showCentralizedStationCode,
-                param:{stationCode: this.$store.state.map.showCentralizedStationCode}
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.clearOperate();
-                } else {
-                    this.$refs.noticeInfo.doShow();
-                }
-            }).catch((error) => {
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            });
-        },
+        // // 上电解锁 大铁线路
+        // handelPowerUnLock(model) {
+        //     debugger;
+        //     const operate = {
+        //         over: true,
+        //         code: model.code,
+        //         operation: this.$store.state.menuOperation.buttonOperation,
+        //         userOperationType: 'leftClick',
+        //         cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK,
+        //         param:{stationCode: this.$store.state.map.showCentralizedStationCode}
+        //     };
+        //     this.sendCommand(operate);
+        // },
+        // powerOnUnlock() {
+        // const operate = {
+        //     over:true,
+        //     operation:this.Station.powerUnLock.button.operation,
+        //     cmdType:CMD.Station.CMD_STATION_POWER_ON_UNLOCK,
+        //     code:this.$store.state.map.showCentralizedStationCode,
+        //     param:{stationCode: this.$store.state.map.showCentralizedStationCode}
+        // };
+        // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+        //     if (valid) {
+        //         this.clearOperate();
+        //     } else {
+        //         this.$refs.noticeInfo.doShow();
+        //     }
+        // }).catch((error) => {
+        //     console.error(error);
+        //     this.$refs.noticeInfo.doShow();
+        // });
+        // },
         // 分路不良
         handelDefectiveShunting(model) {
             // CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING;
-            const {switchSection, code, shuntingTypeList} = model;
-            this.clearOperate();
-            this.$refs.defectiveShunting.doShow({switchSection, code, shuntingTypeList});
+            const operate = {
+                operation: this.Section.defectiveShunting.button.operation,
+                code: model.code,
+                userOperationType: 'leftClick'
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    const {switchSection, code, shuntingTypeList} = model;
+                    this.$refs.defectiveShunting.doShow({switchSection, code, shuntingTypeList});
+                }
+            });
+            // this.clearOperate();
         },
         // S引导总锁按钮点击
         guideLockLeftButtonDown() {
             const operate = {
-                operation: this.Station.stationMasterLock.leftButton.operation
+                operation: this.Station.stationMasterLock.leftButton.operation,
+                userOperationType: 'leftClick'
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
@@ -399,7 +437,8 @@ export default {
         // X引导总锁按钮点击
         guideLockRightButtonDown() {
             const operate = {
-                operation: this.Station.stationMasterLock.rightButton.operation
+                operation: this.Station.stationMasterLock.rightButton.operation,
+                userOperationType: 'leftClick'
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
@@ -416,16 +455,21 @@ export default {
             this.clearOperate();
             if (operation != this.Command.cancel.clearMbm.operation) {
                 const operate = {
-                    operation: operation
+                    operation: operation,
+                    userOperationType: 'leftClick'
                 };
                 // 以下 会弹出密码框 （总人解，区故解） 铅封按钮
-                const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation, this.Section.defectiveShunting.button.operation,
+                const operationList = [this.Signal.humanTrainRoute.button.operation,
+                    this.Section.fault.button.operation,
+                    this.Section.defectiveShunting.button.operation,
+                    this.Station.powerUnLock.button.operation,
                     this.Signal.signalTurnOff.menuButton.operation];
                 const operationMap = {
                     [this.Signal.humanTrainRoute.button.operation]:'总人解',
                     [this.Section.fault.button.operation]:'区故解',
                     [this.Section.defectiveShunting.button.operation]:'分路不良',
-                    [this.Signal.signalTurnOff.menuButton.operation]:'灭灯'
+                    [this.Signal.signalTurnOff.menuButton.operation]:'灭灯',
+                    [this.Station.powerUnLock.button.operation]:'上电解锁'
                 };
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
@@ -436,6 +480,10 @@ export default {
                         // 判断是否需要 弹窗密码框
                         if (operationList.includes(operation)) {
                             operate['operateNext'] = this.Command.close.password.operation;
+                            if (operation == this.Station.powerUnLock.button.operation) {
+                                operate.nextCmdType = CMD.Station.CMD_STATION_POWER_ON_UNLOCK;
+                                operate.param = {stationCode: this.$store.state.map.showCentralizedStationCode};
+                            }
                             this.$refs.password.doShow(operate, operationMap[operation]);
                         }
                         this.timeNode = this.$store.state.socket.simulationTimeSync;
@@ -446,6 +494,7 @@ export default {
                 // 清除按钮
                 const operate = {
                     start: true,
+                    userOperationType: 'leftClick',
                     operation: operation
                 };
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@@ -478,12 +527,13 @@ export default {
         // 排列进路 OR 信号重开操作
         arrangementRouteOperation(deviceList) {
             const operate = {
-                operation: this.Signal.arrangementRoute.button.operation
+                operation: this.Signal.arrangementRoute.button.operation,
+                userOperationType: 'leftClick'
             };
             if (!this.routeDataMap) { this.handleRouteDataMap(); }
 
             if (!this.checkHaveRoute(deviceList)) { // 无效的进路按钮选择 清除deviceList
-                this.$message.error('无效的进路按钮');
+                // this.$message.error('无效的进路按钮');
                 this.clearOperate();
                 return;
             }
@@ -531,18 +581,21 @@ export default {
             }
         },
         // 总取消
-        handelTotalCancel(model) {
+        handleTotalCancel(model) {
             const operate = {
                 over: true,
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
+                userOperationType: 'leftClick',
                 cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
                 param: {
                     signalCode: model._type === 'Signal' ? model.code : model.signalCode
                 }
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                this.clearOperate();
+                if (valid) {
+                    this.clearOperate();
+                }
             }).catch((error) => {
                 this.clearOperate();
                 console.error(error);
@@ -555,6 +608,7 @@ export default {
                 over: true,
                 code: model.code,
                 operation: this.Signal.guide.button.operation,
+                userOperationType: 'leftClick',
                 cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
                 param: {signalCode: model.signalCode}
             };
@@ -564,6 +618,7 @@ export default {
                 this.sendCommand(operate);
             } else {
                 operate.nextCmdType = CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
+                operate['operateNext'] = this.Command.close.password.operation;
                 this.$refs.password.doShow(operate, '引导信号');
                 this.$store.dispatch('training/updateMapState', [{code: model.code, _type: model._type, pressDown: 1}]);
             }
@@ -574,6 +629,7 @@ export default {
                 over: true,
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
+                userOperationType: 'leftClick',
                 val: model.code,
                 cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
             };
@@ -591,6 +647,7 @@ export default {
                 over: true,
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
+                userOperationType: 'leftClick',
                 cmdType: this.cmdType,
                 param: { switchCode: model.code}
             };
@@ -598,10 +655,15 @@ export default {
         },
         // 发送指令
         sendCommand(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
+            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {
+                if (valid) {
+                    this.clearOperate();
+                }
+            }).catch((error) => {
+                this.clearOperate();
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
-            }).finally(() =>{ this.clearOperate(); });
+            });
         },
         // 校验是否有列车(接车)按钮
         checkHasTrainButton(model) {
@@ -622,6 +684,7 @@ export default {
                 over: true,
                 code: model.code,
                 operation: buttonOperation,
+                userOperationType: 'leftClick',
                 cmdType: '',
                 param: {}
             };
@@ -651,6 +714,7 @@ export default {
                     over: true,
                     code: model.code,
                     operation: this.guideLockRightFlag ? this.Switch.guideLock.rightButton : this.Switch.guideLock.leftButton,
+                    userOperationType: 'leftClick',
                     nextCmdType: CMD.Switch.CMD_SWITCH_MASTER_LOCK,
                     param: {signalCode: model.signalCode}
                 };
@@ -659,6 +723,7 @@ export default {
                     operate.cmdType = CMD.Switch.CMD_SWITCH_MASTER_LOCK;
                     this.sendCommand(operate);
                 } else {
+                    operate['operateNext'] = this.Command.close.password.operation;
                     this.$refs.password.doShow(operate, '引导信号');
                 }
             }
@@ -669,6 +734,7 @@ export default {
                     over: true,
                     code: model.code,
                     operation: this.$store.state.menuOperation.buttonOperation,
+                    userOperationType: 'leftClick',
                     cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
                     param: {sectionCode: model.code}
                 };
@@ -680,8 +746,9 @@ export default {
                 over: true,
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
+                userOperationType: 'leftClick',
                 cmdType: CMD.Signal.CMD_SIGNAL_TURN_ON,
-                param: {signalCode: model.code}
+                param: {signalCode: model.signalCode}
             };
             this.sendCommand(operate);
         },
@@ -691,6 +758,7 @@ export default {
                     over: true,
                     code: model.code,
                     operation: this.$store.state.menuOperation.buttonOperation,
+                    userOperationType: 'leftClick',
                     cmdType: CMD.Signal.CMD_SIGNAL_TURN_OFF,
                     param: {signalCode: model.signalCode}
                 };
@@ -717,7 +785,7 @@ export default {
                 this.handleGuideLock(model);
             } else if (buttonOperation && this.commandTypeList.includes(model._type)) {
                 if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {
-                    this.handelTotalCancel(model);
+                    this.handleTotalCancel(model);
                 } else if (buttonOperation === this.Signal.humanTrainRoute.button.operation) {
                     this.handleTotalHumanSolution(model);
                 } else if (switchOperation.includes(buttonOperation)) {
@@ -771,6 +839,7 @@ export default {
                     name:'总辅助',
                     operation:this.CTCCommand.assistPressMainAssist.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_MAIN_ASSIST,
+                    userOperationType: 'leftClick',
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode,
@@ -782,6 +851,7 @@ export default {
                     name:'改方',
                     operation:this.CTCCommand.assistPressDownTurnDirection.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION,
+                    operationType: 'leftClick',
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode,
@@ -794,6 +864,7 @@ export default {
                     // this.CTCCommand.assistPressDownTurnDirection.menu.operation
                     operation:this.CTCCommand.assistPressReceiveAssist.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_RECEIVE_ASSIST,
+                    userOperationType: 'leftClick',
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode
@@ -804,6 +875,7 @@ export default {
                     name:'发辅助',
                     operation:this.CTCCommand.assistPressDeliverAssist.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_DELIVER_ASSIST,
+                    userOperationType: 'leftClick',
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode
@@ -814,6 +886,7 @@ export default {
                     name:'事故',
                     operation:this.CTCCommand.assistPressAccident.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_ACCIDENT,
+                    userOperationType: 'leftClick',
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode
@@ -826,6 +899,7 @@ export default {
                 'OCCLUSION':{
                     operation:this.CTCCommand.assistPressBlock.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_BLOCK,
+                    userOperationType: 'leftClick',
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode
@@ -835,6 +909,7 @@ export default {
                 'RECOVERY':{
                     operation:this.CTCCommand.assistPressRestore.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_RESTORE,
+                    userOperationType: 'leftClick',
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode
@@ -847,7 +922,8 @@ export default {
                     operation: noPasswordModelTypeMap[model.type].operation,
                     code: model.code,
                     param: noPasswordModelTypeMap[model.type].param,
-                    cmdType : noPasswordModelTypeMap[model.type].nextCmdType
+                    cmdType : noPasswordModelTypeMap[model.type].nextCmdType,
+                    userOperationType: 'leftClick'
                 };
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
@@ -864,7 +940,8 @@ export default {
                 const operate = {
                     operation: modelTypeMap[model.type].operation,
                     code: model.code,
-                    param: modelTypeMap[model.type].param
+                    param: modelTypeMap[model.type].param,
+                    userOperationType: 'leftClick'
                 };
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
index ac3f88c7e..9cfae3884 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
@@ -265,16 +265,21 @@ export default {
         },
         '$store.state.menuOperation.menuCount': function (val) {
             if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) {
+                const operate = {
+                    userOperationType: 'rightClick',
+                    operation: this.Command.commandRight.right.operation
+                };
+                this.$store.dispatch('training/nextNew', operate);
                 this.$refs && this.$refs.popMenu && this.$refs.popMenu.resetShowPosition(this.$store.state.menuOperation.menuPosition);
             } else {
                 this.$refs && this.$refs.popMenu && this.$refs.popMenu.close();
             }
         },
         '$store.state.socket.simulationTimeSync': function (val) {
-            if (this.timeNode && val - this.timeNode >= 15) {
+            if (this.timeNode && val - this.timeNode >= 15000) {
                 this.clearOperate();
             }
-            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15) {
+            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15000) {
                 if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
                     this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0}]);
                 } else if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'Signal' && this.deviceList[0].type === 'SHUNTING') {
@@ -322,12 +327,14 @@ export default {
             if (data.nextCmdType) {
                 operate = {
                     over: true,
+                    userOperationType: 'leftClick',
                     operation: data.operation,
                     cmdType: data.nextCmdType,
                     param: data.param
                 };
             } else {
                 operate = {
+                    userOperationType: 'leftClick',
                     operationPre: data.operation,
                     operation: data.operateNext
                 };
@@ -368,6 +375,7 @@ export default {
         // S引导总锁按钮点击
         guideLockLeftButtonDown() {
             const operate = {
+                userOperationType: 'leftClick',
                 operation: this.Switch.guideLock.leftButton.operation
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@@ -384,6 +392,7 @@ export default {
         // X引导总锁按钮点击
         guideLockRightButtonDown() {
             const operate = {
+                userOperationType: 'leftClick',
                 operation: this.Switch.guideLock.rightButton.operation
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@@ -403,6 +412,7 @@ export default {
             this.clearOperate();
             if (operation != this.Command.cancel.clearMbm.operation) {
                 const operate = {
+                    userOperationType: 'leftClick',
                     operation: operation
                 };
                 // 以下 会弹出密码框 （总人解，区故解） 铅封按钮 684
@@ -430,6 +440,7 @@ export default {
                 // 清除按钮
                 const operate = {
                     start: true,
+                    userOperationType: 'leftClick',
                     operation: operation
                 };
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@@ -467,6 +478,7 @@ export default {
         handelReopenSignal(device) {
             const operate = {
                 operation: this.Signal.reopenSignal.button.operation,
+                userOperationType: 'leftClick',
                 code: device.code,
                 param: { signalCode: device.code }
             };
@@ -475,10 +487,10 @@ export default {
         },
         // 排列进路
         arrangementRouteOperation(deviceList) {
-            const operate = { operation: this.Signal.arrangementRoute.button.operation };
+            const operate = { userOperationType: 'leftClick', operation: this.Signal.arrangementRoute.button.operation };
             if (!this.routeDataMap) { this.handleRouteDataMap(); }
             if (!this.checkHaveRoute(deviceList)) { // 无效的进路按钮选择 清除deviceList
-                this.$message.error('无效的进路按钮');
+                // this.$message.error('无效的进路按钮');
                 this.clearOperate();
                 return;
             }
@@ -543,6 +555,7 @@ export default {
             const operate = {
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
+                userOperationType: 'leftClick',
                 param: {
                     signalCode: model._type === 'Signal' ? model.code : model.signalCode
                 }
@@ -557,6 +570,7 @@ export default {
             const operate = {
                 code: model.code,
                 operation: this.Signal.guide.button.operation,
+                userOperationType: 'leftClick',
                 param: {signalCode: model.signalCode}
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
@@ -570,6 +584,7 @@ export default {
             const operate = {
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
+                userOperationType: 'leftClick',
                 val: model.code,
                 param: { signalCode: model.code }
             };
@@ -582,6 +597,7 @@ export default {
             const operate = {
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
+                userOperationType: 'leftClick',
                 param: { switchCode: model.code}
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
@@ -641,6 +657,7 @@ export default {
             const operate = {
                 code: model.code,
                 operation: this.Signal.guide.button.operation,
+                userOperationType: 'leftClick',
                 param: {signalCode: model.signalCode}
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
@@ -673,7 +690,7 @@ export default {
             // this.handleGuideLock(model);
             // this.handleGuideSignal(model);
             // } else
-            debugger;
+            // debugger;
             if (buttonOperation && this.commandTypeList.includes(model._type)) {
                 if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {
                     this.handelTotalCancel(model);
@@ -747,7 +764,7 @@ export default {
             this.$store.dispatch('menuOperation/setButtonOperation', this.operation);
         },
         routeCommit(trainCode, duration) {
-            const operate = {over: true, cmdType: CMD.CTC.CTC_SET_ROUTE, param:{ tripNumber: trainCode || '', duration: duration >= 0 ? duration : null, force: false }};
+            const operate = {userOperationType: 'leftClick', over: true, cmdType: CMD.CTC.CTC_SET_ROUTE, param:{ tripNumber: trainCode || '', duration: duration >= 0 ? duration : null, force: false }};
             this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
                 this.clearOperate();
             }).catch((e) => {
@@ -766,7 +783,7 @@ export default {
                     this.routeCommit();
                 }
             } else if (this.operation === OperationEvent.MixinCommand.totalCancel.button.operation) {
-                const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE};
+                const operate = {userOperationType: 'leftClick', over: true, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE};
                 this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
                     this.clearOperate();
                 }).catch((e) => {
@@ -774,7 +791,7 @@ export default {
                     this.clearOperate();
                 });
             } else if (this.operation === OperationEvent.Signal.reopenSignal.button.operation) {
-                const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL};
+                const operate = {userOperationType: 'leftClick', over: true, cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL};
                 this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
                     this.clearOperate();
                 }).catch(() => {
@@ -782,7 +799,7 @@ export default {
                     this.clearOperate();
                 });
             } else if (this.operation === OperationEvent.Signal.guide.button.operation) {
-                const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE};
+                const operate = {userOperationType: 'leftClick', over: true, cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE};
                 this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
                     this.$store.dispatch('training/updateMapState', [{code: this.selected.code, _type: this.selected._type, hasSelected: 0}]);
                     this.clearOperate();
@@ -792,13 +809,13 @@ export default {
                     this.clearOperate();
                 });
             } else if (this.operation === OperationEvent.Signal.humanTrainRoute.button.operation) {
-                const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE};
+                const operate = {userOperationType: 'leftClick', over: true, cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE};
                 this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
                 }).catch((e) => {
                     this.$refs.noticeInfo.doShow();
                 }).finally(() => { this.clearOperate(); });
             } else if (this.switchOperation.includes(this.operation)) {
-                const operate = {over:true, cmdType: this.cmdType};
+                const operate = {userOperationType: 'leftClick', over:true, cmdType: this.cmdType};
                 this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
                 }).catch(() => {
                     this.$refs.noticeInfo.doShow();
@@ -885,6 +902,7 @@ export default {
                 const operate = {
                     over:true,
                     operation: noPasswordModelTypeMap[model.type].operation,
+                    userOperationType: 'leftClick',
                     code: model.code,
                     param: noPasswordModelTypeMap[model.type].param,
                     cmdType : noPasswordModelTypeMap[model.type].nextCmdType
@@ -903,6 +921,7 @@ export default {
             } else {
                 const operate = {
                     operation: modelTypeMap[model.type].operation,
+                    userOperationType: 'leftClick',
                     code: model.code,
                     param: modelTypeMap[model.type].param
                 };
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue
new file mode 100644
index 000000000..03bb36e82
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue
@@ -0,0 +1,249 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm"
+    :title="title"
+    :visible.sync="show"
+    width="1220px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-table
+      id="trainFixedPathList"
+      :data="trainFixedPathList"
+      border
+      height="280"
+      style="width: 100%;border:1px #ccc solid"
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        width="70"
+      />
+      <el-table-column
+        prop="stationCode"
+        label="站名"
+        width="120"
+      >
+        <template slot-scope="scope">
+          {{ stationMap[scope.row.stationCode].name }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="arriveTipNum"
+        label="到达车次"
+        width="80"
+      />
+      <el-table-column
+        prop="arriveTime"
+        label="到达时间"
+        width="80"
+      />
+      <el-table-column
+        prop="leaveTipNum"
+        label="出发车次"
+        width="80"
+      />
+      <el-table-column
+        prop="leaveTime"
+        label="出发时间"
+        width="80"
+      />
+      <el-table-column
+        prop="masterCode"
+        label="股道名"
+        width="75"
+      >
+        <template slot-scope="scope">
+          <div v-if="scope.row.masterCode">
+            {{ sectionMap[scope.row.masterCode].name }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="backStationCode"
+        label="来方车站"
+        width="120"
+      >
+        <!-- 后方车站 -->
+        <template slot-scope="scope">
+          <div v-if="scope.row.backStationCode">
+            {{ stationMap[scope.row.backStationCode].name }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="fontStationCode"
+        label="去方车站"
+        width="120"
+      >
+        <!-- 前方车站 -->
+        <template slot-scope="scope">
+          <div v-if="scope.row.fontStationCode">
+            {{ stationMap[scope.row.fontStationCode].name }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="enterDirCode"
+        label="入口"
+        width="170"
+      >
+        <template slot-scope="scope">
+          <div v-if="scope.row.enterDirCode">
+            {{ mapStationDirectionData[scope.row.enterDirCode].name }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="outDirCode"
+        label="出口"
+        width="170"
+      >
+        <template slot-scope="scope">
+          <div v-if="scope.row.outDirCode">
+            {{ mapStationDirectionData[scope.row.outDirCode].name }}
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-row justify="center" class="button-group" style="margin-top:20px">
+      <el-col :span="3" :offset="5">
+        <el-button :id="domIdLoad " type="primary" :loading="loading" @click="loadUpdateTrainFixedPath">加载 </el-button>
+      </el-col>
+      <el-col :span="3" :offset="2">
+        <el-button :id="domIdUpdate " type="primary" :loading="loading" @click="updateTrainFixedPath2Station">更新 </el-button>
+      </el-col>
+      <el-col :span="3" :offset="2">
+        <el-button :id="domIdCancel" @click="cancel">取消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+export default {
+    name: 'TrainFixedPathPane',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            stationCode:'',
+            trainFixedPathList:[
+
+            ],
+            title:''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'stationList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+
+        // 固定列车经路更新加载到计划
+        domIdLoad() {
+            return this.dialogShow ? OperationEvent.CTCCommand.loadUpdateStationTrainFixedPath.menu.domId : '';
+        },
+        // 固定列车经路从生效区更新
+        domIdUpdate() {
+            return this.dialogShow ? OperationEvent.CTCCommand.updateTrainFixedPath2Station.menu.domId : '';
+        },
+
+        mapStationDirectionData() {
+            return this.$store.state.map.mapStationDirectionData;
+        },
+        stationMap() {
+            const stationMap = {};
+            this.stationList.forEach(station=>{
+                stationMap[station.code] = {code:station.code, name:station.name};
+            });
+            return stationMap;
+        },
+        sectionMap() {
+            const sectionMap = {};
+            this.sectionList.forEach(section=>{
+                sectionMap[section.code] = {code:section.code, name:section.name};
+            });
+            return sectionMap;
+        }
+        // domIdConfirm() {
+        //     return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
+        // }
+    },
+    methods:{
+        doShow(stationCode) {
+            const title = '固定径路信息';
+            this.stationCode = stationCode;
+            commitOperate(menuOperate.CTC.getStationTrainFixedPath, { stationCode: stationCode }, 3).then(({valid, response}) => {
+                if (valid) {
+                    this.trainFixedPathList = response.data.data;
+                    this.dialogShow = true;
+                    this.title = title + ' 版本:' + response.data.version;
+                    this.$nextTick(function () {
+                        this.$store.dispatch('training/emitTipFresh');
+                    });
+                }
+            });
+
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+
+        // 固定列车经路更新加载到计划
+        loadUpdateTrainFixedPath() {
+            commitOperate(menuOperate.CTC.loadUpdateStationTrainFixedPath, { stationCode: this.stationCode }, 3).then(({valid, response}) => {
+                if (valid) {
+                    this.$message.success('加载成功！');
+                    this.$nextTick(function () {
+                        this.$store.dispatch('training/emitTipFresh');
+                    });
+                }
+            }).catch(()=>{
+                this.$message.error('加载失败');
+            });
+        },
+        // 固定列车经路从生效区更新
+        updateTrainFixedPath2Station() {
+            commitOperate(menuOperate.CTC.updateTrainFixedPath2Station, { stationCode: this.stationCode }, 3).then(({valid, response}) => {
+                if (valid) {
+                    // 固定列车经路更新列表
+                    commitOperate(menuOperate.CTC.getStationTrainFixedPath, { stationCode: this.stationCode }, 3).then(({valid, response}) => {
+                        if (valid) {
+                            const title = '固定径路信息';
+                            this.trainFixedPathList = response.data.data;
+                            this.title = title + ' 版本 :' + response.data.version;
+                            this.$nextTick(function () {
+                                this.$store.dispatch('training/emitTipFresh');
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/datie_02/menus/menuPanel.vue b/src/jmapNew/theme/datie_02/menus/menuPanel.vue
index 4810414c2..0bd0b85a3 100644
--- a/src/jmapNew/theme/datie_02/menus/menuPanel.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuPanel.vue
@@ -31,6 +31,12 @@
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
     <BoardViewSetting ref="boardViewSetting" />
     <RailViewSetting ref="railViewSetting" />
+    <PowerSupplyArmSetting ref="powerSupplyArmSetting" />
+    <BlockDevice ref="blockDevice" />
+    <RegionBatchOperation ref="regionBatchOperation" />
+    <StationTrainManage ref="stationTrainManage" />
+    <OperationLogQuery ref="operationLogQuery" />
+    <InfoDialog ref="infoDialog" />
   </div>
 </template>
 
@@ -49,6 +55,12 @@ import { EventBus } from '@/scripts/event-bus'
 import SettingsMenu from './components/menu.vue'
 import BoardViewSetting from './dialog/boardViewSetting.vue'
 import RailViewSetting from './dialog/railViewSetting.vue'
+import PowerSupplyArmSetting from './dialog/powerSupplyArmSetting.vue'
+import BlockDevice from './dialog/blockDevice'
+import RegionBatchOperation from './dialog/regionBatchOperation'
+import StationTrainManage from './dialog/stationTrainManage'
+import OperationLogQuery from './dialog/operationLogQuery'
+import InfoDialog from './dialog/infoDialog'
 
 export default {
   name: 'MenuPanel',
@@ -57,6 +69,12 @@ export default {
     SettingsMenu,
     BoardViewSetting,
     RailViewSetting,
+    PowerSupplyArmSetting,
+    BlockDevice,
+    RegionBatchOperation,
+    StationTrainManage,
+    OperationLogQuery,
+    InfoDialog,
   },
   data() {
     return {
@@ -82,22 +100,38 @@ export default {
         {
           label: '调车参数配置',
           id: 'shuntingParam',
-          children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }],
+          children: [
+            { label: '标准站', id: 'Station58852' },
+            { label: '标准甲站', id: 'Station32295' },
+            { label: '标准丙站', id: 'Station47980' },
+          ],
         },
         {
           label: '调车优先级配置',
           id: 'shuntingPriority',
-          children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }],
+          children: [
+            { label: '标准站', id: 'Station58852' },
+            { label: '标准甲站', id: 'Station32295' },
+            { label: '标准丙站', id: 'Station47980' },
+          ],
         },
         {
           label: '调车规则配置',
           id: 'shuntingRule',
-          children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }],
+          children: [
+            { label: '标准站', id: 'Station58852' },
+            { label: '标准甲站', id: 'Station32295' },
+            { label: '标准丙站', id: 'Station47980' },
+          ],
         },
         {
           label: '功能按钮设置',
           id: 'functionButton',
-          children: [{ label: '标准站', id: 'std' }, { label: '标准甲站', id: 'std1' }, { label: '标准乙站', id: 'std2' }],
+          children: [
+            { label: '标准站', id: 'Station58852' },
+            { label: '标准甲站', id: 'Station32295' },
+            { label: '标准丙站', id: 'Station47980' },
+          ],
         },
         { label: '站场界面显示设置', id: 'UIDisplay' },
         { label: '报警提示设置', id: 'alarm' },
@@ -106,12 +140,39 @@ export default {
       T3MenuItems: [
         { label: '设置供电臂状态', id: 'powerSupplyArm', ctc: true },
         { label: '封锁设备操作', id: 'blockedDeviceOperation', ctc: true },
-        { label: '区域批量设备操作', id: 'regionBatchOperation', children: [{}], ctc: true },
-        { label: '站存车管理', id: 'stationTrainManage', children: [{}], ctc: true },
-        { label: '设备影响分析', id: 'deviceAffectAnalyze', children: [{}], ctc: true },
-        { label: '操作日志查询', id: 'operationLog', ctc: true },
-        { label: '防溜设置查询', id: 'deviceAffectAnalyze', ctc: true },
-        { label: '设备影响分析', id: 'deviceAffectAnalyze', ctc: true },
+        {
+          label: '区域批量设备操作',
+          id: 'regionBatchOperation',
+          ctc: true,
+          children: [
+            { label: '标准站', id: 'Station58852' },
+            { label: '标准甲站', id: 'Station32295' },
+            { label: '标准丙站', id: 'Station47980' },
+          ],
+        },
+        {
+          label: '站存车管理',
+          id: 'stationTrainManage',
+          ctc: true,
+          children: [
+            { label: '标准站', id: 'Station58852' },
+            { label: '标准甲站', id: 'Station32295' },
+            { label: '标准丙站', id: 'Station47980' },
+          ],
+        },
+        {
+          label: '设备影响分析',
+          id: 'deviceAffectAnalyze',
+          ctc: true,
+          children: [
+            { label: '标准站', id: 'Station58852' },
+            { label: '标准甲站', id: 'Station32295' },
+            { label: '标准丙站', id: 'Station47980' },
+          ],
+        },
+        { label: '操作日志查询', id: 'operationLog' },
+        { label: '防溜设置查询', id: 'antiSlipSettingQuery' },
+        { label: '信息提示', id: 'info' },
       ],
     }
   },
@@ -188,6 +249,31 @@ export default {
     },
     handleT3MenuSelect(id) {
       console.log(id)
+      this.closeMenus()
+      const params = id.split('-')
+      switch (params[0]) {
+        case 'powerSupplyArm':
+          this.$refs.powerSupplyArmSetting.doShow()
+          break
+        case 'blockedDeviceOperation':
+          this.$refs.blockDevice.doShow()
+          break
+        case 'regionBatchOperation':
+          if (!params[1]) return
+          this.$refs.regionBatchOperation.doShow(params[1])
+          break
+        case 'stationTrainManage':
+          if (!params[1]) return
+          this.$refs.stationTrainManage.doShow(params[1])
+          break
+        case 'operationLog':
+        case 'antiSlipSettingQuery':
+          this.$refs.operationLogQuery.doShow()
+          break
+        case 'info':
+          this.$refs.infoDialog.doShow()
+          break
+      }
     },
     dragEvent() {
       const offset = this.offset
diff --git a/src/jmapNew/theme/datie_02/menus/menuTool.vue b/src/jmapNew/theme/datie_02/menus/menuTool.vue
index 95bc382b2..acc5e6798 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTool.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTool.vue
@@ -19,7 +19,7 @@
   </div>
 </template>
 <script>
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
 
@@ -135,8 +135,7 @@ export default {
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+			this.time = timestampFormat('HH:mmss', initTime)
         }
     },
     mounted() {
diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index 9a10124fd..0c1a2f477 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -581,8 +581,7 @@ import Rpb from '@/assets/ctc_icon/rpb.png';
 import Rpwp from '@/assets/ctc_icon/rpwp.png';
 import Rph from '@/assets/ctc_icon/rph.png';
 import RpAdd from '@/assets/ctc_icon/rpadd.png';
-import { timeFormat } from '@/utils/date';
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import SendRunplan from './dialog/sendRunplan';
 import StageRunplan from './dialog/stageRunplan';
@@ -594,8 +593,8 @@ import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuO
 import { copyAssign } from '@/utils/index';
 import { mapGetters, mapState } from 'vuex';
 import { transfiniteList } from '@/scripts/ConstDic';
-import cmdManage from '@/views/dispatcherStationManage/cmdManage.vue';
-import signedCmd from '@/views/dispatcherStationManage/signedCmd.vue';
+import cmdManage from '@/jmapNew/theme/components/menus/dialog/cmdManage.vue';
+import signedCmd from '@/jmapNew/theme/components/menus/dialog/signedCmd.vue';
 export default {
     name:'RunplanPane',
     components: {
@@ -664,9 +663,8 @@ export default {
     },
     watch:{
         '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            this.initDate(date);
+            this.$store.dispatch('training/setInitTime', time);
+            this.initDate(time);
         },
         '$store.state.training.roleDeviceCode':function(newVal, oldVal) {
             if (oldVal) {
@@ -706,14 +704,9 @@ export default {
             }
         },
         initDate(date) {
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
-            const years = date.getFullYear() + '';
-            let months = date.getMonth() + 1 + '';
-            let dates = date.getDate() + '';
-            if (months.length < 2) { months = '0' + months; }
-            if (dates.length < 2) { dates = '0' + dates; }
-            this.dateString = years + months + dates;
-            this.dateString1 = years + '年' + months + '月' + dates + '日';
+            this.time = timestampFormat('HH:mm:ss', date)
+            this.dateString = timestampFormat('YYYYMMDD', date)
+            this.dateString1 = timestampFormat('YYYY年MM月DD日', date)
         },
         judgeColor({row, rowIndex}) {
             if (row.effect) {
diff --git a/src/jmapNew/theme/datie_02/operationConfig.js b/src/jmapNew/theme/datie_02/operationConfig.js
index 1a6e6e84d..c242db8b5 100644
--- a/src/jmapNew/theme/datie_02/operationConfig.js
+++ b/src/jmapNew/theme/datie_02/operationConfig.js
@@ -1,14 +1,3 @@
-// SECTION 区段
-// SWITCH 道岔
-// SIGNAL 信号机
-// START_SIGNAL 进路起始信号机
-// END_SIGNAL   进路终端信号机
-
-// STATION 车站
-// STAND 站台
-// ROUTE 进路
-// CYCLE 自动折返
-
 // {id: "1", trainingType: "ControlConvertMenu", name: "车站名称"}
 // {id: "2", trainingType: "ControlConvertMenu", name: "车站控制模式编号"}
 // {id: "3", trainingType: "Signal", name: "进路名称"}
@@ -46,83 +35,6 @@
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     list: [
-        // 控制模式
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL.value,
-            skinCode: '04',
-            trainingName: '请求站控({2})',
-            trainingRemark: '请求站控功能',
-            trainingType: 'ControlConvertMenu',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【站控】', codeType:'STATION', subType:'substation' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL.value,
-            skinCode: '04',
-            trainingName: '请求紧急站控({2})',
-            trainingRemark: '请求紧急站控功能',
-            trainingType: 'ControlConvertMenu',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【紧急站控】', codeType:'STATION', subType:'emergency' },
-                { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL.value,
-            skinCode: '04',
-            trainingName: '请求中控({2})',
-            trainingRemark: '请求中控功能',
-            trainingType: 'ControlConvertMenu',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【中控】', codeType:'STATION', subType:'center' },
-                { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.ControlConvertMenu.CMD_CM_INTERLOCK_CONTROL.value,
-            skinCode: '04',
-            trainingName: '请求联锁控({2})',
-            trainingRemark: '请求联锁控功能',
-            trainingType: 'ControlConvertMenu',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【联锁控】', codeType:'STATION', subType:'interconnected' },
-                { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        // 信号机列表
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_SET_ROUTE.value,
-            skinCode: '04',
-            trainingName: '办理进路({3} 进路)',
-            trainingRemark: '办理进路功能',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【办理进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
-                { deviceType: '04', orderNum: 3, operateCode: '3012', tip: '鼠标左键点击【执行】按钮' },
-                { deviceType: '04', orderNum: 4, operateCode: '301', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
         {
             maxDuration: 15,
             minDuration: 8,
@@ -133,54 +45,8 @@ export default {
             trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL' },
-                { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE.value,
-            skinCode: '04',
-            trainingName: '办理引导进路({3})',
-            trainingRemark: '进路办理信号引导',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【办理引导进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '308', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '3086', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
-                { deviceType: '04', orderNum: 4, operateCode: '3082', tip: '鼠标左键点击【执行】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE.value,
-            skinCode: '04',
-            trainingName: '引导进路({3})[进路已锁闭]',
-            trainingRemark: '进路办理信号引导',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3080', tip: '鼠标左键点击【引导进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3080', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL'}, // 进路编号值不正确
-                { deviceType: 'mbm', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮', codeType: 'START_SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE.value,
-            skinCode: '04',
-            trainingName: '取消进路({3} 进路)',
-            trainingRemark: '取消进路功能',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL' },
+                { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
             ]
         },
         {
@@ -196,226 +62,6 @@ export default {
                 { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
                 { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
             ]
-        },
-		{
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE.value,
-            skinCode: '04',
-            trainingName: '取消引导({3})',
-            trainingRemark: '取消引导进路功能（总取消）',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value,
-            skinCode: '04',
-            trainingName: '总人解({3})',
-            trainingRemark: '总人解',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【总人解】' },
-				{ deviceType: '04', orderNum: 2, operateCode: '3050', tip: '输入密码123，点击【执行】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '305', tip: '鼠标左键点击【确定】按钮' },
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value,
-            skinCode: '04',
-            trainingName: '总人解({3})',
-            trainingRemark: '总人解',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' },
-                { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '3050', tip: '鼠标左键点击【{5}】', val: '{6}', codeType:'SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 8,
-            minDuration: 5,
-            operateType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL.value,
-            skinCode: '04',
-            trainingName: '信号重开({5})',
-            trainingRemark: '信号重开功能',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
-                { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 8,
-            minDuration: 5,
-            operateType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL.value,
-            skinCode: '04',
-            trainingName: '信号重开({5})',
-            trainingRemark: '信号重开功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_BLOCK.value,
-            skinCode: '04',
-            trainingName: '信号封锁({5})',
-            trainingRemark: '信号封锁',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封锁】' },
-                { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_BLOCK.value,
-            skinCode: '04',
-            trainingName: '信号封锁({5})',
-            trainingRemark: '信号封锁功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【封锁】' },
-                { deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_UNBLOCK.value,
-            skinCode: '04',
-            trainingName: '信号解封({5})',
-            trainingRemark: '信号解封',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3072', tip: '鼠标左键点击【确认】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '307', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_UNBLOCK.value,
-            skinCode: '04',
-            trainingName: '信号解封({5})',
-            trainingRemark: '信号解封功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2992', tip: '鼠标左键点击【解封】' },
-                { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING.value,
-            skinCode: '04',
-            trainingName: '进路收人工控({3})',
-            trainingRemark: '进路收人工控',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路收人工控】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
-                { deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING.value,
-            skinCode: '04',
-            trainingName: '人工控({5})',
-            trainingRemark: '人工控',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3140', tip: '鼠标左键点击【人工控】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3140', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ],
-            // 成都三号线  特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
-            config:{onlySignalOP:true}
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING.value,
-            skinCode: '04',
-            trainingName: '进路交自动控({3})',
-            trainingRemark: '进路交自动控',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
-                { deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING.value,
-            skinCode: '04',
-            trainingName: '自动控({5})',
-            trainingRemark: '自动控',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3150', tip: '鼠标左键点击【自动控】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3150', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ],
-            config:{onlySignalOP:true}
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType:CMD.Signal.CMD_SIGNAL_DETAIL.value,
-            skinCode: '04',
-            trainingName: '查询进路信息({5} 信号机)',
-            trainingRemark: '查询进路信息',
-            trainingType:'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【进路信息】' },
-                { deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        // 道岔列表
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION.value, // 0312 新增定位字典
-            skinCode: '04',
-            trainingName: '单操到定位({7})',
-            trainingRemark: '单操到定位({15})',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标右键菜单选择【单操到定位】' },
-                { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【确定】按钮' }
-            ]
         },
         {
             maxDuration: 15,
@@ -427,24 +73,10 @@ export default {
             trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键点击【道岔定操】' },
+                { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键点击【总定位】' },
                 { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
             ]
         },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION.value, // 0313 新增定位字典
-            skinCode: '04',
-            trainingName: '单操到反位({7})',
-            trainingRemark: '单操到反位({7})',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【单操到反位】' },
-                { deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
         {
             maxDuration: 15,
             minDuration: 8,
@@ -455,491 +87,9 @@ export default {
             trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键点击【道岔反操】' },
+                { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键点击【总反位】' },
                 { deviceType: '02', orderNum: 2, operateCode: '1020', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
             ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK.value,
-            skinCode: '04',
-            trainingName: '道岔单锁({7})',
-            trainingRemark: '道岔单锁功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK.value,
-            skinCode: '04',
-            trainingName: '道岔单锁({7})',
-            trainingRemark: '道岔单锁功能',
-            trainingType: 'Switch',
-            productTypes: ['01'], // 现地操作
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键点击【道岔单锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔解锁({7})',
-            trainingRemark: '道岔解锁功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔解锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔解锁({7})',
-            trainingRemark: '道岔解锁功能',
-            trainingType: 'Switch',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键点击【道岔解锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '1040', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_BLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔封锁({7})',
-            trainingRemark: '道岔封锁功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1051', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '105', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_BLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔封锁({7})',
-            trainingRemark: '道岔封锁功能',
-            trainingType: 'Switch',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【封锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '2991', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_UNBLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔解封({7})',
-            trainingRemark: '道岔解封功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1062', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '106', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_UNBLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔解封({7})',
-            trainingRemark: '道岔解封功能',
-            trainingType: 'Switch',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '2992', tip: '鼠标左键点击【解封】' },
-                { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
-            ]
-        },
-        {
-            maxDuration: 20,
-            minDuration: 10,
-            operateType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK.value,
-            skinCode: '04',
-            trainingName: '区故解({7})',
-            trainingRemark: '道岔区段故障解锁功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【区故解】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1092', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '109', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        // 区段列表
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Section.CMD_SECTION_FAULT_UNLOCK.value,
-            skinCode: '04',
-            trainingName: '区故解({8}{9})',
-            trainingRemark: '故障解锁功能',
-            trainingType: 'Section',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区故解】' },
-                { deviceType: '03', orderNum: 2, operateCode: '4023', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '03', orderNum: 3, operateCode: '402', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Section.CMD_SECTION_FAULT_UNLOCK.value,
-            skinCode: '04',
-            trainingName: '区故解({8}{9})',
-            trainingRemark: '故障解锁功能',
-            trainingType: 'Section',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '4020', tip: '鼠标左键点击【区故解】'},
-                { deviceType: '03', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '03', orderNum: 3, operateCode: '4020', tip: '鼠标左键点击【{8}{9}】', codeType:'SECTION' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Section.CMD_SECTION_DETAILS.value,
-            skinCode: '04',
-            trainingName: '属性({8}{9})',
-            trainingRemark: '区段详情({8}{9})',
-            trainingType: 'Section',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '410', tip: '鼠标右键菜单选择【属性】' },
-                { deviceType: '03', orderNum: 2, operateCode: '410', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        // 站台列表
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN.value,
-            skinCode: '04',
-            trainingName: '设置扣车({10}-{12}站台)',
-            trainingRemark: '设置扣车功能',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】' },
-                { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN.value,
-            skinCode: '04',
-            trainingName: '取消扣车({10}-{12}站台)',
-            trainingRemark: '设置取消扣车功能',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
-                { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN.value,
-            skinCode: '04',
-            trainingName: '全线取消扣车',
-            trainingRemark: '设置取消扣车功能({12}全线)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
-                { deviceType: '06', orderNum: 2, operateCode: 'com01', tip: '鼠标左键点击【{12}全线】按钮', val: 'true' },
-                { deviceType: '06', orderNum: 3, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
-            skinCode: '04',
-            trainingName: '设置跳停({10}-{12}站台)',
-            trainingRemark: '设置跳停功能',
-            trainingType: 'Stand',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'},
-                { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【跳停】', codeType:'STAND', subType:'StopJumpLamp' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
-            skinCode: '04',
-            trainingName: '设置跳停({10}-{12}站台)',
-            trainingRemark: '设置跳停功能',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' },
-                { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value,
-            skinCode: '04',
-            trainingName: '取消跳停({10}-{12}站台)',
-            trainingRemark: '设置取消跳停功能',
-            trainingType: 'Stand',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'},
-                { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【取消跳停】', codeType:'STAND', subType:'CancelStopJumpLamp' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value,
-            skinCode: '04',
-            trainingName: '取消跳停({10}-{12}站台)',
-            trainingRemark: '设置取消跳停功能',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
-                { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
-            skinCode: '04',
-            trainingName: '设置停站时间({10}-{12}站台)',
-            trainingRemark: '设置停站时间(自动, 一直有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
-                { deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
-            skinCode: '04',
-            trainingName: '设置停站时间({10}-{12}站台)',
-            trainingRemark: '设置停站时间(人工, 20秒, 一直有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
-                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' },
-                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
-                { deviceType: '06', orderNum: 4, operateCode: '5093', tip: '标左键点击，选择【一直有效】', val: '02' },
-                { deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
-            skinCode: '04',
-            trainingName: '设置停站时间({10}-{12}站台)',
-            trainingRemark: '设置停站时间(人工, 20秒, 一次有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
-                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' },
-                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
-                { deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_RUN_TIME.value,
-            skinCode: '04',
-            trainingName: '设置站间运行等级({10}-{12}站台)',
-            trainingRemark: '设置站间运行等级(自动, 一直有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置站间运行等级】' },
-                { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_RUN_TIME.value,
-            skinCode: '04',
-            trainingName: '设置站间运行等级({10}-{12}站台)',
-            trainingRemark: '设置站间运行等级(人工, 常速, 一直有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置站间运行等级】' },
-                { deviceType: '06', orderNum: 2, operateCode: '5106', tip: '鼠标左键点击，选择【人工】', val: '02' },
-                { deviceType: '06', orderNum: 3, operateCode: '5107', tip: '鼠标左键点击，取消选择【一直有效】', val: '02' },
-                { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_RUN_TIME.value,
-            skinCode: '04',
-            trainingName: '设置站间运行等级({10}-{12}站台)',
-            trainingRemark: '设置站间运行等级(人工, 常速, 一次有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置站间运行等级】' },
-                { deviceType: '06', orderNum: 2, operateCode: '5106', tip: '鼠标左键点击，选择【人工】', val: '02' },
-                { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 8, // 自动生成实训失败
-            minDuration: 5,
-            operateType: CMD.Stand.CMD_STAND_VIEW_STATUS.value,
-            skinCode: '04',
-            trainingName: '显示站台信息({10}-{12}站台)',
-            trainingRemark: '查询站台状态功能',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【显示站台信息】' },
-                { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【退出】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO.value,
-            skinCode: '04',
-            trainingName: '设置自动进路({3})',
-            trainingRemark: '设置自动进路功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
-            ],
-            // 成都三号线  特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
-            config:{autoRouteBT:true}
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO.value,
-            skinCode: '04',
-            trainingName: '取消自动进路({3})',
-            trainingRemark: '取消自动进路功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
-            ],
-            // 成都三号线  特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
-            config:{autoRouteBT:true}
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK.value,
-            skinCode: '04',
-            trainingName: '设置自动折返({3})',
-            trainingRemark: '设置自动折返功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
-            ],
-            // 成都三号线  特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
-            config:{autoCycleBT:true}
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK.value,
-            skinCode: '04',
-            trainingName: '取消自动折返({3})',
-            trainingRemark: '取消自动折返功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
-            ],
-            // 成都三号线  特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
-            config:{autoCycleBT:true}
-        },
-        /** 引导总锁 */
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Station.CMD_STATION_SET_MASTER_GUIDE_LOCK.value,
-            skinCode: '04',
-            trainingName: '引导总锁({26})',
-            trainingRemark: '设置引导总锁',
-            trainingType: 'Station',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '609', tip: '鼠标左键点击【引导总锁】' },
-                { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '609', tip: '鼠标左键点击【{26}】', codeType:'BUTTON' }
-            ],
-            config:{guideTotalLockBT:true}
-        },
-        /** 取消引导总锁 */
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Station.CMD_STATION_CANCEL_MASTER_GUIDE_LOCK.value,
-            skinCode: '04',
-            trainingName: '取消引导总锁({26})',
-            trainingRemark: '取消引导总锁',
-            trainingType: 'Station',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '609', tip: '鼠标左键点击【引导总锁】' },
-                { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '609', tip: '鼠标左键点击【{26}】', codeType:'BUTTON' }
-            ],
-            config:{guideTotalLockBT:true}
         }
-        // totalGuideLock
-        //
     ]
 };
diff --git a/src/jmapNew/theme/datie_jd1a/menus/index.vue b/src/jmapNew/theme/datie_jd1a/menus/index.vue
index d9177f96d..92ffd9c48 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/index.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/index.vue
@@ -33,7 +33,7 @@
         <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">与中心通信正常</div>
       </div>
     </div>
-    <div v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1405px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
+    <div id="tipInfoBox" v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1405px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
       <div style="width: 60%;height: 30px;line-height: 30px;text-align: center;">提示信息窗</div>
       <div style="width: 40%;height: 30px;line-height: 30px;text-align: center;border-left: 2px #ccc solid;">{{ '操控A:主机' + '  ' + dateString + '  ' + time }}</div>
     </div>
@@ -80,8 +80,7 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
 import PassiveTimeout from './passiveDialog/timeout';
-import { timeFormat } from '@/utils/date';
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import BottomTable from './bottomTable';
 import MenuPanel from './menuPanel';
 import CtcBarIcon1 from '@/assets/ctc_icon/pic1.png';
@@ -102,8 +101,8 @@ import CtcBarIcon15 from '@/assets/ctc_icon/pic15.png';
 import CtcBarIcon16 from '@/assets/ctc_icon/pic16.png';
 import CtcBarIcon17 from '@/assets/ctc_icon/pic17.png';
 import CtcBarIcon18 from '@/assets/ctc_icon/pic18.png';
-import cmdManage from '@/views/dispatcherStationManage/cmdManage.vue';
-import signedCmd from '@/views/dispatcherStationManage/signedCmd.vue';
+import cmdManage from '@/jmapNew/theme/components/menus/dialog/cmdManage.vue';
+import signedCmd from '@/jmapNew/theme/components/menus/dialog/signedCmd.vue';
 
 export default {
     name: 'Menus',
@@ -210,9 +209,8 @@ export default {
             val && this.$store.dispatch('config/updateMenuBar');
         },
         '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            this.initDate(date);
+            this.$store.dispatch('training/setInitTime', time);
+            this.initDate(time);
         },
         '$store.state.socket.railwaySimulationRunplanSendChange': function (val) {
             if (this.isCtc) {
@@ -273,14 +271,9 @@ export default {
             }
         },
         initDate(date) {
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
-            const years = date.getFullYear() + '';
-            let months = date.getMonth() + 1 + '';
-            let dates = date.getDate() + '';
-            if (months.length < 2) { months = '0' + months; }
-            if (dates.length < 2) { dates = '0' + dates; }
-            this.dateString = years + months + dates;
-            this.dateString1 = years + '年' + months + '月' + dates + '日';
+            this.time = timestampFormat('HH:mm:ss', date)
+            this.dateString = timestampFormat('YYYYMMDD', date)
+            this.dateString1 = timestampFormat('YYYY年MM月DD日', date)
         },
         handleRunplan() {
             this.$refs.runplanPane.doShow();
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue b/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
index 49d286571..2269f4008 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
@@ -349,10 +349,10 @@ export default {
       this.guideLockLeftFlag = false
     },
     '$store.state.socket.simulationTimeSync': function(val) {
-      if (this.timeNode && val - this.timeNode >= 15) {
+      if (this.timeNode && val - this.timeNode >= 15000) {
         this.clearOperate()
       }
-      if (this.deviceTimeNode && val - this.deviceTimeNode >= 15) {
+      if (this.deviceTimeNode && val - this.deviceTimeNode >= 15000) {
         if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
           this.$store.dispatch('training/updateMapState', [{ code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0 }])
         } else if (
@@ -605,7 +605,7 @@ export default {
 
       if (!this.checkHaveRoute(deviceList)) {
         // 无效的进路按钮选择 清除deviceList
-        this.$message.error('无效的进路按钮')
+        // this.$message.error('无效的进路按钮')
         this.clearOperate()
         return
       }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
index da166116e..cc7308548 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
@@ -269,10 +269,10 @@ export default {
             }
         },
         '$store.state.socket.simulationTimeSync': function (val) {
-            if (this.timeNode && val - this.timeNode >= 15) {
+            if (this.timeNode && val - this.timeNode >= 15000) {
                 this.clearOperate();
             }
-            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15) {
+            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15000) {
                 if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
                     this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0}]);
                 } else if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'Signal' && this.deviceList[0].type === 'SHUNTING') {
@@ -474,7 +474,7 @@ export default {
             const operate = { operation: this.Signal.arrangementRoute.button.operation };
             if (!this.routeDataMap) { this.handleRouteDataMap(); }
             if (!this.checkHaveRoute(deviceList)) { // 无效的进路按钮选择 清除deviceList
-                this.$message.error('无效的进路按钮');
+                // this.$message.error('无效的进路按钮');
                 this.clearOperate();
                 return;
             }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue b/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue
index f09e16af6..7586a11b9 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue
@@ -275,7 +275,7 @@ export default {
         },
         // 道岔封锁
         block() {
-            debugger;
+            // debugger;
             commitOperate(menuOperate.Switch.block, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
                     this.$refs.switchControl.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuTool.vue b/src/jmapNew/theme/datie_jd1a/menus/menuTool.vue
index 95bc382b2..5b74687ff 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuTool.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuTool.vue
@@ -19,7 +19,7 @@
   </div>
 </template>
 <script>
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
 
@@ -135,8 +135,7 @@ export default {
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+            this.time = timestampFormat('HH:mmss', initTime)
         }
     },
     mounted() {
diff --git a/src/jmapNew/theme/datie_jd1a/menus/runplanPane.vue b/src/jmapNew/theme/datie_jd1a/menus/runplanPane.vue
index 1d805fa98..e9a32d84f 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/runplanPane.vue
@@ -515,8 +515,8 @@ import ModifyTripNumber from './dialog/modifyTripNumber';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { copyAssign } from '@/utils/index';
 import { mapGetters, mapState } from 'vuex';
-import cmdManage from '@/views/dispatcherStationManage/cmdManage.vue';
-import signedCmd from '@/views/dispatcherStationManage/signedCmd.vue';
+import cmdManage from '@/jmapNew/theme/components/menus/dialog/cmdManage.vue';
+import signedCmd from '@/jmapNew/theme/components/menus/dialog/signedCmd.vue';
 export default {
     name:'RunplanPane',
     components: {
diff --git a/src/jmapNew/theme/datie_ksk/menus/index.vue b/src/jmapNew/theme/datie_ksk/menus/index.vue
index 645d03ed7..77e72e89e 100644
--- a/src/jmapNew/theme/datie_ksk/menus/index.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/index.vue
@@ -33,7 +33,7 @@
         <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">与中心通信正常</div>
       </div>
     </div>
-    <div v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1405px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
+    <div id="tipInfoBox" v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1405px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
       <div style="width: 60%;height: 30px;line-height: 30px;text-align: center;">提示信息窗</div>
       <div style="width: 40%;height: 30px;line-height: 30px;text-align: center;border-left: 2px #ccc solid;">{{ '操控A:主机' + '  ' + dateString + '  ' + time }}</div>
     </div>
@@ -80,8 +80,7 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
 import PassiveTimeout from './passiveDialog/timeout';
-import { timeFormat } from '@/utils/date';
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import BottomTable from './bottomTable';
 import MenuPanel from './menuPanel';
 import CtcBarIcon1 from '@/assets/ctc_icon/pic1.png';
@@ -102,8 +101,8 @@ import CtcBarIcon15 from '@/assets/ctc_icon/pic15.png';
 import CtcBarIcon16 from '@/assets/ctc_icon/pic16.png';
 import CtcBarIcon17 from '@/assets/ctc_icon/pic17.png';
 import CtcBarIcon18 from '@/assets/ctc_icon/pic18.png';
-import cmdManage from '@/views/dispatcherStationManage/cmdManage.vue';
-import signedCmd from '@/views/dispatcherStationManage/signedCmd.vue';
+import cmdManage from '@/jmapNew/theme/components/menus/dialog/cmdManage.vue';
+import signedCmd from '@/jmapNew/theme/components/menus/dialog/signedCmd.vue';
 
 export default {
     name: 'Menus',
@@ -210,9 +209,8 @@ export default {
             val && this.$store.dispatch('config/updateMenuBar');
         },
         '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            this.initDate(date);
+            this.$store.dispatch('training/setInitTime', time);
+            this.initDate(time);
         },
         '$store.state.socket.railwaySimulationRunplanSendChange': function (val) {
             if (this.isCtc) {
@@ -273,14 +271,9 @@ export default {
             }
         },
         initDate(date) {
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
-            const years = date.getFullYear() + '';
-            let months = date.getMonth() + 1 + '';
-            let dates = date.getDate() + '';
-            if (months.length < 2) { months = '0' + months; }
-            if (dates.length < 2) { dates = '0' + dates; }
-            this.dateString = years + months + dates;
-            this.dateString1 = years + '年' + months + '月' + dates + '日';
+            this.time = timestampFormat('HH:mm:ss', date)
+            this.dateString = timestampFormat('YYYYMMDD', date)
+            this.dateString1 = timestampFormat('YYYY年MM月DD日', date)
         },
         handleRunplan() {
             this.$refs.runplanPane.doShow();
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue
index 3d78a4d6f..3442cd328 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue
@@ -273,7 +273,7 @@ export default {
             this.clearOperate();
         },
         '$store.state.socket.simulationTimeSync': function(val) {
-            if (this.timeNode && val - this.timeNode >= 15) {
+            if (this.timeNode && val - this.timeNode >= 15000) {
                 this.clearOperate();
             }
             const routeDeviceList = [];
@@ -289,7 +289,7 @@ export default {
             routeDeviceList.forEach(item => {
                 updateList.push({ code: item.code, _type: item._type, toSelected: 0 });
             });
-            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15) {
+            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15000) {
                 if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
                     this.$store.dispatch('training/updateMapState', updateList);
                 } else if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'Signal' && this.deviceList[0].type === 'SHUNTING') {
@@ -510,7 +510,7 @@ export default {
 
             if (!this.checkHaveRoute(deviceList)) {
                 // 无效的进路按钮选择 清除deviceList
-                this.$message.error('无效的进路按钮');
+                // this.$message.error('无效的进路按钮');
                 this.clearOperate();
                 return;
             }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
index da166116e..cc7308548 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
@@ -269,10 +269,10 @@ export default {
             }
         },
         '$store.state.socket.simulationTimeSync': function (val) {
-            if (this.timeNode && val - this.timeNode >= 15) {
+            if (this.timeNode && val - this.timeNode >= 15000) {
                 this.clearOperate();
             }
-            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15) {
+            if (this.deviceTimeNode && val - this.deviceTimeNode >= 15000) {
                 if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
                     this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0}]);
                 } else if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'Signal' && this.deviceList[0].type === 'SHUNTING') {
@@ -474,7 +474,7 @@ export default {
             const operate = { operation: this.Signal.arrangementRoute.button.operation };
             if (!this.routeDataMap) { this.handleRouteDataMap(); }
             if (!this.checkHaveRoute(deviceList)) { // 无效的进路按钮选择 清除deviceList
-                this.$message.error('无效的进路按钮');
+                // this.$message.error('无效的进路按钮');
                 this.clearOperate();
                 return;
             }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuTool.vue b/src/jmapNew/theme/datie_ksk/menus/menuTool.vue
index 95bc382b2..acc5e6798 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuTool.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuTool.vue
@@ -19,7 +19,7 @@
   </div>
 </template>
 <script>
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
 
@@ -135,8 +135,7 @@ export default {
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+			this.time = timestampFormat('HH:mmss', initTime)
         }
     },
     mounted() {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue
index f732adc88..a83ad906b 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue
@@ -193,11 +193,11 @@ export default {
             }
         },
         operationHandler(buttonOperation, selectType) {
-            debugger;
+            // debugger;
             switch (buttonOperation) {
             case OperationEvent.Section.fault.button.operation: {
                 // 事故解锁
-                debugger;
+                // debugger;
                 commitOperate(menuOperate.Section.fault, {sectionCode:selectType.code}, 3).then(({valid, operate})=>{
                     if (valid) {
                         // this.$refs.sectionUnLock.doShow(operate, this.selected);
@@ -210,7 +210,7 @@ export default {
             }
             case OperationEvent.Section.axlePreReset.button.operation: {
                 // 计轴复零
-                debugger;
+                // debugger;
                 commitOperate(menuOperate.Section.axlePreReset, {sectionCode:selectType.code}, 3).then(({valid, operate})=>{
                     if (valid) {
                         // this.$refs.sectionUnLock.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/foshan_01/menus/menuTool.vue b/src/jmapNew/theme/foshan_01/menus/menuTool.vue
index 266a43165..bdeda66ce 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuTool.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuTool.vue
@@ -10,7 +10,7 @@
   </div>
 </template>
 <script>
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
 
@@ -126,8 +126,7 @@ export default {
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+			this.time = timestampFormat('HH:mmss', initTime)
         }
     },
     mounted() {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue
index fac7a7a4d..490cfb79c 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue
@@ -71,6 +71,7 @@ export default {
     },
     methods: {
         init() {
+            console.log(123)
             document.getElementById(this.canvasId).oncontextmenu = function (e) {
                 return false;
             };
diff --git a/src/router/index.js b/src/router/index.js
index e7a4c0a99..bf24f13a2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -203,6 +203,8 @@ const VoiceManage = () => import('@/views/fileManage/voiceManage');
 const IscsDeviceManage = () => import('@/views/system/iscsDeviceManage');
 const IscsResourcesManage = () => import('@/views/system/iscsResourcesManage');
 
+const PisScreen = () => import('@/views/pis/index')
+
 // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
 // import { getSessionStorage } from '@/utils/auth';
 
@@ -703,6 +705,11 @@ export const publicAsyncRoute = [
         path: '/bigTrainRunplanManage',
         component: BigTrainRunplanManage,
         hidden: true
+    },
+    {
+        path: '/pis',
+        component: PisScreen,
+        hidden: true
     }
 
 ];
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 373696a28..c54106158 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -1,269 +1,277 @@
 export default {
-    ConstSelect: {
-        Status: [
-            { label: '无效', value: '0' },
-            { label: '有效', value: '1' }
-        ],
+  ConstSelect: {
+    Status: [{ label: '无效', value: '0' }, { label: '有效', value: '1' }],
 
-        Whether: [
-            { label: '否', value: false },
-            { label: '是', value: true }
-        ],
+    Whether: [{ label: '否', value: false }, { label: '是', value: true }],
 
-        DirectionCodeList: [
-            { value: '2', label: '上行' },
-            { value: '1', label: '下行' }
-        ],
+    DirectionCodeList: [{ value: '2', label: '上行' }, { value: '1', label: '下行' }],
 
-        SignalLeftOrRightList: [
-            { label: '左侧', value: 'L' },
-            { label: '右侧', value: 'R' }
-        ],
+    SignalLeftOrRightList: [{ label: '左侧', value: 'L' }, { label: '右侧', value: 'R' }],
 
-        roleList: [
-            { label: '实训用户', value: '01' },
-            { label: '地图生产者', value: '02' },
-            { label: '课程生成者', value: '03' },
-            { label: '系统管理员', value: '04' },
-            { label: '超级管理员', value: '05' },
-            { label: '销售用户', value: '06' }
-        ],
+    roleList: [
+      { label: '实训用户', value: '01' },
+      { label: '地图生产者', value: '02' },
+      { label: '课程生成者', value: '03' },
+      { label: '系统管理员', value: '04' },
+      { label: '超级管理员', value: '05' },
+      { label: '销售用户', value: '06' },
+    ],
 
-        examResultList: [
-            { label: '未计算', value: '01' },
-            { label: '通过', value: '02' },
-            { label: '未通过', value: '03' },
-            { label: '已放弃', value: '04' }
-        ],
+    examResultList: [
+      { label: '未计算', value: '01' },
+      { label: '通过', value: '02' },
+      { label: '未通过', value: '03' },
+      { label: '已放弃', value: '04' },
+    ],
 
-        PermissionUseList: [
-            { label: '公用', value: true },
-            { label: '专用', value: false }
-        ],
+    PermissionUseList: [{ label: '公用', value: true }, { label: '专用', value: false }],
 
-        RegionTypeList: [
-            { label: '零点西上行', value: '01' },
-            { label: '零点西下行', value: '02' },
-            { label: '零西渡线/', value: '03' },
-            { label: '零西渡线\\', value: '04' },
-            { label: 'PGY一联段线', value: '05' },
-            { label: '零点东上行', value: '06' },
-            { label: '零点东下行', value: '07' },
-            { label: '零东渡线/', value: '08' },
-            { label: '零东渡线\\', value: '09' },
-            { label: '库线1', value: '10' },
-            { label: '库线2', value: '11' },
-            { label: '库线渡线/', value: '12' },
-            { label: '库线渡线\\', value: '13' },
-            { label: '联络线1', value: '14' },
-            { label: '联络线2', value: '15' },
-            { label: 'SHZ一联段线', value: '16' },
-            { label: 'SHZ二联段线', value: '17' },
-            { label: 'SHD三联段线', value: '18' },
-            { label: 'SHD四联段线', value: '19' }
-        ],
-        roleTypeNew:[
-            {label: '管理员', value: 'ADMIN', enLabel: 'Admin '},
-            {label: '教员', value: 'Instructor', enLabel: 'Instructor '},
-            {label: '行值', value: 'STATION_SUPERVISOR', enLabel: 'Attendant '},
-            {label: '观众', value: 'AUDIENCE', enLabel: 'Audience '},
-            {label: '司机', value: 'DRIVER', enLabel: 'Driver '},
-            {label: '通号', value: 'MAINTAINER', enLabel: 'Repairman '},
-            {label: '车辆段信号楼', value: 'DEPOT_DISPATCHER', enLabel: 'Depot dispatcher '},
-            {label: '电力调度', value: 'ELECTRIC_DISPATCHER', enLabel: 'Electric dispatcher'},
-            {label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher '},
-            {label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent department'},
-            {label: '停车场信号楼', value: 'PARKING_LOT_SIGNAL_BUILDING', enLabel: 'Parking Signal Building'},
-            {label: '车站助理', value: 'STATION_ASSISTANT', enLabel: 'StationAssistant'},
-            {label: '车站站长', value: 'STATION_MASTER', enLabel: 'StationMaster'},
-            {label: '车站信号员', value: 'STATION_SIGNALER', enLabel: 'StationSignaler'},
-            {label: '车站客运员', value: 'STATION_PASSENGER', enLabel: 'StationPassenger'},
-            {label: '车站扳道员', value: 'STATION_SWITCH_MAN', enLabel: 'StationSwitchMan'},
-            {label: '车站引导员', value: 'STATION_FACILITATOR', enLabel: 'StationFacilitator'},
-            {label: '车站工务工', value: 'STATION_WORKER', enLabel: 'StationWorker'},
-            {label: '设备管理员', value: 'DEVICE_MANAGER', enLabel: 'DeviceManager'},
-            {label: '车务段段长', value: 'TRAIN_MASTER', enLabel: 'Train_Master'}
+    RegionTypeList: [
+      { label: '零点西上行', value: '01' },
+      { label: '零点西下行', value: '02' },
+      { label: '零西渡线/', value: '03' },
+      { label: '零西渡线\\', value: '04' },
+      { label: 'PGY一联段线', value: '05' },
+      { label: '零点东上行', value: '06' },
+      { label: '零点东下行', value: '07' },
+      { label: '零东渡线/', value: '08' },
+      { label: '零东渡线\\', value: '09' },
+      { label: '库线1', value: '10' },
+      { label: '库线2', value: '11' },
+      { label: '库线渡线/', value: '12' },
+      { label: '库线渡线\\', value: '13' },
+      { label: '联络线1', value: '14' },
+      { label: '联络线2', value: '15' },
+      { label: 'SHZ一联段线', value: '16' },
+      { label: 'SHZ二联段线', value: '17' },
+      { label: 'SHD三联段线', value: '18' },
+      { label: 'SHD四联段线', value: '19' },
+    ],
+    roleTypeNew: [
+      { label: '管理员', value: 'ADMIN', enLabel: 'Admin ' },
+      { label: '教员', value: 'Instructor', enLabel: 'Instructor ' },
+      { label: '行值', value: 'STATION_SUPERVISOR', enLabel: 'Attendant ' },
+      { label: '观众', value: 'AUDIENCE', enLabel: 'Audience ' },
+      { label: '司机', value: 'DRIVER', enLabel: 'Driver ' },
+      { label: '通号', value: 'MAINTAINER', enLabel: 'Repairman ' },
+      { label: '车辆段信号楼', value: 'DEPOT_DISPATCHER', enLabel: 'Depot dispatcher ' },
+      { label: '电力调度', value: 'ELECTRIC_DISPATCHER', enLabel: 'Electric dispatcher' },
+      { label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher ' },
+      { label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent department' },
+      { label: '停车场信号楼', value: 'PARKING_LOT_SIGNAL_BUILDING', enLabel: 'Parking Signal Building' },
+      { label: '车站助理', value: 'STATION_ASSISTANT', enLabel: 'StationAssistant' },
+      { label: '车站站长', value: 'STATION_MASTER', enLabel: 'StationMaster' },
+      { label: '车站信号员', value: 'STATION_SIGNALER', enLabel: 'StationSignaler' },
+      { label: '车站客运员', value: 'STATION_PASSENGER', enLabel: 'StationPassenger' },
+      { label: '车站扳道员', value: 'STATION_SWITCH_MAN', enLabel: 'StationSwitchMan' },
+      { label: '车站引导员', value: 'STATION_FACILITATOR', enLabel: 'StationFacilitator' },
+      { label: '车站工务工', value: 'STATION_WORKER', enLabel: 'StationWorker' },
+      { label: '设备管理员', value: 'DEVICE_MANAGER', enLabel: 'DeviceManager' },
+      { label: '车务段段长', value: 'TRAIN_MASTER', enLabel: 'Train_Master' },
+    ],
 
-        ],
+    releaseReview: [
+      { enlabel: 'Unpublished', label: '未发布', value: '0' },
+      { enlabel: 'Pending review', label: '待审核', value: '1' },
+      { enlabel: 'Successfully released', label: '发布成功', value: '2' },
+      { enlabel: 'Overrule', label: '被驳回', value: '3' },
+    ],
+    productType: [
+      { enlabel: 'Lesson System', label: '教学系统', value: 'Lesson' },
+      { enlabel: 'Exam System', label: '考试系统', value: 'Exam' },
+      { enlabel: 'Simulation System', label: '仿真系统', value: 'Simulation' },
+      { enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan' },
+    ],
+    customeredProductType: [{ enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan' }],
 
-        releaseReview: [
-            { enlabel: 'Unpublished', label: '未发布', value: '0'},
-            { enlabel: 'Pending review', label: '待审核', value: '1'},
-            { enlabel: 'Successfully released', label: '发布成功', value: '2'},
-            { enlabel: 'Overrule', label: '被驳回', value: '3'}
-        ],
-        productType: [
-            { enlabel: 'Lesson System', label: '教学系统', value: 'Lesson'},
-            { enlabel: 'Exam System', label: '考试系统', value: 'Exam'},
-            { enlabel: 'Simulation System', label: '仿真系统', value: 'Simulation'},
-            { enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan'}
-        ],
-        customeredProductType: [
-            { enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan'}
-        ],
+    controlMode: [
+      { label: '中控', value: 'OperateCenterControl' },
+      { label: '站控', value: 'LocalStationControl' },
+      { label: '紧急站控', value: 'EmergencyStationControl' },
+      { label: '联锁控', value: 'InterlockStationControl' },
+    ],
 
-        controlMode: [
-            { label: '中控', value: 'OperateCenterControl' },
-            { label: '站控', value: 'LocalStationControl' },
-            { label: '紧急站控', value: 'EmergencyStationControl' },
-            { label: '联锁控', value: 'InterlockStationControl' }
-        ],
+    simulationRole: [
+      { label: '行调操作', value: 'Center' },
+      { label: '现地操作', value: 'Local' },
+      { label: '车辆段操作', value: 'Depot_IL' },
+    ],
 
-        simulationRole: [
-            { label: '行调操作', value: 'Center' },
-            { label: '现地操作', value: 'Local' },
-            { label: '车辆段操作', value: 'Depot_IL'}
-        ],
+    deviceTypeList: [
+      { label: '区段', value: 'Section' },
+      { label: '道岔', value: 'Switch' },
+      { label: '信号机', value: 'Signal' },
+      { label: '站台', value: 'Stand' },
+      { label: '车站', value: 'Station' },
+      { label: '控制模式', value: 'ControlConvertMenu' },
+      { label: '车次窗', value: 'TrainWindow' },
+      { label: '全线限速', value: 'LimitControl' },
+      { label: '司机', value: 'Driver' },
+      { label: '列车', value: 'Train' },
+      { label: '方向杆', value: 'DirectionRod' },
+      { label: 'CTC', value: 'CTC' },
+      { label: '路票', value: 'RAIL' },
+      { label: '会话', value: 'Conversation' },
+    ],
 
-        deviceTypeList: [
-            { label: '区段', value: 'Section' },
-            { label: '道岔', value: 'Switch' },
-            { label: '信号机', value: 'Signal' },
-            { label: '站台', value: 'Stand' },
-            { label: '车站', value: 'Station' },
-            { label: '控制模式', value: 'ControlConvertMenu' },
-            { label: '车次窗', value: 'TrainWindow' },
-            { label: '全线限速', value: 'LimitControl' },
-            { label: '司机', value: 'Driver' },
-            { label: '列车', value: 'Train' },
-            { label: '方向杆', value: 'DirectionRod'},
-            { label: 'CTC', value: 'CTC' },
-            { label: '路票', value: 'RAIL' }
-        ],
-
-        simulationDeviceList:[
-            {label:'区段', value:'SECTION'},
-            {label:'计轴器', value:'AXLE_COUNTER'},
-            {label:'道岔', value:'SWITCH'},
-            {label:'信号机', value:'SIGNAL'},
-            {label:'车站', value:'STATION'},
-            {label:'站台', value:'STAND'},
-            {label:'屏蔽门', value:'PSD'},
-            {label:'紧急停车按钮', value:'ESP'},
-            {label:'区域控制器', value:'ZC'},
-            {label:'线路控制器', value:'LC'},
-            {label:'进路', value:'ROUTE'},
-            {label:'进路延续保护', value:'OVERLAP'},
-            {label:'自动信号', value:'AUTO_SIGNAL'},
-            {label:'自动折返', value:'CYCLE'},
-            {label:'列车', value:'TRAIN'},
-            {label:'列车门', value:'TRAIN_DOOR'},
-            {label:'交路', value:'ROUTING'},
-            {label:'站间运行等级', value:'RUN_LEVEL'}
-        ],
-        QuestionTypeList: [
-            { label: '选择题', value: 'select' },
-            { label: '判断题', value: 'judge' },
-            { label: '多选题', value: 'multi'},
-            { label: '填空题', value: 'fill'},
-            { label: '问答题', value: 'answer'}
-        ],
-        // 新版的产品类型枚举
-        prdType:[
-            { enlabel: 'ATS local workstation', label: 'ATS现地工作站', value: '01'},
-            { enlabel: 'ATS Traffic dispatching workstation', label: 'ATS行调工作站', value: '02'},
-            { enlabel: 'Comprehensive exercise cloud platform', label: '综合演练云平台', value: '03'},
-            { enlabel: 'Driver simulation driving system', label: '司机模拟驾驶系统', value: '04'},
-            { enlabel: 'Dispatch workstation', label: '派班工作站', value: '05'},
-            { enlabel: 'ISCS workstation', label: 'ISCS工作站', value: '06'},
-            { enlabel: 'Interlocking station at depot', label: '车辆段联锁工作站', value: '09' }
-        ],
-        trainingDeviceType: {
-            Switch: {enlabel: 'Switch training', label:'道岔实训'},
-            Section: {enlabel: 'Section training', label:'区段实训'},
-            Signal: {enlabel: 'Signal training', label:'信号机实训'},
-            Stand: {enlabel: 'Stand training', label:'站台实训'},
-            Station: {enlabel: 'Station training', label:'车站实训'},
-            Train: { enlabel: 'Train training', label: '列车实训'},
-            ControlConvertMenu: {enlabel: 'Control mode training', label:'控制模式实训'},
-            LimitControl: {enlabel: 'Control mode limit', label:'全线限速实训'},
-            TrainWindow: {enlabel: 'TrainWindow training', label:'车次窗实训'},
-            Driver: {enlabel: 'Driver training', label:'司机实训'},
-            DirectionRod: {enlabel: 'Direction rod training', label:'方向杆实训'}
-        },
-        interfaceErrorConfig: {
-            '500000': { type: '权限错误:', message: '您尚未有该操作权限！'},
-            '500004': { type: '权限错误:', message: '您剩余的权限数量不足！'},
-            '500005': { type: '权限错误:', message: '您的权限时间已过！'},
-            '500006': { type: '权限错误:', message: '您已经领取，不能重复领取！'},
-            '500007': { type: '权限错误:', message: '剩余分发权限数量不足！'},
-            '500010': { type: '支付错误:', message: '微信统一支付调用失败！'}
-        },
-        projectDeviceTypeList:[
-            {label: '道岔', value: 'SWITCH'},
-            {label: '信号机', value:'SIGNAL'},
-            {label: '屏蔽门', value: 'PSD'},
-            {label: 'IBP盘', value: 'IBP'},
-            {label: '虚拟IBP盘', value: 'VR_IBP'},
-            {label: '教员机', value: 'IM'},
-            {label: '行调工作站', value: 'CW'},
-            {label: '现地工作站', value: 'LW'},
-            {label: '大屏工作站', value: 'LSW'},
-            {label: '列车驾驶终端', value: 'DRIVE'},
-            {label: '虚拟站台屏蔽门终端', value: 'VR_PSD'},
-            {label: '现地综合监控', value: 'ISCS_LW'},
-            {label: '中心综合监控', value: 'ISCS_CW'},
-            {label: '车辆段终端', value: 'DEPOT'},
-            {label: '派班工作站', value: 'SCHEDULING'},
-            {label: '虚拟CCTV', value: 'CCTV'},
-            {label: 'PLC网关', value: 'PLC_GATEWAY'},
-            {label: '端头控制盒', value: 'PSL'},
-            {label: 'PSC控制柜', value: 'PSC'},
-            {label: '虚拟电子沙盘', value: 'SANDBOX'},
-            {label: '联锁工作站', value: 'ILW'},
-            {label: 'UDP下位机', value: 'UDP_LOW'},
-            {label: '区段', value: 'SECTION'},
-            {label: '列车', value: 'TRAIN'},
-            {label: 'UDP客户端', value: 'UDP_CLIENT'}
-        ],
-        ossList: [
-            { name: '场景1', url: '场景1—桂花园道岔故障（配分版60分）.pdf' },
-            { name: '场景2', url: '场景2—体育馆道岔故障（配分版60分）.pdf' },
-            { name: '场景3', url: '场景3—火车站道岔故障（配分版60分）.pdf' },
-            { name: '场景4', url: '场景4—列车救援（配分版60分）.pdf' },
-            { name: '场景5', url: '场景5—接触网无电（配分版60分）.pdf' },
-            { name: '场景6', url: '场景6—计轴故障试题（配分版60分）.pdf' },
-            { name: '场景7', url: '场景7—大学城道岔故障（配分版40分）.pdf' },
-            { name: '场景8', url: '场景8—车站照明故障（配分版40分）.pdf' },
-            { name: '场景9', url: '场景9—车站站台门故障（配分版40分）.pdf' },
-            { name: '场景10', url: '场景10—列车限速（配分版40分）.pdf' },
-            { name: '场景11', url: '场景11—区间疏导乘客（配分版40分）.pdf' },
-            { name: '场景12', url: '场景12—区域控制器故障（配分版40分）.pdf' }
-        ],
-        responderTypeList: [
-            { name: '固定应答器', value: 'FB'},
-            { name: '可变应答器', value: 'VB'},
-            { name: '填充应答器', value: 'IB'}
-        ],
-        loadRuleList: [
-            { label: '每日加载', value:'EVERY_DAY' },
-            { label: '周内加载', value: 'WITHIN_A_WEEK' },
-            { label: '周末加载', value: 'WEEKEND' }
-        ],
-        turnBackTypeList: [
-            { label: '无折返', value: 'NONE' },
-            { label: '默认', value: 'DEFAULT' },
-            { label: '自动换端', value: 'AUTO' },
-            { label: '无人折返', value: 'UNMANNED' }
-        ],
-        directionLabelList: [
-            { label: 'X', value: 'X' },
-            { label: 'XF', value: 'XF' },
-            { label: 'XD', value: 'XD' },
-            { label: 'S', value: 'S' },
-            { label: 'SF', value: 'SF' },
-            { label: 'SD', value: 'SD' }
-        ],
-        trainingType: [ // 实训类型
-            { enlabel: 'single operation', label: '单操', value: 'SINGLE'},
-            { enlabel: 'scene operation', label: '场景', value: 'SCENE'}
-        ],
-        ioDirectionList:[ // 出入口类型
-            {value:'DOWN_IN_STATION', label:'下行进站'},
-            {value:'UP_IN_STATION', label :'上行进站'},
-            {value:'DOWN_OUT_STATION', label:'下行出站'},
-            {value:'UP_OUT_STATION', label:'上行出站'},
-            {value:'BOTH_WAY_STATION', label:'双向'}
-        ]
-    }
-};
+    simulationDeviceList: [
+      { label: '区段', value: 'SECTION' },
+      { label: '计轴器', value: 'AXLE_COUNTER' },
+      { label: '道岔', value: 'SWITCH' },
+      { label: '信号机', value: 'SIGNAL' },
+      { label: '车站', value: 'STATION' },
+      { label: '站台', value: 'STAND' },
+      { label: '屏蔽门', value: 'PSD' },
+      { label: '紧急停车按钮', value: 'ESP' },
+      { label: '区域控制器', value: 'ZC' },
+      { label: '线路控制器', value: 'LC' },
+      { label: '进路', value: 'ROUTE' },
+      { label: '进路延续保护', value: 'OVERLAP' },
+      { label: '自动信号', value: 'AUTO_SIGNAL' },
+      { label: '自动折返', value: 'CYCLE' },
+      { label: '列车', value: 'TRAIN' },
+      { label: '列车门', value: 'TRAIN_DOOR' },
+      { label: '交路', value: 'ROUTING' },
+      { label: '站间运行等级', value: 'RUN_LEVEL' },
+    ],
+    QuestionTypeList: [
+      { label: '选择题', value: 'select' },
+      { label: '判断题', value: 'judge' },
+      { label: '多选题', value: 'multi' },
+      { label: '填空题', value: 'fill' },
+      { label: '问答题', value: 'answer' },
+    ],
+    // 新版的产品类型枚举
+    prdType: [
+      { enlabel: 'ATS local workstation', label: 'ATS现地工作站', value: '01' },
+      { enlabel: 'ATS Traffic dispatching workstation', label: 'ATS行调工作站', value: '02' },
+      { enlabel: 'Comprehensive exercise cloud platform', label: '综合演练云平台', value: '03' },
+      { enlabel: 'Driver simulation driving system', label: '司机模拟驾驶系统', value: '04' },
+      { enlabel: 'Dispatch workstation', label: '派班工作站', value: '05' },
+      { enlabel: 'ISCS workstation', label: 'ISCS工作站', value: '06' },
+      { enlabel: 'Interlocking station at depot', label: '车辆段联锁工作站', value: '09' },
+      { enlabel: 'Large screen vehicle real workstation', label: '应急调度指挥系统', value: '10' },
+    ],
+    trainingDeviceType: {
+      Switch: { enlabel: 'Switch training', label: '道岔实训' },
+      Section: { enlabel: 'Section training', label: '区段实训' },
+      Signal: { enlabel: 'Signal training', label: '信号机实训' },
+      Stand: { enlabel: 'Stand training', label: '站台实训' },
+      Station: { enlabel: 'Station training', label: '车站实训' },
+      Train: { enlabel: 'Train training', label: '列车实训' },
+      ControlConvertMenu: { enlabel: 'Control mode training', label: '控制模式实训' },
+      LimitControl: { enlabel: 'Control mode limit', label: '全线限速实训' },
+      TrainWindow: { enlabel: 'TrainWindow training', label: '车次窗实训' },
+      Driver: { enlabel: 'Driver training', label: '司机实训' },
+      DirectionRod: { enlabel: 'Direction rod training', label: '方向杆实训' },
+    },
+    interfaceErrorConfig: {
+      '500000': { type: '权限错误:', message: '您尚未有该操作权限！' },
+      '500004': { type: '权限错误:', message: '您剩余的权限数量不足！' },
+      '500005': { type: '权限错误:', message: '您的权限时间已过！' },
+      '500006': { type: '权限错误:', message: '您已经领取，不能重复领取！' },
+      '500007': { type: '权限错误:', message: '剩余分发权限数量不足！' },
+      '500010': { type: '支付错误:', message: '微信统一支付调用失败！' },
+    },
+    projectDeviceTypeList: [
+      { label: '道岔', value: 'SWITCH' },
+      { label: '信号机', value: 'SIGNAL' },
+      { label: '屏蔽门', value: 'PSD' },
+      { label: 'IBP盘', value: 'IBP' },
+      { label: '虚拟IBP盘', value: 'VR_IBP' },
+      { label: '教员机', value: 'IM' },
+      { label: '行调工作站', value: 'CW' },
+      { label: '现地工作站', value: 'LW' },
+      { label: '大屏工作站', value: 'LSW' },
+      { label: '列车驾驶终端', value: 'DRIVE' },
+      { label: '虚拟站台屏蔽门终端', value: 'VR_PSD' },
+      { label: '现地综合监控', value: 'ISCS_LW' },
+      { label: '中心综合监控', value: 'ISCS_CW' },
+      { label: '车辆段终端', value: 'DEPOT' },
+      { label: '派班工作站', value: 'SCHEDULING' },
+      { label: '虚拟CCTV', value: 'CCTV' },
+      { label: 'PLC网关', value: 'PLC_GATEWAY' },
+      { label: '端头控制盒', value: 'PSL' },
+      { label: 'PSC控制柜', value: 'PSC' },
+      { label: '虚拟电子沙盘', value: 'SANDBOX' },
+      { label: '联锁工作站', value: 'ILW' },
+      { label: 'UDP下位机', value: 'UDP_LOW' },
+      { label: '区段', value: 'SECTION' },
+      { label: '列车', value: 'TRAIN' },
+      { label: 'UDP客户端', value: 'UDP_CLIENT' },
+      { label: '站台PIS', value: 'PIS_STAND' },
+      { label: '列车PIS', value: 'PIS_TRAIN' },
+    ],
+    ossList: [
+      { name: '场景1', url: '场景1—桂花园道岔故障（配分版60分）.pdf' },
+      { name: '场景2', url: '场景2—体育馆道岔故障（配分版60分）.pdf' },
+      { name: '场景3', url: '场景3—火车站道岔故障（配分版60分）.pdf' },
+      { name: '场景4', url: '场景4—列车救援（配分版60分）.pdf' },
+      { name: '场景5', url: '场景5—接触网无电（配分版60分）.pdf' },
+      { name: '场景6', url: '场景6—计轴故障试题（配分版60分）.pdf' },
+      { name: '场景7', url: '场景7—大学城道岔故障（配分版40分）.pdf' },
+      { name: '场景8', url: '场景8—车站照明故障（配分版40分）.pdf' },
+      { name: '场景9', url: '场景9—车站站台门故障（配分版40分）.pdf' },
+      { name: '场景10', url: '场景10—列车限速（配分版40分）.pdf' },
+      { name: '场景11', url: '场景11—区间疏导乘客（配分版40分）.pdf' },
+      { name: '场景12', url: '场景12—区域控制器故障（配分版40分）.pdf' },
+    ],
+    responderTypeList: [{ name: '固定应答器', value: 'FB' }, { name: '可变应答器', value: 'VB' }, { name: '填充应答器', value: 'IB' }],
+    loadRuleList: [
+      { label: '每日加载', value: 'EVERY_DAY' },
+      { label: '周内加载', value: 'WITHIN_A_WEEK' },
+      { label: '周末加载', value: 'WEEKEND' },
+    ],
+    turnBackTypeList: [
+      { label: '无折返', value: 'NONE' },
+      { label: '默认', value: 'DEFAULT' },
+      { label: '自动换端', value: 'AUTO' },
+      { label: '无人折返', value: 'UNMANNED' },
+    ],
+    directionLabelList: [
+      { label: 'X', value: 'X' },
+      { label: 'XF', value: 'XF' },
+      { label: 'XD', value: 'XD' },
+      { label: 'S', value: 'S' },
+      { label: 'SF', value: 'SF' },
+      { label: 'SD', value: 'SD' },
+    ],
+    trainingType: [
+      // 实训类型
+      { enlabel: 'single operation', label: '单操', value: 'SINGLE' },
+      { enlabel: 'scene operation', label: '场景', value: 'SCENE' },
+    ],
+    ioDirectionList: [
+      // 出入口类型
+      { value: 'DOWN_IN_STATION', label: '下行进站' },
+      { value: 'UP_IN_STATION', label: '上行进站' },
+      { value: 'DOWN_OUT_STATION', label: '下行出站' },
+      { value: 'UP_OUT_STATION', label: '上行出站' },
+      { value: 'BOTH_WAY_STATION', label: '双向' },
+    ],
+    conditionList: [{ label: '标识状态', value: 'S' }, { label: '表达式', value: 'E' }, { label: '代表值', value: 'V' }],
+    operationList: [
+      { label: '且', value: 'AND' },
+      { label: '或', value: 'OR' },
+      { label: '非', value: 'NOT' },
+      { label: '是', value: 'IS' },
+      { label: '等于', value: 'EQ' },
+      { label: '不等于', value: 'NEQ' },
+      { label: '大于', value: 'GT' },
+      { label: '大于等于', value: 'GTOE' },
+      { label: '小于', value: 'LT' },
+      { label: '小于等于', value: 'LTOE' },
+    ],
+    operationDeviceList: [
+      { label: '区段', value: 'Section' },
+      { label: '道岔', value: 'Switch' },
+      { label: '信号机', value: 'Signal' },
+      { label: '站台', value: 'StationStand' }, // Stand
+      { label: '车站', value: 'Station' },
+      { label: '进路', value: 'Route' },
+      { label: '列车', value: 'Train' },
+      { label: '自动闭塞', value: 'StationDirectionAuto' },
+      { label: '半自动闭塞', value: 'StationDirectionSemi' },
+    ],
+  },
+}
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index b6a0d2c62..7db833f17 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -144,10 +144,10 @@ export const loginInfo = {
         logoWidth: '0',
         systemType: '011'
     },
-    wh: {
-        title: '城市轨道交通实训平台',
-        loginPath: '/login?project=wh',
-        loginParam: 'WH',
+    yjddzh: {
+        title: '应急调度指挥系统',
+        loginPath: '/login?project=yjddzh',
+        loginParam: 'YJDDZH',
         loginTitle: '空串',
         navigationLogoWidth: '40px',
         navigationMarginLeft: '60px',
@@ -617,7 +617,7 @@ export const loginInfo = {
         systemType: '027'
     },
     richorhhcj: {
-        title: '红河财经学校城市轨道交通实训平台',
+        title: '红河州职业技术学院红河财经学校城市轨道交通实训平台',
         loginPath: '/login?project=richorhhcj',
         bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081',
         loginParam: 'RICHOR_HHCJ',
@@ -777,7 +777,7 @@ export const ProjectIcon = {
     hls: FaviconHls,
     designhls: FaviconHls,
     wjls: Favicon,
-    wh: Favicon,
+    yjddzh: Favicon,
     drts: Favicon,
     designdrts: Favicon,
     hlsdrts: FaviconHls,
@@ -832,7 +832,7 @@ export const ProjectCode = {
     xadt: 'XADT',
     designxadt: 'XADT',
     wjls: 'WJLS',
-    wh: 'WH',
+    yjddzh: 'YJDDZH',
     drts: 'DRTS',
     designdrts: 'DRTS',
     hlsdrts: 'DRTS',
@@ -888,7 +888,7 @@ export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb',
     'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor',
     'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox', 'designhlsdrts', 'hlsdrts', 'jxgm', 'designjxgm',
     'richorygy', 'designrichorygy', 'say', 'designsay', 'unittecsty', 'designunittecsty', 'richorhhcj', 'designrichorhhcj', 'teaching', 'designteaching', 'richorcxjs',
-    'designrichorcxjs', 'hydrailway', 'designhydrailway', 'wh'];
+    'designrichorcxjs', 'hydrailway', 'designhydrailway', 'yjddzh'];
 /** 案例展示隐藏的项目 */
 export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy', 'richorhhcj', 'designrichorhhcj'];
 /** 登录页右下角版本开发基于不展示 */
@@ -1006,7 +1006,7 @@ export const ProjectList = [
     {value: 'teaching', label: '教学通用'},
     {value: 'richor_cxjs', label: '长兴技校'},
     {value: 'hyd_railway', label: '哈盈达大铁'},
-    {value: 'wh', label: '武汉8号线'}
+    {value: 'yjddzh', label: '武汉8号线'}
 ];
 /** 本地项目打包 */
 export const localPackageProject = {
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 41216365f..a7a5df465 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -455,9 +455,15 @@ export default {
         CTC_STATION_IO_GATE_PUBLISH:{value: 'STATION_IO_GATE_PUBLISH', label: '出入口发布生效区'},
         CTC_STATION_IO_GATE_LIST:{value: 'STATION_IO_GATE_LIST', label: '获取出入口列表'},
         CTC_STATION_IO_GATE_EDIT:{value: 'STATION_IO_GATE_EDIT', label: '修改出入口'},
-        CTC_REGULAR_TRAIN_LINE_EDIT:{value: 'REGULAR_TRAIN_LINE_EDIT', label: '增加列车固定径路'},
+        CTC_REGULAR_TRAIN_LINE_EDIT:{value: 'REGULAR_TRAIN_LINE_EDIT', label: '修改列车固定径路'},
+        CTC_REGULAR_TRAIN_LINE_SAVE:{value: 'REGULAR_TRAIN_LINE_SAVE', label: '增加列车固定径路'},
+
         CTC_REGULAR_TRAIN_LINE_BATCH:{value: 'REGULAR_TRAIN_LINE_BATCH', label: '批量增加列车固定径路'},
 
+        CTC_REGULAR_TRAIN_LINE_STATION_UPDATE:{value: 'REGULAR_TRAIN_LINE_STATION_UPDATE', label: '固定列车径路从生效区更新'},
+        CTC_REGULAR_TRAIN_LINE_STATION_UPDATE_LOAD:{value: 'REGULAR_TRAIN_LINE_STATION_UPDATE_LOAD', label: '固定列车经路更新加载到计划'},
+        CTC_REGULAR_TRAIN_LINE_STATION_UPDATE_LIST:{value: 'REGULAR_TRAIN_LINE_STATION_UPDATE_LIST', label: '固定列车经路更新列表'},
+
         CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'},
 
         CTC_STATION_SIGN_RUN_PLAN:{value:'CTC_STATION_SIGN_RUN_PLAN', label: '车站签收阶段计划'},
diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js
index e8961c27d..332bcfea7 100644
--- a/src/scripts/cmdPlugin/CommandHandler.js
+++ b/src/scripts/cmdPlugin/CommandHandler.js
@@ -4,6 +4,8 @@ import router from '@/router/index';
 import store from '@/store/index';
 import Command from './Command';
 import Handler from './Handler';
+import { ScriptMode } from '@/scripts/ConstDic';
+import { objectIsEqual } from '@/utils/date';
 
 class CommandHandle {
     constructor() {
@@ -113,6 +115,10 @@ class CommandHandle {
                 RAIL_FILL_IN_REGISTER: {
                     operate: 'RAIL_FILL_IN_REGISTER',
                     paramList: [{name: 'stationCode'}, {name: 'line'}]
+                },
+                Conversation_Chat_Text: {
+                    operate: 'Conversation_Chat_Text',
+                    paramList: [{name: 'content'}]
                 }
             }
         };
@@ -164,21 +170,55 @@ class CommandHandle {
         return new Promise((resolve, reject) => {
             const group = router.currentRoute.query.group;
             const newApi = router.currentRoute.query.newApi + '';
-            if (newApi === 'true') {
-                const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id);
-                sendSimulationCommand(group, userInfo.memberId, id, command).then((response) => {
-                    resolve(response);
-                }).catch(error => {
-                    reject(error);
-                });
+            // if (router.currentRoute.path.includes('trainingDesign')) {
+            store.dispatch('trainingNew/setSceneOperate', {id, command});
+            // }
+            if (store.state.trainingNew.trainingSwitch && store.state.trainingNew.trainingDetail.type === 'SCENE') {
+                const stepList = JSON.parse(store.state.trainingNew.trainingDetail.stepJson);
+                const step = stepList[store.state.trainingNew.stepOrder - 1];
+                const stepOperation = step.operations[store.state.trainingNew.operateOrder];
+                let flag = true;
+                if (stepOperation.operationType !== id) {
+                    flag = false;
+                }
+                if (!objectIsEqual(stepOperation.params, command)) {
+                    flag = false;
+                }
+                store.dispatch('trainingNew/handleCheckNewTrainingResult', flag);
+                if (flag) {
+                    if (newApi === 'true') {
+                        const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id);
+                        sendSimulationCommand(group, userInfo.memberId, id, command).then((response) => {
+                            resolve(response);
+                        }).catch(error => {
+                            reject(error);
+                        });
+                    } else {
+                        sendCommandNew(group, id, command).then((response) => {
+                            resolve(response);
+                        }).catch(error => {
+                            reject(error);
+                        });
+                    }
+                } else if (store.state.trainingNew.teachMode === ScriptMode.TEACH || store.state.trainingNew.teachMode === ScriptMode.PRACTICE) {
+                    store.dispatch('training/setOperateErrMsg');
+                }
             } else {
-                sendCommandNew(group, id, command).then((response) => {
-                    resolve(response);
-                }).catch(error => {
-                    reject(error);
-                });
+                if (newApi === 'true') {
+                    const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id);
+                    sendSimulationCommand(group, userInfo.memberId, id, command).then((response) => {
+                        resolve(response);
+                    }).catch(error => {
+                        reject(error);
+                    });
+                } else {
+                    sendCommandNew(group, id, command).then((response) => {
+                        resolve(response);
+                    }).catch(error => {
+                        reject(error);
+                    });
+                }
             }
-
         });
     }
 
diff --git a/src/scripts/cmdPlugin/Config.js b/src/scripts/cmdPlugin/Config.js
index ffdfcbc8e..e07bfed6a 100644
--- a/src/scripts/cmdPlugin/Config.js
+++ b/src/scripts/cmdPlugin/Config.js
@@ -3,7 +3,6 @@ export const State2SimulationMap = {
     '01': 'Local',		// 现地工作站
     '02': 'Center',		// 中心调度工作站
     '09':'Depot_IL', // 车辆段工作站
-    '10': 'Local',
     '04': 'Local'
 };
 
diff --git a/src/scripts/cmdPlugin/Handler.js b/src/scripts/cmdPlugin/Handler.js
index 23bd42953..ebae000d2 100644
--- a/src/scripts/cmdPlugin/Handler.js
+++ b/src/scripts/cmdPlugin/Handler.js
@@ -6,6 +6,7 @@ import { State2SimulationMap } from './Config.js';
 import { sendTrainingNextStepNew } from '@/api/jmap/training';
 import { getCmdList } from '@/api/management/dictionary';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { getLocalStorage } from '@/utils/auth';
 
 class Handler {
     constructor() {
@@ -35,6 +36,7 @@ class Handler {
     afterValid(operation, valid) {
         return new Promise((resolve, reject) => {
             const basicInfo = store.getters['training/basicInfo'];
+            const trainingDetail = store.getters['trainingNew/trainingDetail'];
             if (basicInfo.id && valid) {
                 const group = router.currentRoute.query.group;
                 sendTrainingNextStepNew(basicInfo.id, operation, group).then(res=>{
@@ -52,6 +54,16 @@ class Handler {
                     }
                     reject(error);
                 });
+            } else if (trainingDetail && trainingDetail.id) {
+                if (!valid) {
+                    this.pop();
+                    reject();
+                } else {
+                    if (operation.cancel === true) {
+                        this.clear();
+                    }
+                    resolve();
+                }
             } else {
                 resolve();
             }
@@ -154,7 +166,11 @@ class Handler {
     }
 
     getTrainingMode () {
-        return store.state.training.mode;
+        if (store.state.trainingNew.trainingSwitch && store.state.trainingNew.trainingDetail.type === 'SINGLE') {
+            return store.state.trainingNew.teachMode;
+        } else {
+            return store.state.training.mode;
+        }
     }
 
     getTrainingStart() {
@@ -164,6 +180,35 @@ class Handler {
     getOperateBreakStatus () {
         return store.state.menuOperation.break;
     }
+
+    getNewTrainingStart() {
+        return store.state.trainingNew.trainingSwitch;
+    }
+    getNewTrainingOperation() {
+        try {
+            let trainingDetail = getLocalStorage('trainingDetail') || `{}`;
+            trainingDetail = JSON.parse(trainingDetail);
+            const stepList = JSON.parse(trainingDetail.stepJson || `[]`);
+            let stepOrder = getLocalStorage('stepOrder') || `1`;
+            stepOrder = JSON.parse(stepOrder);
+            let operateOrder = getLocalStorage('operateOrder') || `1`;
+            operateOrder = JSON.parse(operateOrder);
+            const step = stepList[stepOrder - 1];
+            // const index = stepOrder - 1 >= 0 ? stepOrder - 1 : 0;
+            // const step = stepList[index];
+            const stepOperation = step.operations[operateOrder];
+            return stepOperation;
+        } catch (e) {
+            console.error(e);
+            return {};
+        }
+    }
+    getNewTrainingType() {
+        return store.state.trainingNew.trainingDetail.type;
+    }
+    handleCheckNewTrainingResult(valid) {
+        store.dispatch('trainingNew/handleCheckNewTrainingResult', valid);
+    }
 }
 
 export default new Handler();
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 4d750df27..04262930b 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -668,6 +668,12 @@ export const OperationEvent = {
                 operation: '00c03s',
                 domId: '_Tips-ningBo-line_remoteResetFunc-sure{TOP}'
             }
+        },
+        commandRight: {
+            right: {
+                operation: '00b',
+                domId: ''
+            }
         }
     },
     // 站台概要表
@@ -2311,6 +2317,10 @@ export const OperationEvent = {
             confirm:{
                 operation: '4281',
                 domId: '_Tips-Section-Defective-Shunting-Confirm'
+            },
+            shuntingTypeListChange: {
+                operation: '4282',
+                domId: '_Tips-Section-Defective-Shunting-Change'
             }
             // menuButton: {
             //     operation: '428',
@@ -3992,6 +4002,10 @@ export const OperationEvent = {
             menu: {
                 operation: '1154',
                 domId: '_Tips-CTC-modifyStationTrack-Menu{TOP}'
+            },
+            edit: {
+                operation: '11541',
+                domId: '_Tips-CTC-modifyStationTrack-edit{TOP}'
             }
         },
         // 出入口发布生效区
@@ -4021,6 +4035,34 @@ export const OperationEvent = {
                 operation: '1158',
                 domId: '_Tips-CTC-batchTrainFixedPath-Menu{TOP}'
             }
+        },
+        // 固定列车径路从生效区更新
+        updateTrainFixedPath2Station:{
+            menu: {
+                operation: '1159',
+                domId: '_Tips-CTC-updateTrainFixedPath2Station-Menu{TOP}'
+            }
+        },
+        // 固定列车经路更新列表
+        getStationTrainFixedPath:{
+            menu: {
+                operation: '1160',
+                domId: '_Tips-CTC-getStationTrainFixedPath-Menu{TOP}'
+            }
+        },
+        // 固定列车经路更新加载到计划
+        loadUpdateStationTrainFixedPath:{
+            menu: {
+                operation: '1161',
+                domId: '_Tips-CTC-loadUpdateStationTrainFixedPath-Menu{TOP}'
+            }
+        },
+        // 修改列车固定径路
+        modifyTrainFixedPath:{
+            menu: {
+                operation: '1161',
+                domId: '_Tips-CTC-loadUpdateStationTrainFixedPath-Menu{TOP}'
+            }
         }
         // CTC_ZONE_SAVE_TRIP_NUMBER
         // CTC_ZONE_SAVE_STATION
@@ -4136,6 +4178,44 @@ export const OperationEvent = {
                 domId: '_Tips-Driver-parkingTrain'
             }
         }
+    },
+    // 语音会话
+    Conversation: {
+        Chat: {
+            menu: {
+                operation: '1401',
+                domId: '_Tips-Conversation-Chat'
+            },
+            sideButton: {
+                operation: '1402',
+                domId: '_Tips-Conversation-Chat-sideButton'
+            }
+        }
+    },
+    // 实训设计
+    TrainingDesign: {
+        menuButton: {
+            goCtc: {
+                operation: '1501',
+                domId: '_Tips-TrainingDesign-menuButton-goCtc'
+            },
+            goRpManage: {
+                operation: '1502',
+                domId: '_Tips-TrainingDesign-menuButton-goRpManage'
+            },
+            trainTicket: {
+                operation: '1503',
+                domId: '_Tips-TrainingDesign-menuButton-trainTicket'
+            },
+            registerBook: {
+                operation: '1504',
+                domId: '_Tips-TrainingDesign-menuButton-registerBook'
+            },
+            faultMode: {
+                operation: '1505',
+                domId: '_Tips-TrainingDesign-menuButton-faultMode'
+            }
+        }
     }
 };
 
diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js
index 6d5a1831c..e77f3f886 100644
--- a/src/scripts/cmdPlugin/ValidateHandler.js
+++ b/src/scripts/cmdPlugin/ValidateHandler.js
@@ -1,6 +1,6 @@
-
+import { objectIsEqual } from '@/utils/date';
 import Handler from './Handler.js';
-import { TrainingMode } from '@/scripts/ConstDic';
+import { TrainingMode, ScriptMode } from '@/scripts/ConstDic';
 
 class ValidateHandler {
     vaildate(mode, operate) {
@@ -9,11 +9,36 @@ class ValidateHandler {
             return this.vaildate_tips(operate);
         case TrainingMode.TEACH: 	// 教学模式
             return this.vaildate_tips(operate);
+        case ScriptMode.PRACTICE:
+            return this.vaildate_newTraining(operate);
+        case ScriptMode.TEACH:
+            return this.vaildate_newTraining(operate);
+        case ScriptMode.TEST:
+            return this.vaildate_newTrainingTest(operate);
         }
 
         return true;
     }
-
+    vaildate_newTraining(operate) {
+        let valid = true;
+        if (Handler.getNewTrainingStart()) {
+            valid = this.judgeNewTraining(operate);
+        } else {
+            Handler.clear();
+            valid = false;
+        }
+        return valid;
+    }
+    vaildate_newTrainingTest(operate) {
+        let valid = true;
+        if (Handler.getNewTrainingStart()) {
+            this.judgeNewTraining(operate);
+        } else {
+            Handler.clear();
+            valid = false;
+        }
+        return valid;
+    }
     vaildate_tips(operate) {
         let valid = true;
         if (Handler.getTrainingStart()) {
@@ -25,7 +50,29 @@ class ValidateHandler {
 
         return valid;
     }
-
+    judgeNewTraining(operate) {
+        const stepOperation = Handler.getNewTrainingOperation();
+        let valid = true;
+        if (operate.cmdType || stepOperation.operationType) {
+            const cmd = operate.cmdType ? operate.cmdType.value : '';
+            valid = (cmd === stepOperation.operationType) && valid;
+        }
+        if (operate.code || stepOperation.deviceCode) {
+            valid = (operate.code === stepOperation.deviceCode) && valid;
+        }
+        if (operate.operation || stepOperation.domId) {
+            valid = (operate.operation === stepOperation.domId) && valid;
+        }
+        if (operate.userOperationType || stepOperation.userOperationType) {
+            valid = (operate.userOperationType === stepOperation.userOperationType) && valid;
+        }
+        const opParam = operate.param == undefined ? {} : operate.param;
+        if (opParam || stepOperation.params) {
+            valid = objectIsEqual(opParam, stepOperation.params) && valid;
+        }
+        Handler.handleCheckNewTrainingResult(valid);
+        return valid;
+    }
     /** 判断操作步骤是否正确 */
     judge (operate) {
         const steps = Handler.getSteps();
diff --git a/src/store/modules/iscs.js b/src/store/modules/iscs.js
index 2ad62748f..e9a954abc 100644
--- a/src/store/modules/iscs.js
+++ b/src/store/modules/iscs.js
@@ -14,7 +14,9 @@ const iscs = {
         closeMusicNum: 0, // 关闭音乐标识
         faultList: [], // 故障 元素状态
         incidentList: [], // 事件列表
-        alarmList: [] // 报警列表
+        alarmList: [], // 报警列表
+        gateFaultList: [], // 闸机故障
+        gateFaultCount: 0
     },
 
     getters: {
@@ -184,6 +186,15 @@ const iscs = {
         },
         updateIscsState: (state, deviceStatus) => {
             Vue.prototype.$iscs && Vue.prototype.$iscs.update(deviceStatus);
+        },
+        handlerGateFaultList: (state, data) => {
+            if (data.type === 'SET') {
+                state.gateFaultList.push(data.stationCode);
+            } else if (data.type === 'CANCEL') {
+                const index = state.gateFaultList.findIndex(item => item === data.stationCode);
+                state.gateFaultList.splice(index, 1);
+            }
+            state.gateFaultCount++;
         }
     },
 
@@ -224,6 +235,9 @@ const iscs = {
         },
         setDelIncidentList: ( { commit }) => {
             commit('setDelIncidentList');
+        },
+        handlerGateFaultList: ({ commit }, data) => {
+            commit('handlerGateFaultList', data);
         }
     }
 };
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 7cea94ac6..6e5f220ab 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -204,6 +204,7 @@ const map = {
     namespaced: true,
 
     state: {
+        disStationList: [], // 调度台list
         routeData: {}, // 进路数据
         routeList: [], // 进路list
         mapStationDirectionData:{}, // 大铁项目 车站方向数据
@@ -258,6 +259,13 @@ const map = {
     },
 
     getters: {
+        disStationList: state => {
+            if (state.map) {
+                return state.disStationList;
+            } else {
+                return [];
+            }
+        },
         trainWindowSectionCode: state => {
             return state.trainWindowSectionCode;
         },
@@ -710,19 +718,33 @@ const map = {
             if (state.map && state.map.displayList && state.map.displayList.length && store.state.training.prdType) {
                 let flag = false;
                 const stationCode = state.showCentralizedStationCode;
-                state.map.displayList.forEach(item => {
-                    if (
-                        store.state.training.prdType === '01' &&
-            item.type === 'LOCAL' &&
-            ((item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) || !stationCode)
-                    ) {
-                        flag = true;
-                    } else if (['02', '03', '04', '05', '07'].includes(store.state.training.prdType) && item.type === 'CENTER' && item.elementList.includes(deviceCode)) {
-                        flag = true;
-                    } else if (store.state.training.prdType === '09' && item.type === 'DEPOT_IL' && item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) {
-                        flag = true;
+                //     state.map.displayList.forEach(item => {
+                //         if (
+                //             store.state.training.prdType === '01' &&
+                // item.type === 'LOCAL' &&
+                // ((item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) || !stationCode)
+                //         ) {
+                //             flag = true;
+                //         } else if (['02', '03', '04', '05', '07'].includes(store.state.training.prdType) && item.type === 'CENTER' && item.elementList.includes(deviceCode)) {
+                //             flag = true;
+                //         } else if (store.state.training.prdType === '09' && item.type === 'DEPOT_IL' && item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) {
+                //             flag = true;
+                //         }
+                //     });
+                const displayData = state.map.displayList.find(item => {
+                    if (store.state.training.prdType === '01' && item.type === 'LOCAL' && (item.stationCodeList.includes(stationCode) || !stationCode)) {
+                        return item;
+                    } else if (['02', '03', '04', '05', '07'].includes(store.state.training.prdType) && item.type === 'CENTER') {
+                        return item;
+                    } else if (store.state.training.prdType === '09' && item.type === 'DEPOT_IL' && item.stationCodeList.includes(stationCode) ) {
+                        return item;
                     }
                 });
+                if (displayData && displayData.elementList) {
+                    return displayData.elementList.includes(deviceCode);
+                } else {
+                    flag = true;
+                }
                 return flag;
             } else {
                 return true;
@@ -731,7 +753,11 @@ const map = {
     },
 
     mutations: {
-    // 改变地图数据索引
+        // 设置调度台列表
+        setDisStationList: (state, list) => {
+            state.disStationList = list;
+        },
+        // 改变地图数据索引
         flushMapRef: state => {
             if (state.map) {
                 state.map.sectionList = [...(state.map.sectionList || [])];
@@ -1107,6 +1133,7 @@ const map = {
             });
             mapData.graphDataNew.overlapList = overlapData;
 
+            commit('setDisStationList', mapData.logicDataNew.disStationList || []);
             commit('setMapName', mapData.name);
             commit('setMapData', mapData.graphDataNew);
             commit('setRouteData', mapData.logicDataNew.routeList);
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index cdde0e7b1..efe28612b 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -193,6 +193,7 @@ function handle(state, data) {
         } else {
             store.dispatch('training/over');
         }
+        state.trainingReloadCount++;
         break;
     case 'Simulation_PslStatus':
         state.simulationPslStatus = msg;
@@ -290,6 +291,15 @@ function handle(state, data) {
     case 'Simulation_Training_Step_Tip':
         state.trainingStepTip = msg;
         break;
+    case 'Simulation_Training_Finish':
+        state.trainingOverCount++;
+        break;
+    case 'YJDDZH_TRAIN_POSITION':
+        state.whTrainInfo = msg;
+        break;
+    case 'Simulation_Training_Step_Finish':
+        state.trainingStepFinishCount++;
+        break;
         //
     // // 大铁项目 调度台 运行图信息 初始化消息
     // case 'SIMULATION_RAILWAY_RUN_PLAN_INIT':
@@ -477,9 +487,24 @@ const socket = {
         railwaySimulationRunplanSendChange:0, // 大铁项目 调度台 发布 行车计划变化
         voiceBroadcastMsgs: [], // 语音播报信息
         voiceBroadcastChange: 0, // 语音播报信息变化
-        trainingStepTip: '' // 新实训推送消息
+        trainingStepTip: '', // 新实训推送消息
+        trainingOverCount: 0, // 新实训结束计数器
+        trainingReloadCount: 0,
+        whTrainInfo: null,
+        trainingStepFinishCount: 0,
         // railwaySimulationRpMsg:{}, // 大铁项目 调度台 调度台
-        // railwaySimulationRpChange:0 // 大铁项目 调度台 运行图信息变化
+        // railwaySimulationRpChange:0, // 大铁项目 调度台 运行图信息变化
+        standPisState: {
+            stationName: '',
+            firstTrainRemain: '',
+            firstEndStationName: '',
+            secondTrainRemain: '',
+            secondEndStationName: '',
+        },
+        onboardPisState: {
+            nextStationName: '',
+            endStationName: '',
+        },
     },
     getters: {
     },
@@ -566,6 +591,12 @@ const socket = {
         setIscsStatePisMessages: (state, speed) => {
             state.iscsStatePisMessages = speed;
         },
+        setStandPisMessages: (state, payload) => {
+            state.standPisState = payload
+        },
+        setOnboardPisMessages: (state, payload) => {
+            state.onboardPisState = payload
+        },
         deleteRailwaySimulationRunplan: (state, stationCode) => {
             delete state.railwaySimulationRunplanSendMap[stationCode];
             state.railwaySimulationRunplanSendChange++;
@@ -588,6 +619,9 @@ const socket = {
         },
         clearTrainingStepTip: (state) => {
             state.trainingStepTip = '';
+        },
+        clearTrainingOverCount: (state) => {
+            state.trainingOverCount = 0;
         }
     },
 
@@ -683,6 +717,12 @@ const socket = {
         handleIscsPisState:({ commit }, state) => {
             commit('setIscsStatePisMessages', state);
         },
+        handleStandPisState: ({ commit }, payload) => {
+            commit('setStandPisMessages', payload);
+        },
+        handleOnboardPisState: ({ commit }, payload) => {
+            commit('setOnboardPisMessages', payload);
+        },
         deleteRailwaySimulationRunplan:({ commit }, stationCode) => {
             commit('deleteRailwaySimulationRunplan', stationCode);
         },
@@ -694,6 +734,9 @@ const socket = {
         },
         clearTrainingStepTip: ({ commit }) => {
             commit('clearTrainingStepTip');
+        },
+        clearTrainingOverCount: ({ commit }) => {
+            commit('clearTrainingOverCount');
         }
     }
 };
diff --git a/src/store/modules/training.js b/src/store/modules/training.js
index dbe085976..86c4e857b 100644
--- a/src/store/modules/training.js
+++ b/src/store/modules/training.js
@@ -4,6 +4,9 @@ import deviceType from '../../jmapNew/constant/deviceType';
 import LangStorage from '@/utils/lang';
 import Handler from '@/scripts/cmdPlugin/Handler';
 import { deepAssign } from '@/utils/index';
+import store from '@/store/index';
+import { ScriptMode } from '@/scripts/ConstDic';
+import { setLocalStorage } from '@/utils/auth';
 
 /**
  * 实训状态数据
@@ -428,13 +431,17 @@ const training = {
 
         // 下一步
         nextNew: ({ commit, state }, operate) => {
+            setLocalStorage('nextNew', JSON.stringify(operate));
             return new Promise((resolve, reject) => {
                 commit('setOperate', operate);
                 if (!state.started && !state.mode) {
                     commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'Please click start, start training!' : '请点击开始，开始实训！', color: 'red' });
                     return;
                 }
-
+                if (store.state.trainingNew.trainingDetail && !store.state.trainingNew.trainingSwitch) {
+                    commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'Please click start, start training!' : '请点击开始，开始实训！', color: 'red' });
+                    return;
+                }
                 // 处理operation
                 Handler.handle(operate).then(rtn => {
                     if (state.trainingStart) {
@@ -453,10 +460,20 @@ const training = {
                             // 测试和考试不给提示
                             rtn && rtn.valid && commit('next');
                         }
+                    } else if (store.state.trainingNew.trainingSwitch && store.state.trainingNew.trainingDetail.type === 'SINGLE') {
+                        if (store.state.trainingNew.teachMode === ScriptMode.TEACH || store.state.trainingNew.teachMode === ScriptMode.PRACTICE) {
+                            if (rtn && rtn.valid) {
+                                commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? "Correct operation! That's great!" : '操作正确！真棒！', color: 'green' });
+                            } else {
+                                commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'operation mistake!' : '操作错误！', color: 'red' });
+                            }
+                        }
+                    } else {
+                        store.dispatch('trainingNew/setTrainingOperate', operate);
                     }
                     resolve(rtn);
                 }).catch(error => {
-                    // console.error(error);
+                    console.error(error);
                     reject(error);
                 });
             });
@@ -662,6 +679,9 @@ const training = {
         },
         setUserRole: ({ commit }, userRole) => {
             commit('setUserRole', userRole);
+        },
+        setOperateErrMsg: ({ commit }) => {
+            commit('setOperateErrMsg', { errMsg: '操作错误！', color: 'red' });
         }
     }
 };
diff --git a/src/store/modules/trainingNew.js b/src/store/modules/trainingNew.js
index 4f2bc0d05..17339eff1 100644
--- a/src/store/modules/trainingNew.js
+++ b/src/store/modules/trainingNew.js
@@ -1,9 +1,17 @@
+import { setLocalStorage } from '@/utils/auth';
 const training = {
     namespaced: true,
     state: {
         teachMode: '', // 实训模式
         trainingDetail: null, // 实训详情
-        trainingSwitch: false // 实训开始结束标志
+        trainingSwitch: false, // 实训开始结束标志
+        trainingOperate: null,
+        simulationPause: false, // 实训 暂停判断
+        sceneOperate: null,
+        stepOrder: 0,
+        operateOrder: 0,
+        stepOverCount: 0,
+        trainingScore: ''
     },
     getters: {
         teachMode: (state) => {
@@ -14,6 +22,21 @@ const training = {
         },
         trainingSwitch: (state) => {
             return state.trainingSwitch;
+        },
+        trainingOperate: (state) => {
+            return state.trainingOperate;
+        },
+        stepOrder: (state) => {
+            return state.stepOrder;
+        },
+        stepOverCount: (state) => {
+            return state.stepOverCount;
+        },
+        trainingScore: (state) => {
+            return state.trainingScore;
+        },
+        sceneOperate: (state) => {
+            return state.sceneOperate;
         }
     },
     mutations: {
@@ -22,9 +45,44 @@ const training = {
         },
         setTrainingDetail: (state, detail) => {
             state.trainingDetail = detail;
+            setLocalStorage('trainingDetail', JSON.stringify(detail));
         },
         setTrainingSwitch: (state, flag) => {
             state.trainingSwitch = flag;
+        },
+        setTrainingOperate: (state, trainingOperate) => {
+            state.trainingOperate = trainingOperate;
+        },
+        stepOrderIncrease: (state) => {
+            state.stepOrder++;
+            setLocalStorage('stepOrder', JSON.stringify(state.stepOrder));
+        },
+        clearStepOrder: (state) => {
+            state.stepOrder = 0;
+            setLocalStorage('stepOrder', JSON.stringify(state.stepOrder));
+        },
+        operateOrderIncrease: (state) => {
+            state.operateOrder++;
+            setLocalStorage('operateOrder', JSON.stringify(state.operateOrder));
+        },
+        setSimulationPause: (state, value) => {
+            state.simulationPause = value;
+        },
+        clearOperateOrder: (state) => {
+            state.operateOrder = 0;
+            setLocalStorage('operateOrder', JSON.stringify(state.operateOrder));
+        },
+        stepOverCountChange: (state) => {
+            state.stepOverCount++;
+        },
+        clearStepOverCount: (state) => {
+            state.clearStepOverCount = 0;
+        },
+        setTrainingScore: (state, score) => {
+            state.trainingScore = score;
+        },
+        setSceneOperate: (state, sceneOperate) => {
+            state.sceneOperate = sceneOperate;
         }
     },
     actions: {
@@ -36,10 +94,51 @@ const training = {
         },
         trainingStart: ({commit}) => {
             commit('setTrainingSwitch', true);
+            setLocalStorage('nextNew', null);
         },
         trainingEnd: ({commit}) => {
             commit('setTrainingSwitch', false);
+            setLocalStorage('nextNew', null);
+        },
+        setTrainingOperate: ({commit, state}, trainingOperate) => {
+            commit('setTrainingOperate', trainingOperate);
+        },
+        stepOrderIncrease: ({commit}) => {
+            commit('stepOrderIncrease');
+        },
+        clearStepOrder: ({commit}) => {
+            commit('clearStepOrder');
+        },
+        operateOrderIncrease: ({commit}) => {
+            commit('operateOrderIncrease');
+        },
+        setSimulationPause: ({commit}, simulationPause) => {
+            commit('setSimulationPause', simulationPause);
+        },
+        clearOperateOrder: ({commit}) => {
+            commit('clearOperateOrder');
+        },
+        clearStepOverCount: ({commit}) => {
+            commit('clearStepOverCount');
+        },
+        setTrainingScore: ({commit}, score) => {
+            commit('setTrainingScore', score);
+        },
+        setSceneOperate: ({commit}, sceneOperate) => {
+            commit('setSceneOperate', sceneOperate);
+        },
+        handleCheckNewTrainingResult:({commit, state}, valid) => {
+            const stepList = JSON.parse(state.trainingDetail.stepJson);
+            const step = stepList[state.stepOrder - 1];
+            if (valid && step.operations.length === (state.operateOrder + 1 )) {
+                commit('stepOverCountChange');
+            } else if (valid) {
+                commit('operateOrderIncrease');
+            } else {
+                console.error('校验失败；');
+            }
         }
     }
 };
 export default training;
+
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 0f0a7d8ee..01775a9a2 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,4 +1,5 @@
 import SessionStorage from 'sessionstorage';
+import store from '@/store/index';
 
 const TokenKey = 'Admin-Token';
 
@@ -23,3 +24,22 @@ export function setSessionStorage(key, value) {
 export function removeSessionStorage(key) {
     return SessionStorage.removeItem(key);
 }
+
+// 操作LocalStorage
+export function getLocalStorage(key) {
+    const idKey = getUserIdKey(key);
+    return localStorage.getItem(idKey);
+}
+export function setLocalStorage(key, value) {
+    const idKey = getUserIdKey(key);
+    return localStorage.setItem(idKey, value);
+}
+export function removeLocalStorage(key) {
+    const idKey = getUserIdKey(key);
+    return localStorage.removeItem(idKey);
+}
+export function getUserIdKey(key) {
+    const id = store.state.user.id;
+    const idKey = `${id}_${key}`;
+    return idKey;
+}
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index b56c5ab9d..0c6bfc252 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -27,7 +27,7 @@ export function handlerUrl(data) {
         BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.233/rtss-server';
         // BASE_API = 'http://114.116.51.125/jlcloud';
-        // BASE_API = 'http://192.168.8.152:9000'; // 袁琪
+        // BASE_API = 'http://192.168.3.90:9100'; // 周寅
         // BASE_API = 'http://192.168.3.94:9000'; // 旭强
         // BASE_API = 'http://192.168.3.15:9000'; // 张赛
         // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬
diff --git a/src/utils/date.js b/src/utils/date.js
index 2402fca25..c1d33503b 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -1,3 +1,17 @@
+import dayjs from 'dayjs';
+// import utc from 'dayjs/plugin/utc'
+import 'dayjs/locale/zh-cn';
+import duration from 'dayjs/plugin/duration';
+import localizedFormat from 'dayjs/plugin/localizedFormat';
+dayjs.locale('zh-cn');
+dayjs
+// .extend(utc)
+    .extend(localizedFormat)
+    .extend(duration);
+
+/**
+ * @returns 当前时间, 格式: 'YYYY-MM-DD HH:mm:ss'
+ */
 export function now() {
     var d = new Date();
     var year = d.getFullYear();
@@ -16,12 +30,19 @@ export function now() {
     return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
 }
 
+/**
+ * @param {Number} usedTime 秒数
+ * @returns `HH:mm:ss`
+ */
 export function timeFormat(usedTime = 0) {
-    let hour = 0; let minute = 0; let second = 0; let sumTime = usedTime;
+    let hour = 0;
+    let minute = 0;
+    let second = 0;
+    let sumTime = usedTime;
     if (sumTime) {
         if (sumTime >= 3600) {
             hour = Math.floor(sumTime / 3600) % 24;
-            sumTime = (sumTime % 3600);
+            sumTime = sumTime % 3600;
         }
         if (sumTime >= 60) {
             minute = Math.floor(sumTime / 60);
@@ -35,8 +56,11 @@ export function timeFormat(usedTime = 0) {
     return getTimeStr(hour) + ':' + getTimeStr(minute) + ':' + getTimeStr(second);
 }
 
-// 时分秒转为时间戳
-
+/**
+ * 时分秒转为时间戳
+ * @param {String} time 'HH:mm:ss'
+ * @returns 秒数
+ */
 export function toTimeStamp(time = '') {
     let s = 0;
     const hour = time.split(':')[0];
@@ -46,8 +70,11 @@ export function toTimeStamp(time = '') {
     return s;
 }
 
-// 时间戳的只转为时分秒
-
+/**
+ * 时间戳的转换为时分秒
+ * @param {Number} mss Unix时间戳
+ * @returns 'HH:mm:ss'
+ */
 export function formatDuring(mss) {
     const now = new Date(mss);
     const hour = now.getHours(); // 返回日期中的小时数（0到23）
@@ -56,41 +83,43 @@ export function formatDuring(mss) {
     return hour + ':' + minute + ':' + second;
 }
 
-export function prefixIntrger(num, length) {
-    return (Array(length).join('0') + num).slice(-length);
-}
-/** 根据秒计算时间hh:mm:ss */
-export function computationTime(time) {
-    let hours = Math.floor(time / 3600);
-    const newTime = time % 3600;
-    let minutes = Math.floor(newTime / 60) + '';
-    let seconds = newTime % 60;
-    if (hours < 0) {
-        hours = '00';
-    } else if (hours < 10) {
-        hours = '0' + hours;
-    }
-    if (minutes < 0) {
-        minutes = '00';
-    } else if (minutes < 10) {
-        minutes = '0' + minutes;
-    }
-    if (seconds < 0) {
-        seconds = '00';
-    } else if (seconds < 10) {
-        seconds = '0' + seconds;
-    }
-    return hours + ':' + minutes + ':' + seconds;
-}
-
 export function computationSeconds(seconds, hourUnit, minuteUnit, secondUnit) {
     if (seconds) {
         const h = parseInt(seconds / 3600);
         const m = parseInt((seconds - h * 3600) / 60);
         const s = (seconds - h * 3600) % 60;
-        return h ? `${h} ${hourUnit} ${m} ${minuteUnit} ${s} ${secondUnit}`
-            : m ? `${m} ${minuteUnit} ${s} ${secondUnit}`
-                : `${s} ${secondUnit}`;
+        return h ? `${h} ${hourUnit} ${m} ${minuteUnit} ${s} ${secondUnit}` : m ? `${m} ${minuteUnit} ${s} ${secondUnit}` : `${s} ${secondUnit}`;
     }
     return null;
 }
+
+export function timestampFormat(format, ms = new Date()) {
+    return dayjs/* .utc */(ms).format(format);
+}
+
+/* 对象是否相等 */
+export function objectIsEqual(obj1, obj2) {
+    if (!(obj1 instanceof Object)) {
+        return false;
+    } else if (!(obj2 instanceof Object)) {
+        return false;
+    }
+    // 仅过滤值为null的项
+    const arr1 = Object.keys(obj1).filter(key => { return obj1[key] != null; });
+    const arr2 = Object.keys(obj2).filter(key => { return obj1[key] != null; });
+    if (arr1.length !== arr2.length) {
+        return false;
+    }
+    for (const key of arr1) {
+        if (obj1[key] instanceof Object && obj2[key] instanceof Object) {
+            if (!objectIsEqual(obj1[key], obj2[key])) {
+                console.log(obj1[key], obj2[key]);
+                return false;
+            }
+        } else if (obj1[key] !== obj2[key]) {
+            console.log(obj1[key], obj2[key]);
+            return false;
+        }
+    }
+    return true;
+}
diff --git a/src/utils/stomp.js b/src/utils/stomp.js
index a97a55091..5b4f5ec3f 100644
--- a/src/utils/stomp.js
+++ b/src/utils/stomp.js
@@ -10,7 +10,7 @@ export const jl3dTopic = '/user/queue/simulation/jl3d'; //  三维topic
 export const LPFTopic = '/user/queue/simulation/passenger'; //  客流topic
 // export const iscsTopic = '/topic/simulation/iscs'; // iscs topic
 
-export function getTopic(type, group, stationCode) {
+export function getTopic(type, group, param) {
     let topic = '';
     switch (type) {
     case 'SYSTIME':
@@ -23,7 +23,7 @@ export function getTopic(type, group, stationCode) {
         topic = `/queue/simulation/${group}/state`;
         break;
     case 'ISCSPSD':
-        topic = `/queue/simulation/${group}/iscs/psd/${stationCode}`;
+        topic = `/queue/simulation/${group}/iscs/psd/${param.stationCode}`;
         break;
     case 'ISCSPA':
         topic = `/queue/simulation/${group}/iscs/pa`;
@@ -31,6 +31,15 @@ export function getTopic(type, group, stationCode) {
     case 'ISCSPIS':
         topic = `/queue/simulation/${group}/iscs/pis`;
         break;
+    case 'ISCSGATE':
+        topic = `/queue/simulation/${group}/iscs/gate/${param.stationCode}`;
+        break;
+    case 'PIS_STAND':
+        topic = `/queue/simulation/${group}/standPis/${param.standCode}`;
+        break;
+    case 'PIS_TRAIN':
+        topic = `/queue/simulation/${group}/onboardPis/${param.groupNumber}`;
+        break;
     case 'CTC':
         topic = `/user/queue/simulation/${group}/ctc`;
         break;
@@ -52,7 +61,7 @@ export function creatSubscribe(topic, header) {
         if (!Vue.prototype.$stomp) {
             Vue.prototype.$stomp = new StompClient();
         }
-        if (!Vue.prototype.$stomp.subscribeMap[topic]) {
+        if (!Vue.prototype.$stomp.subscribeMap.has(topic)) {
             Vue.prototype.$stomp.subscribe(topic, callback, header);
         }
     } catch (error) {
@@ -69,12 +78,16 @@ function callback(Response) {
             store.dispatch('socket/setSimulationTimeSync', Number.parseInt(Response.body));
         } else if (Response.headers.destination.includes('state')) {
             store.dispatch('socket/handleSimulationState', Number.parseInt(Response.body));
-        } else if (Response.headers.destination.includes('iscs/psd')) {
+        } else if (Response.headers.destination.includes('iscs/psd') || Response.headers.destination.includes('iscs/gate')) {
             store.dispatch('socket/handleIscsState', JSON.parse(Response.body));
         } else if (Response.headers.destination.includes('iscs/pa')) {
             store.dispatch('socket/handleIscsPaState', JSON.parse(Response.body));
         } else if (Response.headers.destination.includes('iscs/pis')) {
             store.dispatch('socket/handleIscsPisState', JSON.parse(Response.body));
+        } else if (Response.headers.destination.includes('standPis')) {
+            store.dispatch('socket/handleStandPisState', JSON.parse(Response.body));
+        } else if (Response.headers.destination.includes('onboardPis')) {
+            store.dispatch('socket/handleOnboardPisState', JSON.parse(Response.body));
         } else {
             const data = JSON.parse(Response.body);
             store.dispatch('socket/setStomp', data);
diff --git a/src/views/bigTrainRunplanManage/addRunplan.vue b/src/views/bigTrainRunplanManage/addRunplan.vue
index dba9dcc5f..ba09f15af 100644
--- a/src/views/bigTrainRunplanManage/addRunplan.vue
+++ b/src/views/bigTrainRunplanManage/addRunplan.vue
@@ -144,6 +144,7 @@ export default {
             loading: false,
             title:'',
             // mapStationDirectionList:[],
+            isAdd:false,
             mapStationDirectionMap:{},
             enterDirList:[], // 入口列表
             outDirList:[],
@@ -231,7 +232,9 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.CTCCommand.addTrainFixedPath.menu.domId : '';
+            return this.dialogShow
+                ? (this.isAdd ? OperationEvent.CTCCommand.addTrainFixedPath.menu.domId : OperationEvent.CTCCommand.modifyTrainFixedPath.menu.domId)
+                : '';
         }
     },
     methods:{
@@ -239,16 +242,26 @@ export default {
             this.mapStationDirectionMap = mapStationDirectionMap;
             const mapStationDirectionList = Object.values(mapStationDirectionMap);
             this.enterDirList = mapStationDirectionList.filter(stationDirection=>{
-                return stationDirection.runStatus == 'R';
+                return stationDirection.stationCode == stationCode && (
+                    stationDirection.ioDirection == 'DOWN_IN_STATION' ||
+                    stationDirection.ioDirection == 'UP_IN_STATION' ||
+                    stationDirection.ioDirection == 'BOTH_WAY_STATION'
+                );
             });
             this.outDirList = mapStationDirectionList.filter(stationDirection=>{
-                return stationDirection.runStatus == 'D';
+                return stationDirection.stationCode == stationCode && (
+                    stationDirection.ioDirection == 'DOWN_OUT_STATION' ||
+                    stationDirection.ioDirection == 'UP_OUT_STATION' ||
+                    stationDirection.ioDirection == 'BOTH_WAY_STATION'
+                );
             });
             if (row) {
                 this.addModel = Object.assign({}, row);
                 this.title = '修改列车固定径路';
+                this.isAdd = false;
             } else {
                 this.title = '增加列车固定径路';
+                this.isAdd = true;
                 this.addModel.stationCode = stationCode;
             }
             this.filterSectionList = Object.values(filterSectionMap);
@@ -311,16 +324,29 @@ export default {
                 if (valid) {
                     this.loading = true;
                     const param = Object.assign({}, this.addModel);
-                    if (this.title == '增加列车固定径路') { delete param.code; }
-                    commitOperate(menuOperate.CTC.addTrainFixedPath, param, 3).then(({valid})=>{
-                        if (valid) {
+                    if (this.isAdd) {
+                        delete param.code;
+                        commitOperate(menuOperate.CTC.addTrainFixedPath, param, 3).then(({valid})=>{
+                            if (valid) {
+                                this.doClose();
+                                this.$emit('refresh');
+                            }
+                        }).catch(() => {
                             this.doClose();
-                            this.$emit('refresh');
-                        }
-                    }).catch(() => {
-                        this.doClose();
-                        this.$emit('noticeInfo');
-                    });
+                            this.$emit('noticeInfo');
+                        });
+                    } else {
+                        commitOperate(menuOperate.CTC.modifyTrainFixedPath, param, 3).then(({valid})=>{
+                            if (valid) {
+                                this.doClose();
+                                this.$emit('refresh');
+                            }
+                        }).catch(() => {
+                            this.doClose();
+                            this.$emit('noticeInfo');
+                        });
+                    }
+
                 }
             });
         },
diff --git a/src/views/bigTrainRunplanManage/batchTrainFxPath.vue b/src/views/bigTrainRunplanManage/batchTrainFxPath.vue
index 8a2f04acb..d24218fc3 100644
--- a/src/views/bigTrainRunplanManage/batchTrainFxPath.vue
+++ b/src/views/bigTrainRunplanManage/batchTrainFxPath.vue
@@ -206,10 +206,18 @@ export default {
             this.mapStationDirectionMap = mapStationDirectionMap;
             const mapStationDirectionList = Object.values(mapStationDirectionMap);
             this.enterDirList = mapStationDirectionList.filter(stationDirection=>{
-                return stationDirection.runStatus == 'R';
+                return stationDirection.stationCode == stationCode && (
+                    stationDirection.ioDirection == 'DOWN_IN_STATION' ||
+                    stationDirection.ioDirection == 'UP_IN_STATION' ||
+                    stationDirection.ioDirection == 'BOTH_WAY_STATION'
+                );
             });
             this.outDirList = mapStationDirectionList.filter(stationDirection=>{
-                return stationDirection.runStatus == 'D';
+                return stationDirection.stationCode == stationCode && (
+                    stationDirection.ioDirection == 'DOWN_OUT_STATION' ||
+                    stationDirection.ioDirection == 'UP_OUT_STATION' ||
+                    stationDirection.ioDirection == 'BOTH_WAY_STATION'
+                );
             });
             this.addModel.stationCode = stationCode;
             this.filterSectionList = Object.values(filterSectionMap);
diff --git a/src/views/bigTrainRunplanManage/directionInformation.vue b/src/views/bigTrainRunplanManage/directionInformation.vue
index e6a437e8e..81864a710 100644
--- a/src/views/bigTrainRunplanManage/directionInformation.vue
+++ b/src/views/bigTrainRunplanManage/directionInformation.vue
@@ -68,6 +68,7 @@
   </el-dialog>
 </template>
 <script>
+// import { deepAssign } from '@/utils/index';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 export default {
@@ -127,7 +128,7 @@ export default {
         },
         commit() {
             this.loading = true;
-            const param = Object.assign({stationCode:this.stationCode}, this.model);
+            const param = Object.assign({stationCode:this.stationCode}, JSON.parse(JSON.stringify(this.model)));
             delete param.ioName;
             delete param.ioDirection;
             commitOperate(menuOperate.CTC.modifyStationDirection, param, 3).then(({valid})=>{
diff --git a/src/views/bigTrainRunplanManage/index.vue b/src/views/bigTrainRunplanManage/index.vue
index b4cc585f1..cdfb5d6c5 100644
--- a/src/views/bigTrainRunplanManage/index.vue
+++ b/src/views/bigTrainRunplanManage/index.vue
@@ -4,7 +4,7 @@
       <div class="BTRpMenuBar">
         <div class="eachBTRpMenuBar" @click="addTab('StationTrack')">车站股道</div>
         <div class="eachBTRpMenuBar" @click="addTab('StationDirection')">车站出入口</div>
-        <div class="eachBTRpMenuBar" @click="addTab('TrainFixedPath')">列车固定路径</div>
+        <div class="eachBTRpMenuBar" @click="addTab('TrainFixedPath')">列车固定径路</div>
         <div class="eachBTRpMenuBar">车站用户管理</div>
         <div class="eachBTRpMenuBar">备份区名称</div>
         <div class="eachBTRpMenuBar">工作区选择</div>
@@ -98,7 +98,7 @@ export default {
             this.currentTabs = tabs.filter(tab => tab.name !== targetName);
         },
         addTab(name) {
-            const nameMap = {'StationTrack':{title:'车站股道', component:StationTrack }, 'TrainFixedPath':{title:'列车固定路径', component:TrainFixedPath}, 'StationDirection':{title:'出入口', component:StationDirection}};
+            const nameMap = {'StationTrack':{title:'车站股道', component:StationTrack }, 'TrainFixedPath':{title:'列车固定径路', component:TrainFixedPath}, 'StationDirection':{title:'出入口', component:StationDirection}};
             const findTab = this.currentTabs.find(tab=>{
                 return tab.name == name;
             });
@@ -133,7 +133,7 @@ export default {
             this.$refs.noticeInfo.doShow();
         }
         // '车站股道'
-        // 列车固定路径
+        // 列车固定径路
     }
 
 };
diff --git a/src/views/bigTrainRunplanManage/stationTrack.vue b/src/views/bigTrainRunplanManage/stationTrack.vue
index bea9c169d..d0c5bc2cd 100644
--- a/src/views/bigTrainRunplanManage/stationTrack.vue
+++ b/src/views/bigTrainRunplanManage/stationTrack.vue
@@ -8,12 +8,12 @@
       <div class="stationTrackRMenu">
         <div class="stationTrackRMenuL">
           <!-- :id="domIdConfirm"  :loading="loading" @click="commit"-->
-          <el-button class="stationTrackButton" size="small" @click="modifySection">修改</el-button>
+          <el-button :id="OperationEvent.CTCCommand.modifyStationTrack.edit.domId" class="stationTrackButton" size="small" @click="modifySection">修改</el-button>
         </div>
         <div class="stationTrackRMenuR">
           <span class="stationTrackRVer">版本号</span>
           <el-button class="stationTrackButton" size="small">备份</el-button>
-          <el-button class="stationTrackButton" size="small" @click="releaseStationTrack">更新至生效区</el-button>
+          <el-button :id="OperationEvent.CTCCommand.releaseStationTrack.menu.operation" class="stationTrackButton" size="small" @click="releaseStationTrack">更新至生效区</el-button>
           <el-button class="stationTrackButton" size="small">导入</el-button>
           <el-button class="stationTrackButton" size="small">比较</el-button>
         </div>
@@ -153,6 +153,7 @@ import { mapGetters } from 'vuex';
 import TerminalStationList from './terminalStationList';
 import TrackInformation from './trackInformation';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 export default {
     name:'StationTrack',
     components: {
@@ -175,9 +176,9 @@ export default {
                 'D':'上下行'
             },
             typeMap:{
-                'VAN':'客车',
+                'VAN':'客货车',
                 'GOODS_VAN':'货车',
-                'PASSENGER':'客货车'
+                'PASSENGER':'客车'
             },
             transfiniteTypeMap:{
                 'NO':'不能接发超限列车',
@@ -213,7 +214,10 @@ export default {
     computed:{
         ...mapGetters('map', [
             'sectionList'
-        ])
+        ]),
+        OperationEvent() {
+            return OperationEvent;
+        }
     },
     methods:{
         loadStation() {
@@ -252,10 +256,14 @@ export default {
         },
         modifySection() {
             if (this.currentRow) {
-                this.$refs.trackInformation.doShow({
-                    row:this.currentRow,
-                    filterSectionMap:this.filterSectionMap,
-                    stationCode:this.currentStationCode
+                commitOperate(menuOperate.CTC.editStationTrack, {}, 0).then(({valid})=>{
+                    if (valid) {
+                        this.$refs.trackInformation.doShow({
+                            row:this.currentRow,
+                            filterSectionMap:this.filterSectionMap,
+                            stationCode:this.currentStationCode
+                        });
+                    }
                 });
             }
         },
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'},
diff --git a/src/views/bigTrainRunplanManage/trainFixedPath.vue b/src/views/bigTrainRunplanManage/trainFixedPath.vue
index 0668362ee..769fc97f8 100644
--- a/src/views/bigTrainRunplanManage/trainFixedPath.vue
+++ b/src/views/bigTrainRunplanManage/trainFixedPath.vue
@@ -37,6 +37,7 @@
           :data="tableData"
           border
           :height="(height-100)+'px'"
+          :row-class-name="tableRowClassName"
           highlight-current-row
           style="border:1px #ccc solid;"
           @row-click="selectedSection"
@@ -157,12 +158,12 @@
           </el-table-column>
           <!-- trainInspection -->
           <el-table-column
-            prop="appendData.LIEJIAN "
+            prop="appendData.LIEJIAN"
             label="列检"
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.LIEJIAN" />
+              <el-checkbox v-model="scope.row.appendData.LIEJIAN" @change="changeData(scope.row,'LIEJIAN')" />
             </template>
           </el-table-column>
           <!-- crossZero -->
@@ -172,7 +173,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.JIAO_LING" />
+              <el-checkbox v-model="scope.row.appendData.JIAO_LING" @change="changeData(scope.row,'JIAO_LING')" />
             </template>
           </el-table-column>
           <el-table-column
@@ -181,7 +182,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.JIAOPIAO" />
+              <el-checkbox v-model="scope.row.appendData.JIAOPIAO" @change="changeData(scope.row,'JIAOPIAO')" />
             </template>
           </el-table-column>
           <!-- columnEnd -->
@@ -191,7 +192,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.LIEWEI" />
+              <el-checkbox v-model="scope.row.appendData.LIEWEI" @change="changeData(scope.row,'LIEWEI')" />
             </template>
           </el-table-column>
           <!-- locomotive -->
@@ -201,7 +202,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.JICHE" />
+              <el-checkbox v-model="scope.row.appendData.JICHE" @change="changeData(scope.row,'JICHE')" />
             </template>
           </el-table-column>
           <!-- goodsInspection -->
@@ -211,7 +212,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.HUOJIAN" />
+              <el-checkbox v-model="scope.row.appendData.HUOJIAN" @change="changeData(scope.row,'HUOJIAN')" />
             </template>
           </el-table-column>
           <!-- multiplyDown -->
@@ -221,7 +222,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.CHENGJIANG" />
+              <el-checkbox v-model="scope.row.appendData.CHENGJIANG" @change="changeData(scope.row,'CHENGJIANG')" />
             </template>
           </el-table-column>
           <!-- sailUpstream -->
@@ -231,7 +232,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.SHANGSHUI" />
+              <el-checkbox v-model="scope.row.appendData.SHANGSHUI" @change="changeData(scope.row,'SHANGSHUI')" />
             </template>
           </el-table-column>
           <!-- pickUp  -->
@@ -241,7 +242,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.ZHAIGUA" />
+              <el-checkbox v-model="scope.row.appendData.ZHAIGUA" @change="changeData(scope.row,'ZHAIGUA')" />
             </template>
           </el-table-column>
           <!-- transfer -->
@@ -251,7 +252,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.HUANCHENG" />
+              <el-checkbox v-model="scope.row.appendData.HUANCHENG" @change="changeData(scope.row,'HUANCHENG')" />
             </template>
           </el-table-column>
           <!-- handling  -->
@@ -261,7 +262,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.ZHUANGXIE" />
+              <el-checkbox v-model="scope.row.appendData.ZHUANGXIE" @change="changeData(scope.row,'ZHUANGXIE')" />
             </template>
           </el-table-column>
           <!-- pollution -->
@@ -271,7 +272,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.XIWU" />
+              <el-checkbox v-model="scope.row.appendData.XIWU" @change="changeData(scope.row,'XIWU')" />
             </template>
           </el-table-column>
           <!-- crossing-->
@@ -281,7 +282,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.DAOKOU" />
+              <el-checkbox v-model="scope.row.appendData.DAOKOU" @change="changeData(scope.row,'DAOKOU')" />
             </template>
           </el-table-column>
           <!-- trainNumber -->
@@ -291,7 +292,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.CHEHAO" />
+              <el-checkbox v-model="scope.row.appendData.CHEHAO" @change="changeData(scope.row,'CHEHAO')" />
             </template>
           </el-table-column>
           <!-- affair  -->
@@ -301,7 +302,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.ZHANWU" />
+              <el-checkbox v-model="scope.row.appendData.ZHANWU" @change="changeData(scope.row,'ZHANWU')" />
             </template>
           </el-table-column>
           <el-table-column
@@ -310,7 +311,7 @@
             width="40"
           >
             <template slot-scope="scope">
-              <el-checkbox v-model="scope.row.appendData.ZONGKONG" />
+              <el-checkbox v-model="scope.row.appendData.ZONGKONG" @change="changeData(scope.row,'ZONGKONG')" />
             </template>
           </el-table-column>
         </el-table>
@@ -369,6 +370,9 @@ export default {
         selectedSection(row, column, event) {
             this.currentRow = row;
         },
+        tableRowClassName({row, rowIndex}) {
+            row.row_index = rowIndex;
+        },
         loadStation() {
             this.$refs.terminalStationList.loadStation();
         },
@@ -396,30 +400,41 @@ export default {
                 mapStationDirectionMap:this.mapStationDirectionData
             });
         },
+        changeData(row, prop) {
+            row.appendData[prop] = !row.appendData[prop];
+            this.$refs.trainFxPath.doShow({
+                stationCode:this.currentStationCode,
+                filterSectionMap:this.filterSectionMap,
+                mapStationDirectionMap:this.mapStationDirectionData,
+                row:JSON.parse(JSON.stringify(row))
+            });
+        },
         modifyTrainFxPath() {
             if (this.currentRow) {
                 this.$refs.trainFxPath.doShow({
                     stationCode:this.currentStationCode,
                     filterSectionMap:this.filterSectionMap,
                     mapStationDirectionMap:this.mapStationDirectionData,
-                    row:this.currentRow
+                    row:JSON.parse(JSON.stringify(this.currentRow))
                 });
             }
         },
         deleteTrainFxPath() {
             if (this.currentRow) {
                 const that = this;
-                this.$confirm('确定删除该条列车路径数据?', '警告', {
+                this.$confirm('确定删除该条列车固定径路数据?', '警告', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
                     // stationCode 车站编码
                     // runPlanCode:this.currentRow.runPlanCode
+                    const currentIndex = this.currentRow.row_index;
                     const param = {stationCode:this.currentRow.stationCode, code:this.currentRow.code };
                     commitOperate(menuOperate.CTC.deleteTrainFixedPath, param, 3).then(({valid})=>{
                         if (valid) {
                             that.$message.success('删除成功！');
+                            this.handleData(currentIndex);
                         }
                     }).catch(() => {
                         that.$message.error('删除失败');
@@ -429,7 +444,7 @@ export default {
         },
         clearTrainFxPath() {
             const that = this;
-            this.$confirm('确定清空该站的所有列车路径数据?', '警告', {
+            this.$confirm('确定清空该站的所有列车固定径路数据?', '警告', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
@@ -439,6 +454,7 @@ export default {
                 commitOperate(menuOperate.CTC.clearTrainFixedPath, param, 3).then(({valid})=>{
                     if (valid) {
                         that.$message.success('清空成功！');
+                        this.handleData();
                     }
                 }).catch(() => {
                     that.$message.error('清空失败');
@@ -490,6 +506,7 @@ export default {
                                 if (valid) {
                                     loading.close();
                                     that.$message.success('导入成功！');
+                                    this.handleData();
                                 }
                             }).catch(() => {
                                 loading.close();
@@ -520,14 +537,20 @@ export default {
         coverTime(time) {
             return time ? time.split(':').splice(0, 2).join(':') : '';
         },
-        handleData() {
+        handleData(currentIndex) {
             commitOperate(menuOperate.CTC.getTrainFixedPath, { stationCode: this.currentStationCode }, 3).then(({valid, response}) => {
                 if (valid) {
-                    debugger;
                     this.tableData = response.data;
+                    if (currentIndex != undefined) {
+                        const length = this.tableData.length - 1;
+                        const nextIndex = currentIndex < length ? currentIndex : length;
+                        this.$refs.trainFixedPathTableIn.setCurrentRow(this.tableData[nextIndex]);
+                        this.currentRow = this.tableData[nextIndex];
+                    } else {
+                        this.currentRow = null;
+                    }
                 }
             });
-            this.currentRow = null;
             // const railCtcStationManageRpMsg = copyAssign({}, this.$store.state.socket.railCtcStationManageRpMsg);
             // this.tableData = Object.values(railCtcStationManageRpMsg).filter(data=>{
             //     data.arriveTime = this.coverTime(data.arriveTime);
diff --git a/src/views/components/systemTime/index.vue b/src/views/components/systemTime/index.vue
index 4894e0e1f..a35b33fd0 100644
--- a/src/views/components/systemTime/index.vue
+++ b/src/views/components/systemTime/index.vue
@@ -19,7 +19,7 @@ import Digit from './digit';
 import Separator from './separator';
 
 export default {
-    name: 'SystenTime',
+    name: 'SystemTime',
     components: {
         Digit,
         Separator
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index d7b8de9d4..0a7c85f96 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -219,7 +219,7 @@ export default {
             });
         },
         async start() {
-            const jumpFunc = ['jump', 'jump', 'enterIntegratedSimulation', 'jump', 'jumpScheduling', 'enterISCS', 'enterScreen', '', 'jump', 'jump'];
+            const jumpFunc = ['jump', 'jump', 'enterIntegratedSimulation', 'jump', 'jumpScheduling', 'enterISCS', 'enterScreen', '', 'jump', 'enterScreen'];
             this[jumpFunc[parseInt(this.courseModel.prdType) - 1]]();
         },
         jumpSimulation() {
diff --git a/src/views/designPlatform/bigScreen.vue b/src/views/designPlatform/bigScreen.vue
index 8f375930f..7daf8fed9 100644
--- a/src/views/designPlatform/bigScreen.vue
+++ b/src/views/designPlatform/bigScreen.vue
@@ -2,6 +2,7 @@
   <div class="bigScreen">
     <div v-show="maskOpen" class="bigScreenMask" />
     <jlmap-visual ref="jlmapVisual" />
+    <wh-train-list v-if="prdType=== '10'" ref="whTrainList" />
     <div v-show="disPlay" class="bigScreenBack">
       <el-button-group>
         <el-button type="primary" @click="back">返回</el-button>
@@ -16,11 +17,14 @@ import { clearSimulation } from '@/api/simulation';
 import { mapGetters } from 'vuex';
 import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
 import { getToken } from '@/utils/auth';
+import { TrainingMode } from '@/scripts/ConstDic';
+import WhTrainList from './whTrainList';
 
 export default {
     name: 'BigScreen',
     components: {
-        JlmapVisual
+        JlmapVisual,
+        WhTrainList
     },
     props: {
         widthLeft: {
@@ -46,7 +50,10 @@ export default {
         ]),
         ...mapGetters('config', [
             'canvasId'
-        ])
+        ]),
+        prdType() {
+            return this.$route.query.prdType;
+        }
     },
     watch: {
         widthLeft(val) {
@@ -75,6 +82,9 @@ export default {
         },
         '$store.state.socket.simulationOver':function(val) {
             this.backOut();
+        },
+        '$store.state.socket.whTrainInfo': function(val) {
+
         }
     },
     async beforeDestroy() {
@@ -82,7 +92,7 @@ export default {
         this.$store.dispatch('training/setPrdType', '');
     },
     async mounted() {
-        this.$store.dispatch('training/setPrdType', '07');
+        this.$store.dispatch('training/setPrdType', this.$route.query.prdType || '07');
         await this.setWindowSize();
         await this.initLoadData();
         this.disPlay = true;
@@ -95,7 +105,7 @@ export default {
             if (this.$route.query.group) {
                 loadMapDataById(this.$route.query.mapId, 'simulation');
             } else {
-                this.$store.dispatch('training/changeMode', { mode: null });
+                this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL });
                 loadMapDataById(this.$route.params.mapId, 'preview');
             }
         },
@@ -179,10 +189,16 @@ export default {
             this.clearSubscribe();
             const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
             creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
+            if (this.prdType === '10') {
+                creatSubscribe(`/topic/yjddzh/trainPosition`, header);
+            }
             // await this.$store.dispatch('training/setHasSubscribed');
         },
         clearSubscribe() {
             clearSubscribe(`${displayTopic}\/${this.$route.query.group}`);
+            if (this.prdType === '10') {
+                clearSubscribe(`/topic/yjddzh/trainPosition`);
+            }
         }
     }
 };
diff --git a/src/views/designPlatform/bigSplitScreen.vue b/src/views/designPlatform/bigSplitScreen.vue
index be1540041..0d9bbabd3 100644
--- a/src/views/designPlatform/bigSplitScreen.vue
+++ b/src/views/designPlatform/bigSplitScreen.vue
@@ -27,6 +27,7 @@ import { mapGetters } from 'vuex';
 import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
 import { getToken } from '@/utils/auth';
 import { getSessionStorage } from '@/utils/auth';
+import { TrainingMode } from '@/scripts/ConstDic';
 
 export default {
     name: 'MapPreview',
@@ -105,7 +106,7 @@ export default {
             if (this.$route.query.group) {
                 await loadMapDataById(this.$route.query.mapId, 'simulation');
             } else {
-                this.$store.dispatch('training/changeMode', { mode: null });
+                this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL });
                 loadMapDataById(this.$route.params.mapId, 'preview');
             }
         },
diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue
index de70d659f..3b65843db 100644
--- a/src/views/designPlatform/demonList.vue
+++ b/src/views/designPlatform/demonList.vue
@@ -140,7 +140,7 @@ export default {
                     if (this.loadingProjectList.includes(this.project)) {
                         this.$store.dispatch('app/transitionAnimations');
                     }
-                    const query = { ...data, group: resp.data, scriptId: obj.id, lineCode:obj.lineCode};
+                    const query = { mapId: obj.mapId, group: resp.data, lineCode:obj.lineCode};
                     this.$router.push({ path: `/trainingDesign`, query });
                 }).catch(error => {
                     this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
@@ -148,11 +148,12 @@ export default {
                 break;
             }
             case 'trainingPreview': {
-                const data = { mapId: obj.mapId, prdType: '01' };
+                const data = { mapId: obj.mapId };
                 createSimulationNew(data).then(resp => {
                     if (this.loadingProjectList.includes(this.project)) {
                         this.$store.dispatch('app/transitionAnimations');
                     }
+                    this.$store.dispatch('training/setPrdType', '02');
                     const query = { ...data, group: resp.data, scriptId: obj.id, lineCode:obj.lineCode};
                     this.$router.push({ path: `/trainingPreview`, query });
                 }).catch(error => {
diff --git a/src/views/designPlatform/demonMenu.vue b/src/views/designPlatform/demonMenu.vue
index d42670290..9d2b68c31 100644
--- a/src/views/designPlatform/demonMenu.vue
+++ b/src/views/designPlatform/demonMenu.vue
@@ -5,11 +5,12 @@
       <el-button-group ref="button_group_box" class="button_group_box">
         <el-button size="small" @click="showList">实训列表</el-button>
       </el-button-group>
-      <el-radio-group v-model="demoMode" :disabled="trainingSwitch" class="mode" size="small" style="margin-left: 20px;" @change="changeMode">
-        <el-radio-button :label="TrainingMode.TEACH">{{ $t('display.lesson.teachingMode') }}</el-radio-button>
-        <el-radio-button :label="TrainingMode.PRACTICE">{{ $t('display.lesson.practiceMode') }}</el-radio-button>
-        <el-radio-button :label="TrainingMode.TEST">{{ $t('display.lesson.testMode') }}</el-radio-button>
-      </el-radio-group>
+      <!--      <el-radio-group v-model="demoMode" :disabled="trainingSwitch" class="mode" size="small" style="margin-left: 20px;" @change="changeMode">-->
+      <!--        <el-radio-button :label="TrainingMode.TEACH">{{ $t('display.lesson.teachingMode') }}</el-radio-button>-->
+      <!--        <el-radio-button :label="TrainingMode.PRACTICE">{{ $t('display.lesson.practiceMode') }}</el-radio-button>-->
+      <!--        <el-radio-button :label="TrainingMode.TEST">{{ $t('display.lesson.testMode') }}</el-radio-button>-->
+      <!--      </el-radio-group>-->
+      <!--      <span v-if="demoMode === TrainingMode.TEST" class="display-score">{{ $t('display.lesson.score') }}{{ trainingScore }}</span>-->
     </div>
     <TrainingList ref="trainingList" @editBlob="editBlob" />
   </div>
@@ -44,6 +45,9 @@ export default {
         },
         trainingSwitch() {
             return this.$store.state.trainingNew.trainingSwitch;
+        },
+        trainingScore() {
+            return this.$store.state.trainingNew.trainingScore;
         }
     },
     mounted() {
@@ -109,4 +113,20 @@ export default {
 	overflow: hidden;
 	z-index: 35;
 }
+.display-score {
+	background-color: black;
+	display: -moz-inline-box;
+	display: inline-block;
+	text-align: left;
+	border: 1px solid lightskyblue;
+	width: 100px;
+	height: 32px;
+	line-height: 24px;
+	border-radius: 4px;
+	padding-left: 2px;
+	margin-left: 10px;
+	font-family: "Microsoft" !important;
+	font-size: 18px !important;
+	color: #fff;
+}
 </style>
diff --git a/src/views/designPlatform/mapPreviewNew.vue b/src/views/designPlatform/mapPreviewNew.vue
index e90d53f5a..a565cf9df 100644
--- a/src/views/designPlatform/mapPreviewNew.vue
+++ b/src/views/designPlatform/mapPreviewNew.vue
@@ -11,6 +11,7 @@ import { EventBus } from '@/scripts/event-bus';
 import { DeviceMenu, getDeviceMenuByDeviceType } from '@/scripts/ConstDic';
 import PopMenu from '@/components/PopMenu';
 import { mapGetters } from 'vuex';
+import { TrainingMode } from '@/scripts/ConstDic';
 
 export default {
     name: 'MapPreview',
@@ -78,7 +79,7 @@ export default {
     methods: {
         initLoadData() { // 加载地图数据
             if (parseInt(this.mapId)) {
-                this.$store.dispatch('training/changeMode', { mode: null });
+                this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL });
                 loadMapDataById(this.mapId, 'preview');
             } else {
                 this.endViewLoading();
diff --git a/src/views/designPlatform/poptip.vue b/src/views/designPlatform/poptip.vue
new file mode 100644
index 000000000..3031ebfbd
--- /dev/null
+++ b/src/views/designPlatform/poptip.vue
@@ -0,0 +1,176 @@
+<template>
+  <div id="pop_tip_dialog" class="pop-dialog" :style="{ height: 'auto', left: tPosition.x+'px', top: tPosition.y+'px' }">
+    <div ref="tipRef" class="pop-content" :style="{ width: width + 'px',textAlign: textAlign }">
+      <p style="color: black;" v-html="tip" />
+      <div v-show="tPosition.align === 'top'" x-arrow class="popper__arraw_top" :style="{left: arrawLeft+'px'}" />
+      <div v-show="tPosition.align === 'bottom'" x-arrow class=" popper__arraw_bottom" :style="{left: arrawLeft+'px'}" />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'PopTip',
+    props: {
+        position: {
+            type: Object,
+            required: true,
+            default: function () {
+                return {
+                    x: 0,
+                    y: 0
+                };
+            }
+        },
+        tip: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            defaultFontSize: 14,
+            maxWidth: 300,
+            tPosition: {
+                x: -300,
+                y: -300,
+                align: 'bottom'
+            },
+            offset: 7,
+            textAlign: 'center'
+        };
+    },
+    computed: {
+        width() {
+            let width = this.tip.length * this.defaultFontSize + 40;
+            if (width > this.maxWidth) {
+                width = this.maxWidth;
+            }
+            let parentWidth = 0;
+            if (this.position.fontNumber) {
+                parentWidth = this.position.fontNumber * this.defaultFontSize + 40;
+            }
+            return parentWidth || width;
+        },
+        arrawLeft() {
+            return this.width / 5;
+        }
+    },
+    watch: {
+        'position.x': function (val) {
+            this.resetShowPosition();
+        },
+        'position.y': function (val) {
+            this.resetShowPosition();
+        },
+        'tip': function (val) {
+            this.resetShowPosition();
+        }
+    },
+    mounted() {
+        this.resetShowPosition();
+    },
+    methods: {
+        resetShowPosition() {
+            this.$nextTick(() => {
+                // 位置
+                const height = this.$el.clientHeight;
+
+                this.tPosition.align = this.position.align || 'bottom';
+                this.tPosition.x = this.position.x - (this.arrawLeft + this.offset);
+
+                this.textAlign = this.position.textAlign || 'center';
+                if (this.tPosition.align == 'top') {
+                    const distance = 47;
+                    this.tPosition.y = this.position.y + (distance);
+                } else if (this.tPosition.align == 'bottom') {
+                    const distance = 5;
+                    this.tPosition.y = this.position.y - (height + distance);
+                }
+                if (this.tPosition.x < 0) this.tPosition.x = 0;
+                if (this.tPosition.y < 0) this.tPosition.y = 0;
+            });
+        },
+        reset() {
+            this.tPosition = {
+                x: -300,
+                y: -300
+            };
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+    $bg: #FFDD00;
+    $hoverBg: #f5f7fa;
+
+    .pop-dialog {
+        background-color: $bg;
+        border-radius: 6px;
+        position: fixed;
+        padding: 7px 0px;
+        z-index: 9998;
+
+        .pop-content {
+            .popper__arraw_bottom {
+                position: absolute;
+                height: 14px;
+                width: 14px;
+                background: $bg;
+                -moz-transform: rotate(45deg);
+                -webkit-transform: rotate(45deg);
+                -o-transform: rotate(45deg);
+                transform: rotate(45deg);
+            }
+
+            .popper__arraw_top {
+                position: absolute;
+                height: 14px;
+                width: 14px;
+                top: -7px;
+                background: $bg;
+                -moz-transform: rotate(45deg);
+                -webkit-transform: rotate(45deg);
+                -o-transform: rotate(45deg);
+                transform: rotate(45deg);
+            }
+
+            .popper__arraw_left {
+                position: absolute;
+                height: 14px;
+                width: 14px;
+                left: -7px;
+                background: $bg;
+                -moz-transform: rotate(45deg);
+                -webkit-transform: rotate(45deg);
+                -o-transform: rotate(45deg);
+                transform: rotate(45deg);
+            }
+
+            .popper__arraw_right {
+                position: absolute;
+                height: 14px;
+                width: 14px;
+                right: -7px;
+                background: $bg;
+                -moz-transform: rotate(45deg);
+                -webkit-transform: rotate(45deg);
+                -o-transform: rotate(45deg);
+                transform: rotate(45deg);
+            }
+        }
+
+        .dsp-block {
+            display: block;
+            text-align: left;
+            padding: 6px 15px;
+            width: 100%;
+            border-radius: unset;
+        }
+
+        .dsp-block:hover {
+            background-color: $hoverBg;
+        }
+    }
+</style>
diff --git a/src/views/designPlatform/scenePlayRole.vue b/src/views/designPlatform/scenePlayRole.vue
new file mode 100644
index 000000000..8669a667d
--- /dev/null
+++ b/src/views/designPlatform/scenePlayRole.vue
@@ -0,0 +1,101 @@
+<template>
+  <el-dialog
+    title="角色扮演"
+    :visible.sync="dialogVisible"
+    width="30%"
+    append-to-body
+    :before-close="doClose"
+    center
+  >
+    <template v-for="user in userList">
+      <div :key="user.id" style="display: flex;justify-content: space-between;">
+        <div>{{ user.nickName }}</div>
+        <el-select v-model="user.memberId" size="mini" placeholder="请选择">
+          <el-option
+            v-for="item in roleList"
+            :key="item.id"
+            :label="item.label"
+            :value="item.id"
+          />
+        </el-select>
+      </div>
+    </template>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="commit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import {covertMemberData} from '@/views/newMap/displayNew/utils';
+import { assignUsersPlayRoles } from '@/api/jointSimulation';
+export default {
+    name: 'ScenePlayRole',
+    data() {
+        return {
+            dialogVisible: false,
+            userList: [],
+            roleList: []
+        };
+    },
+    computed: {
+        trainingDetail() {
+            return this.$store.state.trainingNew.trainingDetail;
+        }
+    },
+    watch: {
+        '$store.state.training.simulationUserList': function(val) {
+            this.userList = [];
+            this.$store.state.training.simulationUserList.forEach(user => {
+                this.userList.push({id: user.userId, nickName: user.nickName, memberId: ''});
+            });
+        }
+    },
+    mounted() {
+        if (this.$store.state.training.simulationUserList && this.$store.state.training.simulationUserList.length) {
+            this.userList = [];
+            this.$store.state.training.simulationUserList.forEach(user => {
+                this.userList.push({id: user.userId, nickName: user.nickName, memberId: ''});
+            });
+        }
+    },
+    methods: {
+        doClose() {
+            this.dialogVisible = false;
+        },
+        doShow() {
+            const playerList = JSON.parse(this.trainingDetail.playerIdJson);
+            const memberData = this.$store.state.training.memberData;
+            const activeTrainList = this.$store.state.map.activeTrainList || [];
+            const newMemberData = {};
+            playerList.forEach(playerId => {
+                newMemberData[playerId] = memberData[playerId];
+            });
+            const result = covertMemberData(activeTrainList, Object.values(newMemberData));
+            let list = [];
+            result.deviceListData.forEach(item => {
+                list = list.concat(item);
+            });
+            this.roleList = list;
+            this.dialogVisible = true;
+        },
+        commit() {
+            const list = [];
+            this.userList.forEach(user => {
+                list.push({userId: user.id, memberId: user.memberId});
+            });
+            assignUsersPlayRoles(list, this.$route.query.group).then(resp => {
+                this.$emit('startTraining');
+                this.doClose();
+            }).catch(() => {
+                this.$message.error('扮演角色失败！');
+            });
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/designPlatform/testRunplan.vue b/src/views/designPlatform/testRunplan.vue
index b446bfea1..bad23871c 100644
--- a/src/views/designPlatform/testRunplan.vue
+++ b/src/views/designPlatform/testRunplan.vue
@@ -23,7 +23,6 @@ import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 import { getToken } from '@/utils/auth';
 import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
 export default {
     name:'TestRunplan',
     components: {
@@ -142,8 +141,7 @@ export default {
             if (resp && resp.code == 200 && resp.data) {
                 if (!resp.data.dataError) {
                     this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); // 是否暂停判断
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
-                    // this.$store.dispatch('training/countTime');
+                    this.$store.dispatch('training/setInitTime', resp.data.systemTime);
                     this.planRunning = resp.data.planRunning;
                     if (resp.data.planRunning) {
                         this.$store.commit('training/start');
@@ -159,7 +157,8 @@ export default {
                 time: model.initTime
             };
             ranAsPlan(data, this.group).then(res => {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+                // this.$store.dispatch('training/setInitTime', model.initTime);
+                this.$store.dispatch('training/setInitTime', model.timestamp);
             }).catch(error => {
                 if (error.code == '5001') {
                     this.$messageBox(this.$t('error.mapDataError') + ',' + this.$t('error.startSimulationFailed'));
diff --git a/src/views/designPlatform/trainingDesign.vue b/src/views/designPlatform/trainingDesign.vue
index a11058c73..697e0505e 100644
--- a/src/views/designPlatform/trainingDesign.vue
+++ b/src/views/designPlatform/trainingDesign.vue
@@ -1,46 +1,48 @@
 <template>
   <div class="train">
-    <div v-show="maskOpen" class="trainMask" />
-    <jlmap-visual ref="jlmapVisual" />
     <menu-demon ref="menuDemon" />
-    <voice-chat-box v-if="$route.query.lineCode == '16'" ref="chatbox" :group="group" :user-role="userRole" />
-    <chat-box v-else ref="chatbox" :group="group" :user-role="userRole" />
+    <training-jlmap refs="trainingJlmap" />
+    <training-tip ref="trainingTip" />
+    <training-position-tip ref="trainingPositionTip" />
+    <training-menu v-if="trainingDetail" ref="trainingMenu" :offset-bottom="offsetBottom" />
     <div class="trainBack">
       <el-button-group>
-        <el-button type="primary" @click="back">返回</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 type="primary" size="small" @click="back">返回</el-button>
       </el-button-group>
     </div>
   </div>
 </template>
 <script>
-import JlmapVisual from '@/views/newMap/jlmapNew/index';
-import {loadMapDataById } from '@/utils/loaddata';
-import { clearSimulation } from '@/api/simulation';
-import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
-import { getToken } from '@/utils/auth';
-import chatBox from '@/views/newMap/chatView/chatBox.vue';
-import VoiceChatBox from '@/views/newMap/chatView/voiceChatBox.vue';
+import { clearSimulation, executeScriptNew, simulationPause, exitRunPlan } from '@/api/simulation';
+import { endTrainingStep } from '@/api/jmap/training';
+import TrainingJlmap from './trainingJlmap';
 import MenuDemon from '@/views/trainingManage/demonMenu.vue';
+import TrainingTip from './trainingTip';
+import TrainingPositionTip from './trainingPositionTip';
+import TrainingMenu from './trainingMenu';
+
 export default {
     name: 'TrainingDesign',
     components: {
-        JlmapVisual,
         MenuDemon,
-        chatBox,
-        VoiceChatBox
-    },
-    props: {
-        widthLeft: {
-            type: Number,
-            default: 0
-        }
+        TrainingTip,
+        TrainingJlmap,
+        TrainingPositionTip,
+        TrainingMenu
     },
     data() {
         return {
-            maskOpen: false
+            loading: false,
+            offsetBottom: 50
         };
     },
     computed: {
+        record() { // 编制
+            return this.$route.query.record;
+        },
         mapId() {
             return this.$route.query.mapId;
         },
@@ -53,93 +55,97 @@ export default {
         group() {
             return this.$route.query.group;
         },
-        userRole() {
-            let role = 'AUDIENCE';
-            switch (this.$store.state.training.prdType) {
-            case '02': { role = 'DISPATCHER'; break; }
-            case '01': { role = 'STATION_SUPERVISOR'; break; }
-            case '04': { role = 'DRIVER'; break; }
-            case '05': { role = 'DEPOT_DISPATCHER'; break; }
-            default: { role = 'AUDIENCE'; break; }
-            }
-            return role;
+        teachMode() {
+            return 'TEACHING_MODE';
+        },
+        trainingSwitch() {
+            return this.$store.state.trainingNew.trainingSwitch;
+        },
+        trainingDetail() {
+            return this.$store.state.trainingNew.trainingDetail;
+        },
+        isPause() {
+            return this.$store.state.trainingNew.simulationPause;
         }
     },
     watch: {
-        $route() {
-            this.$nextTick(() => {
-                this.initLoadData();
-            });
-        },
-        '$store.state.app.windowSizeCount': function() { // 窗口缩放
-            this.setWindowSize();
-        },
-        '$store.state.map.mapViewLoadedCount':function() {
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            if (this.$route.query.group && !this.$route.path.includes('displayIscs')) {
-                this.subscribe();
-            }
-        },
-        '$store.state.socket.equipmentStatus': function (val) {
-            if (val.length && this.$route.query.group) {
-                this.statusMessage(val);
-            }
-        },
-        '$store.state.socket.simulationOver':function(val) {
-            this.backOut();
+        '$store.state.trainingNew.stepOverCount': function(val) {
+            this.nextStep();
         }
     },
-    async beforeDestroy() {
-        await this.$store.dispatch('map/mapClear');
-        this.$store.dispatch('training/setPrdType', '');
+    beforeDestroy() {
+        this.$store.dispatch('socket/clearTrainingOverCount');
+        this.$store.dispatch('trainingNew/clearStepOverCount');
+        this.$store.dispatch('trainingNew/setTrainingDetail', null);
+        this.$store.dispatch('trainingNew/trainingEnd');
+        this.$store.dispatch('trainingNew/clearStepOrder');
+        this.$store.dispatch('trainingNew/clearOperateOrder');
+        this.$store.dispatch('trainingNew/changeTeachMode', '');
+        this.$store.dispatch('trainingNew/setSimulationPause', false);
     },
     mounted() {
-        this.$store.dispatch('training/setPrdType', '01');
-        this.setWindowSize();
-        this.initLoadData();
+        this.handleOffsetBottom();
     },
     methods: {
-        initLoadData() { // 加载地图数据
-            if (this.$route.query.group) {
-                loadMapDataById(this.mapId, 'simulation');
-            } else {
-                this.$store.dispatch('training/changeMode', { mode: null });
-                loadMapDataById(this.mapId, 'preview');
-            }
+        handleOffsetBottom() {
+            setTimeout(() => {
+                const menuBottom = document.getElementById('menuButtons_box');
+                const buttonWidth = this.width - 1200;
+                const tipInfoBox = document.getElementById('tipInfoBox');
+                if (menuBottom && buttonWidth < 780) {
+                    this.offsetBottom = (menuBottom.offsetHeight || 0) + 15;
+                }
+                if (tipInfoBox) {
+                    this.offsetBottom += tipInfoBox.offsetHeight;
+                }
+            }, 500);
         },
-        async statusMessage(list) {
-            await this.$store.dispatch('training/updateMapState', list);
-            await this.$store.dispatch('socket/setEquipmentStatus');
+        init() {
+            this.loading = true;
+            exitRunPlan(this.group).then(() => {
+                this.$store.dispatch('training/over').then(() => {
+                    this.$store.dispatch('training/setMapDefaultState').then(() => {
+                        this.$store.dispatch('map/clearJlmapTrainView');
+                        this.$store.dispatch('map/resetActiveTrainList', false);
+                        this.$store.dispatch('map/setTrainWindowShow', false);
+                        this.$store.dispatch('map/initSimulationButton');
+                    });
+                });
+                setTimeout(() => {
+                    this.loading = false;
+                }, 1500);
+            }).catch(() => {
+                this.loading = false;
+                this.$messageBox(this.$t('display.demon.endSimulationFail'));
+            });
         },
-        setWindowSize() {
-            const width = this.width;
-            const height = this.height;
-            this.$store.dispatch('config/resize', { width, height });
+        pauseScript() {
+            simulationPause(this.group).then(resp => {
+                this.$store.dispatch('trainingNew/setSimulationPause', true);
+            }).catch(() => {
+                this.$messageBox(this.$t('scriptRecord.pauseFail'));
+            });
+        },
+        executePlayScript() {
+            executeScriptNew(this.group).then(resp => {
+                this.$store.dispatch('trainingNew/setSimulationPause', false);
+            }).catch(() => {
+                this.$messageBox(this.$t('scriptRecord.recoverFail'));
+            });
         },
         async back() {
             if (this.$route.query.group) {
                 await clearSimulation(this.$route.query.group);
-                this.clearSubscribe();
             }
-            this.$store.dispatch('training/over').then(() => {
-                history.go(-1);
+        },
+        nextStep() {
+            const stepList = JSON.parse(this.$store.state.trainingNew.trainingDetail.stepJson);
+            const index = this.$store.state.trainingNew.stepOrder - 1 >= 0 ? this.$store.state.trainingNew.stepOrder - 1 : 0;
+            const step = stepList[index];
+            endTrainingStep(this.group, step.id).then(resp => {
+            }).catch(() => {
+                this.$message.error('进入下一步实训失败！');
             });
-        },
-        backOut() {
-            if (this.$route.query.projectDevice) {
-                this.$store.dispatch('LogOut').then(() => {
-                    location.reload();
-                });
-            }
-        },
-        async subscribe() {
-            this.clearSubscribe();
-            const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
-            creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
-            // await this.$store.dispatch('training/setHasSubscribed');
-        },
-        clearSubscribe() {
-            clearSubscribe(`${displayTopic}\/${this.$route.query.group}`);
         }
     }
 };
@@ -167,4 +173,5 @@ export default {
         bottom: 15px;
 		z-index: 19;
     }
+
 </style>
diff --git a/src/views/designPlatform/trainingJlmap.vue b/src/views/designPlatform/trainingJlmap.vue
new file mode 100644
index 000000000..2bc8ad917
--- /dev/null
+++ b/src/views/designPlatform/trainingJlmap.vue
@@ -0,0 +1,704 @@
+<template>
+  <div class="train">
+    <div v-show="maskOpen || prdType == '02'" class="trainMask" />
+    <component :is="menus" v-show="prdType !== '02'" :selected="selected" />
+    <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="onContextmenu" />
+    <voice-chat-box v-if="lineCode == '16'" ref="chatbox" :group="group" :user-role="userRole" />
+    <chat-box v-else ref="chatbox" :group="group" :user-role="userRole" />
+    <div v-if="lineCode === '16'" v-show="prdType === '02'" style="position:absolute;width: 100%;top:0;left:0;z-index:10">
+      <dispatcher-station ref="dispatcherStation" />
+    </div>
+    <div class="fault-button">
+      <el-button-group>
+        <el-button v-if="lineCode === '16' && project !== 'teaching' && prdType === '01' " :id="goCTCDom.domId" size="small" @click="goCtc">车务终端</el-button>
+        <el-button v-if="lineCode === '16' && project !== 'teaching' && prdType === '01'" :id="goRpManageDom.domId" size="small" @click="goRpManage">车务管理终端</el-button>
+        <el-button v-if="lineCode ==='16' && prdType === '01'" :id="trainTicketDom.domId" size="small" @click="showTrainTicket">路票</el-button>
+        <el-button v-if="showRegisterBookBtn" :id="registerBookDom.domId" size="small" @click="showRegisterBook">簿册</el-button>
+      </el-button-group>
+      <el-button :id="faultModeDom.domId" size="small" :type="faultMode ? '':'primary' " @click="changeOperateMode()">{{ faultMode?'切换到普通模式':'切换到故障模式' }}</el-button>
+    </div>
+    <train-ticket ref="trainTicket" />
+    <register-book ref="registerBook" />
+  </div>
+</template>
+<script>
+import JlmapVisual from '@/views/newMap/jlmapNew/index';
+import {loadMapDataById } from '@/utils/loaddata';
+import { clearSimulation } from '@/api/simulation';
+import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
+import { getToken, getSessionStorage } from '@/utils/auth';
+import chatBox from '@/views/newMap/chatView/chatBox.vue';
+import VoiceChatBox from '@/views/newMap/chatView/voiceChatBox.vue';
+import { getDeviceMenuByDeviceType, MouseEvent } from '@/scripts/ConstDic';
+import deviceType from '@/jmapNew/constant/deviceType.js';
+import { EventBus } from '@/scripts/event-bus';
+import { getSimulationMemberList, getAllSimulationUser } from '@/api/simulation';
+import { getMemberListCommon, getUserListCommon } from '@/api/rtSimulation';
+import Vue from 'vue';
+import {mapGetters} from 'vuex';
+import { OperateMode } from '@/scripts/ConstDic';
+import TrainTicket from '@/views/newMap/trainTicket/index.vue';
+import RegisterBook from '@/views/newMap/registerBook/index';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import DispatcherStation from '@/views/newMap/jointTrainingNew/dispatcherStation.vue';
+
+export default {
+    name: 'TrainingDesign',
+    components: {
+        JlmapVisual,
+        chatBox,
+        VoiceChatBox,
+        TrainTicket,
+        RegisterBook,
+        DispatcherStation
+    },
+    data() {
+        return {
+            selected: null,
+            menus: null,
+            maskOpen: false,
+            centralizedstationList: [],
+            centralizedStationMap: {},
+            userRole: '',
+            deviceCode: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map',
+            'bigScreenConfig',
+            'stationList',
+            'sectionList',
+            'signalList',
+            'trainList',
+            'trainWindowList'
+        ]),
+        goCTCDom() {
+            return OperationEvent.TrainingDesign.menuButton.goCtc;
+        },
+        goRpManageDom() {
+            return OperationEvent.TrainingDesign.menuButton.goRpManage;
+        },
+        trainTicketDom() {
+            return OperationEvent.TrainingDesign.menuButton.trainTicket;
+        },
+        registerBookDom() {
+            return OperationEvent.TrainingDesign.menuButton.registerBook;
+        },
+        faultModeDom() {
+            return OperationEvent.TrainingDesign.menuButton.faultMode;
+        },
+        prdType() {
+            return this.$store.state.training.prdType;
+        },
+        lineCode() {
+            return this.$route.query.lineCode;
+        },
+        showRegisterBookBtn() {
+            const roleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_SIGNALER', 'STATION_SWITCH_MAN', 'STATION_MASTER', 'STATION_WORKER', 'DEVICE_MANAGER'];
+            return this.$route.query.lineCode === '16' && roleList.includes(this.$store.state.training.userRole);
+        },
+        faultMode() {
+            return this.$store.state.training.operatemode === OperateMode.FAULT;
+        },
+        project() {
+            return getSessionStorage('project');
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        },
+        width() {
+            return this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height;
+        },
+        group() {
+            return this.$route.query.group;
+        },
+        userId() {
+            return this.$store.state.user.id;
+        }
+    },
+    watch: {
+        $route() {
+            this.$nextTick(() => {
+                this.initLoadData();
+            });
+        },
+        '$store.state.socket.trainingReloadCount': function () {
+            if (this.$store.state.trainingNew.trainingDetail && this.$store.state.trainingNew.trainingDetail.type === 'SCENE') {
+                this.initMemberUserInfo();
+            }
+        },
+        '$store.state.app.windowSizeCount': function() { // 窗口缩放
+            this.setWindowSize();
+        },
+        '$store.state.map.mapViewLoadedCount':function() {
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            if (this.$route.query.group && !this.$route.path.includes('displayIscs')) {
+                this.subscribe();
+            }
+        },
+        '$store.state.socket.equipmentStatus': function (val) {
+            if (val.length && this.$route.query.group) {
+                this.statusMessage(val);
+            }
+        },
+        '$store.state.socket.simulationOver':function(val) {
+            this.back();
+        },
+        '$store.state.map.mapDataLoadedCount': function () {
+            const lineCode = this.$jlmap.lineCode;
+            if (lineCode) {
+                this.menus = this.$theme.loadMenuComponent(lineCode);
+                this.$store.commit('training/notifyGetCommandDefinition', lineCode);
+            }
+            this.initMemberUserInfo();
+        },
+        '$store.state.map.map': function (map) {
+            if (map) {
+                this.setCentralizedstationList(map); // 获取集中站列表
+            }
+        },
+        '$store.state.socket.simulationRoleList':function(list) {
+            if (list && list.length) { // 人员变化监控
+                this.$store.dispatch('training/updateMemberAndUser', { simulationUserList: list, userId: this.userId });
+                this.checkRoleChange(list);
+            }
+        },
+        '$store.state.socket.memberChangeCount': function () { // 仿真成员变更
+            this.initMemberUserInfo();
+        }
+    },
+    async beforeDestroy() {
+        await this.$store.dispatch('map/mapClear');
+        this.$store.dispatch('training/setPrdType', '');
+    },
+    mounted() {
+        this.$store.dispatch('training/setPrdType', '01');
+        this.setWindowSize();
+        this.initLoadData();
+    },
+    methods: {
+        changeOperateMode() {
+            let mode = OperateMode.FAULT;
+            if (this.faultMode) {
+                mode = OperateMode.NORMAL;
+            }
+            this.$store.dispatch('training/changeOperateMode', { mode: mode });
+            const operate = {
+                operation: this.faultModeDom.operation,
+                param: { mode: mode },
+                userOperationType: 'leftClick'
+            };
+            this.$store.dispatch('training/nextNew', operate);
+        },
+        goCtc() {
+            const operate = {
+                operation: this.goCTCDom.operation,
+                userOperationType: 'leftClick'
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    const routeData = this.$router.resolve({
+                        path:'/displayNew/demon',
+                        query:{
+                            lineCode:this.$route.query.lineCode,
+                            group: this.$route.query.group,
+                            prdType: '01',
+                            mapId:this.$route.query.mapId,
+                            project: this.project,
+                            newApi: false,
+                            ctc: true,
+                            try: this.$route.query.try || 0,
+                            token: getToken(),
+                            noPreLogout: true
+                        }
+                    });
+                    window.open(routeData.href, '_blank');
+                }
+            });
+        },
+        goRpManage() {
+            const operate = {
+                operation: this.goRpManageDom.operation,
+                userOperationType: 'leftClick'
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    const routeData = this.$router.resolve({
+                        path:'/bigTrainRunplanManage',
+                        query:{
+                            group: this.$route.query.group,
+                            mapId:this.$route.query.mapId,
+                            project: this.project,
+                            prdType: this.prdType,
+                            lineCode:this.$route.query.lineCode,
+                            // stationCode:this.$store.state.training.roleDeviceCode,
+                            // token:getToken(),
+                            noPreLogout: true
+                        }
+                    });
+                    window.open(routeData.href, '_blank');
+                }
+            });
+        },
+        showTrainTicket() {
+            const operate = {
+                operation: this.trainTicketDom.operation,
+                userOperationType: 'leftClick'
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    const stationSupervisorList = [];
+                    for (const memberId in this.$store.state.training.memberData) {
+                        const item = this.$store.state.training.memberData[memberId];
+                        if (item.type === 'STATION_SUPERVISOR') {
+                            const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
+                            const memberData = { labelName: '值班员-' + device.name + (item.name ? `-${item.name }` : ''), id:item.id, userId:item.userId };
+                            stationSupervisorList.push(memberData);
+                        }
+                    }
+                    EventBus.$emit('trainTicketMember', stationSupervisorList);
+                    this.$refs.trainTicket.doShow();
+                }
+            });
+        },
+        showRegisterBook() {
+            const operate = {
+                operation: this.registerBookDom.operation,
+                userOperationType: 'leftClick'
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$refs.registerBook.doShow();
+                }
+            });
+        },
+        // 获取设备数据
+        getDeviceByEm(em) {
+            var device = this.$store.getters['map/getDeviceByCode'](em.deviceCode) || null;
+            if (device) {
+                device._viewVal = em.val;
+            }
+            return device;
+        },
+        // 根据皮肤类型转换激活的菜单类型
+        getSelectedByLineCode(device) {
+            const switchSectionIsWitchLineCodeList = ['03'];
+            const lineCode = this.$store.getters['map/lineCode'];
+            if (switchSectionIsWitchLineCodeList.includes(lineCode) && device._type == deviceType.Section) {
+                const section = this.$store.getters['map/getDeviceByCode'](device._code);
+                if (section) {
+                    device = this.$store.getters['map/getDeviceByCode'](section.relSwitchCode);
+                }
+            }
+            // 过滤道岔相关区段变成道岔model
+            if (device._type == 'Section' && device.type == '03') {
+                device = this.$store.getters['map/getDeviceByCode'](device.switch.code);
+            }
+
+            return device;
+        },
+        clickEvent(em) {
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            var device = { _type: em.deviceType, _code: em.deviceCode, _event: MouseEvent.Left };
+
+            const lineCode = this.$store.getters['map/lineCode'];
+            if (em.deviceType === 'StationStand' && lineCode === '01') {
+                const menu = getDeviceMenuByDeviceType(device._type) || [];
+                this.$store.dispatch('menuOperation/setPopMenu', { position: { x: em.clientX, y: em.clientY }, menu: menu });
+            }
+
+            if (em.deviceCode) {
+                device = this.getDeviceByEm(em);
+            }
+            this.selected = { ...device, _event: MouseEvent.Left };
+            this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
+            this.$store.dispatch('menuOperation/setLeftClickCount');
+            if (this.$route.query.lineCode == '07') {
+                this.$store.dispatch('menuOperation/setMenuChange', {device: device, subType: em.subType});
+            }
+            this.$store.dispatch('training/emitTipFresh');
+            if (this.$store.state.map.selectDevice && this.$store.state.map.selectDevice.flag && device._type) {
+                if (device._type.toUpperCase() == this.$store.state.map.selectDevice.type.toUpperCase()) {
+                    EventBus.$emit('selectDevice', device);
+                } else {
+                    const name = this.typeObj[this.$store.state.map.selectDevice.type];
+                    const info = '选择的设备类型不正确' + (name ? `，请选择${name}类型` : '');
+                    this.$message.info(info);
+                }
+            }
+
+        },
+        onContextmenu(em) {
+            var menu = null;
+            var device = null;
+            const point = { x: em.clientX, y: em.clientY };
+            const lineCode = this.$store.getters['map/lineCode'];
+            if (em.subType === 'TrainWindow') {
+                if (lineCode != '06') {
+                    device = { _type: deviceType.TrainWindow, code: em.deviceCode, _event: MouseEvent.Right };
+                    this.$store.dispatch('map/setTrainWindowShow', true);
+                }
+            } else if (em.subType == 'button' && em.deviceType == 'Station') { // 宁波一号线右键显示控制模式
+                const equipment = this.getDeviceByEm(em);
+                this.$store.dispatch('menuOperation/setSelected', {device:equipment, subType: em.subType});
+                menu = getDeviceMenuByDeviceType('StationControl');
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                this.$store.dispatch('training/emitTipFresh');
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                return;
+            } else if (em.subType == 'light' && em.deviceType == 'Station') { // 宁波一号线右键显示强制点灯
+                const equipment = this.getDeviceByEm(em);
+                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
+                menu = getDeviceMenuByDeviceType('StationLight');
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                this.$store.dispatch('training/emitTipFresh');
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                return;
+            } else if (em.subType == 'preReset' && em.deviceType == 'Station') { // 宁波一号线右键显示计轴复位
+                const equipment = this.getDeviceByEm(em);
+                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
+                menu = getDeviceMenuByDeviceType('StationPreReset');
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                this.$store.dispatch('training/emitTipFresh');
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                return;
+            } else if (em.subType == 'enabled' && em.deviceType == 'Switch') {
+                menu = getDeviceMenuByDeviceType('Enabled');
+                const equipment = this.getDeviceByEm(em);
+                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                return;
+            } else if (em.subType === 'enabled' && em.deviceType === 'Signal') {
+                menu = getDeviceMenuByDeviceType('Enabled');
+                const equipment = this.getDeviceByEm(em);
+                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu});
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                return;
+            } else if (em.deviceCode && !this.isScreen) {
+                device = this.getDeviceByEm(em);
+            }
+            if (device) {
+                device = this.getSelectedByLineCode(device);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                if (!this.buttonOperation) {
+                    this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
+                    if (!this.checkShouldPop(device)) {
+                        this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: null });
+                    } else {
+                        if (em.deviceType === 'StationStand' && lineCode === '01') {
+                            return;
+                        }
+                        menu = getDeviceMenuByDeviceType(device._type);
+                        this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                    }
+                } else if (this.$route.query.ctc) {
+                    this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
+                    menu = getDeviceMenuByDeviceType(device._type);
+                    this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                }
+            } else {
+                menu = getDeviceMenuByDeviceType('Cancel');
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+            }
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        checkShouldPop(device) {
+            const lineCode = this.$store.getters['map/lineCode'];
+            if (device) {
+                if (device._type === 'Signal') {
+                    return device._viewVal === '3';
+                } else if (device._type === 'StationControl' && lineCode == '01') { // 中控模式显示范围
+                    return device._viewVal === '1';
+                } else {
+                    return true;
+                }
+            }
+        },
+        initLoadData() { // 加载地图数据
+            if (this.$route.query.group) {
+                loadMapDataById(this.mapId, 'simulation');
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 结束加载状态
+        endViewLoading(isSuccess) {
+            if (!isSuccess) {
+                this.$store.dispatch('map/mapClear');
+            }
+
+            this.$nextTick(() => {
+                EventBus.$emit('viewLoading', false);
+            });
+        },
+        async statusMessage(list) {
+            await this.$store.dispatch('training/updateMapState', list);
+            await this.$store.dispatch('socket/setEquipmentStatus');
+        },
+        setWindowSize() {
+            const width = this.width;
+            const height = this.height;
+            this.$store.dispatch('config/resize', { width, height });
+        },
+        async back() {
+            if (this.$route.query.group) {
+                await clearSimulation(this.$route.query.group);
+                this.clearSubscribe();
+            }
+            this.$store.dispatch('training/over').then(() => {
+                history.go(-1);
+            });
+        },
+        subscribe() {
+            // this.clearSubscribe();
+            const topic = `${displayTopic}\/${this.$route.query.group}`;
+            const subscription = this.$stomp.subscribeMap.get(topic);
+            if (!subscription || !subscription.sub) {
+                const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
+                creatSubscribe(topic, header);
+            }
+
+        },
+        clearSubscribe() {
+            clearSubscribe(`${displayTopic}\/${this.$route.query.group}`);
+        },
+        setCentralizedstationList(map) {
+            this.centralizedstationList = [];
+            (map.stationList || []).forEach(item => {
+                if (item.centralized) {
+                    this.centralizedstationList.push({value: item.code, name: item.name});
+                    this.centralizedStationMap[item.code] = item.code;
+                    item.chargeStationCodeList && item.chargeStationCodeList.length && item.chargeStationCodeList.forEach(ele => {
+                        this.centralizedStationMap[ele] = item.code;
+                    });
+                }
+            });
+        },
+        checkRoleChange(data) {
+            data.forEach(item => {
+                if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId) {
+                    this.userRole = item.type || 'AUDIENCE';
+                    this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
+                    this.$store.dispatch('training/setUserRole', this.userRole);
+                    this.deviceCode = item.deviceCode;
+                    this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]);
+                }
+            });
+        }, // 设置prdType和role
+        setSimulationPrdType(deviceCode) {
+            // Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号
+            let tempData;
+            let dataZoom;
+            switch (this.userRole) {
+            case 'DISPATCHER':
+                this.$store.dispatch('training/setPrdType', '02');
+                this.$store.dispatch('training/setRoles', 'DISPATCHER');
+                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                this.setShowStation('');
+                break;
+            case 'STATION_SUPERVISOR':
+                if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
+                this.$store.dispatch('training/setPrdType', '01');
+                this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
+                this.stationRoleShow(deviceCode);
+                break;
+            case 'STATION_ASSISTANT':
+                if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
+                this.$store.dispatch('training/setPrdType', '01');
+                this.$store.dispatch('training/setRoles', 'STATION_ASSISTANT');
+                this.stationRoleShow(deviceCode);
+                break;
+            case 'STATION_SIGNALER': // 车站信号员
+                if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
+                this.$store.dispatch('training/setPrdType', '01');
+                this.$store.dispatch('training/setRoles', 'STATION_SIGNALER');
+                this.stationRoleShow(deviceCode);
+                break;
+            case 'STATION_SWITCH_MAN': // 车站扳道员
+                if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
+                this.$store.dispatch('training/setPrdType', '01');
+                this.$store.dispatch('training/setRoles', 'STATION_SWITCH_MAN');
+                this.stationRoleShow(deviceCode);
+                break;
+            case 'DEPOT_DISPATCHER':
+                this.$store.dispatch('training/setPrdType', '09');
+                this.$store.dispatch('training/setRoles', 'DEPOT_DISPATCHER');
+                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                if (this.mapViewLoadedOver) {
+                    const showStation = this.centralizedStationMap[deviceCode];
+                    const list = [];
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    for (const key in mapDevice) {
+                        list.push(mapDevice[key]);
+                    }
+                    this.$jlmap.updateShowStation(list, showStation);
+                }
+                tempData = this.$store.state.map.map.displayList.find(item => { return item.stationCodeList.includes(deviceCode); });
+                dataZoom = { offsetX: tempData.offsetX, offsetY: tempData.offsetY, scaleRate: tempData.scaleRate };
+                this.$store.commit('map/setDataZoom', dataZoom);
+                this.$jlmap.setDepot(dataZoom);
+                break;
+            case 'DRIVER':
+                this.$store.dispatch('training/setPrdType', '04');
+                this.$store.dispatch('training/setRoles', 'DRIVER');
+                this.setShowStation('');
+                break;
+            case 'MAINTAINER':
+                this.$store.dispatch('training/setPrdType', '');
+                this.$store.dispatch('training/setRoles', 'MAINTAINER');
+                this.setShowStation('');
+                break;
+            case 'RAIL_CTC':
+                this.$store.dispatch('training/setPrdType', '10');
+                this.$store.dispatch('training/setRoles', 'RAIL_CTC');
+                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                this.setShowStation(deviceCode);
+                break;
+            default:
+                this.$store.dispatch('training/setPrdType', '');
+                this.$store.dispatch('training/setRoles', 'AUDIENCE');
+                this.setShowStation('');
+            }
+            if (this.$route.query.type === 'ILW') {
+                this.$store.dispatch('training/setPrdType', '');
+                this.$store.dispatch('training/setRoles', 'AUDIENCE');
+            }
+        },
+        stationRoleShow(deviceCode) {
+            if (this.lineCode === '14') {
+                const list = [];
+                const mapDevice = this.$store.state.map.mapDevice;
+                this.$jlmap.setMap(this.$store.state.map.map, this.$store.state.map.mapDevice, {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData});
+                for (const key in mapDevice) {
+                    list.push(mapDevice[key]);
+                }
+                this.$jlmap.updateShowMode(list, '02');
+            }
+            if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === deviceCode && picture.type === 'chainStation');
+                if (picture) {
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    const list = [];
+                    const deviceList = [];
+                    for (const key in mapDevice) {
+                        list.push(mapDevice[key]);
+                        deviceList.push(key);
+                    }
+                    this.$jlmap.updateShowStation(list, '');
+                    this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                    this.$jlmap.updatePicture(deviceList);
+                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                    this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[deviceCode]);
+                } else {
+                    this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                    this.setShowStation(deviceCode);
+                }
+            } else {
+                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                this.setShowStation(deviceCode);
+            }
+        },
+        setShowStation(stationCode) {
+            const showStation = this.centralizedStationMap[stationCode];
+            const list = [];
+            const mapDevice = this.$store.state.map.mapDevice;
+            for (const key in mapDevice) {
+                list.push(mapDevice[key]);
+            }
+            this.$jlmap.updateShowStation(list, showStation);
+            this.$jlmap.setCenter(showStation);
+        },
+        async getTrainDetail() {
+            try {
+                await loadMapDataById(this.mapId, 'Group');
+                await this.$store.dispatch('training/setMapDefaultState');
+            } catch (error) {
+                this.$messageBox(this.$t('error.getMapDataFailed'));
+                this.endViewLoading();
+            }
+        },
+        initMemberUserInfo() {
+            if (this.$route.query.newApi + '' === 'true') {
+                getMemberListCommon(this.group).then(resp => {
+                    this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.userId });
+                    const member = resp.data.find(elem => elem.userId == this.userId);
+                    if (member) {
+                        this.userRole = member.type || 'AUDIENCE';
+                        this.$store.dispatch('training/setRoleDeviceCode', member.deviceCode);
+                        this.$store.dispatch('training/setUserRole', this.userRole);
+                        this.deviceCode = member.deviceCode;
+                        this.setSimulationPrdType(this.centralizedStationMap[member.deviceCode]);
+                    }
+                    getUserListCommon(this.group).then(res => {
+                        this.$store.dispatch('training/setSimulationUserList', res.data);
+                    }).catch(() => {
+                        this.$messageBox('获取所有仿真用户失败！');
+                    });
+                }).catch(() => {
+                    this.$messageBox('获取仿真成员列表失败！');
+                });
+            } else {
+                // 获取仿真成员列表
+                getSimulationMemberList(this.group).then(resp => {
+                    this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.userId });
+                    const member = resp.data.find(elem => elem.userId == this.userId);
+                    if (member) {
+                        this.userRole = member.type || 'AUDIENCE';
+                        this.$store.dispatch('training/setRoleDeviceCode', member.deviceCode);
+                        this.$store.dispatch('training/setUserRole', this.userRole);
+                        this.deviceCode = member.deviceCode;
+                        this.setSimulationPrdType(this.centralizedStationMap[member.deviceCode]);
+                    }
+                    getAllSimulationUser(this.group).then(res => {
+                        this.$store.dispatch('training/setSimulationUserList', res.data);
+                    }).catch(() => {
+                        this.$messageBox('获取所有仿真用户失败！');
+                    });
+                }).catch(() => {
+                    this.$messageBox('获取仿真成员列表失败！');
+                });
+            }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.train {
+	width: 100%;
+	overflow: hidden;
+	position: relative;
+}
+.trainMask{
+	opacity: 1;
+	background: #000;
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 9;
+}
+.trainBack {
+	position: absolute;
+	float: right;
+	right: 15px;
+	bottom: 15px;
+	z-index: 19;
+}
+.fault-button{
+	position: absolute;
+	top: 15px;
+	right: 10px;
+}
+</style>
diff --git a/src/views/designPlatform/trainingList.vue b/src/views/designPlatform/trainingList.vue
index bbca1a900..250e38ba4 100644
--- a/src/views/designPlatform/trainingList.vue
+++ b/src/views/designPlatform/trainingList.vue
@@ -5,17 +5,20 @@
         <div style="margin-bottom: 10px;font-size: 16px;">{{ `当前实训名称：${training.name || ''}` }}</div>
         <div style="font-size: 16px;">{{ `当前实训描述：${training.description || ''}` }}</div>
       </el-card>
-      <div class="trainingHeader">
-        <div class="trainingList">实训列表</div>
-        <div class="flexNull" />
-      </div>
-      <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="单操实训" name="first">
+          <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+        </el-tab-pane>
+        <el-tab-pane label="场景实训" name="second">
+          <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryListScene" />
+        </el-tab-pane>
+      </el-tabs>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getPublishSingleList, getPublishTrainingDetail, loadPublishTraining } from '@/api/jmap/training';
+import { getPublishSingleList, getPublishTrainingDetail, loadPublishTraining, getPublishScenesList } from '@/api/jmap/training';
 import Cookies from 'js-cookie';
 import ConstConfig from '@/scripts/ConstConfig';
 
@@ -27,6 +30,7 @@ export default {
     data() {
         return {
             dialogVisible: false,
+            activeName: 'first',
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -37,11 +41,61 @@ export default {
                 reset: true,
                 show:false
             },
+            prdTypeMap: {
+                DISPATCHER: '02',
+                STATION_SUPERVISOR: '01',
+                STATION_ASSISTANT: '01',
+                DEPOT_DISPATCHER: '09',
+                DRIVER: '04',
+                RAIL_CTC: '10'
+            },
             queryList: {
                 query: this.queryFunction,
                 selectCheckShow: false,
                 paginationHiden: true,
                 indexShow: true,
+                height: 500,
+                columns: [
+                    {
+                        title: this.$t('trainingManage.name'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('trainingManage.description'),
+                        prop: 'description'
+                    },
+                    {
+                        title: this.$t('trainingManage.type'),
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return this.covertData(row); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('trainingManage.labelJson'),
+                        prop: 'labelJson'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('trainingManage.operate'),
+                        width: '150',
+                        buttons: [
+                            {
+                                name: '加载',
+                                handleClick: this.loadScript,
+                                type: 'primary',
+                                showControl:(row) => { return row.id; }
+                            }
+                        ]
+                    }
+                ]
+            },
+            queryListScene: {
+                query: this.queryFunctionScene,
+                selectCheckShow: false,
+                paginationHiden: true,
+                indexShow: true,
+                height: 500,
                 columns: [
                     {
                         title: this.$t('trainingManage.name'),
@@ -97,6 +151,9 @@ export default {
         queryFunction() {
             return getPublishSingleList(this.mapId);
         },
+        queryFunctionScene() {
+            return getPublishScenesList(this.mapId);
+        },
         doShow() {
             this.getListData();
             this.dialogVisible = true;
@@ -106,13 +163,26 @@ export default {
         },
         async loadScript(index, data) {
             if (this.trainingSwitch) {
-                this.$message.success('请先结束当前实训后再加载新的实训！');
+                this.$message.error('请先结束当前实训后再加载新的实训！');
                 return;
             }
             try {
                 const detailResp = await getPublishTrainingDetail(data.id);
                 this.training = detailResp.data;
+                if (detailResp.data.mapLocationJson) {
+                    const mapLocation = JSON.parse(detailResp.data.mapLocationJson);
+                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+                }
+                if (detailResp.data.playerIdJson) {
+                    const playerId = JSON.parse(detailResp.data.playerIdJson)[0];
+                    if (playerId) {
+                        const member = this.$store.state.training.memberData[playerId];
+                        this.$store.dispatch('training/setPrdType', this.prdTypeMap[member.type]);
+                        this.$store.dispatch('training/setRoles', member.type);
+                    }
+                }
                 this.$store.dispatch('trainingNew/setTrainingDetail', detailResp.data);
+                this.$store.dispatch('trainingNew/setTrainingScore', '');
                 await loadPublishTraining(this.group, data.id, {mode: this.teachMode});
                 this.$message.success('加载实训成功！');
             } catch (e) {
diff --git a/src/views/designPlatform/trainingMenu.vue b/src/views/designPlatform/trainingMenu.vue
new file mode 100644
index 000000000..07c6f9114
--- /dev/null
+++ b/src/views/designPlatform/trainingMenu.vue
@@ -0,0 +1,308 @@
+<template>
+  <!-- v-drag  拖拽 调整宽高 -->
+  <div v-quickMenuDrag class="reminder-drag" :style="{bottom: offsetBottom + 'px'}">
+    <div ref="drapBox" class="reminder-box">
+      <div class="tip-title">
+        <div>
+          <i v-show="isShrink" class="icon el-icon-minus" @click="shrink" />
+          <i v-show="!isShrink" class="icon el-icon-plus" @click="shrink" />
+          <i v-show="!isShrink && !trainingSwitch && trainingDetail" class="icon el-icon-video-play" @click="handlerStart" />
+          <i v-show="!isShrink && trainingSwitch" class="icon el-icon-switch-button" @click="handlerEnd" />
+        </div>
+        <p style="color: #fff;">
+          <span>{{ trainingDetail.name }}</span>
+        </p>
+      </div>
+      <div v-if="isShrink" class="reminder-box-content">
+        <div class="zhezhao" />
+        <div ref="dragBody" class="tip-body-box">
+          <div class="tip-body">
+            <el-scrollbar wrap-class="scrollbar-wrapper">
+              <p class="list-item">
+                <span class="list-label">{{ $t('display.training.trainingName') }}</span>
+                <span class="list-elem">{{ trainingDetail.name }}</span>
+              </p>
+              <p v-if="demoMode === TrainingMode.TEST" class="list-item">
+                <span class="list-label">{{ $t('display.lesson.score') }}</span>
+                <span class="list-elem">{{ trainingScore }}</span>
+              </p>
+              <p class="list-item">
+                <span class="list-label">实训模式：</span>
+                <span class="list-elem">
+                  <el-radio-group v-model="demoMode" :disabled="trainingSwitch" class="mode" size="small" @change="changeMode">
+                    <el-radio :label="TrainingMode.TEACH" border>{{ $t('display.lesson.teachingMode') }}</el-radio>
+                    <el-radio :label="TrainingMode.PRACTICE" border>{{ $t('display.lesson.practiceMode') }}</el-radio>
+                    <el-radio :label="TrainingMode.TEST" border>{{ $t('display.lesson.testMode') }}</el-radio>
+                  </el-radio-group>
+                </span>
+              </p>
+              <p class="list-item">
+                <span class="list-label" style="vertical-align: top;"> {{ $t('display.training.trainingInstructions') }}</span>
+                <span class="list-elem elem-span">{{ trainingDetail.description }}</span>
+              </p>
+              <p class="list-item">
+                <span class="list-label">操作按钮：</span>
+                <span class="list-elem">
+                  <el-button v-if="!trainingSwitch && trainingDetail" size="small" type="success" @click="handlerStart">开始</el-button>
+                  <el-button v-if="trainingSwitch" size="small" type="danger" @click="handlerEnd">结束</el-button>
+                </span>
+              </p>
+            </el-scrollbar>
+          </div>
+          <div class="drag-right" />
+          <div class="drag-left" />
+          <div class="drag-bottom" />
+          <div class="drag-top" />
+        </div>
+      </div>
+    </div>
+    <scene-play-role ref="scenePlayRole" @startTraining="startTraining" />
+  </div>
+</template>
+
+<script>
+import { ScriptMode } from '@/scripts/ConstDic';
+import { clearSimulation } from '@/api/simulation';
+import { startTraining, endTraining } from '@/api/jmap/training';
+import ScenePlayRole from './scenePlayRole';
+
+export default {
+    name: 'TipTrainingDetail',
+    components: {
+        ScenePlayRole
+    },
+    props: {
+        offsetBottom: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            isShrink: true,
+            showSumbit: false,
+            demoMode: ScriptMode.TEACH,
+            TrainingMode: ScriptMode
+        };
+    },
+    computed: {
+        trainingSwitch() {
+            return this.$store.state.trainingNew.trainingSwitch;
+        },
+        trainingScore() {
+            return this.$store.state.trainingNew.trainingScore;
+        },
+        trainingDetail() {
+            return this.$store.state.trainingNew.trainingDetail;
+        },
+        group() {
+            return this.$route.query.group;
+        },
+        teachMode() {
+            return this.$store.state.trainingNew.teachMode;
+        }
+    },
+    watch: {},
+    mounted() {
+        this.loadInitData();
+    },
+    methods: {
+        loadInitData() {
+            this.showSumbit = false;
+        },
+        shrink() {
+            if (this.isShrink) {
+                this.isShrink = false;
+            } else {
+                this.isShrink = true;
+                this.$nextTick(()=>{
+                    const dragDom = document.querySelector('.reminder-drag').style.bottom;
+                    if (document.body.clientHeight - 300 - parseInt(dragDom.replace('px', '')) < 0) {
+                        document.querySelector('.reminder-drag').style.bottom = `${document.body.clientHeight - 300}px`;
+                    }
+                });
+            }
+        },
+        changeMode(val) {
+            this.demoMode = val;
+            this.$store.dispatch('trainingNew/changeTeachMode', this.demoMode);
+        },
+        handlerStart() {
+            if (this.trainingDetail.type === 'SCENE') {
+                this.$refs.scenePlayRole.doShow();
+            } else {
+                this.startTraining();
+            }
+        },
+        startTraining() {
+            this.$store.dispatch('trainingNew/changeTeachMode', this.demoMode);
+            startTraining(this.group, {mode: this.demoMode}).then(() => {
+                this.$store.dispatch('trainingNew/trainingStart');
+                this.$store.dispatch('trainingNew/setTrainingScore', '');
+            }).catch(() => {
+                this.$message.error('开始实训失败！');
+            });
+        },
+        handlerEnd() {
+            endTraining(this.group).then((resp) => {
+                this.$store.dispatch('trainingNew/trainingEnd');
+                this.$store.dispatch('socket/clearTrainingStepTip');
+                this.$store.dispatch('trainingNew/clearStepOrder');
+                this.$store.dispatch('trainingNew/clearOperateOrder');
+                this.$store.dispatch('trainingNew/setTrainingScore', resp.data);
+            }).catch(() => {
+                this.$message.error('结束实训失败！');
+            });
+        },
+        back() {
+            if (this.group) {
+                clearSimulation(this.group);
+            }
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+@import "src/styles/mixin.scss";
+
+.tip-body-box {
+	height: 260px;
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+}
+
+.reminder-drag{
+	position: absolute;
+	bottom: 0px;
+	left: 15px;
+	z-index: 10;
+}
+
+.elem-span{
+	display:inline-block;width:77%;line-height:26px;margin-top:-4px;
+}
+
+.zhezhao{
+	width: 100%;
+	height: 100%;
+	filter: blur(8px);
+	background: rgba(255,255,255,0.9);
+	position:absolute;
+}
+.reminder-box-content{
+	width: 500px;
+	height: 260px;
+	left: 0;
+	top: 0;
+	z-index: 2;
+	background: rgba(255,255,255,0.8);
+	position: relative;
+}
+.reminder-box {
+	border-radius: 5px;
+	overflow: hidden;
+	z-index: 10;
+	font-size: 18px;
+
+	.tip-title {
+		width: 500px;
+		overflow: hidden;
+		height: 40px;
+		display: flex;
+		align-items: center;
+		flex-direction: row-reverse;
+		background-color: rgba(64, 158, 255,1);
+		border-radius: 5px 5px 0 0;
+		justify-content: space-between;
+		padding: 0 10px;
+	}
+
+	.drag-right,
+	.drag-left {
+		width: 10px;
+		cursor: e-resize;
+		background-color: yellow;
+		height: 100%;
+		position: absolute;
+		right: 0;
+		top: 0;
+		opacity: 0;
+	}
+
+	.drag-left {
+		left: 0;
+	}
+
+	.drag-bottom {
+		position: absolute;
+		bottom: 0;
+		width: 100%;
+		height: 10px;
+		cursor: s-resize;
+		background-color: yellow;
+		opacity: 0;
+	}
+
+	.drag-top {
+		position: absolute;
+		top: -45px;
+		left: 0;
+		width: 100%;
+		height: 10px;
+		cursor: s-resize;
+		background-color: yellow;
+		opacity: 0;
+	}
+
+	.tip-body {
+		height: 260px;
+		padding: 10px;
+
+		.list-label {
+			width: 105px;
+		}
+	}
+
+	.tip-foot {
+		width: 100%;
+		position: absolute;
+		right: 0px;
+		bottom: 0px;
+		background-color: #fff;
+		padding: 10px 0 10px 10px;
+
+		.foot-detail {
+			height: 100%;
+			float: right;
+			margin-top: 9px;
+			padding-right: 15px;
+		}
+
+		.foot-submit {
+			float: right;
+			margin-top: 9px;
+			padding-right: 15px;
+		}
+	}
+
+	.icon {
+		float: right;
+		margin-right: 10px;
+		cursor: pointer;
+		background-color: #f3f3f3;
+		border-radius: 50%;
+	}
+
+	/deep/ {
+		.el-tree-node__content {
+			margin-bottom: 4px;
+		}
+
+		.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+			background-color: #d6e5f7;
+		}
+	}
+}
+</style>
diff --git a/src/views/designPlatform/trainingPositionTip.vue b/src/views/designPlatform/trainingPositionTip.vue
new file mode 100644
index 000000000..0edb941ca
--- /dev/null
+++ b/src/views/designPlatform/trainingPositionTip.vue
@@ -0,0 +1,198 @@
+<template>
+  <div v-if="tipShow">
+    <pop-tip v-show="popShow" :position="position" :tip="tip" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import PopTip from './poptip';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import { getDomOffset } from '@/utils/index';
+import { ScriptMode } from '@/scripts/ConstDic';
+
+export default {
+    name: 'TrainingTips',
+    components: { PopTip },
+    data() {
+        return {
+            tipShow: false,
+            popShow: false,
+            position: {
+                x: 0,
+                y: 0
+            },
+            tip: ''
+        };
+    },
+    computed: {
+        ...mapGetters([
+            'canvasWidth',
+            'canvasHeight'
+        ]),
+        trainingDetail() {
+            return this.$store.state.trainingNew.trainingDetail;
+        },
+        teachMode() {
+            return this.$store.state.trainingNew.teachMode;
+        }
+    },
+    watch: {
+        '$store.state.socket.trainingStepTip': function(val) {
+            if (val && this.trainingDetail.type === 'SINGLE') {
+                const member = this.$store.state.training.memberData[val.memberId];
+                this.$nextTick(function() {
+                    this.$store.dispatch('trainingNew/clearOperateOrder');
+                    this.$store.dispatch('trainingNew/stepOrderIncrease');
+                    if (member.userId == this.$store.state.user.id) {
+                        this.tipInit();
+                    }
+                });
+            }
+        },
+        '$store.state.socket.trainingOverCount': function(val) {
+            this.tip = '';
+            this.popShow = false;
+            this.tipShow = false;
+            this.position = { x: 0, y: 0 };
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            this.tip = '';
+            this.popShow = false;
+            this.tipShow = false;
+            this.position = { x: 0, y: 0 };
+        }
+    },
+    methods: {
+        tipInit() {
+            if (this.teachMode === ScriptMode.TEACH) {
+                this.tipShow = true;
+                const offset = this.$store.state.config.canvasOffset;
+                const trainingDetail = this.$store.state.trainingNew.trainingDetail;
+                const stepOrder = this.$store.state.trainingNew.stepOrder;
+                const steps = JSON.parse(trainingDetail.stepJson);
+                if (steps && steps.length) {
+                    const step = steps[stepOrder - 1];
+                    const distance = 5;
+                    this.tip = this.$store.state.socket.trainingStepTip.content;
+                    if (step && step.tipPosition && step.tipPosition.deviceCode) {
+                        const position = this.getShapeTipPoint(step.tipPosition);
+                        if (position) {
+                            this.position = {
+                                x: position.x + offset.x,
+                                y: position.y + offset.y - distance
+                            };
+                            this.popTipShow();
+                        }
+                    } else if (step && step.tipPosition && step.tipPosition.domId) {
+                        const position = this.getOtherTipPoint(step.tipPosition);
+                        if (position) {
+                            this.position = position;
+                            this.position.y -= distance;
+                            this.popTipShow();
+                        }
+                    } else {
+                        this.popTipHide();
+                    }
+                } else {
+                    this.tipShow = false;
+                }
+            } else {
+                this.tipShow = false;
+            }
+        },
+        popTipShow() {
+            this.popShow = true;
+        },
+        popTipHide() {
+            this.popShow = false;
+        },
+        // 获取地图设备提示位置
+        getShapeTipPoint(tipPosition) {
+            var position = null;
+            // 单独处理 自动折返
+            const newTipPosition = Object.assign({}, tipPosition);
+            if (newTipPosition.deviceCode.includes('Cycle')) {
+                const buttonList = this.$store.state.map.map.cycleButtonList;
+                if (buttonList && buttonList.length > 0) {
+                    buttonList.forEach(element => {
+                        if (element.cycleCode == newTipPosition.code) {
+                            newTipPosition.deviceCode = element.code;
+                        }
+                    });
+                }
+            }
+            let subDeviceType = '';
+            if (newTipPosition.subType) { subDeviceType = newTipPosition.subType; } else { subDeviceType = newTipPosition.type; }
+            position = this.$jlmap.getShapeTipPoint({
+                code: newTipPosition.deviceCode,
+                subDeviceType: subDeviceType
+            });
+            if (position) {
+                if (position.x < 0) {
+                    position.x = 0;
+                }
+                if (position.x > this.canvasWidth) {
+                    position.x = this.canvasWidth;
+                }
+                if (position.y < 0) {
+                    position.y = 0;
+                }
+                if (position.y > this.canvasHeight) {
+                    position.y = this.canvasHeight;
+                }
+            }
+            return position;
+        },
+        // 获取地图菜单按钮和对话框按钮提示显示位置
+        getOtherTipPoint(tipPosition) {
+            const domId = OperationHandler.getDomIdByOperation(tipPosition.domId);
+            const btnDom = document.getElementById(domId);
+            if (btnDom) {
+                const offset = getDomOffset(btnDom);
+                if (offset.x == 0 && offset.y == 0) {
+                    return null;
+                }
+
+                let align = 'bottom';
+                if (this.tipAlignIsTop(tipPosition, domId)) {
+                    align = 'top';
+                }
+
+                return {
+                    align: align,
+                    x: offset.x + btnDom.clientWidth / 2,
+                    y: offset.y
+                };
+            }
+            return null;
+        },
+        tipAlignIsTop(step, domId) {
+            // 如果是tip框则箭头朝上
+            // if (step.type.toUpperCase() === 'bar'.toUpperCase()) {
+            //     return true;
+            // }
+            const Dom = document.getElementById(domId);
+            if (Dom.parentElement.id == 'menuButtons_box') { // 现地操作按钮提示位置判断
+                return false;
+            }
+
+            if (/{TOP}/.test(domId)) {
+                return true;
+            }
+            if (/{BOTTOM}/.test(domId)) {
+                return false;
+            }
+            // 如果domId中不含以下关键字，则箭头朝上
+            const keyList = ['choose', 'select'];
+            for (var key in keyList) {
+                if (domId.toUpperCase().indexOf(keyList[key].toUpperCase()) !== -1) {
+                    return false;
+                }
+            }
+            // 其他情况默认朝下
+            return true;
+        }
+    }
+};
+</script>
diff --git a/src/views/designPlatform/trainingPreview.vue b/src/views/designPlatform/trainingPreview.vue
index 551579c76..87b2d2ed4 100644
--- a/src/views/designPlatform/trainingPreview.vue
+++ b/src/views/designPlatform/trainingPreview.vue
@@ -1,40 +1,38 @@
 <template>
   <div class="train">
-    <div v-show="maskOpen" class="trainMask" />
-    <jlmap-visual ref="jlmapVisual" />
     <menu-demon ref="menuDemon" />
-    <voice-chat-box v-if="$route.query.lineCode == '19'" ref="chatbox" :group="group" :user-role="userRole" />
-    <chat-box v-else ref="chatbox" :group="group" :user-role="userRole" />
+    <training-jlmap refs="trainingJlmap" />
     <training-tip ref="trainingTip" />
+    <training-position-tip ref="trainingPositionTip" />
+    <!--    <scene-play-role ref="scenePlayRole" @startTraining="startTraining" />-->
+    <training-menu v-if="trainingDetail" ref="trainingMenu" :offset-bottom="offsetBottom" />
     <div class="trainBack">
       <el-button-group>
-        <el-button @click="nextStep">下一步</el-button>
-        <el-button v-if="!trainingSwitch && trainingDetail" type="success" @click="handlerStart">开始</el-button>
-        <el-button v-if="trainingSwitch" type="danger" @click="handlerEnd">结束</el-button>
+        <!--        <el-button v-if="!trainingSwitch && trainingDetail" type="success" @click="handlerStart">开始</el-button>-->
+        <!--        <el-button v-if="trainingSwitch" type="danger" @click="handlerEnd">结束</el-button>-->
         <el-button type="primary" @click="back">返回</el-button>
       </el-button-group>
     </div>
   </div>
 </template>
 <script>
-import JlmapVisual from '@/views/newMap/jlmapNew/index';
-import {loadMapDataById } from '@/utils/loaddata';
 import { clearSimulation } from '@/api/simulation';
 import { startTraining, endTraining, endTrainingStep } from '@/api/jmap/training';
-import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
-import { getToken } from '@/utils/auth';
-import chatBox from '@/views/newMap/chatView/chatBox.vue';
-import VoiceChatBox from '@/views/newMap/chatView/voiceChatBox.vue';
 import MenuDemon from './demonMenu.vue';
 import TrainingTip from './trainingTip';
+import TrainingPositionTip from './trainingPositionTip';
+import TrainingJlmap from './trainingJlmap';
+// import ScenePlayRole from './scenePlayRole';
+import TrainingMenu from './trainingMenu';
 export default {
     name: 'TrainingDesign',
     components: {
-        JlmapVisual,
         MenuDemon,
-        chatBox,
-        VoiceChatBox,
-        TrainingTip
+        TrainingTip,
+        TrainingJlmap,
+        TrainingPositionTip,
+        // ScenePlayRole,
+        TrainingMenu
     },
     props: {
         widthLeft: {
@@ -44,11 +42,12 @@ export default {
     },
     data() {
         return {
-            maskOpen: false,
-            offsetBottom: 0,
+            // maskOpen: false,
             trainingObj: null,
             starting: false,
-            stepId: 1
+            selected: null,
+            menus: null,
+            offsetBottom: 15
         };
     },
     computed: {
@@ -72,60 +71,39 @@ export default {
         },
         trainingDetail() {
             return this.$store.state.trainingNew.trainingDetail;
-        },
-        userRole() {
-            let role = 'AUDIENCE';
-            switch (this.$store.state.training.prdType) {
-            case '02': { role = 'DISPATCHER'; break; }
-            case '01': { role = 'STATION_SUPERVISOR'; break; }
-            case '04': { role = 'DRIVER'; break; }
-            case '05': { role = 'DEPOT_DISPATCHER'; break; }
-            default: { role = 'AUDIENCE'; break; }
-            }
-            return role;
         }
     },
     watch: {
-        $route() {
-            this.$nextTick(() => {
-                this.initLoadData();
-            });
-        },
-        '$store.state.app.windowSizeCount': function() { // 窗口缩放
-            this.setWindowSize();
-        },
-        '$store.state.map.mapViewLoadedCount':function() {
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            if (this.$route.query.group && !this.$route.path.includes('displayIscs')) {
-                this.subscribe();
-            }
-        },
-        '$store.state.socket.equipmentStatus': function (val) {
-            if (val.length && this.$route.query.group) {
-                this.statusMessage(val);
-            }
-        },
-        '$store.state.socket.simulationOver':function(val) {
-            this.backOut();
+        '$store.state.trainingNew.stepOverCount': function(val) {
+            this.nextStep();
         }
     },
     async beforeDestroy() {
-        await this.$store.dispatch('map/mapClear');
-        this.$store.dispatch('training/setPrdType', '');
+        this.$store.dispatch('socket/clearTrainingOverCount');
+        this.$store.dispatch('trainingNew/clearStepOverCount');
+        this.$store.dispatch('trainingNew/setTrainingDetail', null);
+        this.$store.dispatch('trainingNew/trainingEnd');
+        this.$store.dispatch('trainingNew/clearStepOrder');
+        this.$store.dispatch('trainingNew/clearOperateOrder');
+        this.$store.dispatch('trainingNew/changeTeachMode', '');
     },
     mounted() {
-        this.$store.dispatch('training/setPrdType', '01');
-        this.setWindowSize();
-        this.initLoadData();
+        this.$store.dispatch('trainingNew/setTrainingScore', '');
+        this.handleOffsetBottom();
     },
     methods: {
-        initLoadData() { // 加载地图数据
-            if (this.$route.query.group) {
-                loadMapDataById(this.mapId, 'simulation');
-            } else {
-                this.$store.dispatch('training/changeMode', { mode: null });
-                loadMapDataById(this.mapId, 'preview');
-            }
+        handleOffsetBottom() {
+            setTimeout(() => {
+                const menuBottom = document.getElementById('menuButtons_box');
+                const tipInfoBox = document.getElementById('tipInfoBox');
+                const buttonWidth = this.width - 1200;
+                if (menuBottom && buttonWidth < 780) {
+                    this.offsetBottom = (menuBottom.offsetHeight || 0) + 15;
+                }
+                if (tipInfoBox) {
+                    this.offsetBottom += tipInfoBox.offsetHeight;
+                }
+            }, 500);
         },
         overallTranslation(flag) {
             const panel = document.getElementById('leftSlider');
@@ -135,58 +113,40 @@ export default {
                 panel.style.transform = '';
             }
         },
-        async statusMessage(list) {
-            await this.$store.dispatch('training/updateMapState', list);
-            await this.$store.dispatch('socket/setEquipmentStatus');
-        },
-        setWindowSize() {
-            const width = this.width;
-            const height = this.height;
-            this.$store.dispatch('config/resize', { width, height });
-        },
         async back() {
             if (this.$route.query.group) {
                 await clearSimulation(this.$route.query.group);
-                this.clearSubscribe();
             }
-            this.$store.dispatch('training/over').then(() => {
-                history.go(-1);
-            });
-        },
-        backOut() {
-            if (this.$route.query.projectDevice) {
-                this.$store.dispatch('LogOut').then(() => {
-                    location.reload();
-                });
-            }
-        },
-        async subscribe() {
-            this.clearSubscribe();
-            const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
-            creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
-            // await this.$store.dispatch('training/setHasSubscribed');
-        },
-        clearSubscribe() {
-            clearSubscribe(`${displayTopic}\/${this.$route.query.group}`);
         },
         handlerStart() {
+            if (this.trainingDetail.type === 'SCENE') {
+                this.$refs.scenePlayRole.doShow();
+            } else {
+                this.startTraining();
+            }
+        },
+        startTraining() {
             startTraining(this.group, {mode: this.teachMode}).then(() => {
                 this.$store.dispatch('trainingNew/trainingStart');
+                this.$store.dispatch('trainingNew/setTrainingScore', '');
             }).catch(() => {
                 this.$message.error('开始实训失败！');
             });
         },
         nextStep() {
-            endTrainingStep(this.group, this.stepId).then(resp => {
-                this.stepId++;
+            const stepList = JSON.parse(this.$store.state.trainingNew.trainingDetail.stepJson);
+            const step = stepList[this.$store.state.trainingNew.stepOrder - 1];
+            endTrainingStep(this.group, step.id).then(resp => {
+            }).catch(() => {
+                this.$message.error('进入下一步实训失败！');
             });
         },
         handlerEnd() {
-            endTraining(this.group).then(() => {
+            endTraining(this.group).then((resp) => {
                 this.$store.dispatch('trainingNew/trainingEnd');
                 this.$store.dispatch('socket/clearTrainingStepTip');
-                this.$store.dispatch('socket/setTrainingDetail', null);
-                this.stepId = 1;
+                this.$store.dispatch('trainingNew/clearStepOrder');
+                this.$store.dispatch('trainingNew/setTrainingScore', resp.data);
             }).catch(() => {
                 this.$message.error('结束实训失败！');
             });
diff --git a/src/views/designPlatform/trainingTip.vue b/src/views/designPlatform/trainingTip.vue
index 748d1d7e7..94c54fc22 100644
--- a/src/views/designPlatform/trainingTip.vue
+++ b/src/views/designPlatform/trainingTip.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { ScriptMode } from '@/scripts/ConstDic';
 export default {
     name: 'TrainingTip',
     data() {
@@ -11,9 +12,53 @@ export default {
             trainingTipMessage: ''
         };
     },
+    computed: {
+        teachMode() {
+            return this.$store.state.trainingNew.teachMode;
+        },
+        trainingDetail() {
+            return this.$store.state.trainingNew.trainingDetail;
+        }
+    },
     watch: {
         '$store.state.socket.trainingStepTip': function(val) {
-            this.trainingTipMessage = val;
+            if (val && this.trainingDetail.type === 'SCENE') {
+                const member = this.$store.state.training.memberData[val.memberId];
+                this.$nextTick(function() {
+                    this.$store.dispatch('trainingNew/clearOperateOrder');
+                    this.$store.dispatch('trainingNew/stepOrderIncrease');
+                    if (member.userId == this.$store.state.user.id && (this.teachMode === ScriptMode.TEACH || this.teachMode === ScriptMode.PRACTICE)) {
+                        this.trainingTipMessage = val.content;
+                    }
+                });
+            }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val) {
+                this.trainingTipMessage = '';
+            }
+        },
+        '$store.state.socket.trainingStepFinishCount': function(val) {
+            this.trainingTipMessage = '';
+        },
+        '$store.state.socket.trainingOverCount': function(val) {
+            if (this.teachMode === ScriptMode.TEACH) {
+                this.trainingTipMessage = '实训完成，请点击结束按钮。';
+            }
+        },
+        '$store.state.training.operateErrMsg': function (val) {
+            this.tipInfo({ color: val.color, message: val.errMsg });
+        }
+    },
+    methods: {
+        tipInfo(opt) {
+            if (opt && opt.hasOwnProperty('color') && opt.hasOwnProperty('message')) {
+                const h = this.$createElement;
+                this.$notify({
+                    title: this.$t('global.tips'),
+                    message: h('i', { style: 'color:' + opt.color }, opt.message)
+                });
+            }
         }
     }
 };
diff --git a/src/views/designPlatform/whTrainList.vue b/src/views/designPlatform/whTrainList.vue
new file mode 100644
index 000000000..44e4c4cf6
--- /dev/null
+++ b/src/views/designPlatform/whTrainList.vue
@@ -0,0 +1,103 @@
+<template>
+  <div class="menuTrainListOut" :class="{'active': drawer}">
+    <div class="menuTrainListBtn" @click="clickBtn">列车</div>
+    <div :show-close="false" class="menuTrainList_box" style="height: 100%;">
+      <div class="menuTrainList">
+        <el-table :data="trainList" height="100%" :highlight-current-row="true" style="border-radius:5px 0px 0px 5px;" @row-click="selectTrain">
+          <el-table-column property="groupNum" label="车组号" width="130" />
+          <el-table-column property="direction" label="方向" width="130" />
+          <el-table-column property="location" label="公里标" width="130" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+export default {
+    name: 'WhTrainList',
+    data() {
+        return {
+            drawer: false,
+            trainList:[],
+            trainMap: new Map()
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map',
+            'mapConfig'
+        ]),
+        lineCode() {
+            return this.$route.query.lineCode;
+        }
+    },
+    watch:{
+        '$store.state.socket.whTrainInfo': function (val) {
+            if (val) {
+                this.trainMap.set(val.groupNum, {groupNum: val.groupNum, direction: val.roadType === 'RIGHT' ? '右' : '左', location: val.location});
+                const trainList = [];
+                for (const [key, value] of this.trainMap) {
+                    trainList.push(value);
+                }
+                this.trainList = trainList;
+            }
+        }
+    },
+    mounted() {
+        this.trainList = [];
+    },
+    methods:{
+        clickBtn() {
+            if (this.drawer) {
+                this.drawer = false;
+            } else {
+                this.drawer = true;
+            }
+        },
+        selectTrain(row, column, event) {
+            // 设置显示中心
+            this.$jlmap.setCenter(row.code);
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.menuTrainListOut{
+	position: absolute;
+	right: 0;
+	top: 20%;
+	height: 60%;
+	transform: translateX(400px);
+	transition: all 0.4s;
+	&.active{
+		transform: translateX(0px);
+	}
+}
+.menuTrainListBtn{
+	background: #fff;
+	text-align: center;
+	border-radius: 6px 0px 0px 6px;
+	position: absolute;
+	top: 45%;
+	z-index: 2;
+	transform: translateX(-23px);
+	cursor: pointer;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	text-align: center;
+	justify-content: center;
+	padding: 7px 4px;
+	width: 23px;
+}
+.menuTrainList_box{
+	height: 100%;
+	.menuTrainList{
+		width: 400px;
+		height: 100%;
+		border-radius: 10px 0px 0px 10px;
+		background: #fff;
+	}
+}
+</style>
diff --git a/src/views/fileManage/voiceManage/generate.vue b/src/views/fileManage/voiceManage/generate.vue
new file mode 100644
index 000000000..ac6049346
--- /dev/null
+++ b/src/views/fileManage/voiceManage/generate.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="580px" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="60px">
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="formModel.name" />
+      </el-form-item>
+      <el-form-item label="描述" prop="desc">
+        <el-input v-model="formModel.desc" />
+      </el-form-item>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { generateAudio } from '@/api/audioResources';
+export default {
+    name: 'Generate',
+    data() {
+        return {
+            replaceList: [],
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                name: '',
+                desc: ''
+            },
+            loading: false
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                name: [
+                    { required: true, message: '请输入音频资源名称', trigger: 'blur' }
+                ],
+                desc: [
+                    { required: true, message: '请输入音频资源描述', trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return '生成音频资源';
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        handleRemove() {
+            this.formModel.url = '';
+        },
+
+        show() {
+            this.dialogVisible = true;
+            this.$nextTick(() => {
+                this.$refs.ruleForm.resetFields();
+            });
+        },
+        doSave() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    const data = {
+                        id: this.formModel.id,
+                        name: this.formModel.name,
+                        desc: this.formModel.desc
+                    };
+                    generateAudio(data).then(resp => {
+                        this.$message.success('生成音频资源数据成功！');
+                        this.handleClose();
+                        this.$emit('reloadTable');
+                    }).catch(error => {
+                        this.$message.error(error.message);
+                        this.loading = false;
+                    });
+                }
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                id: '',
+                name: '',
+                desc: ''
+            };
+            this.$refs.ruleForm.resetFields();
+            this.dialogVisible = false;
+            this.loading = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.chat-box-footer-create{
+	font-size: 16px;
+	text-align: center;
+	color: #fff;
+	position: relative;
+	left: 5px;
+	top: 6px;
+	line-height: 30px;
+	cursor: pointer;
+	width: 40px;
+	height: 40px;
+	border-radius: 50%;
+	background: green;
+	border: none;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.chat-box-footer-send{
+	background: #F2F2F2;
+	right: 55px;
+	cursor: pointer;
+	.icon-yuyin{
+		color: #333;
+		font-size: 24px;
+		margin: 0;
+	}
+	&.active{
+		.icon-yuyin{
+			color: green;
+		}
+	}
+	.close_icon{
+		position: absolute;
+		top: 8px;
+		left: 45px;
+		font-size: 16px;
+		color: #333;
+		font-weight: 600;
+		padding: 3px;
+	}
+}
+#record_progress_bar{
+	width: 40px;
+	height: 40px;
+	position: absolute;
+	left: 0;
+	top: 0;
+	border-radius: 50%;
+}
+</style>
diff --git a/src/views/fileManage/voiceManage/index.vue b/src/views/fileManage/voiceManage/index.vue
index 13d2a5fe0..6d6b79315 100644
--- a/src/views/fileManage/voiceManage/index.vue
+++ b/src/views/fileManage/voiceManage/index.vue
@@ -2,15 +2,18 @@
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <add-voice ref="addVoice" @reloadTable="reloadTable" />
+    <generate-voice ref="generateVoice" @reloadTable="reloadTable" />
   </div>
 </template>
 
 <script>
 import { pagedAudioResources, deleteAudioResources } from '@/api/audioResources';
 import AddVoice from './add';
+import GenerateVoice from './generate';
 export default {
     name: 'DeviceManage',
     components: {
+        GenerateVoice,
         AddVoice
     },
     data() {
@@ -77,7 +80,8 @@ export default {
                     }
                 ],
                 actions: [
-                    { text: this.$t('global.add'), handler: this.createAudioResources}
+                    { text: this.$t('global.add'), handler: this.createAudioResources},
+                    { text: '生成', handler: this.generateAudioResources }
                 ]
             },
             currentModel: {}
@@ -120,6 +124,9 @@ export default {
         createAudioResources() {
             this.$refs.addVoice.show();
         },
+        generateAudioResources() {
+            this.$refs.generateVoice.show();
+        },
         editConfig(index, row) {
             this.$refs.addVoice.show(row);
         },
diff --git a/src/views/iscs/iscsSystem/config/broadcast/realTimeBroadcast.vue b/src/views/iscs/iscsSystem/config/broadcast/realTimeBroadcast.vue
new file mode 100644
index 000000000..845e3c6f8
--- /dev/null
+++ b/src/views/iscs/iscsSystem/config/broadcast/realTimeBroadcast.vue
@@ -0,0 +1,119 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :visible.sync="visible"
+    width="600px"
+    :before-close="doClose"
+    class="iscs-voice-broadcast-dialog"
+  >
+    <div>
+      <div class="dialog-header">实时广播</div>
+      <div class="secondary-title">信息内容</div>
+      <el-input
+        v-model="messageContent"
+        type="textarea"
+        :row="4"
+        placeholder="请输入内容"
+      />
+      <div class="release-button" @click="releaseRealTime">发布</div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+    name: 'RealTimeBroadcast',
+    props: {
+        resourcesList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            visible: false,
+            messageContent: ''
+        };
+    },
+    methods:{
+        doClose() {
+            this.visible = false;
+        },
+        doShow() {
+            this.visible = true;
+        },
+        releaseRealTime() {
+            this.visible = false;
+            this.$emit('releaseRealTime', this.messageContent);
+            this.messageContent = '';
+        }
+    }
+};
+</script>
+
+<style scoped>
+.dialog-header{
+	text-align: center;
+	font-size: 28px;
+	margin-bottom: 15px;
+}
+.information-description-box{
+	height: 100px;
+	width: 100%;
+	background: #DCDCDC;
+	border-left: 2px solid #898888;
+	overflow-x: auto;
+	overflow-y: auto;
+}
+.information-box{
+	white-space: nowrap;
+	background: #DCDCDC;
+	margin-top: 2px;
+	cursor: pointer;
+}
+.secondary-title{
+	text-align: center;
+	width: 100%;
+	font-size: 18px;
+	background: #A9A9A9;
+	border-top: 2px solid #898888;
+	border-left: 2px solid #898888;
+	border-right: 2px solid #fff;
+	border-bottom: 2px solid #fff;
+}
+.information-context-box{
+	background: #DCDCDC;
+	width: 100%;
+	height: 200px;
+	overflow-y: auto;
+}
+.release-button{
+	position: absolute;
+	right: 20px;
+	background: #CCCCCC;
+	color: #000;
+	font-weight: bold;
+	margin-top: 10px;
+	padding: 7px 15px;
+	border-top: 2px solid #fff;
+	border-left: 2px solid #fff;
+	border-right: 2px solid #454541;
+	border-bottom: 2px solid #454541;
+	cursor: pointer;
+}
+</style>
+<style>
+.iscs-voice-broadcast-dialog .el-dialog__body{
+	background: #A9A9A9;
+	padding-top: 10px;
+	padding-bottom: 60px;
+}
+.iscs-voice-broadcast-dialog .el-dialog__headerbtn{
+	top: 10px;
+}
+.iscs-voice-broadcast-dialog .el-dialog__header{
+	background-image: linear-gradient(#FFE4C4, #F4A460, #FFE4C4);
+}
+</style>
diff --git a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue
index 765a1e0e4..2ef98d8e4 100644
--- a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue
+++ b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue
@@ -22,46 +22,82 @@
             <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('LCD')? '#2EFF74':'#CDCDCD'}" />
             <div id="LCD" class="pa-state-box">{{ deviceMap['LCD'].state }}</div>
           </div>
+          <div v-else style="width: 10px;height: 10px;" />
         </el-col>
         <el-col :span="3">
           <div v-if="checkHasDevice('UP_STAND')" class="broadcast-mode-button" @click="selectedArea('UP_STAND')">
             <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('UP_STAND')? '#2EFF74':'#CDCDCD'}" />
             <div id="UP_STAND" class="pa-state-box">{{ deviceMap['UP_STAND'].state }}</div>
           </div>
+          <div v-else style="width: 10px;height: 10px;" />
         </el-col>
         <el-col :span="3">
           <div v-if="checkHasDevice('DOWN_STAND')" class="broadcast-mode-button" @click="selectedArea('DOWN_STAND')">
             <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('DOWN_STAND')? '#2EFF74':'#CDCDCD'}" />
             <div id="DOWN_STAND" class="pa-state-box">{{ deviceMap['DOWN_STAND'].state }}</div>
           </div>
+          <div v-else style="width: 10px;height: 10px;" />
         </el-col>
         <el-col :span="3">
           <div v-if="checkHasDevice('ADMINISTRATIVE_AREA')" class="broadcast-mode-button" @click="selectedArea('ADMINISTRATIVE_AREA')">
             <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('ADMINISTRATIVE_AREA')? '#2EFF74':'#CDCDCD'}" />
             <div id="ADMINISTRATIVE_AREA" class="pa-state-box">{{ deviceMap['ADMINISTRATIVE_AREA'].state }}</div>
           </div>
+          <div v-else style="width: 10px;height: 10px;" />
         </el-col>
         <el-col :span="3">
           <div v-if="checkHasDevice('GATE')" class="broadcast-mode-button" @click="selectedArea('GATE')">
             <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('GATE')? '#2EFF74':'#CDCDCD'}" />
             <div id="GATE" class="pa-state-box">{{ deviceMap['GATE'].state }}</div>
           </div>
+          <div v-else style="width: 10px;height: 10px;" />
         </el-col>
         <el-col :span="3">
           <div v-if="checkHasDevice('TRANSFER_CHANNEL')" class="broadcast-mode-button" @click="selectedArea('TRANSFER_CHANNEL')">
             <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('TRANSFER_CHANNEL')? '#2EFF74':'#CDCDCD'}" />
             <div id="TRANSFER_CHANNEL" class="pa-state-box">{{ deviceMap['TRANSFER_CHANNEL'].state }}</div>
           </div>
+          <div v-else style="width: 10px;height: 10px;" />
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="5"><div class="broadcast-atc-button">ATC广播</div></el-col>
-        <el-col :span="3"><div v-if="checkHasDevice('LCD')" class="broadcast-use-button" :style="{color: enableAreaList.includes('LCD')? '#2EFF74':'#CDCDCD'}">{{ this.enableAreaList.includes('LCD')? '启用':'未启用' }}</div></el-col>
-        <el-col :span="3"><div v-if="checkHasDevice('UP_STAND')" class="broadcast-use-button" :style="{color: enableAreaList.includes('UP_STAND')? '#2EFF74':'#CDCDCD'}">{{ this.enableAreaList.includes('UP_STAND')? '启用':'未启用' }}</div></el-col>
-        <el-col :span="3"><div v-if="checkHasDevice('DOWN_STAND')" class="broadcast-use-button" :style="{color: enableAreaList.includes('DOWN_STAND')? '#2EFF74':'#CDCDCD'}">{{ this.enableAreaList.includes('DOWN_STAND')? '启用':'未启用' }}</div></el-col>
-        <el-col :span="3"><div v-if="checkHasDevice('ADMINISTRATIVE_AREA')" class="broadcast-use-button" :style="{color: enableAreaList.includes('ADMINISTRATIVE_AREA')? '#2EFF74':'#CDCDCD'}">{{ this.enableAreaList.includes('ADMINISTRATIVE_AREA')? '启用':'未启用' }}</div></el-col>
-        <el-col :span="3"><div v-if="checkHasDevice('GATE')" class="broadcast-use-button" :style="{color: enableAreaList.includes('GATE')? '#2EFF74':'#CDCDCD'}">{{ this.enableAreaList.includes('GATE')? '启用':'未启用' }}</div></el-col>
-        <el-col :span="3"><div v-if="checkHasDevice('TRANSFER_CHANNEL')" class="broadcast-use-button" :style="{color: enableAreaList.includes('TRANSFER_CHANNEL')? '#2EFF74':'#CDCDCD'}">{{ this.enableAreaList.includes('TRANSFER_CHANNEL')? '启用':'未启用' }}</div></el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('LCD')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('LCD')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('LCD')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('UP_STAND')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('UP_STAND')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('UP_STAND')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('DOWN_STAND')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('DOWN_STAND')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('DOWN_STAND')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('ADMINISTRATIVE_AREA')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('ADMINISTRATIVE_AREA')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('ADMINISTRATIVE_AREA')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('GATE')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('GATE')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('GATE')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('TRANSFER_CHANNEL')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('TRANSFER_CHANNEL')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('TRANSFER_CHANNEL')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
       </el-row>
     </div>
     <div class="pre-taped-broadcast">
@@ -108,74 +144,87 @@
         </el-col>
       </el-row>
     </div>
-    <!--<div class="time-control-pa-home">-->
-    <!--<el-row :gutter="50">-->
-    <!--<el-col :span="2">-->
-    <!--<div class="time-control-button">时间控制</div>-->
-    <!--</el-col>-->
-    <!--<el-col :span="20">-->
-    <!--<el-row :gutter="20" style="margin-top: 5px; font-size: 13px">-->
-    <!--<el-col :span="2">-->
-    <!--<div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">排定描述</div>-->
-    <!--</el-col>-->
-    <!--<el-col :span="22">-->
-    <!--<el-input v-model="addModel.scheduledDescribe" size="mini" style="width: 100%" /></el-col>-->
-    <!--</el-row>-->
-    <!--<el-row style="margin-top: 5px; font-size: 13px">-->
-    <!--<el-col :span="2">-->
-    <!--<div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">开始时间</div>-->
-    <!--</el-col>-->
-    <!--<el-col :span="5">-->
-    <!--<el-date-picker-->
-    <!--v-model="addModel.startTime"-->
-    <!--type="datetime"-->
-    <!--placeholder="选择日期时间"-->
-    <!--size="mini"-->
-    <!--/>-->
-    <!--</el-col>-->
-    <!--<el-col :span="2">-->
-    <!--<div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">结束时间</div>-->
-    <!--</el-col>-->
-    <!--<el-col :span="5">-->
-    <!--<el-date-picker-->
-    <!--v-model="addModel.endTime"-->
-    <!--type="datetime"-->
-    <!--placeholder="选择日期时间"-->
-    <!--size="mini"-->
-    <!--/>-->
-    <!--</el-col>-->
-    <!--<el-col :span="2">-->
-    <!--<div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">延时时间</div>-->
-    <!--</el-col>-->
-    <!--<el-col :span="5">-->
-    <!--<el-time-picker-->
-    <!--v-model="addModel.delayTime"-->
-    <!--placeholder="选择时间"-->
-    <!--size="mini"-->
-    <!--/>-->
-    <!--</el-col>-->
-    <!--<el-col :span="1">-->
-    <!--<div class="time-control-button-small">今日</div>-->
-    <!--</el-col>-->
-    <!--<el-col :span="1">-->
-    <!--<div class="time-control-button-small">一次</div>-->
-    <!--</el-col>-->
-    <!--<el-col :span="1">-->
-    <!--<div class="time-control-button-small" style="width: 43px;">无截至</div>-->
-    <!--</el-col>-->
-    <!--</el-row>-->
-    <!--</el-col>-->
-    <!--<el-col :span="2">-->
-    <!--<div class="time-control-button-small" style="height: 50px;width: 50px; position: relative;top: 10px;right: 30px;line-height: 14px;padding-top: 10px;padding-left: 10px">设定<br>确认</div>-->
-    <!--</el-col>-->
-    <!--</el-row>-->
-    <!--</div>-->
-    <div class="pa-grey-box" />
+    <div class="time-control-pa-home">
+      <el-row :gutter="50">
+        <el-col :span="2">
+          <div class="time-control-button">时间控制</div>
+        </el-col>
+        <el-col :span="20">
+          <el-row :gutter="20" style="margin-top: 5px; font-size: 13px">
+            <el-col :span="2">
+              <div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">排定描述</div>
+            </el-col>
+            <el-col :span="22">
+              <el-input v-model="addModel.desc" size="mini" style="width: 100%" /></el-col>
+          </el-row>
+          <el-row style="margin-top: 5px; font-size: 13px">
+            <el-col :span="2">
+              <div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">开始时间</div>
+            </el-col>
+            <el-col :span="5">
+              <el-date-picker
+                v-model="addModel.startTime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="选择日期时间"
+                size="mini"
+              />
+            </el-col>
+            <el-col :span="2">
+              <div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">结束时间</div>
+            </el-col>
+            <el-col :span="5">
+              <el-date-picker
+                v-model="addModel.endTime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="选择日期时间"
+                size="mini"
+              />
+            </el-col>
+            <el-col :span="2">
+              <div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">延时时间</div>
+            </el-col>
+            <el-col :span="5">
+              <el-time-picker
+                v-model="addModel.delayTime"
+                value-format="HH:mm:ss"
+                placeholder="选择时间"
+                size="mini"
+              />
+            </el-col>
+            <el-col :span="1">
+              <div class="time-control-button-small" @click="setToday">今日</div>
+            </el-col>
+            <el-col :span="1">
+              <div class="time-control-button-small" @click="setOnce">一次</div>
+            </el-col>
+            <el-col :span="1">
+              <div class="time-control-button-small" style="width: 43px;" @click="setNoEnd">无截至</div>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <div class="time-control-button-small" style="height: 50px;width: 50px; position: relative;top: 10px;right: 30px;line-height: 14px;padding-top: 10px;padding-left: 10px" @click="setTimerBroadcast">设定<br>确认</div>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="pa-grey-box">
+      <template v-for="(item, index) in timedList">
+        <el-row :key="index" style="display: flex; align-items: center;">
+          <el-col :span="5">{{ item.desc|| '--' }}</el-col>
+          <el-col :span="5">{{ item.startTime|| '--' }}</el-col>
+          <el-col :span="5">{{ item.endTime|| '--' }}</el-col>
+          <el-col :span="5">{{ item.delayTime|| '--' }}</el-col>
+          <el-col :span="4"><el-button type="text" @click="removeTimed(item)">删除</el-button></el-col>
+        </el-row>
+      </template>
+    </div>
     <div style="position: absolute; left: 73%; top: 67%;width: 13%;height: 30%;font-size: 12px;color: #fff;"><state-table /></div>
     <div class="broadcast-mode">
       <el-row>
         <el-col :span="12"><div style="height: 40px;text-align: center; background: #000088;color: #fff;line-height: 40px">实时广播</div></el-col>
-        <el-col :span="12"><div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%;">广播</div></el-col>
+        <el-col :span="12"><div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%;" @click="realTimeBroadCast">广播</div></el-col>
       </el-row>
     </div>
     <div class="broadcast-mode" style="top: 25%;">
@@ -194,8 +243,8 @@
       <el-row>
         <el-col :span="12"><div style="height: 80px;text-align: center; background: #000088;color: #fff;line-height: 80px">ATC广播</div></el-col>
         <el-col :span="12">
-          <div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%;">启用</div>
-          <div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%; margin-top: 5px">停用</div>
+          <div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%;" @click="enableAtcBroadcast">启用</div>
+          <div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%; margin-top: 5px" @click="stopAtcBroadcast">停用</div>
         </el-col>
       </el-row>
     </div>
@@ -208,31 +257,41 @@
         </el-col>
       </el-row>
     </div>
+    <audio id="lcd_voice" controls style="width: 0;height: 0;" />
+    <audio id="up_stand_voice" controls style="width: 0;height: 0;" />
+    <audio id="down_stand_voice" controls style="width: 0;height: 0;" />
+    <audio id="administrative_area_voice" controls style="width: 0;height: 0;" />
+    <audio id="gate_area_voice" controls style="width: 0;height: 0;" />
+    <audio id="transfer_channel_voice" controls style="width: 0;height: 0;" />
     <audio id="voice" controls style="width: 0;height: 0;" />
+    <real-time-broadcast ref="realTimeBroadcast" @releaseRealTime="releaseRealTime" />
   </div>
 </template>
 
 <script>
 import StateTable from './stateTable';
 import { queryIscsDeviceCod } from '@/api/iscs';
-import { queryIscsResourcesByGroup } from '@/api/simulation';
+import { queryIscsResourcesByGroup, queryPaTimedList } from '@/api/simulation';
 import { sendCommandNew } from '@/api/jmap/training';
 import { getToken } from '@/utils/auth';
 import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp';
+import RealTimeBroadcast from './realTimeBroadcast';
 export default {
     name: 'StationHome',
     components: {
-        StateTable
+        StateTable,
+        RealTimeBroadcast
     },
     data() {
         return {
             addModel: {
-                scheduledDescribe: '',
+                desc: '',
                 startTime: '',
                 endTime: '',
                 delayTime: ''
             },
             enableAreaList: [],
+            atcBroadcast: [],
             bgmResources: '',
             videoMode: 'RECORDING',
             messageIndex: 0,
@@ -240,10 +299,14 @@ export default {
             iscsDeviceMap: {},
             iscsDeviceList: [],
             iscsDeviceState: {},
-            deviceMap: {}
+            deviceMap: {},
+            timedList: []
         };
     },
     watch: {
+        '$store.state.socket.simulationReset': function(val) {
+            this.initTimedPlayList();
+        },
         '$route.query.stationId': function () {
             const params2 = { mapId: this.$route.query.mapId, system: 'PA', station: this.$route.query.stationId };
             queryIscsDeviceCod(params2).then(resp => {
@@ -252,56 +315,9 @@ export default {
                     this.$set(device, 'state', this.iscsDeviceState[device.code] ? this.iscsDeviceState[device.code].state : '0');
                     this.iscsDeviceMap[device.code] = device;
                     const div = document.getElementById(device.position);
-                    if (div) {
-                        switch (device.state) {
-                        case '0':
-                            div.style.background = '#CCCCCC';
-                            break;
-                        case '1':
-                            div.style.background = '#FF0000';
-                            break;
-                        case '2':
-                            div.style.background = '#880000';
-                            break;
-                        case '3':
-                            div.style.background = '#0000FF';
-                            break;
-                        case '4':
-                            div.style.background = '#554488';
-                            break;
-                        case '5':
-                            div.style.background = '#44CC55';
-                            break;
-                        case '6':
-                            div.style.background = '#FF00FF';
-                            break;
-                        case '7':
-                            div.style.background = '#887711';
-                            break;
-                        case '8':
-                            div.style.background = '#006600';
-                            break;
-                        case '9':
-                            div.style.background = '#778877';
-                            break;
-                        case '10':
-                            div.style.background = '#555454';
-                            break;
-                        case '11':
-                            div.style.background = '#556688';
-                            break;
-                        case '12':
-                            div.style.background = '#887711';
-                            break;
-                        case '13':
-                            div.style.background = '#115577';
-                            break;
-                        case '♬':
-                            div.style.background = '';
-                            break;
-                        }
-                    }
+                    this.setElementColor(div, device.state);
                 });
+                this.initTimedPlayList();
             });
         },
         '$store.state.socket.iscsStatePaMessages': function (list) {
@@ -314,56 +330,17 @@ export default {
                     }
                     const device = this.iscsDeviceMap[item.code];
                     if (device) {
-                        this.$set(this.deviceMap[device.position], 'state', item.state);
+                        const oldState = parseInt(this.deviceMap[device.position].state);
+                        const newState = parseInt(item.state);
                         const div = document.getElementById(device.position);
-                        if (div) {
-                            switch (item.state) {
-                            case '0':
-                                div.style.background = '#CCCCCC';
-                                break;
-                            case '1':
-                                div.style.background = '#FF0000';
-                                break;
-                            case '2':
-                                div.style.background = '#880000';
-                                break;
-                            case '3':
-                                div.style.background = '#0000FF';
-                                break;
-                            case '4':
-                                div.style.background = '#554488';
-                                break;
-                            case '5':
-                                div.style.background = '#44CC55';
-                                break;
-                            case '6':
-                                div.style.background = '#FF00FF';
-                                break;
-                            case '7':
-                                div.style.background = '#887711';
-                                break;
-                            case '8':
-                                div.style.background = '#006600';
-                                break;
-                            case '9':
-                                div.style.background = '#778877';
-                                break;
-                            case '10':
-                                div.style.background = '#555454';
-                                break;
-                            case '11':
-                                div.style.background = '#556688';
-                                break;
-                            case '12':
-                                div.style.background = '#887711';
-                                break;
-                            case '13':
-                                div.style.background = '#115577';
-                                break;
-                            case '♬':
-                                div.style.background = '';
-                                break;
-                            }
+                        if (!oldState || oldState > newState) {
+                            this.$set(this.deviceMap[device.position], 'state', item.state);
+                            this.setElementColor(div, item.state);
+                            this.playBroadcast(item, device.position);
+                        }
+                        if (!this.atcBroadcast.includes(device.position) && !oldState) {
+                            this.$set(this.deviceMap[device.position], 'state', item.state);
+                            this.setElementColor(div, item.state);
                         }
                     }
                 });
@@ -387,11 +364,183 @@ export default {
             this.subscribe();
         });
         this.getResourcesList();
+        this.initTimedPlayList();
     },
     beforeDestroy() {
         this.clearSubscribe();
     },
     methods: {
+        setElementColor(div, state) {
+            if (div) {
+                switch (state) {
+                case '0':
+                    div.style.background = '#CCCCCC';
+                    break;
+                case '1':
+                    div.style.background = '#FF0000';
+                    break;
+                case '2':
+                    div.style.background = '#880000';
+                    break;
+                case '3':
+                    div.style.background = '#0000FF';
+                    break;
+                case '4':
+                    div.style.background = '#554488';
+                    break;
+                case '5':
+                    div.style.background = '#44CC55';
+                    break;
+                case '6':
+                    div.style.background = '#FF00FF';
+                    break;
+                case '7':
+                    div.style.background = '#887711';
+                    break;
+                case '8':
+                    div.style.background = '#006600';
+                    break;
+                case '9':
+                    div.style.background = '#778877';
+                    break;
+                case '10':
+                    div.style.background = '#555454';
+                    break;
+                case '11':
+                    div.style.background = '#556688';
+                    break;
+                case '12':
+                    div.style.background = '#887711';
+                    break;
+                case '13':
+                    div.style.background = '#115577';
+                    break;
+                case '♬':
+                    div.style.background = '';
+                    break;
+                }
+            }
+        },
+        getTimeString (full) {
+            const simulationDate = new Date(this.$store.state.socket.simulationTimeSync);
+            console.log(simulationDate, this.$store.state.socket.simulationTimeSync);
+            const year = simulationDate.getFullYear();
+            let month = simulationDate.getMonth() + 1;
+            if (month < 10) {
+                month = '0' + month;
+            }
+            let day = simulationDate.getDate();
+            if (day < 10) {
+                day = '0' + day;
+            }
+            let hour = simulationDate.getHours();
+            if (hour < 10) {
+                hour = '0' + hour;
+            }
+            let minute = simulationDate.getMinutes();
+            if (minute < 10) {
+                minute = '0' + minute;
+            }
+            let second = simulationDate.getSeconds();
+            if (second < 10) {
+                second = '0' + second;
+            }
+            if (full) {
+                return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
+            } else {
+                return year + '-' + month + '-' + day;
+            }
+        },
+        setToday() {
+            const dateString = this.getTimeString(false);
+            console.log(dateString, 'today---');
+            this.addModel.startTime = dateString + ' 00:00:00';
+            this.addModel.endTime = dateString + ' 23:59:59';
+            this.addModel.delayTime = '00:01:00';
+        },
+        setOnce() {
+            this.addModel.startTime = this.getTimeString(true);
+            this.addModel.endTime = '';
+            this.addModel.delayTime = '';
+        },
+        setNoEnd() {
+            this.addModel.startTime = this.getTimeString(true);
+            this.addModel.endTime = '';
+            this.addModel.delayTime = '00:01:00';
+        },
+        playBroadcast(info, position) {
+            if (this.$route.query.stationId === info.stationCode && !['0', '12', '13'].includes(info.state) && this.atcBroadcast.includes(position)) {
+                const audio = document.getElementById(position.toLowerCase() + '_voice');
+                if (!audio) { return; }
+                audio.pause();
+                audio.src = this.$store.state.user.resourcesUrl + info.url;
+                audio.play();
+                const _that = this;
+                audio.addEventListener('ended', function() {
+                    const device = _that.iscsDeviceMap[info.code];
+                    const div = document.getElementById(device.position);
+                    _that.$set(_that.deviceMap[device.position], 'state', '0');
+                    div.style.background = '#CCCCCC';
+                }, false);
+            }
+        },
+        setTimerBroadcast() {
+            const iscsDeviceCodes = [];
+            this.enableAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            if (!this.addModel.desc) {
+                this.$message.error('请填写排定描述！');
+                return;
+            }
+            if (!this.addModel.startTime) {
+                this.$message.error('请选择开始时间！');
+                return;
+            }
+            if (this.resourcesList[this.messageIndex]) {
+                const params = {
+                    resourceId: this.resourcesList[this.messageIndex].id,
+                    iscsDeviceCodes: iscsDeviceCodes,
+                    type: this.videoMode,
+                    desc: this.addModel.desc,
+                    startTime: this.addModel.startTime,
+                    endTime: this.addModel.endTime,
+                    delayTime: this.addModel.delayTime,
+                    stationCode: this.$route.query.stationId
+                };
+                sendCommandNew(this.$route.query.group, 'ISCS_PA_Timed_Play', params).then(() => {
+                    this.addModel = { desc: '', startTime: '', endTime: '', delayTime: '' };
+                    this.initTimedPlayList();
+                }).catch(() => {
+                    this.$message.error('设定定时广播失败！');
+                });
+            }
+        },
+        removeTimed(data) {
+            if (data) {
+                const params = {
+                    stationCode: this.$route.query.stationId,
+                    desc: data.desc
+                };
+                sendCommandNew(this.$route.query.group, 'ISCS_PA_Remove_Timed_Play', params).then(() => {
+                    this.addModel = { desc: '', startTime: '', endTime: '', delayTime: '' };
+                    this.initTimedPlayList();
+                }).catch(() => {
+                    this.$message.error('设定定时广播失败！');
+                });
+            }
+        },
+        initTimedPlayList() {
+            queryPaTimedList(this.$route.query.group, { stationCode: this.$route.query.stationId }).then(resp => {
+                this.timedList = resp.data;
+            }).catch(() => { this.$message.error('获取定时广播信息失败！'); });
+        },
         chooseMessage(index) {
             this.messageIndex = index;
         },
@@ -416,6 +565,21 @@ export default {
                 this.enableAreaList = ['LCD', 'UP_STAND', 'DOWN_STAND', 'ADMINISTRATIVE_AREA', 'GATE', 'TRANSFER_CHANNEL'];
             }
         },
+        enableAtcBroadcast() {
+            this.enableAreaList.forEach(item => {
+                if (!this.atcBroadcast.includes(item)) {
+                    this.atcBroadcast.push(item);
+                }
+            });
+        },
+        stopAtcBroadcast() {
+            this.enableAreaList.forEach(item => {
+                const index = this.atcBroadcast.findIndex(elem => item === elem);
+                if (index > -1) {
+                    this.atcBroadcast.splice(index, 1);
+                }
+            });
+        },
         playBgm() {
             const iscsDeviceCodes = [];
             this.enableAreaList.forEach(item => {
@@ -434,10 +598,10 @@ export default {
                     type: 'BGM'
                 };
                 sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
-                    const bgmUrl = this.$store.state.user.resourcesUrl + this.bgmResources[0].url;
-                    const audio = document.getElementById('voice');
-                    audio.src = bgmUrl;
-                    audio.play();
+                    // const bgmUrl = this.$store.state.user.resourcesUrl + this.bgmResources[0].url;
+                    // const audio = document.getElementById('voice');
+                    // audio.src = bgmUrl;
+                    // audio.play();
                 }).catch(() => {
                     this.$message.error('背景音乐播放失败！');
                 });
@@ -445,9 +609,11 @@ export default {
         },
         stopBgm() {
             const iscsDeviceCodes = [];
+			const positionList = [];
             this.enableAreaList.forEach(item => {
                 if (this.deviceMap[item]) {
                     iscsDeviceCodes.push(this.deviceMap[item].code);
+					positionList.push(this.deviceMap[item].position);
                 }
             });
             if (!iscsDeviceCodes.length) {
@@ -455,13 +621,44 @@ export default {
                 return;
             }
             sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => {
-                const audio = document.getElementById('voice');
-                audio.pause();
+				positionList.forEach(elem => {
+					const audio = document.getElementById(elem.toLowerCase()+'_voice');
+					audio.pause();
+				});
+				const audio = document.getElementById('voice');
+				audio.pause();
             }).catch(() => {
                 this.$message.error('背景音乐终止播放失败！');
             });
         },
         stopBroadcast() {
+            const iscsDeviceCodes = [];
+			const positionList = [];
+            this.enableAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+					positionList.push(this.deviceMap[item].position);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => {
+				positionList.forEach(elem => {
+					const audio = document.getElementById(elem.toLowerCase()+'_voice');
+					audio.pause();
+				});
+				const audio = document.getElementById('voice');
+				audio.pause();
+            }).catch(() => {
+                this.$message.error('广播终止播放失败！');
+            });
+        },
+        realTimeBroadCast() {
+            this.$refs.realTimeBroadcast.doShow();
+        },
+        releaseRealTime(content) {
             const iscsDeviceCodes = [];
             this.enableAreaList.forEach(item => {
                 if (this.deviceMap[item]) {
@@ -472,11 +669,14 @@ export default {
                 this.$message.error('请选择广播设备');
                 return;
             }
-            sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => {
-                const audio = document.getElementById('voice');
-                audio.pause();
+            const params = {
+                iscsDeviceCodes: iscsDeviceCodes,
+                content: content,
+                type: 'REAL_TIME'
+            };
+            sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(() => {
             }).catch(() => {
-                this.$message.error('广播终止播放失败！');
+                this.$message.error('发布广播失败！');
             });
         },
         releaseBroadcast() {
@@ -497,10 +697,10 @@ export default {
                     type: this.videoMode
                 };
                 sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
-                    this.voiceUrl = this.$store.state.user.resourcesUrl + this.resourcesList[this.messageIndex].url;
-                    const audio = document.getElementById('voice');
-                    audio.src = this.voiceUrl;
-                    audio.play();
+                    // this.voiceUrl = this.$store.state.user.resourcesUrl + this.resourcesList[this.messageIndex].url;
+                    // const audio = document.getElementById('voice');
+                    // audio.src = this.voiceUrl;
+                    // audio.play();
                 }).catch(() => {
                     this.$message.error('发布广播失败！');
                 });
@@ -703,7 +903,7 @@ export default {
     .pa-grey-box{
         position: absolute;
         left: 12%;
-        top: 70%;
+        top: 74%;
         width: 60%;
         height: 18%;
         background: #DDDDDD;
diff --git a/src/views/iscs/iscsSystem/config/pis/infoBroadcast.vue b/src/views/iscs/iscsSystem/config/pis/infoBroadcast.vue
index ce8ecbee1..f50753d52 100644
--- a/src/views/iscs/iscsSystem/config/pis/infoBroadcast.vue
+++ b/src/views/iscs/iscsSystem/config/pis/infoBroadcast.vue
@@ -7,7 +7,7 @@
     class="iscs-voice-broadcast-dialog"
   >
     <div>
-      <div class="dialog-header">信息广播</div>
+      <div class="dialog-header">滚动信息发布</div>
       <div class="iscs-pis-dialog-info">
         <el-radio-group v-model="addModel.infoType" @change="getResourcesList">
           <el-radio label="REAL_TIME">实时信息</el-radio>
@@ -59,7 +59,7 @@
       </div>
       <div v-show="addModel.infoType !== 'REAL_TIME'" style="margin-top: 10px">
         <div style="display: inline;">名称：</div>
-        <input v-model="resource.name" class="pis-dialog-input" style="width: 550px;">
+        <input disabled v-model="resource.name" class="pis-dialog-input" style="width: 550px;">
         <!--<input v-model="addModel.infoTime" class="pis-dialog-input" style="width: 140px;">-->
         <!--<div style="display: inline;">次</div>-->
       </div>
@@ -90,7 +90,7 @@
         <div class="button-group-content" :style="{left: addModel.infoType ==='REAL_TIME'?'300px':'550px'}">
           <div class="pis-button">设定中</div>
           <div class="pis-button" @click="releaseBroadcast">发布</div>
-          <div class="pis-button">取消</div>
+          <div class="pis-button" @click="doClose">取消</div>
         </div>
       </div>
       <!--<div class="pis-dialog-form-box">-->
diff --git a/src/views/iscs/iscsSystem/config/pis/mainScreen.vue b/src/views/iscs/iscsSystem/config/pis/mainScreen.vue
index 03f557547..bd9b5d2c5 100644
--- a/src/views/iscs/iscsSystem/config/pis/mainScreen.vue
+++ b/src/views/iscs/iscsSystem/config/pis/mainScreen.vue
@@ -4,12 +4,21 @@
       <div class="screen_header_text">乘客信息</div>
     </div>
     <div class="main_screen_content">
-      <div class="screen_left">
+      <div v-show="!isSingleStation" class="screen_left">
         <div class="screen_left_tab">特定区域</div>
-        <el-row><el-button v-for="(item, index) in verticalHeader" :key="index" class="screen_operate_name" :class="{'active': item.active}" @click="selectedBatch(item)">{{ item.title }}</el-button></el-row>
+        <el-row
+          ><el-button
+            v-for="(item, index) in verticalHeader"
+            :key="index"
+            class="screen_operate_name"
+            :class="{ active: item.active }"
+            @click="selectedBatch(item)"
+            >{{ item.title }}</el-button
+          ></el-row
+        >
       </div>
       <div class="screen_main_content">
-        <div class="screen_main_content_inner">
+        <div v-show="!isSingleStation" class="screen_main_content_inner">
           <div class="screen_left_text_group">
             <div v-for="(item, index) in verticalHeader" :key="index" class="each_data_info">{{ item.name }}</div>
           </div>
@@ -19,27 +28,74 @@
                 <div class="each_data_info" @click="selectedStation(station)">
                   <div class="screen_station_name">{{ station.stationName }}</div>
                 </div>
-                <div v-if="station.children&&station.children.length>0">
-                  <div v-for="(child,index) in station.children" :key="station.code+index" class="each_data_info" style="display: flex;align-items: center;justify-content: center;" @click="selectArea(station.code,index)">
-                    <div v-if="child.status==='default'" class="button_default_content">
-                      <div class="button_default" :style="{background:selectedAreaList.includes(station.code + '-' + index)?'#2EFF74':'#CDCDCD'}" />
+                <div v-if="station.children && station.children.length > 0">
+                  <div
+                    v-for="(child, index) in station.children"
+                    :key="station.code + index"
+                    class="each_data_info"
+                    style="display: flex;align-items: center;justify-content: center;"
+                    @click="selectArea(station.code, index)"
+                  >
+                    <div v-if="child.status === 'default'" class="button_default_content">
+                      <div
+                        class="button_default"
+                        :style="{ background: selectedAreaList.includes(station.code + '-' + index) ? '#2EFF74' : '#CDCDCD' }"
+                      />
                     </div>
-                    <div :id="station.code + '-' + index" style="width: 14px;height: 14px;margin-left: 5px;" />
+                    <div
+                      v-if="child.status === 'default'"
+                      :class="station.code + '-' + index"
+                      style="width: 14px;height: 14px;margin-left: 5px;"
+                      :style="{ backgroundColor: statusColor['normal'] }"
+                    />
+                    <div>{{ `${station.code}-${index}` }}</div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
+        <div v-show="isSingleStation" class="screen_main_content_inner_single_station">
+          <div class="header">
+            <div v-for="(item, index) in verticalHeader" :key="index" class="each_data_info">{{ item.name }}</div>
+          </div>
+          <div class="content">
+            <div class="list" v-if="currentStation && currentStation.children && currentStation.children.length > 0">
+              <div class="stationButton" @click="selectedStation(currentStation)">
+                <div class="screen_station_name">全车站</div>
+              </div>
+              <div
+                v-for="(child, index) in currentStation.children"
+                :key="currentStation.code + index"
+                class="each_data_info"
+                style="display: flex;align-items: center;justify-content: center;"
+                @click="selectArea(currentStation.code, index)"
+              >
+                <div v-if="child.status === 'default'" class="button_default_content">
+                  <div
+                    class="button_default"
+                    :style="{ background: selectedAreaList.includes(currentStation.code + '-' + index) ? '#2EFF74' : '#CDCDCD' }"
+                  />
+                </div>
+                <div
+                  v-if="child.status === 'default'"
+                  :class="currentStation.code + '-' + index"
+                  style="width: 14px;height: 14px;margin-left: 5px;"
+                  :style="{ backgroundColor: statusColor['normal'] }"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
       <div class="screen_right">
         <div class="each_operate">
           <div class="each_operate_text">操作</div>
-          <div class="each_operate_button" @click="showInfoBrroadcast">信息发布<br>窗口</div>
+          <div class="each_operate_button" @click="showInfoBrroadcast">滚动信息<br />发布</div>
         </div>
         <div class="each_operate">
           <div class="each_operate_text">信息清除</div>
-          <div class="each_operate_button" @click="stopBroadcast">清除<br>普通信息</div>
+          <div class="each_operate_button" @click="stopBroadcast">清除<br />普通信息</div>
         </div>
       </div>
     </div>
@@ -69,354 +125,552 @@
   </div>
 </template>
 <script>
-import { getByGroupStationList } from '@/api/jmap/map';
-import { queryIscsDeviceCod } from '@/api/iscs';
-import InfoBroadcast from './infoBroadcast';
-import { sendCommandNew } from '@/api/jmap/training';
-import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp';
-import { getToken } from '@/utils/auth';
-export default {
-    name:'MainScreen',
-    components: {
-        InfoBroadcast
-    },
-    data() {
-        return {
-            verticalHeader: [
-                {name: '车站', title: '全线', key: 'station', type: 'header', active: false},
-                {name: '站厅(LCD)', title: '全站厅(LCD)', key: 'stationHall', type: 'checkBox', active: false},
-                {name: '上行站台', title: '全上行站台', key: 'uplinkStation', type: 'checkBox', active: false},
-                {name: '下行站台', title: '全下行站台', key: 'downlinkStation', type: 'checkBox', active: false},
-                {name: '出入口', title: '全出入口', key: 'passageway', type: 'checkBox', active: false},
-                {name: '物业', title: '全物业', key: 'property', type: 'checkBox', active: false},
-                {name: '天桥1', title: '天桥1', key: 'overbridge1', type: 'checkBox', active: false},
-                {name: '天桥2', title: '天桥2', key: 'overbridge2', type: 'checkBox', active: false},
-                {name: 'LED', title: '出入口(LED)', key: 'LED', type: 'checkBox', active: false}
-            ],
-            stationList:[],
-            selectedAreaList: [],
-            iscsDeviceMap: {},
-            deviceMap: {}
-        };
-    },
-    watch: {
-        '$store.state.socket.iscsStatePisMessages': function (list) {
-            if (list && list.length) {
-                list.forEach(item => {
-                    const index = this.iscsDeviceMap[item.code];
-                    if (index) {
-                        this.$set(this.deviceMap[index], 'state', item.state);
-                        const div = document.getElementById(index);
-                        div.style.background = item.state === 'normal' ? '#2EFF74' : '#D4D4D4';
-                    }
-                });
-            }
+import { getByGroupStationList } from '@/api/jmap/map'
+import { queryIscsDeviceCod } from '@/api/iscs'
+import InfoBroadcast from './infoBroadcast'
+import { sendCommandNew } from '@/api/jmap/training'
+import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp'
+import { getToken } from '@/utils/auth'
 
-        }
+export default {
+  name: 'MainScreen',
+  components: {
+    InfoBroadcast,
+  },
+  computed: {
+    currentStation() {
+      return this.stationList.find(station => station.code === this.$route.query.stationId)
     },
-    async created () {
-        // 请求当前线路车站列表
-        try {
-            const positionMap = {
-                LCD: 0,
-                UP_STAND: 1,
-                DOWN_STAND: 2,
-                GATE: 3,
-                PROPERTY: 4,
-                OVERPASS1: 5,
-                OVERPASS2: 6,
-                LED:7
-            };
-            const res = await getByGroupStationList(this.$route.query.group);
-            const resp = await queryIscsDeviceCod({ mapId: this.$route.query.mapId, system: 'PIS' });
-            if (res.code == 200) {
-                this.stationList = [];
-                res.data.forEach(station => {
-                    if (!station.depot) {
-                        const children = [{status:'none'}, {status:'none'}, {status:'none'}, {status:'none'}, {status:'none'}, {status:'none'}, {status:'none'}, {status:'none'}];
-                        if (resp.code == 200) {
-                            resp.data && resp.data.forEach(item => {
-                                if (station.code == item.station) {
-                                    const index = positionMap[item.position];
-                                    if ( children[index]) {
-                                        children[index].status = 'default';
-                                        this.iscsDeviceMap[item.code] = station.code + '-' + index;
-                                        this.deviceMap[station.code + '-' + index] = item;
-                                    }
-                                }
-                            });
-                        }
-                        const param = {
-                            stationName: station.name,
-                            code: station.code,
-                            children:children
-                        };
-                        this.stationList.push(param);
-                    }
-                });
-            }
-            this.subscribe();
-        } catch (e) {
-            this.$message.error('获取车站列表失败！');
-        }
+    isSingleStation() {
+      return this.$route.query.stationId.startsWith('Station')
     },
-    beforeDestroy() {
-        this.clearSubscribe();
-    },
-    methods:{
-        showInfoBrroadcast() {
-            this.$refs.infoBroadcast.doShow();
-        },
-        stopBroadcast() {
-            const iscsDeviceCodes = [];
-            this.selectedAreaList.forEach(item => {
-                if (this.deviceMap[item]) {
-                    iscsDeviceCodes.push(this.deviceMap[item].code);
-                }
-            });
-            if (!iscsDeviceCodes.length) {
-                this.$message.error('请选择广播设备');
-                return;
-            }
-            sendCommandNew(this.$route.query.group, 'ISCS_PIS_Stop_Playing', {iscsDeviceCodes: iscsDeviceCodes}).then(resp => {
-                const audio = document.getElementById('voice');
-                audio.pause();
-            }).catch(() => {
-                this.$message.error('广播终止播放失败！');
-            });
-        },
-        releaseBroadcast(voice, type) {
-            const iscsDeviceCodes = [];
-            this.selectedAreaList.forEach(item => {
-                if (this.deviceMap[item]) {
-                    iscsDeviceCodes.push(this.deviceMap[item].code);
-                }
-            });
-            if (!iscsDeviceCodes.length) {
-                this.$message.error('请选择广播设备');
-                return;
-            }
-            const params = {
-                resourceId: voice.id,
-                iscsDeviceCodes: iscsDeviceCodes,
-                name: voice.name,
-                content: voice.content,
-                type
-            };
-            sendCommandNew(this.$route.query.group, 'ISCS_PIS_Play', params).then(resp => {
-                const voiceUrl = this.$store.state.user.resourcesUrl + (voice.url || resp.data);
-                const audio = document.getElementById('voice');
-                audio.src = voiceUrl;
-                audio.play();
-            }).catch(() => {
-                this.$message.error('发布广播失败！');
-            });
-        },
-        selectArea(stationName, index) {
-            const elem = stationName + '-' + index;
-            if (this.selectedAreaList.includes(elem)) {
-                const areaIndex = this.selectedAreaList.indexOf(elem);
-                this.selectedAreaList.splice(areaIndex, 1);
-            } else {
-                this.selectedAreaList.push(elem);
-            }
-        },
-        selectedStation(station) {
-            const flag = this.checkStationSelected(station);
-            station.children.forEach((item, index) => {
-                const elem = station.code + '-' + index;
-                if (item.status === 'default' && flag) {
-                    const areaIndex = this.selectedAreaList.indexOf(elem);
-                    this.selectedAreaList.splice(areaIndex, 1);
-                } else if (item.status === 'default' && !flag && !this.selectedAreaList.includes(elem)) {
-                    this.selectedAreaList.push(elem);
-                }
-            });
-        },
-        checkStationSelected(station) {
-            let stationSelectedFlag = true;
-            station.children.some((item, index) => {
-                if (item.status === 'default') {
-                    stationSelectedFlag = this.selectedAreaList.includes(station.code + '-' + index);
-                    return !stationSelectedFlag;
-                }
-            });
-            return stationSelectedFlag;
-        },
-        selectedBatch(data) {
-            data.active = !data.active;
-            if (data.key == 'station') {
-                this.selectedAllLine(data);
-            } else {
-                let areaIndex;
-                this.verticalHeader.map((item, index) => {
-                    if (item.key == data.key) {
-                        areaIndex = index;
-                    }
-                });
-                const flag = data.active;
-                this.stationList.forEach(station => {
-                    station.children.forEach((item, index) => {
-                        const elem = station.code + '-' + index;
-                        if (item.status == 'default' && (index + 1) == areaIndex && !flag) {
-                            const selectedAreaIndex = this.selectedAreaList.indexOf(elem);
-                            this.selectedAreaList.splice(selectedAreaIndex, 1);
-                        } else if (item.status == 'default' && (index + 1) == areaIndex && flag) {
-                            this.selectedAreaList.push(elem);
-                        }
-                    });
-                });
-            }
-        },
-        selectedAllLine(data) {
-            const flag = data.active;
-            this.selectedAreaList = [];
-            this.stationList.forEach(station => {
-                station.children.forEach((item, index) => {
-                    if (item.status === 'default' && flag) {
-                        this.selectedAreaList.push(station.code + '-' + index);
-                    }
-                });
-            });
-        },
-        subscribe() {
-            this.clearSubscribe();
-            const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
-            creatSubscribe(getTopic('ISCSPIS', this.$route.query.group ), header);
-            this.$store.dispatch('app/animationsClose');
-        },
-        clearSubscribe() {
-            clearSubscribe(getTopic('ISCSPIS', this.$route.query.group));
-        }
+  },
+  data() {
+    return {
+      verticalHeader: [
+        { name: '车站', title: '全线', key: 'station', type: 'header', active: false },
+        { name: '站厅(LCD)', title: '全站厅(LCD)', key: 'stationHall', type: 'checkBox', active: false },
+        { name: '上行站台', title: '全上行站台', key: 'uplinkStation', type: 'checkBox', active: false },
+        { name: '下行站台', title: '全下行站台', key: 'downlinkStation', type: 'checkBox', active: false },
+        { name: '出入口', title: '全出入口', key: 'passageway', type: 'checkBox', active: false },
+        { name: '物业', title: '全物业', key: 'property', type: 'checkBox', active: false },
+        { name: '天桥1', title: '天桥1', key: 'overbridge1', type: 'checkBox', active: false },
+        { name: '天桥2', title: '天桥2', key: 'overbridge2', type: 'checkBox', active: false },
+        { name: 'LED', title: '出入口(LED)', key: 'LED', type: 'checkBox', active: false },
+      ],
+      statusColor: {
+        normal: '#00ff00',
+      },
+      stationList: [],
+      selectedAreaList: [],
+      iscsDeviceMap: {},
+      deviceMap: {},
     }
-};
+  },
+  watch: {
+    // '$store.state.socket.iscsStatePisMessages': function(list) {
+    //   if (list && list.length) {
+    //     list.forEach(item => {
+    //       const index = this.iscsDeviceMap[item.code]
+    //       if (index) {
+    //         this.$set(this.deviceMap[index], 'state', item.state)
+    //       }
+    //     })
+    //   }
+    // },
+  },
+  async created() {
+    // 请求当前线路车站列表
+    try {
+      const positionMap = {
+        LCD: 0,
+        UP_STAND: 1,
+        DOWN_STAND: 2,
+        GATE: 3,
+        PROPERTY: 4,
+        OVERPASS1: 5,
+        OVERPASS2: 6,
+        LED: 7,
+      }
+      const res = await getByGroupStationList(this.$route.query.group)
+      const resp = await queryIscsDeviceCod({ mapId: this.$route.query.mapId, system: 'PIS' })
+      if (res.code == 200) {
+        this.stationList = []
+        res.data.forEach(station => {
+          if (!station.depot) {
+            const children = [
+              { status: 'none' },
+              { status: 'none' },
+              { status: 'none' },
+              { status: 'none' },
+              { status: 'none' },
+              { status: 'none' },
+              { status: 'none' },
+              { status: 'none' },
+            ]
+            if (resp.code == 200) {
+              resp.data &&
+                resp.data.forEach(item => {
+                  if (station.code == item.station) {
+                    const index = positionMap[item.position]
+                    if (children[index]) {
+                      children[index].status = 'default'
+                      this.iscsDeviceMap[item.code] = station.code + '-' + index
+                      this.deviceMap[station.code + '-' + index] = item
+                    }
+                  }
+                })
+            }
+            const param = {
+              stationName: station.name,
+              code: station.code,
+              children: children,
+            }
+            this.stationList.push(param)
+          }
+        })
+      }
+      this.subscribe()
+    } catch (e) {
+      this.$message.error('获取车站列表失败！')
+    }
+  },
+  beforeDestroy() {
+    this.clearSubscribe()
+  },
+  methods: {
+    showInfoBrroadcast() {
+      this.$refs.infoBroadcast.doShow()
+    },
+    stopBroadcast() {
+      const iscsDeviceCodes = []
+      this.selectedAreaList.forEach(item => {
+        if (this.deviceMap[item]) {
+          iscsDeviceCodes.push(this.deviceMap[item].code)
+        }
+      })
+      if (!iscsDeviceCodes.length) {
+        this.$message.error('请选择广播设备')
+        return
+      }
+      sendCommandNew(this.$route.query.group, 'ISCS_PIS_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes })
+        .then(resp => {
+          // const audio = document.getElementById('voice')
+          // audio.pause()
+        })
+        .catch(() => {
+          this.$message.error('广播终止播放失败！')
+        })
+    },
+    releaseBroadcast(voice, type) {
+      const iscsDeviceCodes = []
+      this.selectedAreaList.forEach(item => {
+        if (this.isSingleStation && !item.startsWith(this.$route.query.stationId)) return
+        if (this.deviceMap[item]) {
+          iscsDeviceCodes.push(this.deviceMap[item].code)
+        }
+      })
+      if (!iscsDeviceCodes.length) {
+        this.$message.error('请选择广播设备')
+        return
+      }
+      const params = {
+        resourceId: voice.id,
+        iscsDeviceCodes: iscsDeviceCodes,
+        name: voice.name,
+        content: voice.content,
+        type,
+      }
+      sendCommandNew(this.$route.query.group, 'ISCS_PIS_Play', params)
+        .then(resp => {
+          // const voiceUrl = this.$store.state.user.resourcesUrl + (voice.url || resp.data)
+          // const audio = document.getElementById('voice')
+          // audio.src = voiceUrl
+          // audio.play()
+        })
+        .catch(() => {
+          this.$message.error('发布广播失败！')
+        })
+    },
+    selectArea(stationName, index) {
+      const elem = stationName + '-' + index
+      if (this.selectedAreaList.includes(elem)) {
+        const areaIndex = this.selectedAreaList.indexOf(elem)
+        this.selectedAreaList.splice(areaIndex, 1)
+      } else {
+        this.selectedAreaList.push(elem)
+      }
+    },
+    selectedStation(station) {
+      const flag = this.checkStationSelected(station)
+      station.children.forEach((item, index) => {
+        const elem = station.code + '-' + index
+        if (item.status === 'default' && flag) {
+          const areaIndex = this.selectedAreaList.indexOf(elem)
+          this.selectedAreaList.splice(areaIndex, 1)
+        } else if (item.status === 'default' && !flag && !this.selectedAreaList.includes(elem)) {
+          this.selectedAreaList.push(elem)
+        }
+      })
+    },
+    checkStationSelected(station) {
+      let stationSelectedFlag = true
+      station.children.some((item, index) => {
+        if (item.status === 'default') {
+          stationSelectedFlag = this.selectedAreaList.includes(station.code + '-' + index)
+          return !stationSelectedFlag
+        }
+      })
+      return stationSelectedFlag
+    },
+    selectedBatch(data) {
+      data.active = !data.active
+      if (data.key == 'station') {
+        this.selectedAllLine(data)
+      } else {
+        let areaIndex
+        this.verticalHeader.map((item, index) => {
+          if (item.key == data.key) {
+            areaIndex = index
+          }
+        })
+        const flag = data.active
+        this.stationList.forEach(station => {
+          station.children.forEach((item, index) => {
+            const elem = station.code + '-' + index
+            if (item.status == 'default' && index + 1 == areaIndex && !flag) {
+              const selectedAreaIndex = this.selectedAreaList.indexOf(elem)
+              this.selectedAreaList.splice(selectedAreaIndex, 1)
+            } else if (item.status == 'default' && index + 1 == areaIndex && flag) {
+              this.selectedAreaList.push(elem)
+            }
+          })
+        })
+      }
+    },
+    selectedAllLine(data) {
+      const flag = data.active
+      this.selectedAreaList = []
+      this.stationList.forEach(station => {
+        station.children.forEach((item, index) => {
+          if (item.status === 'default' && flag) {
+            this.selectedAreaList.push(station.code + '-' + index)
+          }
+        })
+      })
+    },
+    subscribe() {
+      this.clearSubscribe()
+      const header = { group: this.$route.query.group || '', 'X-Token': getToken() }
+      creatSubscribe(getTopic('ISCSPIS', this.$route.query.group), header)
+      this.$store.dispatch('app/animationsClose')
+    },
+    clearSubscribe() {
+      clearSubscribe(getTopic('ISCSPIS', this.$route.query.group))
+    },
+  },
+}
 </script>
 <style lang="scss" scoped>
-/deep/{
-	.el-button{
-		border-radius: 0 !important;
-		color: #333 !important;
-		width: 100% !important;
-	}
+/deep/ {
+  .el-button {
+    border-radius: 0 !important;
+    color: #333 !important;
+    width: 100% !important;
+  }
 }
-.screen_header_text{margin-top: 20px;text-align: center;color: #9af1ec;font-size: 18px;padding-right: 100px;padding-bottom: 10px;}
-.main_screen{padding-left: 50px;width: 100%;}
-.main_screen_header{}
-.screen_main_content_inner{width: 100%;height: 500px;border-top: 2px solid #8c8a89;overflow-y: auto;display:flex;border-left: 2px solid #8c8a89;border-right: 2px solid #fff;border-bottom: 2px solid #fff;}
-.main_screen_content{display:inline-block;width: 100%;padding-left:100px;padding-right:200px;position: relative;height:500px;}
-.screen_left{display: inline-block;padding-bottom: 10px;padding-top: 10px;width: 100px;border: 2px #ccc solid;
-border-top: 2px solid #8c8a89;border-left: 2px solid #8c8a89;border-right: 2px solid #fff;border-bottom: 2px solid #fff;position:absolute;left:0;}
-.screen_left_tab{
-    font-size: 12px;
-    text-align: center;
-    color: #86e4d6;
+.screen_header_text {
+  margin-top: 20px;
+  text-align: center;
+  color: #9af1ec;
+  font-size: 18px;
+  padding-right: 100px;
+  padding-bottom: 10px;
 }
-.sceen_left_content{}
-.screen_right{display: inline-block;position:absolute;right:0;top:0;width: 200px;}
-.each_operate{width: 92px;padding: 10px;border-top: 2px solid #8c8a89;border-left: 2px solid #8c8a89;border-right: 2px solid #fff;border-bottom: 2px solid #fff;margin-top: 30px;margin-left: 30px;}
-.each_operate_text{text-align: center;font-size: 12px;color: #a9f4f6;}
-.each_operate_button{text-align: center;font-size: 12px;margin-top: 5px;cursor:pointer;background: #CCCCCC;display: inline-block;border-top: 2px solid #fff;border-left: 2px solid #fff;border-right: 2px solid #565656;border-bottom: 2px solid #565656;padding: 2px 8px;line-height: 140%;}
-.footer_button_group{position: absolute;right: 0;top: 0;width: 160px;}
-.main_screen_footer{margin-left: 120px;padding-right:160px;position: relative;margin-top:10px;}
-#screen_footer_text{
-    width:100%;
-    resize:none;
-    height: 190px;
-    border-top: 2px solid #8c8a89;
-    border-left: 2px solid #8c8a89;
-    border-right: 2px solid #fff;
-    border-bottom: 2px solid #fff;
+.main_screen {
+  padding-left: 50px;
+  width: 100%;
 }
-.each_footer_button{margin-left:20px;margin-top: 10px;}
-.each_footer_button_icon{width: 14px;height: 14px;display: inline-block;}
-.each_footer_button_text{font-size: 13px;color: #fff;margin-left: 5px;display: inline-block;vertical-align: top;margin-top: 1px;}
-.screen_main_content{padding-left: 20px;padding-right: 20px;}
-.screen_status_red{background:#ff0000;}
-.screen_status_green{background:#00ff00;}
-.screen_status_blue{background:#00aaff}
-.screen_status_active{border-top: 2px solid #f1f1f1;border-left: 2px solid #d0d8dd;border-right: 2px solid #959da0;border-bottom: 2px solid #90999d;}
-.screen_status_active:after{
-    content:'';
-    border-top: 2px solid #a6a2a6;
-    border-left: 2px solid #a5aca5;
-    border-right: 2px solid #ececec;
-    border-bottom: 2px solid #e4e4e4;
-    background: #00ff00;
-    min-width: 10px;
-    height: 10px;
-    display: inline-block;
-    vertical-align: top;
+.main_screen_header {
 }
-.screen_status_active::after{content:'';border-top: 2px solid #a6a2a6;border-left: 2px solid #a5aca5;border-right: 2px solid #ececec;border-bottom: 2px solid #e4e4e4;background: #00ff00;min-width: 10px;height: 10px;display: inline-block;vertical-align: top;}
-.screen_left_text_group{width:260px;padding: 0px 10px 10px 10px;font-size: 14px;color: #9de4e8;display: inline-block;}
-.each_data_info{margin-top:10px;height:20px;}
-.screen_right_group{display: inline-block;vertical-align: top;font-size:0;overflow-x: auto;min-height:100%;}
-.each_station_info{width:130px;display: inline-block;vertical-align:top;padding-right: 10px;}
-.screen_station_name,.screen_operate_name{
-    padding: 2px 0px;
-    font-size: 12px;
+.screen_main_content_inner {
+  width: 100%;
+  height: 500px;
+  border-top: 2px solid #8c8a89;
+  overflow-y: auto;
+  display: flex;
+  border-left: 2px solid #8c8a89;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+}
+.screen_main_content_inner_single_station {
+  width: 100%;
+  height: 500px;
+  border-top: 2px solid #8c8a89;
+  border-left: 2px solid #8c8a89;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+  .header {
+    display: flex;
+    justify-content: space-evenly;
+    color: #9af1ec;
+    & > div {
+      width: 11%;
+      text-align: center;
+    }
+  }
+  .content {
+    .list {
+      display: flex;
+      justify-content: space-evenly;
+      & > div {
+        width: 11%;
+        text-align: center;
+      }
+      .stationButton {
+        margin: 0;
+        .screen_station_name {
+          width: auto;
+        }
+      }
+    }
+  }
+}
+.main_screen_content {
+  display: inline-block;
+  width: 100%;
+  padding-left: 100px;
+  padding-right: 200px;
+  position: relative;
+  height: 500px;
+}
+.screen_left {
+  display: inline-block;
+  padding-bottom: 10px;
+  padding-top: 10px;
+  width: 100px;
+  border: 2px #ccc solid;
+  border-top: 2px solid #8c8a89;
+  border-left: 2px solid #8c8a89;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+  position: absolute;
+  left: 0;
+}
+.screen_left_tab {
+  font-size: 12px;
+  text-align: center;
+  color: #86e4d6;
+}
+.sceen_left_content {
+}
+.screen_right {
+  display: inline-block;
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 200px;
+}
+.each_operate {
+  width: 92px;
+  padding: 10px;
+  border-top: 2px solid #8c8a89;
+  border-left: 2px solid #8c8a89;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+  margin-top: 30px;
+  margin-left: 30px;
+}
+.each_operate_text {
+  text-align: center;
+  font-size: 12px;
+  color: #a9f4f6;
+}
+.each_operate_button {
+  text-align: center;
+  font-size: 12px;
+  margin-top: 5px;
+  cursor: pointer;
+  background: #cccccc;
+  display: inline-block;
+  border-top: 2px solid #fff;
+  border-left: 2px solid #fff;
+  border-right: 2px solid #565656;
+  border-bottom: 2px solid #565656;
+  padding: 2px 8px;
+  line-height: 140%;
+}
+.footer_button_group {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 160px;
+}
+.main_screen_footer {
+  margin-left: 120px;
+  padding-right: 160px;
+  position: relative;
+  margin-top: 10px;
+}
+#screen_footer_text {
+  width: 100%;
+  resize: none;
+  height: 190px;
+  border-top: 2px solid #8c8a89;
+  border-left: 2px solid #8c8a89;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+}
+.each_footer_button {
+  margin-left: 20px;
+  margin-top: 10px;
+}
+.each_footer_button_icon {
+  width: 14px;
+  height: 14px;
+  display: inline-block;
+}
+.each_footer_button_text {
+  font-size: 13px;
+  color: #fff;
+  margin-left: 5px;
+  display: inline-block;
+  vertical-align: top;
+  margin-top: 1px;
+}
+.screen_main_content {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+.screen_status_red {
+  background: #ff0000;
+}
+.screen_status_green {
+  background: #00ff00;
+}
+.screen_status_blue {
+  background: #00aaff;
+}
+.screen_status_active {
+  border-top: 2px solid #f1f1f1;
+  border-left: 2px solid #d0d8dd;
+  border-right: 2px solid #959da0;
+  border-bottom: 2px solid #90999d;
+}
+.screen_status_active:after {
+  content: '';
+  border-top: 2px solid #a6a2a6;
+  border-left: 2px solid #a5aca5;
+  border-right: 2px solid #ececec;
+  border-bottom: 2px solid #e4e4e4;
+  background: #00ff00;
+  min-width: 10px;
+  height: 10px;
+  display: inline-block;
+  vertical-align: top;
+}
+.screen_status_active::after {
+  content: '';
+  border-top: 2px solid #a6a2a6;
+  border-left: 2px solid #a5aca5;
+  border-right: 2px solid #ececec;
+  border-bottom: 2px solid #e4e4e4;
+  background: #00ff00;
+  min-width: 10px;
+  height: 10px;
+  display: inline-block;
+  vertical-align: top;
+}
+.screen_left_text_group {
+  width: 260px;
+  padding: 0px 10px 10px 10px;
+  font-size: 14px;
+  color: #9de4e8;
+  display: inline-block;
+}
+.each_data_info {
+  margin-top: 10px;
+  height: 20px;
+}
+.screen_right_group {
+  display: inline-block;
+  vertical-align: top;
+  font-size: 0;
+  overflow-x: auto;
+  min-height: 100%;
+}
+.each_station_info {
+  width: 130px;
+  display: inline-block;
+  vertical-align: top;
+  padding-right: 10px;
+}
+.screen_station_name,
+.screen_operate_name {
+  padding: 2px 0px;
+  font-size: 12px;
+  background: #cccccc;
+  text-align: center;
+  border-top: 2px solid #f9f9f9;
+  border-left: 2px solid #f6f8f8;
+  border-right: 2px solid #9e9e9e;
+  border-bottom: 2px solid #636667;
+  cursor: pointer;
+  margin-left: 0;
+  margin-top: 10px;
+  &:active,
+  &.active {
     background: #cccccc;
-    text-align: center;
-    border-top: 2px solid #f9f9f9;
-    border-left: 2px solid #f6f8f8;
-    border-right: 2px solid #9e9e9e;
-    border-bottom: 2px solid #636667;
-    cursor: pointer;
-    margin-left: 0;
-	margin-top: 10px;
-	&:active,
-	&.active{
-		background: #cccccc;
-		border-top: 2px solid #9c9c9c;
-		border-left: 2px solid #9c9c9c;
-		border-right: 2px solid #fff;
-		border-bottom: 2px solid #fff;
-	}
-}
-.screen_station_name{
-    width: 120px;
-}
-.screen_station_name.active{
-    background: #EBB570;
-    border-top: 2px solid #795B31;
-    border-left: 2px solid #795B31;
+    border-top: 2px solid #9c9c9c;
+    border-left: 2px solid #9c9c9c;
     border-right: 2px solid #fff;
     border-bottom: 2px solid #fff;
+  }
+}
+.screen_station_name {
+  width: 120px;
+}
+.screen_station_name.active {
+  background: #ebb570;
+  border-top: 2px solid #795b31;
+  border-left: 2px solid #795b31;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
 }
 
-.data_button_info{
-      width: 14px;
-      height: 14px;
-      display: inline-block;
-      margin-left: 52px;
-      position: relative;
+.data_button_info {
+  width: 14px;
+  height: 14px;
+  display: inline-block;
+  margin-left: 52px;
+  position: relative;
 }
-.button_default{
-    height: 10px;
-    width: 10px;
-    margin: auto;
-    background:#CCCCCC;
-    position: relative;
-    top: 50%;
-    transform: translateY(-50%);
-    border-top: 2px solid #fff;
-    border-left: 2px solid #fff;
-    border-right: 2px solid #898888;
-    border-bottom: 2px solid #898888;
+.button_default {
+  height: 10px;
+  width: 10px;
+  margin: auto;
+  background: #cccccc;
+  position: relative;
+  top: 50%;
+  transform: translateY(-50%);
+  border-top: 2px solid #fff;
+  border-left: 2px solid #fff;
+  border-right: 2px solid #898888;
+  border-bottom: 2px solid #898888;
 }
-.button_default_content{
-    height: 18px;
-    width: 18px;
-    background: #D4D4D4;
-    display: inline-block;
-    border-top: 2px solid #fff;
-    border-left: 2px solid #fff;
-    border-right: 2px solid #898888;
-    border-bottom: 2px solid #898888;
+.button_default_content {
+  height: 18px;
+  width: 18px;
+  background: #d4d4d4;
+  display: inline-block;
+  border-top: 2px solid #fff;
+  border-left: 2px solid #fff;
+  border-right: 2px solid #898888;
+  border-bottom: 2px solid #898888;
 }
-.screen_right_group_in{
-    display: -webkit-flex;
-    display: flex;
-    -webkit-flex-flow: row nowrap;
+.screen_right_group_in {
+  display: -webkit-flex;
+  display: flex;
+  -webkit-flex-flow: row nowrap;
 }
 </style>
diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
index 7f764c25c..e8a153d94 100644
--- a/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
@@ -3,7 +3,7 @@
     <el-dialog
       v-dialogDrag
       class="iscs_fuzhou-01__systerm route-detail"
-      title="故障设置"
+      :title="title"
       :visible.sync="show"
       width="300px"
       :before-close="doClose"
@@ -60,12 +60,14 @@ export default {
             options: [
                 { label: '104A断路器故障', value: 'group_2' },
                 { label: '104B断路器故障', value: 'group_52' },
-                { label: '框架电流保护故障', value: 'frame_group' }
+                { label: '框架电流保护故障', value: 'frame_group' },
+                { label: '闸机故障', value: 'gate_fault' }
             ],
             list: {
                 valve: ['控分', '控合']
             },
-            farmed: ''
+            farmed: '',
+            type: ''
         };
     },
     computed: {
@@ -74,10 +76,17 @@ export default {
         ]),
         show() {
             return this.dialogShow;
+        },
+        title() {
+            return this.type === 'CANCEL' ? '故障取消' : '故障设置';
         }
     },
     methods: {
-        doShow() {
+        doShow(type) {
+            this.type = type;
+            if (type === 'CANCEL') {
+                this.options = [{ label: '闸机故障', value: 'gate_fault' }];
+            }
             this.dialogShow = true;
             this.elemList = [];
         },
@@ -91,6 +100,12 @@ export default {
                     this.farmed = '';
                     if (this.formModel.value == 'frame_group') {
                         this.setMalfunction();
+                    } else if (this.formModel.value === 'gate_fault') {
+                        if (this.$route.query.stationId && this.$route.params.mode === 'autoTicket') {
+                            this.$store.dispatch('iscs/handlerGateFaultList', { type: this.type, stationCode: this.$route.query.stationId });
+                        } else {
+                            this.$message.error('请在车站自动售检票系统中设置或取消故障！');
+                        }
                     } else {
                         this.setModelMalfunction(this.$iscs.iscsDevice[this.formModel.value].model);
                     }
diff --git a/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue b/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue
index f05ce8962..154c7ee0f 100644
--- a/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue
@@ -75,11 +75,11 @@ export default {
         subscribe(stationCode) {
             this.clearSubscribe();
             const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
-            creatSubscribe(getTopic('ISCSPSD', this.$route.query.group, stationCode ), header);
+            creatSubscribe(getTopic('ISCSPSD', this.$route.query.group, {stationCode} ), header);
             this.$store.dispatch('app/animationsClose');
         },
         clearSubscribe(stationCode) {
-            clearSubscribe(getTopic('ISCSPSD', this.$route.query.group, stationCode));
+            clearSubscribe(getTopic('ISCSPSD', this.$route.query.group, {stationCode}));
         }
     }
 };
diff --git a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
index 0e0a5ddd9..f21e20670 100644
--- a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
@@ -41,6 +41,9 @@ export default {
         $route() {
             this.mode = this.$route.params.mode;
             this.getInitData();
+        },
+        '$store.state.iscs.gateFaultCount': function(val) {
+            this.$store.dispatch('iscs/updateIscsState', [{deviceType: 'GATE', status: this.$store.state.iscs.gateFaultList.includes(this.stationId) ? 0 : 1}]);
         }
     },
     created() {
@@ -84,6 +87,9 @@ export default {
                     const data = JSON.parse(resp.data.graphData);
                     this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
                     document.querySelector('.fasIndex').scrollTop = 0;
+                    if (this.mode === 'autoTicket') {
+                        this.$store.dispatch('iscs/updateIscsState', [{deviceType: 'GATE', status: this.$store.state.iscs.gateFaultList.includes(this.stationId) ? 0 : 1}]);
+                    }
                 } else {
                     this.loading = false;
                 }
diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue
index d3a5751f7..d56187e81 100644
--- a/src/views/iscs/iscsSystem/stationNav.vue
+++ b/src/views/iscs/iscsSystem/stationNav.vue
@@ -2,8 +2,8 @@
   <div>
     <div class="station-nav-out">
       <div class="station-nav">
-        <div class="station-line" />
         <div class="stationList">
+          <div class="station-line" />
           <div v-for="(item, index) in stationList" :key="index" class="station-box-out">
             <div class="station-box">
               <div class="leftRect" />
@@ -64,6 +64,7 @@
         <!-- <span v-show="!alarmInfo" class="point_box" /> -->
       </div>
       <div class="bottom-back" @click="getIncidentList">事件</div>
+      <div class="bottom-back" @click="cancelMalfunction">故障取消</div>
       <div class="bottom-back" @click="handleMalfunction">故障设置</div>
     </div>
     <alarm-config ref="alarmConfig" />
@@ -460,7 +461,10 @@ export default {
         },
         // 设置故障
         handleMalfunction() {
-            this.$refs.malfunction.doShow();
+            this.$refs.malfunction.doShow('SET');
+        },
+        cancelMalfunction() {
+            this.$refs.malfunction.doShow('CANCEL');
         },
         selectChildren(type, isReplace = false) { // 选择菜单
             let stationName = '';
@@ -512,10 +516,9 @@ export default {
 }
 .station-line{
     height: 12px;
-    width: 80%;
+    width: 100%;
     position: absolute;
     background-image: linear-gradient(to bottom , #9c9c9c, #F0F0F0,#9c9c9c);
-    left: 10px;
     top: 25px;
     border: 1px #505050 solid;
 }
@@ -574,7 +577,7 @@ export default {
 .station-box{
     display: inline-block;
     position: relative;
-    margin-right: 1.8vw;
+    // margin-right: 1.8vw;
     width: 1.5vw;
     margin-top: 20px;
     cursor: pointer;
@@ -704,8 +707,13 @@ background:rgba(231,237,253,0.9);
     padding:0px 1vw;
 }
 .stationList{
-    display: inline-block;
+    // display: inline-block;
+    display: flex;
+    position: relative;
+    justify-content: space-between;
+    float: left;
     height: 100%;
+    width: 82%;
 }
 .station-nav-out{
     position: absolute;
diff --git a/src/views/iscsSystem/自动售票.json b/src/views/iscsSystem/自动售票.json
index e3a3568d2..a408f3476 100644
--- a/src/views/iscsSystem/自动售票.json
+++ b/src/views/iscsSystem/自动售票.json
@@ -1,2184 +1,521 @@
 {
-    "iscsLineList":[
-        {
-            "points":[
-                {
-                    "x":64,
-                    "y":76
-                },
-                {
-                    "x":149,
-                    "y":76
-                }
-            ],
-            "code":"IscsLine_1",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":10,
-                    "y":10
-                },
-                {
-                    "x":80,
-                    "y":10
-                }
-            ],
-            "code":"IscsLine_2",
-            "_type":"IscsLine",
-            "isFillGradual":false,
-            "lineWidth":0,
-            "fillColor":"#fff",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":10,
-                    "y":10
-                },
-                {
-                    "x":20,
-                    "y":10
-                }
-            ],
-            "code":"IscsLine_3",
-            "_type":"IscsLine",
-            "isFillGradual":false,
-            "lineWidth":0,
-            "fillColor":"#fff",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":64,
-                    "y":82
-                },
-                {
-                    "x":149,
-                    "y":82
-                }
-            ],
-            "code":"IscsLine_4",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":104,
-                    "y":83
-                },
-                {
-                    "x":104,
-                    "y":767
-                }
-            ],
-            "code":"IscsLine_5",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":63,
-                    "y":716
-                },
-                {
-                    "x":103,
-                    "y":716
-                }
-            ],
-            "code":"IscsLine_6",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":150,
-                    "y":53
-                },
-                {
-                    "x":150,
-                    "y":83
-                }
-            ],
-            "code":"IscsLine_7",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":209,
-                    "y":74
-                },
-                {
-                    "x":1694,
-                    "y":74
-                }
-            ],
-            "code":"IscsLine_8",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":10,
-                    "y":9
-                },
-                {
-                    "x":20,
-                    "y":9
-                }
-            ],
-            "code":"IscsLine_9",
-            "_type":"IscsLine",
-            "isFillGradual":false,
-            "lineWidth":0,
-            "fillColor":"#fff",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":209,
-                    "y":80
-                },
-                {
-                    "x":1694,
-                    "y":80
-                }
-            ],
-            "code":"IscsLine_10",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":208,
-                    "y":51
-                },
-                {
-                    "x":208,
-                    "y":81
-                }
-            ],
-            "code":"IscsLine_11",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":1693,
-                    "y":50
-                },
-                {
-                    "x":1693,
-                    "y":80
-                }
-            ],
-            "code":"IscsLine_12",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":185,
-                    "y":718
-                },
-                {
-                    "x":1785,
-                    "y":718
-                }
-            ],
-            "code":"IscsLine_13",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":185,
-                    "y":724
-                },
-                {
-                    "x":1785,
-                    "y":724
-                }
-            ],
-            "code":"IscsLine_14",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":1786,
-                    "y":50
-                },
-                {
-                    "x":1786,
-                    "y":760
-                }
-            ],
-            "code":"IscsLine_15",
-            "_type":"IscsLine",
-            "z2":0,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":821,
-                    "y":166
-                },
-                {
-                    "x":961,
-                    "y":166
-                }
-            ],
-            "code":"IscsLine_16",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":831,
-                    "y":177
-                },
-                {
-                    "x":961,
-                    "y":177
-                }
-            ],
-            "code":"IscsLine_17",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":824,
-                    "y":300
-                },
-                {
-                    "x":954,
-                    "y":300
-                }
-            ],
-            "code":"IscsLine_18",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":828,
-                    "y":311
-                },
-                {
-                    "x":958,
-                    "y":311
-                }
-            ],
-            "code":"IscsLine_19",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":959,
-                    "y":174
-                },
-                {
-                    "x":959,
-                    "y":300
-                }
-            ],
-            "code":"IscsLine_20",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":969,
-                    "y":181
-                },
-                {
-                    "x":969,
-                    "y":307
-                }
-            ],
-            "code":"IscsLine_21",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":793,
-                    "y":240
-                },
-                {
-                    "x":833,
-                    "y":240
-                }
-            ],
-            "code":"IscsLine_22",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":827,
-                    "y":269
-                },
-                {
-                    "x":827,
-                    "y":315
-                }
-            ],
-            "code":"IscsLine_23",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":816,
-                    "y":240
-                },
-                {
-                    "x":816,
-                    "y":300
-                }
-            ],
-            "code":"IscsLine_24",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":828,
-                    "y":181
-                },
-                {
-                    "x":828,
-                    "y":198
-                }
-            ],
-            "code":"IscsLine_25",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "points":[
-                {
-                    "x":816,
-                    "y":181
-                },
-                {
-                    "x":816,
-                    "y":201
-                }
-            ],
-            "code":"IscsLine_26",
-            "_type":"IscsLine",
-            "z2":4,
-            "isFillGradual":false,
-            "lineWidth":1,
-            "fillColor":"#FFFFFF",
-            "fillBackground":"",
-            "classify":"solid",
-            "arrowShow":"none",
-            "arrowSize":5,
-            "controlCode":"",
-            "modelList":[
-
-            ],
-            "isGradual":false,
-            "gradualShow":"level",
-            "zlevel":1,
-            "z":5
-        }
-    ],
-    "iscsTextList":[
-        {
-            "point":{
-                "x":900,
-                "y":46
-            },
-            "code":"IscsText_1",
-            "_type":"IscsText",
-            "context":"安平站 自动售检票系统",
-            "unit":"",
-            "textFill":"#FCFF52",
-            "fontSize":18,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":907,
-                "y":140
-            },
-            "code":"IscsText_2",
-            "_type":"IscsText",
-            "context":"非付费区",
-            "unit":"",
-            "textFill":"#FFFFFF",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":325,
-                "y":172
-            },
-            "code":"IscsText_3",
-            "_type":"IscsText",
-            "context":"非付费区",
-            "unit":"",
-            "textFill":"#FFFFFF",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1552,
-                "y":172
-            },
-            "code":"IscsText_4",
-            "_type":"IscsText",
-            "context":"非付费区",
-            "unit":"",
-            "textFill":"#FFFFFF",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":169,
-                "y":291
-            },
-            "code":"IscsText_5",
-            "_type":"IscsText",
-            "context":"T01",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":169,
-                "y":386
-            },
-            "code":"IscsText_6",
-            "_type":"IscsText",
-            "context":"V05",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":169,
-                "y":471
-            },
-            "code":"IscsText_7",
-            "_type":"IscsText",
-            "context":"V06",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":169,
-                "y":556
-            },
-            "code":"IscsText_8",
-            "_type":"IscsText",
-            "context":"V07",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":169,
-                "y":636
-            },
-            "code":"IscsText_9",
-            "_type":"IscsText",
-            "context":"V08",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1809,
-                "y":400
-            },
-            "code":"IscsText_10",
-            "_type":"IscsText",
-            "context":"V04",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1809,
-                "y":485
-            },
-            "code":"IscsText_11",
-            "_type":"IscsText",
-            "context":"V03",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1809,
-                "y":565
-            },
-            "code":"IscsText_12",
-            "_type":"IscsText",
-            "context":"V02",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1809,
-                "y":645
-            },
-            "code":"IscsText_13",
-            "_type":"IscsText",
-            "context":"V01",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1172,
-                "y":395
-            },
-            "code":"IscsText_14",
-            "_type":"IscsText",
-            "context":"付费区",
-            "unit":"",
-            "textFill":"#FFFFFF",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":540,
-                "y":252
-            },
-            "code":"IscsText_15",
-            "_type":"IscsText",
-            "context":"EN18",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":587,
-                "y":252
-            },
-            "code":"IscsText_16",
-            "_type":"IscsText",
-            "context":"EN19",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":630,
-                "y":252
-            },
-            "code":"IscsText_17",
-            "_type":"IscsText",
-            "context":"EN20",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":675,
-                "y":252
-            },
-            "code":"IscsText_18",
-            "_type":"IscsText",
-            "context":"EN21",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":717,
-                "y":252
-            },
-            "code":"IscsText_19",
-            "_type":"IscsText",
-            "context":"RE22",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1084,
-                "y":255
-            },
-            "code":"IscsText_20",
-            "_type":"IscsText",
-            "context":"RE13",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1128,
-                "y":255
-            },
-            "code":"IscsText_21",
-            "_type":"IscsText",
-            "context":"RE14",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1174,
-                "y":255
-            },
-            "code":"IscsText_22",
-            "_type":"IscsText",
-            "context":"RE15",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1217,
-                "y":255
-            },
-            "code":"IscsText_23",
-            "_type":"IscsText",
-            "context":"RE16",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1262,
-                "y":255
-            },
-            "code":"IscsText_24",
-            "_type":"IscsText",
-            "context":"RE17",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":490,
-                "y":640
-            },
-            "code":"IscsText_25",
-            "_type":"IscsText",
-            "context":"RE6",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":490,
-                "y":596
-            },
-            "code":"IscsText_26",
-            "_type":"IscsText",
-            "context":"EX05",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":490,
-                "y":556
-            },
-            "code":"IscsText_27",
-            "_type":"IscsText",
-            "context":"EX04",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":490,
-                "y":507
-            },
-            "code":"IscsText_28",
-            "_type":"IscsText",
-            "context":"EX03",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":490,
-                "y":467
-            },
-            "code":"IscsText_29",
-            "_type":"IscsText",
-            "context":"EX02",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":490,
-                "y":423
-            },
-            "code":"IscsText_30",
-            "_type":"IscsText",
-            "context":"EX01",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1382,
-                "y":638
-            },
-            "code":"IscsText_31",
-            "_type":"IscsText",
-            "context":"RE7",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1383,
-                "y":600
-            },
-            "code":"IscsText_32",
-            "_type":"IscsText",
-            "context":"EX08",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1383,
-                "y":556
-            },
-            "code":"IscsText_33",
-            "_type":"IscsText",
-            "context":"EX09",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1383,
-                "y":510
-            },
-            "code":"IscsText_34",
-            "_type":"IscsText",
-            "context":"EX10",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1383,
-                "y":470
-            },
-            "code":"IscsText_35",
-            "_type":"IscsText",
-            "context":"EX11",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        },
-        {
-            "point":{
-                "x":1383,
-                "y":426
-            },
-            "code":"IscsText_36",
-            "_type":"IscsText",
-            "context":"EX12",
-            "unit":"",
-            "textFill":"#000000",
-            "fontSize":14,
-            "fontWeight":450,
-            "fontFamily":"consolas",
-            "gbColor":"",
-            "gbColorBorder":"",
-            "gbWidth":0,
-            "levelPadding":0,
-            "verticalPadding":0,
-            "zlevel":1,
-            "z":6
-        }
-    ],
-    "iscsRectList":[
-        {
-            "point":{
-                "x":388,
-                "y":160
-            },
-            "code":"IscsRect_1",
-            "_type":"IscsRect",
-            "z2":0,
-            "fillColor":"rgba(0, 128, 129, 1)",
-            "borderWidth":1,
-            "strokeColor":"#FFFFFF",
-            "width":1100,
-            "height":500,
-            "type":"solid",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":812,
-                "y":162
-            },
-            "code":"IscsRect_2",
-            "_type":"IscsRect",
-            "z2":4,
-            "fillColor":"rgba(162, 162, 162, 1)",
-            "borderWidth":0,
-            "strokeColor":"#B0B0B0",
-            "width":20,
-            "height":20,
-            "type":"solid",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":954,
-                "y":162
-            },
-            "code":"IscsRect_3",
-            "_type":"IscsRect",
-            "z2":4,
-            "fillColor":"rgba(162, 162, 162, 1)",
-            "borderWidth":0,
-            "strokeColor":"#B0B0B0",
-            "width":20,
-            "height":20,
-            "type":"solid",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":811,
-                "y":296
-            },
-            "code":"IscsRect_4",
-            "_type":"IscsRect",
-            "z2":4,
-            "fillColor":"rgba(162, 162, 162, 1)",
-            "borderWidth":0,
-            "strokeColor":"#B0B0B0",
-            "width":20,
-            "height":20,
-            "type":"solid",
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":954,
-                "y":296
-            },
-            "code":"IscsRect_5",
-            "_type":"IscsRect",
-            "z2":4,
-            "fillColor":"rgba(162, 162, 162, 1)",
-            "borderWidth":0,
-            "strokeColor":"#B0B0B0",
-            "width":20,
-            "height":20,
-            "type":"solid",
-            "zlevel":1,
-            "z":5
-        }
-    ],
-    "iscsPictureList":[
-        {
-            "point":{
-                "x":821,
-                "y":217
-            },
-            "code":"IscsPicture_1",
-            "_type":"IscsPicture",
-            "type":"checkSell",
-            "z2":5,
-            "rotation":0,
-            "width":40,
-            "height":55,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":407,
-                "y":597
-            },
-            "code":"IscsPicture_2",
-            "_type":"IscsPicture",
-            "type":"checkArrowDouble",
-            "z2":4,
-            "rotation":270,
-            "width":45,
-            "height":80,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":389,
-                "y":571
-            },
-            "code":"IscsPicture_3",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":0,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":389,
-                "y":527
-            },
-            "code":"IscsPicture_4",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":0,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":389,
-                "y":483
-            },
-            "code":"IscsPicture_5",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":0,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":389,
-                "y":440
-            },
-            "code":"IscsPicture_6",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":0,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":389,
-                "y":396
-            },
-            "code":"IscsPicture_7",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":0,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1424,
-                "y":597
-            },
-            "code":"IscsPicture_8",
-            "_type":"IscsPicture",
-            "type":"checkArrowDouble",
-            "z2":4,
-            "rotation":270,
-            "width":45,
-            "height":80,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":922,
-                "y":218
-            },
-            "code":"IscsPicture_9",
-            "_type":"IscsPicture",
-            "type":"checkSell",
-            "z2":4,
-            "rotation":0,
-            "width":40,
-            "height":55,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1407,
-                "y":576
-            },
-            "code":"IscsPicture_10",
-            "_type":"IscsPicture",
-            "type":"checkArrowRight",
-            "z2":4,
-            "rotation":0,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1407,
-                "y":532
-            },
-            "code":"IscsPicture_11",
-            "_type":"IscsPicture",
-            "type":"checkArrowRight",
-            "z2":4,
-            "rotation":0,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1407,
-                "y":488
-            },
-            "code":"IscsPicture_12",
-            "_type":"IscsPicture",
-            "type":"checkArrowRight",
-            "z2":4,
-            "rotation":0,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1407,
-                "y":445
-            },
-            "code":"IscsPicture_13",
-            "_type":"IscsPicture",
-            "type":"checkArrowRight",
-            "z2":4,
-            "rotation":0,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1407,
-                "y":401
-            },
-            "code":"IscsPicture_14",
-            "_type":"IscsPicture",
-            "type":"checkArrowRight",
-            "z2":4,
-            "rotation":0,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":736,
-                "y":521
-            },
-            "code":"IscsPicture_15",
-            "_type":"IscsPicture",
-            "type":"checkFlowCumulative",
-            "z2":4,
-            "rotation":0,
-            "width":340,
-            "height":140,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":105,
-                "y":568
-            },
-            "code":"IscsPicture_16",
-            "_type":"IscsPicture",
-            "type":"checkSell2",
-            "z2":0,
-            "rotation":0,
-            "width":50,
-            "height":60,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":105,
-                "y":487
-            },
-            "code":"IscsPicture_17",
-            "_type":"IscsPicture",
-            "type":"checkSell2",
-            "z2":0,
-            "rotation":0,
-            "width":50,
-            "height":60,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":105,
-                "y":397
-            },
-            "code":"IscsPicture_18",
-            "_type":"IscsPicture",
-            "type":"checkSell2",
-            "z2":0,
-            "rotation":0,
-            "width":50,
-            "height":60,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":105,
-                "y":309
-            },
-            "code":"IscsPicture_19",
-            "_type":"IscsPicture",
-            "type":"checkSell2",
-            "z2":0,
-            "rotation":0,
-            "width":50,
-            "height":60,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":106,
-                "y":215
-            },
-            "code":"IscsPicture_20",
-            "_type":"IscsPicture",
-            "type":"checkSell2",
-            "z2":0,
-            "rotation":0,
-            "width":50,
-            "height":60,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1735,
-                "y":581
-            },
-            "code":"IscsPicture_21",
-            "_type":"IscsPicture",
-            "type":"checkSell2",
-            "z2":0,
-            "rotation":0,
-            "width":50,
-            "height":60,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1734,
-                "y":499
-            },
-            "code":"IscsPicture_22",
-            "_type":"IscsPicture",
-            "type":"checkSell2",
-            "z2":0,
-            "rotation":0,
-            "width":50,
-            "height":60,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1734,
-                "y":420
-            },
-            "code":"IscsPicture_23",
-            "_type":"IscsPicture",
-            "type":"checkSell2",
-            "z2":0,
-            "rotation":0,
-            "width":50,
-            "height":60,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1734,
-                "y":329
-            },
-            "code":"IscsPicture_24",
-            "_type":"IscsPicture",
-            "type":"checkSell2",
-            "z2":0,
-            "rotation":0,
-            "width":50,
-            "height":60,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":825,
-                "y":404
-            },
-            "code":"IscsPicture_25",
-            "_type":"IscsPicture",
-            "type":"checkNormal",
-            "z2":4,
-            "rotation":0,
-            "width":180,
-            "height":100,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":591,
-                "y":77
-            },
-            "code":"IscsPicture_26",
-            "_type":"IscsPicture",
-            "type":"",
-            "z2":4,
-            "rotation":0,
-            "width":50,
-            "height":50,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":694,
-                "y":161
-            },
-            "code":"IscsPicture_27",
-            "_type":"IscsPicture",
-            "type":"checkArrowDouble",
-            "z2":4,
-            "rotation":0,
-            "width":45,
-            "height":80,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":633,
-                "y":179
-            },
-            "code":"IscsPicture_28",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":90,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":589,
-                "y":179
-            },
-            "code":"IscsPicture_29",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":90,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":545,
-                "y":179
-            },
-            "code":"IscsPicture_30",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":90,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":501,
-                "y":179
-            },
-            "code":"IscsPicture_31",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":90,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1061,
-                "y":161
-            },
-            "code":"IscsPicture_33",
-            "_type":"IscsPicture",
-            "type":"checkArrowDouble",
-            "z2":4,
-            "rotation":0,
-            "width":45,
-            "height":80,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1088,
-                "y":179
-            },
-            "code":"IscsPicture_34",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":90,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1132,
-                "y":179
-            },
-            "code":"IscsPicture_35",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":90,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1176,
-                "y":179
-            },
-            "code":"IscsPicture_36",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":90,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        },
-        {
-            "point":{
-                "x":1220,
-                "y":179
-            },
-            "code":"IscsPicture_37",
-            "_type":"IscsPicture",
-            "type":"checkArrowLeft",
-            "z2":4,
-            "rotation":90,
-            "width":80,
-            "height":45,
-            "zlevel":1,
-            "z":5
-        }
-    ],
-    "ordinaryDoorList":[
-        {
-            "point":{
-                "x":786,
-                "y":240
-            },
-            "z2":4,
-            "code":"OrdinaryDoor_1",
-            "_type":"OrdinaryDoor",
-            "rotationAngle":90,
-            "r":42,
-            "doorType":"1",
-            "zlevel":1,
-            "z":5
-        }
-    ]
+	"iscsPictureList": [{
+		"point": {
+			"x": 821,
+			"y": 217
+		},
+		"code": "IscsPicture_1",
+		"_type": "IscsPicture",
+		"type": "checkSell",
+		"z2": 5,
+		"rotation": 0,
+		"width": 40,
+		"height": 55,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 407,
+			"y": 597
+		},
+		"code": "IscsPicture_2",
+		"_type": "IscsPicture",
+		"type": "checkArrowDouble",
+		"z2": 4,
+		"rotation": 270,
+		"width": 45,
+		"height": 80,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 389,
+			"y": 571
+		},
+		"code": "IscsPicture_3",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 0,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 389,
+			"y": 527
+		},
+		"code": "IscsPicture_4",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 0,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 389,
+			"y": 483
+		},
+		"code": "IscsPicture_5",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 0,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 389,
+			"y": 440
+		},
+		"code": "IscsPicture_6",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 0,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 389,
+			"y": 396
+		},
+		"code": "IscsPicture_7",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 0,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1424,
+			"y": 597
+		},
+		"code": "IscsPicture_8",
+		"_type": "IscsPicture",
+		"type": "checkArrowDouble",
+		"z2": 4,
+		"rotation": 270,
+		"width": 45,
+		"height": 80,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 922,
+			"y": 218
+		},
+		"code": "IscsPicture_9",
+		"_type": "IscsPicture",
+		"type": "checkSell",
+		"z2": 4,
+		"rotation": 0,
+		"width": 40,
+		"height": 55,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1407,
+			"y": 576
+		},
+		"code": "IscsPicture_10",
+		"_type": "IscsPicture",
+		"type": "checkArrowRight",
+		"z2": 4,
+		"rotation": 0,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1407,
+			"y": 532
+		},
+		"code": "IscsPicture_11",
+		"_type": "IscsPicture",
+		"type": "checkArrowRight",
+		"z2": 4,
+		"rotation": 0,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1407,
+			"y": 488
+		},
+		"code": "IscsPicture_12",
+		"_type": "IscsPicture",
+		"type": "checkArrowRight",
+		"z2": 4,
+		"rotation": 0,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1407,
+			"y": 445
+		},
+		"code": "IscsPicture_13",
+		"_type": "IscsPicture",
+		"type": "checkArrowRight",
+		"z2": 4,
+		"rotation": 0,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1407,
+			"y": 401
+		},
+		"code": "IscsPicture_14",
+		"_type": "IscsPicture",
+		"type": "checkArrowRight",
+		"z2": 4,
+		"rotation": 0,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 736,
+			"y": 521
+		},
+		"code": "IscsPicture_15",
+		"_type": "IscsPicture",
+		"type": "checkFlowCumulative",
+		"z2": 4,
+		"rotation": 0,
+		"width": 340,
+		"height": 140,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 105,
+			"y": 568
+		},
+		"code": "IscsPicture_16",
+		"_type": "IscsPicture",
+		"type": "checkSell2",
+		"z2": 0,
+		"rotation": 0,
+		"width": 50,
+		"height": 60,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 105,
+			"y": 487
+		},
+		"code": "IscsPicture_17",
+		"_type": "IscsPicture",
+		"type": "checkSell2",
+		"z2": 0,
+		"rotation": 0,
+		"width": 50,
+		"height": 60,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 105,
+			"y": 397
+		},
+		"code": "IscsPicture_18",
+		"_type": "IscsPicture",
+		"type": "checkSell2",
+		"z2": 0,
+		"rotation": 0,
+		"width": 50,
+		"height": 60,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 105,
+			"y": 309
+		},
+		"code": "IscsPicture_19",
+		"_type": "IscsPicture",
+		"type": "checkSell2",
+		"z2": 0,
+		"rotation": 0,
+		"width": 50,
+		"height": 60,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 106,
+			"y": 215
+		},
+		"code": "IscsPicture_20",
+		"_type": "IscsPicture",
+		"type": "checkSell2",
+		"z2": 0,
+		"rotation": 0,
+		"width": 50,
+		"height": 60,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1735,
+			"y": 581
+		},
+		"code": "IscsPicture_21",
+		"_type": "IscsPicture",
+		"type": "checkSell2",
+		"z2": 0,
+		"rotation": 0,
+		"width": 50,
+		"height": 60,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1734,
+			"y": 499
+		},
+		"code": "IscsPicture_22",
+		"_type": "IscsPicture",
+		"type": "checkSell2",
+		"z2": 0,
+		"rotation": 0,
+		"width": 50,
+		"height": 60,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1734,
+			"y": 420
+		},
+		"code": "IscsPicture_23",
+		"_type": "IscsPicture",
+		"type": "checkSell2",
+		"z2": 0,
+		"rotation": 0,
+		"width": 50,
+		"height": 60,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1734,
+			"y": 329
+		},
+		"code": "IscsPicture_24",
+		"_type": "IscsPicture",
+		"type": "checkSell2",
+		"z2": 0,
+		"rotation": 0,
+		"width": 50,
+		"height": 60,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 825,
+			"y": 404
+		},
+		"code": "IscsPicture_25",
+		"_type": "IscsPicture",
+		"type": "checkNormal",
+		"z2": 4,
+		"rotation": 0,
+		"width": 180,
+		"height": 100,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 591,
+			"y": 77
+		},
+		"code": "IscsPicture_26",
+		"_type": "IscsPicture",
+		"type": "",
+		"z2": 4,
+		"rotation": 0,
+		"width": 50,
+		"height": 50,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 694,
+			"y": 161
+		},
+		"code": "IscsPicture_27",
+		"_type": "IscsPicture",
+		"type": "checkArrowDouble",
+		"z2": 4,
+		"rotation": 0,
+		"width": 45,
+		"height": 80,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 633,
+			"y": 179
+		},
+		"code": "IscsPicture_28",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 90,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 589,
+			"y": 179
+		},
+		"code": "IscsPicture_29",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 90,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 545,
+			"y": 179
+		},
+		"code": "IscsPicture_30",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 90,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 501,
+			"y": 179
+		},
+		"code": "IscsPicture_31",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 90,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1061,
+			"y": 161
+		},
+		"code": "IscsPicture_33",
+		"_type": "IscsPicture",
+		"type": "checkArrowDouble",
+		"z2": 4,
+		"rotation": 0,
+		"width": 45,
+		"height": 80,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1088,
+			"y": 179
+		},
+		"code": "IscsPicture_34",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 90,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1132,
+			"y": 179
+		},
+		"code": "IscsPicture_35",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 90,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1176,
+			"y": 179
+		},
+		"code": "IscsPicture_36",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 90,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}, {
+		"point": {
+			"x": 1220,
+			"y": 179
+		},
+		"code": "IscsPicture_37",
+		"_type": "IscsPicture",
+		"type": "checkArrowLeft",
+		"z2": 4,
+		"rotation": 90,
+		"width": 80,
+		"height": 45,
+		"zlevel": 1,
+		"z": 5
+	}],
+	"ordinaryDoorList": [{
+		"point": {
+			"x": 786,
+			"y": 240
+		},
+		"z2": 4,
+		"code": "OrdinaryDoor_1",
+		"_type": "OrdinaryDoor",
+		"rotationAngle": 90,
+		"r": 42,
+		"doorType": "1",
+		"zlevel": 1,
+		"z": 5
+	}]
 }
diff --git a/src/views/jlmap3d/drive/sceneview/mmiview.vue b/src/views/jlmap3d/drive/sceneview/mmiview.vue
index 2b0ceca4c..d2a4b29e9 100644
--- a/src/views/jlmap3d/drive/sceneview/mmiview.vue
+++ b/src/views/jlmap3d/drive/sceneview/mmiview.vue
@@ -91,9 +91,7 @@
 
 <script>
 
-import axios from 'axios';
-
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 
 import { mmirender } from '@/views/jlmap3d/drive/sceneview/mmi';
 
@@ -173,8 +171,7 @@ export default {
   },
   watch: {
     '$store.state.training.initTime': function (initTime) {
-        let date = new Date(initTime);
-        this.timer = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
+        this.timer = timestampFormat('HH:mm:ss', initTime)
         document.getElementById("timeupdate").innerHTML = this.timer;
     }
   },
diff --git a/src/views/jlmap3d/drive/sceneview/tmsview.vue b/src/views/jlmap3d/drive/sceneview/tmsview.vue
index 3a028cc20..a3489f2e7 100644
--- a/src/views/jlmap3d/drive/sceneview/tmsview.vue
+++ b/src/views/jlmap3d/drive/sceneview/tmsview.vue
@@ -5,7 +5,7 @@
         运行
       </div>
 
-      <div :id="topmsg.id" class="tmstopdivchild" v-for="(topmsg,index) in trainData" :style="{left:topmsg.left+'px',width:topmsg.width+'px'}">
+      <div :id="topmsg.id" class="tmstopdivchild" v-for="(topmsg,index) in trainData" :key="index" :style="{left:topmsg.left+'px',width:topmsg.width+'px'}">
         <div class="tmstopmsg" style="top:0" :style="{width:topmsg.width+'px'}">
           {{topmsg.name}}
         </div>
@@ -47,6 +47,7 @@
       <div class="tmsdowndivmsg" style="top:0;">
         <div class="tmsdownbutton"
         v-for="(button1,indexbt1) in buttonList1"
+        :key="indexbt1"
         :style="{left:button1.left+'px',backgroundColor:button1.bgcolor}">
           {{button1.name}}
         </div>
@@ -55,6 +56,7 @@
       <div class="tmsdowndivmsg" style="bottom:0;border:solid 0.5px #fff">
         <div class="tmsdownbutton"
         v-for="(button2,indexbt2) in buttonList2"
+        :key="indexbt2"
         :style="{left:button2.left+'px',backgroundColor:button2.bgcolor}">
           {{button2.name}}
         </div>
@@ -67,9 +69,8 @@
 
 <script>
 
-import axios from 'axios';
+import { timestampFormat } from '@/utils/date';
 
-import { prefixIntrger } from '@/utils/date';
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 
 import TmsFault from '@/views/jlmap3d/drive/sceneview/tmscomponent/tmsfault';
@@ -231,8 +232,7 @@ export default {
   },
   watch: {
     '$store.state.training.initTime': function (initTime) {
-        let date = new Date(initTime);
-        this.timer = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
+        this.timer = timestampFormat('HH:mm:ss', initTime)
         document.getElementById("tmstimeupdate").innerHTML = this.timer;
     }
   },
diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue
index 61e8e93f5..3754039f7 100644
--- a/src/views/jlmap3d/passflow/jl3dpassflow.vue
+++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue
@@ -4,22 +4,22 @@
     <div v-if="lineCode == '07'" id="jlReal3d" class="jlReal3d">
       <div class="realCctv1">
         <video id="myvideo0" class="video-js">
-          <source src="http://160.20.60.15/hls/cctv1.m3u8" type="application/x-mpegURL" />
+          <source src="http://160.20.60.15/hls/cctv1.m3u8" type="application/x-mpegURL">
         </video>
       </div>
       <div class="realCctv2">
         <video id="myvideo1" class="video-js">
-          <source src="http://160.20.60.15/hls/cctv2.m3u8" type="application/x-mpegURL" />
+          <source src="http://160.20.60.15/hls/cctv2.m3u8" type="application/x-mpegURL">
         </video>
       </div>
       <div class="realCctv3">
         <video id="myvideo2" class="video-js">
-          <source src="http://160.20.60.15/hls/cctv3.m3u8" type="application/x-mpegURL" />
+          <source src="http://160.20.60.15/hls/cctv3.m3u8" type="application/x-mpegURL">
         </video>
       </div>
       <div class="realCctv4">
         <video id="myvideo3" class="video-js">
-          <source src="http://160.20.60.15/hls/cctv4.m3u8" type="application/x-mpegURL" />
+          <source src="http://160.20.60.15/hls/cctv4.m3u8" type="application/x-mpegURL">
         </video>
       </div>
     </div>
@@ -46,136 +46,196 @@
   </div>
 </template>
 <script>
-import Vue from 'vue'
-import Video from 'video.js'
-import 'video.js/dist/video-js.css'
-import { Jl3dpassflow } from '@/jlmap3d/jl3dpassflow/jl3dpassflownew.js'
-import { ProjectIcon, loginInfo } from '@/scripts/ProjectConfig'
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js'
+import Vue from 'vue';
+import Video from 'video.js';
+import 'video.js/dist/video-js.css';
+import { Jl3dpassflow } from '@/jlmap3d/jl3dpassflow/jl3dpassflownew.js';
+import { ProjectIcon, loginInfo } from '@/scripts/ProjectConfig';
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 export default {
-  name: 'Passflow',
-  components: {
+    name: 'Passflow',
+    components: {
     // VideoPlayer
-  },
-  data() {
-    return {
-      localStatic: JL3D_LOCAL_STATIC,
-      jl3d: null,
-      rendermode: '监控视角',
-      renderswitch: false,
-      stationlist: [],
-      value: '',
-      isCctv: true,
-      videoList: [],
-      // playerOptionList:[
-      // http://hls.cntv.lxdns.com/asp/hls/main/0303000a/3/default/978a64ddd3a1caa85ae70a23414e6540/main.m3u8
-      //     // http://160.20.60.15/hls/cctv1.m3u8
-      //     {sources: [{ type:'application/x-mpegURL', src: 'http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8'}]},
-      //     {sources: [{ type:'application/x-mpegURL', src: 'http://192.168.3.6/hls/vlc.m3u8'}]},
-      //     {sources: [{ type:'application/x-mpegURL', src: 'http://192.168.3.6/hls/vlc.m3u8'}]},
-      //     {sources: [{ type:'application/x-mpegURL', src: 'http://192.168.3.6/hls/vlc.m3u8'}]}
-      // ],
-      loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts', 'hlsdrts', 'designhlsdrts'],
-    }
-  },
-  computed: {
-    code() {
-      return this.$route.query.code
     },
-    lineCode() {
-      return this.$route.query.lineCode
+    data() {
+        return {
+            localStatic: JL3D_LOCAL_STATIC,
+            jl3d: null,
+            rendermode: '监控视角',
+            renderswitch: false,
+            stationlist: [],
+            value: '',
+            isCctv: true,
+            videoList: [],
+            // playerOptionList:[
+            // http://hls.cntv.lxdns.com/asp/hls/main/0303000a/3/default/978a64ddd3a1caa85ae70a23414e6540/main.m3u8
+            //     // http://160.20.60.15/hls/cctv1.m3u8
+            //     {sources: [{ type:'application/x-mpegURL', src: 'http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8'}]},
+            //     {sources: [{ type:'application/x-mpegURL', src: 'http://192.168.3.6/hls/vlc.m3u8'}]},
+            //     {sources: [{ type:'application/x-mpegURL', src: 'http://192.168.3.6/hls/vlc.m3u8'}]},
+            //     {sources: [{ type:'application/x-mpegURL', src: 'http://192.168.3.6/hls/vlc.m3u8'}]}
+            // ],
+            loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts', 'hlsdrts', 'designhlsdrts']
+        };
     },
-  },
-  watch: {
-    '$store.state.app.windowSizeCount': function () {
-      this.videoList.forEach((videoPlay, index) => {
-        console.log('??')
-        document.querySelector('.myvideo' + index + '-dimensions').style.width = window.innerWidth / 4 + 'px'
-        document.querySelector('.myvideo' + index + '-dimensions').style.height = window.innerHeight / 2 + 'px'
-        // videoPlay.width_ = window.innerWidth / 4;
-        // videoPlay.height_ = window.innerHeight / 2;
-      })
+    computed: {
+        code() {
+            return this.$route.query.code;
+        },
+        lineCode() {
+            return this.$route.query.lineCode;
+        }
+    },
+    watch: {
+        '$store.state.app.windowSizeCount': function () {
+            this.videoList.forEach((videoPlay, index) => {
+                console.log('??');
+                document.querySelector('.myvideo' + index + '-dimensions').style.width = window.innerWidth / 4 + 'px';
+                document.querySelector('.myvideo' + index + '-dimensions').style.height = window.innerHeight / 2 + 'px';
+                // videoPlay.width_ = window.innerWidth / 4;
+                // videoPlay.height_ = window.innerHeight / 2;
+            });
+        }
+    },
+    created() {
+        if (this.loadingProjectList.includes(this.$route.query.project)) {
+            this.$store.dispatch('app/transitionAnimations');
+        }
+        document.querySelector("link[rel*='icon']").href =
+      loginInfo[this.$route.query.project].linkIcon || ProjectIcon[this.$route.query.project];
+    },
+    mounted() {
+        if (this.lineCode == '07') {
+            for (var i = 0; i < 4; i++) {
+                const videoPlay = new Video(
+                    'myvideo' + i,
+                    {
+                        controls: false,
+                        autoplay: 'muted',
+                        loop: false,
+                        preload: 'auto',
+                        width: window.innerWidth / 4 + 'px',
+                        height: window.innerHeight / 2 + 'px',
+                        hls: {
+                            withCredentials: true
+                        }
+                    },
+                    function () {
+                        console.log('videojs播放器初始化成功');
+                        const video = this;
+                        var lastTime = -1;
+                        // this.on('loadstart', function() {
+                        //     // 开始加载
+                        //     console.log('loadstart');
+                        // });
+                        this.on('loadeddata', function() {
+                            console.log('loadeddata');
+                        });
+                        this.on('error', function() {
+                            console.log('error');
+                            if (video.error().code == '') {
+                                const src = video.getMedia().src[0].src;
+                                video.reset();
+                                video.src(src);
+                                video.load();
+                                video.play();
+                                var currentTime = video.currentTime();
+                                lastTime = currentTime;
+                            }
+                        });
+                        this.on('seeked', function() {
+                            // 已经拿到视频流,可以播放
+                            console.log('seeked');
+                            // var currentTime = video.currentTime();
+                            // if (currentTime != lastTime) {
+                            //     // video.currentTime(currentTime + 10000);
+                            //     video.play();
+                            // }
+                            // video.play();
+                        });
+                        this.on('loadedmetadata', function() {
+                            console.log('loadedmetadata');
+                            // 加载到元数据后开始播放视频
+                            // startVideo();
+                            video.autoplay(true);
+                            // var tryTimes = 0;
+                            let isVideoBreak = null;
+                            clearInterval(isVideoBreak);
+                            isVideoBreak = setInterval(function() {
+                                var currentTime = video.currentTime();
+                                console.log('currentTime' + currentTime + 'lastTime' + lastTime);
+                                if (currentTime == lastTime) {
+                                    video.currentTime(currentTime + 10000);
+                                    video.play();
+                                    // video.autoplay(true);
+                                    // // 尝试5次播放后，如仍未播放成功提示刷新
+                                    // if (++tryTimes > 5) {
+                                    //     alert('您的网速有点慢，刷新下试试');
+                                    //     tryTimes = 0;
+                                    // }
+                                } else {
+                                    lastTime = currentTime;
+                                    // tryTimes = 0;
+                                }
+                            }, 3000);
+                        });
+                        this.on('play', function() {
+                            console.log('play');
+                        });
+                    }
+                );
+                this.videoList.push(videoPlay);
+            }
+        }
+        this.init();
+        window.updatestationlist = this.updatestationlist;
+        if (this.$route.query.type == 'CCTV') {
+            this.isCctv = false;
+        }
     },
-  },
-  created() {
-    if (this.loadingProjectList.includes(this.$route.query.project)) {
-      this.$store.dispatch('app/transitionAnimations')
-    }
-    document.querySelector("link[rel*='icon']").href =
-      loginInfo[this.$route.query.project].linkIcon || ProjectIcon[this.$route.query.project]
-  },
-  mounted() {
-    if (this.lineCode == '07') {
-      for (var i = 0; i < 4; i++) {
-        const videoPlay = new Video(
-          'myvideo' + i,
-          {
-            controls: false,
-            autoplay: 'muted',
-            loop: true,
-            preload: 'auto',
-            width: window.innerWidth / 4 + 'px',
-            height: window.innerHeight / 2 + 'px',
-            hls: {
-              withCredentials: true,
-            },
-          },
-          function () {
-            console.log('videojs播放器初始化成功')
-          }
-        )
-        this.videoList.push(videoPlay)
-      }
-    }
-    this.init()
-    window.updatestationlist = this.updatestationlist
-    if (this.$route.query.type == 'CCTV') {
-      this.isCctv = false
-    }
-  },
 
-  beforeDestroy() {},
-  methods: {
-    init: function () {
-      // let mapdata = this.$store.state.socket.device;
-      let dom = document.getElementById('jl3d')
-      this.jl3d = new Jl3dpassflow(dom, this.$route.query.mapid, this.$route.query.group, 'normal')
-    },
-    switchrender() {
-      if (this.renderswitch == true) {
-        this.rendermode = '退出监控'
-        this.renderswitch = false
-        this.jl3d.switchviews('freeview')
-      } else {
-        this.rendermode = '监控视角'
-        this.renderswitch = true
-        this.jl3d.switchviews('4views')
-      }
-    },
-    switch4view() {
-      this.jl3d.switchviews('4views')
-    },
-    switch2view() {
-      this.jl3d.switchviews('2views')
-    },
-    switchauto() {
-      this.jl3d.switchviews('freeview')
-    },
-    updatestationlist(list) {
-      // console.log(list);
-      this.value = list[0].name
-      this.stationlist = list
-    },
-    currentsel(selVal) {
-      this.jl3d.changestation(selVal)
-      // let oldgroupnum = this.groupnum;
-      // this.value = selVal;
-    },
-    back() {
-      window.close()
-    },
-  },
-}
+    beforeDestroy() {},
+    methods: {
+        init: function () {
+            // let mapdata = this.$store.state.socket.device;
+            const dom = document.getElementById('jl3d');
+            this.jl3d = new Jl3dpassflow(dom, this.$route.query.mapid, this.$route.query.group, 'normal');
+        },
+        switchrender() {
+            if (this.renderswitch == true) {
+                this.rendermode = '退出监控';
+                this.renderswitch = false;
+                this.jl3d.switchviews('freeview');
+            } else {
+                this.rendermode = '监控视角';
+                this.renderswitch = true;
+                this.jl3d.switchviews('4views');
+            }
+        },
+        switch4view() {
+            this.jl3d.switchviews('4views');
+        },
+        switch2view() {
+            this.jl3d.switchviews('2views');
+        },
+        switchauto() {
+            this.jl3d.switchviews('freeview');
+        },
+        updatestationlist(list) {
+            // console.log(list);
+            this.value = list[0].name;
+            this.stationlist = list;
+        },
+        currentsel(selVal) {
+            this.jl3d.changestation(selVal);
+            // let oldgroupnum = this.groupnum;
+            // this.value = selVal;
+        },
+        back() {
+            window.close();
+        }
+    }
+};
 </script>
 <style scoped>
 /* #jl3d {
diff --git a/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue b/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue
index 9708a5a15..27f654e0b 100644
--- a/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue
+++ b/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue
@@ -91,10 +91,6 @@
 
 <script>
 
-import axios from 'axios';
-
-import { prefixIntrger } from '@/utils/date';
-
 import { mmirender } from '@/views/jlmap3d/railwaydrive/sceneview/mmi';
 
 import { mmiimage } from '@/views/jlmap3d/railwaydrive/sceneview/mmiimage';
@@ -160,17 +156,7 @@ export default {
     window.updateSpeedView = this.updateSpeedView
     this.init();
   },
-  beforeDestroy() {
-
-
-  },
-  // watch: {
-  //   '$store.state.training.initTime': function (initTime) {
-  //       let date = new Date(initTime);
-  //       this.timer = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
-  //       document.getElementById("timeupdate").innerHTML = this.timer;
-  //   }
-  // },
+  beforeDestroy() { },
   methods: {
     init(){
       this.time();
diff --git a/src/views/login/forgetPassword.vue b/src/views/login/forgetPassword.vue
new file mode 100644
index 000000000..7a351683b
--- /dev/null
+++ b/src/views/login/forgetPassword.vue
@@ -0,0 +1,262 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="dialogShow"
+    width="500px"
+    :before-close="doClose"
+    :z-index="9000"
+    :show-close="false"
+    :close-on-click-modal="false"
+    top="25vh"
+  >
+    <el-form ref="ruleForm" :model="form" :rules="rules" label-width="110px" class="demo-ruleForm">
+      <el-form-item prop="type">
+        <template slot="label">
+          <span>找回途径：</span>
+        </template>
+        <el-radio-group v-model="form.type" size="small">
+          <el-radio label="phone" border>手机号找回</el-radio>
+          <el-radio label="email" border>邮箱找回</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="form.type === 'email'" prop="email">
+        <template slot="label">
+          <span>邮&emsp;&emsp;箱：</span>
+        </template>
+        <el-input v-model="form.email" size="small" style="width: 200px;" />
+      </el-form-item>
+      <el-form-item v-if="form.type === 'phone'" prop="phone">
+        <template slot="label">
+          <span>手机号：</span>
+        </template>
+        <el-input v-model="form.phone" size="small" style="width: 200px;" />
+      </el-form-item>
+      <el-form-item label="密码：" prop="password">
+        <template slot="label">
+          <span>密&emsp;&emsp;码：</span>
+        </template>
+        <el-input v-model="form.password" size="small" autocomplete="new-password" show-password style="width: 200px;" />
+      </el-form-item>
+      <el-form-item label="密码确认：" prop="repeatPassword">
+        <el-input v-model="form.repeatPassword" size="small" autocomplete="new-password" show-password style="width: 200px;" />
+      </el-form-item>
+      <el-form-item prop="vfCode">
+        <template slot="label">
+          <span>验证码：</span>
+        </template>
+        <el-input v-model="form.vfCode" size="small" style="display: inline-block;width: 200px" />
+        <el-button
+          size="small"
+          type="primary"
+          style="margin-top: 10px; margin-right: 10px;"
+          :disabled="passWordCodeTime != 0"
+          @click="sendVfcode"
+        >
+          {{ $t('global.sendCode') }}
+          <span
+            v-if="passWordCodeTime"
+          >{{ passWordCodeTime }}</span>
+        </el-button>
+      </el-form-item>
+      <div style="display: flex;justify-content: space-around;">
+        <el-button type="primary" size="small" @click="submitForm()">找回</el-button>
+        <el-button size="small" @click="doClose()">返回登录</el-button>
+      </div>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+import { findPassword, sendPhoneVfcode, sendEmailVfcode } from '@/api/management/user';
+import md5 from 'js-md5';
+import {clearInterval, setInterval} from 'timers';
+export default {
+    name: 'ForgetPassword',
+
+    data() {
+        var validateEmail = (rule, value, callback) => {
+            const regu = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+            const re = new RegExp(regu);
+            if (!re.test(value) ) {
+                callback(new Error('邮箱格式不正确'));
+            } else {
+                callback();
+            }
+        };
+        var validatePhone = (rule, value, callback) => {
+            const regu = /^1(3[0-9]|4[5,7]|5[0,1,2,3,5,6,7,8,9]|6[2,5,6,7]|7[0,1,7,8]|8[0-9]|9[1,8,9])\d{8}$/;
+            const re = new RegExp(regu);
+            if (!re.test(value)) {
+                callback(new Error('手机号格式不正确'));
+            } else {
+                callback();
+            }
+        };
+        var validatePassword = (rule, value, callback) => {
+            if (this.form.repeatPassword) {
+                this.$refs.ruleForm.validateField('repeatPassword');
+            }
+            callback();
+        };
+        var validateRepeatPassword = (rule, value, callback) => {
+            if (value !== this.form.password) {
+                callback(new Error('两次密码不相同，请确认密码'));
+            } else {
+                callback();
+            }
+        };
+        var validateVfCode = (rule, value, callback) => {
+            if (this.form.vfCode.length !== 4) {
+                callback(new Error('验证码长度错误'));
+            } else {
+                callback();
+            }
+        };
+        return {
+            dialogShow: false,
+            message: '',
+            operation: '',
+            title: '密码找回',
+            passWordTime: null,
+            form: {
+                type: 'phone',
+                phone: '',
+                email: '',
+                password: '',
+                repeatPassword: '',
+                vfCode: ''
+            },
+            passWordCodeTime: 0,
+            rules: {
+                phone: [
+                    { required: true, message: '请输入手机号', trigger: 'blur' },
+                    { validator: validatePhone, trigger: 'blur' }
+                ],
+                email: [
+                    { required: true, message: '请输入邮箱', trigger: 'blur' },
+                    { validator: validateEmail, trigger: 'blur' }
+                ],
+                password: [
+                    { required: true, message: '请输入密码', trigger: 'blur' },
+                    { validator: validatePassword, trigger: 'blur' },
+                    { min: 5, max: 20, message: '长度在 5 到 20 个字符', trigger: 'blur' }
+                ],
+                repeatPassword: [
+                    { required: true, message: '请重复输入密码', trigger: 'blur' },
+                    { validator: validateRepeatPassword, trigger: 'blur' },
+                    { min: 5, max: 20, message: '长度在 5 到 20 个字符', trigger: 'blur' }
+                ],
+                vfCode: [
+                    { required: true, message: '请输入验证码', trigger: 'blur' },
+                    { validator: validateVfCode, trigger: 'blur' }
+                ]
+            }
+        };
+    },
+    computed: {
+    },
+    mounted() {
+
+    },
+    methods: {
+        doShow() {
+            this.form = {
+                type: 'phone',
+                phone: '',
+                email: '',
+                password: '',
+                repeatPassword: '',
+                vfCode: ''
+            };
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.form = {
+                type: 'phone',
+                phone: '',
+                email: '',
+                password: '',
+                repeatPassword: '',
+                vfCode: ''
+            };
+            this.$refs.ruleForm.clearValidate();
+        },
+        async sendVfcode() {
+            const reguEmail = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+            const reguPhone = /^1(3[0-9]|4[5,7]|5[0,1,2,3,5,6,7,8,9]|6[2,5,6,7]|7[0,1,7,8]|8[0-9]|9[1,8,9])\d{8}$/;
+            const rePhone = new RegExp(reguPhone);
+            const reEmail = new RegExp(reguEmail);
+            if (this.form.type === 'phone' && this.form.phone && rePhone.test(this.form.phone)) {
+                const random = Math.floor(Math.random() * 10000 + 1);
+                const timeCount = Date.parse(new Date()) / 1000;
+                const pass = `${timeCount}86${this.form.phone}${random}`;
+                const param = {
+                    mobile: this.form.phone,
+                    nationCode: '86',
+                    rd: random + '',
+                    time: timeCount + '',
+                    token: md5(pass)
+                };
+                try {
+                    this.passWordCodeTime = 60;
+                    this.passWordTime = setInterval(() => {
+                        this.passWordCodeTime--;
+                        if (this.passWordCodeTime <= 0) {
+                            this.passWordCodeTime = 0;
+                            clearInterval(this.mobileTime);
+                            this.passWordTime = null;
+                        }
+                    }, 1000);
+                    await sendPhoneVfcode(param);
+                } catch (error) {
+                    this.$message.info(this.$t('global.codeFaile'));
+                }
+            } else if (this.form.type === 'email' && this.form.email && reEmail.test(this.form.email)) {
+                const param = { email: this.form.email };
+                try {
+                    this.passWordCodeTime = 60;
+                    this.passWordTime = setInterval(() => {
+                        this.passWordCodeTime--;
+                        if (this.passWordCodeTime <= 0) {
+                            this.passWordCodeTime = 0;
+                            clearInterval(this.mobileTime);
+                            this.passWordTime = null;
+                        }
+                    }, 1000);
+                    await sendEmailVfcode(param);
+                } catch (error) {
+                    this.$message.info(this.$t('global.codeFaile'));
+                }
+            } else {
+                this.$refs.ruleForm.validateField('email');
+                this.$refs.ruleForm.validateField('phone');
+            }
+        },
+        submitForm() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    const data = { email: this.form.email, mobile: this.form.phone, newPwd: md5(this.form.password), vfCode: this.form.vfCode };
+                    findPassword(data).then(resp => {
+                        this.$message.success('设置密码成功！' );
+                        this.doClose();
+                    }).catch(error => {
+                        this.$message.error('设置密码失败：' + error.message);
+                    });
+                }
+            });
+        }
+    }
+};
+
+</script>
+<style scoped>
+	.confirm-control-speed .context {
+		padding-bottom: 40px !important;
+		border: 1px solid lightgray;
+	}
+	.ningbo-01__systerm .el-dialog .el-button{
+		display: block;
+		margin: 0 auto;
+	}
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 86b9e48c1..70637a11e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -100,6 +100,9 @@
               {{ $t('login.login') }}
             </el-button>
           </el-form-item>
+          <div style="display: inline-block;width: 100%;">
+            <div class="popover_box active" style="bottom: 50px;" @click="forgetPassword">忘记密码？</div>
+          </div>
         </el-form>
       </div>
       <float-part v-if="isProject && !versionBaseNoShow.includes(project)" />
@@ -128,6 +131,7 @@
       <!--</div>-->
     </div>
     <register ref="register" />
+    <forget-password ref="forgetPassword" />
   </div>
 </template>
 
@@ -156,10 +160,11 @@ import { getSimulationInfoNew } from '@/api/simulation';
 import { getSimulationInfoByGroup } from '@/api/rtSimulation';
 import { getSessionStorage } from '@/utils/auth';
 import Register from './register';
+import ForgetPassword from './forgetPassword';
 
 export default {
     name: 'Login',
-    components: { QrcodeVue, FloatPart, Register },
+    components: { QrcodeVue, FloatPart, Register, ForgetPassword },
     data() {
         const validateName = (rule, value, callback) => {
             if (value) {
@@ -254,7 +259,7 @@ export default {
         },
         bgImg() {
             const bgImgAll = process.env.VUE_APP_PRO === 'local' || this.$route.query.project == 'heb' ? '' : bgImg;
-            const synchronousLogin = ['VR_IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD', 'SANDBOX', 'ILW'];
+            const synchronousLogin = ['VR_IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD', 'SANDBOX', 'ILW', 'PIS_STAND', 'PIS_TRAIN'];
             const imgMap = {
                 ISCS_LW: bgIscsImg,
                 ISCS_CW: bgIscsImg,
@@ -268,7 +273,7 @@ export default {
             return synchronousLogin.includes(this.$route.query.type) ? imgMap[this.$route.query.type] : bgImgAll;
         },
         syncLogin() {
-            const synchronousLogin = ['VR_IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD', 'SANDBOX', 'ILW'];
+            const synchronousLogin = ['VR_IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD', 'SANDBOX', 'ILW', 'PIS_STAND', 'PIS_TRAIN'];
             return this.$route.query.type ? synchronousLogin.includes(this.$route.query.type) : false;
         },
         loadingText() {
@@ -279,7 +284,9 @@ export default {
                 CCTV: '检测教员机登录中',
                 VR_PSD: '检测教员机登录中',
                 LSW: '检测教员机登录中',
-                ILW: '检测教员机登录中'
+                ILW: '检测教员机登录中',
+                PIS_TRAIN: '检测教员机登录中',
+                PIS_STAND: '检测教员机登录中'
             };
             return this.$route.query.type ? textMap[this.$route.query.type] : '';
         }
@@ -469,7 +476,6 @@ export default {
                             type: this.$route.query.type
                         };
                         setSessionStorage('projectDevice', JSON.stringify(res.data.deviceVO));
-
                         if (this.$route.query.type == 'LSW') {
                             const config = JSON.parse(res.data.deviceVO.config);
                             if (config.quadrant == '99') {
@@ -478,12 +484,34 @@ export default {
                                 this.$router.push({ path: `/bigSplitScreen/${resp.data.map.id}`, query: {...query, prdType:resp.data.prodType} });
                             }
                         } else if (this.$route.query.type === 'ISCS_LW' || this.$route.query.type === 'ISCS_CW') {
-                            this.$router.push({ path: `/displayIscs/system`, query: {
-                                group: res.data.group,
-                                lineCode: resp.data.map.lineCode,
-                                mapId:resp.data.map.id,
-                                projectDevice: this.$route.query.projectDevice,
-                                type: this.$route.query.type} });
+                            const config = JSON.parse(res.data.deviceVO.config);
+                            if (config.picture === 'paMain') {
+                                // displayIscs/system/stationConfig/paMain?stationName=象峰站&stationId=Station25166&group=20-120-196-193&mapId=196&lineCode=02
+                                this.$router.push({ path: `displayIscs/system/stationConfig/paMain`, query: {
+                                    stationId: config.stationCode,
+                                    group: res.data.group,
+                                    mapId:resp.data.map.id,
+                                    lineCode: resp.data.map.lineCode,
+                                    projectDevice: this.$route.query.projectDevice,
+                                    type: this.$route.query.type
+                                } });
+                            } else if (config.picture === 'pidsMain') {
+                                this.$router.push({ path: `displayIscs/system/stationConfig/pidsMain`, query: {
+                                    stationId: config.stationCode,
+                                    group: res.data.group,
+                                    mapId:resp.data.map.id,
+                                    lineCode: resp.data.map.lineCode,
+                                    projectDevice: this.$route.query.projectDevice,
+                                    type: this.$route.query.type
+                                } });
+                            } else {
+                                this.$router.push({ path: `/displayIscs/system`, query: {
+                                    group: res.data.group,
+                                    lineCode: resp.data.map.lineCode,
+                                    mapId:resp.data.map.id,
+                                    projectDevice: this.$route.query.projectDevice,
+                                    type: this.$route.query.type} });
+                            }
                         } else if (this.$route.query.type == 'CCTV') {
                             if (RealCctvList.includes(this.project)) {
                                 this.$router.push({
@@ -545,6 +573,9 @@ export default {
                             this.$router.push({ path: `/jlmap3d/sandbox`, query: sandboxQuery });
                         } else if (this.$route.query.type === 'ILW') {
                             this.$router.push({ path: `/jointTrainingNew`, query: query });
+                        } else if (this.$route.query.type === 'PIS_STAND' || this.$route.query.type === 'PIS_TRAIN') {
+                            const config = JSON.parse(res.data.deviceVO.config);
+                            this.$router.push({ path: `/pis`, query: {...query, ...config}});
                         } else {
                             this.$router.push({ path: `/jointTrainingNew`, query: query });
                         }
@@ -623,6 +654,9 @@ export default {
         // },
         registerUser() {
             this.$refs.register.doShow();
+        },
+        forgetPassword() {
+            this.$refs.forgetPassword.doShow();
         }
     }
 };
@@ -762,7 +796,7 @@ export default {
 	.popover_box {
 		position: absolute;
 		right: 80px;
-		bottom: 106px;
+		bottom: 124px;
 		cursor: pointer;
 		color: #225592;
 		font-size: 14px;
@@ -815,7 +849,7 @@ export default {
 			font-size: 39px;
 			font-weight: bold;
 			top: 150px;
-			width: 1050px;
+			width: 1070px;
 			text-align: center;
 			position: absolute;
 		}
diff --git a/src/views/login/orgSelect.vue b/src/views/login/orgSelect.vue
new file mode 100644
index 000000000..772df0186
--- /dev/null
+++ b/src/views/login/orgSelect.vue
@@ -0,0 +1,42 @@
+<template>
+	<el-dialog center :visible.sync="show" :close-on-click-modal="false" :show-close="false" title="请选择要登录的组织">
+		<div class="formWrapper">
+			<el-select v-model="selected" placeholder="请选择">
+				<el-option v-for="option in orgList" :key="option.orgId" :label="option.name" :value="option.orgId" />
+			</el-select>
+		</div>
+		<el-button slot="footer" primary size="small" @click="confirmSelect">确认</el-button>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	name: 'OrgSelect',
+	data() {
+		return {
+			show: false,
+			orgList: [],
+			selected: ''
+		}
+	},
+	methods: {
+		confirmSelect() {
+			this.$emit('select', this.selected)
+		},
+		doShow(orgList) {
+			this.orgList = orgList
+			this.show = true
+		},
+		doClose() {
+			this.show = false
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.formWrapper {
+	display: flex;
+	justify-content: center;
+}
+</style>
diff --git a/src/views/newMap/chatView/chatContent.vue b/src/views/newMap/chatView/chatContent.vue
index 2b5d953de..4364ec822 100644
--- a/src/views/newMap/chatView/chatContent.vue
+++ b/src/views/newMap/chatView/chatContent.vue
@@ -32,9 +32,7 @@
   </div>
 </template>
 <script>
-// import yuyin from '@/assets/yuyin.png';
 import {overConversationMessage} from '@/api/chat';
-// this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
 export default {
     props:{
         messageList:{
diff --git a/src/views/newMap/chatView/voiceChatBox.vue b/src/views/newMap/chatView/voiceChatBox.vue
index 09276a89c..ccc23c38f 100644
--- a/src/views/newMap/chatView/voiceChatBox.vue
+++ b/src/views/newMap/chatView/voiceChatBox.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="voiceChatBox" :class="{'active': drawer}" :style="{'bottom':bottom+'px'}">
-    <div class="menuTrainListBtn" @click="clickBtn">
+    <div :id="sideButtonDom.domId" class="menuTrainListBtn" @click="clickBtn">
       <div>
         <div id="voiceName" />
         <div class="teleNameIn">语音</div>
@@ -30,7 +30,7 @@
       </div>
       <div class="chat-box-footer">
         <el-input v-model="textContent" size="small" placeholder="请输入会话文字，点击T发送" style="flex: 1; margin-left: 5px;" :rows="1" />
-        <el-button size="mini" class="chat-box-footer-create" :disabled="contentSend" @click="sendText">T</el-button>
+        <el-button :id="sendTextId" size="mini" class="chat-box-footer-create" :disabled="contentSend" @click="sendText">T</el-button>
         <el-button v-if="!$route.query.record" class="chat-box-footer-create chat-box-footer-send" :class="{'active': recordSending}" :disabled="audioPlay" size="mini" type="primary" @click="startRecording()">
           <el-progress id="voice_progress_bar" type="circle" :show-text="false" :percentage="100/60*seconds" :width="40" :stroke-width="2" status="success" />
           <i v-if="recordSending" class="el-icon-close close_icon" @click.stop="cancleRecording()" />
@@ -52,6 +52,8 @@ import {sendChatAudioBase64, overSimulationConversition, getAllConversition, acc
 import { getSessionStorage } from '@/utils/auth';
 import { getSimulationMemberList} from '@/api/simulation';
 import { getUserListCommon } from '@/api/rtSimulation';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 export default {
     name: 'NewChatBox',
     components:{
@@ -144,6 +146,12 @@ export default {
             } else {
                 return [];
             }
+        },
+        sendTextId() {
+            return OperationEvent.Conversation.Chat.menu.domId;
+        },
+        sideButtonDom() {
+            return OperationEvent.Conversation.Chat.sideButton;
         }
     },
     watch:{
@@ -507,7 +515,10 @@ export default {
             }
         },
         '$store.state.socket.simulationReset': function () { // 仿真重置
+            this.drawer = false;
             this.conversitionStateMap = {};
+            this.commonMessageList = [];
+            this.messageList = [];
             const voiceName = document.querySelector('#voiceName');
             if (voiceName) {
                 voiceName.classList.remove('flash');
@@ -617,6 +628,12 @@ export default {
         },
         clickBtn() {
             this.drawer = !this.drawer;
+            const operate = {
+                operation: this.sideButtonDom.operation,
+                param: { drawer: this.drawer },
+                userOperationType: 'leftClick'
+            };
+            this.$store.dispatch('training/nextNew', operate);
         },
         acceptUser() {
             acceptConversitionInvite(this.group, this.conversitionId).then(res=>{
@@ -761,8 +778,15 @@ export default {
             });
         },
         sendText() {
-            sendChatText(this.group, {content: this.textContent}).then(resp => {
-                this.textContent = '';
+            // sendChatText(this.group, {content: this.textContent}).then(resp => {
+            //     this.textContent = '';
+            // }).catch((error) => {
+            //     this.$message.error('发送会话文字失败：' + error.message);
+            // });
+            commitOperate(menuOperate.Conversation.Chat, {content: this.textContent}, 3).then(({valid})=>{
+                if (valid) {
+                    this.textContent = '';
+                }
             }).catch((error) => {
                 this.$message.error('发送会话文字失败：' + error.message);
             });
diff --git a/src/views/newMap/displayBaSiDi/baSiDi.vue b/src/views/newMap/displayBaSiDi/baSiDi.vue
index 4e8c53c97..66f7d9169 100644
--- a/src/views/newMap/displayBaSiDi/baSiDi.vue
+++ b/src/views/newMap/displayBaSiDi/baSiDi.vue
@@ -123,11 +123,10 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
 import BuzzerAudio from '@/assets/buzzer.mp3';
 import AlarmTableHmi from '@/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi';
 import LogDetail from '@/jmapNew/theme/nanjing_02/menus/menuDialog/logDetail';
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 export default {
     name: 'BaSiDi',
     components: {
@@ -135,7 +134,6 @@ export default {
         LogDetail
     },
     props: {
-
         dataError: {
             type: Boolean,
             required: true
@@ -197,11 +195,11 @@ export default {
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.initDate(date);
+            // const date = new Date(initTime);
+            this.initDate(initTime);
         },
         '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
+            this.$store.dispatch('training/setInitTime', time);
         },
         '$store.state.socket.simulationAlarmInfo': function(val) {
             (val || []).forEach(item => {
@@ -291,14 +289,9 @@ export default {
             this.$emit('back');
         },
         initDate(date) {
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
-            const years = date.getFullYear() + '';
-            let months = date.getMonth() + 1 + '';
-            let dates = date.getDate() + '';
-            if (months.length < 2) { months = '0' + months; }
-            if (dates.length < 2) { dates = '0' + dates; }
-            this.dateString = dates + '.' + months + '.' + years;
-        }
+            this.time = timestampFormat('HH:mm:ss', date)
+            this.dateString = timestampFormat('YYYY.MM.DD', date)
+        },
     }
 };
 </script>
diff --git a/src/views/newMap/displayBaSiDi/baSiDiNew.vue b/src/views/newMap/displayBaSiDi/baSiDiNew.vue
index 9089753df..be5ff9da0 100644
--- a/src/views/newMap/displayBaSiDi/baSiDiNew.vue
+++ b/src/views/newMap/displayBaSiDi/baSiDiNew.vue
@@ -106,11 +106,10 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
 import BuzzerAudio from '@/assets/buzzer.mp3';
 import AlarmTableHmi from '@/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi';
 import LogDetail from '@/jmapNew/theme/nanjing_02/menus/menuDialog/logDetail';
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 export default {
     name: 'BaSiDi',
     components: {
@@ -169,11 +168,10 @@ export default {
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.initDate(date);
+            this.initDate(initTime);
         },
         '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
+            this.$store.dispatch('training/setInitTime', time);
         },
         '$store.state.socket.simulationAlarmInfo': function(val) {
             (val || []).forEach(item => {
@@ -263,14 +261,9 @@ export default {
             this.$emit('back');
         },
         initDate(date) {
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
-            const years = date.getFullYear() + '';
-            let months = date.getMonth() + 1 + '';
-            let dates = date.getDate() + '';
-            if (months.length < 2) { months = '0' + months; }
-            if (dates.length < 2) { dates = '0' + dates; }
-            this.dateString = dates + '.' + months + '.' + years;
-        }
+            this.time = timestampFormat('HH:mm:ss', date)
+            this.dateString = timestampFormat('YYYY.MM.DD', date)
+        },
     }
 };
 </script>
diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue
index 8f1bf3294..77baca574 100644
--- a/src/views/newMap/displayBaSiDi/index.vue
+++ b/src/views/newMap/displayBaSiDi/index.vue
@@ -26,7 +26,6 @@
 import { getSessionStorage } from '@/utils/auth';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { timeFormat } from '@/utils/date';
 import { getToken } from '@/utils/auth';
 import { creatSubscribe, clearSubscribe, displayTopic, getTopic } from '@/utils/stomp';
 import SetTime from '@/views/newMap/displayNew/demon/setTime';
@@ -309,7 +308,7 @@ export default {
             if (resp && resp.code == 200 && resp.data) {
                 if (!resp.data.dataError) {
                     this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); // 是否暂停判断
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
+                    this.$store.dispatch('training/setInitTime', resp.data.systemTime);
                     this.$store.dispatch('training/countTime');
                     this.$store.dispatch('runPlan/setRunPlanInfo', resp.data.runPlan);
                     this.planRunning = resp.data.planRunning;
@@ -342,7 +341,8 @@ export default {
                 data.loadNumber = model.loadNum;
             }
             ranAsPlan(data, this.group).then(res => {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+                // this.$store.dispatch('training/setInitTime', model.initTime);
+                this.$store.dispatch('training/setInitTime', model.timestamp);
             }).catch(error => {
                 let message = '';
                 switch (error.code) {
diff --git a/src/views/newMap/displayCity/demon/setTime.vue b/src/views/newMap/displayCity/demon/setTime.vue
index d64695573..d189fea63 100644
--- a/src/views/newMap/displayCity/demon/setTime.vue
+++ b/src/views/newMap/displayCity/demon/setTime.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import { getLoadTrainNumber } from '@/api/simulation';
 
 // 计划行车时间选择
@@ -85,23 +85,17 @@ export default {
         handleChange(initTime) {
             this.formModel.loadNum = 0;
             if (this.hasNumber) {
-                getLoadTrainNumber({ time: this.formatTime(initTime) }, this.group).then(resp => {
+                getLoadTrainNumber({ time: timestampFormat('HH:mm:ss', initTime) }, this.group).then(resp => {
                     this.maxNumber = parseInt(resp.data);
                 });
             }
         },
-        formatTime(initTime) {
-            const hh = prefixIntrger(initTime.getHours(), 2);
-            const mm = prefixIntrger(initTime.getMinutes(), 2);
-            const ss = prefixIntrger(initTime.getSeconds(), 2);
-            return `${hh}:${mm}:${ss}`;
-        },
         handleSure() {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.status = true;
                     const model = {
-                        initTime: this.formatTime(this.formModel.initTime)
+                        initTime: timestampFormat('HH:mm:ss', this.formModel.initTime),
                     };
 
                     if (this.hasNumber) {
diff --git a/src/views/newMap/displayCity/index.vue b/src/views/newMap/displayCity/index.vue
index e714b7541..3bf24d5e3 100644
--- a/src/views/newMap/displayCity/index.vue
+++ b/src/views/newMap/displayCity/index.vue
@@ -19,7 +19,6 @@
 import { getSessionStorage } from '@/utils/auth';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { timeFormat } from '@/utils/date';
 import MapSystemDraft from '@/views/newMap/mapsystemNew/index';
 import MenuDemon from './menuDemon';
 import MenuSystemTime from '@/views/newMap/displayCity/menuSystemTime';
@@ -246,7 +245,7 @@ export default {
                 data.loadNumber = model.loadNum;
             }
             ranAsPlan(data, this.group).then(res => {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+                this.$store.dispatch('training/setInitTime', model.initTime);
             }).catch(error => {
                 let message = '';
                 switch (error.code) {
diff --git a/src/views/newMap/displayCity/menuSystemTime.vue b/src/views/newMap/displayCity/menuSystemTime.vue
index 82bd57c7d..ef4be0e88 100644
--- a/src/views/newMap/displayCity/menuSystemTime.vue
+++ b/src/views/newMap/displayCity/menuSystemTime.vue
@@ -16,9 +16,8 @@
   </div>
 </template>
 <script>
-import { prefixIntrger } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
-import { timeFormat } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 
 // 顶部时间栏显示
 export default {
@@ -65,55 +64,24 @@ export default {
         }
     },
     watch: {
-        '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.initDate(date);
+        '$store.state.training.initTime': function (timestamp) {
+            this.initDate(timestamp);
         },
-        '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            this.initDate(date);
+        '$store.state.socket.simulationTimeSync': function (timestamp) { // 仿真时间更新
+            this.$store.dispatch('training/setInitTime', timestamp);
         }
     },
     mounted() {
         const initTime = this.$store.state.training.initTime;
         if (initTime > 0) {
-            const date = new Date(initTime);
-            this.initDate(date);
+            this.initDate(initTime);
         }
     },
     methods: {
-        initDate(date) {
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
-            const years = date.getFullYear() + '';
-            let months = date.getMonth() + 1 + '';
-            let dates = date.getDate() + '';
-            if (months.length < 2) { months = '0' + months; }
-            if (dates.length < 2) { dates = '0' + dates; }
-            this.dateString = dates + '/' + months + '/' + years.slice(2);
-            const day = date.getDay();
-            switch (day) {
-            case 0:
-                this.dayString = '星 期 日';
-                break;
-            case 1:
-                this.dayString = '星 期 一';
-                break;
-            case 2:
-                this.dayString = '星 期 二';
-                break;
-            case 3:
-                this.dayString = '星 期 三';
-                break;
-            case 4:
-                this.dayString = '星 期 四';
-                break;
-            case 5:
-                this.dayString = '星 期 五';
-                break;
-            case 6:
-                this.dayString = '星 期 六';
-            }
+        initDate(timestamp) {
+            this.time = timestampFormat('HH:mmss', timestamp)
+            this.dateString = timestampFormat('YYYY/MM/DD', timestamp)
+            this.dayString = timestampFormat('dddd', timestamp).split('').join(' ')
         }
     }
 };
diff --git a/src/views/newMap/displayNew/demon/modifyTime.vue b/src/views/newMap/displayNew/demon/modifyTime.vue
index f05c11ff9..ae6bb984c 100644
--- a/src/views/newMap/displayNew/demon/modifyTime.vue
+++ b/src/views/newMap/displayNew/demon/modifyTime.vue
@@ -18,7 +18,7 @@
 
 <script>
 import { modifySystemTime } from '@/api/simulation';
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 
 // 修改系统时间
 export default {
@@ -57,18 +57,12 @@ export default {
             this.status = false;
             this.show = false;
         },
-        formatTime(time) {
-            const hh = prefixIntrger(time.getHours(), 2);
-            const mm = prefixIntrger(time.getMinutes(), 2);
-            const ss = prefixIntrger(time.getSeconds(), 2);
-            return `${hh}:${mm}:${ss}`;
-        },
         handleSure() {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.status = true;
                     const model = {
-                        time: this.formatTime(this.formModel.time)
+                        time: timestampFormat('HH:mm:ss', this.formModel.time)
                     };
                     modifySystemTime(model, this.group).then(resp => {
                         this.status = false;
diff --git a/src/views/newMap/displayNew/demon/setTime.vue b/src/views/newMap/displayNew/demon/setTime.vue
index d64695573..73fc876cb 100644
--- a/src/views/newMap/displayNew/demon/setTime.vue
+++ b/src/views/newMap/displayNew/demon/setTime.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import { getLoadTrainNumber } from '@/api/simulation';
 
 // 计划行车时间选择
@@ -74,6 +74,7 @@ export default {
     },
     methods: {
         doShow() {
+            console.log(this.$store.state.training.initTime)
             this.formModel.initTime = new Date(this.$store.state.training.initTime || null);
             this.handleChange(this.formModel.initTime);
             this.show = true;
@@ -85,23 +86,19 @@ export default {
         handleChange(initTime) {
             this.formModel.loadNum = 0;
             if (this.hasNumber) {
-                getLoadTrainNumber({ time: this.formatTime(initTime) }, this.group).then(resp => {
+                getLoadTrainNumber({ time: timestampFormat('HH:mm:ss', initTime) }, this.group).then(resp => {
                     this.maxNumber = parseInt(resp.data);
                 });
             }
         },
-        formatTime(initTime) {
-            const hh = prefixIntrger(initTime.getHours(), 2);
-            const mm = prefixIntrger(initTime.getMinutes(), 2);
-            const ss = prefixIntrger(initTime.getSeconds(), 2);
-            return `${hh}:${mm}:${ss}`;
-        },
         handleSure() {
             this.$refs.form.validate((valid) => {
+                debugger
                 if (valid) {
                     this.status = true;
                     const model = {
-                        initTime: this.formatTime(this.formModel.initTime)
+                        initTime: timestampFormat('HH:mm:ss', this.formModel.initTime),
+                        timestamp:this.formModel.initTime
                     };
 
                     if (this.hasNumber) {
diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue
index 209e1cba0..30f45d062 100644
--- a/src/views/newMap/displayNew/dispatherContest/index.vue
+++ b/src/views/newMap/displayNew/dispatherContest/index.vue
@@ -86,14 +86,10 @@ import MenuSchema from '@/views/newMap/displayNew/menuSchema';
 import TheoryExamSelect from './theoryExamSelect';
 import TheoryExam from './theoryExam';
 import PayPage from '@/views/newMap/displayNew/demon/payPage';
-// import { getGoodsTryUse } from '@/api/management/goods';
 import {clearSimulation, getSimulationInfoNew } from '@/api/simulation';
-// import { PermissionType } from '@/scripts/ConstDic';
-// import { getCountTime } from '@/utils/index';
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import { ScriptMode, TrainingMode } from '@/scripts/ConstDic';
 import SelectRole from '@/views/newMap/displayNew/scriptDisplay/component/selectRole';
-// import { setGoodsTryUse } from '@/api/management/goods';
 
 import {competitionPracticalSceneStart, competitionPracticalSceneExit, competitionPracticalSceneFinish, getEmptyOperationalStatistics} from '@/api/competition';
 import { EventBus } from '@/scripts/event-bus';
@@ -142,11 +138,6 @@ export default {
     data() {
         return {
             userRole: 'AUDIENCE',
-            // training: {
-            //     id: '',
-            //     name: '',
-            //     remarks: ''
-            // },
             isScriptLoad: false,
             isScriptRun: false,
             scriptMode: ScriptMode.TEACH,
@@ -214,7 +205,7 @@ export default {
         '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
             if (this.$route.query.noFirst) {
                 const initTime = new Date(this.$store.state.training.initTime || null);
-                const model = {initTime:this.formatTime(initTime)};
+                const model = {initTime: timestampFormat('HH:mm:ss', initTime), timestamp:initTime};
                 this.start(model);
             }
         },
@@ -251,12 +242,6 @@ export default {
         });
     },
     methods: {
-        formatTime(initTime) {
-            const hh = prefixIntrger(initTime.getHours(), 2);
-            const mm = prefixIntrger(initTime.getMinutes(), 2);
-            const ss = prefixIntrger(initTime.getSeconds(), 2);
-            return `${hh}:${mm}:${ss}`;
-        },
         selectBeginTime() {
             this.$refs.setTime.doShow();
         },
diff --git a/src/views/newMap/displayNew/exam/index.vue b/src/views/newMap/displayNew/exam/index.vue
index fe9048cc4..a0b7a0eeb 100644
--- a/src/views/newMap/displayNew/exam/index.vue
+++ b/src/views/newMap/displayNew/exam/index.vue
@@ -85,6 +85,48 @@ export default {
             this.$store.dispatch('training/setStopCountTime');
             this.$store.dispatch('training/setTrainingStart', false);
             EventBus.$emit('viewLoading', false);
+        },
+        '$store.state.socket.simulationRoleList':function(list) {
+            if (list && list.length) {
+                this.checkRoleChange(list);
+            }
+        },
+        '$store.state.training.simulationUserList': function(val) {
+            const userInfo = this.$store.state.training.simulationUserList.find(user => user.userId == this.$store.state.user.id );
+            if (userInfo.type === 'STATION_SUPERVISOR') {
+                if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                    const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === userInfo.deviceCode && picture.type === 'chainStation');
+                    if (picture) {
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        const deviceList = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                            deviceList.push(key);
+                        }
+                        this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                        this.$jlmap.updatePicture(deviceList);
+                        // this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                        this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                    } else {
+                        this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                        }
+                        this.$jlmap.updateShowStation(list, userInfo.deviceCode);
+                    }
+                } else {
+                    this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    const list = [];
+                    for (const key in mapDevice) {
+                        list.push(mapDevice[key]);
+                    }
+                    this.$jlmap.updateShowStation(list, userInfo.deviceCode);
+                }
+            }
         }
     },
     // mounted() {
@@ -207,6 +249,45 @@ export default {
             if (!isSuccess) {
                 this.$store.dispatch('map/mapClear');
             }
+        },
+        checkRoleChange(list) {
+            list.forEach(item => {
+                if (item.messageType === 'PLAY_CHANGE' && item.userId == this.$store.state.user.id && item.type === 'STATION_SUPERVISOR') {
+                    if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                        const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === item.deviceCode && picture.type === 'chainStation');
+                        if (picture) {
+                            const mapDevice = this.$store.state.map.mapDevice;
+                            const list = [];
+                            const deviceList = [];
+                            for (const key in mapDevice) {
+                                list.push(mapDevice[key]);
+                                deviceList.push(key);
+                            }
+                            this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                            this.$jlmap.updatePicture(deviceList);
+                            // this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                            this.$store.dispatch('map/setShowCentralizedStationCode', item.deviceCode);
+                        } else {
+                            this.$store.dispatch('map/setShowCentralizedStationCode', item.deviceCode);
+                            const mapDevice = this.$store.state.map.mapDevice;
+                            const list = [];
+                            for (const key in mapDevice) {
+                                list.push(mapDevice[key]);
+                            }
+                            this.$jlmap.updateShowStation(list, item.deviceCode);
+                        }
+                    } else {
+                        this.$store.dispatch('map/setShowCentralizedStationCode', item.deviceCode);
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                        }
+                        this.$jlmap.updateShowStation(list, item.deviceCode);
+                    }
+                    this.$jlmap.setCenter(item.deviceCode);
+                }
+            });
         }
     }
 };
diff --git a/src/views/newMap/displayNew/exam/tipExamList.vue b/src/views/newMap/displayNew/exam/tipExamList.vue
index 6664f5004..3f9ed4f74 100644
--- a/src/views/newMap/displayNew/exam/tipExamList.vue
+++ b/src/views/newMap/displayNew/exam/tipExamList.vue
@@ -39,14 +39,14 @@
                 <span class="list-label">{{ $t('display.exam.questionTitle') }}</span>
                 <span class="list-elem">{{ courseModel.name }}</span>
               </p>
-              <p class="list-item">
-                <span class="list-label">{{ $t('display.exam.bestTime') }}</span>
-                <span class="list-elem">{{ courseModel.minDuration }} {{ $t('display.seconds') }} </span>
-              </p>
-              <p class="list-item">
-                <span class="list-label">{{ $t('display.exam.maximumTime') }}</span>
-                <span class="list-elem">{{ courseModel.maxDuration }} {{ $t('display.seconds') }} </span>
-              </p>
+              <!--              <p class="list-item">-->
+              <!--                <span class="list-label">{{ $t('display.exam.bestTime') }}</span>-->
+              <!--                <span class="list-elem">{{ courseModel.minDuration }} {{ $t('display.seconds') }} </span>-->
+              <!--              </p>-->
+              <!--              <p class="list-item">-->
+              <!--                <span class="list-label">{{ $t('display.exam.maximumTime') }}</span>-->
+              <!--                <span class="list-elem">{{ courseModel.maxDuration }} {{ $t('display.seconds') }} </span>-->
+              <!--              </p>-->
               <p class="list-item">
                 <span class="list-label"> {{ $t('display.exam.trainingInstructions') }}</span>
                 <span class="list-elem">{{ courseModel.remarks }}</span>
@@ -82,7 +82,8 @@
 import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
 import { refreshExamList } from '@/api/management/userexam';
-import { getTrainingDetailNew } from '@/api/jmap/training';
+// import { getTrainingDetailNew } from '@/api/jmap/training';
+import { loadTrainingInSimulation } from '@/api/jmap/training';
 
 export default {
     name: 'TipExamList',
@@ -137,6 +138,9 @@ export default {
         },
         isLast() {
             return this.examIndex == this.trainingList.length - 1;
+        },
+        group() {
+            return this.$route.query.group;
         }
     },
     watch: {
@@ -166,7 +170,8 @@ export default {
                 }
             });
             if (obj) {
-                getTrainingDetailNew(obj.trainingId).then(resp => {
+                loadTrainingInSimulation(this.group, obj.trainingId).then(resp => {
+                // getTrainingDetailNew(obj.trainingId).then(resp => {
                     this.courseModel = {
                         id: resp.data.id,
                         name: resp.data.name,
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 4c531db3f..2e02bb7c0 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -225,7 +225,7 @@ export default {
             if (resp && resp.code == 200 && resp.data) {
                 if (!resp.data.dataError) {
                     this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); // 是否暂停判断
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
+                    this.$store.dispatch('training/setInitTime', resp.data.systemTime);
                     // this.$store.dispatch('training/countTime');
                     if (resp.data.prodType === '03') {
                         this.$store.dispatch('training/setPrdType', this.$route.query.prdType);
@@ -287,7 +287,8 @@ export default {
                 data.loadNumber = model.loadNum;
             }
             ranAsPlan(data, this.group).then(res => {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+                // this.$store.dispatch('training/setInitTime', model.initTime);
+                this.$store.dispatch('training/setInitTime', model.timestamp);
             }).catch(error => {
                 let message = '';
                 switch (error.code) {
diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue
index d823efbde..111eea871 100644
--- a/src/views/newMap/displayNew/lesson/index.vue
+++ b/src/views/newMap/displayNew/lesson/index.vue
@@ -130,13 +130,43 @@ export default {
         '$store.state.training.simulationUserList': function(val) {
             const userInfo = this.$store.state.training.simulationUserList.find(user => user.userId == this.$store.state.user.id );
             if (userInfo.type === 'STATION_SUPERVISOR') {
-                this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
-                const mapDevice = this.$store.state.map.mapDevice;
-                const list = [];
-                for (const key in mapDevice) {
-                    list.push(mapDevice[key]);
+                if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                    const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === userInfo.deviceCode && picture.type === 'chainStation');
+                    if (picture) {
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        const deviceList = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                            deviceList.push(key);
+                        }
+                        this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                        this.$jlmap.updatePicture(deviceList);
+                        // this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                        this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                    } else {
+                        this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                        }
+                        this.$jlmap.updateShowStation(list, userInfo.deviceCode);
+                    }
+                } else {
+                    this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    const list = [];
+                    for (const key in mapDevice) {
+                        list.push(mapDevice[key]);
+                    }
+                    this.$jlmap.updateShowStation(list, userInfo.deviceCode);
                 }
-                this.$jlmap.updateShowStation(list, userInfo.deviceCode);
+            }
+        },
+        '$store.state.socket.simulationRoleList':function(list) {
+            if (list && list.length) {
+                this.checkRoleChange(list);
             }
         },
         async $route() {
@@ -331,6 +361,45 @@ export default {
                 }
             });
             window.open(routeData.href, '_blank');
+        },
+        checkRoleChange(list) {
+            list.forEach(item => {
+                if (item.messageType === 'PLAY_CHANGE' && item.userId == this.$store.state.user.id && item.type === 'STATION_SUPERVISOR') {
+                    if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                        const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === item.deviceCode && picture.type === 'chainStation');
+                        if (picture) {
+                            const mapDevice = this.$store.state.map.mapDevice;
+                            const list = [];
+                            const deviceList = [];
+                            for (const key in mapDevice) {
+                                list.push(mapDevice[key]);
+                                deviceList.push(key);
+                            }
+                            this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                            this.$jlmap.updatePicture(deviceList);
+                            // this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                            this.$store.dispatch('map/setShowCentralizedStationCode', item.deviceCode);
+                        } else {
+                            this.$store.dispatch('map/setShowCentralizedStationCode', item.deviceCode);
+                            const mapDevice = this.$store.state.map.mapDevice;
+                            const list = [];
+                            for (const key in mapDevice) {
+                                list.push(mapDevice[key]);
+                            }
+                            this.$jlmap.updateShowStation(list, item.deviceCode);
+                        }
+                    } else {
+                        this.$store.dispatch('map/setShowCentralizedStationCode', item.deviceCode);
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                        }
+                        this.$jlmap.updateShowStation(list, item.deviceCode);
+                    }
+                    this.$jlmap.setCenter(this.trainingObj.locateDeviceCode);
+                }
+            });
         }
     }
 };
diff --git a/src/views/newMap/displayNew/lesson/tipTrainingDetail.vue b/src/views/newMap/displayNew/lesson/tipTrainingDetail.vue
index d3f6ad2eb..c9bc3efe5 100644
--- a/src/views/newMap/displayNew/lesson/tipTrainingDetail.vue
+++ b/src/views/newMap/displayNew/lesson/tipTrainingDetail.vue
@@ -18,14 +18,14 @@
                 <span class="list-label">{{ $t('display.training.trainingName') }}</span>
                 <span class="list-elem">{{ courseModel.name }}</span>
               </p>
-              <p class="list-item">
-                <span class="list-label">{{ $t('display.training.bestTime') }}</span>
-                <span class="list-elem">{{ courseModel.minDuration }} {{ $t('display.seconds') }} </span>
-              </p>
-              <p class="list-item">
-                <span class="list-label">{{ $t('display.training.maximumTime') }}</span>
-                <span class="list-elem">{{ courseModel.maxDuration }} {{ $t('display.seconds') }} </span>
-              </p>
+              <!--              <p class="list-item">-->
+              <!--                <span class="list-label">{{ $t('display.training.bestTime') }}</span>-->
+              <!--                <span class="list-elem">{{ courseModel.minDuration }} {{ $t('display.seconds') }} </span>-->
+              <!--              </p>-->
+              <!--              <p class="list-item">-->
+              <!--                <span class="list-label">{{ $t('display.training.maximumTime') }}</span>-->
+              <!--                <span class="list-elem">{{ courseModel.maxDuration }} {{ $t('display.seconds') }} </span>-->
+              <!--              </p>-->
               <p class="list-item">
                 <span class="list-label" style="vertical-align: top;"> {{ $t('display.training.trainingInstructions') }}</span>
                 <span class="list-elem elem-span">{{ courseModel.remarks }}</span>
diff --git a/src/views/newMap/displayNew/menuSystemTime.vue b/src/views/newMap/displayNew/menuSystemTime.vue
index 0530fdbbb..576df343e 100644
--- a/src/views/newMap/displayNew/menuSystemTime.vue
+++ b/src/views/newMap/displayNew/menuSystemTime.vue
@@ -16,9 +16,8 @@
   </div>
 </template>
 <script>
-import { prefixIntrger } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
-import { timeFormat } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 
 // 顶部时间栏显示
 export default {
@@ -69,55 +68,24 @@ export default {
         }
     },
     watch: {
-        '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.initDate(date);
+        '$store.state.training.initTime': function (timestamp) {
+            this.initDate(timestamp);
         },
-        '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
-            this.initDate(date);
+        '$store.state.socket.simulationTimeSync': function (timestamp) { // 仿真时间更新
+            this.initDate(timestamp)
         }
     },
     mounted() {
         const initTime = this.$store.state.training.initTime;
         if (initTime > 0) {
-            const date = new Date(initTime);
-            this.initDate(date);
+            this.initDate(initTime);
         }
     },
     methods: {
-        initDate(date) {
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
-            const years = date.getFullYear() + '';
-            let months = date.getMonth() + 1 + '';
-            let dates = date.getDate() + '';
-            if (months.length < 2) { months = '0' + months; }
-            if (dates.length < 2) { dates = '0' + dates; }
-            this.dateString = dates + '/' + months + '/' + years.slice(2);
-            const day = date.getDay();
-            switch (day) {
-            case 0:
-                this.dayString = '星 期 日';
-                break;
-            case 1:
-                this.dayString = '星 期 一';
-                break;
-            case 2:
-                this.dayString = '星 期 二';
-                break;
-            case 3:
-                this.dayString = '星 期 三';
-                break;
-            case 4:
-                this.dayString = '星 期 四';
-                break;
-            case 5:
-                this.dayString = '星 期 五';
-                break;
-            case 6:
-                this.dayString = '星 期 六';
-            }
+        initDate(timestamp) {
+            this.time = timestampFormat('HH:mmss', timestamp)
+            this.dateString = timestampFormat('YYYY/MM/DD', timestamp)
+            this.dayString = timestampFormat('dddd', timestamp).split('').join(' ')
         }
     }
 };
diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue
index 418ba98c3..c851074e9 100644
--- a/src/views/newMap/displayNew/practiceDisplay.vue
+++ b/src/views/newMap/displayNew/practiceDisplay.vue
@@ -104,7 +104,6 @@ import { creatSubscribe, clearSubscribe, displayTopic, LPFTopic} from '@/utils/s
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 import { getToken } from '@/utils/auth';
 import { mapGetters } from 'vuex';
-import { timeFormat } from '@/utils/date';
 import { getPostByProjectCode } from '@/api/learn';
 import { ProjectCode } from '@/scripts/ProjectConfig';
 export default {
@@ -288,7 +287,7 @@ export default {
             if (resp && resp.code == 200 && resp.data) {
                 if (!resp.data.dataError) {
                     this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); // 是否暂停判断
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
+                    this.$store.dispatch('training/setInitTime', resp.data.systemTime);
                     // this.$store.dispatch('training/countTime');
                     this.$store.dispatch('runPlan/setRunPlanInfo', resp.data.runPlan);
                     this.planRunning = resp.data.planRunning;
@@ -437,7 +436,8 @@ export default {
                 data.loadNumber = model.loadNum;
             }
             ranAsPlan(data, this.group).then(res => {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+                // this.$store.dispatch('training/setInitTime', model.initTime);
+                this.$store.dispatch('training/setInitTime', model.timestamp);
             }).catch(error => {
                 let message = '';
                 switch (error.code) {
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
index 4cb4f824d..098a0f671 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
@@ -267,7 +267,7 @@ export default {
                     this.$store.dispatch('training/over');// 仿真按计划行车结束
                 }
                 this.planRunning = resp.data.planRunning;
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
+                this.$store.dispatch('training/setInitTime', resp.data.systemTime);
             } else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
                 this.dataError = true;
                 this.$messageBox('此地图数据正在维护中,无法运行！');
diff --git a/src/views/newMap/displayNew/utils.js b/src/views/newMap/displayNew/utils.js
index 96f63cedc..199f51e80 100644
--- a/src/views/newMap/displayNew/utils.js
+++ b/src/views/newMap/displayNew/utils.js
@@ -29,7 +29,7 @@ export function covertMemberData (activeTrainList, resp) {
         const name = member.name ? '-' + member.name : '';
         if (member.deviceCode) {
             const device = store.getters['map/getDeviceByCode'](member.deviceCode);
-            member.deviceName = device.name || device.groupNumber;
+            member.deviceName = device ? device.name || device.groupNumber : '';
             member.label = member.type + member.deviceName + name + userName;
             member.normalName = member.type + member.deviceName + name;
         } else {
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 95fa6cc70..84b1d1ba4 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -95,7 +95,6 @@ import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
 import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice';
 import Jl3dMaintainerSelect from '@/views/jlmap3d/maintainer/jl3dmaintainerselect';
 import { EventBus } from '@/scripts/event-bus';
-import { timeFormat } from '@/utils/date';
 import { Message } from 'element-ui';
 import { getToken } from '@/utils/auth';
 import MembersManage from './memberManage/membersManage';
@@ -389,7 +388,7 @@ export default {
             const resp = await getSimulationInfoNew(this.group);
             if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
                 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);// 设置剧本暂停装填
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));// 设置仿真时间
+                this.$store.dispatch('training/setInitTime', resp.data.systemTime);// 设置仿真时间
                 // this.$store.dispatch('training/countTime');// 前端仿真时间开始跑秒
                 this.$store.dispatch('runPlan/setRunPlanInfo', resp.data.runPlan);
                 if (resp.data.planRunning) {
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 43f6d45a0..4ebb137ab 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -237,7 +237,7 @@ export default {
         },
         '$store.state.socket.simulationStart': async function (val) {
             if (val) {
-                this.$store.dispatch('training/setInitTime', +new Date(val));
+                this.$store.dispatch('training/setInitTime', val);
                 this.$store.dispatch('training/start');
             }
         }
@@ -356,6 +356,7 @@ export default {
         },
         selectBeginTime() {
             this.$refs.setTime.doShow();
+            console.log(1);
         },
         // 开始仿真
         start(model) {
@@ -363,7 +364,8 @@ export default {
                 time: model.initTime
             };
             ranAsPlan(data, this.group).then(res => {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+                // this.$store.dispatch('training/setInitTime', model.initTime);
+                this.$store.dispatch('training/setInitTime', model.timestamp);
             }).catch((error) => {
                 if (error.code == '5001') {
                     this.$messageBox(this.$t('error.mapDataError') + '，' + this.$t('error.startSimulationFailed'));
diff --git a/src/views/newMap/jointTrainingNew/realCCTV.vue b/src/views/newMap/jointTrainingNew/realCCTV.vue
index 3977b36db..5de8da288 100644
--- a/src/views/newMap/jointTrainingNew/realCCTV.vue
+++ b/src/views/newMap/jointTrainingNew/realCCTV.vue
@@ -42,14 +42,75 @@ export default {
             const videoPlay = new Video('myvideo' + i, {
                 controls: false,
                 autoplay: 'muted',
-                loop:true,
+                loop: false,
                 preload: 'auto',
                 width: window.innerWidth / 2 + 'px',
                 height: window.innerHeight + 'px',
                 hls: {
                     withCredentials: true
                 }
-            }, function () { console.log('videojs播放器初始化成功'); });
+            }, function () {
+                console.log('videojs播放器初始化成功');
+                const video = this;
+                var lastTime = -1;
+                this.on('loadeddata', function() {
+                    console.log('loadeddata');
+                });
+                this.on('seeked', function() {
+                    // 已经拿到视频流,可以播放
+                    console.log('seeked');
+                    // var currentTime = video.currentTime();
+                    // if (currentTime != lastTime) {
+                    //     video.currentTime(currentTime + 10000);
+                    //     video.play();
+                    // }
+                });
+                this.on('error', function() {
+                    console.log('error');
+                    if (video.error().code == '') {
+                        const src = video.getMedia().src[0].src;
+                        video.reset();
+                        video.src(src);
+                        video.load();
+                        video.play();
+                        var currentTime = video.currentTime();
+                        lastTime = currentTime;
+                    }
+                });
+                this.on('loadedmetadata', function() {
+                    console.log('loadedmetadata');
+                    // 加载到元数据后开始播放视频
+                    // startVideo();
+                    video.autoplay(true);
+
+                    // var tryTimes = 0;
+                    let isVideoBreak = null;
+                    clearInterval(isVideoBreak);
+                    isVideoBreak = setInterval(function() {
+                        // debugger;
+                        var currentTime = video.currentTime();
+                        console.log('currentTime' + currentTime + 'lastTime' + lastTime);
+                        if (currentTime == lastTime) {
+                            video.currentTime(currentTime + 10000);
+                            video.play();
+                            // video.src({
+                            //     src:that.videosrc
+                            // });
+                            // // 尝试5次播放后，如仍未播放成功提示刷新
+                            // if (++tryTimes > 5) {
+                            //     alert('您的网速有点慢，刷新下试试');
+                            //     tryTimes = 0;
+                            // }
+                        } else {
+                            lastTime = currentTime;
+                            // tryTimes = 0;
+                        }
+                    }, 3000);
+                });
+                this.on('play', function() {
+                    console.log('play');
+                });
+            });
             this.videoList.push(videoPlay);
         }
     },
diff --git a/src/views/newMap/mapDraftPicture/createPicture.vue b/src/views/newMap/mapDraftPicture/createPicture.vue
index d7eff1ecd..827405b49 100644
--- a/src/views/newMap/mapDraftPicture/createPicture.vue
+++ b/src/views/newMap/mapDraftPicture/createPicture.vue
@@ -14,6 +14,7 @@
           <el-option label="站间透明" value="lucency" />
           <el-option label="连锁车站" value="chainStation" />
           <el-option label="大屏显示" value="bigScreen" />
+          <el-option label="区域批量操作" value="regionBatchOperation" />
         </el-select>
       </el-form-item>
       <el-form-item v-if="ruleForm.type !== 'bigScreen'" label="所属车站：" prop="stationCode">
diff --git a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue
new file mode 100644
index 000000000..bdf2a3655
--- /dev/null
+++ b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue
@@ -0,0 +1,146 @@
+<template>
+  <el-dialog v-dialogDrag :title="$t('map.routePreview')" :visible.sync="show" width="60%" :before-do-close="doClose" append-to-body>
+    <div>
+      <QueryListPage
+        ref="queryListPage"
+        style="margin-top: 10px;"
+        :pager-config="pagerConfig"
+        :query-form="queryForm"
+        :query-list="queryList"
+      />
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getDisStationList, deleteDisStation } from '@/api/disStation.js';
+import { mapGetters } from 'vuex';
+export default {
+    name:'BigRouteDetail',
+    props: {
+        mapInfo: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            show:false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                show:false
+            },
+            queryList: {
+                query: this.queryFunction,
+                height:'500px',
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '调度台名称',
+                        width: 150,
+                        prop: 'name'
+                    },
+                    {
+                        title: 'code',
+                        width: 150,
+                        prop: 'code'
+                    },
+                    {
+                        title: '下辖车站',
+                        prop: 'stationList',
+                        type: 'tag',
+                        columnValue: (row) => { return this.getNameList(row.stationList); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '200',
+                        buttons: [
+                            {
+                                name: '删除',
+                                handleClick: this.deleteRoute,
+                                type: 'danger'
+                            },
+                            {
+                                name: '编辑',
+                                handleClick: this.editRouteFn,
+                                type: 'primary'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    mounted() {
+
+    },
+    methods:{
+        doShow() {
+            this.show = true;
+            this.reloadData();
+        },
+        doClose() {
+            this.show = false;
+        },
+        reloadData() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        queryFunction(params) {
+            if (this.mapInfo && this.mapInfo.id) {
+                return getDisStationList(this.mapInfo.id, params);
+            }
+        },
+        getNameList(codeList) {
+            const nameList = [];
+            codeList && codeList.forEach(item => {
+                nameList.push(this.formatName(item));
+            });
+            return nameList;
+        },
+        formatName(code) {
+            let name = '';
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            if (device) {
+                name = device.name || device.code;
+            }
+            return name;
+        },
+        editRouteFn(index, row) {
+            this.$emit('setEditDate', JSON.parse(JSON.stringify(row)));
+            this.doClose();
+        },
+        deleteRoute(index, row) {
+            this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
+                confirmButtonText: this.$t('tip.confirm'),
+                cancelButtonText: this.$t('tip.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteDisStation(this.mapInfo.id, row.code).then(res => {
+                    this.$message.success('删除成功！');
+                    this.reloadData();
+                    this.$emit('refresh');
+                }).catch(err => {
+                    console.log('删除失败！', err);
+                    this.$message.error('删除失败！');
+                });
+            }).catch(() => {
+                this.$message.info(this.$t('tip.cancelledDelete'));
+            });
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/index.vue
new file mode 100644
index 000000000..9eb98999f
--- /dev/null
+++ b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/index.vue
@@ -0,0 +1,92 @@
+<template>
+  <div style="height: 100%;">
+    <DisStationDraft
+      ref="routeEdit"
+      :selected="selected"
+      :map-info="mapInfo"
+      @setCenter="setCenter"
+    />
+    <DisStationDetail ref="routeDetail" :map-info="mapInfo" @refresh="refresh" @setEditDate="setEditDate" />
+  </div>
+</template>
+<script>
+import DisStationDraft from './route';
+import DisStationDetail from './detail';
+
+export default {
+    name: 'DisStationOperate',
+    components: {
+        DisStationDraft,
+        DisStationDetail
+    },
+    props: {
+        mapInfo: {
+            type: Object,
+            default() {
+                return null;
+            }
+        },
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            routeList:[]
+        };
+    },
+    created() {},
+    methods: {
+        setEditDate(data) {
+            this.$nextTick(() => {
+                this.$refs.routeEdit.initPage(data);
+            });
+        },
+        clickEvent(e, model) {
+            this.onSelect(model);
+        },
+        onSelect(model) {
+            if (model) {
+                this.selected = model;
+            } else {
+                this.selected = null;
+            }
+        },
+        setDelayUnlockStatus(data, status) {
+            if (data && data.delayShowList) {
+                data.delayShowList.forEach(elem => {
+                    elem.status = status;
+                });
+            }
+        },
+        previewRouteEvent: function () {
+            if (this.$refs && this.$refs.routeDetail) {
+                this.$refs.routeDetail.doShow();
+            }
+        },
+        initLoad() {
+            this.$refs.routeEdit && this.$refs.routeEdit.initLoad();
+        },
+        createRouteEvent: function () {
+            if (this.$refs && this.$refs.routeEdit) {
+                this.$refs.routeEdit.initPage();
+            }
+        },
+        setSelected(selected) {
+            this.$refs.routeEdit.setSelected(selected);
+        },
+        setCenter(code) {
+            this.$emit('setCenter', code);
+        },
+        batchSectionListFocus(flag) {
+            this.$refs.routeEdit.batchSectionListFocus(flag);
+        },
+        refresh() {
+            this.$refs.routeEdit.initPage();
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue
new file mode 100644
index 000000000..02ff686b8
--- /dev/null
+++ b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="BigRouteInfo">
+    <el-form ref="form" :model="editModel" :rules="rules" label-width="140px" size="mini" class="bigDefinition">
+      <el-form-item label="编号:">
+        <el-select v-model="editModel.code" disabled :placeholder="$t('map.pleaseSelect')">
+          <el-option
+            v-for="item in disStationList"
+            :key="item.code"
+            :label="`${item.name}(${item.code})`"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="调度台名称:" prop="name">
+        <el-input v-model="editModel.name" style="width: 180px;" />
+      </el-form-item>
+      <el-form-item label="下辖车站:" prop="stationList">
+        <el-select v-model="editModel.stationList" multiple clearable filterable :placeholder="$t('map.pleaseSelect')">
+          <el-option
+            v-for="item in stationList"
+            :key="item.code"
+            :label="`${item.name}(${item.code})`"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div class="button_box">
+      <el-button-group class="button-group">
+        <el-button v-if="editModel.code" type="primary" size="small" @click="edit">更新</el-button>
+        <el-button v-else type="success" size="small" @click="create">保存</el-button>
+      </el-button-group>
+    </div>
+
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { getUID } from '@/jmapNew/utils/Uid';
+import { deepAssign } from '@/utils/index';
+import { createDisStation, updateDisStation } from '@/api/disStation.js';
+
+export default {
+    name:'DisStationDraft',
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        },
+        mapInfo: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            editModel: {
+                code: '',
+                name: '',
+                stationList: [] // 关联车站code列表
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'disStationList',
+            'stationList'
+        ]),
+        mapId() {
+            return this.$route.params.mapId || '';
+        },
+        rules() {
+            const rules = {
+                code: [
+                    { required: true, message: this.$t('rules.pleaseSelect'), trigger: 'change' }
+                ],
+                name: [
+                    { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'change' }
+                ],
+                stationList: [
+                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
+                ]
+            };
+            return rules;
+        }
+    },
+    mounted() {
+        this.initPage();
+    },
+    methods: {
+        initPage(row) {
+            if (this.mapInfo) {
+                if (row) {
+                    this.editModel = Object.assign({}, row);
+                } else {
+                    this.$refs.form && this.$refs.form.resetFields();
+                    this.editModel.code = '';
+                }
+            }
+        },
+        edit() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    const model = deepAssign({}, this.editModel);
+                    console.log('model', model);
+                    updateDisStation(this.mapId, model).then(res => {
+                        this.$message.success('修改成功！');
+                    }).catch(err => {
+                        console.log('修改失败！', err);
+                        this.$message.error('修改失败！');
+                    });
+                }
+            });
+        },
+        create() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    const uid = getUID('DisStation', this.disStationList);
+                    const model = {
+                        mapId: this.mapId,
+                        code: uid,
+                        name: this.editModel.name,
+                        stationList: this.editModel.stationList
+                    };
+                    console.log('model', model);
+                    createDisStation(this.mapId, model).then(res => {
+                        this.$refs.form.resetFields();
+                        this.$message.success('创建成功！');
+                    }).catch(err => {
+                        console.log('创建失败！', err);
+                        this.$message.error('创建失败！');
+                    });
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+    .button_box{
+		position: absolute;
+		bottom: 0;
+		background: #fff;
+		box-shadow: 4px 5px 10px #565656;
+		width: 100%;
+		padding: 8px 10px;
+	}
+	.button-group{float: right;}
+</style>
diff --git a/src/views/newMap/newMapdraft/dataRelation/index.vue b/src/views/newMap/newMapdraft/dataRelation/index.vue
index 4bb85ee5a..9920156b2 100644
--- a/src/views/newMap/newMapdraft/dataRelation/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/index.vue
@@ -33,6 +33,7 @@ import RouteOperate from './routeoperate/index';
 import RoutingOperate from './routingoperate/index';
 import BigRoutingOperate from './bigroutingoperate/index';
 import IndicatorAssociatedInfo from './indicatorAssociatedInfo/index';
+import DisStationOperate from './disStationOperate/index';
 import AutomaticOperate from './automaticoperate/index';
 // import PathOperate from './pathoperate/index';
 import RunLevelOperate from './runLeveloperate/index';
@@ -58,6 +59,7 @@ export default {
         TurnedOperate,
         DwellTimeOperate,
         ContinueProtectOperate,
+        DisStationOperate,
         IndicatorAssociatedInfo
         // DestinationOperate
     },
@@ -102,6 +104,9 @@ export default {
                 {label: '出入口', name: 'indicatorAssociatedInfo', menus: IndicatorAssociatedInfo}
                 // {label: this.$t('map.routing'), name:'routing', menus:RoutingOperate}
             ];
+            if (this.$route.query.lineCode == '16') {
+                this.tabList.push({label: '调度台', name: 'DisStationOperate', menus: DisStationOperate});
+            }
             this.enabledTab = 'bigRoutingOperate';
         } else {
             this.tabList = [
diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
index 8df1abbfa..47ff8ac12 100644
--- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
@@ -121,10 +121,10 @@
 									handleClick: this.deleteRoute,
 									type: 'danger'
 								},
-								// {
-								// 	name: '更新',
-								// 	handleClick: this.handleUpdate,
-								// }
+								{
+									name: '修改',
+									handleClick: this.handleUpdate,
+								}
 							]
 						}
 					]
@@ -175,11 +175,13 @@
 				});
 			},
 			handleUpdate(index, row) {
-				saveAssist(row, this.$route.params.mapId).then(res => {
-					this.$message.success('更新成功');
-				}).catch(() => {
-					this.$messageBox('操作异常');
-				});
+				this.$emit('updateData',row);
+				this.doClose();
+				// saveAssist(row, this.$route.params.mapId).then(res => {
+				// 	this.$message.success('更新成功');
+				// }).catch(() => {
+				// 	this.$messageBox('操作异常');
+				// });
 			},
 		}
 	};
diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue
index 0c54e7e92..cb159205f 100644
--- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue
@@ -6,7 +6,8 @@
 			:map-info="mapInfo"
 			@setCenter="setCenter"
 		/>
-		<indicator-associated-info-detail ref="routeDetail" :map-info="mapInfo" @routeSelected="routeSelected" @refresh="refresh" />
+		<!-- @routeSelected="routeSelected" -->
+		<indicator-associated-info-detail ref="routeDetail" :map-info="mapInfo"  @refresh="refresh" @updateData="updateData"/>
 	</div>
 </template>
 <script>
@@ -59,12 +60,12 @@
 					});
 				}
 			},
-			routeSelected: function (data) {
-				this.routeData = data;
-				if (this.$refs && this.$refs.routeEdit) {
-					this.$refs.routeEdit.isModify = data.id;
-				}
-			},
+			// routeSelected: function (data) {
+			// 	this.routeData = data;
+			// 	if (this.$refs && this.$refs.routeEdit) {
+			// 		this.$refs.routeEdit.isModify = data.id;
+			// 	}
+			// },
 			previewRouteEvent: function () {
 				if (this.$refs && this.$refs.routeDetail) {
 					this.$refs.routeDetail.doShow();
@@ -89,6 +90,9 @@
 			},
 			refresh() {
 				this.$refs.routeEdit.initPage();
+			},
+			updateData(row){
+				this.$refs.routeEdit.initPage(row);
 			}
 		}
 	};
diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
index f791c8eee..946dd5c50 100644
--- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
@@ -158,7 +158,8 @@ export default {
             directionLabelList: ConstConfig.ConstSelect.directionLabelList,
             ioDirectionList: ConstConfig.ConstSelect.ioDirectionList,
             addModel:{
-                id: '',
+                id:'',
+                code: '',
                 name:'',
                 stationCode: '',
                 labelEnum:'',
@@ -222,11 +223,17 @@ export default {
         this.initPage();
     },
     methods:{
-        initPage() {
+        initPage(row) {
             if (this.mapInfo) {
-                queryAssistListPaged({pageNum: 1, pageSize: 999}, this.mapInfo.id).then(resp => {
-                    this.relativeList = resp.data.list;
-                });
+                if (row) {
+                    this.isModify = true;
+                    this.addModel = Object.assign({}, row);
+                } else {
+                    this.isModify = false;
+                }
+                // queryAssistListPaged({pageNum: 1, pageSize: 999}, this.mapInfo.id).then(resp => {
+                //     this.relativeList = resp.data.list;
+                // });
             }
         },
         hover(field) {
@@ -251,15 +258,25 @@ export default {
                 }
             }
         },
+        update() {
+            this.save();
+        },
         save() {
             const that = this;
             that.$refs.form.validate((valid) => {
                 if (valid) {
                     const newModel = deepAssign({}, that.addModel);
+                    if (!that.isModify) {
+                        delete newModel.id;
+                    }
                     // newModel.code = setUID('Route');
                     that.loading = true;
                     saveAssist(newModel, that.mapInfo.id).then(res=>{
-                        that.$message.success(that.$t('tip.creatingSuccessful'));
+                        if (that.isModify) {
+                            that.$message.success('更新成功');
+                        } else {
+                            that.$message.success(that.$t('tip.creatingSuccessful'));
+                        }
                         that.loading = false;
                         this.initPage();
                         that.clear();
@@ -273,8 +290,10 @@ export default {
         clear() {
             if (this.$refs && this.$refs.form && this.mapInfo) {
                 this.$refs.form.resetFields();
+                this.isModify = false;
                 this.addModel = {
-                    id: '',
+                    id:'',
+                    code: '',
                     name:'',
                     stationCode: '',
                     labelEnum:'',
@@ -283,7 +302,9 @@ export default {
                     signalCode: '',
                     runModel: '',
                     runStatus: '',
-                    relativeCode: ''
+                    relativeStationCode: '',
+                    relativeLabelEnum: ''
+
                 };
             }
         }
diff --git a/src/views/newMap/newMapdraft/mapoperate/config/list.vue b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
index f49ad6a5c..ab5c68855 100644
--- a/src/views/newMap/newMapdraft/mapoperate/config/list.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
@@ -99,7 +99,7 @@
             <el-form-item v-if="!item.isHidden" :key="item.prop" :label="item.label" :prop="item.prop" :required="item.required">
               <template v-if="!item.firstLevel">
                 <template>
-                  <el-input-number v-model="formModel[item.prop]" :min="item.min" :max="item.max" :label="item.label" :disabled="item.disabled" style="width: 140px" @change="((val)=>{deviceChange(val,item)})" />
+                  <el-input-number v-model="formModel[item.prop]" :min="item.min" :max="item.max" :precision="item.precision" :label="item.label" :disabled="item.disabled" style="width: 140px" @change="((val)=>{deviceChange(val,item)})" />
                 </template>
                 <span class="numberSpan">{{ item.placeholder }}</span>
                 <el-button v-if="item.button" type="primary" size="mini" class="numberBtn" @click="item.clickFunction">{{ item.buttonText }}</el-button>
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
index e5100b997..8cddaa344 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
@@ -125,6 +125,9 @@
           </el-form-item>
         </el-form>
       </el-collapse-item>
+      <el-collapse-item title="批量计算区段长度" name="8">
+        <el-button class="sectionSetting" @click="calculateSectionLength" type="primary" size="small">设置</el-button>
+      </el-collapse-item>
     </el-collapse>
   </div>
 </template>
@@ -424,6 +427,24 @@ export default {
             }
             models.push(deepAssign(section, { _type: 'Section' }));
             this.$emit('updateMapModel', models);
+        },
+        calculateSectionLength(){
+            const precisionOf = num => num.toString().split('.').pop().length
+            this.$confirm('确认设置所有区段的实际长度吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(()=>{
+                this.sectionList.forEach(section => {
+                    const { kmMin, kmMax } = section
+                    if (typeof kmMin === 'number' && typeof kmMax === 'number') {
+                        const precision = Math.max(precisionOf(kmMin), precisionOf(kmMax))
+                        section.lengthFact = Number((kmMax - kmMin).toFixed(precision))
+                    }
+                })
+                this.$emit('updateMapModel', this.sectionList)
+                this.$message.success('区段长度设置成功!')
+            })
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index 8ef3a3e20..23457d3d1 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -223,6 +223,8 @@ export default {
                             { prop: 'logicLengthList', label: '逻辑区段实际长度:', type: 'lengthFact', isHidden: !this.isHasLogicPhysicalSection, mergeLength: this.mergeLength, width: '160px'},
                             { prop: 'leftStopPointOffset', label: this.$t('map.leftStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 左向停车点偏移量
                             { prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 右向停车点偏移量
+                            { prop: 'kmMin', label: '最小公里标：', type: 'number', min: 0, placeholder: this.$t('map.meter'), precision: 2, isHidden: !this.isSwitchSectionType || !this.isCrossSectionType || !this.isLogicSectionType },
+                            { prop: 'kmMax', label: '最大公里标：', type: 'number', min: 0, placeholder: this.$t('map.meter'), precision: 2, isHidden: !this.isSwitchSectionType || !this.isCrossSectionType || !this.isLogicSectionType },
                             { prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow },
                             { prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true, isHidden: !this.isSwitchSectionShow },
                             { prop: 'relCrossSection', label: '关联岔心', type: 'select', optionLabel: 'name&&code', optionValue: 'code', clearable: true, isHidden: this.isSwitchSectionType, options: this.crossSectionList }
@@ -321,6 +323,9 @@ export default {
         isSwitchSectionType() {
             return this.editModel.type !== '04';
         },
+        isLogicSectionType() {
+            return this.editModel.type !== '02';
+        },
         isLogicSectionNameSort() { // 逻辑区段排序 判断
             return this.editModel.type == '01';
         },
diff --git a/src/views/pis/components/slideshow.vue b/src/views/pis/components/slideshow.vue
new file mode 100644
index 000000000..ecc8cd449
--- /dev/null
+++ b/src/views/pis/components/slideshow.vue
@@ -0,0 +1,91 @@
+<template>
+  <div class="wrapper">
+    <div class="slidecontent" :class="{ animation: animation }" :style="`transform: translateX(-${currentIndex}00%)`">
+      <template v-for="(path, idx) in _paths">
+        <img class="img" :src="idx - currentIndex < 3 ? `${prefix}${path}` : ''" :key="`${path}${idx}`" />
+      </template>
+    </div>
+  </div>
+</template>
+
+<script>
+let timer
+export default {
+  name: 'SlideShow',
+  props: {
+    paths: {
+      type: Array,
+      validator: val => Array.isArray(val) && val.every(item => typeof item === 'string'),
+    },
+    prefix: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      currentIndex: 0,
+      animation: true,
+    }
+  },
+  computed: {
+    len() {
+      return this._paths.length
+    },
+    _paths() {
+      return [...this.paths, this.paths[0]]
+    },
+  },
+  mounted() {
+    this.initAnimation()
+    window.addEventListener('visibilitychange', this.visibilityChangeHandler)
+  },
+  methods: {
+    initAnimation() {
+      timer = setInterval(() => {
+        this.animation = true
+        this.currentIndex = this.nextIndex(this.currentIndex)
+        setTimeout(() => {
+          if (this.currentIndex === this.len - 1) {
+            this.animation = false
+            this.currentIndex = this.nextIndex(this.currentIndex)
+          }
+        }, 1000)
+      }, 4000)
+    },
+    pauseAnimation() {
+      clearInterval(timer)
+    },
+    visibilityChangeHandler() {
+      if (document.hidden) this.pauseAnimation()
+      else this.initAnimation()
+    },
+    nextIndex(idx) {
+      return idx < this.len - 1 ? idx + 1 : 0
+    },
+  },
+  beforeDestroy() {
+    timer = null
+    window.removeEventListener('visibilitychange', this.visibilityChangeHandler)
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.wrapper {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  position: relative;
+  .slidecontent {
+    height: 100%;
+    white-space: nowrap;
+    .img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+.animation {
+  transition: 1s linear all;
+}
+</style>
diff --git a/src/views/pis/index.vue b/src/views/pis/index.vue
new file mode 100644
index 000000000..a053b5e3c
--- /dev/null
+++ b/src/views/pis/index.vue
@@ -0,0 +1,441 @@
+<template>
+  <div class="screen">
+    <div v-if="view === 'stand'" class="station">
+      <div class="datetime">
+        <div class="logo">
+          <img :src="logo" alt="" />
+        </div>
+        <div>
+          <span>{{ date }}</span>
+          <span class="time">{{ time }}</span>
+        </div>
+      </div>
+      <div class="traininfo">
+        <div class="currentStation">
+          <div>本站 This Station</div>
+          <div class="text-center bigger">{{ standPisState.stationName }}</div>
+          <div class="text-center">{{ standPisState.stationNameEn }}</div>
+        </div>
+        <div class="devide"></div>
+        <div class="nextTrain">
+          <div>第一班列车 1st</div>
+          <div v-if="standPisState.secondTrainRemain !== null">
+            <div v-if="standPisState.firstTrainRemain > 0" class="text-center yellow">
+              <span class="bigger">{{ standPisState.firstTrainRemain }} 分钟</span> <span>min</span>
+            </div>
+            <div v-else-if="standPisState.firstTrainRemain > -1" class="text-center yellow">
+              <span class="bigger">即将进站</span>
+            </div>
+            <div v-else class="text-center yellow">
+              <span class="bigger">列车到达</span>
+            </div>
+          </div>
+          <div>开往 {{ standPisState.firstEndStationName }}</div>
+          <div v-if="standPisState.firstEndStationNameEn">TO {{ standPisState.firstEndStationNameEn }}</div>
+        </div>
+        <div class="devide"></div>
+        <div class="secondTrain">
+          <div>第二班列车 2nd</div>
+          <div v-if="standPisState.secondTrainRemain !== null">
+            <div v-if="standPisState.secondTrainRemain > 0" class="text-center bigger">
+              {{ standPisState.secondTrainRemain }} 分钟 <span>min</span>
+            </div>
+            <div v-else-if="standPisState.secondTrainRemain > -1" class="text-center bigger">即将进站</div>
+            <div v-else class="text-center bigger">列车到达</div>
+          </div>
+          <div>开往 {{ standPisState.secondEndStationName }}</div>
+          <div v-if="standPisState.secondEndStationNameEn">TO {{ standPisState.secondEndStationNameEn }}</div>
+        </div>
+      </div>
+      <div class="media">
+        <div class="mediacontent">
+          <SlideShow
+            :prefix="prefix"
+            :paths="
+              Array(27)
+                .fill()
+                .map((e, i) => `img${i + 1}.jpg`)
+            "
+          />
+        </div>
+        <div class="banner">
+          <div class="text">{{ standPisState.text }}</div>
+          <div class="text">{{ standPisState.text }}</div>
+        </div>
+      </div>
+      <div class="tempratrue">
+        <div class="directionIdentifer">《《</div>
+        <div class="trainpic">
+          <div class="pic"></div>
+          <div class="textarea">
+            <div v-for="i in 6" :key="i">舒适 Vacant</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="view === 'train'" class="train">
+      <div class="train-pis-content">
+        <div class="left">
+          <div class="logo">
+            <img :src="logo" alt="" />
+          </div>
+          <div class="info">
+            <div class="time block">
+              <div>时间 TIME</div>
+              <div>{{ time }}</div>
+            </div>
+            <div class="date block">
+              <div>日期 DATE</div>
+              <div>{{ date }}</div>
+            </div>
+            <div class="next block">
+              <div class="up">
+                <div>{{ !!onboardPisState.parking ? '当前站' : '下一站' }}</div>
+                <div>{{ !!onboardPisState.parking ? 'Current Station' : 'Next Station' }}</div>
+              </div>
+              <div class="down">
+                <div>{{ onboardPisState.stationName }}</div>
+                <div>{{ onboardPisState.stationNameEN }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="right">
+          <div class="dest">
+            <div>
+              开往: {{ onboardPisState.endStationName
+              }}{{ onboardPisState.endStationNameEn ? ' / TO: ' + currentTrain.endStationNameEn : '' }}
+            </div>
+          </div>
+          <div class="media">
+            <SlideShow
+              :prefix="prefix"
+              :paths="
+                Array(27)
+                  .fill()
+                  .map((e, i) => `img${i + 1}.jpg`)
+              "
+            />
+          </div>
+        </div>
+      </div>
+      <div class="banner">
+        <div class="text">{{ onboardPisState.text }}</div>
+        <div class="text">{{ onboardPisState.text }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { creatSubscribe, clearSubscribe, getTopic, displayTopic } from '@/utils/stomp'
+import { timestampFormat } from '@/utils/date'
+import logo from '@/assets/icon/favicon_hhzy.png'
+import SlideShow from './components/slideshow'
+export default {
+  name: 'PIS',
+  components: { SlideShow },
+  watch: {
+    '$store.state.socket.simulationTimeSync': function(val) {
+      this.time = timestampFormat('HH:mm', val)
+      this.date = timestampFormat('YYYY年MM月DD日', val)
+    },
+    '$store.state.socket.standPisState': function(val) {
+      this.standPisState.stationName = val.stationName
+      this.standPisState.firstTrainRemain = val.firstTrainRemain
+      this.standPisState.firstEndStationName = val.firstEndStationName
+      this.standPisState.secondTrainRemain = val.secondTrainRemain
+      this.standPisState.secondEndStationName = val.secondEndStationName
+      if (val.text) this.standPisState.text = val.text
+    },
+    '$store.state.socket.onboardPisState': function(val) {
+      this.onboardPisState.stationName = val.stationName
+      this.onboardPisState.endStationName = val.endStationName
+      this.onboardPisState.parking = val.parking
+    },
+  },
+  data() {
+    return {
+      view: '',
+      date: '',
+      time: '',
+      logo,
+      standPisState: {
+        standCode: '',
+        stationName: '',
+        firstTrainRemain: undefined,
+        firstEndStationName: '',
+        secondTrainRemain: undefined,
+        secondEndStationName: '',
+        text:
+          '党的十八大提出，倡导富强、民主、文明、和谐，倡导自由、平等、公正、法治，倡导爱国、敬业、诚信、友善，积极培育和践行社会主义核心价值观。富强、民主、文明、和谐是国家层面的价值目标，自由、平等、公正、法治是社会层面的价值取向，爱国、敬业、诚信、友善是公民个人层面的价值准则，这24个字是社会主义核心价值观的基本内容。',
+      },
+      onboardPisState: {
+        groupNumber: '',
+        stationName: '',
+        endStationName: '',
+        parking: 0,
+        text: '今日天气：晴，最低气温15℃，最高气温22℃，风向风力：东北风3级，空气质量：良好',
+      },
+      standPisImgUrl: `${this.$store.state.user.resourcesUrl}/PICTURE/2022-08-01/standPis.png`,
+      onboardPisImgUrl: `${this.$store.state.user.resourcesUrl}/PICTURE/2022-08-01/onboardPis.png`,
+      prefix: `${this.$store.state.user.resourcesUrl}/PICTURE/pis/`,
+    }
+  },
+  mounted() {
+    this.initPage(this.$route.query)
+  },
+  beforeDestroy() {
+    this.clearPage()
+  },
+
+  methods: {
+    initPage(query) {
+      const { type, group, standCode, groupNumber } = query
+      this.query = query
+      if (type === 'PIS_STAND') {
+        this.view = 'stand'
+        creatSubscribe(getTopic(type, group, { standCode }))
+      } else if (type === 'PIS_TRAIN') {
+        this.view = 'train'
+        creatSubscribe(getTopic(type, group, { groupNumber }))
+      }
+      creatSubscribe(`${displayTopic}\/${group}`)
+    },
+    clearPage() {
+      clearSubscribe(
+        getTopic(
+          this.query.type,
+          this.query.group,
+          this.view === 'stand' ? { standCode: this.query.standCode } : { groupNumber: this.query.groupNumber }
+        )
+      )
+      clearSubscribe(`${displayTopic}\/${this.query.group}`)
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.screen {
+  height: 100vh;
+  width: 100vw;
+  font-size: 28px;
+  color: #fff;
+  user-select: none;
+}
+.station {
+  height: 100%;
+  display: grid;
+  gap: 10px;
+  padding: 10px;
+  background: linear-gradient(#009eb5, #00b7d7);
+  grid-template-columns: repeat(4, 1fr);
+  grid-template-rows: repeat(5, 1fr);
+  & > div {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    overflow: visible;
+  }
+  .datetime,
+  .traininfo {
+    border: 1px solid rgb(143, 192, 184);
+    border-radius: 5px;
+    background: #009ab8;
+    box-shadow: 2px 2px 3px 1px #69898f, 0px 0px 5px 0px inset lightgrey;
+  }
+  .datetime {
+    grid-area: 1/1/2/2;
+    flex-direction: column;
+    justify-content: space-evenly;
+    .time {
+      font-size: 1.2em;
+      margin-left: 0.5em;
+    }
+    .logo {
+      & > img {
+        height: 110px;
+      }
+    }
+  }
+  .traininfo {
+    grid-area: 2/1/5/2;
+    flex-direction: column;
+    justify-content: space-evenly;
+    font-size: 24px;
+    & > div {
+      width: 100%;
+      padding: 0 30px;
+      line-height: 1.6em;
+    }
+    .devide {
+      width: 80%;
+      height: 2px;
+      background: rgba($color: #fff, $alpha: 0.7);
+      border-radius: 100%;
+    }
+    .text-center {
+      text-align: center;
+    }
+    .bigger {
+      font-size: 1.5em;
+    }
+    .yellow {
+      color: #cff055;
+    }
+    .nextTrain {
+      font-size: 1.1em;
+    }
+  }
+  .media {
+    grid-area: 1/2/5/5;
+    flex-direction: column;
+    justify-content: space-between;
+    .mediacontent {
+      width: 100%;
+      height: calc(85% - 10px);
+      background: linear-gradient(#cff055, #009eb5);
+      background-position: center;
+      background-size: cover;
+    }
+    .banner {
+      width: 100%;
+      height: 15%;
+      border: 1px solid rgb(143, 192, 184);
+      border-radius: 5px;
+      background: #009ab8;
+      box-shadow: 2px 2px 3px 1px #69898f, 0px 0px 5px 0px inset lightgrey;
+      overflow: hidden;
+      padding: 10px;
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      .text {
+        white-space: nowrap;
+        font-size: 60px;
+        animation: 40s linear infinite scroll;
+        color: #cff055;
+      }
+    }
+  }
+  .tempratrue {
+    grid-area: 5/1/6/5;
+    justify-content: space-evenly;
+    .directionIdentifer {
+      font-size: 72px;
+    }
+    .trainpic {
+      width: 80%;
+      .pic {
+        height: 120px;
+        background-image: url('~@/assets/pis/train.png');
+        background-size: cover;
+        background-position: center;
+      }
+      .textarea {
+        display: flex;
+        justify-content: space-evenly;
+      }
+    }
+  }
+}
+.train {
+  height: 100%;
+  background: linear-gradient(90deg, #44537b, #445567, #44537b);
+  .train-pis-content {
+    height: 88%;
+    padding: 15px;
+    display: flex;
+    .left,
+    .right {
+      height: 100%;
+    }
+    .left {
+      width: 30%;
+      background: linear-gradient(90deg, #3e4e69, #586baa, #3e4e69);
+      padding: 20px;
+      .logo {
+        height: 12%;
+        display: flex;
+        justify-content: center;
+        & > img {
+          height: 100%;
+          transform: translateY(-10px);
+        }
+      }
+      .info {
+        height: 88%;
+        background-color: #7076b0;
+        border-radius: 15px;
+        padding: 8px;
+        overflow: visible;
+        display: flex;
+        flex-direction: column;
+        font-size: 2rem;
+        font-weight: bold;
+        .time {
+          height: 25%;
+        }
+        .date {
+          height: 25%;
+          margin: 8px 0;
+        }
+        .next {
+          height: 50%;
+        }
+        .block {
+          background: linear-gradient(90deg, #445397, #7b7cc2, #445397);
+          border-radius: 7px;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: space-evenly;
+          .up,
+          .down {
+            text-align: center;
+          }
+        }
+      }
+    }
+    .right {
+      width: 70%;
+      .dest {
+        height: 15%;
+        display: flex;
+        align-items: center;
+        padding: 20px;
+        font-size: 40px;
+      }
+      .media {
+        height: 85%;
+        background: linear-gradient(#7b7cc2, #cff055);
+        background-position: center;
+        background-size: cover;
+      }
+    }
+  }
+  .banner {
+    height: 12%;
+    overflow: hidden;
+    padding: 10px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .text {
+      white-space: nowrap;
+      font-size: 60px;
+      animation: 40s linear infinite scroll;
+      color: #cff055;
+    }
+  }
+}
+@keyframes scroll {
+  from {
+    transform: translateX(0);
+  }
+  to {
+    transform: translateX(-100%);
+  }
+}
+</style>
diff --git a/src/views/planMonitor/components/routingoperate/routeMap.vue b/src/views/planMonitor/components/routingoperate/routeMap.vue
index 51d720180..f250fd50b 100644
--- a/src/views/planMonitor/components/routingoperate/routeMap.vue
+++ b/src/views/planMonitor/components/routingoperate/routeMap.vue
@@ -19,6 +19,7 @@ import { loadMapDataById } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 import RouteConfig from './routeConfig';
 import GernaratePlan from '../menus/gernaratePlanTrain';
+import { TrainingMode } from '@/scripts/ConstDic';
 
 export default {
     name: 'RouteMap',
@@ -119,7 +120,7 @@ export default {
             });
         },
         loadInitPage() {
-            this.$store.dispatch('training/changeMode', { mode: null });
+            this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL });
             loadMapDataById(this.$route.query.mapId, 'preview');
         },
         endViewLoading(isSuccess) {
diff --git a/src/views/planMonitor/newEditTool/menuTool.vue b/src/views/planMonitor/newEditTool/menuTool.vue
index 9cbe4e450..1371d73b8 100644
--- a/src/views/planMonitor/newEditTool/menuTool.vue
+++ b/src/views/planMonitor/newEditTool/menuTool.vue
@@ -8,7 +8,7 @@
   </div>
 </template>
 <script>
-import { prefixIntrger } from '@/utils/date';
+import { timestampFormat } from '@/utils/date';
 import logo_ from '@/assets/logo_.png';
 
 export default {
@@ -110,8 +110,7 @@ export default {
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
-            const date = new Date(initTime);
-            this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+            this.time = timestampFormat('HH:mmss', initTime)
         }
     },
     mounted() {
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 43fce4c62..1c145ad5b 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -558,7 +558,7 @@ export default {
                 this.$store.dispatch('training/setRoles', 'PARKING_LOT_SIGNAL_BUILDING');
 
             } else if (role.type == '车站助理') {
-                prdType = '';
+                prdType = '01';
                 role.type = 'STATION_ASSISTANT';
                 this.$store.dispatch('training/setRoles', 'STATION_ASSISTANT');
             } else if (role.type == '车站站长') {
diff --git a/src/views/system/deviceManage/editConfig.vue b/src/views/system/deviceManage/editConfig.vue
index 127915e29..4ad076c1a 100644
--- a/src/views/system/deviceManage/editConfig.vue
+++ b/src/views/system/deviceManage/editConfig.vue
@@ -55,6 +55,26 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="系统" prop="picture">
+        <el-select v-model="formIscs.picture" placeholder="请选择" size="small" clearable>
+          <el-option
+            v-for="item in pictureList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车站" prop="stationCode">
+        <el-select v-model="formIscs.stationCode" placeholder="请选择" size="small" clearable>
+          <el-option
+            v-for="item in stationList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
@@ -64,7 +84,7 @@
 </template>
 
 <script>
-import { getDeviceDetail, setVrIbpConfig, setLwConfig, getDevicesByType, setIscsLwConfig, setIscsCwConfig } from '@/api/project';
+import { getDeviceDetail, getDevicesByType, setDeviceConfig } from '@/api/project';
 import { getAllMapOnline, getStationListNeedAttendant } from '@/api/jmap/map';
 export default {
     name: 'EditConfig',
@@ -83,8 +103,14 @@ export default {
                 stationCode: ''
             },
             formIscs: {
-                deviceCode: ''
+                deviceCode: '',
+                picture: '',
+                stationCode: ''
             },
+            pictureList: [
+                { label: '广播系统', value: 'paMain' },
+                { label: '乘客信息', value: 'pidsMain' }
+            ],
             rulesIbp: {
                 part: [
                     { required: true, message: '请选择显示位置', trigger: 'change' }
@@ -132,7 +158,7 @@ export default {
             this.data = row;
             this.mapList = [];
             this.stationList = [];
-            if (this.data.type === 'VR_IBP' || this.data.type === 'ISCS_LW') {
+            if (['VR_IBP', 'ISCS_LW'].includes(this.data.type)) {
                 getDevicesByType('LW').then(res => {
                     if (res.data && res.data.length) {
                         this.lwList = res.data;
@@ -148,24 +174,23 @@ export default {
                 }).catch(() => {
                     this.$message.error('获取设备列表失败！');
                 });
-            } else {
-                getAllMapOnline().then(res => {
-                    if (res.data && res.data.length) {
-                        this.mapList = res.data;
-                        this.formLw.mapId = this.mapList[0].id;
-                        this.mapIdChange(this.mapList[0].id);
-                    }
-                }).catch(() => {
-                    this.$message.error('获取地图列表失败！');
-                });
             }
-
+            getAllMapOnline().then(res => {
+                if (res.data && res.data.length) {
+                    this.mapList = res.data;
+                    this.formLw.mapId = this.mapList[0].id;
+                    this.mapIdChange(this.mapList[0].id);
+                }
+            }).catch(() => {
+                this.$message.error('获取地图列表失败！');
+            });
         },
         doSave() {
             const self = this;
             if (this.data.type === 'VR_IBP') {
                 this.$refs.formIbp.validate(() => {
-                    setVrIbpConfig(this.data.id, this.formIbp).then(response => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(this.formIbp) };
+                    setDeviceConfig(data).then(response => {
                         self.$message.success('设置虚拟IBP设备配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
@@ -175,7 +200,8 @@ export default {
                 });
             } else if (this.data.type === 'LW') {
                 this.$refs.formLw.validate(() => {
-                    setLwConfig(this.data.id, this.formLw).then(response => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(this.formLw) };
+                    setDeviceConfig(data).then(response => {
                         self.$message.success('设置现地工作站配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
@@ -185,7 +211,8 @@ export default {
                 });
             } else if (this.data.type === 'ISCS_LW') {
                 this.$refs.formIscs.validate(() => {
-                    setIscsLwConfig(this.data.id, this.formIscs).then(response => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(this.formIscs) };
+                    setDeviceConfig(data).then(response => {
                         self.$message.success('设置现地综合监控配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
@@ -195,7 +222,8 @@ export default {
                 });
             } else if (this.data.type === 'ISCS_CW') {
                 this.$refs.formIscs.validate(() => {
-                    setIscsCwConfig(this.data.id, this.formIscs).then(response => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(this.formIscs) };
+                    setDeviceConfig(data).then(response => {
                         self.$message.success('设置中心综合监控配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
diff --git a/src/views/system/deviceManage/editConfigGateway.vue b/src/views/system/deviceManage/editConfigGateway.vue
index b1e9add06..d4693c46b 100644
--- a/src/views/system/deviceManage/editConfigGateway.vue
+++ b/src/views/system/deviceManage/editConfigGateway.vue
@@ -75,7 +75,9 @@ export default {
                 PSC: 'PSC控制柜',
                 SECTION: '区段',
                 TRAIN: '列车',
-                UDP_CLIENT: 'UDP客户端'
+                UDP_CLIENT: 'UDP客户端',
+                PIS_STAND: '站台PIS',
+                PIS_TRAIN: '列车PIS',
             },
             mapId: '',
             mapList: [],
diff --git a/src/views/system/deviceManage/editConfigIbp.vue b/src/views/system/deviceManage/editConfigIbp.vue
index 5408bd983..4e034786d 100644
--- a/src/views/system/deviceManage/editConfigIbp.vue
+++ b/src/views/system/deviceManage/editConfigIbp.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { getDeviceDetail, setIbpConfig} from '@/api/project';
+import { getDeviceDetail, setDeviceConfig} from '@/api/project';
 // import { deepAssign } from '@/utils/index';
 import { getAllMapOnline, getStationListNeedAttendant } from '@/api/jmap/map';
 
@@ -112,8 +112,9 @@ export default {
         },
         doSave() {
             this.checkCount = 0;
-            const form = JSON.parse(this.jsonConfig);
-            setIbpConfig(this.data.id, form).then(resp => {
+            // const form = JSON.parse(this.jsonConfig);
+            const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: this.jsonConfig };
+            setDeviceConfig(data).then(resp => {
                 this.$message.success('设置IBP网关映射配置成功');
                 this.handleClose();
                 this.$emit('reloadTable');
diff --git a/src/views/system/deviceManage/editConfigScreen.vue b/src/views/system/deviceManage/editConfigScreen.vue
index 8b81348ff..f62d2a5b2 100644
--- a/src/views/system/deviceManage/editConfigScreen.vue
+++ b/src/views/system/deviceManage/editConfigScreen.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { getDevicesByType, getDeviceDetail, setLswConfig, setCctvConfig, setVrPsdConfig, setPlcConfig, setSandboxConfig, setIlwConfig } from '@/api/project';
+import { getDevicesByType, getDeviceDetail, setDeviceConfig } from '@/api/project';
 import { getAllMapOnline, getStationListNeedAttendant, getPsdListByStandCode, getStandListByStationCode } from '@/api/jmap/map';
 
 export default {
@@ -197,7 +197,8 @@ export default {
                         deviceCode: this.formData.deviceCode,
                         quadrant: this.formData.quadrant
                     };
-                    setLswConfig(this.data.id, param).then(() => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
+                    setDeviceConfig(data).then(() => {
                         self.$message.success('设置大屏工作站配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
@@ -210,7 +211,8 @@ export default {
                     const param = {
                         deviceCode: this.formData.deviceCode
                     };
-                    setCctvConfig(this.data.id, param).then(() => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
+                    setDeviceConfig(data).then(() => {
                         self.$message.success('设置CCTV工作站配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
@@ -224,7 +226,8 @@ export default {
                         deviceCode: this.formData.deviceCode,
                         psdCode: this.formData.psdCode
                     };
-                    setVrPsdConfig(this.data.id, param).then(() => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
+                    setDeviceConfig(data).then(() => {
                         self.$message.success('设置虚拟屏蔽门工作站配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
@@ -238,7 +241,8 @@ export default {
                         addr: this.formData.addr,
                         quantity: this.formData.quantity
                     };
-                    setPlcConfig(this.data.id, param).then(() => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
+                    setDeviceConfig(data).then(() => {
                         self.$message.success('设置PLC配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
@@ -251,7 +255,8 @@ export default {
                     const param = {
                         deviceCode: this.formData.deviceCode
                     };
-                    setSandboxConfig(this.data.id, param).then(() => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
+                    setDeviceConfig(data).then(() => {
                         self.$message.success('设置电子沙盘配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
@@ -264,7 +269,8 @@ export default {
                     const param = {
                         deviceCode: this.formData.deviceCode
                     };
-                    setIlwConfig(this.data.id, param).then(() => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
+                    setDeviceConfig(data).then(() => {
                         self.$message.success('设置联锁工作站配置成功');
                         self.handleClose();
                         self.$emit('reloadTable');
diff --git a/src/views/system/deviceManage/index.vue b/src/views/system/deviceManage/index.vue
index 71aee7ee5..689aae5f8 100644
--- a/src/views/system/deviceManage/index.vue
+++ b/src/views/system/deviceManage/index.vue
@@ -203,8 +203,8 @@ export default {
             });
         },
         editConfig(index, row) {
-            const configGatewayList = ['SWITCH', 'SIGNAL', 'PSD', 'PSL', 'PSC', 'UDP_LOW', 'SECTION', 'TRAIN', 'UDP_CLIENT'];
-            if (row.type === 'LW' || row.type === 'VR_IBP' || row.type === 'ISCS_LW' || row.type === 'ISCS_CW') {
+            const configGatewayList = ['SWITCH', 'SIGNAL', 'PSD', 'PSL', 'PSC', 'UDP_LOW', 'SECTION', 'TRAIN', 'UDP_CLIENT', 'PIS_STAND', 'PIS_TRAIN'];
+            if (['LW', 'VR_IBP', 'ISCS_LW', 'ISCS_CW'].includes(row.type)) {
                 this.$refs.editConfig.doShow(row);
             } else if (configGatewayList.includes(row.type)) {
                 this.$refs.editConfigGateway.doShow(row);
diff --git a/src/views/system/iscsResourcesManage/index.vue b/src/views/system/iscsResourcesManage/index.vue
index ab8311256..f47895b39 100644
--- a/src/views/system/iscsResourcesManage/index.vue
+++ b/src/views/system/iscsResourcesManage/index.vue
@@ -31,7 +31,8 @@ const typeMap = {
 const typeList = [
     { value: 'RECORDING', label: '预录' },
     { value: 'EMERGENCY_RECORDING', label: '紧急预录' },
-    { value: 'BGM', label: '背景音乐' }
+    { value: 'BGM', label: '背景音乐' },
+    { value: 'ATS', label: 'ATS预录' }
 ];
 export default {
     name: 'DeviceManage',
diff --git a/src/views/system/userControl/index.vue b/src/views/system/userControl/index.vue
index c31ad1a67..1faf04231 100644
--- a/src/views/system/userControl/index.vue
+++ b/src/views/system/userControl/index.vue
@@ -15,6 +15,7 @@ import DictionaryEdit from './edit';
 import CreateUser from './createUser';
 import CreateSingleUser from './createSingleUser';
 import BindCompany from './bindCompany';
+import {adminResetUserPassword} from '@/api/management/user';
 
 export default {
     name: 'UserControl',
@@ -163,6 +164,10 @@ export default {
                                 name: '绑定组织管理员',
                                 handleClick: this.handleBind
                             },
+                            {
+                                name: '重置密码',
+                                handleClick: this.resetPassword
+                            },
                             {
                                 name: '删除',
                                 handleClick: this.handleDelete
@@ -222,6 +227,19 @@ export default {
         handleBind(index, row) {
             this.$refs.bindCompany.doShow(row);
         },
+        resetPassword(index, row) {
+            this.$confirm('操作会将改用户密码重置为初始密码，是否继续', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                adminResetUserPassword(row.id).then(response => {
+                    this.$message.success('重置密码成功！');
+                }).catch(() => {
+                    this.$message.error('重置密码失败!');
+                });
+            });
+        },
         handleDelete(index, row) {
             deleteUserInLogic(row.id).then(resp=> {
                 // 逻辑删除
diff --git a/src/views/trainingManage/create.vue b/src/views/trainingManage/create.vue
index 92367fba5..5d0f7e5c8 100644
--- a/src/views/trainingManage/create.vue
+++ b/src/views/trainingManage/create.vue
@@ -148,16 +148,23 @@ export default {
             this.dialogVisible = true;
         },
         doCreate() {
-            this.$refs.dataform.validateForm(async() => {
+            this.$refs.dataform.validateForm(() => {
                 const cpData = Object.assign({}, this.formModel);
                 cpData.labelJson = JSON.stringify(this.tagForm.dynamicTags);
+                let api = updateTraining;
+                let mes = '编辑';
                 if (this.isCreate) {
-                    await createTraining(cpData);
-                } else {
-                    await updateTraining(cpData);
+                    api = createTraining;
+                    mes = '创建';
                 }
-                this.$emit('edit');
-                this.doClose();
+                api(cpData).then(res => {
+                    this.$message.success(`${mes}实训成功！`);
+                    this.$emit('edit');
+                    this.doClose();
+                }).catch(err => {
+                    this.$message.error('获取实训详情信息失败！');
+                    this.$message.error(`${mes}实训失败！，${err.message}`);
+                });
             });
         },
         doClose() {
diff --git a/src/views/trainingManage/demonMenu.vue b/src/views/trainingManage/demonMenu.vue
index 5b017e1b5..41ecb6ba7 100644
--- a/src/views/trainingManage/demonMenu.vue
+++ b/src/views/trainingManage/demonMenu.vue
@@ -3,22 +3,43 @@
     <div class="display_top_draft">
       <div class="btn_hover" @click="menuClick">菜单</div>
       <el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:${btnWidth}px`">
+        <el-button size="small" @click="handlerMemberManage">成员管理</el-button>
         <el-button size="small" @click="showList">实训列表</el-button>
       </el-button-group>
     </div>
-    <TrainingList ref="trainingList" @updateDetails="updateDetails" />
-    <EditDetails ref="editDetails" v-dialogDrag :edit-data="editData" />
+    <TrainingList ref="trainingList" @updateDetails="updateDetails" @gradeRules="gradeRules" @closeAllDialog="closeAllDialog" @draftTracK="draftTracK" />
+    <EditDetails ref="editDetails" :edit-data="editData" @openEditOperate="openEditOperate" @handleCondition="handleCondition" @publish="publish" @preview="preview" @gradeRules="gradeRules" />
+    <EditCondition ref="editCondition" v-dialogDrag :materials-list="materialsList" @editConditionFn="editConditionFn" @backStep="backStep" />
+    <edit-operate ref="editOperate" v-dialogDrag @backStepList="backStepList" />
+    <grade-rules ref="gradeRules" />
+    <members-manage ref="membersManage" :is-admin="isAdmin" @addSimulationMember="addSimulationMember" /> <!-- 成员管理 -->
+    <add-member ref="addMember" :station-list="stationList" />
+    <TrackList ref="trackList" />
   </div>
 </template>
 <script>
 import TrainingList from './trainingList.vue';
+import TrackList from './trackList.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';
+import MembersManage from '@/views/newMap/jointTrainingNew/memberManage/membersManage';
+import AddMember from '@/views/newMap/jointTrainingNew/memberManage/addMember';
+import {mapGetters} from 'vuex';
 
 export default {
     name:'DemonMenu',
     components:{
         TrainingList,
-        EditDetails
+        TrackList,
+        EditDetails,
+        EditCondition,
+        EditOperate,
+        GradeRules,
+        MembersManage,
+        AddMember
     },
     props:{
     },
@@ -26,10 +47,16 @@ export default {
         return {
             hoverBtn: false,
             btnWidth: -600,
-            editData: {}
+            materialsList: [],
+            refsList: ['editDetails', 'editCondition', 'trackList'],
+            editData: {},
+            isAdmin: true
         };
     },
     computed:{
+        ...mapGetters('map', [
+            'stationList'
+        ]),
         group() {
             return this.$route.query.group;
         },
@@ -41,8 +68,33 @@ export default {
         }
     },
     mounted() {
+        this.getMaterials();
     },
     methods:{
+        publish(data) {
+            this.$refs.trainingList.publishScript(null, data);
+        },
+        preview(data) {
+            this.$refs.trainingList.previewScript(null, data);
+        },
+        editConditionFn(data, index, key) {
+            this.$refs.editDetails.editConditionFn(data, index, key);
+        },
+        backStep() {
+            this.$refs.editDetails.backStep();
+        },
+        handleCondition(index, row, key) {
+            this.$refs.editCondition.doShow(row, 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) {
@@ -51,14 +103,43 @@ export default {
                 this.btnWidth = -600;
             }
         },
+        draftTracK(row) {
+            this.$refs.trackList.doShow(row);
+        },
         showList() {
             this.$refs.trainingList.doShow();
+        },
+        showMembersManage() {
+
         },
         updateDetails(data) {
             this.editData = data;
+            this.closeAllDialog('editDetails');
             this.$refs.editDetails.doShow(data);
+        },
+        closeAllDialog(noCloseName) {
+            this.refsList.forEach(key => {
+                if (key != noCloseName && this.$refs[key]) {
+                    this.$refs[key].doClose();
+                }
+            });
+        },
+        openEditOperate(data) {
+            this.$refs.editOperate.doShow(data);
+        },
+        backStepList(data) {
+            this.$refs.editDetails.setOperations(data);
+            this.$refs.editDetails.minisize();
+        },
+        gradeRules(data) {
+            this.$refs.gradeRules.doShow(data);
+        },
+        addSimulationMember() {
+            this.$refs.addMember.doShow();
+        },
+        handlerMemberManage() {
+            this.$refs.membersManage.doShow();
         }
-
     }
 };
 </script>
diff --git a/src/views/trainingManage/editCondition.vue b/src/views/trainingManage/editCondition.vue
new file mode 100644
index 000000000..db9128d6f
--- /dev/null
+++ b/src/views/trainingManage/editCondition.vue
@@ -0,0 +1,325 @@
+<template>
+  <div>
+    <!-- <div class="conditionTab">
+      <div v-if="tabVisible" class="conditionTabLable" @click="minisize">
+        <span class="titleStyle">{{ title }}</span>
+      </div>
+    </div> -->
+    <el-dialog :title="title" :visible.sync="dialogVisible" :width="dialogWidth" :modal="false" :close-on-click-modal="false" :before-close="doClose" center :style="{'margin-left': dialogMarginLeft + 'px'}">
+      <div @click="editValue(null, '')">
+        <div>
+          <Expression ref="expression" :materials-list="materialsList" :get-device-list="getDeviceList" @editExpression="editExpression" @addExp="addExp" />
+        </div>
+        <el-table
+          :data="tableData"
+          max-height="150"
+          border
+        >
+          <el-table-column label="条件关系">
+            <template slot-scope="scope">
+              <ExpressionValue ref="ExpressionValue" :materials-list="materialsList" :get-device-list="getDeviceList" :value-obj="scope.row" :index-path="scope.$index + ''" :active-index-path="activeIndexPath" @editValue="editValue" />
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="conditionBtn">
+          <!-- <el-button size="small" @click="addExp()">新增条件关系</el-button> -->
+          <el-button size="small" :disabled="deleteDisabled" @click="deleteExp">删除条件关系</el-button>
+          <el-button size="small" :disabled="clearDisabled" @click="clearExp">清空条件关系</el-button>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="doSave">保存</el-button>
+        <el-button size="small" @click="doClose">取消</el-button>
+        <el-button size="small" @click="doBackStep">返回步骤列表</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Expression from './expression.vue';
+import ExpressionValue from './expressionValue.vue';
+import ConstConfig from '@/scripts/ConstConfig';
+
+export default {
+    name: 'EditCondition',
+    components:{
+        ExpressionValue,
+        Expression
+    },
+    props: {
+        materialsList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            dialogWidth: '1000px',
+            tabVisible: false,
+            dialogVisible: false,
+            tableData: [],
+            roleDeviceCode: '', // 角色对应站点code
+            activeIndexPath: '',
+            rowIndex: 0,
+            conditionKey: ''
+        };
+    },
+    computed: {
+        title() {
+            const keyObj = {
+                triggerCondition: '编辑触发条件',
+                operateCondition : '编辑操作条件',
+                completionCondition: '编辑完成条件'
+            };
+            const t = keyObj[this.conditionKey] || this.$t('trainingManage.editCompletionCondition');
+            return t;
+        },
+        dialogMarginLeft() {
+            const w = this.$store.state.app.width;
+            const ml = (w - parseInt(this.dialogWidth)) / 2;
+            return ml;
+        },
+        ConstSelect() {
+            return ConstConfig.ConstSelect;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        },
+        mapStationDirectionData() {
+            return this.$store.state.map.mapStationDirectionData;
+        },
+        getDeviceList() {
+            const typeObj = {};
+            this.ConstSelect.operationDeviceList.forEach(ii => {
+                typeObj[ii.value] = ii.label;
+            });
+            const list = [];
+            Object.values(this.mapDevice).forEach(item => {
+                if (typeObj[item._type]) {
+                    list.push({
+                        code: item.code,
+                        name: `${item.groupNumber || item.name}(${typeObj[item._type]})`,
+                        _type: item._type
+                    });
+                }
+            });
+            Object.values(this.mapStationDirectionData).forEach(item => {
+                if (!this.roleDeviceCode || this.roleDeviceCode == item.relativeStationCode) {
+                    let isAuto = true;
+                    if (item.runModel == 'S') {
+                        isAuto = false;
+                    }
+                    list.push({
+                        code: item.code,
+                        name: `${item.name}_${item.labelEnum}(${isAuto ? '自动闭塞' : '半自动闭塞'})`,
+                        _type:  `${isAuto ? 'StationDirectionAuto' : 'StationDirectionSemi'}`
+                    });
+                }
+            });
+            this.getRouteList.forEach(item => {
+                list.push({
+                    code: item.code,
+                    name: `${item.name}(进路)`,
+                    startSignalCode: item.startSignalCode,
+                    _type: 'Route'
+                });
+            });
+            return list;
+        },
+        routeData() {
+            return this.$store.state.map.routeData;
+        },
+        getRouteList() {
+            return Object.values(this.routeData);
+        },
+        deleteDisabled() {
+            let s = false;
+            if (!this.tableData[0] || !this.tableData[0].valuables || !this.activeIndexPath) {
+                s = true;
+            }
+            return s;
+        },
+        clearDisabled() {
+            let s = false;
+            if (!this.tableData[0] || !this.tableData[0].valuables) {
+                s = true;
+            }
+            return s;
+        }
+    },
+    watch: {},
+    methods: {
+        addExp(obj) {
+            let addData = { t: 'E', operator: 'EQ', valuables: [] };
+            if (obj) {
+                addData = obj;
+            }
+            let data = {
+                t: 'E',
+                operator: 'AND',
+                valuables: [this.tableData[0], addData]
+            };
+            if (this.clearDisabled) {
+                data = addData;
+            }
+            this.tableData.splice(0, 1, data);
+        },
+        deleteExp() {
+            const arrPath = this.activeIndexPath.split('-');
+            if (arrPath.length < 2) {
+                this.clearExp();
+            } else {
+                const lastIndex = arrPath[arrPath.length - 1] == 0 ? 1 : 0;
+                arrPath.pop();
+                let tData = this.tableData;
+                let lData = this.tableData;
+                arrPath.forEach((item, index) => {
+                    if (index != arrPath.length - 1) {
+                        lData = lData[item].valuables;
+                    }
+                    if (tData[item]) {
+                        tData = tData[item].valuables;
+                    }
+                });
+                const data = tData[lastIndex];
+                lData.splice(0, 1, data);
+            }
+        },
+        clearExp() {
+            this.tableData = [];
+        },
+        editValue(data, indexPath) {
+            this.activeIndexPath = indexPath;
+            this.$refs.expression.setFormData(data, indexPath);
+        },
+        editExpression(data, indexPath) {
+            if (!indexPath) { return; }
+            const arrPath = indexPath.split('-');
+            const lastIndex = arrPath[arrPath.length - 1];
+            arrPath.pop();
+            let tData = this.tableData;
+            arrPath.forEach(index => {
+                if (tData[index]) {
+                    tData = tData[index].valuables;
+                }
+            });
+            tData.splice(lastIndex, 1, data);
+        },
+        doSave() {
+            let data = this.tableData[0];
+            if (this.clearDisabled) {
+                data = null;
+            }
+            if (this.checkData(data)) {
+                this.$emit('editConditionFn', data, this.rowIndex, this.conditionKey);
+                this.doClose();
+            } else {
+                this.$message.info('请编辑完整的条件关系！');
+            }
+        },
+        checkData(data) {
+            const that = this;
+            function notCompleteData(obj) {
+                let s = false;
+                if ( !s && obj.t == 'E' && (!obj.valuables || !obj.valuables[0])) {
+                    s = true;
+                }
+                if (!s && obj.t == 'E' && !that.hasNotIs(obj.operator) && (!obj.valuables || !obj.valuables[1])) {
+                    s = true;
+                }
+                if (!s && obj.valuables && obj.valuables[0]) {
+                    s = notCompleteData(obj.valuables[0]);
+                }
+                if (!s && obj.valuables && obj.valuables[1]) {
+                    s = notCompleteData(obj.valuables[1]);
+                }
+                return s;
+            }
+            let s = true;
+            if (data && notCompleteData(data)) {
+                s = false;
+            }
+            return s;
+        },
+        hasNotIs(operator) {
+            let s = false;
+            const arr = ['NOT', 'IS'];
+            if (arr.includes(operator)) {
+                s = true;
+            }
+            return s;
+        },
+        minisize() {
+            this.dialogVisible = true;
+        },
+        doBackStep() {
+            this.$emit('backStep');
+            this.doClose();
+        },
+        doShow(row, rowIndex, conditionKey) {
+            const data = row[conditionKey];
+            const member = this.$store.state.training.memberData[row.memberId];
+            this.roleDeviceCode = member.deviceCode || '';
+            this.dialogVisible = true;
+            this.tabVisible = true;
+            this.activeIndexPath = '';
+            if (data) {
+                this.tableData = [data];
+            } else {
+                this.tableData = [];
+            }
+            this.rowIndex = rowIndex;
+            this.conditionKey = conditionKey;
+            this.$nextTick(() => {
+                this.$refs.expression.clearFromData();
+            });
+        },
+        doClose() {
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog__wrapper {
+	width: 1px;
+	height: 1px;
+	top: auto;
+	right: auto;
+	bottom: auto;
+	left: auto;
+	overflow: visible !important;
+}
+// .conditionTab{
+//     position: absolute;
+//     z-index: 10;
+// 	right: 12px;
+// 	top: calc(45% + 200px);
+// }
+// .conditionTabLable{
+//     position: absolute;
+//     background: #fff;
+//     border-radius: 5px 0px 0px 5px ;
+//     padding: 5px 0px;
+//     width: 23px;
+//     text-align: center;
+//     left: 50%;
+//     transform: translateX(-50%);
+//     cursor: pointer;
+//     top:-28px;
+// }
+// .nullDiv {
+// 	width: 100%;
+// 	height: 28px;
+// 	line-height: 28px;
+// 	cursor: pointer;
+// 	color: #ccc;
+// }
+.conditionBtn {
+	height: 50px;
+	line-height: 50px;
+}
+</style>
diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue
index 3e8ef0045..e038e2f8d 100644
--- a/src/views/trainingManage/editDetails.vue
+++ b/src/views/trainingManage/editDetails.vue
@@ -1,26 +1,120 @@
 <template>
-  <div>
+  <div class="editContent" :class="{'active': dialogVisible && record}">
     <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>
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="800px" :modal="false" :before-close="doClose" center>
-      <div class="stepListBox">
-        <el-button size="small" type="primary" @click="addStep">新增步骤</el-button>
-        <QueryListPage ref="queryListPage" :query-form="queryForm" :query-list="queryList" />
+    <div class="editContentTitle">
+      <div>
+        <span>实训名称：{{ editData.name || '' }}</span>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" @click="updateMapLocation">{{ $t('trainingManage.mapLocation') }}</el-button>
-        <el-button size="small" type="primary" @click="saveScenesStage">{{ $t('trainingManage.saveBackground') }}</el-button>
-        <el-button size="small" type="success" @click="saveStepData">{{ $t('trainingManage.saveStepData') }}</el-button>
-      </span>
-    </el-dialog>
+      <div>
+        <el-button size="small" type="success" @click="gradeRules">评分</el-button>
+        <el-button size="small" type="primary" @click="previewTraining">预览</el-button>
+        <el-button size="small" type="primary" @click="publishTraining">发布</el-button>
+        <el-button size="small" type="danger" @click="clearStep">清空步骤</el-button>
+      </div>
+    </div>
+    <el-tabs v-model="activeName" type="card">
+      <el-tab-pane label="步骤列表" name="stepList">
+        <div class="tabPaneBox">
+          <div class="tabPaneHead">
+            <el-button size="small" type="primary" @click="addStep">新增步骤</el-button>
+          </div>
+          <el-table
+            :data="tableData"
+            :max-height="tableHeight"
+            border
+          >
+            <el-table-column type="index" label="序号" width="50" />
+            <el-table-column :label="$t('trainingManage.roleSelect')" width="200">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.memberId" placeholder="请选择" size="mini">
+                  <el-option
+                    v-for="item in roleList"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('trainingManage.stepDescription')">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.description" placeholder="请输入步骤描述" size="mini" />
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('trainingManage.triggerCondition')">
+              <template slot-scope="scope">
+                <span>{{ getConditionName(scope.row, 'triggerCondition') }}</span>
+                <el-button style="margin-left: 10px" size="mini" @click="handleCondition(scope.$index, scope.row, 'triggerCondition')">{{ $t('global.edit') }}</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('trainingManage.completionCondition')">
+              <template slot-scope="scope">
+                <span>{{ getConditionName(scope.row, 'completionCondition') }}</span>
+                <el-button style="margin-left: 10px" size="mini" @click="handleCondition(scope.$index, scope.row, 'completionCondition')">{{ $t('global.edit') }}</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('trainingManage.operateCondition')">
+              <template slot-scope="scope">
+                <span>{{ getConditionName(scope.row, 'operateCondition') }}</span>
+                <el-button style="margin-left: 10px" size="mini" @click="handleEditOperate(scope.$index, scope.row)">{{ $t('global.edit') }}</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('global.operate')" width="90">
+              <template slot-scope="scope">
+                <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">{{ $t('global.delete') }}</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="tabPaneFooter">
+            <el-button size="small" type="success" @click="saveStepData">{{ $t('trainingManage.saveStepData') }}</el-button>
+          </div>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="地图定位" name="mapLocation">
+        <div class="tabPaneBox">
+          <div>
+            <el-form ref="form" :model="mapLocationObj" label-width="80px">
+              <el-form-item label="X坐标">
+                <span>{{ mapLocationObj.x || '' }}</span>
+              </el-form-item>
+              <el-form-item label="Y坐标">
+                <span>{{ mapLocationObj.y || '' }}</span>
+              </el-form-item>
+              <el-form-item label="缩放">
+                <span>{{ mapLocationObj.scale || '' }}</span>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="tabPaneFooter">
+            <el-button size="small" type="primary" @click="updateMapLocation">{{ $t('trainingManage.mapLocation') }}</el-button>
+          </div>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="背景" name="Background">
+        <div class="tabPaneBox">
+          <div>
+            <el-form ref="form" :model="bgSceneObj" label-width="80px">
+              <el-form-item label="更新时间">
+                <span>{{ bgSceneObj.systemTime || '' }}</span>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="tabPaneFooter">
+            <el-button size="small" type="primary" @click="saveScenesStage">{{ $t('trainingManage.saveBackground') }}</el-button>
+          </div>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
 <script>
-import { updateTrainingStep, getTrainingAll, updateTrainingBackgroud, getTrainingStepList, updateTrainingMaplocation } from '@/api/trainingManage';
+import { updateTrainingStep, getTrainingAll, updateTrainingBackgroud, getTrainingStepList, updateTrainingMaplocation, clearTrainingStep } from '@/api/trainingManage';
+import { assignUsersPlayRoles } from '@/api/jointSimulation';
 import Vue from 'vue';
 import {covertMemberData} from '@/views/newMap/displayNew/utils';
 
@@ -37,69 +131,24 @@ export default {
     },
     data() {
         return {
+            dialogWidth: '1100px',
             tabVisible: false,
             dialogVisible: false,
-            formModel: {
-                mapLocationJson: '',
-                // runPlanId:'',
-                // operaJson: '',
-                stepJson: '',
-                scoringRuleJson: '',
-                // memberJson: '',
-                // playerIdJson: '',
-                failureConditionJson: ''
-            },
-            queryForm: {
-                show: false
-
-            },
-            queryList: {
-                height: '500px',
-                indexShow: true,
-                paginationHiden: true,
-                selectCheckShow: false,
-                data: [],
-                columns: [
-                    // {
-                    //     title: this.$t('trainingManage.stepNum'),
-                    //     width: '80',
-                    //     prop: 'id',
-                    //     type: 'basic',
-                    //     edit: true
-                    // },
-                    {
-                        title: this.$t('trainingManage.roleSelect'),
-                        width: '200',
-                        prop: 'memberId',
-                        type: 'select',
-                        options: []
-                    },
-                    {
-                        title: this.$t('trainingManage.stepDescription'),
-                        prop: 'description',
-                        type: 'basic',
-                        edit: true
-                    },
-                    {
-                        type: 'button',
-                        title: this.$t('global.operate'),
-                        width: '100',
-                        buttons: [
-                            {
-                                name: this.$t('global.delete'),
-                                type: 'danger',
-                                handleClick: this.handleDelete
-                            }
-                        ]
-                    }
-                ]
-            }
+            roleList: [],
+            tableData: [],
+            activeName: 'stepList',
+            mapLocationObj: {},
+            bgSceneObj: {}
         };
     },
     computed: {
-        title() {
-            const t = this.$t('trainingManage.editTagTitle');
-            return t;
+        record() { // 编制
+            return this.$route.query.record;
+        },
+        tableHeight() {
+            const s = 210;
+            const h = this.$store.state.app.height;
+            return h - s;
         },
         group() {
             return this.$route.query.group;
@@ -119,36 +168,104 @@ export default {
                 result.deviceListData.forEach(item => {
                     list = list.concat(item);
                 });
-                list.forEach(every => {
-                    every.code = every.id;
-                    every.name = `${every.label}(${every.type})`;
-                });
-                const colObj = this.queryList.columns.find(item => {
-                    return item.prop == 'memberId';
-                });
-                if (colObj) {
-                    colObj.options = list;
-                }
+                this.roleList = list;
             }
+        },
+        editData() {
+            this.mapLocationObj = {};
+            if (this.editData['mapLocationJson']) {
+                this.mapLocationObj = JSON.parse(this.editData['mapLocationJson']);
+            }
+            this.bgSceneObj = {};
+            if (this.editData['bgSceneJson']) {
+                this.bgSceneObj = JSON.parse(this.editData['bgSceneJson']);
+            }
+        },
+        '$store.state.map.activeTrainListChange': function () {
+            const activeTrainList = this.$store.state.map.activeTrainList;
+            const memberData = this.$store.state.training.memberData;
+            // 获取仿真成员列表
+            const result = covertMemberData(activeTrainList, Object.values(memberData));
+            let list = [];
+            result.deviceListData.forEach(item => {
+                list = list.concat(item);
+            });
+            this.roleList = list;
         }
     },
     methods: {
+        publishTraining() {
+            console.log('发布实训');
+            this.$emit('publish', this.editData);
+        },
+        previewTraining() {
+            console.log('预览实训');
+            this.$emit('preview', this.editData);
+        },
+        clearStep() {
+            this.$confirm('确定清空实训步骤?', '警告', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                clearTrainingStep(this.editData.id).then(res => {
+                    console.log(res, '清空步骤');
+                    this.getStepList(this.editData);
+                }).cathc(err => {
+                    console.log(err, '清空步骤失败');
+                });
+            }).catch(e => {});
+        },
+        editConditionFn(data, index, key) {
+            this.tableData[index][key] = data;
+            this.dialogVisible = true;
+        },
+        getRoleSelect(v) {
+            let name = '';
+            const colObj = this.roleList.find(item => {
+                return item.value == v;
+            });
+            if (colObj) {
+                name = colObj.label;
+            }
+            return name;
+        },
+        getConditionName(row, key) {
+            const obj = row[key] || {};
+            let n = '';
+            switch (obj.t) {
+            case 'V':
+                n = `值为${obj.v}`;
+                break;
+            case 'S':
+                n = `${obj.elementCode}设备的${obj.filedName}属性`;
+                break;
+            case 'E':
+                n = '';
+                break;
+            }
+            return n;
+        },
         addStep() {
-            const lastIndex = this.queryList.data.length - 1;
+            const lastIndex = this.tableData.length - 1;
             let mId = '';
-            if (this.queryList.data[lastIndex]) {
-                mId = this.queryList.data[lastIndex].memberId || '';
+            if (this.tableData[lastIndex]) {
+                mId = this.tableData[lastIndex].memberId || '';
             }
             const obj = {
-                // id: lastIndex + 2 + '',
                 memberId: mId,
                 description: ''
-                // triggerCondition: [],
-                // completionCondition:[],
-                // failureCondition: [],
-                // operations: []
             };
-            this.queryList.data.push(obj);
+            this.tableData.push(obj);
+        },
+        setOperations(data) {
+            if (data) {
+                this.tableData[data.index].operations = data.stepDetail.operations;
+                this.tableData[data.index].tipPosition = data.tipPosition;
+            }
+        },
+        gradeRules() {
+            this.$emit('gradeRules', this.editData);
         },
         handleDelete(index, row) {
             console.log('删除', index, row);
@@ -157,32 +274,59 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                this.queryList.data.splice(index, 1);
+                this.tableData.splice(index, 1);
             }).catch(e => {});
         },
+        handleCondition(index, row, key) {
+            console.log(key, '条件', index, row);
+            const member = this.$store.state.training.memberData[row.memberId];
+            if (!member.userId) {
+                assignUsersPlayRoles([{ userId: this.$store.state.user.id, memberId: member.id}], this.$route.query.group).then(resp => {
+                }).catch(() => { this.$message.error('调整角色失败！'); });
+            }
+            this.$emit('handleCondition', index, row, key);
+            this.doClose();
+        },
+        handleEditOperate(index, row) {
+            if (!row.memberId) {
+                this.$message.info('请先选择角色！');
+                return;
+            }
+            const member = this.$store.state.training.memberData[row.memberId];
+            if (!member.userId) {
+                assignUsersPlayRoles([{ userId: this.$store.state.user.id, memberId: member.id}], this.$route.query.group).then(resp => {
+                }).catch(() => { this.$message.error('调整角色失败！'); });
+            }
+            this.$emit('openEditOperate', { index: index, data: row, type: this.editData.type });
+            this.doClose();
+        },
         minisize() {
+            this.dialogVisible = !this.dialogVisible;
+        },
+        backStep() {
             this.dialogVisible = true;
+            this.activeName = 'stepList';
         },
         doShow(data) {
-            // this.getTrainingAllInfo(data);
             this.getStepList(data);
             this.dialogVisible = true;
             this.tabVisible = true;
         },
         saveStepData() {
             const list = [];
-            this.queryList.data.forEach((item, index) => {
+            this.tableData.forEach((item, index) => {
                 const obj = {
-                    ...item,
-                    id: index + 1 + ''
+                    ...item
+                    // id: index + 1 + ''
                 };
                 delete obj.isEdit;
                 list.push(obj);
             });
-            updateTrainingStep(this.editData.id, list).then(res => {
+            updateTrainingStep(this.group, this.editData.id, list).then(res => {
                 console.log('保存步骤成功！', res);
                 this.$message.success('保存步骤成功！');
                 // this.doClose();
+                this.getStepList(this.editData);
             }).catch(err => {
                 console.log('保存步骤失败', err);
                 this.$message.error('保存步骤失败');
@@ -194,28 +338,32 @@ export default {
         getStepList(data) { // 获取步骤
             getTrainingStepList(data.id).then(res => {
                 console.log(res, '获取步骤成功');
-                this.queryList.data = res.data;
+                this.tableData = res.data;
             }).catch(err => {
                 console.log(err, '获取步骤失败');
-                this.queryList.data = [];
+                this.tableData = [];
             });
         },
-        getTrainingAllInfo(data) {
-            getTrainingAll(data.id).then(res => {
-                Object.keys(this.formModel).forEach(key => {
-                    this.formModel[key] = res.data[key] || '';
-                    if (key == 'stepJson') {
-                        const sList = res.data[key] ? JSON.parse(res.data[key]) : [];
-                        this.queryList.data = Object.prototype.toString.call(sList) === '[object Array]' ? sList : [];
-                    }
+        getTrainingAllInfo(id) {
+            return new Promise((resolve, reject) => {
+                getTrainingAll(id).then(res => {
+                    console.log(res, '获取详细信息成功');
+                    const data = {
+                        ...res.data
+                    };
+                    const objArr = ['bgSceneJson', 'mapLocationJson'];
+                    objArr.forEach(key => {
+                        data[key] = res.data[key] ? JSON.parse(res.data[key]) : {};
+                    });
+                    const arr = ['labelJson', 'memberJson', 'playerIdJson', 'stepJson'];
+                    arr.forEach(key => {
+                        data[key] = res.data[key] ? JSON.parse(res.data[key]) : [];
+                    });
+                    resolve(data);
+                }).catch(err => {
+                    console.log(err, '获取详细信息失败');
+                    reject(err);
                 });
-                console.log(res, this.formModel, '获取详细信息成功');
-            }).catch(err => {
-                console.log(err, '获取详细信息失败');
-                Object.keys(this.formModel).forEach(key => {
-                    this.formModel[key] = '';
-                });
-                this.queryList.data = [];
             });
         },
         updateMapLocation() {
@@ -224,7 +372,7 @@ export default {
             updateTrainingMaplocation({id: this.editData.id, mapLocationJson: JSON.stringify(params)}).then(res => {
                 console.log('保存地图定位成功！', res);
                 this.$message.success('保存地图定位成功！');
-                this.formModel.mapLocationJson = JSON.stringify(params);
+                this.mapLocationObj = params;
             }).catch(err => {
                 console.log('保存地图定位失败', err);
                 this.$message.error('保存地图定位失败');
@@ -234,6 +382,11 @@ export default {
             updateTrainingBackgroud({id: this.editData.id, groupId: this.group}).then(res => {
                 console.log('保存背景', res);
                 this.$message.success('保存背景成功！');
+                this.getTrainingAllInfo(this.editData.id).then(suc => {
+                    this.bgSceneObj = suc.bgSceneJson;
+                }).catch(() => {
+                    this.bgSceneObj = {};
+                });
             }).catch(err => {
                 console.log('保存背景失败', err);
                 this.$message.error('保存背景失败');
@@ -243,10 +396,33 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.editContent {
+	position: absolute;
+    right: 0;
+	top: 0;
+    height: 100%;
+	width: 800px;
+	transform: translateX(800px);
+	transition: all 0.4s;
+	z-index: 35;
+	background: #fff;
+	&.active{
+		transform: translateX(0px);
+	}
+}
+/deep/ .el-dialog__wrapper {
+	width: 1px;
+	height: 1px;
+	top: auto;
+	right: auto;
+	bottom: auto;
+	left: auto;
+	overflow: visible !important;
+}
 .editContentTab{
     position: absolute;
     z-index: 10;
-	right: 12px;
+	left: -12px;
 	top: calc(45% + 100px);
 }
 .editContentTabLable{
@@ -254,11 +430,28 @@ export default {
     background: #fff;
     border-radius: 5px 0px 0px 5px ;
     padding: 5px 0px;
-    width: 23px;
+    width: 24px;
     text-align: center;
     left: 50%;
     transform: translateX(-50%);
     cursor: pointer;
     top:-28px;
 }
+.tabPaneBox {
+	padding: 0 20px;
+	.tabPaneHead, .tabPaneFooter {
+		padding: 10px 0;
+	}
+	.tabPaneFooter {
+		display: flex;
+		justify-content: center;
+	}
+}
+.editContentTitle {
+	height: 50px;
+	padding: 0 20px;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
 </style>
diff --git a/src/views/trainingManage/editOperate.vue b/src/views/trainingManage/editOperate.vue
new file mode 100644
index 000000000..6036b6e61
--- /dev/null
+++ b/src/views/trainingManage/editOperate.vue
@@ -0,0 +1,181 @@
+<template>
+  <div>
+    <div class="editContentTab">
+      <div v-if="dialogVisible" class="editContentTabLable" @click="minisize">
+        <span class="titleStyle">{{ $t('trainingManage.editTagTitle') }}</span>
+      </div>
+    </div>
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="500" :modal="false" :close-on-click-modal="false" :show-close="false" center style="margin-left: 200px">
+      <el-row style="font-size: 16px;padding: 5px;">
+        <el-col :span="4">步骤描述：</el-col>
+        <el-col :span="20">{{ stepDetail.description }}</el-col>
+      </el-row>
+      <el-row style="font-size: 16px;padding: 5px;overflow: hidden;word-wrap: break-word;">
+        <el-col :span="4">操作详情：</el-col>
+        <el-col :span="20">
+          <!--<div v-for="item in stepDetail.operations" :key="item">
+            <div>{{ item }}</div>
+          </div>-->
+          <template>
+            <div v-for="(item, index) in stepDetail.operations" :key="index">
+              <el-tag :type="tagIndex === index? 'success':''" closable @close="deleteOperation(index)" @click="changeTagIndex(index)">
+                {{ covertString(item) }}
+              </el-tag>
+            </div>
+          </template>
+        </el-col>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="success" @click="backStepList">返回步骤列表</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+export default {
+    name: 'EditOperate',
+    data() {
+        return {
+            title: '编辑操作',
+            dialogVisible: false,
+            dialogWidth: 500,
+            dataIndex: 0,
+            tagIndex: 0,
+            trainingType: '',
+            stepDetail: {
+                id: '',
+                description: '',
+                operations: []
+            },
+            cmdMap: {}
+        };
+    },
+    watch: {
+        '$store.state.trainingNew.trainingOperate': function (val) {
+            if (val && this.dialogVisible && this.trainingType === 'SINGLE') {
+                const data = {
+                    deviceCode: val.code || '',
+                    userOperationType: val.userOperationType || '',
+                    domId: val.operation || '',
+                    operationType: val.cmdType ? val.cmdType.value : '',
+                    params: val.param || {},
+                    t: 'C'
+                };
+                this.stepDetail.operations.push(data);
+            }
+        },
+        '$store.state.trainingNew.sceneOperate': function (val) {
+            if (val && this.dialogVisible && this.trainingType === 'SCENE') {
+                const data = {
+                    operationType: val.id,
+                    params: val.command,
+                    t: 'S'
+                };
+                this.stepDetail.operations.push(data);
+            }
+        }
+    },
+    mounted() {
+        for (const key in CMD) {
+            for (const mapKey in CMD[key]) {
+                this.cmdMap[CMD[key][mapKey].value] = CMD[key][mapKey].label;
+            }
+        }
+    },
+    methods: {
+        doShow(data) {
+            if (data) {
+                this.stepDetail.id = data.data.id;
+                this.stepDetail.description = data.data.description;
+                this.stepDetail.operations = data.data.operations || [];
+                this.dataIndex = data.index;
+                this.trainingType = data.type;
+                this.dialogVisible = true;
+            }
+        },
+        minisize() {
+            this.dialogVisible = true;
+        },
+        deleteOperation(index) {
+            if (this.tagIndex === index) {
+                this.tagIndex = 0;
+            }
+            this.stepDetail.operations.splice(index, 1);
+        },
+        changeTagIndex(index) {
+            this.tagIndex = index;
+        },
+        backStepList() {
+            const tipPosition = {};
+            if (this.stepDetail.operations[this.tagIndex] && this.trainingType === 'SINGLE') {
+                tipPosition.domId = this.stepDetail.operations[this.tagIndex].domId;
+                tipPosition.deviceCode = this.stepDetail.operations[this.tagIndex].deviceCode;
+                tipPosition.operateIndex = this.tagIndex;
+            }
+            this.$emit('backStepList', { index: this.dataIndex, stepDetail: this.stepDetail, tipPosition: tipPosition });
+            this.dialogVisible = false;
+            this.stepDetail = {
+                id: '',
+                description: '',
+                operations: []
+            };
+            this.trainingType = '';
+            this.dataIndex = 0;
+            this.tagIndex = 0;
+        },
+        covertString(data) {
+            const userOperationTypeMap = {
+                rightClick: '右键点击',
+                leftClick: '左键点击',
+                chooseValue: '选择',
+                fillValue: '填写'
+            };
+            if (userOperationTypeMap[data.userOperationType]) {
+                return userOperationTypeMap[data.userOperationType] + data.domId;
+            } else if (data.domId) {
+                return data.domId;
+            } else if (data.operationType && this.cmdMap[data.operationType]) {
+                return this.cmdMap[data.operationType];
+            } else {
+                console.log(this.cmdMap, '------------');
+                return '';
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+/deep/ .el-dialog__wrapper {
+	width: 1px;
+	height: 1px;
+	top: auto;
+	right: auto;
+	bottom: auto;
+	left: auto;
+	overflow: visible !important;
+}
+/deep/ .el-dialog--center{
+	width: 600px;
+}
+.editContentTab{
+	position: absolute;
+	z-index: 10;
+	right: 12px;
+	top: calc(45% + 100px);
+}
+.editContentTabLable{
+	position: absolute;
+	background: #fff;
+	border-radius: 5px 0 0 5px ;
+	padding: 5px 0;
+	width: 23px;
+	text-align: center;
+	left: 50%;
+	transform: translateX(-50%);
+	cursor: pointer;
+	top:-28px;
+}
+</style>
diff --git a/src/views/trainingManage/expression.vue b/src/views/trainingManage/expression.vue
new file mode 100644
index 000000000..a43d97c62
--- /dev/null
+++ b/src/views/trainingManage/expression.vue
@@ -0,0 +1,453 @@
+<template>
+  <div @click.stop>
+    <el-form ref="formModel" :model="formModel" :rules="rules" label-width="110px">
+      <el-form-item label="运算符" prop="operator">
+        <el-select v-model="formModel.operator" placeholder="请选择运算符" size="mini">
+          <el-option
+            v-for="option in ConstSelect.operationList"
+            :key="option.value"
+            :label="option.label"
+            :value="option.value"
+          />
+        </el-select>
+      </el-form-item>
+      <div class="rowConditionList">
+        <!-- <el-form-item label="值1类型" prop="t1">
+          <el-select v-model="formModel.t1" placeholder="请选择条件类型" size="mini">
+            <el-option
+              v-for="option in conditionList1"
+              :key="option.value"
+              :label="option.label"
+              :value="option.value"
+            />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item v-if="showDevice" label="设备类型">
+          <el-select v-model="deviceType" clearable placeholder="请选择设备类型" size="mini" @change="changeDeviceType">
+            <el-option
+              v-for="option in ConstSelect.operationDeviceList"
+              :key="option.value"
+              :label="option.label"
+              :value="option.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="deviceType == 'Route'" label="初始信号机">
+          <el-select v-model="startSignal" placeholder="请选择值" size="mini">
+            <el-option
+              v-for="option in getSignalList"
+              :key="option.code"
+              :label="option.name"
+              :value="option.code"
+            />
+          </el-select>
+          <el-button :type="field == 'startSignal' ? 'danger' : 'primary'" size="mini" @click="hover('startSignal')">激活</el-button>
+        </el-form-item>
+        <el-form-item v-if="showDevice" label="设备" prop="elementCode">
+          <el-select v-model="formModel.elementCode" clearable placeholder="请选择设备" size="mini">
+            <el-option
+              v-for="option in filterDeviceList"
+              :key="option.code"
+              :label="option.name"
+              :value="option.code"
+            />
+          </el-select>
+          <el-button v-if="showElementCodeActive" :type="field == 'elementCode' ? 'danger' : 'primary'" size="mini" @click="hover('elementCode')">激活</el-button>
+        </el-form-item>
+        <el-form-item v-if="showDevice" label="属性" prop="filedName">
+          <el-select v-model="formModel.filedName" clearable placeholder="请选择设备属性" size="mini" @change="changeFiledName">
+            <el-option
+              v-for="option in getAttributeList"
+              :key="option.name"
+              :label="option.desc"
+              :value="option.name"
+            />
+          </el-select>
+        </el-form-item>
+      </div>
+      <div class="rowConditionList">
+        <!-- <el-form-item v-if="showConditionList2" label="值2类型" prop="t2">
+          <el-select v-model="formModel.t2" placeholder="请选择条件类型" size="mini">
+            <el-option
+              v-for="option in conditionList2"
+              :key="option.value"
+              :label="option.label"
+              :value="option.value"
+            />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item v-if="showValue2" label="值" prop="v">
+          <el-select v-if="optionObj[valueType]" v-model="formModel.v" placeholder="请选择值" size="mini">
+            <el-option
+              v-for="option in optionValueType"
+              :key="option.value"
+              :label="option.label"
+              :value="option.value"
+            />
+          </el-select>
+          <div v-else-if="valueType == 'Section'">
+            <el-select v-model="formModel.v" placeholder="请选择值" size="mini">
+              <el-option
+                v-for="option in getSectionList"
+                :key="option.code"
+                :label="option.name"
+                :value="option.code"
+              />
+            </el-select>
+            <el-button :type="field == 'v' ? 'danger' : 'primary'" size="mini" @click="hover('v')">激活</el-button>
+          </div>
+          <el-input-number v-else-if="valueType=='float' || valueType=='int'" v-model="formModel.v" :precision="valueType=='int' ? 0 : 2" size="mini" style="width: 180px" />
+          <el-input v-else v-model="formModel.v" size="mini" style="width: 180px" />
+        </el-form-item>
+      </div>
+      <el-form-item class="dialog-footer">
+        <el-button v-if="indexPath" size="mini" type="primary" @click="doSave">修改</el-button>
+        <el-button v-else size="mini" type="primary" @click="doAdd">新增</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import ConstConfig from '@/scripts/ConstConfig';
+export default {
+    name: 'Expression',
+    components:{},
+    props: {
+        getDeviceList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        },
+        materialsList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            indexPath: '',
+            field: '',
+            deviceType: '',
+            startSignal: '',
+            formModel: {
+                t: 'E',
+                t1: 'S',
+                t2: 'V',
+                valuables1: '',
+                valuables2: '',
+                operator: 'EQ',
+                elementCode: '',
+                filedName: '',
+                v: ''
+            }
+        };
+    },
+    computed: {
+        ConstSelect() {
+            return ConstConfig.ConstSelect;
+        },
+        conditionList1() {
+            return this.ConstSelect.conditionList.filter(item => {
+                return item.value == 'S';
+            });
+        },
+        conditionList2() {
+            return this.ConstSelect.conditionList.filter(item => {
+                return item.value == 'V';
+            });
+        },
+        filterDeviceList() {
+            let list = [];
+            list = this.getDeviceList.filter(item => {
+                return item._type == this.deviceType;
+            });
+            if (this.deviceType == 'Route') {
+                list = list.filter(item => {
+                    return item.startSignalCode == this.startSignal;
+                });
+            }
+            return list;
+        },
+        getSignalList() { // 信号机列表
+            let list = [];
+            list = this.getDeviceList.filter(item => {
+                return item._type == 'Signal';
+            });
+            return list;
+        },
+        getSectionList() { // 区段列表
+            let list = [];
+            list = this.getDeviceList.filter(item => {
+                return item._type == 'Section';
+            });
+            return list;
+        },
+        valueType() {
+            let type = '';
+            const findObj = this.getAttributeList.find(item => {
+                return item.name == this.formModel.filedName;
+            });
+            if (findObj) {
+                type = findObj.type || '';
+            }
+            return type;
+        },
+        optionValueType() {
+            return this.optionObj[this.valueType] || [];
+        },
+        getAttributeList() {
+            let attr = [];
+            if (this.deviceType) {
+                const obj = this.materialsList.find(item => {
+                    return item.srcName == this.deviceType;
+                });
+                if (obj) {
+                    attr = obj.materials;
+                }
+            }
+            return attr;
+        },
+        optionObj() {
+            const obj = {
+                boolean: [
+                    { label: '是', value: true },
+                    { label: '否', value: false }
+                ]
+            };
+            this.materialsList.forEach(item => {
+                item.materials.forEach(every => {
+                    if (every.valueList) {
+                        obj[every.type] = every.valueList;
+                    }
+                });
+            });
+            return obj;
+        },
+        rules() {
+            const crules = {
+                t: [
+                    { required: true, message: '请选择条件类型', trigger: 'blur' }
+                ],
+                t1: [
+                    { required: true, message: '请选择条件类型', trigger: 'blur' }
+                ],
+                t2: [
+                    { required: true, message: '请选择条件类型', trigger: 'blur' }
+                ],
+                operator: [
+                    { required: true, message: '请选择运算符', trigger: 'blur' }
+                ],
+                elementCode: [
+                    { required: true, message: '请选择设备', trigger: 'blur' }
+                ],
+                filedName: [
+                    { required: true, message: '请选择设备属性', trigger: 'blur' }
+                ],
+                v: [
+                    { required: true, message: '请输入值', trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        showElementCodeActive() {
+            let s = true;
+            const arr = ['Route', 'StationDirectionAuto', 'StationDirectionSemi'];
+            if (arr.includes(this.deviceType)) {
+                s = false;
+            }
+            return s;
+        },
+        showDevice() {
+            let s = false;
+            if (this.formModel.t1 == 'S') {
+                s = true;
+            }
+            return s;
+        },
+        showConditionList2() {
+            let s = true;
+            const arr = ['NOT', 'IS'];
+            if (arr.includes(this.formModel.operator)) {
+                s = false;
+            }
+            return s;
+        },
+        showValue2() {
+            let s = true;
+            if (!this.showConditionList2 || this.formModel.t2 != 'V') {
+                s = false;
+            }
+            return s;
+        }
+    },
+    watch: {
+        '$store.state.menuOperation.selectedCount': function(val) {
+            if (this.field && this.showDevice) {
+                const model = this.$store.state.menuOperation.selected;
+                let code = model.code;
+                if (model._type == 'SignalButton' && model.signalCode) {
+                    code = model.signalCode;
+                }
+                let list = this.getDeviceList;
+                if (this.field == 'v') {
+                    list = this.getSectionList;
+                } else if (this.field == 'startSignal') {
+                    list = this.getSignalList;
+                }
+                const findObj = list.find(item => {
+                    return item.code == code;
+                });
+                if (findObj) {
+                    if (this.field == 'startSignal') {
+                        this[this.field] = findObj.code;
+                        this.formModel.elementCode = '';
+                    } else {
+                        this.formModel[this.field] = findObj.code;
+                    }
+                }
+                if (this.field != 'startSignal' && this.deviceType != this.getDeviceType()) {
+                    this.deviceType = this.getDeviceType();
+                    this.formModel.filedName = '';
+                    this.formModel.v = '';
+                }
+                this.field = '';
+            }
+        }
+    },
+    created() {},
+    methods: {
+        changeDeviceType() {
+            this.formModel.elementCode = '';
+            this.formModel.filedName = '';
+            this.formModel.v = '';
+        },
+        changeFiledName() {
+            this.formModel.v = '';
+        },
+        hover(field) {
+            this.field = field == this.field ? '' : field;
+            this.$emit('hover', field);
+        },
+        validate() {
+            return new Promise((resolve, reject) => {
+                this.$refs.formModel.validate(valid => {
+                    if (valid) {
+                        const cpData = {};
+                        cpData.t = this.formModel.t;
+                        cpData.operator = this.formModel.operator;
+                        let objV1 = {
+                            valuables: this.formModel.valuables1.valuables || [],
+                            operator: this.formModel.valuables1.operator || 'EQ',
+                            t: this.formModel.valuables1.t || 'E'
+                        };
+                        let objV2 = {
+                            valuables: this.formModel.valuables2.valuables || [],
+                            operator: this.formModel.valuables2.operator || 'EQ',
+                            t: this.formModel.valuables2.t || 'E'
+                        };
+                        if (this.formModel.t1 == 'S') {
+                            objV1 = {
+                                elementCode: this.formModel.elementCode,
+                                filedName: this.formModel.filedName,
+                                t: 'S'
+                            };
+                        }
+                        if (this.formModel.t2 == 'V') {
+                            objV2 = {
+                                v: this.formModel.v,
+                                t: 'V'
+                            };
+                        }
+                        cpData.valuables = [objV1];
+                        if (this.showConditionList2) {
+                            cpData.valuables[1] = objV2;
+                        }
+                        resolve(cpData);
+                    } else {
+                        reject();
+                    }
+                });
+            });
+        },
+        doAdd() {
+            this.validate().then(res => {
+                this.$emit('addExp', res);
+            });
+        },
+        doSave() {
+            this.validate().then(res => {
+                this.$emit('editExpression', res, this.indexPath);
+            });
+        },
+        setFormData(data, indexPath) {
+            this.indexPath = indexPath;
+            this.clearFromData();
+            if (data) {
+                const valuables = data.valuables || [];
+                this.formModel.t = data.t || '';
+                this.formModel.operator = data.operator || '';
+                this.formModel.valuables1 = valuables[0] || '';
+                this.formModel.valuables2 = valuables[1] || '';
+                if (valuables[0]) {
+                    this.formModel.elementCode = valuables[0].elementCode || '';
+                    this.formModel.filedName = valuables[0].filedName || '';
+                    this.formModel.t1 = valuables[0].t || 'E';
+                } else {
+                    this.formModel.elementCode = '';
+                    this.formModel.filedName = '';
+                    this.formModel.t1 = 'S';
+                }
+                const arr = ['NOT', 'IS'];
+                if (!arr.includes(data.operator) && valuables[1]) {
+                    this.formModel.v = valuables[1].v;
+                    this.formModel.t2 = valuables[1].t;
+                } else {
+                    this.formModel.v = '';
+                    this.formModel.t2 = 'V';
+                }
+            }
+            this.deviceType = this.getDeviceType();
+            this.startSignal = this.getStartSignal();
+        },
+        getDeviceType() {
+            let type = '';
+            const findObj = this.getDeviceList.find(item => {
+                return item.code == this.formModel.elementCode;
+            });
+            if (findObj) {
+                type = findObj._type || '';
+            }
+            return type;
+        },
+        getStartSignal() {
+            let signal = '';
+            const findObj = this.getDeviceList.find(item => {
+                return item.code == this.formModel.elementCode;
+            });
+            if (findObj) {
+                signal = findObj.startSignalCode || '';
+            }
+            return signal;
+        },
+        clearFromData() {
+            this.$refs.formModel.resetFields();
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.rowConditionList {
+		display: flex;
+		flex-wrap: wrap;
+	}
+	/deep/ .el-form-item__label {
+		line-height: 28px;
+	}
+	/deep/ .el-form-item__content {
+		line-height: 28px;
+	}
+</style>
diff --git a/src/views/trainingManage/expressionValue.vue b/src/views/trainingManage/expressionValue.vue
new file mode 100644
index 000000000..beafc3d5b
--- /dev/null
+++ b/src/views/trainingManage/expressionValue.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="mainDiv" @click.stop>
+    <span v-if="valueObj.t == 'V'">
+      <span>{{ valueObj.v }}</span>
+    </span>
+    <span v-if="valueObj.t == 'S'">
+      <span>{{ getElementCodeName(valueObj.elementCode) }}</span>
+      <span>的</span>
+      <span>{{ getFiledName(valueObj) }}</span>
+    </span>
+    <div v-if="valueObj.t == 'E'" :style="{background: activeIndexPath==indexPath ? '#32f807' : ''}">
+      <span>&nbsp;</span>
+      <span v-if="hasSunExp(valueObj) && indexPath != '0'">&nbsp;(&nbsp;</span>
+      <span v-if="!valueObj.valuables[0]">??</span>
+      <span v-if="valueObj.valuables[0] && valueObj.valuables[0].t == 'S'">
+        <span>{{ getElementCodeName(valueObj.valuables[0].elementCode) }}</span>
+        <span>的</span>
+        <span>{{ getFiledName(valueObj.valuables[0]) }}</span>
+      </span>
+      <ExpressionValue v-if="valueObj.valuables[0] && valueObj.valuables[0].t == 'E'" :materials-list="materialsList" :get-device-list="getDeviceList" :value-obj="valueObj.valuables[0]" :index-path="indexPath+'-0'" :active-index-path="activeIndexPath" @editValue="clickExpression" />
+      <span v-if="isBigExp(valueObj)" class="bigExpressionDiv">
+        <el-select v-model="valueObj.operator" placeholder="请选择" size="mini" style="width: 60px">
+          <el-option
+            v-for="option in operationList1"
+            :key="option.value"
+            :label="option.label"
+            :value="option.value"
+          />
+        </el-select>
+      </span>
+      <span v-else class="expressionDiv" @click.stop="clickExpression(valueObj, indexPath)">&nbsp;{{ getOperatorName(valueObj.operator) }}&nbsp;</span>
+      <ExpressionValue v-if="!hasNotIs(valueObj.operator) && valueObj.valuables[1] && valueObj.valuables[1].t == 'E'" :materials-list="materialsList" :get-device-list="getDeviceList" :value-obj="valueObj.valuables[1]" :index-path="indexPath+'-1'" :active-index-path="activeIndexPath" @editValue="clickExpression" />
+      <span v-if="valueObj.valuables[1] && valueObj.valuables[1].t == 'V'">
+        <span>{{ getValueName(valueObj) }}</span>
+      </span>
+      <span v-if="!hasNotIs(valueObj.operator) && !valueObj.valuables[1]">??</span>
+      <span v-if="hasSunExp(valueObj) && indexPath != '0'">&nbsp;)&nbsp;</span>
+      <span>&nbsp;</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import ConstConfig from '@/scripts/ConstConfig';
+export default {
+    name: 'ExpressionValue',
+    components:{},
+    props: {
+        valueObj: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        indexPath: {
+            type: String,
+            default() {
+                return '0';
+            }
+        },
+        activeIndexPath: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        getDeviceList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        },
+        materialsList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {};
+    },
+    computed: {
+        ConstSelect() {
+            return ConstConfig.ConstSelect;
+        },
+        operationList1() {
+            const arr = ['AND', 'OR'];
+            return this.ConstSelect.operationList.filter(item => {
+                return arr.includes(item.value);
+            });
+        },
+        optionObj() {
+            const obj = {
+                boolean: [
+                    { label: '是', value: true },
+                    { label: '否', value: false }
+                ]
+            };
+            this.materialsList.forEach(item => {
+                item.materials.forEach(every => {
+                    if (every.valueList) {
+                        obj[every.type] = every.valueList;
+                    }
+                });
+            });
+            return obj;
+        },
+        valueTypeList() {
+            let list = [];
+            Object.values(this.optionObj).forEach(item => {
+                list = list.concat(item);
+            });
+            return list;
+        }
+    },
+    watch: {},
+    created() {},
+    methods: {
+        getValueName(obj) {
+            let value = obj.valuables[1].v;
+            const type = this.getValueType(obj.valuables[0]);
+            if (type) {
+                if (type != 'Section') {
+                    const list = this.optionObj[type] || [];
+                    const findObj = list.find(item => {
+                        return item.value == value;
+                    });
+                    if (findObj) {
+                        value = findObj.label;
+                    }
+                } else {
+                    const findObj = this.getDeviceList.find(item => {
+                        return item.code == value;
+                    });
+                    if (findObj) {
+                        value = findObj.name;
+                    }
+                }
+            }
+            return value;
+        },
+        getElementCodeName(code) {
+            let name = code;
+            const findObj = this.getDeviceList.find(item => {
+                return item.code == code;
+            });
+            if (findObj) {
+                name = findObj.name;
+            }
+            return name;
+        },
+        getValueType(obj) {
+            let name = '';
+            const findObj = this.getDeviceAttr(obj);
+            if (findObj) {
+                name = findObj.type;
+            }
+            return name;
+        },
+        getFiledName(obj) {
+            let name = obj.filedName;
+            const findObj = this.getDeviceAttr(obj);
+            if (findObj) {
+                name = findObj.desc;
+            }
+            return name;
+        },
+        getDeviceAttr(obj) {
+            const type = this.deviceType(obj.elementCode);
+            const attrList = this.getAttributeList(type);
+            const findObj = attrList.find(item => {
+                return item.name == obj.filedName;
+            });
+            return findObj;
+        },
+        deviceType(code) {
+            let type = '';
+            const findObj = this.getDeviceList.find(item => {
+                return item.code == code;
+            });
+            if (findObj) {
+                type = findObj._type || '';
+            }
+            return type;
+        },
+        getAttributeList(type) {
+            let attr = [];
+            const obj = this.materialsList.find(item => {
+                return item.srcName == type;
+            });
+            if (obj) {
+                attr = obj.materials;
+            }
+            return attr;
+        },
+        hasSunExp(obj) {
+            let s = false;
+            if (obj.valuables[0] && obj.valuables[0].t == 'E') {
+                if (this.hasNotIs(obj.operator) || (obj.valuables[1] && obj.valuables[1].t == 'E')) {
+                    s = true;
+                }
+            }
+            return s;
+        },
+        isBigExp(obj) {
+            let s = false;
+            if (obj.valuables[0] && obj.valuables[0].t == 'E') {
+                s = true;
+            }
+            return s;
+        },
+        clickExpression(obj, path) {
+            const cpData = JSON.parse(JSON.stringify(obj));
+            this.$emit('editValue', cpData, path);
+        },
+        hasNotIs(operator) {
+            let s = false;
+            const arr = ['NOT', 'IS'];
+            if (arr.includes(operator)) {
+                s = true;
+            }
+            return s;
+        },
+        getOperatorName(o) {
+            let n = '等于';
+            const findObj = ConstConfig.ConstSelect.operationList.find(item => {
+                return item.value == o;
+            });
+            if (findObj) {
+                n = findObj.label;
+            }
+            return n;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.mainDiv {
+		display: inline-block;
+	}
+	.expressionDiv {
+		color: #ff8000;
+		cursor: pointer;
+		&:hover {
+			background: #32f807;
+		}
+	}
+</style>
diff --git a/src/views/trainingManage/gradeRules.vue b/src/views/trainingManage/gradeRules.vue
new file mode 100644
index 000000000..422f3e064
--- /dev/null
+++ b/src/views/trainingManage/gradeRules.vue
@@ -0,0 +1,213 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogVisible" width="800px" :modal="false" :before-close="doClose" center>
+    <!--  -->
+    <!-- <span>角色：</span> -->
+    <el-form ref="form" :model="addModel" label-width="70px" :rules="rules">
+      <el-form-item label="角色:" prop="memberId" style="display:inline-block">
+        <el-select v-model="addModel.memberId" placeholder="" style="width:145px" size="mini" @change="changeMember">
+          <el-option
+            v-for="item in memberList"
+            :key="item.id"
+            :label="item.normalName"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="总分:" prop="fullMarks" style="display:inline-block">
+        <el-input-number v-model="addModel.fullMarks" style="width:145px" :min="0" size="mini" :step="1" />
+      </el-form-item>
+    </el-form>
+    <!-- <span style="margin-left:10px">总分：</span> -->
+    <!-- </el-form-item> -->
+    <el-table
+      id="gradeRules"
+      ref="gradeRules"
+      :data="allstepList"
+      border
+      :height="350"
+      style="border:1px #ccc solid;"
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        width="80"
+      />
+      <el-table-column
+        prop="description"
+        label="步骤描述"
+        width="468"
+      />
+      <el-table-column
+        prop="score"
+        label="分值"
+        width="200"
+      >
+        <template v-if="addModel.memberId==scope.row.memberId" slot-scope="scope">
+          <el-input-number v-model="currentStepMap[scope.row.id]" style="width:145px" :min="0" size="mini" :step="1" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-row justify="center" style="margin-top:20px">
+      <el-col :span="6" :offset="7">
+        <el-button @click="cancel">取消</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button type="primary" :loading="loading" @click="commit">确定 </el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+<script>
+import {covertMemberData} from '@/views/newMap/displayNew/utils';
+import { getTrainingStepList, getTrainingPlayers, updateTrainingGradeRules, getTrainingGradeRules } from '@/api/trainingManage';
+export default {
+    name: 'GradeRules',
+    props: {},
+    data() {
+        return {
+            dialogVisible: false,
+            trainingId:'',
+            loading:false,
+            title:'评分',
+            allstepList:[],
+            memberList:[],
+            currentStepMap:{},
+            gradeRulesMap:{},
+            addModel:{
+                memberId:'',
+                fullMarks:'',
+                details:[
+                ]
+            },
+            rules:{
+                memberId: [
+                    { required: true, message: '请选择角色', trigger: 'blur' },
+                    { required: true, message: '请选择角色', trigger: 'change' }
+                ],
+                fullMarks: [
+                    { required: true, message: '请输入总分', trigger: 'blur' },
+                    { required: true, message: '请输入总分', trigger: 'change' }
+                ]
+            }
+        };
+    },
+    methods:{
+        doShow(row) {
+            this.dialogVisible = true;
+            this.trainingId = row.id;
+            // 获取步骤
+            getTrainingStepList(row.id).then(resp => {
+                if (resp.data) {
+                    this.allstepList = resp.data;
+                    // 获取规则
+                    getTrainingGradeRules(row.id).then(response=>{
+                        this.gradeRulesMap = {};
+                        response.data.forEach(gradeRule=>{
+                            this.gradeRulesMap[gradeRule.memberId] = gradeRule;
+                        });
+                        // 获取角色信息
+                        getTrainingPlayers(row.id).then(res=>{
+                            let activeTrainList = [];
+                            if (this.$store.state.training.started) {
+                                activeTrainList = this.$store.state.map.activeTrainList;
+                            }
+                            // 获取仿真成员列表
+                            const result = covertMemberData(activeTrainList, res.data);
+                            let list = [];
+                            result.deviceListData.forEach(item => {
+                                list = list.concat(item);
+                            });
+                            this.memberList = list;
+                            if (this.memberList.length > 0) {
+                                this.changeMember(this.memberList[0].id);
+                            }
+                        //
+                        }).catch((e) => {
+                            console.error(e);
+                        });
+                    });
+                }
+            }).catch((e) => {
+                console.error(e);
+                this.$message.error('获取实训步骤信息失败！');
+            });
+        },
+        changeMember(memberId) {
+            const currentStepMap = {};
+            this.allstepList.forEach(each=>{
+                if (each.memberId == memberId) {
+                    currentStepMap[each.id] = 0;
+                }
+            });
+            if (this.gradeRulesMap[memberId]) {
+                this.addModel.fullMarks = this.gradeRulesMap[memberId].fullMarks;
+                this.gradeRulesMap[memberId].details.forEach(each=>{
+                    currentStepMap[each.elementId] = each.score;
+                });
+            } else {
+                this.addModel.fullMarks = '';
+                this.addModel.details = [];
+            }
+            this.currentStepMap = Object.assign({}, currentStepMap);
+            this.addModel.memberId = memberId;
+        },
+        doClose() {
+            this.dialogVisible = false;
+        },
+        cancel() {
+            this.doClose();
+        },
+        commit() {
+            const that = this;
+            that.$refs.form.validate((valid) => {
+                if (valid) {
+                    const keyList = Object.keys(that.currentStepMap);
+                    const details = [];
+                    keyList.forEach(key=>{
+                        details.push({elementId:key, score:that.currentStepMap[key]});
+                    });
+                    that.addModel.details = details;
+                    const gradeRulesList = Object.values(that.gradeRulesMap);
+                    gradeRulesList.map(gradeRule=>{
+                        if (gradeRule.memberId == that.addModel.memberId) {
+                            gradeRule.details = [...that.addModel.details];
+                            gradeRule.fullMarks = that.addModel.fullMarks;
+                        }
+                    });
+                    if (!that.gradeRulesMap[that.addModel.memberId] && that.addModel.details.length > 0) {
+                        gradeRulesList.push(that.addModel);
+                    }
+                    if (that.addModel.details.length > 0) {
+                        let result = false;
+                        gradeRulesList.forEach(gradeRules=>{
+                            let total = 0;
+                            gradeRules.details.forEach(detail=>{
+                                total += detail.score || 0;
+                            });
+                            if (total !== gradeRules.fullMarks) {
+                                result = result || true;
+                            }
+                        });
+                        if (result) {
+                            that.$message.error('步骤分总和不等于总分');
+                            return;
+                        }
+                        that.loading = true;
+                        updateTrainingGradeRules(that.trainingId, gradeRulesList).then(resp => {
+                            that.loading = false;
+                            that.gradeRulesMap[that.addModel.memberId] = JSON.parse(JSON.stringify(that.addModel));
+                            that.$message.success('更新实训评分规则成功！');
+                        }).catch((e) => {
+                            that.loading = false;
+                            console.error(e);
+                            that.$message.error('更新实训评分规则失败！');
+                        });
+                    } else {
+                        that.$message.error('该角色不存在');
+                    }
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/views/trainingManage/trackList.vue b/src/views/trainingManage/trackList.vue
new file mode 100644
index 000000000..b9ab419a0
--- /dev/null
+++ b/src/views/trainingManage/trackList.vue
@@ -0,0 +1,141 @@
+<template>
+  <el-dialog v-dialogDrag title="草稿发布轨迹" :visible.sync="dialogVisible" width="1050px" :before-close="doClose" center>
+    <div>
+      <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { draftPubTrace, deleteTrace } from '@/api/trainingManage';
+
+export default {
+    name: 'TrackList',
+    components:{},
+    props: {},
+    data() {
+        return {
+            dialogVisible: false,
+            training: {},
+            draftId: '',
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '100px',
+                reset: true,
+                show: false
+            },
+            queryList: {
+                height: 500,
+                query: this.queryFunction,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '实训草稿名称',
+                        prop: 'draftName'
+                    },
+                    {
+                        title: '草稿实训是否存在',
+                        prop: 'draftExist',
+                        type: 'basicText',
+                        columnValue: (row) => { return this.covertData(row, 'draftExist'); }
+                    },
+                    {
+                        title: '已发布实训名称',
+                        prop: 'pubName'
+                    },
+                    {
+                        title: '发布实训是否存在',
+                        prop: 'pubExist',
+                        type: 'basicText',
+                        columnValue: (row) => { return this.covertData(row, 'pubExist'); }
+                    },
+                    {
+                        title: '发布者名称',
+                        prop: 'traceCreatorName'
+                    },
+                    {
+                        title: '发布时间',
+                        width: '160',
+                        prop: 'traceTime'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('trainingManage.operate'),
+                        width: '100',
+                        buttons: [
+                            {
+                                name: this.$t('trainingManage.delete'),
+                                handleClick: this.deleteTrack,
+                                type: 'danger',
+                                showControl:(row) => { return row.id; }
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        group() {
+            return this.$route.query.group;
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        }
+    },
+    methods: {
+        queryFunction(param) {
+            const params = {
+                ...param,
+                desc: true,
+                draftId: this.draftId
+            };
+            return draftPubTrace(params);
+        },
+        doShow(row) {
+            console.log(row);
+            this.draftId = row.id;
+            this.getListData();
+            this.dialogVisible = true;
+        },
+        doClose() {
+            this.dialogVisible = false;
+        },
+        covertData(row, key) {
+            let s = '否';
+            if (row[key] == true) {
+                s = '是';
+            }
+            return s;
+        },
+        deleteTrack(index, row) {
+            console.log('删除轨迹', index, row);
+            this.$confirm('确定删除该条数据?', '警告', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                if (!row.id) { return; }
+                deleteTrace([row.id]).then(res => {
+                    console.log('删除成功', res);
+                    this.getListData();
+                }).catch(err => {
+                    console.log('删除失败', err);
+                    this.getListData();
+                });
+            }).catch(e => {});
+        },
+        getListData() {
+            this.$refs.queryListPage && this.$refs.queryListPage.commitQuery();
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog--center .el-dialog__body{
+    padding: 10px 25px 10px 25px;
+}
+</style>
diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue
index a477513b9..6bfe4de52 100644
--- a/src/views/trainingManage/trainingList.vue
+++ b/src/views/trainingManage/trainingList.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-dialogDrag title="实训管理" :visible.sync="dialogVisible" width="1000px" :before-close="doClose" center>
+  <el-dialog v-dialogDrag title="实训管理" :visible.sync="dialogVisible" width="1250px" :before-close="doClose" center>
     <div>
       <div class="trainingHeader">
         <div class="trainingList">实训草稿列表</div>
@@ -13,12 +13,14 @@
 </template>
 
 <script>
-import { getTrainingList} from '@/api/trainingManage';
+import { getTrainingList, getTrainingAll } from '@/api/trainingManage';
+import { loadTrainingBg } from '@/api/jmap/training';
 import Cookies from 'js-cookie';
 import ConstConfig from '@/scripts/ConstConfig';
 import Create from './create.vue';
-
+import { loadDraftTraining } from '@/api/jmap/training';
 import { deleteTraining, publishTraining } from '@/api/trainingManage';
+import { OperateMode } from '@/scripts/ConstDic';
 
 export default {
     name: 'TrainingList',
@@ -33,12 +35,22 @@ export default {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
             },
+            training: {},
             queryForm: {
                 labelWidth: '100px',
                 reset: true,
                 show:false
             },
+            prdTypeMap: {
+                DISPATCHER: '02',
+                STATION_SUPERVISOR: '01',
+                STATION_ASSISTANT: '01',
+                DEPOT_DISPATCHER: '09',
+                DRIVER: '04',
+                RAIL_CTC: '10'
+            },
             queryList: {
+                height: 500,
                 query: this.queryFunction,
                 selectCheckShow: false,
                 indexShow: true,
@@ -70,7 +82,7 @@ export default {
                     {
                         type: 'button',
                         title: this.$t('trainingManage.operate'),
-                        width: '360',
+                        width: '500',
                         buttons: [
                             {
                                 name: this.$t('trainingManage.record'),
@@ -101,6 +113,18 @@ export default {
                                 handleClick: this.previewScript,
                                 type: 'primary',
                                 showControl:(row) => { return row.id; }
+                            },
+                            {
+                                name: this.$t('trainingManage.gradeRules'),
+                                handleClick: this.gradeRules,
+                                type: 'success',
+                                showControl:(row) => { return row.id; }
+                            },
+                            {
+                                name: this.$t('trainingManage.publishTrack'),
+                                handleClick: this.publishTrack,
+                                type: 'primary',
+                                showControl:(row) => { return row.id; }
                             }
                         ]
                     }
@@ -109,6 +133,18 @@ export default {
         };
     },
     computed: {
+        group() {
+            return this.$route.query.group;
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        },
+        teachMode() {
+            return 'TEACHING_MODE';
+        },
+        trainingSwitch() {
+            return this.$store.state.trainingNew.trainingSwitch;
+        }
     },
     methods: {
         queryFunction(param) {
@@ -154,9 +190,33 @@ export default {
             return list;
         },
         drawUp(index, row) {
-            console.log('编辑', index, row);
-            this.$emit('updateDetails', row);
-            this.doClose();
+            if (this.trainingSwitch) {
+                this.$message.error('请先结束当前实训再编制！');
+                return;
+            }
+            const qObj = {...this.$route.query};
+            qObj.record = true;
+            this.$router.replace({ query:{...qObj}});
+            console.log('编辑', qObj, index, row);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            getTrainingAll(row.id).then(resp => {
+                this.$store.dispatch('trainingNew/setTrainingDetail', null);
+                if (resp.data && resp.data.mapLocationJson) {
+                    const mapLocation = JSON.parse(resp.data.mapLocationJson);
+                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+                }
+                this.$emit('updateDetails', resp.data);
+                this.doClose();
+            }).catch((e) => {
+                console.error(e);
+                this.$emit('updateDetails', {});
+                this.$message.error('获取实训详情信息失败！');
+            });
+            loadTrainingBg(this.$route.query.group, row.id).then(resp => {
+                console.log('加载草稿实训背景', resp);
+            }).catch(() => {
+                this.$message.error('加载草稿实训背景失败！');
+            });
         },
         handleModify(index, row) {
             console.log('修改', index, row);
@@ -182,17 +242,73 @@ export default {
         },
         publishScript(index, row) {
             console.log('发布', index, row);
-            if (!row.id) { return; }
-            publishTraining({draftId: row.id}).then(res => {
-                console.log('发布实训成功', res);
-                this.$message.success('发布实训成功！');
-            }).catch(err => {
-                console.log('发布实训失败', err);
-                this.$message.error('发布实训失败');
+            this.$prompt('请输入发布后名称', '提示',
+                {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    inputValue: row.name,
+                    inputErrorMessage: '输入不能为空',
+                    inputValidator: (value) => {
+                        if (!value) {
+                            return '输入不能为空';
+                        }
+                    }
+
+                }).then(suc => {
+                if (!row.id || !suc.value) { return; }
+                publishTraining({draftId: row.id, reName: suc.value}).then(res => {
+                    console.log('发布实训成功', res);
+                    this.$message.success('发布实训成功！');
+                }).catch(err => {
+                    console.log('发布实训失败', err);
+                    this.$message.error(`发布实训失败！，${err.message}`);
+                });
             });
         },
-        previewScript(index, row) {
-            console.log('预览', index, row);
+        async previewScript(index, data) {
+            console.log('预览', index, data);
+            if (this.trainingSwitch) {
+                this.$message.error('请先结束当前实训后再加载新的实训！');
+                return;
+            }
+            const qObj = {...this.$route.query};
+            delete qObj.record;
+            this.$router.replace({ query:{...qObj}});
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            try {
+                const detailResp = await getTrainingAll(data.id);
+                this.training = detailResp.data;
+                if (detailResp.data.mapLocationJson) {
+                    const mapLocation = JSON.parse(detailResp.data.mapLocationJson);
+                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+                }
+                if (detailResp.data.playerIdJson) {
+                    const playerId = JSON.parse(detailResp.data.playerIdJson)[0];
+                    if (playerId) {
+                        const member = this.$store.state.training.memberData[playerId];
+                        this.$store.dispatch('training/setPrdType', this.prdTypeMap[member.type]);
+                        this.$store.dispatch('training/setRoles', member.type);
+                    }
+                }
+                this.$emit('closeAllDialog');
+                this.$store.dispatch('trainingNew/setTrainingDetail', detailResp.data);
+                this.$store.dispatch('trainingNew/setTrainingScore', '');
+                await loadDraftTraining(this.group, data.id, {mode: this.teachMode});
+                this.$message.success('加载实训成功！');
+            } catch (e) {
+                console.error('ceshi', e);
+                this.$message.error(`加载实训失败！，${e.message}`);
+            }
+        },
+        // 打分
+        gradeRules(index, row) {
+            this.doClose();
+            this.$emit('gradeRules', row);
+            // this.$refs.gradeRules.doShow();
+        },
+        publishTrack(index, row) {
+            this.$emit('draftTracK', row);
         },
         getListData() {
             this.$refs.queryListPage && this.$refs.queryListPage.commitQuery();