diff --git a/src/components/FileEcho.vue b/src/components/FileEcho.vue index f070926e..7f52e248 100644 --- a/src/components/FileEcho.vue +++ b/src/components/FileEcho.vue @@ -103,7 +103,7 @@ export default { }) return } - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` // 图片预览,使用自己添加的组件 if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) { this.imageUrl = getFileAccessHttpUrl(file.id) diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue index 0a37bc79..0ce5470f 100644 --- a/src/components/ProcessDetailList.vue +++ b/src/components/ProcessDetailList.vue @@ -296,7 +296,7 @@ export default { }) return } - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` // 图片预览,使用自己添加的组件 if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) { this.imageUrl = getFileAccessHttpUrl(file.id) diff --git a/src/components/UploadFile.vue b/src/components/UploadFile.vue index 3033f413..8abfbbf7 100644 --- a/src/components/UploadFile.vue +++ b/src/components/UploadFile.vue @@ -309,7 +309,7 @@ export default { }) return } - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${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}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` console.log(fileSuffix) // 图片预览,使用自己添加的组件 if (FILE_TYPE_IMGS.includes(fileSuffix)) { diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue index 8b0346de..71e60633 100644 --- a/src/components/jero/JUpload.vue +++ b/src/components/jero/JUpload.vue @@ -441,7 +441,7 @@ export default { }) return } - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${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}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` console.log(fileSuffix) // 图片预览,使用自己添加的组件 if (FILE_TYPE_IMGS.includes(fileSuffix)) { diff --git a/src/utils/kkFilePreview.js b/src/utils/kkFilePreview.js index d4560b5e..ce83d9cf 100644 --- a/src/utils/kkFilePreview.js +++ b/src/utils/kkFilePreview.js @@ -3,14 +3,33 @@ import { USER_INFO } from '../store/mutation-types' import { Base64 } from 'js-base64' import md5 from 'md5' +function fillZero (str) { + let realNum + if (str < 10) { + realNum = '0' + str + } else { + realNum = str + } + return realNum +} + /** * kkFile预览文件并添加水印 * @param fileUrl */ export const kkFilePreview = (fileUrl) => { const userInfo = Vue.ls.get(USER_INFO) + // 获取当前时间 + const date = new Date() + const year = date.getFullYear() + const month = date.getMonth() + 1 + const day = date.getDate() + const hour = date.getHours() + const minute = date.getMinutes() + const second = date.getSeconds() + const time = `${year}${fillZero(month)}${fillZero(day)}${fillZero(hour)}${fillZero(minute)}${fillZero(second)}` // 水印内容 - const watermarkTxt = `${userInfo.username} ${userInfo.realname}` + const watermarkTxt = `${userInfo.username} ${userInfo.realname} ${time}` // 客户环境预览需要加的加密参数 const watermarkSign = md5(watermarkTxt + 'cnhtc') const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileUrl))}&watermarkTxt=${encodeURIComponent(watermarkTxt)}&watermarkSign=${watermarkSign}` diff --git a/src/utils/previewPdf.js b/src/utils/previewPdf.js index 63088d98..8a923440 100644 --- a/src/utils/previewPdf.js +++ b/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/view/${id}?type=view&token=${getToken()}` + const url = `${window._CONFIG.domianURL}/sys/common/view/${id}?type=view&at=${getToken()}` return `${process.env.BASE_URL}pdfjs/web/viewer.html?file=` + encodeURIComponent(url) + '&.pdf' } diff --git a/src/utils/util.js b/src/utils/util.js index 7061ef4e..107cbda6 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -2,6 +2,9 @@ import Vue from 'vue' import * as api from '@/api/api' import { isURL } from '@/utils/validate' import { ACCESS_TOKEN } from '@/store/mutation-types' +import { getFileInfo } from '@/api/api' +import { dealUrl, kkFilePreview } from './kkFilePreview' +import { previewPdf } from './previewPdf' // import onlineCommons from '@/components/onlineForm/onlineForm' // @@ -678,3 +681,37 @@ export function getConfusionCode (tableName, fieldName) { } return '' } + +/** + * 通过文件id在当前窗口预览文件 + * @param fileId + */ +export function previewFileCurrentWindowByFileId (fileId) { + return new Promise((resolve, reject) => { + getFileInfo({ id: fileId }).then(res => { + if (res.success) { + const file = res.result || {} + // 支持预览的文件后缀 + const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'] + const fileSuffix = file.fileName ? file.fileName.split('.')[file.fileName.split('.').length - 1] : '' + const canPreview = CAN_PREVIEW_FILE_SUFFIX.some(tt => fileSuffix.toLowerCase() === tt) + // 判断是否为可预览格式的文件 + if (!canPreview) { + reject('该文件类型不支持预览') + } + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw'] + const FILE_TYPE_PDF = 'pdf' + // pdf预览 + if (canPreview && FILE_TYPE_PDF.includes(fileSuffix)) { + const url = previewPdf(file.id) + window.open(url, '_self') + return + } + // 其余可预览文件仍使用KKFile进行预览 + const kkFileUrl = dealUrl(fileFullUrl) + window.open(kkFileUrl, '_self') + } + }) + }) +} diff --git a/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue b/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue index a8d19afe..b7bc3fa4 100644 --- a/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue +++ b/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue @@ -8,7 +8,7 @@ @@ -128,6 +128,8 @@ import { kkFilePreview } from '@/utils/kkFilePreview' const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw'] const FILE_TYPE_PDF = 'pdf' +// 支持预览的文件后缀 +const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'] export default { name: 'QuestionAnswerList', @@ -223,7 +225,15 @@ export default { handleAttachClick (record) { // 截取文件后缀名 const fileSuffix = record.declareFileName ? record.declareFileName.split('.')[record.declareFileName.split('.').length - 1] : '' - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.declareFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.declareFile}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}` + const canPreview = CAN_PREVIEW_FILE_SUFFIX.some(tt => fileSuffix === tt) + // 判断是否为可预览格式的文件 + if (!canPreview) { + this.$message.loading(this.$t('uploadFile.cannotPreview')).then(() => { + this.handleDownload(record.declareFile, record.declareFileName) + }) + return + } // 图片预览,使用自己添加的组件 if (FILE_TYPE_IMGS.includes(fileSuffix)) { this.imageUrl = getFileAccessHttpUrl(record.declareFile) @@ -240,13 +250,12 @@ export default { window.open(url) return } - // word用KKfile预览 - if (fileSuffix === 'doc' || fileSuffix === 'docx') { - kkFilePreview(fileFullUrl) - return - } - // 如果都不能预览就下载 - downloadFile(`/sys/common/download/${record.declareFile}`, record.declareFileName) + // 其余可预览文件仍使用KKFile进行预览 + kkFilePreview(fileFullUrl) + }, + handleDownload (id, name) { + // 下载文件 + downloadFile(`/sys/common/download/${id}`, name) }, // 查看 handleDetail (record) { diff --git a/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue index efa31fe0..0baabb0d 100644 --- a/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue +++ b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue @@ -212,7 +212,7 @@ export default { }) return } - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` // 图片预览,使用自己添加的组件 if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) { this.imageUrl = getFileAccessHttpUrl(file.id) diff --git a/src/views/enterpriseStandardLibrary/check/modules/CheckReportModal.vue b/src/views/enterpriseStandardLibrary/check/modules/CheckReportModal.vue index ed847ec7..7937a07b 100644 --- a/src/views/enterpriseStandardLibrary/check/modules/CheckReportModal.vue +++ b/src/views/enterpriseStandardLibrary/check/modules/CheckReportModal.vue @@ -53,6 +53,8 @@ import { kkFilePreview } from '@/utils/kkFilePreview' const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw'] const FILE_TYPE_PDF = 'pdf' +// 支持预览的文件后缀 +const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'] export default { name: 'CheckReportModal', @@ -149,7 +151,15 @@ export default { handleRelatedMaterialClick (record) { // 截取文件后缀名 const fileSuffix = record.declareFileName ? record.declareFileName.split('.')[record.declareFileName.split('.').length - 1] : '' - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.declareFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.declareFile}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}` + const canPreview = CAN_PREVIEW_FILE_SUFFIX.some(tt => fileSuffix === tt) + // 判断是否为可预览格式的文件 + if (!canPreview) { + this.$message.loading(this.$t('uploadFile.cannotPreview')).then(() => { + this.handleDownload(record.declareFile, record.declareFileName) + }) + return + } // 图片预览,使用自己添加的组件 if (FILE_TYPE_IMGS.includes(fileSuffix)) { this.imageUrl = getFileAccessHttpUrl(record.declareFile) @@ -166,13 +176,12 @@ export default { window.open(url) return } - // word用KKfile预览 - if (fileSuffix === 'doc' || fileSuffix === 'docx') { - kkFilePreview(fileFullUrl) - return - } - // 如果都不能预览就下载 - downloadFile(`/sys/common/download/${record.declareFile}`, record.declareFileName) + // 其余可预览文件仍使用KKFile进行预览 + kkFilePreview(fileFullUrl) + }, + handleDownload (id, name) { + // 下载文件 + downloadFile(`/sys/common/download/${id}`, name) }, handleCancel () { this.close() diff --git a/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue b/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue index 82d93a5d..9bad34b5 100644 --- a/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue +++ b/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue @@ -224,7 +224,7 @@ export default { }) return } - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` // 图片预览,使用自己添加的组件 if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) { this.imageUrl = getFileAccessHttpUrl(file.id) diff --git a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue index e0047bc4..e35ed9d6 100644 --- a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue +++ b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue @@ -206,7 +206,7 @@ export default { handleRelatedMaterialClick (record) { // 截取文件后缀名 const fileSuffix = record.declareFileName ? record.declareFileName.split('.')[record.declareFileName.split('.').length - 1] : '' - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.declareFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.declareFile}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.declareFileName}` // 图片预览,使用自己添加的组件 if (FILE_TYPE_IMGS.includes(fileSuffix)) { this.imageUrl = getFileAccessHttpUrl(record.declareFile) diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue index 919629c7..8d39a0f2 100644 --- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue +++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue @@ -283,7 +283,7 @@ export default { }) return } - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` // 图片预览,使用自己添加的组件 if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) { this.imageUrl = getFileAccessHttpUrl(file.id) diff --git a/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue index d8599752..fb7dd324 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/CheckContentModal.vue +++ b/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/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` // word文件仍使用KKFile进行预览 const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` this.iframeSrc = url diff --git a/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue b/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue index 6c8c6480..884d8034 100644 --- a/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue +++ b/src/views/projectLibrary/specialProjectLibrary/modules/BasisDescriptionModal.vue @@ -199,7 +199,7 @@ export default { }) return } - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` // 图片预览,使用自己添加的组件 if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) { this.imageUrl = getFileAccessHttpUrl(file.id) @@ -236,4 +236,4 @@ export default { .basis-description { } - \ No newline at end of file + diff --git a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue index 774ce289..15b49dfd 100644 --- a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue +++ b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue @@ -378,7 +378,7 @@ export default { }) return } - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` console.log(fileFullUrl) // 图片预览,使用自己添加的组件 if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) { diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue index 407aee32..7f237a6f 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue @@ -22,13 +22,14 @@ + v-decorator.trim="[ 'clause', validatorRules.sectionNumber ]" /> @@ -58,7 +59,8 @@ import { getFileInfo } from '@/api/api' import { previewPdf } from '@/utils/previewPdf' import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' -import { addInspectionContentTable, editInspectionContentTable, getFileByInspectId } from '@api/workCenter' +import { getFileByInspectId } from '@api/workCenter' +import moment from 'moment/moment' const Base64 = require('js-base64').Base64 @@ -98,7 +100,7 @@ export default { validateTrigger: 'blur' } }, - index: undefined, // 编辑的表格的下标 + index: -1, // 编辑的表格的下标 iframeSrc: '' // 左侧预览的路径 } }, @@ -152,8 +154,8 @@ export default { // pdf预览 const url = previewPdf(file.id) this.iframeSrc = url - } else if (fileSuffix === 'docx') { - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + } else if (['doc', 'docx'].includes(fileSuffix)) { + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` // word文件仍使用KKFile进行预览 const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` this.iframeSrc = url @@ -162,7 +164,7 @@ export default { close () { this.visible = false this.model = {} - this.index = undefined + this.index = -1 this.iframeSrc = '' }, handleCancel () { @@ -170,53 +172,26 @@ export default { }, // 提交并新增 handleSubmitAddAdd () { - if (this.confirmLoading) return this.form.validateFields((err, values) => { if (!err) { - this.confirmLoading = true const param = Object.assign({}, this.model, values) - if (!param.processEsInspectId) { - param.processEsInspectId = this.data.id + if (!param.createTime) { + param.createTime = moment().format('YYYY-MM-DD HH:mm:ss') } - console.log(param) - const fn = param.id ? editInspectionContentTable : addInspectionContentTable - fn(param).then(res => { - if (res.success) { - this.$message.success(res.message) - this.$emit('ok', param, this.index) - this.form.resetFields() - this.model = {} - } else { - this.$message.warn(res.message) - } - }).finally(() => { - this.confirmLoading = false - }) + this.$emit('ok', param, this.index) + this.form.resetFields() } }) }, handleOk () { - if (this.confirmLoading) return this.form.validateFields((err, values) => { if (!err) { - this.confirmLoading = true const param = Object.assign({}, this.model, values) - if (!this.model.processEsInspectId) { - param.processEsInspectId = this.data.id + if (!param.createTime) { + param.createTime = moment().format('YYYY-MM-DD HH:mm:ss') } - console.log(param) - const fn = param.id ? editInspectionContentTable : addInspectionContentTable - fn(param).then(res => { - if (res.success) { - this.$message.success(res.message) - this.$emit('ok', param, this.index) - this.close() - } else { - this.$message.warn(res.message) - } - }).finally(() => { - this.confirmLoading = false - }) + this.$emit('ok', param, this.index) + this.close() } }) } @@ -232,7 +207,6 @@ export default { .content-left { width: 60%; height: 100%; - overflow-y: scroll; iframe { height: calc(100% - 20px) !important; } diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/CommentModal.vue b/src/views/workCenter/enterpriseStandardRevision/modules/CommentModal.vue index c2dcc0bf..fb374346 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/CommentModal.vue +++ b/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/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}` // word文件仍使用KKFile进行预览 const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` this.iframeSrc = url diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue index e606bbf9..9d2da9b5 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue @@ -17,7 +17,7 @@ @@ -26,106 +26,103 @@ -
-
- -
-
+
+ +
+
{{ $t('workCenter.enStandardRevision.standardText') }} -
- -
- -

