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

src/components/navMenu/index.vue

@@ -300,11 +300,11 @@ export default {
         //       path: '/convertDocView',
         //       menuId: '3F52K25546'
         //     },
-            {
+            /*{
               title: '菜单管理',
               path: '/menuManage',
               menuId: '87b8b4f5817a7829696e63185c744d52'
-            },
+            },*/
             {
               title: '链接管理',
               path: '/linkManage',

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -9,9 +9,9 @@
         <div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <list-project></list-project>
         </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>
-        </div>
+        </div>-->
         <div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <list-other></list-other>
         </div>
@@ -68,13 +68,13 @@ export default {
               name: "listProject"
             });
             continue;
-          } else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
+          }/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
             list.push({
               label: "重点标准跟踪清单",
               name: "listTracking"
             });
             continue;
-          } else if (entity.id === "5a75523729b04102a565167004d640e9") {
+          }*/ else if (entity.id === "5a75523729b04102a565167004d640e9") {
             list.push({
               label: "其他清单",
               name: "listOther"