diff --git a/src/api/assist.js b/src/api/assist.js index de8a71d94..09791c67d 100644 --- a/src/api/assist.js +++ b/src/api/assist.js @@ -3,22 +3,25 @@ import request from '@/utils/request'; // 查询指示灯关联信息列表 export function queryAssistListPaged(params, mapId) { return request({ - url: `/api/assist/indicator/section/list/${mapId}`, + // url: `/api/assist/indicator/section/list/${mapId}`, + url: `/api/station/direction/list/${mapId}`, method: 'get', params }); } // 根据id查询单个指示灯关联信息 -export function queryAssistById(id){ +export function queryAssistById(mapId){ return request({ - url: `/api/assist/indicator/section/${id}`, + // url: `/api/assist/indicator/section/${id}`, + url: `/api/station/direction/${mapId}`, method: 'get' }) } // 保存指示灯关联信息 export function saveAssist(data, mapId) { return request({ - url: `/api/assist/indicator/section/save/${mapId}`, + // url: `/api/assist/indicator/section/save/${mapId}`, + url: `/api/station/direction/save/${mapId}`, method: 'post', data }) @@ -26,7 +29,8 @@ export function saveAssist(data, mapId) { // 删除指示灯关联关系 export function deleteAssist(id) { return request({ - url: `/api/assist/indicator/section/delete/${id}`, + // url: `/api/assist/indicator/section/delete/${id}`, + url: `/api/station/direction/delete/${id}`, method: 'delete' }) } diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index 6c8ade51f..bd9b8133d 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -78,7 +78,7 @@ export default class SignalButton extends Group { x1: model.position.x - 1, y1: model.position.y - 1, x2: model.position.x - 1, - y2: model.position.y + 16 + y2: model.position.y + 15 }, style: { lineWidth: 2, @@ -93,7 +93,7 @@ export default class SignalButton extends Group { shape: { x1: model.position.x - 1, y1: model.position.y - 1, - x2: model.position.x + 16, + x2: model.position.x + 15, y2: model.position.y - 1 }, style: { @@ -107,10 +107,10 @@ export default class SignalButton extends Group { zlevel: this.zlevel, z: this.z + 1, shape: { - x1: model.position.x + 16, + x1: model.position.x + 15, y1: model.position.y - 1, - x2: model.position.x + 16, - y2: model.position.y + 16 + x2: model.position.x + 15, + y2: model.position.y + 15 }, style: { lineWidth: 2, @@ -124,9 +124,9 @@ export default class SignalButton extends Group { z: this.z + 1, shape: { x1: model.position.x - 1, - y1: model.position.y + 16, - x2: model.position.x + 16, - y2: model.position.y + 16, + y1: model.position.y + 15, + x2: model.position.x + 15, + y2: model.position.y + 15, }, style: { lineWidth: 2, @@ -204,9 +204,10 @@ export default class SignalButton extends Group { this.leftLine && this.leftLine.hide(); this.rectButton && this.rectButton.show(); this.buttonText && this.buttonText.show(); - // this.leftBoard && this.leftBoard.show(); - // this.rightBoard && this.rightBoard.show(); - // this.top + this.leftBoard && this.leftBoard.hide(); + this.rightBoard && this.rightBoard.hide(); + this.topBoard && this.topBoard.hide(); + this.bottomBoard && this.bottomBoard.hide(); } blockShow() { this.rightLine && this.rightLine.show(); diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue index f9380d6d9..58eb8bffa 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue @@ -117,7 +117,7 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { MouseEvent } from '@/scripts/ConstDic'; import CenterConfig from '../../../../views/newMap/newMapdraft/mapoperate/displayConfig/centerConfig'; - // import { OperateMode } from '@/scripts/ConstDic';564 + // import { OperateMode } from '@/scripts/ConstDic';48 export default { name: 'MapButtonMenu', diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index f928193a5..dfc88db72 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -241,6 +241,14 @@ export default { { label: '默认', value: 'DEFAULT' }, { label: '自动换端', value: 'AUTO' }, { label: '无人折返', value: 'UNMANNED' } - ] + ], + directionLabelList: [ + { label: 'X', value: 'X' }, + { label: 'XF', value: 'XF' }, + { label: 'XD', value: 'XD' }, + { label: 'S', value: 'S' }, + { label: 'SF', value: 'SF' }, + { label: 'SD', value: 'SD' } + ] } }; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 934094017..3f8d2ea6f 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -28,9 +28,9 @@ export function handlerUrl(data) { // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.8.152:9000'; // 袁琪 // BASE_API = 'http://192.168.8.172:9200'; // 旭强 - BASE_API = 'http://192.168.3.15:9000'; // 张赛 + // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 - // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 + BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue index 8cd256cd0..c3a3639e2 100644 --- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue +++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue @@ -34,17 +34,6 @@ queryForm: { show:false }, - modelTypeList: [{value: 'indicator', label: '指示灯'}, {value: 'button', label: '按钮'}], - typeList: [ - {value: 'receive', label:'接'}, - {value: 'deliver', label: '发'}, - {value: 'section', label: '区间'}, - {value: 'assist', label: '辅助'}, - {value: 'main_assist', label: '总辅助'}, - {value: 'receive_assist', label: '接辅助'}, - {value: 'deliver_assist', label: '发辅助'}, - {value: 'change_direction', label: '换方'} - ], queryList: { query: this.queryFunction, height:'500px', @@ -52,28 +41,15 @@ indexShow: true, columns: [ { - title: '主设备', - prop: 'code', - width: 150, + title: '关联车站', + prop: 'stationCode', type: 'tag', - columnValue: (row) => { return this.getMainDeviceName(row.code); }, + columnValue: (row) => { return this.getDeviceName(row.stationCode); }, tagType: (row) => { return ''; } }, { - title: '设备分型', - prop: 'modelType', - width: 150, - type: 'tag', - columnValue: (row) => { return this.getModelType(row.modelType); }, - tagType: (row) => { return ''; } - }, - { - title: '类型', - prop: 'type', - width: 150, - type: 'tag', - columnValue: (row) => { return this.getType(row.type); }, - tagType: (row) => { return ''; } + title: '运行方向', + prop: 'labelEnum' }, { title: '关联区段列表', @@ -83,19 +59,10 @@ tagType: (row) => { return ''; } }, { - title: '关联进路', - prop: 'routeCode', - width: 200, + title: '关联信号机', + prop: 'signalCode', type: 'tag', - columnValue: (row) => { return this.getRouteName(row.routeCode); }, - tagType: (row) => { return ''; } - }, - { - title: '关联站台', - prop: 'standCode', - width: 150, - type: 'tag', - columnValue: (row) => { return this.getStandName(row.standCode); }, + columnValue: (row) => { return this.getDeviceName(row.code); }, tagType: (row) => { return ''; } }, { @@ -139,34 +106,8 @@ return queryAssistListPaged(params, this.mapInfo.id); } }, - getMainDeviceName(code) { + getDeviceName(code) { const device = this.$store.getters['map/getDeviceByCode'](code); - if (device){ - return device.name + '[' + code + ']'; - } else { - return ''; - } - }, - getModelType(modelType) { - if (modelType === 'indicator') { - return '指示灯'; - } else if (modelType === 'button') { - return '按钮'; - } - }, - getType(type) { - const typeElem = this.typeList.find(item => item.value === type); - return typeElem.label; - }, - getRouteName(routeCode) { - if (routeCode) { - return this.filterRouteMap[routeCode] + '[' + routeCode + ']' - } else { - return ''; - } - }, - getStandName(standCode) { - const device = this.$store.getters['map/getDeviceByCode'](standCode); return device ? device.name : ''; }, getSectionName(sectionList) { diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue index dcf1e2921..f84bd881d 100644 --- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue +++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/index.vue @@ -4,7 +4,6 @@ ref="routeEdit" :selected="selected" :map-info="mapInfo" - :route-data="routeData" @setCenter="setCenter" /> diff --git a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue index 03d569c33..09550c70d 100644 --- a/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue +++ b/src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue @@ -4,44 +4,31 @@ - - - - - + + {{ $t('map.activate') }} - - + + - - - - - - + {{ $t('map.activate') }} - - + + - {{ $t('map.activate') }} - - - - - - + {{$t('map.activate')}}
@@ -90,11 +63,11 @@