diff --git a/src/App.vue b/src/App.vue index 2f2a1dc..09fb910 100644 --- a/src/App.vue +++ b/src/App.vue @@ -23,7 +23,7 @@ export default { /* !!process.env.VUE_APP_BASE_API 开头的为公司环境 - assetsManagement 除了assetsAuth.vue,其他文件切换 上传文件 公司环境正式环境 + assetsManagement 除了 assetsAuth.vue, 其他文件切换 上传文件 公司环境正式环境 myUpload 切换正式环境,公司环境 vue.config.js 切换公司环境,正式环境 .env.production 切换公司环境,正式环境 diff --git a/src/api/renwuApi/index.js b/src/api/renwuApi/index.js index 16e644d..5eb89f6 100644 --- a/src/api/renwuApi/index.js +++ b/src/api/renwuApi/index.js @@ -196,4 +196,21 @@ export function assetTaskdwHcBl(data) { method: "post", data, }) +} + +export function assetTaskzcTj(data) { + return request({ + url: `/unit/assetTask/zcTj`, + method: "post", + data, + }) +} + + +export function assetTaskhistory(params) { + return request({ + url: `/unit/assetTask/history`, + method: "get", + params, + }) } \ No newline at end of file diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 7ac37e0..93e84bd 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -64,6 +64,12 @@ export default { const route = sidebarRouters.filter(item => item.path == '') const twoActiveRoute = route[0].children.filter(item => item.path == "taskInfo") this.levelList = [activeRoute[0].children[0],twoActiveRoute[0],matched[0]] + }else if(matched[0].path == "/taskAuditInfolishichakan") { + // 管理端--任务管理--任务审核--任务管理历史详情 + const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'task') + const route = sidebarRouters.filter(item => item.path == '') + const twoActiveRoute = route[0].children.filter(item => item.path == "taskInfo") + this.levelList = [activeRoute[0].children[0],twoActiveRoute[0],matched[0]] } else if(matched[0].path == "/mytaskAuditInfo") { // 单位端--我的任务--资产核查--资产审核详情 const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'myTask') diff --git a/src/router/index.js b/src/router/index.js index 5ea504d..cff9bfc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -94,6 +94,11 @@ export const constantRoutes = [ component: () => import('@/views/auditPages/taskManagement/audit'), name: 'taskAuditInfo', meta: { title: '资产审核', icon: 'user', activeMenu: "/task" } + },{ + path: 'taskAuditInfolishichakan', + component: () => import('@/views/auditPages/taskManagement/audit'), + name: 'taskAuditInfolishichakan', + meta: { title: '资产提交记录', icon: 'user', activeMenu: "/task" } },{ path: 'mytaskInfo', component: () => import('@/views/unitPages/myTask/info'), diff --git a/src/utils/request.js b/src/utils/request.js index 827b69c..3a93e8d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -56,7 +56,7 @@ service.interceptors.request.use(config => { const s_url = sessionObj.url; // 请求地址 const s_data = sessionObj.data; // 请求数据 const s_time = sessionObj.time; // 请求时间 - const interval = 1000; // 间隔时间(ms),小于此时间视为重复提交 + const interval = 100; // 间隔时间(ms),小于此时间视为重复提交 if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { const message = '数据正在处理,请勿重复提交'; console.warn(`[${s_url}]: ` + message) diff --git a/src/views/auditPages/assetsManagement/email.vue b/src/views/auditPages/assetsManagement/email.vue index b6be177..2bfef80 100644 --- a/src/views/auditPages/assetsManagement/email.vue +++ b/src/views/auditPages/assetsManagement/email.vue @@ -245,8 +245,11 @@ export default { } }, mounted(){ - if(this.$route.params) { + if( Object.keys(this.$route.params).length != 0) { this.formInline = this.$route.params; + }else{ + this.formInline.current = 1 + this.formInline.size = 20 } this.getList(); this.getDeptTree(); diff --git a/src/views/auditPages/assetsManagement/index.vue b/src/views/auditPages/assetsManagement/index.vue index 69fce46..ff994f3 100644 --- a/src/views/auditPages/assetsManagement/index.vue +++ b/src/views/auditPages/assetsManagement/index.vue @@ -1,4 +1,4 @@ - +