diff --git a/.env.development b/.env.development
index a58f1f9..cc495e8 100644
--- a/.env.development
+++ b/.env.development
@@ -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.development2 b/.env.development1
similarity index 75%
rename from .env.development2
rename to .env.development1
index cc495e8..a58f1f9 100644
--- a/.env.development2
+++ b/.env.development1
@@ -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/src/views/elder/canaddet/CanAddElderTag.data.ts b/src/views/elder/canaddet/CanAddElderTag.data.ts
index 425ed7f..785722a 100644
--- a/src/views/elder/canaddet/CanAddElderTag.data.ts
+++ b/src/views/elder/canaddet/CanAddElderTag.data.ts
@@ -23,7 +23,7 @@ export const columns: BasicColumn[] = [
{
title: '说明',
align: 'center',
- dataIndex: 'describe',
+ dataIndex: 'describ',
},
{
title: '价格(元)',
diff --git a/src/views/elder/canaddet/CanAddElderTagList.vue b/src/views/elder/canaddet/CanAddElderTagList.vue
index 1bc12f0..404b52b 100644
--- a/src/views/elder/canaddet/CanAddElderTagList.vue
+++ b/src/views/elder/canaddet/CanAddElderTagList.vue
@@ -15,7 +15,7 @@
标签类型
-
@@ -99,7 +99,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
},
},
exportConfig: {
- name: "可新增标签",
+ name: "差异标签",
url: getExportUrl,
params: queryParam,
},
diff --git a/src/views/elder/eldertag/ElderTagList.vue b/src/views/elder/eldertag/ElderTagList.vue
index c8efae7..97b5dd7 100644
--- a/src/views/elder/eldertag/ElderTagList.vue
+++ b/src/views/elder/eldertag/ElderTagList.vue
@@ -8,7 +8,7 @@
标签类型
-
@@ -43,12 +43,12 @@
新增
- 标签管理
- 引用
+
标准标签库
- 差异比对
+
差异标签
@@ -63,23 +63,23 @@
-
关闭
-
+ -->
-
关闭
引用
-
+ -->
{
- existETIds.value = res.records
- if (izReset) {
- canAddElderTagRef.value?.searchReset()
- } else {
- canAddElderTagRef.value?.reload()
- }
- })
+ let res = await idListByDS({ dataSourceCode: 'master' })
+ existETIds.value = res.records
+ if (izReset) {
+ canAddElderTagRef.value?.searchReset()
+ } else {
+ canAddElderTagRef.value?.reload()
+ }
}
async function handleLookNewDirectives() {
diff --git a/src/views/elder/eldertag/components/ElderTagForm.vue b/src/views/elder/eldertag/components/ElderTagForm.vue
index 6d4f0b7..40402d6 100644
--- a/src/views/elder/eldertag/components/ElderTagForm.vue
+++ b/src/views/elder/eldertag/components/ElderTagForm.vue
@@ -7,7 +7,7 @@
diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
index d3411cf..08ee085 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
@@ -1384,20 +1384,19 @@ function onAbnormalListClose() {
}
//刷新已有指令库
-function refreshDMExistedIds(dmOrgInfo, izReset = false, izQuery = true) {
- idListByDS({ dataSourceCode: 'master' }).then(res => {
- existDirectiveIds.value = res.records
- if (izReset) {
- canAddDirectiveRef.value?.searchReset()
- } else {
- canAddDirectiveRef.value?.reload()
- }
- })
+async function refreshDMExistedIds(dmOrgInfo, izReset = false, izQuery = true) {
+ let res = await idListByDS({ dataSourceCode: 'master' })
+ existDirectiveIds.value = res.records
+ if (izReset) {
+ canAddDirectiveRef.value?.searchReset()
+ } else {
+ canAddDirectiveRef.value?.reload()
+ }
}
-function handleLookNewDirectives() {
+async function handleLookNewDirectives() {
+ await refreshDMExistedIds(directiveMainOrgInfo.value, true)
newDirectiveVisible.value = true
- refreshDMExistedIds(directiveMainOrgInfo.value, true)
}
/**
* 关闭新增指令