From 831cfa4c439c6d073d706a82d2a439f8b1818498 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 16:59:50 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new

---
 src/config/index.js |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/config/index.js b/src/config/index.js
index c3d0747..b01d923 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,9 +1,9 @@
 /*
  * @Author: lzhe lzhe@example.com
  * @Date: 2024-03-26 10:28:33
- * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-07 12:06:03
- * @FilePath: /smart-web/src/config/index.js
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2025-11-14 20:21:40
+ * @FilePath: /cps-web/src/config/index.js
  * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 const DEFAULT_CONFIG = {
@@ -20,10 +20,9 @@
 	CORE_VER: "1.6.9",
 
 	//鎺ュ彛鍦板潃
-	API_URL: process.env.NODE_ENV === 'development' && process.env.VUE_APP_PROXY === 'true' ? "/api" : process.env.VUE_APP_API_BASEURL,
-	API_URL_MY: process.env.NODE_ENV === 'development' && process.env.VUE_APP_PROXY === 'true' ? "/myapi" : process.env.VUE_APP_API_MYBASEURL,
+	API_URL: ['development','local'].includes(process.env.NODE_ENV) && process.env.VUE_APP_PROXY === 'true' ? "/api" : process.env.VUE_APP_API_BASEURL,
 	//璇锋眰瓒呮椂
-	TIMEOUT: 10000,
+	TIMEOUT: 20000,
 
 	//TokenName
 	TOKEN_NAME: "Blade-Auth",
@@ -39,7 +38,7 @@
 
 	//甯冨眬 榛樿锛歞efault | 閫氭爮锛歨eader | 缁忓吀锛歮enu | 鍔熻兘鍧烇細dock
 	//dock灏嗗叧闂爣绛惧拰闈㈠寘灞戞爮
-	LAYOUT: 'default',
+	LAYOUT: 'dock',
 
 	//鑿滃崟鏄惁鎶樺彔
 	MENU_IS_COLLAPSE: false,
@@ -64,13 +63,15 @@
 
 	//鎺у埗鍙伴椤甸粯璁ゅ竷灞�
 	DEFAULT_GRID: {
+		data: {},
 		//榛樿鍒嗘爮鏁伴噺鍜屽搴� 渚嬪 [24] [18,6] [8,8,8] [6,12,6]
 		layout: [12, 6, 6],
 		//灏忕粍浠跺垎甯冿紝com鍙栧��:views/home/components 鏂囦欢鍚�
 		copmsList: [
-			['welcome'],
-			['about', 'ver'],
-			['time', 'progress']
+			// ['welcome'],
+			// ['about', 'ver'],
+			// ['time', 'progress']
+			[],[],[]
 		]
 	}
 }

--
Gitblit v1.9.3