Merge branch 'main' into zouyf_dev

Merge pull request 'fix : 样式问题；' (#284 ) from yangws into main
Reviewed-on: #284
2024-09-27 15:11:57 +08:00 · 2024-09-27 15:08:23 +08:00 · 2024-09-27 15:07:58 +08:00 · 2024-09-27 15:06:30 +08:00 · 2024-09-27 15:05:49 +08:00
2 changed files with 4 additions and 1 deletions
--- a/src/renderer/src/views/classManage/basicGroup.vue
+++ b/src/renderer/src/views/classManage/basicGroup.vue
@ -266,6 +266,9 @@ const btnSave = () => {
 }
 //新建小组
 const addGroup = () => {
+  // 做清空处理
+  groupForm.groupname = ''
+  groupForm.orderidx = 0
  groupVisible.value = true
 }
 const btnGroupSave = () => {
--- a/src/renderer/src/views/classManage/classInfo.vue
+++ b/src/renderer/src/views/classManage/classInfo.vue
@ -4,7 +4,7 @@
      <el-descriptions-item label="班级名称">{{ classInfo.caption }}</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>
+          <el-tag style="margin-right: 5px;margin-bottom: 5px;" type="primary" v-for="(item, index) in classInfo.teacher" :key="index">{{item.name}}</el-tag>
        </template>
        <template v-else>{{ classInfo.teachername }}</template>
      </el-descriptions-item>
Author	SHA1	Message	Date
“zouyf”	cb15855fc1	Merge branch 'main' into zouyf_dev	2024-09-27 15:11:57 +08:00
yangws	988c6160bb	Merge pull request 'fix : 样式问题；' (#284 ) from yangws into main Reviewed-on: #284	2024-09-27 15:08:23 +08:00
小杨	0119a92501	fix : 样式问题；	2024-09-27 15:07:58 +08:00
yangws	e1dfc0f8b4	Merge pull request 'fix：新建分组前清空操作;' (#283 ) from yangws into main Reviewed-on: #283	2024-09-27 15:06:30 +08:00
小杨	31f9ec61ea	fix：新建分组前清空操作;	2024-09-27 15:05:49 +08:00