diff --git a/config/dev.env.js b/config/dev.env.js index 175e0c9..b6dcf15 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,6 +4,6 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://127.0.0.1:48090"' - // BASE_API: '"http://192.168.1.241:8080/prod-api"' + // BASE_API: '"http://127.0.0.1:48090"' + BASE_API: '"http://192.168.1.241:8080/prod-api"' }) diff --git a/src/views/login.vue b/src/views/login.vue index 3b8d795..3fdc2c5 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -14,7 +14,7 @@ @keyup.enter.native="handleLogin" >
- 智慧大屏 + 国瑞药业驾驶舱平台
@@ -146,6 +146,12 @@ export default { mounted() { this.handleLoginFocus(); }, + created() { + var isTs=true; + if(isTs){ + //window.location.href = 'http://127.0.0.1/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http://localhost:9528/#/login'; + } + }, methods: { handleLoginFocus() { if (this.loginForm.loginName === "") { diff --git a/src/views/screenDesigner/preview.vue b/src/views/screenDesigner/preview.vue index 1ce7598..f5e53f3 100644 --- a/src/views/screenDesigner/preview.vue +++ b/src/views/screenDesigner/preview.vue @@ -54,7 +54,7 @@ export default { "background-attachment": "initial", "background-origin": "initial", "background-clip": "initial", - transform: `scale(${ratioEquipment}, ${ratioEquipment})`, + "transform-origin": "0 0" }; this.widgets = data.dashboard.widgets;