更新

src/layout/user/datiList.vue

@@ -1,7 +1,7 @@
 <template>
-  <div id="leaveList">
+  <div id="index">
     <el-row>
-      <el-col class="info">
+      <el-col :span="24" class="style">
         <el-form ref="form" :model="form">
           <el-col :span="24" class="topTitle">
             {{ datilist.name }}
@@ -12,13 +12,13 @@
             </el-form-item>
             <template v-if="item.type === '0'">
               <el-col :span="24" v-for="(items, index) in item.option" :key="index">
-                <el-radio v-model="item.answer" :label="items.opname">{{ items.number }}{{ items.opname }}</el-radio>
+                <el-radio v-model="item.answer" :label="items.opname">{{ items.opname }}</el-radio>
               </el-col>
             </template>
             <template v-else-if="item.type === '1'">
               <el-checkbox-group v-model="item.answer">
                 <el-col :span="24" v-for="(items, index) in item.option" :key="index">
-                  <el-checkbox :label="items.opname">{{ items.number }}{{ items.opname }}</el-checkbox>
+                  <el-checkbox :label="items.opname">{{ items.opname }}</el-checkbox>
                 </el-col>
               </el-checkbox-group>
             </template>
@@ -43,43 +43,26 @@
 </template>
 
 <script>
+import _ from 'lodash';
 export default {
-  name: 'leaveList',
+  name: 'index',
   props: {
+    form: null,
     datilist: null,
   },
   components: {},
   data: () => ({
-    form: {
-      name: '',
-      region: '',
-      date1: '',
-      date2: '',
-      delivery: false,
-      type: [],
-      resource: '',
-      desc: '',
-    },
+    task: {},
   }),
   created() {},
-  watch: {
-    info: {
-      handler(val) {
-        if (_.get(val, `id`)) this.$set(this, `task`, val);
-      },
-      immediate: true,
-      deep: true,
-    },
-  },
   computed: {},
   methods: {
     onSubmit() {
-      console.log('submit!');
+      this.$emit('submit', this.task);
     },
   },
 };
 </script>
-
 <style lang="less" scoped>
 .style {
   min-height: 300px;

src/layout/user/workList.vue

@@ -3,10 +3,10 @@
     <el-row>
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in workLists" :key="index">
-          <el-col :span="14" class="time">
-            <el-col>科目:{{ item.name }}</el-col>
-            <el-col :span="24" class="anniu">
-              <el-button v-if="item.display === 'second'" type="primary" size="small" @click="clickBtn(item.id)">在线作答</el-button>
+          <el-col :span="24" class="time">
+            <el-col :span="18">科目:{{ item.name }}</el-col>
+            <el-col :span="6" class="anniu">
+              <el-button v-if="item.display === 'second'" type="primary" size="small" @click="clickBtn(item.name)">在线作答</el-button>
               <el-button v-else type="primary" size="small" @click="clickzy(item.id)">上传作业</el-button>
             </el-col>
           </el-col>
@@ -29,12 +29,10 @@ export default {
   created() {},
   computed: {},
   methods: {
-    clickBtn(id) {
-      this.$router.push({ path: '/user/dati', query: { id: id } });
+    clickBtn(name) {
+      this.$router.push({ path: '/user/dati', query: { name: name } });
     },
     clickzy(id) {
-      console.log(id);
-
       this.$router.push({ path: '/user/chuanzuoye', query: { id: id } });
     },
   },
@@ -52,18 +50,16 @@ p {
 
 .list {
   width: 97%;
-  padding: 0px 0px 0 70px;
+
   background-color: #fff;
   border-radius: 15px;
   margin: 0 5px 5px 5px;
 }
 .list .time {
   padding: 5px 0;
+  height: 70px;
 }
 .list .ispass {
   padding: 20px 0;
 }
-.anniu {
-  padding: 20px 0 0 0;
-}
 </style>

src/views/user/dati.vue

@@ -52,17 +52,27 @@ export default {
 
   computed: {
     ...mapState(['user']),
-    id() {
-      return this.$route.query.id;
+    name() {
+      return this.$route.query.name;
     },
   },
   methods: {
     ...mapTask({ list: 'query', add: 'create', fet: 'fetch', updates: 'update' }),
     async search() {
-      console.log(this.id);
-      const res = await this.list(this.id);
-      console.log(res.data);
-      this.$set(this, `datilist`, res.data);
+      console.log(this.name);
+      const res = await this.list();
+      var tilist = res.data.filter(item => item.name === this.name);
+      for (const result of tilist) {
+        this.$set(this, `datilist`, result);
+
+        for (const option of result.question) {
+   
+          console.log(answer);
+        }
+
+        // let  answer=[]
+      }
+
       this.loading = false;
     },
   },

src/views/user/homework.vue

@@ -73,15 +73,14 @@ export default {
       console.log(ress.data.lessonid);
       let lessonid = ress.data.lessonid;
       const res = await this.subjectList({ lessonid });
-      console.log(res);
-
+      console.log(res.data);
       const resout = await this.list();
       for (const val of resout.data) {
         // console.log(result.data.lessons);
         // var crr = result.data.lessons.filter(item => item.subid);
         this.$set(this, `workLists`, res.data);
         var arr = res.data.filter(item => item.name === val.name);
-        console.log(arr);
+
         for (const att of arr) {
           att.display = 'second';
         }