a

src/views/haomo/components/calendar/HmFullCalendar.vue

@@ -44,6 +44,7 @@
     box-sizing:border-box;
     width: 280px;
     border:1px solid #ececec;
+    display: inline-block;
   }
   .datebook-root .top-panel{
     padding-top: 10px;
@@ -177,24 +178,25 @@
     background: #2db7f5 ;
   }
   .incident{
-    top: -350px;
-    left:270px;
+    vertical-align: top;
+    width: 300px;
     display:inline-block;
-    position:relative;
     background-color:#202020;
-    width:180px;
-    height:;
-    padding:20px;
+    height:428px;
+    position: relative;
+    overflow: scroll;
+    text-align: center;
+    /*padding:20px;*/
     color:#CCC;
-    text-align:center;
-    font-size:14px;
-    font-family:微软雅黑;
-    border-radius:10px;
-    margin:50px;
-    box-shadow:1px 1px 2px #202020;
-    -o-box-shadow:1px 1px 2px #202020;
-    -moz-box-shadow:1px 1px 2px #202020;
-    -webkit-border-shadow:1px 1px 2px #202020;
+    /*text-align:center;*/
+    /*font-size:14px;*/
+    /*font-family:微软雅黑;*/
+    /*border-radius:10px;*/
+    /*margin:50px;*/
+    /*box-shadow:1px 1px 2px #202020;*/
+    /*-o-box-shadow:1px 1px 2px #202020;*/
+    /*-moz-box-shadow:1px 1px 2px #202020;*/
+    /*-webkit-border-shadow:1px 1px 2px #202020;*/
   }
   .close{
     position: absolute;
@@ -203,20 +205,21 @@
     right:0;
   }
   .incident span {
+    color: white;
     font-size: 10px;
     padding: 10px 20px;
   }
   .incident:before{
-    content:'';
-    position:absolute;
-    width:0;
-    height:0;
-    border:15px solid;
-    color:transparent;
-    border-right-color:#202020;
-    left:-30px;
-    top:50%;
-    margin-top:-15px;
+    /*content:'';*/
+    /*position:absolute;*/
+    /*width:0;*/
+    /*height:0;*/
+    /*border:15px solid;*/
+    /*color:transparent;*/
+    /*border-right-color:#202020;*/
+    /*left:-30px;*/
+    /*top:50%;*/
+    /*margin-top:-15px;*/
   }
 </style>
 <script>
@@ -279,6 +282,9 @@
       events: {
         required: false
       },
+      timeOrder: {
+        required: false
+      },
       date: {
         required: false
       }
@@ -399,7 +405,7 @@
       },
       dateChange(dateItem) {
         this.show = true
-        console.log(dateItem, '-=-=-=-=-=-=-=-=-')
+        // console.log(dateItem, '-=-=-=-=-=-=-=-=-')
         var dateObj = new Date(this.showTimeData)
         var year = dateObj.getFullYear()
         var month = dateObj.getMonth()
@@ -448,7 +454,7 @@
               dateItem.active = !dateItem.active
             }
             // 向上发送本次点击的行程数据
-            console.log(result, '--------------------')
+            // console.log(result, '--------------------')
             if (result.schedule) {
               const currentTime = this.timestampToTime(result.schedule.date)
               this.currentDate = currentTime
@@ -488,7 +494,7 @@
         const self = this
         var saveTime = ''
         request(self.schema.modelUnderscorePlural, {
-          params: { 'sortItem': 'create_time', 'pageSize': 10000 }
+          params: { 'sortItem': self.timeOrder, 'pageSize': 10000 }
         }).then(resp => {
           console.log(resp.data, '=========')
           _.each(resp.data, function(item) {
@@ -508,7 +514,7 @@
             }
           })
         })
-        console.log(self.schedules, '+++++最终+++++++++')
+        // console.log(self.schedules, '+++++最终+++++++++')
       }
     },
     created() {

src/views/haomo/components/calendar/index.vue

@@ -6,6 +6,7 @@
       :title="title"
       :events="events"
       :date="date"
+      :timeOrder="timeOrder"
       @dateChange="datechange"
       @monthChange="monthchange"
     ></hm-full-calendar>
@@ -30,7 +31,9 @@
         // title为需要传入的事件名所对应的的字段名，date为时间所对应的字段，events为事件所对应的字段，都不是必传
         title: 'loginid',
         date: 'createTime',
-        events: 'email'
+        events: 'email',
+        // timeOrder为所有所有事件按照数据库的哪个字段排序，为下划线格式
+        timeOrder: 'create_time'
       }
     },
     filters: {