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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2021-06-10 16:08:25 +08:00
commit 7577c5571d
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
View File

@ -50,6 +50,9 @@ export default {
if (this.type == 'Text') {
data.content = `${this.editModel.prepend}::${this.editModel.content}`;
}
if (data.type !== 'VB') {
data.signalCode = '';
}
this.$emit('updateMapModel', data);
this.$emit('clearDeviceSelect');
} else {

4
src/views/newMap/newMapdraft/mapoperate/responder/index.vue
View File

@ -15,7 +15,7 @@
@deviceSelect="deviceSelect"
/>
</el-tab-pane>
<el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
<!-- <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
<responder-create
ref="respCreate"
:field="field"
@ -29,7 +29,7 @@
@deviceChange="deviceChange"
@deviceSelect="deviceSelect"
/>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane class="view-control" label="批量创建" name="third" :lazy="lazy">
<responder-batch
ref="respBatch"

19
src/views/newMap/newMapdraft/mapoperate/responder/responderBatch.vue
View File

@ -1,7 +1,7 @@
<template>
<el-form
ref="form"
label-width="80px"
label-width="90px"
:model="formData"
size="mini"
:rules="formRules"
@ -72,7 +72,7 @@
<template v-for="(item, index) in subFormData">
<div :key="`subFormUnit${index}`" class="sub-form-unit">
<el-row>
<el-col :span="12">
<el-col :span="10">
<el-form-item label="名称">
<el-input
v-model="item.name"
@ -85,7 +85,7 @@
<el-select
v-model="item.type"
filterable
placeholder="请选择"
placeholder="请选择类型"
>
<el-option
v-for="opt in responderTypeList"
@ -97,8 +97,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="item.type === 'VB'">
<el-col :span="24">
<el-row>
<el-col :span="10">
<el-form-item label="区段偏移值">
<el-input-number v-model="item.offset" />
</el-form-item>
</el-col>
<el-col :span="14" v-if="item.type === 'VB'">
<el-form-item label="信号机">
<el-select
v-model="item.signalCode"
@ -233,6 +238,7 @@ export default {
return {
name: "",
type: this.formData.type,
offset: 0,
signalCode: ""
};
});
@ -253,6 +259,7 @@ export default {
const models = [];
// 分组
this.subFormData.forEach(el => {
if (el.type !== "VB") el.signalCode = "";
el.sectionCode = this.formData.sectionCode;
if (!groupMap[el.sectionCode]) {
groupMap[el.sectionCode] = [];
@ -260,7 +267,7 @@ export default {
groupMap[el.sectionCode].push(el);
});
// 偏移量计算
// 绘图位置计算
Object.keys(groupMap).forEach(code => {
const section = this.$store.getters[
"map/getDeviceByCode"

2
src/views/newMap/newMapdraft/mapoperate/responder/responderModel.vue
View File

@ -145,7 +145,7 @@ export default {
] },
{ prop:'textRotate', label: '文字旋转', type: 'number' },
{ prop: 'sectionCode', label: '关联区段', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.sectionList, buttonType: 'RelModelSectionCode', hover: this.hover, buttonShowType: this.isSectionButtonType },
{ prop: 'signalCode', label: '关联信号机', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.signalList, buttonType: 'RelModelSignalCode', hover: this.hover, buttonShowType: this.isSignalButtonType },
this.editModel.type === 'VB'? { prop: 'signalCode', label: '关联信号机', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.signalList, buttonType: 'RelModelSignalCode', hover: this.hover, buttonShowType: this.isSignalButtonType } :'',
{ prop: 'stationCode', label: '关联集中站' + ':', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.centralizedStationList }
]
},