Merge branch 'main' into secondStage

# Conflicts:
#	src/views/dashboard/Analysis.vue
#	src/views/dashboard/modules/FriendLinkCard.vue
#	src/views/dashboard/modules/QuickEnterCard.vue
#	src/views/dashboard/modules/SearchAndWarningCard.vue
#	src/views/dashboard/modules/ToDoTaskCard.vue

src/api/manage.js

@@ -203,7 +203,7 @@ export function getFileAccessHttpUrl (avatar, subStr) {
     } else {
       if (avatar && avatar.length > 0 && avatar.indexOf('[') === -1) {
         const token = Vue.ls.get(ACCESS_TOKEN)
-        return window._CONFIG.staticDomainURL + '/' + avatar + '?token=' + token
+        return window._CONFIG.domianURL + '/sys/common/view' + '/' + avatar + '?token=' + token
       }
     }
   } catch (err) {

src/components/FileEcho.vue

@@ -96,7 +96,7 @@ export default {
         })
         return
       }
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
       // 图片预览，使用自己添加的组件
       if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) {
         this.imageUrl = getFileAccessHttpUrl(file.id)

src/components/ProcessDetailList.vue

@@ -286,7 +286,7 @@ export default {
         })
         return
       }
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
       // 图片预览，使用自己添加的组件
       if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) {
         this.imageUrl = getFileAccessHttpUrl(file.id)

src/components/UploadFile.vue

@@ -308,7 +308,7 @@ export default {
         })
         return
       }
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
       console.log(fileSuffix)
       // 图片预览，使用自己添加的组件
       if (FILE_TYPE_IMGS.includes(fileSuffix)) {

src/components/jero/JUpload.vue

@@ -440,7 +440,7 @@ export default {
         })
         return
       }
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
       console.log(fileSuffix)
       // 图片预览，使用自己添加的组件
       if (FILE_TYPE_IMGS.includes(fileSuffix)) {

src/utils/previewPdf.js

@@ -5,7 +5,7 @@ const getToken = () => Vue.ls.get(ACCESS_TOKEN)
 
 // 预览pdf
 const previewPdf = (id) => {
-  const url = `${window._CONFIG.domianURL}/sys/common/download/${id}?type=view&token=${getToken()}`
+  const url = `${window._CONFIG.domianURL}/sys/common/view/${id}?type=view&token=${getToken()}`
   return `${process.env.BASE_URL}pdfjs/web/viewer.html?file=` + encodeURIComponent(url) + '&.pdf'
 }
 

src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue

@@ -223,7 +223,7 @@ export default {
     handleAttachClick (record) {
       // 截取文件后缀名
       const fileSuffix = record.declareFileName ? record.declareFileName.split('.')[record.declareFileName.split('.').length - 1] : ''
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${record.declareFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.declareFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}`
       // 图片预览，使用自己添加的组件
       if (FILE_TYPE_IMGS.includes(fileSuffix)) {
         this.imageUrl = getFileAccessHttpUrl(record.declareFile)

src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue

@@ -211,7 +211,7 @@ export default {
         })
         return
       }
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
       // 图片预览，使用自己添加的组件
       if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) {
         this.imageUrl = getFileAccessHttpUrl(file.id)

src/views/enterpriseStandardLibrary/check/modules/CheckReportModal.vue

@@ -149,7 +149,7 @@ export default {
     handleRelatedMaterialClick (record) {
       // 截取文件后缀名
       const fileSuffix = record.declareFileName ? record.declareFileName.split('.')[record.declareFileName.split('.').length - 1] : ''
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${record.declareFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.declareFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}`
       // 图片预览，使用自己添加的组件
       if (FILE_TYPE_IMGS.includes(fileSuffix)) {
         this.imageUrl = getFileAccessHttpUrl(record.declareFile)

src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue

@@ -224,7 +224,7 @@ export default {
         })
         return
       }
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
       // 图片预览，使用自己添加的组件
       if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) {
         this.imageUrl = getFileAccessHttpUrl(file.id)

src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue

@@ -207,7 +207,7 @@ export default {
     handleRelatedMaterialClick (record) {
       // 截取文件后缀名
       const fileSuffix = record.declareFileName ? record.declareFileName.split('.')[record.declareFileName.split('.').length - 1] : ''
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${record.declareFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.declareFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}`
       // 图片预览，使用自己添加的组件
       if (FILE_TYPE_IMGS.includes(fileSuffix)) {
         this.imageUrl = getFileAccessHttpUrl(record.declareFile)

src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue

@@ -274,7 +274,7 @@ export default {
         })
         return
       }
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
       // 图片预览，使用自己添加的组件
       if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) {
         this.imageUrl = getFileAccessHttpUrl(file.id)

src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue

@@ -121,7 +121,7 @@ export default {
         const url = previewPdf(file.id)
         this.iframeSrc = url
       } else if (fileSuffix === 'docx') {
-        const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
+        const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
         // word文件仍使用KKFile进行预览
         const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
         this.iframeSrc = url

src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue

@@ -198,7 +198,7 @@ export default {
         })
         return
       }
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
       // 图片预览，使用自己添加的组件
       if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) {
         this.imageUrl = getFileAccessHttpUrl(file.id)

src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue

@@ -377,7 +377,7 @@ export default {
         })
         return
       }
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
       console.log(fileFullUrl)
       // 图片预览，使用自己添加的组件
       if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) {

src/views/workCenter/enterpriseStandardRevision/modules/CommentModal.vue

@@ -151,7 +151,7 @@ export default {
         const url = previewPdf(file.id)
         this.iframeSrc = url
       } else if (fileSuffix === 'docx') {
-        const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
+        const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
         // word文件仍使用KKFile进行预览
         const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
         this.iframeSrc = url

src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue

@@ -349,7 +349,7 @@ export default {
         })
         return
       }
-      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${record.standardFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.standardFile_dictText}`
+      const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.standardFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.standardFile_dictText}`
       // 图片预览，使用自己添加的组件
       if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix)) {
         this.imageUrl = getFileAccessHttpUrl(record.standardFile)

src/views/workCenter/standardConsultationProcess/modules/ConsultationModal.vue

@@ -158,7 +158,7 @@ export default {
         getFileInfo({ id: fileId }).then(res => {
           if (res.success) {
             const fileInfo = res.result || {}
-            const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${fileInfo.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${fileInfo.fileName}`
+            const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${fileInfo.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${fileInfo.fileName}`
             // 截取文件后缀名
             const fileSuffix = (fileInfo.fileName ? fileInfo.fileName.split('.')[fileInfo.fileName.split('.').length - 1] : '').toLowerCase()
             switch (fileSuffix) {