Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
This commit is contained in:
commit
68a84c9d81
@ -75,9 +75,9 @@ export default {
|
|||||||
this.$store.dispatch('config/resize', { width: width, height: height });
|
this.$store.dispatch('config/resize', { width: width, height: height });
|
||||||
},
|
},
|
||||||
setMapResize(LeftWidth) {
|
setMapResize(LeftWidth) {
|
||||||
const widths = this.$store.state.app.width - 521 - LeftWidth;
|
const width = this.$store.state.app.width - 521 - LeftWidth;
|
||||||
const heights = this.$store.state.app.height - 90;
|
const height = this.$store.state.app.height - 90;
|
||||||
this.$store.dispatch('config/resize', { width: widths, height: heights });
|
this.$store.dispatch('config/resize', { width: width, height: height });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -52,14 +52,8 @@ export default {
|
|||||||
watch: {
|
watch: {
|
||||||
$route(val) {
|
$route(val) {
|
||||||
this.iscsChange(this.$route.params.id);
|
this.iscsChange(this.$route.params.id);
|
||||||
},
|
|
||||||
'$store.state.app.windowSizeCount': function() {
|
|
||||||
this.$store.dispatch('config/resize', { width: this.$store.state.app.width - 521 - this.widthLeft, height: this.$store.state.app.height - 60 });
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
|
||||||
this.$store.dispatch('config/resize', { width: this.$store.state.app.width - 521 - this.widthLeft, height: this.$store.state.app.height - 60 });
|
|
||||||
},
|
|
||||||
mounted() {
|
mounted() {
|
||||||
this.$refs.iscsPlate.show();
|
this.$refs.iscsPlate.show();
|
||||||
this.$refs.iscsPlate.drawIscsInit();
|
this.$refs.iscsPlate.drawIscsInit();
|
||||||
|
@ -68,9 +68,6 @@ export default {
|
|||||||
'$store.state.config.canvasSizeCount': function (val) {
|
'$store.state.config.canvasSizeCount': function (val) {
|
||||||
this.reSize();
|
this.reSize();
|
||||||
},
|
},
|
||||||
'$store.state.app.windowSizeCount': function() {
|
|
||||||
this.setWindowSize();
|
|
||||||
},
|
|
||||||
'$store.state.socket.equipmentStatus': function (val) {
|
'$store.state.socket.equipmentStatus': function (val) {
|
||||||
if (val.length) {
|
if (val.length) {
|
||||||
this.statusMessage(val);
|
this.statusMessage(val);
|
||||||
@ -169,13 +166,6 @@ export default {
|
|||||||
this.$iscs && this.$iscs.resize({ width: this.width, height: this.height });
|
this.$iscs && this.$iscs.resize({ width: this.width, height: this.height });
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
setWindowSize() {
|
|
||||||
this.$nextTick(() => {
|
|
||||||
const width = this.size ? this.size.width : this.$store.state.app.width;
|
|
||||||
const height = this.size ? this.size.height : this.$store.state.app.height;
|
|
||||||
this.$store.dispatch('config/resize', { width: width, height: height });
|
|
||||||
});
|
|
||||||
},
|
|
||||||
back() {
|
back() {
|
||||||
this.group = this.$route.query.group;
|
this.group = this.$route.query.group;
|
||||||
this.$store.dispatch('training/over').then(() => {
|
this.$store.dispatch('training/over').then(() => {
|
||||||
|
Loading…
Reference in New Issue
Block a user