diff --git a/src/api/jmap/lesson.js b/src/api/jmap/lesson.js index a168e0d58..9a5a89e31 100644 --- a/src/api/jmap/lesson.js +++ b/src/api/jmap/lesson.js @@ -83,7 +83,8 @@ export function getLessonByClassId(classId) { /** 强制删除课程（即删除课程和课程关联的试卷） */ export function forceDeleteLesson(lessonId) { return request({ - url: `/api/lesson/usedLesson/${lessonId}` + url: `/api/lesson/usedLesson/${lessonId}`, + method: 'delete' }); } diff --git a/src/api/jmap/lessondraft.js b/src/api/jmap/lessondraft.js index 69b47b7c1..7c8a9bb9e 100644 --- a/src/api/jmap/lessondraft.js +++ b/src/api/jmap/lessondraft.js @@ -69,6 +69,14 @@ export function updateLessonChapter(data) { }); } +/** 删除课程章节*/ +export function deleteLessonChapter(id) { + return request({ + url: `/api/lessonDraft/chapter/${id}`, + method: 'delete' + }); +} + /** 创建课程章节详细内容*/ export function getLessonChapterDetail(data) { return request({ diff --git a/src/api/jointTraining.js b/src/api/jointTraining.js index dd3785ddc..7c77e7245 100644 --- a/src/api/jointTraining.js +++ b/src/api/jointTraining.js @@ -238,3 +238,12 @@ export function realDeviceIsUsedNew(group, projectCode) { } }); } + +// 获取所有需要值班员的车站（新版） +export function getAvailableStaionList(mapId) { + return request({ + url: `/api/map/${mapId}/station/needSupervisor`, + method: 'get' + }); +} + diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js index 6520bb8e6..49c469f2c 100644 --- a/src/i18n/langs/en/router.js +++ b/src/i18n/langs/en/router.js @@ -75,5 +75,6 @@ export default { deviceManage: 'Device management', iscsDraw: 'Iscs Draw', iscsSystem: 'Iscs System', - studentManage: 'Student manage' + studentManage: 'Student manage', + examDetail: 'Exam detail' }; diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js index 70aaa568f..b30c1ff92 100644 --- a/src/i18n/langs/zh/router.js +++ b/src/i18n/langs/zh/router.js @@ -78,5 +78,7 @@ export default { iscsSystem: 'Iscs系统', studentManage: '学生管理', competitionManage: '竞赛管理', - refereeJManage: '仿真管理' + refereeJManage: '仿真管理', + homeJsxt: '首页', + examDetail: '考试详情' }; diff --git a/src/iscs/constant/iscsData.js b/src/iscs/constant/iscsData.js index 8aa2c8ea1..66cb0c906 100644 --- a/src/iscs/constant/iscsData.js +++ b/src/iscs/constant/iscsData.js @@ -4,7 +4,9 @@ const iscsData = { '13': {'stateTableList':[{'point':{'x':430, 'y':100}, 'columnNum':2, 'rowNum':15, 'rowHeight':30, 'columnWidthList':[110, 100], 'headerType':'none', 'tableData':[{'column1':'系统故障', 'column2':'fasSystemFailure'}, {'column1':'FACD自动状态', 'column2':'facpAutoMode'}, {'column1':'气灭控制系统状态', 'column2':'gesControlStatus'}, {'column2':'hydrantStartupStatus', 'column1':'消火栓泵启动状态'}, {'column1':'感温电缆火警状态', 'column2':'tscFireCondition'}, {}, {}, {}, {}, {}, {}, {}, {}, {}], '_type':'StateTable', 'headerFontSize':14, 'fontSize':12, 'headerContextList':[], 'code':'StateTable_1', 'zlevel':1, 'z':5}, {'point':{'x':675, 'y':100}, 'columnNum':2, 'rowNum':9, 'rowHeight':30, 'columnWidthList':[190, 100], 'headerType':'normal', 'tableData':[{'column2':'aEquipmentAreaFireDetector', 'column1':'站厅A端设备区'}, {'column1':'站厅公共区', 'column2':'scaFireDetector'}, {'column1':'站厅B端设备区', 'column2':'bEquipmentAreaFireDetector'}, {'column1':'站台公共区', 'column2':'pcaFireDetector'}, {}, {}, {}, {}], '_type':'StateTable', 'headerFontSize':14, 'fontSize':12, 'headerContextList':['点型火灾探测器', '状态'], 'code':'StateTable_2', 'zlevel':1, 'z':5}, {'point':{'x':1030, 'y':100}, 'columnNum':2, 'rowNum':3, 'rowHeight':30, 'columnWidthList':[200, 100], 'headerType':'merge', 'tableData':[{'column2':'elevatorCutFirePowerSupply', 'column1':'站内垂直电梯切非站台B消'}, {'column2':'otherCutFirePowerSupply', 'column1':'其他切非回路站台B消'}], '_type':'StateTable', 'headerFontSize':14, 'fontSize':12, 'headerContextList':['非消防电源'], 'code':'StateTable_3', 'zlevel':1, 'z':5}, {'point':{'x':1030, 'y':230}, 'columnNum':3, 'rowNum':5, 'rowHeight':30, 'columnWidthList':[155, 100, 100], 'headerType':'normal', 'tableData':[{'column1':'会展中心下行左线', 'column2':'inDownLeftManualAlarm', 'column3':'inDownLeftHydrant'}, {'column1':'会展中心上行右线', 'column2':'inUpRightManualAlarm', 'column3':'inUpRightManualAlarm'}, {'column1':'会展中心至世纪大道下行左线', 'column2':'outDownLeftManualAlarm', 'column3':'outDownLeftHydrant'}, {'column1':'会展中心至世纪大道上行右线', 'column2':'outUpRightManualAlarm', 'column3':'outUpRightHydrant'}], '_type':'StateTable', 'headerFontSize':14, 'fontSize':12, 'headerContextList':['位置', '手动报警按钮', '消火栓按钮'], 'code':'StateTable_4', 'zlevel':1, 'z':5}]}, '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':{}, + }, '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}] + }, '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}]}, '42': {'vidiconList':[{'_type':'Vidicon', 'code':'Vidicon_1', 'width':40, 'right':true, 'point':{'x':311, 'y':248}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_2', 'width':40, 'right':true, 'point':{'x':321, 'y':158}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_3', 'width':40, 'right':true, 'point':{'x':324, 'y':93}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_4', 'width':40, 'right':true, 'point':{'x':559, 'y':72}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_5', 'width':40, 'right':true, 'point':{'x':547, 'y':163}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_6', 'width':40, 'right':true, 'point':{'x':562, 'y':272}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_7', 'width':40, 'right':true, 'point':{'x':751, 'y':98}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_8', 'width':40, 'right':true, 'point':{'x':750, 'y':156}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_9', 'width':40, 'right':false, 'point':{'x':846, 'y':71}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_10', 'width':40, 'right':false, 'point':{'x':846, 'y':269}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_11', 'width':40, 'right':false, 'point':{'x':940, 'y':182}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_12', 'width':40, 'right':false, 'point':{'x':1082, 'y':90}, 'zlevel':1, 'z':4}, {'_type':'Vidicon', 'code':'Vidicon_13', 'width':40, 'right':false, 'point':{'x':1079, 'y':245}, 'zlevel':1, 'z':4}], 'iscsRectList':[{'point':{'x':25, 'y':176}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':96, 'y':176}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':167, 'y':176}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':238, 'y':176}, 'code':'IscsRect_4', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':309, 'y':149}, 'code':'IscsRect_5', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':380, 'y':124}, 'code':'IscsRect_6', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':45, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':425, 'y':134}, 'code':'IscsRect_7', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':55, 'height':30, 'zlevel':1, 'z':3}, {'point':{'x':425, 'y':164}, 'code':'IscsRect_8', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':55, 'height':30, 'zlevel':1, 'z':3}, {'point':{'x':739, 'y':149}, 'code':'IscsRect_9', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':70, 'height':60, 'zlevel':1, 'z':3}, {'point':{'x':1060, 'y':135}, 'code':'IscsRect_10', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':55, 'height':80, 'zlevel':1, 'z':3}, {'point':{'x':1115, 'y':150}, 'code':'IscsRect_11', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':55, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':1170, 'y':150}, 'code':'IscsRect_12', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':55, 'height':65, 'zlevel':1, 'z':3}, {'point':{'x':1225, 'y':135}, 'code':'IscsRect_13', '_type':'IscsRect', 'fillColor':'rgba(239, 231, 231, 0)', 'borderWidth':2, 'strokeColor':'#F7F1F1', 'width':125, 'height':80, 'zlevel':1, 'z':3}], 'vidiconCloudList':[{'_type':'VidiconCloud', 'code':'VidiconCloud_1', 'r':18, 'point':{'x':59, 'y':211}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_2', 'r':18, 'point':{'x':131, 'y':212}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_3', 'r':18, 'point':{'x':203, 'y':212}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_4', 'r':18, 'point':{'x':273, 'y':212}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_5', 'r':18, 'point':{'x':511, 'y':131}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_6', 'r':18, 'point':{'x':1010, 'y':141}, 'zlevel':1, 'z':4}, {'_type':'VidiconCloud', 'code':'VidiconCloud_7', 'r':18, 'point':{'x':1255, 'y':140}, 'zlevel':1, 'z':4}], 'iscsLineList':[{'point1':{'x':370, 'y':50}, 'point2':{'x':1075, 'y':50}, 'code':'IscsLine_1', '_type':'IscsLine', 'classify':'solid', 'lineWidth':10, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':370, 'y':50}}, {'point1':{'x':370, 'y':306}, 'point2':{'x':1075, 'y':306}, 'code':'IscsLine_2', '_type':'IscsLine', 'classify':'solid', 'lineWidth':10, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':370, 'y':306}}, {'point1':{'x':380, 'y':50}, 'point2':{'x':380, 'y':90}, 'code':'IscsLine_3', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':380, 'y':50}}, {'point1':{'x':380, 'y':90}, 'point2':{'x':395, 'y':100}, 'code':'IscsLine_4', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':380, 'y':90}}, {'point1':{'x':395, 'y':100}, 'point2':{'x':380, 'y':110}, 'code':'IscsLine_5', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':395, 'y':100}}, {'point1':{'x':380, 'y':110}, 'point2':{'x':380, 'y':245}, 'code':'IscsLine_6', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':380, 'y':110}}, {'point1':{'x':380, 'y':245}, 'point2':{'x':395, 'y':255}, 'code':'IscsLine_7', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':380, 'y':245}}, {'point1':{'x':395, 'y':255}, 'point2':{'x':380, 'y':265}, 'code':'IscsLine_8', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':395, 'y':255}}, {'point1':{'x':1060, 'y':50}, 'point2':{'x':1060, 'y':90}, 'code':'IscsLine_9', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':1060, 'y':50}}, {'point1':{'x':1060, 'y':90}, 'point2':{'x':1045, 'y':100}, 'code':'IscsLine_10', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':1060, 'y':90}}, {'point1':{'x':1045, 'y':100}, 'point2':{'x':1060, 'y':110}, 'code':'IscsLine_11', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':1045, 'y':100}}, {'point1':{'x':1060, 'y':110}, 'point2':{'x':1060, 'y':245}, 'code':'IscsLine_12', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':1060, 'y':110}}, {'point1':{'x':1060, 'y':245}, 'point2':{'x':1045, 'y':255}, 'code':'IscsLine_13', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':1060, 'y':245}}, {'point1':{'x':1045, 'y':255}, 'point2':{'x':1060, 'y':265}, 'code':'IscsLine_14', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':1045, 'y':255}}, {'point1':{'x':1060, 'y':265}, 'point2':{'x':1060, 'y':305}, 'code':'IscsLine_15', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#F7F1F1', 'zlevel':1, 'z':4, 'point':{'x':1060, 'y':265}}], 'iscsTextList':[{'point':{'x':40, 'y':187}, 'code':'IscsText_1', '_type':'IscsText', 'context':'控制室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':103, 'y':180}, 'code':'IscsText_2', '_type':'IscsText', 'context':' 35KV\n开关柜室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':173, 'y':181}, 'code':'IscsText_3', '_type':'IscsText', 'context':' 直流\n开关柜室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':252, 'y':183}, 'code':'IscsText_4', '_type':'IscsText', 'context':'0.4KV\n低压室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':388, 'y':137}, 'code':'IscsText_5', '_type':'IscsText', 'context':'排热\n风室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':439, 'y':144}, 'code':'IscsText_6', '_type':'IscsText', 'context':'男厕', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':438, 'y':175}, 'code':'IscsText_7', '_type':'IscsText', 'context':'女厕', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':758, 'y':192}, 'code':'IscsText_8', '_type':'IscsText', 'context':'电梯', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1066, 'y':150}, 'code':'IscsText_9', '_type':'IscsText', 'context':'屏蔽门\n控制室', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':166}, 'code':'IscsText_10', '_type':'IscsText', 'context':'配电间', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1235, 'y':186}, 'code':'IscsText_11', '_type':'IscsText', 'context':'商用通\n信设备', 'textFill':'#C1B38D', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':37, 'y':238}, 'code':'IscsText_12', '_type':'IscsText', 'context':'01015#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':110, 'y':238}, 'code':'IscsText_13', '_type':'IscsText', 'context':'01016#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':180, 'y':239}, 'code':'IscsText_14', '_type':'IscsText', 'context':'01017#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':251, 'y':238}, 'code':'IscsText_15', '_type':'IscsText', 'context':'01018#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':323, 'y':182}, 'code':'IscsText_16', '_type':'IscsText', 'context':'01039#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':324, 'y':118}, 'code':'IscsText_17', '_type':'IscsText', 'context':'01049#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':311, 'y':272}, 'code':'IscsText_18', '_type':'IscsText', 'context':'01050#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':488, 'y':159}, 'code':'IscsText_19', '_type':'IscsText', 'context':'01020#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':559, 'y':95}, 'code':'IscsText_20', '_type':'IscsText', 'context':'01044#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':547, 'y':187}, 'code':'IscsText_21', '_type':'IscsText', 'context':'01042#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':563, 'y':256}, 'code':'IscsText_22', '_type':'IscsText', 'context':'01043#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':752, 'y':119}, 'code':'IscsText_23', '_type':'IscsText', 'context':'01045#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':749, 'y':177}, 'code':'IscsText_24', '_type':'IscsText', 'context':'01057#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':842, 'y':93}, 'code':'IscsText_25', '_type':'IscsText', 'context':'01047#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':934, 'y':204}, 'code':'IscsText_26', '_type':'IscsText', 'context':'01046#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':839, 'y':254}, 'code':'IscsText_27', '_type':'IscsText', 'context':'01048#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':986, 'y':166}, 'code':'IscsText_28', '_type':'IscsText', 'context':'01019#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1077, 'y':111}, 'code':'IscsText_29', '_type':'IscsText', 'context':'01041#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1073, 'y':265}, 'code':'IscsText_30', '_type':'IscsText', 'context':'01040#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1232, 'y':164}, 'code':'IscsText_31', '_type':'IscsText', 'context':'01021#', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':606, 'y':152}, 'code':'IscsText_32', '_type':'IscsText', 'context':'下', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':605, 'y':189}, 'code':'IscsText_33', '_type':'IscsText', 'context':'上', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':913, 'y':153}, 'code':'IscsText_34', '_type':'IscsText', 'context':'下', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':911, 'y':191}, 'code':'IscsText_35', '_type':'IscsText', 'context':'上', 'textFill':'#F7F1F1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'staircaseList':[{'point':{'x':621, 'y':136}, 'fill':'#fff', 'isRight':false, 'rotationAngle':0, 'code':'Staircase_1', '_type':'Staircase', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':853, 'y':137}, 'fill':'#fff', 'isRight':true, 'rotationAngle':0, 'code':'Staircase_2', '_type':'Staircase', 'width':60, 'zlevel':1, 'z':4}]}, diff --git a/src/jlmap3d/edit/Jlmap3dnewdata.js b/src/jlmap3d/edit/Jlmap3dnewdata.js index 6e240ff41..a4274f5b2 100644 --- a/src/jlmap3d/edit/Jlmap3dnewdata.js +++ b/src/jlmap3d/edit/Jlmap3dnewdata.js @@ -53,6 +53,7 @@ export function Jlmap3ddata(mapid,scope){ // console.log(mapid); // console.log(data3did); getMapDetail(mapid).then(data => { + console.log(data); let mapdata = data.data; //console.log(data3did); jlmap3ddata.id = data3did; diff --git a/src/jlmap3d/edit/connect/getmodels.js b/src/jlmap3d/edit/connect/getmodels.js index 1e633d62e..2a56c5714 100644 --- a/src/jlmap3d/edit/connect/getmodels.js +++ b/src/jlmap3d/edit/connect/getmodels.js @@ -33,7 +33,9 @@ export function getmodels(data) { } assets.push(asset); } + postmap.assets = JSON.stringify(assets); + //link轨道 let links = []; for(let i=0;i { + let mapnetdata = data.data; + getPublish3dMapDetail(skinCode).then(netdata => { + let assetsdata = JSON.parse(netdata.data.sections); + if(assetsdata.link){ + scope.datatype = "old"; + scope.jsonwebwork = new Worker("../../static/workertest/jsonworker.js"); + scope.Subscribe = new Jlmap3dSubscribe(scope,routegroup,scope.jsonwebwork); + scope.Subscribe.socketon(scope.Subscribe.topic); + SimulationLoad(mapnetdata,scope,netdata.data,mapdata,camera,controls,scenesimulation,storemod); + + }else{ + scope.datatype = "new"; + scope.jsonwebworknew = new Worker("../../static/workertest/jsonworkernew.js"); + scope.Subscribe = new Jlmap3dSubscribeNew(scope,routegroup,scope.jsonwebworknew); + scope.Subscribe.socketon(scope.Subscribe.topic); + SimulationLoadNew(mapnetdata,scope,netdata.data,mapdata,camera,controls,scenesimulation,storemod); + } + + }); + }); + // + // let stats = new Stats(); + // dom.appendChild( stats.dom ); + + // var timer = setInterval(function() { + // if(trainlisttest){ + // if(trainlisttest.group){ + // if(trainlisttest.group.children[0]){ + // for(let k in rails.switchrail){ + // const ddd = storemod.getters['map/getDeviceByCode'](k); + // let switchdata = rails.switchrail[k]; + // rails.switchrail[k].locateType = ddd.locateType; + // + // if(ddd.locateType == "01"){ + // //1--向左 2--向右 + // //__\__ __/__ + // if(rails.switchrail[k].directtype == "1"){ + // rails.linkrail[switchdata.alink].lconnect = switchdata.blink; + // rails.linkrail[switchdata.blink].rconnect = switchdata.alink; + // }else if(rails.switchrail[k].directtype == "2"){ + // rails.linkrail[switchdata.alink].rconnect = switchdata.blink; + // rails.linkrail[switchdata.blink].lconnect = switchdata.alink; + // } + // + // }else if(ddd.locateType == "02"){ + // if(rails.switchrail[k].directtype == "1"){ + // rails.linkrail[switchdata.alink].lconnect = switchdata.clink; + // rails.linkrail[switchdata.clink].rconnect = switchdata.alink; + // }else if(rails.switchrail[k].directtype == "2"){ + // rails.linkrail[switchdata.alink].rconnect = switchdata.clink; + // rails.linkrail[switchdata.clink].lconnect = switchdata.alink; + // } + // } + // } + // clearInterval(timer); + // } + // } + // } + // + // }, 2000); + //开启渲染 + animate(); + startWorker(scope.webwork); + //动画时间 + let delta; + //循环渲染函数 + function animate() { + //循环渲染 + //requestAnimationFrame(animate); + //renderer.setAnimationLoop(animate); + requestAnimationFrame(animate); + //判断渲染是否开启 + //根据相机渲染场景 + renderer.render(scene,camera); + //检测动画构造器播放动画 + + // } + // stats.update(); + } + + function startWorker(webwork){ + if(typeof(Worker)!=="undefined"){ + + scope.webwork.onmessage = function (event) { + //更新列车位置 + // if(scope.datatype == "new"){ + // + // UpdateTrainNew(camera,trainlisttest); + // }else{ + // UpdateTrain(camera,trainlisttest); + // } + + if(camerarail.moveswitch == true){ + // console.log(camerarail.progress); + if(camerarail.progress>=0.99){ + camerarail.moveswitch = false; + camerarail.curve = null; + }else{ + let point = camerarail.curve.getPointAt(camerarail.progress); + let tangent = camerarail.curve.getPointAt(camerarail.progress+0.001); + camera.position.x = point.x; + camera.position.y = point.y; + camera.position.z = point.z; + camerarail.progress += 0.003; + // controls.target = new THREE.Vector3(point.x+1,point.y,point.z); + controls.target = new THREE.Vector3(tangent.x,tangent.y,tangent.z); + controls.update(); + point = null; + } + + } + + delta = clock.getDelta(); + for(let i=scope.mixers.length-1;i>=0;i--){ + if(scope.mixers[i]._actions[0].isRunning()){ + // console.log(scope.mixers[i]._actions[0].isRunning()); + scope.mixers[i].update( delta ); + } + } + }; + } + + } + + this.dispose = function(){ + renderer.setAnimationLoop(null); + renderer.dispose(); + scene.dispose(); + controls.dispose(); + camera = null; + scope.assetloader = null; + + mapdata = null; + scope.selectmodel = null; + + scope.materiallist = null; + scope.selectmodel = null; + scope.helpbox = null; + scope.mixers = null; + scope.actions = null; + scope.Subscribe = null; + //console.log(scope); + //scope = null; + } + + this.rayswitch = function(value){ + this.raycasterswitch = value; + if(scope.helpbox){ + scene.remove( scope.helpbox ); + scope.helpbox = null; + } + }; + + this.showstationmsg = function(showtype){ + if(showtype == "show"){ + for(let st=0;st + @@ -21,6 +22,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import {menuOperate, commitOperate} from './utils/menuOperate'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'SectionMenu', @@ -29,7 +31,8 @@ export default { SectionControl, SpeedLimitControl, AlxeEffective, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -72,11 +75,16 @@ export default { ] }, menuForce: [ - // { - // label: '设置计轴失效', - // handler: this.alxeFailure - // // disabledCallback: MenuDisabledState.Section.alxeFailure - // } + { + label: '设置故障', + handler: this.setStoppage, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + { + label: '取消故障', + handler: this.cancelStoppage, + cmdType: CMD.Fault.CMD_CANCEL_FAULT + } ] }; }, @@ -234,6 +242,22 @@ export default { this.$refs.speedLimitControl.doShow(operate, this.selected); } }); + }, + // 设置故障 + setStoppage() { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); + } + }); + }, + // 取消故障 + cancelStoppage() { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); + } + }); } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue index d61298593..6c533599b 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue @@ -7,6 +7,7 @@ + @@ -26,6 +27,7 @@ import { DeviceMenu } from '@/scripts/ConstDic'; import { mouseCancelState } from './utils/menuItemStatus'; import PasswordBox from './dialog/childDialog/passwordInputBox.vue'; import {menuOperate, commitOperate} from './utils/menuOperate'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'SignalMenu', @@ -36,7 +38,8 @@ export default { RouteHandControl, RouteDetail, NoticeInfo, - PasswordBox + PasswordBox, + SetFault }, props: { selected: { @@ -91,21 +94,16 @@ export default { ] }, menuForce: [ - { - label: '信号关灯', - handler: this.signalClose, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL - }, - { - label: '设置故障', - handler: this.setStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT - }, - { - label: '取消故障', - handler: this.cancelStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT - } + { + label: '设置故障', + handler: this.setStoppage, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + { + label: '取消故障', + handler: this.cancelStoppage, + cmdType: CMD.Fault.CMD_CANCEL_FAULT + } ] }; }, @@ -284,50 +282,18 @@ export default { }, // 设置故障 setStoppage() { - const operate = { - start: true, - over: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.stoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT, - param: { - signalCode: `${this.selected.code}` - } - - }; - mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 取消故障 cancelStoppage() { - const operate = { - start: true, - over: true, - code: this.selected.code, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT, - operation: OperationEvent.Signal.cancelStoppage.menu.operation, - param: { - signalCode: `${this.selected.code}` - } - }; - - mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 设置进路 diff --git a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue index 3df18261c..e5087be1f 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue @@ -8,6 +8,7 @@ + @@ -28,6 +29,7 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { mouseCancelState } from './utils/menuItemStatus'; import {menuOperate, commitOperate} from './utils/menuOperate'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'StationStandMenu', @@ -39,7 +41,8 @@ export default { StandRunLevel, NoticeInfo, StandBackStrategy, - StandStopTime + StandStopTime, + SetFault }, props: { selected: { @@ -197,48 +200,18 @@ export default { }, // 设置故障 setStoppage() { - const operate = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.stoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_ADD_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - - mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 取消故障 cancelStoppage() { - const operate = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.cancelStoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - - mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 现地设置扣车 diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue index d9d87027e..fa303a19d 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue @@ -6,6 +6,7 @@ + @@ -22,8 +23,8 @@ import {DeviceMenu } from '@/scripts/ConstDic'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; -import { mouseCancelState } from './utils/menuItemStatus'; import {menuOperate, commitOperate} from './utils/menuOperate'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'SwitchMenu', @@ -33,7 +34,8 @@ export default { SwitchControl, SpeedLimitControl, AlxeEffective, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -89,16 +91,25 @@ export default { { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Switch.CMD_SWITCH_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Switch.CMD_SWITCH_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; }, + computed: { + ...mapGetters('training', [ + 'mode', + 'operatemode' + ]), + ...mapGetters('menuOperation', [ + 'buttonOperation' + ]) + }, watch: { '$store.state.menuOperation.menuCount': function (val) { if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) { @@ -113,15 +124,6 @@ export default { } } }, - computed: { - ...mapGetters('training', [ - 'mode', - 'operatemode' - ]), - ...mapGetters('menuOperation', [ - 'buttonOperation' - ]) - }, methods: { clickEvent() { const self = this; @@ -192,48 +194,18 @@ export default { }, // 设置故障 setStoppage() { - const operate = { - start: true, - code: this.selected.code, - operation: OperationEvent.Switch.stoppage.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_ADD_FAULT, - param: { - switchCode: `${this.selected.code}` - } - }; - - mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 取消故障 cancelStoppage() { - const operate = { - start: true, - code: this.selected.code, - operation: OperationEvent.Switch.cancelStoppage.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_REMOVE_FAULT, - param: { - switchCode: `${this.selected.code}` - } - }; - - mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 道岔单锁 diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue index 4a067f5d2..96ca967de 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue @@ -73,7 +73,7 @@ - 确认 + 确认 取消 帮助 diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue index 86cc82035..9a18253a0 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/playBack.vue @@ -63,7 +63,7 @@ - 确定 + 确定 取消 帮助 diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue index 6f61b5d27..40fbc395a 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue @@ -56,7 +56,7 @@ - 确定 + 确定 取消 帮助 diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue index 5afea1f63..a4f9e7f2d 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue @@ -28,7 +28,7 @@ - 确定 + 确定 取消 帮助 diff --git a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue index f8bd7d56e..27134db34 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue @@ -43,6 +43,8 @@ export default { return { unfold: true, tempData: [], + commitDisabled: false, + loading: false, tableStyle: { 'border-bottom': 'none', 'border-right': 'none' diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue index 0873e9e97..7853e271d 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue @@ -5,6 +5,7 @@ + @@ -19,6 +20,8 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SectionMenu', @@ -27,7 +30,8 @@ export default { NoticeInfo, SpeedLimitControl, SectionControl, - SectionCmdControl + SectionCmdControl, + SetFault }, props: { selected: { @@ -63,24 +67,14 @@ export default { }, menuForce: [ { - label: '设置计轴失效', - handler: this.alxeFailure, - cmdType:'' - }, - { - label: this.$t('menu.menuSection.setFault'), + label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { - label: this.$t('menu.menuSection.cancelFault'), + label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT - }, - { - label: '创建速度限制', - handler: this.setSpeed, - cmdType: CMD.Section.CMD_SWITCH_SET_LIMIT_SPEED + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -152,49 +146,20 @@ export default { this.$refs.noticeInfo.doShow(step); }); }, - // 设置故障 setStoppage() { - const step = { - start: true, - over:true, - code: `${this.selected.code}`, - operation: OperationEvent.Section.stoppage.menu.operation, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT, - param: { - sectionCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - over:true, - code: `${this.selected.code}`, - operation: OperationEvent.Section.cancelStoppage.menu.operation, - cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT, - param: { - sectionCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 设置速度 diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue index 6c70337c7..0e623ebb7 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue @@ -3,6 +3,7 @@ + @@ -15,13 +16,16 @@ 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 SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SignalMenu', components: { PopMenu, NoticeInfo, - CreateDeviceLabel + CreateDeviceLabel, + SetFault }, props: { selected: { @@ -166,20 +170,15 @@ export default { ] }, menuForce: [ - { - label: '信号关灯', - handler: this.signalClose, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL - }, { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -259,48 +258,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - over:true, - code: `${this.selected.code}`, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT, - operation: OperationEvent.Signal.stoppage.menu.operation, - param: { - signalCode: `${this.selected.code}` - } - }; - - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - over:true, - code: `${this.selected.code}`, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT, - operation: OperationEvent.Signal.cancelStoppage.menu.operation, - param: { - signalCode: `${this.selected.code}` - } - }; - - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 设置进路 diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue index 14ad975ad..0522b8bad 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue @@ -3,6 +3,7 @@ + @@ -15,13 +16,16 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { OperateMode } from '@/scripts/ConstDic'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'StationStandMenu', components: { PopMenu, NoticeInfo, - PlatformDwell + PlatformDwell, + SetFault }, props: { selected: { @@ -137,47 +141,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - over:true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.stoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_ADD_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - over:true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.cancelStoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 设置跳停 diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue index d7daad700..b74d34dc1 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue @@ -4,6 +4,7 @@ + @@ -18,6 +19,8 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SwitchMenu', @@ -25,7 +28,8 @@ export default { PopMenu, NoticeInfo, CreateDeviceLabel, - SwitchControl + SwitchControl, + SetFault }, mixins: [ CancelMouseState @@ -118,12 +122,12 @@ export default { { label: '设置故障', handler: this.setStoppage, - cmdType:CMD.Switch.CMD_SWITCH_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType:CMD.Switch.CMD_SWITCH_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -177,48 +181,18 @@ export default { }, // 设置故障 setStoppage() { - const operate = { - start: true, - over:true, - operation: OperationEvent.Switch.stoppage.menu.operation, - cmdType: CMD.Switch.CMD_STOPPAGE, - param: { - switchCode: this.selected.code - } - }; - - // mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 取消故障 cancelStoppage() { - const operate = { - start: true, - over:true, - operation: OperationEvent.Switch.cancelStoppage.menu.operation, - cmdType: CMD.Switch.CMD_CANCEL_STOPPAGE, - param: { - switchCode: this.selected.code - } - }; - - // mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 道岔单锁 diff --git a/src/jmapNew/theme/chengdu_01/menus/utils/menuOperate.js b/src/jmapNew/theme/chengdu_01/menus/utils/menuOperate.js new file mode 100644 index 000000000..85d6fd6f6 --- /dev/null +++ b/src/jmapNew/theme/chengdu_01/menus/utils/menuOperate.js @@ -0,0 +1,257 @@ +import store from '@/store/index_APP_TARGET'; +import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; + +// 操作 +export const menuOperate = { + Section:{ + alxeFailure:{ + // 设置计轴失效 + operation: OperationEvent.Section.alxeFailure.menu.operation, + // cmdType 值有问题 + cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + }, + active:{ + // 区段激活 + operation: OperationEvent.Section.active.menu.operation, + cmdType: CMD.Section.CMD_SECTION_ACTIVE + }, + split:{ + // 区段切除 + operation: OperationEvent.Section.split.menu.operation, + cmdType: CMD.Section.CMD_SECTION_CUT_OFF + }, + setSpeed:{ + // 设置速度 + operation: OperationEvent.Section.setSpeed.menu.operation, + cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED + }, + fault:{ + // 区段故障解锁 + operation: OperationEvent.Section.fault.menu.operation, + cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK + } + }, + Signal:{ + arrangementRoute:{ + // 排列进路 + operation: OperationEvent.Signal.arrangementRoute.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE + }, + cancelTrainRoute:{ + // 取消进路 + operation: OperationEvent.Signal.cancelTrainRoute.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE + }, + lock:{ + // 信号封锁 + operation:OperationEvent.Signal.lock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_BLOCK + }, + unlock:{ + // 信号解封 + operation: OperationEvent.Signal.unlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK + }, + guide:{ + // 进路引导 + operation: OperationEvent.Signal.guide.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE + }, + reopenSignal:{ + // 信号重开 + operation: OperationEvent.Signal.reopenSignal.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL + }, + signalClose:{ + // 信号关灯 + operation: OperationEvent.Signal.signalClose.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL + }, + humanControl:{ + // 进路交人工控 + operation: OperationEvent.Signal.humanControl.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING + }, + atsAutoControl:{ + // 进路交自动控 + operation: OperationEvent.Signal.atsAutoControl.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + }, + setAutoInterlock:{ + // 设置通过模式 + operation: OperationEvent.Signal.setAutoInterlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO + }, + cancelAutoInterlock:{ + // 取消通过模式 + operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO + }, + detail:{ + // 查询进路状态 + operation: OperationEvent.Signal.detail.menu.operation + }, + cancelGuide:{ + // 人工解锁进路（信号机取消引导） + operation: OperationEvent.Signal.cancelGuide.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE + }, + setAutoTurnBack:{ + // 设置自动折返 + operation: OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK + }, + cancelAutoTurnBack:{ + // 取消自动折返 + operation: OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK + } + }, + Switch:{ + lock:{ + // 道岔单锁 + operation: OperationEvent.Switch.lock.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK + }, + unlock:{ + // 道岔解锁 + operation: OperationEvent.Switch.unlock.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK + }, + block:{ + // 道岔封锁 + operation: OperationEvent.Switch.block.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_BLOCK + }, + unblock:{ + // 道岔解封 + operation: OperationEvent.Switch.unblock.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK + }, + locate:{ + // 单操到定位 + operation: OperationEvent.Switch.locate.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION + }, + reverse:{ + // 单操到反位 + operation: OperationEvent.Switch.reverse.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION + }, + setSpeed:{ + // 设置临时限速 + operation: OperationEvent.Switch.setSpeed.menu.operation, + cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED + }, + turnoutForce: { + // 道岔强制扳动 + operation: OperationEvent.Switch.turnoutForce.menu.operation, + cmdType:CMD.Switch.CMD_SWITCH_FORCE_TURN + } + }, + StationStand:{ + setDetainTrain:{ + // 设置扣车 + operation: OperationEvent.StationStand.setDetainTrain.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN + }, + cancelDetainTrain:{ + // 取消扣车 + operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation, + cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN + }, + cancelDetainTrainAll:{ + // 全线取消扣车 + operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation, + cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN + }, + setJumpStop:{ + // 设置跳停 + operation: OperationEvent.StationStand.setJumpStop.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP + }, + cancelJumpStop:{ + // 取消跳停 + operation: OperationEvent.StationStand.cancelJumpStop.menu.operation, + cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP + }, + setStopTime:{ + // 停站时间控制 + operation: OperationEvent.StationStand.setStopTime.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME + }, + setRunLevel:{ + // 运行时间控制 + operation: OperationEvent.StationStand.setRunLevel.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME + }, + earlyDeparture:{ + // 设置提前发车 + operation: OperationEvent.StationStand.earlyDeparture.menu.operation, + cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART + }, + detail:{ + // 查询站台状态 + operation: OperationEvent.StationStand.detail.menu.operation + } + }, + StationControl:{ + // requestCentralControl:{ + // // 请求中控（遥控） + // operation: OperationEvent.StationControl.requestCentralControl.menu.operation, + // cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL + // }, + // requestStationControl:{ + // // 请求站控 + // operation: OperationEvent.StationControl.requestStationControl.menu.operation, + // cmdType:CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL + // }, + // emergencyStationControl:{ + // // 紧急站控 + // operation: OperationEvent.StationControl.emergencyStationControl.menu.operation, + // cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL + // } + }, + Common: { + setFault: { + operation: OperationEvent.Section.stoppage.menu.operation, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + cancelFault: { + operation: OperationEvent.Section.cancelStoppage.menu.operation, + cmdType: CMD.Fault.CMD_CANCEL_FAULT + } + } +}; + +export function commitOperate(operate, paramList, over) { + const step = { + start: true, + operation: operate.operation, + param:{} + }; + step.param = paramList; + // over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作 + if (over == 0 || over == 3) { + const codeList = Object.values(paramList); + step.code = codeList[0]; + } + if (over != 0 && over != 3) { + delete step.start; + } + if (over == 2 || over == 3) { + step.over = true; + step.cmdType = operate.cmdType; + } + return new Promise(function(resolve, reject) { + store.dispatch('training/nextNew', step).then(({ valid }) => { + if (valid) { + store.dispatch('menuOperation/handleBreakFlag', { break: true }); + } + resolve({ valid: valid, operate: step }); + }).catch(error=>{ + reject(error); + }); + }); +} diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue index 3427384e8..9d6056367 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue @@ -5,6 +5,7 @@ + @@ -19,6 +20,8 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SectionMenu', @@ -27,7 +30,8 @@ export default { SectionControl, SectionDetail, TrainCreate, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -43,10 +47,10 @@ export default { menuNormal: { Local: [ { - label: '区故解', - handler: this.fault, + label: '区故解', + handler: this.fault, cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, - auth: { station: true, center: false } + auth: { station: true, center: false } } ], Center: [ @@ -66,19 +70,14 @@ export default { }, menuForce: [ { - label: '设置计轴失效', - handler: this.alxeFailure, - cmdType:'' - }, - { - label: this.$t('menu.menuSection.setFault'), + label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { - label: this.$t('menu.menuSection.cancelFault'), + label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -186,44 +185,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Section.stoppage.menu.operation, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT, - param: { - sectionCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Section.cancelStoppage.menu.operation, - cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT, - param: { - sectionCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, undeveloped() { diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue index 9e5ff2028..9501c8ced 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue @@ -8,6 +8,7 @@ + @@ -25,6 +26,8 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import PasswordBox from './dialog/childDialog/passwordInputBox'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SignalMenu', @@ -36,7 +39,8 @@ export default { RouteDetail, RouteGuide, NoticeInfo, - PasswordBox + PasswordBox, + SetFault }, props: { selected: { @@ -141,20 +145,15 @@ export default { ] }, menuForce: [ - { - label: '信号关灯', - handler: this.signalClose, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL - }, { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -232,46 +231,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT, - operation: OperationEvent.Signal.stoppage.menu.operation, - param: { - signalCode: `${this.selected.code}` - } - }; - - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT, - operation: OperationEvent.Signal.cancelStoppage.menu.operation, - param: { - signalCode: `${this.selected.code}` - } - }; - - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 设置进路 diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue index 2fb3d6036..d1d1307dc 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue @@ -4,6 +4,7 @@ + @@ -17,6 +18,8 @@ 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 SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'StationStandMenu', @@ -24,7 +27,8 @@ export default { PopMenu, StandControl, StandDetail, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -151,45 +155,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.stoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_ADD_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch((error) => { - this.$refs.noticeInfo.doShow(step, [error.message]); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.cancelStoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch((error) => { - this.$refs.noticeInfo.doShow(step, [error.message]); }); }, // 设置扣车 diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue index e4c842f0d..4abe91ca7 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue @@ -4,6 +4,7 @@ + @@ -18,6 +19,8 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; 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', @@ -25,7 +28,8 @@ export default { PopMenu, SectionControl, SwitchControl, - NoticeInfo + NoticeInfo, + SetFault }, mixins: [ CancelMouseState @@ -91,12 +95,12 @@ export default { { label: '设置故障', handler: this.setStoppage, - cmdType:CMD.Switch.CMD_SWITCH_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType:CMD.Switch.CMD_SWITCH_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -150,46 +154,18 @@ export default { }, // 设置故障 setStoppage() { - const operate = { - start: true, - operation: OperationEvent.Switch.stoppage.menu.operation, - cmdType: CMD.Switch.CMD_STOPPAGE, - param: { - switchCode: this.selected.code - } - }; - - // mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 取消故障 cancelStoppage() { - const operate = { - start: true, - operation: OperationEvent.Switch.cancelStoppage.menu.operation, - cmdType: CMD.Switch.CMD_CANCEL_STOPPAGE, - param: { - switchCode: this.selected.code - } - }; - - // mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 道岔单锁 diff --git a/src/jmapNew/theme/chengdu_03/menus/utils/menuOperate.js b/src/jmapNew/theme/chengdu_03/menus/utils/menuOperate.js new file mode 100644 index 000000000..85d6fd6f6 --- /dev/null +++ b/src/jmapNew/theme/chengdu_03/menus/utils/menuOperate.js @@ -0,0 +1,257 @@ +import store from '@/store/index_APP_TARGET'; +import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; + +// 操作 +export const menuOperate = { + Section:{ + alxeFailure:{ + // 设置计轴失效 + operation: OperationEvent.Section.alxeFailure.menu.operation, + // cmdType 值有问题 + cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + }, + active:{ + // 区段激活 + operation: OperationEvent.Section.active.menu.operation, + cmdType: CMD.Section.CMD_SECTION_ACTIVE + }, + split:{ + // 区段切除 + operation: OperationEvent.Section.split.menu.operation, + cmdType: CMD.Section.CMD_SECTION_CUT_OFF + }, + setSpeed:{ + // 设置速度 + operation: OperationEvent.Section.setSpeed.menu.operation, + cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED + }, + fault:{ + // 区段故障解锁 + operation: OperationEvent.Section.fault.menu.operation, + cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK + } + }, + Signal:{ + arrangementRoute:{ + // 排列进路 + operation: OperationEvent.Signal.arrangementRoute.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE + }, + cancelTrainRoute:{ + // 取消进路 + operation: OperationEvent.Signal.cancelTrainRoute.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE + }, + lock:{ + // 信号封锁 + operation:OperationEvent.Signal.lock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_BLOCK + }, + unlock:{ + // 信号解封 + operation: OperationEvent.Signal.unlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK + }, + guide:{ + // 进路引导 + operation: OperationEvent.Signal.guide.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE + }, + reopenSignal:{ + // 信号重开 + operation: OperationEvent.Signal.reopenSignal.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL + }, + signalClose:{ + // 信号关灯 + operation: OperationEvent.Signal.signalClose.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL + }, + humanControl:{ + // 进路交人工控 + operation: OperationEvent.Signal.humanControl.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING + }, + atsAutoControl:{ + // 进路交自动控 + operation: OperationEvent.Signal.atsAutoControl.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + }, + setAutoInterlock:{ + // 设置通过模式 + operation: OperationEvent.Signal.setAutoInterlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO + }, + cancelAutoInterlock:{ + // 取消通过模式 + operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO + }, + detail:{ + // 查询进路状态 + operation: OperationEvent.Signal.detail.menu.operation + }, + cancelGuide:{ + // 人工解锁进路（信号机取消引导） + operation: OperationEvent.Signal.cancelGuide.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE + }, + setAutoTurnBack:{ + // 设置自动折返 + operation: OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK + }, + cancelAutoTurnBack:{ + // 取消自动折返 + operation: OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK + } + }, + Switch:{ + lock:{ + // 道岔单锁 + operation: OperationEvent.Switch.lock.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK + }, + unlock:{ + // 道岔解锁 + operation: OperationEvent.Switch.unlock.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK + }, + block:{ + // 道岔封锁 + operation: OperationEvent.Switch.block.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_BLOCK + }, + unblock:{ + // 道岔解封 + operation: OperationEvent.Switch.unblock.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK + }, + locate:{ + // 单操到定位 + operation: OperationEvent.Switch.locate.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION + }, + reverse:{ + // 单操到反位 + operation: OperationEvent.Switch.reverse.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION + }, + setSpeed:{ + // 设置临时限速 + operation: OperationEvent.Switch.setSpeed.menu.operation, + cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED + }, + turnoutForce: { + // 道岔强制扳动 + operation: OperationEvent.Switch.turnoutForce.menu.operation, + cmdType:CMD.Switch.CMD_SWITCH_FORCE_TURN + } + }, + StationStand:{ + setDetainTrain:{ + // 设置扣车 + operation: OperationEvent.StationStand.setDetainTrain.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN + }, + cancelDetainTrain:{ + // 取消扣车 + operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation, + cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN + }, + cancelDetainTrainAll:{ + // 全线取消扣车 + operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation, + cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN + }, + setJumpStop:{ + // 设置跳停 + operation: OperationEvent.StationStand.setJumpStop.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP + }, + cancelJumpStop:{ + // 取消跳停 + operation: OperationEvent.StationStand.cancelJumpStop.menu.operation, + cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP + }, + setStopTime:{ + // 停站时间控制 + operation: OperationEvent.StationStand.setStopTime.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME + }, + setRunLevel:{ + // 运行时间控制 + operation: OperationEvent.StationStand.setRunLevel.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME + }, + earlyDeparture:{ + // 设置提前发车 + operation: OperationEvent.StationStand.earlyDeparture.menu.operation, + cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART + }, + detail:{ + // 查询站台状态 + operation: OperationEvent.StationStand.detail.menu.operation + } + }, + StationControl:{ + // requestCentralControl:{ + // // 请求中控（遥控） + // operation: OperationEvent.StationControl.requestCentralControl.menu.operation, + // cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL + // }, + // requestStationControl:{ + // // 请求站控 + // operation: OperationEvent.StationControl.requestStationControl.menu.operation, + // cmdType:CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL + // }, + // emergencyStationControl:{ + // // 紧急站控 + // operation: OperationEvent.StationControl.emergencyStationControl.menu.operation, + // cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL + // } + }, + Common: { + setFault: { + operation: OperationEvent.Section.stoppage.menu.operation, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + cancelFault: { + operation: OperationEvent.Section.cancelStoppage.menu.operation, + cmdType: CMD.Fault.CMD_CANCEL_FAULT + } + } +}; + +export function commitOperate(operate, paramList, over) { + const step = { + start: true, + operation: operate.operation, + param:{} + }; + step.param = paramList; + // over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作 + if (over == 0 || over == 3) { + const codeList = Object.values(paramList); + step.code = codeList[0]; + } + if (over != 0 && over != 3) { + delete step.start; + } + if (over == 2 || over == 3) { + step.over = true; + step.cmdType = operate.cmdType; + } + return new Promise(function(resolve, reject) { + store.dispatch('training/nextNew', step).then(({ valid }) => { + if (valid) { + store.dispatch('menuOperation/handleBreakFlag', { break: true }); + } + resolve({ valid: valid, operate: step }); + }).catch(error=>{ + reject(error); + }); + }); +} diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue index 9982b12aa..5af573bcf 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue @@ -5,6 +5,7 @@ + @@ -19,6 +20,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; 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: 'SectionMenu', @@ -27,7 +29,8 @@ export default { SectionControl, SectionUnLock, SpeedLimitControl, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -78,9 +81,14 @@ export default { }, menuForce: [ { - label: '设置计轴失效', // 设置区段故障 - handler: this.alxeFailure, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + label: '设置故障', + handler: this.setStoppage, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + { + label: '取消故障', + handler: this.cancelStoppage, + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -130,11 +138,20 @@ export default { this.$refs.popMenu.close(); } }, - // 设置计轴失效 - alxeFailure() { - commitOperate(menuOperate.Section.alxeFailure, {sectionCode:this.selected.code}, 3).then(({valid, operate})=>{ - }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + // 设置故障 + setStoppage() { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); + } + }); + }, + // 取消故障 + cancelStoppage() { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); + } }); }, // 故障解锁 diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue index 830957023..4ce8a70fc 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue @@ -9,6 +9,7 @@ + @@ -22,6 +23,7 @@ import RouteHandControl from './dialog/routeHandControl'; import RouterCommand from './dialog/routerCommand'; import RouteDetail from './dialog/routeDetail'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; @@ -41,7 +43,8 @@ export default { RouteHandControl, RouteDetail, RouterCommand, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -144,20 +147,15 @@ export default { ] }, menuForce: [ - { - label: '信号关灯', - handler: this.signalClose, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL - }, { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -220,46 +218,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.stoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT, - param: { - signalCode: `${this.selected.code}` - } - }; - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.cancelStoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT, - param: { - signalCode: `${this.selected.code}` - } - }; - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, operationHandler(buttonOperation, selectType) { diff --git a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue index ece399380..566388699 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue @@ -9,6 +9,7 @@ + @@ -28,6 +29,7 @@ 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', @@ -40,7 +42,8 @@ export default { NoticeInfo, StandBackStrategy, StandStopTime, - StandDetainTrainAll + StandDetainTrainAll, + SetFault }, props: { selected: { @@ -194,44 +197,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.stoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_ADD_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - over: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.cancelStoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 设置扣车 diff --git a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue index dc2b1669a..d21fcadbb 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue @@ -5,6 +5,7 @@ + @@ -20,6 +21,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'SwitchMenu', @@ -28,7 +30,8 @@ export default { SwitchControl, SwitchUnLock, SpeedLimitControl, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -81,12 +84,12 @@ export default { { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Switch.CMD_SWITCH_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Switch.CMD_SWITCH_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -143,46 +146,18 @@ export default { }, // 设置故障 setStoppage() { - const operate = { - start: true, - code: this.selected.code, - operation: OperationEvent.Switch.stoppage.menu.operation, - param: { - switchCode: this.selected.code - } - }; - - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 取消故障 cancelStoppage() { - const operate = { - start: true, - code: this.selected.code, - operation: OperationEvent.Switch.cancelStoppage.menu.operation, - param: { - switchCode: this.selected.code - } - }; - - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, operationHandler(buttonOperation, selectType) { diff --git a/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js b/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js index abaeb2ea0..85d6fd6f6 100644 --- a/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js +++ b/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js @@ -212,6 +212,16 @@ export const menuOperate = { // operation: OperationEvent.StationControl.emergencyStationControl.menu.operation, // cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL // } + }, + Common: { + setFault: { + operation: OperationEvent.Section.stoppage.menu.operation, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + cancelFault: { + operation: OperationEvent.Section.cancelStoppage.menu.operation, + cmdType: CMD.Fault.CMD_CANCEL_FAULT + } } }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue index 885bda462..c9eadaeda 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue @@ -5,6 +5,7 @@ + @@ -20,6 +21,8 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SectionMenu', @@ -28,7 +31,8 @@ export default { SectionControl, SectionCmdControl, SpeedCmdControl, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -127,12 +131,12 @@ export default { { label: this.$t('menu.menuSection.setFault'), handler: this.setStoppage, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: this.$t('menu.menuSection.cancelFault'), handler: this.cancelStoppage, - cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -185,45 +189,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Section.stoppage.menu.operation, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT, - param: { - Section_Code: `${this.selected.code}` - } - }; - - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Section.cancelStoppage.menu.operation, - cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT, - param: { - Section_Code: `${this.selected.code}` - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 故障解锁 diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue index 958cd69f1..bfd31336c 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue @@ -8,6 +8,7 @@ + @@ -26,6 +27,8 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import { querySignalStatus } from '@/api/simulation'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SignalMenu', @@ -37,7 +40,8 @@ export default { RouteCmdControl, RouteHandControl, RouteDetail, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -155,12 +159,12 @@ export default { { label: this.$t('menu.menuSignal.setFault'), handler: this.setStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: this.$t('menu.menuSignal.cancelFault'), handler: this.cancelStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -214,44 +218,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.stoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT, - param: { - Signal_Code: `${this.selected.code}` - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.cancelStoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT, - param: { - Signal_Code: `${this.selected.code}` - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 排列进路 diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue index 0efa0bfed..e4f0cd4db 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue @@ -89,12 +89,12 @@ export default { { label: this.$t('menu.menuStation.setStoppage'), handler: this.setStoppage, - cmdType: CMD.Station.CMD_STATION_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: this.$t('menu.menuStation.cancelStoppage'), handler: this.cancelStoppage, - cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue index f96f1ebd0..dccd12408 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue @@ -8,6 +8,7 @@ + @@ -26,6 +27,8 @@ 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 SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'StationStandMenu', @@ -37,7 +40,8 @@ export default { NoticeInfo, StandBackStrategy, StandStopTime, - StandDetainTrainAll + StandDetainTrainAll, + SetFault }, props: { selected: { @@ -219,44 +223,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.stoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_ADD_FAULT, - param: { - StationStand_Code: `${this.selected.code}` - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.cancelStoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT, - param: { - StationStand_Code: `${this.selected.code}` - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 设置扣车 diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue index 2ae658968..d805cad83 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue @@ -5,6 +5,7 @@ + @@ -19,6 +20,8 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SwitchMenu', @@ -27,7 +30,8 @@ export default { SwitchControl, SwitchCmdControl, SpeedCmdControl, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -174,18 +178,12 @@ export default { { label: this.$t('menu.menuSwitch.setFault'), handler: this.setStoppage, - auth: { - - }, - cmdType:CMD.Switch.CMD_SWITCH_ADD_FAULT + cmdType:CMD.Fault.CMD_SET_FAULT }, { label: this.$t('menu.menuSwitch.cancelFault'), handler: this.cancelStoppage, - auth: { - - }, - cmdType:CMD.Switch.CMD_SWITCH_REMOVE_FAULT + cmdType:CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -244,42 +242,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - operation: OperationEvent.Switch.stoppage.menu.operation, - cmdType: CMD.Switch.CMD_STOPPAGE, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - operation: OperationEvent.Switch.cancelStoppage.menu.operation, - cmdType: CMD.Switch.CMD_CANCEL_STOPPAGE, - param: { - Switch_Code: this.selected.code - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 道岔单锁 diff --git a/src/jmapNew/theme/fuzhou_01/menus/utils/menuOperate.js b/src/jmapNew/theme/fuzhou_01/menus/utils/menuOperate.js new file mode 100644 index 000000000..09a216171 --- /dev/null +++ b/src/jmapNew/theme/fuzhou_01/menus/utils/menuOperate.js @@ -0,0 +1,308 @@ +import store from '@/store/index_APP_TARGET'; +import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; + +// 操作 +export const menuOperate = { + Section:{ + alxeFailure:{ + // 设置计轴失效 + operation: OperationEvent.Section.alxeFailure.menu.operation, + // cmdType 值有问题 + cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + }, + active:{ + // 区段激活 + operation: OperationEvent.Section.active.menu.operation, + cmdType: CMD.Section.CMD_SECTION_ACTIVE + }, + alxeEffective:{ + // 确认计轴有效 + operation: OperationEvent.Section.alxeEffective.menu.operation, + cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE + }, + split:{ + // 区段切除 + operation: OperationEvent.Section.split.menu.operation, + cmdType: CMD.Section.CMD_SECTION_CUT_OFF + }, + lock:{ + // 区段封锁 + operation: OperationEvent.Section.lock.menu.operation, + cmdType: CMD.Section.CMD_SECTION_BLOCK + }, + unlock:{ + // 区段解锁 + operation: OperationEvent.Section.unlock.menu.operation, + cmdType: CMD.Section.CMD_SECTION_UNBLOCK + }, + setSpeed:{ + // 设置速度 + operation: OperationEvent.Section.setSpeed.menu.operation, + cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED + }, + fault:{ + // 区段故障解锁 + operation: OperationEvent.Section.fault.menu.operation, + cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK + }, + setFault: { + operation: OperationEvent.Section.stoppage.menu.operation, + cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + } + }, + Signal:{ + arrangementRoute:{ + // 排列进路 + operation: OperationEvent.Signal.arrangementRoute.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE + }, + cancelTrainRoute:{ + // 取消进路 + operation: OperationEvent.Signal.cancelTrainRoute.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE + }, + lock:{ + // 信号封锁 + operation:OperationEvent.Signal.lock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_BLOCK + }, + unlock:{ + // 信号解封 + operation: OperationEvent.Signal.unlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK + }, + guide:{ + // 进路引导 + operation: OperationEvent.Signal.guide.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE + }, + reopenSignal:{ + // 信号重开 + operation: OperationEvent.Signal.reopenSignal.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL + }, + signalClose:{ + // 信号关灯 + operation: OperationEvent.Signal.signalClose.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL + }, + humanControl:{ + // 进路交人工控 + operation: OperationEvent.Signal.humanControl.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING + }, + atsAutoControl:{ + // 进路交自动控 + operation: OperationEvent.Signal.atsAutoControl.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + }, + setAutoInterlock:{ + // 设置通过模式 + operation: OperationEvent.Signal.setAutoInterlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO + }, + cancelAutoInterlock:{ + // 取消通过模式 + operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO + }, + detail:{ + // 查询进路状态 + operation: OperationEvent.Signal.detail.menu.operation + }, + cancelGuide:{ + // 人工解锁进路（信号机取消引导） + operation: OperationEvent.Signal.cancelGuide.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE + }, + setAutoTurnBack:{ + // 设置自动折返 + operation: OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK + }, + cancelAutoTurnBack:{ + // 取消自动折返 + operation: OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK + } + }, + Switch:{ + lock:{ + // 道岔单锁(联锁) + operation: OperationEvent.Switch.lock.menu.operation, + // cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK_CHAIN + }, + unlock:{ + // 道岔解锁(联锁) + operation: OperationEvent.Switch.unlock.menu.operation, + // cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK_CHAIN + }, + block:{ + // 道岔封锁 + operation: OperationEvent.Switch.block.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_BLOCK + }, + unblock:{ + // 道岔解封 + operation: OperationEvent.Switch.unblock.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK + }, + npChain:{ + // 道岔定操（联动） + operation: OperationEvent.Switch.locate.menu.operation, + cmdType:CMD.Switch.CMD_SWITCH_TURN_NP_CHAIN + }, + rpChain:{ + // 道岔反操（联动） + operation: OperationEvent.Switch.reverse.menu.operation, + cmdType:CMD.Switch.CMD_SWITCH_TURN_RP_CHAIN + }, + split:{ + // 区段切除 + operation: OperationEvent.Switch.split.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF + }, + active:{ + // 区段激活 + operation: OperationEvent.Switch.active.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_ACTIVE + }, + setSpeed:{ + // 设置临时限速 + operation: OperationEvent.Switch.setSpeed.menu.operation, + cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED + }, + alxeEffective:{ + // 确认计轴有效 + operation: OperationEvent.Switch.alxeEffective.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE + } + }, + StationStand:{ + setDetainTrain:{ + // 设置扣车 + operation: OperationEvent.StationStand.setDetainTrain.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN + }, + cancelDetainTrain:{ + // 取消扣车 + operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation, + cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN + }, + setDetainTrainAuto:{ + // 区间列车数量限制 + operation: OperationEvent.StationStand.setDetainTrainAuto.menu.operation, + cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO + }, + cancelDetainTrainAuto:{ + // 取消区间列车数量限制 + operation: OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation, + cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO + }, + setBulkBuckleTrain:{ + // 批量扣车 + operation: OperationEvent.StationStand.setBulkBuckleTrain.menu.operation, + cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL + }, + cancelBulkBuckleTrain:{ + // 批量取消扣车 + operation: OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation, + cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL + }, + setJumpStop:{ + // 设置跳停 + operation: OperationEvent.StationStand.setJumpStop.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP + }, + cancelJumpStop:{ + // 取消跳停 + operation: OperationEvent.StationStand.cancelJumpStop.menu.operation, + cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP + }, + setStopTime:{ + // 停站时间控制 + operation: OperationEvent.StationStand.setStopTime.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME + }, + setRunLevel:{ + // 运行时间控制 + operation: OperationEvent.StationStand.setRunLevel.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME + }, + earlyDeparture:{ + // 设置提前发车 + operation: OperationEvent.StationStand.earlyDeparture.menu.operation, + cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART + }, + setBackStrategy:{ + // 设置折返策略 + operation: OperationEvent.StationStand.setBackStrategy.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY + }, + detail:{ + // 查询站台状态 + operation: OperationEvent.StationStand.detail.menu.operation + } + }, + StationControl:{ + requestCentralControl:{ + // 请求中控（遥控） + operation: OperationEvent.StationControl.requestCentralControl.menu.operation, + cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL + }, + requestStationControl:{ + // 请求站控 + operation: OperationEvent.StationControl.requestStationControl.menu.operation, + cmdType:CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL + }, + emergencyStationControl:{ + // 紧急站控 + operation: OperationEvent.StationControl.emergencyStationControl.menu.operation, + cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL + } + }, + Common: { + setFault: { + operation: OperationEvent.Section.stoppage.menu.operation, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + cancelFault: { + operation: OperationEvent.Section.cancelStoppage.menu.operation, + cmdType: CMD.Fault.CMD_CANCEL_FAULT + } + } +}; + +export function commitOperate(operate, paramList, over) { + const step = { + start: true, + operation: operate.operation, + param:{} + }; + step.param = paramList; + // over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作 + if (over == 0 || over == 3) { + const codeList = Object.values(paramList); + step.code = codeList[0]; + } + if (over != 0 && over != 3) { + delete step.start; + } + if (over == 2 || over == 3) { + step.over = true; + step.cmdType = operate.cmdType; + } + return new Promise(function(resolve, reject) { + store.dispatch('training/nextNew', step).then(({ valid }) => { + if (valid) { + store.dispatch('menuOperation/handleBreakFlag', { break: true }); + } + resolve({ valid: valid, operate: step }); + }).catch(error=>{ + reject(error); + }); + }); +} diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue index 50c2225aa..db1b769eb 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue @@ -5,6 +5,7 @@ + @@ -15,11 +16,12 @@ import SectionCmdControl from './dialog/sectionCmdControl'; import SpeedCmdControl from './dialog/speedCmdControl'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; -// import Handler from '@/scripts/cmdPlugin/Handler'; import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SectionMenu', @@ -28,7 +30,8 @@ export default { SectionControl, SectionCmdControl, SpeedCmdControl, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -75,12 +78,12 @@ export default { { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -133,45 +136,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Section.stoppage.menu.operation, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT, - param: { - sectionCode: `${this.selected.code}` - } - }; - - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Section.cancelStoppage.menu.operation, - cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT, - param: { - sectionCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 故障解锁 diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue index 71cf26971..67b88f525 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue @@ -8,6 +8,7 @@ + @@ -26,6 +27,8 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; // import { querySignalStatus } from '@/api/simulation'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SignalMenu', @@ -37,7 +40,8 @@ export default { RouteCmdControl, RouteHandControl, RouteDetail, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -109,12 +113,12 @@ export default { { label: this.$t('menu.menuSignal.setFault'), handler: this.setStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: this.$t('menu.menuSignal.cancelFault'), handler: this.cancelStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -171,44 +175,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.stoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT, - param: { - signalCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.cancelStoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT, - param: { - signalCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 排列进路 diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue index 9ef961d2f..703394751 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue @@ -8,6 +8,7 @@ + @@ -26,6 +27,8 @@ 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 SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'StationStandMenu', @@ -37,7 +40,8 @@ export default { NoticeInfo, StandBackStrategy, StandStopTime, - StandDetainTrainAll + StandDetainTrainAll, + SetFault }, props: { selected: { @@ -219,44 +223,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.stoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_ADD_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.cancelStoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/next', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 设置扣车 diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue index f8d6cb09a..e6dd094c1 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue @@ -5,6 +5,7 @@ + @@ -19,6 +20,8 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; +import {menuOperate, commitOperate} from './utils/menuOperate'; export default { name: 'SwitchMenu', @@ -27,7 +30,8 @@ export default { SwitchControl, SwitchCmdControl, SpeedCmdControl, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -80,12 +84,12 @@ export default { { label: '设置故障', handler: this.setStoppage, - cmdType:CMD.Switch.CMD_SWITCH_ADD_FAULT + cmdType:CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType:CMD.Switch.CMD_SWITCH_REMOVE_FAULT + cmdType:CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -138,42 +142,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - operation: OperationEvent.Switch.stoppage.menu.operation, - cmdType: CMD.Switch.CMD_STOPPAGE, - param: { - switchCode: this.selected.code - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - operation: OperationEvent.Switch.cancelStoppage.menu.operation, - cmdType: CMD.Switch.CMD_CANCEL_STOPPAGE, - param: { - switchCode: this.selected.code - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 道岔单锁 diff --git a/src/jmapNew/theme/haerbin_01/menus/utils/menuOperate.js b/src/jmapNew/theme/haerbin_01/menus/utils/menuOperate.js new file mode 100644 index 000000000..09a216171 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/utils/menuOperate.js @@ -0,0 +1,308 @@ +import store from '@/store/index_APP_TARGET'; +import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; + +// 操作 +export const menuOperate = { + Section:{ + alxeFailure:{ + // 设置计轴失效 + operation: OperationEvent.Section.alxeFailure.menu.operation, + // cmdType 值有问题 + cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + }, + active:{ + // 区段激活 + operation: OperationEvent.Section.active.menu.operation, + cmdType: CMD.Section.CMD_SECTION_ACTIVE + }, + alxeEffective:{ + // 确认计轴有效 + operation: OperationEvent.Section.alxeEffective.menu.operation, + cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE + }, + split:{ + // 区段切除 + operation: OperationEvent.Section.split.menu.operation, + cmdType: CMD.Section.CMD_SECTION_CUT_OFF + }, + lock:{ + // 区段封锁 + operation: OperationEvent.Section.lock.menu.operation, + cmdType: CMD.Section.CMD_SECTION_BLOCK + }, + unlock:{ + // 区段解锁 + operation: OperationEvent.Section.unlock.menu.operation, + cmdType: CMD.Section.CMD_SECTION_UNBLOCK + }, + setSpeed:{ + // 设置速度 + operation: OperationEvent.Section.setSpeed.menu.operation, + cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED + }, + fault:{ + // 区段故障解锁 + operation: OperationEvent.Section.fault.menu.operation, + cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK + }, + setFault: { + operation: OperationEvent.Section.stoppage.menu.operation, + cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + } + }, + Signal:{ + arrangementRoute:{ + // 排列进路 + operation: OperationEvent.Signal.arrangementRoute.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE + }, + cancelTrainRoute:{ + // 取消进路 + operation: OperationEvent.Signal.cancelTrainRoute.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE + }, + lock:{ + // 信号封锁 + operation:OperationEvent.Signal.lock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_BLOCK + }, + unlock:{ + // 信号解封 + operation: OperationEvent.Signal.unlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK + }, + guide:{ + // 进路引导 + operation: OperationEvent.Signal.guide.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE + }, + reopenSignal:{ + // 信号重开 + operation: OperationEvent.Signal.reopenSignal.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL + }, + signalClose:{ + // 信号关灯 + operation: OperationEvent.Signal.signalClose.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL + }, + humanControl:{ + // 进路交人工控 + operation: OperationEvent.Signal.humanControl.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING + }, + atsAutoControl:{ + // 进路交自动控 + operation: OperationEvent.Signal.atsAutoControl.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + }, + setAutoInterlock:{ + // 设置通过模式 + operation: OperationEvent.Signal.setAutoInterlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO + }, + cancelAutoInterlock:{ + // 取消通过模式 + operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO + }, + detail:{ + // 查询进路状态 + operation: OperationEvent.Signal.detail.menu.operation + }, + cancelGuide:{ + // 人工解锁进路（信号机取消引导） + operation: OperationEvent.Signal.cancelGuide.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE + }, + setAutoTurnBack:{ + // 设置自动折返 + operation: OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK + }, + cancelAutoTurnBack:{ + // 取消自动折返 + operation: OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK + } + }, + Switch:{ + lock:{ + // 道岔单锁(联锁) + operation: OperationEvent.Switch.lock.menu.operation, + // cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK_CHAIN + }, + unlock:{ + // 道岔解锁(联锁) + operation: OperationEvent.Switch.unlock.menu.operation, + // cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK_CHAIN + }, + block:{ + // 道岔封锁 + operation: OperationEvent.Switch.block.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_BLOCK + }, + unblock:{ + // 道岔解封 + operation: OperationEvent.Switch.unblock.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK + }, + npChain:{ + // 道岔定操（联动） + operation: OperationEvent.Switch.locate.menu.operation, + cmdType:CMD.Switch.CMD_SWITCH_TURN_NP_CHAIN + }, + rpChain:{ + // 道岔反操（联动） + operation: OperationEvent.Switch.reverse.menu.operation, + cmdType:CMD.Switch.CMD_SWITCH_TURN_RP_CHAIN + }, + split:{ + // 区段切除 + operation: OperationEvent.Switch.split.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF + }, + active:{ + // 区段激活 + operation: OperationEvent.Switch.active.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_ACTIVE + }, + setSpeed:{ + // 设置临时限速 + operation: OperationEvent.Switch.setSpeed.menu.operation, + cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED + }, + alxeEffective:{ + // 确认计轴有效 + operation: OperationEvent.Switch.alxeEffective.menu.operation, + cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE + } + }, + StationStand:{ + setDetainTrain:{ + // 设置扣车 + operation: OperationEvent.StationStand.setDetainTrain.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN + }, + cancelDetainTrain:{ + // 取消扣车 + operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation, + cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN + }, + setDetainTrainAuto:{ + // 区间列车数量限制 + operation: OperationEvent.StationStand.setDetainTrainAuto.menu.operation, + cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO + }, + cancelDetainTrainAuto:{ + // 取消区间列车数量限制 + operation: OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation, + cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO + }, + setBulkBuckleTrain:{ + // 批量扣车 + operation: OperationEvent.StationStand.setBulkBuckleTrain.menu.operation, + cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL + }, + cancelBulkBuckleTrain:{ + // 批量取消扣车 + operation: OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation, + cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL + }, + setJumpStop:{ + // 设置跳停 + operation: OperationEvent.StationStand.setJumpStop.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP + }, + cancelJumpStop:{ + // 取消跳停 + operation: OperationEvent.StationStand.cancelJumpStop.menu.operation, + cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP + }, + setStopTime:{ + // 停站时间控制 + operation: OperationEvent.StationStand.setStopTime.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME + }, + setRunLevel:{ + // 运行时间控制 + operation: OperationEvent.StationStand.setRunLevel.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME + }, + earlyDeparture:{ + // 设置提前发车 + operation: OperationEvent.StationStand.earlyDeparture.menu.operation, + cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART + }, + setBackStrategy:{ + // 设置折返策略 + operation: OperationEvent.StationStand.setBackStrategy.menu.operation, + cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY + }, + detail:{ + // 查询站台状态 + operation: OperationEvent.StationStand.detail.menu.operation + } + }, + StationControl:{ + requestCentralControl:{ + // 请求中控（遥控） + operation: OperationEvent.StationControl.requestCentralControl.menu.operation, + cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL + }, + requestStationControl:{ + // 请求站控 + operation: OperationEvent.StationControl.requestStationControl.menu.operation, + cmdType:CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL + }, + emergencyStationControl:{ + // 紧急站控 + operation: OperationEvent.StationControl.emergencyStationControl.menu.operation, + cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL + } + }, + Common: { + setFault: { + operation: OperationEvent.Section.stoppage.menu.operation, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + cancelFault: { + operation: OperationEvent.Section.cancelStoppage.menu.operation, + cmdType: CMD.Fault.CMD_CANCEL_FAULT + } + } +}; + +export function commitOperate(operate, paramList, over) { + const step = { + start: true, + operation: operate.operation, + param:{} + }; + step.param = paramList; + // over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作 + if (over == 0 || over == 3) { + const codeList = Object.values(paramList); + step.code = codeList[0]; + } + if (over != 0 && over != 3) { + delete step.start; + } + if (over == 2 || over == 3) { + step.over = true; + step.cmdType = operate.cmdType; + } + return new Promise(function(resolve, reject) { + store.dispatch('training/nextNew', step).then(({ valid }) => { + if (valid) { + store.dispatch('menuOperation/handleBreakFlag', { break: true }); + } + resolve({ valid: valid, operate: step }); + }).catch(error=>{ + reject(error); + }); + }); +} diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue index c35831e1c..aeb16bf71 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue @@ -22,7 +22,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import {menuOperate, commitOperate} from './utils/menuOperate'; -import SetFault from './dialog/setFault'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'SectionMenu', @@ -98,20 +98,15 @@ export default { ] }, menuForce: [ - // { - // label: '设置计轴失效', // 设置区段故障 - // handler: this.alxeFailure, - // cmdType: CMD.Section.CMD_SECTION_ADD_FAULT - // }, { label: this.$t('menu.menuSection.setFault'), handler: this.setStoppage, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: this.$t('menu.menuSection.cancelFault'), handler: this.cancelStoppage, - cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -228,14 +223,22 @@ export default { } }); }, + // 设置故障 setStoppage() { - commitOperate(menuOperate.Section.setFault, { sectionCode: this.selected.code }, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.setFault.doShow(operate, this.selected); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } }); }, - cancelStoppage() {} + // 取消故障 + cancelStoppage() { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); + } + }); + } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue index 26cb43946..a5d218da8 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue @@ -8,7 +8,8 @@ - + \ + @@ -26,9 +27,8 @@ import {menuOperate, commitOperate} from './utils/menuOperate'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import { mapGetters } from 'vuex'; -import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; -// import { querySignalStatus } from '@/api/simulation'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'SignalMenu', @@ -41,7 +41,8 @@ export default { RouteHandControl, RouteDetail, RouterCommand, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -166,20 +167,15 @@ export default { ] }, menuForce: [ - { - label: '信号关灯', - handler: this.signalClose, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL - }, { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -235,50 +231,6 @@ export default { this.$refs.popMenu.close(); } }, - // 设置故障 - setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.stoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT, - param: { - signalCode: `${this.selected.code}` - } - }; - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(); - } - }).catch(() => { - this.$refs.noticeInfo.doShow(); - }); - }, - // 取消故障 - cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.cancelStoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT, - param: { - signalCode: `${this.selected.code}` - } - }; - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(); - } - }).catch(() => { - this.$refs.noticeInfo.doShow(); - }); - }, // 获取进路列表 getRouteList(selectType) { const routes = []; @@ -392,6 +344,22 @@ export default { this.$refs.routerCommand.doShow(operate, this.selected, '是否执行引导命令?'); } }); + }, + // 设置故障 + setStoppage() { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); + } + }); + }, + // 取消故障 + cancelStoppage() { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); + } + }); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue index 8cac92f44..c451a5280 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue @@ -9,6 +9,7 @@ + @@ -28,6 +29,7 @@ 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 SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'StationStandMenu', @@ -40,7 +42,8 @@ export default { StandRunLevel, NoticeInfo, StandBackStrategy, - StandStopTime + StandStopTime, + SetFault }, props: { selected: { @@ -201,44 +204,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.stoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_ADD_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.cancelStoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(); }); }, // 设置扣车 diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue index 6cbcd77fc..c47a6cc6f 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue @@ -6,6 +6,7 @@ + @@ -17,9 +18,9 @@ import SpeedLimitControl from './dialog/speedLimitControl'; import AlxeEffective from './dialog/alxeEffective'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; -import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import {menuOperate, commitOperate} from './utils/menuOperate'; @@ -32,7 +33,8 @@ export default { SwitchUnLock, SpeedLimitControl, AlxeEffective, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -129,12 +131,12 @@ export default { { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Switch.CMD_SWITCH_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Switch.CMD_SWITCH_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -184,50 +186,6 @@ export default { this.$refs.popMenu.close(); } }, - // 设置故障 - setStoppage() { - const operate = { - start: true, - code: this.selected.code, - operation: OperationEvent.Switch.stoppage.menu.operation, - param: { - switchCode: this.selected.code - } - }; - - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(); - } - }).catch(() => { - this.$refs.noticeInfo.doShow(); - }); - }, - // 取消故障 - cancelStoppage() { - const operate = { - start: true, - code: this.selected.code, - operation: OperationEvent.Switch.cancelStoppage.menu.operation, - param: { - switchCode: this.selected.code - } - }; - - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(); - } - }).catch(() => { - this.$refs.noticeInfo.doShow(); - }); - }, // 定操定位 locate() { commitOperate(menuOperate.Switch.npChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ @@ -315,6 +273,22 @@ export default { callback: action => { } }); + }, + // 设置故障 + setStoppage() { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); + } + }); + }, + // 取消故障 + cancelStoppage() { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); + } + }); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js b/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js index 34383dd3c..09a216171 100644 --- a/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js +++ b/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js @@ -263,6 +263,16 @@ export const menuOperate = { operation: OperationEvent.StationControl.emergencyStationControl.menu.operation, cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL } + }, + Common: { + setFault: { + operation: OperationEvent.Section.stoppage.menu.operation, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + cancelFault: { + operation: OperationEvent.Section.cancelStoppage.menu.operation, + cmdType: CMD.Fault.CMD_CANCEL_FAULT + } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuSection.vue b/src/jmapNew/theme/xian_01/menus/menuSection.vue index 8c55dfa1a..21816f04b 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSection.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSection.vue @@ -17,11 +17,10 @@ import SpeedCmdControl from './dialog/speedCmdControl'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { mapGetters } from 'vuex'; -import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import { menuOperate, commitOperate } from './utils/menuOperate'; -import SetFault from './dialog/setFault'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'SectionMenu', @@ -113,14 +112,14 @@ export default { }, menuForce: [ { - label: this.$t('menu.menuSection.setFault'), + label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { - label: this.$t('menu.menuSection.cancelFault'), + label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Section.CMD_SECTION_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -175,7 +174,7 @@ export default { setStoppage() { commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.setFault.doShow(operate, this.selected); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } }); }, @@ -183,7 +182,7 @@ export default { cancelStoppage() { commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.setFault.doShow(operate, this.selected); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); }, diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue index d349989f0..197a15e81 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue @@ -8,7 +8,7 @@ - + @@ -24,10 +24,9 @@ import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import { mapGetters } from 'vuex'; -import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import { menuOperate, commitOperate } from './utils/menuOperate'; -import SetFault from './dialog/setFault'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'SignalMenu', @@ -40,7 +39,7 @@ export default { RouteHandControl, RouteDetail, NoticeInfo, - SetFault + SetFault }, props: { selected: { @@ -166,14 +165,14 @@ export default { }, menuForce: [ { - label: this.$t('menu.menuSignal.setFault'), + label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { - label: this.$t('menu.menuSignal.cancelFault'), + label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -232,7 +231,7 @@ export default { setStoppage() { commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.setFault.doShow(operate, this.selected); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } }); }, @@ -240,7 +239,7 @@ export default { cancelStoppage() { commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.setFault.doShow(operate, this.selected); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); }, diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue index ca9705442..c00fab189 100644 --- a/src/jmapNew/theme/xian_01/menus/menuStation.vue +++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue @@ -81,6 +81,16 @@ export default { cmdType: CMD.Station.active } // { + // label: '所有进路交人工控', + // handler: this.humanControlALL, + // cmdType: '' + // }, + // { + // label: '所有进路交ATS自动控', + // handler: this.atsAutoControlALL, + // cmdType: '' + // } + // { // label: '执行关键操作测试', // handler: this.execKeyOperationTest, // cmdType: CMD.Station.active, diff --git a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue index 904d673f3..e8de5bd4f 100644 --- a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue @@ -8,6 +8,7 @@ + @@ -26,6 +27,7 @@ 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', @@ -37,7 +39,8 @@ export default { NoticeInfo, StandBackStrategy, StandStopTime, - StandDetainTrainAll + StandDetainTrainAll, + SetFault }, props: { selected: { @@ -191,44 +194,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.stoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_ADD_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.cancelStoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 设置扣车 diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue index ead1453dc..17aebdcbe 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue @@ -17,11 +17,10 @@ import SpeedCmdControl from './dialog/speedCmdControl'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { mapGetters } from 'vuex'; -import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import { menuOperate, commitOperate } from './utils/menuOperate'; -import SetFault from './dialog/setFault'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'SwitchMenu', @@ -157,20 +156,14 @@ export default { }, menuForce: [ { - label: this.$t('menu.menuSwitch.setFault'), + label: '设置故障', handler: this.setStoppage, - auth: { - - }, - cmdType:CMD.Switch.CMD_SWITCH_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { - label: this.$t('menu.menuSwitch.cancelFault'), + label: '取消故障', handler: this.cancelStoppage, - auth: { - - }, - cmdType:CMD.Switch.CMD_SWITCH_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -227,7 +220,7 @@ export default { setStoppage() { commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.setFault.doShow(operate, this.selected); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } }); }, @@ -235,7 +228,7 @@ export default { cancelStoppage() { commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.setFault.doShow(operate, this.selected); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); }, diff --git a/src/jmapNew/theme/xian_02/menus/index.vue b/src/jmapNew/theme/xian_02/menus/index.vue index 93d0672ea..2eb3607ae 100644 --- a/src/jmapNew/theme/xian_02/menus/index.vue +++ b/src/jmapNew/theme/xian_02/menus/index.vue @@ -228,6 +228,12 @@ export default { .xian-02__system .el-dialog .el-button:disabled span { border: 0px; } + .xian-02__system .el-select-dropdown__item { + background: #5F9EA0; + } + .xian-02__system .el-select-dropdown__list { + background: #5F9EA0; + } .xian-02__select-option .el-select-dropdown__item{ background: #5F9EA0; } @@ -296,9 +302,9 @@ export default { line-height: 22px !important; } - .xian-02__system .el-dialog .el-input.is-disabled .el-input__inner { - background: #F0F0F0 !important; - } + /*.xian-02__system .el-dialog .el-input.is-disabled .el-input__inner {*/ + /*background: #F0F0F0 !important;*/ + /*}*/ .xian-02__system .el-dialog .el-textarea { border-style:solid; diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue index 4d753ce25..705cad421 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSection.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue @@ -6,6 +6,7 @@ + @@ -22,6 +23,7 @@ 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'; export default { name: 'SectionMenu', @@ -31,7 +33,8 @@ export default { SectionUnLock, SpeedLimitControl, AlxeEffective, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -116,9 +119,14 @@ export default { }, menuForce: [ { - label: '设置计轴失效', // 设置区段故障 - handler: this.alxeFailure, - cmdType: CMD.Section.CMD_SECTION_ADD_FAULT + label: '设置故障', + handler: this.setStoppage, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + { + label: '取消故障', + handler: this.cancelStoppage, + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -170,12 +178,20 @@ export default { this.$refs.popMenu.close(); } }, - // 设置计轴失效 - alxeFailure() { - this.mouseCancelState(this.selected); - commitOperate(menuOperate.Section.alxeFailure, {sectionCode:this.selected.code}, 3).then(({valid, operate})=>{ - }).catch((error)=>{ - this.$refs.noticeInfo.doShow({}, error.message); + // 设置故障 + setStoppage() { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); + } + }); + }, + // 取消故障 + cancelStoppage() { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); + } }); }, // 故障解锁 diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue index 94c7d49e7..7ed66994a 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue @@ -9,6 +9,7 @@ + @@ -28,7 +29,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; -// import { querySignalStatus } from '@/api/simulation'; +import SetFault from '@/views/newMap/mapsystemNew/plugin/setFault'; export default { name: 'SignalMenu', @@ -41,7 +42,8 @@ export default { RouteHandControl, RouteDetail, RouterCommand, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -188,20 +190,15 @@ export default { } ], menuForce: [ - { - label: '信号关灯', - handler: this.signalClose, - cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL - }, { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -269,46 +266,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.stoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT, - param: { - signalCode: `${this.selected.code}` - } - }; - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - code: `${this.selected.code}`, - operation: OperationEvent.Signal.cancelStoppage.menu.operation, - cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT, - param: { - signalCode: `${this.selected.code}` - } - }; - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 获取进路列表 diff --git a/src/jmapNew/theme/xian_02/menus/menuStationStand.vue b/src/jmapNew/theme/xian_02/menus/menuStationStand.vue index bbe113eca..d4cfdb4bd 100644 --- a/src/jmapNew/theme/xian_02/menus/menuStationStand.vue +++ b/src/jmapNew/theme/xian_02/menus/menuStationStand.vue @@ -124,6 +124,7 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import PlatformDwell from './dialog/platformDwell'; import { DeviceMenu } from '@/scripts/ConstDic'; +import { OperateMode } from '@/scripts/ConstDic'; export default { name: 'MenuStationStand', @@ -153,6 +154,9 @@ export default { }; }, computed: { + ...mapGetters('training', [ + 'operatemode' + ]), ...mapGetters('menuOperation', [ 'buttonOperation' ]), @@ -172,7 +176,7 @@ export default { }, watch: { '$store.state.menuOperation.menuCount': function (val) { - if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationStand) && !this.buttonOperation) { + if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationStand) && !this.buttonOperation && this.operatemode !== OperateMode.FAULT) { this.stationList.forEach(item => { if (item.code === this.$store.state.menuOperation.selected.stationCode) { if ((this.mapConfig.upDirection === 'right' && this.$store.state.menuOperation.selected.right) || (this.mapConfig.upDirection === 'left' && !this.$store.state.menuOperation.selected.right)) { diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue index 2046d7da4..62efcc86f 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue @@ -6,6 +6,7 @@ + @@ -23,6 +24,7 @@ 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', @@ -32,7 +34,8 @@ export default { SwitchUnLock, SpeedLimitControl, AlxeEffective, - NoticeInfo + NoticeInfo, + SetFault }, props: { selected: { @@ -146,12 +149,12 @@ export default { { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Switch.CMD_SWITCH_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Switch.CMD_SWITCH_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -238,26 +241,20 @@ export default { this.$refs.noticeInfo.doShow(operate); }); }, + // 设置故障 + setStoppage() { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); + } + }); + }, // 取消故障 cancelStoppage() { - const operate = { - start: true, - code: this.selected.code, - operation: OperationEvent.Switch.cancelStoppage.menu.operation, - param: { - switchCode: this.selected.code - } - }; - - this.mouseCancelState(this.selected); - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(operate); }); }, // 定操定位 diff --git a/src/jmapNew/theme/xian_02/menus/popStationStand.vue b/src/jmapNew/theme/xian_02/menus/popStationStand.vue index 29c1b753a..ab4b09b25 100644 --- a/src/jmapNew/theme/xian_02/menus/popStationStand.vue +++ b/src/jmapNew/theme/xian_02/menus/popStationStand.vue @@ -5,6 +5,7 @@ + @@ -16,8 +17,10 @@ import WarningConfirm from './dialog/warningConfirm'; import StopProfile from './dialog/stopProfile'; import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; -import { OperateMode } from '@/scripts/ConstDic'; +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 { name: 'StationStandMenu', @@ -26,7 +29,8 @@ export default { NoticeInfo, UpdateStandPlan, WarningConfirm, - StopProfile + StopProfile, + SetFault }, props: { selected: { @@ -186,12 +190,12 @@ export default { { label: '设置故障', handler: this.setStoppage, - cmdType: CMD.Stand.CMD_STAND_ADD_FAULT + cmdType: CMD.Fault.CMD_SET_FAULT }, { label: '取消故障', handler: this.cancelStoppage, - cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT + cmdType: CMD.Fault.CMD_CANCEL_FAULT } ] }; @@ -205,6 +209,15 @@ export default { 'buttonOperation' ]) }, + watch: { + '$store.state.menuOperation.menuCount': function (val) { + if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationStand) && !this.buttonOperation && this.operatemode === OperateMode.FAULT) { + this.doShow(this.$store.state.menuOperation.menuPosition); + } else { + this.doClose(); + } + } + }, methods: { clickEvent() { const self = this; @@ -267,47 +280,18 @@ export default { }, // 设置故障 setStoppage() { - const step = { - start: true, - over:true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.stoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_ADD_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 取消故障 cancelStoppage() { - const step = { - start: true, - over:true, - code: `${this.selected.code}`, - operation: OperationEvent.StationStand.cancelStoppage.menu.operation, - cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT, - param: { - standCode: `${this.selected.code}` - } - }; - - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{ if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } - }).catch(() => { - this.$refs.noticeInfo.doShow(step); }); }, // 设置跳停 diff --git a/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js b/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js index 5dcae4248..929324f24 100644 --- a/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js +++ b/src/jmapNew/theme/xian_02/menus/utils/menuOperate.js @@ -257,6 +257,16 @@ export const menuOperate = { operation: OperationEvent.StationControl.emergencyStationControl.menu.operation, cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL } + }, + Common: { + setFault: { + operation: OperationEvent.Section.stoppage.menu.operation, + cmdType: CMD.Fault.CMD_SET_FAULT + }, + cancelFault: { + operation: OperationEvent.Section.cancelStoppage.menu.operation, + cmdType: CMD.Fault.CMD_CANCEL_FAULT + } } }; diff --git a/src/permission.js b/src/permission.js index 949a5a037..0f2be5706 100644 --- a/src/permission.js +++ b/src/permission.js @@ -44,6 +44,10 @@ function getRouteInfo(to) { break; } } + if (whiteList.includes(toRoutePath)) { + removeToken(); + } + if (isDesignPage(toRoutePath)) { const whitePage = PermissionParam[current_session] ? PermissionParam[current_session].whitePage : ''; loginPath = whitePage || loginDesignPage; @@ -114,13 +118,14 @@ router.beforeEach((to, from, next) => { } } else { // 继电器使用 - // console.log(to); // 未登录情况下 if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入 next(); } else if (to.path.substr(0, 13) == whiteList[2]) { next(); + } else if (to.path == '/jsxtApply') { + next(); } else { // 否则全部重定向到登录页 next(routeInfo.loginPath); diff --git a/src/router/index_Common.js b/src/router/index_Common.js index 87eabad31..69c9c30d7 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -15,6 +15,8 @@ const Jlmap3dPassFlow = () => import('@/views/jlmap3d/passflow/jl3dpassflow'); const Jlmap3dStation = () => import('@/views/jlmap3d/station/jl3dstation'); const Jlmap3dModel = () => import('@/views/jlmap3d/device/jl3ddevice'); const Jlmap3dTrain = () => import('@/views/jlmap3d/devicetrain/jl3ddevicetrain'); +const Jl3dMaintainer = () => import('@/views/jlmap3d/maintainer/jl3dmaintainer'); + const Display = () => import('@/views/display/index'); const DisplayNew = () => import('@/views/newMap/displayNew/index'); const DesignDisplay = () => import('@/views/display/designIndex'); @@ -121,8 +123,14 @@ const DeviceManage = () => import('@/views/system/deviceManage/index'); const MapSort = () => import('@/views/publish/publishMap/mapSort'); const StudentManage = () => import('@/views/studentManage'); -const CompetitionManage = () => import('@/views/competition/index'); -const RefereeList = () => import('@/views/refereeList/index'); +const CompetitionDetail = () => import('@/views/jsxt/competition/examDetail'); +const CompetitionManage = () => import('@/views/jsxt/competition/index'); +const CompetitionHome = () => import('@/views/jsxt/competition/home'); +const Refereedetail = () => import('@/views/jsxt/competition/theory/quiz/index'); +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'); import { loginInfo, GenerateRouteProjectList } from '@/scripts/ProjectConfig'; import { getSessionStorage } from '@/utils/auth'; @@ -151,6 +159,7 @@ export const mapCreater = '02'; // 地图创建权限 export const lessonCreater = '03'; // 课程创建权限 export const admin = '04'; // 管理员 export const superAdmin = '05'; // 超级管理员 +export const referee = '07'; // 裁判员 export const userExam = '011'; // 考试系统 export const userLesson = '012'; // 教学系统 @@ -158,6 +167,7 @@ export const userSimulation = '013'; // 仿真系统 export const userScreen = '014'; // 大屏系统 export const userPlan = '015'; // 计划系统 export const userTrainingPlatform = '016'; // 实训平台 +export const refereePlatform = '017'; // const isDev = process.env.NODE_ENV === 'development'; /** @@ -214,7 +224,13 @@ export const constantRoutes = [ component: Error401, hidden: true }, - + { // 竞赛系统报名 + path: '/jsxtApply', + component: JsxtApply, + meta: { + }, + hidden: true + }, { path: '/404', component: Errpr404, @@ -959,59 +975,113 @@ export const asyncRouter = [ ] } ] - }, - { - path: '/design/student', - redirect: '/design/student/home', - component: Layout, - meta: { - i18n: 'router.studentManage', - roles: [admin, lessonCreater] - }, - hidden: getSessionStorage('project') ? !getSessionStorage('project').endsWith('gzb') && !window.document.location.pathname.includes('gzb') : !window.document.location.pathname.includes('gzb'), - children: [ - { - path: 'home', - component: StudentManage, - meta: { - i18n: 'router.studentManage', - icon: 'design', - hidden: true - } - } - ] } ]; -const JSXT = [ +export const projectRoute = { + designgzb: [ + { + path: '/design/student', + redirect: '/design/student/home', + component: Layout, + meta: { + i18n: 'router.studentManage', + roles: [admin, lessonCreater] + }, + children: [ + { + path: 'home', + component: StudentManage, + meta: { + i18n: 'router.studentManage', + icon: 'design', + hidden: true + } + } + ] + } + ] +}; +export const JSXT = [ { path: '/jsxt', + redirect: '/jsxt/home', component: Layout, meta: { i18n: 'router.competitionManage', - roles: [user, userTrainingPlatform] + roles: [user, userTrainingPlatform, referee] }, - pathStr: 'jsxt', hidden: getSessionStorage('project') ? !getSessionStorage('project').endsWith('jsxt') && !window.document.location.pathname.includes('jsxt') : !window.document.location.pathname.includes('jsxt'), children: [ { - path: 'home', + path: '', + redirect: '/jsxt/home', component: CompetitionManage, meta: { i18n: 'router.competitionManage', - icon: 'design', - hidden: true - } + icon: 'design' + }, + children: [ + { + path: 'home', + component: CompetitionHome, + meta: { + hidden: true + } + }, + // { + // path: 'theory/:id', + // component: theoryManage, + // meta: { + // hidden: true + // } + // }, + { + path: 'examDetail', + component: CompetitionDetail, + meta: { + il8n: 'router.examDetail', + icon: 'design', + hidden: true + } + } + ] } ] }, + { + path: '/jsxt/theory/detail/:id', + component: Refereedetail, + meta: { + hidden: true + } + }, { path: '/refereeJsxt', component: Layout, meta: { - i18n: 'router.refereeJManage', - roles: [admin, userTrainingPlatform] + i18n: 'router.homeJsxt', + roles: [user, referee, refereePlatform] + }, + 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: [referee, refereePlatform] }, - pathStr: 'refereeJsxt', hidden: getSessionStorage('project') ? !getSessionStorage('project').endsWith('refereeJsxt') && !window.document.location.pathname.includes('refereeJsxt') : !window.document.location.pathname.includes('refereeJsxt'), children: [ { @@ -1036,11 +1106,6 @@ const router = createRouter(); router.beforeEach((to, from, next) => { const project = getSessionStorage('project'); - JSXT.forEach(route => { - if (from.path.includes(route.pathStr)) { - asyncRouter.push(route); - } - }); document.title = loginInfo[project || 'login'].browserTitle || loginInfo[project || 'login'].title; next(); }); diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 88f8ca94d..0e5598c55 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -37,7 +37,8 @@ export default { { label: '课程生成者', value: '03' }, { label: '系统管理员', value: '04' }, { label: '超级管理员', value: '05' }, - { label: '销售用户', value: '06' } + { label: '销售用户', value: '06' }, + { label: '裁判员', value: '07' } ], examResultList: [ diff --git a/src/scripts/GlobalPlugin.js b/src/scripts/GlobalPlugin.js index 0a466d53e..7e0ae1c63 100644 --- a/src/scripts/GlobalPlugin.js +++ b/src/scripts/GlobalPlugin.js @@ -114,3 +114,24 @@ Vue.prototype.$copyClone = function(obj1, obj2 = {}) { } return obj1; }; + +Vue.prototype.$escapeHTML = function (context) { + const pattern = /<\w*>(.*)<\/\w*>/; + + if (pattern.test(context)) { + context = pattern.exec(context)[1]; + } + + context = context.replace(/</g, '<'); + context = context.replace(/>/g, '>'); + + return `${context}`; +}; + +Vue.prototype.$str2number = function(str) { + return parseInt(str); +}; + +Vue.prototype.$asc2chart = function(ascii) { + return String.fromCharCode(ascii); +}; diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index ad9ecf7cf..c39a169a0 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -142,7 +142,7 @@ export const PermissionParam = { // 路径权限处理所需参数配置（跳 refereeJsxt: { whitePage: '/refereeJsxt/login', reg: /^\/refereeJsxt/, - clientId: null + clientId: LoginParams.Design.clientId } }; export const ProjectList = [ diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js index d8b3c8590..726d0788b 100644 --- a/src/scripts/cmdPlugin/CommandHandler.js +++ b/src/scripts/cmdPlugin/CommandHandler.js @@ -22,7 +22,7 @@ class CommandHandle { }; (list || []).forEach(definition => { this.definitionMap[definition.simulationRole][definition.operate] = definition; - this.scriptDefinitionMap[definition.id] = definition; + this.scriptDefinitionMap[definition.operate] = definition; }); } @@ -35,9 +35,9 @@ class CommandHandle { } } - getScriptDefinition(operationId) { - if (operationId) { - return this.scriptDefinitionMap[operationId] || null; + getScriptDefinition(operationType) { + if (operationType) { + return this.scriptDefinitionMap[operationType] || null; } else { return null; } diff --git a/src/scripts/cmdPlugin/Config.js b/src/scripts/cmdPlugin/Config.js index aebf868ae..868caf9ec 100644 --- a/src/scripts/cmdPlugin/Config.js +++ b/src/scripts/cmdPlugin/Config.js @@ -29,14 +29,17 @@ export const MapDeviceType = { /** 设备故障类型 */ export const deviceFaultType = { Section: [ - {label: '计轴故障', value: 'FAULT'}, - {label: '计轴干扰', value: 'DISTURBANCE'} + {label: '计轴故障', value: 'FAULT'} + // {label: '计轴干扰', value: 'DISTURBANCE'} ], Signal: [ {label: '主灯丝熔断故障', value: 'MAIN_FILAMENT_BROKEN'} ], Switch: [ {label: '挤岔', value: 'SPLIT'} + ], + StationStand: [ + {label: '屏蔽门无法关闭', value: 'FAULT'} ] }; /** 设备类型 */ diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 7a7958541..8f50c3d05 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -1,4 +1,4 @@ -import { asyncRouter, constantRoutes, user, userLesson, userExam, userSimulation, userScreen, userPlan, superAdmin, admin, userTrainingPlatform } from '@/router/index_APP_TARGET'; +import { asyncRouter, constantRoutes, user, userLesson, userExam, userSimulation, userScreen, userPlan, superAdmin, admin, userTrainingPlatform, JSXT, refereePlatform, projectRoute } from '@/router/index_APP_TARGET'; import { PermissionType } from '@/utils/PermissionType'; import { UrlConfig } from '@/scripts/ConstDic'; import { getSessionStorage } from '@/utils/auth'; @@ -26,16 +26,22 @@ function setHonePagePath(route, roles) { */ function hasPermission(roles, route, parentsRoles) { setHonePagePath(route, roles); + if (!getSessionStorage('project')) { + return false; + } if (route.meta && route.meta.roles) { // 如果存在本级路由，则使用自己的roles过滤 if (getSessionStorage('project').startsWith('design')) { const result = roles.filter(role => route.meta.roles.indexOf(role) >= 0) || []; return result.length && route.meta.roles.indexOf(userTrainingPlatform) < 0; + } else if (getSessionStorage('project').startsWith('refereeJsxt')) { + const result = roles.filter(role => route.meta.roles.indexOf(role) >= 0) || []; + return result.length && route.meta.roles.indexOf(refereePlatform) >= 0; } else { roles = roles.filter(function (role) { return route.meta.roles.indexOf(role) >= 0; }); - return roles.some(role => route.meta.roles.indexOf(role) >= 0) && route.meta.roles.indexOf(userTrainingPlatform) > 0; + return roles.some(role => route.meta.roles.indexOf(role) >= 0) && route.meta.roles.indexOf(userTrainingPlatform) >= 0; } } else if (parentsRoles) { // 如果没有本级路由，有父级路由，则使用父级路由过滤 @@ -104,8 +110,14 @@ const permission = { if (roles.indexOf(superAdmin) >= 0 && roles.indexOf(admin) < 0) { roles.push(admin); } - - const accessedRouters = filterAsyncRouter(asyncRouter, roles); + const proRoute = projectRoute[getSessionStorage('project')]; + let routeArr = []; + if (proRoute && proRoute.constructor === Array) { + routeArr = [...asyncRouter, ...JSXT, ...proRoute]; + } else { + routeArr = [...asyncRouter, ...JSXT]; + } + const accessedRouters = filterAsyncRouter(routeArr, roles); accessedRouters.forEach(route => { if (route.children && route.children.length == 0) { route.hidden = true; diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index 8c21a5287..5cb0d22e5 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -29,6 +29,9 @@ function handle(state, data) { case 'Simulation_Script_Tip': // 仿真-聊天界面用户进出仿真消息 handleSimulationScriptTipInfo(state, msg); // 用户进出仿真消息 break; + case 'Simulation_Script_Finish': // 剧本执行完成推送消息 + state.scriptFinish++; // 剧本执行完成推送消息 + break; case 'Simulation_RunFact': // 仿真-列车实际到发车站消息 // let runFactMsg = msg; // if (runFactMsg.constructor !== Array ) { @@ -195,6 +198,7 @@ const socket = { roleList: [], // 设置角色信息 simulationRoleList:[], // 设置仿真的聊天角色信息 simulationScriptTip:{}, // 剧本推送提示信息 + scriptFinish:0, // 剧本执行完成提示信息 jointRoomPrepare: false, // 演练房间准备状态 equipmentStatus: [], // 仿真-设备状态消息 trainStationList: [], // 仿真-列车实际到发车站消息 diff --git a/src/store/modules/training.js b/src/store/modules/training.js index da14e9274..f335e1a1d 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -192,8 +192,8 @@ const training = { setOperate: (state, operate) => { state.operate = operate; }, - setInitTime: (state, operate) => { - state.initTime = operate; + setInitTime: (state, initTime) => { + state.initTime = initTime; }, setPrdType: (state, prdType) => { state.prdType = prdType; diff --git a/src/store/modules/user.js b/src/store/modules/user.js index d52813076..d9a0bcc23 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -3,7 +3,7 @@ import { login, logout, getInfo } from '@/api/login'; import { getToken, setToken, removeToken } from '@/utils/auth'; import { getUserConfigInfo } from '@/api/management/user'; import { LoginParams } from '@/utils/login'; -import { creatSubscribe, clearSubscribe, perpetualTopic, commonTopic, disconnect} from '@/utils/stomp'; +import { creatSubscribe, clearSubscribe, perpetualTopic, disconnect} from '@/utils/stomp'; import Cookies from 'js-cookie'; const user = { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 080406116..e9046878d 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,12 +2,12 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 - BASE_API = 'http://192.168.3.6:9000'; // 旭强 + // 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'; // 张S赛 + // 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'; // 张赛 diff --git a/src/utils/index.js b/src/utils/index.js index bad85f49a..74f5b079d 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -149,9 +149,9 @@ export function deepAssign(obj, item) { const target = item.constructor === Array ? [] : {}; // 判断复制的目标是数组还是对象 for (const keys in item) { if (item.hasOwnProperty(keys) && keys != 'instance') { // instance 对面不拷贝 - if (item[keys] && typeof item[keys] === 'object') { // 如果值是对象，就递归一下 - target[keys] = item[keys].constructor === Array ? [] : {}; - target[keys] = deepClone(item[keys]); + if (item[keys] && typeof item[keys] == 'object') { // 如果值是对象，就递归一下 + const targetObj = item[keys].constructor == Array ? [] : {}; + target[keys] = deepAssign(targetObj, item[keys]); } else { target[keys] = item[keys]; } diff --git a/src/views/error-page/401.vue b/src/views/error-page/401.vue index 3b44ee832..2f5be5120 100644 --- a/src/views/error-page/401.vue +++ b/src/views/error-page/401.vue @@ -1,27 +1,27 @@ diff --git a/src/views/jlmap3d/device/jl3ddevice.vue b/src/views/jlmap3d/device/jl3ddevice.vue index 19f9fea27..7456ee6b0 100644 --- a/src/views/jlmap3d/device/jl3ddevice.vue +++ b/src/views/jlmap3d/device/jl3ddevice.vue @@ -119,8 +119,9 @@ }else{ this.datastatus = "new"; this.initnewdata(group,header); - } + // const mapdata = this.$store.getters['map/map']; + // console.log(mapdata); // if (group) { // this.init(group,header); // // this.subscribe(code,group,header); diff --git a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue new file mode 100644 index 000000000..ac05aefbd --- /dev/null +++ b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue @@ -0,0 +1,259 @@ + + + + + diff --git a/src/views/jsxt/apply/index.vue b/src/views/jsxt/apply/index.vue new file mode 100644 index 000000000..9af31e3bb --- /dev/null +++ b/src/views/jsxt/apply/index.vue @@ -0,0 +1,420 @@ + + + + + diff --git a/src/views/competition/demonList.vue b/src/views/jsxt/competition/demonList.vue similarity index 61% rename from src/views/competition/demonList.vue rename to src/views/jsxt/competition/demonList.vue index 936e4c791..c0ce2d471 100644 --- a/src/views/competition/demonList.vue +++ b/src/views/jsxt/competition/demonList.vue @@ -15,13 +15,10 @@ :filter-node-method="filterNode" :default-expanded-keys="expandList" @node-click="clickEvent" - @node-expand="nodeExpand" - @node-collapse="nodeCollapse" > -  仿真系统 -  {{ node.data.name }} +  {{ node.data.name }} @@ -29,7 +26,6 @@ + diff --git a/src/views/jsxt/competition/home.vue b/src/views/jsxt/competition/home.vue new file mode 100644 index 000000000..23e368aeb --- /dev/null +++ b/src/views/jsxt/competition/home.vue @@ -0,0 +1,85 @@ + + + + diff --git a/src/views/competition/index.vue b/src/views/jsxt/competition/index.vue similarity index 100% rename from src/views/competition/index.vue rename to src/views/jsxt/competition/index.vue diff --git a/src/views/jsxt/competition/theory/index.vue b/src/views/jsxt/competition/theory/index.vue new file mode 100644 index 000000000..8e425ac56 --- /dev/null +++ b/src/views/jsxt/competition/theory/index.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/views/jsxt/competition/theory/quiz/index.vue b/src/views/jsxt/competition/theory/quiz/index.vue new file mode 100644 index 000000000..7caffcf5b --- /dev/null +++ b/src/views/jsxt/competition/theory/quiz/index.vue @@ -0,0 +1,243 @@ + + + + diff --git a/src/views/jsxt/competition/theory/quiz/question.vue b/src/views/jsxt/competition/theory/quiz/question.vue new file mode 100644 index 000000000..8871b1b61 --- /dev/null +++ b/src/views/jsxt/competition/theory/quiz/question.vue @@ -0,0 +1,91 @@ + + + + diff --git a/src/views/jsxt/home/index.vue b/src/views/jsxt/home/index.vue new file mode 100644 index 000000000..c84ad8679 --- /dev/null +++ b/src/views/jsxt/home/index.vue @@ -0,0 +1,37 @@ + + + + diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue new file mode 100644 index 000000000..f780baa0d --- /dev/null +++ b/src/views/jsxt/refereeList/index.vue @@ -0,0 +1,87 @@ + + + + diff --git a/src/views/lesson/details.vue b/src/views/lesson/details.vue index c63b2b677..1e6b19fef 100644 --- a/src/views/lesson/details.vue +++ b/src/views/lesson/details.vue @@ -34,7 +34,7 @@ diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatBox.vue index 78c5a0375..72f0a1b69 100644 --- a/src/views/newMap/jointTrainingNew/chatBox.vue +++ b/src/views/newMap/jointTrainingNew/chatBox.vue @@ -19,7 +19,7 @@
- +
@@ -110,6 +110,13 @@ export default { }, setCurrentCoversition(coversition) { this.currentCoversition = coversition; + if (coversition.group) { + this.headerTitle = coversition.name; + } + if (this.recordSending) { + this.cancleRecording(); + } + this.$refs.chatContent.scrollTop(); }, setHeadTitle(headerTitle) { this.headerTitle = headerTitle; @@ -216,6 +223,9 @@ export default { } }); }, + changeCoversition(data) { + this.$refs.chatCoversitionList.changeCoversitionOther(data); + }, handleSetting() { this.$refs.chatSetting.doShow(); }, diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue index 88b23211b..2c94350ae 100644 --- a/src/views/newMap/jointTrainingNew/chatContent.vue +++ b/src/views/newMap/jointTrainingNew/chatContent.vue @@ -1,17 +1,19 @@