服务指令bug

2025-08-08 09:33:27 +08:00 · 2025-08-08 09:33:27 +08:00 · 6183597612
parent 777e838d04
commit 6183597612
8 changed files with 34 additions and 32 deletions
--- 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 保持一致
--- 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 保持一致
--- 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 保持一致
--- 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 保持一致
--- 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 });
+};
+
 /**
 * 上传父路径
 */
--- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
@ -107,11 +107,10 @@
            <a-col :span="12" v-show="showMedia">
              <a-form-item label="服务指令图片" v-bind="validateInfos.previewFile">
                <span v-if="disabled && !formData.previewFile">暂无文件</span>
-                <JImageUpload v-else-if="!mediaApiAddress" :fileMax="1" v-model:value="formData.previewFile"
-                  </JImageUpload>
-                  <JImageUpload v-else :fileMax="1" v-model:value="formData.previewFile"
-                    :value="mediaApiAddress + mediaPath + formData.previewFile">
-                  </JImageUpload>
+                <JImageUpload v-else-if="opeType == 'dmlook'" :fileMax="1"
+                  :value="mediaApiAddress + formData.previewFile">
+                </JImageUpload>
+                <JImageUpload v-else :fileMax="1" v-model:value="formData.previewFile"></JImageUpload>
              </a-form-item>
            </a-col>
            <a-col :span="12">
@ -146,7 +145,7 @@
              <a-form-item label="指令音频预览" id="ConfigServiceDirectiveForm-mp3File">
                <audio controls disabled="false">
                  <source
-                    :src="!!mediaApiAddress ? mediaApiAddress + mediaPath + formData.mp3File : getFileAccessHttpUrl(formData.mp3File)">
+                    :src="opeType == 'dmlook' ? mediaApiAddress + formData.mp3File : getFileAccessHttpUrl(formData.mp3File)">
                </audio>
              </a-form-item>
            </a-col>
@ -159,7 +158,7 @@
              <a-form-item label="指令视频预览" id="ConfigServiceDirectiveForm-mp4File">
                <video controls>
                  <source
-                    :src="!!mediaApiAddress ? mediaApiAddress + mediaPath + formData.mp4File : getFileAccessHttpUrl(formData.mp4File)">
+                    :src="opeType == 'dmlook' ? mediaApiAddress + formData.mp4File : getFileAccessHttpUrl(formData.mp4File)">
                </video>
              </a-form-item>
            </a-col>
@ -173,11 +172,10 @@
            <a-col :span="12">
              <a-form-item label="即时指令图标" v-bind="validateInfos.immediateFile">
                <span v-if="disabled && !formData.immediateFile">暂无文件</span>
-                <JImageUpload v-else-if="!mediaApiAddress" :fileMax="1" v-model:value="formData.immediateFile"
-                  </JImageUpload>
-                  <JImageUpload v-else :fileMax="1" v-model:value="formData.immediateFile"
-                    :value="mediaApiAddress + mediaPath + formData.immediateFile">
-                  </JImageUpload>
+                <JImageUpload v-else-if="opeType == 'dmlook'" :fileMax="1"
+                  :value="mediaApiAddress + formData.immediateFile">
+                </JImageUpload>
+                <JImageUpload v-else :fileMax="1" v-model:value="formData.immediateFile"></JImageUpload>
              </a-form-item>
            </a-col>
          </a-row>
@ -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(',')
--- 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">
    <a-spin :spinning="loading">
      <ConfigServiceDirectiveForm ref="registerForm" v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit"
-        :formBpm="false" :mainOrgCode="mainOrgCode" :mediaApiAddress="opeType == 'dmlook' ? mediaApiAddress : ''">
+        :formBpm="false" :mainOrgCode="mainOrgCode" :mediaApiAddress="mediaApiAddress" :opeType="opeType">
      </ConfigServiceDirectiveForm>
    </a-spin>
    <template #footer>
--- a/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue
+++ b/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue
@ -103,7 +103,7 @@ import ConfigServiceDirectiveModal from './ConfigServiceDirectiveModal.vue'
 import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 import { cloneDeep } from "lodash-es";
-import { getOrgInfo, getOrgUrlByOrgCode } from '@/api/common/api'
+import { getOrgInfo, getMediaUrlByOrgCode } from '@/api/common/api'

 const props = defineProps({
  mainOrgCode: '',
@ -321,8 +321,8 @@ onMounted(() => {
  getOrgInfo().then(res => {
    orgName.value = res.orgName
  })
-  getOrgUrlByOrgCode({ orgCode: props.mainOrgCode }).then(res => {
-    mediaApiAddress.value = res.url
+  getMediaUrlByOrgCode({ orgCode: props.mainOrgCode }).then(res => {
+    mediaApiAddress.value = res.mediaUrl
  })
 });