|
|
@@ -199,7 +199,7 @@
|
|
|
/>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="both">
|
|
|
+ <div class="both" v-if="CourseType.length">
|
|
|
<div class="choose">
|
|
|
<div
|
|
|
class="all_choose"
|
|
|
@@ -328,14 +328,16 @@
|
|
|
margin-top: 10px;
|
|
|
font-size: 14px;
|
|
|
color: #6e6e6e;
|
|
|
+ cursor:pointer
|
|
|
"
|
|
|
+ @click="checkBoolean = !checkBoolean"
|
|
|
>
|
|
|
<span
|
|
|
:class="{ tcMember: getMan2(tc) }"
|
|
|
- v-for="(tc, tcIndex) in checkboxList3"
|
|
|
+ v-for="(tc, tcIndex) in checkboxList3.length > 6 && checkBoolean ? checkboxList3 : checkboxList3.slice(0,6)"
|
|
|
:key="tcIndex"
|
|
|
>{{ getMan2(tc) }}</span
|
|
|
- >
|
|
|
+ ><span class="tcMember" v-if="checkboxList3.length > 6 && !checkBoolean">更多...</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1249,7 +1251,7 @@
|
|
|
<span v-if="itemTool.tool == 54"> 拍照 </span>
|
|
|
<span v-if="itemTool.tool == 55"> 压缩文件 </span>
|
|
|
<span v-if="itemTool.tool == 56"> 投票 </span>
|
|
|
- <span v-if="itemTool.tool == 57"> cocopi </span>
|
|
|
+ <span v-if="itemTool.tool == 57"> CocoPi </span>
|
|
|
</div>
|
|
|
<div
|
|
|
class="remove"
|
|
|
@@ -2265,6 +2267,17 @@
|
|
|
</el-checkbox-group>
|
|
|
<div style="text-align: center; margin-top: 10px" v-else>暂无数据</div>
|
|
|
</div>
|
|
|
+ <div style="margin-top: 10px;">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ layout="prev, pager, next"
|
|
|
+ :page-size="pageSize"
|
|
|
+ :total="total"
|
|
|
+ v-if="page && teacherJuri.length"
|
|
|
+ style="padding-bottom: 20px"
|
|
|
+ @current-change="handleCurrentChange"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="dialogVisibleMember = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="isAddPPTeacher">确定</el-button>
|
|
|
@@ -3228,7 +3241,7 @@
|
|
|
<div class="tool">
|
|
|
<div class="whiteBIcon" @click="addToolFun(57)">
|
|
|
<img src="../../../assets/icon/fourthToolList/cocopi.png" alt />
|
|
|
- <div style="margin: 5px 0">cocopi</div>
|
|
|
+ <div style="margin: 5px 0">CocoPi</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -4200,6 +4213,10 @@ export default {
|
|
|
checkJson: [],
|
|
|
graphJson: {},
|
|
|
rightBoxHeight: 0,
|
|
|
+ checkBoolean:false,
|
|
|
+ pageSize:20,
|
|
|
+ total:0,
|
|
|
+ page:0,
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -4421,6 +4438,11 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
methods: {
|
|
|
+ handleCurrentChange(val) {
|
|
|
+ // console.log(`当前页: ${val}`);
|
|
|
+ this.page = val;
|
|
|
+ this.getTeacher();
|
|
|
+ },
|
|
|
handleCheckAllChange(val) {
|
|
|
this.checkedCities = val ? cityOptions : [];
|
|
|
this.isIndeterminate = false;
|
|
|
@@ -4541,6 +4563,9 @@ export default {
|
|
|
if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
|
|
|
typeT++;
|
|
|
}
|
|
|
+ if(this.CourseType.length == 0){
|
|
|
+ typeT = 3
|
|
|
+ }
|
|
|
if (this.courseName == "" || typeT != 3) {
|
|
|
if (typeT != 3) {
|
|
|
this.$message.error("分类为必选项目，请将信息补充完整后进行下一步");
|
|
|
@@ -4760,6 +4785,9 @@ export default {
|
|
|
if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
|
|
|
typeT++;
|
|
|
}
|
|
|
+ if(this.CourseType.length == 0){
|
|
|
+ typeT = 3
|
|
|
+ }
|
|
|
if (this.cidttt == 1) {
|
|
|
if (this.steps == 1) {
|
|
|
if (this.courseName != "" && typeT == 3) {
|
|
|
@@ -6411,17 +6439,20 @@ export default {
|
|
|
oid: this.oid,
|
|
|
cu: "",
|
|
|
cn: this.searchTN,
|
|
|
+ page: this.page,
|
|
|
+ pageSize: this.pageSize,
|
|
|
};
|
|
|
this.ajax
|
|
|
.get(
|
|
|
this.$store.state.api +
|
|
|
(this.org && this.org != "undefined" && this.org != "null"
|
|
|
- ? "selectUserByOidS"
|
|
|
- : "selectUserByOidS"),
|
|
|
+ ? "selectUserByOidS2"
|
|
|
+ : "selectUserByOidS2"),
|
|
|
params
|
|
|
)
|
|
|
.then((res) => {
|
|
|
let teacherJuri = res.data[0];
|
|
|
+ this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
|
|
|
this.teacherJuri2 = JSON.parse(JSON.stringify(res.data[0]));
|
|
|
for (var i = 0; i < teacherJuri.length; i++) {
|
|
|
if (teacherJuri[i].userid == this.userid) {
|
|
|
@@ -8337,16 +8368,20 @@ export default {
|
|
|
}
|
|
|
|
|
|
if (res.data[2].length == 0 && res.data[3].length == 0) {
|
|
|
- for (var j = 0; j < res.data[1].length; j++) {
|
|
|
- if (
|
|
|
- this.courseTypeId.indexOf(res.data[1][j].id) != -1 &&
|
|
|
- _courseTypeId.indexOf(res.data[1][j].id) == -1
|
|
|
- ) {
|
|
|
- _courseTypeId.push(res.data[1][j].id);
|
|
|
- }
|
|
|
- if (res.data[0][i].id == res.data[1][j].pid) {
|
|
|
- this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
|
|
|
+ if(this.org == '150e3120-9195-11ed-b13d-005056b86db5'){
|
|
|
+ for (var j = 0; j < res.data[1].length; j++) {
|
|
|
+ if (
|
|
|
+ this.courseTypeId.indexOf(res.data[1][j].id) != -1 &&
|
|
|
+ _courseTypeId.indexOf(res.data[1][j].id) == -1
|
|
|
+ ) {
|
|
|
+ _courseTypeId.push(res.data[1][j].id);
|
|
|
+ }
|
|
|
+ if (res.data[0][i].id == res.data[1][j].pid) {
|
|
|
+ this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
|
|
|
+ }
|
|
|
}
|
|
|
+ }else{
|
|
|
+ this.CourseType = []
|
|
|
}
|
|
|
} else {
|
|
|
if (res.data[2].length > 0) {
|
|
|
@@ -9060,6 +9095,7 @@ export default {
|
|
|
},
|
|
|
openMember() {
|
|
|
this.searchTN = "";
|
|
|
+ this.page = 1
|
|
|
this.getTeacher();
|
|
|
this.dialogVisibleMember = true;
|
|
|
},
|
|
|
@@ -9752,7 +9788,11 @@ export default {
|
|
|
justify-content: flex-start;
|
|
|
padding: 10px 0 0 25px;
|
|
|
flex-direction: column;
|
|
|
- flex-wrap: wrap;
|
|
|
+ flex-wrap: nowrap;
|
|
|
+ height: calc(100% - 140px);
|
|
|
+ overflow-y: auto;
|
|
|
+ overflow-x: hidden;
|
|
|
+ flex-direction: column;
|
|
|
}
|
|
|
|
|
|
.people_name >>> .el-checkbox {
|
