From 65c24c1663b4fe7b3fe412367cd8b7b3afc79db6 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Thu, 25 May 2023 14:10:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=8B=E8=BD=BD=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Report/ReportDetail.vue | 58 ++++++++++++++++--- src/views/Report/ReportList.vue | 17 +++++- src/views/Report/ReportManager.vue | 10 +++- .../reportProcess/components/reportForm.vue | 1 - 4 files changed, 73 insertions(+), 13 deletions(-) diff --git a/src/views/Report/ReportDetail.vue b/src/views/Report/ReportDetail.vue index 1d894bc..807a384 100644 --- a/src/views/Report/ReportDetail.vue +++ b/src/views/Report/ReportDetail.vue @@ -55,10 +55,16 @@
报告详情 - 报告下载 + 报告下载
-
+
+
{{item.fileName}}
+
+ +
@@ -126,6 +132,9 @@ export default { name: 'ReportDetail', data() { return { + showText:false, + pointNum:0, + file:{}, isAdmin: false, //是否是管理员 report: {}, formatDate2, @@ -248,13 +257,25 @@ export default { } }, // 预览 - previewRow() { + previewRow(id) { // this.watermarkText = `${this.$store.state.userInfo.usname} ${formatDate(+new Date(), 'yyyy年MM月dd日 hh:mm:ss')}` // this.row = JSON.parse(this.$route.query.row) - this.$api.report.reportGetReportHtmlId({id: this.row.id}).then(({data}) => { + this.$api.report.reportGetReportHtmlId({id: id}).then(({data}) => { this.content = data.content }) }, + handleFile(row){ + this.file=row + let lastName=row.fileName.split('.') + let list=['xls','xlsx'] + if(list.indexOf(lastName[lastName.length-1])>-1){ + this.showText=true + }else{ + this.showText=false + this.previewRow(this.file.fileId) + + } + }, // 下载 downloadRow(row) { // this.$confirm('此操作将下载所选数据文件, 是否继续?', '提示', { @@ -262,7 +283,7 @@ export default { // cancelButtonText: '取消', // type: 'warning' // }).then(() => { - this.$api.report.reportDownload({fileId: row.fileId, repostId: row.id}).then(res => { + this.$api.report.reportDownload({fileId: this.file.fileId, repostId: row.id}).then(res => { downloadFile(res) }) // }) @@ -273,7 +294,7 @@ export default { this.row = res.data this.isAdmin = this.$store.getters.userInfo.usid==this.row.createUserId // 需要给分数/2 - this.previewRow() + this.handleFile(this.row.fileList[0]) }) }, }, @@ -362,17 +383,35 @@ export default { .preview-box { // 定位使水印不溢出元素 + display: flex; position: relative; // 居中 width: calc(100% - 13px - 14px); margin-left: 13px; - + .preview-list{ + width: 200px; + margin-top: 10px; + max-height: 500px; + overflow: auto; + .fileName{ + width: 100%; + height: 28px; + overflow: hidden; + text-overflow: ellipsis; + word-break: keep-all; + white-space: nowrap; + cursor: pointer; + color: #434343; + padding: 0px 10px; + line-height: 28px; + } + } .preview-content { //margin: 0 14px 0 13px; max-height: 500px; padding-bottom: 11px; overflow: auto; - + width: calc(100% - 200px); img { max-width: 100% !important; } @@ -480,4 +519,7 @@ export default { .showLimit ::v-deep .el-textarea .el-input__count{ width: 98%; } +.bgColor{ + background-color: #F2F6FC; +} diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue index 5abce49..7eae331 100644 --- a/src/views/Report/ReportList.vue +++ b/src/views/Report/ReportList.vue @@ -122,6 +122,8 @@