From 82b9014a7b25fb9ef393e99cabacab53ddebc117 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Wed, 31 May 2023 16:47:31 +0800
Subject: [PATCH] 交互调整

---
 src/views/layout/aside/aside.vue      |  2 +-
 src/views/layout/aside/menuTree.vue   | 46 ++++++++++++++++++++++++++++------------------
 src/views/standard/setUp/archived.vue |  4 ++--
 src/views/standard/setUp/clazz.vue    |  2 +-
 src/views/standard/setUp/teacher.vue  |  2 +-
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/views/layout/aside/aside.vue b/src/views/layout/aside/aside.vue
index 4081fa6..656a894 100644
--- a/src/views/layout/aside/aside.vue
+++ b/src/views/layout/aside/aside.vue
@@ -39,7 +39,7 @@
                 <span slot="title">{{ item.name }}</span>
               </template>
 
-              <menu-tree :menuData="item.children"></menu-tree>
+              <menu-tree :menuData="item.children" :path="path"></menu-tree>
             </el-submenu>
             <el-menu-item
               :index="item.path"
diff --git a/src/views/layout/aside/menuTree.vue b/src/views/layout/aside/menuTree.vue
index 25bd60f..bb49688 100644
--- a/src/views/layout/aside/menuTree.vue
+++ b/src/views/layout/aside/menuTree.vue
@@ -1,29 +1,39 @@
 <template>
-    <div>
-      <template v-for="(child) in menuData">
-        <el-submenu v-if="child.children.length > 0" :index="child.path" :key="child.path">
-          <template slot="title">
-            <i :class="child.iconCls?child.iconCls:[fa,fa-file]"/>
-            <span slot="title">{{ child.name }}</span>
-          </template>
-          <menu-tree :menuData="child.children"/>
-        </el-submenu>
+  <div>
+    <template v-for="child in menuData">
+      <el-submenu
+        v-if="child.children.length > 0"
+        :index="child.path"
+        :key="child.path"
+      >
+        <template slot="title">
+          <i :class="child.iconCls ? child.iconCls : [fa, fa - file]" />
+          <span slot="title">{{ child.name }}</span>
+        </template>
+        <menu-tree :menuData="child.children" />
+      </el-submenu>
 
-        <el-menu-item v-else-if="!child.hidden" :index="child.path" :key="child.path">
-          <i :class="child.iconCls?child.iconCls:[fa,fa-file]"/>
-          <span slot="title">{{ child.name}}</span>
-        </el-menu-item>
-      </template>
-    </div>
+      <el-menu-item
+        v-else-if="!child.hidden"
+        :index="child.path"
+        :key="child.path"
+        :class="
+          child.path == '/setUpClazz' && path == '/archived' ? 'is-active' : ''
+        "
+      >
+        <i :class="child.iconCls ? child.iconCls : [fa, fa - file]" />
+        <span slot="title">{{ child.name }}</span>
+      </el-menu-item>
+    </template>
+  </div>
 </template>
 
 <script>
 export default {
   name: "menuTree",
-  props: ["menuData"]
-}
+  props: ["menuData", "path"],
+};
 </script>
 
 <style scoped>
-
 </style>
diff --git a/src/views/standard/setUp/archived.vue b/src/views/standard/setUp/archived.vue
index bbf8392..4992f88 100644
--- a/src/views/standard/setUp/archived.vue
+++ b/src/views/standard/setUp/archived.vue
@@ -48,7 +48,7 @@
             </p>
           </div>
           <div class="btn-box">
-            <el-button class="btn" round @click="classIds = []">取消</el-button>
+            <el-button class="btn" round @click="toClazz">取消</el-button>
             <el-popconfirm
               confirm-button-text="确定"
               cancel-button-text="取消"
@@ -267,7 +267,7 @@ export default {
       });
       this.loadingClass = false;
       if (status === 0) {
-        this.classList = [...data.list] || [];
+        this.classList = (data.list && [...data.list]) || [];
         this.classIds = [];
       } else {
         this.$message.error(info);
diff --git a/src/views/standard/setUp/clazz.vue b/src/views/standard/setUp/clazz.vue
index 88bd813..a6a431e 100644
--- a/src/views/standard/setUp/clazz.vue
+++ b/src/views/standard/setUp/clazz.vue
@@ -67,7 +67,7 @@
                 </p>
                 <div class="clazz-class">
                   <span>学生：{{ clazz.studentCount }}个</span>
-                  <span>教师：{{ clazz.studentCount }}个</span>
+                  <span>教师：{{ clazz.teacherCount }}个</span>
                 </div>
               </div>
             </li>
diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue
index 4ae9123..5bf4426 100644
--- a/src/views/standard/setUp/teacher.vue
+++ b/src/views/standard/setUp/teacher.vue
@@ -354,7 +354,7 @@
               class="sel-t"
               collapse
               clearable
-              placeholder="选择年级-科目"
+              placeholder="选择班级-科目"
               v-model="item.classId"
               :options="classList"
               :props="{ expandTrigger: 'hover' }"
--
libgit2 0.21.4