diff --git a/package.json b/package.json index f818345..e5ac516 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "jsencrypt": "3.0.0-rc.1", "lodash": "^4.17.21", "nprogress": "0.2.0", + "pdfjs-dist": "^5.4.149", "quill": "2.0.2", "screenfull": "5.0.2", "sm-crypto": "^0.3.13", @@ -47,6 +48,7 @@ "vue": "2.6.12", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", + "vue-pdf": "^4.3.0", "vue-router": "3.4.9", "vuedraggable": "2.24.3", "vuex": "3.6.0" diff --git a/src/views/archivesManagement/fileManager/components/addTableData.vue b/src/views/archivesManagement/fileManager/components/addTableData.vue index 9985b81..5525432 100644 --- a/src/views/archivesManagement/fileManager/components/addTableData.vue +++ b/src/views/archivesManagement/fileManager/components/addTableData.vue @@ -256,7 +256,7 @@ export default { return false } if (!isValidSize) { - this.$message.error('文件大小不能超过10MB!') + this.$message.error('文件大小不能超过`${this.maxFileTips}`!') return false } @@ -275,8 +275,6 @@ export default { 'image/jpeg', 'image/jpg', 'image/png', - 'image/gif', - 'image/bmp' ] return allowedTypes.includes(file.type) }, diff --git a/src/views/archivesManagement/fileManager/components/rightTable.vue b/src/views/archivesManagement/fileManager/components/rightTable.vue index d2dfafe..d87f461 100644 --- a/src/views/archivesManagement/fileManager/components/rightTable.vue +++ b/src/views/archivesManagement/fileManager/components/rightTable.vue @@ -12,13 +12,13 @@ @click="handleAdd" :disabled="addBtnIsShow"> 新增 + + 预览文件 + - - + + + + @@ -44,6 +46,7 @@ import { getFileManageApi, } from '@/api/archivesManagement/fileManager/fileManager.js' import AddTableData from './addTableData' +import ViewFile from '@/views/viewFile/viewFile.vue' export default { @@ -60,7 +63,8 @@ export default { }, components: { TableModel, - AddTableData + AddTableData, + ViewFile }, data() { return { @@ -69,6 +73,7 @@ export default { getFileManageApi, title: "", isflag: false, + isViewflag: false, isAdd: '', row: {}, loading: false, @@ -85,14 +90,14 @@ export default { closeDialog() { this.isflag = false; + this.isViewflag = false; }, showColose() { this.isflag = false; + this.isViewflag = false; }, /** 新增按钮操作 */ handleAdd() { - console.log(this.selectedNode); - this.title = "新增"; this.isAdd = 'add'; this.isflag = true; @@ -112,14 +117,12 @@ export default { this.isflag = true; }, - /** 详情操作 */ - handleDetail(row) { - this.title = "详情"; - this.isAdd = 'detail'; + // 预览文件 + viewFile(row) { + this.title = "预览"; + this.isAdd = 'view'; this.row = row; - this.row.belongName = this.selectedNode.label + '/' + this.selectedNode.parentName - this.row.detailStatus = true; - this.isflag = true; + this.isViewflag = true; }, /* 搜索操作 */ handleQuery() { diff --git a/src/views/viewFile/viewFile.vue b/src/views/viewFile/viewFile.vue new file mode 100644 index 0000000..1925984 --- /dev/null +++ b/src/views/viewFile/viewFile.vue @@ -0,0 +1,115 @@ + + + \ No newline at end of file