diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 30f4df6e7..66e77cdf4 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -114,11 +114,11 @@ export default { // path: '/partCodeApply', // menuId: 'ad9db496772c075f78495382b7581fe9' // }, - // { - // title: '标准法规工作组数据统计', - // path: '/dataStatisComments', - // menuId: '' - // }, + { + title: '标准法规工作组数据统计', + path: '/dataStatisComments', + menuId: '' + }, { title: '海外法规', path: '/foreignStandardsAndRegulations', diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index c0ebeee2f..180405eef 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -80,11 +80,13 @@ diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 8925d7ae5..14aefd24c 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1274,10 +1274,12 @@ export default { diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue new file mode 100644 index 000000000..463314d93 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue @@ -0,0 +1,329 @@ + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue new file mode 100644 index 000000000..5339886f7 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue @@ -0,0 +1,406 @@ + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue new file mode 100644 index 000000000..9a21557d9 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue @@ -0,0 +1,144 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue new file mode 100644 index 000000000..8d415f17f --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue @@ -0,0 +1,448 @@ + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue new file mode 100644 index 000000000..728cdef0e --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue @@ -0,0 +1,461 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue new file mode 100644 index 000000000..a4e164e94 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue @@ -0,0 +1,650 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue new file mode 100644 index 000000000..6600a6f72 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue @@ -0,0 +1,569 @@ + + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue new file mode 100644 index 000000000..b8c468edb --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue @@ -0,0 +1,358 @@ + + + + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue new file mode 100644 index 000000000..c9d88e1a0 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue @@ -0,0 +1,369 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue new file mode 100644 index 000000000..095f3912a --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue @@ -0,0 +1,390 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue new file mode 100644 index 000000000..d9aa8d338 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue @@ -0,0 +1,389 @@ + + + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue new file mode 100644 index 000000000..196585903 --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue @@ -0,0 +1,82 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue new file mode 100644 index 000000000..d8fa5d16c --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue @@ -0,0 +1,409 @@ + + + + + + + diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index ff98ca50b..662bfdf1a 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -265,7 +265,7 @@ @@ -3365,7 +3365,7 @@ export default { } break case 'textStatus' : - this.orderBy = 5; + this.orderBy = 4; this.nowOrder = sortObj.column.order if (this.nowOrder === 'ascending') { this.nowOrder = 2 @@ -3793,7 +3793,8 @@ export default { } else { this.sarStandardsSearch.page = page } - this.getDomesticStandardTable(this.tableFlag) + this.standCommonlySearch.page=page + this.getDomesticStandardTable(this.standCommonlySearch) }, // 分页每页显示数改变后方法 pageSizeChange(pageSize) { @@ -5087,16 +5088,19 @@ export default { }, choiceZRBM(type, title, id) { + this.nodeListZRBM = [] this.nodeListZRBM.push(id) this.drawerTitle = title this.modalshowflagZRBM = true }, drawerCheckZRBM(data) { + + console.log("data",data); let idList = '' let nameList = '' data.forEach(item => { - if (item.hasChild === '0' && item.children === null) { + if (item.hasChild === '0') { if (nameList.length > 0) { nameList += ',' idList += ',' diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index aabb2621b..b8d729ce2 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -279,6 +279,7 @@ border class="drag-table" :row-class-name="dragRowClassName" + @sort-change="sortChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="standSelectChange" @@ -362,7 +363,7 @@ sortable prop="standStatusShow" label="文本状态" - width="120" + width="110" >