Parcourir la source

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

qinzhipeng_v il y a 5 ans
Parent
commit
eeab2e6a81

+ 1 - 1
src/views/projectManage/bugList/css/index.css

@@ -175,7 +175,7 @@
 }
 .bug_manage_drawer {
   pointer-events: none;
-  margin-top: 80px;
+  margin-top: 60px;
 }
 .bug_manage_drawer .el-drawer{
   pointer-events: auto;

+ 8 - 4
src/views/workbench/person/index.vue

@@ -256,20 +256,20 @@
       :visible="updateSelfScheduleDialog.visible"
       :data="updateSelfScheduleDialog.data"
       @cancel="updateSelfScheduleDialog.visible = false"
-      @confirm="updateSelfScheduleDialog.visible = false;queryWorkList()"
+      @confirm="updateSelfScheduleDialog.visible = false;queryWorkList();queryWorkListByTime(calendarView)"
     />
     <calendar-dialog
       :title="'新建日程'"
       :visible="createSelfScheduleDialog.visible"
       :data="createSelfScheduleDialog.data"
       @cancel="createSelfScheduleDialog.visible = false"
-      @confirm="createSelfScheduleDialog.visible = false;queryWorkList()"
+      @confirm="createSelfScheduleDialog.visible = false;queryWorkList();queryWorkListByTime(calendarView)"
     />
     <delete-dialog
       :content="'是否删除当前日程'"
       :visible="deleteSelfScheduleDialog.visible"
       @cancel="deleteSelfScheduleDialog.visible = false"
-      @confirm="deleteSelfSchedule()"
+      @confirm="deleteSelfSchedule();queryWorkListByTime(calendarView)"
     />
   </el-container>
 </template>
@@ -291,6 +291,7 @@ export default {
   },
   data() {
     return {
+      calendarView: null,
       chirdrenClass: -1,
       myTeamTableData: [],
       myCreateTab: 'my_create',
@@ -445,7 +446,10 @@ export default {
       })
     },
     queryWorkListByTime(view) {
-      workbenchApi.queryWorkListByTime({ startTime: dayjs(view.activeStart).format('YYYY.MM.DD'), endTime: dayjs(view.activeEnd).format('YYYY.MM.DD') }).then(res => {
+      this.calendarView = view
+      const startTime = dayjs(view.activeStart).subtract(1, 'month').format('YYYY.MM.DD')
+      const endTime = dayjs(view.activeEnd).add(1, 'month').format('YYYY.MM.DD')
+      workbenchApi.queryWorkListByTime({ startTime: startTime, endTime: endTime }).then(res => {
         if (res.code === 200) {
           this.calendarEvents = []
           for (const i in res.data) {