Merge branch 'http_mock' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_mock

src/api/user.js

@@ -1,10 +1,5 @@
 import request from '@/utils/request'
-
-export const requestIp = 'http://10.179.209.19:8762'
-
-export const loginUrl = requestIp + '/sso/login'
-
-export const logoutUrl = requestIp + '/sso/logout'
+import { requestIp } from '@/apiConfig/requestIP'
 
 export function getUserInfo() {
   return request({

src/apiConfig/api.js

@@ -1,3 +1,5 @@
+import { requestIp } from './requestIP'
+
 /*eslint-disable*/   //规避eslint的检查，如没有eslint可不写
 export const mockUrl = 'http://10.179.24.176:8980' // 线下
 // export const mockUrl = 'http://10.179.24.123:8980' // 线上
@@ -13,4 +15,6 @@ export const TeamManagement = 'http://10.179.24.176:8990' // 团队配置 项目
 
 export const task_Url = 'http://10.179.24.176:8990' // 任务
 
-export const Presentation = 'http://10.179.24.176:8990' // 报告模块
+export const Presentation = 'http://10.179.24.176:8990' // 报告模块
+
+export const projectManagementUrl = requestIp + '/project_management' //项目管理

src/apiConfig/requestIP.js

@@ -0,0 +1,11 @@
+export let host = 'http://zhihui-test.intra.xiaojukeji.com'
+export let requestIp = host + '/localzuul'
+export let loginUrl = host + '/sso/login?jumpto=' + 'http://zhihui-test.intra.xiaojukeji.com' + location.pathname
+export let logoutUrl = host + '/sso/logout?jumpto=' + 'http://zhihui-test.intra.xiaojukeji.com' + location.pathname
+
+if (location.host.indexOf('localhost') < 0) {
+  host = 'http://' + location.host
+  requestIp = host + '/zuul'
+  loginUrl = host + '/sso/login?jumpto=' + location.href
+  logoutUrl = host + '/sso/logout?jumpto=' + location.href
+}

src/layout/components/Navbar.vue

@@ -19,7 +19,7 @@ import Hamburger from '@/components/Hamburger'
 // import navbarLogo from '@/icons/rabbit-logo.gif'
 import { settingQueryBizTypeList } from '@/api/settingQueryBizTypeList.js'
 import Utils from '../../util.js'
-// import { logoutUrl } from '@/api/user.js'
+// import { logoutUrl } from '@/apiConfig/requestIP.js'
 
 export default {
   components: {

src/layout/components/Sidebar/index.vue

@@ -52,7 +52,7 @@ import Logo from './Logo'
 import SidebarItem from './SidebarItem'
 import variables from '@/styles/variables.scss'
 import { getGlobalInterface } from '@/api/data.js'
-import { logoutUrl } from '@/api/user.js'
+import { logoutUrl } from '@/apiConfig/requestIP.js'
 
 export default {
   components: { SidebarItem, Logo },

src/utils/request.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 import { Message } from 'element-ui'
 // import store from '@/store'
 // import { getToken } from '@/utils/auth'
-import { loginUrl } from '@/api/user.js'
+import { loginUrl } from '@/apiConfig/requestIP.js'
 
 // create an axios instance
 const service = axios.create({

src/views/Platform/Workbench/TeamWorkbench.vue

@@ -158,7 +158,7 @@ export default {
         .head-line
           width 4px
           height 17px
-          background rgba(64,158,255,1)
+          background #409EFF
           border-radius 1px
           margin 0 10px 20px 0
 </style>

src/views/home/index.vue

@@ -274,7 +274,7 @@ img.img-arrow {
 <script>
 import FloatMenu from './floatMenu'
 import { getGlobalInterface } from '@/api/data.js'
-import { logoutUrl } from '@/api/user.js'
+import { logoutUrl } from '@/apiConfig/requestIP.js'
 
 export default {
   components: {

src/views/projectManage/dialog_vue.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="task">
     <el-dialog :visible.sync="dialogFormVisible" width="70%" :close-on-click-modal="false">
-      <div style="margin: 0% 7% 2% 7%; font-size: 18px; white-space: nowrap;color:rgba(51,59,74,1);">
-        <b style="color: #409EFF;margin: 0 0.5%;font-weight: 600; ">I</b>{{ tit_Name }}
+      <div style="display:flex;align-items: center;margin: 0% 7% 2% 4.5%;">
+        <div style="width:4px;height:17px;background:#409EFF;border-radius:1px;" />
+        <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">{{ tit_Name }}</div>
       </div>
-      <el-form ref="task_form" :model="task_form" :rules="task_rulesForm" label-position="right" style="margin: 0 3%;" label-width="120px">
+      <el-form ref="task_form" :model="task_form" :rules="task_rulesForm" label-position="right" style="margin-right: 3%;" label-width="120px">
         <el-form-item label="任务名称" prop="name" style="width: 100%">
           <el-input v-model="task_form.name" autocomplete="off" placeholder="请输入任务名称" />
         </el-form-item>

src/views/projectManage/projectList/projectIndex.vue

@@ -3,14 +3,14 @@
     <el-container>
       <el-header
         class="bgborder"
-        style=" margin: 1%;display:flex;align-items: center;justify-content: space-between;"
+        style="padding:0 20px 0 23.094px; margin: 1%;display:flex;align-items: center;justify-content: space-between;"
       >
-        <el-dropdown @command="handleCommand">
+        <el-dropdown placement="bottom" @command="handleCommand">
           <span class="el-dropdown-link drop_down" style="cursor: pointer;">
             {{ form_all.bizId }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
-          <el-dropdown-menu slot="dropdown" align="center">
+          <el-dropdown-menu slot="dropdown" align="center" class="requirement_el-dropdown-menu">
             <el-dropdown-item
               v-for="item in all_bizId"
               :key="item.id"
@@ -18,12 +18,12 @@
             >{{ item.bizName }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown @command="handleCommand">
+        <el-dropdown placement="bottom" @command="handleCommand">
           <span class="el-dropdown-link drop_down" style="cursor: pointer;">
             {{ form_all.bizType }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
-          <el-dropdown-menu slot="dropdown" align="center">
+          <el-dropdown-menu slot="dropdown" align="center" class="requirement_el-dropdown-menu">
             <el-dropdown-item
               v-for="item in arr_prjectType"
               :key="item.value"
@@ -31,12 +31,12 @@
             >{{ item.name }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown @command="handleCommand">
+        <el-dropdown placement="bottom" @command="handleCommand">
           <span class="el-dropdown-link drop_down" style="cursor: pointer;">
             {{ form_all.priority }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
-          <el-dropdown-menu slot="dropdown" align="center">
+          <el-dropdown-menu slot="dropdown" align="center" class="requirement_el-dropdown-menu">
             <el-dropdown-item
               v-for="item in arr_priority"
               :key="item.value"
@@ -93,7 +93,7 @@
       <el-main class="requirement-x" style="background-color: #ffffff; border-radius: 8px; margin: 0 1% 1% 1%;min-height: 86vh;padding:0 !important">
         <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:4px;height:17px;background:#409EFF;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
@@ -169,8 +169,9 @@
       </el-main>
     </el-container>
     <el-dialog :visible.sync="dialogFormVisible" width="70%" :close-on-click-modal="false">
-      <div style="margin: 0% 7% 2% 2%; font-size: 18px; white-space: nowrap;color:rgba(51,59,74,1);">
-        <b style="color: #409EFF;margin: 0 0.5%;font-weight: 600; ">I</b>{{ '新建项目' }}
+      <div style="margin: 0% 7% 2% 2.5%;display:flex;align-items: center;">
+        <div style="width:4px;height:17px;background:#409EFF;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-form
         ref="form"
@@ -568,7 +569,7 @@ export default {
   font-size: 14px;
   font-family: MicrosoftYaHei;
 }
-.requirement-x  .el-table .el-table__body tr:hover td { color: #409EFF; background: #EEF0F5; } /*hover时字体, 背景颜色*/
+.requirement-x  .el-table .el-table__body tr:hover td { color: #409EFF; background: #EDF6FF; } /*hover时字体, 背景颜色*/
 
 .bgborder .el-input__inner {
   border: none;
@@ -579,15 +580,22 @@ export default {
   color: #333333 !important;
 }
 
-.bgborder .drop_down{
-  font-size:14px
-}
-
 .bgborder .el-table .el-table__body tr:hover td {
   color: #409eff;
   background: #eef0f5;
 }
 
+.requirement_el-dropdown-menu {
+  max-height: 300px !important;
+  max-width: 200px;
+  overflow-y: auto !important;
+}
+
+.el-dropdown-menu__item:not(.is-disabled):hover {
+  background-color: #f6f7fa;
+  color: #606266;
+}
+
 .bgborder .el-input__icon {
   width: 77px !important;
 }
@@ -597,7 +605,7 @@ export default {
 }
 
 .drop_down {
-  font-size: 13px;
+  font-size: 14px;
   color: #333333;
 }
 .el-dialog__header {

src/views/projectManage/projectList/projectViewDetails.vue

@@ -32,7 +32,7 @@
         </span>
         <span style="float: right;">
           <el-button size="mini" @click="dele_pro()">删除项目</el-button>
-          <el-dropdown>
+          <el-dropdown placement="bottom" style="margin-left: 10px;">
             <el-button size="mini" type="primary">
               新建
               <i class="el-icon-arrow-down el-icon--right" />
@@ -49,7 +49,7 @@
           <el-row :gutter="20">
             <el-col :span="20">
               <div style="display:flex;align-items: center;margin-bottom:20px;margin: 10px 0 50px 20px;">
-                <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+                <div style="width:4px;height:17px;background:#409EFF;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-col>
@@ -58,31 +58,31 @@
           <div style="display: flex; justify-content: space-between; align-items: center;">
             <span style="text-align: center; margin-left: 10%">
               <p>需求数量</p>
-              <p style="font-size: 44px;">{{ form_query.requirementCount }}</p>
+              <p style="font-size: 72px;margin: 0">{{ form_query.requirementCount }}</p>
               <p>
-                <el-button size="mini" type="primary" @click="createDialogVisible = true">提需求</el-button>
+                <el-button size="mini" type="info" plain @click="createDialogVisible = true">提需求</el-button>
               </p>
             </span>
             <span style="text-align: center;">
               <p>任务数量</p>
-              <p style="font-size: 44px;">{{ form_query.taskCount }}</p>
+              <p style="font-size: 72px;margin: 0">{{ form_query.taskCount }}</p>
               <p>
-                <el-button size="mini" type="primary" @click="reated_task()">建任务</el-button>
+                <el-button size="mini" type="info" plain @click="reated_task()">建任务</el-button>
               </p>
             </span>
             <span style="text-align: center;margin-right:10%;">
               <p>Bug数量</p>
-              <p style="font-size: 44px;">{{ form_query.bugCount }}</p>
+              <p style="font-size: 72px;margin: 0">{{ form_query.bugCount }}</p>
               <p>
-                <el-button size="mini" type="primary" @click="created_bug">提bug</el-button>
+                <el-button size="mini" type="info" plain @click="created_bug">提bug</el-button>
               </p>
             </span>
           </div>
         </el-aside>
         <el-container>
           <el-main class="bgborder" style="margin: 0 2.1% 0 0;min-height: 50vh;overflow-x: hidden;">
-            <div style="display:flex;align-items: center;margin-bottom:20px;margin: 20px 0 20px 20px;">
-              <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+            <div style="display:flex;align-items: center;margin-bottom:20px;margin: 20px 0 0 20px;">
+              <div style="width:4px;height:17px;background:#409EFF;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-form
@@ -91,24 +91,26 @@
               style="margin: 0 4%;font-size: 14px;color: rgb(102, 102, 102);"
               :model="form_query"
             >
+              <div style="text-align: right;">
+                <el-button
+                  type="info"
+                  plain
+                  size="mini"
+                  @click="project_modifica(form_query)"
+                >修改</el-button>
+              </div>
               <el-row>
-                <el-col :span="5">项目类型:</el-col>
+                <el-col :span="6">项目类型:</el-col>
                 <el-col :span="18">
                   <div>{{ form_query.projectTypeStr }}</div>
-                  <el-button
-                    style="position: absolute;top: 5px;right: 0"
-                    type="primary"
-                    size="mini"
-                    @click="project_modifica(form_query)"
-                  >修改</el-button>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="4">业务线:</el-col>
+                <el-col :span="6">业务线:</el-col>
                 <el-col :span="18">{{ form_query.bizStr }}</el-col>
               </el-row>
               <el-row>
-                <el-col :span="4">优先级:</el-col>
+                <el-col :span="6">优先级:</el-col>
                 <el-col :span="18">{{ form_query.priorityStr }}</el-col>
               </el-row>
               <el-row>
@@ -128,7 +130,7 @@
                 <el-col :span="18">{{ form_query.testOwnerZh }}</el-col>
               </el-row>
               <el-row>
-                <el-col :span="5">项目描述:</el-col>
+                <el-col :span="6">项目描述:</el-col>
                 <el-col :span="18">
                   <div min-height="80px" style="white-space:pre-line; color: rgb(102, 102, 102);border:1px solid #BFC6DC; border-radius:8px; padding: 0 3%;height: 80px; overflow-y: auto;min-width:100%;">{{ form_query.description }}</div>
                 </el-col>
@@ -230,7 +232,7 @@
       <el-container>
         <el-aside class="bgborder" style="margin:0 1% 1% 1%;">
           <div style="display:flex;align-items: center;margin-bottom:20px;margin: 20px 0 20px 17px;">
-            <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+            <div style="width:4px;height:17px;background:#409EFF;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 ref="all_tasks" class="aside" style="color: #333B4A;" @click="get_allTask">全部任务</div>
@@ -287,7 +289,7 @@
         <el-container>
           <el-main class="bgborder" style=" margin: 0 1.3% 1.3% 0;min-height: 50vh;">
             <div style="display:flex;align-items: center;margin-bottom:20px;margin: 20px 0 20px 20px;">
-              <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+              <div style="width:4px;height:17px;background:#409EFF;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-table
@@ -315,7 +317,7 @@
               <el-table-column label="测试负责人" min-width="100" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.qaObject === null ? '' : scope.row.qaObject.name }}</template>
               </el-table-column>
-              <el-table-column label="任务进度" min-width="150" align="center">
+              <el-table-column label="任务进度" min-width="150" align="left">
                 <template slot-scope="scope">
                   <el-progress :percentage="Number(scope.row.rate && scope.row.rate.substring(0,4))" color="#409eff" />
                 </template>
@@ -565,6 +567,7 @@
     <!-- 弹窗 -->
     <openDialog v-if="dialog_open" ref="task_createdUpdata" />
     <requirement-create
+      class="diologPadding"
       title="新建需求"
       :data="requirement"
       :visible="createDialogVisible"
@@ -1113,6 +1116,13 @@ export default {
 }
 </script>
 <style lang="stylus">
+.diologPadding .el-dialog__body {
+  padding: 30px 70px 30px 20px
+}
+
+.diologPadding .el-dialog__footer {
+  padding: 10px 70px 20px
+}
 .bgborder .rotateNone {
   transform: rotate(90deg);
 }
@@ -1243,7 +1253,7 @@ export default {
 
 .bgborder .el-table .el-table__body tr:hover td { /* hover时字体, 背景颜色 */
   color: #409EFF;
-  background: #EEF0F5;
+  background: #EDF6FF;
   cursor: pointer;
 }
 

src/views/projectManage/requirement/details/index.vue

@@ -8,7 +8,7 @@
         >
           <el-button
             size="mini"
-            type="primary"
+            type="info"
             plain
             class="el-dropdown-link drop_down"
             style="cursor: pointer;"
@@ -25,15 +25,15 @@
           </el-dropdown-menu>
         </el-dropdown>
         <div style="display: inline-block;float: right">
-          <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>
+          <el-button size="mini" type="info" plain style="margin-left: 10px" @click="deleteRequirement">删除需求</el-button>
+          <el-button type="primary" size="mini" @click="createTask">新建任务</el-button>
         </div>
       </div>
     </el-header>
     <el-container>
       <el-aside width="52%" style="margin: 0% 1% 1% 1%;" class="layout_aside">
         <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:4px;height:17px;background:#409EFF;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%">
@@ -77,11 +77,19 @@
       </el-aside>
       <el-aside width="45%" style="margin: 0% 1% 1% 0;" class="layout_aside">
         <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:4px;height:17px;background:#409EFF;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 style="text-align: right;">
+          <el-button
+            type="info"
+            plain
+            size="mini"
+            @click="updateDialogVisible = true"
+          >修改</el-button>
+        </div>
         <div
-          style="font-size: 14px;color: #666666;margin-top: 4%"
+          style="font-size: 14px;color: #666666"
           class="div_requirment_info"
         >
           <el-row>
@@ -91,38 +99,32 @@
                 style="display: inline-block;color: #409EFF;cursor: pointer;"
                 @click="jumpTaskDetal(requirement.belongingProject)"
               >{{ requirement.belongingProjectName }}</div>
-              <el-button
-                style="position: absolute;top: 5px;right: 0"
-                type="primary"
-                size="mini"
-                @click="updateDialogVisible = true"
-              >修改</el-button>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4">业务线:</el-col>
+            <el-col :span="6">业务线:</el-col>
             <el-col :span="18">{{ requirement.bizName }}</el-col>
           </el-row>
           <el-row>
-            <el-col :span="4">优先级:</el-col>
+            <el-col :span="6">优先级:</el-col>
             <el-col :span="18">{{ requirement.priorityName }}</el-col>
           </el-row>
           <el-row>
-            <el-col :span="5">需求来源:</el-col>
+            <el-col :span="6">需求来源:</el-col>
             <el-col :span="18">{{ requirement.sourceTypeName }}</el-col>
           </el-row>
           <el-row>
-            <el-col :span="2">PM:</el-col>
+            <el-col :span="6">PM:</el-col>
             <el-col :span="18">{{ getPmName() }}</el-col>
           </el-row>
           <el-row>
-            <el-col :span="5">PRD链接:</el-col>
+            <el-col :span="6">PRD链接:</el-col>
             <el-col :span="18">
               <el-link type="primary" :href="requirement.mrdUrl">{{ requirement.mrdUrl }}</el-link>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="5">是否跟版:</el-col>
+            <el-col :span="6">是否跟版:</el-col>
             <el-col :span="18">{{ requirement.dependOnRelease? '是':'否' }}</el-col>
           </el-row>
           <el-row v-if="requirement.dependOnRelease">
@@ -134,7 +136,7 @@
     </el-container>
     <el-main id="requirement_details" style="margin: 0 1%;padding: 0" class="layout_main">
       <div style="display:flex;align-items: center;margin: 2% 0 0 2%;">
-        <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+        <div style="width:4px;height:17px;background:#409EFF;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">
@@ -203,7 +205,7 @@
     </el-main>
     <el-main style="margin: 1%;padding: 2% !important;" class="layout_main requirement_details_layout_main">
       <div style="display:flex;align-items: center;margin-bottom:20px">
-        <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+        <div style="width:4px;height:17px;background:#409EFF;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>
@@ -371,7 +373,15 @@ export default {
             barWidth: '60%',
             label: {
               show: true,
-              position: 'inside'
+              position: 'inside',
+              formatter: function(params) {
+                // 如果值大于0 正常显示，否则不显示
+                if (params.value > 0) {
+                  return params.value
+                } else {
+                  return ''
+                }
+              }
             },
             data: []
           }
@@ -434,7 +444,15 @@ export default {
             barWidth: '60%',
             label: {
               show: true,
-              position: 'inside'
+              position: 'inside',
+              formatter: function(params) {
+                // 如果值大于0 正常显示，否则不显示
+                if (params.value > 0) {
+                  return params.value
+                } else {
+                  return ''
+                }
+              }
             },
             data: []
           }

src/views/projectManage/requirement/list/create.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-dialog :visible.sync="isVisible" width="70%" :close-on-click-modal="false">
+  <el-dialog :visible.sync="isVisible" width="70%" style="padding: 30px 75px 30px 20px;" :close-on-click-modal="false">
     <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:4px;height:17px;background:#409EFF;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">

src/views/projectManage/requirement/list/index.vue

@@ -2,8 +2,8 @@
   <div style="width:100%;height:100%;padding-top:1px;background-color: #F2F3F6;">
     <div class="container">
       <el-header class="requirement-header" style=" margin: 1%;display:flex;align-items: center;justify-content: space-between;">
-        <el-dropdown @command="handleCommand">
-          <span class="el-dropdown-link">
+        <el-dropdown placement="bottom" @command="handleCommand">
+          <span class="el-dropdown-link drop_down">
             {{ getTitle(searchTitle.project) }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
@@ -15,8 +15,8 @@
             >{{ item.msg }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown @command="handleCommand">
-          <span class="el-dropdown-link">
+        <el-dropdown placement="bottom" @command="handleCommand">
+          <span class="el-dropdown-link drop_down">
             {{ getTitle(searchTitle.businessline) }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
@@ -28,8 +28,8 @@
             >{{ item.msg }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown @command="handleCommand">
-          <span class="el-dropdown-link">
+        <el-dropdown placement="bottom" @command="handleCommand">
+          <span class="el-dropdown-link drop_down">
             {{ getTitle(searchTitle.source) }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
@@ -41,8 +41,8 @@
             >{{ item.msg }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown @command="handleCommand">
-          <span class="el-dropdown-link">
+        <el-dropdown placement="bottom" @command="handleCommand">
+          <span class="el-dropdown-link drop_down">
             {{ getTitle(searchTitle.priority) }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
@@ -101,7 +101,7 @@
         <el-main class="requirement-main">
           <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:4px;height:17px;background:#409EFF;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
@@ -353,10 +353,14 @@ export default {
 </script>
 
 <style scoped>
-.el-dropdown-link {
+/* .el-dropdown-link {
   white-space: nowrap;
   cursor: pointer;
   color: #333333;
+} */
+.drop_down {
+  font-size: 14px;
+  color: #333333;
 }
 .el-icon-arrow-down {
   font-size: 12px;
@@ -365,7 +369,7 @@ export default {
   margin: 1%;
   background-color: #ffffff;
   border-radius: 8px;
-  line-height: 60px;
+  /* line-height: 60px; */
 }
 .requirement-main {
   margin: 0 1%;
@@ -392,7 +396,7 @@ export default {
 .requirement-header .el-input__inner {
   border: none;
 }
-#requirement_basicName1::-webkit-input-placeholder {
+/* #requirement_basicName1::-webkit-input-placeholder {
   color: #333333;
 }
 #requirement_basicName2::-webkit-input-placeholder {
@@ -400,14 +404,20 @@ export default {
 }
 #requirement_basicName3::-webkit-input-placeholder {
   color: #333333;
-}
+} */
 .requirement-main .el-table .cell {
   padding: 5px 0;
   font-size: 14px;
   font-family: MicrosoftYaHei;
 }
-.requirement-main .el-table .el-table__body tr:hover td { color: #409EFF; background: #EEF0F5; } /*hover时字体, 背景颜色*/
-.requirement_el-dropdown-menu {
+.requirement-main .el-table .el-table__body tr:hover td { color: #409EFF; background: #EDF6FF; } /*hover时字体, 背景颜色*/
+.requirement_el-dropdown-menu .el-dropdown-menu{
   max-height: 300px !important;
-  overflow: auto !important;}
+  max-width: 200px;
+  overflow-y: auto !important;
+  }
+  .el-dropdown-menu__item:not(.is-disabled):hover {
+  background-color: #f6f7fa;
+  color: #606266;
+}
 </style>

src/views/projectManage/taskList/taskIndex.vue

@@ -24,12 +24,12 @@
             <span style="float: right; color: #8492a6; font-size: 13px,">{{ item.id }}</span>
           </el-option>
         </el-select>
-        <el-dropdown @command="handleCommand">
+        <el-dropdown placement="bottom" @command="handleCommand">
           <span class="el-dropdown-link drop_down" style="cursor: pointer;">
             {{ form_task.project_label }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
-          <el-dropdown-menu slot="dropdown" align="center">
+          <el-dropdown-menu slot="dropdown" align="center" class="requirement_el-dropdown-menu">
             <el-dropdown-item
               v-for="item in projectList"
               :key="item.value"
@@ -37,12 +37,12 @@
             >{{ item.msg }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown @command="handleCommand">
+        <el-dropdown placement="bottom" @command="handleCommand">
           <span class="el-dropdown-link drop_down" style="cursor: pointer;">
             {{ form_task.demand_label }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
-          <el-dropdown-menu slot="dropdown" align="center">
+          <el-dropdown-menu slot="dropdown" align="center" class="requirement_el-dropdown-menu">
             <el-dropdown-item
               v-for="item in demandList"
               :key="item.value"
@@ -50,13 +50,13 @@
             >{{ item.msg }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown @command="handleCommand">
+        <el-dropdown placement="bottom" @command="handleCommand">
           <!--是否免测-->
           <span class="el-dropdown-link drop_down" style="cursor: pointer;">
             {{ form_task.noTest_label }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
-          <el-dropdown-menu slot="dropdown" align="center">
+          <el-dropdown-menu slot="dropdown" align="center" class="requirement_el-dropdown-menu">
             <el-dropdown-item
               v-for="item in noTest"
               :key="item.code"
@@ -64,13 +64,13 @@
             >{{ item.msg }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown @command="handleCommand">
+        <el-dropdown placement="bottom" @command="handleCommand">
           <!--业务线-->
           <span class="el-dropdown-link drop_down" style="cursor: pointer;">
             {{ form_task.bizId_label }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
-          <el-dropdown-menu slot="dropdown" align="center">
+          <el-dropdown-menu slot="dropdown" align="center" class="requirement_el-dropdown-menu">
             <el-dropdown-item
               v-for="item in BusinessLine"
               :key="item.value"
@@ -78,12 +78,12 @@
             >{{ item.name }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown @command="handleCommand">
+        <el-dropdown placement="bottom" @command="handleCommand">
           <span class="el-dropdown-link drop_down" style="cursor: pointer;">
             {{ form_task.platform_label }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
-          <el-dropdown-menu slot="dropdown" align="center">
+          <el-dropdown-menu slot="dropdown" align="center" class="requirement_el-dropdown-menu">
             <el-dropdown-item
               v-for="item in arr_platform"
               :key="item.value"
@@ -91,12 +91,12 @@
             >{{ item.name }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-dropdown @command="handleCommand">
+        <el-dropdown placement="bottom" @command="handleCommand">
           <span class="el-dropdown-link drop_down" style="cursor: pointer;">
             {{ form_task.Modular_label }}
             <i class="el-icon-arrow-down el-icon--right" />
           </span>
-          <el-dropdown-menu slot="dropdown" align="center">
+          <el-dropdown-menu slot="dropdown" align="center" class="requirement_el-dropdown-menu">
             <el-dropdown-item
               v-for="item in arr_Modular"
               :key="item.value"
@@ -183,7 +183,7 @@
       <el-main class="requirement-xx" style=" background-color: #ffffff; border-radius: 8px; margin: 0 1% 1%;min-height: 86vh;padding:0 !important">
         <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:4px;height:17px;background:#409EFF;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
@@ -209,10 +209,10 @@
               <div style="cursor: pointer;" @click="link_task(scope.row.id)">{{ scope.row.name }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="归属项目" min-width="100" align="center" show-overflow-tooltip>
+          <el-table-column label="归属项目" min-width="150" align="center" show-overflow-tooltip>
             <template slot-scope="scope">{{ scope.row.projectName }}</template>
           </el-table-column>
-          <el-table-column label="归属需求" min-width="100" align="center" show-overflow-tooltip>
+          <el-table-column label="归属需求" min-width="150" align="center" show-overflow-tooltip>
             <template slot-scope="scope">{{ scope.row.requireName }}</template>
           </el-table-column>
           <el-table-column label="业务线" min-width="100" align="center">
@@ -504,7 +504,7 @@ export default {
   font-size: 14px;
   font-family: MicrosoftYaHei;
 }
-.requirement-xx  .el-table .el-table__body tr:hover td { color: #409EFF; background: #EEF0F5; } /*hover时字体, 背景颜色*/
+.requirement-xx  .el-table .el-table__body tr:hover td { color: #409EFF; background: #EDF6FF; } /*hover时字体, 背景颜色*/
 
 .footer {
   text-align: right;
@@ -528,11 +528,6 @@ export default {
   color: #333333 !important;
 }
 
-.bgborder .el-table .el-table__body tr:hover td {
-  color: #409eff;
-  background: #eef0f5;
-} /*hover时字体, 背景颜色*/
-
 .bgborder .el-input__icon {
   width: 77px !important;
 }
@@ -549,10 +544,14 @@ export default {
   font-size: 14px;
   color: #333333;
 }
-
-.el-dropdown-menu {
+.requirement_el-dropdown-menu {
   max-height: 300px !important;
-  max-width: 20%;
-  overflow-x: auto;
+  max-width: 200px;
+  overflow: auto !important;
 }
+.el-dropdown-menu__item:not(.is-disabled):hover {
+  background-color: #f6f7fa;
+  color: #606266;
+}
+
 </style>

src/views/projectManage/taskList/taskViewDetails.vue

@@ -19,7 +19,7 @@
           <el-dropdown @command="handleCommand">
             <el-button
               size="mini"
-              type="primary"
+              type="info"
               plain
               class="el-dropdown-link drop_down"
               style="cursor: pointer;margin-left:15px"
@@ -38,9 +38,9 @@
           </el-dropdown>
         </div>
         <span style="float: right;">
-          <el-button size="mini" type="primary" plain @click="centerDialogVisible_task = true">删除任务</el-button>
-          <el-dropdown>
-            <el-button size="mini" type="primary" plain>
+          <el-button size="mini" type="info" plain @click="centerDialogVisible_task = true">删除任务</el-button>
+          <el-dropdown placement="bottom" style="margin-left: 10px;">
+            <el-button size="mini" type="primary">
               新建
               <i class="el-icon-arrow-down el-icon--right" />
             </el-button>
@@ -56,7 +56,7 @@
       <el-container>
         <el-aside class="bgborder" style="overflow: hidden; margin:0 1%;minWidth: 55%;">
           <div style="display:flex;align-items: center;margin-bottom:20px;margin: 20px 0 50px 20px;">
-            <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+            <div style="width:4px;height:17px;background:#409EFF;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 style="display: flex; justify-content: space-between; align-items: center;">
@@ -77,19 +77,27 @@
             class="bgborder form_e"
             style="overflow: hidden;margin: 0 2.1% 0 0;min-height: 50vh;"
           >
-            <div style="display:flex;align-items: center;margin-bottom:20px;margin: 20px 0 20px 20px;">
-              <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+            <div style="display:flex;align-items: center;margin-bottom:20px;margin: 20px 0 0 20px;">
+              <div style="width:4px;height:17px;background:#409EFF;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-form
               label-position="left"
-              label-width="100px"
+              label-width="150px"
               style="margin: 0 4%;font-size: 14px;color: rgb(102, 102, 102);"
               :model="task_form"
             >
+              <div style="text-align: right;">
+                <el-button
+                  type="info"
+                  plain
+                  size="mini"
+                  @click="open_created(task_form.describe)"
+                >修改</el-button>
+              </div>
               <el-row :gutter="20">
                 <el-col :span="19">
-                  <el-form-item label="所属项目：" label-width="90px" style="word-break: break-all;">
+                  <el-form-item label="所属项目：" label-width="150px" style="word-break: break-all;">
                     <span
                       v-show="task_form.projectName !== '无归属项目'"
                       style="color: #409EFF;cursor: pointer;"
@@ -100,16 +108,8 @@
                     >{{ task_form.projectName }}</span>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1">
-                  <el-button
-                    style="margin-top:6px"
-                    size="mini"
-                    type="primary"
-                    @click="open_created(task_form.describe)"
-                  >修 改</el-button>
-                </el-col>
               </el-row>
-              <el-form-item label="所属需求：" label-width="90px">
+              <el-form-item label="所属需求：" label-width="150px">
                 <span
                   v-show="task_form.requireName !== '无归属需求'"
                   style="color: #409EFF;cursor: pointer;"
@@ -123,11 +123,11 @@
                 label="业务线/平台/模块："
                 label-width="150px"
               >{{ task_form.bizIdString }} / {{ task_form.typeString }} / {{ task_form.clientTypeString }}</el-form-item>
-              <el-form-item label="是否免测：" label-width="90px">{{ task_form.noTestString }}</el-form-item>
-              <el-form-item label="开发负责人：" label-width="100px">{{ task_form.rdObject === null? '' : task_form.rdObject.name }}</el-form-item>
-              <el-form-item label="测试负责人：" label-width="100px">{{ task_form.qaObject === null? '' : task_form.qaObject.name }}</el-form-item>
-              <el-form-item label="涉及的客户端：" label-width="120px">{{ task_form.involveAppString }}</el-form-item>
-              <el-form-item label="技术文档：" label-width="90px" style="word-break: break-all;">
+              <el-form-item label="是否免测：" label-width="150px">{{ task_form.noTestString }}</el-form-item>
+              <el-form-item label="开发负责人：" label-width="150px">{{ task_form.rdObject === null? '' : task_form.rdObject.name }}</el-form-item>
+              <el-form-item label="测试负责人：" label-width="150px">{{ task_form.qaObject === null? '' : task_form.qaObject.name }}</el-form-item>
+              <el-form-item label="涉及的客户端：" label-width="150px">{{ task_form.involveAppString }}</el-form-item>
+              <el-form-item label="技术文档：" label-width="150px" style="word-break: break-all;">
                 <span
                   style="color: #409EFF;cursor: pointer;"
                   @click="devUrl_tow(2, task_form.devUrl)"
@@ -139,7 +139,7 @@
       </el-container>
       <el-header class="bgborder" style="margin: 1%;height: auto; padding: 0;">
         <div style="display:flex;align-items: center;margin-bottom:20px;margin: 20px 0 20px 20px;">
-          <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+          <div style="width:4px;height:17px;background:#409EFF;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-row :gutter="20" style="margin: 2% 3%">
@@ -787,6 +787,10 @@ export default {
           xAxis: {
             type: 'category',
             data: this.echarts_name,
+            axisTick: {
+              alignWithLabel: true,
+              show: false
+            },
             axisLine: { show: true, lineStyle: { type: 'dashed' }}
           },
           yAxis: [
@@ -805,7 +809,15 @@ export default {
               itemStyle: { normal: { color: '#409EFF' }},
               label: {
                 show: true,
-                position: 'inside'
+                position: 'inside',
+                formatter: function(params) {
+                // 如果值大于0 正常显示，否则不显示
+                  if (params.value > 0) {
+                    return params.value
+                  } else {
+                    return ''
+                  }
+                }
               }
             }
           ]

src/views/projectManage/taskList/versionsCalendar.vue

@@ -19,7 +19,7 @@
       <el-main class="bgborder" style=" margin: 0 1% 1% 1%;min-height: 120.5vh;padding:0 !important">
         <div style="display:flex;align-items: center;margin:24.094px;justify-content: space-between;">
           <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:4px;height:17px;background:#409EFF;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" style="float:right" size="mini" @click="adds()">版本管理</el-button>

src/views/projectManage/version/list/index.vue

@@ -37,7 +37,7 @@
       </el-header>
       <el-main class="layout_main version_list_layout_main">
         <div style="display:flex;align-items: center;padding:20px">
-          <div style="width:4px;height:17px;background:rgba(64,158,255,1);border-radius:1px;" />
+          <div style="width:4px;height:17px;background:#409EFF;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-table
@@ -48,16 +48,20 @@
           :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF',textAlign: 'center'}"
           :cell-style="{textAlign: 'center'}"
         >
-          <el-table-column prop="priority" label="优先级" min-width="6%">
+          <el-table-column prop="priority" label="优先级" min-width="7%">
             <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="requirementName" label="需求名称" min-width="20%">
+          <el-table-column prop="requirementName" label="需求名称" min-width="30%">
             <template v-slot="scope">
-              <div style="cursor: pointer;" @click="getToRequirementDetails(scope.row.id)">
-                {{ scope.row.requirementName }}
-                <div v-if="scope.row.delay" class="div_requirement_name">{{ searchTitle.version +'版本已延期' }}</div>
+              <div>
+                <el-tooltip class="item" effect="dark" placement="bottom" :content="scope.row.requirementName" :disabled="scope.row.requirementName.length < 6">
+                  <div style="cursor: pointer;" @click="getToRequirementDetails(scope.row.id)">
+                    {{ getRequirementName(scope.row.requirementName) }}
+                    <div v-if="scope.row.delay" class="div_requirement_name">{{ searchTitle.version +'版本已延期' }}</div>
+                  </div>
+                </el-tooltip>
               </div>
             </template>
           </el-table-column>
@@ -81,7 +85,7 @@
               />
             </template>
           </el-table-column>
-          <el-table-column prop="statusInfoHealthyList" label="任务健康分布" min-width="30%">
+          <el-table-column prop="statusInfoHealthyList" label="任务健康分布" min-width="32%">
             <template v-slot="scope">
               <version-chart
                 :chart-id="'taskHealthCount' + scope.$index"
@@ -93,7 +97,7 @@
         </el-table>
         <el-pagination
           background
-          layout="->,total, sizes, prev, pager, next, jumper"
+          layout="->,total, prev, pager, next, jumper"
           :current-page="searchForm.curIndex"
           :page-size="searchForm.pageSize"
           :page-sizes="[15,30,45,total]"
@@ -141,7 +145,7 @@ export default {
         taskStageMap: {}
       },
       taskOptionTemplate: {
-        color: ['#69B3FF'],
+        color: ['#409EFF'],
         title: {
           show: false
         },
@@ -197,7 +201,15 @@ export default {
             barWidth: '60%',
             label: {
               show: true,
-              position: 'inside'
+              position: 'inside',
+              formatter: function(params) {
+                // 如果值大于0 正常显示，否则不显示
+                if (params.value > 0) {
+                  return params.value
+                } else {
+                  return ''
+                }
+              }
             },
             data: []
           }
@@ -261,7 +273,16 @@ export default {
             barWidth: '60%',
             label: {
               show: true,
-              position: 'inside'
+              position: 'inside',
+              formatter: function(params) {
+                // 如果值大于0 正常显示，否则不显示
+                if (params.value > 0) {
+                  console.log(params)
+                  return params.value
+                } else {
+                  return ''
+                }
+              }
             },
             data: []
           }
@@ -338,6 +359,7 @@ export default {
       this.taskOptionList = []
       for (const i in data) {
         const option = JSON.parse(JSON.stringify(this.taskOptionTemplate))
+        option.series[0].label.formatter = this.formatter
         for (const j in data[i].statusInfoCountList) {
           option.xAxis[0].data.push(data[i].statusInfoCountList[j].statusString)
           option.series[0].data.push(data[i].statusInfoCountList[j].count)
@@ -349,6 +371,7 @@ export default {
       this.taskHealthOptionList = []
       for (const i in data) {
         const option = JSON.parse(JSON.stringify(this.taskHealthOptionTemplate))
+        option.series[0].label.formatter = this.formatter
         for (const j in data[i].statusInfoHealthyList) {
           option.xAxis[0].data.push(data[i].statusInfoHealthyList[j].statusString)
           const item = {
@@ -362,6 +385,14 @@ export default {
         this.taskHealthOptionList.push(option)
       }
     },
+    formatter: function(params) {
+      // 如果值大于0 正常显示，否则不显示
+      if (params.value > 0) {
+        return params.value
+      } else {
+        return ''
+      }
+    },
     showAppClientEnum() {
       showAppClientEnum()
         .then(res => {
@@ -403,6 +434,16 @@ export default {
             this.$message.warning(res.msg)
           }
         })
+    },
+    getRequirementName(name) {
+      let requirementName = name
+      if (name) {
+        if (name.length > 5) {
+          requirementName = requirementName.substring(0, 6) + '......'
+        }
+      }
+      requirementName += ' '
+      return requirementName
     }
   }
 }
@@ -437,6 +478,7 @@ export default {
   margin: auto;
 }
 .div_requirement_name {
+  display: inline-block;
   width:fit-content;
   margin: auto;
   padding: 0px 5px 0 10px;