调整ibp文件配置路径

This commit is contained in:
zyy 2020-03-16 11:02:33 +08:00
parent 925ff55acf
commit 1c78d52fed
22 changed files with 32 additions and 41 deletions

View File

@ -176,8 +176,9 @@ class SkinCode extends defaultStyle {
blueColor: '#0070C0' // 信号灯蓝色 blueColor: '#0070C0' // 信号灯蓝色
}, },
route: { route: {
direction: true, // 自动通过方向 direction: false, // 自动通过方向
offset: { x: 4, y: 0 }, // 自动通过偏移量 radiusR: 8, // 自动通过三角半径
offset: { x: 2, y: 0 }, // 自动通过偏移量
routeColor: '#00FF00' // 自动进路 routeColor: '#00FF00' // 自动进路
}, },
auto: { auto: {

View File

@ -3,44 +3,44 @@ import Group from 'zrender/src/container/Group';
import { triangular } from '../utils/ShapePoints'; import { triangular } from '../utils/ShapePoints';
class ESigDrict extends Group { class ESigDrict extends Group {
constructor(model) { constructor(model) {
super(); super();
this.model = model; this.model = model;
this.create(); this.create();
} }
create() { create() {
const model = this.model; const model = this.model;
const style = this.model.style; const style = this.model.style;
this.isNew = true; this.isNew = true;
this.sigDrict = new Polygon({ this.sigDrict = new Polygon({
zlevel: model.zlevel, zlevel: model.zlevel,
z: model.z, z: model.z,
shape: { 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: { style: {
stroke: style.backgroundColor, stroke: style.backgroundColor,
lineWidth: 0.5, lineWidth: 0.5,
fill: style.Signal.route.routeColor fill: style.Signal.route.routeColor
} }
}); });
this.add(this.sigDrict); this.add(this.sigDrict);
this.sigDrict.hide(); this.sigDrict.hide();
} }
// 隐藏 // 隐藏
hide() { hide() {
this.sigDrict.hide(); this.sigDrict.hide();
} }
// 显示 // 显示
show() { show() {
this.sigDrict.show(); this.sigDrict.show();
} }
setStyle(styles) { setStyle(styles) {
this.sigDrict.setStyle( styles ); this.sigDrict.setStyle( styles );
} }
} }

View File

@ -32,7 +32,6 @@ const UserSimulation = () => import('@/views/system/userSimulation/index');
const ExistingSimulation = () => import('@/views/system/existingSimulation/index'); const ExistingSimulation = () => import('@/views/system/existingSimulation/index');
const CacheControl = () => import('@/views/system/cacheControl/index'); const CacheControl = () => import('@/views/system/cacheControl/index');
const SystemGenerate = () => import('@/views/system/systemGenerate/index'); const SystemGenerate = () => import('@/views/system/systemGenerate/index');
const IbpDraw = () => import('@/views/system/ibpDraw/index');
const News = () => import('@/views/system/news/index'); const News = () => import('@/views/system/news/index');
const CommandDictionary = () => import('@/views/system/commandDictionary/index'); const CommandDictionary = () => import('@/views/system/commandDictionary/index');
const CommandDictionaryDetail = () => import('@/views/system/commandDictionary/edit'); 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 ScriptDisplay = () => import('@/views/scriptManage/display/index');
const IbpHome = () => import('@/views/ibp/home'); const IbpHome = () => import('@/views/ibp/home');
const IbpDraw = () => import('@/views/ibp/ibpDraw/index');
const TeachDetail = () => import('@/views/teach/detail/index'); const TeachDetail = () => import('@/views/teach/detail/index');
const TeachHome = () => import('@/views/teach/index'); const TeachHome = () => import('@/views/teach/index');
@ -797,13 +797,6 @@ export const asyncRouter = [
roles: [admin] roles: [admin]
}, },
children: [ children: [
// {
// path: 'ibp/edit',
// component: IbpDraw,
// meta: {
// i18n: 'router.ibpDraw'
// }
// },
{ {
path: 'dictionary', path: 'dictionary',
component: Dictionary, component: Dictionary,

View File

@ -94,8 +94,8 @@ class MenuContextHandler {
if (control) { if (control) {
if (this.getPrdType() != '') { if (this.getPrdType() != '') {
const type = State2SimulationMap[this.getPrdType()]; const type = State2SimulationMap[this.getPrdType()];
const status = State2ControlMap[control.controlMode]; // 判断当前模式 // const status = State2ControlMap[control.controlMode]; // 判断当前模式
// const status = 'LocalStationControl'; const status = 'LocalStationControl';
menu = [...menuList[type]]; menu = [...menuList[type]];
// 特殊处理站台的右键操作( 因为小站台不允许有操作 ) // 特殊处理站台的右键操作( 因为小站台不允许有操作 )
if (selected._type == 'StationStand') { if (selected._type == 'StationStand') {

View File

@ -61,7 +61,7 @@ export default {
type: 'primary' type: 'primary'
}, },
{ {
name: '修改绘图', name: '绘图',
handleClick: this.handleModify, handleClick: this.handleModify,
type: 'primary' type: 'primary'
}, },
@ -125,7 +125,7 @@ export default {
}, },
// //
handleModify(index, row) { 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 }); this.$router.push({ path: `/design/ibp/edit`, query: query });
}, },
// //

View File

@ -11,7 +11,7 @@
</transition> </transition>
</template> </template>
<script> <script>
import IbpPlate from '@/views/ibpsystem/index'; import IbpPlate from '@/views/ibp/ibpsystem/index';
import IbpOperate from './ibpOperate/index'; import IbpOperate from './ibpOperate/index';
import localStore from 'storejs'; import localStore from 'storejs';

View File

@ -58,9 +58,6 @@ export default {
]), ]),
ibpId() { ibpId() {
return ['ibp', (Math.random().toFixed(5)) * 100000].join('_'); return ['ibp', (Math.random().toFixed(5)) * 100000].join('_');
},
width() {
return this.canvasWidth - 200;
} }
}, },
watch: { watch: {