Browse Source

任务修改,工作台团队选择

PrinceLee 5 years ago
parent
commit
2ee9142c98

+ 8 - 0
src/api/taskIndex.js

@@ -184,3 +184,11 @@ export function launchTest(data) {
     data
   })
 }
+
+// 获取任务统计数据
+export function getTaskSumData(id) {
+  return request({
+    url: TeamManagement + `/task/getTaskSumData?id=` + id,
+    method: 'get'
+  })
+}

+ 12 - 1
src/styles/detail-pages.scss

@@ -44,7 +44,18 @@
     font-family: MicrosoftYaHei;
     color: rgb(51, 59, 74);
     margin-right:8%;
-    white-space: nowrap; 
+    display: flex;
+    flex-direction: column;
+    width: 150px;
+    .title-id{
+      color:rgba(51,59,74,0.5);
+      font-size: 14px;
+    }
+    .title-name {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
   }
   .top-page-title {
     display: flex;

+ 2 - 1
src/views/projectManage/projectList/components/modifySchedule.vue

@@ -111,7 +111,7 @@ export default {
       },
       detailDayList: [], // 详细的日期
       schedule: '',
-      selectTask: '', // 选择的任务id
+      selectTask: null, // 选择的任务id
       tasksOptions: [], // 任务下拉选项
       tasksDetailList: [], // 已有任务项目
       loading: false
@@ -201,6 +201,7 @@ export default {
       })
       this.tasksDetailList.push(res)
       this.form.taskList.push(res.id)
