Merge commit 'a5df1e0635866baf7b8c1bc91c4a2334572c9298' into master_v2
This commit is contained in:
commit
80c44141e0
|
@ -75,6 +75,17 @@ module.exports = configure(function (ctx) {
|
||||||
https: false,
|
https: false,
|
||||||
port: 8080,
|
port: 8080,
|
||||||
open: true, // opens browser window automatically
|
open: true, // opens browser window automatically
|
||||||
|
headers: {
|
||||||
|
"Access-Control-Allow-Methods": "POST,GET,PUT,DELETE",
|
||||||
|
"Access-Control-Allow-Credentials": true,
|
||||||
|
"Access-Control-Allow-Origin": "*",
|
||||||
|
"Access-Control-Allow-Headers": "*",
|
||||||
|
},
|
||||||
|
proxy: {
|
||||||
|
"/get_websocket_port": "http://192.168.2.102",
|
||||||
|
"/media_control_client_product.js": "http://192.168.2.102",
|
||||||
|
"/media_control_client_language.js": "http://192.168.2.102",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
// https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework
|
// https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework
|
||||||
|
|
|
@ -117,7 +117,7 @@ export default defineComponent({
|
||||||
console.log(e);
|
console.log(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
EventBus.getInstance().on(EventNamesDefine.CheckDebug, () => {
|
EventBus.getInstance().on(EventNamesDefine.CheckDebug2, () => {
|
||||||
const to_normal_url = () => {
|
const to_normal_url = () => {
|
||||||
const p1 = window.location.href.indexOf("?debug");
|
const p1 = window.location.href.indexOf("?debug");
|
||||||
const p2 = window.location.href.indexOf("#");
|
const p2 = window.location.href.indexOf("#");
|
||||||
|
|
Loading…
Reference in New Issue