提交 1f8c1b9c 编写于 作者: qian.jie's avatar qian.jie

新页面添加显示滚动条显示

上级 222099db
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
filterable filterable
clearable clearable
:options="interfaceOptions" :options="interfaceOptions"
:props="props" :props="props"
placeholder="选择科室" placeholder="选择科室"
:show-all-levels="false" :show-all-levels="false"
@expand-change="handleItemChange" @expand-change="handleItemChange"
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<el-date-picker <el-date-picker
v-model="dateTime" v-model="dateTime"
class="serviceSchedule_dateTime" class="serviceSchedule_dateTime"
type="datetime" type="date"
value-format="yyyy-MM-dd HH:mm:dd" value-format="yyyy-MM-dd"
placeholder="选择日期时间" placeholder="选择日期时间"
@change="getNowDate" @change="getNowDate"
/> />
...@@ -40,13 +40,19 @@ ...@@ -40,13 +40,19 @@
</el-button> </el-button>
</div> </div>
<div <div
class="fullCalendar-show" class="fullCalendar-show"
style="width:100%"
> >
<FullCalendar <div
ref="fullCalendar" class="fullCalendar-show-out"
:options="calendarOptions" :style="{width:getWidth}"
class="FullCalendar" >
/> <FullCalendar
ref="fullCalendar"
:options="calendarOptions"
class="FullCalendar"
/>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -102,6 +108,8 @@ ...@@ -102,6 +108,8 @@
eventColor: '#fff', eventColor: '#fff',
eventBackgroundColor: '#fff', eventBackgroundColor: '#fff',
events: [], events: [],
slotMinWidth:50,
resourceAreaWidth:'5%',
allDaySlot: false, // 周,日视图时,all-day 不显示 allDaySlot: false, // 周,日视图时,all-day 不显示
slotDuration: '00:05:00', slotDuration: '00:05:00',
slotMinTime: '09:00', slotMinTime: '09:00',
...@@ -121,6 +129,7 @@ ...@@ -121,6 +129,7 @@
loading: false, loading: false,
doctorList: [], doctorList: [],
index: 0, index: 0,
getWidth:'100%'
}; };
}, },
watch: {}, watch: {},
...@@ -216,6 +225,7 @@ ...@@ -216,6 +225,7 @@
}; };
} }
); );
this.getWidth = 3000 + 'px';
this.calendarOptions.events = [].concat(dutyRosterPreList, dutyWorkList); this.calendarOptions.events = [].concat(dutyRosterPreList, dutyWorkList);
const calendarApi = this.$refs.fullCalendar.getApi(); const calendarApi = this.$refs.fullCalendar.getApi();
calendarApi.gotoDate(this.dateTime); calendarApi.gotoDate(this.dateTime);
...@@ -235,11 +245,13 @@ ...@@ -235,11 +245,13 @@
width: 100%; width: 100%;
} }
.agment-box { .agment-box {
height: 100%; // height: 100%;
padding: 0 25px 25px 25px; padding: 0 25px 25px 25px;
border-radius: 6px; border-radius: 6px;
flex: 3.8; flex: 3.8;
width: 100%; width: 100%;
max-height: 1000px;
overflow: hidden;
.serviceSchedule_select { .serviceSchedule_select {
width: 100%; width: 100%;
background: #fff; background: #fff;
...@@ -247,7 +259,7 @@ ...@@ -247,7 +259,7 @@
align-items: center; align-items: center;
padding: 20px 0 0px 20px; padding: 20px 0 0px 20px;
.serviceSchedule-cascader { .serviceSchedule-cascader {
height: 100%; // height: 100%;
background: #fff; background: #fff;
margin-right: 15px; margin-right: 15px;
} }
...@@ -262,9 +274,12 @@ ...@@ -262,9 +274,12 @@
align-items: center; align-items: center;
} }
} }
.fullCalendar-show{ .fullCalendar-show{
// max-width: 300px !important; width: 100%;
overflow-x:scroll; overflow: scroll;
// /deep/ .fc-resource{
// width: 100% !important;
// }
} }
.FullCalendar { .FullCalendar {
background: #fff; background: #fff;
...@@ -279,10 +294,17 @@ ...@@ -279,10 +294,17 @@
display: flex; display: flex;
} }
} }
} // /deep/.fc-col-header-cell{
/deep/ .fc-col-header-cell{ // width: 100px !important;
max-width: 80px !important; // }
} // /deep/.fc-timegrid-col{
// width: 100px !important;
// }
// /deep/.fc-timegrid-col-frame{
// width: 100px !important;
// }
}
.w2 { .w2 {
/deep/.fc-prev-button { /deep/.fc-prev-button {
background: #f4f4f5; background: #f4f4f5;
...@@ -291,6 +313,7 @@ ...@@ -291,6 +313,7 @@
} }
} }
/deep/ .fc-timegrid-col-frame{ /deep/ .fc-timegrid-col-frame{
// width: 100px !important;
background: #fff !important; background: #fff !important;
} }
.w3 { .w3 {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册