企业标准

- {{ $t('workCenter.enStandardRevision.onLineEditing') }} -
-
- -
-
- * - + +
+ +

企业标准

+ {{ $t('workCenter.enStandardRevision.onLineEditing') }} +
+
+
+ +
+
+ * + {{ $t('workCenter.enStandardRevision.conferee') }} -
- - -
- -
-
- * - + + + +
+ +
+
+ * + {{ $t('workCenter.enStandardRevision.meetingSummary') }} -
- - - {{ - (formInline.meetingSummary === 'null' || formInline.meetingSummary === '' - || formInline.meetingSummary === null || formInline.meetingSummary === undefined) - ? $t('uploadFile.clickUpload') - : $t('uploadFile.viewUploadedFiles') - }} - -
- -
-
- * - + + + {{ + (formInline.meetingSummary === 'null' || formInline.meetingSummary === '' + || formInline.meetingSummary === null || formInline.meetingSummary === undefined) + ? $t('uploadFile.clickUpload') + : $t('uploadFile.viewUploadedFiles') + }} + + +
+ +
+
+ * + {{ $t('workCenter.enStandardRevision.compilationIllustration') }} -
- - - {{ - (formInline.comp_illustration === 'null' || formInline.comp_illustration === '' - || formInline.comp_illustration === null || formInline.comp_illustration === undefined) - ? $t('uploadFile.clickUpload') - : $t('uploadFile.viewUploadedFiles') - }} - -
- -
-
- * - + + + {{ + (formInline.compIllustration === 'null' || formInline.compIllustration === '' + || formInline.compIllustration === null || formInline.compIllustration === undefined) + ? $t('uploadFile.clickUpload') + : $t('uploadFile.viewUploadedFiles') + }} + + +
+ +

{{ $t('enterpriseStandardLibrary.standard.auditContent') }}

+ +
+
+ * + {{ $t('workCenter.enStandardRevision.isNeedAudit') }} -
- - - - {{ $t('yes') }} - - - {{ $t('not') }} - - -
+ + + + {{ $t('yes') }} + + + {{ $t('not') }} + + +
-