1

src/iconfonts/iconfont.json

@@ -0,0 +1,93 @@
+{
+  "id": "1873447",
+  "name": "培训会",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon",
+  "description": "培训会图标",
+  "glyphs": [
+    {
+      "icon_id": "9958478",
+      "name": "作业管理",
+      "font_class": "icon-test",
+      "unicode": "e626",
+      "unicode_decimal": 58918
+    },
+    {
+      "icon_id": "4978040",
+      "name": "学生作业",
+      "font_class": "xueshengzuoye",
+      "unicode": "e608",
+      "unicode_decimal": 58888
+    },
+    {
+      "icon_id": "5405253",
+      "name": "班级信息",
+      "font_class": "banjixinxi",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "1129593",
+      "name": "评分卡",
+      "font_class": "pingfenqia",
+      "unicode": "e623",
+      "unicode_decimal": 58915
+    },
+    {
+      "icon_id": "1413429",
+      "name": "课程",
+      "font_class": "kecheng",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
+    {
+      "icon_id": "2180822",
+      "name": "班级管理",
+      "font_class": "banjiguanli",
+      "unicode": "e611",
+      "unicode_decimal": 58897
+    },
+    {
+      "icon_id": "7504590",
+      "name": "成绩",
+      "font_class": "chengji",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "7517993",
+      "name": "名单",
+      "font_class": "mingdan",
+      "unicode": "e60e",
+      "unicode_decimal": 58894
+    },
+    {
+      "icon_id": "7712207",
+      "name": "考勤",
+      "font_class": "kaoqin",
+      "unicode": "e723",
+      "unicode_decimal": 59171
+    },
+    {
+      "icon_id": "8783394",
+      "name": "问卷",
+      "font_class": "dibudaohanglan-",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "13769961",
+      "name": "个人",
+      "font_class": "geren",
+      "unicode": "e60b",
+      "unicode_decimal": 58891
+    },
+    {
+      "icon_id": "14947319",
+      "name": "请假",
+      "font_class": "qingjia",
+      "unicode": "e720",
+      "unicode_decimal": 59168
+    }
+  ]
+}

src/views/home/classmenu.vue

@@ -52,6 +52,7 @@ export default {
           { name: '请假管理', icon: 'iconfont iconqingjia' },
           { name: '考勤管理', icon: 'iconfont iconkaoqin' },
           { name: '学生评分', icon: 'iconfont iconpingfenqia' },
+          { name: '学生作业', icon: 'iconfont iconxueshengzuoye' },
         ];
       } else if (this.user.type === '3') {
         this.menuList = [

src/views/task/index.vue

@@ -42,10 +42,29 @@ export default {
     ...util({ modelFetch: 'fetch' }),
     async search() {
       const classid = sessionStorage.getItem('classid');
-      const userid = this.user.userid;
-      const lesson = await this.modelFetch({ model: 'lesson', classid });
-      const tealesson = lesson.data.lessons.filter(item => item.teaid === userid);
-      this.$set(this, `lessonList`, tealesson);
+      const user = this.user;
+      if (user.type == '1') {
+        const lesson = await this.modelFetch({ model: 'lesson', classid });
+        let lessons = _.get(lesson.data, 'lessons', []);
+        // lesson排序,只去时间最早的作为作业的上传lessonid,需要和学生作业列表处相同处理
+        let r = lessons.filter(f => f.subid);
+        r = r.map(r => {
+          let time = r.time.split('-');
+          r.start = `${r.date} ${time[0]}`;
+          return r;
+        });
+        r = Object.values(_.groupBy(r, 'subid'));
+        r = r.map(a => {
+          let na = _.orderBy(a, ['start'], ['asc']);
+          return _.head(na);
+        });
+        this.$set(this, `lessonList`, r);
+      } else {
+        const lesson = await this.modelFetch({ model: 'lesson', classid });
+        const tealesson = lesson.data.lessons.filter(item => item.teaid === user.userid);
+        let newlesson = _.uniqBy(tealesson, 'subid');
+        this.$set(this, `lessonList`, newlesson);
+      }
     },
     async toDetail(id) {
       this.$router.push({ path: '/task/stutask', query: { id } });

src/views/task/stutask.vue

@@ -6,6 +6,12 @@
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </van-col>
         <van-col class="main" :span="24" v-if="display === 'list'">
+          <el-col :span="24" class="total">
+            <p>
+              班级人数：<span>{{ stuTotal }}</span
+              >作业人数：<span>{{ tasktotal }}</span>
+            </p>
+          </el-col>
           <van-col :span="24" class="taskList" v-for="(item, index) in taskList" :key="index">
             <van-cell is-link @click="toDetail(item)">
               <!-- 使用 title 插槽来自定义标题 -->
@@ -37,8 +43,8 @@
           <template v-else-if="tasktype === 'pic'">
             <van-image :src="picurl"></van-image>
           </template>
-          <van-field v-model="score" type="number" label="作业成绩：" placeholder="请输入学生成绩" />
-          <van-button round type="info" @click="onSubmit">提交成绩</van-button>
+          <van-field v-model="score" type="number" label="作业成绩：" placeholder="请输入学生成绩" v-if="user.type == '3'" />
+          <van-button round type="info" @click="onSubmit" v-if="user.type == '3'">提交成绩</van-button>
         </van-col>
       </van-col>
     </van-row>
@@ -50,6 +56,7 @@ import NavBar from '@/layout/common/topInfo.vue';
 import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: uploadtask } = createNamespacedHelpers('uploadtask');
 const { mapActions: task } = createNamespacedHelpers('task');
+const { mapActions: student } = createNamespacedHelpers('student');
 export default {
   name: 'stutask',
   props: {},
@@ -59,6 +66,8 @@ export default {
     isleftarrow: '',
     navShow: true,
     taskList: [],
+    tasktotal: 0,
+    stuTotal: 0,
     display: 'list',
     task: {},
     tasktype: '',
@@ -68,8 +77,10 @@ export default {
   }),
   created() {
     this.search();
+    this.searchstu();
   },
   computed: {
+    ...mapState(['user', 'classid']),
     id() {
       return this.$route.query.id;
     },
@@ -77,9 +88,11 @@ export default {
   methods: {
     ...uploadtask(['fetch', 'query', 'update']),
     ...task({ taskInfo: 'fetch' }),
+    ...student({ stuQuery: 'query' }),
     async search() {
       const stutasks = await this.query({ lessonid: this.id });
       this.$set(this, `taskList`, stutasks.data);
+      this.$set(this, `tasktotal`, stutasks.total);
     },
     async toDetail(item) {
       this.$set(this, `uploadtask`, item);
@@ -94,7 +107,6 @@ export default {
           }
         }
         this.$set(this, `task`, task.data);
-        console.log(task.data);
       } else if (item.picurl) {
         this.tasktype = 'pic';
         this.picurl = item.picurl;
@@ -111,6 +123,11 @@ export default {
         this.display = 'list';
       }
     },
+    // 查班级学生
+    async searchstu() {
+      let res = await this.stuQuery({ classid: this.classid });
+      if (res.errcode == 0) this.$set(this, `stuTotal`, res.total);
+    },
   },
   mounted() {
     this.title = this.$route.meta.title;
@@ -147,4 +164,13 @@ export default {
   display: -webkit-inline-box;
   margin-right: 10px;
 }
+.total {
+  text-align: center;
+  p {
+    span {
+      color: #ff0000;
+      margin: 0 10px;
+    }
+  }
+}
 </style>

vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
     //api地址前缀
     proxy: {
       '/files': {
-        target: 'http://smart.cc-lotus.info',
+        target: 'http://free.liaoningdoupo.com',
         changeOrigin: true,
         ws: true,
       },