|
@@ -10,8 +10,7 @@
|
|
|
box-sizing: border-box;
|
|
|
"
|
|
|
>
|
|
|
- <div class="btnAllNT">
|
|
|
- <!-- <img src="../../assets/icon/learn/screen.png" @click="allScrell" /> -->
|
|
|
+ <!-- <div class="btnAllNT">
|
|
|
<img
|
|
|
v-if="
|
|
|
courseDetail.userid == userid ||
|
|
@@ -51,7 +50,7 @@
|
|
|
)
|
|
|
"
|
|
|
/>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
<div
|
|
|
class="pButton"
|
|
|
style="left: 0; top: 140px"
|
|
@@ -225,10 +224,10 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="body_student" :class="{ navLeftCss: !mlDialog }">
|
|
|
- <div class="new_topFixed"></div>
|
|
|
- <div class="new_top" :class="{ navLeftCss: !mlDialog }">
|
|
|
- <div class="courseIndex">
|
|
|
+ <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
|
|
|
+ <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
|
|
|
+ <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
|
|
|
+ <div class="courseIndex" :style="{width: orgArray.includes(org) ? '100%' : 'calc(100% - 745px)'}">
|
|
|
<div>任务{{ taskCount + 1 }}</div>
|
|
|
<el-tooltip
|
|
|
effect="light"
|
|
@@ -245,7 +244,8 @@
|
|
|
</div>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
- <div class="btnAll">
|
|
|
+ <!-- v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'" -->
|
|
|
+ <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid)">
|
|
|
<div class="btnLeft">
|
|
|
<el-tooltip effect="light" content="刷新" placement="top">
|
|
|
<div class="reBtnIcon" @click="refreshCourse">
|
|
@@ -311,7 +311,7 @@
|
|
|
/>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <!-- <div
|
|
|
+ <div
|
|
|
class="last"
|
|
|
@click="juriVisible = true"
|
|
|
v-if="tType == 1"
|
|
@@ -329,7 +329,7 @@
|
|
|
/>
|
|
|
</div>
|
|
|
<div class="lastText">权限</div>
|
|
|
- </div> -->
|
|
|
+ </div>
|
|
|
<div
|
|
|
class="returnBtn1 returnIcon"
|
|
|
@click.stop="
|
|
@@ -423,6 +423,8 @@
|
|
|
</div> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <!-- !chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .taskDetail3 && -->
|
|
|
<div
|
|
|
class="isNoMessage"
|
|
|
v-if="
|
|
@@ -444,6 +446,8 @@
|
|
|
<img src="../../assets/icon/isNoMessage.png" alt />
|
|
|
</div>
|
|
|
<div class="study_top" :class="{ pzClass: pzDialog }">
|
|
|
+ <!-- chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .taskDetail3 || -->
|
|
|
<div
|
|
|
class="vedioBox"
|
|
|
v-if="
|
|
@@ -454,6 +458,44 @@
|
|
|
"
|
|
|
style="border-radius: 0 0 20px 20px"
|
|
|
>
|
|
|
+ <!-- <div
|
|
|
+ class="taskBox"
|
|
|
+ v-if="
|
|
|
+ chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .taskDetail3
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <div
|
|
|
+ style="
|
|
|
+ display: flex;
|
|
|
+ flex-wrap: nowrap;
|
|
|
+ flex-direction: column;
|
|
|
+ position: relative;
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <div
|
|
|
+ style="
|
|
|
+ padding: 15px 0;
|
|
|
+ line-height: 29px;
|
|
|
+ font-size: 18px;
|
|
|
+ color: #0e1e33;
|
|
|
+ "
|
|
|
+ class="cont"
|
|
|
+ v-if="
|
|
|
+ chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .taskDetail3 != ''
|
|
|
+ "
|
|
|
+ v-html="
|
|
|
+ chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .taskDetail3
|
|
|
+ ? MarkdownT(chapInfoList[courseType].chapterInfo[0].taskJson[
|
|
|
+ taskCount
|
|
|
+ ].taskDetail3)
|
|
|
+ : '暂无描述'
|
|
|
+ "
|
|
|
+ ></div>
|
|
|
+ </div>
|
|
|
+ </div> -->
|
|
|
<div
|
|
|
class="taskBox"
|
|
|
v-if="
|
|
@@ -1868,7 +1910,9 @@
|
|
|
:key="sIndex"
|
|
|
class="noWorksName"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -2986,7 +3030,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(16, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -3086,7 +3132,9 @@
|
|
|
:key="sIndex"
|
|
|
class="noWorksName"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -3294,7 +3342,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(32, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -3462,7 +3512,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(57, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -3710,7 +3762,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(50, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -3896,7 +3950,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(4, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -4063,7 +4119,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(45, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -4169,7 +4227,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(69, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -4465,7 +4525,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(15, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -4747,7 +4809,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(1, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -5029,7 +5093,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(3, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -5310,7 +5376,9 @@
|
|
|
:key="sIndex"
|
|
|
class="noWorksName"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -5592,7 +5660,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(7, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -5699,7 +5769,9 @@
|
|
|
:key="sIndex"
|
|
|
class="noWorksName"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -5831,7 +5903,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(40, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -6003,7 +6077,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(41, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -6236,7 +6312,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(47, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -6394,7 +6472,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(48, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -6623,7 +6703,9 @@
|
|
|
class="noWorksName"
|
|
|
@click="teacherWorkSubmit(52, toolIndex, taskCount, s)"
|
|
|
>
|
|
|
- {{ s.student }}
|
|
|
+ <el-tooltip effect="dark" :content="s.student" placement="top">
|
|
|
+ <span>{{ s.student }}</span>
|
|
|
+ </el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -8028,6 +8110,23 @@
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
|
|
|
+ <classRoomHelper :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
|
|
|
+ '/courseDetail?userid=' +
|
|
|
+ userid +
|
|
|
+ '&oid=' +
|
|
|
+ oid +
|
|
|
+ '&org=' +
|
|
|
+ org +
|
|
|
+ '&cid=' +
|
|
|
+ classId +
|
|
|
+ '&courseId=' +
|
|
|
+ id +
|
|
|
+ '&tType=' +
|
|
|
+ tType +
|
|
|
+ '&screenType=' +
|
|
|
+ screenType
|
|
|
+ )"></classRoomHelper>
|
|
|
<div
|
|
|
class="pButton"
|
|
|
@click="(pzDialog = true), selectPz()"
|
|
@@ -8037,7 +8136,7 @@
|
|
|
<!-- 批 -->
|
|
|
<img src="../../assets/mlBtn.png" style="width: 25px" alt="" />
|
|
|
</div>
|
|
|
- <div v-if="pzDialog == true" class="newDialogCss">
|
|
|
+ <div v-if="pzDialog == true" class="newDialogCss" :style="`right:${commentRight}`">
|
|
|
<div class="pzTop2">
|
|
|
<!-- <div>评论</div>
|
|
|
<div @click="pzDialog = false">
|
|
@@ -8049,9 +8148,11 @@
|
|
|
</div> -->
|
|
|
<div class="cb-tabList">
|
|
|
<div :class="[commentTagShow==0?'cb-tabItem':'']" @click="commentTagShow=0">评论</div>
|
|
|
- <div :class="[commentTagShow==1?'cb-tabItem':'']" @click="commentTagShow=1">评分</div>
|
|
|
+ <!-- <div :class="[commentTagShow==1?'cb-tabItem':'']" @click="commentTagShow=1">评分</div> -->
|
|
|
+ <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
|
|
|
+ <div :class="[commentTagShow==2?'cb-tabItem':'']" @click="commentTagShow=2">总评</div>
|
|
|
</div>
|
|
|
- <el-select v-model="pzStype" @change="selectPz" class="selectBox">
|
|
|
+ <el-select v-model="pzStype" @change="selectPz" class="selectBox" v-show="commentTagShow == 0">
|
|
|
<el-option label="时间降序" :value="1"></el-option>
|
|
|
<el-option label="时间升序" :value="2"></el-option>
|
|
|
<el-option label="我的评课" :value="3"></el-option>
|
|
@@ -8156,6 +8257,9 @@
|
|
|
<div class="scoreList" v-if="commentTagShow==1">
|
|
|
<scoreItem v-for="item in scoreList.datalist" @refresh="getScoreList" :data="item" :isScore="scoreList.isScoreList.filter(i=>(i.userid==item.userid && i.courseid == item.courseId))" :key="item.courseId"/>
|
|
|
</div>
|
|
|
+ <div class="scoreList" v-if="commentTagShow==2" style="position: relative">
|
|
|
+ <scoreZong :courseid="id" :userid="userid"></scoreZong>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div
|
|
|
v-if="toolDialogVisible == true"
|
|
@@ -11872,6 +11976,9 @@ import EnglishVoice from '../EnglishVoice2/index.vue'
|
|
|
import checkEnglishVoice from '../checkEnglishVoice/index.vue'
|
|
|
import correctText from '../components/correctText.vue'
|
|
|
import scoreItem from '../scoreList/scoreItem.vue'
|
|
|
+import scoreZong from '../scoreZong/index.vue'
|
|
|
+import classRoomHelper from '../classRoomHelper/index.vue'
|
|
|
+import MarkdownIt from "markdown-it";
|
|
|
|
|
|
const getFile = (url) => {
|
|
|
return new Promise((resolve, reject) => {
|
|
@@ -11945,7 +12052,9 @@ export default {
|
|
|
EnglishVoice,
|
|
|
checkEnglishVoice,
|
|
|
correctText,
|
|
|
- scoreItem
|
|
|
+ scoreItem,
|
|
|
+ classRoomHelper,
|
|
|
+ scoreZong
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
@@ -12311,6 +12420,9 @@ export default {
|
|
|
listdata:[],
|
|
|
isScoreList:[],
|
|
|
},
|
|
|
+ classRoomHelperWidth: '85px',
|
|
|
+ orgArray:['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9','0fec3a8a-ad04-11ed-b13d-005056b86db5'],
|
|
|
+ oidArray:['f297fbdc-f0a0-11ee-b534-005056b86db5','45facc0a-1211-11ec-80ad-005056b86db5']
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
@@ -14383,6 +14495,7 @@ export default {
|
|
|
var commentCount = 0;
|
|
|
var isLikes = false;
|
|
|
var commentJson = [];
|
|
|
+ var likeJson = [];
|
|
|
var data = b[j];
|
|
|
if (i == b[j].tool) {
|
|
|
if (data.type == 2 && a[i].tool[0] == 4) {
|
|
@@ -14544,7 +14657,7 @@ export default {
|
|
|
//点赞
|
|
|
if (d[k].workId == b[j].id) {
|
|
|
likesCount++;
|
|
|
-
|
|
|
+ likeJson.push(d[k])
|
|
|
if (d[k].likesId == this.userid) {
|
|
|
isLikes = true;
|
|
|
}
|
|
@@ -14596,6 +14709,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 1,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14603,6 +14717,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14649,6 +14764,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 3,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14656,6 +14772,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14694,6 +14811,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 4,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14701,6 +14819,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_works);
|
|
|
_worksStudent2[i].push(_works);
|
|
@@ -14716,6 +14835,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 5,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14723,6 +14843,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -14738,6 +14859,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 12,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14745,6 +14867,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14783,6 +14906,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 0,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14790,6 +14914,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14828,6 +14953,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 0,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14835,6 +14961,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14874,6 +15001,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 2,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14881,6 +15009,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14916,6 +15045,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 2,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14923,6 +15053,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -14936,6 +15067,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 8,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14943,6 +15075,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -14956,6 +15089,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 9,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14963,6 +15097,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -14976,6 +15111,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 10,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -14983,6 +15119,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -14996,6 +15133,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 13,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -15003,6 +15141,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15016,6 +15155,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 16,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -15024,7 +15164,8 @@ export default {
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
aiCode: b[j].aiCode,
|
|
|
- teacherCode: b[j].teacherCode
|
|
|
+ teacherCode: b[j].teacherCode,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15038,6 +15179,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 17,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -15045,6 +15187,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15058,6 +15201,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
type: 14,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -15065,6 +15209,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15083,6 +15228,7 @@ export default {
|
|
|
works: _gindex.url,
|
|
|
sName: b[j].name,
|
|
|
type: _gindex.type,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -15090,6 +15236,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i][_gindex.groupIndex].push(_work);
|
|
|
_worksStudent2[i][_gindex.groupIndex].push(_work);
|
|
@@ -15103,6 +15250,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name ? b[j].name : b[j].userid,
|
|
|
type: b[j].type == 1 ? 0 : b[j].type == 4 ? 1 : 3,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -15110,6 +15258,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15122,6 +15271,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name ? b[j].name : b[j].userid,
|
|
|
type: 12,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -15129,6 +15279,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15145,6 +15296,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name ? b[j].name : b[j].userid,
|
|
|
type: 12,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -15152,6 +15304,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15168,6 +15321,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name ? b[j].name : b[j].userid,
|
|
|
type: 15,
|
|
|
+ ttype:b[j].ttype,
|
|
|
time: b[j].time,
|
|
|
score: b[j].score,
|
|
|
img: b[j].img,
|
|
@@ -15175,6 +15329,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -18923,7 +19078,7 @@ export default {
|
|
|
// document.getElementsByClassName("vedioList")[0].style.height = a + "px";
|
|
|
if (this.showType == 2 || this.showType == 3) {
|
|
|
document.getElementsByClassName("navBox")[0].style.height =
|
|
|
- a - 40 + 46 + "px";
|
|
|
+ a - 40 + 0+ "px";
|
|
|
} else {
|
|
|
document.getElementsByClassName("navBox")[0].style.height =
|
|
|
a - 40 + "px";
|
|
@@ -19823,7 +19978,10 @@ export default {
|
|
|
.catch((err) => {
|
|
|
console.error(err);
|
|
|
});
|
|
|
- }
|
|
|
+ },
|
|
|
+ setClassRoomHelperWidth(width){
|
|
|
+ this.classRoomHelperWidth = width
|
|
|
+ }
|
|
|
},
|
|
|
directives: {
|
|
|
// 使用局部注册指令的方式
|
|
@@ -19882,6 +20040,26 @@ export default {
|
|
|
: "";
|
|
|
};
|
|
|
},
|
|
|
+ MarkdownT() {
|
|
|
+ return function (c) {
|
|
|
+ let md = new MarkdownIt();
|
|
|
+ return c
|
|
|
+ ? md.render(c) : "";
|
|
|
+ };
|
|
|
+ },
|
|
|
+ commentRight(){
|
|
|
+ if(!this.orgArray.includes(this.org) && !this.oidArray.includes(this.oid)){
|
|
|
+ return "35px";
|
|
|
+ }
|
|
|
+ return `calc(${this.classRoomHelperWidth} + 5px)`
|
|
|
+ // if(this.$refs["classRoomHelperRef"].type==0){
|
|
|
+ // return "100px";
|
|
|
+ // }else if(this.$refs["classRoomHelperRef"].type==1){
|
|
|
+ // return "502px"
|
|
|
+ // }else{
|
|
|
+ // return "0px"
|
|
|
+ // }
|
|
|
+ },
|
|
|
checkUpload() {
|
|
|
return function () {
|
|
|
var studentK = [];
|
|
@@ -20013,7 +20191,7 @@ export default {
|
|
|
// document.getElementsByClassName("vedioList")[0].style.height = a + "px";
|
|
|
if (this.showType == 2 || this.showType == 3) {
|
|
|
document.getElementsByClassName("navBox")[0].style.height =
|
|
|
- a - 40 + 46 + "px";
|
|
|
+ a - 40 + 0+ "px";
|
|
|
} else {
|
|
|
document.getElementsByClassName("navBox")[0].style.height =
|
|
|
a - 40 + "px";
|
|
@@ -21762,6 +21940,14 @@ export default {
|
|
|
border: 1px solid #0061ff;
|
|
|
}
|
|
|
|
|
|
+.noWorksName > span{
|
|
|
+ max-width: 100%;
|
|
|
+ display: block;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ white-space: nowrap;
|
|
|
+}
|
|
|
+
|
|
|
.isWorksName2 {
|
|
|
width: 100px;
|
|
|
height: 40px;
|
|
@@ -22684,7 +22870,7 @@ export default {
|
|
|
.pzTop2 .checkbox {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
- padding: 5px 30px;
|
|
|
+ padding: 5px 10px;
|
|
|
flex: 0 0 auto;
|
|
|
font-weight: bold;
|
|
|
border-bottom: 1px solid #eee;
|
|
@@ -23061,6 +23247,8 @@ ol {
|
|
|
/* -webkit-user-modify: read-write; */
|
|
|
overflow-wrap: break-word;
|
|
|
-webkit-line-break: after-white-space;
|
|
|
+ word-break: break-word;
|
|
|
+ white-space: pre-line;
|
|
|
}
|
|
|
|
|
|
.scoreBox,
|