wangziqian %!s(int64=5) %!d(string=hai) anos
pai
achega
163a9b1211

+ 9 - 3
src/views/workbench/person/components/calenderDetail.vue

@@ -1,7 +1,7 @@
 <template>
-  <article v-if="showDetail" ref="show-schedule-detail" class="show-schedule-detail">
+  <article v-show="showDetail" ref="show-schedule-detail" class="show-schedule-detail">
     <template v-if="nowDetailData && nowDetailData.origin === 0">
-      <div class="detail-title" :style="{ color : nowDetailData.textColor }">【任务排期】{{ nowDetailData.name }}:{{ nowDetailData.desc }}</div>
+      <div class="detail-title">【任务排期】{{ nowDetailData.name }}:{{ nowDetailData.desc }}</div>
       <div class="detail-time item">
         <div class="label">排期:</div>
         <div>{{ nowDetailData.seperateDaysNoHoliday }}(用时<span>{{ nowDetailData.needDays }}</span>天)</div>
@@ -15,7 +15,7 @@
       </div>
     </template>
     <template v-if="nowDetailData && nowDetailData.origin === 1">
-      <div class="detail-title" :style="{ color : nowDetailData.textColor }">【日程】{{ nowDetailData.name }}:{{ nowDetailData.desc }}</div>
+      <div class="detail-title">【日程】{{ nowDetailData.name }}:{{ nowDetailData.desc }}</div>
       <div class="detail-time item">
         <div class="label">排期:</div>
         <div>{{ nowDetailData.seperateDaysNoHoliday }}(用时<span>{{ nowDetailData.needDays }}</span>天)</div>
@@ -67,6 +67,12 @@ export default {
     data: {
       handler(newV) {
         this.nowDetailData = newV
+        this.$nextTick(() => {
+          const ele = document.querySelector('.detail-title')
+          if (ele) {
+            ele.style.color = newV.textColor
+          }
+        })
       },
       deep: true
     },

+ 3 - 6
src/views/workbench/person/index.vue

@@ -326,7 +326,7 @@ export default {
         const colorList = ['#08AC85', '#0C77E5', '#ED5209', '#D1C200']
         const bgList = ['rgba(97,211,184,0.6)', 'rgba(64,157,254,0.6)', 'rgba(255,137,82,0.6)', 'rgba(245,227,0,0.6)']
         this.calendarEvents = res.data.map((item, index) => {
-          const textColor = colorList[index % 4]
+          item.textColor = colorList[index % 4]
           const title = item.origin ? '日程' : '排期'
           const require = `${item.requireNames && item.requireNames.length > 0 ? item.requireNames.join(',') : '无'}`
           return {
@@ -334,13 +334,10 @@ export default {
             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,
-              textColor: textColor
-            },
+            detailData: item,
             className: item.origin ? 'schedule1' : 'schedule2',
             backgroundColor: bgList[index % 4],
-            textColor: textColor
+            textColor: item.textColor
           }
         })
       }

+ 4 - 7
src/views/workbench/team/index.vue

@@ -326,10 +326,10 @@ export default {
       params.peoples = this.checkedMembers
       const res = await queryTeamWorkListByTime(params)
       if (res.code === 200) {
-        const colorList = ['#08AC85', '#0C77E5', '#ED5209', '#D1C200']
+        const colorList = ['rgba(8,172,133,1)', 'rgba(12,119,229,1)', 'rgba(237,82,9,1)', 'rgba(209,194,0,1)']
         const bgList = ['rgba(97,211,184,0.6)', 'rgba(64,157,254,0.6)', 'rgba(255,137,82,0.6)', 'rgba(245,227,0,0.6)']
         this.calendarEvents = res.data.map((item, index) => {
-          const textColor = colorList[index % 4]
+          item.textColor = colorList[index % 4]
           const title = item.origin ? '日程' : '排期'
           const require = `${item.requireNames && item.requireNames.length > 0 ? item.requireNames.join(',') : '无'}`
           return {
@@ -337,13 +337,10 @@ export default {
             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,
-              textColor: textColor
-            },
+            detailData: item,
             className: item.origin ? 'schedule1' : 'schedule2',
             backgroundColor: bgList[index % 4],
-            textColor: textColor
+            textColor: item.textColor
           }
         })
       }