diff --git a/src/api/modules/message.js b/src/api/modules/message.js new file mode 100644 index 0000000..9d690e0 --- /dev/null +++ b/src/api/modules/message.js @@ -0,0 +1,19 @@ +import { instance as request } from '@/utils/request' + +export default { + // 新增|编辑 + getList(data) { + return request({ + url: '/api/message/list', + method: 'get', + params:data + }) + }, + allRead(data) { + return request({ + url: '/api/message/allRead', + method: 'get', + params:data + }) + }, +} diff --git a/src/api/modules/report.js b/src/api/modules/report.js index ccb89ab..809a544 100644 --- a/src/api/modules/report.js +++ b/src/api/modules/report.js @@ -102,8 +102,9 @@ export default { // 获取报告预览 reportGetReportHtmlId (data) { return request({ - url: `/api/report/getReportHtml/${data.id}`, - method: 'GET' + url: `/api/report/getReportHtml`, + method: 'GET', + params:data }) }, diff --git a/src/router/modules/processCenter.js b/src/router/modules/processCenter.js index 6924959..aebbd75 100644 --- a/src/router/modules/processCenter.js +++ b/src/router/modules/processCenter.js @@ -28,7 +28,24 @@ const routes = [ name:'monitorViews', component: () => import('../../views/userCenter/processCenter/monitorProcesses/monitorDetail.vue') }, - + // 站内信 + { + path: 'mail', + name: 'mail', + component: () => import('../../views/userCenter/mail/index'), + meta: { + crumb: ['站内信'] + } + }, + // 我的收藏 + { + path: 'collect', + name: 'collect', + component: () => import('../../views/userCenter/collect/index'), + meta: { + crumb: ['我的收藏'] + } + }, ], }, diff --git a/src/views/Report/ReportDetail.vue b/src/views/Report/ReportDetail.vue index 945d953..3dd4e4f 100644 --- a/src/views/Report/ReportDetail.vue +++ b/src/views/Report/ReportDetail.vue @@ -55,8 +55,8 @@
报告详情 - 报告下载 + 报告下载
@@ -522,4 +522,13 @@ export default { .bgColor{ background-color: #F2F6FC; } +.checkBtn { + padding: 5px 20px !important; + background-color:#1890FF; + color: #fff; +} +.el-button.is-disabled, .el-button.is-disabled:hover, .el-button.is-disabled:focus{ + background-color: #82bffc; + color: #fff; +} diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue index faa42a5..f58dc78 100644 --- a/src/views/reportProcess/components/reportForm.vue +++ b/src/views/reportProcess/components/reportForm.vue @@ -120,6 +120,7 @@
点击或拖拽上传文件
@@ -297,7 +298,20 @@ export default { } }, methods: { + handlePreview(file){ + let lastName=file.name.split('.') + let list=['xls','xlsx'] + if(list.indexOf(lastName[lastName.length-1].toLower)==-1){ + if(this.form.id|| this.form.reportId ) { + this.$api.report.reportDownload({reportId: this.form.id || this.form.reportId, fileId: file.id}).then(res => { + downloadFile(res) + }) + } + }else{ + this.$message.warning("当前.xls,.xlsx文件不支持下载") + } + }, changeDate(d){ this.form.secrecyLast = new Date(d) }, diff --git a/src/views/userCenter/collect/index.vue b/src/views/userCenter/collect/index.vue new file mode 100644 index 0000000..fa8c0f7 --- /dev/null +++ b/src/views/userCenter/collect/index.vue @@ -0,0 +1,788 @@ + + + + + diff --git a/src/views/userCenter/mail/index.vue b/src/views/userCenter/mail/index.vue new file mode 100644 index 0000000..7a17354 --- /dev/null +++ b/src/views/userCenter/mail/index.vue @@ -0,0 +1,482 @@ + + + + +