tree cache updated

src/api/webApi/homework.js

@@ -4,10 +4,11 @@ import request from '@/utils/request'
 // GET
 // /prod-api/front/homework/getHomeworks
 // 01 查询作业模板
-export function getHomeworks() {
+export function getHomeworks(params) {
   return request({
     url: '/front/homework/getHomeworks',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 
@@ -15,10 +16,11 @@ export function getHomeworks() {
 // GET
 // /prod-api/front/homework/getStudentHomeworks
 // 01 查询学生作业列表
-export function getStudentHomeworks() {
+export function getStudentHomeworks(params) {
   return request({
     url: '/front/homework/getStudentHomeworks',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 
@@ -26,10 +28,11 @@ export function getStudentHomeworks() {
 // GET
 // /prod-api/front/homework/getTeacherHomeworks
 // 01 查询老师发布作业列表
-export function getTeacherHomeworks() {
+export function getTeacherHomeworks(params) {
   return request({
     url: '/front/homework/getTeacherHomeworks',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 
@@ -37,10 +40,11 @@ export function getTeacherHomeworks() {
 // POST
 // /prod-api/front/homework/publicStudentHomework
 // 01 发布学生作业
-export function publicStudentHomework() {
+export function publicStudentHomework(data) {
   return request({
     url: '/front/homework/publicStudentHomework',
-    method: 'post'
+    method: 'post',
+    data
   })
 }
 
@@ -48,9 +52,10 @@ export function publicStudentHomework() {
 // POST
 // /prod-api/front/homework/saveHomeworks
 // 01 保存作业模板
-export function saveHomeworks() {
+export function saveHomeworks(data) {
   return request({
     url: '/front/homework/saveHomeworks',
-    method: 'post'
+    method: 'post',
+    data
   })
 }

src/common/mx-const.js

@@ -119,6 +119,20 @@ export default {
       student: 1,
       teacher: 2,
       master: 3
-    }
+    },
+    /// 1:在线作业,2:视频作业,3:试卷作业,4:文字作业
+    homeworkType: [{
+      label: '在线作业',
+      value: 1
+    },{
+      label: '视频作业',
+      value: 2
+    },{
+      label: '试卷作业',
+      value: 3
+    },{
+      label: '文字作业',
+      value: 4
+    },]
   }
 }

src/views/questioncenter/components/generate-tabs/paper-by-hand.vue

@@ -262,8 +262,9 @@ export default {
 
       // refresh tree by need
       // TODO: 这里最好是由mx-condition解析依赖关系，但现在mx-condition的渲染逻辑不太方便切入
-      const treeDependentKey = this.isKnowledgeBranch ? 'subjectId' : 'gradeId'
-      const newTreeCacheKey = `${model.exeBranch}_${treeDependentKey}_${model[treeDependentKey]}`
+      const treeCacheObj = { ...this.queryOutput }
+      delete treeCacheObj.qtype // 树和题型无关
+      const newTreeCacheKey = `${model.exeBranch}_${JSON.stringify(treeCacheObj)}`
       if (newTreeCacheKey != this.treeCacheKey) {
         this.treeCacheKey = newTreeCacheKey
         const treeFunc = this.isKnowledgeBranch ? knowledgeTree : chapterTree

src/views/questioncenter/components/generate-tabs/paper-work-publish.vue

@@ -4,7 +4,7 @@
       <el-button icon="el-icon-refresh" circle @click="handleQuery"></el-button>
     </div>
     <dynamic-table :rows="rows" :columns="columns"></dynamic-table>
-    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-if="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
                 @pagination="getList"></pagination>
   </el-card>
 </template>
@@ -22,7 +22,12 @@ export default {
         pageNum: 1,
         pageSize: 20
       },
-      columns: [],
+      columns: [
+        { prop: 'id', label: 'ID' },
+        { prop: 'type', label: '类型' },
+        { prop: 'title', label: '标题' },
+        { prop: 'createTime', label: '创建时间' },
+        { prop: 'action', label: '操作' }],
       rows: [],
       total: 0
     }
@@ -36,9 +41,9 @@ export default {
       this.getList()
     },
     async getList() {
-      const res = await getHomeworks()
-      this.total = res.total || 0
-      this.rows = res.rows || []
+      const res = await getHomeworks(this.queryParams)
+      this.rows = res.rows || res.data
+      this.total = res.total || this.rows.length
     }
   }
 }

src/views/questioncenter/generating.vue

@@ -42,12 +42,12 @@ export default {
       normalTabs: [{
         label: '手动组卷',
         content: PaperByHand.name
-      }, {
-        label: '组卷作业',
-        content: PaperByHand.name
       }, {
         label: '智能组卷',
         content: PaperByIntelligent.name
+      }, {
+        label: '组卷记录',
+        content: PaperRecord.name
       }],
       paperWorkTabs: [{
         label: '组卷作业',