提交 92288f2d 编写于 作者: qian.jie's avatar qian.jie

Merge branch 'feature/jq_1' into 'develop'

Feature/jq 1

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!206
...@@ -280,12 +280,13 @@ ...@@ -280,12 +280,13 @@
}; };
} }
); );
// this.getWidth = this.$refs.agmentSelect.scrollWidth + 'px'; if (res.data) {
// this.getWidth = 3000 + 'px'; this.calendarOptions.events = [].concat(
this.calendarOptions.events = [].concat( dutyRosterPreList,
dutyRosterPreList, dutyWorkList
dutyWorkList );
); }
const calendarApi = this.$refs.fullCalendar.getApi(); const calendarApi = this.$refs.fullCalendar.getApi();
this.getWidth = `${ this.getWidth = `${
(this.calendarOptions.resources.length + 1) * 150 (this.calendarOptions.resources.length + 1) * 150
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册