样式改动

src/api/requirement.js

@@ -138,3 +138,11 @@ export function getRequireSumData(id) {
     method: 'get'
   })
 }
+
+// 获取需求下所有排期
+export function listByRequire(id) {
+  return request({
+    url: requestIp + `/schedule/listByRequire?id=` + id,
+    method: 'get'
+  })
+}

src/styles/detail-pages.scss

@@ -46,7 +46,7 @@
     margin-right:8%;
     display: flex;
     flex-direction: column;
-    width: 150px;
+    width: 190px;
     .title-id{
       color:rgba(51,59,74,0.5);
       font-size: 14px;

src/views/projectManage/projectList/projectViewDetails.vue

@@ -3,12 +3,12 @@
     <el-container>
       <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">
-              <span class="title-id">Project-{{ form_query.id }}</span>
-              <span class="title-name">项目 : {{ form_query.name }}</span>
-            </div>
-          </el-tooltip>
+          <div class="header-title">
+            <span class="title-id">PROJECT-{{ form_query.id }}</span>
+            <el-tooltip class="item" effect="dark" :content="form_query.name" placement="bottom">
+              <span class="title-name">项目-{{ form_query.name }}</span>
+            </el-tooltip>
+          </div>
           <el-dropdown placement="bottom" @command="handleCommand">
             <el-button size="mini" plainclass="el-dropdown-link drop_down">
               {{ form_query.statusString }}

src/views/projectManage/requirement/components/scheduleList.vue

@@ -92,7 +92,7 @@
 import Sortable from 'sortablejs'
 import moment from 'moment'
 import 'moment/locale/zh-cn'
-import { getTaskByRequireId } from '@/api/requirement.js'
+import { listByRequire } from '@/api/requirement.js'
 import { listByTask, scheduleDelete, sortForTask } from '@/api/projectViewDetails'
 import modifySchedule from './modifySchedule'
 import move from '@/assets/麻将@2x.png'
@@ -173,7 +173,8 @@ export default {
       return res.msg
     },
     async listByTask(id) { // 获取排期列表
-      const res = this.all ? await getTaskByRequireId(id) : await listByTask(id)
+      console.log(this.all)
+      const res = this.all ? await listByRequire(id) : await listByTask(id)
       if (res.code === 200) {
         this.scheduleList = res.data.schedulDetailResponses
         this.scheduleDetail = res.data || {}

src/views/projectManage/requirement/requirementDetail.vue

@@ -3,12 +3,12 @@
     <el-container>
       <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">
-              <span class="title-id">Requirement-{{ form_query.id }}</span>
-              <span class="title-name">需求 : {{ form_query.name }}</span>
-            </div>
-          </el-tooltip>
+          <div class="header-title">
+            <span class="title-id">REQUIREMENT-{{ form_query.id }}</span>
+            <el-tooltip class="item" effect="dark" :content="form_query.name" placement="bottom">
+              <span class="title-name">需求-{{ form_query.name }}</span>
+            </el-tooltip>
+          </div>
           <el-dropdown placement="bottom" @command="updateStatus">
             <el-button size="mini" plainclass="el-dropdown-link drop_down">
               {{ getStatus.msg }}
@@ -118,7 +118,7 @@
             <div class="title-left-name">需求计划</div>
           </div>
           <div>
-            <schedule-list :id="requirementId" :type-list="taskScheduleEvent" />
+            <schedule-list :id="requirementId" :type-list="taskScheduleEvent" :all="true" />
           </div>
         </section>
         <section class="main-section">

src/views/projectManage/taskList/taskViewDetail.vue

@@ -3,21 +3,22 @@
     <el-container>
       <el-header class="main-header">
         <div class="top-page-title">
-          <div v-if="form_query.stage >= 2" class="task-stage">
+          <div v-if="form_query.stage === 2 || form_query.stage === 3" class="task-stage">
             <div class="task-stage-main">
-              <img :src="stageImg">
+              <img v-if="form_query.stage === 2 || form_query.stage === 3" :src="stageImg">
+              <img v-if="form_query.stage === 1" :src="normalImg">
               <div class="task-stage-title">
                 <p class="task-stage-h1">{{ form_query.stageString }}</p>
                 <p class="task-stage-h2">{{ form_query.lateMsg }}</p>
               </div>
             </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">
-              <span class="title-id">Task-{{ form_query.id }}</span>
-              <span class="title-name">任务 : {{ form_query.name }}</span>
-            </div>
-          </el-tooltip>
+          <div class="header-title">
+            <span class="title-id">TASK-{{ form_query.id }}</span>
+            <el-tooltip class="item" effect="dark" :content="form_query.name" placement="bottom">
+              <span class="title-name">任务-{{ form_query.name }}</span>
+            </el-tooltip>
+          </div>
           <el-dropdown placement="bottom" @command="updateStatus">
             <el-button size="mini" plainclass="el-dropdown-link drop_down">
               {{ getStatus.msg }}
@@ -69,14 +70,10 @@
           <div class="detail-info">
             <el-form :inline="true" :model="form_query" class="demo-form-inline" label-position="right" label-width="100px">
               <el-form-item label="所属项目：">
-                <el-select v-model="form_query.projectId" placeholder="请选择" @change="changeArea">
-                  <el-option v-for="(item,index) in belongProjectList" :key="item.name + index" :label="item.name" :value="item.id" />
-                </el-select>
+                {{ form_query.projectName }}
               </el-form-item>
               <el-form-item label="所属需求：">
-                <el-select v-model="form_query.requireId" placeholder="请选择" @change="changeArea">
-                  <el-option v-for="(item,index) in requireList" :key="item.name + index" :label="item.name" :value="item.id" />
-                </el-select>
+                {{ form_query.requireName }}
               </el-form-item>
               <el-form-item label="所属模块：" class="module">
                 <span>{{ form_query.moduleInfoName }}</span>
@@ -136,8 +133,8 @@
             <ul class="comment-main">
               <li v-for="(item,index) in comments" :key="'comment'+index">
                 <span class="comment-name">{{ item.commentInfo.name }}</span>
-                <span class="comment-gmtCreater">{{ item.commentInfo.gmtCreater }}</span>
-                <span class="comment-content">{{ item.commentInfo.content }}</span><br>
+                <span class="comment-gmtCreater">{{ item.commentInfo.gmtCreater }}</span><br>
+                <span class="comment-content">{{ item.commentInfo.content }}</span>
               </li>
             </ul>
             <el-input
@@ -236,6 +233,7 @@ import TestReport from '@/views/Platform/presentation/Templates/TestReport' //
 import DailyReport from '@/views/Platform/presentation/Templates/DailyReport' // 日报
 import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
 import stage from '@/assets/detailPage/已完成@2x.png'
+import stage1 from '@/assets/detailPage/正常@2x.png'
 import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改（已上线/已提测/已准出）
 import bugTableDialog from '@/views/projectManage/bugList/details/bugTableDialog' // 缺陷表格
 export default {
@@ -267,6 +265,7 @@ export default {
   data() {
     return {
       stageImg: stage,
+      normalImg: stage1,
       activeName: '1', // 顶部tab切换
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),

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

@@ -1,7 +1,7 @@
 <template>
   <article v-if="showDetail" ref="show-schedule-detail" class="show-schedule-detail">
     <template v-if="nowDetailData && nowDetailData.origin === 0">
-      <div class="detail-title">【任务排期】{{ nowDetailData.name }}</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">【日程】{{ nowDetailData.name }}</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>

src/views/workbench/person/index.vue

@@ -108,7 +108,6 @@
           <MyFullCalendar
             v-show="activeSchedule === '1'"
             :events="calendarEvents"
-            @dateClick="dateClick"
             @change="queryWorkListByTime"
             @eventClick="showSchedule"
           >

src/views/workbench/team/index.vue

@@ -57,7 +57,6 @@
             :events="calendarEvents"
             :add-button="false"
             @change="queryTeamWorkListByTime"
-            @dateClick="dateClick"
             @eventClick="showSchedule"
           >
             <el-checkbox-group v-model="origin" class="origin">