diff --git a/package.json b/package.json
index 9a08831b7..b7dc55048 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
 		"three": "^0.107.0",
 		"vue": "^2.6.10",
 		"vue-i18n": "^8.12.0",
+		"vue-quill-editor": "^3.0.6",
 		"vue-router": "^3.1.6",
 		"vuedraggable": "^2.23.2",
 		"vuex": "^3.1.0",
diff --git a/src/api/chat.js b/src/api/chat.js
index 7b493411a..06ec79b98 100644
--- a/src/api/chat.js
+++ b/src/api/chat.js
@@ -312,11 +312,11 @@ export function getSimulationConversationListNew(group) {
 }
 
 // 获取/创建仿真会话（新版地图）
-export function getSimulationConversationIdNew(params, group) {
+export function getSimulationConversationIdNew(data, group) {
     return request({
         url: `/simulation/${group}/wx/conversation`,
-        method: 'get',
-        params: params
+        method: 'post',
+        data
     });
 }
 
@@ -336,3 +336,12 @@ export function getSimulationContextListNew(group, conversationId) {
         method: 'get'
     });
 }
+
+// 获取仿真会话消息列表（新版地图）
+export function getSimulationChatMemberNew(group, conversationId) {
+    return request({
+        url: `/simulation/${group}/${conversationId}/members`,
+        method: 'get'
+    });
+}
+
diff --git a/src/api/competition.js b/src/api/competition.js
index a2a656a9f..15fe0b588 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -46,10 +46,10 @@ export function getQuestionListByMapId(params) {
     });
 }
 
-// 加载实操及内容
-export function loadQuestionList(competitionId, data) {
+// 加载试卷
+export function loadingPaper(competitionId, data) {
     return request({
-        url: `api/v1/competitionPractical/competition/${competitionId}/distribute`,
+        url: `/api/v1/competition/${competitionId}/testPaper`,
         method: 'post',
         data
     });
@@ -64,19 +64,85 @@ export function postSignUp(id, data) {
 }
 
 /** 查询用户是否已经报名该竞赛 */
-export function getIsSignUp(raceId) {
+export function getIsSignUp(raceId, params = {}) {
     return request({
         url: `/api/race/${raceId}/isSignUp`,
-        method: 'get'
+        method: 'get',
+        params
     });
 }
 
 /** 分页查询竞赛报名人员 */
 export function getRaceUserList(params) {
     return request({
-        url: `/api/race/${params.raceId}/raceUser`,
+        url: `/api/race/${params.raceId}/raceUser/page`,
         method: 'get',
         params
     });
 }
 
+// /** 分页查询理论题列表 */
+// export function getCompetitionTheory(params) {
+//     return request({
+//         url: `/api/v1/competitionTheory`,
+//         method: 'get',
+//         params
+//     });
+// }
+
+/** 提交试卷 */
+export function postCompetitionTheory(data) {
+    return request({
+        url: `/api/v1/competitionTheory/submit`,
+        method: 'post',
+        data
+    });
+}
+
+/** 查询本竞赛用的实操列表 */
+export function getCompetitionPractical(competitionId) {
+    return request({
+        url: `/api/v1/competitionPractical/competition/${competitionId}`,
+        method: 'get'
+    });
+}
+
+/** 查询竞赛报名人员详情 */
+export function getRaceUserById(raceId) {
+    return request({
+        url: `/api/race/${raceId}/raceUser`,
+        method: 'get'
+    });
+}
+
+/** 查询加载的实操题 */
+export function getPracticalQuestion(competitionId) {
+    return request({
+        url: `/api/v1/competitionPractical/competition/${competitionId}`,
+        method: 'get'
+    });
+}
+
+/** 查询加载的理论题 */
+export function getTheoryQuestion(competitionId) {
+    return request({
+        url: `/api/v1/competitionTheory/competition/${competitionId}`,
+        method: 'get'
+    });
+}
+
+/** 查询理论题作答详情 */
+export function getCompetitionDetail(competitionId) {
+    return request({
+        url: `/api/v1/competitionTheory/detail/competition/${competitionId}`,
+        method: 'get'
+    });
+}
+
+/** 根据id查询竞赛信息 */
+export function getRaceById(id) {
+    return request({
+        url: `/api/race/${id}`,
+        method: 'get'
+    });
+}
diff --git a/src/api/questionBank.js b/src/api/questionBank.js
new file mode 100644
index 000000000..90c860824
--- /dev/null
+++ b/src/api/questionBank.js
@@ -0,0 +1,45 @@
+import request from '@/utils/request';
+
+// 分页查询理论试题
+export function listQuestionPage(params) {
+    return request({
+        url: `/api/questionBank/questions/paging`,
+        method: 'get',
+        params
+    });
+}
+
+// 创建题目
+export function createQuestion(data) {
+    return request({
+        url: `/api/questionBank/questions`,
+        method: 'post',
+        data
+    });
+}
+
+// 删除题目
+export function deleteQuestion(questionId) {
+    return request({
+        url: `/api/questionBank/questions/${questionId}`,
+        method: 'delete'
+    });
+}
+
+// 更新题目
+export function updateOption(data) {
+    return request({
+        url: `/api/questionBank/questions/${data.id}`,
+        method: 'put',
+        data
+    });
+}
+
+// 获取题目信息
+export function getQuestionInfo(questionId) {
+    return request({
+        url: `/api/questionBank/questions/${questionId}`,
+        method: 'get'
+    });
+}
+
diff --git a/src/api/race.js b/src/api/race.js
index 13d7ecb91..2d8d24498 100644
--- a/src/api/race.js
+++ b/src/api/race.js
@@ -24,3 +24,54 @@ export function updateRace(id, data) {
         data
     });
 }
+
+/** 获取实操试题列表（题库）*/
+export function getPracticeList() {
+    return request({
+        url: `/api/v1/competitionPractical/competition`,
+        method: 'get'
+    });
+}
+
+/** 获取单个实操试题详情（题库）*/
+export function getPracticeByIdBasic() {
+    return request({
+        url: `/api/v1/competitionPractical/competition`,
+        method: 'get'
+    });
+}
+
+/** 创建实操试题 */
+export function createPractice(data) {
+    return request({
+        url: `/api/v1/competitionPractical/competition`,
+        method: 'post',
+        data
+    });
+}
+
+/** 更新实操试题信息 */
+export function putPracticeInfo(id, params) {
+    return request({
+        url: `/api/v1/competitionPractical/competition/${id}`,
+        method: 'put',
+        data: params
+    });
+}
+
+/** 删除实操试题 */
+export function deletePractice(id) {
+    return request({
+        url: `/api/v1/competitionPractical/competition/${id}`,
+        method: 'delete'
+    });
+}
+
+/** 录制实操试题 */
+export function practiceRecordNotify(practiceId) {
+    return request({
+        url: `/api/scriptSimulation/${practiceId}/scriptWrite`,
+        method: 'get'
+    });
+}
+
diff --git a/src/api/simulation.js b/src/api/simulation.js
index 29407127d..921119a33 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -685,3 +685,11 @@ export function simulationLoadRunPlan(group, templateId) {
         method: 'put'
     });
 }
+/** 根据车次号获取列车信息 */
+export function getTrainDetailBytripNumber(group, params) {
+    return request({
+        url: `/simulation/${group}/planTripInfo`,
+        method: 'get',
+        params: params
+    });
+}
diff --git a/src/assets/SAFS.png b/src/assets/SAFS.png
new file mode 100644
index 000000000..2807e5991
Binary files /dev/null and b/src/assets/SAFS.png differ
diff --git a/src/assets/apply.png b/src/assets/apply.png
new file mode 100644
index 000000000..5460d5141
Binary files /dev/null and b/src/assets/apply.png differ
diff --git a/src/assets/applyAlready.png b/src/assets/applyAlready.png
new file mode 100644
index 000000000..9d36a1d7d
Binary files /dev/null and b/src/assets/applyAlready.png differ
diff --git a/src/components/PopMenu/index.vue b/src/components/PopMenu/index.vue
index f982ae27a..c8d1baaf5 100644
--- a/src/components/PopMenu/index.vue
+++ b/src/components/PopMenu/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-show="show" class="pop-menu" :style="{ height: height, left: tPosition.x+'px', top: tPosition.y+'px' }">
+  <div v-show="show" class="pop-menu" :class="popMenuClass" :style="{ height: height, left: tPosition.x+'px', top: tPosition.y+'px' }">
     <div v-for="(item, index) in menu" :key="index" class="" :style="{ width: width }">
       <div v-if="item.children">
         <el-popover
@@ -99,6 +99,12 @@ export default {
             default() {
                 return '';
             }
+        },
+        popMenuClass: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue
index 2707c5a49..28421fb31 100644
--- a/src/components/QueryListPage/QueryForm.vue
+++ b/src/components/QueryListPage/QueryForm.vue
@@ -150,7 +150,7 @@
             <template v-for="(button, index) in queryList.actions">
               <el-button v-if="button.fileType==='file' && (button.hasOwnProperty('show') ? button.show: true)" :key="index" :type="button.type ? button.type: 'primary'" size="small" class="button_style uploadDemo" :disabled="button.disabled" :loading="button.disabled">
                 <input id="queryFormFilesInput" type="file" class="file_box" accept=".json, application/json" @change="button.handler">
-                {{ $t('map.importMap') }}
+                {{ button.text }}
               </el-button>
               <el-button
                 v-else-if="button.hasOwnProperty('show') ? button.show: true"
diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index fa0365d2f..54abab9d7 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -49,6 +49,20 @@
             :sortable="column.sortable"
             :sort-by="column.sortBy"
           />
+          <el-table-column
+            v-else-if="checkColumnTyep(column, 'html')"
+            :key="index"
+            :prop="column.prop"
+            :label="column.title"
+            :width="column.width"
+            show-overflow-tooltip
+            :sortable="column.sortable"
+            :sort-by="column.sortBy"
+          >
+            <template slot-scope="scope">
+              <div v-html="scope.row[column.prop]" />
+            </template>
+          </el-table-column>
           <el-table-column
             v-else-if="checkColumnTyep(column, 'basicText')"
             :key="index"
@@ -142,7 +156,7 @@
           @click="queryList.selectAllClick(queryList.selection)"
         >{{ $t('global.selectAdd') }}</el-button>
       </div>
-      <div class="page-container " style="text-align: center; margin: 10px 0; height: 40px;">
+      <div v-if="!queryList.paginationHiden" class="page-container " style="text-align: center; margin: 10px 0; height: 40px;">
         <el-pagination
           :current-page="pageIndex"
           :page-sizes="[10, 20, 50, 100] "
diff --git a/src/components/QuillEditor/index.vue b/src/components/QuillEditor/index.vue
new file mode 100644
index 000000000..2e4bf60d7
--- /dev/null
+++ b/src/components/QuillEditor/index.vue
@@ -0,0 +1,116 @@
+<template>
+  <div>
+    <quill-editor
+      ref="editor"
+      v-model="content"
+      :options="options"
+      :style="{height: height+'px', 'margin-bottom': '80px'}"
+      @change="onChange"
+      @blur="onBlur"
+      @focus="onFocus"
+    />
+  </div>
+</template>
+
+<script>
+import { quillEditor } from 'vue-quill-editor';
+import 'quill/dist/quill.snow.css';
+
+export default {
+    components: {
+        quillEditor
+    },
+    props: {
+        value: {
+            type: String,
+            default: ''
+        },
+        height: {
+            type: Number,
+            default: 200
+        },
+        placeholder: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            content: '',
+            options: {
+                modules: {
+                    toolbar: [
+                        ['bold', 'italic', 'underline', 'strike'],
+                        [],
+                        [],
+                        [{'list': 'ordered'}, {'list': 'bullet'}],
+                        [{'script': 'sub'}, {'script': 'super'}],
+                        [{'indent': '-1'}, {'indent': '+1'}],
+                        [{'direction': 'rtl'}],
+                        [{'size': ['small', 'large', 'huge']}],
+                        [{'color': [], 'background': []}],
+                        [{'font': []}],
+                        [{'align': []}],
+                        ['clean']
+                    ]
+                }
+            }
+        };
+    },
+    computed: {
+        editor() {
+            return this.$refs.editor.quill;
+        },
+        titleConfig () {
+            return {
+                'ql-bold': '加粗',
+                'ql-color': '颜色',
+                'ql-font': '字体',
+                'ql-code': '插入代码',
+                'ql-italic': '斜体',
+                'ql-link': '添加链接',
+                'ql-background': '背景颜色',
+                'ql-size': '字体大小',
+                'ql-strike': '删除线',
+                'ql-script': '上标/下标',
+                'ql-underline': '下划线',
+                'ql-blockquote': '引用',
+                'ql-header': '标题',
+                'ql-indent': '缩进',
+                'ql-list': '列表',
+                'ql-align': '文本对齐',
+                'ql-direction': '文本方向',
+                'ql-code-block': '代码块',
+                'ql-formula': '公式',
+                'ql-image': '图片',
+                'ql-video': '视频',
+                'ql-clean': '清除字体样式'
+            };
+        }
+    },
+    watch: {
+        'value': function(val) {
+            this.$nextTick(() => {
+                if (val != this.$escapeHTML(this.content)) {
+                    this.editor.enable(false);
+                    this.content = val;
+                    this.editor.enable(true);
+                    this.editor.blur();
+                }
+            });
+        }
+    },
+    mounted() {
+        this.content = this.value;
+    },
+    methods: {
+        onChange(e) {
+            this.$emit('input', this.$escapeHTML(this.content));
+        },
+        onBlur(e) {
+        },
+        onFocus(e) {
+        }
+    }
+};
+</script>
diff --git a/src/directive/focus/focus.js b/src/directive/focus/focus.js
index 7c3b68b65..512c0d1df 100644
--- a/src/directive/focus/focus.js
+++ b/src/directive/focus/focus.js
@@ -1,18 +1,21 @@
 export default {
-	// 当被绑定的元素插入到 DOM 中时
-	inserted: function (el, obj) {
-		// 这是需要页面刚加载就能进行聚焦操作使用的钩子函数,可以省略的，视具体需求而定
-		// 对值进行判断
-		if (obj.value) {
-			// 聚焦元素
-			el.focus();
-		}
-	},
-	// 当指令所在组件的 VNode 及其子 VNode 全部更新后调用
-	// 这是每当绑定的值发生改变时触发的钩子函数
-	componentUpdated: function (el, obj) {
-		if (obj.value) {
-			el.focus();
-		}
-	}
+    // 当被绑定的元素插入到 DOM 中时
+    inserted: function (el, obj) {
+        // 这是需要页面刚加载就能进行聚焦操作使用的钩子函数,可以省略的，视具体需求而定
+        // 对值进行判断
+        const dom = el.querySelector('input') || el.querySelector('textarea');
+        dom.focus();
+        // el.focus();
+        // if (obj.value) {
+        // 	// 聚焦元素
+        // 	el.focus();
+        // }
+    },
+    // 当指令所在组件的 VNode 及其子 VNode 全部更新后调用
+    // 这是每当绑定的值发生改变时触发的钩子函数
+    componentUpdated: function (el, obj) {
+        if (obj.value) {
+            el.focus();
+        }
+    }
 };
diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js
index 3d668d8a4..d9474d1a2 100644
--- a/src/i18n/langs/en/router.js
+++ b/src/i18n/langs/en/router.js
@@ -77,5 +77,7 @@ export default {
     iscsSystem: 'Iscs System',
     studentManage: 'Student manage',
     examDetail: 'Exam detail',
-    raceManage: 'Race manage'
+    raceManage: 'Race manage',
+    practiceManage:'Practice manage',
+    bankManage: 'Bank manage'
 };
diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index b95471af5..6e4a9e741 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -315,12 +315,12 @@ export default {
     centralized: '是否集中站:',
     stationRunPlanName: '真实名称:',
     stationVisible: '是否显示:',
-    stationNameFont: '车站字体:',
+    stationNameFont: '车站字体大小:',
     stationNameFontColor: '车站字体颜色:',
     stationKmPostShow: '是否显示公里标名称:',
     stationKmRange: '公里标距离:',
     stationKmPost: '公里标名称:',
-    stationKmPostFont: '公里标字体:',
+    stationKmPostFont: '公里标字体大小:',
     stationKmPostFontColor: '公里标字体颜色:',
     stationPositionX: 'x坐标:',
     stationPositionY: 'y坐标:',
@@ -350,7 +350,7 @@ export default {
     stationstandPosition: '车站坐标:',
     subhead:'副标题:',
     subheadDisplay:'是否显示副标题:',
-    subheadFont:'副标题字体:',
+    subheadFont:'副标题字体大小:',
     subheadFontColor:'副标题字体颜色:',
     subheadPosition:'副标题坐标:',
 
@@ -377,7 +377,7 @@ export default {
 
     textCode: '文字编码:',
     textContent: '文本内容:',
-    textFont: '字体格式:',
+    textFont: '字体大小:',
     textFontColor: '字体颜色:',
 
     trainCode: '列车编号:',
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index fc651d643..e46828125 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -82,5 +82,7 @@ export default {
     homeJsxt: '首页',
     examDetail: '考试详情',
     raceManage: '竞赛管理',
-    recaList: '报名列表'
+    recaList: '报名列表',
+    bankManage: '题库列表',
+    practiceManage:'实操列表'
 };
diff --git a/src/iscs/constant/iscsData.js b/src/iscs/constant/iscsData.js
index 1dd16f9e9..f445843bb 100644
--- a/src/iscs/constant/iscsData.js
+++ b/src/iscs/constant/iscsData.js
@@ -5,7 +5,7 @@ const iscsData = {
     '21': {
         'iscsLineList':[{'point1':{'x':72, 'y':51}, 'point2':{'x':72, 'y':171}, 'code':'IscsLine_1', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':72, 'y':51}}, {'point1':{'x':72, 'y':286}, 'point2':{'x':72, 'y':381}, 'code':'IscsLine_2', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':72, 'y':286}}, {'point1':{'x':71, 'y':381}, 'point2':{'x':161, 'y':381}, 'code':'IscsLine_3', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':71, 'y':381}}, {'point1':{'x':181, 'y':381}, 'point2':{'x':196, 'y':381}, 'code':'IscsLine_4', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':181, 'y':381}}, {'point1':{'x':51, 'y':471}, 'point2':{'x':1041, 'y':471}, 'code':'IscsLine_5', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':51, 'y':471}}, {'point1':{'x':382, 'y':51}, 'point2':{'x':382, 'y':471}, 'code':'IscsLine_6', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':382, 'y':51}}, {'point1':{'x':442, 'y':41}, 'point2':{'x':442, 'y':186}, 'code':'IscsLine_7', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':442, 'y':41}}, {'point1':{'x':442, 'y':196}, 'point2':{'x':442, 'y':356}, 'code':'IscsLine_8', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':442, 'y':196}}, {'point1':{'x':442, 'y':366}, 'point2':{'x':442, 'y':596}, 'code':'IscsLine_9', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':442, 'y':366}}, {'point1':{'x':652, 'y':41}, 'point2':{'x':652, 'y':186}, 'code':'IscsLine_10', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':652, 'y':41}}, {'point1':{'x':652, 'y':196}, 'point2':{'x':652, 'y':596}, 'code':'IscsLine_11', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':652, 'y':196}}, {'point1':{'x':737, 'y':51}, 'point2':{'x':737, 'y':186}, 'code':'IscsLine_12', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':737, 'y':51}}, {'point1':{'x':737, 'y':196}, 'point2':{'x':737, 'y':470}, 'code':'IscsLine_13', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':737, 'y':196}}, {'point1':{'x':72, 'y':301}, 'point2':{'x':102, 'y':301}, 'code':'IscsLine_14', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':72, 'y':301}}, {'point1':{'x':152, 'y':301}, 'point2':{'x':162, 'y':301}, 'code':'IscsLine_15', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':152, 'y':301}}, {'point1':{'x':181, 'y':301}, 'point2':{'x':196, 'y':301}, 'code':'IscsLine_16', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':181, 'y':301}}, {'point1':{'x':210, 'y':171}, 'point2':{'x':210, 'y':281}, 'code':'IscsLine_22', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':210, 'y':171}}, {'point1':{'x':225, 'y':341}, 'point2':{'x':245, 'y':341}, 'code':'IscsLine_23', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':225, 'y':341}}, {'point1':{'x':315, 'y':341}, 'point2':{'x':390, 'y':341}, 'code':'IscsLine_24', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':315, 'y':341}}, {'point1':{'x':405, 'y':341}, 'point2':{'x':450, 'y':341}, 'code':'IscsLine_25', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':405, 'y':341}}, {'point1':{'x':465, 'y':341}, 'point2':{'x':485, 'y':341}, 'code':'IscsLine_26', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':465, 'y':341}}, {'point1':{'x':610, 'y':341}, 'point2':{'x':630, 'y':341}, 'code':'IscsLine_27', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':610, 'y':341}}, {'point1':{'x':645, 'y':341}, 'point2':{'x':745, 'y':341}, 'code':'IscsLine_28', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':645, 'y':341}}, {'point1':{'x':760, 'y':341}, 'point2':{'x':800, 'y':341}, 'code':'IscsLine_29', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':760, 'y':341}}, {'point1':{'x':365, 'y':171}, 'point2':{'x':365, 'y':511}, 'code':'IscsLine_30', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':365, 'y':171}}, {'point1':{'x':365, 'y':511}, 'point2':{'x':525, 'y':511}, 'code':'IscsLine_31', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':365, 'y':511}}, {'point1':{'x':555, 'y':511}, 'point2':{'x':675, 'y':511}, 'code':'IscsLine_32', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':511}}, {'point1':{'x':675, 'y':170}, 'point2':{'x':675, 'y':510}, 'code':'IscsLine_33', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':675, 'y':170}}, {'point1':{'x':485, 'y':296}, 'point2':{'x':485, 'y':386}, 'code':'IscsLine_34', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':296}}, {'point1':{'x':610, 'y':296}, 'point2':{'x':610, 'y':386}, 'code':'IscsLine_35', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':610, 'y':296}}, {'point1':{'x':485, 'y':296}, 'point2':{'x':545, 'y':296}, 'code':'IscsLine_36', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':296}}, {'point1':{'x':485, 'y':326}, 'point2':{'x':545, 'y':326}, 'code':'IscsLine_37', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':326}}, {'point1':{'x':485, 'y':356}, 'point2':{'x':545, 'y':356}, 'code':'IscsLine_38', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':356}}, {'point1':{'x':485, 'y':386}, 'point2':{'x':545, 'y':386}, 'code':'IscsLine_39', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':485, 'y':386}}, {'point1':{'x':555, 'y':296}, 'point2':{'x':610, 'y':296}, 'code':'IscsLine_40', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':296}}, {'point1':{'x':555, 'y':326}, 'point2':{'x':610, 'y':326}, 'code':'IscsLine_41', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':326}}, {'point1':{'x':555, 'y':356}, 'point2':{'x':610, 'y':356}, 'code':'IscsLine_42', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':356}}, {'point1':{'x':555, 'y':386}, 'point2':{'x':610, 'y':386}, 'code':'IscsLine_43', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#2AF5E6', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':555, 'y':386}}, {'point1':{'x':347, 'y':380}, 'point2':{'x':347, 'y':575}, 'code':'IscsLine_44', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':347, 'y':380}}, {'point1':{'x':346, 'y':575}, 'point2':{'x':357, 'y':575}, 'code':'IscsLine_45', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':346, 'y':575}}, {'point1':{'x':372, 'y':575}, 'point2':{'x':392, 'y':575}, 'code':'IscsLine_46', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':372, 'y':575}}, {'point1':{'x':407, 'y':575}, 'point2':{'x':542, 'y':575}, 'code':'IscsLine_47', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':407, 'y':575}}, {'point1':{'x':567, 'y':575}, 'point2':{'x':727, 'y':575}, 'code':'IscsLine_48', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':567, 'y':575}}, {'point1':{'x':742, 'y':575}, 'point2':{'x':767, 'y':575}, 'code':'IscsLine_49', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':742, 'y':575}}, {'point1':{'x':767, 'y':341}, 'point2':{'x':767, 'y':575}, 'code':'IscsLine_50', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':767, 'y':341}}, {'point1':{'x':867, 'y':341}, 'point2':{'x':890, 'y':341}, 'code':'IscsLine_51', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':867, 'y':341}}, {'point1':{'x':920, 'y':381}, 'point2':{'x':935, 'y':381}, 'code':'IscsLine_52', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':920, 'y':381}}, {'point1':{'x':951, 'y':381}, 'point2':{'x':1045, 'y':381}, 'code':'IscsLine_53', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':951, 'y':381}}, {'point1':{'x':1045, 'y':286}, 'point2':{'x':1045, 'y':381}, 'code':'IscsLine_54', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1045, 'y':286}}, {'point1':{'x':1045, 'y':51}, 'point2':{'x':1045, 'y':171}, 'code':'IscsLine_55', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1045, 'y':51}}, {'point1':{'x':1020, 'y':51}, 'point2':{'x':1020, 'y':171}, 'code':'IscsLine_56', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1020, 'y':51}}, {'point1':{'x':990, 'y':171}, 'point2':{'x':1021, 'y':171}, 'code':'IscsLine_57', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':990, 'y':171}}, {'point1':{'x':941, 'y':171}, 'point2':{'x':973, 'y':171}, 'code':'IscsLine_58', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':941, 'y':171}}, {'point1':{'x':859, 'y':171}, 'point2':{'x':869, 'y':171}, 'code':'IscsLine_59', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':859, 'y':171}}, {'point1':{'x':829, 'y':171}, 'point2':{'x':842, 'y':171}, 'code':'IscsLine_60', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':829, 'y':171}}, {'point1':{'x':731, 'y':171}, 'point2':{'x':772, 'y':171}, 'code':'IscsLine_61', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':731, 'y':171}}, {'point1':{'x':701, 'y':171}, 'point2':{'x':713, 'y':171}, 'code':'IscsLine_62', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':701, 'y':171}}, {'point1':{'x':671, 'y':171}, 'point2':{'x':686, 'y':171}, 'code':'IscsLine_63', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':671, 'y':171}}, {'point1':{'x':636, 'y':171}, 'point2':{'x':651, 'y':171}, 'code':'IscsLine_64', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':636, 'y':171}}, {'point1':{'x':561, 'y':171}, 'point2':{'x':619, 'y':171}, 'code':'IscsLine_65', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':561, 'y':171}}, {'point1':{'x':112, 'y':51}, 'point2':{'x':112, 'y':171}, 'code':'IscsLine_66', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':112, 'y':51}}, {'point1':{'x':112, 'y':171}, 'point2':{'x':122, 'y':171}, 'code':'IscsLine_67', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':112, 'y':171}}, {'point1':{'x':142, 'y':171}, 'point2':{'x':152, 'y':171}, 'code':'IscsLine_68', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':142, 'y':171}}, {'point1':{'x':167, 'y':171}, 'point2':{'x':227, 'y':171}, 'code':'IscsLine_69', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':167, 'y':171}}, {'point1':{'x':284, 'y':171}, 'point2':{'x':294, 'y':171}, 'code':'IscsLine_70', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':284, 'y':171}}, {'point1':{'x':314, 'y':171}, 'point2':{'x':329, 'y':171}, 'code':'IscsLine_71', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':314, 'y':171}}, {'point1':{'x':346, 'y':171}, 'point2':{'x':390, 'y':171}, 'code':'IscsLine_72', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':346, 'y':171}}, {'point1':{'x':407, 'y':171}, 'point2':{'x':415, 'y':171}, 'code':'IscsLine_73', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':407, 'y':171}}, {'point1':{'x':431, 'y':171}, 'point2':{'x':450, 'y':171}, 'code':'IscsLine_74', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':431, 'y':171}}, {'point1':{'x':468, 'y':171}, 'point2':{'x':532, 'y':171}, 'code':'IscsLine_75', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#3F566C', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':468, 'y':171}}, {'point1':{'x':1015, 'y':301}, 'point2':{'x':1045, 'y':301}, 'code':'IscsLine_76', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1015, 'y':301}}, {'point1':{'x':950, 'y':301}, 'point2':{'x':960, 'y':301}, 'code':'IscsLine_77', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':950, 'y':301}}, {'point1':{'x':920, 'y':301}, 'point2':{'x':930, 'y':301}, 'code':'IscsLine_78', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#5DCDC8', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':920, 'y':301}}, {'point1':{'x':905, 'y':261}, 'point2':{'x':905, 'y':281}, 'code':'IscsLine_79', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':905, 'y':261}}, {'point1':{'x':905, 'y':225}, 'point2':{'x':905, 'y':245}, 'code':'IscsLine_80', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':905, 'y':225}}, {'point1':{'x':1071, 'y':223}, 'point2':{'x':1071, 'y':241}, 'code':'IscsLine_81', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#0C68E7', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1071, 'y':223}}], 'iscsRectList':[{'point':{'x':52, 'y':171}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':40, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':195, 'y':281}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#A39A9A', 'width':30, 'height':111, 'zlevel':1, 'z':3}, {'point':{'x':890, 'y':281}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#A39A9A', 'width':30, 'height':111, 'zlevel':1, 'z':3}, {'point':{'x':1025, 'y':171}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':40, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':870, 'y':146}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#A39A9A', 'width':70, 'height':45, 'zlevel':1, 'z':3}], 'iscsTextList':[{'point':{'x':64, 'y':180}, 'code':'IscsText_1', '_type':'IscsText', 'context':'新\n\n\n风\n\n\n道', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':202, 'y':290}, 'code':'IscsText_2', '_type':'IscsText', 'context':'混\n\n\n风\n\n\n室', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':481, 'y':492}, 'code':'IscsText_3', '_type':'IscsText', 'context':'站台回排风/排烟风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':279}, 'code':'IscsText_4', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':309}, 'code':'IscsText_5', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':340}, 'code':'IscsText_6', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':370}, 'code':'IscsText_7', '_type':'IscsText', 'context':'站厅送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':523, 'y':556}, 'code':'IscsText_8', '_type':'IscsText', 'context':'站台送风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':53, 'y':451}, 'code':'IscsText_9', '_type':'IscsText', 'context':'站厅层', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':53, 'y':482}, 'code':'IscsText_10', '_type':'IscsText', 'context':'站台层', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':293, 'y':53}, 'code':'IscsText_11', '_type':'IscsText', 'context':'左端环控机房', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':758, 'y':53}, 'code':'IscsText_12', '_type':'IscsText', 'context':'右端环控机房', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':386, 'y':53}, 'code':'IscsText_13', '_type':'IscsText', 'context':'左端管理\n 用房区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':678, 'y':53}, 'code':'IscsText_14', '_type':'IscsText', 'context':'右端管理\n 用房区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':456, 'y':55}, 'code':'IscsText_15', '_type':'IscsText', 'context':'公共区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':598, 'y':54}, 'code':'IscsText_16', '_type':'IscsText', 'context':'公共区', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':897, 'y':290}, 'code':'IscsText_17', '_type':'IscsText', 'context':'混\n\n\n风\n\n\n室', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1039, 'y':180}, 'code':'IscsText_18', '_type':'IscsText', 'context':'新\n\n\n风\n\n\n道', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1036, 'y':37}, 'code':'IscsText_19', '_type':'IscsText', 'context':'新风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':993, 'y':37}, 'code':'IscsText_20', '_type':'IscsText', 'context':'排风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':877, 'y':164}, 'code':'IscsText_21', '_type':'IscsText', 'context':'回排风室', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':47, 'y':37}, 'code':'IscsText_22', '_type':'IscsText', 'context':'新风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':96, 'y':37}, 'code':'IscsText_23', '_type':'IscsText', 'context':'排风井', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':130, 'y':131}, 'code':'IscsText_24', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':123, 'y':119}, 'code':'IscsText_25', '_type':'IscsText', 'context':'MD-4', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':158, 'y':138}, 'code':'IscsText_26', '_type':'IscsText', 'context':'FD2-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':156, 'y':195}, 'code':'IscsText_27', '_type':'IscsText', 'context':'FD1-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':150, 'y':239}, 'code':'IscsText_28', '_type':'IscsText', 'context':'MD-3', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':214, 'y':220}, 'code':'IscsText_29', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':179, 'y':268}, 'code':'IscsText_30', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':145, 'y':262}, 'code':'IscsText_31', '_type':'IscsText', 'context':'MD-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':111, 'y':271}, 'code':'IscsText_32', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':136, 'y':356}, 'code':'IscsText_33', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':259, 'y':135}, 'code':'IscsText_34', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':307, 'y':133}, 'code':'IscsText_35', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':415, 'y':129}, 'code':'IscsText_36', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':653, 'y':131}, 'code':'IscsText_37', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':711, 'y':131}, 'code':'IscsText_38', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':809, 'y':135}, 'code':'IscsText_39', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':984, 'y':133}, 'code':'IscsText_40', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':770, 'y':301}, 'code':'IscsText_41', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':300}, 'code':'IscsText_42', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':682, 'y':401}, 'code':'IscsText_43', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':795, 'y':425}, 'code':'IscsText_44', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':388, 'y':408}, 'code':'IscsText_45', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':368, 'y':384}, 'code':'IscsText_46', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':347, 'y':314}, 'code':'IscsText_47', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':286, 'y':302}, 'code':'IscsText_48', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':425, 'y':302}, 'code':'IscsText_49', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':472, 'y':150}, 'code':'IscsText_50', '_type':'IscsText', 'context':'站厅回风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':550, 'y':150}, 'code':'IscsText_51', '_type':'IscsText', 'context':'站厅回风管', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':357, 'y':543}, 'code':'IscsText_52', '_type':'IscsText', 'context':'FD1-9', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':396, 'y':543}, 'code':'IscsText_53', '_type':'IscsText', 'context':'FD1-10', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':715, 'y':543}, 'code':'IscsText_54', '_type':'IscsText', 'context':'FD1-11', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':385, 'y':448}, 'code':'IscsText_55', '_type':'IscsText', 'context':'FD2-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':612, 'y':444}, 'code':'IscsText_56', '_type':'IscsText', 'context':'FD2-7', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':612, 'y':415}, 'code':'IscsText_57', '_type':'IscsText', 'context':'MD-14', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':707, 'y':422}, 'code':'IscsText_58', '_type':'IscsText', 'context':'MD-19', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':720, 'y':384}, 'code':'IscsText_59', '_type':'IscsText', 'context':'FD1-7', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':388, 'y':421}, 'code':'IscsText_60', '_type':'IscsText', 'context':'MD-8', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':397}, 'code':'IscsText_61', '_type':'IscsText', 'context':'MD-17', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':291, 'y':367}, 'code':'IscsText_62', '_type':'IscsText', 'context':'FD1-4', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':375, 'y':308}, 'code':'IscsText_63', '_type':'IscsText', 'context':'FD1-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':402, 'y':286}, 'code':'IscsText_64', '_type':'IscsText', 'context':'MD-16', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':317, 'y':302}, 'code':'IscsText_65', '_type':'IscsText', 'context':'MD-5', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':239, 'y':302}, 'code':'IscsText_66', '_type':'IscsText', 'context':'AHU-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':146, 'y':342}, 'code':'IscsText_67', '_type':'IscsText', 'context':'MD-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':98, 'y':257}, 'code':'IscsText_68', '_type':'IscsText', 'context':'FAF-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':446, 'y':361}, 'code':'IscsText_69', '_type':'IscsText', 'context':'FD1-3', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':615, 'y':310}, 'code':'IscsText_70', '_type':'IscsText', 'context':'FD1-6', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':686, 'y':287}, 'code':'IscsText_71', '_type':'IscsText', 'context':'MD-18', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':757, 'y':289}, 'code':'IscsText_72', '_type':'IscsText', 'context':'MD-15', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':726, 'y':312}, 'code':'IscsText_73', '_type':'IscsText', 'context':'FD1-5', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':799, 'y':304}, 'code':'IscsText_74', '_type':'IscsText', 'context':'AHU-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':974, 'y':119}, 'code':'IscsText_75', '_type':'IscsText', 'context':'MD-12', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':837, 'y':135}, 'code':'IscsText_76', '_type':'IscsText', 'context':'FD2-8', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':755, 'y':122}, 'code':'IscsText_77', '_type':'IscsText', 'context':'RAF/SEF-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':711, 'y':119}, 'code':'IscsText_78', '_type':'IscsText', 'context':'MD-13', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':654, 'y':118}, 'code':'IscsText_79', '_type':'IscsText', 'context':'MD-11', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':674, 'y':141}, 'code':'IscsText_80', '_type':'IscsText', 'context':'FD2-6', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':614, 'y':140}, 'code':'IscsText_81', '_type':'IscsText', 'context':'FD2-5', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':470, 'y':177}, 'code':'IscsText_82', '_type':'IscsText', 'context':'FD2-4', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':410, 'y':113}, 'code':'IscsText_83', '_type':'IscsText', 'context':'MD-7', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':374, 'y':141}, 'code':'IscsText_84', '_type':'IscsText', 'context':'FD2-3', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':332, 'y':141}, 'code':'IscsText_85', '_type':'IscsText', 'context':'FD2-9', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':288, 'y':120}, 'code':'IscsText_86', '_type':'IscsText', 'context':'MD-6', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':204, 'y':121}, 'code':'IscsText_87', '_type':'IscsText', 'context':'RAF/SEF-1', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':952, 'y':347}, 'code':'IscsText_88', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':945, 'y':264}, 'code':'IscsText_89', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':911, 'y':230}, 'code':'IscsText_90', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':998, 'y':264}, 'code':'IscsText_91', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':211}, 'code':'IscsText_92', '_type':'IscsText', 'context':'FD1-8', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':839, 'y':251}, 'code':'IscsText_93', '_type':'IscsText', 'context':'MD-20', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':930, 'y':251}, 'code':'IscsText_94', '_type':'IscsText', 'context':'MD-10', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':976, 'y':250}, 'code':'IscsText_95', '_type':'IscsText', 'context':'FAF-2', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':947, 'y':333}, 'code':'IscsText_96', '_type':'IscsText', 'context':'MD-9', 'textFill':'#5DCDC8', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':844, 'y':304}, 'code':'IscsText_97', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'volumeControlDamperList':[{'point':{'x':161, 'y':355}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_1', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':161, 'y':278}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_2', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':184, 'y':231}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_3', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':325, 'y':315}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_4', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':412, 'y':314}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_5', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':695, 'y':314}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_6', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':770, 'y':314}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_7', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':320, 'y':385}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_8', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':342, 'y':411}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_9', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':656, 'y':413}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_10', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':748, 'y':419}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_11', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':933, 'y':355}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_12', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':973, 'y':145}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_13', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':712, 'y':145}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_14', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':651, 'y':145}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_15', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':122, 'y':144}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_16', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':294, 'y':144}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_17', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':415, 'y':144}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_18', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':930, 'y':274}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_19', 'width':20, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':880, 'y':241}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_20', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}], 'ventilatorList':[{'point':{'x':103, 'y':282}, '_type':'Ventilator', 'code':'Ventilator_1', 'width':50, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':773, 'y':150}, '_type':'Ventilator', 'code':'Ventilator_2', 'width':55, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':150}, '_type':'Ventilator', 'code':'Ventilator_3', 'width':55, 'isRight':false, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':959, 'y':280}, '_type':'Ventilator', 'code':'Ventilator_4', 'width':55, 'isRight':false, 'color':'#00ff00', 'zlevel':1, 'z':4}], 'fireDamperList':[{'point':{'x':195, 'y':195}, '_type':'FireDamper', 'code':'FireDamper_1', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':389, 'y':325}, '_type':'FireDamper', 'code':'FireDamper_2', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':449, 'y':326}, '_type':'FireDamper', 'code':'FireDamper_3', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':630, 'y':326}, '_type':'FireDamper', 'code':'FireDamper_4', 'width':15, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':745, 'y':326}, '_type':'FireDamper', 'code':'FireDamper_5', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':332, 'y':365}, '_type':'FireDamper', 'code':'FireDamper_6', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':358, 'y':559}, '_type':'FireDamper', 'code':'FireDamper_7', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':392, 'y':559}, '_type':'FireDamper', 'code':'FireDamper_8', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':727, 'y':560}, '_type':'FireDamper', 'code':'FireDamper_9', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':752, 'y':398}, '_type':'FireDamper', 'code':'FireDamper_10', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':890, 'y':209}, '_type':'FireDamper', 'code':'FireDamper_11', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'airConditionerList':[{'point':{'x':238, 'y':321}, '_type':'AirConditioner', 'code':'AirConditioner_1', 'width':75, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':800, 'y':317}, '_type':'AirConditioner', 'code':'AirConditioner_2', 'width':75, 'isRight':false, 'color':'#00ff00', 'zlevel':1, 'z':4}], 'smookExhaustFdList':[{'point':{'x':350, 'y':445}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_1', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':660, 'y':445}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_2', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':843, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_3', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_4', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':620, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_5', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':153, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_6', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':330, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_7', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':391, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_8', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':452, 'y':155}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_9', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'iscsButtonList':[{'point':{'x':1030, 'y':25}, 'code':'IscsButton_1', '_type':'IscsButton', 'levelPadding':30, 'verticalPadding':5, 'context':'图元说明', 'function':'GraphicEle', 'fontSize':14, 'zlevel':1, 'z':4}]
     }, '22':{
-        'iscsRectList':[{'point':{'x':60, 'y':30}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':150, 'y':30}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':240, 'y':30}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':330, 'y':30}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':555, 'y':30}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':125, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':680, 'y':30}, 'code':'IscsRect_6', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':355, 'height':135, 'zlevel':1, 'z':3}, {'point':{'x':60, 'y':135}, 'code':'IscsRect_7', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':110, 'height':150, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':135}, 'code':'IscsRect_8', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':215, 'y':135}, 'code':'IscsRect_9', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':205}, 'code':'IscsRect_10', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':80, 'zlevel':1, 'z':3}], 'iscsLineList':[{'point1':{'x':80, 'y':50}, 'point2':{'x':495, 'y':50}, 'code':'IscsLine_1', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':50}}, {'point1':{'x':505, 'y':50}, 'point2':{'x':560, 'y':50}, 'code':'IscsLine_2', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':505, 'y':50}}]
+        'iscsRectList':[{'point':{'x':60, 'y':30}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':150, 'y':30}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':240, 'y':30}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':330, 'y':30}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':555, 'y':30}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':125, 'height':115, 'zlevel':1, 'z':3}, {'point':{'x':680, 'y':30}, 'code':'IscsRect_6', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':355, 'height':135, 'zlevel':1, 'z':3}, {'point':{'x':60, 'y':135}, 'code':'IscsRect_7', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':110, 'height':150, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':135}, 'code':'IscsRect_8', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':215, 'y':135}, 'code':'IscsRect_9', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':45, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':170, 'y':205}, 'code':'IscsRect_10', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':90, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':770, 'y':35}, 'code':'IscsRect_11', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':40, 'height':30, 'zlevel':1, 'z':3}, {'point':{'x':50, 'y':420}, 'code':'IscsRect_12', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':35, 'height':110, 'zlevel':1, 'z':3}, {'point':{'x':85, 'y':420}, 'code':'IscsRect_13', '_type':'IscsRect', 'fillColor':'rgba(0, 0, 0, 0)', 'borderWidth':1, 'strokeColor':'#FFFFFF', 'width':70, 'height':110, 'zlevel':1, 'z':3}], 'iscsLineList':[{'point1':{'x':79, 'y':50}, 'point2':{'x':495, 'y':50}, 'code':'IscsLine_1', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':79, 'y':50}}, {'point1':{'x':505, 'y':50}, 'point2':{'x':560, 'y':50}, 'code':'IscsLine_2', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':505, 'y':50}}, {'point1':{'x':575, 'y':50}, 'point2':{'x':685, 'y':50}, 'code':'IscsLine_3', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':575, 'y':50}}, {'point1':{'x':700, 'y':50}, 'point2':{'x':735, 'y':50}, 'code':'IscsLine_4', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':700, 'y':50}}, {'point1':{'x':750, 'y':50}, 'point2':{'x':770, 'y':50}, 'code':'IscsLine_5', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':750, 'y':50}}, {'point1':{'x':810, 'y':50}, 'point2':{'x':830, 'y':50}, 'code':'IscsLine_6', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':810, 'y':50}}, {'point1':{'x':80, 'y':50}, 'point2':{'x':80, 'y':100}, 'code':'IscsLine_7', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':50}}, {'point1':{'x':80, 'y':114}, 'point2':{'x':80, 'y':155}, 'code':'IscsLine_8', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':114}}, {'point1':{'x':90, 'y':185}, 'point2':{'x':90, 'y':205}, 'code':'IscsLine_9', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':185}}, {'point1':{'x':90, 'y':223}, 'point2':{'x':90, 'y':238}, 'code':'IscsLine_10', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':223}}, {'point1':{'x':90, 'y':255}, 'point2':{'x':90, 'y':310}, 'code':'IscsLine_11', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':90, 'y':255}}, {'point1':{'x':89, 'y':310}, 'point2':{'x':475, 'y':310}, 'code':'IscsLine_12', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':89, 'y':310}}, {'point1':{'x':194, 'y':314}, 'point2':{'x':194, 'y':330}, 'code':'IscsLine_13', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':194, 'y':314}}, {'point1':{'x':195, 'y':330}, 'point2':{'x':94, 'y':330}, 'code':'IscsLine_14', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':195, 'y':330}}, {'point1':{'x':94, 'y':330}, 'point2':{'x':94, 'y':480}, 'code':'IscsLine_15', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':94, 'y':330}}, {'point1':{'x':64, 'y':480}, 'point2':{'x':449, 'y':480}, 'code':'IscsLine_16', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':64, 'y':480}}, {'point1':{'x':120, 'y':114}, 'point2':{'x':120, 'y':155}, 'code':'IscsLine_17', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':120, 'y':114}}, {'point1':{'x':120, 'y':75}, 'point2':{'x':120, 'y':100}, 'code':'IscsLine_18', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':120, 'y':75}}, {'point1':{'x':120, 'y':75}, 'point2':{'x':560, 'y':75}, 'code':'IscsLine_19', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':120, 'y':75}}, {'point1':{'x':575, 'y':75}, 'point2':{'x':685, 'y':75}, 'code':'IscsLine_20', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':575, 'y':75}}, {'point1':{'x':700, 'y':75}, 'point2':{'x':710, 'y':75}, 'code':'IscsLine_21', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':700, 'y':75}}, {'point1':{'x':755, 'y':75}, 'point2':{'x':755, 'y':85}, 'code':'IscsLine_23', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':755, 'y':75}}, {'point1':{'x':725, 'y':75}, 'point2':{'x':755, 'y':75}, 'code':'IscsLine_24', '_type':'IscsLine', 'lineWidth':1, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':725, 'y':75}}], 'fireDamperList':[{'point':{'x':560, 'y':34}, '_type':'FireDamper', 'code':'FireDamper_1', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':36}, '_type':'FireDamper', 'code':'FireDamper_2', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':68, 'y':100}, '_type':'FireDamper', 'code':'FireDamper_3', 'width':25, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':75, 'y':239}, '_type':'FireDamper', 'code':'FireDamper_4', 'width':30, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':108, 'y':100}, '_type':'FireDamper', 'code':'FireDamper_5', 'width':25, 'direction':'horizontal', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':559, 'y':67}, '_type':'FireDamper', 'code':'FireDamper_6', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':69}, '_type':'FireDamper', 'code':'FireDamper_7', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'volumeControlDamperList':[{'point':{'x':735, 'y':34}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_1', 'width':15, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':67, 'y':201}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_2', 'width':20, 'rotateAngle':'90', 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':710, 'y':60}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_3', 'width':15, 'rotateAngle':'0', 'color':'#00ff00', 'zlevel':1, 'z':5}], 'orbitalVentilatorList':[], 'airConditionerList':[{'point':{'x':826, 'y':33}, '_type':'AirConditioner', 'code':'AirConditioner_1', 'width':70, 'isRight':true, 'color':'#00ff00', 'zlevel':1, 'z':4}]
     },
     '31': {'platformScreenDoorList':[{'point':{'x':135, 'y':225}, 'code':'PlatformScreenDoor_1', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':198, 'y':225}, 'code':'PlatformScreenDoor_2', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':324, 'y':225}, 'code':'PlatformScreenDoor_4', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':260, 'y':225}, 'code':'PlatformScreenDoor_5', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':385, 'y':225}, 'code':'PlatformScreenDoor_6', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':448, 'y':225}, 'code':'PlatformScreenDoor_7', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':512, 'y':225}, 'code':'PlatformScreenDoor_8', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':576, 'y':225}, 'code':'PlatformScreenDoor_9', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':830, 'y':225}, 'code':'PlatformScreenDoor_10', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':767, 'y':225}, 'code':'PlatformScreenDoor_11', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':702, 'y':225}, 'code':'PlatformScreenDoor_12', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':639, 'y':225}, 'code':'PlatformScreenDoor_13', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1330, 'y':225}, 'code':'PlatformScreenDoor_14', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1267, 'y':225}, 'code':'PlatformScreenDoor_15', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1205, 'y':225}, 'code':'PlatformScreenDoor_16', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1143, 'y':225}, 'code':'PlatformScreenDoor_17', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1080, 'y':225}, 'code':'PlatformScreenDoor_18', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1017, 'y':225}, 'code':'PlatformScreenDoor_19', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':955, 'y':225}, 'code':'PlatformScreenDoor_20', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':892, 'y':225}, 'code':'PlatformScreenDoor_21', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':143, 'y':638}, 'code':'PlatformScreenDoor_22', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':455, 'y':638}, 'code':'PlatformScreenDoor_23', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':519, 'y':638}, 'code':'PlatformScreenDoor_24', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':582, 'y':638}, 'code':'PlatformScreenDoor_25', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1085, 'y':638}, 'code':'PlatformScreenDoor_26', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1022, 'y':638}, 'code':'PlatformScreenDoor_27', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':958, 'y':638}, 'code':'PlatformScreenDoor_28', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':896, 'y':638}, 'code':'PlatformScreenDoor_29', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':833, 'y':638}, 'code':'PlatformScreenDoor_30', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':770, 'y':638}, 'code':'PlatformScreenDoor_31', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':707, 'y':638}, 'code':'PlatformScreenDoor_32', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':645, 'y':638}, 'code':'PlatformScreenDoor_33', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':331, 'y':638}, 'code':'PlatformScreenDoor_34', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':269, 'y':638}, 'code':'PlatformScreenDoor_35', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':206, 'y':638}, 'code':'PlatformScreenDoor_36', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':394, 'y':638}, 'code':'PlatformScreenDoor_37', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1333, 'y':638}, 'code':'PlatformScreenDoor_38', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1271, 'y':638}, 'code':'PlatformScreenDoor_39', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1209, 'y':638}, 'code':'PlatformScreenDoor_40', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1147, 'y':638}, 'code':'PlatformScreenDoor_41', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}], 'endDoorList':[{'point':{'x':97, 'y':209}, 'code':'EndDoor_1', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':1407, 'y':210}, 'code':'EndDoor_2', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':113, 'y':654}, 'code':'EndDoor_3', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':1405, 'y':659}, 'code':'EndDoor_4', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}], 'borderRadiusList':[{'point':{'x':141, 'y':157}, 'code':'BorderRadius_1', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':391, 'y':158}, 'code':'BorderRadius_2', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':644, 'y':157}, 'code':'BorderRadius_3', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':896, 'y':157}, 'code':'BorderRadius_4', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':1148, 'y':157}, 'code':'BorderRadius_5', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':147, 'y':717}, 'code':'BorderRadius_6', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':1150, 'y':718}, 'code':'BorderRadius_7', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':649, 'y':716}, 'code':'BorderRadius_8', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':900, 'y':717}, 'code':'BorderRadius_9', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':399, 'y':717}, 'code':'BorderRadius_10', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}], 'iscsLineList':[{'point1':{'x':104, 'y':260}, 'point2':{'x':1438, 'y':260}, 'code':'IscsLine_1', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':104, 'y':260}}, {'point1':{'x':134, 'y':220}, 'point2':{'x':1391, 'y':220}, 'code':'IscsLine_2', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':134, 'y':220}}, {'point1':{'x':103, 'y':189}, 'point2':{'x':1436, 'y':189}, 'code':'IscsLine_3', 'classify':'solid', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':103, 'y':189}}, {'point1':{'x':104, 'y':150}, 'point2':{'x':1437, 'y':150}, 'code':'IscsLine_4', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':104, 'y':150}}, {'point1':{'x':133, 'y':190}, 'point2':{'x':133, 'y':261}, 'code':'IscsLine_5', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':133, 'y':190}}, {'point1':{'x':1393, 'y':189}, 'point2':{'x':1393, 'y':260}, 'code':'IscsLine_6', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1393, 'y':189}}, {'point1':{'x':385, 'y':149}, 'point2':{'x':385, 'y':260}, 'code':'IscsLine_7', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':385, 'y':149}}, {'point1':{'x':637, 'y':149}, 'point2':{'x':637, 'y':259}, 'code':'IscsLine_8', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':637, 'y':149}}, {'point1':{'x':1142, 'y':149}, 'point2':{'x':1142, 'y':259}, 'code':'IscsLine_9', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1142, 'y':149}}, {'point1':{'x':892, 'y':149}, 'point2':{'x':892, 'y':259}, 'code':'IscsLine_10', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':892, 'y':149}}, {'point1':{'x':109, 'y':634}, 'point2':{'x':1439, 'y':634}, 'code':'IscsLine_11', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':109, 'y':634}}, {'point1':{'x':108, 'y':749}, 'point2':{'x':1438, 'y':749}, 'code':'IscsLine_12', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':108, 'y':749}}, {'point1':{'x':107, 'y':712}, 'point2':{'x':1437, 'y':712}, 'code':'IscsLine_13', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':107, 'y':712}}, {'point1':{'x':142, 'y':671}, 'point2':{'x':1393, 'y':671}, 'code':'IscsLine_14', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':142, 'y':671}}, {'point1':{'x':141, 'y':633}, 'point2':{'x':141, 'y':713}, 'code':'IscsLine_15', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':141, 'y':633}}, {'point1':{'x':1395, 'y':633}, 'point2':{'x':1395, 'y':713}, 'code':'IscsLine_16', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1395, 'y':633}}, {'point1':{'x':392, 'y':633}, 'point2':{'x':392, 'y':749}, 'code':'IscsLine_17', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':392, 'y':633}}, {'point1':{'x':644, 'y':633}, 'point2':{'x':644, 'y':749}, 'code':'IscsLine_18', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':644, 'y':633}}, {'point1':{'x':894, 'y':634}, 'point2':{'x':894, 'y':749}, 'code':'IscsLine_19', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':894, 'y':634}}, {'point1':{'x':1146, 'y':634}, 'point2':{'x':1146, 'y':749}, 'code':'IscsLine_20', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1146, 'y':634}}, {'point1':{'x':408, 'y':301}, 'point2':{'x':408, 'y':601}, 'code':'IscsLine_21', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':408, 'y':301}}, {'point1':{'x':1140, 'y':299}, 'point2':{'x':1140, 'y':600}, 'code':'IscsLine_22', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1140, 'y':299}}, {'point1':{'x':644, 'y':301}, 'point2':{'x':644, 'y':391}, 'code':'IscsLine_23', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':644, 'y':301}}, {'point1':{'x':221, 'y':328}, 'point2':{'x':481, 'y':328}, 'code':'IscsLine_24', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':328}}, {'point1':{'x':221, 'y':370}, 'point2':{'x':481, 'y':370}, 'code':'IscsLine_25', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':370}}, {'point1':{'x':220, 'y':393}, 'point2':{'x':480, 'y':393}, 'code':'IscsLine_26', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':393}}, {'point1':{'x':221, 'y':415}, 'point2':{'x':481, 'y':415}, 'code':'IscsLine_27', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':415}}, {'point1':{'x':220, 'y':436}, 'point2':{'x':480, 'y':436}, 'code':'IscsLine_28', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':436}}, {'point1':{'x':221, 'y':458}, 'point2':{'x':481, 'y':458}, 'code':'IscsLine_29', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':458}}, {'point1':{'x':222, 'y':479}, 'point2':{'x':482, 'y':479}, 'code':'IscsLine_30', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':222, 'y':479}}, {'point1':{'x':221, 'y':500}, 'point2':{'x':481, 'y':500}, 'code':'IscsLine_31', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':500}}, {'point1':{'x':220, 'y':521}, 'point2':{'x':480, 'y':521}, 'code':'IscsLine_32', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':521}}, {'point1':{'x':220, 'y':539}, 'point2':{'x':480, 'y':539}, 'code':'IscsLine_33', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':539}}, {'point1':{'x':219, 'y':580}, 'point2':{'x':479, 'y':580}, 'code':'IscsLine_34', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':219, 'y':580}}, {'point1':{'x':219, 'y':560}, 'point2':{'x':479, 'y':560}, 'code':'IscsLine_35', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':219, 'y':560}}, {'point1':{'x':220, 'y':349}, 'point2':{'x':480, 'y':349}, 'code':'IscsLine_36', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':349}}, {'point1':{'x':511, 'y':368}, 'point2':{'x':701, 'y':368}, 'code':'IscsLine_37', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':511, 'y':368}}, {'point1':{'x':513, 'y':346}, 'point2':{'x':703, 'y':346}, 'code':'IscsLine_38', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':513, 'y':346}}, {'point1':{'x':512, 'y':323}, 'point2':{'x':702, 'y':323}, 'code':'IscsLine_39', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':512, 'y':323}}, {'point1':{'x':954, 'y':408}, 'point2':{'x':1214, 'y':408}, 'code':'IscsLine_40', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':408}}, {'point1':{'x':952, 'y':450}, 'point2':{'x':1212, 'y':450}, 'code':'IscsLine_41', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':952, 'y':450}}, {'point1':{'x':954, 'y':367}, 'point2':{'x':1214, 'y':367}, 'code':'IscsLine_42', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':367}}, {'point1':{'x':955, 'y':348}, 'point2':{'x':1215, 'y':348}, 'code':'IscsLine_43', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':348}}, {'point1':{'x':955, 'y':326}, 'point2':{'x':1215, 'y':326}, 'code':'IscsLine_44', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':326}}, {'point1':{'x':955, 'y':429}, 'point2':{'x':1215, 'y':429}, 'code':'IscsLine_45', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':429}}, {'point1':{'x':955, 'y':471}, 'point2':{'x':1215, 'y':471}, 'code':'IscsLine_46', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':471}}, {'point1':{'x':954, 'y':388}, 'point2':{'x':1214, 'y':388}, 'code':'IscsLine_47', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':388}}, {'point1':{'x':954, 'y':493}, 'point2':{'x':1214, 'y':493}, 'code':'IscsLine_48', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':493}}, {'point1':{'x':954, 'y':517}, 'point2':{'x':1214, 'y':517}, 'code':'IscsLine_49', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':517}}, {'point1':{'x':954, 'y':539}, 'point2':{'x':1214, 'y':539}, 'code':'IscsLine_50', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':539}}, {'point1':{'x':955, 'y':579}, 'point2':{'x':1214, 'y':579}, 'code':'IscsLine_51', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':579}}, {'point1':{'x':954, 'y':559}, 'point2':{'x':1213, 'y':559}, 'code':'IscsLine_52', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':559}}], 'iscsRectList':[{'point':{'x':220, 'y':300}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':260, 'height':300, 'zlevel':1, 'z':3}, {'point':{'x':512, 'y':300}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':190, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':954, 'y':300}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':260, 'height':300, 'zlevel':1, 'z':3}], 'iscsTextList':[{'point':{'x':229, 'y':163}, 'code':'IscsText_1', '_type':'IscsText', 'context':'车厢1', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':483, 'y':162}, 'code':'IscsText_2', '_type':'IscsText', 'context':'车厢2', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':747, 'y':161}, 'code':'IscsText_3', '_type':'IscsText', 'context':'车厢3', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':991, 'y':161}, 'code':'IscsText_4', '_type':'IscsText', 'context':'车厢4', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1243, 'y':162}, 'code':'IscsText_5', '_type':'IscsText', 'context':'车厢5', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':239, 'y':722}, 'code':'IscsText_6', '_type':'IscsText', 'context':'车厢1', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':491, 'y':722}, 'code':'IscsText_7', '_type':'IscsText', 'context':'车厢2', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':742, 'y':722}, 'code':'IscsText_8', '_type':'IscsText', 'context':'车厢3', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':989, 'y':723}, 'code':'IscsText_9', '_type':'IscsText', 'context':'车厢4', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1242, 'y':722}, 'code':'IscsText_10', '_type':'IscsText', 'context':'车厢5', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':100, 'y':131}, 'code':'IscsText_11', '_type':'IscsText', 'context':'下行', 'textFill':'#20B8C1', 'fontSize':14, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1406, 'y':755}, 'code':'IscsText_12', '_type':'IscsText', 'context':'上行', 'textFill':'#20B8C1', 'fontSize':14, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':308}, 'code':'IscsText_13', '_type':'IscsText', 'context':'下行站台', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':309}, 'code':'IscsText_14', '_type':'IscsText', 'context':'状态', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1011, 'y':306}, 'code':'IscsText_15', '_type':'IscsText', 'context':'上行站台', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1163, 'y':308}, 'code':'IscsText_16', '_type':'IscsText', 'context':'状态', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':334}, 'code':'IscsText_17', '_type':'IscsText', 'context':'滑动门&应急门开门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':354}, 'code':'IscsText_18', '_type':'IscsText', 'context':'滑动门&应急门关门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':376}, 'code':'IscsText_19', '_type':'IscsText', 'context':'滑动门互锁解除报警', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':398}, 'code':'IscsText_20', '_type':'IscsText', 'context':'紧急控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':442}, 'code':'IscsText_22', '_type':'IscsText', 'context':'紧急控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':464}, 'code':'IscsText_23', '_type':'IscsText', 'context':'就地控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':484}, 'code':'IscsText_24', '_type':'IscsText', 'context':'就得控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':506}, 'code':'IscsText_25', '_type':'IscsText', 'context':'就地控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':525}, 'code':'IscsText_26', '_type':'IscsText', 'context':'自动开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':225, 'y':545}, 'code':'IscsText_27', '_type':'IscsText', 'context':'自动关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':565}, 'code':'IscsText_28', '_type':'IscsText', 'context':'所有门开到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':585}, 'code':'IscsText_29', '_type':'IscsText', 'context':'所有门关到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':517, 'y':306}, 'code':'IscsText_30', '_type':'IscsText', 'context':'系统驱动电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':518, 'y':329}, 'code':'IscsText_31', '_type':'IscsText', 'context':'系统控制电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':519, 'y':352}, 'code':'IscsText_32', '_type':'IscsText', 'context':'监视电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':520, 'y':375}, 'code':'IscsText_33', '_type':'IscsText', 'context':'现场总线故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':332}, 'code':'IscsText_34', '_type':'IscsText', 'context':'滑动门&应急门开门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':960, 'y':352}, 'code':'IscsText_35', '_type':'IscsText', 'context':'滑动门&应急门关门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':371}, 'code':'IscsText_36', '_type':'IscsText', 'context':'滑动门互锁解除报警', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':393}, 'code':'IscsText_37', '_type':'IscsText', 'context':'紧急控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':225, 'y':421}, 'code':'IscsText_38', '_type':'IscsText', 'context':'紧急控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':413}, 'code':'IscsText_39', '_type':'IscsText', 'context':'紧急控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':433}, 'code':'IscsText_40', '_type':'IscsText', 'context':'紧急控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':454}, 'code':'IscsText_41', '_type':'IscsText', 'context':'就地控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':477}, 'code':'IscsText_42', '_type':'IscsText', 'context':'就得控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':500}, 'code':'IscsText_43', '_type':'IscsText', 'context':'就地控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':523}, 'code':'IscsText_44', '_type':'IscsText', 'context':'自动开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':545}, 'code':'IscsText_45', '_type':'IscsText', 'context':'自动关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':565}, 'code':'IscsText_46', '_type':'IscsText', 'context':'所有门开到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':583}, 'code':'IscsText_47', '_type':'IscsText', 'context':'所有门关到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':154, 'y':265}, 'code':'IscsText_48', '_type':'IscsText', 'context':'1-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':217, 'y':266}, 'code':'IscsText_49', '_type':'IscsText', 'context':'1-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':266}, 'code':'IscsText_50', '_type':'IscsText', 'context':'1-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':341, 'y':266}, 'code':'IscsText_51', '_type':'IscsText', 'context':'1-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':404, 'y':267}, 'code':'IscsText_52', '_type':'IscsText', 'context':'2-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':467, 'y':267}, 'code':'IscsText_53', '_type':'IscsText', 'context':'2-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':531, 'y':266}, 'code':'IscsText_54', '_type':'IscsText', 'context':'2-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':596, 'y':266}, 'code':'IscsText_55', '_type':'IscsText', 'context':'2-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':659, 'y':266}, 'code':'IscsText_56', '_type':'IscsText', 'context':'3-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':720, 'y':267}, 'code':'IscsText_57', '_type':'IscsText', 'context':'3-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':787, 'y':267}, 'code':'IscsText_58', '_type':'IscsText', 'context':'3-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':267}, 'code':'IscsText_59', '_type':'IscsText', 'context':'3-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':910, 'y':266}, 'code':'IscsText_60', '_type':'IscsText', 'context':'4-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':972, 'y':267}, 'code':'IscsText_61', '_type':'IscsText', 'context':'4-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1035, 'y':266}, 'code':'IscsText_62', '_type':'IscsText', 'context':'4-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1098, 'y':267}, 'code':'IscsText_63', '_type':'IscsText', 'context':'4-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1162, 'y':267}, 'code':'IscsText_64', '_type':'IscsText', 'context':'5-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1225, 'y':267}, 'code':'IscsText_65', '_type':'IscsText', 'context':'5-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1288, 'y':267}, 'code':'IscsText_66', '_type':'IscsText', 'context':'5-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1348, 'y':266}, 'code':'IscsText_67', '_type':'IscsText', 'context':'5-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':164, 'y':619}, 'code':'IscsText_68', '_type':'IscsText', 'context':'1-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':223, 'y':619}, 'code':'IscsText_69', '_type':'IscsText', 'context':'1-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':285, 'y':619}, 'code':'IscsText_70', '_type':'IscsText', 'context':'1-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':348, 'y':619}, 'code':'IscsText_71', '_type':'IscsText', 'context':'1-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':412, 'y':618}, 'code':'IscsText_72', '_type':'IscsText', 'context':'2-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':472, 'y':618}, 'code':'IscsText_73', '_type':'IscsText', 'context':'2-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':535, 'y':619}, 'code':'IscsText_74', '_type':'IscsText', 'context':'2-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':599, 'y':620}, 'code':'IscsText_75', '_type':'IscsText', 'context':'2-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':663, 'y':618}, 'code':'IscsText_76', '_type':'IscsText', 'context':'3-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':724, 'y':618}, 'code':'IscsText_77', '_type':'IscsText', 'context':'3-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':787, 'y':617}, 'code':'IscsText_78', '_type':'IscsText', 'context':'3-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':619}, 'code':'IscsText_79', '_type':'IscsText', 'context':'3-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':912, 'y':619}, 'code':'IscsText_80', '_type':'IscsText', 'context':'4-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':973, 'y':620}, 'code':'IscsText_81', '_type':'IscsText', 'context':'4-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1039, 'y':619}, 'code':'IscsText_82', '_type':'IscsText', 'context':'4-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1101, 'y':619}, 'code':'IscsText_83', '_type':'IscsText', 'context':'4-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1165, 'y':618}, 'code':'IscsText_84', '_type':'IscsText', 'context':'5-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1225, 'y':618}, 'code':'IscsText_85', '_type':'IscsText', 'context':'5-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1290, 'y':620}, 'code':'IscsText_86', '_type':'IscsText', 'context':'5-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1350, 'y':620}, 'code':'IscsText_87', '_type':'IscsText', 'context':'5-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':432, 'y':399}, 'code':'IscsText_88', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':421}, 'code':'IscsText_89', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':443}, 'code':'IscsText_90', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':431, 'y':464}, 'code':'IscsText_91', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':431, 'y':484}, 'code':'IscsText_92', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':506}, 'code':'IscsText_93', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':525}, 'code':'IscsText_94', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':544}, 'code':'IscsText_95', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':427, 'y':586}, 'code':'IscsText_96', '_type':'IscsText', 'context':'关到位', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1161, 'y':585}, 'code':'IscsText_97', '_type':'IscsText', 'context':'关到位', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':524}, 'code':'IscsText_98', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':501}, 'code':'IscsText_99', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1165, 'y':392}, 'code':'IscsText_100', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':455}, 'code':'IscsText_101', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':478}, 'code':'IscsText_102', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':545}, 'code':'IscsText_103', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1160, 'y':415}, 'code':'IscsText_104', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1161, 'y':435}, 'code':'IscsText_105', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'arcStatusList':[{'point':{'x':443, 'y':338}, 'code':'ArcStatus_1', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':443, 'y':359}, 'code':'ArcStatus_2', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':443, 'y':381}, 'code':'ArcStatus_3', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':311}, 'code':'ArcStatus_4', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':335}, 'code':'ArcStatus_5', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':358}, 'code':'ArcStatus_6', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':380}, 'code':'ArcStatus_7', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':337}, 'code':'ArcStatus_8', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':357}, 'code':'ArcStatus_9', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':377}, 'code':'ArcStatus_10', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}]},
     '41': {'iscsRectList':[{'point':{'x':1, 'y':70}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':160, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':161, 'y':80}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':95, 'height':70, 'zlevel':1, 'z':3}, {'point':{'x':1, 'y':205}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F  7F1F1', 'width':135, 'height':100, 'zlevel':1, 'z':3}, {'point':{'x':136, 'y':225}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':120, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':327, 'y':116}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':60, 'zlevel':1, 'z':3}, {'point':{'x':936, 'y':26}, 'code':'IscsRect_6', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1006, 'y':26}, 'code':'IscsRect_7', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1076, 'y':26}, 'code':'IscsRect_8', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1146, 'y':26}, 'code':'IscsRect_9', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1305, 'y':40}, 'code':'IscsRect_10', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':145, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':1305, 'y':130}, 'code':'IscsRect_11', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':145, 'height':105, 'zlevel':1, 'z':3}, {'point':{'x':1340, 'y':270}, 'code':'IscsRect_12', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':45, 'height':35, 'zlevel':1, 'z':3}, {'point':{'x':1385, 'y':270}, 'code':'IscsRect_13', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':45, 'height':35, 'zlevel':1, 'z':3}, {'point':{'x':930, 'y':160}, 'code':'IscsRect_14', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':90, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':1020, 'y':160}, 'code':'IscsRect_15', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':50, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':1070, 'y':160}, 'code':'IscsRect_16', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':85, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':1155, 'y':160}, 'code':'IscsRect_17', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':90, 'height':95, 'zlevel':1, 'z':3}, {'point':{'x':760, 'y':116}, 'code':'IscsRect_18', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':65, 'height':60, 'zlevel':1, 'z':3}, {'point':{'x':1054, 'y':265}, 'code':'IscsRect_19', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':135, 'height':40, 'zlevel':1, 'z':3}], 'iscsLineList':[{'point1':{'x':0, 'y':15}, 'point2':{'x':260, 'y':15}, 'code':'IscsLine_1', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':0, 'y':15}}, {'point1':{'x':260, 'y':15}, 'point2':{'x':260, 'y':0}, 'code':'IscsLine_2', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':260, 'y':15}}, {'point1':{'x':330, 'y':0}, 'point2':{'x':330, 'y':15}, 'code':'IscsLine_3', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':330, 'y':0}}, {'point1':{'x':330, 'y':15}, 'point2':{'x':810, 'y':15}, 'code':'IscsLine_4', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':330, 'y':15}}, {'point1':{'x':810, 'y':15}, 'point2':{'x':810, 'y':0}, 'code':'IscsLine_5', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':810, 'y':15}}, {'point1':{'x':880, 'y':0}, 'point2':{'x':880, 'y':15}, 'code':'IscsLine_6', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':880, 'y':0}}, {'point1':{'x':880, 'y':15}, 'point2':{'x':1470, 'y':15}, 'code':'IscsLine_7', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':880, 'y':15}}, {'point1':{'x':0, 'y':305}, 'point2':{'x':300, 'y':305}, 'code':'IscsLine_8', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':0, 'y':305}}, {'point1':{'x':300, 'y':305}, 'point2':{'x':300, 'y':320}, 'code':'IscsLine_9', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':300, 'y':305}}, {'point1':{'x':370, 'y':320}, 'point2':{'x':370, 'y':305}, 'code':'IscsLine_10', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':370, 'y':320}}, {'point1':{'x':370, 'y':305}, 'point2':{'x':800, 'y':305}, 'code':'IscsLine_11', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':370, 'y':305}}, {'point1':{'x':800, 'y':305}, 'point2':{'x':800, 'y':320}, 'code':'IscsLine_12', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':800, 'y':305}}, {'point1':{'x':870, 'y':305}, 'point2':{'x':870, 'y':320}, 'code':'IscsLine_13', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':870, 'y':305}}, {'point1':{'x':870, 'y':305}, 'point2':{'x':1470, 'y':305}, 'code':'IscsLine_14', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':870, 'y':305}}, {'point1':{'x':746, 'y':100}, 'point2':{'x':746, 'y':110}, 'code':'IscsLine_15', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':746, 'y':100}}, {'point1':{'x':746, 'y':16}, 'point2':{'x':746, 'y':37}, 'code':'IscsLine_16', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':746, 'y':16}}, {'point1':{'x':729, 'y':190}, 'point2':{'x':729, 'y':212}, 'code':'IscsLine_17', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':729, 'y':190}}, {'point1':{'x':729, 'y':274}, 'point2':{'x':729, 'y':305}, 'code':'IscsLine_18', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':729, 'y':274}}, {'point1':{'x':416, 'y':14}, 'point2':{'x':416, 'y':29}, 'code':'IscsLine_19', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':416, 'y':14}}, {'point1':{'x':416, 'y':92}, 'point2':{'x':416, 'y':110}, 'code':'IscsLine_20', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':416, 'y':92}}, {'point1':{'x':436, 'y':189}, 'point2':{'x':436, 'y':216}, 'code':'IscsLine_21', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':436, 'y':189}}, {'point1':{'x':436, 'y':280}, 'point2':{'x':436, 'y':305}, 'code':'IscsLine_22', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':436, 'y':280}}], 'iscsTextList':[{'point':{'x':262, 'y':9}, 'code':'IscsText_1', '_type':'IscsText', 'context':'2号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':304, 'y':296}, 'code':'IscsText_2', '_type':'IscsText', 'context':'5号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':813, 'y':10}, 'code':'IscsText_3', '_type':'IscsText', 'context':'3号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':804, 'y':297}, 'code':'IscsText_4', '_type':'IscsText', 'context':'4号出入口', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':183, 'y':107}, 'code':'IscsText_5', '_type':'IscsText', 'context':'配电间', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':33, 'y':246}, 'code':'IscsText_6', '_type':'IscsText', 'context':'空调机房', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':170, 'y':248}, 'code':'IscsText_7', '_type':'IscsText', 'context':'环控\n电控室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':333, 'y':160}, 'code':'IscsText_8', '_type':'IscsText', 'context':'客服中心', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':764, 'y':159}, 'code':'IscsText_9', '_type':'IscsText', 'context':'客服中心', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':949, 'y':38}, 'code':'IscsText_10', '_type':'IscsText', 'context':'通信\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1020, 'y':40}, 'code':'IscsText_11', '_type':'IscsText', 'context':'通信\n电源室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1088, 'y':40}, 'code':'IscsText_12', '_type':'IscsText', 'context':'AFC\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':41}, 'code':'IscsText_13', '_type':'IscsText', 'context':'交\n接\n班\n室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':950, 'y':171}, 'code':'IscsText_14', '_type':'IscsText', 'context':'车站\n控制室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1026, 'y':175}, 'code':'IscsText_15', '_type':'IscsText', 'context':'站长室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1091, 'y':169}, 'code':'IscsText_16', '_type':'IscsText', 'context':'信号\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1173, 'y':169}, 'code':'IscsText_17', '_type':'IscsText', 'context':'信号\n电源室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1061, 'y':273}, 'code':'IscsText_18', '_type':'IscsText', 'context':'中和监控\n设备室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1346, 'y':281}, 'code':'IscsText_19', '_type':'IscsText', 'context':'男更', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1393, 'y':280}, 'code':'IscsText_20', '_type':'IscsText', 'context':'女更', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1372, 'y':144}, 'code':'IscsText_21', '_type':'IscsText', 'context':'票务室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1355, 'y':64}, 'code':'IscsText_22', '_type':'IscsText', 'context':'环控\n电控室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':13, 'y':122}, 'code':'IscsText_23', '_type':'IscsText', 'context':'01022#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':59, 'y':183}, 'code':'IscsText_24', '_type':'IscsText', 'context':'01023#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':267, 'y':263}, 'code':'IscsText_25', '_type':'IscsText', 'context':'01024#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':332, 'y':279}, 'code':'IscsText_26', '_type':'IscsText', 'context':'01001#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':333, 'y':145}, 'code':'IscsText_27', '_type':'IscsText', 'context':'01002#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':570, 'y':281}, 'code':'IscsText_28', '_type':'IscsText', 'context':'01004#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':464, 'y':59}, 'code':'IscsText_29', '_type':'IscsText', 'context':'01003#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':568, 'y':110}, 'code':'IscsText_30', '_type':'IscsText', 'context':'01028#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':523, 'y':183}, 'code':'IscsText_31', '_type':'IscsText', 'context':'01027#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':615, 'y':186}, 'code':'IscsText_32', '_type':'IscsText', 'context':'01029#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':469, 'y':238}, 'code':'IscsText_33', '_type':'IscsText', 'context':'01026#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':662, 'y':238}, 'code':'IscsText_34', '_type':'IscsText', 'context':'01030#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':766, 'y':142}, 'code':'IscsText_35', '_type':'IscsText', 'context':'01005#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':774, 'y':80}, 'code':'IscsText_36', '_type':'IscsText', 'context':'01031#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':840, 'y':64}, 'code':'IscsText_37', '_type':'IscsText', 'context':'01033#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':783, 'y':269}, 'code':'IscsText_38', '_type':'IscsText', 'context':'01006#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':849, 'y':249}, 'code':'IscsText_39', '_type':'IscsText', 'context':'01032#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':948, 'y':232}, 'code':'IscsText_40', '_type':'IscsText', 'context':'01008#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':947, 'y':97}, 'code':'IscsText_41', '_type':'IscsText', 'context':'01007#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1017, 'y':97}, 'code':'IscsText_42', '_type':'IscsText', 'context':'01009#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1089, 'y':98}, 'code':'IscsText_43', '_type':'IscsText', 'context':'01010#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':142}, 'code':'IscsText_44', '_type':'IscsText', 'context':'01037#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1114, 'y':142}, 'code':'IscsText_45', '_type':'IscsText', 'context':'01034#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1088, 'y':233}, 'code':'IscsText_46', '_type':'IscsText', 'context':'01011#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1176, 'y':233}, 'code':'IscsText_47', '_type':'IscsText', 'context':'01012#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1127, 'y':290}, 'code':'IscsText_48', '_type':'IscsText', 'context':'01013#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':933, 'y':292}, 'code':'IscsText_49', '_type':'IscsText', 'context':'01035#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':994, 'y':291}, 'code':'IscsText_50', '_type':'IscsText', 'context':'01036#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1317, 'y':169}, 'code':'IscsText_51', '_type':'IscsText', 'context':'01014#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1379, 'y':211}, 'code':'IscsText_52', '_type':'IscsText', 'context':'01038#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':742, 'y':128}, 'code':'IscsText_53', '_type':'IscsText', 'context':'上', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':685, 'y':167}, 'code':'IscsText_54', '_type':'IscsText', 'context':'下', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':284, 'y':94}, 'code':'IscsText_55', '_type':'IscsText', 'context':'01025#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':397, 'y':127}, 'code':'IscsText_56', '_type':'IscsText', 'context':'上', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':456, 'y':169}, 'code':'IscsText_57', '_type':'IscsText', 'context':'下', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'vidiconList':[{'_type':'Vidicon', 'code':'Vidicon_1', 'width':40, 'right':true, 'point':{'x':14, 'y':99}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_2', 'width':40, 'right':true, 'point':{'x':59, 'y':160}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_3', 'width':40, 'right':true, 'point':{'x':299, 'y':86}, 'rotationAngle':90, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_4', 'width':40, 'right':true, 'point':{'x':267, 'y':239}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_5', 'width':40, 'right':true, 'point':{'x':569, 'y':87}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_6', 'width':40, 'right':true, 'point':{'x':614, 'y':160}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_7', 'width':40, 'right':false, 'point':{'x':526, 'y':159}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_8', 'width':40, 'right':false, 'point':{'x':474, 'y':217}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_9', 'width':40, 'right':true, 'point':{'x':660, 'y':217}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_10', 'width':40, 'right':false, 'point':{'x':779, 'y':61}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_11', 'width':40, 'right':true, 'point':{'x':839, 'y':44}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_12', 'width':40, 'right':true, 'point':{'x':850, 'y':227}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_13', 'width':40, 'right':true, 'point':{'x':993, 'y':272}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_14', 'width':40, 'right':false, 'point':{'x':940, 'y':272}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_15', 'width':40, 'right':true, 'point':{'x':1115, 'y':120}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_16', 'width':40, 'right':false, 'point':{'x':965, 'y':120}, 'rotationAngle':0, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_17', 'width':40, 'right':false, 'point':{'x':1387, 'y':190}, 'rotationAngle':0, 'zlevel':1, 'z':4}], 'vidiconCloudList':[{'_type':'VidiconCloud', 'code':'VidiconCloud_1', 'r':18, 'point':{'x':353, 'y':255}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_2', 'r':18, 'point':{'x':349, 'y':122}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_3', 'r':18, 'point':{'x':487, 'y':32}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_4', 'r':18, 'point':{'x':803, 'y':120}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_5', 'r':18, 'point':{'x':592, 'y':252}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_6', 'r':18, 'point':{'x':805, 'y':245}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_7', 'r':18, 'point':{'x':970, 'y':70}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_8', 'r':18, 'point':{'x':1042, 'y':70}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_9', 'r':18, 'point':{'x':1110, 'y':70}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_10', 'r':18, 'point':{'x':1198, 'y':210}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_11', 'r':18, 'point':{'x':970, 'y':210}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_12', 'r':18, 'point':{'x':1110, 'y':210}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_13', 'r':18, 'point':{'x':1149, 'y':272}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_14', 'r':18, 'point':{'x':1340, 'y':145}, 'zlevel':1, 'z':4}], 'brakeMachineList':[{'point':{'x':730, 'y':36}, 'isRight':false, 'code':'BrakeMachine_1', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':48}, 'isRight':false, 'code':'BrakeMachine_2', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':60}, 'isRight':false, 'code':'BrakeMachine_3', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':72}, 'isRight':false, 'code':'BrakeMachine_4', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':730, 'y':84}, 'isRight':false, 'code':'BrakeMachine_5', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':212}, 'isRight':true, 'code':'BrakeMachine_6', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':224}, 'isRight':true, 'code':'BrakeMachine_7', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':236}, 'isRight':true, 'code':'BrakeMachine_8', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':248}, 'isRight':true, 'code':'BrakeMachine_9', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':30}, 'isRight':true, 'code':'BrakeMachine_10', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':42}, 'isRight':true, 'code':'BrakeMachine_11', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':54}, 'isRight':true, 'code':'BrakeMachine_12', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':66}, 'isRight':true, 'code':'BrakeMachine_13', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':217}, 'isRight':true, 'code':'BrakeMachine_14', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':229}, 'isRight':true, 'code':'BrakeMachine_15', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':241}, 'isRight':true, 'code':'BrakeMachine_16', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':253}, 'isRight':true, 'code':'BrakeMachine_17', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':265}, 'isRight':true, 'code':'BrakeMachine_18', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':717, 'y':260}, 'isRight':true, 'code':'BrakeMachine_19', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}, {'point':{'x':405, 'y':78}, 'isRight':true, 'code':'BrakeMachine_20', '_type':'BrakeMachine', 'width':25, 'zlevel':1, 'z':4}], 'staircaseList':[{'point':{'x':700, 'y':111}, 'fill':'#fff', 'isRight':true, 'rotationAngle':180, 'code':'Staircase_1', '_type':'Staircase', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':457, 'y':192}, 'fill':'#fff', 'isRight':false, 'rotationAngle':180, 'code':'Staircase_2', '_type':'Staircase', 'width':60, 'zlevel':1, 'z':4}]},
diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index f46b8c9b2..7907c9965 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
@@ -541,6 +542,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 0.1, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index 105148ae5..f95bfdceb 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
@@ -491,6 +492,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 1, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [], // 特殊列车类型需设置显示格式
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index 05fdc0707..e9c64c29a 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: true							// 进路触发颜色
@@ -659,6 +660,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 1, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js
index cf87fc295..2c5e629be 100644
--- a/src/jmapNew/config/skinCode/foshan_01.js
+++ b/src/jmapNew/config/skinCode/foshan_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
@@ -523,6 +524,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 0, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index f1b957b48..721c93775 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
@@ -515,6 +516,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 0, // 车身line宽
                 changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index 7075919f8..4ddba9dab 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
@@ -540,6 +541,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 2, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 940c09892..521b51b5f 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
@@ -521,6 +522,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 1, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [], // 特殊列车类型需设置显示格式
diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
index 54f73378c..8953afb6d 100644
--- a/src/jmapNew/config/skinCode/xian_01.js
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
@@ -545,16 +546,17 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 0, // 车身line宽
                 changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [
                     {
-                        type: '03',
+                        type: 'MANUAL',
                         serviceNumber: 'MM',
                         nameFormat: 'serviceNumber:groupNumber'
                     },
                     {
-                        type: '02',
+                        type: 'HEAD',
                         nameFormat: 'targetCode:groupNumber'
                     }
                 ], // 特殊列车类型需设置显示格式
@@ -574,7 +576,8 @@ class SkinCode extends defaultStyle {
                 normalColor: '#FFF'
             },
             hsda: {
-                trainHSDATextFontSize: 8// 列车HDSA字号
+                trainHSDATextFontSize: 8, // 列车HDSA字号
+                upPaddingHSDA: 0
             },
             trainNumber: {
                 targetCodePrefix: '000', // 目的地码前缀
@@ -585,7 +588,8 @@ class SkinCode extends defaultStyle {
             trainServer: {
                 serviceNumberPrefix: '00', // 服务号(表号)前缀
                 defaultServiceNumber: 'BB', // 默认服务号（表号）
-                trainServerOffset: { x: 26, y: 1}// 列车服务号偏移
+                trainServerOffset: { x: 26, y: 1}, // 列车服务号偏移
+                manualTypeText: 'MM' // 人工车填充
             },
             trainTarget: {
                 tripNumberPrefix: '0000', // 车次号前缀
@@ -595,14 +599,14 @@ class SkinCode extends defaultStyle {
                 smallColor: '#70ECEE', // 小交路颜色
                 bigColor: '#FFFFFF', // 大交路颜色
                 inboundColor: '#00FF00', // 回库颜色
-                planTypeColor: '#FFFFFF', // 计划车颜色
-                manualTypeColor: '#FF0', // 人工车
-                headTypeColor: '#FF0' // 头码车
+                planTypeColor: '#FFFFFF' // 计划车颜色
             },
             trainTargetNumber: {
                 groupNumberPrefix: '000', // 车组号前缀
                 defaultGroupNumber: 'EEE', // 默认车组号
-                trainTargetNumberOffset: {x: -1, y: 1}// 车组号偏移量
+                trainTargetNumberOffset: {x: -1, y: 1}, // 车组号偏移量
+                manualTypeColor: '#FF0', // 人工车
+                headTypeColor: '#FF0' // 头码车
             },
             trainHead: {
                 trainMoreLength: 1, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index 8d9a50e62..504339c51 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -4,6 +4,7 @@ import deviceType from '../../constant/deviceType';
 class SkinCode extends defaultStyle {
     constructor() {
         super();
+        this.fontFamily = '宋体';
         this[deviceType.Section] = {
             active: {
                 routeColor: false							// 进路触发颜色
@@ -659,6 +660,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.Train] = {
             trainBody: {
+                fontFamily: 'consolas',
                 trainBodyLineWidth: 2, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
                 specialTrainType: [], // 特殊列车类型需设置显示格式
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 89775ba64..db61befd0 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -291,6 +291,13 @@ class Jlmap {
         (list || []).forEach(elem => {
             const code = elem.code;
             const type = elem._type;
+            if (elem.deviceType === 'TRAIN' && elem.type === 'HEAD') {
+                elem.serviceNumber = '';
+            } else if (elem.deviceType === 'TRAIN' && elem.type === 'MANUAL') {
+                elem.serviceNumber = '';
+                elem.tripNumber = '';
+                elem.destinationCode = '';
+            }
             const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
             this.hookHandle(oDevice, elem);
         });
@@ -371,7 +378,6 @@ class Jlmap {
     update(list) {
         this.setUpdateMapDevice(list || []); // 增加一个 前数据 处理 为了在区段中 获取全部的 道岔信息
         const signalDeviceList = [];
-        const signalStatusList = [];
         (list || []).forEach(elem => {
             const code = elem.code;
             const type = elem._type;
@@ -386,13 +392,9 @@ class Jlmap {
                     }
                 }
                 const signalDevice = this.mapDevice[route.startSignalCode];
-                const signalStatus = {atsControl: elem.atsControl, fleetMode: elem.fleetMode};
                 const index = signalDeviceList.indexOf(signalDevice);
                 if (index === -1) {
                     signalDeviceList.push(signalDevice);
-                    signalStatusList.push(signalStatus);
-                } else {
-                    signalStatusList[index] = {atsControl: signalStatusList[index].atsControl && elem.atsControl, fleetMode: signalStatusList[index].fleetMode || elem.fleetMode};
                 }
             } else if (elem.deviceType === 'CYCLE') {
                 store.dispatch('map/updateAutoReentryState', elem);
@@ -418,6 +420,8 @@ class Jlmap {
                 if (elem.deviceType === 'TRAIN') {
                     store.dispatch('map/updateTrainState', elem);
                     store.dispatch('map/setTrainListUpdate', elem);
+                } else if (elem.deviceType === 'STAND') {
+                    store.dispatch('map/updateStationStand', elem);
                 }
                 const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
                 if (elem.dispose) {
@@ -429,15 +433,28 @@ class Jlmap {
                 }
             }
         });
-        this.handleRouteSignalStatus(signalDeviceList, signalStatusList);
+        this.handleRouteSignalStatus(signalDeviceList);
         // 状态后处理
         this.postHandle(list || []);
 
         if (this.methods.stateUpdate instanceof Function) { this.methods.stateUpdate(list); }
     }
-    handleRouteSignalStatus(signalDeviceList, signalStatusList) {
+    handleRouteSignalStatus(signalDeviceList) {
+        const routeStartSignalData = store.state.map.routeStartSignalData;
         signalDeviceList.forEach((item, index)=> {
-            if (item && this.hookHandle(item, signalStatusList[index])) {
+            const status = {};
+            if (routeStartSignalData[item.code] && routeStartSignalData[item.code].length) {
+                routeStartSignalData[item.code].forEach((elem, index)=> {
+                    if (index) {
+                        status.atsControl = status.atsControl && elem.atsControl;
+                        status.fleetMode = status.fleetMode || elem.fleetMode;
+                    } else {
+                        status.atsControl = elem.atsControl;
+                        status.fleetMode = elem.fleetMode;
+                    }
+                });
+            }
+            if (item && this.hookHandle(item, status)) {
                 this.$painter.update(item);
             }
         });
diff --git a/src/jmapNew/shape/Automactic/EMouse.js b/src/jmapNew/shape/AutoTurnBack/EMouse.js
similarity index 95%
rename from src/jmapNew/shape/Automactic/EMouse.js
rename to src/jmapNew/shape/AutoTurnBack/EMouse.js
index 967f6094e..8eb02756e 100644
--- a/src/jmapNew/shape/Automactic/EMouse.js
+++ b/src/jmapNew/shape/AutoTurnBack/EMouse.js
@@ -17,7 +17,7 @@ export default class EMouse extends Group {
                 y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance - 30,
                 fontWeight: 'normal',
                 fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-                fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
+                fontFamily: this.device.style.fontFamily,
                 text: this.device.model.name,
                 textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
                 textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
diff --git a/src/jmapNew/shape/Automactic/index.js b/src/jmapNew/shape/AutoTurnBack/index.js
similarity index 99%
rename from src/jmapNew/shape/Automactic/index.js
rename to src/jmapNew/shape/AutoTurnBack/index.js
index 942029bab..83c303df7 100644
--- a/src/jmapNew/shape/Automactic/index.js
+++ b/src/jmapNew/shape/AutoTurnBack/index.js
@@ -9,7 +9,7 @@ import EMouse from './EMouse';
 import BoundingRect from 'zrender/src/core/BoundingRect';
 import {isShowThePrdType} from '../../utils/handlePath';
 
-export default class Automactic extends Group {
+export default class AutoTurnBack extends Group {
     constructor(model, style) {
         super();
         this.z = 20;
diff --git a/src/jmapNew/shape/AutomacticRoute/EMouse.js b/src/jmapNew/shape/AutomacticRoute/EMouse.js
index 96e179317..f2547d8c6 100644
--- a/src/jmapNew/shape/AutomacticRoute/EMouse.js
+++ b/src/jmapNew/shape/AutomacticRoute/EMouse.js
@@ -17,7 +17,7 @@ export default class EMouse extends Group {
                 y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance - 30,
                 fontWeight: 'normal',
                 fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-                fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
+                fontFamily: this.device.style.fontFamily,
                 text: this.device.model.name,
                 textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
                 textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
diff --git a/src/jmapNew/shape/AxleReset/EMouse.js b/src/jmapNew/shape/AxleReset/EMouse.js
index 96e179317..f2547d8c6 100644
--- a/src/jmapNew/shape/AxleReset/EMouse.js
+++ b/src/jmapNew/shape/AxleReset/EMouse.js
@@ -17,7 +17,7 @@ export default class EMouse extends Group {
                 y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance - 30,
                 fontWeight: 'normal',
                 fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-                fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
+                fontFamily: this.device.style.fontFamily,
                 text: this.device.model.name,
                 textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
                 textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
diff --git a/src/jmapNew/shape/GuideLock/EMouse.js b/src/jmapNew/shape/GuideLock/EMouse.js
index 2241f7e1c..1589c764a 100644
--- a/src/jmapNew/shape/GuideLock/EMouse.js
+++ b/src/jmapNew/shape/GuideLock/EMouse.js
@@ -17,7 +17,7 @@ export default class EMouse extends Group {
                 y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance - 30,
                 fontWeight: 'normal',
                 fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-                fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
+                fontFamily: this.device.style.fontFamily,
                 text: this.device.model.name,
                 textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
                 textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
diff --git a/src/jmapNew/shape/LcControl/EMouse.js b/src/jmapNew/shape/LcControl/EMouse.js
index fdb639e95..f2547d8c6 100644
--- a/src/jmapNew/shape/LcControl/EMouse.js
+++ b/src/jmapNew/shape/LcControl/EMouse.js
@@ -2,52 +2,52 @@ import Group from 'zrender/src/container/Group';
 import Text from 'zrender/src/graphic/Text';
 
 export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.create();
-	}
-	create() {
-		this.text = new Text({
-			zlevel: this.device.zlevel,
-			z: this.device.z+1,
-			position: [0, 0],
-			style: {
-				x: this.device.model.position.x,
-				y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance-30,
-				fontWeight: 'normal',
-				fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
-				fontFamily: this.device.style.LcControl.mouseOverStyle.fontFamily,
-				text: this.device.model.name,
-				textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
-				textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
-				textVerticalAlign: this.device.style.LcControl.mouseOverStyle.textVerticalAlign
-			}
-		});
-		this.add(this.text);
-		this.text.hide();
-	}
-	mouseover(e) {
-		if (e.target && e.target._subType == 'Text') {
-			this.text.show();
-		} else {
-			this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor);
-			this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor);
-			this.device.control.setTextBorder(true);
-			this.device.control.setArcBorder(true);
-		}
-	}
+    constructor(device) {
+        super();
+        this.device = device;
+        this.create();
+    }
+    create() {
+        this.text = new Text({
+            zlevel: this.device.zlevel,
+            z: this.device.z + 1,
+            position: [0, 0],
+            style: {
+                x: this.device.model.position.x,
+                y: this.device.model.position.y + this.device.style.LcControl.lamp.radiusR + this.device.style.LcControl.text.distance - 30,
+                fontWeight: 'normal',
+                fontSize: this.device.style.LcControl.mouseOverStyle.fontSize,
+                fontFamily: this.device.style.fontFamily,
+                text: this.device.model.name,
+                textFill: this.device.style.LcControl.mouseOverStyle.fontColor,
+                textAlign: this.device.style.LcControl.mouseOverStyle.textAlign,
+                textVerticalAlign: this.device.style.LcControl.mouseOverStyle.textVerticalAlign
+            }
+        });
+        this.add(this.text);
+        this.text.hide();
+    }
+    mouseover(e) {
+        if (e.target && e.target._subType == 'Text') {
+            this.text.show();
+        } else {
+            this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor);
+            this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor);
+            this.device.control.setTextBorder(true);
+            this.device.control.setArcBorder(true);
+        }
+    }
 
-	mouseout(e) {
-		if (!this.device.model.down) {
-			if (e.target && e.target._subType == 'Text') {
-				this.text.hide();
-			} else {
-				this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor);
-				this.device.control.setTextColor('#FFFFFF');
-				this.device.control.setTextBorder(false);
-				this.device.control.setArcBorder(false);
-			}
-		}
-	}
+    mouseout(e) {
+        if (!this.device.model.down) {
+            if (e.target && e.target._subType == 'Text') {
+                this.text.hide();
+            } else {
+                this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor);
+                this.device.control.setTextColor('#FFFFFF');
+                this.device.control.setTextBorder(false);
+                this.device.control.setArcBorder(false);
+            }
+        }
+    }
 }
diff --git a/src/jmapNew/shape/LimitControl/EMouse.js b/src/jmapNew/shape/LimitControl/EMouse.js
index 4abd12d5d..c650da217 100644
--- a/src/jmapNew/shape/LimitControl/EMouse.js
+++ b/src/jmapNew/shape/LimitControl/EMouse.js
@@ -2,53 +2,53 @@ import Group from 'zrender/src/container/Group';
 import Text from 'zrender/src/graphic/Text';
 
 export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.create();
-	}
-	create() {
-		this.text = new Text({
-			_subType: 'Text',
-			zlevel: this.device.zlevel,
-			z: this.device.z+1,
-			position: [0, 0],
-			style: {
-				x: this.device.model.position.x,
-				y: this.device.model.position.y + this.device.style.LimitControl.lamp.radiusR + this.device.style.LimitControl.text.distance-30,
-				fontWeight: this.device.style.LimitControl.mouseOverStyle.fontWeight,
-				fontSize: this.device.style.LimitControl.mouseOverStyle.fontSize,
-				fontFamily: this.device.style.LimitControl.mouseOverStyle.fontFormat,
-				text: this.device.model.name,
-				textFill: this.device.style.LimitControl.mouseOverStyle.fontColor,
-				textAlign: this.device.style.LimitControl.mouseOverStyle.textAlign,
-				textVerticalAlign: this.device.style.LimitControl.mouseOverStyle.textVerticalAlign
-			}
-		});
-		this.add(this.text);
-		this.text.hide();
-	}
-	mouseover(e) {
-		if (e.target && e.target._subType == 'Text') {
-			this.text.show();
-		} else {
-			this.device.control.setControlColor(this.device.style.LimitControl.mouseOverStyle.arcColor);
-			this.device.control.setTextColor(this.device.style.LimitControl.mouseOverStyle.textColor);
-			this.device.control.setTextBorder(true);
-			this.device.control.setArcBorder(true);
-		}
-	}
+    constructor(device) {
+        super();
+        this.device = device;
+        this.create();
+    }
+    create() {
+        this.text = new Text({
+            _subType: 'Text',
+            zlevel: this.device.zlevel,
+            z: this.device.z + 1,
+            position: [0, 0],
+            style: {
+                x: this.device.model.position.x,
+                y: this.device.model.position.y + this.device.style.LimitControl.lamp.radiusR + this.device.style.LimitControl.text.distance - 30,
+                fontWeight: this.device.style.LimitControl.mouseOverStyle.fontWeight,
+                fontSize: this.device.style.LimitControl.mouseOverStyle.fontSize,
+                fontFamily: this.device.style.fontFormat,
+                text: this.device.model.name,
+                textFill: this.device.style.LimitControl.mouseOverStyle.fontColor,
+                textAlign: this.device.style.LimitControl.mouseOverStyle.textAlign,
+                textVerticalAlign: this.device.style.LimitControl.mouseOverStyle.textVerticalAlign
+            }
+        });
+        this.add(this.text);
+        this.text.hide();
+    }
+    mouseover(e) {
+        if (e.target && e.target._subType == 'Text') {
+            this.text.show();
+        } else {
+            this.device.control.setControlColor(this.device.style.LimitControl.mouseOverStyle.arcColor);
+            this.device.control.setTextColor(this.device.style.LimitControl.mouseOverStyle.textColor);
+            this.device.control.setTextBorder(true);
+            this.device.control.setArcBorder(true);
+        }
+    }
 
-	mouseout(e) {
-		if (!this.device.model.down) {
-			if (e.target && e.target._subType == 'Text') {
-				this.text.hide();
-			} else {
-				this.device.control.setControlColor(this.device.style.LimitControl.lamp.controlColor);
-				this.device.control.setTextColor('#FFFFFF');
-				this.device.control.setTextBorder(false);
-				this.device.control.setArcBorder(false);
-			}
-		}
-	}
+    mouseout(e) {
+        if (!this.device.model.down) {
+            if (e.target && e.target._subType == 'Text') {
+                this.text.hide();
+            } else {
+                this.device.control.setControlColor(this.device.style.LimitControl.lamp.controlColor);
+                this.device.control.setTextColor('#FFFFFF');
+                this.device.control.setTextBorder(false);
+                this.device.control.setArcBorder(false);
+            }
+        }
+    }
 }
diff --git a/src/jmapNew/shape/SaidLamp/EMouse.js b/src/jmapNew/shape/SaidLamp/EMouse.js
index 92865a4eb..156f18853 100644
--- a/src/jmapNew/shape/SaidLamp/EMouse.js
+++ b/src/jmapNew/shape/SaidLamp/EMouse.js
@@ -17,7 +17,7 @@ export default class EMouse extends Group {
                 y: this.device.model.position.y + this.device.deviceStyle.lamp.radiusR + this.device.deviceStyle.text.distance - 30,
                 fontWeight: 'normal',
                 fontSize: this.device.deviceStyle.mouseOverStyle.fontSize,
-                fontFamily: this.device.deviceStyle.mouseOverStyle.fontFamily,
+                fontFamily: this.device.style.fontFamily,
                 text: this.device.model.name,
                 textFill: this.device.deviceStyle.mouseOverStyle.fontColor,
                 textAlign: this.device.deviceStyle.mouseOverStyle.textAlign,
diff --git a/src/jmapNew/shape/Section/EMouse.js b/src/jmapNew/shape/Section/EMouse.js
index 03316ae93..978e9e36a 100644
--- a/src/jmapNew/shape/Section/EMouse.js
+++ b/src/jmapNew/shape/Section/EMouse.js
@@ -59,6 +59,7 @@ class EMouse extends Group {
                     x: rect.x + (rect.width / 2),
                     y: rect.y + (rect.height / 2),
                     text: this.device.model.name,
+                    fontFamily: this.device.style.fontFamily,
                     textFill: this.device.style.Section.mouseOverStyle.textShadowColor, // 黄色
                     textAlign: 'middle',
                     textVerticalAlign: 'top',
diff --git a/src/jmapNew/shape/Section/ESeparator.js b/src/jmapNew/shape/Section/ESeparator.js
index 562db4652..7aa299a93 100644
--- a/src/jmapNew/shape/Section/ESeparator.js
+++ b/src/jmapNew/shape/Section/ESeparator.js
@@ -8,7 +8,7 @@ export default class ESeparator extends Group {
         super();
         this.model = model;
         this.zlevel = model.zlevel;
-        this.z = model.style.Section.separator.z || 6;
+        this.z = model.z || 6;
         this.style = model.style;
         this.setType();
     }
diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index 6815330f6..08542bfdf 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -481,6 +481,7 @@ export default class Section extends Group {
             this.lPartition = new ESeparator({
                 style: style,
                 zlevel: this.zlevel,
+                z: this.z + 3,
                 traingle: traingle,
                 point: {
                     x: model.points[0].x,
@@ -495,6 +496,7 @@ export default class Section extends Group {
             this.rPartition = new ESeparator({
                 style: style,
                 zlevel: this.zlevel,
+                z: this.z + 3,
                 traingle: traingle,
                 point: {
                     x: model.points[model.points.length - 1].x,
diff --git a/src/jmapNew/shape/Signal/ESigPost.js b/src/jmapNew/shape/Signal/ESigPost.js
index 45322b62e..5f23398c5 100644
--- a/src/jmapNew/shape/Signal/ESigPost.js
+++ b/src/jmapNew/shape/Signal/ESigPost.js
@@ -33,6 +33,7 @@ class ESigPost extends Group {
         this.hor = new Polyline({
             zlevel: model.zlevel,
             z: model.z,
+            _val: '3',
             shape: {
                 points: [
                     [model.x, model.y],
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index 9fc0c362f..132a59302 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -67,6 +67,7 @@ class Signal extends Group {
             this.ciConfirm = new Text({
                 zlevel: this.zlevel,
                 z: this.z,
+                _val: '3',
                 silent: false,
                 _subType: 'enabled',
                 style: {
@@ -110,6 +111,7 @@ class Signal extends Group {
             this.tText = new Text({
                 zlevel: this.zlevel,
                 z: this.z,
+                _val: '3',
                 style: {
                     x: endPoint.x,
                     y: endPoint.y,
diff --git a/src/jmapNew/shape/Station/ESingleControl.js b/src/jmapNew/shape/Station/ESingleControl.js
index f1e0607e3..ad2956851 100644
--- a/src/jmapNew/shape/Station/ESingleControl.js
+++ b/src/jmapNew/shape/Station/ESingleControl.js
@@ -53,7 +53,7 @@ export default class ESingleControl extends Group {
                 y: model.point.y + model.style.Station.StationControl.lamp.radiusR + model.style.Station.StationControl.text.distance,
                 fontWeight: model.style.Station.StationControl.text.fontWeight,
                 fontSize: model.style.Station.StationControl.text.fontSize,
-                fontFamily: model.style.Station.StationControl.text.fontFormat,
+                fontFamily: model.style.fontFamily,
                 text: model.context,
                 textFill: model.style.Station.StationControl.text.fontColor,
                 textAlign: model.style.Station.StationControl.text.textAlign,
diff --git a/src/jmapNew/shape/StationStand/EDetain.js b/src/jmapNew/shape/StationStand/EDetain.js
index 1f17152cb..a70e31784 100644
--- a/src/jmapNew/shape/StationStand/EDetain.js
+++ b/src/jmapNew/shape/StationStand/EDetain.js
@@ -23,7 +23,8 @@ class EDetain extends Group {
                     x: model.x,
                     y: model.y,
                     text: style.StationStand.detainCar.text,
-                    fontSize: `${style.StationStand.detainCar.fontSize} px  ${style.fontFamily}`,
+                    fontSize: `${style.StationStand.detainCar.fontSize}px`,
+                    fontFamily: style.fontFamily,
                     textFill: style.StationStand.detainCar.centerTrainColor,
                     textStroke: style.backgroundColor,
                     textAlign: style.textStyle.textAlign,
@@ -59,11 +60,13 @@ class EDetain extends Group {
 
     hideMode() {
         this.detain && this.detain.hide();
+        this.circleDetain && this.circleDetain.hide();
     }
 
     showMode() {
         this.create();
         this.detain && this.detain.show();
+        this.circleDetain && this.circleDetain.show();
     }
 }
 
diff --git a/src/jmapNew/shape/Train/EMouse.js b/src/jmapNew/shape/Train/EMouse.js
index 3b0bbccf4..9433e57a4 100644
--- a/src/jmapNew/shape/Train/EMouse.js
+++ b/src/jmapNew/shape/Train/EMouse.js
@@ -37,7 +37,7 @@ class EMouse extends Group {
             text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? this.device.model.sectionModel.parentName : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
         } else {
             if (Vue.prototype.$jlmap.lineCode == '11' || Vue.prototype.$jlmap.lineCode == '10') {
-                text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? this.device.model.sectionModel.parentName : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: 无跳停\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: CTC车\n最高信号系统控制: CTC\n驾驶模式: SM模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折法策略: \n折返状态: \n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`;
+                text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? this.device.model.sectionModel.parentName : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: CTC车\n最高信号系统控制: CTC\n驾驶模式: SM模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折法策略: \n折返状态: \n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`;
             } else {
                 text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? this.device.model.sectionModel.parentName : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`;
             }
diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js
index d849cf47a..665d41f82 100644
--- a/src/jmapNew/shape/Train/TrainBody.js
+++ b/src/jmapNew/shape/Train/TrainBody.js
@@ -99,7 +99,7 @@ export default class TrainBody extends Group {
             textAlign: 'middle',
             textVerticalAlign: 'top'
         }) : '';
-        const serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.serviceNumber || style.Train.trainServer.defaultServiceNumber) + '';//	服务号(表号)
+        const serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.serviceNumber || model.model.specialServiceNumber || style.Train.trainServer.defaultServiceNumber) + '';//	服务号(表号)
         const tripNumber = style.Train.trainTarget.tripNumberPrefix + (style.Train.trainTarget.defaultDirectionCode
             ? (model.directionCode || style.Train.trainTarget.defaultDirectionCode) + (model.tripNumber || style.Train.trainTarget.defaultTripNumber)
             : model.tripNumber || style.Train.trainTarget.defaultTripNumber) + ''; //  车次号
@@ -320,9 +320,9 @@ export default class TrainBody extends Group {
         if (type === 'PLAN') {
             this.style.Train.trainTarget.planTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.planTypeColor});
         } else if (type === 'MANUAL') {
-            this.style.Train.trainTarget.manualTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.manualTypeColor});
+            this.style.Train.trainTargetNumber.manualTypeColor && this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle({textFill: this.style.Train.trainTargetNumber.manualTypeColor});
         } else if (type === 'HEAD') {
-            this.style.Train.trainTarget.headTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.headTypeColor});
+            this.style.Train.trainTargetNumber.headTypeColor && this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle({textFill: this.style.Train.trainTargetNumber.headTypeColor});
         }
     }
     setSoonerOrLater(dt) {
@@ -344,10 +344,10 @@ export default class TrainBody extends Group {
                 this.delayTime && this.delayTime.setStyle({textFill: this.style.Train.soonerOrLater.normalColor});
             }
         } else if (this.style.Train.soonerOrLater && this.style.Train.soonerOrLater.level === 3) {
-            if (dt > 0) {
+            if (dt > 120) {
                 this.style.Train.soonerOrLater.serviceNumber && this.textTrainServer && this.textTrainServer.setStyle({textFill: this.style.Train.soonerOrLater.earlyColor});
                 this.style.Train.soonerOrLater.trainBody && this.trainBodyBox && this.trainBodyBox.setColor({stroke: this.style.Train.soonerOrLater.earlyColor});
-            } else if (dt < 0) {
+            } else if (dt < -120) {
                 this.style.Train.soonerOrLater.serviceNumber && this.textTrainServer && this.textTrainServer.setStyle({textFill: this.style.Train.soonerOrLater.lateColor});
                 this.style.Train.soonerOrLater.trainBody && this.trainBodyBox && this.trainBodyBox.setColor({stroke: this.style.Train.soonerOrLater.lateColor});
             } else {
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index 092991e40..07ba2b4be 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -29,12 +29,11 @@ export default class Train extends Group {
             style.Train.trainBody.specialTrainType.some((item) => {
                 if (model.type === item.type) {
                     this.nameFormat = item.nameFormat;
-                    model.serviceNumber = item.serviceNumber ? item.serviceNumber : model.serviceNumber;
+                    model.specialServiceNumber = item.serviceNumber ? item.serviceNumber : model.serviceNumber;
                     return true;
                 }
             });
         }
-
         this.create();
         this.setState(model, this);
         this.initShowStation(model);
@@ -408,8 +407,8 @@ export default class Train extends Group {
             this.setHoldStatus(model.hold);
             this.setJumpStatus(model.jump);
             this.setSoonerOrLater(model.dt);
-            this.setPlanRoutingTypeColor(model.planRoutingType);
             this.setTrainTypeColor(model.type);
+            this.setPlanRoutingTypeColor(model.planRoutingType);
             const style = this.style;
             if (style.Section.trainPosition.display) {
                 this.updateSection(object);
diff --git a/src/jmapNew/shape/ZcControl/EMouse.js b/src/jmapNew/shape/ZcControl/EMouse.js
index 0855053f9..fd8eb1fe8 100644
--- a/src/jmapNew/shape/ZcControl/EMouse.js
+++ b/src/jmapNew/shape/ZcControl/EMouse.js
@@ -2,53 +2,53 @@ import Group from 'zrender/src/container/Group';
 import Text from 'zrender/src/graphic/Text';
 
 export default class EMouse extends Group {
-	constructor(device) {
-		super();
-		this.device = device;
-		this.create();
-	}
-	create() {
-		this.text = new Text({
-			_subType: 'Text',
-			zlevel: this.device.zlevel,
-			z: this.device.z+1,
-			position: [0, 0],
-			style: {
-				x: this.device.model.position.x,
-				y: this.device.model.position.y + this.device.style.ZcControl.lamp.radiusR + this.device.style.ZcControl.text.distance-30,
-				fontWeight: this.device.style.ZcControl.mouseOverStyle.fontWeight,
-				fontSize: this.device.style.ZcControl.mouseOverStyle.fontSize,
-				fontFamily: this.device.style.ZcControl.mouseOverStyle.fontFormat,
-				text: this.device.model.name,
-				textFill: this.device.style.ZcControl.mouseOverStyle.fontColor,
-				textAlign: this.device.style.ZcControl.mouseOverStyle.textAlign,
-				textVerticalAlign: this.device.style.ZcControl.mouseOverStyle.textVerticalAlign
-			}
-		});
-		this.add(this.text);
-		this.text.hide();
-	}
-	mouseover(e) {
-		if (e.target && e.target._subType == 'Text') {
-			this.text.show();
-		} else {
-			this.device.control.setControlColor(this.device.style.ZcControl.mouseOverStyle.arcColor);
-			this.device.control.setTextColor(this.device.style.ZcControl.mouseOverStyle.textColor);
-			this.device.control.setTextBorder(true);
-			this.device.control.setArcBorder(true);
-		}
-	}
+    constructor(device) {
+        super();
+        this.device = device;
+        this.create();
+    }
+    create() {
+        this.text = new Text({
+            _subType: 'Text',
+            zlevel: this.device.zlevel,
+            z: this.device.z + 1,
+            position: [0, 0],
+            style: {
+                x: this.device.model.position.x,
+                y: this.device.model.position.y + this.device.style.ZcControl.lamp.radiusR + this.device.style.ZcControl.text.distance - 30,
+                fontWeight: this.device.style.ZcControl.mouseOverStyle.fontWeight,
+                fontSize: this.device.style.ZcControl.mouseOverStyle.fontSize,
+                fontFamily: this.device.style.fontFamily,
+                text: this.device.model.name,
+                textFill: this.device.style.ZcControl.mouseOverStyle.fontColor,
+                textAlign: this.device.style.ZcControl.mouseOverStyle.textAlign,
+                textVerticalAlign: this.device.style.ZcControl.mouseOverStyle.textVerticalAlign
+            }
+        });
+        this.add(this.text);
+        this.text.hide();
+    }
+    mouseover(e) {
+        if (e.target && e.target._subType == 'Text') {
+            this.text.show();
+        } else {
+            this.device.control.setControlColor(this.device.style.ZcControl.mouseOverStyle.arcColor);
+            this.device.control.setTextColor(this.device.style.ZcControl.mouseOverStyle.textColor);
+            this.device.control.setTextBorder(true);
+            this.device.control.setArcBorder(true);
+        }
+    }
 
-	mouseout(e) {
-		if (!this.device.model.down) {
-			if (e.target && e.target._subType == 'Text') {
-				this.text.hide();
-			} else {
-				this.device.control.setControlColor(this.device.style.ZcControl.lamp.controlColor);
-				this.device.control.setTextColor('#FFFFFF');
-				this.device.control.setTextBorder(false);
-				this.device.control.setArcBorder(false);
-			}
-		}
-	}
+    mouseout(e) {
+        if (!this.device.model.down) {
+            if (e.target && e.target._subType == 'Text') {
+                this.text.hide();
+            } else {
+                this.device.control.setControlColor(this.device.style.ZcControl.lamp.controlColor);
+                this.device.control.setTextColor('#FFFFFF');
+                this.device.control.setTextBorder(false);
+                this.device.control.setArcBorder(false);
+            }
+        }
+    }
 }
diff --git a/src/jmapNew/shape/factory.js b/src/jmapNew/shape/factory.js
index c943149dd..4741ab55a 100644
--- a/src/jmapNew/shape/factory.js
+++ b/src/jmapNew/shape/factory.js
@@ -17,7 +17,7 @@ import Line from './Line/index.js';
 import Text2 from './Text/index.js';
 import AxleReset from './AxleReset/index';
 import GuideLock from './GuideLock/index';
-import AutoTurnBack from './Automactic/index.js';
+import AutoTurnBack from './AutoTurnBack/index.js';
 import OutFrame from './OutFrame/index.js';
 import CheckBox from './checkBox/checkBox.js';
 import AutomaticRoute from './AutomacticRoute/index.js';
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
index 39f7b59e6..3e6bef581 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -21,50 +21,51 @@
         <el-radio-group
           :id="domIdTrainType"
           v-model="formModel.type"
-          style="margin-left: 15px;"
+          style="margin-left: 45px;"
           @change="trainTypeChange"
         >
           <el-radio :label="'PLAN'">{{ $t('menu.planTrain') }}</el-radio>
-          <el-radio :label="'MANUAL'">{{ $t('menu.headCodeTrain') }}</el-radio>
-          <el-radio :label="'HEAD'" style="margin-top:5px;">{{ $t('menu.artificialTrain') }}</el-radio>
+          <el-radio :label="'HEAD'">{{ $t('menu.headCodeTrain') }}</el-radio>
+          <el-radio :label="'MANUAL'" style="margin-top:5px;">{{ $t('menu.artificialTrain') }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-if="formModel.type == 'PLAN'" prop="serviceNumber">
-        <span slot="label">{{ $t('menu.serviceNumber') }}</span>
+      <el-form-item v-if="formModel.type == 'PLAN'|| formModel.type == 'HEAD'" prop="serviceNumber">
+        <span slot="label">{{ $t('menu.serviceNumber') + '：' }}</span>
         <el-input
           :id="domIdServerNo"
           v-model="formModel.serviceNumber"
           :disabled="serverNoIsDisabled"
         />
       </el-form-item>
-      <el-form-item v-if="formModel.type == 'PLAN'|| formModel.type == 'MANUAL'" :label="this.$t('menu.tripNumber')+this.$t('global.colon')" prop="tripNumber">
+      <el-form-item v-if="formModel.type == 'PLAN'" :label="this.$t('menu.tripNumber')+this.$t('global.colon')" prop="tripNumber">
         <el-input
           :id="domIdTrainNo"
           v-model="formModel.tripNumber"
           maxlength="4"
         />
       </el-form-item>
-      <el-form-item v-if="formModel.type == 'PLAN' || formModel.type == 'MANUAL'" :label="this.$t('menu.targetCode')+this.$t('global.colon')" prop="destinationCode">
+      <el-form-item v-if="formModel.type == 'PLAN' || formModel.type == 'HEAD'" :label="this.$t('menu.targetCode')+this.$t('global.colon')" prop="destinationCode">
         <el-input
           :id="domIdTargetCode"
           v-model="formModel.destinationCode"
+          :disabled="formModel.type !== 'HEAD'"
         />
       </el-form-item>
-      <!--<el-form-item v-if="formModel.type == '03'" :label="this.$t('menu.category')+this.$t('global.colon')" prop="category">-->
-      <!--<el-select-->
-      <!--:id="domIdTrainNumber"-->
-      <!--v-model="formModel.category"-->
-      <!--filterable-->
-      <!--:disabled="true"-->
-      <!--&gt;-->
-      <!--<el-option-->
-      <!--v-for="item in categoryList"-->
-      <!--:key="item.value"-->
-      <!--:label="item.name"-->
-      <!--:value="item.value"-->
-      <!--/>-->
-      <!--</el-select>-->
-      <!--</el-form-item>-->
+      <el-form-item v-if="formModel.type == 'MANUAL'" :label="this.$t('menu.category')+this.$t('global.colon')" prop="category">
+        <el-select
+          :id="domIdTrainNumber"
+          v-model="formModel.category"
+          filterable
+          :disabled="true"
+        >
+          <el-option
+            v-for="item in categoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
     <el-row justify="center" class="button-group">
       <el-col :span="10" :offset="2">
@@ -82,11 +83,11 @@
 <script>
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import ConfirmTrain from './childDialog/confirmTrain';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import Handler from '@/scripts/cmdPlugin/Handler';
 import { menuOperate, commitOperate } from '../utils/menuOperate';
+import {getTrainDetailBytripNumber} from '@/api/simulation';
 
 export default {
     name: 'TrainControl',
@@ -97,9 +98,7 @@ export default {
     data() {
         return {
             trainList: [],
-            categoryList: [
-                { name: 'MM', value: '01' }
-            ],
+            serviceNumber:'',
             formModel: {
                 tripNumber: '',
                 groupNumber: '',
@@ -108,7 +107,9 @@ export default {
                 destinationCode: '',
                 category: 'MM'
             },
-
+            categoryList: [
+                { name: 'MM', value: '01' }
+            ],
             rules: {
                 groupNumber: [
                     { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'change' }
@@ -116,9 +117,6 @@ export default {
                 type: [
                     { required: true, message: this.$t('rules.selectATrainType'), trigger: 'change' }
                 ],
-                serviceNumber: [
-                    { required: true, message: this.$t('rules.enterTheServiceNumber'), trigger: 'blur' }
-                ],
                 tripNumber: [
                     { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
                 ],
@@ -136,27 +134,15 @@ export default {
         ...mapGetters('map', [
             'map'
         ]),
-        trainNoIsDisabled() {
-            return false;
-        },
         serverNoIsDisabled() {
             return true;
         },
-        targetCodeIsDisabled() {
-            return true;
-        },
         trainNumberIsDisabled() {
             if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
                 return true;
             }
             return '';
         },
-        // trainTypeIsDisabled() {
-        // 	if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-        // 		return true;
-        // 	}
-        // 	return '';
-        // },
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
@@ -242,29 +228,23 @@ export default {
                 return this.$t('menu.menuTrain.editTrainId');
             }
             return '';
-        },
-        istargetCode() {
-            if (this.formModel.serviceNumber && this.formModel.targetCode) {
-                return false;
-            }
-            return true;
         }
     },
     watch: {
-        // 'formModel.tripNumber': function(val) {
-        //     if (val.length == 4) {
-        //         // this.trainNoChange(val);
-        //     } else {
-        //         this.formModel = {
-        //             groupNumber: this.formModel.groupNumber,
-        //             tripNumber: val,
-        //             type: this.formModel.type,
-        //             serviceNumber: '',
-        //             destinationCode: '',
-        //             category: 'MM'
-        //         };
-        //     }
-        // }
+        'formModel.tripNumber': function(val) {
+            if (val.length == 4) {
+                this.trainNoChange(val);
+            } else {
+                this.formModel = {
+                    groupNumber: this.formModel.groupNumber,
+                    tripNumber: val,
+                    type: this.formModel.type,
+                    serviceNumber: '',
+                    targetCode: '',
+                    category: 'MM'
+                };
+            }
+        }
     },
     mounted() {
         this.$nextTick(() => {
@@ -279,6 +259,7 @@ export default {
                 this.operation = operate.operation;
             }
             const model = this.$store.getters['map/getDeviceByCode'](selected.code);
+            this.serviceNumber = model.serviceNumber;
             this.formModel = {
                 groupNumber: model.groupNumber,
                 tripNumber: model.tripNumber,
@@ -302,37 +283,37 @@ export default {
         },
         trainNumberChange(groupNumber) {
             const operate = {
-
-                val: `${groupNumber}`,
+                groupNumber: groupNumber,
                 operation: ''
             };
-
             if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
             } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
             }
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             });
         },
         trainTypeChange(trainType) {
+            if (trainType === 'HEAD') {
+                this.formModel.serviceNumber = '';
+            } else if (trainType === 'PLAN' && this.serviceNumber) {
+                this.formModel.serviceNumber = this.serviceNumber;
+            }
             const operate = {
-
-                val: `${trainType}`,
+                type: trainType,
                 operation: ''
             };
-
             if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
             } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
             }
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -340,42 +321,26 @@ export default {
         },
         trainNoChange(tripNumber) {
             const operate = {
-                send: true,
-
-                val: tripNumber,
+                tripNumber: tripNumber,
                 operation: ''
             };
-
             if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
-                operate.cmdType = CMD.Train.addTrainId;
             } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
-                operate.cmdType = CMD.Train.editTrainId;
             }
             Handler.undo(1);
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            getTrainDetailBytripNumber(this.$route.query.group, {tripNumber:tripNumber}).then(resp => {
+                if (resp.data) {
+                    this.formModel.serviceNumber = resp.data.serviceNumber;
+                    this.formModel.destinationCode = resp.data.destinationCode;
+                }
+            }).catch(() => {
+                this.$message.error('获取列车信息失败！');
+            });
+            this.$store.dispatch('training/tripNumber', operate).then(({ valid }) => {
                 if (valid) {
-                    if (response.data) {
-                        this.formModel = {
-                            groupNumber: this.formModel.groupNumber,
-                            tripNumber: tripNumber,
-                            trainType: this.formModel.trainType,
-                            serviceNumber: response.data.serviceNumber,
-                            targetCode: response.data.targetCode,
-                            category: 'MM'
-                        };
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    } else {
-                        this.formModel = {
-                            groupNumber: this.formModel.groupNumber,
-                            tripNumber: tripNumber,
-                            trainType: this.formModel.trainType,
-                            serviceNumber: '',
-                            targetCode: '',
-                            category: 'MM'
-                        };
-                    }
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             });
         },
@@ -392,23 +357,25 @@ export default {
         addTrainId() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
-                    const model = this.formModel;
-                    const operate = {
-                        send: true,
-
-                        operation: OperationEvent.Train.addTrainId.menu.operation,
-                        cmdType: CMD.Train.CMD_ADD_TRAIN_ID,
-                        messages: [this.$t('tip.addTrainIdTip')],
-                        val: `${model.groupNumber}::${model.trainType}::${model.serviceNumber}::${model.tripNumber}::${model.targetCode}`
+                    const params = {
+                        groupNumber: this.formModel.groupNumber,
+                        type: this.formModel.type,
+                        serviceNumber: '',
+                        tripNumber: '',
+                        destinationCode: ''
                     };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (this.formModel.type === 'PLAN') {
+                        params.serviceNumber = this.formModel.serviceNumber;
+                        params.tripNumber = this.formModel.tripNumber;
+                        params.destinationCode = this.formModel.destinationCode;
+                    } else if (this.formModel.type === 'HEAD') {
+                        params.tripNumber = this.formModel.tripNumber;
+                        params.destinationCode = this.formModel.destinationCode;
+                    }
+                    commitOperate(menuOperate.TrainWindow.addTrainId, params, 2).then(({valid})=>{
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                            this.$refs.confirmTrain.doShow(operate);
                         }
                     }).catch(() => {
                         this.loading = false;
@@ -424,28 +391,6 @@ export default {
         editTrainId() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
-                    // const operate = {
-                    //     send: true,
-                    //
-                    //     operation: OperationEvent.Train.editTrainId.menu.operation,
-                    //     cmdType: CMD.Train.CMD_EDIT_TRAIN_ID,
-                    //     messages: [this.$t('tip.editTrainIdTip')],
-                    //     val: `${this.formModel.trainType}::${this.formModel.tripNumber}`
-                    // };
-                    //
-                    // this.loading = true;
-                    // this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    //     this.loading = false;
-                    //     if (valid) {
-                    //         this.doClose();
-                    //         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    //         this.$refs.confirmTrain.doShow(operate);
-                    //     }
-                    // }).catch(() => {
-                    //     this.loading = false;
-                    //     this.doClose();
-                    //     this.$refs.noticeInfo.doShow();
-                    // });
                     const params = {
                         groupNumber: this.formModel.groupNumber,
                         type: this.formModel.type,
@@ -453,11 +398,11 @@ export default {
                         tripNumber: '',
                         destinationCode: ''
                     };
-                    if (this.formModel.type === '01') {
+                    if (this.formModel.type === 'PLAN') {
                         params.serviceNumber = this.formModel.serviceNumber;
                         params.tripNumber = this.formModel.tripNumber;
                         params.destinationCode = this.formModel.destinationCode;
-                    } else if (this.formModel.type === '02') {
+                    } else if (this.formModel.type === 'HEAD') {
                         params.tripNumber = this.formModel.tripNumber;
                         params.destinationCode = this.formModel.destinationCode;
                     }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
index 32e9ad06e..8e98c0f6f 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
@@ -3,6 +3,8 @@
     <el-select
       v-model="groupNumber"
       filterable
+      size="small"
+      style="width: 100%;"
       :disabled="true"
     >
       <el-option
@@ -12,7 +14,13 @@
         :value="train.groupNumber"
       />
     </el-select>
-    <el-table :data="tableData" :show-header="false">
+    <div style="margin-top: 5px;">
+      <div :class="[tabType==='baseInfo'?'simulate-tabs-button-active':'simulate-tabs-button']" style="margin-right: 6px" @click="changeTabs('baseInfo')">基本信息</div>
+      <div :class="[tabType==='groupInfo'?'simulate-tabs-button-active':'simulate-tabs-button']" style="margin-right: 6px" @click="changeTabs('groupInfo')">车组信息</div>
+      <div :class="[tabType==='planInfo'?'simulate-tabs-button-active':'simulate-tabs-button']" style="margin-right: 6px" @click="changeTabs('planInfo')">计划信息</div>
+      <div :class="[tabType==='atcInfo'?'simulate-tabs-button-active':'simulate-tabs-button']" @click="changeTabs('atcInfo')">ATC信息</div>
+    </div>
+    <el-table :data="tableData" :show-header="false" border style="margin-top: 5px;height: 360px;">
       <el-table-column prop="key" label="key" />
       <el-table-column prop="value" label="value" />
     </el-table>
@@ -32,6 +40,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import Handler from '@/scripts/cmdPlugin/Handler';
 import { menuOperate, commitOperate } from '../utils/menuOperate';
+import {TrainType} from '@/scripts/ConstDic';
 
 export default {
     name: 'TrainControl',
@@ -42,13 +51,14 @@ export default {
             trainList: [],
             tableData: [],
             baseInfo: [],
-            marshallingInfo: [],
+            groupInfo: [],
             planInfo: [],
             atcInfo: [],
             operation: null,
             dialogShow: false,
             loading: false,
-            groupNumber: ''
+            groupNumber: '',
+            tabType: 'baseInfo'
         };
     },
     computed: {
@@ -80,64 +90,7 @@ export default {
             if (!this.dialogShow) {
                 this.operation = operate.operation;
             }
-            const model = this.$store.getters['map/getDeviceByCode'](selected.code);
-            this.groupNumber = model.groupNumber;
-            this.baseInfo = [
-                {key: '车组号', value: model.groupNumber},
-                {key: '车次号', value: ''},
-                {key: '表号', value: ''},
-                {key: '目的地号', value: ''},
-                {key: '类型', value: ''},
-                {key: '司机号', value: ''},
-                {key: '车站', value: ''},
-                {key: '所处设备', value: ''},
-                {key: '跟踪模式', value: ''},
-                {key: 'ATP切除', value: ''},
-                {key: '停站状态', value: ''}
-            ];
-            this.marshallingInfo = [
-                {key: '车组号', value: ''},
-                {key: '设备ID', value: ''},
-                {key: '车头号1', value: ''},
-                {key: '车头号2', value: ''},
-                {key: '车厢号1', value: ''},
-                {key: '车厢号2', value: ''},
-                {key: '车厢号3', value: ''},
-                {key: '车厢号4', value: ''},
-                {key: '车厢号5', value: ''},
-                {key: '车厢号6', value: ''},
-                {key: '车厢号7', value: ''},
-                {key: '车厢号8', value: ''}
-            ];
-            this.planInfo = [
-                {key: '车组号', value: ''},
-                {key: '车次号', value: ''},
-                {key: '表号', value: ''},
-                {key: '运行等级', value: ''},
-                {key: '状态', value: ''},
-                {key: '计划偏离', value: ''},
-                {key: '停站时间', value: ''},
-                {key: '计划到站', value: ''},
-                {key: '计划到点', value: ''},
-                {key: '计划发点', value: ''},
-                {key: '终端发车站台', value: ''},
-                {key: '终端发车时间', value: ''},
-                {key: '预计离开站台', value: ''},
-                {key: '预计离开时间', value: ''},
-                {key: '预计到达站台', value: ''},
-                {key: '预计到达时间', value: ''},
-                {key: '区间运行时分', value: ''}
-            ];
-            this.atcInfo = [
-                {key: '车组号', value: ''},
-                {key: '车次号', value: ''},
-                {key: '表号', value: ''},
-                {key: '运行方向', value: ''},
-                {key: '扣车状态', value: ''},
-                {key: '车门状态', value: ''},
-                {key: '驾驶模式', value: ''},
-                {key: '目的地号', value: ''}
-            ];
+            this.initData(selected);
             this.tableData = this.baseInfo;
             /** 加载列车数据*/
             this.dialogShow = true;
@@ -174,7 +127,118 @@ export default {
             }).catch(() => {
                 this.doClose();
             });
+        },
+        changeTabs(type) {
+            switch (type) {
+            case 'baseInfo':
+                this.tableData = this.baseInfo;
+                this.tabType = 'baseInfo';
+                break;
+            case 'groupInfo':
+                this.tableData = this.groupInfo;
+                this.tabType = 'groupInfo';
+                break;
+            case 'planInfo':
+                this.tableData = this.planInfo;
+                this.tabType = 'planInfo';
+                break;
+            case 'atcInfo':
+                this.tableData = this.atcInfo;
+                this.tabType = 'atcInfo';
+                break;
+            }
+        },
+        initData(model) {
+            this.groupNumber = model.groupNumber;
+            this.baseInfo = [
+                {key: '车组号', value: model.groupNumber},
+                {key: '车次号', value: model.tripNumber},
+                {key: '表号', value: model.serviceNumber},
+                {key: '目的地号', value: model.destinationCode},
+                {key: '类型', value: TrainType[model.type]},
+                {key: '司机号', value: ''},
+                {key: '车站', value: ''},
+                {key: '所处设备', value: ''},
+                {key: '跟踪模式', value: ''},
+                {key: 'ATP切除', value: ''},
+                {key: '停站状态', value: ''}
+            ];
+            this.groupInfo = [
+                {key: '车组号', value: model.groupNumber},
+                {key: '设备ID', value: ''},
+                {key: '车头号1', value: ''},
+                {key: '车头号2', value: ''},
+                {key: '车厢号1', value: ''},
+                {key: '车厢号2', value: ''},
+                {key: '车厢号3', value: ''},
+                {key: '车厢号4', value: ''},
+                {key: '车厢号5', value: ''},
+                {key: '车厢号6', value: ''},
+                {key: '车厢号7', value: ''},
+                {key: '车厢号8', value: ''}
+            ];
+            this.planInfo = [
+                {key: '车组号', value: model.groupNumber},
+                {key: '车次号', value: model.tripNumber},
+                {key: '表号', value: model.serviceNumber},
+                {key: '运行等级', value: model.runLevel},
+                {key: '状态', value: ''},
+                {key: '计划偏离', value: model.dt},
+                {key: '停站时间', value: ''},
+                {key: '计划到站', value: ''},
+                {key: '计划到点', value: ''},
+                {key: '计划发点', value: ''},
+                {key: '终端发车站台', value: ''},
+                {key: '终端发车时间', value: ''},
+                {key: '预计离开站台', value: ''},
+                {key: '预计离开时间', value: ''},
+                {key: '预计到达站台', value: ''},
+                {key: '预计到达时间', value: ''},
+                {key: '区间运行时分', value: ''}
+            ];
+            this.atcInfo = [
+                {key: '车组号', value: model.groupNumber},
+                {key: '车次号', value: model.tripNumber},
+                {key: '表号', value: model.serviceNumber},
+                {key: '运行方向', value: model.right ? '上行' : '下行'},
+                {key: '扣车状态', value: model.runControlStatus === '01' ? '正常' : model.runControlStatus === '03' ? '跳停' : '扣车'},
+                {key: '车门状态', value: model.speed ? '关闭' : '开启'},
+                {key: '驾驶模式', value: 'SM模式'},
+                {key: '目的地号', value: model.destinationCode}
+            ];
         }
     }
 };
 </script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.simulate-tabs-button {
+		display: inline;
+		border-top: solid 1px #FBFAEF;
+		border-left: solid 1px #FBFAEF;
+		border-bottom: solid 1px #858273;
+		border-right: solid 1px #858273;
+		width: 90px;
+		height: 28px;
+		font-size: 14px;
+		line-height: 28px;
+		padding: 2px 10px;
+	}
+	.simulate-tabs-button:active{
+		border-top: solid 1px #858273;
+		border-left: solid 1px #858273;
+		border-bottom: solid 1px #FBFAEF;
+		border-right: solid 1px #FBFAEF;
+	}
+	.simulate-tabs-button-active{
+		display: inline;
+		border-top: solid 1px #858273;
+		border-left: solid 1px #858273;
+		border-bottom: solid 1px #FBFAEF;
+		border-right: solid 1px #FBFAEF;
+		width: 90px;
+		height: 28px;
+		font-size: 14px;
+		line-height: 28px;
+		padding: 2px 10px;
+	}
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/index.vue b/src/jmapNew/theme/xian_01/menus/index.vue
index d92cd369d..80e174563 100644
--- a/src/jmapNew/theme/xian_01/menus/index.vue
+++ b/src/jmapNew/theme/xian_01/menus/index.vue
@@ -96,6 +96,21 @@ export default {
         overflow: hidden !important;
     }
 
+	.xian-01__systerm.pop-menu{
+		padding: 0;
+		padding-left: 20px;
+	}
+	.xian-01__systerm.pop-menu .dsp-block {
+		display: block;
+		text-align: left;
+		width: 100%;
+		border-radius: unset;
+		border: 1px solid transparent;
+		color: #000;
+		padding: 6px 6px;
+		border-left: 1px solid #bdbcbc;
+	}
+
     .xian-01__systerm .el-dialog {
         background: rgba(100, 100, 100, 0.3);
         border: 2px solid rgb(144, 144, 144, 0.8);
diff --git a/src/jmapNew/theme/xian_01/menus/menuBar.vue b/src/jmapNew/theme/xian_01/menus/menuBar.vue
index e59b47d55..679d5f01d 100644
--- a/src/jmapNew/theme/xian_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuBar.vue
@@ -67,6 +67,10 @@
         </template>
       </template>
     </div>
+    <!--<div class="deviceStatus">-->
+    <!--<div class="holdTrainStatus">H</div>-->
+    <!--<div class="jumpStopStatus">S</div>-->
+    <!--</div>-->
     <station-control-convert ref="stationControlConvert" />
     <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
     <view-train-id ref="viewTrainId" />
@@ -694,7 +698,7 @@ export default {
 <style scoped rel="stylesheet/scss" lang="scss">
     @import "src/styles/mixin.scss";
     $width: 30px;
-    $height: 30px;
+    $height:30px;
     $menuPadding: 10px;
     $menuItemHeight: 30px;
     $menuItemWidth: 190px;
@@ -810,4 +814,21 @@ export default {
         -moz-box-sizing: border-box;
         -webkit-box-sizing: border-box;
     }
+
+    .deviceStatus{
+        display: inline-block;
+        font-size: 0;
+        height: 40px;
+        background: #f0f0f0;
+        width: 300px;
+    }
+    .holdTrainStatus,.jumpStopStatus{
+        color: #fff;
+        display: inline-block;
+        width: 30px;
+        height: 30px;
+        text-align: center;
+        background: #ccc;
+        font-size:14px;
+    }
 </style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuCancel.vue b/src/jmapNew/theme/xian_01/menus/menuCancel.vue
index 56bfbeb33..89aa52c8c 100644
--- a/src/jmapNew/theme/xian_01/menus/menuCancel.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuCancel.vue
@@ -63,18 +63,12 @@ export default {
         initMenu() {
             this.menuNormal = [];
             this.stationList.forEach(station => {
-                if (station.chargeStationCodeList && station.chargeStationCodeList.length) {
+                if (station.relStationCodeList && station.relStationCodeList.length) {
                     const node = {
                         label: station.name,
-                        children: [
-                            {
-                                code: station.code,
-                                label: station.name,
-                                handler: this.mapLocation
-                            }
-                        ]
+                        children: []
                     };
-                    station.chargeStationCodeList.forEach(item => {
+                    station.relStationCodeList.forEach(item => {
                         const next = this.$store.getters['map/getDeviceByCode'](item);
                         node.children.push({
                             code: next.code,
diff --git a/src/jmapNew/theme/xian_01/menus/menuSection.vue b/src/jmapNew/theme/xian_01/menus/menuSection.vue
index 1589964cd..dedd28ab0 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSection.vue
@@ -1,12 +1,10 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <section-control ref="sectionControl" />
     <section-cmd-control ref="sectionCmdControl" />
     <speed-cmd-control ref="speedCmdControl" />
     <notice-info ref="noticeInfo" />
-    <set-fault ref="setFault" />
-    <train-add-plan ref="trainAddPlan" />
   </div>
 </template>
 
@@ -21,9 +19,7 @@ import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from './utils/menuOperate';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import TrainAddPlan from './dialog/trainAddPlan';
 
 export default {
     name: 'SectionMenu',
@@ -32,9 +28,7 @@ export default {
         SectionControl,
         SectionCmdControl,
         SpeedCmdControl,
-        NoticeInfo,
-        SetFault,
-        TrainAddPlan
+        NoticeInfo
     },
     props: {
         selected: {
@@ -199,7 +193,7 @@ export default {
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainAddPlan.doShow(step, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', step);
                 }
             });
         },
@@ -207,7 +201,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -215,7 +209,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
index 197a15e81..b9cf196a7 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <route-selection ref="routeSelection" />
     <route-lock ref="routeLock" />
     <route-control ref="routeControl" />
@@ -8,7 +8,6 @@
     <route-hand-control ref="routeHandControl" />
     <route-detail ref="routeDetail" />
     <notice-info ref="noticeInfo" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -26,7 +25,6 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import { menuOperate, commitOperate } from './utils/menuOperate';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 
 export default {
     name: 'SignalMenu',
@@ -38,8 +36,7 @@ export default {
         RouteCmdControl,
         RouteHandControl,
         RouteDetail,
-        NoticeInfo,
-        SetFault
+        NoticeInfo
     },
     props: {
         selected: {
@@ -231,7 +228,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -239,7 +236,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue
index 68b97edd6..ae11724e8 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <station-cmd-control ref="stationCmdControl" />
     <station-human-control-all ref="stationHumanControlAll" />
     <station-set-route-control-all ref="stationSetRouteControlAll" />
@@ -131,10 +131,12 @@ export default {
             }
         },
         doShow(point) {
-            this.clickEvent();
-            this.initMenu();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
+            if (this.selected.ciStation) {
+                this.clickEvent();
+                this.initMenu();
+                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                    this.$refs.popMenu.resetShowPosition(point);
+                }
             }
         },
         doClose() {
@@ -245,7 +247,10 @@ export default {
             const operate = {
                 start: true,
                 code: this.selected.code,
-                operation: OperationEvent.Station.humanControlALL.menu.operation
+                operation: OperationEvent.Station.humanControlALL.menu.operation,
+                param:{
+                    stationCode:this.selected.code
+                }
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
@@ -259,7 +264,10 @@ export default {
             const operate = {
                 start: true,
                 code: this.selected.code,
-                operation: OperationEvent.Station.atsAutoControlALL.menu.operation
+                operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
+                param:{
+                    stationCode:this.selected.code
+                }
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
diff --git a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
index e8de5bd4f..92383cc75 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <stand-control ref="standControl" />
     <stand-detail ref="standDetail" />
     <stand-run-level ref="standRunLevel" />
@@ -8,7 +8,6 @@
     <stand-detain-train-all ref="standDetainTrainAll" />
     <notice-info ref="noticeInfo" />
     <stand-back-strategy ref="standBackStrategy" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -22,12 +21,11 @@ import StandStopTime from './dialog/standStopTime';
 import StandDetainTrainAll from './dialog/standDetainTrainAll';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+// import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from './utils/menuOperate';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 
 export default {
     name: 'StationStandMenu',
@@ -39,8 +37,7 @@ export default {
         NoticeInfo,
         StandBackStrategy,
         StandStopTime,
-        StandDetainTrainAll,
-        SetFault
+        StandDetainTrainAll
     },
     props: {
         selected: {
@@ -196,7 +193,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -204,7 +201,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
index 17aebdcbe..767b37f07 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
@@ -1,11 +1,10 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <switch-control ref="switchControl" />
     <switch-cmd-control ref="switchCmdControl" />
     <speed-cmd-control ref="speedCmdControl" />
     <notice-info ref="noticeInfo" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -20,7 +19,6 @@ import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from './utils/menuOperate';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 
 export default {
     name: 'SwitchMenu',
@@ -29,8 +27,7 @@ export default {
         SwitchControl,
         SwitchCmdControl,
         SpeedCmdControl,
-        NoticeInfo,
-        SetFault
+        NoticeInfo
     },
     props: {
         selected: {
@@ -220,7 +217,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -228,7 +225,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index a211af021..2c9f247f4 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -1,12 +1,13 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
     <notice-info ref="noticeInfo" />
     <train-control ref="trainControl" />
     <train-delete ref="trainDelete" />
     <train-move ref="trainMove" />
     <train-switch ref="trainSwitch" />
     <train-edit-number ref="trainEditNumber" />
+    <train-detail ref="trainDetail" />
   </div>
 </template>
 
@@ -22,6 +23,7 @@ import TrainDelete from './dialog/trainDelete';
 import TrainMove from './dialog/trainMove';
 import TrainSwitch from './dialog/trainSwitch';
 import TrainEditNumber from './dialog/trainEditNumber';
+import TrainDetail from './dialog/trainDetail';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
@@ -33,7 +35,8 @@ export default {
         TrainDelete,
         TrainMove,
         TrainSwitch,
-        TrainEditNumber
+        TrainEditNumber,
+        TrainDetail
     },
     props: {
         selected: {
@@ -50,48 +53,48 @@ export default {
                 Local: [],
                 Center: [
                     {
-                        label: this.$t('menu.menuTrain.addTrainId'),
-                        handler: this.addTrainId,
-                        cmdType:''
+                        label: '添加列车识别号',
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
-                        label: this.$t('menu.menuTrain.deleteTrainId'),
-                        handler: this.delTrainId,
-                        cmdType:''
+                        label: '删除列车识别号',
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
-                        label: this.$t('menu.menuTrain.editTrainId'),
+                        label: '修改列车识别号',
                         handler: this.editTrainId,
-                        cmdType:CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
-                        label: this.$t('menu.menuTrain.editTrainNo'),
-                        handler: this.editTrainNo,
-                        cmdType:''
+                        label: '修改车组号',
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
-                        label: this.$t('menu.menuTrain.moveTrainId'),
-                        handler: this.moveTrainId,
-                        cmdType:''
+                        label: '移动列车识别号',
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
-                        label: this.$t('menu.menuTrain.switchTrainId'),
-                        handler: this.switchTrainId,
-                        cmdType:''
+                        label: '交换列车识别号',
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
                         label: '标记ATP切除',
-                        handler: this.undeveloped(),
+                        handler: this.undeveloped,
                         cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_CUT
                     },
                     {
                         label: '标记ATP激活',
-                        handler: this.undeveloped(),
+                        handler: this.undeveloped,
                         cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_RECOVER
                     },
                     {
                         label: '查看列车详细运行信息',
-                        handler: this.undeveloped(),
+                        handler: this.undeveloped,
                         cmdType: CMD.TrainWindow.CMD_TRAIN_INFO
                     }
                 ]
@@ -144,10 +147,9 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
             this.menu = MenuContextHandler.covert(this.menuNormal);
             if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
+                this.menu = [...this.menu, ...this.menuForce];
             }
 
             // 故障模式菜单列表
@@ -159,28 +161,26 @@ export default {
             this.clickEvent();
             this.initMenu();
 
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+            if (this.$refs.popMenu && this.menu && this.menu.length) {
                 this.$refs.popMenu.resetShowPosition(point);
             }
         },
         doClose() {
-            if (this.$refs && this.$refs.popMenu) {
+            if (this.$refs.popMenu) {
                 this.$refs.popMenu.close();
-                // this.$store.dispatch('map/setTrainWindowShow', false);
             }
         },
         // 设置故障
         setStoppage() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.stoppage.menu.operation,
                 cmdType: CMD.Train.CMD_STOPPAGE,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -194,14 +194,13 @@ export default {
         cancelStoppage() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.cancelStoppage.menu.operation,
                 cmdType: CMD.Train.CMD_CANCEL_STOPPAGE,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -215,14 +214,13 @@ export default {
         limitSpeed() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.limitSpeed.menu.operation,
                 cmdType: CMD.Train.CMD_LIMIT_SPEED,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -236,13 +234,12 @@ export default {
         addTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.addTrainId.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(step, this.selected);
@@ -253,13 +250,12 @@ export default {
         delTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.delTrainId.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(step, this.selected);
@@ -270,13 +266,12 @@ export default {
         editTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.editTrainId.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(step, this.selected);
@@ -287,13 +282,12 @@ export default {
         editTrainNo() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.editTrainNo.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEditNumber.doShow(step, this.selected);
@@ -304,36 +298,57 @@ export default {
         moveTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.moveTrainId.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMove.doShow(step, this.selected);
                 }
             });
         },
-        undeveloped() {},
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
         // 交换列车识别号
         switchTrainId() {
             const step = {
                 start: true,
-
                 operation: OperationEvent.Train.switchTrainId.menu.operation,
                 param: {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSwitch.doShow(step, this.selected);
                 }
             });
+        },
+        checkTrainDetails() {
+            const step = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Train.trainDetailInfo.menu.operation,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDetail.doShow(step, this.selected);
+                }
+            });
         }
     }
 };
diff --git a/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js b/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
index 2323957ec..c084d1998 100644
--- a/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
+++ b/src/jmapNew/theme/xian_01/menus/utils/menuOperate.js
@@ -60,7 +60,7 @@ export const menuOperate = {
         cancelTrainRoute:{
             // 取消进路
             operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
-            cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+            cmdType: CMD.Signal.CMD_SIGNAL_FORCE_CANCEL_ROUTE
         },
         lock:{
             // 信号封锁
@@ -268,15 +268,19 @@ export const menuOperate = {
         editTrainId: {
             operation: OperationEvent.Train.editTrainId.menu.operation,
             cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+        },
+        addTrainId: {
+            operation: OperationEvent.Train.addTrainId.menu.operation,
+            cmdType: ''
         }
     },
     Common: {
         setFault: {
-            operation: OperationEvent.Section.stoppage.menu.operation,
+            operation: OperationEvent.MixinCommand.stoppage.menu.operation,
             cmdType: CMD.Fault.CMD_SET_FAULT
         },
         cancelFault: {
-            operation: OperationEvent.Section.cancelStoppage.menu.operation,
+            operation: OperationEvent.MixinCommand.cancelStoppage.menu.operation,
             cmdType: CMD.Fault.CMD_CANCEL_FAULT
         }
     }
diff --git a/src/jmapNew/theme/xian_01/planConvert.js b/src/jmapNew/theme/xian_01/planConvert.js
index fdbf73e59..5fde9cd64 100644
--- a/src/jmapNew/theme/xian_01/planConvert.js
+++ b/src/jmapNew/theme/xian_01/planConvert.js
@@ -220,7 +220,7 @@ export default {
                             serie.markPoint.data.push(createMartPoint({
                                 directionCode: elem.directionCode,
                                 coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
-                                name: `(${elem.groupNumber})${elem.serviceNumber}${elem.directionCode}${elem.tripNumber}`,
+                                name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`,
                                 color: lineStyle.color || '#000'
                             }));
                         }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainAddPlan.vue
deleted file mode 100644
index 6c4c3fca4..000000000
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainAddPlan.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="xian-02__system stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="340px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
-      <div style="width: 96%;">
-        <el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
-          <el-select v-model="addModel.tripNumber" filterable @change="tripNumberChange">
-            <el-option
-              v-for="tripNum in tripNumberList"
-              :key="tripNum"
-              :label="tripNum"
-              :value="tripNum"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="服 务 号:" label-width="95px" prop="serviceNumber">
-          <el-select v-model="addModel.serviceNumber" filterable>
-            <el-option
-              v-for="serviceNumber in serviceNumberList"
-              :key="serviceNumber"
-              :label="serviceNumber"
-              :value="serviceNumber"
-            />
-          </el-select>
-        </el-form-item>
-      </div>
-    </el-form>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <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 { getTripNumberList, getServiceNumbersByTripNum } from '@/api/simulation';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    // name: 'TrainMove',
-    name: 'TrainAddPlan',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            selected: null,
-            tripNumberList:  [],
-            serviceNumberList: [],
-            addModel: {
-                serviceNumber: '', // 服务号
-                tripNumber: '' // 车次号
-            },
-
-            rules: {
-                serviceNumber: [
-                    { required: true, message: '请输入服务号', trigger: 'blur' }
-                ],
-                tripNumber: [
-                    { required: true, message: '请输入车次号', trigger: 'change' }
-                ]
-            },
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'trainList',
-            'stationStandList',
-            'trainWindowSectionCode'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.createPlanTrain.menu.domId : '';
-        },
-        title() {
-            return '创建计划车';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        tripNumberChange(tripNumber) {
-            getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => {
-                this.serviceNumberList = [];
-                if (typeof resp.data == 'string') {
-                    this.serviceNumberList.push(resp.data);
-                } else {
-                    resp.data.forEach(item => {
-                        if (!this.serviceNumberList.includes(item)) {
-                            this.serviceNumberList.push(item);
-                        }
-                    });
-                }
-                if (this.serviceNumberList.length === 1) {
-                    this.addModel.serviceNumber = this.serviceNumberList[0];
-                }
-            });
-        },
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            // if (!this.dialogShow) {
-
-            // }
-            this.addModel = {
-                tripNumber:'',
-                serviceNumber:''
-            };
-            getTripNumberList(this.$route.query.group).then(resp => {
-                this.tripNumberList = [];
-                resp.data.forEach(item => {
-                    if (!this.tripNumberList.includes(item)) {
-                        this.tripNumberList.push(item);
-                    }
-                });
-            }).catch(error => {
-                console.log(error);
-                // this.$messageBox(error.message);
-            });
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            // this.mouseCancelState(this.selected);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        over: true,
-                        operation: OperationEvent.Train.createPlanTrain.menu.operation,
-                        cmdType: CMD.Section.CMD_Train_Init_Plan,
-                        param: {
-                            serviceNumber: this.addModel.serviceNumber, // 服务号
-                            tripNumber: this.addModel.tripNumber // 车次号
-                        }
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        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>
-<style scoped>
-    .xian-02__system .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
new file mode 100644
index 000000000..1eaa48b54
--- /dev/null
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="xian-02__system train-move"
+    :title="title"
+    :visible.sync="show"
+    width="760px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="12">车体号:</el-col>
+      <el-col :span="12">追踪号:</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 100px;" @change="inputGroupNumber" />
+      </el-col>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 100px;" @change="inputGroupNumber" />
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">实际的DID</el-col>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">被请求的DID</el-col>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">DID浏览选项</el-col>
+      <el-col :span="12">
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="5">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+
+export default {
+    name: 'TrainMove',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            addModel: {
+                stationName: '',
+                trainWindowCode: '',
+                groupNumber: ''
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdInput() {
+            return this.dialogShow ? OperationEvent.Train.addTrainId.input.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.addTrainId.menu.domId : '';
+        },
+        title() {
+            return '移动车组号';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
+                if (section) {
+                    const station = this.$store.getters['map/getDeviceByCode'](section.stationCode);
+                    if (station) {
+                        this.addModel.stationName = station.name;
+                    }
+                }
+                this.addModel.trainWindowCode = selected.code;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            this.mouseCancelState(this.selected);
+        },
+        inputGroupNumber() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Train.addTrainId.input.operation,
+                val: this.addModel.groupNumber
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Train.addTrainId.menu.operation,
+                val: this.addModel.groupNumber
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    /deep/ .el-row {
+        margin: 10px
+    }
+
+    .xian-02__system .el-dialog .base-label {
+        background: rgba(0, 0, 0, 0.3);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue
index db33f9363..8ab55f8c0 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue
@@ -6,8 +6,6 @@
     <speed-limit-control ref="speedLimitControl" />
     <alxe-effective ref="alxeEffective" />
     <notice-info ref="noticeInfo" />
-    <train-add-plan ref="trainAddPlan" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -24,8 +22,6 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 // import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from './utils/menuOperate';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
-import TrainAddPlan from './dialog/trainAddPlan';
 
 export default {
     name: 'SectionMenu',
@@ -36,8 +32,6 @@ export default {
         SpeedLimitControl,
         AlxeEffective,
         NoticeInfo,
-        SetFault,
-        TrainAddPlan
     },
     props: {
         selected: {
@@ -205,7 +199,8 @@ export default {
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainAddPlan.doShow(step, this.selected);
+                    // this.$refs.trainAddPlan.doShow(step, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', step);
                 }
             });
         },
@@ -213,7 +208,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -221,7 +216,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index 7ed66994a..d769bb877 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -9,7 +9,6 @@
     <route-detail ref="routeDetail" />
     <router-command ref="routerCommand" />
     <notice-info ref="noticeInfo" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -29,7 +28,6 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 
 export default {
     name: 'SignalMenu',
@@ -42,8 +40,7 @@ export default {
         RouteHandControl,
         RouteDetail,
         RouterCommand,
-        NoticeInfo,
-        SetFault
+        NoticeInfo
     },
     props: {
         selected: {
@@ -268,7 +265,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -276,7 +273,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
index 62efcc86f..f785dda55 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
@@ -6,7 +6,6 @@
     <speed-limit-control ref="speedLimitControl" />
     <alxe-effective ref="alxeEffective" />
     <notice-info ref="noticeInfo" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -24,7 +23,6 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from './utils/menuOperate';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 
 export default {
     name: 'SwitchMenu',
@@ -34,8 +32,7 @@ export default {
         SwitchUnLock,
         SpeedLimitControl,
         AlxeEffective,
-        NoticeInfo,
-        SetFault
+        NoticeInfo
     },
     props: {
         selected: {
@@ -245,7 +242,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -253,7 +250,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index e01bbf2ec..91736ebf8 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -1,18 +1,15 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" :tip-subhead="tipSubhead" />
+    <pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" :tip-subhead="tipSubhead" pop-class="xian-02__pop_tip_station" />
     <notice-info ref="noticeInfo" />
     <train-delete ref="trainDelete" />
     <train-define ref="trainDefine" />
     <train-move ref="trainMove" />
-    <!-- <train-edit ref="trainEdit" /> -->
     <train-set-plan ref="trainSetPlan" />
-    <train-add-plan ref="trainAddPlan" />
-    <!-- <train-move-evently ref="trainMoveEvently" /> -->
-    <!-- <train-delete-plan ref="trainDeletePlan" /> -->
     <train-set-head ref="trainSetHead" />
     <train-set-work ref="trainSetWork" />
     <trainSetWorkATP ref="trainSetWorkATP" />
+    <train-destination ref="trainDestination" />
   </div>
 </template>
 
@@ -24,10 +21,10 @@ import TrainDelete from './dialog/trainDelete';
 import TrainDefine from './dialog/trainDefine';
 import TrainMove from './dialog/trainMove';
 import TrainSetPlan from './dialog/trainSetPlan';
-import TrainAddPlan from './dialog/trainAddPlan';
 import TrainSetHead from './dialog/trainSetHead';
 import TrainSetWork from './dialog/trainSetWork';
 import trainSetWorkATP from './dialog/trainSetWorkATP';
+import TrainDestination from './dialog/trainDestination';
 
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
@@ -44,10 +41,10 @@ export default {
         TrainDefine,
         TrainMove,
         TrainSetPlan,
-        TrainAddPlan,
         TrainSetHead,
         TrainSetWork,
-        trainSetWorkATP
+        trainSetWorkATP,
+        TrainDestination
     },
     props: {
         selected: {
@@ -64,75 +61,6 @@ export default {
             menu: [],
             menuNormal: {
                 Local: [
-                    // {
-                    //     label: '设置车组号',
-                    //     handler: this.addTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '删除车组号',
-                    //     handler: this.delTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '移动车组号',
-                    //     handler: this.moveTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '新建计划车',
-                    //     handler: this.addPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '设置计划车',
-                    //     handler: this.setPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置头码车',
-                    //     handler: this.setHeadTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置人工车',
-                    //     handler: this.setWorkTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设乘务组号',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '标记ATP切除',
-                    //     handler: this.setTrainATPdel,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '标记ATP恢复',
-                    //     handler: this.setTrainATPRec,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '旅行冲突列车',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '列车信息',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // }
                 ],
                 Center: [
                     {
@@ -140,41 +68,51 @@ export default {
                         children: [
                             {
                                 label: '目的地ID',
-                                handler: this.atsAutoControlALL
+                                // handler: this.updateDestination,
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '删除ID',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '更改追踪号',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '交换追踪号',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '运行等级',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '列车模式',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '惰性模式',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '旁路模式',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             }
                         ]
                     },
                     {
                         label: '列车明细',
-                        handler: this.atsAutoControlALL
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
                         label: '请求',
@@ -184,37 +122,45 @@ export default {
                                 children:[
                                     {
                                         label: '扣车',
-                                        handler: this.atsAutoControlALL
+                                        handler: this.undeveloped,
+                                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                                     },
                                     {
                                         label: '发车 ',
-                                        handler: this.atsAutoControlALL
+                                        handler: this.undeveloped,
+                                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                                     }
                                 ]
                             },
                             {
                                 label: '停车/放行',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '就绪状态',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '测试',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '救援列车',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '开车门',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '关车门',
-                                handler: this.atsAutoControlALL
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             }
                         ]
                     },
@@ -223,19 +169,23 @@ export default {
                         children: [
                             {
                                 label: '创建设备标签',
-                                handler: this.undeveloped
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '查看设备标签',
-                                handler: this.undeveloped
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '更改设备标签',
-                                handler: this.undeveloped
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             },
                             {
                                 label: '删除设备标签',
-                                handler: this.undeveloped
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             }
                         ]
                     },
@@ -244,87 +194,21 @@ export default {
                         children: [
                             {
                                 label: '完整性报警确认',
-                                handler: this.undeveloped
+                                handler: this.undeveloped,
+                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                             }
                         ]
                     },
                     {
                         label: '更新列车计划',
-                        handler: this.undeveloped
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     },
                     {
                         label: '帮助',
-                        handler: this.undeveloped
+                        handler: this.undeveloped,
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
                     }
-                    // {
-                    //     label: '设置车组号',
-                    //     handler: this.addTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '删除车组号',
-                    //     handler: this.delTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '移动车组号',
-                    //     handler: this.moveTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '新建计划车',
-                    //     handler: this.addPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '设置计划车',
-                    //     handler: this.setPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置头码车',
-                    //     handler: this.setHeadTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置人工车',
-                    //     handler: this.setWorkTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设乘务组号',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '标记ATP切除',
-                    //     handler: this.setTrainATPdel,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '标记ATP恢复',
-                    //     handler: this.setTrainATPRec,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '旅行冲突列车',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '列车信息',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // }
                 ]
             },
             menuForce: [
@@ -375,14 +259,16 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            if (this.$store.state.training.prdType === '02') {
+                this.menu = this.menuNormal.Center;
+            }
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
             }
         },
         doShow(point) {
-            this.topTip = `道岔: ${this.selected.name}`;
+            this.topTip = `车辆: ${this.selected.serviceNumber}`;
             this.clickEvent();
             this.initMenu();
 
@@ -604,6 +490,23 @@ export default {
                     this.$refs.trainSetWorkATP.doShow(operate, this.selected);
                 }
             });
+        },
+        updateDestination() {
+            const operate = {
+                start: true,
+                code: this.selected.code,
+                operation: OperationEvent.Train.destinationTrainId.menu.operation,
+                param: {
+                    trainCode: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) =>{
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainDestination.doShow(operate, this.selected);
+                    this.doClose();
+                }
+            });
         }
     }
 };
diff --git a/src/jmapNew/theme/xian_02/menus/popStationStand.vue b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
index ab4b09b25..e89137065 100644
--- a/src/jmapNew/theme/xian_02/menus/popStationStand.vue
+++ b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
@@ -5,7 +5,6 @@
     <update-stand-plan ref="updateStandPlan" :selected="selected" />
     <warning-confirm ref="warningConfirm" :selected="selected" />
     <stop-profile ref="stopProfile" :selected="selected" />
-    <set-fault ref="setFault" />
   </div>
 </template>
 
@@ -19,7 +18,6 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault';
 import {menuOperate, commitOperate} from './utils/menuOperate';
 
 export default {
@@ -29,8 +27,7 @@ export default {
         NoticeInfo,
         UpdateStandPlan,
         WarningConfirm,
-        StopProfile,
-        SetFault
+        StopProfile
     },
     props: {
         selected: {
@@ -282,7 +279,7 @@ export default {
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.setFault);
                 }
             });
         },
@@ -290,7 +287,7 @@ export default {
         cancelStoppage() {
             commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                    this.$store.dispatch('training/setCommonMenuStep', menuOperate.Common.cancelFault);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js b/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js
index 929324f24..ce474fd46 100644
--- a/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js
+++ b/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js
@@ -260,11 +260,11 @@ export const menuOperate = {
     },
     Common: {
         setFault: {
-            operation: OperationEvent.Section.stoppage.menu.operation,
+            operation: OperationEvent.MixinCommand.stoppage.menu.operation,
             cmdType: CMD.Fault.CMD_SET_FAULT
         },
         cancelFault: {
-            operation: OperationEvent.Section.cancelStoppage.menu.operation,
+            operation: OperationEvent.MixinCommand.cancelStoppage.menu.operation,
             cmdType: CMD.Fault.CMD_CANCEL_FAULT
         }
     }
diff --git a/src/main.js b/src/main.js
index bf8f2874f..f5a04a56c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,6 +4,7 @@ import 'normalize.css/normalize.css'; // A modern alternative to CSS resets
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 import '@/styles/index.scss'; // global css
+import 'quill/dist/quill.snow.css';
 
 import LangStorage from '@/utils/lang';
 import App from './App';
diff --git a/src/permission.js b/src/permission.js
index 3f32cd3f1..96d5874f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -19,7 +19,7 @@ function hasPermission(roles, permissionRoles) {
 
 const whiteList = ['/login', '/design/login', '/gzzbxy/relay']; // 不重定向白名单
 
-const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/, /^\/displayNew\/record/, /^\/displayNew\/manage/, /^\/displayNew\/plan/];
+const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/, /^\/displayNew\/record/, /^\/displayNew\/manage/, /^\/displayNew\/plan/, /^\/practiceDisplayNew/];
 
 function isDesignPage(toRoutePath) {
     return designPageRegex.some(item => item.test(toRoutePath) );
@@ -47,6 +47,10 @@ function getRouteInfo(to) {
     } else {
         const whitePage = PermissionParam[current_session] ? PermissionParam[current_session].whitePage : '';
         loginPath = whitePage || loginPage;
+        if (current_session && current_session.startsWith('jsxt') || current_session && current_session.startsWith('refereeJsxt')) {
+            const raceId = getSessionStorage('raceId'); // 登陆时候保存 竞赛id
+            loginPath = `${loginPath}?raceId=${raceId}`;
+        }
         if (current_session && current_session.startsWith('design')) {
             removeToken();
         }
diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index cbdebad42..d73e884a4 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -64,6 +64,7 @@ const LessonDetail = () => import('@/views/lesson/details');
 const ScriptmanageHome = () => import('@/views/scriptManage/home');
 const ScriptDisplay = () => import('@/views/scriptManage/display/index');
 const ScriptDisplayNew = () => import('@/views/scriptManage/display/indexNew');
+const PracticeDisplayNew = () => import('@/views/competitionManage/practiceList/display/index');
 
 const IbpHome = () => import('@/views/ibp/home');
 const IbpDraw = () => import('@/views/ibp/ibpDraw/index');
@@ -122,7 +123,12 @@ const RunPlanApproval = () => import('@/views/approval/runPlan/index');
 const DeviceManage = () => import('@/views/system/deviceManage/index');
 const MapSort = () => import('@/views/publish/publishMap/mapSort');
 const StudentManage = () => import('@/views/studentManage');
-const RaceManage = () => import('@/views/competitionManage/index');
+const RaceManage = () => import('@/views/competitionManage/competition/index');
+const BankManage = () => import('@/views/competitionManage/bankList/index');
+const PracticeManage = () => import('@/views/competitionManage/practiceList/index');
+const QuestionCreatePage = () => import('@/views/competitionManage/bankList/question-create-page');
+const QuestionUpdatePage = () => import('@/views/competitionManage/bankList/question-update-page');
+const GeneratePaper = () => import('@/views/competitionManage/generatePaper');
 
 const CompetitionDetail = () => import('@/views/jsxt/competition/examDetail');
 const CompetitionManage = () => import('@/views/jsxt/competition/index');
@@ -132,11 +138,9 @@ const JsxtExamResult = () => import('@/views/jsxt/competition/result');
 const JsxtApply = () => import('@/views/jsxt/apply/index');
 // const theoryManage = () => import('@/views/jsxt/competition/theory/index');
 const RefereeList = () => import('@/views/jsxt/refereeList/index');
-const homeJsxt = () => import('@/views/jsxt/home/index');
-const RecaList = () => import('@/views/jsxt/reca/list');
 
 import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
-import { getSessionStorage } from '@/utils/auth';
+// import { getSessionStorage } from '@/utils/auth';
 
 /**
  * Note: sub-menu only appear when route children.length >= 1
@@ -279,6 +283,11 @@ export const publicAsyncRoute = [
         component: ScriptDisplayNew,
         hidden: true
     },
+    { // 实操试题编辑 战场图
+        path: '/practiceDisplayNew/:mode',
+        component: PracticeDisplayNew,
+        hidden: true
+    },
     {
         path: '/displayBigScreen/:mapId',
         component: BigScreen,
@@ -916,11 +925,10 @@ export const asyncRouter = [
         ]
     },
     {
-        path: '/design/race',
-        redirect: '/design/race/manage',
+        path: '/design/race', // 竞赛管理
         component: Layout,
         meta: {
-            i18n: 'route.raceManage',
+            i18n: 'router.raceManage',
             roles: [admin]
         },
         children: [
@@ -931,6 +939,37 @@ export const asyncRouter = [
                     i18n: 'router.raceManage',
                     icon: 'design'
                 }
+            },
+            {
+                path: 'bank',
+                component: BankManage,
+                meta: {
+                    i18n: 'router.bankManage',
+                    icon: 'design'
+                }
+            },
+            {
+                path: 'practice',
+                component: PracticeManage,
+                meta: {
+                    i18n: 'router.practiceManage',
+                    icon: 'design'
+                }
+            },
+            {
+                path: 'questionCreate',
+                component: QuestionCreatePage,
+                hidden: true
+            },
+            {
+                path: 'questionUpdate/:questionId',
+                component: QuestionUpdatePage,
+                hidden: true
+            },
+            {
+                path: 'generate',
+                component: GeneratePaper,
+                hidden: true
             }
         ]
     }
@@ -1007,34 +1046,16 @@ export const JSXT = [
         component: Refereedetail,
         hidden: true
     },
+    // 裁判系统
     {
         path: '/refereeJsxt',
+        redirect: '/refereeJsxt/home',
         component: Layout,
         meta: {
             i18n: 'router.homeJsxt',
             roles: [user, admin]
         },
-        hidden: getSessionStorage('project') ? !getSessionStorage('project').endsWith('refereeJsxt') && !window.document.location.pathname.includes('refereeJsxt') : !window.document.location.pathname.includes('refereeJsxt'),
-        children: [
-            {
-                path: 'preview',
-                component: homeJsxt,
-                meta: {
-                    i18n: 'router.homeJsxt',
-                    icon: 'design',
-                    hidden: true
-                }
-            }
-        ]
-    },
-    {
-        path: '/referee',
-        component: Layout,
-        meta: {
-            i18n: 'router.refereeJManage',
-            roles: [user, admin]
-        },
-        hidden: getSessionStorage('project') ? !getSessionStorage('project').endsWith('refereeJsxt') && !window.document.location.pathname.includes('refereeJsxt') : !window.document.location.pathname.includes('refereeJsxt'),
+        hidden: true,
         children: [
             {
                 path: 'home',
@@ -1046,26 +1067,6 @@ export const JSXT = [
                 }
             }
         ]
-    },
-    {
-        path: '/referee',
-        component: Layout,
-        meta: {
-            i18n: 'router.recaList',
-            roles: [user, admin]
-        },
-        hidden: getSessionStorage('project') ? !getSessionStorage('project').endsWith('refereeJsxt') && !window.document.location.pathname.includes('refereeJsxt') : !window.document.location.pathname.includes('refereeJsxt'),
-        children: [
-            {
-                path: 'recaList',
-                component: RecaList,
-                meta: {
-                    i18n: 'router.recaList',
-                    icon: 'design',
-                    hidden: true
-                }
-            }
-        ]
     }
 ];
 const createRouter = () => new Router({
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 88f8ca94d..a462dc7b9 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -147,6 +147,10 @@ export default {
             { label: '控制模式', value: 'ControlConvertMenu' },
             { label: '车次窗', value: 'TrainWindow' }
         ],
+        QuestionTypeList: [
+            { label: '选择题', value: 'select' },
+            { label: '判断题', value: 'judge' }
+        ],
         // 新版的产品类型枚举
         prdType:[
             { enlabel: 'ATS local workstation', label: 'ATS现地工作站', value: '01'},
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index 4b05c1047..0c2feb35b 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -2211,12 +2211,18 @@ export const IbpShowCondition = {
     Show_Open_Screen_Door: {statusKey: 'screenDoorOpenStatus', statusValue:['02'], defaultStatus: 'close'},
     Show_Close_Screen_Door: {statusKey: 'screenDoorOpenStatus', statusValue: ['01'], defaultStatus: 'open'}
 };
-
+/** 列车类型 */
+export const TrainType = {
+    PLAN: '计划车',
+    HEAD: '头码车',
+    MANUAL: '人工车'
+};
 export const UrlConfig = {
     display: '/display',
     displayNew: '/displayNew',
     scriptDisplay: '/scriptDisplay',
     scriptDisplayNew:'/scriptDisplayNew',
+    practiceDisplayNew:'/practiceDisplayNew',
     examRuleDraft: '/examRule/draft',
     examRuleManage: '/examRule/manage',
     lesson: {
@@ -2307,5 +2313,9 @@ export const UrlConfig = {
         draft: '/trainingPlatform/draft',
         pay: '/trainingPlatform/pay',
         runPlan: '/trainingPlatform/runPlan/manage'
+    },
+    bank: {
+        questionCreate: '/design/race/questionCreate',
+        questionUpdate: '/design/race/questionUpdate'
     }
 };
diff --git a/src/scripts/GlobalPlugin.js b/src/scripts/GlobalPlugin.js
index 7e0ae1c63..af9b09c5d 100644
--- a/src/scripts/GlobalPlugin.js
+++ b/src/scripts/GlobalPlugin.js
@@ -5,11 +5,13 @@ import TurnbackBar from '@/components/TurnbackBar';
 import ConstConfig from '@/scripts/ConstConfig';
 import Dictionary from '@/scripts/DictionaryData';
 import Theme from '@/jmapNew/theme/factory';
+import QuillEditor from '@/components/QuillEditor/index';
 
 // 全局组件
 Vue.component('DataForm', DataForm);
 Vue.component('QueryListPage', QueryListPage);
 Vue.component('TurnbackBar', TurnbackBar);
+Vue.component('QuillEditor', QuillEditor);
 
 Vue.prototype.$ConstSelect = (function() {
     ConstConfig.ConstSelect.translate = function(value, codeName) {
@@ -116,7 +118,7 @@ Vue.prototype.$copyClone = function(obj1, obj2 = {}) {
 };
 
 Vue.prototype.$escapeHTML = function (context) {
-    const pattern = /<\w*>(.*)<\/\w*>/;
+    const pattern = /<\p>(.*)<\/\p>/;
 
     if (pattern.test(context)) {
         context = pattern.exec(context)[1];
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index dc911ae3b..68ff8bb54 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -78,6 +78,8 @@ export default {
         CMD_SIGNAL_SET_ROUTE: {value:'Signal_Set_Route', label: '排列进路'},
         /** 取消进路 */
         CMD_SIGNAL_CANCEL_ROUTE: {value:'Signal_Cancel_Route', label: '取消进路'},
+        /** 强制取消进路 */
+        CMD_SIGNAL_FORCE_CANCEL_ROUTE: {value: 'Signal_Force_Cancel_Route', label: '强制取消进路'},
         /** 人解进路 */
         CMD_SIGNAL_HUMAN_RELEASE_ROUTE: {value:'Signal_Human_Release_Route', label: '人解进路'},
         /** 信号关灯 */
diff --git a/src/scripts/cmdPlugin/Config.js b/src/scripts/cmdPlugin/Config.js
index 868caf9ec..7d74e9352 100644
--- a/src/scripts/cmdPlugin/Config.js
+++ b/src/scripts/cmdPlugin/Config.js
@@ -36,7 +36,7 @@ export const deviceFaultType = {
         {label: '主灯丝熔断故障', value: 'MAIN_FILAMENT_BROKEN'}
     ],
     Switch: [
-        {label: '挤岔', value: 'SPLIT'}
+        {label: '失表', value: 'SPLIT'}
     ],
     StationStand: [
         {label: '屏蔽门无法关闭', value: 'FAULT'}
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 69bedb83b..1cb6c3ca6 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -2079,6 +2079,18 @@ export const OperationEvent = {
                 operation: '2994',
                 domId: '_Tips-TotalCancel-Button{TOP}'
             }
+        },
+        // 取消故障
+        cancelStoppage: {
+            menu: {
+                operation: '2995'
+            }
+        },
+        // 道岔故障
+        stoppage: {
+            menu: {
+                operation: '2996'
+            }
         }
     }
 
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index f956fe8cc..3205a7be4 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -181,6 +181,7 @@ const map = {
     state: {
         routeData: {}, // 进路数据
         routeList: [], // 进路list
+        routeStartSignalData: {}, // 进路始端信号机数据
         autoReentryData: {}, // 自动折返数据
         autoReentryList: [], // 自动折返list
         signalApproachSectionData: {}, // 信号机接近区段数据
@@ -209,7 +210,11 @@ const map = {
         showCentralizedStationCode: '',	// 现地分集中站显示(集中站code)
         showCentralizedStationNum: 0, 	// 现地分集中站显示判断
         overlapList: [], // 延续保护list
-        overlapData: {} // 延续保护数据
+        overlapData: {}, // 延续保护数据
+        holdStandList: [], // 扣车站台列表
+        holdStatus: false, // 是否有扣车状态
+        jumpStandList: [], // 跳停站台列表
+        jumpStatus: false // 是否有跳停状态
     },
 
     getters: {
@@ -228,6 +233,13 @@ const map = {
         routeData: (state) => {
             return state.routeData;
         },
+        routeStartSignalData: (state) => {
+            if (state.map) {
+                return state.map.routeStartSignalData || {};
+            } else {
+                return {};
+            }
+        },
         overlapData: (state) => {
             return state.overlapData;
         },
@@ -715,6 +727,11 @@ const map = {
         setRouteData: (state, routeDataList) => {
             routeDataList.forEach(data => {
                 state.routeData[data.code] = data;
+                if (state.routeStartSignalData[data.startSignalCode] && state.routeStartSignalData[data.startSignalCode].length) {
+                    state.routeStartSignalData[data.startSignalCode].push(data);
+                } else {
+                    state.routeStartSignalData[data.startSignalCode] = [data];
+                }
             });
             state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => {
                 state.routeData[item.automaticRouteCode].automaticRouteCode = item.code;
@@ -751,6 +768,22 @@ const map = {
         updateTrainState:(state, status) =>{
             state.map.trainList[parseInt(status.code) - 1] = deepAssign(state.map.trainList[parseInt(status.code) - 1] || {}, status);
         },
+        updateStationStand: (state, status) => {
+            const holdIndex = state.holdStandList.indexOf(status.code);
+            const jumpIndex = state.jumpStandList.indexOf(status.code);
+            if ((status.stationHoldTrain || status.centerHoldTrain) && holdIndex < 0) {
+                state.holdStandList.push(status.code);
+            } else if (!(status.stationHoldTrain && status.centerHoldTrain) && holdIndex > -1) {
+                state.holdStandList.splice(holdIndex, 1);
+            }
+            state.holdStatus = state.holdStandList.length > 0;
+            if ((status.assignSkip || status.allSkip) && jumpIndex < 0) {
+                state.jumpStandList.push(status.code);
+            } else if (!(status.assignSkip && status.allSkip) && jumpIndex > -1) {
+                state.jumpStandList.splice(jumpIndex, 1);
+            }
+            state.jumpStatus = state.jumpStandList.length > 0;
+        },
         setMapVersion:(state, version) => {
             state.version = version;
         },
@@ -819,6 +852,9 @@ const map = {
         updateTrainState:({ commit }, status) => {
             commit('updateTrainState', status);
         },
+        updateStationStand: ({ commit }, status) => {
+            commit('updateStationStand', status);
+        },
         getRouteDataListByCode: ({ state, commit }, code) => { // 获取进路数据
             return new Promise((resolve) => {
                 const list = [];
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 470488e82..e287a3194 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -163,7 +163,7 @@ function handleSimulationInfo(state, data) {
         targetOnline:data.targetMember ? data.targetMember.online : null,
         targetName:data.targetMember ? data.targetMember : 'All',
         targetRole:data.targetMember ? data.targetMember.role : null,
-        group: data.group,
+        all: data.all,
         date: +new Date(`${myDate1} ${chatTime}`)
     };
     state.simulationText = params;
diff --git a/src/store/modules/training.js b/src/store/modules/training.js
index f335e1a1d..86b1e400f 100644
--- a/src/store/modules/training.js
+++ b/src/store/modules/training.js
@@ -35,7 +35,9 @@ const training = {
         prdType: '', 				// 产品类型
         roles: '', 					// 角色权限类型
         group: '',					// 设置全局 group
-        centerStationCode:'' // 当前居中的集中站code
+        centerStationCode:'', // 当前居中的集中站code
+        commonMenuCount: 0,			// 公共菜单计数
+        commonMenuStep: null		// 公共菜单步骤
     },
 
     getters: {
@@ -92,6 +94,12 @@ const training = {
             });
 
             return trainList;
+        },
+        commonMenuCount: (state) => {
+            return state.commonMenuCount;
+        },
+        commonMenuStep: (state) => {
+            return state.commonMenuStep;
         }
     },
 
@@ -209,6 +217,10 @@ const training = {
         },
         setCenterStationCode:(state, centerStationCode) => {
             state.centerStationCode = centerStationCode;
+        },
+        setCommonMenuStep: (state, commonMenuStep) => {
+            state.commonMenuStep = commonMenuStep;
+            state.commonMenuCount++;
         }
     },
 
@@ -611,6 +623,11 @@ const training = {
         /** 设置当前居中的集中站code */
         setCenterStationCode:({ commit }, centerStationCode) => {
             commit('setCenterStationCode', centerStationCode);
+        },
+
+        /** 公共菜单操作 */
+        setCommonMenuStep:({ commit }, commonMenuStep) => {
+            commit('setCommonMenuStep', commonMenuStep);
         }
     }
 };
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index e9046878d..778caeb7b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -7,10 +7,9 @@ export function getBaseUrl() {
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
-        // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
-        // BASE_API = 'http://2i38984j47.qicp.vip';    // 张赛
+        // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
     }
diff --git a/src/views/competitionManage/bankList/dialog-detail.vue b/src/views/competitionManage/bankList/dialog-detail.vue
new file mode 100644
index 000000000..22ef3c89a
--- /dev/null
+++ b/src/views/competitionManage/bankList/dialog-detail.vue
@@ -0,0 +1,78 @@
+<template>
+  <el-dialog v-dialogDrag :close-on-click-moda="false" :title="title" :visible.sync="show" width="860px" :close-on-click-modal="false" :before-close="doClose">
+    <div class="ql-editor" v-html="$escapeHTML(`题 目:  ${form.topic}`)" />
+    <template v-if="checkType(form, 'judge')">
+      <div class="answer">
+        答 案:
+        <template v-for="(el,i) in options">
+          <span v-if="el.correct" :key="i">{{ el.content }} </span>
+        </template>
+      </div>
+
+    </template>
+    <template v-else-if="checkType(form, 'select')">
+      <div v-for="(el,i) in options" :key="i" class="option" :label="$str2number(el.id)">
+        <span>{{ $asc2chart(i+65) }}. </span>
+        <div class="ql-editor" style="display: inline; padding: 0" v-html="$escapeHTML(el.content)" />
+      </div>
+      <div class="answer">
+        答 案:
+        <template v-for="(el,i) in options">
+          <span v-if="el.correct" :key="i">{{ $asc2chart(i+65) }} </span>
+        </template>
+      </div>
+    </template>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="show = false">关闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+    data() {
+        return {
+            show: false,
+            form: {
+                optionList: []
+            }
+        };
+    },
+    computed: {
+        title() {
+            return '详 情';
+        },
+        options() {
+            return this.form.optionList;
+        }
+    },
+    methods: {
+        checkType(option, type) {
+            return option.type == type;
+        },
+        appendIndex(str, index) {
+            return `${index + 1}. ${str}`;
+        },
+        doShow(node) {
+            this.form = node.row || {};
+            this.show = true;
+        },
+        doClose(done) {
+            this.show = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.option {
+		line-height: 22px;
+		padding-left: 20px;
+	}
+
+	.answer {
+		line-height: 32px;
+		color: #000;
+		padding-left: 15px;
+	}
+</style>
diff --git a/src/views/competitionManage/bankList/dialog-modify-rich.vue b/src/views/competitionManage/bankList/dialog-modify-rich.vue
new file mode 100644
index 000000000..e41791c43
--- /dev/null
+++ b/src/views/competitionManage/bankList/dialog-modify-rich.vue
@@ -0,0 +1,46 @@
+<template>
+  <el-dialog v-dialogDrag :close-on-click-moda="false" :title="title" :visible.sync="show" width="40%" :close-on-click-modal="false" :before-close="doClose">
+    <quill-editor v-model="content" placeholder="请输入内容" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doInput">确 定</el-button>
+      <el-button @click="show = false">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+    data() {
+        return {
+            show: false,
+            content: '',
+            node: {
+                model: {},
+                prop: ''
+            }
+        };
+    },
+    computed: {
+        title() {
+            return '富文本输入';
+        }
+    },
+    methods: {
+        doShow(node) {
+            this.node = node;
+            this.content = (node.model || {})[node.prop] || '';
+            this.show = true;
+        },
+        doClose(done) {
+            this.show = false;
+        },
+        doInput() {
+            const node = this.node;
+            node.model[node.prop] = this.content;
+            this.$emit('update', node.model);
+            this.doClose();
+        }
+    }
+};
+</script>
diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
new file mode 100644
index 000000000..4bff2fff2
--- /dev/null
+++ b/src/views/competitionManage/bankList/index.vue
@@ -0,0 +1,158 @@
+<template>
+  <div>
+    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <dialog-detail ref="detail" />
+  </div>
+</template>
+
+<script>
+import { UrlConfig } from '@/scripts/ConstDic';
+import { listQuestionPage, deleteQuestion } from '@/api/questionBank.js';
+import DialogDetail from './dialog-detail';
+
+export default {
+    components: {
+        DialogDetail
+    },
+    data() {
+        return {
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '80px',
+                queryObject: {
+                    type: {
+                        type: 'select',
+                        label: '类 型',
+                        config: {
+                            data: this.$ConstSelect.QuestionTypeList
+                        }
+                    },
+                    topic: {
+                        type: 'text',
+                        label: '题 目'
+                    }
+                }
+            },
+            queryList: {
+                query: listQuestionPage,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '题 目',
+                        prop: 'topic'
+                    },
+                    {
+                        title: '类 型',
+                        prop: 'type',
+                        type: 'tag',
+                        width: '120',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.type, 'QuestionTypeList'); },
+                        tagType: (row) => {
+                            return '';
+                        }
+                    },
+                    {
+                        title: '答 案',
+                        prop: 'answer',
+                        type: 'tagMore',
+                        width: '100',
+                        columnValue: (row) => { return this.answerTags(row); },
+                        tagType: (row) => {
+                            return '';
+                        }
+                    },
+                    // {
+                    //     title: '创建人',
+                    //     prop: 'createUserName',
+                    //     width: '100'
+                    // },
+                    {
+                        type: 'button',
+                        title: '操 作',
+                        width: '420',
+                        buttons: [
+                            {
+                                name: '编辑',
+                                handleClick: this.edit
+                            },
+                            {
+                                name: '删 除',
+                                handleClick: this.doDelete,
+                                // showControl: (row) => { return row.createUserId == this.userId; },
+                                type: 'danger'
+                            },
+                            {
+                                name: '预 览',
+                                handleClick: this.doDetail
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: '添 加', handler: this.doCreate }
+                ]
+            }
+        };
+    },
+    computed: {
+        userId() {
+            return this.$store.state.user.id;
+        }
+    },
+    methods: {
+        doCreate() {
+            this.$router.push({path: `${UrlConfig.bank.questionCreate}`});
+        },
+
+        edit(index, row) {
+            this.$router.push({path: `${UrlConfig.bank.questionUpdate}/${row.id}`});
+        },
+
+        doDelete(index, row) {
+            this.$confirm('删除试题，是否继续？', '提 示', {
+                confirmButtonText: '确 定',
+                cancelButtonText: '取 消',
+                type: 'warning'
+            }).then(() => {
+                deleteQuestion(row.id).then(resp => {
+                    this.reloadTable();
+                }).catch(error => {
+                    this.$message.error(`删除试题失败: ${error.message}`);
+                });
+            }).catch( () => { });
+        },
+
+        doDetail(index, row) {
+            this.$refs.detail.doShow({index, row});
+        },
+
+        answerTags(row) {
+            const answer = [];
+            row.optionList.forEach((el, i) => {
+                switch (row.type) {
+                case 'select':
+                    if (el.correct) {
+                        answer.push(this.$asc2chart(i + 65));
+                    }
+                    break;
+                case 'judge':
+                    if (el.correct) {
+                        answer.push(el.content);
+                    }
+                    break;
+                }
+            });
+            return answer;
+        },
+
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>
diff --git a/src/views/competitionManage/bankList/item-answer.vue b/src/views/competitionManage/bankList/item-answer.vue
new file mode 100644
index 000000000..9f44910e3
--- /dev/null
+++ b/src/views/competitionManage/bankList/item-answer.vue
@@ -0,0 +1,55 @@
+<template>
+  <div>
+    <template v-if="type=='select'">
+      <el-radio-group v-model="active" @change="onChange">
+        <el-radio v-for="(el,i) in optionList" :key="i" :label="i"> 选项-{{ $asc2chart(65+i) }} </el-radio>
+      </el-radio-group>
+    </template>
+    <template v-if="type=='judge'">
+      <el-radio-group v-model="active" @change="onChange">
+        <el-radio :label="0"> √ </el-radio>
+        <el-radio :label="1"> × </el-radio>
+      </el-radio-group>
+    </template>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+    props: {
+        value: {
+            type: Number,
+            default: 0
+        },
+        optionList: {
+            type: Array,
+            required: true
+        },
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            active: 0
+        };
+    },
+    watch: {
+        value(val) {
+            this.active = val;
+        }
+    },
+    methods: {
+        onChange(e) {
+            this.$emit('input', e);
+            this.$emit('change', e);
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/competitionManage/bankList/item-options.vue b/src/views/competitionManage/bankList/item-options.vue
new file mode 100644
index 000000000..24b4d6117
--- /dev/null
+++ b/src/views/competitionManage/bankList/item-options.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="option">
+    <template v-if="type=='select'">
+      <div v-for="(el,i) in optionList" :key="i" class="option__item">
+        <div> 选项-{{ $asc2chart(65+i) }} </div>
+        <item-rich v-model="el.content" :remove="remove" @modify="doModify(el)" @remove="doRemove(i)" />
+      </div>
+      <el-button v-if="add" class="item__button" type="primary" size="mini" icon="el-icon-plus" @click="doAppend" />
+    </template>
+  </div>
+</template>
+
+<script>
+import ItemRich from './item-rich';
+
+export default {
+    components: {
+        ItemRich
+    },
+    props: {
+        optionList: {
+            type: Array,
+            required: true
+        },
+        type: {
+            type: String,
+            required: true
+        },
+        add: {
+            type: Boolean,
+            default: false
+        },
+        remove: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+        };
+    },
+    methods: {
+        doModify(el) {
+            this.$emit('modify', {model: el, prop: 'content'});
+        },
+        doRemove(index) {
+            this.$emit('remove', index);
+        },
+        doAppend() {
+            this.$emit('append');
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+    .option {
+		&__item {
+			margin-bottom: 10px;
+		}
+    }
+</style>
diff --git a/src/views/competitionManage/bankList/item-rich.vue b/src/views/competitionManage/bankList/item-rich.vue
new file mode 100644
index 000000000..570bc17c0
--- /dev/null
+++ b/src/views/competitionManage/bankList/item-rich.vue
@@ -0,0 +1,55 @@
+<template>
+  <div class="item no-select" :style="{height: height+'px'}">
+    <div class="ql-editor item__text" @click="doModify" v-html="$escapeHTML(`${value}`)" />
+    <el-button class="item__button" type="primary" size="mini" icon="el-icon-edit" circle @click="doModify" />
+    <el-button v-if="remove" class="item__button" type="danger" size="mini" icon="el-icon-delete" circle @click="doRemove" />
+  </div>
+</template>
+
+<script>
+
+export default {
+    props: {
+        value: {
+            type: String,
+            default: ''
+        },
+        height: {
+            type: Number,
+            default: 60
+        },
+        remove: {
+            type: Boolean,
+            default: false
+        }
+    },
+    methods: {
+        doModify() {
+            this.$emit('modify', this.value);
+        },
+        doRemove() {
+            this.$emit('remove', this.value);
+        }
+    }
+};
+
+</script>
+
+<style lang="scss" scoped>
+    .item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        &__text {
+            flex: 1;
+            background: #f1f1f1;
+        }
+
+        &__button {
+            width: 32px;
+            margin-left: 10px;
+            place-self: flex-end;
+        }
+    }
+</style>
diff --git a/src/views/competitionManage/bankList/question-create-page.vue b/src/views/competitionManage/bankList/question-create-page.vue
new file mode 100644
index 000000000..804953422
--- /dev/null
+++ b/src/views/competitionManage/bankList/question-create-page.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="page">
+    <div class="page__container">
+      <el-card class="page__container-body">
+        <question-form ref="info" :option="formModel" :remove="true" @modify="doModify" />
+      </el-card>
+      <div class="page__container-footer">
+        <el-button type="primary" :is-create="true" @click="create">提 交</el-button>
+        <el-button @click="back">返 回</el-button>
+      </div>
+    </div>
+    <dialog-modify-rich ref="rich" />
+  </div>
+</template>
+
+<script>
+import QuestionForm from './question-form.vue';
+import DialogModifyRich from './dialog-modify-rich';
+import { createQuestion } from '@/api/questionBank.js';
+import * as authUtils from '@/utils/auth.js';
+
+export default {
+    components: {
+        QuestionForm,
+        DialogModifyRich
+    },
+    data() {
+        return {
+            active: 0,
+            formModel: {
+                id: '',
+                topic: '',
+                type: 'select',
+                answer: 0,
+                optionList: []
+            }
+        };
+    },
+    computed: {
+        deviceId() {
+            return this.$route.params.deviceId;
+        },
+        path() {
+            return this.$route.path;
+        }
+    },
+    created() {
+        const value = authUtils.getSessionStorage(this.path);
+        if (value) {
+            const model = JSON.parse(value);
+            this.formModel.type = model.type;
+        }
+    },
+    methods: {
+        doBack() {
+            this.$router.go(-1);
+        },
+        doModify(node) {
+            this.$refs.rich.doShow(node);
+        },
+        create() {
+            this.$refs.info.validate().then(valid => {
+                if (valid) {
+                    createQuestion(this.formModel).then(resp => {
+                        authUtils.setSessionStorage(this.path, JSON.stringify({
+                            type: this.formModel.type
+                        }));
+                        this.doBack();
+                    }).catch(error => {
+                        this.$message.error(`创建试题失败: ${error.message}`);
+                    });
+                }
+            }).catch(error => { this.$message.warning(error.message); });
+        },
+        back() {
+            this.$router.go(-1);
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.page {
+		width: 100%;
+		&__container {
+			width: 55%;
+			margin: auto;
+            padding:20px 0px;
+			&-header {
+				margin-bottom: 10px;
+				.step-group {
+                    margin: 10px 0;
+					.box {
+						display: flex;
+						justify-content: flex-end;
+					}
+                }
+			}
+
+			&-body {
+				padding: 40px;
+			}
+
+			&-footer {
+				margin-top: 20px;
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/competitionManage/bankList/question-form.vue b/src/views/competitionManage/bankList/question-form.vue
new file mode 100644
index 000000000..0d128f3b4
--- /dev/null
+++ b/src/views/competitionManage/bankList/question-form.vue
@@ -0,0 +1,129 @@
+<template>
+  <div>
+    <el-form ref="form" :model="option" :rules="rules" label-width="80px">
+      <el-form-item label="类 型" prop="type">
+        <el-select v-model="option.type" :disabled="update" placeholder="请选择试题类型" @change="onTypeChnage">
+          <el-option v-for="it in QuestionTypeList" :key="it.value" :label="it.label" :value="it.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="问 题" prop="topic">
+        <item-rich v-model="option.topic" @modify="onModify({model: option, prop: 'topic'})" />
+      </el-form-item>
+      <template v-if="isCreate">
+        <el-form-item v-if="option.type != 'judge'" label="选 项" prop="optionList">
+          <item-options :option-list="optionList" :type="option.type" :add="isSelect" :remove="remove" @remove="onRemove" @modify="onModify" @append="onAppend" />
+        </el-form-item>
+        <el-form-item label="答 案" prop="answer">
+          <item-answer v-model="option.answer" :option-list="optionList" :type="option.type" @change="onAnswerChnage" />
+        </el-form-item>
+      </template>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import ItemRich from './item-rich';
+import ItemOptions from './item-options';
+import ItemAnswer from './item-answer';
+
+export default {
+    components: {
+        ItemRich,
+        ItemOptions,
+        ItemAnswer
+    },
+    props: {
+        option: {
+            type: Object,
+            required: true
+        },
+        isCreate: {
+            type: Boolean,
+            default: true
+        },
+        remove: {
+            type: Boolean,
+            default: false
+        },
+        update: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+        };
+    },
+    computed: {
+        isSelect() {
+            return this.remove && this.option.type == 'select';
+        },
+        templateMap() {
+            return {
+                select: function() {
+                    return [
+                        { content: '', correct: true },
+                        { content: '', correct: false },
+                        { content: '', correct: false },
+                        { content: '', correct: false }
+                    ];
+                },
+                judge: function() {
+                    return [
+                        { content: '√', correct: true },
+                        { content: '×', correct: false }
+                    ];
+                }
+            };
+        },
+        optionList() {
+            return this.option.optionList;
+        },
+        QuestionTypeList() {
+            return this.$ConstSelect.QuestionTypeList;
+        },
+        rules() {
+            return {
+                topic: [
+                    { required: true, message: '请输入试题内容', trigger: 'blur' }
+                ],
+                type: [
+                    { required: true, message: '请输入试题类型', trigger: 'change' }
+                ],
+                answer: [
+                    { required: true, message: '请选择正确答案', trigger: 'change' }
+                ]
+            };
+        }
+    },
+    mounted() {
+        this.onTypeChnage(this.option.type);
+    },
+    methods: {
+        validate() {
+            return new Promise((resolve, reject) => {
+                this.$refs['form'].validate((valid) => {
+                    resolve(valid);
+                });
+            });
+        },
+        onTypeChnage(type) {
+            if (this.templateMap[type]) {
+                this.option.optionList = this.templateMap[type]();
+            }
+        },
+        onAnswerChnage(answer) {
+            this.option.optionList.forEach((el, i) => { el.correct = i == answer; });
+        },
+        onModify(node) {
+            this.$emit('modify', node);
+        },
+        onAppend() {
+            this.option.optionList.push({content: '', correct: false});
+        },
+        onRemove(index) {
+            this.option.optionList.splice(index, 1);
+        }
+    }
+};
+</script>
diff --git a/src/views/competitionManage/bankList/question-update-page.vue b/src/views/competitionManage/bankList/question-update-page.vue
new file mode 100644
index 000000000..0e2a41161
--- /dev/null
+++ b/src/views/competitionManage/bankList/question-update-page.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="page">
+    <div class="page__container">
+      <el-card class="page__container-body">
+        <question-form ref="info" :option="formModel" :remove="true" :update="true" @modify="doModify" />
+      </el-card>
+    </div>
+    <div class="page__container-footer">
+      <el-button type="primary" :is-create="true" @click="update">更 新</el-button>
+      <el-button @click="back">返 回</el-button>
+    </div>
+    <dialog-modify-rich ref="rich" />
+  </div>
+</template>
+
+<script>
+import QuestionForm from './question-form.vue';
+import DialogModifyRich from './dialog-modify-rich';
+import { getQuestionInfo, updateOption } from '@/api/questionBank.js';
+
+export default {
+    components: {
+        QuestionForm,
+        DialogModifyRich
+    },
+    data() {
+        return {
+            formModel: {
+                id: '',
+                topic: '',
+                type: 'select',
+                answer: 0,
+                optionList: []
+            },
+            optionList: []
+        };
+    },
+    computed: {
+        questionId() {
+            return this.$route.params.questionId;
+        }
+    },
+    watch: {
+        '$router': function() {
+            this.loadInitData();
+        }
+    },
+    created() {
+        this.loadInitData();
+    },
+    methods: {
+        loadInitData() {
+            getQuestionInfo(this.questionId).then(resp => {
+                this.formModel = resp.data;
+                this.formModel.answer = this.formModel.optionList.findIndex(ele => ele.correct);
+            });
+        },
+        doBack() {
+            this.$router.go(-1);
+        },
+        doModify(node) {
+            this.$refs.rich.doShow(node);
+        },
+        update() {
+            this.$refs.info.validate().then(valid => {
+                if (valid) {
+                    updateOption(this.formModel).then(resp => {
+                        this.doBack();
+                    }).catch(error => {
+                        this.$message.error(`创建试题失败: ${error.message}`);
+                    });
+                }
+            }).catch(error => { this.$message.warning(error.message); });
+        },
+        back() {
+            this.$router.go(-1);
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.page {
+		width: 100%;
+		&__container {
+			width: 55%;
+			margin: auto;
+			&-header {
+				margin-bottom: 10px;
+				.step-group {
+                    margin: 10px 0;
+					.box {
+						display: flex;
+						justify-content: flex-end;
+					}
+                }
+			}
+
+			&-body {
+				padding: 40px;
+			}
+
+			&-footer {
+				margin-top: 20px;
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/competitionManage/create.vue b/src/views/competitionManage/competition/create.vue
similarity index 98%
rename from src/views/competitionManage/create.vue
rename to src/views/competitionManage/competition/create.vue
index 331f5d6fa..0250f0d9f 100644
--- a/src/views/competitionManage/create.vue
+++ b/src/views/competitionManage/competition/create.vue
@@ -73,7 +73,8 @@ export default {
                 name: '',
                 startDate: '',
                 endDate: '',
-                mapId: ''
+                mapId: '',
+                optionalRoles: ['DISPATCHER']
             },
             pickerOptions: {
                 disabledDate(time) {
diff --git a/src/views/competitionManage/index.vue b/src/views/competitionManage/competition/index.vue
similarity index 95%
rename from src/views/competitionManage/index.vue
rename to src/views/competitionManage/competition/index.vue
index 7b013f3eb..eb02095ac 100644
--- a/src/views/competitionManage/index.vue
+++ b/src/views/competitionManage/competition/index.vue
@@ -3,6 +3,7 @@
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <create-race ref="createRace" :map-list="mapList" @refresh="refresh" />
     <input id="competition-manage-url" v-model="url" style="opacity: 0;">
+    <div id="bm" ref="bm" />
   </div>
 </template>
 
@@ -84,6 +85,10 @@ export default {
                             {
                                 name: '裁判地址',
                                 handleClick: this.showRefereeUrl
+                            },
+                            {
+                                name: '生成试卷',
+                                handleClick: this.generatePaper
                             }
                         ]
                     }
@@ -167,6 +172,9 @@ export default {
                 document.execCommand('Copy'); // 执行浏览器复制命令
                 this.$message.success('报名路径已经复制到粘贴板');
             });
+        },
+        generatePaper(index, row) {
+            this.$router.push({ path: `/design/race/generate`, query: {raceId:row.id} });
         }
     }
 };
diff --git a/src/views/competitionManage/generatePaper.vue b/src/views/competitionManage/generatePaper.vue
new file mode 100644
index 000000000..f8abc9cb3
--- /dev/null
+++ b/src/views/competitionManage/generatePaper.vue
@@ -0,0 +1,225 @@
+<template>
+  <div style="width: 100%;height: 100%;">
+    <div style="margin-top: 10px;position: absolute; right: 50px;">
+      <el-button size="small" type="primary" @click="exportPaper">导出试题</el-button>
+      <el-button size="small" type="primary" @click="goBack">返回</el-button>
+    </div>
+    <el-card style="width: 45%;margin-left: 50px;margin-top: 60px;display: inline-block;height: calc(100% - 100px);">
+      <div slot="header">
+        <span>理论试题列表</span>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="addTheoryQuestion">添加试题</el-button>
+        <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text" @click="theoryReview">预览</el-button>
+      </div>
+      <el-table
+        :data="theoryQuestionList"
+        style="width: 100%"
+        height="100%"
+        :summary-method="getSummaries"
+        :show-summary="showSummary"
+        :row-style="handleRowStyle"
+      >
+        <el-table-column prop="type" label="类型" width="100">
+          <template slot-scope="scope">
+            <el-tag type="primary" disable-transitions>{{ QuestionTypeMap[scope.row.type] }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="topic" label="题目" show-overflow-tooltip="">
+          <template slot-scope="scope">
+            <span v-html="scope.row.topic" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="score" label="分值" width="100">
+          <template slot-scope="scope">
+            <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
+            <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
+            <el-input-number v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" :controls="noControls" :min="0" size="mini" style="width: 90px" @blur="editScopeBlur(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="operate" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button type="warning" size="mini" @click="removeTheoryQuestion(scope.row)">移出</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-card style="width: 45%;margin-left: calc(10% - 100px);margin-top: 60px;display: inline-block;height: calc(100% - 100px);">
+      <div slot="header">
+        <span>实操试题列表</span>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="addOperateQuestion">添加试题</el-button>
+        <el-button style="float: right; padding: 3px 0;margin-right: 5px" type="text" @click="operateReview">预览</el-button>
+      </div>
+      <el-table
+        :data="operateQuestionList"
+        style="width: 100%"
+        height="100%"
+        :row-style="handleRowStyle"
+        :summary-method="getSummaries"
+        :show-summary="showSummary"
+      >
+        <el-table-column prop="name" label="实操名称" />
+        <el-table-column prop="creatorName" label="创建人" />
+        <el-table-column prop="score" label="分值">
+          <template slot-scope="scope">
+            <span v-if="!scope.row.editScope" @click="editScope(scope.row)">{{ scope.row.score }}</span>
+            <i v-if="!scope.row.editScope" class="el-icon-edit" @click="editScope(scope.row)" />
+            <el-input-number v-if="scope.row.editScope" v-model="scope.row.score" v-focus="scope.row.editFocus" :controls="noControls" :min="0" size="mini" @blur="editScopeBlur(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="operate" label="操作">
+          <template slot-scope="scope">
+            <el-button type="warning" size="mini" @click="removeOperateQuestion(scope.row)">移出</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <set-exam-time ref="setExamTime" :theory-question-list="theoryQuestionList" :operate-question-list="operateQuestionList" />
+    <theory-review ref="theoryReview" :theory-question-list="theoryQuestionList" />
+    <theory-question ref="theoryQuestion" :theory-index-list="theoryIndexList" @addQuestion="addTheoryQuestionList" @removeQuestion="removeTheoryQuestion" />
+    <operate-question ref="operateQuestion" :operate-index-list="operateIndexList" @addQuestion="addOperateQuestionList" @removeQuestion="removeOperateQuestion" />
+  </div>
+</template>
+
+<script>
+import TheoryReview from './theoryReview';
+import TheoryQuestion from './theoryQuestion';
+import OperateQuestion from './operateQuestion';
+import SetExamTime from './setExamTime';
+export default {
+    name: 'GeneratPaper',
+    components: {
+        SetExamTime,
+        TheoryReview,
+        TheoryQuestion,
+        OperateQuestion
+    },
+    data() {
+        return {
+            QuestionTypeMap: {
+                select: '选择题',
+                judge: '判断题'
+            },
+            showSummary: true,
+            noControls: false,
+            theoryQuestionList: [], // 理论试卷试题列表
+            operateQuestionList: [], // 实操试卷试题列表
+            theoryIndexList: [], // 理论试卷试题索引列表
+            operateIndexList: []// 实操试卷试题索引列表
+        };
+    },
+    methods: {
+        removeOperateQuestion(row) {
+            const index = this.operateIndexList.indexOf(row.id);
+            this.operateIndexList.splice(index, 1);
+            this.operateQuestionList.splice(index, 1);
+        },
+        removeTheoryQuestion(row) {
+            const index = this.theoryIndexList.indexOf(row.id);
+            this.theoryIndexList.splice(index, 1);
+            this.theoryQuestionList.splice(index, 1);
+        },
+        addTheoryQuestionList(row) {
+            if (this.theoryQuestionList.length) {
+                this.theoryIndexList.push(row.id);
+                this.theoryQuestionList.push(row);
+            } else {
+                this.theoryIndexList = [row.id];
+                this.theoryQuestionList = [row];
+            }
+        },
+        addOperateQuestionList(row) {
+            if (this.operateQuestionList.length) {
+                this.operateIndexList.push(row.id);
+                this.operateQuestionList.push(row);
+            } else {
+                this.operateIndexList = [row.id];
+                this.operateQuestionList = [row];
+            }
+        },
+        addTheoryQuestion() {
+            this.$refs.theoryQuestion.doShow();
+        },
+        addOperateQuestion() {
+            this.$refs.operateQuestion.doShow();
+        },
+        goBack() {
+            this.$router.go(-1);
+        },
+        theoryReview() {
+            this.$refs.theoryReview.doShow();
+        },
+        operateReview() {
+        },
+        editScope(row) {
+            this.$set(row, 'editScope', true);
+            this.$nextTick(() => {
+                this.$set(row, 'editFocus', true);
+            });
+        },
+        editScopeBlur(row) {
+            this.$set(row, 'editScope', false);
+            this.$set(row, 'editFocus', true);
+            if (row.score > 0) {
+                this.$set(row, 'isError', false);
+            }
+            this.showSummary = false;
+
+            this.$nextTick(() => {
+                this.getSummaries({data: this.theoryQuestionList});
+            });
+        },
+        handleRowStyle({row, rowIndex}) {
+            return row.isError ? {background: '#F00'} : {background: '#FFF'};
+        },
+        getSummaries(param) {
+            const { data } = param;
+            const sums = [];
+            sums[0] = '总分';
+            const values = data.map(item => Number(item.score));
+            if (!values.every(value => isNaN(value))) {
+                sums[2] = values.reduce((prev, curr) => {
+                    const value = Number(curr);
+                    if (!isNaN(value)) {
+                        return prev + curr;
+                    } else {
+                        return prev;
+                    }
+                }, 0);
+                sums[2] += ' 分';
+            }
+            this.showSummary = true;
+            return sums;
+        },
+        exportPaper() {
+            let flag = false;
+            this.theoryQuestionList.forEach((item) => {
+                if (item.score <= 0) {
+                    flag = true;
+                    this.$set(item, 'isError', true);
+                }
+            });
+            this.operateQuestionList.forEach((item) => {
+                if (item.score <= 0) {
+                    flag = true;
+                    this.$set(item, 'isError', true);
+                }
+            });
+            if (flag) {
+                this.$message.error('试题分分值不得为0');
+            } else {
+                this.$refs.setExamTime.doShow();
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+/deep/
+.el-card__body{
+	height: calc(100% - 47px);
+}
+/deep/
+.el-table__body-wrapper {
+	height: calc(100% - 97px) !important;
+}
+</style>
diff --git a/src/views/competitionManage/operateQuestion.vue b/src/views/competitionManage/operateQuestion.vue
new file mode 100644
index 000000000..9c1f017b9
--- /dev/null
+++ b/src/views/competitionManage/operateQuestion.vue
@@ -0,0 +1,219 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="实操试题" width="80%">
+    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
+
+</template>
+
+<script>
+export default {
+    mixins: [
+        // WindowResizeHandler
+    ],
+    props: {
+        operateIndexList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            index: 0,
+            height: 0,
+            loading: false,
+            dialogVisible: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '80px',
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '实操名称'
+                    }
+                }
+            },
+            queryList: {
+                // query: getPracticeList,
+                data:[
+                    {id:1, raceId:2, name:'行调进行扣车操作', creatorName:'水墨'},
+                    {id:2, raceId:4, name:'行调进行扣车操作', creatorName:'zyy'},
+                    {id:3, raceId:3, name:'行调进行扣车操作', creatorName:'水墨'}
+                ],
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '实操名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '创建人',
+                        prop: 'creatorName',
+                        width: '100'
+                    },
+                    {
+                        type: 'button',
+                        title: '操 作',
+                        width: '420',
+                        buttons: [
+                            {
+                                name: '添加',
+                                handleClick: this.addQuestion,
+                                showControl: (row) => { return !row.paper; },
+                                type: 'success'
+                            },
+                            {
+                                name: '移出',
+                                handleClick: this.removeQuestion,
+                                showControl: (row) => { return row.paper; },
+                                type: 'warning'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+    },
+    watch: {
+
+    },
+    methods: {
+        loadInitData() {
+            this.$nextTick(() => {
+                this.queryList.reload();
+            });
+        },
+        doShow() {
+            this.dialogVisible = true;
+            this.loadInitData();
+        },
+        handleClose() {
+            this.dialogVisible = false;
+        },
+        addQuestion(index, row) {
+            this.$set(row, 'paper', true);
+            row.score = 0;
+            this.$emit('addQuestion', row);
+        },
+        afterQuery(data) {
+            if (data && data.list) {
+                const that = this;
+                const list = data.list;
+                if (list) {
+                    list.map(elem => {
+                        this.$set(elem, 'paper', that.operateIndexList.includes(elem.id));
+                    });
+                }
+            }
+            return data;
+        },
+        removeQuestion(index, row) {
+            this.$set(row, 'paper', false);
+            this.$emit('removeQuestion', row);
+        },
+        answerTags(row) {
+            const answer = [];
+            row.optionList.forEach((el, i) => {
+                switch (row.type) {
+                case 'select':
+                    if (el.correct) {
+                        answer.push(this.$asc2chart(i + 65));
+                    }
+                    break;
+                case 'judge':
+                    if (el.correct) {
+                        answer.push(el.content);
+                    }
+                    break;
+                }
+            });
+            return answer;
+        }
+    }
+};
+
+</script>
+<style lang="scss" scoped>
+	.layer-center {
+		width: 900px;
+		height: 100%;
+		margin: auto;
+		background: #fff;
+	}
+
+	.quiz {
+		background: #eee;
+		height: 100%;
+
+		&::-webkit-scrollbar {
+			display:none
+		}
+
+		&__card {
+			height: 100%;
+			.dir-item {
+				padding-left: 25px;
+			}
+
+			.dir-caption {
+				padding-left: 10px;
+				line-height: 26px;
+				background: #f1f1f1;
+			}
+
+		}
+
+		&__container {
+			height: 100%;
+
+			&-header {
+				height: auto !important;
+
+				.title {
+					font-size: 24px;
+					line-height: 60px;
+					font-weight: bold;
+					text-align: center;
+				}
+
+				.notes {
+					color:#606266;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					margin:  0 20px;
+				}
+			}
+
+			&-main {
+				.section {
+					padding: 5px 20px;
+					.caption {
+						line-height: 26px;
+					}
+					.context {
+					}
+				}
+			}
+
+			&-footer {
+				text-align: right;
+				position: sticky;
+				bottom: 0px;
+				padding: 40px ;
+				.buttons {
+					position: relative;
+					bottom: 20px;
+				}
+			}
+		}
+	}
+</style>
diff --git a/src/views/competitionManage/practiceList/create.vue b/src/views/competitionManage/practiceList/create.vue
new file mode 100644
index 000000000..e612b68b7
--- /dev/null
+++ b/src/views/competitionManage/practiceList/create.vue
@@ -0,0 +1,127 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getPracticeByIdBasic} from '@/api/race';
+
+export default {
+    name: 'ScriptDraft',
+    props: {
+        title: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        raceList:{
+            type: Array,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            isEdit:false,
+            formModel: {
+                name: '',
+                mapId: '',
+                description:''
+            }
+        };
+    },
+    computed: {
+        raceInfoList() {
+            const racelist = [];
+            this.raceList.forEach(each=>{
+                racelist.push({label:each.name, value:each.id});
+            });
+            return racelist;
+        },
+        form() {
+            const form = {
+                labelWidth: '120px',
+                items: [
+                    { prop: 'name', label: '实操名称', type: 'text' },
+                    { prop:'raceId', label:'竞赛名称', type:'select', options:this.raceInfoList, disabled:this.isEdit},
+                    { prop: 'description', label: '实操描述', type: 'textarea' }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                name: [
+                    { validator: this.validateScriptName, trigger: 'blur' },
+                    { validator: this.validateScriptName, trigger: 'change' }
+                ],
+                description: [
+                    { validator: this.validateDescription, trigger: 'blur' },
+                    { validator: this.validateDescription, trigger: 'change' }
+                ],
+                raceId:[
+                    { required: true, message: '请选择竞赛', trigger: 'change' }
+                ]
+            };
+            return crules;
+        }
+    },
+    methods: {
+        validateScriptName(rule, value, callback) {
+            if (value.trim().length === 0) {
+                this.formModel.name = this.formModel.name.replace(/\s/g, '');
+                return callback(new Error('请输入实操名称'));
+            } else {
+                return callback();
+            }
+        },
+        validateDescription(rule, value, callback) {
+            if (value.trim().length === 0) {
+                this.formModel.description = this.formModel.description.replace(/\s/g, '');
+                return callback(new Error('请输入实操描述'));
+            } else {
+                return callback();
+            }
+        },
+        doShow(questid) {
+            if (questid) {
+                getPracticeByIdBasic(questid).then(resp=>{
+                    const data = {'name':resp.data.name, 'description':resp.data.description, 'mapId':resp.data.mapId};
+                    this.formModel = data;
+                    this.formModel.id = questid;
+                    this.dialogVisible = true;
+                    this.isEdit = true;
+                });
+            } else {
+                this.formModel.mapId = this.$route.params.mapId;
+                this.dialogVisible = true;
+                this.isEdit = false;
+            }
+        },
+        doCreate() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                self.$emit('create', Object.assign({}, this.formModel));
+                self.doClose();
+            });
+        },
+        doClose() {
+            this.$refs.dataform.resetForm();
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog--center .el-dialog__body{
+    padding: 25px 65px 30px 10px;
+}
+</style>
diff --git a/src/views/competitionManage/practiceList/display/index.vue b/src/views/competitionManage/practiceList/display/index.vue
new file mode 100644
index 000000000..5a1a1ea0d
--- /dev/null
+++ b/src/views/competitionManage/practiceList/display/index.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="script-parent">
+    <div class="script-card" :style="{width: widthLeft+'px'}">
+      <practice-record ref="tipTaskRecord" :group="group" :width="widthLeft" />
+    </div>
+    <drap-left :width-left="widthLeft" :min="480" :max="580" @drapWidth="drapWidth" />
+    <div class="script-display">
+      <display ref="display" :size="size" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Display from '@/views/newMap/displayNew/index';
+import PracticeRecord from './practiceRecord';
+import drapLeft from '@/views/components/drapLeft/index';
+
+export default {
+    name: 'ScriptDisplayNew',
+    components: {
+        Display,
+        PracticeRecord,
+        drapLeft
+    },
+    data() {
+        return {
+            widthLeft: 480,
+            size: {
+                width: document.documentElement.clientWidth - 480,
+                height: document.documentElement.clientHeight
+            },
+            group: this.$route.query.group
+        };
+    },
+    watch: {
+        '$store.state.app.windowSizeCount': function() {
+            this.size = { width: this.$store.state.app.width - 480, height: this.$store.state.app.height};
+        },
+        widthLeft: function(val) {
+            this.size = { width: this.$store.state.app.width - val, height: this.$store.state.app.height};
+        }
+    },
+    methods: {
+        drapWidth(width) {
+            this.widthLeft = Number(width);
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+    .script-parent {
+        display: flex;
+        flex-flow: row;
+        .script-card {
+            width: 780px;
+        }
+    }
+</style>
diff --git a/src/views/competitionManage/practiceList/display/practiceRecord.vue b/src/views/competitionManage/practiceList/display/practiceRecord.vue
new file mode 100644
index 000000000..ca5fc3c8e
--- /dev/null
+++ b/src/views/competitionManage/practiceList/display/practiceRecord.vue
@@ -0,0 +1,10 @@
+<template>
+  <div>
+    111
+  </div>
+</template>
+<script>
+export default {
+
+};
+</script>
diff --git a/src/views/competitionManage/practiceList/index.vue b/src/views/competitionManage/practiceList/index.vue
new file mode 100644
index 000000000..44d86ad87
--- /dev/null
+++ b/src/views/competitionManage/practiceList/index.vue
@@ -0,0 +1,186 @@
+<template>
+  <div>
+    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <create-practice ref="createPractice" :race-list="raceList" title="创建实操" @reloadTable="reloadTable" @create="handleConfirmCreate" />
+    <create-practice ref="modifyPractice" :race-list="raceList" title="修改实操" @reloadTable="reloadTable" @create="handleConfirmModify" />
+  </div>
+</template>
+<script>
+import { getPracticeList, getRaceList, putPracticeInfo, deletePractice, createPractice, practiceRecordNotify } from '@/api/race';
+import { launchFullscreen } from '@/utils/screen';
+import { UrlConfig } from '@/scripts/ConstDic';
+import CreatePractice from './create';
+export default {
+    name:'PracticeManage',
+    components:{
+        CreatePractice
+    },
+    data() {
+        return {
+            raceList:[],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '80px',
+                queryObject: {
+                    raceId: {
+                        type: 'select',
+                        label: '竞赛名称',
+                        config: {
+                            data: []
+                        }
+                    },
+                    name: {
+                        type: 'text',
+                        label: '实操名称'
+                    }
+                }
+            },
+            queryList: {
+                // query: getPracticeList,
+                data:[
+                    {id:1, raceId:2, name:'行调进行扣车操作', creatorName:'水墨'},
+                    {id:2, raceId:4, name:'行调进行扣车操作', creatorName:'zyy'},
+                    {id:3, raceId:3, name:'行调进行扣车操作', creatorName:'水墨'}
+                ],
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '竞赛名称',
+                        prop: 'raceId',
+                        type: 'tag',
+                        width: '320',
+                        columnValue: (row) => { return this.getRaceName(row.raceId); },
+                        tagType: (row) => {
+                            return '';
+                        }
+                    },
+                    {
+                        title: '实操名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '创建人',
+                        prop: 'creatorName',
+                        width: '100'
+                    },
+                    {
+                        type: 'button',
+                        title: '操 作',
+                        width: '420',
+                        buttons: [
+                            {
+                                name: '录 制',
+                                handleClick: this.doRecord,
+                                type: 'success'
+                            },
+                            {
+                                name: '更 新',
+                                handleClick: this.doUpdate,
+                                type: 'primary'
+                            },
+                            {
+                                name: '删 除',
+                                handleClick: this.doDelete,
+                                type: 'danger'
+                            }
+                            // {
+                            //     name: '预 览',
+                            //     handleClick: this.doDetail
+                            // }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: '添 加', handler: this.doCreate }
+                ]
+            }
+        };
+    },
+    mounted() {
+        getRaceList({pageSize:999, pageNum:1}).then(res=>{
+            this.raceList = res.data.list;
+            this.queryForm.queryObject.raceId.config.data = [];
+            this.raceList.forEach(each=>{
+                this.queryForm.queryObject.raceId.config.data.push({label:each.name, value:each.id});
+            });
+        });
+    },
+    methods:{
+        doCreate() {
+            this.$refs.createPractice.doShow(null);
+        },
+        doDetail() {
+
+        },
+        doDelete(index, row) {
+            this.$confirm('此操作将删除此实操, 是否继续?', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deletePractice(row.id).then(response => {
+                    this.$message.success('删除实操试题成功');
+                    this.reloadTable();
+                }).catch((error) => {
+                    this.$messageBox(`删除实操试题失败: ${error.message}`);
+                });
+            }).catch(() => { });
+        },
+        doRecord(index, row) {
+            // row.id
+            let raceInfo;
+            this.raceList.forEach(each=>{
+                if (each.id == row.raceId) {
+                    raceInfo = each;
+                }
+            });
+            practiceRecordNotify(83).then(resp => {
+                const query = { mapId: raceInfo.mapId, group: resp.data, scriptId: row.id, lineCode:raceInfo.lineCode};
+                this.$router.push({ path: `${UrlConfig.practiceDisplayNew}/practice`, query });
+                launchFullscreen();
+            }).catch(error => {
+                this.$messageBox(`创建仿真失败: ${error.message}`);
+            });
+        },
+        // 修改
+        doUpdate(index, row) {
+            this.$refs.modifyPractice.doShow(row.id);
+        },
+        getRaceName(raceId) {
+            let raceName = '';
+            this.raceList.forEach(each=>{
+                if (each.id == raceId) {
+                    raceName = each.name;
+                }
+            });
+            return raceName;
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        handleConfirmCreate(data) {
+            createPractice(data).then(resp => {
+                this.reloadTable();
+                this.$message.success('创建实操试题成功');
+            }).catch(error => {
+                this.$messageBox(`创建实操试题失败: ${error.message}`);
+            });
+        },
+        handleConfirmModify(data) {
+            putPracticeInfo(data.id, data).then(resp => {
+                this.reloadTable();
+                this.$message.success('修改实操试题成功');
+            }).catch(error => {
+                this.$messageBox(`修改实操试题失败: ${error.message}`);
+            });
+        }
+    }
+};
+</script>
diff --git a/src/views/competitionManage/setExamTime.vue b/src/views/competitionManage/setExamTime.vue
new file mode 100644
index 000000000..1276e6079
--- /dev/null
+++ b/src/views/competitionManage/setExamTime.vue
@@ -0,0 +1,172 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="试卷导出" width="500px">
+    <el-form ref="form" :model="form" label-width="150px" :rules="rules">
+      <el-form-item label="理论竞赛时长:" prop="theoryExamTime">
+        <el-input-number v-model="form.theoryExamTime" controls-position :min="1" /><span>&nbsp&nbsp分</span>
+      </el-form-item>
+      <el-form-item label="实操竞赛时长:" prop="operateExamTime">
+        <el-input-number v-model="form.operateExamTime" controls-position :min="1" /><span>&nbsp&nbsp分</span>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleExport">导出</el-button>
+        <el-button @click="handleClose">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+
+</template>
+
+<script>
+import { getRaceById } from '@/api/competition';
+export default {
+    mixins: [
+        // WindowResizeHandler
+    ],
+    props: {
+        operateQuestionList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        },
+        theoryQuestionList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            index: 0,
+            height: 0,
+            loading: false,
+            dialogVisible: false,
+            form: {
+                theoryExamTime: 1,
+                operateExamTime: 1
+            },
+            rules: {
+                theoryExamTime: [
+                    { required: true, message: '请输入理论竞赛时长', trigger: 'blur' }
+                ],
+                operateExamTime: [
+                    { required: true, message: '请输入实操竞赛时长', trigger: 'blur' }
+                ]
+            }
+        };
+    },
+    computed: {
+    },
+    watch: {
+
+    },
+    methods: {
+        doShow() {
+            this.dialogVisible = true;
+        },
+        handleClose() {
+            this.dialogVisible = false;
+        },
+        handleExport() {
+            getRaceById(this.$route.query.raceId).then(resp => {
+                const exportData = {
+                    practicalQuestions: this.operateQuestionList,
+                    theoryQuestions: this.theoryQuestionList,
+                    competitionId: this.$route.query.raceId,
+                    theoryExamTime: this.form.theoryExamTime,
+                    practicalExamTime: this.form.operateExamTime
+                };
+                const content = new Blob([JSON.stringify(exportData)]);
+                const urlObject = window.URL || window.webkitURL || window;
+                const url = urlObject.createObjectURL(content);
+                const el = document.createElement('a');
+                el.href = url;
+                el.download = `${resp.data.name}试卷.json`;
+                el.click();
+                urlObject.revokeObjectURL(url);
+                this.dialogVisible = false;
+            }).catch(()=> {
+                this.$message.error('查询竞赛详情失败！');
+            });
+        }
+    }
+};
+
+</script>
+<style lang="scss" scoped>
+	.layer-center {
+		width: 900px;
+		height: 100%;
+		margin: auto;
+		background: #fff;
+	}
+
+	.quiz {
+		background: #eee;
+		height: 100%;
+
+		&::-webkit-scrollbar {
+			display:none
+		}
+
+		&__card {
+			height: 100%;
+			.dir-item {
+				padding-left: 25px;
+			}
+
+			.dir-caption {
+				padding-left: 10px;
+				line-height: 26px;
+				background: #f1f1f1;
+			}
+
+		}
+
+		&__container {
+			height: 100%;
+
+			&-header {
+				height: auto !important;
+
+				.title {
+					font-size: 24px;
+					line-height: 60px;
+					font-weight: bold;
+					text-align: center;
+				}
+
+				.notes {
+					color:#606266;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					margin:  0 20px;
+				}
+			}
+
+			&-main {
+				.section {
+					padding: 5px 20px;
+					.caption {
+						line-height: 26px;
+					}
+					.context {
+					}
+				}
+			}
+
+			&-footer {
+				text-align: right;
+				position: sticky;
+				bottom: 0px;
+				padding: 40px ;
+				.buttons {
+					position: relative;
+					bottom: 20px;
+				}
+			}
+		}
+	}
+</style>
diff --git a/src/views/competitionManage/theoryQuestion.vue b/src/views/competitionManage/theoryQuestion.vue
new file mode 100644
index 000000000..4085c872e
--- /dev/null
+++ b/src/views/competitionManage/theoryQuestion.vue
@@ -0,0 +1,244 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="理论试题" width="80%">
+    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
+
+</template>
+
+<script>
+import { listQuestionPage } from '@/api/questionBank.js';
+export default {
+    mixins: [
+        // WindowResizeHandler
+    ],
+    props: {
+        theoryIndexList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            index: 0,
+            height: 0,
+            loading: false,
+            dialogVisible: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '80px',
+                queryObject: {
+                    type: {
+                        type: 'select',
+                        label: '类 型',
+                        config: {
+                            data: this.$ConstSelect.QuestionTypeList
+                        }
+                    },
+                    topic: {
+                        type: 'text',
+                        label: '题 目'
+                    }
+                }
+            },
+            queryList: {
+                query: listQuestionPage,
+                selectCheckShow: false,
+                indexShow: true,
+                afterQuery: this.afterQuery,
+                columns: [
+                    {
+                        title: '类 型',
+                        prop: 'type',
+                        type: 'tag',
+                        width: '120',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.type, 'QuestionTypeList'); },
+                        tagType: (row) => {
+                            return '';
+                        }
+                    },
+                    {
+                        title: '题 目',
+                        prop: 'topic',
+                        type: 'html'
+                    },
+                    {
+                        title: '答 案',
+                        prop: 'answer',
+                        type: 'tagMore',
+                        width: '100',
+                        columnValue: (row) => { return this.answerTags(row); },
+                        tagType: (row) => {
+                            return '';
+                        }
+                    },
+                    {
+                        title: '创建人',
+                        prop: 'createUserName',
+                        width: '100'
+                    },
+                    {
+                        type: 'button',
+                        title: '操 作',
+                        width: '100',
+                        buttons: [
+                            {
+                                name: '添加',
+                                handleClick: this.addQuestion,
+                                showControl: (row) => { return !row.paper; },
+                                type: 'success'
+                            },
+                            {
+                                name: '移出',
+                                handleClick: this.removeQuestion,
+                                showControl: (row) => { return row.paper; },
+                                type: 'warning'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+    },
+    watch: {
+
+    },
+    methods: {
+        loadInitData() {
+            this.$nextTick(() => {
+                this.queryList.reload();
+            });
+        },
+        doShow() {
+            this.dialogVisible = true;
+            this.loadInitData();
+        },
+        handleClose() {
+            this.dialogVisible = false;
+        },
+        addQuestion(index, row) {
+            this.$set(row, 'paper', true);
+            row.score = 0;
+            this.$emit('addQuestion', row);
+        },
+        afterQuery(data) {
+            if (data && data.list) {
+                const that = this;
+                const list = data.list;
+                if (list) {
+                    list.map(elem => {
+                        this.$set(elem, 'paper', that.theoryIndexList.includes(elem.id));
+                    });
+                }
+            }
+            return data;
+        },
+        removeQuestion(index, row) {
+            this.$set(row, 'paper', false);
+            this.$emit('removeQuestion', row);
+        },
+        answerTags(row) {
+            const answer = [];
+            row.optionList.forEach((el, i) => {
+                switch (row.type) {
+                case 'select':
+                    if (el.correct) {
+                        answer.push(this.$asc2chart(i + 65));
+                    }
+                    break;
+                case 'judge':
+                    if (el.correct) {
+                        answer.push(el.content);
+                    }
+                    break;
+                }
+            });
+            return answer;
+        }
+    }
+};
+
+</script>
+<style lang="scss" scoped>
+	.layer-center {
+		width: 900px;
+		height: 100%;
+		margin: auto;
+		background: #fff;
+	}
+
+	.quiz {
+		background: #eee;
+		height: 100%;
+
+		&::-webkit-scrollbar {
+			display:none
+		}
+
+		&__card {
+			height: 100%;
+			.dir-item {
+				padding-left: 25px;
+			}
+
+			.dir-caption {
+				padding-left: 10px;
+				line-height: 26px;
+				background: #f1f1f1;
+			}
+
+		}
+
+		&__container {
+			height: 100%;
+
+			&-header {
+				height: auto !important;
+
+				.title {
+					font-size: 24px;
+					line-height: 60px;
+					font-weight: bold;
+					text-align: center;
+				}
+
+				.notes {
+					color:#606266;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					margin:  0 20px;
+				}
+			}
+
+			&-main {
+				.section {
+					padding: 5px 20px;
+					.caption {
+						line-height: 26px;
+					}
+					.context {
+					}
+				}
+			}
+
+			&-footer {
+				text-align: right;
+				position: sticky;
+				bottom: 0px;
+				padding: 40px ;
+				.buttons {
+					position: relative;
+					bottom: 20px;
+				}
+			}
+		}
+	}
+</style>
diff --git a/src/views/competitionManage/theoryReview.vue b/src/views/competitionManage/theoryReview.vue
new file mode 100644
index 000000000..efc2d4be4
--- /dev/null
+++ b/src/views/competitionManage/theoryReview.vue
@@ -0,0 +1,214 @@
+<template>
+  <el-dialog fullscreen :visible.sync="dialogVisible" :before-close="handleClose" style="height: 100%;" title="理论试题预览" :show-close="showClose" center>
+    <el-container class="quiz">
+      <el-container class="quiz__container">
+        <el-header class="quiz__container-header layer-center">
+          <div class="title">{{ formModel.name }}</div>
+          <div class="notes">{{ formModel.description }}</div>
+        </el-header>
+        <el-main class="quiz__container-main layer-center">
+          <div v-for="(el,i) in sortedList" :id="'anchor__lst-'+i" :key="i" class="section">
+            <template v-if="el.children.length">
+              <div class="caption">{{ index2UnicodeList[i] }}、{{ el.title }} </div>
+              <question v-for="(item,j) in el.children" :id="'anchor__lst-'+item.type+'-'+item.index" :key="j" v-model="item.answer" class="context" :option="item" @save="onSave" />
+            </template>
+          </div>
+        </el-main>
+        <el-footer class="quiz__container-footer layer-center" @click="returnTop">
+          <el-button-group class="buttons">
+            <el-button v-loading="loading" type="primary" @click="handleClose">返回</el-button>
+          </el-button-group>
+        </el-footer>
+      </el-container>
+    </el-container>
+  </el-dialog>
+
+</template>
+
+<script>
+import Question from '@/views/jsxt/competition/theory/quiz/question';
+
+export default {
+    components: {
+        Question
+    },
+    mixins: [
+        // WindowResizeHandler
+    ],
+    props: {
+        theoryQuestionList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            index: 0,
+            height: 0,
+            loading: false,
+            showClose: false,
+            dialogVisible: false,
+            formModel: {
+                description: '',
+                duration: 10,
+                name: '',
+                status: '',
+                totalScore: 0,
+                passScore: 10
+            }
+        };
+    },
+    computed: {
+        examId() {
+            return this.$route.params.examId;
+        },
+        userExamId() {
+            return this.$route.params.userExamId;
+        },
+        question() {
+            return this.theoryQuestionList[this.index] || {};
+        },
+        index2UnicodeList() {
+            return ['一', '二', '三', '四'];
+        },
+        sortedList() {
+            return [
+                {
+                    title: '判断题',
+                    children: this.theoryQuestionList.filter(el => { return el.type === 'judge'; })
+                },
+                {
+                    title: '选择题',
+                    children: this.theoryQuestionList.filter(el => { return el.type === 'select'; })
+                }
+            ];
+        }
+    },
+    watch: {
+        '$router': function() {
+            this.loadInitData();
+        }
+    },
+    methods: {
+        loadInitData() {
+            console.log('获取试题详情');
+        },
+        doShow() {
+            this.dialogVisible = true;
+            this.loadInitData();
+        },
+        resizeHandler() {
+            this.height = this._clientHeight;
+        },
+        appendIndex(str, index) {
+            return `${index + 1}. ${str}`;
+        },
+        goAnchor(selector) {
+            const anchor = this.$el.querySelector(selector);
+            const el = this.$el.querySelector('.el-main');
+            if (anchor && el) {
+                el.scrollTop = anchor.offsetTop;
+            }
+        },
+        returnTop() {
+            document.querySelector('.el-header').scrollIntoView(true);
+        },
+        onSave(data) {
+            console.log(data, '问答题');
+        },
+        handleClose() {
+            this.dialogVisible = false;
+        }
+    }
+};
+
+</script>
+<style lang="scss" scoped>
+	.layer-center {
+		width: 900px;
+		height: 100%;
+		margin: auto;
+		background: #fff;
+	}
+
+	.quiz {
+		background: #eee;
+		height: 100%;
+
+		&::-webkit-scrollbar {
+			display:none
+		}
+
+		&__card {
+			height: 100%;
+			.dir-item {
+				padding-left: 25px;
+			}
+
+			.dir-caption {
+				padding-left: 10px;
+				line-height: 26px;
+				background: #f1f1f1;
+			}
+
+		}
+
+		&__container {
+			height: 100%;
+
+			&-header {
+				height: auto !important;
+
+				.title {
+					font-size: 24px;
+					line-height: 60px;
+					font-weight: bold;
+					text-align: center;
+				}
+
+				.notes {
+					color:#606266;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					margin:  0 20px;
+				}
+			}
+
+			&-main {
+				.section {
+					padding: 5px 20px;
+					.caption {
+						line-height: 26px;
+					}
+					.context {
+					}
+				}
+			}
+
+			&-footer {
+				text-align: right;
+				position: sticky;
+				bottom: 0px;
+				padding: 40px ;
+				.buttons {
+					position: relative;
+					bottom: 20px;
+				}
+			}
+		}
+	}
+	/deep/
+	.el-dialog__body {
+		height: calc(100% - 24px);
+		padding: 0;
+	}
+	/deep/
+	.el-dialog__header {
+		padding: 0;
+		background: #409EFF;
+		height: 24px;
+	}
+</style>
diff --git a/src/views/components/StatusIcon/statusIcon.vue b/src/views/components/StatusIcon/statusIcon.vue
new file mode 100644
index 000000000..0dd3a0901
--- /dev/null
+++ b/src/views/components/StatusIcon/statusIcon.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="icon-box" :style="{top: offset+'px'}">
+    <div class="textStatus" :style="{background: holdBackground}" @mouseenter="showHoldStatus" @mouseleave="hideHoldStatus">H</div>
+    <div class="textStatus" :style="{background: jumpBackground}" @mouseenter="showJumpStatus" @mouseleave="hideJumpStatus">S</div>
+    <pop-tip v-show="popShow" :position="position" :tip="tip" />
+  </div>
+</template>
+
+<script>
+import PopTip from '@/views/newMap/mapsystemNew/plugin/src/poptip';
+
+export default {
+    name: 'StatusIcon',
+    components: { PopTip },
+    data() {
+        return {
+            offset: 15,
+            holdBackground: '#807D8E',
+            jumpBackground: '#807D8E',
+            tip: '',
+            position: {x: 0, y:0, align: 'top', textAlign:'left', fontNumber: 12},
+            popShow: false
+        };
+    },
+    watch: {
+        '$store.state.map.holdStatus': function (val) {
+            if (val) {
+                this.holdBackground = '#F00';
+            } else {
+                this.holdBackground = '#807D8E';
+            }
+        },
+        '$store.state.map.jumpStatus': function (val) {
+            if (val) {
+                this.jumpBackground = '#F00';
+            } else {
+                this.jumpBackground = '#807D8E';
+            }
+        }
+    },
+    mounted() {
+        this.setPosition();
+    },
+    methods: {
+        setPosition() {
+            this.$nextTick(() => {
+                let offset = 30;
+                const menuBar = document.getElementById('menuBar');
+                const menuTool = document.getElementById('menuTool');
+                if (menuBar) {
+                    offset = (menuBar.offsetHeight || 0);
+                }
+
+                if (menuTool) {
+                    offset = (menuTool.offsetHeight || 0);
+                }
+                if (this.offset !== offset) {
+                    this.offset = offset;
+                }
+            });
+        },
+        showHoldStatus(e) {
+            if (this.$store.state.map.holdStandList.length) {
+                this.popShow = true;
+                this.position.x = e.clientX;
+                this.position.y = e.clientY;
+                this.tip = '扣车提示:<br>';
+                this.$store.state.map.holdStandList.forEach(item => {
+                    const stand = this.$store.getters['map/getDeviceByCode'](item);
+                    const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
+                    const dir = stand.right ? '上行站台' : '下行站台';
+                    if (stand) {
+                        this.tip = this.tip + station.name + ':<br>' + dir + '站台存在扣车命令<br>';
+                    }
+                });
+            }
+        },
+        hideHoldStatus(e) {
+            this.popShow = false;
+        },
+        showJumpStatus(e) {
+            if (this.$store.state.map.jumpStandList.length) {
+                this.popShow = true;
+                this.position.x = e.clientX;
+                this.position.y = e.clientY;
+                this.tip = '跳停提示:<br>';
+                this.$store.state.map.jumpStandList.forEach(item => {
+                    const stand = this.$store.getters['map/getDeviceByCode'](item);
+                    const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
+                    const dir = stand.right ? '上行站台' : '下行站台';
+                    if (stand) {
+                        this.tip = this.tip + station.name + ':<br>' + dir + '站台存在跳停命令<br>';
+                    }
+                });
+            }
+        },
+        hideJumpStatus(e) {
+            this.popShow = false;
+        }
+    }
+};
+</script>
+
+<style scoped>
+	.icon-box {
+		z-index: 7;
+		position: absolute;
+		left: 0;
+		width: 120px;
+		height: 64px;
+		background: rgb(224, 223, 223);
+		/*border-radius: 4px;*/
+		overflow: hidden;
+		display: flex;
+		box-shadow: 0 0 5px #eee;
+	}
+	.textStatus {
+		width: 50px;
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 28px;
+		margin: 7px 4px;
+
+		background: #807D8E;
+		color: #C9A167;
+	}
+</style>
diff --git a/src/views/components/font/index.vue b/src/views/components/font/index.vue
index 6f8ea0a1e..011f83c6d 100644
--- a/src/views/components/font/index.vue
+++ b/src/views/components/font/index.vue
@@ -1,71 +1,70 @@
 <template>
   <div class="font_box">
-    <el-select v-model="font" :placeholder="$t('global.font')" @input="$emit('input', inputValue)">
+    <!-- <el-select v-model="font" :placeholder="$t('global.font')" @input="$emit('input', inputValue)">
       <el-option v-for="option in fontList" :key="option.code" :label="option.name" :value="option.code" />
-    </el-select>
+    </el-select> -->
     <el-select v-model="size" :placeholder="$t('global.size')" @input="$emit('input', inputValue)">
       <el-option v-for="option in sizeList" :key="option.code" :label="option.name" :value="option.code" />
     </el-select><br>
-    <div class="format">
+    <!-- <div class="format">
       <span :style="{'font-family': font, 'font-size': size}">{{ text }}</span>
-    </div>
+    </div> -->
   </div>
 </template>
 
 <script>
 export default {
     name: 'ElFont',
-    props: [
-        'value'
-    ],
+    props: ['value'],
     data() {
         return {
-            fontList: [
-                { code: 'consolas', name: 'consolas' },
-                { code: 'sans-serif', name: 'sans-serif' },
-                { code: 'STHeiti', name: '华文黑体' },
-                { code: 'FangSong', name: '仿宋' }
-            ],
+            // fontList: [
+            //     { code: 'consolas', name: 'consolas' },
+            //     { code: 'sans-serif', name: 'sans-serif' },
+            //     { code: 'STHeiti', name: '华文黑体' },
+            //     { code: 'FangSong', name: '仿宋' }
+            // ],
             sizeList: [
-                { code: '0px', name: '0px' },
-                { code: '4px', name: '4px' },
-                { code: '6px', name: '6px' },
-                { code: '8px', name: '8px' },
-                { code: '10px', name: '10px' },
-                { code: '12px', name: '12px' },
-                { code: '14px', name: '14px' },
-                { code: '16px', name: '16px' },
-                { code: '18px', name: '18px' },
-                { code: '20px', name: '20px' },
-                { code: '22px', name: '22px' },
-                { code: '24px', name: '24px' },
-                { code: '26px', name: '26px' },
-                { code: '28px', name: '28px' },
-                { code: '30px', name: '30px' },
-                { code: '32px', name: '32px' },
-                { code: '34px', name: '34px' },
-                { code: '36px', name: '36px' },
-                { code: '38px', name: '38px' },
-                { code: '40px', name: '40px' }
+                { code: '0', name: '0px' },
+                { code: '4', name: '4px' },
+                { code: '6', name: '6px' },
+                { code: '8', name: '8px' },
+                { code: '10', name: '10px' },
+                { code: '12', name: '12px' },
+                { code: '14', name: '14px' },
+                { code: '16', name: '16px' },
+                { code: '18', name: '18px' },
+                { code: '20', name: '20px' },
+                { code: '22', name: '22px' },
+                { code: '24', name: '24px' },
+                { code: '26', name: '26px' },
+                { code: '28', name: '28px' },
+                { code: '30', name: '30px' },
+                { code: '32', name: '32px' },
+                { code: '34', name: '34px' },
+                { code: '36', name: '36px' },
+                { code: '38', name: '38px' },
+                { code: '40', name: '40px' }
             ],
             size: '10px',
-            font: 'consolas',
+            // font: 'consolas',
             text: 'hello world'
         };
     },
     computed: {
         inputValue: function () {
-            return this.size + ' ' + this.font;
+            return this.size;
         }
     },
     watch: {
         value(val) {
             if (val !== this.inputValue && val) {
-                const arr = val.split(' ');
-                if (arr && arr.length >= 2) {
-                    this.size = arr[0];
-                    this.font = arr[1];
-                }
+                this.size = val;
+                // const arr = val.split(' ');
+                // if (arr && arr.length >= 2) {
+                //     this.size = arr[0];
+                //     this.font = arr[1];
+                // }
             }
         }
     },
@@ -79,7 +78,7 @@ export default {
         background-color: #C0C4CC;
         width: 100%;
 		display: flex;
-    	padding-left: 15px;
+		padding-left: 15px;
     }
 	.font_box{
 		/deep/ {
diff --git a/src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue b/src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue
index b1c18cbef..0847b6f85 100644
--- a/src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue
+++ b/src/views/iscs/iscsDraw/iscsBasOperate/volumeControlDamper.vue
@@ -5,7 +5,7 @@
         <el-input v-model="form.code" :disabled="true" />
       </el-form-item>
       <el-form-item label="图形宽度" prop="width">
-        <el-input-number v-model="form.width" :min="20" />
+        <el-input-number v-model="form.width" :min="15" />
       </el-form-item>
       <el-form-item label="旋转角度" prop="rotateAngle">
         <el-select v-model="form.rotateAngle" placeholder="请选择类型">
diff --git a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
index 68b60815b..27af4ddd9 100644
--- a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
+++ b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
@@ -1,19 +1,31 @@
 <template>
   <div class="iscs_lcd_box" style="width: 100%;height: 100%; position: relative;">
     <div class="lcdControl_title">LCD控制屏</div>
-    <div class="area_select">
+    <div class="area_select" style="margin-top: 110px;">
       <div class="area_select_title">特定区域</div>
       <div class="area_select_button">全线</div>
     </div>
-    <div class="area_select" style="top: 27%;">
+    <div class="area_select" style="margin-top: 200px;">
       <div>
-        <el-radio v-model="lcdSwitch" :label="true" size="small" border>开启LCD屏</el-radio>
+        <el-radio v-model="lcdSwitch" :label="true" size="small" border style="margin-left: 12px;margin-bottom: 5px;margin-top: 10px;">开启LCD屏</el-radio>
         <br>
         <el-radio v-model="lcdSwitch" :label="false" size="small" border>关闭LCD屏</el-radio>
       </div>
-      <div>确定</div>
+      <div class="area_select_button" style="margin-top: 20px;">确定</div>
+    </div>
+
+    <div class="lcd_content_box">
+      <div style="display: inline-block;">
+        <div class="lcd_content_box_left_title">车站</div>
+        <div class="lcd_content_box_left_title">选择</div>
+      </div>
+      <div v-for="(station, index) in stationList" :key="index" style="display: inline-block;text-align: center;">
+        <div class="each_station_info">{{ station }}</div>
+        <div class="button_default_content">
+          <div class="button_default" :style="{background:selectedAreaList.includes(station.stationName + '-' + index)?'#2EFF74':'#CDCDCD'}" />
+        </div>
+      </div>
     </div>
-    <div />
   </div>
 </template>
 <script>
@@ -22,7 +34,8 @@ export default {
         return {
             columns: ['车站', '选择'],
             stationList: ['会展中心站', '世纪大道站', '交通大学站', '市图书馆站', '中心医院站', '未来路站', '火车站', '人民广场站', '体育中心站'],
-            lcdSwitch: true
+            lcdSwitch: true,
+            selectedAreaList:[]
         };
     }
 };
@@ -41,10 +54,8 @@ export default {
 	}
 	.area_select {
 		position: absolute;
-		top: 15%;
 		left: 25%;
 		width: 120px;
-		/*height: 70px;*/
 		border-top: 3px solid #898888;
 		border-left: 3px solid #898888;
 		border-right: 3px solid #fff;
@@ -58,17 +69,74 @@ export default {
 	}
 	.area_select_button {
 		text-align: center;
-		width: 80px;
+		width: 90px;
 		height: 30px;
 		background: #A9A9A9;
 		border-top: 2px solid #FFF;
 		border-left: 2px solid #FFF;
 		border-right: 2px solid #898888;
 		border-bottom: 2px solid #898888;
-		margin: 5px 18px 10px;
+		margin: 5px 12px 10px;
 		font-size: 14px;
 		line-height: 30px;
 	}
+	.each_station_info{
+		/*display: inline-block;*/
+		vertical-align:top;
+		font-size: 13px;
+		padding: 2px 2px;
+		background: #A9A9A9;
+		border-top: 2px solid #FFF;
+		border-left: 2px solid #FFF;
+		border-right: 2px solid #898888;
+		border-bottom: 2px solid #898888;
+		margin-right: 5px;
+	}
+	.lcd_content_box{
+		margin-top: 110px;
+		width: 700px;
+		height: 330px;
+		position: absolute;
+		left: 35%;
+		border-top: 3px solid #898888;
+		border-left: 3px solid #898888;
+		border-right: 3px solid #fff;
+		border-bottom: 3px solid #fff;
+		padding-top: 10px;
+		padding-left: 10px;
+		overflow-x: auto;
+	}
+	.lcd_content_box_left_title{
+		vertical-align:top;
+		font-size: 13px;
+		color: #CBFFFF;
+		padding: 10px 10px 5px;
+	}
+	.button_default_content{
+		margin-top: 5px;
+		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;
+		text-align: center;
+	}
+	.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;
+	}
 </style>
 <style lang="scss">
 	.iscs_lcd_box .el-radio.is-bordered.is-checked {
@@ -95,4 +163,13 @@ export default {
 	.iscs_lcd_box .el-radio__input.is-checked+.el-radio__label {
 		color: #FFF;
 	}
+	.iscs_lcd_box .el-radio__input.is-checked .el-radio__inner{
+		background: #FFF;
+	}
+	.iscs_lcd_box .el-radio__input.is-checked .el-radio__inner::after{
+		background: #1E84C7;
+	}
+	.iscs_lcd_box .el-radio--small.is-bordered {
+		padding: 8px 5px 0 0;
+	}
 </style>
diff --git a/src/views/jsxt/apply/index.vue b/src/views/jsxt/apply/index.vue
index ed7eeb9b1..8333e0aed 100644
--- a/src/views/jsxt/apply/index.vue
+++ b/src/views/jsxt/apply/index.vue
@@ -55,14 +55,37 @@
     </template>
     <template v-else>
       <div v-if="flag" class="apply_box">
-        <i class="el-icon-success" style="color: green; font-size: 40px;" />
-        <span class="title">报名成功!</span>
+        <div class="img_box"><img :src="SAFS" alt=""></div>
+        <div style="width: 100%;text-align:center;margin-top:120px;"><i class="el-icon-success" style="color: green; font-size: 100px;" /></div>
+        <div style="width: 100%;margin-top: 25px;">
+          <div class="apply_box_title">报名成功!:<br> 您的赛事信息如下:
+            <br>竞赛名称：{{ compition.name }}
+            <br>竞赛时间：{{ compition.startDate }}
+            <br>姓名：{{ formModel.name }}
+            <br>公司：{{ formModel.company }}
+            <br>部门：{{ formModel.department }}
+            <br>职位：{{ formModel.job }}
+            <br>电话：{{ formModel.phone.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2") }}
+          </div>
+        </div>
       </div>
-      <div v-if="!flag" class="apply_box">
-        <i class="el-icon-info" style="color: green; font-size: 40px;" />
-        <span class="title">您已报过名了!</span>
+      <div v-if="!flag" class="applyAready_box">
+        <div class="img_box"><img :src="SAFS" alt=""></div>
+        <div style="width: 100%;text-align:center;margin-top:120px;"><img :src="applyAlready" class="applyAlready"></div>
+        <div style="width: 100%;margin-top: 25px;">
+          <div class="apply_box_title">
+            您的赛事信息如下:
+            <br>竞赛名称：{{ compition.name }}
+            <br>竞赛时间：{{ compition.startDate }}
+            <br>姓名：{{ formModel.name }}
+            <br>公司：{{ formModel.organization }}
+            <br>部门：{{ formModel.department }}
+            <br>职位：{{ formModel.position }}
+            <br>电话：{{ formModel.mobile.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2") }}
+          </div>
+        </div>
       </div>
-    </template>
+    </template></div></template>
   </div>
 </template>
 
@@ -74,8 +97,9 @@ import md5 from 'js-md5';
 import Cookies from 'js-cookie';
 import QrcodeVue from 'qrcode.vue';
 import { getUserinfoMobileCode } from '@/api/management/user';
-import { postSignUp } from '@/api/competition';
-import { getIsSignUp } from '@/api/competition';
+import { postSignUp, getRaceUserById, getRaceById } from '@/api/competition';
+import applyAlready from '@/assets/applyAlready.png';
+import SAFS from '@/assets/SAFS.png';
 
 export default {
     name: '',
@@ -96,7 +120,9 @@ export default {
             }
         };
         return {
+            SAFS: SAFS,
             dialogVisible: false,
+            applyAlready:applyAlready,
             applyFlag: true,
             flag: true,
             loginClient: 'Design',
@@ -128,6 +154,10 @@ export default {
                 department: '', // 部门
                 phone: '', // 电话
                 phoneCode: '' // 验证码
+            },
+            compition:{
+                name:'',
+                startDate:''
             }
         };
     },
@@ -184,9 +214,13 @@ export default {
                     if (this.checkLogin) {
                         this.clearTimer(this.checkLogin);
                     }
-                    getIsSignUp(this.$route.query.raceId).then(res => {
+                    getRaceUserById(this.$route.query.raceId).then(res => {
                         if (res.data) {
                             // 已经报名过
+                            getRaceById(this.$route.query.raceId).then(res=>{
+                                this.compition = res.data;
+                            });
+                            this.formModel = res.data;
                             this.applyFlag = false;
                             this.flag = false;
                         }
@@ -324,15 +358,20 @@ export default {
                     name: this.formModel.name,
                     organization: this.formModel.company,
                     position: this.formModel.job,
-                    vdCode: this.formModel.phoneCode
+                    vdCode: this.formModel.phoneCode,
+                    role: 'DISPATCHER'
                 };
                 if (this.$route.query.raceId) {
                     postSignUp(this.$route.query.raceId, param).then(res => {
                         // this.$messageBox('报名成功！');
+                        getRaceById(this.$route.query.raceId).then(res=>{
+                            this.compition = res.data;
+                        });
                         this.applyFlag = false;
                         this.flag = true;
                     }).catch(error => {
                         console.log(error);
+                        this.$messageBox(error.message);
                     });
                 } else {
                     this.$messageBox('报名地址有问题，请检查');
@@ -378,8 +417,12 @@ export default {
     $dark_gray:#889aa4;
     $light_gray:#eee;
     $qrcodeSize: 270px;
+    .applyAlready{
+        width:150px;
+    }
+	.applyAready_box{
+	}
 	.dictionary_box{
-		padding-top: 10px;
 		.joylink-card{
 			width: 800px;
 			margin: 0 auto 20px;
@@ -391,19 +434,27 @@ export default {
 			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 		}
 	}
-	.apply_box{
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin-top: 50px;
-		font-size: 25px;
-		.title{
-			margin-left: 7px;
-			text-align: left;
-			font-size: 25px;
-			width: auto;
+	.img_box{
+		width: 100%;
+		height: 80px;
+		img{
+			width: 100%;
+			height: 100%;
 		}
 	}
+	.apply_box{
+		// display: flex;
+		// justify-content: center;
+		// align-items: center;
+		font-size: 25px;
+	}
+    .apply_box_title{
+			font-size: 22px;
+            line-height: 35px;
+            margin-left: 50%;
+            transform: translateX(-50%);
+            display: inline-block;
+		}
 	/deep/{
 		.dialog-apply{
 			.el-form-item{
diff --git a/src/views/jsxt/competition/demonList.vue b/src/views/jsxt/competition/demonList.vue
index c0ce2d471..790fc26b8 100644
--- a/src/views/jsxt/competition/demonList.vue
+++ b/src/views/jsxt/competition/demonList.vue
@@ -70,12 +70,12 @@ export default {
         clickEvent(obj, data, ele) {
             if (obj.type === 'Map') {
                 this.mapId = obj.id;
-                this.$router.push({ path: `/jsxt/home`});
+                this.$router.push({ path: `/jsxt/home`, query:{raceId:this.$route.query.raceId}});
             } else if (obj.type === 'theory') {
-                const query = {type: 'theory', mapId: this.mapId};
+                const query = {type: 'theory', mapId: this.mapId, raceId:this.$route.query.raceId};
                 this.$router.push({path: `/jsxt/examDetail`, query: query});
             } else if (obj.type === 'operation') {
-                const query = {type: 'operation', mapId: this.mapId};
+                const query = {type: 'operation', mapId: this.mapId, raceId:this.$route.query.raceId};
                 this.$router.push({path: `/jsxt/examDetail`, query: query});
             }
         }
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 1d28941f2..48ecc8904 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -1,50 +1,12 @@
 <template>
   <div class="joylink-card">
-    <div class="card-title">
-      <b>{{ examType + $t('exam.nameOfTestPaper') +': ' + examDetails.name }}</b>
-    </div>
-    <div class="card_content">
-      <el-scrollbar wrap-class="scrollbar-wrapper">
-        <!-- <p class="list-item">
-          <span class="list-label">{{ $t('exam.examStartTime') +':' }}</span>
-          <span v-if="examDetails.startTime" class="list-elem">
-            {{ examDetails.startTime }} - {{ examDetails.endTime }}</span>
-          <span v-else class="list-elem">{{ $t('exam.theExamIsReadyAnyTime') }}</span>
-        </p>
-        <p class="list-item">
-          <span class="list-label">{{ $t('exam.testExplanation') + ':' }}</span>
-          <span class="list-elem">{{ examDetails.remarks }}</span>
-        </p>
-        <p class="list-item">
-          <span class="list-label">{{ $t('exam.examTimeAvailable') + ':' }}</span>
-          <span class="list-elem" v-html="parseInt(examDetails.duration) / 60 + $t('exam.minutes')" />
-        </p>
-        <p class="list-item">
-          <span class="list-label">{{ $t('exam.fullMarksInTheExam') + ':' }}</span>
-          <span class="list-elem">{{ examDetails.fullPoint }}</span>
-        </p>
-        <p class="list-item">
-          <span class="list-label">{{ $t('exam.passMarkTheExam') + ':' }}</span>
-          <span class="list-elem">{{ examDetails.passingPoint }}</span>
-        </p>
-        <p class="list-item">
-          <span class="list-label">{{ $t('exam.examinationRules') + ':' }}</span>
-        </p>
-        <div class="list-elem">
-          <p class="list-table">
-            <el-table :data="examDetails.examDefinitionRulesVOList" border show-summary>
-              <el-table-column prop="name" :label="this.$t('exam.trainingType')" width="180" />
-              <el-table-column prop="num" :label="this.$t('exam.numberOfQuestions')" />
-              <el-table-column prop="point" :label="this.$t('exam.score')" />
-              <el-table-column prop="chapterIdLong" :label="this.$t('exam.totalScore')" />
-            </el-table>
-          </p>
-        </div> -->
-        <div class="btn-start">
-          <el-button :disabled="disabled" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
-        </div>
-      </el-scrollbar>
-    </div>
+    <template v-if="resultFlag">
+      <b class="title-name">{{ examType }}</b>
+      <!-- <img class="img_box" :src="applyImg" alt=""> -->
+      <div class="btn-start">
+        <el-button :disabled="disabled" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
+      </div>
+    </template>
   </div>
 </template>
 <script>
@@ -55,13 +17,16 @@ import LangStorage from '@/utils/lang';
 import { getPublishMapInfo } from '@/api/jmap/map';
 import ConstConfig from '@/scripts/ConstConfig';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { participantCreatTrainingRoom } from '@/api/competition';
+import {getRaceUserById} from '@/api/competition';
+import { participantCreatTrainingRoom, getPracticalQuestion, getTheoryQuestion } from '@/api/competition';
+// import applyImg from '@/assets/apply.png';
 
 export default {
     name: 'ExamDetailView',
     data() {
         return {
             disabled: false,
+            // applyImg: applyImg,
             examDetails: {
                 lessonId: '',
                 name: '',
@@ -78,6 +43,7 @@ export default {
             examList: [],
             trainingOperateTypeMap: {},
             drawWay: false,
+            resultFlag: false,
             lineCode: '' // 线路对应的皮肤
         };
     },
@@ -92,10 +58,14 @@ export default {
     watch: {
         '$route.params.examId': function (val) {
             this.loadInitPage(val);
+        },
+        $route() {
+            this.getUserStatus();
         }
     },
     async mounted() {
         // this.loadInitPage(this.$route.params.examId);
+        this.getUserStatus();
     },
     methods: {
         async getList() {
@@ -186,14 +156,41 @@ export default {
                 }
             }
         },
+        async getUserStatus() {
+            this.resultFlag = false;
+            const res = await getRaceUserById(this.$route.query.raceId);
+            if (this.$route.query.type == 'theory' && (res.data.status == 4 || res.data.status == 5)) {
+                this.$router.replace({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
+            } else if (this.$route.query.type == 'operation' && (res.data.status == 4 || res.data.status == 6)) {
+                this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
+            } else {
+                this.resultFlag = true;
+            }
+        },
         async exmaStart() {
             if (this.$route.query.type == 'theory') {
-                this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}`);
+                getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
+                    if (resp.data) {
+                        this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
+                    } else {
+                        this.$messageBox('试卷还没被加载');
+                    }
+
+                }).catch(()=>{
+                    this.$messageBox('试卷还没被加载');
+                });
             } else {
-                // this.disabled = true;
-                participantCreatTrainingRoom(1, {mapId: 41, prdType: '02'}).then(resp => {
-                    const query = { lineCode: '11', mapId: '41', group: resp.data, roomId: '385' };
-                    this.$router.replace({ path: `/jointTrainingNew`, query: query});
+                getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
+                    if (responese.data) {
+                        participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
+                            const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
+                            this.$router.replace({ path: `/jointTrainingNew`, query: query});
+                        });
+                    } else {
+                        this.$messageBox('试卷还没被加载');
+                    }
+                }).catch(()=>{
+                    this.$messageBox('试卷还没被加载');
                 });
             }
         }
@@ -205,6 +202,7 @@ export default {
 	.joylink-card{
 		height: 100%;
 		overflow: hidden;
+		position: relative;
 		.card-title{
 			height: 47px;
 			line-height: 47px;
@@ -216,6 +214,22 @@ export default {
 			padding-right: 0;
 			height: 100%;
 		}
+		.title-name{
+			// position: absolute;
+			// left: 50%;
+			// top: 66px;
+			// transform: translateX(-80px);
+			font-size: 30px;
+			text-align: center;
+			width: 100%;
+			margin-top: 50px;
+			display: block;
+		}
+	}
+	.img_box{
+		width: 400px;
+		margin: 0 auto;
+		display: block;
 	}
 
 	.menu li {
@@ -283,5 +297,6 @@ export default {
 	.btn-start {
 		text-align: center;
 		margin-bottom: 20px;
+		margin-top: 50px;
 	}
 </style>
diff --git a/src/views/jsxt/competition/result.vue b/src/views/jsxt/competition/result.vue
index 52f0c8133..9882d484a 100644
--- a/src/views/jsxt/competition/result.vue
+++ b/src/views/jsxt/competition/result.vue
@@ -4,36 +4,39 @@
       <span style="font-weight:bold ">{{ $t('exam.examResultsDetails') }}</span>
     </div>
     <div class="context">
-      <el-form ref="form" :model="resultModel" size="mini">
-        <el-form-item :label="this.$t('exam.testQuestionsName')+':'" prop="name">
-          <span>{{ resultModel.examName }}</span>
-        </el-form-item>
+      <!-- <el-form ref="form" :model="resultModel" size="mini">
         <el-form-item :label="this.$t('exam.testScores')+':'" prop="score">
           <span>{{ resultModel.score + ' '+ $t('exam.points') }}</span>
         </el-form-item>
-        <el-form-item :label="this.$t('exam.whetherThrough')+':'" prop="detail">
-          <span v-if="resultModel.result === '01'" style="color:darkgray">{{ $t('exam.didNotCalculate') }}</span>
-          <span v-else-if="resultModel.result === '02'" style="color:green">{{ $t('exam.pass') }}</span>
-          <span v-else-if="resultModel.result === '03'" style="color:red">{{ $t('exam.notPass') }}</span>
-        </el-form-item>
         <el-form-item :label="this.$t('exam.examTime')+':'" prop="detail">
-          <span>{{ Math.ceil(resultModel.usedTime/60) + ' '+ $t('global.minutes') }}</span>
+          <span>{{ Math.ceil((resultModel.usedTime || 0)/60) + ' '+ $t('global.minutes') }}</span>
         </el-form-item>
-      </el-form>
-      <el-table :data="resultModel.userExamQuestionsVOs" border style="width: 100%; min-height: 200px;" :summary-method="getSummaries" show-summary>
-        <el-table-column prop="trainingName" :label="this.$t('exam.trainingName')" />
-        <el-table-column prop="score" :label="this.$t('exam.trainingScore')" />
-        <el-table-column prop="cause" label="原因/结果" />
+      </el-form> -->
+      <el-table :data="tableData" border style="width: 100%; min-height: 200px;" :summary-method="getSummaries" show-summary :span-method="objectSpanMethod">
+        <el-table-column prop="title" label="题目" />
+        <el-table-column prop="score" label="分值" />
+        <el-table-column prop="goal" label="得分" />
+        <el-table-column v-if="this.$route.query.type ==='theory'" prop="correctAnswer" label="答题结果" />
+        <el-table-column v-if="this.$route.query.type ==='theory'" prop="explain" label="说明" />
+        <el-table-column v-if="this.$route.query.type ==='operate'" prop="scoringPointIndex" label="得分点">
+          <template slot-scope="scope">
+            <span>{{ '得分点'+scope.row.scoringPointIndex }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="this.$route.query.type ==='operate'" prop="scoringPointScore" label="得分点分值" />
+        <el-table-column v-if="this.$route.query.type ==='operate'" prop="scoringPointGoal" label="得分点得分" />
+        <el-table-column v-if="this.$route.query.type ==='operate'" prop="scoringPointExplain" label="得分点说明" />
       </el-table>
     </div>
     <div class="draf_box">
-      <el-button type="primary " @click="back">{{ $t('exam.returnToExamList') }}</el-button>
+      <el-button type="primary " @click="back">返回首页</el-button>
     </div>
   </div>
 </template>
 <script>
 // import { submitExam } from '@/api/management/userexam';
 // import { UrlConfig } from '@/scripts/ConstDic';
+import { getCompetitionDetail } from '@/api/competition';
 
 export default {
     name: 'ExamResult',
@@ -49,7 +52,20 @@ export default {
                 trainingName: '',
                 score: 0
             },
-            loading: true
+            theoryData: [
+                { title: '1', score: '2', goal: '0', correctAnswer: 'A', explain: '这是说明原因，所有A为正确答案' },
+                { title: '2', score: '2', goal: '0', correctAnswer: 'B', explain: '这是说明原因，所有B为正确答案' },
+                { title: '3', score: '2', goal: '0', correctAnswer: 'C', explain: '这是说明原因，所有C为正确答案' },
+                { title: '4', score: '2', goal: '0', correctAnswer: 'D', explain: '这是说明原因，所有D为正确答案' }
+            ],
+            operateData: [
+                { title: '1', score: '25', goal: '0', scoringPoints: [{score: '10', goal: '0', explain: '这是说明原因1'}, {score: '10', goal: '0', explain: '这是说明原因2'}, {score: '5', goal: '0', explain: '这是说明原因3'}] },
+                { title: '2', score: '25', goal: '0', scoringPoints: [{score: '10', goal: '0', explain: '这是说明原因1'}, {score: '10', goal: '0', explain: '这是说明原因2'}, {score: '5', goal: '0', explain: '这是说明原因3'}] },
+                { title: '3', score: '25', goal: '0', scoringPoints: [{score: '10', goal: '0', explain: '这是说明原因1'}, {score: '10', goal: '0', explain: '这是说明原因2'}, {score: '5', goal: '0', explain: '这是说明原因3'}] },
+                { title: '4', score: '25', goal: '0', scoringPoints: [{score: '10', goal: '0', explain: '这是说明原因1'}, {score: '10', goal: '0', explain: '这是说明原因2'}, {score: '5', goal: '0', explain: '这是说明原因3'}] }
+            ],
+            loading: true,
+            tableData: []
         };
     },
     computed: {
@@ -57,11 +73,11 @@ export default {
             return this.$store.state.app.height - 50;
         }
     },
-    mounted() {
+    created() {
         this.submitExamData();
     },
     methods: {
-        getSummaries(param) {
+        getSummaries(param) { // 计算总分
             const { columns, data } = param;
             const sums = [];
             columns.forEach((column, index) => {
@@ -69,48 +85,72 @@ export default {
                     sums[index] = this.$t('exam.totalScore');
                     return;
                 }
-                const values = data.map(item => Number(item[column.property]));
-                if (!values.every(value => isNaN(value))) {
-                    sums[index] = values.reduce((prev, curr) => {
-                        const value = Number(curr);
-                        if (!isNaN(value)) {
-                            return prev + curr;
-                        } else {
-                            return prev;
-                        }
-                    }, 0);
-                    sums[index] += this.$t('exam.points');
-                } else {
-                    sums[index] = 'N/A';
+                if (column.property === 'score' || column.property === 'goal' || column.property === 'scoringPointScore' || column.property === 'scoringPointGoal') {
+                    const values = data.map(item => Number(item[column.property]));
+                    if (!values.every(value => isNaN(value))) {
+                        sums[index] = values.reduce((prev, curr) => {
+                            const value = Number(curr);
+                            if (!isNaN(value)) {
+                                return prev + curr;
+                            } else {
+                                return prev;
+                            }
+                        }, 0);
+                        sums[index] += this.$t('exam.points');
+                    } else {
+                        sums[index] = '';
+                    }
                 }
             });
             return sums;
         },
         submitExamData() {
-            // this.loading = true;
-            // let count = 3;
-            // const userExamId = this.$route.params.userExamId;
-            // let interval = setInterval(() => {
-            //     submitExam(userExamId).then(response => {
             this.loading = false;
-            //         this.resultModel = response.data;
-            //         clearInterval(interval);
-            //         interval = null;
-            //     }).catch(() => {
-            //         if (count-- < 0) {
-            //             this.loading = false;
-            //             clearInterval(interval);
-            //             interval = null;
-            //             this.$messageBox(this.$t('error.submitExamFailed'));
-            //         }
-            //     });
-            // }, 1000);
+            if (this.$route.query.type == 'theory') {
+                getCompetitionDetail(this.$route.query.raceId).then(res => {
+                    console.log(res);
+                    this.tableData = [];
+                    res.data.forEach(item => {
+                        this.tableData.push({
+                            title: item.topic,
+                            score: item.totalScore,
+                            goal: item.score,
+                            correctAnswer: item.correct ? '正确' : '错误',
+                            explain: item.remarks
+                        });
+                    });
+                });
+            } else if (this.$route.query.type == 'operate') {
+                this.tableData = [];
+                this.operateData.forEach(item => {
+                    if (item.scoringPoints && item.scoringPoints.length) {
+                        item.scoringPoints.forEach((elem, index) => {
+                            this.tableData.push({
+                                title: item.title, score: index ? 0 : item.score, goal: index ? 0 : item.goal, scoringPointLength: item.scoringPoints.length, scoringPointIndex: index + 1, scoringPointScore: elem.score, scoringPointGoal: elem.goal, scoringPointExplain: elem.explain
+                            });
+                        });
+                    }
+                });
+            }
         },
         back() {
-            const query = {type: 'operation', mapId: this.$route.query.mapId};
-            this.$router.push({path: `/jsxt/examDetail`, query: query});
-            // const examId = this.resultModel.examId;
-            // this.$router.push({path: `${UrlConfig.trainingPlatform.examDetail}/${examId}`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId }});
+            const query = {type: 'operation', mapId: this.$route.query.mapId, raceId:this.$route.query.raceId};
+            this.$router.push({path: `/jsxt/home`, query: query });
+        },
+        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+            if ((columnIndex === 0 || columnIndex === 1 || columnIndex === 2) && row.scoringPointLength) {
+                if (row.scoringPointIndex === 1) {
+                    return {
+                        rowspan: row.scoringPointLength,
+                        colspan: 1
+                    };
+                } else {
+                    return {
+                        rowspan: 0,
+                        colspan: 0
+                    };
+                }
+            }
         }
     }
 };
diff --git a/src/views/jsxt/competition/theory/quiz/index.vue b/src/views/jsxt/competition/theory/quiz/index.vue
index 7caffcf5b..6c78db0ac 100644
--- a/src/views/jsxt/competition/theory/quiz/index.vue
+++ b/src/views/jsxt/competition/theory/quiz/index.vue
@@ -26,6 +26,7 @@
 // import { commitExam, getExamInfo, getUserExam, saveExamAnswer } from '@/api/exam.js';
 // import WindowResizeHandler from '@/mixin/WindowResizeHandler';
 import Question from './question';
+import { postCompetitionTheory, getTheoryQuestion } from '@/api/competition';
 
 export default {
     components: {
@@ -47,26 +48,8 @@ export default {
                 totalScore: 0,
                 passScore: 10
             },
-            examQuestions: [
-                {
-                    topic: 'PH玻璃电极只能在5~60℃范围内使用，而且还应通过温度校正装置来消除影响。',
-                    type: 'judge',
-                    optionList: [
-                        {id: '160', content: '√', correct: true},
-                        {id: '161', content: '×', correct: false}
-                    ]
-                },
-                {
-                    topic: '调度工作是（ ___ ）工作中的一个重要组成部分。',
-                    type: 'select',
-                    optionList: [
-                        {id: '40', content: '<span style="color: windowtext;">煤矿管理</span>', correct: false},
-                        {id: '41', content: '<span style="color: windowtext;">企业管理</span>', correct: true},
-                        {id: '42', content: '<span style="color: windowtext;">安全生产</span>', correct: false},
-                        {id: '43', content: '<span style="color: windowtext;">生产组织</span>', correct: false}
-                    ]
-                }
-            ]
+            examQuestions: [],
+            theoryAnswers: []
         };
     },
     computed: {
@@ -105,18 +88,15 @@ export default {
     },
     methods: {
         loadInitData() {
-            console.log('获取试题详情');
-            // getExamInfo(this.examId).then(resp => {
-            //     this.formModel = resp.data;
-            //     getUserExam(this.userExamId).then(rest => {
-            //         this.examQuestions = rest.data.map((el, i) => {
-            //             el.index = i;
-            //             return el;
-            //         });
-            //     });
-            // }).catch(error => {
-            //     this.$message.error(`加载考试详情失败：${error.message}`);
-            // });
+            this.theoryAnswers = [];
+            getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
+                if (resp.data) {
+                    this.examQuestions = resp.data.questions.map((el, i) => {
+                        el.index = i;
+                        return el;
+                    });
+                }
+            }).catch(error => { this.$message.error(`加载考试详情失败：${error.message}`); });
         },
         resizeHandler() {
             this.height = this._clientHeight;
@@ -153,11 +133,20 @@ export default {
             }
         },
         doEnd() {
-            // console.log('考试成绩');
-            this.$router.push({ path: `/jsxt/home`});
+            const params = {
+                competitionId: this.$route.query.raceId,
+                theoryAnswers: this.theoryAnswers
+            };
+            postCompetitionTheory(params).then(()=>{
+                this.$router.push({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
+            });
         },
         onSave(data) {
-            console.log(data, '问答题');
+            // console.log(data, '问答题');
+            this.theoryAnswers.push({
+                answerOptionId: data.answer,
+                questionId: data.userExamQuestionId
+            });
         }
     }
 };
diff --git a/src/views/jsxt/home/index.vue b/src/views/jsxt/home/index.vue
deleted file mode 100644
index c84ad8679..000000000
--- a/src/views/jsxt/home/index.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <div class="content_box">
-    <h4>欢迎进入城市轨道交通裁判平台</h4>
-  </div>
-</template>
-
-<script>
-
-export default {
-    name: 'RefereeList',
-    data() {
-        return {
-
-        };
-    },
-    computed: {
-
-    },
-    created() {
-        this.loadInitData();
-    },
-    methods: {
-        loadInitData() {
-
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .content_box{
-		position: relative;
-		.refresh_box{
-			float: right;
-			margin: 10px;
-		}
-	}
-</style>
diff --git a/src/views/jsxt/reca/list.vue b/src/views/jsxt/reca/list.vue
deleted file mode 100644
index 8370ceaf6..000000000
--- a/src/views/jsxt/reca/list.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <div class="">
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-  </div>
-</template>
-
-<script>
-import { getRaceList } from '@/api/race';
-import { getRaceUserList } from '@/api/competition';
-import localStore from 'storejs';
-
-export default {
-    name: '',
-    data() {
-        return {
-            raceList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '80px',
-                reset: true,
-                queryObject: {
-                    raceId: {
-                        type: 'select',
-                        label: '竞赛名称',
-                        config: {
-                            data: []
-                        }
-                    },
-                    reviewed: {
-                        type: 'select',
-                        label: '审核状态',
-                        config: {
-                            data: [
-                                { label: '通过', value: true },
-                                { label: '不通过', value: false }
-                            ]
-                        }
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: '名字',
-                        prop: 'name'
-                    },
-                    {
-                        title: '手机号',
-                        prop: 'mobile'
-                    },
-                    {
-                        title: '身份证号',
-                        prop: 'idNumber'
-                    },
-                    {
-                        title: '所属组织/企业/学校',
-                        prop: 'organization'
-                    },
-                    {
-                        title: '部门/专业',
-                        prop: 'department'
-                    },
-                    {
-                        title: '职位',
-                        prop: 'position'
-                    },
-                    // {
-                    //     title: '竞赛名称',
-                    //     prop: 'raceId',
-                    //     type: 'tag',
-                    //     columnValue: (row) => { return this.$convertField(row.raceId, this.raceList, ['value', 'label']); },
-                    //     tagType: (row) => { return 'success'; }
-                    // },
-                    {
-                        type: 'button',
-                        title: this.$t('global.operate'),
-                        buttons: [
-                            // {
-                            //     name: '修改',
-                            //     handleClick: this.update,
-                            //     type: ''
-                            // }
-                        ]
-                    }
-                ],
-                actions: []
-            }
-        };
-    },
-    created() {
-        this.loadInitData();
-    },
-    methods: {
-        async loadInitData() {
-            const params = localStore.get(this.$route.path);
-            const param = {
-                pageSize: 9999,
-                pageIndex: 1
-            };
-            this.raceList = [];
-            const resp = await getRaceList(param);
-            resp.data.list.forEach(elem => {
-                this.queryForm.queryObject.raceId.config.data.push({ value: elem.id, label: elem.name });
-                this.raceList.push({ value: elem.id, label: elem.name });
-            });
-            if (resp.data.list.length) {
-                if (params && params.raceId) {
-                    this.queryForm.queryObject.raceId.value = params.raceId;
-                } else {
-                    this.queryForm.queryObject.raceId.value = '' + resp.data.list[0].id;
-                }
-            }
-        },
-        // 查询函数
-        queryFunction(params) {
-            return new Promise(async(resolve, reject) => {
-                if (params.raceId) {
-                    const res = await getRaceUserList(params);
-                    resolve(res);
-                } else {
-                    setTimeout(() => {
-                        params.raceId = this.queryForm.queryObject.raceId.value;
-                        resolve(this.queryFunction(params));
-                    }, 500);
-                }
-            });
-        },
-        refresh() {
-            this.$refs.queryListPage.refresh(true);
-        }
-    }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 6fe0830f1..627c170a4 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -1,105 +1,217 @@
 <template>
-  <div class="content_box">
-    <div class="refresh_box_out">
-      <div class="refresh_box">
-        <el-button type="primary" size="small" @click="loadQuestions">加载试题</el-button>
-        <el-button size="small" @click="refresh">刷新列表</el-button>
-      </div>
-    </div>
-    <el-card class="tableList">
-      <el-table :data="tableData" style="width: 100%" border>
-        <el-table-column prop="name" label="用户名">
-          <template slot-scope="scope">{{ scope.row.name }}</template>
-        </el-table-column>
-        <el-table-column prop="organization" label="公司" />
-        <el-table-column prop="department" label="部门" />
-        <el-table-column prop="position" label="职位" />
-        <el-table-column prop="score" label="评分">
-          <template slot-scope="scope">{{ scope.row.score?scope.row.score:0 }}</template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="primary" size="small" @click="handleClick(scope.row)">进入</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <question-list ref="questionList" />
+  <div class="refereeList">
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <!-- <question-list ref="questionList" /> -->
   </div>
 </template>
 
 <script>
-// import { getPublishMapDetailList } from '@/api/jmap/map';
-import {refereeGetCompetitionList, refereeEnterSimulation} from '@/api/competition';
-import {getPermissionJointNew} from '@/api/jointTraining';
-import QuestionList from './questionList';
+import { refereeEnterSimulation, loadingPaper, getRaceUserList } from '@/api/competition';
+// import QuestionList from './questionList';
 
 export default {
     name: 'RefereeList',
     components:{
-        QuestionList
+        // QuestionList
     },
     data() {
         return {
-            tableData: [],
-            isLeaving:false
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '80px',
+                reset: true,
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '名字'
+                    },
+                    organization: {
+                        type: 'text',
+                        label: '公司'
+                    }
+                }
+            },
+            queryList: {
+                paginationHiden:true,
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                afterQuery:this.afterQuery,
+                columns: [
+                    {
+                        title: '名字',
+                        prop: 'name'
+                    },
+                    {
+                        title: '手机号',
+                        prop: 'mobile'
+                    },
+                    {
+                        title: '公司',
+                        prop: 'organization'
+                    },
+                    {
+                        title: '部门',
+                        prop: 'department'
+                    },
+                    {
+                        title: '报名时间',
+                        prop: 'time'
+                    },
+                    {
+                        title: '状态',
+                        prop: 'status',
+                        type: 'tag',
+                        columnValue: (row) => { return this.covertStatus(row.status); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '理论分数',
+                        prop: 'theoryScore'
+                    },
+                    {
+                        title: '实操分数',
+                        prop: 'practiceScore'
+                    },
+                    {
+                        title: '总分',
+                        prop: 'totalScore'
+                    },
+                    // {
+                    //     title: '竞赛名称',
+                    //     prop: 'raceId',
+                    //     type: 'tag',
+                    //     columnValue: (row) => { return this.$convertField(row.raceId, this.raceList, ['value', 'label']); },
+                    //     tagType: (row) => { return 'success'; }
+                    // },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        buttons: [
+                            {
+                                name: '进入',
+                                handleClick: this.handleClick,
+                                type: '',
+                                showControl: (row) => { return row.status == '3'; }
+                            },
+                            {
+                                name: '回放',
+                                handleClick: this.playBack,
+                                type: '',
+                                showControl: (row) => { return row.status == '4'; }
+                            },
+                            {
+                                name: '修改',
+                                handleClick: this.gradeScore,
+                                type: 'success',
+                                showControl: (row) => { return row.status == '4'; }
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: '导入试题', handler: this.handleAdd, fileType: 'file' }
+                ]
+            },
+            isLeaving:false,
+            inter:null
         };
     },
     computed: {
     },
     created() {
-        this.loadInitData();
+    },
+    mounted() {
+        this.getData();
     },
     beforeDestroy() {
         this.isLeaving = true;
     },
     methods: {
-        loadInitData() {
-            this.getData();
+        covertStatus(status) {
+            const statusDict = {'0':'尚未参赛', '1':'进入赛场', '2':'理论赛场', '3':'实操赛场', '4':'完成比赛', '5':'完成理论', '6':'完成实操'};
+            return statusDict[status];
         },
         getData() {
-            refereeGetCompetitionList(1).then(response=>{
-                this.tableData = response.data;
-                setTimeout(() => {
+            const params = {raceId:this.$route.query.raceId, pageSize:999, pageNum:1};
+            getRaceUserList(params).then(response=>{
+                this.queryList.data = response.data.list;
+                this.refresh();
+                clearTimeout(this.inter);
+                this.inter = setTimeout(() => {
                     if (!this.isLeaving) {
                         this.getData();
                     }
                 }, 2000);
             });
         },
-        handleClick(row) {
-            const group = row.room.group;
-            getPermissionJointNew(group).then(resp=>{
-                refereeEnterSimulation(group).then(response=>{
-                    const query = { lineCode: '11', mapId: '41', group: row.room.group, roomId: row.room.id };
-                    this.$router.push({ path: `/jointTrainingNew`, query: query});
-                });
+        handleAdd() {
+            const loading = this.$loading({
+                lock: true,
+                text: '正在导入中...',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+            setTimeout(() => {
+                const obj = document.getElementById('queryFormFilesInput');
+                if (!obj.files) return;
+                const f = obj.files[0];
+                const reader = new FileReader();
+                const that = this;
+                reader.readAsText(f, 'utf-8');
+                reader.onload = function(e) {
+                    const data = e.target.result;
+                    console.log(JSON.parse(data));
+                    loadingPaper(that.$route.query.raceId, JSON.parse(data)).then(res => {
+                        that.$message.success('试题加载成功');
+                        loading.close();
+                    }).catch(error => {
+                        loading.close();
+                        that.$message.error('试题加载失败' + error.message);
+                    });
+                    obj.value = '';
+                };
             });
         },
-        refresh() {
-            this.loadInitData();
+        // 查询函数
+        queryFunction(params) {
+            if (this.$route.query.raceId) {
+                params['raceId'] = this.$route.query.raceId;
+                params['pageSize'] = 999;
+            }
+            return getRaceUserList(params);
         },
-        loadQuestions() {
-            this.$refs.questionList.doShow();
+        handleClick(index, row) {
+            const group = row.group;
+            refereeEnterSimulation(group).then(response=>{
+                const query = { lineCode: '11', mapId: '41', group: group, raceId: this.$route.query.raceId};
+                this.$router.push({ path: `/jointTrainingNew`, query: query});
+            });
+        },
+        playBack(index, row) {
+        },
+        gradeScore(index, row) {
+
+        },
+        // afterQuery(data) {
+        //     clearTimeout(this.inter);
+        //     this.inter = setTimeout(() => {
+        //         if (!this.isLeaving) {
+        //             this.refresh();
+        //         }
+        //     }, 3000);
+        // },
+        refresh() {
+            this.$refs.queryListPage.refresh(false);
         }
+        // loadQuestions() {
+        //     this.$refs.questionList.doShow();
+        // }
     }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .content_box{
-		position: relative;
-		.refresh_box{
-			float: right;
-			margin: 10px;
-		}
-	}
-  .tableList{
-    width:94%;
-    margin-left: 3%;
-    margin-top: 5px;
-  }
-  .refresh_box_out{
-    display: inline-block;
-    width: 100%;
-  }
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1d6254ccc..6078dda2d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -223,7 +223,7 @@ export default {
                 this.cookiesToken = 'UserDesignToken';
                 this.modelType = 'design';
                 this.loginClient = 'Design';
-                this.path = '/refereeJsxt/preview';
+                this.path = '/refereeJsxt/home';
             }
 
             const nowLang = LangStorage.getLang('zh');
@@ -336,17 +336,25 @@ export default {
             this.tipsMsg = '';
             removeSessionStorage('againEnter');
             if (this.$route.query.raceId) {
-                getIsSignUp(this.$route.query.raceId).then(res => {
-                    if (res.data) {
-                        this.$router.push({ path: this.path });
-                    }
-                }).catch(() => {
-                    this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
-                });
-            } else if (!this.$route.path.includes('jsxt/login')) {
+                if (this.$route.path.includes('jsxt/login')) {
+                    getIsSignUp(this.$route.query.raceId, { isLogin: true }).then(res => {
+                        if (res.data) {
+                            setSessionStorage('raceId', this.$route.query.raceId);
+                            this.$router.push({ path: this.path, query:{ raceId:this.$route.query.raceId } });
+                        } else {
+                            this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
+                        }
+                    }).catch(() => {
+                        this.$messageBox('登陆竞赛系统失败，请稍后重试');
+                    });
+                } else {
+                    setSessionStorage('raceId', this.$route.query.raceId);
+                    this.$router.push({ path: this.path, query:{ raceId:this.$route.query.raceId } });
+                }
+            } else if (!this.$route.path.includes('jsxt/login') && !this.$route.path.includes('refereeJsxt/login')) {
                 this.$router.push({ path: this.path });
             } else {
-                this.$messageBox('请调整路径参数');
+                this.$messageBox('请输入正确的链接地址');
             }
         },
         handleLanguage() {
diff --git a/src/views/newMap/displayNew/LeftSlider.vue b/src/views/newMap/displayNew/LeftSlider.vue
index 6343b6f7a..6c6be9906 100644
--- a/src/views/newMap/displayNew/LeftSlider.vue
+++ b/src/views/newMap/displayNew/LeftSlider.vue
@@ -17,7 +17,6 @@
           :data="treeList"
           node-key="id"
           :props="defaultProps"
-          :filter-node-method="filterNode"
           highlight-current
           :span="22"
           default-expand-all
@@ -51,7 +50,8 @@ export default {
     data() {
         return {
             show: true,
-            treeList: []
+            treeList: [],
+            defaultProps: ''
         };
     },
     computed: {
diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index 6ea2f84da..c0221b57c 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -1,8 +1,8 @@
 <template>
   <!-- v-quickMenuDrag  -->
   <div class="chatBox">
-    <div v-show="!minimize" class="chat-box">
-      <chat-member-list ref="chatMemberList" :group="group" @addCoversition="addCoversition" />
+    <div v-if="!minimize" class="chat-box">
+      <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" @addCoversition="addCoversition" />
       <div class="chat-box-main">
         <chat-coversition-list ref="chatCoversitionList" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
         <div class="chat-window">
@@ -11,8 +11,8 @@
             <div class="minimality" @click="handleMinimality('min')">
               <i class="el-icon-remove" />
             </div>
-            <div v-show="currentCoversition.group==undefined?true:currentCoversition.group" class="showMembers" @click="handleMembers()">
-              <i class="el-icon-user-solid" />
+            <div v-show="currentCoversition.all==undefined?true&&isShow:currentCoversition.all&&isShow" class="chat-createGroup" @click="handleCreateGroup()">
+              <i class="el-icon-plus" style="font-weight: bolder;" />
             </div>
             <div class="chat-setting" @click="handleSetting()">
               <i class="el-icon-s-tools" />
@@ -43,12 +43,14 @@
       </div>
     </div>
     <chat-setting ref="chatSetting" :form="form" @setSetting="setSetting" />
+    <chat-create-group ref="createGroup" :group="group" @addCoversition="addCoversition" />
   </div>
 </template>
 <script>
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import ChatSetting from './chatSetting';
 import ChatContent from './chatContent';
+import ChatCreateGroup from './chatCreateGroup';
 import ChatMemberList from './chatMemberList';
 import ChatCoversitionList from './chatCoversitionList';
 import RecordRTC from 'recordrtc';
@@ -59,12 +61,17 @@ export default {
         ChatSetting,
         ChatContent,
         ChatMemberList,
-        ChatCoversitionList
+        ChatCoversitionList,
+        ChatCreateGroup
     },
     props: {
         group: {
             type: String,
             required: true
+        },
+        userRole: {
+            type: String,
+            required: true
         }
     },
     data() {
@@ -84,15 +91,12 @@ export default {
             headerTitle:''
         };
     },
+    computed:{
+        isShow() {
+            return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE';
+        }
+    },
     watch: {
-        '$store.state.socket.simulationRoleList': function (val) {
-            if (val && val.length) {
-                this.$nextTick(() => {
-                    this.$refs.chatMemberList.setMemberStatus(val);
-                    this.$refs.chatCoversitionList.setCoversitionStatus(val);
-                });
-            }
-        },
         '$store.state.socket.simulationScriptTip':function(val, old) {
             if (val) {
                 if (val.type == 'Conversation') {
@@ -134,7 +138,7 @@ export default {
         },
         setCurrentCoversition(coversition) {
             this.currentCoversition = coversition;
-            if (coversition.group) {
+            if (coversition.all) {
                 this.headerTitle = coversition.name;
             }
             if (this.recordSending) {
@@ -147,7 +151,7 @@ export default {
         },
         addCoversition({data, headerTitle}) {
             this.$refs.chatCoversitionList.addCoversition(data, headerTitle);
-            this.currentCoversition = {id:data.id, group:data.group};
+            this.currentCoversition = {id:data.id, all:data.all};
             this.headerTitle = headerTitle;
         },
         changeCoversition(data) {
@@ -259,12 +263,11 @@ export default {
                 }
             });
         },
+        handleCreateGroup() {
+            this.$refs.createGroup.doShow();
+        },
         handleSetting() {
             this.$refs.chatSetting.doShow();
-        },
-        handleMembers() {
-            this.$refs.chatSetting.doClose();
-            this.$refs.chatMemberList.doShow();
         }
     }
 };
@@ -272,7 +275,7 @@ export default {
 <style lang="scss" scoped>
 .chatBox{
   width: 503px;
-  height: 400px;
+//   height: 400px;
   position: absolute;
   padding-left:5px;
   left: 0;
@@ -281,7 +284,7 @@ export default {
 }
 .chat-box{
   width: 100%;
-  height: 100%;
+  height: 400px;
 }
 .chat-box-header{
     width: 100%;
@@ -293,6 +296,10 @@ export default {
   margin-left: 15px;
   display: inline-block;
   margin-top: 10px;
+  width: 70%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .chat-box-content{
     width: 100%;
@@ -312,6 +319,14 @@ export default {
     display: inline-block;
     width: 400px;
 }
+.chat-createGroup{
+    float: right;
+    line-height: 40px;
+    margin-right: 10px;
+    cursor: pointer;
+    font-size: 16px;
+    position: relative;
+}
 .chat-setting{
     float: right;
     line-height: 40px;
diff --git a/src/views/newMap/displayNew/chatView/chatContent.vue b/src/views/newMap/displayNew/chatView/chatContent.vue
index 3a94a2e08..ff89831a5 100644
--- a/src/views/newMap/displayNew/chatView/chatContent.vue
+++ b/src/views/newMap/displayNew/chatView/chatContent.vue
@@ -4,13 +4,13 @@
       <div v-for="(chatContent,index) in chatContentList" :key="index" class="chatContentInClass">
         <div :class="chatContent.self?'rightUser':'leftUser'">
           <div class="userHeader">
-            <div v-if="chatContent.group&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
+            <div v-if="chatContent.all&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
             <div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ formatTime(chatContent.chatTime) }}</div>
           </div>
           <div class="userBubble" @click="playAudio('audio'+index)">
             <div class="userMessage">
               <!-- &&!(chatContent.self) -->
-              <span v-if="chatContent.group">@{{ covertName(chatContent.targetName) }}</span>
+              <span v-if="chatContent.all">@{{ covertName(chatContent.targetName) }}</span>
               <span class="el-icon-video-play playicon" />
               <span class="messageText">{{ chatContent.message }}</span>
               <audio :id="'audio'+index" :src="baseUrl+chatContent.src" style="display:none" />
@@ -46,7 +46,7 @@ export default {
                 this.chatContentList.push(simulationText);
                 this.scrollTop();
             } else {
-                if (!simulationText.group) {
+                if (!simulationText.all) {
                     this.$emit('changeCoversition', simulationText);
                     // this.$emit('addCoversition', {data:simulationText, headerTitle:''});
                     this.chatContentList.push(simulationText);
diff --git a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
index c5512932c..f1a4a4b03 100644
--- a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
+++ b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
@@ -32,9 +32,14 @@ export default {
                 if (resp.data) {
                     const data = resp.data;
                     data.map(coversition=>{
-                        const objectCover = this.handleMemberName(coversition);
-                        coversition.coverName = objectCover.coversitionName;
-                        coversition.isOnline = objectCover.isOnline;
+                        if (coversition.name) {
+                            coversition.coverName = coversition.name;
+                            coversition.isOnline = true;
+                        } else {
+                            const objectCover = this.handleMemberName(coversition);
+                            coversition.coverName = objectCover.coversitionName;
+                            coversition.isOnline = objectCover.isOnline;
+                        }
                         return coversition;
                     });
                     this.coversitionList = data;
@@ -49,8 +54,13 @@ export default {
             const index = this.coversitionList.findIndex(item=>{ return item.id == data.id; });
             if (index < 0) {
                 const objectCover = this.handleMemberName(data);
-                data.coverName = objectCover.coversitionName;
-                data.isOnline = objectCover.isOnline;
+                if (data.name) {
+                    data.coverName = data.name;
+                    data.isOnline = true;
+                } else {
+                    data.coverName = objectCover.coversitionName;
+                    data.isOnline = objectCover.isOnline;
+                }
                 this.coversitionList.push(data);
                 if (headerTitle) {
                     this.currentCoversition = data;
@@ -58,8 +68,8 @@ export default {
             }
         },
         changeCoversition(coversition) {
-            this.$emit('setHeadTitle', !coversition.isOnline ? coversition.coverName + ' (离线)' : coversition.coverName);
-            this.currentCoversition = {id:coversition.id, group:coversition.group};
+            this.$emit('setHeadTitle', coversition.coverName);
+            this.currentCoversition = {id:coversition.id, all:coversition.all};
             this.$emit('setCurrentCoversition', coversition);
             // this.$refs.chatContent.reloadData(this.currentCoversition);
         },
@@ -74,7 +84,7 @@ export default {
             this.changeCoversition(coversition);
         },
         handleMemberName(conversition) {
-            if (conversition.group) {
+            if (conversition.all) {
                 return {coversitionName:conversition.name, isOnline:true};
             } else {
                 let coversitionName = '';
@@ -119,11 +129,6 @@ export default {
                 }
                 return {coversitionName:coversitionName, isOnline:isOnline};
             }
-        },
-        setCoversitionStatus(data) {
-            this.initPage(false);
-            this.$emit('setHeadTitle', !this.currentCoversition.isOnline ? this.currentCoversition.coverName + ' (离线)' : this.currentCoversition.coverName);
-            // this.changeCoversition(this.currentCoversition);
         }
     }
 };
diff --git a/src/views/newMap/displayNew/chatView/chatCreateGroup.vue b/src/views/newMap/displayNew/chatView/chatCreateGroup.vue
new file mode 100644
index 000000000..68bcf6b89
--- /dev/null
+++ b/src/views/newMap/displayNew/chatView/chatCreateGroup.vue
@@ -0,0 +1,224 @@
+<template>
+  <div v-show="dialogVisible" class="chat-create-group">
+    <div class="create-group-header">
+      <div class="create-group-title">添加会话对象</div>
+      <div class="create-group-close">
+        <i class="el-icon-close" @click="dialogVisible=false" />
+      </div>
+    </div>
+    <div class="create-group-content">
+      <div class="chat-member-list">
+        <el-checkbox-group v-model="checkList">
+          <el-checkbox
+            v-for="member in memberList"
+            :key="member.id"
+            class="each-chat-member"
+            :label="member"
+            :disabled="member.userId === userId"
+          >{{ member.memberName }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="currentSelectList">
+        <div
+          v-for="member in checkList"
+          :key="member.id"
+          class="eachSelect"
+        >
+          {{ member.memberName }}
+        </div>
+
+      </div>
+      <!-- :style="member.userId === userId ?'color:red':''" -->
+    </div>
+    <div class="create-group-bottom">
+      <el-button :loading="loading" size="small" type="primary" @click="doCreate">创建会话</el-button>
+      <el-button size="small" @click="doClose">取消</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import {getSimulationMembersNew, getSimulationConversationIdNew} from '@/api/chat';
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
+export default {
+    name:'ChatCreateGroup',
+    props: {
+        group: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible:false,
+            loading:false,
+            memberList:[],
+            checkList:[]
+        };
+    },
+    computed:{
+        userId() {
+            return this.$store.state.user.id;
+        }
+    },
+    methods:{
+        doShow() {
+            this.getSimulationMembers();
+            this.dialogVisible = true;
+        },
+        getSimulationMembers() {
+            getSimulationMembersNew(this.$route.query.group).then(resp => {
+                let lastData = JSON.stringify(resp.data);
+                const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+                roleTypeList.forEach(function(element) {
+                    const rolename = element.value;
+                    if (Cookies.get('user_lang') == 'en') {
+                        lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
+                    } else {
+                        lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
+                    }
+                });
+                lastData = JSON.parse(lastData);
+                lastData = lastData.filter(memberIn=>{ return memberIn.role != '观众'; });
+                lastData.map(member=>{
+                    const deviceName = member.deviceName ? '-' + member.deviceName : '';
+                    const memberName = member.name ? '-' + member.name : '';
+                    member.memberName = member.role + deviceName + memberName;
+                    return member;
+                });
+                this.memberList = lastData;
+            });
+        },
+        doCreate() {
+            if (this.checkList.length > 0) {
+                this.loading = true;
+                const checkList = this.checkList.map(function(check) { return check.id; });
+                getSimulationConversationIdNew(checkList, this.group).then(resp => {
+                    if (resp.data) {
+                        const data = resp.data;
+                        this.loading = false;
+                        this.$emit('addCoversition', {data:data, headerTitle:resp.data.name});
+                        this.dialogVisible = false;
+                        this.checkList = [];
+                    }
+                }).catch(error=>{
+                    this.$messageBox('创建会话失败: ' + error.messagfe);
+                    this.loading = false;
+                    this.dialogVisible = false;
+                    this.checkList = [];
+                });
+            }
+
+        },
+        doClose() {
+            this.checkList = [];
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.chat-create-group{
+    position: absolute;
+    width: 70%;
+    height: 300px;
+    border: 1px #dedede solid;
+    left: 26%;
+    top: 8%;
+    z-index: 7;
+    border-radius: 8px;
+    box-shadow: #b5aeae 0 0 10px;
+    background: #fff;
+}
+.create-group-header{
+    padding-left: 10px;
+    padding-top: 6px;
+    font-size: 14px;
+    border-bottom: 1px #dedede solid;
+    padding-bottom: 6px;
+}
+.create-group-title{
+    display: inline-block;
+}
+.create-group-close{
+    float: right;
+    display: inline-block;
+    margin-right: 5px;
+    font-size: 16px;
+    cursor: pointer;
+}
+.chat-member-list{
+    width: 54%;
+    height: 216px;
+    overflow-y: auto;
+    padding: 5px 10px;
+    font-size: 14px;
+    overflow-x: hidden;
+    border-right: 1px #ccc solid;
+    display:inline-block;
+}
+.create-group-content{
+    width: 100%;
+    height: 220px;
+    padding-bottom: 10px;
+    border-bottom: 1px #dedede solid;
+}
+.create-group-bottom{
+    text-align: center;
+    margin-top:8px;
+}
+.each-chat-member{
+    display:block;
+    margin-top:5px;
+}
+.currentSelectList{
+    display: inline-block;
+    width: 44%;
+    font-size: 14px;
+    vertical-align: top;
+    padding: 5px 10px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    height: 216px;
+}
+.eachSelect{
+    display:block;
+    margin-top:5px;
+}
+// 谷歌、safari、qq浏览器、360浏览器滚动条样式
+// 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
+.chat-member-list::-webkit-scrollbar,.currentSelectList::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    // height: 110px;
+    background-color: #FFFFFF;
+}
+/*定义滚动条轨道 内阴影+圆角*/
+.chat-member-list::-webkit-scrollbar-track,.currentSelectList::-webkit-scrollbar-track{
+    // box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+    border-radius: 10px;
+    background-color: #FFFFFF;;
+}
+/*定义滑块 内阴影+圆角*/
+.chat-member-list::-webkit-scrollbar-thumb,.currentSelectList::-webkit-scrollbar-thumb{
+    border-radius: 10px;
+    // box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+    background-color: #cacaca;
+}
+/*滑块效果*/
+.chat-member-list::-webkit-scrollbar-thumb:hover,.currentSelectList::-webkit-scrollbar-thumb:hover {
+    border-radius: 5px;
+    // box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: rgba(0,0,0,0.4);
+}
+/*IE滚动条颜色*/
+html {
+    scrollbar-face-color:#bfbfbf;/*滚动条颜色*/
+    scrollbar-highlight-color:#000;
+    scrollbar-3dlight-color:#000;
+    scrollbar-darkshadow-color:#000;
+    scrollbar-Shadow-color:#adadad;/*滑块边色*/
+    scrollbar-arrow-color:rgba(0,0,0,0.4);/*箭头颜色*/
+    scrollbar-track-color:#eeeeee;/*背景颜色*/
+}
+</style>
diff --git a/src/views/newMap/displayNew/chatView/chatMemberList.vue b/src/views/newMap/displayNew/chatView/chatMemberList.vue
index ddb243928..1fc6bcdb3 100644
--- a/src/views/newMap/displayNew/chatView/chatMemberList.vue
+++ b/src/views/newMap/displayNew/chatView/chatMemberList.vue
@@ -5,14 +5,16 @@
       <div
         v-for="member in memberList"
         :key="member.id"
-        :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'"
-        @click="createConversition(member)"
+        :style="member.userId === userId ?'color:red':''"
+        class="each-chat-member"
+        :title="member.memberName"
       >{{ member.memberName }}</div>
+      <!-- :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'" -->
     </div>
   </div>
 </template>
 <script>
-import {getSimulationMembersNew, getSimulationConversationIdNew} from '@/api/chat';
+import {getSimulationChatMemberNew} from '@/api/chat';
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
 export default {
@@ -21,43 +23,35 @@ export default {
         group: {
             type: String,
             required: true
+        },
+        currentCoversition:{
+            type: Object,
+            required: true
         }
     },
     data() {
         return {
-            showMembers:false,
+            showMembers:true,
             memberList:[]
         };
     },
+    computed:{
+        userId() {
+            return this.$store.state.user.id;
+        }
+    },
+    watch:{
+        currentCoversition:function (val, old) {
+            if (val) {
+                this.getSimulationMembers();
+            }
+        }
+    },
     mounted() {
-        this.getSimulationMembers();
     },
     methods:{
-        createConversition(member) {
-            if (member.userId != this.$store.state.user.id && member.online) {
-                getSimulationConversationIdNew({ memberId: member.id }, this.group).then(resp => {
-                    if (resp.data) {
-                        const data = resp.data;
-                        this.$emit('addCoversition', {data:data, headerTitle:member.memberName});
-                        this.showMembers = false;
-                    }
-                });
-            }
-        },
-        setMemberStatus(memberInfo) {
-            this.getSimulationMembers();
-            // memberInfo.forEach(member=>{
-            //     if (this.coversitionList) {
-            //         this.coversitionList.forEach(item=>{
-            //             if (item.id == member.id) {
-            //                 item.online = member.online;
-            //             }
-            //         });
-            //     }
-            // });
-        },
         getSimulationMembers() {
-            getSimulationMembersNew(this.$route.query.group).then(resp => {
+            getSimulationChatMemberNew(this.$route.query.group, this.currentCoversition.id).then(resp => {
                 let lastData = JSON.stringify(resp.data);
                 const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
                 roleTypeList.forEach(function(element) {
@@ -82,14 +76,6 @@ export default {
             return this.memberList.filter(member=>{
                 return member.id == memberId;
             });
-        },
-        doShow() {
-            if (this.showMembers) {
-                this.showMembers = false;
-            } else {
-                this.showMembers = true;
-                this.getSimulationMembers();
-            }
         }
     }
 };
diff --git a/src/views/newMap/displayNew/designIndex.vue b/src/views/newMap/displayNew/designIndex.vue
index 2af6e52c5..0d4132c3c 100644
--- a/src/views/newMap/displayNew/designIndex.vue
+++ b/src/views/newMap/displayNew/designIndex.vue
@@ -303,7 +303,7 @@ export default {
             if (resp && resp.code == 200) {
                 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
                 this.questId = Number(resp.data.questId) || 0;
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`));
+                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
             }
         },
         // 加载地图数据
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 4c7c007f6..300e73f1c 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -4,6 +4,7 @@
       <transition name="el-zoom-in-bottom">
         <map-system-draft ref="mapCanvas" @back="back" />
       </transition>
+      <status-icon v-if="$route.query.lineCode == '11' || $route.query.lineCode == '10'" ref="statusIcon" />
       <menu-exam
         v-if="isExam"
         ref="menuExam"
@@ -40,6 +41,7 @@
         :group="group"
         :quest-id="questId"
         :show-station="showStation"
+        :user-role="userRole"
         @tryTime="tryTime"
         @hidepanel="hidepanel"
         @passflow="passflow"
@@ -51,6 +53,20 @@
 
       <menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :group="group" :data-error="dataError" />
 
+      <menu-practice
+        v-if="isPractice"
+        ref="menuPractice"
+        :group="group"
+        :offset="offset"
+        :offset-bottom="offsetBottom"
+        :show-station="showStation"
+        :station-list="stationList"
+        :show-select-station="showSelectStation"
+        :data-error="dataError"
+        @switchMode="switchMode"
+        @switchStationMode="switchStationMode"
+      />
+
       <menu-train-list v-if="isDemon" @setCenter="setCenter" />
 
       <menu-schema
@@ -95,6 +111,7 @@ import MenuDemon from '@/views/newMap/displayNew/menuDemon';
 import MenuSchema from '@/views/newMap/displayNew/menuSchema';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 import MenuScript from '@/views/newMap/displayNew/menuScript';
+import MenuPractice from '@/views/newMap/displayNew/menuPractice';
 import Scheduling from './demon/scheduling';
 import { mapGetters } from 'vuex';
 import { getTrainingStepsDetailNew, getTrainingDetailNew } from '@/api/jmap/training';
@@ -108,6 +125,7 @@ import Vue from 'vue';
 import LeftSlider from '@/views/newMap/displayNew/LeftSlider';
 import { getSessionStorage } from '@/utils/auth';
 import MenuTrainList from '@/views/newMap/displayNew/menuTrainList';
+import StatusIcon from '@/views/components/StatusIcon/statusIcon';
 
 // 三维
 // import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
@@ -126,11 +144,13 @@ export default {
         MenuSchema,
         MenuSystemTime,
         MenuTrainList,
+        MenuPractice,
         // Jl3dSimulation,
         Jl3dDrive,
         Jl3dDevice,
         Scheduling,
-        LeftSlider
+        LeftSlider,
+        StatusIcon
     },
     props: {
         size: {
@@ -220,6 +240,9 @@ export default {
         isScript() {
             return this.mode === 'script';
         },
+        isPractice() {
+            return this.mode === 'practice';
+        },
         isScreen() {
             return this.model === 'dp';
         },
@@ -231,6 +254,17 @@ export default {
         },
         project() {
             return getSessionStorage('project');
+        },
+        userRole() {
+            if (this.$route.query.prdType == '02') {
+                return 'DISPATCHER';
+            } else if (this.$route.query.prdType == '01') {
+                return 'STATION_SUPERVISOR';
+            } else if (this.$route.query.prdType == '04') {
+                return 'DRIVER';
+            } else {
+                return 'AUDIENCE';
+            }
         }
     },
     watch: {
@@ -398,7 +432,7 @@ export default {
             if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
                 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
                 this.questId = Number(resp.data.questId) || 0;
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`));
+                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
                 if (resp.data.planRunning) {
                     this.$store.dispatch('training/simulationStart');
                 } else {
@@ -423,6 +457,8 @@ export default {
                     await this.initLoadDemonData();
                 } else if (this.isScript) {
                     await this.initLoadTaskData();
+                } else if (this.isPractice) {
+                    await this.initPracticeData();
                 } else {
                     await this.initLoadLessonOrExamData();
                 }
@@ -478,6 +514,18 @@ export default {
                 this.endViewLoading();
             }
         },
+        // 加载实操地图数据
+        async initPracticeData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.switchMode('01');
+
+            if (parseInt(this.mapId)) {
+                await this.loadNewMapDataByGroup(this.group);
+            } else {
+                this.endViewLoading();
+            }
+        },
         // 选择脚本
         async selectQuest(row, id, mapLocation, roleName) {
             try {
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 8c877c830..68ed595d1 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <chat-box ref="chatbox" :group="group" />
+    <chat-box ref="chatbox" :group="group" :user-role="userRole" />
     <div class="display-card" :style="{top: offset+'px'}">
       <el-row>
         <span v-if="countTime" class="display-score">{{ $t('display.demon.trialTime') }} {{ countTime }}</span>
@@ -77,6 +77,10 @@ export default {
             default() {
                 return false;
             }
+        },
+        userRole: {
+            type: String,
+            required: true
         }
     },
     data() {
@@ -183,7 +187,7 @@ export default {
             ranAsPlan(data, this.group).then(res => {
                 this.$store.dispatch('training/simulationStart').then(() => {
                     this.$store.dispatch('map/setRunPlanStatus', true);
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
+                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
                     this.$store.dispatch('map/setShowCentralizedStationNum');
                 });
             }).catch(error => {
diff --git a/src/views/newMap/displayNew/menuPractice.vue b/src/views/newMap/displayNew/menuPractice.vue
new file mode 100644
index 000000000..a11b241f4
--- /dev/null
+++ b/src/views/newMap/displayNew/menuPractice.vue
@@ -0,0 +1,206 @@
+<template>
+  <div class="menuPractice">
+    <div class="practice-schema" :style="{top: offset+'px'}">
+      <el-select v-model="swch" size="small" :placeholder="$t('display.schema.selectProduct')" @change="switchMode">
+        <el-option v-for="item in swchList" :key="item.value" :label="item.name" :value="item.value" />
+      </el-select>
+      <el-select v-if="showSelectStation&&swch=='01'" v-model="showStationContent" style="width: 100px;" size="small" @change="switchStationModeInfo">
+        <el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />
+      </el-select>
+    </div>
+    <div class="practice-bottom" :style="{bottom: offsetBottom + 'px'}">
+      <el-button-group>
+        <!-- v-if="!isScriptCommand"  -->
+        <!-- v-if="!isScriptCommand"  -->
+        <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">按计划行车</el-button>
+        <el-button type="danger" :disabled="!isDisable" @click="end">退出计划</el-button>
+        <el-button type="primary" @click="back">返回</el-button>
+      </el-button-group>
+    </div>
+    <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
+  </div>
+</template>
+<script>
+import SetTime from '@/views/newMap/displayNew/demon/setTime';
+import { ranAsPlan, exitRunPlan } from '@/api/simulation';
+import { Notification } from 'element-ui';
+export default {
+    name: 'MenuPractice',
+    components:{
+        SetTime
+    },
+    props: {
+        group: {
+            type: String,
+            required: true
+        },
+        offset: {
+            type: Number,
+            required: true
+        },
+        offsetBottom: {
+            type: Number,
+            required: true
+        },
+        dataError: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        },
+        showSelectStation: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        },
+        showStation: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        stationList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            isDisable: false,
+            swch: '01',
+            showStationContent:'',
+            swchList: [
+                { value: '01', name: '现地' },
+                { value: '02', name: '行调' }
+            ]
+        };
+    },
+    watch:{
+        'showStation':function(val) {
+            this.showStationContent = this.showStation;
+        }
+    },
+    methods:{
+        back() {
+            this.$store.dispatch('training/over').then(() => {
+                history.go(-1);
+                Notification.closeAll();
+            });
+        },
+        selectBeginTime() {
+            this.$refs.setTime.doShow();
+        },
+        start(model) {
+            this.isDisable = true;
+            const data = {
+                time: model.initTime
+                // loadNumber:this.trainList.length
+            };
+            // const data = {
+            //     time: model.initTime
+            // };
+            // if (this.$route.query.prdType === '04') {
+            //     data.loadNumber = model.loadNum;
+            // }
+            ranAsPlan(data, this.group).then(res => {
+                this.$store.dispatch('training/simulationStart').then(() => {
+                    this.$store.dispatch('map/setRunPlanStatus', true);
+                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+                    this.$store.dispatch('map/setShowCentralizedStationNum');
+                });
+            }).catch((error) => {
+                this.isDisable = false;
+                if (error.code == '5001') {
+                    this.$messageBox(this.$t('error.mapDataError') + '，' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5002') {
+                    this.$messageBox(this.$t('error.runningChartDataError') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5003') {
+                    this.$messageBox(this.$t('error.runningChartIsNotLoaded') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5004') {
+                    this.$messageBox(this.$t('error.runningDataError') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5000') {
+                    this.$messageBox(this.$t('error.systemError') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4000') {
+                    this.$messageBox(this.$t('error.simulationDoesNotExist') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4001') {
+                    this.$messageBox(this.$t('error.simulationOperationIsNotDefined') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4002') {
+                    this.$messageBox(this.$t('error.simulationOperationProcessingMethodNotFound') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4003') {
+                    this.$messageBox(this.$t('error.simulationOperationFailed') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4004') {
+                    this.$messageBox(this.$t('error.operationConflict') + ',' + this.$t('error.startSimulationFailed'));
+                }
+            });
+        },
+        switchMode(swch) {
+            this.$emit('switchMode', swch);
+            this.switchModeInner(swch);
+        },
+        switchModeInner(swch) {
+            let showMode = '03';
+            if (swch == '01') {
+                showMode = '03';
+            } else if (swch == '02') {
+                showMode = '02';
+            }
+            const nameList = Object.keys(this.$store.state.map.map || {});
+            let list = [];
+            nameList.forEach(item => {
+                if (item !== 'skinVO') {
+                    const data = this.$store.state.map.map[item];
+                    if (data && data.constructor === Array) {
+                        list = [...list, ...data];
+                    }
+                }
+            });
+            this.$jlmap.updateShowMode(list, showMode);
+            if (swch == '02') {
+                this.switchStationMode('');
+            } else {
+                this.switchStationMode(null);
+            }
+        },
+        switchStationModeInfo(val) {
+            this.showStationContent = val;
+            this.$emit('switchStationMode', val);
+        },
+        switchStationMode(val) {
+            this.$emit('switchStationMode', val);
+        },
+        end() {
+            this.isDisable = false;
+            exitRunPlan(this.group).then(() => {
+                this.$store.dispatch('training/over').then(() => {
+                    this.$store.dispatch('training/setMapDefaultState').then(() => {
+                        this.$store.dispatch('map/setRunPlanStatus', false);
+                        this.$store.dispatch('map/clearJlmapTrainView');
+                        this.$store.dispatch('map/setTrainWindowShow', false);
+                    });
+                });
+            }).catch(() => {
+                this.isDisable = true;
+                this.$messageBox(this.$t('display.demon.endSimulationFail'));
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.practice-schema {
+    z-index: 9;
+    display: inline;
+    position: absolute;
+    right: 15px;
+}
+.practice-bottom {
+    position: absolute;
+    float: right;
+    right: 15px;
+    bottom: 15px;
+}
+</style>
+
diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue
index 0fd47a4f0..2a98e9db5 100644
--- a/src/views/newMap/displayNew/menuScript.vue
+++ b/src/views/newMap/displayNew/menuScript.vue
@@ -121,7 +121,7 @@ export default {
             ranAsPlan(data, this.group).then(res => {
                 this.$store.dispatch('training/simulationStart').then(() => {
                     this.$store.dispatch('map/setRunPlanStatus', true);
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
+                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
                     this.$store.dispatch('map/setShowCentralizedStationNum');
                 });
             }).catch((error) => {
diff --git a/src/views/newMap/displayNew/menuSystemTime.vue b/src/views/newMap/displayNew/menuSystemTime.vue
index 9130f92c9..0e5ed6dca 100644
--- a/src/views/newMap/displayNew/menuSystemTime.vue
+++ b/src/views/newMap/displayNew/menuSystemTime.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowSystemTime" class="display-card" :style="{top: offset+'px', right: right+'px'}">
+  <div v-if="isShowSystemTime" class="display-card" :style="{top: top+'px', right: newRight+'px'}">
     <template v-if="pause">
       <span class="display-pause">{{ $t('display.systemTime.timePause') }}</span>
     </template>
@@ -8,7 +8,10 @@
         class="display-time"
         :time="time"
       />
-
+      <div v-if="isShowDate" style="width: 80px;height: 58px;float: right;box-shadow: 0 0 5px #eee;">
+        <div class="display-date-box">{{ dateString }}</div>
+        <div class="display-date-box">{{ dayString }}</div>
+      </div>
     </template>
   </div>
 </template>
@@ -34,7 +37,9 @@ export default {
     },
     data() {
         return {
-            time: '00:0000'
+            time: '00:0000',
+            dateString: '00/00/00',
+            dayString: ''
         };
     },
     computed: {
@@ -42,24 +47,68 @@ export default {
             return this.$route.params.mode == 'demon' ||
 					this.$route.params.mode == 'dp' ||
 					this.$route.params.mode == 'plan' ||
-					this.$route.params.mode == 'script' ||
+                    this.$route.params.mode == 'script' ||
+                    this.$route.params.mode == 'practice' ||
 					!this.$route.params.mode;
         },
         pause() {
             return this.$store.state.scriptRecord.simulationPause;
+        },
+        isShowDate() {
+            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.$route.path.includes('displayNew');
+        },
+        top() {
+            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.$route.path.includes('displayNew') ? 35 : this.offset;
+        },
+        newRight() {
+            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.$route.path.includes('displayNew') ? this.$store.state.config.width - 340 - 80 : this.right;
         }
     },
     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.initDate(date);
         }
     },
     mounted() {
         const initTime = this.$store.state.training.initTime;
         if (initTime > 0) {
             const date = new Date(initTime);
+            this.initDate(date);
+        }
+    },
+    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 = '星 期 日';
+            }
         }
     }
 };
@@ -88,5 +137,12 @@ export default {
     .display-card .el-row {
         line-height: 32px !important;
     }
+	.display-date-box{
+		height: 29px;
+		line-height: 29px;
+		background: #404040;
+		color: #1DEA1E;
+		text-align: center;
+	}
 
 </style>
diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue
index 30c5769a9..276455a38 100644
--- a/src/views/newMap/displayNew/menuTrainList.vue
+++ b/src/views/newMap/displayNew/menuTrainList.vue
@@ -1,15 +1,10 @@
 <template>
-  <div class="menuTrainListOut">
-    <div v-if="drawer" class="menuTrainListBtn" @click="clickBtn"><i
-      class="el-icon-more"
-      style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);margin-left: -10px;"
-    /></div>
+  <div class="menuTrainListOut" :class="{'xian_01' : lineCode == '11'}">
+    <div v-if="drawer" class="menuTrainListBtn" @click="clickBtn">
+      <i class="el-icon-more" style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);margin-left: -10px;" /></div>
     <div v-else class="menuTrainListBtn1" @click="clickBtn">
       <div class="menuTrainListBtn1In">
-        <i
-          class="el-icon-more"
-          style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);"
-        />
+        <i class="el-icon-more" style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);" />
       </div>
     </div>
     <div
@@ -38,6 +33,11 @@ export default {
             oldDevice: null
         };
     },
+    computed: {
+        lineCode() {
+            return this.$route.query.lineCode;
+        }
+    },
     watch:{
         '$store.state.map.trainListUpdate': function (val) {
             this.trainList = this.$store.state.map.map.trainList.filter((train)=>{
@@ -49,7 +49,6 @@ export default {
                 this.trainList = [];
             }
         }
-
     },
     mounted() {
     },
@@ -67,29 +66,7 @@ export default {
         // 设置显示中心
         setCenter(code) {
             this.$emit('setCenter', code);
-            // const device = this.$store.getters['map/getDeviceByCode'](code);
-            // this.deviceHighLight(this.oldDevice, false);
-            // this.deviceHighLight(device, true);
-            // this.oldDevice = device;
         }
-        // 高亮设备
-        // deviceHighLight(device, flag) {
-        //     if (device && device.instance && typeof device.instance.drawSelected === 'function' ) {
-        //         if (device._type === 'Section' && device.type === '04') {
-        //             device.relevanceSectionList.forEach(item => {
-        //                 const sectionModel = this.$store.getters['map/getDeviceByCode'](item);
-        //                 sectionModel && sectionModel.instance.drawSelected(flag);
-        //             });
-        //         } else if (device._type === 'Section' && device.type === '01' && device.logicSectionCodeList && device.logicSectionCodeList.length) {
-        //             device.logicSectionCodeList.forEach(item => {
-        //                 const sectionModel = this.$store.getters['map/getDeviceByCode'](item);
-        //                 sectionModel && sectionModel.instance.drawSelected(flag);
-        //             });
-        //         } else {
-        //             device.instance.drawSelected(flag);
-        //         }
-        //     }
-        // }
     }
 };
 </script>
diff --git a/src/views/newMap/jlmapNew/pendant/zoom.vue b/src/views/newMap/jlmapNew/pendant/zoom.vue
index ec917b8c5..e82c5b89f 100644
--- a/src/views/newMap/jlmapNew/pendant/zoom.vue
+++ b/src/views/newMap/jlmapNew/pendant/zoom.vue
@@ -38,7 +38,7 @@ export default {
     methods: {
         setPosition() {
             this.$nextTick(() => {
-                let offset = 15;
+                let offset = this.$route.path.includes('displayNew') && (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) ? 73 : 15;
                 const menuBar = document.getElementById('menuBar');
                 const menuTool = document.getElementById('menuTool');
                 if (menuBar) {
diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatBox.vue
index 72f0a1b69..d1c1f8846 100644
--- a/src/views/newMap/jointTrainingNew/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatBox.vue
@@ -2,7 +2,7 @@
   <!-- v-quickMenuDrag  -->
   <div class="chatBox">
     <div v-show="!minimize" class="chat-box">
-      <chat-member-list ref="chatMemberList" :group="group" @addCoversition="addCoversition" />
+      <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" @addCoversition="addCoversition" />
       <div class="chat-box-main">
         <chat-coversition-list ref="chatCoversitionList" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
         <div class="chat-window">
@@ -11,8 +11,8 @@
             <div class="minimality" @click="handleMinimality('min')">
               <i class="el-icon-remove" />
             </div>
-            <div v-show="currentCoversition.group==undefined?true:currentCoversition.group" class="showMembers" @click="handleMembers()">
-              <i class="el-icon-user-solid" />
+            <div v-show="currentCoversition.all==undefined?true&&isShow:currentCoversition.all&&isShow" class="chat-createGroup" @click="handleCreateGroup()">
+              <i class="el-icon-plus" style="font-weight: bolder;" />
             </div>
             <div class="chat-setting" @click="handleSetting()">
               <i class="el-icon-s-tools" />
@@ -42,6 +42,7 @@
       </div>
     </div>
     <chat-setting ref="chatSetting" :form="form" @setSetting="setSetting" />
+    <chat-create-group ref="createGroup" :group="group" @addCoversition="addCoversition" />
   </div>
 </template>
 <script>
@@ -49,6 +50,7 @@ import ChatSetting from './chatSetting';
 import ChatContent from './chatContent';
 import ChatMemberList from './chatMemberList';
 import ChatCoversitionList from './chatCoversitionList';
+import ChatCreateGroup from './chatCreateGroup';
 import RecordRTC from 'recordrtc';
 import {uploadAudioFileNew} from '@/api/chat';
 export default {
@@ -57,12 +59,17 @@ export default {
         ChatSetting,
         ChatContent,
         ChatMemberList,
-        ChatCoversitionList
+        ChatCoversitionList,
+        ChatCreateGroup
     },
     props: {
         group: {
             type: String,
             required: true
+        },
+        userRole: {
+            type: String,
+            required: true
         }
     },
     data() {
@@ -81,14 +88,9 @@ export default {
             headerTitle:'所有人'
         };
     },
-    watch: {
-        '$store.state.socket.simulationRoleList': function (val) {
-            if (val && val.length) {
-                this.$nextTick(() => {
-                    this.$refs.chatMemberList.setMemberStatus(val);
-                    this.$refs.chatCoversitionList.setCoversitionStatus(val);
-                });
-            }
+    computed:{
+        isShow() {
+            return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE';
         }
     },
     mounted() {
@@ -110,7 +112,7 @@ export default {
         },
         setCurrentCoversition(coversition) {
             this.currentCoversition = coversition;
-            if (coversition.group) {
+            if (coversition.all) {
                 this.headerTitle = coversition.name;
             }
             if (this.recordSending) {
@@ -123,7 +125,7 @@ export default {
         },
         addCoversition({data, headerTitle}) {
             this.$refs.chatCoversitionList.addCoversition(data);
-            this.currentCoversition = {id:data.id, group:data.group};
+            this.currentCoversition = {id:data.id, all:data.all};
             this.headerTitle = headerTitle;
         },
         // 语音录制开始
@@ -229,9 +231,8 @@ export default {
         handleSetting() {
             this.$refs.chatSetting.doShow();
         },
-        handleMembers() {
-            this.$refs.chatSetting.doClose();
-            this.$refs.chatMemberList.doShow();
+        handleCreateGroup() {
+            this.$refs.createGroup.doShow();
         }
     }
 };
@@ -260,6 +261,10 @@ export default {
   margin-left: 15px;
   display: inline-block;
   margin-top: 10px;
+  width: 70%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .chat-box-content{
     width: 100%;
@@ -285,6 +290,14 @@ export default {
     cursor: pointer;
     font-size: 16px;
 }
+.chat-createGroup{
+    float: right;
+    line-height: 40px;
+    margin-right: 10px;
+    cursor: pointer;
+    font-size: 16px;
+    position: relative;
+}
 .chat-box-footer-tool{
     width: 100%;
     height: 30px;
diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue
index 2c94350ae..5e0864de6 100644
--- a/src/views/newMap/jointTrainingNew/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatContent.vue
@@ -4,17 +4,19 @@
       <div v-for="(chatContent,index) in chatContentList" :key="index" class="chatContentInClass">
         <div :class="chatContent.self?'rightUser':'leftUser'">
           <div class="userHeader">
-            <div v-if="chatContent.group&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
+            <!-- chatContent.all&&  -->
+            <div v-if="!chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
             <div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ formatTime(chatContent.chatTime) }}</div>
           </div>
-          <div class="userBubble" @click="playAudio('audio'+index)">
+          <div class="userBubble" @click="playAudio(baseUrl+chatContent.src)">
             <div class="userMessage">
-              <span v-if="chatContent.group&&!chatContent.member.robot">@{{ covertName(chatContent.targetName) }}</span>
+              <!-- chatContent.all&& -->
+              <span v-if="!chatContent.member.robot">@{{ covertName(chatContent.targetName) }}</span>
               <span class="el-icon-video-play playicon" />
               <span class="messageText">{{ chatContent.message }}</span>
-              <audio :id="'audio'+index" :src="baseUrl+chatContent.src" style="display:none" />
             </div>
           </div>
+          <audio id="audioPlay" style="display:none" />
         </div>
       </div>
     </div>
@@ -35,6 +37,9 @@ export default {
         return {
             chatContentList:[],
             coversition:{},
+            currentAudioList:[],
+            currentAudioIndex:0,
+            isPlay:false,
             baseUrl:process.env.VUE_APP_VOICE_API
         };
     },
@@ -47,12 +52,28 @@ export default {
             const simulationText = this.$store.state.socket.simulationText;
             if (this.currentCoversition.id == val.id) {
                 this.chatContentList.push(simulationText);
+                if (simulationText.member.userId != this.$store.state.user.id) {
+                    this.currentAudioList.push(this.baseUrl + simulationText.src);
+                    if (!this.isPlay) {
+                        this.isPlay = true;
+                        this.playAllAudio();
+                    }
+                }
                 this.scrollTop();
             } else {
-                if (!simulationText.group) {
+                debugger;
+                if (!simulationText.all) {
                     this.$emit('changeCoversition', simulationText);
                     // this.$emit('addCoversition', {data:simulationText, headerTitle:''});
                     this.chatContentList.push(simulationText);
+                    if (simulationText.member.userId != this.$store.state.user.id) {
+                        this.currentAudioList.push(this.baseUrl + simulationText.src);
+                        if (!this.isPlay) {
+                            this.isPlay = true;
+                            this.playAllAudio();
+                        }
+                    }
+
                 }
             }
         },
@@ -101,6 +122,25 @@ export default {
         formatTime(time) {
             return /\d{2}:\d{2}:\d{2}/.exec(time)[0] || time;
         },
+        playAllAudio() {
+            this.playEachAudio(this.currentAudioList[this.currentAudioIndex]);
+        },
+        playEachAudio(audioUrl) {
+            this.$nextTick(function() {
+                document.querySelector('#audioPlay').src = audioUrl;
+                document.querySelector('#audioPlay').play();
+                const that = this;
+                document.querySelector('#audioPlay').onended = function() {
+                    that.currentAudioList.shift();
+                    if (that.currentAudioList.length > 0) {
+                        that.currentAudioIndex++;
+                        that.playEachAudio(that.currentAudioList[that.currentAudioIndex]);
+                    } else {
+                        that.isPlay = false;
+                    }
+                };
+            });
+        },
         covertName(data) {
             if (data != 'All') {
                 const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
@@ -123,8 +163,9 @@ export default {
                 return 'All';
             }
         },
-        playAudio(id) {
-            document.querySelector('#' + id).play();
+        playAudio(audioUrl) {
+            document.querySelector('#audioPlay').src = audioUrl;
+            document.querySelector('#audioPlay').play();
         }
         // reloadData(currentCoversition) {
         //     this.chatContentList = [];
diff --git a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue b/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
index 4516e5b0f..530229abe 100644
--- a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
+++ b/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
@@ -32,9 +32,15 @@ export default {
                 if (resp.data) {
                     const data = resp.data;
                     data.map(coversition=>{
-                        const objectCover = this.handleMemberName(coversition);
-                        coversition.coverName = objectCover.coversitionName;
-                        coversition.isOnline = objectCover.isOnline;
+                        if (coversition.name) {
+                            coversition.coverName = coversition.name;
+                            coversition.isOnline = true;
+                        } else {
+                            const objectCover = this.handleMemberName(coversition);
+                            coversition.coverName = objectCover.coversitionName;
+                            coversition.isOnline = objectCover.isOnline;
+                        }
+
                         return coversition;
                     });
                     this.coversitionList = data;
@@ -49,15 +55,21 @@ export default {
             const index = this.coversitionList.findIndex(item=>{ return item.id == data.id; });
             if (index < 0) {
                 const objectCover = this.handleMemberName(data);
-                data.coverName = objectCover.coversitionName;
-                data.isOnline = objectCover.isOnline;
+                if (data.name) {
+                    data.coverName = data.name;
+                    data.isOnline = true;
+                } else {
+                    data.coverName = objectCover.coversitionName;
+                    data.isOnline = objectCover.isOnline;
+                }
+
                 this.coversitionList.push(data);
                 this.currentCoversition = data;
             }
         },
         changeCoversition(coversition) {
-            this.$emit('setHeadTitle', !coversition.isOnline ? coversition.coverName + ' (离线)' : coversition.coverName);
-            this.currentCoversition = {id:coversition.id, group:coversition.group};
+            this.$emit('setHeadTitle', coversition.coverName);
+            this.currentCoversition = {id:coversition.id, all:coversition.all};
             this.$emit('setCurrentCoversition', coversition);
             // this.$refs.chatContent.reloadData(this.currentCoversition);
         },
@@ -72,7 +84,7 @@ export default {
             this.changeCoversition(coversition);
         },
         handleMemberName(conversition) {
-            if (conversition.group) {
+            if (conversition.all) {
                 return {coversitionName:conversition.name, isOnline:true};
             } else {
                 let coversitionName = '';
@@ -117,11 +129,6 @@ export default {
                 }
                 return {coversitionName:coversitionName, isOnline:isOnline};
             }
-        },
-        setCoversitionStatus(data) {
-            this.initPage(false);
-            this.$emit('setHeadTitle', !this.currentCoversition.isOnline ? this.currentCoversition.coverName + ' (离线)' : this.currentCoversition.coverName);
-            // this.changeCoversition(this.currentCoversition);
         }
     }
 };
diff --git a/src/views/newMap/jointTrainingNew/chatCreateGroup.vue b/src/views/newMap/jointTrainingNew/chatCreateGroup.vue
new file mode 100644
index 000000000..68bcf6b89
--- /dev/null
+++ b/src/views/newMap/jointTrainingNew/chatCreateGroup.vue
@@ -0,0 +1,224 @@
+<template>
+  <div v-show="dialogVisible" class="chat-create-group">
+    <div class="create-group-header">
+      <div class="create-group-title">添加会话对象</div>
+      <div class="create-group-close">
+        <i class="el-icon-close" @click="dialogVisible=false" />
+      </div>
+    </div>
+    <div class="create-group-content">
+      <div class="chat-member-list">
+        <el-checkbox-group v-model="checkList">
+          <el-checkbox
+            v-for="member in memberList"
+            :key="member.id"
+            class="each-chat-member"
+            :label="member"
+            :disabled="member.userId === userId"
+          >{{ member.memberName }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="currentSelectList">
+        <div
+          v-for="member in checkList"
+          :key="member.id"
+          class="eachSelect"
+        >
+          {{ member.memberName }}
+        </div>
+
+      </div>
+      <!-- :style="member.userId === userId ?'color:red':''" -->
+    </div>
+    <div class="create-group-bottom">
+      <el-button :loading="loading" size="small" type="primary" @click="doCreate">创建会话</el-button>
+      <el-button size="small" @click="doClose">取消</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import {getSimulationMembersNew, getSimulationConversationIdNew} from '@/api/chat';
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
+export default {
+    name:'ChatCreateGroup',
+    props: {
+        group: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible:false,
+            loading:false,
+            memberList:[],
+            checkList:[]
+        };
+    },
+    computed:{
+        userId() {
+            return this.$store.state.user.id;
+        }
+    },
+    methods:{
+        doShow() {
+            this.getSimulationMembers();
+            this.dialogVisible = true;
+        },
+        getSimulationMembers() {
+            getSimulationMembersNew(this.$route.query.group).then(resp => {
+                let lastData = JSON.stringify(resp.data);
+                const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+                roleTypeList.forEach(function(element) {
+                    const rolename = element.value;
+                    if (Cookies.get('user_lang') == 'en') {
+                        lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
+                    } else {
+                        lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
+                    }
+                });
+                lastData = JSON.parse(lastData);
+                lastData = lastData.filter(memberIn=>{ return memberIn.role != '观众'; });
+                lastData.map(member=>{
+                    const deviceName = member.deviceName ? '-' + member.deviceName : '';
+                    const memberName = member.name ? '-' + member.name : '';
+                    member.memberName = member.role + deviceName + memberName;
+                    return member;
+                });
+                this.memberList = lastData;
+            });
+        },
+        doCreate() {
+            if (this.checkList.length > 0) {
+                this.loading = true;
+                const checkList = this.checkList.map(function(check) { return check.id; });
+                getSimulationConversationIdNew(checkList, this.group).then(resp => {
+                    if (resp.data) {
+                        const data = resp.data;
+                        this.loading = false;
+                        this.$emit('addCoversition', {data:data, headerTitle:resp.data.name});
+                        this.dialogVisible = false;
+                        this.checkList = [];
+                    }
+                }).catch(error=>{
+                    this.$messageBox('创建会话失败: ' + error.messagfe);
+                    this.loading = false;
+                    this.dialogVisible = false;
+                    this.checkList = [];
+                });
+            }
+
+        },
+        doClose() {
+            this.checkList = [];
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.chat-create-group{
+    position: absolute;
+    width: 70%;
+    height: 300px;
+    border: 1px #dedede solid;
+    left: 26%;
+    top: 8%;
+    z-index: 7;
+    border-radius: 8px;
+    box-shadow: #b5aeae 0 0 10px;
+    background: #fff;
+}
+.create-group-header{
+    padding-left: 10px;
+    padding-top: 6px;
+    font-size: 14px;
+    border-bottom: 1px #dedede solid;
+    padding-bottom: 6px;
+}
+.create-group-title{
+    display: inline-block;
+}
+.create-group-close{
+    float: right;
+    display: inline-block;
+    margin-right: 5px;
+    font-size: 16px;
+    cursor: pointer;
+}
+.chat-member-list{
+    width: 54%;
+    height: 216px;
+    overflow-y: auto;
+    padding: 5px 10px;
+    font-size: 14px;
+    overflow-x: hidden;
+    border-right: 1px #ccc solid;
+    display:inline-block;
+}
+.create-group-content{
+    width: 100%;
+    height: 220px;
+    padding-bottom: 10px;
+    border-bottom: 1px #dedede solid;
+}
+.create-group-bottom{
+    text-align: center;
+    margin-top:8px;
+}
+.each-chat-member{
+    display:block;
+    margin-top:5px;
+}
+.currentSelectList{
+    display: inline-block;
+    width: 44%;
+    font-size: 14px;
+    vertical-align: top;
+    padding: 5px 10px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    height: 216px;
+}
+.eachSelect{
+    display:block;
+    margin-top:5px;
+}
+// 谷歌、safari、qq浏览器、360浏览器滚动条样式
+// 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
+.chat-member-list::-webkit-scrollbar,.currentSelectList::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    // height: 110px;
+    background-color: #FFFFFF;
+}
+/*定义滚动条轨道 内阴影+圆角*/
+.chat-member-list::-webkit-scrollbar-track,.currentSelectList::-webkit-scrollbar-track{
+    // box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+    border-radius: 10px;
+    background-color: #FFFFFF;;
+}
+/*定义滑块 内阴影+圆角*/
+.chat-member-list::-webkit-scrollbar-thumb,.currentSelectList::-webkit-scrollbar-thumb{
+    border-radius: 10px;
+    // box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+    background-color: #cacaca;
+}
+/*滑块效果*/
+.chat-member-list::-webkit-scrollbar-thumb:hover,.currentSelectList::-webkit-scrollbar-thumb:hover {
+    border-radius: 5px;
+    // box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: rgba(0,0,0,0.4);
+}
+/*IE滚动条颜色*/
+html {
+    scrollbar-face-color:#bfbfbf;/*滚动条颜色*/
+    scrollbar-highlight-color:#000;
+    scrollbar-3dlight-color:#000;
+    scrollbar-darkshadow-color:#000;
+    scrollbar-Shadow-color:#adadad;/*滑块边色*/
+    scrollbar-arrow-color:rgba(0,0,0,0.4);/*箭头颜色*/
+    scrollbar-track-color:#eeeeee;/*背景颜色*/
+}
+</style>
diff --git a/src/views/newMap/jointTrainingNew/chatMemberList.vue b/src/views/newMap/jointTrainingNew/chatMemberList.vue
index ed497a016..eb68d680a 100644
--- a/src/views/newMap/jointTrainingNew/chatMemberList.vue
+++ b/src/views/newMap/jointTrainingNew/chatMemberList.vue
@@ -5,15 +5,17 @@
       <div
         v-for="member in memberList"
         :key="member.id"
-        :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'"
+        class="each-chat-member"
         :style="member.userId === userId ?'color:red':''"
-        @click="createConversition(member)"
+        :title="member.memberName"
       >{{ member.memberName }}</div>
+      <!-- :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'" -->
     </div>
   </div>
 </template>
 <script>
-import {getSimulationMembersNew, getSimulationConversationIdNew} from '@/api/chat';
+// getSimulationMembersNew,
+import {getSimulationChatMemberNew} from '@/api/chat';
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
 export default {
@@ -22,11 +24,15 @@ export default {
         group: {
             type: String,
             required: true
+        },
+        currentCoversition:{
+            type: Object,
+            required: true
         }
     },
     data() {
         return {
-            showMembers:false,
+            showMembers:true,
             memberList:[]
         };
     },
@@ -35,35 +41,19 @@ export default {
             return this.$store.state.user.id;
         }
     },
+    watch:{
+        currentCoversition:function (val, old) {
+            if (val) {
+                this.getSimulationMembers();
+            }
+        }
+    },
     mounted() {
-        this.getSimulationMembers();
     },
     methods:{
-        createConversition(member) {
-            if (member.userId != this.$store.state.user.id && member.online) {
-                getSimulationConversationIdNew({ memberId: member.id }, this.group).then(resp => {
-                    if (resp.data) {
-                        const data = resp.data;
-                        this.$emit('addCoversition', {data:data, headerTitle:member.memberName});
-                        this.showMembers = false;
-                    }
-                });
-            }
-        },
-        setMemberStatus(memberInfo) {
-            this.getSimulationMembers();
-            // memberInfo.forEach(member=>{
-            //     if (this.coversitionList) {
-            //         this.coversitionList.forEach(item=>{
-            //             if (item.id == member.id) {
-            //                 item.online = member.online;
-            //             }
-            //         });
-            //     }
-            // });
-        },
         getSimulationMembers() {
-            getSimulationMembersNew(this.$route.query.group).then(resp => {
+            this.memberList = [];
+            getSimulationChatMemberNew(this.$route.query.group, this.currentCoversition.id).then(resp => {
                 let lastData = JSON.stringify(resp.data);
                 const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
                 roleTypeList.forEach(function(element) {
@@ -84,14 +74,6 @@ export default {
                 });
                 this.memberList = lastData;
             });
-        },
-        doShow() {
-            if (this.showMembers) {
-                this.showMembers = false;
-            } else {
-                this.showMembers = true;
-                this.getSimulationMembers();
-            }
         }
     }
 };
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 93a9a8e19..e6cd8932b 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -48,6 +48,8 @@ import { checkLoginLine } from '@/api/login';
 import { loadNewMapDataByGroup } from '@/utils/loaddata';
 import { getUserRolesNew, deljointTrainRoomNew} from '@/api/jointTraining';
 import { clearSimulation, getSimulationInfoNew } from '@/api/simulation';
+import {getRaceUserById} from '@/api/competition';
+import { getSessionStorage } from '@/utils/auth';
 import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
 import Jl3dMaintainer from '@/views/jlmap3d/maintainer/jl3dmaintainer';
 import { EventBus } from '@/scripts/event-bus';
@@ -127,6 +129,9 @@ export default {
         },
         prdType() {
             return this.$store.state.training.prdType;
+        },
+        project() {
+            return getSessionStorage('project');
         }
     },
     watch: {
@@ -278,7 +283,6 @@ export default {
                 if (menuBar) {
                     offset += (menuBar.offsetHeight || 0);
                 }
-
                 if (menuTool) {
                     offset += (menuTool.offsetHeight || 0);
                 }
@@ -322,7 +326,7 @@ export default {
             if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
                 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
                 this.questId = Number(resp.data.questId) || 0;
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`));
+                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
                 this.$store.dispatch('map/setRunPlanStatus', resp.data.planRunning);
                 if (resp.data.planRunning) {
                     this.$store.dispatch('training/simulationStart');
@@ -359,8 +363,17 @@ export default {
 
             if (this.lineCode) {
                 // 01 现地 02 行调 '' 观众
-                const resp = await this.getUserRole();
-                console.log('/////////////' + resp.data.userRole);
+                let resp = {data: {}};
+                if (this.project == 'jsxt' ) {
+                    resp = await getRaceUserById(this.$route.query.raceId);
+                    resp.data.userRole = resp.data.role;
+                } else if (this.project == 'refereeJsxt') {
+                    resp['code'] = 200;
+                    resp.data['userRole'] = 'ADMIN';
+                } else {
+                    resp = await this.getUserRole();
+                }
+                // console.log('/////////////' + resp.data.userRole);
                 if (resp && resp.code == 200) {
                     // Admin 管理员 Instructor 教员 Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 IBP:IBP盘
                     this.userRole = resp.data.userRole;
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 7a32b40b4..0360aea61 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -1,21 +1,22 @@
 <template>
   <div>
-    <chat-box :group="group" />
+    <chat-box :group="group" :user-role="userRole" />
     <div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01'}">
       <el-button-group>
         <el-button v-if="isProject && !dataError " type="primary" @click="setRelDevice">{{ $t('joinTraining.connectRealDevices') }}</el-button>
         <el-button v-if="isDriver && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button>
-        <template v-if="isAdmin">
+        <template v-if="isAdmin && project != 'refereeJsxt'">
           <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
           <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button>
         </template>
-        <template v-if="project==='jsxt'">
-          <!-- <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button> -->
-          <el-button type="danger" @click="endCompetition">结束</el-button>
-        </template>
-        <el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">返回</el-button>
-        <el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
+        <!-- <el-button type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button> -->
       </el-button-group>
+      <template v-if="project==='jsxt'">
+        <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button>
+        <el-button :disabled="jsStart" type="danger" @click="endCompetition">提交</el-button>
+      </template>
+      <el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">返回</el-button>
+      <el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
     </div>
     <qr-code ref="qrCode" />
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
@@ -126,11 +127,11 @@ export default {
         '$store.state.map.runPlanStatus': function (val) {
             this.isDisable = val;
         },
-        '$store.state.socket.competitionStart':function(val) {
-            if (val) {
-                this.startCompetition();
-            }
-        },
+        // '$store.state.socket.competitionStart':function(val) {
+        //     if (val) {
+        //         this.startCompetition();
+        //     }
+        // },
         '$store.state.socket.simulationOver':function(val) {
             if (val && this.project === 'refereeJsxt') {
                 this.$router.go(-1);
@@ -243,8 +244,11 @@ export default {
             };
             ranAsPlan(data, this.group).then(res => {
                 this.$store.dispatch('training/simulationStart').then(() => {
+                    if (this.project == 'jsxt') {
+                        this.jsStart = false;
+                    }
                     this.$store.dispatch('map/setRunPlanStatus', true);
-                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
+                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
                 });
             }).catch((error) => {
                 this.isDisable = false;
@@ -318,7 +322,7 @@ export default {
                 cancelButtonText: this.$t('global.cancel'),
                 type: 'warning'
             }).then(() => {
-                participantCompleteCompetition(1, this.group).then(resp => {
+                participantCompleteCompetition(this.$route.query.raceId, this.group).then(resp => {
                     // this.$router.go(-1);
                     this.submit();
                 }).catch(()=> {
@@ -328,7 +332,8 @@ export default {
         },
         refeeEndCompetition() {
             refereeExitSimulation(this.group).then(resp => {
-                this.$router.go(-1);
+                // this.$router.go(-1);
+                this.$router.replace({ path: `/refereeJsxt/home`, query: { raceId:this.$route.query.raceId } });
             }).catch(()=> {
                 this.$message.success('退出系统失败');
             });
@@ -336,7 +341,7 @@ export default {
         submit() {
             // this.$store.dispatch('exam/over').then(() => {
             //     this.$store.dispatch('trainingList/clearTrainingList');
-            this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId } });
+            this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
             // });
         }
     }
diff --git a/src/views/newMap/mapsystemNew/common/commonMenu.vue b/src/views/newMap/mapsystemNew/common/commonMenu.vue
new file mode 100644
index 000000000..f10404952
--- /dev/null
+++ b/src/views/newMap/mapsystemNew/common/commonMenu.vue
@@ -0,0 +1,51 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <set-fault ref="setFault" />
+    <train-add-plan ref="trainAddPlan" />
+  </div>
+</template>
+
+<script>
+import SetFault from './menus/setFault';
+import TrainAddPlan from './menus/trainAddPlan';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+export default {
+    name: 'CommonMenu',
+    components: {
+        SetFault,
+        TrainAddPlan
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+        '$store.state.training.commonMenuCount': function (val) {
+            const operate = this.$store.state.training.commonMenuStep || {};
+            switch (operate.operation) {
+            case OperationEvent.MixinCommand.stoppage.menu.operation:
+            case OperationEvent.MixinCommand.cancelStoppage.menu.operation:
+                this.$refs.setFault.doShow(operate, this.selected);
+                break;
+            case OperationEvent.Train.createPlanTrain.menu.operation:
+                this.$refs.trainAddPlan.doShow(operate, this.selected);
+                break;
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue
index ccbba871a..0c55fe6b1 100644
--- a/src/views/newMap/mapsystemNew/common/index.vue
+++ b/src/views/newMap/mapsystemNew/common/index.vue
@@ -3,6 +3,7 @@
     <training-tips ref="trainingTips" />
     <component :is="menus" :selected="selected" />
     <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="contextmenu" />
+    <common-menu ref="commonMenu" :selected="selected" />
   </div>
 </template>
 
@@ -13,12 +14,14 @@ import { getDeviceMenuByDeviceType, OperationEvent } from '@/scripts/ConstDic';
 import deviceType from '@/jmap/constant/deviceType';
 import JlmapVisual from '@/views/newMap/jlmapNew/index';
 import TrainingTips from '@/views/newMap/mapsystemNew/plugin/trainingtip';
+import CommonMenu from './commonMenu';
 
 export default {
     name: 'LessonCanvas',
     components: {
         JlmapVisual,
-        TrainingTips
+        TrainingTips,
+        CommonMenu
     },
     data() {
         return {
diff --git a/src/views/newMap/mapsystemNew/common/menus/noticeInfo.vue b/src/views/newMap/mapsystemNew/common/menus/noticeInfo.vue
new file mode 100644
index 000000000..672cfec3d
--- /dev/null
+++ b/src/views/newMap/mapsystemNew/common/menus/noticeInfo.vue
@@ -0,0 +1,84 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="xian-01__systerm notice-info"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="(message,index) in messages">
+        <div :key="index">{{ message }}</div>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">{{ $t('global.confirm') }}</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+export default {
+    name: 'NoticeInfo',
+    data() {
+        return {
+            dialogShow: false,
+            messages: [this.$t('tip.commandFailed')]
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return this.$t('tip.hint');
+        },
+        domIdSure() {
+            return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(messages) {
+            this.dialogShow = true;
+            this.messages = [this.$t('tip.commandFailed')];
+            if (messages && messages != 'null') {
+                this.messages.push(messages);
+            }
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.doClose();
+        },
+        cancel() {
+            this.doClose();
+        }
+    }
+};
+
+</script>
+<style>
+    .notice-info .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/views/newMap/mapsystemNew/common/menus/setFault.vue b/src/views/newMap/mapsystemNew/common/menus/setFault.vue
new file mode 100644
index 000000000..cf848894f
--- /dev/null
+++ b/src/views/newMap/mapsystemNew/common/menus/setFault.vue
@@ -0,0 +1,189 @@
+<template>
+  <el-dialog v-dialogDrag :class="className" :title="title" :visible.sync="show" width="350px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <el-row class="header">
+      <el-col :span="11"><span>设备:</span></el-col>
+      <el-col :span="11" :offset="2"><span>故障类型:</span></el-col>
+    </el-row>
+    <el-row>
+      <el-form ref="form" :model="form" :rules="rules">
+        <el-col :span="11">
+          <el-form-item>
+            <el-input v-model="deviceName" size="small" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="11" :offset="2">
+          <el-form-item prop="faultType">
+            <el-select v-model="form.faultType" size="small" style="height: 28px;" placeholder="请选择">
+              <el-option
+                v-for="item in faultList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
+
+export default {
+    name: 'SwitchControl',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            operation: '',
+            stationName: '',
+            switchName: '',
+            activeShow: false,
+            deviceName: '',
+            faultList: [],
+            className: '',
+            form: { faultType: ''},
+            rules: {
+                faultType: [
+                    { required: true, message: '请选择故障类型', trigger: 'change'}
+                ]
+            }
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        },
+        title() {
+            if (this.operation === OperationEvent.MixinCommand.stoppage.menu.operation) {
+                return '设置故障';
+            } else if (this.operation === OperationEvent.MixinCommand.cancelStoppage.menu.operation) {
+                return '取消故障';
+            }
+            return '';
+        }
+    },
+    created() {
+        switch (this.$route.query.lineCode) {
+        case '02':
+        case '05':
+            this.className = 'fuzhou-01__systerm';
+            break;
+        case '03':
+            this.className = 'beijing-01__systerm';
+            break;
+        case '04':
+            this.className = 'chengdou-03__systerm';
+            break;
+        case '06':
+            this.className = 'ningbo-01__systerm';
+            break;
+        case '07':
+            this.className = 'haerbin-01__systerm';
+            break;
+        case '08':
+            this.className = 'foshan-01__systerm';
+            break;
+        case '09':
+            this.className = 'xian-02__system';
+            break;
+        case '10':
+        case '11':
+            this.className = 'xian-01__systerm';
+            break;
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            if (!this.dialogShow) {
+                this.switchName = '';
+                this.stationName = '';
+                this.operation = operate.operation;
+                this.cmdType = operate.cmdType;
+                this.deviceName = deviceType[selected._type] + '-' + selected.name;
+                this.faultList = deviceFaultType[selected._type];
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.form.faultType = '';
+            this.$refs.form.resetFields();
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.sendCommand();
+                }
+            });
+        },
+        sendCommand() { // 发送指令
+            this.loading = true;
+            const setp = {
+                over: true,
+                operation: this.operation,
+                cmdType: this.cmdType,
+                param: {
+                    faultType: this.form.faultType
+                }
+            };
+            this.$store.dispatch('training/nextNew', setp).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                } else {
+                    this.doClose();
+                    this.$messageBox('设置或取消故障操作失败！');
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                this.$messageBox(error.message || '设置或取消故障操作失败！');
+            });
+        },
+
+        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/xian_01/menus/dialog/trainAddPlan.vue b/src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue
similarity index 87%
rename from src/jmapNew/theme/xian_01/menus/dialog/trainAddPlan.vue
rename to src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue
index 8d9d21818..d30bee7e2 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainAddPlan.vue
+++ b/src/views/newMap/mapsystemNew/common/menus/trainAddPlan.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="xian-01__systerm stand-stop-time"
+    :class="className"
     :title="title"
     :visible.sync="show"
     width="340px"
@@ -12,16 +12,6 @@
   >
     <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
       <div style="width: 96%;">
-        <!--<el-form-item label="车 组 号:" label-width="95px" prop="trainCode">-->
-        <!--<el-select v-model="addModel.trainCode" filterable>-->
-        <!--<el-option-->
-        <!--v-for="train in trainList"-->
-        <!--:key="train.groupNumber"-->
-        <!--:label="train.groupNumber"-->
-        <!--:value="train.code"-->
-        <!--/>-->
-        <!--</el-select>-->
-        <!--</el-form-item>-->
         <el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
           <el-select v-model="addModel.tripNumber" filterable @change="tripNumberChange">
             <el-option
@@ -61,10 +51,9 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { getTripNumberList, getServiceNumbersByTripNum } from '@/api/simulation';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import NoticeInfo from './noticeInfo';
 
 export default {
-    // name: 'TrainMove',
     name: 'TrainAddPlan',
     components: {
         NoticeInfo
@@ -75,6 +64,7 @@ export default {
             selected: null,
             tripNumberList:  [],
             serviceNumberList: [],
+            className: '',
             addModel: {
                 serviceNumber: '', // 服务号
                 tripNumber: '' // 车次号
@@ -111,6 +101,36 @@ export default {
             return '创建计划车';
         }
     },
+    created() {
+        switch (this.$route.query.lineCode) {
+        case '02':
+        case '05':
+            this.className = 'fuzhou-01__systerm stand-stop-time';
+            break;
+        case '03':
+            this.className = 'beijing-01__systerm stand-stop-time';
+            break;
+        case '04':
+            this.className = 'chengdou-03__systerm stand-stop-time';
+            break;
+        case '06':
+            this.className = 'ningbo-01__systerm stand-stop-time';
+            break;
+        case '07':
+            this.className = 'haerbin-01__systerm stand-stop-time';
+            break;
+        case '08':
+            this.className = 'foshan-01__systerm stand-stop-time';
+            break;
+        case '09':
+            this.className = 'xian-02__system stand-stop-time';
+            break;
+        case '10':
+        case '11':
+            this.className = 'xian-01__systerm stand-stop-time';
+            break;
+        }
+    },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
diff --git a/src/views/newMap/mapsystemNew/plugin/src/poptip.vue b/src/views/newMap/mapsystemNew/plugin/src/poptip.vue
index cdd598c4f..2cc938b89 100644
--- a/src/views/newMap/mapsystemNew/plugin/src/poptip.vue
+++ b/src/views/newMap/mapsystemNew/plugin/src/poptip.vue
@@ -1,7 +1,7 @@
 <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="text-align: center;" :style="{ width: width + 'px' }">
-      <p style="color: black;">{{ tip }}</p>
+    <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>
@@ -36,7 +36,8 @@ export default {
                 y: -300,
                 align: 'bottom'
             },
-            offset: 7
+            offset: 7,
+            textAlign: 'center'
         };
     },
     computed: {
@@ -45,7 +46,11 @@ export default {
             if (width > this.maxWidth) {
                 width = this.maxWidth;
             }
-            return width;
+            let parentWidth = 0;
+            if (this.position.fontNumber) {
+                parentWidth = this.position.fontNumber * this.defaultFontSize + 40;
+            }
+            return parentWidth || width;
         },
         arrawLeft() {
             return this.width / 5;
@@ -73,7 +78,9 @@ export default {
 
                 this.tPosition.align = this.position.align || 'bottom';
                 this.tPosition.x = this.position.x - (this.arrawLeft + this.offset);
+                this.parentWidth = 0;
 
+                this.textAlign = this.position.textAlign || 'center';
                 if (this.tPosition.align == 'top') {
                     const distance = 47;
                     this.tPosition.y = this.position.y + (distance);
diff --git a/src/views/newMap/mapsystemNew/plugin/src/tip.vue b/src/views/newMap/mapsystemNew/plugin/src/tip.vue
index d571475c6..ae63924f5 100644
--- a/src/views/newMap/mapsystemNew/plugin/src/tip.vue
+++ b/src/views/newMap/mapsystemNew/plugin/src/tip.vue
@@ -6,19 +6,19 @@
 
 <script>
 export default {
-	name: 'Tip',
-	props: {
-		tip: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			defaultFontSize: 14
-		};
-	},
-	methods: {
-	}
+    name: 'Tip',
+    props: {
+        tip: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            defaultFontSize: 14
+        };
+    },
+    methods: {
+    }
 };
 </script>
diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue
index 1c5c03d54..2fd54b5a2 100644
--- a/src/views/newMap/newMapdraft/mapoperate/station.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/station.vue
@@ -70,10 +70,10 @@
       <div style="height: 100%;">
         <el-scrollbar wrap-class="scrollbar-wrapper">
           <el-form ref="oprt" :model="allModel" label-width="130px" size="mini">
-            <el-form-item label="车站字体:" prop="nameFont">
+            <el-form-item label="车站字体大小:" prop="nameFont">
               <el-font v-model="allModel.nameFont" :placeholder="this.$t('tip.stationFont')" />
             </el-form-item>
-            <el-form-item label="公里标字体:" prop="kmPostFont">
+            <el-form-item label="公里标字体大小:" prop="kmPostFont">
               <el-font v-model="allModel.kmPostFont" :placeholder="this.$t('tip.stationFont')" />
             </el-form-item>
             <el-form-item label="车站Y坐标:" prop="positionY">
@@ -118,6 +118,7 @@ export default {
             lazy: true,
             // field: '',
             chargeStation:[],
+            relStationList: [], // 车站列表
             controlled:false,
             editModel: {
                 centralized: false,
@@ -145,6 +146,7 @@ export default {
                 kmPostFontColor: '#FFFFFF',
                 isShowControlMode: '',
                 chargeStationCodeList:[],
+                relStationCodeList: [], // 联锁站关联车站列表
                 position: { x: 0, y: 0 },
                 kilometerPosition: { x: 0, y: 0 }, // 公里标偏移坐标
                 // controlled:false,
@@ -238,6 +240,7 @@ export default {
                             { prop: 'centralized', label: this.$t('map.centralized'), type: 'checkbox', disabled:this.controlled, change:true, deviceChange:this.changeCentralized },
                             { prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList, isHidden: !this.isZcCode, disabled:true },
                             { prop: 'chargeStationCodeList', label: this.$t('map.chargeStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.chargeStation, isHidden: !this.isZcCode, deviceChange:this.changeChargeStation},
+                            { prop: 'relStationCodeList', label: '联锁站关联车站:', type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.relStationList, isHidden: !this.idCiStation},
                             { prop: 'runPlanName', label: this.$t('map.stationRunPlanName'), type: 'input' }
                         ]
                     }
@@ -279,6 +282,9 @@ export default {
         },
         isZcCode() {
             return this.editModel.centralized;
+        },
+        idCiStation() {
+            return this.editModel.ciStation;
         }
     },
     watch: {
@@ -298,21 +304,29 @@ export default {
                 this.editModel = deepAssign(this.editModel, selected);
                 // 被控制的车站数据
                 const beCentralizedStation = {};
+                this.relStationList = JSON.parse(JSON.stringify(this.stationList));
                 this.stationList.forEach(data=>{
                     if (data.centralized) {
                         data.chargeStationCodeList.forEach(charge=>{
                             beCentralizedStation[charge] = data.code;
                         });
                     }
+                    if (data.ciStation && data.code != this.selected.code) {
+                        const arr = data.relStationCodeList || [];
+                        arr.forEach(stationCode => {
+                            this.relStationList.forEach((data, index) => {
+                                if (data.code == stationCode) {
+                                    this.relStationList.splice(index, 1);
+                                }
+                            });
+                        });
+                    }
                 });
                 // 筛选数据 去掉已经是集中站的数据，去掉自己本身，去掉被别的集中站选中的数据
                 this.chargeStation = this.stationList.filter(data=>{
                     return !data.centralized && data.code != this.editModel.code && !(beCentralizedStation[data.code] && beCentralizedStation[data.code] != this.editModel.code);
                 });
                 this.controlled = !!beCentralizedStation[selected.code];
-                // this.chargeStation = this.stationList.filter(data=>{
-                //     return !data.centralized && data.code != this.editModel.code && !(data.controlled && data.concentrateStationCode != this.editModel.code);
-                // });
             }
         },
         changeControlMode(data) {
@@ -407,11 +421,11 @@ export default {
                                 zcCode: '',
                                 runPlanName: '',
                                 visible: true,
-                                nameFont: '22px consolas',
+                                nameFont: '22',
                                 nameFontColor: '#FFFFFF',
                                 kmPost: '1000km~2000km',
                                 kmPostShow: true,
-                                kmPostFont: '8px consolas',
+                                kmPostFont: '8',
                                 kmPostFontColor: '#FFFFFF',
                                 kilometerPosition: { x: 0, y: 0 },
                                 centralized: false,
@@ -420,6 +434,7 @@ export default {
                                 // concentrateStationCode: '',
                                 // controlled: false,
                                 chargeStationCodeList:[],
+                                relStationCodeList: [], // 联锁站关联车站列表
                                 createControlMode: item.control,
                                 createTurnBack: false,
                                 turnBackPoint: {x: 0, y: 0}, // 按图折返坐标
diff --git a/src/views/newMap/newMapdraft/mapoperate/text.vue b/src/views/newMap/newMapdraft/mapoperate/text.vue
index 9add562bf..8195ecbf0 100644
--- a/src/views/newMap/newMapdraft/mapoperate/text.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/text.vue
@@ -206,7 +206,7 @@ export default {
                     const model = {
                         _type: 'Text',
                         code: getUID('Text', this.textList),
-                        font: '14px consolas',
+                        font: '14',
                         fontColor: '#FFFFFF',
                         content: `${this.addModel.prepend}::${this.addModel.content}`,
                         position: {
diff --git a/src/views/scriptManage/create.vue b/src/views/scriptManage/create.vue
index 8e990e401..c6df9178f 100644
--- a/src/views/scriptManage/create.vue
+++ b/src/views/scriptManage/create.vue
@@ -24,8 +24,6 @@ export default {
     data() {
         return {
             dialogVisible: false,
-            mapList: [],
-            taskStatusList: [],
             formModel: {
                 name: '',
                 mapId: '',
diff --git a/src/views/system/dictionaryDetail/index.vue b/src/views/system/dictionaryDetail/index.vue
index 81c30dbb4..e56b0aeaa 100644
--- a/src/views/system/dictionaryDetail/index.vue
+++ b/src/views/system/dictionaryDetail/index.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <!-- <turnback-bar :title="turnbackBarTitle"></turnback-bar> -->
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <div class="draft">
       <el-button-group>
@@ -102,12 +101,6 @@ export default {
         };
     },
 
-    // computed: {
-    //     turnbackBarTitle() {
-    //         return this.dic.name + '(' + this.dic.code + ')'
-    //     }
-    // },
-
     created() {
         this.dicId = this.$route.query.id;
         getData(this.dicId).then(response => {