diff --git a/quasar.conf.js b/quasar.conf.js index 6c637f7..1a04b15 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -73,11 +73,6 @@ module.exports = configure(function (ctx) { https: false, port: 8080, open: true, // opens browser window automatically - 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 diff --git a/src/App.vue b/src/App.vue index 70f955c..7ff6ab6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -119,7 +119,7 @@ export default defineComponent({ console.log(e); } - EventBus.getInstance().on(EventNamesDefine.CheckDebug2, () => { + EventBus.getInstance().on(EventNamesDefine.CheckDebug, () => { const to_normal_url = () => { const p1 = window.location.href.indexOf("?debug"); const p2 = window.location.href.indexOf("#"); diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue index d320891..f07957b 100644 --- a/src/components/ControlPanelDialog.vue +++ b/src/components/ControlPanelDialog.vue @@ -2004,9 +2004,13 @@ export default defineComponent({ if (wall_dom) { if(item.cmw==1214){ item.w=wall_dom.offsetWidth*0.5 + }else{ + item.w=(item.cmw/1214) *(wall_dom.offsetWidth*0.5) } if(item.cmh==684){ item.h=wall_dom.offsetHeight*0.5 + }else{ + item.h=(item.cmh/684) *(wall_dom.offsetHeight*0.5) } item.InitialH = item.h; item.InitialW = item.w;