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>
|
||||||
<div class="view-content" style="text-align:center;">
|
<div class="view-content" style="text-align:center;">
|
||||||
<span class="title-center">删除</span>
|
<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>
|
||||||
<div class="view-content">
|
<div class="view-content">
|
||||||
<span class="title-center">修改</span>
|
<span class="title-center">修改</span>
|
||||||
@ -374,15 +374,17 @@ export default {
|
|||||||
this.$refs['addForm'].validate((valid) => {
|
this.$refs['addForm'].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
const models = [];
|
const models = [];
|
||||||
this.addModel.modelList.forEach(item => {
|
this.addModel.modelList.forEach(code => {
|
||||||
const model = this.$store.getters['map/getDeviceByCode'](item);
|
const model = this.$store.getters['map/getDeviceByCode'](code);
|
||||||
model.point.y = this.addModel.pointY;
|
const modelData = deepAssign({}, model);
|
||||||
model.height = this.addModel.height;
|
modelData.point.y = this.addModel.pointY;
|
||||||
model.width = this.addModel.width;
|
modelData.height = this.addModel.height;
|
||||||
models.push(model);
|
modelData.width = this.addModel.width;
|
||||||
|
models.push(modelData);
|
||||||
});
|
});
|
||||||
this.$emit('updateMapModel', models);
|
this.$emit('updateMapModel', models);
|
||||||
this.addModel.modelList = [];
|
this.addModel.modelList = [];
|
||||||
|
this.field = '';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user