Эх сурвалжийг харах

个人工作台,团队工作台样式修改

PrinceLee 5 жил өмнө
parent
commit
d0026cac92

+ 1 - 1
src/views/workbench/person/components/myFullCalendar.vue

@@ -35,7 +35,7 @@
       editable="false"
       droppable="false"
       selectable="true"
-      event-color="#409EFF"
+      event-color="rgba(64,157,254,0.6)"
       :display-event-time="false"
       :plugins="calendarPlugins"
       :weekends="calendarWeekends"

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

@@ -9,9 +9,9 @@
         <div class="top-tabs">
           <el-tabs v-model="activeName">
             <el-tab-pane label="个人日程" name="1" />
-            <el-tab-pane label="概览" name="2" />
+            <!-- <el-tab-pane label="概览" name="2" />
             <el-tab-pane label="需求" name="3" />
-            <el-tab-pane label="任务" name="4" />
+            <el-tab-pane label="任务" name="4" /> -->
             <el-tab-pane label="缺陷" name="5" />
           </el-tabs>
         </div>
@@ -313,7 +313,10 @@ export default {
             title: `${title}:${item.peopleObject.name}:${item.name}`,
             start: moment(item.startTime).toDate(),
             end: moment(item.endTime).add(1, 'day').toDate(),
-            detailData: item
+            detailData: item,
+            className: item.origin ? 'schedule1' : 'schedule2',
+            backgroundColor: item.origin ? 'rgba(97,211,184,0.6)' : 'rgba(64,157,254,0.6)',
+            textColor: item.origin ? '#08AC85' : '#0C77E5'
           }
         })
       }
@@ -434,6 +437,27 @@ export default {
     margin: 10px 35px 0 35px;
   }
 }
+>>>.schedule1 {
+  margin: 1px;
+  padding: 2px 10px;
+  border: none;
+}
+>>>.schedule2 {
+  margin: 1px;
+  padding: 2px 10px;
+  border: none;
+}
+>>>.fc-content{
+  transform: scale(1) !important;
+  margin-left: 0 !important;
+  width: auto !important;
+}
+>>>.fc-content span{
+  bottom: 0 !important;
+  white-space:nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>
 
 <style scoped>

+ 41 - 9
src/views/workbench/team/index.vue

@@ -31,9 +31,9 @@
       <div class="top-tabs">
         <el-tabs v-model="activeName">
           <el-tab-pane label="团队日程" name="1" />
-          <el-tab-pane label="概览" name="2" />
+          <!-- <el-tab-pane label="概览" name="2" />
           <el-tab-pane label="需求" name="3" />
-          <el-tab-pane label="任务" name="4" />
+          <el-tab-pane label="任务" name="4" /> -->
           <el-tab-pane label="缺陷" name="5" />
         </el-tabs>
       </div>
@@ -114,6 +114,7 @@ import ganntViews from './components/ganntViews'
 import MyFullCalendar from '@/views/workbench/person/components/myFullCalendar'
 import calenderDetail from '@/views/workbench/person/components/calenderDetail'
 import calendarDialog from '@/views/workbench/person/components/calendarFormDialog'
+import { View } from '@fullcalendar/core'
 
 export default {
   components: {
@@ -140,9 +141,12 @@ export default {
       memberList: [], // 团队成员列表
       checkAllMember: false, // 选择全部成员
       checkedMembers: [], // 被选中的成员列表
-      calendarEvents: [
-        // 日程图标数据
-        { title: 'Event Now', start: new Date(), end: new Date().setDate(16) }
+      calendarEvents: [// 日程图标数据
+        {
+          title: 'Event Now',
+          start: moment().startOf('month').valueOf(),
+          end: moment().endOf('month').valueOf()
+        }
       ],
       calendarView: null, // 日程图表数据
       showDetail: false, // 显示详情弹框
@@ -292,11 +296,15 @@ export default {
       }
     },
     async queryTeamWorkListByTime(view) { // 获取指定时间段团队日程信息
-      this.calendarView = view
+      this.calendarView = View
       const params = {
         timeInfo: {
-          startTime: moment(view.activeStart || null).subtract(1, 'month').format('YYYY.MM.DD'),
-          endTime: moment(view.activeEnd || null).add(1, 'month').format('YYYY.MM.DD')
+          startTime: view.activeStart
+            ? moment(view.activeStart).format('YYYY.MM.DD')
+            : moment().startOf('month').format('YYYY.MM.DD'),
+          endTime: view.activeEnd
+            ? moment(view.activeEnd).format('YYYY.MM.DD')
+            : moment().endOf('month').format('YYYY.MM.DD')
         },
         teamSearchInfo: this.searchForm,
         searchScheduleInfo: { origin: this.origin }
@@ -313,7 +321,10 @@ export default {
             title: `${title}:${item.peopleObject.name}:${item.name}`,
             start: moment(item.startTime).toDate(),
             end: moment(item.endTime).add(1, 'day').toDate(),
-            detailData: item
+            detailData: item,
+            className: item.origin ? 'schedule1' : 'schedule2',
+            backgroundColor: item.origin ? 'rgba(97,211,184,0.6)' : 'rgba(64,157,254,0.6)',
+            textColor: item.origin ? '#08AC85' : '#0C77E5'
           }
         })
       }
@@ -373,4 +384,25 @@ export default {
   max-width: 20vw;
   overflow: scroll;
 }
+>>>.schedule1 {
+  margin: 1px;
+  padding: 2px 10px;
+  border: none;
+}
+>>>.schedule2 {
+  margin: 1px;
+  padding: 2px 10px;
+  border: none;
+}
+>>>.fc-content{
+  transform: scale(1) !important;
+  margin-left: 0 !important;
+  width: auto !important;
+}
+>>>.fc-content span{
+  bottom: 0 !important;
+  white-space:nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>