diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 22a99cc0d..6d7118a59 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -144,7 +144,7 @@ export default { menuId: 'PCZKM8TQJAH5UP5EAXTJ' }, { - title: '未符合项跟踪', + title: '未符合项整改', path: '/nonConfomity', menuId: 'HQSK8WWPDJG7R5F53LTK' }, diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index bcdaee17a..6254b0035 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -542,13 +542,15 @@ export default { _this: this, }, res=> { const result = res.data[0] - // Object.keys(result).forEach((tableName,index) => { - // const tableRes = result[tableName] - // const count = `count${index + 1}` - // this.pageConfig[count] = tableRes.total - // this[tableName] = tableRes.records - // console.log(tableRes) - // }) + for(const type in result) { + this[type] = result[type].records + } + this.newItemsPage = 1 + this.oldItemsPage = 1 + this.newStandPage = 1 + this.oldStandPage = 1 + this.newPolicyPage = 1 + this.oldPolicypage = 1 }, e => { console.log(e) }) diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index 73243f3ad..a91d0f497 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -1,3800 +1,49 @@ - + - diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue new file mode 100644 index 000000000..de8d151e9 --- /dev/null +++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue b/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue new file mode 100644 index 000000000..9e86f0384 --- /dev/null +++ b/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue @@ -0,0 +1,44 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue b/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue new file mode 100644 index 000000000..3b0e0e5da --- /dev/null +++ b/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue @@ -0,0 +1,16 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue new file mode 100644 index 000000000..3c140cddc --- /dev/null +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -0,0 +1,283 @@ + + + + + + diff --git a/src/router/index.js b/src/router/index.js index 3ba6b919f..2f3dc3c0c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -674,7 +674,7 @@ const routes = [ import('@/pages/regulatoryRepository/nonConfomity'), meta: { requireAuth: true, - title: '未符合项跟踪', + title: '未符合项整改', menuId: 'HQSK8WWPDJG7R5F53LTK' } },