Merge branch 'feature/jq_1' into 'develop'

Feature/jq 1

See merge request !203

src/views/IM/diagnosis-admin/modal/index.scss

@@ -117,6 +117,7 @@
 }
 .show-work-set {
   margin-top: 100px;
+  padding: 10px;
 }
 .agment-left-con {
   padding: 15px;
@@ -312,7 +313,7 @@
 }
 @media screen and (min-width: 1000px) and (max-width: 1300px) {
   /deep/.fc-header-toolbar {
-    right: 6%;
+    right: 3%;
   }
   .ag-left1 {
     width: 12% !important;

src/views/IM/diagnosis-admin/overviewScheduling.vue

@@ -129,7 +129,7 @@
           ],
           // timeZone: 'UTC',
           locale: 'zh-cn',
-          aspectRatio: 4.5, // 设置日历单元格宽度与高度的比例。
+          aspectRatio: 3, // 设置日历单元格宽度与高度的比例。
           schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
           initialView: 'resourceTimeGridDay',
           resources: [],
@@ -151,6 +151,7 @@
             meridiem: 'short',
             hour12: false, // 设置时间为24小时
           },
+          expandRows: true,
         },
         workingTicketVisible: false, // 工作表票详情页面
         scrollerHeight: 0,
@@ -268,7 +269,8 @@
                 };
               }
             );
-            const dutyWorkList = (res.data.dutyWorkList || []).map((item, index) => {
+            const dutyWorkList = (res.data.dutyWorkList || []).map(
+              (item, index) => {
                 return {
                   id: index,
                   resourceId: item.doctorId,
@@ -276,7 +278,8 @@
                   start: item.startTime,
                   color: '#E7F4F5',
                 };
-            });
+              }
+            );
             // this.getWidth = this.$refs.agmentSelect.scrollWidth + 'px';
             // this.getWidth = 3000 + 'px';
             this.calendarOptions.events = [].concat(