From ea83d8023afe00b8c6cc5aca10f34cb22845fa29 Mon Sep 17 00:00:00 2001
From: miao <2514145421@qq.com>
Date: Thu, 9 Mar 2023 14:11:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA=E5=99=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AE=BD=E9=AB=98=E7=9A=84=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quasar.conf.js                        | 5 -----
 src/App.vue                           | 2 +-
 src/components/ControlPanelDialog.vue | 4 ++++
 3 files changed, 5 insertions(+), 6 deletions(-)

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;