diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
index de8b5a4..0dc0ed5 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
@@ -122,7 +122,7 @@
{{ text || text === 0 ? text : global.emptyLine }}
- {{ text }}
+ {{ record.file_dictText }}
{{ global.emptyLine }}
@@ -135,6 +135,12 @@
+
+
+
+
![]()
+
+
@@ -280,7 +286,9 @@ export default {
],
url: {
list: '/assessment/lawsEvaluationNotMet/page'
- }
+ },
+ image: false,
+ imageUrl: ''
}
},
mounted () {
@@ -346,7 +354,7 @@ export default {
},
previewFile (record) {
// 截取文件后缀名
- const fileSuffix = record.fileId_dictText ? record.fileId_dictText.split('.')[record.fileId_dictText.split('.').length - 1].toLowerCase() : ''
+ const fileSuffix = record.file_dictText ? record.file_dictText.split('.')[record.file_dictText.split('.').length - 1].toLowerCase() : ''
const canPreview = CAN_PREVIEW_FILE_SUFFIX.some(tt => fileSuffix.toLowerCase() === tt)
// 判断是否为可预览格式的文件
if (!canPreview) {
@@ -355,10 +363,10 @@ export default {
})
return
}
- const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.fileId}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.fileId_dictText}`
+ const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.file}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.file_dictText}`
// 图片预览,使用自己添加的组件
if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix)) {
- this.imageUrl = getFileAccessHttpUrl(record.fileId)
+ this.imageUrl = getFileAccessHttpUrl(record.file)
// 获取viewer实例
const viewer = this.$el.querySelector('.image').$viewer
// 调用show方法进行显示预览图
@@ -368,7 +376,7 @@ export default {
}
// pdf预览
if (canPreview && FILE_TYPE_PDF.includes(fileSuffix)) {
- const url = previewPdf(record.fileId)
+ const url = previewPdf(record.file)
window.open(url)
return
}
@@ -378,7 +386,7 @@ export default {
// 下载
handleDownload (record) {
// 下载文件
- downloadFile(`/sys/common/download/${record.fileId}`, record.fileId_dictText)
+ downloadFile(`/sys/common/download/${record.file}`, record.file_dictText)
},
// 查看
handleLook (record) {
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
index f2964bc..8dbf28f 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
@@ -16,7 +16,7 @@
- {{ model.unsatisfiedRequire }}
+ {{ model.unsatisfiedRequire }}
@@ -25,7 +25,7 @@
- {{ model.correctionSolution }}
+ {{ model.correctionSolution }}
@@ -34,7 +34,7 @@
- {{ model.correctionPeriod }}
+ {{ model.correctionPeriod_dictText }}
@@ -43,7 +43,7 @@
- {{ model.correctionCost }}
+ {{ model.correctionCost }}
@@ -52,7 +52,7 @@
- {{ model.commonality }}
+ {{ model.commonality }}
@@ -61,7 +61,7 @@
- {{ model.commonalityCost }}
+ {{ model.commonalityCost }}