|
|
@@ -1816,7 +1816,7 @@
|
|
|
|
|
|
<div class="comment" style="min-width: 200px">
|
|
|
<div class="worksName">
|
|
|
- <div style="cursor: pointer" @click="openSname(w.sName, w.wid)">
|
|
|
+ <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex)">
|
|
|
{{ w.sName }}
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -4617,7 +4617,7 @@
|
|
|
</div>
|
|
|
<div v-if="e.detail">{{ e.detail }}</div>
|
|
|
</div>
|
|
|
- <div class="easy_comment" v-if="isStar == false">
|
|
|
+ <div class="easy_comment" v-if="false">
|
|
|
<div v-for="(p, pIndex) in PlTextList" :key="pIndex" @click="fastText(p, 2)">
|
|
|
{{ p }}
|
|
|
</div>
|
|
|
@@ -4653,7 +4653,7 @@
|
|
|
</div>
|
|
|
<div v-if="e.detail">{{ e.detail }}</div>
|
|
|
</div>
|
|
|
- <div class="easy_comment" v-if="isStar == false">
|
|
|
+ <div class="easy_comment" v-if="false">
|
|
|
<div v-for="(p, pIndex) in PlTextList" :key="pIndex" @click="fastText(p, 2)">
|
|
|
{{ p }}
|
|
|
</div>
|
|
|
@@ -5128,7 +5128,7 @@
|
|
|
<div v-if="dialogVisibleGroup">
|
|
|
<div v-if="courseDetail.userid == userid" class="g_d_btnBox">
|
|
|
<div style="color: rgb(171 171 171); margin: 0 10px 0 0">
|
|
|
- 提示：需要锁定位置，才能点击头像修改座位。
|
|
|
+ 提示：开启【开放选座】，学生能够自由加入和退出小组。
|
|
|
</div>
|
|
|
<!-- <div type="primary" v-if="groupJson.islock == 1" class="returnBtn" style="background-color: #225bc7"
|
|
|
@click="lockChair">
|
|
|
@@ -5561,7 +5561,7 @@
|
|
|
></el-input> -->
|
|
|
|
|
|
<el-select style="margin-top: 10px" v-model="item.username" filterable allow-create placeholder="请选择学生">
|
|
|
- <el-option v-for="item1 in uploadStudentJuri" :key="item1.userid"
|
|
|
+ <el-option v-for="item1 in checkUpload()" :key="item1.userid"
|
|
|
:label="item1.name ? item1.name : item1.username" :value="item1.userid">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
@@ -5593,7 +5593,7 @@
|
|
|
<span class="tian1">名称</span>
|
|
|
<el-select v-model="worksSName" filterable allow-create style="width: 250px; margin: 15px 0px"
|
|
|
placeholder="请选择学生">
|
|
|
- <el-option v-for="item in classJuri" :key="item.userid" :label="item.name ? item.name : item.username"
|
|
|
+ <el-option v-for="item in uploadStudentJuri" :key="item.userid" :label="item.name ? item.name : item.username"
|
|
|
:value="item.userid">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
@@ -6533,22 +6533,6 @@ export default {
|
|
|
console.error(err);
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
- selectCStudent() {
|
|
|
- let params = {
|
|
|
- cid: this.tcid ? this.tcid : this.courseDetail.juri,
|
|
|
- oid: this.oid,
|
|
|
- cn: '',
|
|
|
- };
|
|
|
- this.ajax
|
|
|
- .get(this.$store.state.api + "selectSnameByCidGroup", params)
|
|
|
- .then((res) => {
|
|
|
- this.classJuri = res.data[0];
|
|
|
- })
|
|
|
- .catch((err) => {
|
|
|
- console.error(err);
|
|
|
- });
|
|
|
- },
|
|
|
selectUploadStudent() {
|
|
|
let params = {
|
|
|
cid: this.uploadCid,
|
|
|
@@ -6558,7 +6542,16 @@ export default {
|
|
|
this.ajax
|
|
|
.get(this.$store.state.api + "selectSnameByCidGroup", params)
|
|
|
.then((res) => {
|
|
|
- this.uploadStudentJuri = res.data[0];
|
|
|
+ var studentK = [];
|
|
|
+ if (this.isWorksS[this.toolindex].length > 0) {
|
|
|
+ for (var z = 0; z < this.isWorksS[this.toolindex].length; z++) {
|
|
|
+ studentK.push(this.isWorksS[this.toolindex][z].uid);
|
|
|
+ }
|
|
|
+ studentK = studentK.join(",");
|
|
|
+ }
|
|
|
+ this.uploadStudentJuri = res.data[0].filter((el)=>{
|
|
|
+ return studentK.indexOf(el.userid) == -1
|
|
|
+ });
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
console.error(err);
|
|
|
@@ -8354,7 +8347,7 @@ export default {
|
|
|
uid: file.uid,
|
|
|
fileType: _ftype,
|
|
|
username:
|
|
|
- _this.plworkFile.length + 1 > 10
|
|
|
+ _this.plworkFile.length > 10
|
|
|
? _this.plworkFile.length + 1
|
|
|
: "0" + (_this.plworkFile.length + 1),
|
|
|
});
|
|
|
@@ -9339,7 +9332,6 @@ export default {
|
|
|
_this.selectSWorks(gindex);
|
|
|
}
|
|
|
|
|
|
- _this.selectCStudent();
|
|
|
_this.selectStudent();
|
|
|
_this.selectSLook();
|
|
|
if (_this.courseDetail.userid == _this.userid && _this.IsFollow) {
|
|
|
@@ -9673,6 +9665,7 @@ export default {
|
|
|
this.navList[this.courseType].isOpen = true;
|
|
|
this.taskCount = parseInt(_followC[1])
|
|
|
this.navId = res.data[0][0].followC;
|
|
|
+ document.scrollingElement.scrollTop = 0;
|
|
|
this.getCourseDetail(2)
|
|
|
}
|
|
|
}
|
|
|
@@ -10733,6 +10726,12 @@ export default {
|
|
|
if (t == 16 || t == 32 || t == 57 || t == 50) {
|
|
|
this.dialogVisibleWorks = true;
|
|
|
} else if (t == 15) {
|
|
|
+ this.answerQ = this.chapInfoList[this.courseType].chapterInfo[0]
|
|
|
+ .taskJson[index].toolChoose[i].answerQ
|
|
|
+ ? this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index]
|
|
|
+ .toolChoose[i].answerQ
|
|
|
+ : "";
|
|
|
+ this.questionAnswer = ''
|
|
|
this.answerDialogVisibleTeacher = true;//问答
|
|
|
} else if (t == 52) {
|
|
|
this.wordJson = this.chapInfoList[this.courseType].chapterInfo[0]
|
|
|
@@ -11051,9 +11050,12 @@ export default {
|
|
|
this.fulltype = type;
|
|
|
this.fullUrl = url;
|
|
|
},
|
|
|
- openSname(n, id) {
|
|
|
+ openSname(n, id, i) {
|
|
|
this.snameWid = id;
|
|
|
this.worksSName = n;
|
|
|
+ this.toolindex = i
|
|
|
+ this.uploadCid = this.tcid ? this.tcid : this.courseDetail.juri
|
|
|
+ this.selectUploadStudent();
|
|
|
this.dialogVisibleSname = true;
|
|
|
},
|
|
|
updateName() {
|
|
|
@@ -11682,6 +11684,21 @@ export default {
|
|
|
: "";
|
|
|
};
|
|
|
},
|
|
|
+ checkUpload(){
|
|
|
+ return function(){
|
|
|
+ var studentK = [];
|
|
|
+ if (this.plworkFile.length > 0) {
|
|
|
+ for (var z = 0; z < this.plworkFile.length; z++) {
|
|
|
+ studentK.push(this.plworkFile[z].username);
|
|
|
+ }
|
|
|
+ studentK = studentK.join(",");
|
|
|
+ }
|
|
|
+ var a = this.uploadStudentJuri.filter((el)=>{
|
|
|
+ return studentK.indexOf(el.userid) == -1
|
|
|
+ });
|
|
|
+ return a
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
mounted() {
|
|
|
if (this.screenType == 2) {
|
