|
@@ -163,7 +163,7 @@
|
|
|
<cloudSearch
|
|
|
v-if="status == 0"
|
|
|
:advance="false"
|
|
|
- @search="getTask(treeData)"
|
|
|
+ @search="getTask()"
|
|
|
@reset="reset()"
|
|
|
>
|
|
|
<template slot="normal">
|
|
@@ -175,14 +175,14 @@
|
|
|
size="small"
|
|
|
></el-input>
|
|
|
</div>
|
|
|
- <div class="cloudSearch-item">
|
|
|
+ <!-- <div class="cloudSearch-item">
|
|
|
<div class="form-label">年份:</div>
|
|
|
<el-input
|
|
|
v-model="listQuery.year"
|
|
|
placeholder="请选择年份"
|
|
|
size="small"
|
|
|
></el-input>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
<div class="cloudSearch-item">
|
|
|
<div class="form-label">状态:</div>
|
|
|
<el-select v-model="listQuery.status" placeholder="请选择状态">
|
|
@@ -190,7 +190,7 @@
|
|
|
<el-option label="已上传" :value="1"></el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
- <div class="cloudSearch-item">
|
|
|
+ <!-- <div class="cloudSearch-item">
|
|
|
<div class="form-label">创建时间:</div>
|
|
|
<el-date-picker
|
|
|
v-model="ctime"
|
|
@@ -200,14 +200,14 @@
|
|
|
end-placeholder="结束日期"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</template>
|
|
|
</cloudSearch>
|
|
|
<cloudTable
|
|
|
v-if="status == 0"
|
|
|
class="dataTable0"
|
|
|
:table="dataTable0"
|
|
|
- @refresh-table="getTask(treeData)"
|
|
|
+ @refresh-table="getTask"
|
|
|
@handle="handle0"
|
|
|
@handleSelectionChange=""
|
|
|
>
|
|
@@ -250,12 +250,12 @@ export default {
|
|
|
period: "",
|
|
|
subject: "",
|
|
|
},
|
|
|
- ctime: "",
|
|
|
+ // ctime: "",
|
|
|
listQuery: {
|
|
|
name: "",
|
|
|
- year: "",
|
|
|
- status: "",
|
|
|
- created_at: "",
|
|
|
+ // year: "",
|
|
|
+ status: 0,
|
|
|
+ // created_at: "",
|
|
|
},
|
|
|
treeData: [],
|
|
|
// 新增阅卷任务表单
|
|
@@ -428,13 +428,13 @@ export default {
|
|
|
}, 2000); // 2s
|
|
|
}
|
|
|
},
|
|
|
- ctime: function (val) {
|
|
|
- if (val instanceof Array) {
|
|
|
- this.listQuery.created_at = val.join(",");
|
|
|
- } else {
|
|
|
- this.listQuery.created_at = "";
|
|
|
- }
|
|
|
- },
|
|
|
+ // ctime: function (val) {
|
|
|
+ // if (val instanceof Array) {
|
|
|
+ // this.listQuery.created_at = val.join(",");
|
|
|
+ // } else {
|
|
|
+ // this.listQuery.created_at = "";
|
|
|
+ // }
|
|
|
+ // },
|
|
|
},
|
|
|
imgArr: {
|
|
|
deep: true,
|
|
@@ -490,23 +490,20 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
getTask(data) {
|
|
|
+ debugger;
|
|
|
this.curID = data ? data.id : "0";
|
|
|
this.curTree = data ? data : {};
|
|
|
let params = {
|
|
|
- name: data ? data.name : "",
|
|
|
- ctgid: data.id,
|
|
|
+ name: this.listQuery.name,
|
|
|
+ status: this.listQuery.status,
|
|
|
+ ctgid: this.curID,
|
|
|
+ page: this.dataTable.paginationOpt.pageIndex,
|
|
|
+ size: this.dataTable.paginationOpt.pageRows,
|
|
|
};
|
|
|
- paperApi
|
|
|
- .getMarkTaskList(
|
|
|
- Object.assign(params, {
|
|
|
- page: this.dataTable0.paginationOpt.pageIndex,
|
|
|
- size: this.dataTable0.paginationOpt.pageRows,
|
|
|
- })
|
|
|
- )
|
|
|
- .then((res) => {
|
|
|
- this.dataTable0.data = res.data;
|
|
|
- this.dataTable0.paginationOpt.total = res.total;
|
|
|
- });
|
|
|
+ paperApi.getMarkTaskList(params).then((res) => {
|
|
|
+ this.dataTable0.data = res.data;
|
|
|
+ this.dataTable0.paginationOpt.total = res.total;
|
|
|
+ });
|
|
|
},
|
|
|
getItems(data) {
|
|
|
this.curID = data ? data.id : "0";
|
|
@@ -588,14 +585,14 @@ export default {
|
|
|
this.ctime = "";
|
|
|
this.listQuery = {
|
|
|
name: "",
|
|
|
- year: "",
|
|
|
- status: "",
|
|
|
- created_at: "",
|
|
|
+ // year: "",
|
|
|
+ status: 0,
|
|
|
+ // created_at: "",
|
|
|
};
|
|
|
- this.leftQuery.period = "高中"
|
|
|
- this.leftQuery.subject = "语文"
|
|
|
+ this.leftQuery.period = "高中";
|
|
|
+ this.leftQuery.subject = "语文";
|
|
|
this.curID = 0;
|
|
|
- this.getItems();
|
|
|
+ this.getTask()
|
|
|
this.$refs.treeInner.setCurrentKey(null);
|
|
|
},
|
|
|
back() {
|