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 diff --git a/index.html b/index.html index 3a0ef47..3859f38 100644 --- a/index.html +++ b/index.html @@ -32,7 +32,6 @@ - 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 ''' } } 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 - + +