更新

src/layout/user/pingfenList.vue

@@ -3,14 +3,18 @@
     <el-row>
       <van-col :span="24">
         <van-collapse v-model="openCollapse" @change="onclick">
-          <!-- <van-collapse-item :name="index" v-for="(item, index) in checkWorkList" :key="index"> -->
+          <el-col :span="24" class="score"> 班级总分:{{ leaveList.num }}</el-col>
           <van-collapse-item :name="acc.id" v-for="(acc, index) in groupList" :key="index">
             <div slot="title" class="title">
-              <span class="name">{{ acc.name }}</span>
+              <span class="name">组名:{{ acc.name }}</span>
+              <span class="newscore">组分:{{ acc.score || 0 }}分</span>
             </div>
             <van-row class="attend" v-for="(item, index) in acc.students" :key="index">
               <template>
-                <p>{{ item.stuname }}</p>
+                <p>
+                  <span class="name">名称:{{ item.stuname }}</span
+                  ><span class="newscore"> 分数:{{ item.stores || 0 }}分</span>
+                </p>
               </template>
             </van-row>
           </van-collapse-item>
@@ -26,6 +30,7 @@ export default {
   props: {
     groupList: null,
     stuList: null,
+    leaveList: null,
   },
   components: {},
   data: () => ({
@@ -58,10 +63,10 @@ p {
   float: left;
   width: 100%;
 }
-.list .name {
+.name {
   float: left;
-  width: 80%;
-  font-size: 20px;
+  width: 100px;
+  font-size: 15px;
 }
 .attend {
   border-bottom: 1px solid #f3f3f3;
@@ -72,4 +77,17 @@ p {
 .status {
   padding: 12px 0;
 }
+.score {
+  text-align: center;
+  font-size: 20px;
+  margin: 0 0 15px 0;
+  color: blue;
+}
+.newscore {
+  padding: 0 0 0 20px;
+  font-size: 15px;
+}
+.attend p {
+  font-size: 15px;
+}
 </style>

src/views/user/pingfenindex.vue

@@ -11,7 +11,7 @@
             <van-button round type="info" icon="smile" @click="onClickRight()">添加分数</van-button>
           </el-col>
           <el-col :span="24" class="leaveList">
-            <pingfenList :groupList="groupList" :stuList="groupList" @clickShow="clickShow"></pingfenList>
+            <pingfenList :groupList="groupList" :leaveList="leaveList" :stuList="groupList" @clickShow="clickShow"></pingfenList>
           </el-col>
         </el-col>
       </el-col>
@@ -37,6 +37,7 @@ export default {
   },
   data: () => ({
     groupList: [],
+    leaveList: [],
     stuList: [],
     title: '',
     isleftarrow: '',
@@ -72,31 +73,30 @@ export default {
       let num = eval(nes.join('+'));
       leaveList.data.num = num;
       console.log(leaveList.data);
-      let resgroup = await this.groupinfo();
-      this.$set(this, `groupList`, resgroup.data);
-      for (const acc of resgroup.data) {
-        for (const stu of acc.students) {
-          console.log(stu);
-        }
-      }
-    },
+      this.$set(this, `leaveList`, leaveList.data);
+      const resq = await this.groupinfo();
 
-    async clickShow(acc) {
-      for (const id of acc) {
-        var result = this.groupList.filter(item => item.id === id);
-        const stu = await this.query();
-        for (const acc of result) {
-          for (const val of acc.students) {
-            var ref = stu.data.filter(item => item.id === val.stuid);
-            console.log(ref);
-            let sum = ref.map(i => i.selfscore);
-            if (sum.length == 0) {
-              let score = 0;
-            }
+      for (const val of resq.data) {
+        for (const acc of val.students) {
+          var ref = res.data.filter(item => item.id === acc.stuid);
+          for (const aaa of ref) {
+            acc.stores = aaa.selfscore;
           }
+
+          let asd = val.students.map(i => i.stores);
+          console.log(asd);
+          let nes = asd.filter(d => d);
+          let snewcore = eval(nes.join('+'));
+
+          val.score = snewcore;
         }
       }
+      console.log(resq.data);
+
+      this.$set(this, `groupList`, resq.data);
     },
+
+    async clickShow(acc) {},
     // 跳转到请假
     onClickRight() {
       this.$router.push({ path: '/user/socre' });

src/views/user/socre.vue

@@ -92,11 +92,12 @@ export default {
     },
     async submit() {
       console.log(this.form);
-      this.info.selfscore = this.form.selfscore;
-      console.log(this.info);
+      this.info.selfscore = Number(this.form.selfscore) + Number(this.info.selfscore);
+      console.log(this.info.selfscore);
       let res = await this.updates(this.info);
       this.$checkRes(res, '修改成功', '修改失败');
       console.log(res);
+      this.$router.push({ path: '/user/pingfenindex' });
     },
   },
 };