diff --git a/.env b/.env index 4fc23da..54665ec 100644 --- a/.env +++ b/.env @@ -2,13 +2,13 @@ VITE_PORT = 3100 # spa-title -VITE_GLOB_APP_TITLE = 全代码平台 +VITE_GLOB_APP_TITLE = 供应链平台 # spa shortname(英文缩写) -VITE_GLOB_APP_SHORT_NAME = 全代码平台 +VITE_GLOB_APP_SHORT_NAME = 供应链平台 # 应用名称(仅展示在登录页和左上角logo旁,其他情况用VITE_GLOB_APP_TITLE) -VITE_SYSTEM_NAME = 全代码平台 +VITE_SYSTEM_NAME = 供应链平台 # 应用名称简写,用于空间不足的界面显示(左上角logo旁,7个字以内,超出变成...) # VITE_SYSTEM_SHORT_NAME = 全代码平台 diff --git a/.env.development b/.env.development index 4adb53e..cba40ea 100644 --- a/.env.development +++ b/.env.development @@ -13,10 +13,11 @@ VITE_PUBLIC_PATH = / #VITE_PROXY=[["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api/system/oss/","http://127.0.0.1:8091/system/oss/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] -VITE_PROXY=[["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api","http://10.10.2.102:9500"]] +VITE_PROXY=[["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api","http://10.10.2.102:9500"]] # 是否删除Console.log VITE_DROP_CONSOLE = false +VITE_GLOB_APP_TITLE = 供应链平台 # 接口地址 # 如果没有跨域问题,直接在这里配置即可 @@ -45,7 +46,7 @@ VITE_GLOB_PRINT_BASE_URL = http://114.116.210.204:3300 VITE_GLOB_API_URL_PREFIX = #租户开关 -VITE_GLOB_TENANT_ENABLED = true +#VITE_GLOB_TENANT_ENABLED = false #登录时是否需要输入租户码 VITE_GLOB_TENANT_INPUT_REQUIRED = true diff --git a/.env.production b/.env.production index 8edeeff..67ca205 100644 --- a/.env.production +++ b/.env.production @@ -47,7 +47,8 @@ VITE_GLOB_API_URL_PREFIX = # 打包是否开启pwa功能 VITE_USE_PWA = false #租户开关 -VITE_GLOB_TENANT_ENABLED = true +#VITE_GLOB_TENANT_ENABLED = false +VITE_GLOB_APP_TITLE = 供应链平台 #登录时是否需要输入租户码 # VITE_GLOB_TENANT_INPUT_REQUIRED = true diff --git a/package.json b/package.json index 685a5c7..ef5e17d 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "showdown": "^2.1.0", "snowflake-id": "^1.1.0", "sortablejs": "^1.14.0", + "three": "0.152.0", "tinymce": "^5.10.3", "vditor": "^3.9.2", "vue": "~3.3.4", diff --git a/src/assets/images/earth-blue-marble.jpg b/src/assets/images/earth-blue-marble.jpg new file mode 100644 index 0000000..e673a7c Binary files /dev/null and b/src/assets/images/earth-blue-marble.jpg differ diff --git a/src/assets/images/particle-sprite.png b/src/assets/images/particle-sprite.png new file mode 100644 index 0000000..a1e2189 Binary files /dev/null and b/src/assets/images/particle-sprite.png differ diff --git a/src/views/secondDev/Earth3D.vue b/src/views/secondDev/Earth3D.vue new file mode 100644 index 0000000..6b2ef35 --- /dev/null +++ b/src/views/secondDev/Earth3D.vue @@ -0,0 +1,335 @@ + + + + + diff --git a/src/views/secondDev/FormInformation.vue b/src/views/secondDev/FormInformation.vue index 8ccbc9c..6822c29 100644 --- a/src/views/secondDev/FormInformation.vue +++ b/src/views/secondDev/FormInformation.vue @@ -53,6 +53,8 @@ itemRefs.value.push(el); }; + + onBeforeUpdate(() => { itemRefs.value = []; }); diff --git a/src/views/secondDev/Login.vue b/src/views/secondDev/Login.vue index f963fbc..42794a7 100644 --- a/src/views/secondDev/Login.vue +++ b/src/views/secondDev/Login.vue @@ -1,16 +1,25 @@