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

调整地图绘制矩形框保存字段

Browse Source
This commit is contained in:
zyy 2020-03-06 10:21:41 +08:00
parent 30c672026f
commit a1f752fe59
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/utils/parser.js
View File

@ -119,7 +119,7 @@ export function parser(data, skinCode) {
mapDevice[elem.code] = createDevice(deviceType.MapCycleButtonVO, elem, propConvert);
}, this);
zrUtil.each(data.outFrameList || [], elem => {
zrUtil.each(data.outerFrameList || [], elem => {
mapDevice[elem.code] = createDevice(deviceType.OutFrame, elem, propConvert);
}, this);
@ -214,7 +214,7 @@ export function updateMapData(state, model) {
case deviceType.Psd: updateForList(model, state, 'psdList'); break;
case deviceType.Esp: updateForList(model, state, 'espList'); break;
case deviceType.MapCycleButtonVO: updateForList(model, state, 'cycleButtonList'); break;
case deviceType.OutFrame: updateForList(model, state, 'outFrameList'); break;
case deviceType.OutFrame: updateForList(model, state, 'outerFrameList'); break;
}
}
}

4
src/store/modules/map.js
View File

@ -323,9 +323,9 @@ const map = {
return [];
}
},
outFrameList: (state) => {
outerFrameList: (state) => {
if (state.map) {
return state.map.outFrameList || [];
return state.map.outerFrameList || [];
} else {
return [];
}

6
src/views/newMap/newMapdraft/mapoperate/outFrameControl.vue
View File

@ -146,7 +146,7 @@ export default {
},
computed: {
...mapGetters('map', [
'outFrameList'
'outerFrameList'
]),
form() {
const form = {
@ -155,7 +155,7 @@ export default {
draw: {
name: this.$t('map.drawData'),
item: [
{ prop: 'code', label: this.$t('map.lineCoding'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.outFrameList, change: true, deviceChange: this.deviceChange },
{ prop: 'code', label: this.$t('map.lineCoding'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.outerFrameList, change: true, deviceChange: this.deviceChange },
{ prop: 'width', label: '宽度:', type: 'number', min: 1, placeholder: 'px' },
{ prop: 'height', label: '高度:', type: 'number', min: 1, placeholder: 'px' },
{ prop: 'position', label: '坐标:', type: 'coordinate', width: '140px', children: [
@ -225,7 +225,7 @@ export default {
if (valid) {
const model = {
_type: 'OutFrame',
code: getUID('OutFrame', this.outFrameList),
code: getUID('OutFrame', this.outerFrameList),
width: this.addModel.width,
height: this.addModel.height,
position: this.addModel.position