合并冲突

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -76,12 +76,12 @@
         </div>
       </table-tools-bar>
       <div class="action-bar">
-        <el-button type="primary"
-                   class="common-button-primary add-button"
-                   @click="addModal"
-                   size="mini"
-                   v-btn-permission="'57f40856850c95912be0760a082db0e0'"
-                   :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>
+<!--        <el-button type="primary"-->
+<!--                   class="common-button-primary add-button"-->
+<!--                   @click="addModal"-->
+<!--                   size="mini"-->
+<!--                   v-btn-permission="'57f40856850c95912be0760a082db0e0'"-->
+<!--                   :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>-->
         <el-button class="common-button-default in-button"
                    :loading="searching"
                    size="mini"

src/pages/regulatoryRepository/nonConfomity/index.vue

@@ -42,6 +42,7 @@ export default {
   flex-direction: column;
   background-color: #FFFFFF;
   .non-content {
+    padding: 0 10px;
     height: 100%;
     /deep/  .el-tabs {
       display: flex;