From 61835976129b507b4176b175a7663e819e7448f3 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 8 Aug 2025 09:33:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 -- .env.development102 | 3 -- .env.development103 | 3 -- .env.production | 9 ++---- src/api/common/api.ts | 9 ++++++ .../components/ConfigServiceDirectiveForm.vue | 31 +++++++++++-------- .../ConfigServiceDirectiveModal.vue | 2 +- .../components/DirectiveRespositoryList.vue | 6 ++-- 8 files changed, 34 insertions(+), 32 deletions(-) diff --git a/.env.development b/.env.development index f8e1f53..a58f1f9 100644 --- a/.env.development +++ b/.env.development @@ -20,9 +20,6 @@ VITE_GLOB_API_URL_PREFIX= #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 VITE_APP_SUB_jeecg-app-1 = '//localhost:8091' -# 业务平台所在服务器nginx中静态资源media对应的路径 开头结尾都要带斜杠 -VITE_NGINX_MEDIA_LOCATION = '/media101/upFiles101/' - # 填写后将作为乾坤子应用启动，主应用注册时AppName需保持一致（放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动） #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 # 作为乾坤子应用启动时必填，需与qiankun主应用注册子应用时填写的 entry 保持一致 diff --git a/.env.development102 b/.env.development102 index ebf1b42..cc495e8 100644 --- a/.env.development102 +++ b/.env.development102 @@ -20,9 +20,6 @@ VITE_GLOB_API_URL_PREFIX= #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' -# 业务平台所在服务器nginx中静态资源media对应的路径 开头结尾都要带斜杠 -VITE_NGINX_MEDIA_LOCATION = '/media102/upFiles102/' - # 填写后将作为乾坤子应用启动，主应用注册时AppName需保持一致（放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动） #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 # 作为乾坤子应用启动时必填，需与qiankun主应用注册子应用时填写的 entry 保持一致 diff --git a/.env.development103 b/.env.development103 index 0df29c2..41782c0 100644 --- a/.env.development103 +++ b/.env.development103 @@ -20,9 +20,6 @@ VITE_GLOB_API_URL_PREFIX= #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' -# 业务平台所在服务器nginx中静态资源media对应的路径 开头结尾都要带斜杠 -VITE_NGINX_MEDIA_LOCATION = '/media103/upFiles103/' - # 填写后将作为乾坤子应用启动，主应用注册时AppName需保持一致（放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动） #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 # 作为乾坤子应用启动时必填，需与qiankun主应用注册子应用时填写的 entry 保持一致 diff --git a/.env.production b/.env.production index 8a1dc74..636bb2d 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ VITE_USE_MOCK = false # 发布路径 -VITE_PUBLIC_PATH = /biz101 +VITE_PUBLIC_PATH = /biz102 # 是否启用gzip或brotli压缩 # 选项值: gzip | brotli | none @@ -13,17 +13,14 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=/nursingunit101 +VITE_GLOB_API_URL=/nursingunit102 #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101 +VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit102 # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= -# 业务平台所在服务器nginx中静态资源media对应的路径 开头结尾都要带斜杠 -VITE_NGINX_MEDIA_LOCATION = '/media103/upFiles103/' - # 填写后将作为乾坤子应用启动，主应用注册时AppName需保持一致（放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动） #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 # 作为乾坤子应用启动时必填，需与qiankun主应用注册子应用时填写的 entry 保持一致 diff --git a/src/api/common/api.ts b/src/api/common/api.ts index 8d3f2ff..41c65d2 100644 --- a/src/api/common/api.ts +++ b/src/api/common/api.ts @@ -19,6 +19,7 @@ enum Api { getOrgInfo = '/sys/api/getOrgInfo', getApiAddressByOrgCode = '/sys/api/getApiAddressByOrgCode', getOrgUrlByOrgCode = '/sys/api/getOrgUrlByOrgCode', + getMediaUrlByOrgCode = '/sys/api/getMediaUrlByOrgCode', } /** @@ -43,6 +44,14 @@ export const getApiAddressByOrgCode = (params) => { export const getOrgUrlByOrgCode = (params) => { return defHttp.get({ url: Api.getOrgUrlByOrgCode, params }); }; +/** + * 获取对应机构媒体资源地址 + * @param params + */ +export const getMediaUrlByOrgCode = (params) => { + return defHttp.get({ url: Api.getMediaUrlByOrgCode, params }); +}; + /** * 上传父路径 */ diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue index 47cb086..cc2e9bb 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue @@ -107,11 +107,10 @@ 暂无文件 - - - + + + @@ -146,7 +145,7 @@ @@ -159,7 +158,7 @@ @@ -173,11 +172,10 @@ 暂无文件 - - - + + + @@ -225,7 +223,9 @@ const props = defineProps({ formBpm: { type: Boolean, default: true }, mainOrgCode: '', mediaApiAddress: '',//指令资源请求地址 + opeType: 'look', }); + const bodyTagDictCode = ref(`nu_config_body_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 order by sort asc`) const emotionTagDictCode = ref(`nu_config_emotion_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 order by sort asc`) const formRef = ref(); @@ -268,7 +268,7 @@ const instructionTagName = ref('') const categoryName = ref('') const typeName = ref('') const cycleTypeName = ref('') -const mediaPath = ref(import.meta.env.VITE_NGINX_MEDIA_LOCATION) +const orgMediaPathAddress = ref('')//对应机构媒体资源静态访问路径 //表单验证 const validatorRules = reactive({ categoryId: [{ required: true, message: '请选择服务类别!' },], @@ -445,6 +445,11 @@ 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/ConfigServiceDirectiveModal.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue index 8d65777..feac11b 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue @@ -19,7 +19,7 @@ :footer-style="{ textAlign: 'right' }" @close="handleCancel"> + :formBpm="false" :mainOrgCode="mainOrgCode" :mediaApiAddress="mediaApiAddress" :opeType="opeType">