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

src/utils/global.js

@@ -24,7 +24,6 @@ export function deepClone(obj) {
   return newObj
 }
 export function getAllTime(start, end, noHoliday = true) {
-  console.log(start, end)
   const NewArr = []
   let nextDate = dayjs(start)
   end = dayjs(end).add(1, 'day')

src/views/projectManage/projectList/components/modifySchedule.vue

@@ -198,7 +198,7 @@ export default {
     selectTaskList: { // 已选择任务列表
       handler(newV, old) {
         if (newV && newV.length > 0) {
-          this.tasksOptions = newV
+          // this.tasksOptions = newV
           this.tasksDetailList = [...newV]
           this.form.taskList = newV.map(item => item.id)
         }
@@ -219,16 +219,16 @@ export default {
   created() {
     this.getType()
     if (this.type === 'task' && this.detailData === null) {
-      this.init()
+      this.initTask()
     } else {
-      this.getNowTask()
+      // this.getNowTask()
     }
   },
   methods: {
-    async init() { // 任务页面下获取当前任务
+    async initTask() { // 任务页面下获取当前任务
       const res = await taskGet(this.$route.query.id)
       if (res.code === 200) {
-        this.tasksOptions = [res.data]
+        // this.tasksOptions = [res.data]
         this.tasksDetailList = [res.data]
         this.form.taskList = [res.data.id]
       }

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

@@ -31,7 +31,6 @@
       <div class="detail-people item"><div class="label">参与人：</div>
         {{ nowDetailData.peopleObject.name }}
       </div>
-      <div class="detail-needs item"><div class="label">同步到团队：</div>{{ nowDetailData.syncTeam === 0?'否':'是' }}</div>
       <div class="detail-tasks item"><div class="label">日程描述：</div>{{ nowDetailData.desc }}</div>
       <div class="footer">
         <div class="cancel" @click="deleteSchedule">删除</div>
@@ -88,8 +87,8 @@ export default {
     position: {
       handler(newV) {
         this.$nextTick(() => {
-          this.$refs['show-schedule-detail'].style.left = newV[0] || 0
-          this.$refs['show-schedule-detail'].style.top = newV[1] || 0
+          if (this.$refs['show-schedule-detail']) this.$refs['show-schedule-detail'].style.left = newV[0] || 0
+          if (this.$refs['show-schedule-detail']) this.$refs['show-schedule-detail'].style.top = newV[1] || 0
         })
       },
       deep: true
@@ -110,7 +109,9 @@ export default {
       }
       if (this.showDetail) {
         const topScroll = e.srcElement.scrollTop // 获取页面滚动高度
-        this.$refs['show-schedule-detail'].style.top = Number(this.position[1].replace('px', '')) - (topScroll - this.topScroll) + 'px'
+        if (this.$refs['show-schedule-detail']) {
+          this.$refs['show-schedule-detail'].style.top = Number(this.position[1].replace('px', '')) - (topScroll - this.topScroll) + 'px'
+        }
       }
     },
     editSchedule() {