From 4e159b12fd766394e5b6a52faf70bc161f75d674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 24 Mar 2025 14:13:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                        |  1 +
 .env.prod                       |  1 +
 src/utils/request.js            |  1 +
 src/views/partner/file/file.vue | 36 +++++++++++++++++++++++----------
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/.env.dev b/.env.dev
index 1abce2e..42e9c3c 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,6 +12,7 @@ VUE_APP_BASE_API = 'http://localhost:48080'
 VUE_APP_FILE_API = 'http://122.51.230.86:9000/'
 VUE_APP_PREVIEW_URL = 'https://www.nuoyunr.com/minio/'
 VUE_APP_IMAGE_URL = 'http://122.51.230.86:9000'
+VUE_APP_INSPECTION_FILE_URL = 'http://lanan-file.lighting-it.cn/'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.prod b/.env.prod
index 9718ac2..89b3763 100644
--- a/.env.prod
+++ b/.env.prod
@@ -14,6 +14,7 @@ PUBLIC_PATH = 'http://159.75.168.143:82'
 # VUE_APP_FILE_API = 'https://www.nuoyunr.com/minio/'
 VUE_APP_FILE_API = 'http://122.51.230.86:9000/'
 VUE_APP_PREVIEW_URL = 'https://www.nuoyunr.com/minio/'
+VUE_APP_INSPECTION_FILE_URL = 'http://lanan-file.lighting-it.cn/'
 # 二级部署路径
 VUE_APP_APP_NAME ='yudao-admin'
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 8d57aca..26adb47 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -40,6 +40,7 @@ service.interceptors.request.use(config => {
   // 设置租户
   if (getTenantEnable()) {
     const tenantId = getTenantId();
+    // console.log('请求时的租户id', tenantId)
     if (tenantId) {
       config.headers['tenant-id'] = tenantId;
     }
diff --git a/src/views/partner/file/file.vue b/src/views/partner/file/file.vue
index 02be798..9700275 100644
--- a/src/views/partner/file/file.vue
+++ b/src/views/partner/file/file.vue
@@ -106,23 +106,33 @@
     <el-dialog :title="'文件预览（' + selectFile.fileName + '）'" :visible.sync="isShowFile" width="70%" append-to-body>
       <div class="preview-container">
         <audio v-if="isAudioType" class="preview-iframe" controls>
-          <source :src="imageUrl + selectFile.filePath"/>
+          <source :src="selectFile.filePath.includes('http')
+    ? inspectionFileUrl + selectFile.filePath.replace(/^.*?uploads\//, 'uploads/')
+    : imageUrl + selectFile.filePath"/>
         </audio>
         <!-- 左侧预览区域 -->
         <iframe
           :src="fileUrl"
           frameborder="0"
-          class="preview-iframe" v-if="!isImage && selectFile.fileType != 'txt' && !isAudioType && selectFile.fileType != 'pdf'"
+          class="preview-iframe"
+          v-if="!isImage && selectFile.fileType != 'txt' && !isAudioType && selectFile.fileType != 'pdf'"
         >
         </iframe>
         <image-preview
           class="preview-iframe"
-          :src="selectFile.filePath.includes('http') ? selectFile.filePath : imageUrl + selectFile.filePath"
+          :src="selectFile.filePath.includes('http')
+    ? inspectionFileUrl + selectFile.filePath.replace(/^.*?uploads\//, 'uploads/')
+    : imageUrl + selectFile.filePath"
           v-if="isImage">
         </image-preview>
 
+        <!--     如果selectFile.filePath包含http就不拼接imageUrl   -->
+        <!--              :src="selectFile.filePath.includes('http') ? selectFile.filePath : imageUrl + selectFile.filePath"
+           -->
         <iframe
-          :src="imageUrl + selectFile.filePath"
+          :src="selectFile.filePath.includes('http')
+    ? inspectionFileUrl + selectFile.filePath.replace(/^.*?uploads\//, 'uploads/')
+    : imageUrl + selectFile.filePath"
           frameborder="0"
           class="preview-iframe"
           v-if="selectFile.fileType == 'txt' || selectFile.fileType == 'pdf'"
@@ -239,7 +249,7 @@
         </el-form-item>
         <!-- 上传进度 -->
       </el-form>
-<!--      <el-progress v-if="uploadProgress !== null" :percentage="uploadProgress" />-->
+      <!--      <el-progress v-if="uploadProgress !== null" :percentage="uploadProgress" />-->
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitBatchForm">确 定</el-button>
         <el-button @click="cancelBatch">取 消</el-button>
@@ -265,17 +275,18 @@ import {
 import inspFileUpload from '@/components/FileUpload/index.vue'
 import {getAccessToken} from "@/utils/auth";
 // import  cos from "@/utils/cosUpload"
-import  cos from "@/utils/cos"
+import cos from "@/utils/cos"
 
 export default {
   name: "InspectionFile",
   components: {inspFileUpload},
   data() {
     return {
-      uploadProgress:0,
+      uploadProgress: 0,
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/cosUpload",
       imageUrl: process.env.VUE_APP_FILE_API,
       previewUrl: process.env.VUE_APP_PREVIEW_URL,
+      inspectionFileUrl: process.env.VUE_APP_INSPECTION_FILE_URL,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -390,7 +401,10 @@ export default {
     preview(item) {
       console.log('预览文件地址', this.previewUrl)
       this.fileUrl = 'https://view.officeapps.live.com/op/view.aspx?src=' +
-        (item.filePath.includes('http') ? item.filePath : this.previewUrl + item.filePath);
+        (item.filePath.includes('http')
+          ? this.inspectionFileUrl + item.filePath.replace(/^.*?uploads\//, 'uploads/')
+          : this.previewUrl + item.filePath);
+
 
       // this.fileUrl = 'https://view.xdocin.com/view?src=' + this.imageUrl + item.filePath
       console.log(this.fileUrl)
@@ -770,14 +784,14 @@ export default {
               return reject();
             }
             this.$message.success("上传成功：" + data.Location);
-            this.fileList.push({ name: file.name, url: data.Location });
+            this.fileList.push({name: file.name, url: data.Location});
             resolve();
           }
         );
       });
     },
     // 直接使用 cos-js-sdk 进行上传
-    async uploadToCOS({ file }) {
+    async uploadToCOS({file}) {
       const fileName = `files/${file.name}`; // 你的存储路径
       cos.putObject(
         {
@@ -887,7 +901,7 @@ export default {
       // if (res.code === 0) {
       //   // edit by 芋道源码
       //   this.uploadList.push({name: res.data.name, url: res.data.url});
-        this.uploadedSuccessfully();
+      this.uploadedSuccessfully();
       // } else {
       //   this.number--;
       //   this.$modal.closeLoading();