更新

src/layout/class/headStuList.vue

@@ -10,7 +10,7 @@
     <el-row>
       <el-col :span="24" class="info">
         <el-col :span="6" class="list" v-for="(item, index) in headStuList" :key="index" @click.native="clickAssign(item.id)">
-          <p class="name">{{ item.name }}</p>
+          <p class="name" :style="`font-size:${changeNum(item.name)}px`">{{ item.name }}</p>
           <p class="job" v-if="item.job">{{ item.job }}<i class="el-icon-circle-check"></i></p>
         </el-col>
       </el-col>
@@ -18,7 +18,6 @@
     <el-dialog title="指派职务" width="90%" :visible.sync="assignShow" :before-close="handleClose">
       <el-form :model="assignForm">
         <el-form-item label="学生姓名">
-          <!-- <el-input v-model="assignForm.name" :disabled="true"></el-input> -->
           {{ assignForm.name }}
         </el-form-item>
         <el-form-item label="学生职务">
@@ -61,6 +60,13 @@ export default {
     handleClose() {
       this.$emit('handleClose');
     },
+    changeNum(name) {
+      if (name.length >= 5) {
+        return 10;
+      } else {
+        return 15;
+      }
+    },
   },
 };
 </script>
@@ -75,7 +81,11 @@ p {
 }
 .list {
   text-align: center;
-  min-height: 50px;
+  border: 1px solid #2c69fe;
+  width: 70px;
+  margin: 0 11px 10px 12px;
+  padding: 5px 0px;
+  border-radius: 10px;
 }
 .list .job {
   font-size: 10px;

src/layout/index/mainData.vue

@@ -30,9 +30,11 @@
           </el-col>
           <template v-if="lesson">
             <el-col :span="24" class="context">
-              <el-col :span="12" class="contexttime"><span>8:30 — 11:30</span></el-col
-              ><el-col :span="12" class="contextclass"
-                ><p>{{ lesson.subname }}</p>
+              <el-col :span="12" class="contexttime">
+                <span>8:30 — 11:30</span>
+              </el-col>
+              <el-col :span="12" class="contextclass">
+                <p>{{ lesson.subname }}</p>
                 <p>{{ lesson.teaname }}</p>
               </el-col>
               <el-col :span="24">
@@ -40,13 +42,20 @@
               </el-col>
             </el-col>
             <el-col :span="24" class="context" v-if="lesson.subname">
-              <el-col :span="12" class="contexttime"><span>11:30—13:30</span></el-col
-              ><el-col :span="12" class="contextclass"><p>午餐+休息</p> </el-col>
+              <el-col :span="12" class="contexttime">
+                <span>11:30—13:30</span>
+              </el-col>
+              <el-col :span="12" class="contextclass">
+                <p></p>
+                <p>午餐+休息</p>
+              </el-col>
             </el-col>
             <el-col :span="24" class="context">
-              <el-col :span="12" class="contexttime"><span>11:30—4:30</span></el-col
-              ><el-col :span="12" class="contextclass"
-                ><p>{{ lesson.subname }}</p>
+              <el-col :span="12" class="contexttime">
+                <span>11:30—4:30</span>
+              </el-col>
+              <el-col :span="12" class="contextclass">
+                <p>{{ lesson.subname }}</p>
                 <p>{{ lesson.teaname }}</p>
               </el-col>
               <el-col :span="24">
@@ -54,12 +63,20 @@
               </el-col>
             </el-col>
             <el-col :span="24" class="context" v-if="lesson.subname">
-              <el-col :span="12" class="contexttime"><span>16:30—17:30</span></el-col
-              ><el-col :span="12" class="contextclass"><p>晚餐</p> </el-col>
+              <el-col :span="12" class="contexttime">
+                <span>16:30—17:30</span>
+              </el-col>
+              <el-col :span="12" class="contextclass">
+                <p></p>
+                <p>晚餐</p>
+              </el-col>
             </el-col>
             <el-col :span="24" class="context">
-              <el-col :span="12" class="contexttime"><span>17:30 — 19:45</span></el-col
-              ><el-col :span="12" class="contextclass">
+              <el-col :span="12" class="contexttime">
+                <span>17:30 — 19:45</span>
+              </el-col>
+              <el-col :span="12" class="contextclass">
+                <p></p>
                 <p>{{ lesson.lastLesson }}</p>
               </el-col>
             </el-col>
@@ -101,6 +118,10 @@ export default {
 </script>
 
 <style lang="less" scoped>
+p {
+  padding: 0;
+  margin: 0;
+}
 .info {
   text-align: center;
   padding: 7px 0 0 0;
@@ -145,6 +166,9 @@ export default {
 }
 .contextclass {
   background-color: #ffffff;
-  padding: 0 20px 0 20px;
+}
+.contextclass p {
+  padding: 15px 0 0 0;
+  text-align: center;
 }
 </style>

src/layout/teacherscore/mainData.vue

@@ -15,7 +15,7 @@
           </el-col>
           <el-col :span="24">
             <el-col :span="16" class="title">工作量</el-col>
-            <el-col :span="8" class="fenshu">评分:{{ xsscore }}分</el-col>
+            <el-col :span="8" class="fenshu">评分:{{ xsscore === undefined ? '0' : xsscore }}分</el-col>
             <el-col :span="24" class="work">{{ xsscore > 5 ? '本月工作量饱满' : '本月工作量干枯' }}</el-col>
           </el-col>
           <el-col :span="24" class="beizhu">

src/layout/user/messageInfo.vue

@@ -58,7 +58,7 @@ p {
 }
 .name {
   text-align: center;
-  line-height: 100px;
+  padding: 20px 0;
   font-size: 20px;
   font-family: 微软雅黑;
   font-weight: bold;

src/router/index.js

@@ -109,7 +109,7 @@ const routes = [
   // 个人信息-添加请假
   {
     path: '/user/leaveDetail',
-    meta: { title: '填写请假条', isleftarrow: true },
+    meta: { title: '请假条', isleftarrow: true },
     component: () => import('../views/user/leaveDetail.vue'),
   },
   // 个人信息-请假结果

src/views/class/index.vue

@@ -24,13 +24,6 @@
               :noGroupStudentNames="noGroupStudentNames"
               :classid="this.user.classid"
             ></classList>
-            <!-- :groupList="groupList"
-              @saveGroup="saveGroup"
-              @exitGroup="exitGroup"
-              @deleteGroup="deleteGroup"
-              @joinGroup="joinGroup"
-              :stuIdAndGroupId="stuIdAndGroupId"
-              :noGroupStudentNames="noGroupStudentNames" -->
           </span>
         </el-col>
         <el-col :span="24" class="foot">
@@ -99,7 +92,7 @@ export default {
     ...mapGroup(['query', 'create', 'delete', 'insert', 'exit']),
     // 班主任查询管理班级列表
     async searchInfo() {
-      const res = await this.classList(this.user.userid);
+      const res = await this.classList({ headteacherid: this.user.userid });
       if (this.$checkRes(res)) {
         this.$set(this, `headClassList`, res.data);
       }

src/views/user/leaveDetail.vue

@@ -3,7 +3,6 @@
     <el-row>
       <el-col :span="24" class="style">
         <el-col :span="24" class="top">
-          <!-- <topInfo></topInfo> -->
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </el-col>
         <el-col :span="24" class="main">
@@ -17,7 +16,6 @@
 <script>
 import NavBar from '@/layout/common/topInfo.vue';
 import leaveRequest from '@/layout/user/leaveRequest.vue';
-// import { createNamespacedHelpers, mapGetters } from 'vuex';
 import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapLeave } = createNamespacedHelpers('leave');
 export default {
@@ -60,8 +58,12 @@ export default {
       this.form.studentid = this.user.userid;
       let data = this.form;
       let res = await this.create(data);
-      let msg = `${this.keyWord}添加成功`;
-      if (this.$checkRes(res, msg)) this.cancelClick();
+      if (res.errcode === 0) {
+        let msg = `${this.keyWord}添加成功`;
+        if (this.$checkRes(res, msg)) this.cancelClick();
+      } else {
+        let msg = `${this.keyWord}添加失败`;
+      }
     },
     cancelClick() {
       this.$router.push({ path: '/user/leave' });