|
@@ -38,15 +38,15 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column v-if="isUser" prop="userNo" label="学号" align="center" width="">
|
|
<el-table-column v-if="isUser" prop="userNo" label="学号" align="center" width="">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column v-if="isUser" prop="totalScore" label="总分" align="center" width="">
|
|
|
|
- </el-table-column>
|
|
|
|
|
|
+ <!-- <el-table-column v-if="isUser" prop="totalScore" label="总分" align="center" width="">
|
|
|
|
+ </el-table-column> -->
|
|
<el-table-column v-if="isUser" prop="gender" label="性别" align="center" width="" :formatter="genderFun">
|
|
<el-table-column v-if="isUser" prop="gender" label="性别" align="center" width="" :formatter="genderFun">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column v-if="isUser" prop="orgName" label="所属组织架构" align="center" width="">
|
|
<el-table-column v-if="isUser" prop="orgName" label="所属组织架构" align="center" width="">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="操作" width="400" align="center">
|
|
|
|
|
|
+ <el-table-column label="操作" width="200px" align="center">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <div style="display: flex; align-items: center">
|
|
|
|
|
|
+ <div style="display: flex; align-items: center;justify-content: flex-start;">
|
|
<div class="detail_button_out" v-if="isUser">
|
|
<div class="detail_button_out" v-if="isUser">
|
|
<div class="detail_button" @click="addUser(scope.row)">
|
|
<div class="detail_button" @click="addUser(scope.row)">
|
|
<img src="../../../assets/img/table/search.png" />
|
|
<img src="../../../assets/img/table/search.png" />
|
|
@@ -74,39 +74,6 @@
|
|
<div class="table-content" v-show="!isUser">
|
|
<div class="table-content" v-show="!isUser">
|
|
<el-table height="100%" v-show="!isUser" :data="tableData" :row-style="{ height: '0px' }"
|
|
<el-table height="100%" v-show="!isUser" :data="tableData" :row-style="{ height: '0px' }"
|
|
:cell-style="{ padding: '5px' }" :header-cell-style="{ background: '#F8F8F8', color: '#606266' }">
|
|
:cell-style="{ padding: '5px' }" :header-cell-style="{ background: '#F8F8F8', color: '#606266' }">
|
|
- <!-- <el-table-column prop="name" label="姓名" align="center" width="" show-overflow-tooltip>
|
|
|
|
- </el-table-column> -->
|
|
|
|
- <!-- <el-table-column
|
|
|
|
- v-if="isUser"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- prop="userName"
|
|
|
|
- label="姓名"
|
|
|
|
- align="center"
|
|
|
|
- width=""
|
|
|
|
- >
|
|
|
|
- </el-table-column>
|
|
|
|
- <el-table-column v-if="isUser" prop="userNo" label="学号" align="center" width="">
|
|
|
|
- </el-table-column>
|
|
|
|
- <el-table-column v-if="isUser" prop="totalScore" label="总分" align="center" width="">
|
|
|
|
- </el-table-column>
|
|
|
|
- <el-table-column
|
|
|
|
- v-if="isUser"
|
|
|
|
- prop="gender"
|
|
|
|
- label="性别"
|
|
|
|
- align="center"
|
|
|
|
- width=""
|
|
|
|
- :formatter="genderFun"
|
|
|
|
- >
|
|
|
|
- </el-table-column>
|
|
|
|
- <el-table-column
|
|
|
|
- v-if="isUser"
|
|
|
|
- prop="orgName"
|
|
|
|
- label="所属组织架构"
|
|
|
|
- align="center"
|
|
|
|
- width=""
|
|
|
|
-
|
|
|
|
- >
|
|
|
|
- </el-table-column> -->
|
|
|
|
<el-table-column v-if="!isUser" show-overflow-tooltip prop="planName" label="计划名称" align="center" width="">
|
|
<el-table-column v-if="!isUser" show-overflow-tooltip prop="planName" label="计划名称" align="center" width="">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column v-if="!isUser" prop="createDate" label="创建时间" align="center" width="">
|
|
<el-table-column v-if="!isUser" prop="createDate" label="创建时间" align="center" width="">
|
|
@@ -117,9 +84,9 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column v-if="!isUser" prop="planStatus" label="状态" :formatter="forMaPlan" align="center" width="">
|
|
<el-table-column v-if="!isUser" prop="planStatus" label="状态" :formatter="forMaPlan" align="center" width="">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="操作" width="400" align="center">
|
|
|
|
|
|
+ <el-table-column label="操作" width="300px" align="center">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <div style="display: flex; align-items: center">
|
|
|
|
|
|
+ <div style="display: flex; align-items: center;justify-content: flex-start;">
|
|
<div class="detail_button_out" v-if="isUser">
|
|
<div class="detail_button_out" v-if="isUser">
|
|
<div class="detail_button" @click="addUser(scope.row)">
|
|
<div class="detail_button" @click="addUser(scope.row)">
|
|
<img src="../../../assets/img/table/search.png" />
|
|
<img src="../../../assets/img/table/search.png" />
|
|
@@ -148,27 +115,10 @@
|
|
:current-page.sync="pageNum" layout="total, sizes, prev, pager, next" :page-size="pageSize"
|
|
:current-page.sync="pageNum" layout="total, sizes, prev, pager, next" :page-size="pageSize"
|
|
:page-sizes="[10, 20, 50, 100]" :total="total">
|
|
:page-sizes="[10, 20, 50, 100]" :total="total">
|
|
</el-pagination>
|
|
</el-pagination>
|
|
- <!-- <el-pagination small background layout="total prev, pager, next" :total="36">
|
|
|
|
- </el-pagination> -->
|
|
|
|
</div>
|
|
</div>
|
|
<CompareUser ref="register" @search="searchTarget" />
|
|
<CompareUser ref="register" @search="searchTarget" />
|
|
<ComparePlanUser ref="planUser" @search="searchTarget" />
|
|
<ComparePlanUser ref="planUser" @search="searchTarget" />
|
|
<el-dialog title="请选择计划" :visible.sync="choosePlanVisible">
|
|
<el-dialog title="请选择计划" :visible.sync="choosePlanVisible">
|
|
- <!-- <el-table height="100%" :data="comparePlanList" :row-style="{ height: '0px' }" :cell-style="{ padding: '5px' }"
|
|
|
|
- :header-cell-style="{ background: '#F8F8F8', color: '#606266' }" @select="selectHandle" ref="multipleTable">
|
|
|
|
- <el-table-column type="selection" width="55">
|
|
|
|
- </el-table-column>
|
|
|
|
- <el-table-column v-if="!isUser" show-overflow-tooltip prop="planName" label="计划名称" align="center" width="">
|
|
|
|
- </el-table-column>
|
|
|
|
- <el-table-column v-if="!isUser" prop="createDate" label="创建时间" align="center" width="">
|
|
|
|
- </el-table-column>
|
|
|
|
- <el-table-column v-if="!isUser" prop="planEndTime" label="结束时间" align="center" width="">
|
|
|
|
- </el-table-column>
|
|
|
|
- <el-table-column v-if="!isUser" prop="createUserName" label="创建人" align="center" width="">
|
|
|
|
- </el-table-column>
|
|
|
|
- <el-table-column v-if="!isUser" prop="planStatus" label="状态" :formatter="forMaPlan" align="center" width="">
|
|
|
|
- </el-table-column>
|
|
|
|
- </el-table> -->
|
|
|
|
<div class="btn_area">
|
|
<div class="btn_area">
|
|
<el-button @click="chooseCancel">取消</el-button>
|
|
<el-button @click="chooseCancel">取消</el-button>
|
|
<el-button v-if="comparePlanList.length > 0" type="primary" @click="chooseEnsure">确定</el-button>
|
|
<el-button v-if="comparePlanList.length > 0" type="primary" @click="chooseEnsure">确定</el-button>
|
|
@@ -275,7 +225,7 @@ export default {
|
|
//如果用户信息不存在跳转登陆页
|
|
//如果用户信息不存在跳转登陆页
|
|
this.$router.push({ path: "/" });
|
|
this.$router.push({ path: "/" });
|
|
}
|
|
}
|
|
- this.searchTarget();
|
|
|
|
|
|
+ // this.searchTarget();
|
|
this.isClikcObj(false);
|
|
this.isClikcObj(false);
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -497,6 +447,10 @@ export default {
|
|
: `&orgNo=${this.group[this.group.length - 1]}`
|
|
: `&orgNo=${this.group[this.group.length - 1]}`
|
|
}`;
|
|
}`;
|
|
}
|
|
}
|
|
|
|
+ console.log('isUser')
|
|
|
|
+ console.log(this.isUser+'')
|
|
|
|
+ console.log("url")
|
|
|
|
+ console.log(url)
|
|
this.$http.get(url, {}, (res) => {
|
|
this.$http.get(url, {}, (res) => {
|
|
if (res && res.code == 200) {
|
|
if (res && res.code == 200) {
|
|
console.log(res.data.content);
|
|
console.log(res.data.content);
|
|
@@ -666,7 +620,8 @@ export default {
|
|
.detail_button_out {
|
|
.detail_button_out {
|
|
flex: 1;
|
|
flex: 1;
|
|
display: flex;
|
|
display: flex;
|
|
- justify-content: space-around;
|
|
|
|
|
|
+ // justify-content: space-around;
|
|
|
|
+ justify-content: flex-start;
|
|
|
|
|
|
.detail_button {
|
|
.detail_button {
|
|
display: flex;
|
|
display: flex;
|