+      this.selectTask = null
     },
     cancelTask(id) { // 删除单个关联任务
       if (this.disabled) {

+ 4 - 1
src/views/projectManage/projectList/projectViewDetails.vue

@@ -4,7 +4,10 @@
       <el-header class="main-header">
         <div class="top-page-title">
           <el-tooltip :disabled="form_query.name && form_query.name.length > 20 ? false : true" effect="dark" :content="form_query.name" placement="bottom">
-            <div class="header-title">项目 : {{ form_query.name | ellipsis(10) }}</div>
+            <div class="header-title">
+              <span class="title-id">Project-{{ form_query.id }}</span>
+              <span class="title-name">项目 : {{ form_query.name }}</span>
+            </div>
           </el-tooltip>
           <el-dropdown placement="bottom" @command="handleCommand">
             <el-button size="mini" plainclass="el-dropdown-link drop_down">

+ 2 - 1
src/views/projectManage/requirement/components/modifySchedule.vue

@@ -111,7 +111,7 @@ export default {
       },
       detailDayList: [], // 详细的日期
       schedule: '',
-      selectTask: '', // 选择的任务id
+      selectTask: null, // 选择的任务id
       tasksOptions: [], // 任务下拉选项
       tasksDetailList: [], // 已有任务项目
       loading: false
@@ -201,6 +201,7 @@ export default {
       })
       this.tasksDetailList.push(res)
       this.form.taskList.push(res.id)
+      this.selectTask = null
     },
     cancelTask(id) { // 删除单个关联任务
       if (this.disabled) {

+ 4 - 1
src/views/projectManage/requirement/requirementDetail.vue

@@ -4,7 +4,10 @@
       <el-header class="main-header">
         <div class="top-page-title">
           <el-tooltip :disabled="form_query.name && form_query.name.length > 20 ? false : true" effect="dark" :content="form_query.name" placement="bottom">
-            <div class="header-title">需求 : {{ form_query.name | ellipsis(10) }}</div>
+            <div class="header-title">
+              <span class="title-id">Requirement-{{ form_query.id }}</span>
+              <span class="title-name">需求 : {{ form_query.name }}</span>
+            </div>
           </el-tooltip>
           <el-dropdown placement="bottom" @command="updateStatus">
             <el-button size="mini" plainclass="el-dropdown-link drop_down">

+ 2 - 2
src/views/projectManage/taskList/components/dataStatistics.vue

@@ -21,7 +21,7 @@
 <script>
 import normalEchart from '@/components/chart/normalEchart'
 import createdBug from '@/views/projectManage/bugList/file/createdBug'
-import { getRequireSumData } from '@/api/requirement'
+import { getTaskSumData } from '@/api/taskIndex'
 import bugImg from '@/assets/detailPage/缺陷修复@2x.png'
 export default {
   components: {
@@ -44,7 +44,7 @@ export default {
   },
   methods: {
     async getProjectSumData() { // 获取数据
-      const res = await getRequireSumData(this.$route.query.id)
+      const res = await getTaskSumData(this.$route.query.id)
       if (res.code === 200) {
         this.bugData = res.data.bugData
         this.setDataChart(this.bugData.detail, 'echartsOption3')

+ 14 - 1
src/views/projectManage/taskList/components/modifySchedule.vue

@@ -110,7 +110,7 @@ export default {
       },
       detailDayList: [], // 详细的日期
       schedule: '',
-      selectTask: '', // 选择的任务id
+      selectTask: null, // 选择的任务id
       tasksOptions: [], // 任务下拉选项
       tasksDetailList: [], // 已有任务项目
       loading: false
@@ -138,8 +138,20 @@ export default {
   created() {
     this.getType()
     this.remoteMethod()
+    this.init()
   },
   methods: {
+    async init() {
+      const res = await allTaskList({
+        bizId: Number(localStorage.getItem('bizId')),
+        name: this.$route.query.id
+      })
+      if (res.code === 200) {
+        this.tasksOptions = res.data
+        this.tasksDetailList = [...res.data]
+        this.form.taskList.push(res.data.id)
+      }
+    },
     async getScheduleData(id) { // 当有传入的详细信息的时候
       const res = await scheduleGet(id)
       let obj
@@ -192,6 +204,7 @@ export default {
       })
       this.tasksDetailList.push(res)
       this.form.taskList.push(res.id)
+      this.selectTask = null
     },
     cancelTask(id) { // 删除单个关联任务
       if (this.disabled) {

+ 4 - 1
src/views/projectManage/taskList/taskViewDetail.vue

@@ -13,7 +13,10 @@
             </div>
           </div>
           <el-tooltip :disabled="form_query.name && form_query.name.length > 20 ? false : true" effect="dark" :content="form_query.name" placement="bottom">
-            <div class="header-title">任务 : {{ form_query.name | ellipsis(10) }}</div>
+            <div class="header-title">
+              <span class="title-id">Task-{{ form_query.id }}</span>
+              <span class="title-name">任务 : {{ form_query.name }}</span>
+            </div>
           </el-tooltip>
           <el-dropdown placement="bottom" @command="updateStatus">
             <el-button size="mini" plainclass="el-dropdown-link drop_down">

+ 0 - 1
src/views/workbench/person/index.vue

@@ -105,7 +105,6 @@
             :events="calendarEvents"
             @dateClick="dateClick"
             @change="queryWorkListByTime"
-            @select="select"
             @eventClick="showSchedule"
           >
             <el-button type="primary" size="small" @click="dateClick()">添加日程</el-button>

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

@@ -59,7 +59,6 @@
             @change="queryTeamWorkListByTime"
             @dateClick="dateClick"
             @eventClick="showSchedule"
-            @select="select"
           >
             <el-checkbox-group v-model="origin" class="origin">
               <el-checkbox :label="0" @change="queryTeamWorkListByTime(calendarView)">任务排期</el-checkbox>
@@ -211,7 +210,7 @@ export default {
     },
     handleTeams(e) { // 团队变动
       this.searchForm.teamId = e
-      const res = this.searchEnum.team.find(item => item.teamId === e)
+      const res = this.searchEnum.teams.find(item => item.teamId === e)
       this.teamName = res.teamName
       this.queryTeamWorkListByTime(this.calendarView)
       this.updateGannt()