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

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

@@ -81,7 +81,7 @@
               <el-option-group
                 v-for="group in tasksByOptions"
                 :key="'task-group'+group.id"
-                :label="group.idString+group.name"
+                :label="group.idString+' '+group.name"
               >
                 <span v-if="group.taskInfoList.length > 0" class="group-expand">
                   <i v-show="hiddenList.findIndex(item=>item === group.id) > -1" class="el-icon-arrow-down" @click="hiddenGroup(group.id)" />

src/views/workbench/team/index.vue

@@ -161,12 +161,14 @@
     <!-- 新建操作 -->
     <!-- 日程操作弹框 -->
     <calendar-dialog
+      v-if="updateSchedule.visible"
       :title="'编辑日程'"
       :visible.sync="updateSchedule.visible"
       :data="updateSchedule.data"
       @confirm="queryTeamWorkListByTime(calendarView)"
     />
     <calendar-dialog
+      v-if="createSchedule.visible"
       :title="'新建日程'"
       :visible.sync="createSchedule.visible"
       :data="createSchedule.data"