|
@@ -48,22 +48,66 @@
|
|
|
>课程管理</span
|
|
|
>
|
|
|
<span class="sub_head">评价管理</span>
|
|
|
+ <span
|
|
|
+ @click="
|
|
|
+ goTo(
|
|
|
+ '/worksReport?userid=' + userid + '&oid=' + oid + '&org=' + org
|
|
|
+ )
|
|
|
+ "
|
|
|
+ >数据报告</span
|
|
|
+ >
|
|
|
</div>
|
|
|
<div class="student_head">
|
|
|
<div class="student_search">
|
|
|
- <div>项目筛选</div>
|
|
|
- <el-select v-model="groupA" @change="search">
|
|
|
- <el-option value="0" label="我的课程"></el-option>
|
|
|
- <el-option value="1" label="他人课程"></el-option>
|
|
|
+ <div>班级筛选</div>
|
|
|
+ <el-select v-model="classChoose" @change="search">
|
|
|
+ <el-option label="全部" value="">全部</el-option>
|
|
|
+ <el-option
|
|
|
+ v-for="(c, cIndex) in classJuri"
|
|
|
+ :key="cIndex"
|
|
|
+ :value="c.id"
|
|
|
+ :label="c.name"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ <div
|
|
|
+ style="
|
|
|
+ line-height: 35px;
|
|
|
+ font-size: 14px;
|
|
|
+ min-width: 60px;
|
|
|
+ margin-left: 10px;
|
|
|
+ "
|
|
|
+ >
|
|
|
+ 目标筛选
|
|
|
+ </div>
|
|
|
+ <el-select v-model="eChoose" @change="search" clear="mbCss">
|
|
|
+ <el-option label="全部" value="">全部</el-option>
|
|
|
+ <el-option
|
|
|
+ v-for="(e, eIndex) in evaJuri"
|
|
|
+ :key="eIndex"
|
|
|
+ :value="e.id"
|
|
|
+ :label="e.title"
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
<el-input
|
|
|
v-model="cn"
|
|
|
placeholder="筛选项目名称"
|
|
|
@input="search"
|
|
|
></el-input>
|
|
|
- <div @click="
|
|
|
- goTo('/studentWorks?userid=' + userid + '&oid=' + oid + '&org=' + org)
|
|
|
- ">学生评价管理</div>
|
|
|
+ <div
|
|
|
+ style="margin-left: 10px; cursor: pointer"
|
|
|
+ @click="
|
|
|
+ goTo(
|
|
|
+ '/studentWorks?userid=' +
|
|
|
+ userid +
|
|
|
+ '&oid=' +
|
|
|
+ oid +
|
|
|
+ '&org=' +
|
|
|
+ org
|
|
|
+ )
|
|
|
+ "
|
|
|
+ >
|
|
|
+ 学生评价管理
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -86,12 +130,31 @@
|
|
|
min-width="30"
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
+ <el-table-column label="班级" min-width="30" align="center">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{
|
|
|
+ tableData1[scope.$index].classJson.className
|
|
|
+ ? tableData1[scope.$index].classJson.className
|
|
|
+ : "-"
|
|
|
+ }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="uname"
|
|
|
label="创建人"
|
|
|
min-width="30"
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="evaTitle"
|
|
|
+ label="目标名称"
|
|
|
+ min-width="30"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.evaTitle ? scope.row.evaTitle : "-" }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="time"
|
|
|
label="时间"
|
|
@@ -309,11 +372,15 @@ export default {
|
|
|
sClass: "",
|
|
|
subjectJuri: [],
|
|
|
projectJuri: [],
|
|
|
+ classJuri: [],
|
|
|
+ evaJuri: [],
|
|
|
grade: [],
|
|
|
projectchoose: "",
|
|
|
page: 1,
|
|
|
total: 0,
|
|
|
groupA: "0",
|
|
|
+ classChoose: "",
|
|
|
+ eChoose: "",
|
|
|
cn: "",
|
|
|
userid: this.$route.query.userid,
|
|
|
org: this.$route.query.org,
|
|
@@ -375,39 +442,55 @@ export default {
|
|
|
this.getStudnet();
|
|
|
},
|
|
|
//获取班级列表
|
|
|
- getClass() {
|
|
|
- this.isLoading = true;
|
|
|
- let params = {
|
|
|
- cu: "",
|
|
|
- cn: this.sClass,
|
|
|
- page: this.page,
|
|
|
- };
|
|
|
- this.ajax
|
|
|
- .get(this.$store.state.api + "selectClass", params)
|
|
|
- .then((res) => {
|
|
|
- this.isLoading = false;
|
|
|
- this.grade = res.data[0];
|
|
|
- })
|
|
|
- .catch((err) => {
|
|
|
- this.isLoading = false;
|
|
|
- console.error(err);
|
|
|
- });
|
|
|
- },
|
|
|
+ // getClass() {
|
|
|
+ // this.isLoading = true;
|
|
|
+ // let params = {
|
|
|
+ // cu: "",
|
|
|
+ // cn: this.sClass,
|
|
|
+ // page: this.page,
|
|
|
+ // };
|
|
|
+ // this.ajax
|
|
|
+ // .get(this.$store.state.api + "selectClass", params)
|
|
|
+ // .then((res) => {
|
|
|
+ // this.isLoading = false;
|
|
|
+ // this.grade = res.data[0];
|
|
|
+ // })
|
|
|
+ // .catch((err) => {
|
|
|
+ // this.isLoading = false;
|
|
|
+ // console.error(err);
|
|
|
+ // });
|
|
|
+ // },
|
|
|
getProject() {
|
|
|
this.isLoading = true;
|
|
|
let params = {
|
|
|
- type: this.groupA,
|
|
|
uid: this.userid,
|
|
|
- oid: this.oid,
|
|
|
+ cid: this.classChoose,
|
|
|
+ eid: this.eChoose,
|
|
|
cn: this.cn,
|
|
|
page: this.page,
|
|
|
};
|
|
|
this.ajax
|
|
|
- .get(this.$store.state.api + "getProject", params)
|
|
|
+ .get(this.$store.state.api + "getProject1", params)
|
|
|
.then((res) => {
|
|
|
this.isLoading = false;
|
|
|
this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
|
|
|
this.tableData1 = res.data[0];
|
|
|
+ var cJuri = res.data[1];
|
|
|
+ for (var j = 0; j < this.tableData1.length; j++) {
|
|
|
+ this.tableData1[j].classJson = { className: "" };
|
|
|
+ for (var i = 0; i < cJuri.length; i++) {
|
|
|
+ if (this.tableData1[j].courseId == cJuri[i].courseId) {
|
|
|
+ if (cJuri[i].cName != undefined && cJuri[i].cName != null) {
|
|
|
+ if (this.tableData1[j].classJson.className == "") {
|
|
|
+ this.tableData1[j].classJson.className += cJuri[i].cName;
|
|
|
+ } else {
|
|
|
+ this.tableData1[j].classJson.className +=
|
|
|
+ "," + cJuri[i].cName;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
this.isLoading = false;
|
|
@@ -477,11 +560,37 @@ export default {
|
|
|
this.reportVisible = true;
|
|
|
this.signDialog = false;
|
|
|
},
|
|
|
+ getClass() {
|
|
|
+ let params = {
|
|
|
+ oid: this.oid,
|
|
|
+ };
|
|
|
+ this.ajax
|
|
|
+ .get(this.$store.state.api + "selectClassBySchool", params)
|
|
|
+ .then((res) => {
|
|
|
+ this.classJuri = res.data[0];
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ console.error(err);
|
|
|
+ });
|
|
|
+ },
|
|
|
+ getEva() {
|
|
|
+ let params = {
|
|
|
+ oid: this.oid,
|
|
|
+ };
|
|
|
+ this.ajax
|
|
|
+ .get(this.$store.state.api + "selectAllEvaluation", params)
|
|
|
+ .then((res) => {
|
|
|
+ this.evaJuri = res.data[0];
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ console.error(err);
|
|
|
+ });
|
|
|
+ },
|
|
|
},
|
|
|
created() {
|
|
|
this.page = 1;
|
|
|
- // this.getClass();
|
|
|
- // this.getGroup();
|
|
|
+ this.getClass();
|
|
|
+ this.getEva();
|
|
|
this.getProject();
|
|
|
},
|
|
|
};
|
|
@@ -490,7 +599,7 @@ export default {
|
|
|
<style scoped>
|
|
|
.sub_head {
|
|
|
position: relative;
|
|
|
- margin-left: 10px;
|
|
|
+ margin: 0 10px;
|
|
|
}
|
|
|
.sub_head::after {
|
|
|
content: "";
|
|
@@ -502,7 +611,8 @@ export default {
|
|
|
bottom: -12px;
|
|
|
}
|
|
|
|
|
|
-.pb_head > span:nth-child(1) {
|
|
|
+.pb_head > span:nth-child(1),
|
|
|
+.pb_head > span:nth-child(3) {
|
|
|
/* font-size: 16px; */
|
|
|
font-size: 26px;
|
|
|
cursor: pointer;
|
|
@@ -510,7 +620,8 @@ export default {
|
|
|
/* color: #409eff; */
|
|
|
color: #999;
|
|
|
}
|
|
|
-.pb_head > span:nth-child(1):hover {
|
|
|
+.pb_head > span:nth-child(1):hover,
|
|
|
+.pb_head > span:nth-child(3):hover {
|
|
|
color: #000;
|
|
|
}
|
|
|
.pb_head {
|
|
@@ -634,4 +745,11 @@ export default {
|
|
|
padding: 20px;
|
|
|
box-sizing: border-box;
|
|
|
}
|
|
|
+
|
|
|
+.mbCss >>> .el-input__inner {
|
|
|
+ margin: 0 !important;
|
|
|
+}
|
|
|
+.student_search >>> .el-input {
|
|
|
+ width: auto !important;
|
|
|
+}
|
|
|
</style>
|