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

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

@@ -189,8 +189,10 @@ export default {
         div.style.paddingTop = '0'
         const icon = document.createElement('i')
         if (item.innerText.match(/排期/)) {
+          item.innerText = item.innerText.replace(/排期：/, '')
           icon.className = 'el-icon-document'
         } else {
+          item.innerText = item.innerText.replace(/日程：/, '')
           icon.className = 'el-icon-date'
         }
         div.appendChild(icon)

src/views/workbench/person/index.vue

@@ -486,8 +486,8 @@ export default {
             end: moment(item.endTime).add(1, 'day').toDate(),
             detailData: item,
             className: item.origin ? 'schedule1' : 'schedule2',
-            backgroundColor: this.bgColorList[(index - num) % 20],
-            textColor: this.colorList[(index - num) % 20]
+            backgroundColor: this.colorList[(index - num) % 20],
+            textColor: '#FFFFFF'
           }
         })
       }

src/views/workbench/team/index.vue

@@ -58,7 +58,7 @@
               <el-checkbox v-for="item in memberList" :key="item.idap" :label="item.idap">
                 <div class="check-point">
                   {{ item.name }}
-                  <div class="point" :style="{'background-color': mapMemberColor.get(item.idap).color}" />
+                  <div class="point" :style="{'background-color': mapMemberColor.get(item.idap).bgColor}" />
                 </div>
               </el-checkbox>
             </el-checkbox-group>