From a6d1b4b93de1924eeec9491a3c9087d6a58d59fa Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Wed, 3 Jun 2026 15:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=8D=E5=8F=AF=E4=BC=A0?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8C=85/=E7=9B=B4=E6=8E=A5=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/yxk-admin.scss | 15 ++++ src/router/routers.js | 5 ++ .../archiveSearch/module/resultList.vue | 12 +-- .../utillizeRecord/myUtilizeList.vue | 12 +-- .../utillizeRecord/recordList.vue | 12 +-- .../managementLibrary/anjuan/tableList.vue | 1 + .../managementLibrary/file/index.vue | 1 + .../managementLibrary/juannei/index.vue | 1 + .../managementLibrary/project/index.vue | 1 + .../collectionLibrary/anjuan/tableList.vue | 1 + .../collectionLibrary/file/index.vue | 1 + .../collectionLibrary/juannei/index.vue | 1 + .../module/uploadOriginal/bigUpload.vue | 13 +++ .../module/uploadOriginal/embedUpload.vue | 12 ++- .../collectionLibrary/project/index.vue | 1 + src/views/components/category/preUpload.vue | 13 +++ src/views/features/403.vue | 90 +++++++++++++++++++ src/views/prearchiveLibrary/file/index.vue | 1 + src/views/prearchiveLibrary/index.vue | 1 + .../module/businessDetails/index.vue | 12 +-- src/views/system/user/cart.vue | 12 +-- 21 files changed, 187 insertions(+), 31 deletions(-) create mode 100644 src/views/features/403.vue diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 438b950..798a088 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -2110,4 +2110,19 @@ input[type ='number'] { white-space: nowrap; width: 200px; } +} + + +.el-table--group, .el-table--border{ + border: none; +} + +// .el-table .el-table__header-wrapper th.el-table__cell, +// .el-table .el-table__header th.el-table__cell{ +// border: none; +// } + +.el-table .el-table__body-wrapper td.el-table__cell, +.el-table .el-table__fixed-right td.el-table__cell{ + border: none; } \ No newline at end of file diff --git a/src/router/routers.js b/src/router/routers.js index 724d3dd..47ddee9 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -20,6 +20,11 @@ export const constantRouterMap = [ component: (resolve) => require(['@/views/features/401'], resolve), hidden: true }, + { + path: '/403', + component: (resolve) => require(['@/views/features/403'], resolve), + hidden: true + }, { path: '/redirect', component: Layout, diff --git a/src/views/archiveUtilize/archiveSearch/module/resultList.vue b/src/views/archiveUtilize/archiveSearch/module/resultList.vue index 4dac268..39fe5ec 100644 --- a/src/views/archiveUtilize/archiveSearch/module/resultList.vue +++ b/src/views/archiveUtilize/archiveSearch/module/resultList.vue @@ -553,14 +553,14 @@ export default { value: 2, label: '下载' }, - { - value: 3, - label: '打印' - } // { - // value: 4, - // label: '实体借阅' + // value: 3, + // label: '打印' // } + { + value: 4, + label: '实体借阅' + } ] this.$refs.lendFormRef.detailArcData.push(item) }) diff --git a/src/views/archiveUtilize/utillizeRecord/myUtilizeList.vue b/src/views/archiveUtilize/utillizeRecord/myUtilizeList.vue index b0eb4f8..13515a9 100644 --- a/src/views/archiveUtilize/utillizeRecord/myUtilizeList.vue +++ b/src/views/archiveUtilize/utillizeRecord/myUtilizeList.vue @@ -175,14 +175,14 @@ export default { value: 2, label: '下载' }, - { - value: 3, - label: '打印' - } // { - // value: 4, - // label: '实体借阅' + // value: 3, + // label: '打印' // } + { + value: 4, + label: '实体借阅' + } ], statusOptions: [ { value: null, label: '全部' }, diff --git a/src/views/archiveUtilize/utillizeRecord/recordList.vue b/src/views/archiveUtilize/utillizeRecord/recordList.vue index 986421b..bd5e60e 100644 --- a/src/views/archiveUtilize/utillizeRecord/recordList.vue +++ b/src/views/archiveUtilize/utillizeRecord/recordList.vue @@ -202,14 +202,14 @@ export default { value: 2, label: '下载' }, - { - value: 3, - label: '打印' - } // { - // value: 4, - // label: '实体借阅' + // value: 3, + // label: '打印' // } + { + value: 4, + label: '实体借阅' + } ], statusOptions: [ { value: 1, label: '利用中' }, diff --git a/src/views/archivesManage/managementLibrary/anjuan/tableList.vue b/src/views/archivesManage/managementLibrary/anjuan/tableList.vue index 2ba602a..1f6e86e 100644 --- a/src/views/archivesManage/managementLibrary/anjuan/tableList.vue +++ b/src/views/archivesManage/managementLibrary/anjuan/tableList.vue @@ -13,6 +13,7 @@ :default-sort="{ prop: '', order: '' }" :row-class-name="tableRowClassName" :row-key="rowKey" + border @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" diff --git a/src/views/archivesManage/managementLibrary/file/index.vue b/src/views/archivesManage/managementLibrary/file/index.vue index 397335f..dd2ebfc 100644 --- a/src/views/archivesManage/managementLibrary/file/index.vue +++ b/src/views/archivesManage/managementLibrary/file/index.vue @@ -24,6 +24,7 @@ height="calc(100vh - 364px)" :row-class-name="tableRowClassName" :row-key="rowKey" + border @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" diff --git a/src/views/archivesManage/managementLibrary/juannei/index.vue b/src/views/archivesManage/managementLibrary/juannei/index.vue index d953f5f..fcd745c 100644 --- a/src/views/archivesManage/managementLibrary/juannei/index.vue +++ b/src/views/archivesManage/managementLibrary/juannei/index.vue @@ -22,6 +22,7 @@ height="calc(100vh - 364px)" :row-class-name="tableRowClassName" :row-key="rowKey" + border @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" diff --git a/src/views/archivesManage/managementLibrary/project/index.vue b/src/views/archivesManage/managementLibrary/project/index.vue index b5146cc..3e00b61 100644 --- a/src/views/archivesManage/managementLibrary/project/index.vue +++ b/src/views/archivesManage/managementLibrary/project/index.vue @@ -13,6 +13,7 @@ height="calc(100vh - 364px)" :row-key="rowKey" :row-class-name="tableRowClassName" + border @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue index 022db79..ba5ed7e 100644 --- a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue +++ b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue @@ -13,6 +13,7 @@ :default-sort="{ prop: '', order: '' }" :row-class-name="tableRowClassName" :row-key="rowKey" + border @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" diff --git a/src/views/collectReorganizi/collectionLibrary/file/index.vue b/src/views/collectReorganizi/collectionLibrary/file/index.vue index 5e82f05..e08d01a 100644 --- a/src/views/collectReorganizi/collectionLibrary/file/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/file/index.vue @@ -23,6 +23,7 @@ height="calc(100vh - 418px)" :row-class-name="tableRowClassName" :row-key="rowKey" + border @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" diff --git a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue index b0f9db2..acb77da 100644 --- a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue @@ -22,6 +22,7 @@ height="calc(100vh - 418px)" :row-class-name="tableRowClassName" :row-key="rowKey" + border @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" diff --git a/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/bigUpload.vue b/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/bigUpload.vue index f2d8d1a..8bbaf68 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/bigUpload.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/bigUpload.vue @@ -323,6 +323,19 @@ export default { const selectedFiles = Array.from(e.target.files) if (selectedFiles.length === 0) return + // 3. 非目录上传时，禁止上传压缩包 + if (!this.isCatalogUpload) { + const compressedExtensions = ['.zip', '.rar', '.7z', '.tar', '.gz', '.bz2'] + const hasCompressedFile = selectedFiles.some(file => + compressedExtensions.some(ext => file.name.toLowerCase().endsWith(ext)) + ) + if (hasCompressedFile) { + this.showMessage('不可上传压缩包文件', 'error') + e.target.value = '' + return + } + } + // 3. 重复文件检测（原有逻辑不变） if (!this.isCatalogUpload) { await this.getFileList() diff --git a/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/embedUpload.vue b/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/embedUpload.vue index 071410c..526962a 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/embedUpload.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/embedUpload.vue @@ -14,7 +14,6 @@ ref="fileInput" type="file" :multiple="true" - class="file-input" style="display: none;" @change="handleFileSelect" @@ -174,6 +173,17 @@ export default { console.log('selectedFiles', selectedFiles) if (selectedFiles.length === 0) return + // 禁止上传压缩包 + const compressedExtensions = ['.zip', '.rar', '.7z', '.tar', '.gz', '.bz2'] + const hasCompressedFile = selectedFiles.some(file => + compressedExtensions.some(ext => file.name.toLowerCase().endsWith(ext)) + ) + if (hasCompressedFile) { + this.showMessage('不可上传压缩包文件', 'error') + e.target.value = '' + return + } + const existingFileNames = this.fileList.map(item => item.file.name) this.repeatFileData = selectedFiles.filter(file => existingFileNames.includes(file.name)) diff --git a/src/views/collectReorganizi/collectionLibrary/project/index.vue b/src/views/collectReorganizi/collectionLibrary/project/index.vue index 0e57f6a..4911831 100644 --- a/src/views/collectReorganizi/collectionLibrary/project/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/project/index.vue @@ -10,6 +10,7 @@ :data="projectData" highlight-current-row style="width: 100%;" + border height="calc(100vh - 418px)" :row-key="rowKey" :row-class-name="tableRowClassName" diff --git a/src/views/components/category/preUpload.vue b/src/views/components/category/preUpload.vue index 07d713d..13fa836 100644 --- a/src/views/components/category/preUpload.vue +++ b/src/views/components/category/preUpload.vue @@ -291,6 +291,19 @@ export default { const selectedFiles = Array.from(e.target.files) if (selectedFiles.length === 0) return + // 3. 非批量挂载时，禁止上传压缩包 + if (this.isBatchMount !== 'true') { + const compressedExtensions = ['.zip', '.rar', '.7z', '.tar', '.gz', '.bz2'] + const hasCompressedFile = selectedFiles.some(file => + compressedExtensions.some(ext => file.name.toLowerCase().endsWith(ext)) + ) + if (hasCompressedFile) { + this.showMessage('不可上传压缩包文件', 'error') + e.target.value = '' + return + } + } + // 初始化文件上传状态（仅初始化，不上传） const newFileList = selectedFiles.map(file => ({ file, diff --git a/src/views/features/403.vue b/src/views/features/403.vue new file mode 100644 index 0000000..44d2782 --- /dev/null +++ b/src/views/features/403.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/views/prearchiveLibrary/file/index.vue b/src/views/prearchiveLibrary/file/index.vue index ad2432e..d572fa7 100644 --- a/src/views/prearchiveLibrary/file/index.vue +++ b/src/views/prearchiveLibrary/file/index.vue @@ -58,6 +58,7 @@ height="calc(100vh - 418px)" :row-class-name="tableRowClassName" :row-key="rowKey" + border @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" diff --git a/src/views/prearchiveLibrary/index.vue b/src/views/prearchiveLibrary/index.vue index d1c6f83..21de5c7 100644 --- a/src/views/prearchiveLibrary/index.vue +++ b/src/views/prearchiveLibrary/index.vue @@ -53,6 +53,7 @@ v-loading="crud.loading" :data="crud.data" style="width: 100%;" + border @row-click="clickRowHandler" @select="crud.selectChange" @select-all="crud.selectAllChange" diff --git a/src/views/system/processManage/runningProcess/module/businessDetails/index.vue b/src/views/system/processManage/runningProcess/module/businessDetails/index.vue index b7df251..92450ed 100644 --- a/src/views/system/processManage/runningProcess/module/businessDetails/index.vue +++ b/src/views/system/processManage/runningProcess/module/businessDetails/index.vue @@ -101,14 +101,14 @@ export default { value: 2, label: '下载' }, - { - value: 3, - label: '打印' - } // { - // value: 4, - // label: '实体借阅' + // value: 3, + // label: '打印' // } + { + value: 4, + label: '实体借阅' + } ], utilizeStateOptions: [ { diff --git a/src/views/system/user/cart.vue b/src/views/system/user/cart.vue index 1993388..52eeea2 100644 --- a/src/views/system/user/cart.vue +++ b/src/views/system/user/cart.vue @@ -187,14 +187,14 @@ export default { value: 2, label: '下载' }, - { - value: 3, - label: '打印' - } // { - // value: 4, - // label: '实体借阅' + // value: 3, + // label: '打印' // } + { + value: 4, + label: '实体借阅' + } ] }) this.$refs.lendFormRef.detailArcData = data