diff --git a/.env.development b/.env.development index cc495e8..a58f1f9 100644 --- a/.env.development +++ b/.env.development @@ -6,19 +6,19 @@ VITE_PUBLIC_PATH = / # 跨域代理,您可以配置多个 ,请注意,没有换行符 -VITE_PROXY = [["/nursing-unit_102","http://localhost:8092/nursing-unit_102"],["/upload","http://localhost:3300/upload"]] +VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"]] #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://localhost:8092/nursing-unit_102 +VITE_GLOB_DOMAIN_URL=http://localhost:8091/nursing-unit_101 #后台接口父地址(必填) -VITE_GLOB_API_URL=/nursing-unit_102 +VITE_GLOB_API_URL=/nursing-unit_101 # 接口前缀 VITE_GLOB_API_URL_PREFIX= #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 -VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' +VITE_APP_SUB_jeecg-app-1 = '//localhost:8091' # 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动) #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 diff --git a/.env.development101 b/.env.development2 similarity index 75% rename from .env.development101 rename to .env.development2 index a58f1f9..cc495e8 100644 --- a/.env.development101 +++ b/.env.development2 @@ -6,19 +6,19 @@ VITE_PUBLIC_PATH = / # 跨域代理,您可以配置多个 ,请注意,没有换行符 -VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"]] +VITE_PROXY = [["/nursing-unit_102","http://localhost:8092/nursing-unit_102"],["/upload","http://localhost:3300/upload"]] #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://localhost:8091/nursing-unit_101 +VITE_GLOB_DOMAIN_URL=http://localhost:8092/nursing-unit_102 #后台接口父地址(必填) -VITE_GLOB_API_URL=/nursing-unit_101 +VITE_GLOB_API_URL=/nursing-unit_102 # 接口前缀 VITE_GLOB_API_URL_PREFIX= #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 -VITE_APP_SUB_jeecg-app-1 = '//localhost:8091' +VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' # 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动) #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 diff --git a/.env.development103 b/.env.development3 similarity index 100% rename from .env.development103 rename to .env.development3 diff --git a/.env.production b/.env.production index cb59464..04195f8 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ VITE_USE_MOCK = false # 发布路径 -VITE_PUBLIC_PATH = /biz103 +VITE_PUBLIC_PATH = /biz101 # 是否启用gzip或brotli压缩 # 选项值: gzip | brotli | none @@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=/nursingunit103 +VITE_GLOB_API_URL=/nursingunit101 #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit103 +VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101 # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/src/App.vue b/src/App.vue index f0d8666..504bee8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,99 +7,103 @@ +// update-begin--author:liaozhiyang---date:20230803---for:【QQYUN-5839】windi会影响到html2canvas绘制的图片样式 +img { + display: inline-block; +} + +.nu-menu-item :hover { + color: #69c0ff !important; +} + +// update-end--author:liaozhiyang---date:20230803---for:【QQYUN-5839】windi会影响到html2canvas绘制的图片样式 diff --git a/src/views/services/directiveTag/bodytag/BodyTagList.vue b/src/views/services/directiveTag/bodytag/BodyTagList.vue index f98a937..41b2d8a 100644 --- a/src/views/services/directiveTag/bodytag/BodyTagList.vue +++ b/src/views/services/directiveTag/bodytag/BodyTagList.vue @@ -97,8 +97,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ useSearchForm: false, pagination: { current: 1, - pageSize: 50, - pageSizeOptions: ['50', '70', '100'], + pageSize: 15, + pageSizeOptions: ['15','50', '70', '100'], }, actionColumn: { width: 160, diff --git a/src/views/services/directiveTag/emotiontag/EmotionTagList.vue b/src/views/services/directiveTag/emotiontag/EmotionTagList.vue index f7c3390..8028e78 100644 --- a/src/views/services/directiveTag/emotiontag/EmotionTagList.vue +++ b/src/views/services/directiveTag/emotiontag/EmotionTagList.vue @@ -97,8 +97,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ useSearchForm: false, pagination: { current: 1, - pageSize: 50, - pageSizeOptions: ['50', '70', '100'], + pageSize: 15, + pageSizeOptions: ['15','50', '70', '100'], }, actionColumn: { width: 160, diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue index 7210eb4..b224065 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue +++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue @@ -73,10 +73,10 @@
-
+
- + 全部 启用 @@ -89,8 +89,8 @@ 新增分类标签 - +