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

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

src/router/index.js

@@ -649,14 +649,14 @@ export const constantRoutes = [{
     }
     ]
   },
-  {
-    path: '/apiManagement',
-    // hidden: true,
-    component: () =>
-          import('@/views/apiManagement/index'),
-    name: '接口管理',
-    meta: { title: '接口管理' }
-  },
+  // {
+  //   path: '/apiManagement',
+  //   hidden: true,
+  //   component: () =>
+  //         import('@/views/apiManagement/index'),
+  //   name: '接口管理',
+  //   meta: { title: '接口管理' }
+  // },
   {
     path: '/newWeb',
     component: () =>
@@ -679,13 +679,14 @@ export const constantRoutes = [{
               import('@/views/automation/index'),
       meta: { title: '扁鹊' }
     },
-    // {
-    //   path: '/apiManagement',
-    //   name: 'api管理'
-    // }
+    {
+      path: '/apiManagemet',
+      name: 'api管理'
+    },
     {
       path: '/apiManagement',
       name: 'api管理',
+      hidden: true,
       component: () =>
               import('@/views/apiManagement/index'),
       meta: { title: 'api管理' }

src/views/projectManage/bugList/bugindex.vue

@@ -8,7 +8,7 @@
             <el-button size="mini" type="primary" @click="createdDefect">新建缺陷</el-button>
           </div>
           <el-divider style="color: #EEF0F5; margin: 10px 0 ;" />
-          <el-col :span="24" class="Layout" style="padding:0 0 1% 15px">
+          <el-col :span="24" class="Layout" style="padding: 5px 0 15px 15px">
             <el-form :model="formInline" class="flex_start" style="width: 100%;">
               <div class="Layout">
                 <div class="queryName">缺陷标题</div>

src/views/projectManage/bugList/css/index.css

@@ -23,7 +23,7 @@
    overflow-x: hidden;
 }
 .headerBg.table_v{
-  padding: 1% 1% 0 0;
+  padding: 1%;
 }
 .Layout {
   display: flex;

src/views/projectManage/bugList/details/bugTableDialog.vue

@@ -39,12 +39,13 @@
     <div align="right">
       <el-pagination
         :current-page.sync="currentPage"
-        :page-sizes="[15, 30, 45, total]"
+        :page-sizes="[15, 20, 30]"
         :page-size="pageSize"
         background
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
         @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
       />
     </div>
 
@@ -169,6 +170,10 @@ export default {
         this.drawerShow = false
       })
     },
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.bugGetTableList(this.queryData, false)
+    },
     handleCurrentChange(val) { // 分页
       this.curIndex = val
       this.bugGetTableList(this.queryData, false)

src/views/projectManage/bugList/details/statusChange.vue

@@ -40,10 +40,10 @@
         <el-form-item v-if="statusDialogTitle === '待测试'" label="修复方式" class="bug_manage_dialog bug_manage_dialog_fixMethod">
           <el-input v-model="statusDialogForm.reasonOrDesc" type="textarea" placeholder="请输入具体原因，得出结论的过程，具体修复过程或方式" maxlength="300" show-word-limit rows="4" />
         </el-form-item>
-        <el-form-item v-if="statusDialogTitle === 'Reopen'" label="Reopen原因" prop="reasonOrDesc" class="bug_manage_dialog">
+        <el-form-item v-if="statusDialogTitle === 'Reopen'" prop="reasonOrDesc" :rules="{ required: true, message: '请输入Reopen原因', trigger: ['blur', 'change'] }" label="Reopen原因" class="bug_manage_dialog">
           <el-input v-model="statusDialogForm.reasonOrDesc" type="textarea" placeholder="请输入Reopen" maxlength="300" show-word-limit rows="4" />
         </el-form-item>
-        <el-form-item v-if="statusDialogTitle === 'Hold'" label="Hold原因" prop="reasonOrDesc" class="bug_manage_dialog">
+        <el-form-item v-if="statusDialogTitle === 'Hold'" prop="reasonOrDesc" :rules="{ required: true, message: '请输入Hold原因', trigger: ['blur', 'change'] }" label="Hold原因" class="bug_manage_dialog">
           <el-input v-model="statusDialogForm.reasonOrDesc" type="textarea" maxlength="300" show-word-limit rows="4" />
         </el-form-item>
       </el-form>
@@ -85,8 +85,7 @@ export default {
       bugReasonEnumList: [], // 缺陷原因
       rules: { // 状态表单验证
         bugReason: [{ required: true, message: '请选择缺陷原因', trigger: ['blur', 'change'] }],
-        repairResult: [{ required: true, message: '请选择修复结果', trigger: ['blur', 'change'] }],
-        reasonOrDesc: [{ required: true, message: '请输入Reopen原因', trigger: ['blur', 'change'] }]
+        repairResult: [{ required: true, message: '请选择修复结果', trigger: ['blur', 'change'] }]
       }
     }
   },

