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

src/views/projectManage/requirement/requirementDetail.vue

@@ -122,6 +122,7 @@
               :id="requirementId"
               :type-list="taskScheduleEvent"
               class-name="white"
+              :all="true"
             />
           </div>
         </section>

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

@@ -149,7 +149,7 @@ export default {
       if (res.code === 200) {
         this.tasksOptions = res.data
         this.tasksDetailList = [...res.data]
-        this.form.taskList.push(res.data.id)
+        this.form.taskList = res.data.map(item => item.id)
       }
     },
     async getScheduleData(id) { // 当有传入的详细信息的时候

src/views/workbench/person/index.vue

@@ -318,9 +318,10 @@ export default {
       if (res.code === 200) {
         this.calendarEvents = res.data.map(item => {
           const title = item.origin ? '日程' : '排期'
+          const require = `${item.requireNames && item.requireNames.length > 0 ? item.requireNames.join(',') : '无'}`
           return {
             id: item.id,
-            title: `${title}：${item.peopleObject.name}：${item.name}`,
+            title: `${title}：${item.peopleObject.name}：${item.name}-${item.desc || '无'};所属需求：${require}`,
             start: moment(item.startTime).toDate(),
             end: moment(item.endTime).add(1, 'day').toDate(),
             detailData: item,
@@ -464,9 +465,6 @@ export default {
 }
 >>>.fc-content span{
   bottom: 0 !important;
-  white-space:nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
 }
 </style>
 

src/views/workbench/team/index.vue

@@ -329,9 +329,10 @@ export default {
       if (res.code === 200) {
         this.calendarEvents = res.data.map(item => {
           const title = item.origin ? '日程' : '排期'
+          const require = `${item.requireNames && item.requireNames.length > 0 ? item.requireNames.join(',') : '无'}`
           return {
             id: item.id,
-            title: `${title}：${item.peopleObject.name}：${item.name}`,
+            title: `${title}：${item.peopleObject.name}：${item.name}-${item.desc || '无'};所属需求：${require}`,
             start: moment(item.startTime).toDate(),
             end: moment(item.endTime).add(1, 'day').toDate(),
             detailData: item,
@@ -414,8 +415,5 @@ export default {
 }
 >>>.fc-content span{
   bottom: 0 !important;
-  white-space:nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
 }
 </style>