瀏覽代碼

工作台优化

wangziqian 4 年之前
父節點
當前提交
9bce7035ec

+ 3 - 2
src/views/workbench/person/components/myFullCalendar.vue

@@ -182,8 +182,9 @@ export default {
     setIcon() {
       const eleList = document.getElementsByClassName('fc-title')
       Array.prototype.forEach.call(eleList, item => {
-        // const grandParent = item.parentElement.parentElement
-        // const color = grandParent.style.color
+        if (item.parentElement.childNodes.length > 3) {
+          return
+        }
         const div = document.createElement('div')
         div.style.display = 'inline-block'
         div.style.paddingTop = '0'

+ 2 - 2
src/views/workbench/person/index.vue

@@ -429,13 +429,13 @@ export default {
         let num = 0
         this.calendarEvents = res.data.map((item, index) => {
           const title = item.origin ? '日程' : '排期'
-          const require = `${item.requireNames && item.requireNames.length > 0 ? item.requireNames.join(',') : '无'}`
+          const require = `${item.requireNames && item.requireNames.length > 0 ? '所属需求:' + item.requireNames.join(',') : '所属需求:无'}`
           if (index >= 1 && item.id === res.data[index - 1].id) {
             num = num + 1
           }
           return {
             id: item.id,
-            title: `${title}:${item.peopleObject.name}:${item.name}-${item.desc || '无'};所属需求:${require}`,
+            title: `${title}:${item.peopleObject.name}:${item.name}-${item.desc || '无'};${item.origin ? '' : require}`,
             start: moment(item.startTime).toDate(),
             end: moment(item.endTime).add(1, 'day').toDate(),
             detailData: item,

+ 2 - 2
src/views/workbench/team/index.vue

@@ -506,10 +506,10 @@ export default {
         this.calendarEvents = res.data.map((item, index) => {
           const colorObj = this.mapMemberColor.get(item.peopleObject.idap)
           const title = item.origin ? '日程' : '排期'
-          const require = `${item.requireNames && item.requireNames.length > 0 ? item.requireNames.join(',') : '无'}`
+          const require = `${item.requireNames && item.requireNames.length > 0 ? '所属需求:' + item.requireNames.join(',') : '所属需求:无'}`
           return {
             id: item.id,
-            title: `${title}:${item.peopleObject.name}:${item.name}-${item.desc || '无'};所属需求:${require}`,
+            title: `${title}:${item.peopleObject.name}:${item.name}-${item.desc || '无'};${item.origin ? '' : require}`,
             start: moment(item.startTime).toDate(),
             end: moment(item.endTime).add(1, 'day').toDate(),
             detailData: item,