合并冲突

src/components/navMenu/index.vue

@@ -138,11 +138,11 @@ export default {
             // //   title: '子公司标准库',
             // //   path: '/subsidiaryStandardLibrary'
             // // }
-            // {
-            //   title: '车型/项目库',
-            //   path: '/localProductsOrProjectLibrary',
-            //   menuId: 'PCZKM8TQJAH5UP5EAXTJ'
-            // },
+            {
+              title: '车型/项目库',
+              path: '/localProductsOrProjectLibrary',
+              menuId: 'PCZKM8TQJAH5UP5EAXTJ'
+            },
             // {
             //   title: '未符合项跟踪',
             //   path: '/nonConfomity',

src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue

@@ -6,6 +6,7 @@
         <i class="el-icon-back"></i>
       </div>
       <div class="title">{{opinionList.standardName }}<i class="el-icon-s-order" @click="heightShow = !heightShow"></i></div>
+      <div class="title">管理征求意见<i class="el-icon-s-order" @click="heightShow = !heightShow"></i></div>
     </div>
     <transition name="el-zoom-in-top">
       <div v-show="heightShow" class="transition-box">
@@ -64,11 +65,6 @@
             label="提出人"
             width="170">
           </el-table-column>
-            <el-table-column
-              prop="proposer"
-              label="提出人"
-              width="170">
-          </el-table-column>
         </el-table>
       </div>
     </div>