调整默认配置
This commit is contained in:
zyy
parent
e934860885
commit
4e36c7b456
@ -11,7 +11,7 @@ import { selectLineCode } from './config/deviceStyle';
|
||||
import { deviceFactory, createBoundingRect, calculateDCenter } from './utils/parser';
|
||||
import { deepAssign } from '@/utils/index';
|
||||
import store from '@/store/index_APP_TARGET';
|
||||
import Vue from 'vue';
|
||||
import { loadPropConvert } from './theme/factory';
|
||||
|
||||
const renderer = 'canvas';
|
||||
const devicePixelRatio = 1;
|
||||
@ -179,7 +179,7 @@ class Jlmap {
|
||||
}
|
||||
}
|
||||
}
|
||||
const screenSplit = opts.list.length ? opts.list : Vue.prototype.$theme.loadPropConvert(store.state.map.map.skinVO.code).screenSplit;
|
||||
const screenSplit = opts.list.length ? opts.list : loadPropConvert(store.state.map.map.skinVO.code).screenSplit;
|
||||
const splitList = JSON.parse(JSON.stringify(screenSplit));
|
||||
const num = screenSplit.length + 1;
|
||||
const offsetY = (opts.height - 100) / num; // 高度差
|
||||
|
||||
@ -174,7 +174,7 @@ class MouseController extends Eventful {
|
||||
|
||||
moveEvent(e) {
|
||||
const newEm = new EventModel(e);
|
||||
const trainDetails = store.state.map.trainDetails;
|
||||
const trainDetails = store.state.map.trainDetails; // 获取当前拿到train详情 对比 移除
|
||||
if (trainDetails) {
|
||||
if (newEm.deviceType != deviceType.Train || trainDetails.code != newEm.deviceCode) {
|
||||
var instance = (this.$jmap.getDeviceByCode(trainDetails.code) || {} ).instance;
|
||||
@ -285,7 +285,7 @@ class MouseController extends Eventful {
|
||||
}
|
||||
});
|
||||
this.deviceList = includeDeviceList;
|
||||
store.dispatch('map/setSeclectDeviceList', this.deviceList);
|
||||
store.dispatch('map/setSeclectDeviceList', this.deviceList); // 给store设置框选的 model
|
||||
}
|
||||
// 生成包围盒对象坐标
|
||||
createFakeBoundingRect(instance) {
|
||||
|
||||
@ -36,6 +36,12 @@ class Signal extends Group {
|
||||
y: 0
|
||||
};
|
||||
}
|
||||
if (!model.positionPoint.x) {
|
||||
model.positionPoint.x = 0;
|
||||
}
|
||||
if (!model.positionPoint.y) {
|
||||
model.positionPoint.y = 0;
|
||||
}
|
||||
this.cbtcStatus = '';
|
||||
this.create();
|
||||
this.createMouseEvent();
|
||||
@ -53,6 +59,12 @@ class Signal extends Group {
|
||||
const drict = this.model.right ? 1 : -1; // 朝向 左:右
|
||||
const posit = this.model.positionType == '01' ? -1 : 1; // 位置 上:下
|
||||
|
||||
model.position.x = Number(model.position.x);
|
||||
model.position.y = Number(model.position.y);
|
||||
model.positionPoint.x = Number(model.positionPoint.x);
|
||||
model.positionPoint.y = Number(model.positionPoint.y);
|
||||
model.namePosition.x = Number(model.namePosition.x);
|
||||
model.namePosition.y = Number(model.namePosition.y);
|
||||
// 信号机高柱矮柱 (信号机底座)
|
||||
this.sigPost = new ESigPost({
|
||||
zlevel: this.zlevel,
|
||||
|
||||
@ -214,7 +214,7 @@ export default class Train extends Group {
|
||||
setDirectionType(right, flag) {
|
||||
if (this.style.Train.trainStatusStyle.directionType.length > 0) {
|
||||
this.style.Train.trainStatusStyle.directionType.forEach((item) => {
|
||||
if (right === item.type) {
|
||||
if (right == item.type) {
|
||||
let lineLShow = item.lineLShow;
|
||||
let arrowLShow = item.arrowLShow;
|
||||
let lineRShow = item.lineRShow;
|
||||
@ -238,7 +238,7 @@ export default class Train extends Group {
|
||||
setDirectionStopType(right) {
|
||||
if (this.style.Train.trainStatusStyle.directionStopType.length > 0) {
|
||||
this.style.Train.trainStatusStyle.directionStopType.forEach((item) => {
|
||||
if (right === item.type) {
|
||||
if (right == item.type) {
|
||||
if (this.style.Train.trainHead.directionStopType == 'special') {
|
||||
this.trainL && this.trainL.setArrowShow(item.lineLShow);
|
||||
this.trainR && this.trainR.setArrowShow(item.lineRShow);
|
||||
|
||||
@ -400,6 +400,13 @@ export const menuOperate = {
|
||||
|
||||
};
|
||||
|
||||
/**
|
||||
* 发送请求参数
|
||||
* @param {*} operate
|
||||
* @param {*} paramList 请求参数
|
||||
* @param {*} over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作
|
||||
* @param {*} val 教学模式val 校验模式判断
|
||||
*/
|
||||
export function commitOperate(operate, paramList, over, val) {
|
||||
const step = {
|
||||
start: true,
|
||||
@ -408,7 +415,6 @@ export function commitOperate(operate, paramList, over, val) {
|
||||
};
|
||||
if (val) { step.val = val; }
|
||||
step.param = paramList;
|
||||
// over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作
|
||||
if (over == 0 || over == 3) {
|
||||
const codeList = Object.values(paramList);
|
||||
step.code = codeList[0];
|
||||
|
||||
@ -179,10 +179,7 @@ export default {
|
||||
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
|
||||
},
|
||||
title() {
|
||||
if ( this.operation == OperationEvent.Section.alxeEffective.menu.operation || this.operation == OperationEvent.Switch.alxeEffective.menu.operation ) {
|
||||
return '确认计轴恢复工作';
|
||||
}
|
||||
return '';
|
||||
return '确认计轴恢复工作';
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
|
||||
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
|
||||
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
|
||||
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
|
||||
import { commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
|
||||
import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
|
||||
|
||||
export default {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<el-form ref="form" :label-width="form.labelWidth" size="mini" :rules="rules" :model="formModel" class="form_data">
|
||||
<template v-for="(items, index) in form.items">
|
||||
<div v-if="items.item.length" :key="index" class="card" :class="{'card_code' : !items.name}">
|
||||
<div class="card_title">{{ items.name }}</div>
|
||||
<fieldset v-if="items.item.length" :key="index" class="card">
|
||||
<legend class="card_title">{{ items.name }}</legend>
|
||||
<template v-for="item in items.item">
|
||||
<template v-if="checkFieldType(item, 'select')">
|
||||
<el-form-item v-if="!item.isHidden" :key="item.prop" :label="item.label" :prop="item.prop" :required="item.required">
|
||||
@ -268,7 +268,7 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
</template>
|
||||
</div>
|
||||
</fieldset>
|
||||
</template>
|
||||
<slot />
|
||||
</el-form>
|
||||
@ -368,7 +368,6 @@ export default {
|
||||
font-size: 14px;
|
||||
color: #606266;
|
||||
line-height: 40px;
|
||||
// padding: 0 12px 0 0;
|
||||
-webkit-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
line-height: 28px;
|
||||
@ -419,28 +418,12 @@ export default {
|
||||
|
||||
.card{
|
||||
border: 1px solid #ccc;
|
||||
padding: 10px;
|
||||
padding-top: 18px;
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
margin-bottom: 15px;
|
||||
|
||||
&:last-child{
|
||||
margin-bottom: 0;
|
||||
}
|
||||
margin-bottom: 5px;
|
||||
|
||||
.card_title {
|
||||
position: absolute;
|
||||
left: 10px;
|
||||
top: -8px;
|
||||
background: #fff;
|
||||
padding: 0px 5px;
|
||||
}
|
||||
}
|
||||
.card_code{
|
||||
border: 0px solid #ccc;
|
||||
padding: 0px;
|
||||
}
|
||||
/deep/ {
|
||||
.input-with-select .el-input-group__prepend {
|
||||
background-color: #fff;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user