Эх сурвалжийг харах

Merge branch 'cnpc2.1' into debug

shanbinzhang 5 сар өмнө
parent
commit
fcfb4297e4

+ 3 - 3
src/views/externalReport/List.vue

@@ -83,7 +83,7 @@ const collectClassifyOpts = computed(() => {
 function findCollectItem(arr) {
     let collectArr = []
     function traverse(node) {
-        if (node.IsCollect === 1) {
+        if (node.IsCollect === 1&&!node.Children?.length) {
             collectArr.push(node);
         }
         if (node.Children && node.Children.length) {
@@ -353,7 +353,7 @@ function goDetail(item){
                             <ul class="list">
                                 <li 
                                     :class="['item',
-                                        {'active':selectClassifyVal.includes(item.Id)},
+                                        {'active':selectClassifyVal.includes(item.Id)&&!item.Children?.length},
                                     ]" 
                                     v-for="item in classifyOptions" 
                                     :key="item.Id"
@@ -377,7 +377,7 @@ function goDetail(item){
                                     <ul class="classify-sub-list" v-if="item.Children&&item.isSlide">
                                         <li 
                                             :class="['sub-item',
-                                                {'active':selectClassifyVal.includes(subItem.Id)}
+                                                {'active':selectClassifyVal.includes(subItem.Id)&&!subItem.Children?.length}
                                             ]" 
                                             v-for="subItem in item.Children"
                                             :key="subItem.Id"