zhaoyingbo/cherry_fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove line

Browse Source
This commit is contained in:
RainSun 2020-09-09 08:02:29 +08:00
parent 832f8adf8b
commit c93b95fbc9
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/views/Schedule/Schedule.vue
View File

@ -56,9 +56,12 @@
v-if="schedule.lesson[show_week-1][d-1][i-1]"
>
<p class="info">
{{schedule.lesson[show_week-1][d-1][i-1].Lesson}}
<span :class="hide_weekend ? '' : 'long'">{{schedule.lesson[show_week-1][d-1][i-1].Lesson}}</span>
<br />
{{schedule.lesson[show_week-1][d-1][i-1].Room.replace(/\[.+\]/, "")}}
<span v-if="hide_weekend">{{schedule.lesson[show_week-1][d-1][i-1].Room}}</span>
<span v-else>{{schedule.lesson[show_week-1][d-1][i-1].Room.replace(/\[.+\]/, "")}}</span>
<br />
<span v-if="hide_weekend">{{schedule.lesson[show_week-1][d-1][i-1].Teacher}}</span>
</p>
</div>
</div>
@ -167,7 +170,7 @@ export default {
week_day: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
// 课程背景颜色
bg_color: [
"e4f5ff",
"E5F4FF",
"defbf7",
"e7e5fa",
"fcebcf",
@ -181,7 +184,7 @@ export default {
],
// 课程文字颜色
font_color: [
"58a2d9",
"00A6F2",
"2bbbbc",
"8379d8",
"e89812",
@ -271,7 +274,6 @@ export default {
this.show_week = lock ? this.current_week : this.show_week;
if(this.user_info.cid == '2020') this.show_week = lock ? 1 : this.show_week;
this.getDays();
this.addAiData();
return;
}
}
@ -466,21 +468,6 @@ export default {
open(url) {
window.open(url);
},
// 为小爱适配
addAiData() {
let row_lesson_info = JSON.stringify(this.row_lesson_info)
let ai = document.getElementById('ai')
if(ai == undefined) {
let div = document.createElement('div')
div.innerHTML = row_lesson_info
div.style.display = "None"
div.id = 'ai'
document.body.appendChild(div)
} else {
ai.innerHTML = row_lesson_info
}
},
},
created() {
this.init(true);
@ -614,7 +601,6 @@ export default {
flex-direction: column;
.lesson-box {
height: 2.8rem;
border: 1px #eee solid;
display: flex;
align-items: center;
justify-content: center;
@ -629,10 +615,23 @@ export default {
align-items: center;
justify-content: center;
overflow: hidden;
padding: 0.05rem;
box-sizing: border-box;
.info {
font-size: 0.3rem;
font-size: 0.25rem;
margin-bottom: 0.1rem;
text-align: center;
span:first-of-type {
font-size: 0.3rem;
line-height: .4rem;
display: inline-block;
max-height: 1.2rem;
text-overflow: ellipsis;
overflow: hidden;
}
.long {
max-height: 1.6rem !important;
}
}
}
}