From 58647b225caba5add6e2848c91e81eb280795b2d Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Tue, 4 Mar 2025 12:51:32 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=A0=A0=ED=82=A8=EC=8A=A4=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jenkinsfile b/jenkinsfile index 2ece8aa..d554d83 100644 --- a/jenkinsfile +++ b/jenkinsfile @@ -30,9 +30,10 @@ pipeline { steps { // 로컬 Nginx 서버 재실행 bat ''' - taskkill /f /im nginx.exe > nul 2>&1 - ping -n 3 127.0.0.1 > nul - start "" "C:\\nginx\\nginx.exe" + net stop localnginx + ping -n 5 127.0.0.1 > nul + net start localnginx + ping -n 5 127.0.0.1 > nul ''' } } From af63fd12b67a30020c474d7ef138c6510dec06d0 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Tue, 4 Mar 2025 13:24:24 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.dev b/.env.dev index b3fdefe..4da29f6 100644 --- a/.env.dev +++ b/.env.dev @@ -1,6 +1,6 @@ VITE_DOMAIN = https://192.168.0.251:5173/ # VITE_LOGIN_URL = http://localhost:10325/ms/ -VITE_SERVER = httpS://192.168.0.251:10300/ +VITE_SERVER = https://192.168.0.251:10300/ VITE_API_URL = https://192.168.0.251:10300/api/ VITE_TEST_URL = https://192.168.0.251:10300/test/ VITE_KAKAO_MAP_KEY=6f092e8f45ee81186bb6d8408f66a492 \ No newline at end of file From 3ba4718e0a4214d600c7ab9b574280cf54ecc5d4 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Tue, 4 Mar 2025 13:52:25 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=A9=94=EB=89=B4=EB=B0=94=20pc=20?= =?UTF-8?q?=EA=B3=A0=EC=A0=95=20=EB=B0=8F=20=ED=86=A0=EA=B8=80=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 3 +-- public/js/main.js | 4 +++- src/layouts/TheMenu.vue | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 3a0ef47..95cc0cd 100644 --- a/index.html +++ b/index.html @@ -32,7 +32,6 @@ - @@ -77,7 +76,7 @@ - + themeConfig diff --git a/public/js/main.js b/public/js/main.js index 047566f..102f787 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -111,5 +111,7 @@ // If current layout is vertical and current window screen is > small // Auto update menu collapsed/expanded based on the themeConfig - window.Helpers.setCollapsed(true, false); + // 250304 pc 화면에서 메뉴바 고정을 위해 false 처리 + window.Helpers.setCollapsed(false, false); + //window.Helpers.setCollapsed(true, false); })(); diff --git a/src/layouts/TheMenu.vue b/src/layouts/TheMenu.vue index f82dba7..6c5c44c 100644 --- a/src/layouts/TheMenu.vue +++ b/src/layouts/TheMenu.vue @@ -23,9 +23,10 @@ LOCALNET - + +
From fbd345403a8a0b86d70e327c832411c2bbbec35f Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Tue, 4 Mar 2025 13:53:25 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 95cc0cd..3859f38 100644 --- a/index.html +++ b/index.html @@ -76,7 +76,7 @@ - themeConfig +