From 479131ef21eecec618b9169ed8f84d49fc153ec9 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 26 Jul 2024 14:12:40 +0800
Subject: [PATCH 1/3] edit

---
 src/renderer/src/layout/components/Header.vue | 1 +
 src/renderer/src/views/resource/index.vue     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index 59a69ec..26f5c42 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -190,6 +190,7 @@ function setLayout() {
   height: 100%;
   display: flex;
   justify-content: space-between;
+  align-items: center;
   padding-bottom: 5px;
   flex-direction: column;
 
diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue
index ecae1b5..c340fba 100644
--- a/src/renderer/src/views/resource/index.vue
+++ b/src/renderer/src/views/resource/index.vue
@@ -26,7 +26,6 @@ import ResoureSearch from './container/resoure-search.vue'
 import ResoureList from './container/resoure-list.vue'
 import uploadDialog from '@/components/upload-dialog/index.vue'
 import uploaderState from '@/store/modules/uploader'
-import { hasPermission } from '@/utils/hasPermission'
 //
 const sourceStore = useResoureStore()
 const isDialogOpen = ref(false)

From 80ee3c0f1186f27f287c06fbeba871de6888a318 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 26 Jul 2024 14:15:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8ea8298..d78f8c0 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,8 @@
     "build": "electron-vite build",
     "postinstall": "electron-builder install-app-deps",
     "build:unpack": "npm run build && electron-builder --dir",
-    "build:test": "npm run build && electron-builder --win --config ./electron-builder-test.yml",
-    "build:prod": "npm run build && electron-builder --win --config ./electron-builder.yml",
+    "build:dev": "npm run build && electron-builder --win --config ./electron-builder-test.yml",
+    "build:test": "npm run build && electron-builder --win --config ./electron-builder.yml",
     "build:mac": "npm run build && electron-builder --mac",
     "build:linux": "npm run build && electron-builder --linux"
   },

From 828abbbcb731d412fe8c7348c08d67ee9796db42 Mon Sep 17 00:00:00 2001
From: yangws <1607839436@qq.com>
Date: Fri, 26 Jul 2024 14:34:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/router/index.js              |  8 ++++-
 src/renderer/src/views/classManage/aside.vue  |  8 ++---
 .../src/views/classManage/basicGroup.vue      |  3 +-
 .../src/views/classManage/classInfo.vue       | 29 +++++++++++--------
 src/renderer/src/views/classManage/index.vue  |  5 ++--
 .../src/views/classManage/studentList.vue     |  9 ++++--
 6 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js
index 7692dc2..4bb6ea2 100644
--- a/src/renderer/src/router/index.js
+++ b/src/renderer/src/router/index.js
@@ -37,7 +37,13 @@ export const constantRoutes = [
         component: () => import('@/views/profile/index.vue'),
         name: 'profile',
         meta: {title: '个人中心'}
-      }
+      },
+      {
+        path: '/class',
+        component: () => import('@/views/classManage/index.vue'),
+        name: 'class',
+        meta: {title: '班级中心'},
+      },
     ]
   },
 
diff --git a/src/renderer/src/views/classManage/aside.vue b/src/renderer/src/views/classManage/aside.vue
index a6c4370..7efce51 100644
--- a/src/renderer/src/views/classManage/aside.vue
+++ b/src/renderer/src/views/classManage/aside.vue
@@ -19,10 +19,8 @@
 </template>
 
 <script setup>
-import {ref,defineProps,defineEmits} from "vue";
-import { useRouter } from 'vue-router'
+import {ref,defineProps,defineEmits,onMounted} from "vue";
 const activeIndex = ref('0')
