|
@@ -227,7 +227,7 @@
|
|
|
<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">
|
|
|
+ <div class="courseIndex" :style="{width: orgArray.includes(org) ? '100%' : 'calc(100% - 745px)'}">
|
|
|
<div>任务{{ taskCount + 1 }}</div>
|
|
|
<el-tooltip
|
|
|
effect="light"
|
|
@@ -1880,7 +1880,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>
|
|
@@ -2998,7 +3000,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>
|
|
@@ -3098,7 +3102,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>
|
|
@@ -3306,7 +3312,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>
|
|
@@ -3474,7 +3482,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>
|
|
@@ -3722,7 +3732,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>
|
|
@@ -3908,7 +3920,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>
|
|
@@ -4075,7 +4089,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>
|
|
@@ -4181,7 +4197,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>
|
|
@@ -4477,7 +4495,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>
|
|
@@ -4759,7 +4779,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>
|
|
@@ -5041,7 +5063,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>
|
|
@@ -5322,7 +5346,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>
|
|
@@ -5604,7 +5630,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>
|
|
@@ -5711,7 +5739,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>
|
|
@@ -5843,7 +5873,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>
|
|
@@ -6015,7 +6047,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>
|
|
@@ -6248,7 +6282,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>
|
|
@@ -6406,7 +6442,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>
|
|
@@ -6635,7 +6673,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>
|
|
@@ -8041,7 +8081,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
|
|
|
- <classRoomHelper :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(
|
|
|
+ <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=' +
|
|
@@ -12345,8 +12385,8 @@ export default {
|
|
|
isScoreList:[],
|
|
|
},
|
|
|
classRoomHelperWidth: '85px',
|
|
|
- orgArray:['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9'],
|
|
|
- oidArray:['f297fbdc-f0a0-11ee-b534-005056b86db5']
|
|
|
+ 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,17 +14423,17 @@ export default {
|
|
|
f[g].ttype == 2 &&
|
|
|
this.tcid &&
|
|
|
this.arrayToArray(
|
|
|
- f[g].classid.split(","),
|
|
|
+ (f[g].classid ? f[g].classid.split(",") : []),
|
|
|
this.tcid.split(",")
|
|
|
).length == 0
|
|
|
) {
|
|
|
continue;
|
|
|
}
|
|
|
if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
|
|
|
- f[g].classid.split(","),
|
|
|
+ (f[g].classid ? f[g].classid.split(",") : []),
|
|
|
this.tcid.split(",")
|
|
|
).length !== 0 || this.arrayToArray(
|
|
|
- f[g].classid.split(","),
|
|
|
+ (f[g].classid ? f[g].classid.split(",") : []),
|
|
|
this.classId ? this.classId.split(",") : []
|
|
|
).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
|
|
|
this.groupStudent[i][gA].push(f[g]);
|
|
@@ -14416,6 +14456,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) {
|
|
@@ -14577,7 +14618,7 @@ export default {
|
|
|
//点赞
|
|
|
if (d[k].workId == b[j].id) {
|
|
|
likesCount++;
|
|
|
-
|
|
|
+ likeJson.push(d[k])
|
|
|
if (d[k].likesId == this.userid) {
|
|
|
isLikes = true;
|
|
|
}
|
|
@@ -14629,6 +14670,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,
|
|
@@ -14636,6 +14678,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14682,6 +14725,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,
|
|
@@ -14689,6 +14733,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14727,6 +14772,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,
|
|
@@ -14734,6 +14780,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_works);
|
|
|
_worksStudent2[i].push(_works);
|
|
@@ -14749,6 +14796,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,
|
|
@@ -14756,6 +14804,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -14771,6 +14820,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,
|
|
@@ -14778,6 +14828,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14816,6 +14867,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,
|
|
@@ -14823,6 +14875,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14861,6 +14914,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,
|
|
@@ -14868,6 +14922,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14907,6 +14962,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,
|
|
@@ -14914,6 +14970,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
if (this.isGroup) {
|
|
|
let isGw = 1;
|
|
@@ -14949,6 +15006,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,
|
|
@@ -14956,6 +15014,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -14969,6 +15028,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,
|
|
@@ -14976,6 +15036,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -14989,6 +15050,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,
|
|
@@ -14996,6 +15058,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15009,6 +15072,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,
|
|
@@ -15016,6 +15080,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15029,6 +15094,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,
|
|
@@ -15036,6 +15102,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15049,6 +15116,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,
|
|
@@ -15057,7 +15125,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);
|
|
@@ -15071,6 +15140,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,
|
|
@@ -15078,6 +15148,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15091,6 +15162,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,
|
|
@@ -15098,6 +15170,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15116,6 +15189,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,
|
|
@@ -15123,6 +15197,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i][_gindex.groupIndex].push(_work);
|
|
|
_worksStudent2[i][_gindex.groupIndex].push(_work);
|
|
@@ -15136,6 +15211,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,
|
|
@@ -15143,6 +15219,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15155,6 +15232,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,
|
|
@@ -15162,6 +15240,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15178,6 +15257,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,
|
|
@@ -15185,6 +15265,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -15201,6 +15282,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,
|
|
@@ -15208,6 +15290,7 @@ export default {
|
|
|
commentCount: commentCount,
|
|
|
isLikes: isLikes,
|
|
|
commentJson: commentJson,
|
|
|
+ likeJson:likeJson
|
|
|
};
|
|
|
_worksStudent[i].push(_work);
|
|
|
_worksStudent2[i].push(_work);
|
|
@@ -18946,7 +19029,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";
|
|
@@ -20056,7 +20139,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";
|
|
@@ -21805,6 +21888,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;
|
|
@@ -23102,6 +23193,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,
|