mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-12 12:26:44 +08:00
Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal
This commit is contained in:
@@ -477,7 +477,7 @@
|
|||||||
v-model="answerData.word"></el-input>
|
v-model="answerData.word"></el-input>
|
||||||
</div>
|
</div>
|
||||||
<div style="padding: 0px 5px">
|
<div style="padding: 0px 5px">
|
||||||
<el-button icon="el-icon-search" type="primary" @click="getResults()">搜索</el-button>
|
<el-button icon="el-icon-search" type="primary" @click="getResults(true)">搜索</el-button>
|
||||||
<el-button icon="el-icon-download" type="primary" @click="exportsList()">导出成绩</el-button>
|
<el-button icon="el-icon-download" type="primary" @click="exportsList()">导出成绩</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -764,10 +764,6 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
// this.resourceData = JSON.parse(localStorage.getItem('typeList'))
|
|
||||||
// if(this.resOwnerListMap.length == 0) {
|
|
||||||
// this.$store.dispatch("getList");
|
|
||||||
// }
|
|
||||||
this.getResOwnerTree().then(rs=>{
|
this.getResOwnerTree().then(rs=>{
|
||||||
this.resOwnerListMap=rs;
|
this.resOwnerListMap=rs;
|
||||||
});
|
});
|
||||||
@@ -1273,7 +1269,10 @@ export default {
|
|||||||
this.answerData.row=row;
|
this.answerData.row=row;
|
||||||
this.getResults();
|
this.getResults();
|
||||||
},
|
},
|
||||||
getResults() {
|
getResults(flag) {
|
||||||
|
if(flag){
|
||||||
|
this.answerData.pageIndex=1;
|
||||||
|
}
|
||||||
let params = {
|
let params = {
|
||||||
testId: this.answerData.row.id,// 考试 的id
|
testId: this.answerData.row.id,// 考试 的id
|
||||||
aid:'',// 答卷人ID
|
aid:'',// 答卷人ID
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<el-button type="primary" class="findBtn" size="medium" @click="tableDataReset">重置</el-button>
|
<el-button type="primary" class="findBtn" size="medium" @click="tableDataReset">重置</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-table ref="multipleTable" :data="tableDataShow" tooltip-effect="dark" style="width: 100%">
|
<el-table ref="multipleTable" :data="tableDataShow" tooltip-effect="dark" style="width: 100%">
|
||||||
|
|
||||||
<el-table-column label="姓名" prop="name" align="center" ></el-table-column>
|
<el-table-column label="姓名" prop="name" align="center" ></el-table-column>
|
||||||
<el-table-column prop="userNo" label="工号" align="center"></el-table-column>
|
<el-table-column prop="userNo" label="工号" align="center"></el-table-column>
|
||||||
<el-table-column prop="departName" label="部门" align="center"></el-table-column>
|
<el-table-column prop="departName" label="部门" align="center"></el-table-column>
|
||||||
@@ -30,9 +30,9 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { getToken } from '@/utils/token'
|
import { getToken } from '@/utils/token'
|
||||||
import usergroupApi from "@/api/modules/usergroup";
|
|
||||||
import userApi from "@/api/system/user";
|
import userApi from "@/api/system/user";
|
||||||
import orgApi from "@/api/system/organiza";
|
import orgApi from "@/api/system/organiza";
|
||||||
|
import apiAudience from "@/api/boe/audience.js";
|
||||||
export default{
|
export default{
|
||||||
data(){
|
data(){
|
||||||
return{
|
return{
|
||||||
@@ -76,15 +76,23 @@
|
|||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
let that = this;
|
let that = this;
|
||||||
if (that.$route.query.id) {
|
if (this.$route.query.id) {
|
||||||
usergroupApi.detail(that.$route.query.id).then((res) => {
|
let req = {audienceId:this.$route.query.id}
|
||||||
if (res.status == 200) {
|
apiAudience.detail(req).then((res) => {
|
||||||
that.form = res.result;
|
if (res.status == 200) {
|
||||||
that.oldUserGroupItems = JSON.parse(JSON.stringify( res.result.userGroupItems ));
|
that.form = res.result;
|
||||||
that.tableData = res.result.userGroupItems;
|
that.tableData = res.result.memberList;
|
||||||
that.queryTableData();
|
that.queryTableData();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
// usergroupApi.detail(that.$route.query.id).then((res) => {
|
||||||
|
// if (res.status == 200) {
|
||||||
|
// that.form = res.result;
|
||||||
|
// that.oldUserGroupItems = JSON.parse(JSON.stringify( res.result.userGroupItems ));
|
||||||
|
// that.tableData = res.result.userGroupItems;
|
||||||
|
// that.queryTableData();
|
||||||
|
// }
|
||||||
|
// });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods:{
|
methods:{
|
||||||
|
|||||||
Reference in New Issue
Block a user