Merge branch 'feature/jq' into 'develop'

Feature/jq

See merge request !167

src/views/IM/diagnosis-admin/modal/newScheduling.vue

@@ -8,12 +8,16 @@
       justifycontent: space-between;
     "
   >
-    <div class="agment-box">
+    <div 
+      ref="agment" 
+      class="agment-box"
+    >
       <FullCalendar :options="calendarOptions" />
     </div>
     <div
       v-if="this.schedulingType != 3"
       class="agment-box-left"
+      :style="{height: scrollerHeight}"
     >
       <div class="ag-left-change">
         <div
@@ -182,6 +186,7 @@
           eventClick: this.handleEventClick,
         },
         workingTicketVisible: false, // 工作表票详情页面
+        scrollerHeight:0
       };
     },
     watch: {
@@ -194,6 +199,8 @@
       },
     },
     mounted() {
+      this.scrollerHeight = this.$refs.agment.clientHeight + 'px';
+      // console.log(this.$refs.agment.clientHeight, 'this.$refs.agment.offsetHeight;');
       this.init();
     },
     methods: {