Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mt-education-mobile
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王旭
mt-education-mobile
Commits
d55dcd92
Commit
d55dcd92
authored
Apr 27, 2020
by
yun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
回复试验
parent
68a26e74
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
168 additions
and
147 deletions
+168
-147
Coursediscuss.vue
src/components/CourseDiscuss/Coursediscuss.vue
+1
-1
DiscusssingleReply.vue
src/components/CourseDiscuss/DiscusssingleReply.vue
+1
-1
index.vue
src/views/TrainDetail/index.vue
+165
-145
index.vue
src/views/addTrain/index.vue
+1
-0
No files found.
src/components/CourseDiscuss/Coursediscuss.vue
View file @
d55dcd92
...
...
@@ -159,7 +159,7 @@ export default {
this
.
removeDiscuss
(
this
.
optionIndex
)
}
else
{
this
.
optionShow
=
false
//
document.getElementById('discussInput').focus()
document
.
getElementById
(
'discussInput'
).
focus
()
setTimeout
(()
=>
{
this
.
ReplyShow
(
this
.
optionIndex
,
this
.
currentDiscuss
.
studentName
)
},
500
)
...
...
src/components/CourseDiscuss/DiscusssingleReply.vue
View file @
d55dcd92
...
...
@@ -95,7 +95,7 @@ export default {
this
.
optionShow
=
false
this
.
removeThisRepply
()
}
else
if
(
item
.
name
===
'回复'
)
{
//
document.getElementById('discussInput').focus()
document
.
getElementById
(
'discussInput'
).
focus
()
this
.
optionShow
=
false
setTimeout
(()
=>
{
this
.
sendReplyEmit
()
...
...
src/views/TrainDetail/index.vue
View file @
d55dcd92
...
...
@@ -71,24 +71,27 @@
style=
"z-index: 2"
>
<div
style=
"width: 54%;display: flex;justify-content: space-between;height: 100%"
>
<li
v-for=
"(item, key) in tags"
:key=
"key"
:class=
"{select: currentTag == item}"
@
click=
"tagClick(item)"
>
<!-- {{ item ==='评论' ? item +'(' + (discussLen > 999 ? '999+' : discussLen) + ')': item }} -->
<div
style=
"height: 100%;position: relative;white-space: nowrap"
>
{{item}}
<span
v-if=
"item === '评论'"
class=
"count"
>
{{ item ==='评论' ? (discussLen === 0 ? '' : (discussLen > 999 ? '999+' : discussLen)) : '' }}
</span>
<div
v-show=
"currentTag === item"
class=
"bottom_line"
></div>
</div>
</li>
<li
v-for=
"(item, key) in tags"
:key=
"key"
:class=
"{select: currentTag == item}"
@
click=
"tagClick(item)"
>
<!-- {{ item ==='评论' ? item +'(' + (discussLen > 999 ? '999+' : discussLen) + ')': item }} -->
<div
style=
"height: 100%;position: relative;white-space: nowrap"
>
{{ item }}
<span
v-if=
"item === '评论'"
class=
"count"
>
{{ item ==='评论' ? (discussLen === 0 ? '' : (discussLen > 999 ? '999+' : discussLen)) : '' }}
</span>
<div
v-show=
"currentTag === item"
class=
"bottom_line"
/>
</div>
</li>
</div>
</ul>
</div>
...
...
@@ -104,7 +107,10 @@
<p
class=
"title"
>
培训介绍
</p>
<div
class=
"attr"
style=
"color: #333333;"
>
<div
class=
"attr"
style=
"color: #333333;"
>
{{ (!courseInfo.courseDescription || courseInfo.courseDescription === '' || courseInfo.courseDescription === undefined) ? '-暂无内容-' : courseInfo.courseDescription }}
</div>
<div
class=
"attr"
>
...
...
@@ -123,7 +129,7 @@
:key=
"key"
class=
"item_left"
>
<span
style=
"font-size: 12px;text-align: center;position: relative;top: -1px;"
>
{{
key===0?'':'|'
}}
</span>
{{ item.lname }}
<span
style=
"font-size: 12px;text-align: center;position: relative;top: -1px;"
>
{{
key===0?'':'|'
}}
</span>
{{ item.lname }}
</em>
</div>
</div>
...
...
@@ -196,12 +202,18 @@
class=
"person"
v-if=
"currentTag == tags[1]"
>
<div
class=
"panel"
:style=
"{'padding-bottom': learnAllCount==0?'15px': '0px'}"
>
<div
class=
"panel"
:style=
"{'padding-bottom': learnAllCount==0?'15px': '0px'}"
>
<p
class=
"title"
>
已报名
<span
class=
"num"
>
{{ learnAllCount }}人
</span>
</p>
<div
class=
"person-detail"
v-show=
"enrolment.length!=0"
>
<div
class=
"person-detail"
v-show=
"enrolment.length!=0"
>
<div
class=
"person-head"
:isTagCoverEnrolment=
"isTagCoverEnrolment"
...
...
@@ -209,21 +221,21 @@
v-for=
"(pic,index) in enrolment"
>
<div
class=
"head-item"
>
<van-image
round
class=
"headStyle"
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
<van-image
round
class=
"headStyle"
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
</div>
</div>
<div
...
...
@@ -242,13 +254,13 @@
v-if=
"isTagCoverEnrolment === false"
name=
"ellipsis"
/>
<!-- <span v-if="isTagCoverEnrolment === false" class="three_porint">...</span>-->
<!-- <van-icon-->
<!-- style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"-->
<!-- v-if="isTagCoverEnrolment === true"-->
<!-- name="arrow-up"-->
<!-- />-->
<!-- <van-icon
<!-- <span v-if="isTagCoverEnrolment === false" class="three_porint">...</span>-->
<!-- <van-icon-->
<!-- style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"-->
<!-- v-if="isTagCoverEnrolment === true"-->
<!-- name="arrow-up"-->
<!-- />-->
<!-- <van-icon
style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"
v-if="isTagCoverEnrolment === false"
name="arrow-down"
...
...
@@ -262,21 +274,21 @@
v-for=
"pic in enrolment2"
>
<div
class=
"head-item"
>
<van-image
round
class=
"headStyle"
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
<van-image
round
class=
"headStyle"
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
</div>
</div>
<div
...
...
@@ -290,18 +302,18 @@
style=
"width:12vw;height:12vw;margin-top: 1.19vw;margin-left: 2vw;border-radius: 30px 30px 30px 30px;border: white;position: relative;background-color: #f3f3f3"
>
<van-icon
style=
"-webkit-appearance:none;position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)"
v-if=
"isTagCoverEnrolment === true"
name=
"arrow-up"
/>
style=
"-webkit-appearance:none;position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)"
v-if=
"isTagCoverEnrolment === true"
name=
"arrow-up"
/>
<!--<van-icon
style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"
v-if="isTagCoverEnrolment === false"
name="arrow-down"
/>-->
<!-- <span class="three_porint">...</span>-->
<!-- <span class="three_porint">...</span>-->
</button>
<!-- <span
<!-- <span
style="font-size: 14px;font-weight: bold;margin-left: 8px;"
class="name"
v-if="optShowEnrolment"
...
...
@@ -309,12 +321,18 @@
</div>
</div>
</div>
<div
class=
"panel bottom"
:style=
"{'padding-bottom': finishCount==0?'15px': '0px'}"
>
<div
class=
"panel bottom"
:style=
"{'padding-bottom': finishCount==0?'15px': '0px'}"
>
<p
class=
"title"
>
已到场
<span
class=
"num"
>
{{ finishCount }}人
</span>
</p>
<div
class=
"person-detail"
v-show=
"arrived.length!=0"
>
<div
class=
"person-detail"
v-show=
"arrived.length!=0"
>
<div
class=
"person-head"
:isTagCoverArrived=
"isTagCoverArrived"
...
...
@@ -322,23 +340,23 @@
v-for=
"(pic,index) in arrived"
>
<div
class=
"head-item"
>
<van-image
class=
"headStyle"
round
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
<van-image
class=
"headStyle"
round
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
</div>
</div>
<div
v-show=
"isTagCoverArrived === false"
style=
"position: relative"
...
...
@@ -349,11 +367,11 @@
@
click=
"isTagCoverArrived = !isTagCoverArrived"
style=
"width:12vw;height:12vw;margin-top: 1.19vw;margin-left: 2vw;border-radius: 30px 30px 30px 30px;border: white;position: relative;background-color: #f3f3f3"
>
<!-- <van-icon-->
<!-- style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"-->
<!-- v-if="isTagCoverArrived === true"-->
<!-- name="arrow-up"-->
<!-- />-->
<!-- <van-icon-->
<!-- style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"-->
<!-- v-if="isTagCoverArrived === true"-->
<!-- name="arrow-up"-->
<!-- />-->
<!--<van-icon
style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"
v-if="isTagCoverArrived === false"
...
...
@@ -364,10 +382,9 @@
v-if=
"isTagCoverArrived === false"
name=
"ellipsis"
/>
<!-- <span v-if="isTagCoverArrived === false" class="three_porint">...</span>-->
<!-- <span v-if="isTagCoverArrived === false" class="three_porint">...</span>-->
</button>
<!-- <span
<!-- <span
style="font-size: 14px;font-weight: bold;margin-left: 8px;"
class="name"
v-if="optShowArrived"
...
...
@@ -380,23 +397,23 @@
v-for=
"pic in arrived2"
>
<div
class=
"head-item"
>
<van-image
round
class=
"headStyle"
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
<van-image
round
class=
"headStyle"
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
</div>
</div>
<div
v-if=
"isTagCoverArrived === true"
style=
"position: relative"
...
...
@@ -417,8 +434,7 @@
v-if="isTagCoverArrived === false"
name="arrow-down"
/>-->
<!-- <span class="three_porint">...</span>-->
<!-- <span class="three_porint">...</span>-->
</button>
<!--<span
style="font-size: 14px;font-weight: bold;margin-left: 8px;"
...
...
@@ -428,12 +444,18 @@
</div>
</div>
</div>
<div
class=
"panel bottom"
:style=
"{'padding-bottom': notFinishCount==0?'15px': '0px'}"
>
<div
class=
"panel bottom"
:style=
"{'padding-bottom': notFinishCount==0?'15px': '0px'}"
>
<p
class=
"title"
>
未到场
<span
class=
"num"
>
{{ notFinishCount }}人
</span>
</p>
<div
class=
"person-detail"
v-show=
"absent.length!=0"
>
<div
class=
"person-detail"
v-show=
"absent.length!=0"
>
<div
class=
"person-head"
:isTagCoverAbsent=
"isTagCoverAbsent"
...
...
@@ -441,21 +463,21 @@
v-for=
"(pic,index) in absent"
>
<div
class=
"head-item"
>
<van-image
round
class=
"headStyle"
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
<van-image
round
class=
"headStyle"
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
</div>
</div>
<div
...
...
@@ -468,7 +490,7 @@
@
click=
"isTagCoverAbsent = !isTagCoverAbsent"
style=
"width:12vw;height:12vw;margin-top: 1.19vw;margin-left: 2vw;border-radius: 30px 30px 30px 30px;border: white;position: relative;background-color: #f3f3f3;-webkit-appearance:none"
>
<!-- <van-icon
<!-- <van-icon
style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"
v-if="isTagCoverAbsent === true"
name="arrow-up"
...
...
@@ -483,8 +505,7 @@
v-if=
"isTagCoverAbsent === false"
name=
"ellipsis"
/>
<!-- <span v-if="isTagCoverAbsent === false" class="three_porint">...</span>-->
<!-- <span v-if="isTagCoverAbsent === false" class="three_porint">...</span>-->
</button>
<!--<span
style="font-size: 14px;font-weight: bold;margin-left: 8px;"
...
...
@@ -499,21 +520,21 @@
v-for=
"pic in absent2"
>
<div
class=
"head-item"
>
<van-image
round
class=
"headStyle"
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
<van-image
round
class=
"headStyle"
:src=
"pic.headPic"
/>
<div
class=
"content"
>
<div
:class=
"['course-type', pic.isAppoint=== '1'? '': 'blue-font-button']"
>
{{ pic.isAppoint == 1? '必修' : '选修' }}
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
<span
class=
"name"
>
{{ pic.personName | dealWithLength(3) }}
</span>
</div>
</div>
</div>
<div
...
...
@@ -526,7 +547,7 @@
@
click=
"isTagCoverAbsent = !isTagCoverAbsent"
style=
"width:12vw;height:12vw;margin-top: 1.19vw;margin-left: 2vw;border-radius: 30px 30px 30px 30px;border: white;position: relative;background-color: #f3f3f3;-webkit-appearance:none"
>
<van-icon
<van-icon
style=
"position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"
v-if=
"isTagCoverAbsent === true"
name=
"arrow-up"
...
...
@@ -536,8 +557,7 @@
v-if="isTagCoverAbsent === false"
name="arrow-down"
/>-->
<!-- <span class="three_porint">...</span>-->
<!-- <span class="three_porint">...</span>-->
</button>
<!--<span
style="font-size: 14px;font-weight: bold;margin-left: 8px;"
...
...
@@ -641,7 +661,7 @@
:start-page=
"1"
@
loaded=
"onPdfLoaded"
v-if=
"previewType === 'pdf'"
:show
Page =
"100"
:show
-page=
"100"
:pdf-src=
"priviewPicture"
:show-loading=
"false"
/>
...
...
@@ -661,7 +681,7 @@
@
blur=
"nextTime"
style=
"position: fixed;width: 1px;height: 1px;z-index: -1;"
v-if=
"currentTag == tags[2]"
/
>
>
<div
v-if=
"currentTag == tags[2]"
class=
"inputPL"
...
...
@@ -1138,18 +1158,18 @@ export default {
},
// 回复点击
textareaHeightBiggerRe(type, replyName) {
const input = document.getElementById('discussInput'),
focusBtn = document.getElementById('btnFocus2')
/*
const input = document.getElementById('discussInput'),
focusBtn = document.getElementById('btnFocus2')
*/
if (this.saveReplyName !== replyName) {
this.commentContent = ''
this.saveReplyName = replyName
}
this.discussType = type
this.discussPlaceHloder = '回复@' + replyName
focusBtn.addEventListener('click', function() {
/*
focusBtn.addEventListener('click', function() {
input.focus()
})
focusBtn.click()
focusBtn.click()
*/
},
textareaHeightSmaller() {
if (this.commentContent.trim() === '') {
...
...
src/views/addTrain/index.vue
View file @
d55dcd92
...
...
@@ -1619,6 +1619,7 @@ export default {
}
.cancel{
margin-top: 8px;
border-bottom: 0px solid #e7e7e7;
}
}
*::-webkit-scrollbar{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment