|
|
@@ -234,7 +234,9 @@
|
|
|
class="vedioBox"
|
|
|
v-if="
|
|
|
chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
- .taskDetail != '' || vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0
|
|
|
+ .taskDetail != '' ||
|
|
|
+ vChapterData[taskCount].length > 0 ||
|
|
|
+ fileC[taskCount].length > 0
|
|
|
"
|
|
|
>
|
|
|
<div
|
|
|
@@ -660,6 +662,9 @@
|
|
|
@click="isClose = 1"
|
|
|
>
|
|
|
展开
|
|
|
+ <div class="closeImg">
|
|
|
+ <img src="../../assets/icon/newIcon/close.png" alt="" />
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div
|
|
|
class="queTopClose"
|
|
|
@@ -667,6 +672,9 @@
|
|
|
@click="isClose = 0"
|
|
|
>
|
|
|
收缩
|
|
|
+ <div class="openImg">
|
|
|
+ <img src="../../assets/icon/newIcon/open.png" alt="" />
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<el-button
|
|
|
style="margin: 0 30px 0 auto"
|
|
|
@@ -756,27 +764,27 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="tool">
|
|
|
- <div class="whiteBIcon" @click="addTools2(65)">
|
|
|
- <img
|
|
|
- src="../../assets/icon/firstToolList/pickPeople.png"
|
|
|
- alt
|
|
|
- />
|
|
|
- <div style="margin: 5px 0">挑人</div>
|
|
|
- </div>
|
|
|
- <div class="check" @click="addTools2(65)">
|
|
|
+ <div class="whiteBIcon" @click="addTools2(65)">
|
|
|
+ <img
|
|
|
+ src="../../assets/icon/firstToolList/pickPeople.png"
|
|
|
+ alt
|
|
|
+ />
|
|
|
+ <div style="margin: 5px 0">挑人</div>
|
|
|
+ </div>
|
|
|
+ <div class="check" @click="addTools2(65)">
|
|
|
+ <img
|
|
|
+ src="../../assets/icon/checkNo.png"
|
|
|
+ alt
|
|
|
+ v-if="checktoolArray.indexOf(65) == -1"
|
|
|
+ />
|
|
|
+ <div class="checkDiv" v-else>
|
|
|
<img
|
|
|
- src="../../assets/icon/checkNo.png"
|
|
|
+ src="../../assets/icon/checkedIs.png"
|
|
|
alt
|
|
|
- v-if="checktoolArray.indexOf(65) == -1"
|
|
|
- />
|
|
|
- <div class="checkDiv" v-else>
|
|
|
- <img
|
|
|
- src="../../assets/icon/checkedIs.png"
|
|
|
- alt
|
|
|
- /><span>已选择</span>
|
|
|
- </div>
|
|
|
+ /><span>已选择</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="toolSort" v-if="toolType == 1">
|
|
|
<div class="tool">
|
|
|
@@ -3709,7 +3717,9 @@
|
|
|
:key="index"
|
|
|
>
|
|
|
<div>
|
|
|
- <span>{{ index + 1 + "、" + item.askstitle }}</span>
|
|
|
+ <span style="word-break: break-all; white-space: normal">{{
|
|
|
+ index + 1 + "、" + item.askstitle
|
|
|
+ }}</span>
|
|
|
</div>
|
|
|
<div class="right_box_xuan">
|
|
|
<span>正确率</span>
|
|
|
@@ -3762,10 +3772,7 @@
|
|
|
v-for="(item, index) in tool.testJson.testJson"
|
|
|
:key="index"
|
|
|
>
|
|
|
- <div>
|
|
|
- <span>{{ index + 1 + "、" + item.teststitle }}</span>
|
|
|
- </div>
|
|
|
- <div class="right_box_xuan">
|
|
|
+ <div class="right_box_xuan" style="margin-right: 10px">
|
|
|
<span>正确率</span>
|
|
|
<span>{{
|
|
|
(checkJson[toolIndex][index].right
|
|
|
@@ -3773,6 +3780,11 @@
|
|
|
: 0) + "%"
|
|
|
}}</span>
|
|
|
</div>
|
|
|
+ <div>
|
|
|
+ <span style="word-break: break-all; white-space: normal">{{
|
|
|
+ index + 1 + "、" + item.teststitle
|
|
|
+ }}</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div
|
|
|
@@ -11610,7 +11622,15 @@
|
|
|
center
|
|
|
>
|
|
|
<div class="pick_box">
|
|
|
- <div class="noWorksName" :class="{isSelectName: isPickStudent.indexOf(item.userid) !== -1}" v-for="(item,index) in uploadStudentJuri" :key="index" @click="pickStudent(item)">{{item.name}}</div>
|
|
|
+ <div
|
|
|
+ class="noWorksName"
|
|
|
+ :class="{ isSelectName: isPickStudent.indexOf(item.userid) !== -1 }"
|
|
|
+ v-for="(item, index) in uploadStudentJuri"
|
|
|
+ :key="index"
|
|
|
+ @click="pickStudent(item)"
|
|
|
+ >
|
|
|
+ {{ item.name }}
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -12660,7 +12680,7 @@ export default {
|
|
|
.get(this.$store.state.api + "selectSnameByCidGroup", params)
|
|
|
.then((res) => {
|
|
|
loading.close();
|
|
|
- this.uploadStudentJuri = res.data[0]
|
|
|
+ this.uploadStudentJuri = res.data[0];
|
|
|
this.dialogVisiblePickPeople = true;
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
@@ -16581,7 +16601,7 @@ export default {
|
|
|
);
|
|
|
return;
|
|
|
}
|
|
|
- this.selectPickStudent()
|
|
|
+ this.selectPickStudent();
|
|
|
} else if (t == 26) {
|
|
|
window.parent.postMessage(
|
|
|
{
|
|
|
@@ -17892,8 +17912,8 @@ export default {
|
|
|
this.wordCloudData = array;
|
|
|
this.dialogVisibleWordCloud = true;
|
|
|
},
|
|
|
- pickStudent(stu){
|
|
|
- if(this.isPickStudent.indexOf(stu.userid) !== -1){
|
|
|
+ pickStudent(stu) {
|
|
|
+ if (this.isPickStudent.indexOf(stu.userid) !== -1) {
|
|
|
return;
|
|
|
}
|
|
|
this.$confirm(`是否让${stu.name}同学回答问题？`, "提示", {
|
|
|
@@ -17902,18 +17922,20 @@ export default {
|
|
|
type: "warning",
|
|
|
})
|
|
|
.then(() => {
|
|
|
- let params = [{
|
|
|
- uid:stu.userid,
|
|
|
- cid:this.id,
|
|
|
- stage:this.courseType,
|
|
|
- task:this.taskCount,
|
|
|
- tool:this.toolindex
|
|
|
- }]
|
|
|
+ let params = [
|
|
|
+ {
|
|
|
+ uid: stu.userid,
|
|
|
+ cid: this.id,
|
|
|
+ stage: this.courseType,
|
|
|
+ task: this.taskCount,
|
|
|
+ tool: this.toolindex,
|
|
|
+ },
|
|
|
+ ];
|
|
|
this.ajax
|
|
|
.post(this.$store.state.api + "updateCoursePick", params)
|
|
|
.then((res) => {
|
|
|
- this.$message.success("操作成功")
|
|
|
- this.getPick()
|
|
|
+ this.$message.success("操作成功");
|
|
|
+ this.getPick();
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
this.$message.error("网络不佳");
|
|
|
@@ -17922,48 +17944,50 @@ export default {
|
|
|
})
|
|
|
.catch(() => {});
|
|
|
},
|
|
|
- getPick(){
|
|
|
+ getPick() {
|
|
|
let params = {
|
|
|
- cid:this.id
|
|
|
- }
|
|
|
+ cid: this.id,
|
|
|
+ };
|
|
|
this.ajax
|
|
|
- .get(this.$store.state.api + "getPick", params)
|
|
|
- .then((res) => {
|
|
|
- let array = []
|
|
|
- for(var i = 0; i < res.data[0].length;i++){
|
|
|
- array.push(res.data[0][i].userid)
|
|
|
- }
|
|
|
- this.isPickStudent = array
|
|
|
- if(array.indexOf(this.userid) !== -1){
|
|
|
- this.$confirm("你被老师选到啦！", "提示", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- showCancelButton:false,
|
|
|
- closeOnClickModal:false,
|
|
|
- type: "warning",
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- let pa = [{
|
|
|
- uid: this.userid,
|
|
|
- cid: this.id
|
|
|
- }]
|
|
|
- this.ajax
|
|
|
- .post(this.$store.state.api + "deletePick", pa)
|
|
|
- .then((res) => {
|
|
|
- this.getPick()
|
|
|
- })
|
|
|
- .catch((err) => {
|
|
|
- this.$message.error("网络不佳");
|
|
|
- console.error(err);
|
|
|
- });
|
|
|
- })
|
|
|
- .catch(() => {});
|
|
|
- }
|
|
|
+ .get(this.$store.state.api + "getPick", params)
|
|
|
+ .then((res) => {
|
|
|
+ let array = [];
|
|
|
+ for (var i = 0; i < res.data[0].length; i++) {
|
|
|
+ array.push(res.data[0][i].userid);
|
|
|
+ }
|
|
|
+ this.isPickStudent = array;
|
|
|
+ if (array.indexOf(this.userid) !== -1) {
|
|
|
+ this.$confirm("你被老师选到啦！", "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ showCancelButton: false,
|
|
|
+ closeOnClickModal: false,
|
|
|
+ type: "warning",
|
|
|
})
|
|
|
- .catch((err) => {
|
|
|
- this.$message.error("网络不佳");
|
|
|
- console.error(err);
|
|
|
- });
|
|
|
- }
|
|
|
+ .then(() => {
|
|
|
+ let pa = [
|
|
|
+ {
|
|
|
+ uid: this.userid,
|
|
|
+ cid: this.id,
|
|
|
+ },
|
|
|
+ ];
|
|
|
+ this.ajax
|
|
|
+ .post(this.$store.state.api + "deletePick", pa)
|
|
|
+ .then((res) => {
|
|
|
+ this.getPick();
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ this.$message.error("网络不佳");
|
|
|
+ console.error(err);
|
|
|
+ });
|
|
|
+ })
|
|
|
+ .catch(() => {});
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ this.$message.error("网络不佳");
|
|
|
+ console.error(err);
|
|
|
+ });
|
|
|
+ },
|
|
|
},
|
|
|
directives: {
|
|
|
// 使用局部注册指令的方式
|
|
|
@@ -18656,7 +18680,7 @@ export default {
|
|
|
.returnBtn {
|
|
|
width: 86px;
|
|
|
height: 36px;
|
|
|
- background: #409eff;
|
|
|
+ background: #3681fc;
|
|
|
border-radius: 4px;
|
|
|
color: #fff;
|
|
|
text-align: center;
|
|
|
@@ -18944,8 +18968,25 @@ export default {
|
|
|
align-items: center;
|
|
|
}
|
|
|
.queTopClose {
|
|
|
- margin-right: 20px;
|
|
|
+ margin-right: 30px;
|
|
|
cursor: pointer;
|
|
|
+ position: relative;
|
|
|
+ display: flex;
|
|
|
+}
|
|
|
+
|
|
|
+.closeImg,
|
|
|
+.openImg {
|
|
|
+ width: 25px;
|
|
|
+ height: 25px;
|
|
|
+ position: absolute;
|
|
|
+ right: -20px;
|
|
|
+ top: -1px;
|
|
|
+}
|
|
|
+
|
|
|
+.closeImg > img,
|
|
|
+.openImg > img {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
}
|
|
|
|
|
|
.question {
|
|
|
@@ -19210,6 +19251,12 @@ export default {
|
|
|
font-size: 18px;
|
|
|
}
|
|
|
|
|
|
+.redioStyle >>> .el-radio__label > span,
|
|
|
+.redioStyle >>> .el-checkbox__label > span {
|
|
|
+ word-break: break-all;
|
|
|
+ white-space: normal;
|
|
|
+}
|
|
|
+
|
|
|
.redioStyle >>> .el-checkbox__label {
|
|
|
font-size: 18px;
|
|
|
}
|
|
|
@@ -19418,7 +19465,7 @@ export default {
|
|
|
|
|
|
.cru_selectBox {
|
|
|
overflow: auto;
|
|
|
- width: 90%;
|
|
|
+ width: 95%;
|
|
|
margin: 17px auto 0;
|
|
|
height: calc(100% - 40px - 21px - 20px - 17px);
|
|
|
}
|
|
|
@@ -19632,13 +19679,13 @@ export default {
|
|
|
padding: 5px;
|
|
|
text-overflow: ellipsis;
|
|
|
cursor: pointer;
|
|
|
- border: 1px solid #3681FC;
|
|
|
+ border: 1px solid #3681fc;
|
|
|
}
|
|
|
|
|
|
.noWorksName.isWork {
|
|
|
- background: #E7EBF1 !important;
|
|
|
- border: 1px solid #CAD1DC !important;
|
|
|
- color: #ACB4BF !important;
|
|
|
+ background: #e7ebf1 !important;
|
|
|
+ border: 1px solid #cad1dc !important;
|
|
|
+ color: #acb4bf !important;
|
|
|
}
|
|
|
|
|
|
.isWorksName {
|
|
|
@@ -20523,6 +20570,7 @@ export default {
|
|
|
border-radius: 5px;
|
|
|
padding: 5px;
|
|
|
margin-left: 10px;
|
|
|
+ min-width: 95px;
|
|
|
}
|
|
|
|
|
|
.pButton:hover {
|
|
|
@@ -20595,7 +20643,7 @@ export default {
|
|
|
.pzTop2 .checkbox {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
- padding: 15px 30px;
|
|
|
+ padding: 5px 30px;
|
|
|
flex: 0 0 auto;
|
|
|
font-weight: bold;
|
|
|
border-bottom: 1px solid #eee;
|
|
|
@@ -21857,7 +21905,7 @@ ol {
|
|
|
margin-left: 10px;
|
|
|
}
|
|
|
|
|
|
-.pick_box{
|
|
|
+.pick_box {
|
|
|
display: flex;
|
|
|
align-items: flex-start;
|
|
|
flex-wrap: wrap;
|
zengyicheng
