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

# Conflicts: # src/components/navMenu/index.vue
2021-06-22 18:02:50 +08:00
parent e575d3b2ea 789f3b05f3
commit e17655412b
26 changed files with 6864 additions and 3074 deletions
@@ -387,13 +387,13 @@ export default {
            // }
          ]
        },
-        // {
-        //   title: '搜索中心',
-        //   path: '/advancedSearch',
-        //   'icon-class': 'search',
-        //   menuId: 'K9BAYUPZBC',
-        //   isChildren: true // 判断没有子菜单
-        // },
+              {
+                  title: '搜索中心',
+                  path: '/advancedSearch',
+                  'icon-class': 'search',
+                  menuId: 'K9BAYUPZBC',
+                  isChildren: true // 判断没有子菜单
+              },
        // {
        //   title: '标准比对库',
        //   path: '/standardComparisonLibrary',