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

# Conflicts: # src/sysConfig/index.js
2021-06-04 18:02:14 +08:00
parent 7cc0300099 af2a58433d
commit de57b8d2ae
8 changed files with 37 additions and 22 deletions
@@ -93,11 +93,11 @@ export default {
              path: '/standardForComments',
              menuId: ''
            },
-            // {
-            //   title: '海外标准法规',
-            //   path: '/foreignStandardsAndRegulations',
-            //   menuId: '6K8A2RZYRE'
-            // },
+            {
+              title: '海外标准法规',
+              path: '/foreignStandardsAndRegulations',
+              menuId: '6K8A2RZYRE'
+            },
            // {
            //   title: '国内外政策',
            //   path: '/foreignRegulationsDatabase',
@@ -143,11 +143,11 @@ export default {
              path: '/localProductsOrProjectLibrary',
              menuId: 'PCZKM8TQJAH5UP5EAXTJ'
            },
-            // {
-            //   title: '未符合项跟踪',
-            //   path: '/nonConfomity',
-            //   menuId: 'HQSK8WWPDJG7R5F53LTK'
-            // },
+            {
+              title: '未符合项跟踪',
+              path: '/nonConfomity',
+              menuId: 'HQSK8WWPDJG7R5F53LTK'
+            },
            // {
            //   title: '标准法规工作组',
            //   path: '/workGroup',