From 192d1bcd8e1e4dc1295d63bf9d6618891b714582 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 23 八月 2023 17:18:47 +0800
Subject: [PATCH] 12adsa
---
screen_standard/src/assets/main.css | 2 +-
screen_standard/src/views/index.vue | 8 --------
screen_standard/vite.config.js | 15 ++-------------
3 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/screen_standard/src/assets/main.css b/screen_standard/src/assets/main.css
index ead72f7..5df6d48 100644
--- a/screen_standard/src/assets/main.css
+++ b/screen_standard/src/assets/main.css
@@ -10,7 +10,7 @@
margin: 0;
/* height: 100%; */
height: 100vh;
- /* overflow-y: scroll; */
+ overflow-y: hidden;
font-weight: normal;
}
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index 44bd141..98a72b4 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -553,14 +553,6 @@
}
option && myChart.setOption(option);
}
-
-// onBeforeUnmount(()=>{
-// clearTimeout(timer.value)
-// clearTimeout(timer1.value)
-// clearTimeout(timer2.value)
-// clearTimeout(timer3.value)
-// clearTimeout(timer4.value)
-// })
onUnmounted(() => {
clearTimeout(timer.value)
clearTimeout(timer1.value)
diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index af60791..092dcac 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -11,10 +11,6 @@
// https://vitejs.dev/config/
export default defineConfig(({mode, command}) => {
let env = loadEnv(mode, process.cwd(), '')
- console.log('-------');
- console.log(env.VITE_BASE_PATH);
- console.log(env.VITE_BASE_URL);
- console.log('-------');
return {
base:env.VITE_BASE_CONTEXT,
plugins: [
@@ -50,16 +46,9 @@
target: env.VITE_BASE_URL, // 閫氳繃浠ｇ悊鎺ュ彛璁块棶瀹為檯鍦板潃銆傝繖閲屾槸瀹為檯璁块棶鐨勫湴鍧�銆倂ue浼氶�氳繃浠ｇ悊鏈嶅姟鍣ㄦ潵浠ｇ悊璇锋眰
changeOrigin: true,
ws: false, // 鍏佽websocket浠ｇ悊
- // rewrite: (path) => path.replace(/^[env.VITE_BASE_PATH]/, ''), // 灏哸pi鏇挎崲涓虹┖
secure: false,
- rewrite: (path) => path.replace(/^\/api/, '')
- },
- /*'/api' : {
- target: env.VITE_BASE_URL, // 閫氳繃浠ｇ悊鎺ュ彛璁块棶瀹為檯鍦板潃銆傝繖閲屾槸瀹為檯璁块棶鐨勫湴鍧�銆倂ue浼氶�氳繃浠ｇ悊鏈嶅姟鍣ㄦ潵浠ｇ悊璇锋眰
- changeOrigin: true,
- ws: false, // 鍏佽websocket浠ｇ悊
- rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
- }*/
+ rewrite: (path) => path.replace(env.VITE_BASE_PATH, '')
+ }
}
}
}
--
Gitblit v1.9.3