xjc пре 3 година
родитељ
комит
4b4486138b
2 измењених фајлова са 25 додато и 32 уклоњено
  1. 3 0
      src/api.js
  2. 22 32
      src/views/article/Article.vue

+ 3 - 0
src/api.js

@@ -252,6 +252,9 @@ export default {
 		return axios.delete(`${baseURL}/api/admin/article`, { params: params });
 	},
 	// 作业相关
+	getLessonsList: params => {
+		return axios.get(`${baseURL}/api/admin/lessons/default`, { params: params });
+	},
 	getHomeWorkList: params => {
 		return axios.get(`${baseURL}/api/admin/homework/list`, { params: params });
 	},

+ 22 - 32
src/views/article/Article.vue

@@ -146,7 +146,7 @@ a {
           </el-form-item>
           <el-form-item label="阶段" label-width=200>
             <el-select
-              v-model="form.term"
+              v-model="form.step"
               placeholder="请选择"
               filterable
               clearable
@@ -154,7 +154,7 @@ a {
               @clear="getData()"
             >
               <el-option
-                v-for="item in lessonSearch"
+                v-for="item in stepSearch"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value"
@@ -207,7 +207,7 @@ a {
           </template>
         </el-table-column>
         <el-table-column prop="filename" label="作业文件"></el-table-column>
-        <el-table-column prop="lesson" label="课程"></el-table-column>
+        <el-table-column prop="step" label="阶段"></el-table-column>
         <el-table-column prop="ctime" label="提交时间"></el-table-column>
         <el-table-column prop="status" label="状态" width="80"></el-table-column>
         <el-table-column prop="zip" width="150" label="操作">
@@ -305,27 +305,9 @@ export default {
       dialogVisible: false,
       journalLogo: "",
       multipleSelection: [],
-      journalSearch: [
-        {"label":"第一课(环境搭建、整数、浮点数、字符串、布尔值和None)","value":"01"},
-        {"label":"第二课(列表、元组、集合)","value":"02"},
-        {"label":"第三课(字典、复习所有数据结构)","value":"03"},
-        {"label":"第四课(python程序结构和流程控制(for、if、else、while))","value":"04"},
-        {"label":"第五课(python操作文件(读写文件)、python内置库(模块、包))","value":"05"},
-        {"label":"第六课(python函数编程一)","value":"06"},
-        {"label":"第七课(python函数编程二)","value":"07"},
-        {"label":"第八课(python面向对象)","value":"08"},
-        {"label":"第九课(python错误和异常处理)","value":"09"},
-        {"label":"第十课(python多进程与多线程)","value":"10"}
-      ],
-      termSearch:[
-        {"label":"第一期","value":"01"},
-        {"label":"第二期","value":"02"}
-      ],
-      lessonSearch:[
-        {"label":"python基础","value":"python基础"},
-        {"label":"爬虫基础","value":"爬虫基础"},
-        {"label":"逆向进阶","value":"逆向进阶"}
-      ]
+      journalSearch: [],
+      termSearch:[],
+      stepSearch:[]
     };
   },
   methods: {
@@ -394,14 +376,22 @@ export default {
     },
     getData() {
       var parm = this.form;
-      this.loading = true;      
-      // this.$api.getWorkList(parm).then((res) => {
-      //   this.$api.getHomeWorkList(parm).then((res) => {
-      //     this.list = res.data.data.list;
-      //     this.total = res.data.data.total;
-      //     this.loading = false;
-      //   });
-      // });
+      this.loading = true;
+      this.$api.getLessonsList(parm).then((res)=>{
+        this.termSearch = []
+        this.stepSearch = []
+        this.journalSearch = []
+        res.data.data.terms.forEach((item)=>{
+          this.termSearch.push({"label":item+"期","value":item})
+        })
+        res.data.data.steps.forEach((item)=>{
+          this.stepSearch.push({"label":item,"value":item})
+        })
+        let lessons = res.data.data.lessons;
+        Object.keys(lessons).forEach((item)=>{
+          this.journalSearch.push({"label":lessons[item],"value":item})
+        })
+      })      
       this.$api.getHomeWorkList(parm).then((res) => {
         this.list = res.data.data.list;
         this.total = res.data.data.total;