From 642b04827dc8fab60e809ba28dbd5f777defaf6b Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Thu, 6 Oct 2022 01:13:35 +0800
Subject: [PATCH] =?UTF-8?q?clay=20commit=20:=20=E4=B8=80=E4=BA=9B=E5=B0=8F?=
 =?UTF-8?q?bug=E8=B0=83=E6=95=B4=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/content/components/dire_data.vue |  2 +-
 src/views/content/index.vue                | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/content/components/dire_data.vue b/src/views/content/components/dire_data.vue
index 4495f54..94c288c 100644
--- a/src/views/content/components/dire_data.vue
+++ b/src/views/content/components/dire_data.vue
@@ -15,7 +15,7 @@
       </el-row>
       <el-row v-for="(chile,index) in dire.children" :key="index">
         <el-col class="name" :offset="1" :span="23">
-          {{ chile.name }}<span v-if="chile.children.length>1">({{chile.children.length}}人)</span>
+          {{ chile.name }}
         </el-col>
           <el-col class="text" :offset="1" :span="23">
             <div v-for="(item,index) in chile.children" :key="index" @click="linkClick(item)">
diff --git a/src/views/content/index.vue b/src/views/content/index.vue
index e900f4b..8bbc3ca 100644
--- a/src/views/content/index.vue
+++ b/src/views/content/index.vue
@@ -208,6 +208,7 @@ export default {
   watch: {
     $route(to, from) {
       console.log("我被触发了")
+      this.showIndex = 0
       let arcId = this.$route.params && this.$route.query.id
       this.navId = this.$route.params && this.$route.params.navId;
       let id = this.$route.params && this.$route.params.secondId
@@ -229,7 +230,6 @@ export default {
       } else {
         console.log(this.navId, "this.navId")
         if (undefined == this.navId) {
-          this.showIndex = 0
           this.getNodes()
         }
       }
@@ -249,6 +249,7 @@ export default {
           }
         }
       } else {
+        this.navList = []
         this.secondId = id
         this.getNav()
       }
@@ -256,10 +257,11 @@ export default {
   },
   created() {
     setLanguage(this)
+    this.showIndex = 0
     this.secondId = this.$route.params && this.$route.params.secondId;
     this.navId = this.$route.params && this.$route.params.navId;
     this.type = this.$route.query && this.$route.query.type
-    console.log(this.type,"this.type")
+    console.log(this.type, "this.type")
     setTimeout(() => {
       this.getNav()
     }, 200);
@@ -317,7 +319,7 @@ export default {
     /**
      * 获得节点信息
      */
-    async  getNodes() {
+    async getNodes() {
       this.navList = []
       // await getNode({id: this.secondId}).then(res => {
       //   this.navList = res.data
@@ -348,9 +350,11 @@ export default {
       //     }
       //   }
       // })
-      let res =  await getNode({id: this.secondId})
+      let res = await getNode({id: this.secondId})
       // todo 延时异步问题
-      this.$refs.lab.style.height = res.data.length * 8 + 10 + 'rem'
+      setTimeout(() => {
+        this.$refs.lab.style.height = res.data.length * 8 + 10 + 'rem'
+      }, 100);
       this.navList = res.data
       // if (!this.navList){
       //   return
@@ -379,7 +383,7 @@ export default {
     getContent(menu) {
       console.log("getContent内部,menu:", menu)
       console.log(menu)
-      if (menu == undefined){
+      if (menu == undefined) {
         return
       }
       this.type = menu.type
@@ -393,7 +397,7 @@ export default {
           pageSize: 5
         }
         this.listDataType = 0
-        if (this.type === 4||menu.isSimple == 1) {
+        if (this.type === 4 || menu.isSimple == 1) {
           data.pageSize = 10
           this.listDataType = 1
         }