-const router = useRouter()
 const props = defineProps({
   classList:{
     type:Array,
@@ -45,7 +43,9 @@ const handleSelect = (itemDom,pathKey) => {
   // })
   emits('handleSelect',{index,id})
 }
-
+onMounted(() => {
+  console.log(props.classList,'props.classList')
+})
 </script>
 
 <style scoped>
diff --git a/src/renderer/src/views/classManage/basicGroup.vue b/src/renderer/src/views/classManage/basicGroup.vue
index 791b6ff..3d7c4bc 100644
--- a/src/renderer/src/views/classManage/basicGroup.vue
+++ b/src/renderer/src/views/classManage/basicGroup.vue
@@ -113,8 +113,7 @@ import useUserStore from '@/store/modules/user'
 import {useRoute} from 'vue-router'
 import {ElMessage} from "element-plus";
 
-const userStore = useUserStore()
-const route = useRoute()
+const userStore = useUserStore().user
 const props = defineProps({
   classId: {type: Number}
 })
diff --git a/src/renderer/src/views/classManage/classInfo.vue b/src/renderer/src/views/classManage/classInfo.vue
index f15d02b..de3d879 100644
--- a/src/renderer/src/views/classManage/classInfo.vue
+++ b/src/renderer/src/views/classManage/classInfo.vue
@@ -2,19 +2,24 @@
   <el-card style="width: 100%">
     <template #header>
       <div style="text-align: left">
-        <el-button type="danger" @click="deleteClassRoom">删除班级</el-button>
+        <el-button v-if="classInfo.teacher.length > 0" type="danger" @click="deleteClassRoom">删除班级</el-button>
       </div>
     </template>
-    <el-descriptions :column="1">
-      <el-descriptions-item label="班级名称">{{ classInfo.className }}</el-descriptions-item>
-      <el-descriptions-item label="教师">
-        <template v-if="classInfo.teacher.length > 0">
-          <el-tag type="primary" v-for="(item, index) in classInfo.teacher" :key="index">{{item.name}}</el-tag>
-        </template>
-        <template v-else>暂无</template>
-      </el-descriptions-item>
-      <el-descriptions-item label="学生人数">{{ classInfo.student.length }}人</el-descriptions-item>
-    </el-descriptions>
+    <template v-if="classInfo.teacher.length > 0">
+      <el-descriptions :column="1">
+        <el-descriptions-item label="班级名称">{{ classInfo.className }}</el-descriptions-item>
+        <el-descriptions-item label="教师">
+          <template>
+            <el-tag type="primary" v-for="(item, index) in classInfo.teacher" :key="index">{{item.name}}</el-tag>
+          </template>
+        </el-descriptions-item>
+        <el-descriptions-item label="学生人数">{{ classInfo.student.length }}人</el-descriptions-item>
+      </el-descriptions>
+    </template>
+
+    <template v-else>
+      <el-empty description="暂无班级信息" style="margin: 0 auto"/>
+    </template>
   </el-card>
 </template>
 
@@ -35,7 +40,7 @@
     student: []
   })
   const isDelClass = delClassDemo()
-  const userStore = useUserStore()
+  const userStore = useUserStore().user
   //删除教室
   const deleteClassRoom = () => {
     ElMessageBox.alert('确认删除该班级？', {
diff --git a/src/renderer/src/views/classManage/index.vue b/src/renderer/src/views/classManage/index.vue
index 4ba11ad..8deb68d 100644
--- a/src/renderer/src/views/classManage/index.vue
+++ b/src/renderer/src/views/classManage/index.vue
@@ -75,7 +75,7 @@
   import ClassInfo from './classInfo.vue'
   import Aside from './aside.vue'
 
-  const userStore = useUserStore()
+  const userStore = useUserStore().user
   const isDel = delClassDemo()
   //获取班级信息
   const classList = ref([])
@@ -144,7 +144,7 @@
     classList.value = []
     listClassmain({ entpid: userStore.deptId, pageSize: 500, status: 'open' }).then(response => {
       response.rows.forEach(item => {
-        if(item.classteacherids && Number(item.classteacherids) === userStore?.id){
+        if(item.classteacherids && Number(item.classteacherids) === userStore.userId){
           classList.value.push(item)
         }
       })
@@ -265,6 +265,7 @@
   onMounted(() => {
     getClassInfo()
     nextTick(() => {
+      console.log(userStore.deptId,'123')
       viewportHeight.value = getViewportHeight()
     })
     window.addEventListener('resize', () => {
diff --git a/src/renderer/src/views/classManage/studentList.vue b/src/renderer/src/views/classManage/studentList.vue
index 9bc1402..f3826b5 100644
--- a/src/renderer/src/views/classManage/studentList.vue
+++ b/src/renderer/src/views/classManage/studentList.vue
@@ -118,7 +118,7 @@
 
   const studentVisible = ref(false)
   const importVisiable = ref(false)
-  const userStore = useUserStore()
+  const userStore = useUserStore().user
   const props = defineProps({
     classId: {type: Number}
   })
@@ -191,6 +191,8 @@
               message: '修改成功',
               type: 'success',
             })
+            getClassStudentInfo()
+            studentVisible.value = false
           })
         }else{
           studentForm.entpid = classInfo.value.entpid;
@@ -206,10 +208,11 @@
                 type: 'success',
               })
             }
+            getClassStudentInfo()
+            studentVisible.value = false
           })
         }
-        getClassStudentInfo()
-        studentVisible.value = false
+
       } else {
         return false;
       }