diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index 1f4dbd6ee..3e8fe2a1b 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -176,8 +176,9 @@ class SkinCode extends defaultStyle { blueColor: '#0070C0' // 信号灯蓝色 }, route: { - direction: true, // 自动通过方向 - offset: { x: 4, y: 0 }, // 自动通过偏移量 + direction: false, // 自动通过方向 + radiusR: 8, // 自动通过三角半径 + offset: { x: 2, y: 0 }, // 自动通过偏移量 routeColor: '#00FF00' // 自动进路 }, auto: { diff --git a/src/jmapNew/shape/Signal/ESigRoute.js b/src/jmapNew/shape/Signal/ESigRoute.js index 11df58356..d379919ee 100644 --- a/src/jmapNew/shape/Signal/ESigRoute.js +++ b/src/jmapNew/shape/Signal/ESigRoute.js @@ -3,44 +3,44 @@ import Group from 'zrender/src/container/Group'; import { triangular } from '../utils/ShapePoints'; class ESigDrict extends Group { - constructor(model) { - super(); - this.model = model; - this.create(); - } + constructor(model) { + super(); + this.model = model; + this.create(); + } - create() { - const model = this.model; - const style = this.model.style; + create() { + const model = this.model; + const style = this.model.style; - this.isNew = true; - this.sigDrict = new Polygon({ + this.isNew = true; + this.sigDrict = new Polygon({ zlevel: model.zlevel, z: model.z, shape: { - points: triangular(model.x, model.y, model.drict, style.Signal.lamp.radiusR) + points: triangular(model.x, model.y, model.drict, style.Signal.route.radiusR) }, style: { stroke: style.backgroundColor, lineWidth: 0.5, fill: style.Signal.route.routeColor } - }); - this.add(this.sigDrict); + }); + this.add(this.sigDrict); this.sigDrict.hide(); - } + } - // 隐藏 - hide() { - this.sigDrict.hide(); - } + // 隐藏 + hide() { + this.sigDrict.hide(); + } - // 显示 - show() { - this.sigDrict.show(); - } + // 显示 + show() { + this.sigDrict.show(); + } setStyle(styles) { - this.sigDrict.setStyle( styles ); + this.sigDrict.setStyle( styles ); } } diff --git a/src/router/index.js b/src/router/index.js index fcf6592ea..2b781f5d0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -32,7 +32,6 @@ const UserSimulation = () => import('@/views/system/userSimulation/index'); const ExistingSimulation = () => import('@/views/system/existingSimulation/index'); const CacheControl = () => import('@/views/system/cacheControl/index'); const SystemGenerate = () => import('@/views/system/systemGenerate/index'); -const IbpDraw = () => import('@/views/system/ibpDraw/index'); const News = () => import('@/views/system/news/index'); const CommandDictionary = () => import('@/views/system/commandDictionary/index'); const CommandDictionaryDetail = () => import('@/views/system/commandDictionary/edit'); @@ -59,6 +58,7 @@ const ScriptmanageHome = () => import('@/views/scriptManage/home'); const ScriptDisplay = () => import('@/views/scriptManage/display/index'); const IbpHome = () => import('@/views/ibp/home'); +const IbpDraw = () => import('@/views/ibp/ibpDraw/index'); const TeachDetail = () => import('@/views/teach/detail/index'); const TeachHome = () => import('@/views/teach/index'); @@ -797,13 +797,6 @@ export const asyncRouter = [ roles: [admin] }, children: [ - // { - // path: 'ibp/edit', - // component: IbpDraw, - // meta: { - // i18n: 'router.ibpDraw' - // } - // }, { path: 'dictionary', component: Dictionary, diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js index fc730f27a..1c738b885 100644 --- a/src/scripts/cmdPlugin/MenuContextHandler.js +++ b/src/scripts/cmdPlugin/MenuContextHandler.js @@ -94,8 +94,8 @@ class MenuContextHandler { if (control) { if (this.getPrdType() != '') { const type = State2SimulationMap[this.getPrdType()]; - const status = State2ControlMap[control.controlMode]; // 判断当前模式 - // const status = 'LocalStationControl'; + // const status = State2ControlMap[control.controlMode]; // 判断当前模式 + const status = 'LocalStationControl'; menu = [...menuList[type]]; // 特殊处理站台的右键操作( 因为小站台不允许有操作 ) if (selected._type == 'StationStand') { diff --git a/src/views/ibp/home.vue b/src/views/ibp/home.vue index b53b71ea3..52b3d1b08 100644 --- a/src/views/ibp/home.vue +++ b/src/views/ibp/home.vue @@ -61,7 +61,7 @@ export default { type: 'primary' }, { - name: '修改绘图', + name: '绘图', handleClick: this.handleModify, type: 'primary' }, @@ -125,7 +125,7 @@ export default { }, // 进入绘图数据 handleModify(index, row) { - const query = { mapId: this.$route.params.mapId, stationCode: '33333' }; + const query = { mapId: this.$route.params.mapId, stationCode: row.stationCode, ibpId: row.id }; this.$router.push({ path: `/design/ibp/edit`, query: query }); }, // 更新 diff --git a/src/views/system/ibpDraw/ibpOperate/ibpAlarm.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpAlarm.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpAlarm.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpAlarm.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpAppendageBox.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpAppendageBox.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpAppendageBox.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpAppendageBox.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpArrow.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpArrow.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpArrow.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpArrow.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpBg.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpBg.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpBg.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpBg.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpButton.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpButton.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpClock.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpClock.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpClock.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpClock.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpElevator.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpElevator.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpElevator.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpElevator.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpKey.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpKey.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpKey.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpKey.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpLamp.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpLamp.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpLamp.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpLamp.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpLine.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpLine.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpLine.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpLine.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpRotateTip.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpRotateTip.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpRotateTip.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpRotateTip.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpTelephoneTerminal.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpTelephoneTerminal.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpTelephoneTerminal.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpTelephoneTerminal.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpText.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpText.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpText.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpText.vue diff --git a/src/views/system/ibpDraw/ibpOperate/ibpTipBox.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpTipBox.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/ibpTipBox.vue rename to src/views/ibp/ibpDraw/ibpOperate/ibpTipBox.vue diff --git a/src/views/system/ibpDraw/ibpOperate/index.vue b/src/views/ibp/ibpDraw/ibpOperate/index.vue similarity index 100% rename from src/views/system/ibpDraw/ibpOperate/index.vue rename to src/views/ibp/ibpDraw/ibpOperate/index.vue diff --git a/src/views/system/ibpDraw/index.vue b/src/views/ibp/ibpDraw/index.vue similarity index 97% rename from src/views/system/ibpDraw/index.vue rename to src/views/ibp/ibpDraw/index.vue index 02a31261d..0af5f67a6 100644 --- a/src/views/system/ibpDraw/index.vue +++ b/src/views/ibp/ibpDraw/index.vue @@ -11,7 +11,7 @@