hold判断

src/views/projectManage/requirement/list/index.vue

@@ -129,10 +129,11 @@
               {{ scope.row.requirementDisplayId }}
               <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px; padding: 0 10px;">
               <div
-                v-if="scope.row.optionsObject && scope.row.optionsObject.tagsType !==-1 && scope.row.optionsObject.remindTags"
+                v-if="scope.row.optionsObject && scope.row.optionsObject.tagsType !==-1 && scope.row.optionsObject.remindTags && scope.row.status !== -2"
                 :class="'tag-tip'+scope.row.optionsObject.tagsType"
               >{{ scope.row.optionsObject.remindTags }}
               </div>
+              <div v-if="scope.row.status === -2" class="tag-tip1">hold</div>
             </span><br>
             <span class="stylus-hover" @click="getToRequirementDetails(scope.row.id)">{{ scope.row.name }}</span>
           </template>

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

@@ -251,6 +251,7 @@ export default {
 >>>.fc-title {
   line-height: 15px;
   padding-left: 4px;
+  color:#333333 !important;
 }
 >>>.fc-event-container .fc-content {
   text-overflow: inherit;

src/views/workbench/person/index.vue

@@ -254,11 +254,15 @@ export default {
       detailXY: [0, 0], // 详情弹框位置
       colorList: [
         'rgba(11,160,188,1)', 'rgba(129,186,0,1)', 'rgba(235,172,0,1)', 'rgba(132,100,247 ,1)', 'rgba(73,92,197 ,1)',
-        'rgba(193,67,96,1)', 'rgba(211,87,35,1)', 'rgba(211,96,118,1)', 'rgba(179,201,58,1)', 'rgba(64,127,232,1)'
+        'rgba(193,67,96,1)', 'rgba(211,87,35,1)', 'rgba(211,96,118,1)', 'rgba(179,201,58,1)', 'rgba(64,127,232,1)',
+        'rgba(86,68,93,1)', 'rgba(111,33,8,1)', 'rgba(192,53,70,1)', 'rgba(92,25,107,1)', 'rgba(73,10,61,1)',
+        'rgba(189,21,80,1)', 'rgba( 31,78,95,1)', 'rgba(241,0,229,1)', 'rgba(114,0,218,1)', 'rgba(70,14,68,1)'
       ],
       bgColorList: [
         'rgba(11,160,188,0.2)', 'rgba(129,186,0,0.2)', 'rgba(235,172,0,0.2)', 'rgba(132,100,247 ,0.2)', 'rgba(73,92,197 ,0.2)',
-        'rgba(193,67,96,0.2)', 'rgba(211,87,35,0.2)', 'rgba(211,96,118,0.2)', 'rgba(179,201,58,0.2)', 'rgba(64,127,232,0.2)'
+        'rgba(193,67,96,0.2)', 'rgba(211,87,35,0.2)', 'rgba(211,96,118,0.2)', 'rgba(179,201,58,0.2)', 'rgba(64,127,232,0.2)',
+        'rgba(86,68,93,0.2)', 'rgba(111,33,8,0.2)', 'rgba(192,53,70,0.2)', 'rgba(92,25,107,0.2)', 'rgba(73,10,61,0.2)',
+        'rgba(189,21,80,0.2)', 'rgba( 31,78,95,0.2)', 'rgba(241,0,229,0.2)', 'rgba(114,0,218,0.2)', 'rgba(70,14,68,0.2)'
       ]
     }
   },
@@ -382,8 +386,8 @@ export default {
             end: moment(item.endTime).add(1, 'day').toDate(),
             detailData: item,
             className: item.origin ? 'schedule1' : 'schedule2',
-            backgroundColor: this.bgColorList[(index - num) % 10],
-            textColor: this.colorList[(index - num) % 10]
+            backgroundColor: this.bgColorList[(index - num) % 20],
+            textColor: this.colorList[(index - num) % 20]
           }
         })
       }

src/views/workbench/team/index.vue

@@ -198,11 +198,15 @@ export default {
       visibleSchedule: false, // 排期任务弹框
       colorList: [
         'rgba(11,160,188,1)', 'rgba(129,186,0,1)', 'rgba(235,172,0,1)', 'rgba(132,100,247 ,1)', 'rgba(73,92,197 ,1)',
-        'rgba(193,67,96,1)', 'rgba(211,87,35,1)', 'rgba(211,96,118,1)', 'rgba(179,201,58,1)', 'rgba(64,127,232,1)'
+        'rgba(193,67,96,1)', 'rgba(211,87,35,1)', 'rgba(211,96,118,1)', 'rgba(179,201,58,1)', 'rgba(64,127,232,1)',
+        'rgba(86,68,93,1)', 'rgba(111,33,8,1)', 'rgba(192,53,70,1)', 'rgba(92,25,107,1)', 'rgba(73,10,61,1)',
+        'rgba(189,21,80,1)', 'rgba( 31,78,95,1)', 'rgba(241,0,229,1)', 'rgba(114,0,218,1)', 'rgba(70,14,68,1)'
       ],
       bgColorList: [
         'rgba(11,160,188,0.2)', 'rgba(129,186,0,0.2)', 'rgba(235,172,0,0.2)', 'rgba(132,100,247 ,0.2)', 'rgba(73,92,197 ,0.2)',
-        'rgba(193,67,96,0.2)', 'rgba(211,87,35,0.2)', 'rgba(211,96,118,0.2)', 'rgba(179,201,58,0.2)', 'rgba(64,127,232,0.2)'
+        'rgba(193,67,96,0.2)', 'rgba(211,87,35,0.2)', 'rgba(211,96,118,0.2)', 'rgba(179,201,58,0.2)', 'rgba(64,127,232,0.2)',
+        'rgba(86,68,93,0.2)', 'rgba(111,33,8,0.2)', 'rgba(192,53,70,0.2)', 'rgba(92,25,107,0.2)', 'rgba(73,10,61,0.2)',
+        'rgba(189,21,80,0.2)', 'rgba( 31,78,95,0.2)', 'rgba(241,0,229,0.2)', 'rgba(114,0,218,0.2)', 'rgba(70,14,68,0.2)'
       ],
       mapMemberColor: new Map()// 人员对应颜色表
     }
@@ -247,8 +251,8 @@ export default {
       this.mapMemberColor.clear()
       arr.map((item, index) => {
         this.mapMemberColor.set(item.idap, {
-          color: this.colorList[index % 10],
-          bgColor: this.bgColorList[index % 10]
+          color: this.colorList[index % 20],
+          bgColor: this.bgColorList[index % 20]
         })
       })
     },