diff --git a/sub-operation-service/.env.development b/sub-operation-service/.env.development index 0aa1dcc..d976afd 100644 --- a/sub-operation-service/.env.development +++ b/sub-operation-service/.env.development @@ -1,5 +1,9 @@ # 开发环境 VITE_PORT = 9526 +<<<<<<< HEAD +======= +VITE_MODE = 'DEV' +>>>>>>> 72be137aba334c5c79ccf1cd83763de284a8f730 VITE_APP_MIAN = 'daimp-front-main' VITE_APP_MIAN_URL = 'http://localhost:9000' VITE_APP_NAME = 'sub-operation-service' @@ -7,3 +11,4 @@ VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:8080' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300' + diff --git a/sub-operation-service/.env.production b/sub-operation-service/.env.production index cecfdc7..1ef59cf 100644 --- a/sub-operation-service/.env.production +++ b/sub-operation-service/.env.production @@ -3,7 +3,7 @@ VITE_APP_MIAN = 'daimp-front-main' VITE_APP_MIAN_URL = 'http://47.109.205.240' VITE_APP_NAME = 'sub-operation-service' # 接口 -VITE_APP_BASE_API = '/apis' +VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = '' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = '' diff --git a/sub-operation-service/package.json b/sub-operation-service/package.json index 02a0bd1..5b02f67 100644 --- a/sub-operation-service/package.json +++ b/sub-operation-service/package.json @@ -1,5 +1,5 @@ { - "name": "sub-operation-admin", + "name": "sub-operation-service", "private": true, "version": "0.0.1", "type": "module", diff --git a/sub-operation-service/src/App.vue b/sub-operation-service/src/App.vue index 7a2b418..3293538 100644 --- a/sub-operation-service/src/App.vue +++ b/sub-operation-service/src/App.vue @@ -24,4 +24,6 @@ const size = computed(() => SettingStore.themeConfig.globalComSize); diff --git a/sub-operation-service/src/styles/iconfont.css b/sub-operation-service/src/styles/aliiconfont.css similarity index 100% rename from sub-operation-service/src/styles/iconfont.css rename to sub-operation-service/src/styles/aliiconfont.css diff --git a/sub-operation-service/yarn.lock b/sub-operation-service/yarn.lock index 24467ef..9aeb966 100644 --- a/sub-operation-service/yarn.lock +++ b/sub-operation-service/yarn.lock @@ -2086,7 +2086,7 @@ dunder-proto@^1.0.0, dunder-proto@^1.0.1: es-errors "^1.3.0" gopd "^1.2.0" -echarts@^5.5.0: +echarts@^5.6.0: version "5.6.0" resolved "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz#2377874dca9fb50f104051c3553544752da3c9d6" integrity sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA== @@ -5531,6 +5531,11 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +splitpanes@^4.0.3: + version "4.0.3" + resolved "https://registry.npmmirror.com/splitpanes/-/splitpanes-4.0.3.tgz#342c2b57d906371c2ab44b4578333fbeb13aaa94" + integrity sha512-S/f1CoH2JroOib7kzQtTQNtQCa7VzNQ2qKOO5HNj/5EVVcNkfz1eX/sH+X3XKdBdDLihEKDekVGwrLADd2oirA== + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"