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.development102 b/.env.development101
similarity index 75%
rename from .env.development102
rename to .env.development101
index cc495e8..a58f1f9 100644
--- a/.env.development102
+++ b/.env.development101
@@ -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.production b/.env.production
index 636bb2d..cb59464 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@
VITE_USE_MOCK = false
# 发布路径
-VITE_PUBLIC_PATH = /biz102
+VITE_PUBLIC_PATH = /biz103
# 是否启用gzip或brotli压缩
# 选项值: gzip | brotli | none
@@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip'
VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
#后台接口父地址(必填)
-VITE_GLOB_API_URL=/nursingunit102
+VITE_GLOB_API_URL=/nursingunit103
#后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit102
+VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit103
# 接口父路径前缀
VITE_GLOB_API_URL_PREFIX=
diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
index 53b15ca..7210eb4 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
@@ -75,18 +75,22 @@
-
+ style="position: absolute; top: 8px; right: 8px; z-index: 1; background: white; padding: 0px; border-radius: 4px;">
+
全部
启用
-
-
+
+
+
+
新增分类标签
-
+
@@ -947,29 +951,29 @@ function menuItems(data) {
}
else if (data.level === 2) {
const items = [
- { key: 'addCat', label: '新增服务类别', icon: 'ant-design:plus-outlined', canAdd: data.canAdd, action: addCategory },
+ { key: 'addCat', label: '新增服务类别', icon: 'ant-design:plus-outlined', canAdd: data.parentLevelEnabled, action: addCategory },
]
if (data.canAdd) {
items.push({ key: 'addTyp', label: '新增服务类型', icon: 'ant-design:plus-outlined', canAdd: data.canAdd, action: addType })
}
if (data.izEnabled === '1') {
- items.push({ key: 'usingCat', label: '启用服务类别', icon: 'ant-design:check-circle-outlined', canAdd: data.canAdd, action: usingCategory })
+ items.push({ key: 'usingCat', label: '启用服务类别', icon: 'ant-design:check-circle-outlined', canAdd: data.parentLevelEnabled, action: usingCategory })
} else if (data.izEnabled === '0') {
- items.push({ key: 'stopCat', label: '停用服务类别', icon: 'ant-design:stop-outlined', canAdd: data.canAdd, action: stopCategory })
+ items.push({ key: 'stopCat', label: '停用服务类别', icon: 'ant-design:stop-outlined', canAdd: data.parentLevelEnabled, action: stopCategory })
}
return items
}
else if (data.level === 3) {
const items = [
- { key: 'addTyp', label: '新增服务类型', icon: 'ant-design:plus-outlined', canAdd: data.canAdd, action: addType },
+ { key: 'addTyp', label: '新增服务类型', icon: 'ant-design:plus-outlined', canAdd: data.parentLevelEnabled, action: addType },
]
if (data.canAdd) {
items.push({ key: 'addDir', label: '新增服务指令', icon: 'ant-design:plus-outlined', canAdd: data.canAdd, action: addDirective })
}
if (data.izEnabled === '1') {
- items.push({ key: 'usingTyp', label: '启用服务类型', icon: 'ant-design:check-circle-outlined', canAdd: data.canAdd, action: usingType })
+ items.push({ key: 'usingTyp', label: '启用服务类型', icon: 'ant-design:check-circle-outlined', canAdd: data.parentLevelEnabled, action: usingType })
} else if (data.izEnabled === '0') {
- items.push({ key: 'stopTyp', label: '停用服务类型', icon: 'ant-design:stop-outlined', canAdd: data.canAdd, action: stopType })
+ items.push({ key: 'stopTyp', label: '停用服务类型', icon: 'ant-design:stop-outlined', canAdd: data.parentLevelEnabled, action: stopType })
}
return items
}
diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
index cc2e9bb..fdf5356 100644
--- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -445,11 +445,6 @@ const showMedia = ref(true)
* isEditMedia_是否为编辑指令资源 (隐藏业务字段)
*/
function edit(record, isEditMedia_ = false, showMedia_ = true, showExistTags = true) {
- setInterval(()=>{
- console.log(111,props.opeType)
- console.log(222,props.mediaApiAddress)
- console.log(333,formData.previewFile)
- },2000)
if (!!record.bodyTags && showExistTags) {
// 将逗号分隔的字符串转换为 "id = 'id1' or id = 'id2'" 格式
const bodyTagConditions = record.bodyTags.split(',')
diff --git a/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue b/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue
index 424d644..1cd432b 100644
--- a/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue
+++ b/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue
@@ -115,6 +115,7 @@ const queryParam = reactive({
instructionTagId: '',
categoryId: '',
typeId: '',
+ izEnabled: '0',
});
watch(
() => queryParam.instructionTagId,
@@ -152,13 +153,13 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
fixed: 'right',
},
beforeFetch: async (params) => {
- // let res = await idListByDS({ dataSourceCode: 'master' })
+ let rangerQuery = await setRangeQuery();
params.dataSourceCode = props.mainOrgCode
if (excludeIds.value.length) {
params.excludeIds = excludeIds.value.join(',')
}
params.izEnabled = '0'
- let rangerQuery = await setRangeQuery();
+ rangerQuery.izEnabled = '0'
return Object.assign(params, rangerQuery);
},
},