diff --git a/src/api/project.js b/src/api/project.js index d8f9d202c..ff15b0c58 100644 --- a/src/api/project.js +++ b/src/api/project.js @@ -37,46 +37,6 @@ export function getDeviceDetail(id) { method: 'get' }); } -/** 添加/修改屏蔽门设备网关映射配置 */ -export function setPsdConfig(id, data) { - return request({ - url: `/api/device/${id}/config/psd`, - method: 'put', - data: data - }); -} -/** 添加/修改信号机设备网关映射配置 */ -export function setSignalConfig(id, data) { - return request({ - url: `/api/device/${id}/config/signal`, - method: 'put', - data: data - }); -} -/** 添加/修改信号机设备网关映射配置 */ -export function setSwitchConfig(id, data) { - return request({ - url: `/api/device/${id}/config/switch`, - method: 'put', - data: data - }); -} -/** 添加/修改区段设备网关映射配置 */ -export function setSectionConfig(id, data) { - return request({ - url: `/api/device/${id}/config/section`, - method: 'put', - data: data - }); -} -/** 添加/修改端头控制盒网关映射配置 */ -export function setPslConfig(id, data) { - return request({ - url: `/api/device/${id}/config/psl`, - method: 'put', - data: data - }); -} /** 添加/修改ibp盘网关映射配置 */ export function setIbpConfig(id, data) { return request({ @@ -85,15 +45,6 @@ export function setIbpConfig(id, data) { data: data }); } -/** 添加/修改psc控制柜网关映射配置 */ -export function setPscConfig(id, data) { - return request({ - url: `/api/device/${id}/config/psc`, - method: 'put', - data: data - }); -} - /** 添加/修改ibp设备配置 */ export function setVrIbpConfig(id, data) { return request({ diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue index f097aa880..0091f900f 100644 --- a/src/views/system/configLine/config.vue +++ b/src/views/system/configLine/config.vue @@ -84,7 +84,6 @@ export default { 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', - 'signalForceCancelRoute', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'guideNeedRouteSettingFirst', @@ -115,7 +114,7 @@ export default { 'setManualWhenHeadTrainArriveTarget', 'routeDefaultCheckConflict' ], - selectList: ['runMode'], + selectList: ['runMode', 'singleApproachLockCancelRoute'], generalConfig: [ 'lockFirst', 'switchSingleHandle', @@ -123,7 +122,7 @@ export default { 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', - 'signalForceCancelRoute', + 'singleApproachLockCancelRoute', 'runMode', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', @@ -165,7 +164,8 @@ export default { speedList: ['rmAtpSpeed', 'urmAtpSpeed'], numberList: ['figuresOfTripNumber', 'figuresOfServiceNumber'], optionsMap: { - runMode:[{label: 'CBTC级别', value: 'CBTC'}, {label: '点式通信', value: 'ITC'}, {label: '联锁级', value: 'IL'}] + runMode:[{label: 'CBTC级别', value: 'CBTC'}, {label: '点式通信', value: 'ITC'}, {label: '联锁级', value: 'IL'}], + singleApproachLockCancelRoute: [{label: '不能取消', value: 'NOT'}, {label: '延时取消', value: 'DELAY'}, {label: '直接取消', value: 'DIRECT'}] }, remarkMap: { lockFirst: '是否先锁闭——办理过程直接先锁闭区段', @@ -173,7 +173,7 @@ export default { switchSingleHandle: '道岔区段状态改变按单个道岔处理', switchNRTurnChain:'道岔正/反操是否联动', switchSingleLockChain:'道岔单解/锁是否联动', - signalForceCancelRoute:'是否强制取消进路/在接近区段占用时是否依旧强制执行取消进路', + singleApproachLockCancelRoute:'接近区段占用时取消进路方式', runMode:'列车控制模式/级别', initSingleLockSwitch: '初始加载设备时是否默认单锁正线道岔', ctcOverlapOnlyTurnBackStationLock: 'CTC列车进路延续保护仅折返站处锁闭', diff --git a/src/views/system/deviceManage/editConfigGateway.vue b/src/views/system/deviceManage/editConfigGateway.vue index 1cca1986e..b1e9add06 100644 --- a/src/views/system/deviceManage/editConfigGateway.vue +++ b/src/views/system/deviceManage/editConfigGateway.vue @@ -100,34 +100,6 @@ export default { } }, methods: { - // initForm(row) { - // switch (row.type) { - // case 'PSD': { - // this.setDeviceConfigFunction = setPsdConfig; - // break; - // } - // case 'SIGNAL': { - // this.setDeviceConfigFunction = setSignalConfig; - // break; - // } - // case 'SWITCH': { - // this.setDeviceConfigFunction = setSwitchConfig; - // break; - // } - // case 'PSL': { - // this.setDeviceConfigFunction = setPslConfig; - // break; - // } - // case 'PSC': { - // this.setDeviceConfigFunction = setPscConfig; - // break; - // } - // case 'SECTION': { - // this.setDeviceConfigFunction = setSectionConfig; - // break; - // } - // } - // }, initData(row) { this.jsonConfig = '{}'; getDeviceDetail(row.id).then(resp => {