Merge branch 'ww' into 'main'

perf: 优化组态中心访问地址

See merge request huang/yun-teng-iot-front!221

@@ -13,10 +13,12 @@ VITE_PUBLIC_PATH = /
 # 线上演示环境
 # 线上演示环境
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # 线上测试环境
 # 线上测试环境
-VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
+# VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
+VITE_PROXY = [["/api","https://dev.thingskit.com/api"],["/thingskit-drawio","http://localhost:3000/"]]
 
 
 # 实时数据的ws地址
 # 实时数据的ws地址
-VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
+# VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
+VITE_WEB_SOCKET = ws://44.99.141.212:8080/api/ws/plugins/telemetry?token=
 
 
 # Delete console
 # Delete console
 VITE_DROP_CONSOLE = true
 VITE_DROP_CONSOLE = true
@@ -32,3 +34,4 @@ VITE_GLOB_API_URL_PREFIX=/yt
 
 
 #configuration
 #configuration
 VITE_GLOB_CONFIGURATION = /thingskit-drawio
 VITE_GLOB_CONFIGURATION = /thingskit-drawio
+

@@ -16,11 +16,13 @@ VITE_BUILD_COMPRESS = 'gzip'
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 
 # Basic interface address SPA
 # Basic interface address SPA
-VITE_GLOB_API_URL=http://47.99.141.212:8080/api
+# VITE_GLOB_API_URL=http://47.99.141.212:8080/api
+VITE_GLOB_API_URL=https://dev.thingskit.com/api
 
 
 # File upload address， optional
 # File upload address， optional
 # It can be forwarded by nginx or write the actual address directly
 # It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=http://47.99.141.212:8080/api/yt/oss/upload
+# VITE_GLOB_UPLOAD_URL=http://47.99.141.212:8080/api/yt/oss/upload
+VITE_GLOB_UPLOAD_URL=https://dev.thingskit.com/api/yt/oss/upload
 
 
 # Interface prefix
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=/yt
 VITE_GLOB_API_URL_PREFIX=/yt
@@ -35,7 +37,9 @@ VITE_USE_PWA = false
 VITE_LEGACY = true
 VITE_LEGACY = true
 
 
 # 实时数据的ws地址
 # 实时数据的ws地址
-VITE_WEB_SOCKET = ws://47.99.141.212:8080/api/ws/plugins/telemetry?token=
+VITE_WEB_SOCKET = wss://dev.thingskit.com/api/ws/plugins/telemetry?token=
+# VITE_WEB_SOCKET = ws://47.99.141.212:8080/api/ws/plugins/telemetry?token=
 
 
 #configuration
 #configuration
 VITE_GLOB_CONFIGURATION = http://localhost:3000
 VITE_GLOB_CONFIGURATION = http://localhost:3000
+

@@ -81,7 +81,7 @@
   } from '/@/api/configuration/center/configurationCenter';
   } from '/@/api/configuration/center/configurationCenter';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 
 
-  import { getAppEnvConfig } from '/@/utils/env';
+  import { getAppEnvConfig, isDevMode } from '/@/utils/env';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
 
 
   export default defineComponent({
   export default defineComponent({
@@ -95,6 +95,7 @@
     },
     },
     setup() {
     setup() {
       const { VITE_GLOB_CONFIGURATION } = getAppEnvConfig();
       const { VITE_GLOB_CONFIGURATION } = getAppEnvConfig();
+      const isDev = isDevMode();
       const searchInfo = reactive<Recordable>({});
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 表格hooks
       // 表格hooks
@@ -157,10 +158,16 @@
       };
       };
 
 
       const handlePreview = (record: Recordable | null) => {
       const handlePreview = (record: Recordable | null) => {
-        window.open(`${VITE_GLOB_CONFIGURATION}/?dev=1&configurationId=${record!.id}&lightbox=1`);
+        window.open(
+          `${VITE_GLOB_CONFIGURATION}/${isDev ? '?dev=1&' : '?'}configurationId=${
+            record!.id
+          }&lightbox=1`
+        );
       };
       };
       const handleDesign = (record: Recordable | null) => {
       const handleDesign = (record: Recordable | null) => {
-        window.open(VITE_GLOB_CONFIGURATION + '/?dev=1&configurationId=' + record!.id, '_blank');
+        window.open(
+          `${VITE_GLOB_CONFIGURATION}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}`
+        );
       };
       };
       return {
       return {
         searchInfo,
         searchInfo,