joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

西安二号线调整&宁波一号线vue告警调整&仿真鼠标样式调整

Browse Source
This commit is contained in:
fan 2020-04-17 15:02:35 +08:00
parent 795ad48e32
commit 2100144656
6 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jmapNew/config/skinCode/xian_02.js
View File

@ -14,7 +14,7 @@ class SkinCode extends defaultStyle {
distance: 18, // 文字离区段距离
fontSize: 11, // 字体大小
fontWeight: 'normal', // 字体粗细
fontColor: 'lightgreen', // 字体颜色
fontColor: '#FFFFFF', // 字体颜色
textAlign: 'center', // 水平对齐方式
textPosition: 'inside', // 文字位置
textVerticalAlign: 'middle' // 文字垂直对齐方式
@ -399,7 +399,7 @@ class SkinCode extends defaultStyle {
position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
offset: {x: 0, y: 8}, // 道岔名称与区段距离
fontSize: 11, // 字体大小
fontColor: '#C0C0C0', // 道岔名称颜色
fontColor: '#FFFFFF', // 道岔名称颜色
fontWeight: 'normal', // 字体粗细
borderColor: '#FE0000', // 道岔边框颜色
lossColor: 'lightgreen', // 道岔失去颜色
@ -552,23 +552,23 @@ class SkinCode extends defaultStyle {
distance: 30, // 模式间距
psd: {
text: 'PSD',
defaultColor: '#FFF'
defaultColor: '#9F9C9C'
},
mfa: {
text: 'MFA',
defaultColor: '#FFF'
defaultColor: '#9F9C9C'
},
mfb: {
text: 'MFB',
defaultColor: '#FFF'
defaultColor: '#9F9C9C'
},
pfa: {
text: 'PFA',
defaultColor: '#FFF'
defaultColor: '#9F9C9C'
},
pfb: {
text: 'PFB',
defaultColor: '#FFF'
defaultColor: '#9F9C9C'
}
};
this[deviceType.ReturnModeGroup] = {

4
src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue
View File

@ -24,8 +24,8 @@
</el-row>
<div v-if="passModel">
<div style="height: 12px" />
<el-radio :id="upRadioId" v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'" @change="changeRadio">设置自动通过</el-radio>
<el-radio :id="upRadioId" v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'" @change="changeRadio">取消自动通过</el-radio>
<el-radio v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'" @change="changeRadio">设置自动通过</el-radio>
<el-radio v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'" @change="changeRadio">取消自动通过</el-radio>
</div>
<el-row justify="center" class="button-group">
<el-col :span="10" :offset="2">

3
src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
View File

@ -64,7 +64,8 @@ export default {
row: null,
operation: '',
stationLists: [],
disabledAll: false
disabledAll: false,
checked2: false
};
},
computed: {

4
src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
View File

@ -24,10 +24,10 @@
</el-row>
<el-row style="margin: 12px 0;">
<el-col :span="11">
<el-radio :id="upRadioId" v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'">设置</el-radio>
<el-radio v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'">设置</el-radio>
</el-col>
<el-col :span="11" :offset="2">
<el-radio :id="upRadioId" v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'">取消</el-radio>
<el-radio v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'">取消</el-radio>
</el-col>
</el-row>
<el-row justify="center" class="button-group">

12
src/views/newMap/displayNew/index.vue
View File

@ -324,11 +324,15 @@ export default {
} else {
this.mouseNumTime += 1;
}
if (this.mapBoxP) {
if (this.mouseNumTime >= 8) {
this.mapBoxP.style.cursor = 'none'; // canvas 单个绘图层级只设置一层就好
if (this.mapBox) {
if (this.mouseNumTime >= 15) {
for (let i = 0; i < this.mapBox.length; i++) {
this.mapBox[i].style.cursor = 'none';
}
} else {
this.mapBoxP.style.cursor = '';
for (let i = 0; i < this.mapBox.length; i++) {
this.mapBox[i].style.cursor = '';
}
}
}
}, 1000);

37
src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
View File

@ -17,6 +17,9 @@
<div style="height: calc(100% - 46px);">
<el-scrollbar wrap-class="scrollbar-wrapper">
<config-data ref="make" :form="formMake" :form-model="addModel" :rules="createRules" />
<div style="color: #99a9bf;font-size: 12px;text-align: center;">
<span>提示:设置归属车站时，坐标会默认设置为车站下方50px</span>
</div>
</el-scrollbar>
</div>
<div class="button_box">
@ -52,7 +55,7 @@ export default {
data() {
return {
activeName: 'first',
autoList: [],
selectLists: [],
atsControlList: [],
centerCommunicationList: [],
chainControlList: [],
@ -177,12 +180,12 @@ export default {
labelWidth: '150px',
items: [
{ prop:'type', label: this.$t('map.saidLampType'), type: 'select', optionLabel: 'name', optionValue: 'value', options: this.typeList},
{ prop: 'name', label: this.$t('map.saidLampName'), type: 'input', isHidden: this.noNameTypeList.includes(this.editModel.type) },
{ prop: 'name', label: this.$t('map.saidLampName'), type: 'input', isHidden: this.noNameTypeList.includes(this.addModel.type) },
{ prop:'stationCode', label: '所属车站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, change: true, deviceChange: this.changeBelongStation},
{ prop: 'position', label: this.$t('map.textPoints'), type: 'coordinate', width: '140px', children: [
{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
{ prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
] },
{ prop:'stationCode', label: '所属车站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList}
] }
]
};
return form;
@ -366,20 +369,6 @@ export default {
break;
}
},
changeStation(code) { // 选择对应的所属设备集中站
this.autoList.forEach(elem => {
if (elem.code == code) {
this.addModel.stationCode = elem.stationCode;
}
});
},
changeEditStation(code) { // 选择对应的所属设备集中站
this.autoList.forEach(elem => {
if (elem.code == code) {
this.editModel.stationCode = elem.stationCode;
}
});
},
deviceChange(code) {
this.$emit('setCenter', code);
this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
@ -450,6 +439,18 @@ export default {
}
return idPrefix;
},
changeBelongStation(code) {
console.log(code, '===============');
if (code) {
this.stationList.forEach(item => {
if (item.code === code) {
this.addModel.position.x = item.position.x;
this.addModel.position.y = item.position.y + 50;
}
});
}
},
// 创建对象
create() {
this.$refs.make.validate((valid) => {