From 381f26b6615577a432216434c97f318112d924f5 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 28 Jan 2021 18:49:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=89=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=E8=AE=BE=E7=BD=AE/=E5=8F=96=E6=B6=88=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=BF=9B=E8=B7=AF/=E8=87=AA=E5=8A=A8=E6=8A=98?= =?UTF-8?q?=E8=BF=94=20=E5=AE=9E=E8=AE=AD=20=E6=93=8D=E4=BD=9C=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/chengdu_03/operationConfig.js | 57 +++++++++++++++++-- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js index db8bfdf42..8df903f24 100644 --- a/src/jmapNew/theme/chengdu_03/operationConfig.js +++ b/src/jmapNew/theme/chengdu_03/operationConfig.js @@ -29,7 +29,6 @@ // {id: "29", trainingType: "Stand", name: "站台名称"} // {id: "30", trainingType: "Stand", name: "站台编码"} - // {id: "15", trainingType: "Switch", name: "道岔位置"} // {id: "16", trainingType: "Switch", name: "道岔位置(反)"} // {id: "17", trainingType: "Switch", name: "道岔编码"} @@ -829,23 +828,69 @@ export default { { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【退出】按钮' } ] }, - // CMD_SIGNAL_CANCEL_CI_AUTO { maxDuration: 15, minDuration: 8, operateType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO.value, skinCode: '04', - trainingName: '设置自动进路({3} 进路)', + trainingName: '设置自动进路({3})', trainingRemark: '设置自动进路功能', trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' }, - { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL' }, - { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' } + { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' } ], // 成都三号线 特殊配置 类似于哈尔滨线的 atp/联锁进路 配置 - config:{onlySignalOP:true} + config:{autoRouteBT:true} + }, + { + maxDuration: 15, + minDuration: 8, + operateType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO.value, + skinCode: '04', + trainingName: '取消自动进路({3})', + trainingRemark: '取消自动进路功能', + trainingType: 'Signal', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, + { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' } + ], + // 成都三号线 特殊配置 类似于哈尔滨线的 atp/联锁进路 配置 + config:{autoRouteBT:true} + }, + { + maxDuration: 15, + minDuration: 8, + operateType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK.value, + skinCode: '04', + trainingName: '设置自动折返({3})', + trainingRemark: '设置自动折返功能', + trainingType: 'Signal', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' }, + { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' } + ], + // 成都三号线 特殊配置 类似于哈尔滨线的 atp/联锁进路 配置 + config:{autoCycleBT:true} + }, + { + maxDuration: 15, + minDuration: 8, + operateType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK.value, + skinCode: '04', + trainingName: '取消自动折返({3})', + trainingRemark: '取消自动折返功能', + trainingType: 'Signal', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, + { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' } + ], + // 成都三号线 特殊配置 类似于哈尔滨线的 atp/联锁进路 配置 + config:{autoCycleBT:true} } ] From f4e3deaabcbe3a775321857987bfe871f64c594a Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 28 Jan 2021 18:54:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E4=B8=8D=E6=B8=85=E9=99=A4=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/constant/deviceState.js | 7 ++++++- src/views/newMap/mapsystemNew/index.vue | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js index a816ccda0..15d1d5f96 100644 --- a/src/jmapNew/constant/deviceState.js +++ b/src/jmapNew/constant/deviceState.js @@ -77,7 +77,12 @@ deviceState[deviceType.Signal] = { redOpen: 1, // 红灯开放(默认状态) delayTime: 0, // 信号机延迟解锁倒计时 atsControl: 1, // 0是人工，1是自动 - fault: 0 // 是否故障 + fault: 0, // 是否故障 + isStartSignal: 0, // 是否进路排列选中始端信号机 + isTerminalSignal: 0, // 是否进路排列待选终端信号机 + isCiConfirm: 0, // 是否联锁确认（并未进行联锁确认，前端根据流程给的值） + isRequestLock: 0, // 是否请求封锁或请求解封 + isRequestGuide: 0 // 是否请求引导 }; deviceState[deviceType.Station] = { diff --git a/src/views/newMap/mapsystemNew/index.vue b/src/views/newMap/mapsystemNew/index.vue index a9a93c14c..9897d7ca7 100644 --- a/src/views/newMap/mapsystemNew/index.vue +++ b/src/views/newMap/mapsystemNew/index.vue @@ -97,7 +97,7 @@ export default { await this.$store.dispatch('map/clearJlmapTrainView'); await this.$store.dispatch('map/setTrainWindowShow', false); await this.$store.dispatch('training/setMapDefaultState'); - this.clearSubscribe(); + // this.clearSubscribe(); this.$confirm(this.$t('tip.getMapStateDataException'), this.$t('tip.hint'), { confirmButtonText: this.$t('global.confirm'), showCancelButton: false, From 012fdd117f316ababb6a6f71a0d2326ce9601d09 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 28 Jan 2021 20:05:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=9B=BD=E8=B5=9B?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=B4=AD=E4=B9=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/demonMenu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue index e663d6f8a..1b99abcfe 100644 --- a/src/views/newMap/displayNew/demonMenu.vue +++ b/src/views/newMap/displayNew/demonMenu.vue @@ -26,7 +26,7 @@ 留言板 联系方式 - 购买 + Date: Fri, 29 Jan 2021 09:17:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=B7=A5=E4=B8=9A?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/ProjectConfig.js | 2 +- src/views/login/index.vue | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 710c668e8..c613ac6c7 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -476,7 +476,7 @@ export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy']; // 实训设计平台通过项目code获取地图列表的项目 export const CaseHideProjectList = ['heb', 'designheb']; // 案例展示隐藏的项目 export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角版本开发基于不展示 -export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角主体不展示 +export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd']; // 登录页右下角主体不展示 export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy']; // 登录页样式 export const NoQrcodeList = ['heb', 'designheb']; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 7d0c81a58..7ed9d66f9 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -100,7 +100,9 @@ -
主体：北京玖琏科技有限公司 备案号：京ICP备18028522号
+
+ {{ project.endsWith('cgy')?'北京和利时系统工程有限公司、北京玖琏科技有限公司联合开发':'主体：北京玖琏科技有限公司 备案号：京ICP备18028522号' }} +