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

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

Browse Source
This commit is contained in:
joylink_fanyuhong 2020-02-05 17:30:32 +08:00
commit 7ce1b02447
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/iscs/iscsDraw/iscsOperate/fireHydranAlarmButton.vue
View File

@ -72,7 +72,7 @@ export default {
x: this.addModel.x, x: this.addModel.x,
y: this.addModel.y y: this.addModel.y
}, },
code: this.isUpdate ? this.form.code : getUID('FireHydranAlarmButton', this.iscs.fireHydranAlarmButtonList), code: this.isUpdate ? this.addModel.code : getUID('FireHydranAlarmButton', this.iscs.fireHydranAlarmButtonList),
_type: 'FireHydranAlarmButton', _type: 'FireHydranAlarmButton',
width: this.addModel.width width: this.addModel.width
}; };

2
src/views/iscs/iscsDraw/iscsOperate/gasFireControl.vue
View File

@ -73,7 +73,7 @@ export default {
x: this.addModel.x, x: this.addModel.x,
y: this.addModel.y y: this.addModel.y
}, },
code: this.isUpdate ? this.form.code : getUID('GasFireControl', this.iscs.gasFireControlList), code: this.isUpdate ? this.addModel.code : getUID('GasFireControl', this.iscs.gasFireControlList),
_type: 'GasFireControl', _type: 'GasFireControl',
width: this.addModel.width width: this.addModel.width
}; };

2
src/views/iscs/iscsDraw/iscsOperate/manualAlarmButton.vue
View File

@ -73,7 +73,7 @@ export default {
x: this.addModel.x, x: this.addModel.x,
y: this.addModel.y y: this.addModel.y
}, },
code: this.isUpdate ? this.form.code : getUID('ManualAlarmButton', this.iscs.manualAlarmButtonList), code: this.isUpdate ? this.addModel.code : getUID('ManualAlarmButton', this.iscs.manualAlarmButtonList),
_type: 'ManualAlarmButton', _type: 'ManualAlarmButton',
width: this.addModel.width width: this.addModel.width
}; };

2
src/views/iscs/iscsDraw/iscsOperate/smokeDetector.vue
View File

@ -73,7 +73,7 @@ export default {
x: this.addModel.x, x: this.addModel.x,
y: this.addModel.y y: this.addModel.y
}, },
code: this.isUpdate ? this.form.code : getUID('SmokeDetector', this.iscs.smokeDetectorList), code: this.isUpdate ? this.addModel.code : getUID('SmokeDetector', this.iscs.smokeDetectorList),
_type: 'SmokeDetector', _type: 'SmokeDetector',
width: this.addModel.width width: this.addModel.width
}; };

2
src/views/iscs/iscsDraw/iscsOperate/temperatureDetector.vue
View File

@ -73,7 +73,7 @@ export default {
x: this.addModel.x, x: this.addModel.x,
y: this.addModel.y y: this.addModel.y
}, },
code: this.isUpdate ? this.form.code : getUID('TemperatureDetector', this.iscs.temperatureDetectorList), code: this.isUpdate ? this.addModel.code : getUID('TemperatureDetector', this.iscs.temperatureDetectorList),
_type: 'TemperatureDetector', _type: 'TemperatureDetector',
width: this.addModel.width width: this.addModel.width
}; };