Skip to content

C
confucius
Commit e18048b1 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 2c368b55
Show whitespace changes
Inline Side-by-side
Showing with 96 additions and 20 deletions
src/pages/classroom/components/classroomNav.vue
View file @ e18048b1
<template> <template>
<div class=""> <div class="">
<q-list style="width:180px;overflow:hidden;background-color: rgb(245, 246, 247);"> <q-list style="width:170px;overflow:hidden;background-color: rgb(245, 246, 247);">
<template v-for="(x,i) in NavData"> <template v-for="(x,i) in NavData">
<q-item to="" clickable v-ripple :active="currentNav==x.key" @click="chooseNav(x)" v-if="x.RoomList.length==0" <q-item to="" clickable v-ripple :active="currentNav==x.key" @click="chooseNav(x)" v-if="x.RoomList.length==0"
:key="i"> :key="i">
......
src/pages/classroom/components/css/comSummary.css
View file @ e18048b1
...@@ -226,12 +226,13 @@ ...@@ -226,12 +226,13 @@
width: 100%; width: 100%;
/* min-height: 500px; */ /* min-height: 500px; */
margin:10px; margin:10px;
overflow: auto; /* overflow: auto; */
} }
.comSummary .summaryTable { .comSummary .summaryTable {
/* width:100%; */ /* width:100%; */
width: 1680px; width: 1680px;
border-radius:4px; border-radius:4px;
height: calc(100vh - 100px);
/* background-color:#E6E6E6; */ /* background-color:#E6E6E6; */
background-color: #F1F6FB; background-color: #F1F6FB;
/* table-layout:fixed;word-break:break-all; */ /* table-layout:fixed;word-break:break-all; */
...@@ -241,7 +242,7 @@ ...@@ -241,7 +242,7 @@
background-color: #fff; background-color: #fff;
} }
.comSummary .summaryTable th { .comSummary .summaryTable th {
width: 210px; /* width: 210px; */
position:relative; position:relative;
} }
.comSummary .summaryTable th:first-child{ .comSummary .summaryTable th:first-child{
......
src/pages/classroom/components/scenicSummary.vue
View file @ e18048b1
<style lang="scss"> <style lang="scss" scoped>
@import "./css/comSummary.css"; @import "./css/comSummary.css";
.td-item{ .td-item{
// min-width: 160px; // min-width: 160px;
width: 200px; width: 195px;
position: relative; position: relative;
margin-left:9px; margin-left:9px;
border-radius: 4px; border-radius: 4px;
...@@ -33,12 +33,62 @@ ...@@ -33,12 +33,62 @@
.td-bg{ .td-bg{
background-color: #F1F6FB; background-color: #F1F6FB;
} }
/deep/.el-timeline{
padding-left: 5px;
}
.tbody{
// width: calc(100% + 10px);
width: 1680px;
padding-right: 10px;
height: calc(100vh - 170px);
overflow-y: scroll;
overflow-x: hidden;
}
.body-td{
position: relative;
}
.tbody::-webkit-scrollbar{
width:10px;
height:10px;
/**/
}
.tbody::-webkit-scrollbar-track{
background: rgb(239, 239, 239);
border-radius:2px;
}
.tbody::-webkit-scrollbar-thumb{
background: #bfbfbf;
border-radius:10px;
}
.tbody::-webkit-scrollbar-thumb:hover{
background: #333;
}
</style> </style>
<template> <template>
<div class="flexOne comSummary"> <div class="flexOne comSummary">
<div class="mainSummary"> <div class="mainSummary">
<!-- <table>
<colgroup>
<col style="width: 80px;" />
<col />
</colgroup>
<thead>
<tr><th>序号</th><th>内容</th></tr>
</thead>
</table> -->
<table class="summaryTable" cellspacing="0"> <table class="summaryTable" cellspacing="0">
<colgroup>
<col width='105px'/>
<col width='10px'/>
<col width='200px'/>
<col width='200px'/>
<col width='200px'/>
<col width='200px'/>
<col width='200px'/>
<col width='200px'/>
<col width='200px'/>
<col width='10px'/>
</colgroup>
<thead> <thead>
<th class=""> <th class="">
<div class="leftDay"> <div class="leftDay">
...@@ -52,6 +102,7 @@ ...@@ -52,6 +102,7 @@
<span class="monthNum">{{nowMonth}}</span> <span class="monthNum">{{nowMonth}}</span>
<!-- <span class="monthLis">{{$t('pub.month')}}</span> --> <!-- <span class="monthLis">{{$t('pub.month')}}</span> -->
</div> </div>
</th> </th>
<th style="width:10px"> <th style="width:10px">
<div class="Arrow" @click="leftClick()"> <div class="Arrow" @click="leftClick()">
...@@ -75,9 +126,23 @@ ...@@ -75,9 +126,23 @@
</div> </div>
</th> </th>
</thead> </thead>
</table>
<div class="tbody summaryTable">
<colgroup>
<col width='140px'/>
<col width='215px'/>
<col width='215px'/>
<col width='215px'/>
<col width='215px'/>
<col width='215px'/>
<col width='215px'/>
<col width='215px'/>
<col width='40px'/>
</colgroup>
<tbody> <tbody>
<tr> <tr>
<td style="width:50px;text-align:center;padding-top:8px;" :colspan='2'> <td style="width:50px;text-align:center;padding-top:8px; width:140px">
<el-timeline :reverse="reverse"> <el-timeline :reverse="reverse">
<el-timeline-item <el-timeline-item
v-for="(activity, index) in activities" v-for="(activity, index) in activities"
...@@ -88,7 +153,7 @@ ...@@ -88,7 +153,7 @@
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
</td> </td>
<td v-for="(item,index) in tbodayData" :class="{'td-bg':index%2==0}" > <td v-for="(item,index) in tbodayData" class="body-td" :class="{'td-bg':index%2==0}" >
<div v-for="(_item,_index) in item.InfoList" class="absolute" :style="{'top':_item.offSetTop+'px','z-index':_index}"> <div v-for="(_item,_index) in item.InfoList" class="absolute" :style="{'top':_item.offSetTop+'px','z-index':_index}">
<div class="td-item" v-if="_item.Type===0" @click="goCourseInfo(_item)" :style="{'height':_item.height}"> <div class="td-item" v-if="_item.Type===0" @click="goCourseInfo(_item)" :style="{'height':_item.height}">
<img src="../../../assets/images/classroom/useing.png" alt="" class="ClassStatus" v-if="_item.ClassStatus===1"> <img src="../../../assets/images/classroom/useing.png" alt="" class="ClassStatus" v-if="_item.ClassStatus===1">
...@@ -105,7 +170,7 @@ ...@@ -105,7 +170,7 @@
<td></td> <td></td>
</tr> </tr>
</tbody> </tbody>
</table> </div>
</div> </div>
<UserHistory ref="history" :classroomId="classroomUserId" ></UserHistory> <UserHistory ref="history" :classroomId="classroomUserId" ></UserHistory>
......
src/pages/classroom/useRecord.vue
View file @ e18048b1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="page-body con"> <div class="page-body con">
<div class="left"> <div class="left">
<div class="dateModel col-5 q-mb-sm cursor-pointer shadow-1"> <div class="dateModel col-5 q-mb-sm cursor-pointer shadow-1">
<div class="q-mb-sm">开始日期:{{dateModel}}</div> <!-- <div class="q-mb-sm">开始日期:{{dateModel}}</div>
<q-btn label="重新选择" color="primary" size="sm" > <q-btn label="重新选择" color="primary" size="sm" >
<q-popup-proxy transition-show="scale" transition-hide="scale"> <q-popup-proxy transition-show="scale" transition-hide="scale">
<q-date now-btn v-model="dateModel" minimal mask="YYYY-MM-DD" @input="dateChoose"> <q-date now-btn v-model="dateModel" minimal mask="YYYY-MM-DD" @input="dateChoose">
...@@ -10,9 +10,17 @@ ...@@ -10,9 +10,17 @@
<q-btn v-close-popup label="关闭" color="primary q-px-md" flat /> <q-btn v-close-popup label="关闭" color="primary q-px-md" flat />
</div> </div>
</q-date> </q-date>
</q-popup-proxy> </q-popup-proxy>
</q-btn> </q-btn> -->
<el-date-picker
v-model="dateModel"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</div> </div>
<ClassroomNav :NavData="navData" :activeNav="msg.RoomId" :activeFaNav="msg.SchoolId" @success="successNav"/> <ClassroomNav :NavData="navData" :activeNav="msg.RoomId" :activeFaNav="msg.SchoolId" @success="successNav"/>
</div> </div>
<div class="right"> <div class="right">
...@@ -38,6 +46,7 @@ ...@@ -38,6 +46,7 @@
}, },
data() { data() {
return { return {
dateModel1:"",
dateModel:"", dateModel:"",
loading: true, loading: true,
schoolId:0, schoolId:0,
...@@ -171,17 +180,18 @@ ...@@ -171,17 +180,18 @@
height: calc( 100vh - 80px); height: calc( 100vh - 80px);
.left{ .left{
width: 200px; width: 170px;
background-color: rgb(245, 246, 247); background-color: rgb(245, 246, 247);
min-height: 100%; min-height: 100%;
} }
.right{ .right{
box-sizing: border-box;
width: calc(100% + 10px); width: calc(100% + 10px);
padding-right: 10px; padding-right: 10px;
// height: calc(100vh - 100px); height: calc(100vh - 100px);
height: 950px; // height: 900px;
overflow: scroll; overflow-x: scroll;
// overflow: hidden; overflow-y: hidden;
} }
} }
.right::-webkit-scrollbar{ .right::-webkit-scrollbar{
...@@ -200,9 +210,9 @@ ...@@ -200,9 +210,9 @@
.right::-webkit-scrollbar-thumb:hover{ .right::-webkit-scrollbar-thumb:hover{
background: #333; background: #333;
} }
.right::-webkit-scrollbar-corner{ // .right::-webkit-scrollbar-corner{
background: #179a16; // background: #179a16;
} // }
.dateModel{ .dateModel{
// height: 50px; // height: 50px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment