Merge branch 'develop' into FOTON

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -2418,7 +2418,7 @@
       // 树节点鼠标移入移出
       mouseenter(data){
         this.$set(data, 'show', true)
-        if(data.parentId !== null){
+        if(data.parentId !== null && data.id !== 'zcwdsc'){
           this.$set(data, 'showDel', true)
         }
       },

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -191,7 +191,7 @@
 <!--                <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
                 <div class="table-jump" @click="changeState(scope.row)">
                   <div v-if="scope.row.unCount === '0'">符合</div>
-                  <div v-if="scope.row.unCount === '-1'">不涉及</div>
+                  <div v-else-if="scope.row.unCount === '-1'">不涉及</div>
                   <div v-else >不符合</div>
                 </div>
               </template>