panxiandiao_i 5 年之前
父節點
當前提交
7f3f5fca4e

+ 1 - 1
src/views/Platform/Workbench/TeamWorkbench.vue

@@ -86,7 +86,7 @@ export default {
       const param = { appType: val, startTime: dayjs().subtract(1, 'month'), endTime: dayjs().add(1, 'month') }
       releaseScheduleList(param).then((res) => {
         if (res.code === 200) {
-          this.appVersion = versionDeal(res.data, val, this.optionsRelease)
+          this.appVersion = res.data ? versionDeal(res.data, val, this.optionsRelease) : {}
         } else {
           this.errFun(res.msg)
         }

+ 30 - 16
src/views/projectManage/requirement/details/index.vue

@@ -4,12 +4,18 @@
       <div>
         <span style="font-size: 16px;color:#333333">{{ '需求:' + requirement.name }}</span>
         <el-dropdown
-          size="mini"
-          split-button
-          style="margin-left: 10px"
           @command="updateRequirementStatus"
         >
-          <span class="el-dropdown-link">{{ getStatusName() }}</span>
+          <el-button
+            size="mini"
+            type="primary"
+            plain
+            class="el-dropdown-link drop_down"
+            style="cursor: pointer;"
+          >
+            <span class="el-dropdown-link">{{ getStatusName() }}</span>
+            <i class="el-icon-arrow-down el-icon--right" />
+          </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
               v-for="(item,index) in searchInfo.requirementStatus"
@@ -19,15 +25,16 @@
           </el-dropdown-menu>
         </el-dropdown>
         <div style="display: inline-block;float: right">
-          <el-button size="mini" style="margin-left: 10px" @click="deleteRequirement">删除需求</el-button>
-          <el-button type="primary" size="mini" @click="createTask">新建</el-button>
+          <el-button size="mini" type="primary" plain style="margin-left: 10px" @click="deleteRequirement">删除需求</el-button>
+          <el-button type="primary" plain size="mini" @click="createTask">新建</el-button>
         </div>
       </div>
     </el-header>
     <el-container>
       <el-aside width="52%" style="margin: 0% 2% 2% 2%;" class="layout_aside">
-        <div style="font-size: 18px">
-          <b style="color: #409EFF">I</b>数据统计
+        <div style="display:flex;align-items: center;">
+          <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+          <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">数据统计</div>
         </div>
         <div v-loading="loading.task || loading.bug" class="div_statistics" style="margin: 2%">
           <el-container style="border-bottom: 1px solid #D8D8D8">
@@ -69,8 +76,9 @@
         </div>
       </el-aside>
       <el-aside width="42%" style="margin: 0% 2% 2% 0;" class="layout_aside">
-        <div style="font-size: 18px">
-          <b style="color: #409EFF;">I</b>基础信息
+        <div style="display:flex;align-items: center;">
+          <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+          <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">基础信息</div>
         </div>
         <div
           v-loading="loading.info"
@@ -81,7 +89,8 @@
             <el-col :span="6">归属的项目:</el-col>
             <el-col :span="18">
               <div
-                style="display: inline-block;color: #409EFF"
+                style="display: inline-block;color: #409EFF;cursor: pointer;"
+                @click="jumpTaskDetal(requirement.id)"
               >{{ requirement.belongingProjectName }}</div>
               <el-button
                 style="position: absolute;top: 5px;right: 0"
@@ -125,8 +134,9 @@
       </el-aside>
     </el-container>
     <el-main id="requirement_details" style="margin: 0 2% 0 2%;padding: 0" class="layout_main">
-      <div style="font-size: 18px;margin: 2%">
-        <b style="color: #409EFF;">I</b>任务
+      <div style="display:flex;align-items: center;margin: 15px 0 0 20px;">
+        <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+        <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">任务</div>
       </div>
       <el-radio-group v-model="radio" size="mini" style="float: right;margin: 0 1% 1% 0">
         <el-radio-button label="列表" />
@@ -178,7 +188,7 @@
           <template v-slot="scope">{{ getQaOrRdNameList(scope.row.qaList) }}</template>
         </el-table-column>
       </el-table>
-      <gantt v-else :versions="ganttVersions" :table-data="ganttTableData" :string-type="'任务'" />
+      <gantt v-if="radio === '甘特图' && ganttTableData" :versions="ganttVersions" :table-data="ganttTableData" :string-type="'任务'" />
       <div style="margin:0 2%;padding: 2% 0;border-bottom: 1px solid #D8D8D8;font-size: 14px;color: #333333">排期汇总:{{ getScheduleCollect() }}</div>
       <el-row style="margin: 2%;font-size: 14px;color: #333333">
         <el-col :span="8">
@@ -190,8 +200,9 @@
       </el-row>
     </el-main>
     <el-main style="margin: 2%;" class="layout_main requirement_details_layout_main">
-      <div style="font-size: 18px;margin-bottom: 2%">
-        <b style="color: #409EFF;">I</b>评论
+      <div style="display:flex;align-items: center;">
+        <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+        <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">评论</div>
       </div>
       <div>
         <div v-for="(item,index) in comments" :key="index" class="animated bounceInRight">
@@ -484,6 +495,9 @@ export default {
     getStatusName() {
       return this.requirementStatusOb[this.requirement.status]
     },
+    jumpTaskDetal(id) {
+      this.$router.push({ name: '项目详情', query: { id: id }})
+    },
     getRequirementById() {
       this.loading.info = true
       return getRequirementById({

+ 5 - 1
src/views/projectManage/requirement/list/create.vue

@@ -1,5 +1,9 @@
 <template>
-  <el-dialog :title="title" :visible.sync="isVisible" width="60%">
+  <el-dialog :visible.sync="isVisible" width="60%">
+    <div style="display:flex;align-items: center;margin: 5px 0px 25px 42px;">
+      <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+      <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">{{ title }}</div>
+    </div>
     <el-form :model="form" :rules="rules" label-position="right" label-width="120px">
       <el-form-item label="需求名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入需求名称" />

+ 17 - 14
src/views/projectManage/requirement/list/index.vue

@@ -112,8 +112,11 @@
       </el-row>
     </el-header>
     <el-main class="requirement-main">
-      <div style="font-size: 18px;margin: 2%">
-        <b style="color: #409EFF;">I</b>版本列表
+      <div style="font-size: 18px;margin: 2%;display:flex;justify-content:space-between;align-items: center;">
+        <div style="display:flex;justify-content: center;align-items: center;">
+          <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+          <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">需求列表</div>
+        </div>
         <el-button
           type="primary"
           size="mini"
@@ -127,43 +130,43 @@
         :data="tableData"
         style="width: 100%"
         highlight-current-row
-        :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF',textAlign: 'center'}"
-        :cell-style="{textAlign: 'center'}"
+        :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF'}"
+        size="mini"
       >
-        <el-table-column prop="priority" label="优先级" sortable min-width="8%">
+        <el-table-column prop="priority" label="优先级" width="100" sortable align="center">
           <template v-slot="scope">
             <div class="div_priority" :style="{background: priorityColors[scope.row.priority % priorityColors.length]}">{{ 'P'+scope.row.priority }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="name" label="需求名称" min-width="18%">
+        <el-table-column prop="name" label="需求名称" show-overflow-tooltip width="400">
           <template v-slot="scope">
             <div style="cursor: pointer;" @click="getToRequirementDetails(scope.row.id)">{{ scope.row.name }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="bizId" label="业务线" min-width="10%">
+        <el-table-column prop="bizId" label="业务线" show-overflow-tooltip align="center">
           <template v-slot="scope">
             {{ getBizName(scope.row.bizId) }}
           </template>
         </el-table-column>
-        <el-table-column prop="sourceType" label="需求来源" min-width="10%">
+        <el-table-column prop="sourceType" label="需求来源" show-overflow-tooltip align="center">
           <template v-slot="scope">
             {{ sourceTypeOb[scope.row.sourceType] }}
           </template>
         </el-table-column>
-        <el-table-column prop="belongingProjectName" label="归属的项目" min-width="10%">
+        <el-table-column prop="belongingProjectName" label="归属的项目" show-overflow-tooltip align="center">
           <template v-slot="scope">
             {{ getProjectName(scope.row.belongingProject) }}
           </template>
         </el-table-column>
-        <el-table-column prop="pm" label="PM" min-width="10%">
+        <el-table-column prop="pm" label="PM" show-overflow-tooltip align="center">
           <template v-slot="scope">
             {{ scope.row.pm[0]?scope.row.pm[0].name:'无' }}
           </template>
         </el-table-column>
-        <el-table-column prop="taskCount" label="任务总数" min-width="8%" />
-        <el-table-column prop="bugCount" label="bug总数" min-width="8%" />
-        <el-table-column prop="creator" label="创建人" min-width="8%" />
-        <el-table-column prop="createTime" label="创建时间" min-width="8%">
+        <el-table-column prop="taskCount" label="任务总数" show-overflow-tooltip align="center" />
+        <el-table-column prop="bugCount" label="bug总数" show-overflow-tooltip align="center" />
+        <el-table-column prop="creator" label="创建人" show-overflow-tooltip align="center" />
+        <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip align="center">
           <template v-slot="scope">{{ getcreateTime(scope.row.createTime) }}</template>
         </el-table-column>
       </el-table>