Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_test

src/views/workbench/components/searchSection.vue

@@ -227,8 +227,8 @@ export default {
     color: #333333;
     opacity: 1;
     width: 100px;
-    margin: 0 20px 20px 5px;
-}
+    margin: 0 10px 20px 5px;
+  }
 }
 
 .fromName {

src/views/workbench/person/components/myFullCalendar.vue

@@ -12,7 +12,7 @@
             <el-button type="primary" size="small" @click="callCalendarApi('changeView','timeGridWeek')">周</el-button>
             <el-button type="primary" size="small" @click="callCalendarApi('changeView','timeGridDay')">日</el-button>
           </el-button-group>
-          <el-button-group>
+          <el-button-group style="margin-left: 20px">
             <el-button type="primary" size="small" :class="todayClassName" @click="callCalendarApi('today')">今天</el-button>
           </el-button-group>
         </div>

src/views/workbench/person/index.vue

@@ -396,13 +396,14 @@ export default {
       let schedule = dayList[0] === dayList[len - 1] ? `${dayList[0]}` : `${dayList[0]}-${dayList[len - 1]}`
       try {
         const detailDayList = await getSeprateDayInfo(dayList)
-        dayList = detailDayList.data.holidayHasWork
+        dayList = dayList.filter(item => !detailDayList.data.holidayHasWork.find(val => val === item))
+        console.log(dayList)
         schedule = detailDayList.data.seperateDaysNoHoliday
       } catch (error) {
         throw error
       }
       if (!bizId) { // 新建日程
-        this.dateClick({
+        this.addCalender({
           dayList: dayList,
           schedule: schedule
         })

src/views/workbench/team/index.vue

@@ -51,34 +51,33 @@
           <el-tab-pane label="日历视图" name="1" />
           <el-tab-pane label="甘特图" name="2" />
         </el-tabs>
-        <div class="detail-info">
-          <search-section
-            v-show="activeSchedule === '1'"
-            :value.sync="filtrate"
-            :search-form="searchForm"
-            :member-color.sync="mapMemberColor"
-            @change="queryTeamWorkListByTime(calendarView)"
-            @loading="loading = false"
-          />
-          <MyFullCalendar
-            v-show="activeSchedule === '1'"
-            :events="calendarEvents"
-            :add-button="false"
-            @change="queryTeamWorkListByTime"
-            @eventClick="showSchedule"
-            @select="selectDates"
-          >
-            <div style="width: 100px" />
-          </MyFullCalendar>
-          <calender-detail
-            :show.sync="showDetail"
-            :data="nowDetailData"
-            :position="detailXY"
-            @edit="editSchedule"
-            @delete="deleteSchedule"
-          />
-          <gannt-views v-show="activeSchedule === '2'" ref="gannt-views" :search="searchForm" />
-        </div>
+        <search-section
+          v-show="activeSchedule === '1'"
+          :value.sync="filtrate"
+          :search-form="searchForm"
+          style="margin: 0 30px;"
+          :member-color.sync="mapMemberColor"
+          @change="queryTeamWorkListByTime(calendarView)"
+          @loading="loading = false"
+        />
+        <MyFullCalendar
+          v-show="activeSchedule === '1'"
+          :events="calendarEvents"
+          :add-button="false"
+          @change="queryTeamWorkListByTime"
+          @eventClick="showSchedule"
+          @select="selectDates"
+        >
+          <div style="width: 100px" />
+        </MyFullCalendar>
+        <calender-detail
+          :show.sync="showDetail"
+          :data="nowDetailData"
+          :position="detailXY"
+          @edit="editSchedule"
+          @delete="deleteSchedule"
+        />
+        <gannt-views v-show="activeSchedule === '2'" ref="gannt-views" :search="searchForm" />
       </section>
     </el-container>
     <el-container v-if="activeName === '2'">
@@ -403,13 +402,13 @@ export default {
       let schedule = dayList[0] === dayList[len - 1] ? `${dayList[0]}` : `${dayList[0]}-${dayList[len - 1]}`
       try {
         const detailDayList = await getSeprateDayInfo(dayList)
-        dayList = detailDayList.data.holidayHasWork
+        dayList = dayList.filter(item => !detailDayList.data.holidayHasWork.find(val => val === item))
         schedule = detailDayList.data.seperateDaysNoHoliday
       } catch (error) {
         throw error
       }
       if (!bizId) { // 新建日程
-        this.dateClick({
+        this.addCalender({
           dayList: dayList,
           schedule: schedule
         })
@@ -424,7 +423,7 @@ export default {
         this.DialogTitle = '新建排期'
       }
     },
-    dateClick(arg) { // 新建日程弹框
+    addCalender(arg) { // 新建日程弹框
       this.createSchedule.data = arg
       this.createSchedule.visible = true
     },