diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 06ea50e3a..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,7 +2,7 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 diff --git a/src/views/newMap/displayNew/demon/runPlanLoad.vue b/src/views/newMap/displayNew/demon/runPlanLoad.vue index 1e3307a19..5f78e3307 100644 --- a/src/views/newMap/displayNew/demon/runPlanLoad.vue +++ b/src/views/newMap/displayNew/demon/runPlanLoad.vue @@ -1,5 +1,5 @@ @@ -29,6 +29,12 @@ export default { computed: { title() { return this.$t('display.runPlan.runDiagramPlanTool'); + }, + width() { + return this.$store.state.app.width > 1920 ? 1920 : this.$store.state.app.width; + }, + height() { + return this.$store.state.app.height > 1080 ? 1080 : this.$store.state.app.height; } }, watch: { @@ -72,9 +78,7 @@ export default { position: absolute; z-index: 36; top: 0px; - left: 0px; - width: 100%; - height: 100%; + right: 0px; background: white; } diff --git a/src/views/planSchedule/index.vue b/src/views/planSchedule/index.vue index 5ebd90bad..5ef6d523e 100644 --- a/src/views/planSchedule/index.vue +++ b/src/views/planSchedule/index.vue @@ -1,5 +1,5 @@