Merge branch 'feature/jq_1' into 'develop'

Feature/jq 1

See merge request !206

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

@@ -280,12 +280,13 @@
                 };
               }
             );
-            // this.getWidth = this.$refs.agmentSelect.scrollWidth + 'px';
-            // this.getWidth = 3000 + 'px';
-            this.calendarOptions.events = [].concat(
-              dutyRosterPreList,
-              dutyWorkList
-            );
+            if (res.data) {
+              this.calendarOptions.events = [].concat(
+                dutyRosterPreList,
+                dutyWorkList
+              );
+            }
+
             const calendarApi = this.$refs.fullCalendar.getApi();
             this.getWidth = `${
               (this.calendarOptions.resources.length + 1) * 150