修改排班

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

@@ -22,19 +22,19 @@
   // display:flex;
   // z-index:1;
   div {
-    width: 130px;
-    height: 40px;
-    //border: 1px solid #ccc;
+    width: 9%;
+    height: 55px;
+    border: 1px solid #ccc;
   }
   .ag-left1 {
     position: absolute;
-    right: 140px;
-    top: 20px;
+    right: 12%;
+    top: 18px;
   }
   .ag-left2 {
     position: absolute;
-    right: 20px;
-    top: 20px;
+    right: 1%;
+    top: 18px;
   }
 }
 .agment-left-con {

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

@@ -132,10 +132,11 @@
           defaultDate: new Date(),
           datesSet: this.handleDatesSet,
           events: [],
+          slotEventOverlap: false,
           header: {
             center: 'month,agendaFourDay', // buttons for switching between views
           },
-          firstDay: new Date().getDay(), // 设置一周中显示的第一天是哪天，周日是0，周一是1，类推
+          firstDay: 1, // 设置一周中显示的第一天是哪天，周日是0，周一是1，类推
           locale: 'zh-cn', // 切换语言，当前为中文
           eventColor: '#fff', // 全部日历日程背景色3BB2E3
           eventBackgroundColor: '#E7F4F5',
@@ -186,7 +187,6 @@
     },
     watch: {
       week(newV) {
-        console.log(newV);
         if (this.haveWeek.indexOf(newV) == -1) {
           this.haveWeek.push(newV);
           this.handleInitSearch();
@@ -255,18 +255,19 @@
         const oneHour = 1 * 60 * 60 * 1000 * 24;
         const timeDifference = (cz / oneHour) | 0;
         const headObj = this.calendarOptions.customButtons.myCustomButton;
-        if (timeDifference > 0) {
+        console.log(timeDifference, 'sjsjsjsj', cz);
+        if (timeDifference > 0 && timeDifference < 7) {
           // 过去
-          this.week = 2;
-          headObj.text = '上周';
+          this.week = 1;
+          headObj.text = '本周';
         } else if (timeDifference < 0) {
           // 未来
           this.week = 3;
           headObj.text = '下周';
         } else {
           // 现在
-          headObj.text = '本周';
-          this.week = 1;
+          headObj.text = '下周';
+          this.week = 2;
         }
       },
       eventResize(event) {