wuhongyu %!s(int64=5) %!d(string=hai) anos
pai
achega
0aa40d6be0

+ 48 - 2
src/layout/class/jiaoshistuwork.vue

@@ -3,12 +3,40 @@
     <el-row>
       <el-col :span="24">
         <el-col :span="24" class="list" v-for="(item, index) in newclassList" :key="index">
-          <el-col :span="24" class="name">
-            <p>学生姓名:{{ item.name }}作业分:{{ item.socre }}</p>
+          <el-col :span="18" class="name">
+            <p>{{ item.name }}</p>
+          </el-col>
+          <el-col :span="6" class="btn">
+            <el-link :underline="false" @click="clickShow()">作业信息</el-link>
           </el-col>
         </el-col>
       </el-col>
     </el-row>
+    <van-overlay :show="show" @click="clickDown">
+      <div class="wrapper" @click="clickDown">
+        <el-col :span="24" class="leaveInfo">
+          <p class="jilu">作业记录</p>
+          <el-col :span="24" class="info">
+            <template v-if="leaveInfo.length > 0">
+              <el-col :span="24" class="date" v-for="(acc, index) in leaveInfo" :key="index">
+                <el-col :span="18">
+                  <p>作业名称:{{ acc.name }}</p>
+                  <p>分数:{{ acc.score }}</p>
+                </el-col>
+                <el-col :span="6" v-for="(acc, index) in leaveInfo" :key="index" class="fen">
+                  <p>上分</p>
+                </el-col>
+              </el-col>
+            </template>
+            <template v-if="leaveInfo.length == 0">
+              <el-col :span="24" class="leavelist" style="text-align:center">
+                <p>暂无作业记录</p>
+              </el-col>
+            </template>
+          </el-col>
+        </el-col>
+      </div>
+    </van-overlay>
   </div>
 </template>
 <script>
@@ -26,6 +54,12 @@ export default {
   created() {},
   computed: {},
   methods: {
+    clickShow() {
+      this.$emit('clickShow');
+    },
+    clickDown() {
+      this.$emit('clickDown');
+    },
     clickShows(id) {
       this.$router.push({ path: '/class/stuDetail', query: { id } });
     },
@@ -86,4 +120,16 @@ p {
 .leavelist .status {
   padding: 10px 0;
 }
+.date {
+  background-color: #66b3ff;
+  color: #ffffff;
+  padding: 0 10px 10px 10px;
+  height: 70px;
+  line-height: 35px;
+}
+.fen {
+  font-size: 22px;
+  height: 70px;
+  line-height: 60px;
+}
 </style>

+ 20 - 2
src/views/class/teastuwork.vue

@@ -6,7 +6,14 @@
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </el-col>
         <el-col :span="24" class="main">
-          <jiaoshistuwork :newclassList="newclassList" :teacherinfo="teacherinfo"></jiaoshistuwork>
+          <jiaoshistuwork
+            :newclassList="newclassList"
+            :teacherinfo="teacherinfo"
+            @clickDown="clickDown"
+            :leaveInfo="leaveInfo"
+            :show="show"
+            @clickShow="clickShow"
+          ></jiaoshistuwork>
         </el-col>
       </el-col>
     </el-row>
@@ -29,11 +36,13 @@ export default {
     jiaoshistuwork, //班主任学生请假列表
   },
   data: () => ({
-    newclassList: [],
+    newclassList: [{ name: '测试学生1', socre: '1' }],
     isleftarrow: '',
     title: '',
     isleftarrow: '',
     teacherinfo: {},
+    leaveInfo: [{ score: '1', name: '测试作业' }],
+    show: false,
 
     navShow: true,
   }),
@@ -65,6 +74,15 @@ export default {
     ...mapHeadteacher({ teaQuery: 'query', stuFetch: 'fetch' }),
 
     async searchInfo({ ...info } = {}) {},
+
+    async clickShow() {
+      console.log('a');
+
+      this.show = true;
+    },
+    clickDown() {
+      this.show = false;
+    },
   },
 };
 </script>

+ 0 - 7
src/views/user/homework.vue

@@ -64,13 +64,10 @@ export default {
     ...mapTask({ list: 'query', add: 'create', fet: 'fetch', updates: 'update' }),
     ...mapClass({ classinfo: 'fetch', classquery: 'query' }),
     ...mapLesson({ lessonList: 'query', lessonadd: 'create', lessonfet: 'fetch', lessonupdates: 'update' }),
-
     ...mapSubject({ subjectList: 'query', subjectListadd: 'create', subjectListfet: 'fetch', subjectListpdates: 'update' }),
-
     async search() {
       let classid = this.user.classid;
       const ress = await this.classinfo(classid);
-
       let lessonid = ress.data.lessonid;
       const res = await this.lessonList({ lessonid });
       const resout = await this.list();
@@ -78,12 +75,8 @@ export default {
         for (const tyl of res.data) {
           var crr = tyl.lessons.filter(item => item.subid);
           this.$set(this, `workLists`, crr);
-          console.log(crr);
         }
-
-        console.log(crr);
         var arr = crr.filter(item => item.subid === val.code);
-
         for (const att of arr) {
           att.display = 'second';
         }

+ 1 - 6
src/views/user/socre.vue

@@ -75,8 +75,6 @@ export default {
       const res = await this.list({ classid });
       console.log(res.data);
       let name = res.data.map(i => i.name);
-      console.log(name);
-
       this.$set(this, `columns`, name);
     },
     async onvalue(value) {
@@ -85,8 +83,6 @@ export default {
       for (const acc of res.data) {
         this.$set(this, `info`, acc);
       }
-      console.log(res);
-
       this.form.id = value.value.id;
     },
     async submit() {
@@ -95,8 +91,7 @@ export default {
       console.log(this.info.selfscore);
       let res = await this.updates(this.info);
       this.$checkRes(res, '修改成功', '修改失败');
-      console.log(res);
-      this.$router.push({ path: '/user/pingfenindex' });
+      this.$router.push({ path: '/user/pingfenindex', query: { id: this.classid } });
     },
   },
 };