diff --git a/src/api/filesTransfer/accept.js b/src/api/filesTransfer/accept.js index 1877255..0dd6bfc 100644 --- a/src/api/filesTransfer/accept.js +++ b/src/api/filesTransfer/accept.js @@ -9,19 +9,30 @@ export function getTransferReceiceListApi(params) { }) } -// 接收查看、进度 -export function getTransferRecordFilesApi(params) { - return request({ - url: '/smartArchives/transferReceice/getTransferRecordFiles', - method: 'GET', - params: params, - }) -} -export function getTransferReceiceDetailByAcceptApi(params) { +// 详情 +export function getTransferReceiceDetailApi(params) { return request({ url: '/smartArchives/transferReceice/getTransferReceiceDetail', method: 'GET', params: params, }) } + +// 详情列表 +export function getTransferReceiceFilesApi(params) { + return request({ + url: '/smartArchives/transferReceice/getTransferReceiceFiles', + method: 'GET', + params: params, + }) +} + +// 确认接收 +export function transferReceiveApi(data) { + return request({ + url: '/smartArchives/transferReceice/transferReceive', + method: 'POST', + data, + }) +} diff --git a/src/api/filesTransfer/audit.js b/src/api/filesTransfer/audit.js index bb0c597..7b4603d 100644 --- a/src/api/filesTransfer/audit.js +++ b/src/api/filesTransfer/audit.js @@ -16,4 +16,22 @@ export function auditTransferApplyApi(data) { method: 'POST', data: data, }) +} + +// 档案移交审核详情 +export function getTransferAuditApi(params) { + return request({ + url: '/smartArchives/transferApply/getTransferAudit', + method: 'GET', + params: params + }) +} + +// 档案移交审核-列表详情 +export function getTransferAudieFilesByApplyIdApi(params) { + return request({ + url: '/smartArchives/transferApply/getTransferAudieFilesByApplyId', + method: 'GET', + params: params + }) } \ No newline at end of file diff --git a/src/api/filesTransfer/record.js b/src/api/filesTransfer/record.js index 0b4df91..fb5506c 100644 --- a/src/api/filesTransfer/record.js +++ b/src/api/filesTransfer/record.js @@ -35,3 +35,12 @@ export function updateTransferRecordFilesStatusApi(data) { data, }) } + +// 详情 +export function getTransferRecordDetailApi(params) { + return request({ + url: '/smartArchives/transferRecord/getTransferRecordDetail', + method: 'GET', + params: params, + }) +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 95ef483..071327a 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -104,7 +104,7 @@ export default { }).then(() => { this.$store.dispatch('LogOut').then(() => { location.href = process.env.VUE_APP_ENV === 'production'? '/smart-archiving/index': '/index' - getSystemConfigApi(); + // getSystemConfigApi(); }) }).catch(() => {}) } diff --git a/src/utils/request.js b/src/utils/request.js index f503a54..e3038bf 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -9,7 +9,8 @@ import { saveAs } from 'file-saver' import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm' import { generateRequestSignature } from '@/utils/crypto-js' -const encryptRequestFlag = getConfig('encryptRequest') + +const encryptRequestFlag = getConfig('encryptRequest',1) const encryptResponseFlag = getConfig('encryptResponse') const checkIntegrityFlag = getConfig('checkIntegrity') const replayAttackFlag = getConfig('replayAttack') @@ -26,7 +27,8 @@ const systemConfig = { }, } -function getConfig(value) { +function getConfig(value,type) { + let config = sessionStorage.getItem('systemConfig'); if(config){ const decryptArr = JSON.parse(decryptWithSM4(config)); @@ -38,6 +40,7 @@ function getConfig(value) { } } + let downloadLoadingInstance export let isRelogin = { show: false } diff --git a/src/utils/systemConfig.js b/src/utils/systemConfig.js index 1598af4..418062d 100644 --- a/src/utils/systemConfig.js +++ b/src/utils/systemConfig.js @@ -1,8 +1,9 @@ import { getNoAuthConfig } from '@/api/system/setting'; import {encryptWithSM4} from '@/utils/sm'; -export function getSystemConfigApi() { - getNoAuthConfig().then(res => { + export async function getSystemConfigApi() { + await getNoAuthConfig().then(res => { + console.log(res.data); sessionStorage.setItem('systemConfig', encryptWithSM4(JSON.stringify(res.data))); }).catch(error => { console.error('Failed to fetch config:', error); diff --git a/src/views/filesTransfer/accept/components/recordList.vue b/src/views/filesTransfer/accept/components/recordList.vue index 608a316..9bdfa72 100644 --- a/src/views/filesTransfer/accept/components/recordList.vue +++ b/src/views/filesTransfer/accept/components/recordList.vue @@ -20,7 +20,7 @@ @@ -236,27 +253,28 @@ export default { .detail-container { padding: 20px; background: #fff; - height: calc(100vh - 120px); /* 减去头部导航栏的高度 */ + height: calc(100vh - 120px); + /* 减去头部导航栏的高度 */ overflow-y: auto; box-sizing: border-box; - + /* 自定义滚动条样式 */ &::-webkit-scrollbar { width: 6px; background: #f5f5f5; } - + &::-webkit-scrollbar-track { background: #f5f5f5; border-radius: 3px; } - + &::-webkit-scrollbar-thumb { background: #c0c4cc; border-radius: 3px; transition: background 0.3s; } - + &::-webkit-scrollbar-thumb:hover { background: #909399; } @@ -333,9 +351,10 @@ export default { } } -.back-btn{ +.back-btn { height: 50px; } + /* 确认弹框样式 */ .confirm-content { display: flex; @@ -367,10 +386,12 @@ export default { color: #909399; line-height: 1.4; } + .file-name-link { color: #409EFF; cursor: pointer; } + .file-name-link:hover { text-decoration: underline; }