FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Mr.Z
2021-08-08 09:51:44 +08:00
parent 9c30db3976 5e68c10d49
commit 24eb75dbe5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+2 -2
View File
@@ -300,11 +300,11 @@ export default {
// path: '/convertDocView', // path: '/convertDocView',
// menuId: '3F52K25546' // menuId: '3F52K25546'
// }, // },
{ /*{
title: '菜单管理', title: '菜单管理',
path: '/menuManage', path: '/menuManage',
menuId: '87b8b4f5817a7829696e63185c744d52' menuId: '87b8b4f5817a7829696e63185c744d52'
}, },*/
{ {
title: '链接管理', title: '链接管理',
path: '/linkManage', path: '/linkManage',
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+4 -4
View File
@@ -9,9 +9,9 @@
<div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"> <div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-project></list-project> <list-project></list-project>
</div> </div>
<div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"> <!-- <div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-tracking></list-tracking> <list-tracking></list-tracking>
</div> </div>-->
<div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"> <div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-other></list-other> <list-other></list-other>
</div> </div>
@@ -68,13 +68,13 @@ export default {
name: "listProject" name: "listProject"
}); });
continue; continue;
} else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") { }/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
list.push({ list.push({
label: "重点标准跟踪清单", label: "重点标准跟踪清单",
name: "listTracking" name: "listTracking"
}); });
continue; continue;
} else if (entity.id === "5a75523729b04102a565167004d640e9") { }*/ else if (entity.id === "5a75523729b04102a565167004d640e9") {
list.push({ list.push({
label: "其他清单", label: "其他清单",
name: "listOther" name: "listOther"