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/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}
}
]
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号' }}
+
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 @@
留言板
联系方式
- 购买
+