Merge branch 'secondStage' into thirdStage

# Conflicts:
#	src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue

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

@@ -45,14 +45,14 @@
 
 <script>
 import Vue from 'vue'
-import { getFileAccessHttpUrl } from '@/api/manage'
+import { getFileAccessHttpUrl, downloadFile } from '@/api/manage'
 import { previewPdf } from '@/utils/previewPdf'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import { getCheckReportById } from '@/api/enterpriseStandardLibraryApi'
+import { kkFilePreview } from '@/utils/kkFilePreview'
 
 const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw']
 const FILE_TYPE_PDF = 'pdf'
-const Base64 = require('js-base64').Base64
 
 export default {
   name: 'CheckReportModal',
@@ -166,9 +166,13 @@ export default {
         window.open(url)
         return
       }
-      // 其余可预览文件仍使用KKFile进行预览
-      const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
-      window.open(url)
+      // word用KKfile预览
+      if (fileSuffix === 'doc' || fileSuffix === 'docx') {
+        kkFilePreview(fileFullUrl)
+        return
+      }
+      // 如果都不能预览就下载
+      downloadFile(`/sys/common/download/${record.declareFile}`, record.declareFileName)
     },
     handleCancel () {
       this.close()

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

@@ -157,8 +157,9 @@ import { getEnterpriseStandardPlanInfoById } from '@/api/enterpriseStandardLibra
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import { previewPdf } from '@/utils/previewPdf'
-import { getFileAccessHttpUrl } from '@/api/manage'
+import { getFileAccessHttpUrl, downloadFile } from '@/api/manage'
 import { getFileInfo } from '../../../../api/api'
+import { kkFilePreview } from '@/utils/kkFilePreview'
 
 // 支持预览的文件类型
 const CAN_PREVIEW_FILE_TYPE = ['pdf', 'image']
@@ -166,7 +167,6 @@ const CAN_PREVIEW_FILE_TYPE = ['pdf', 'image']
 const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx']
 const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw']
 const FILE_TYPE_PDF = 'pdf'
-const Base64 = require('js-base64').Base64
 
 export default {
   name: 'PlanDetail',
@@ -242,9 +242,13 @@ export default {
         window.open(url)
         return
       }
-      // 其余可预览文件仍使用KKFile进行预览
-      const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
-      window.open(url)
+      // word用KKfile预览
+      if (canPreview && (fileSuffix === 'doc' || fileSuffix === 'docx')) {
+        kkFilePreview(fileFullUrl)
+        return
+      }
+      // 如果都不能预览就下载
+      downloadFile(`/sys/common/download/${file.id}`, file.fileName)
     },
     getFileInfo (fileId) {
       return new Promise(resolve => {

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

@@ -145,12 +145,12 @@ import { previewPdf } from '@/utils/previewPdf'
 import { getFileInfo } from '../../../../api/api'
 import UserSelectModal from '@comp/selection/UserSelectModal'
 import StandardResolutionSheetModal from '@views/standardRegulationLibrary/commonPage/modules/StandardResolutionSheetModal'
+import { kkFilePreview } from '@/utils/kkFilePreview'
 
 // 支持预览的文件后缀
 const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx']
 const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw']
 const FILE_TYPE_PDF = 'pdf'
-const Base64 = require('js-base64').Base64
 
 export default {
   name: 'EnterpriseStandardDetail',
@@ -294,9 +294,13 @@ export default {
         window.open(url)
         return
       }
-      // 其余可预览文件仍使用KKFile进行预览
-      const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
-      window.open(url)
+      // word用KKfile预览
+      if (canPreview && (fileSuffix === 'doc' || fileSuffix === 'docx')) {
+        kkFilePreview(fileFullUrl)
+        return
+      }
+      // 如果都不能预览就下载
+      downloadFile(`/sys/common/download/${file.id}`, file.fileName)
     },
     handleDownload (file) {
       // 下载文件