Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
commit
f0d51a2771
@ -22,7 +22,7 @@
|
||||
</div>
|
||||
<div class="view-content" style="text-align:center;">
|
||||
<span class="title-center">删除</span>
|
||||
<el-button type="danger" size="big" @click="removeTrainWindow">{{ $t('map.deleteTrainWindow') }}</el-button>
|
||||
<el-button type="" size="big" @click="removeTrainWindow">{{ $t('map.deleteTrainWindow') }}</el-button>
|
||||
</div>
|
||||
<div class="view-content">
|
||||
<span class="title-center">修改</span>
|
||||
@ -374,15 +374,17 @@ export default {
|
||||
this.$refs['addForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
const models = [];
|
||||
this.addModel.modelList.forEach(item => {
|
||||
const model = this.$store.getters['map/getDeviceByCode'](item);
|
||||
model.point.y = this.addModel.pointY;
|
||||
model.height = this.addModel.height;
|
||||
model.width = this.addModel.width;
|
||||
models.push(model);
|
||||
this.addModel.modelList.forEach(code => {
|
||||
const model = this.$store.getters['map/getDeviceByCode'](code);
|
||||
const modelData = deepAssign({}, model);
|
||||
modelData.point.y = this.addModel.pointY;
|
||||
modelData.height = this.addModel.height;
|
||||
modelData.width = this.addModel.width;
|
||||
models.push(modelData);
|
||||
});
|
||||
this.$emit('updateMapModel', models);
|
||||
this.addModel.modelList = [];
|
||||
this.field = '';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user