src/views/projectManage/iteration/index.vue

@@ -6,7 +6,7 @@
         <el-button size="mini" type="primary" @click="showIteration = true">新建迭代</el-button>
       </div>
       <el-divider style="color: #EEF0F5; margin: 10px 0 ;" />
-      <div class="Layout_flex_start" style="margin-left: 15px">
+      <div class="Layout_flex_start" style="padding: 5px 0 5px 15px">
         <div class="Layout_space_between">
           <div class="searchName">迭代名称</div>
           <el-input v-model="filterItems.name" clearable size="small" placeholder="请输入迭代名称" @change="iteratioFilter(1)" />

src/views/projectManage/projectList/projectIndex.vue

@@ -8,7 +8,7 @@
         </div>
       </div>
       <el-divider style="color: #EEF0F5;" />
-      <div class="Layout">
+      <div class="Layout" style="padding-top: 5px;">
         <div>
           <el-form :model="form_all" class="Layout">
             <div class="Layout" style="padding-left: 15px">
@@ -618,7 +618,7 @@ export default {
     margin-bottom 0
   .stylus-head
     width 100%
-    padding 1%
+    padding 15px
     margin-bottom: 10px
     background-color white
     border-radius 4px

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

@@ -159,6 +159,7 @@ article{
       width: 70px;
       flex-direction: column;
       align-items: center;
+    line-height: initial;
       b{
         font-size: 75px;
       }

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

@@ -1,12 +1,12 @@
 <template>
-  <div class="sos" style="background-color:#F2F3F6;min-height:calc(100vh - 80px);padding:1% 0">
+  <div class="sos" style="background-color:#F2F3F6;min-height:calc(100vh - 80px);padding:10px">
     <div class="stylus-head">
       <div class="stylus-title">
         <span style="font-size: 22px;letter-spacing: 1px;font-weight: 600;color: #333B4A;padding-left: 15px">需求</span>
         <el-button type="primary" size="mini" @click="createDialogVisible = true">新建需求</el-button>
       </div>
       <el-divider style="color: #EEF0F5;" />
-      <div class="Layout">
+      <div class="Layout" style="padding-top: 5px">
         <div>
           <el-form :model="searchForm" class="Layout">
             <div class="Layout" style="padding-left:15px">
@@ -108,9 +108,9 @@
             {{ scope.row.belongingProjectName }}
           </template>
         </el-table-column>
-        <el-table-column prop="pm" label="PM" min-width="100" show-overflow-tooltip align="center">
+        <el-table-column label="PM" min-width="100" show-overflow-tooltip align="center">
           <template v-slot="scope">
-            {{ scope.row.pm[0]?scope.row.pm[0].name:'无' }}
+            {{ scope.row.pm.name }}
           </template>
         </el-table-column>
         <el-table-column prop="taskCount" min-width="100" label="任务总数" show-overflow-tooltip align="center" />
@@ -393,15 +393,16 @@ export default {
     color #333333
     font-weight 400
   .stylus-content >>> .el-table .el-table__body tr:hover td
+    // color #409EFF !important
     background #EDF6FF
   .stylus-head >>> .el-divider--horizontal
     margin 10px 0
   .stylus-head >>> .el-form-item
     margin-bottom 0
   .stylus-head
-    width 98%
-    padding 1%
-    margin:0 auto 1% auto
+    width 100%
+    padding 15px
+    margin-bottom: 10px
     background-color white
     border-radius 4px
     .stylus-title
@@ -412,16 +413,17 @@ export default {
       background rgba(252,252,252,1)
       border-radius 4px
       padding 15px
-      min-height 110px
+      min-height 100px
       margin-top 22px
       border 1px solid rgba(238,238,238,1)
       width 100%
   .stylus-content
-    width 98%
+    width 100%
     padding 0.3% 1% 1% 1%
     margin:0 auto
     background-color white
     border-radius 4px
+    min-height: calc(100vh - 209px);
     .stylus-hover:hover
       color #409EFF !important
       cursor pointer

src/views/projectManage/taskList/taskIndex.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="bgborder" style="background-color:#F2F3F6;min-height:calc(100vh - 80px);padding:1% 0">
+  <div class="bgborder" style="background-color:#F2F3F6;min-height:calc(100vh - 80px);padding:10px">
     <div class="stylus-head">
       <div class="stylus-title">
         <span style="font-size: 22px;letter-spacing: 1px;font-weight: 600;color: #333B4A;padding-left: 15px">任务</span>
@@ -12,7 +12,7 @@
         </div>
       </div>
       <el-divider style="color: #EEF0F5;" />
-      <div class="Layout">
+      <div class="Layout" style="padding: 5px 0 0 15px">
         <div>
           <el-form :model="form_task" class="flex_start">
             <div class="Layout" style="padding-left:15px">
@@ -482,9 +482,9 @@ export default {
   .stylus-head >>> .el-form-item
     margin-bottom 0
   .stylus-head
-    width 98%
-    padding 1%
-    margin:0 auto 1% auto
+    width 100%
+    padding 15px
+    margin-bottom: 10px
     background-color white
     border-radius 4px
     .stylus-title
@@ -494,18 +494,20 @@ export default {
     .stylus-more
       background rgba(252,252,252,1)
       border-radius 4px
-      padding 2% 1%
+      padding 15px
       min-height 100px
       margin-top 22px
       border 1px solid rgba(238,238,238,1)
       width 100%
   .stylus-content
-    width 98%
+    width 100%
     padding 0.3% 1% 1% 1%
     margin:0 auto
     background-color white
     border-radius 4px
+    min-height: calc(100vh - 209px);
     .stylus-hover:hover
       color #409EFF !important
       cursor pointer
 </style>
+

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

@@ -1,7 +1,7 @@
 <template>
   <el-container class="version_list">
     <div style="width:100%;height:100%;padding-top:1px;background-color: #F2F3F6;">
-      <el-main class="layout_header" style="padding: 1%">
+      <el-main class="layout_header" style="padding: 15px">
         <div class="layout_header_title">
           <span style="font-size: 22px;letter-spacing: 1px;font-weight: 600;color: #333B4A;padding-left: 15px">版本</span>
           <i class="el-icon-date calendar" @click="link_calendar" />
@@ -9,8 +9,8 @@
         <div style="position: relative;">
           <el-divider />
         </div>
-        <el-row>
-          <el-col :span="20" style="padding-left:15px">
+        <el-row style="padding: 5px 0 0 15px">
+          <el-col :span="20">
             <span class="queryName">客户端</span>
             <el-select v-model="searchForm.clientType" size="small" style="padding-left: 2px;" clearable filterable placeholder="请选择" @change="onChangeClientType(searchForm.clientType);getVersionHomePageList()">
               <el-option
@@ -533,13 +533,13 @@ export default {
   padding: 0 5px 2% 0
 }
 .layout_header {
-  width: 98%;
-  margin: 1% auto;
+  width: 99%;
+  margin: 10px;
 }
 .layout_main {
-  width: 98%;
-  margin: 0 auto 1% auto;
-  min-height: calc(100vh - 167px);
+  width: 99%;
+  margin: 0 10px 10px 10px;
+  min-height: calc(100vh - 209px);
 }
 .div_priority {
   color: #ffffff;