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

src/styles/PublicStyle/index.scss

@@ -46,6 +46,28 @@
   color: #6AB4FF;
 }
 
+// 任务状态控制
+.public_btn .el-input--suffix .el-input__inner { // 任务状态控制
+  padding-right: 10px;
+  padding-left: 10px;
+  width: 73px;
+}
+.public_btn1 .el-input--suffix .el-input__inner {// 任务状态控制
+  padding-right: 10px;
+  padding-left: 10px;
+  width: 111px;
+}
+.public_btn2 .el-input--suffix .el-input__inner {// 任务状态控制
+  padding-right: 10px;
+  padding-left: 10px;
+  width: 98px;
+}
+.public_btn3 .el-input--suffix .el-input__inner {// 任务状态控制
+  padding-right: 10px;
+  padding-left: 10px;
+  width: 85px;
+}
+// 任务状态控制
 
 .status_color { // 迭代状态样式修改（颜色）
   /deep/ input {

src/views/projectManage/bugList/bugindex.vue

@@ -204,8 +204,8 @@
                     </div>
                   </div>
                   <div align="right">
-                    <el-button type="primary" class="save-search" size="mini" @click="showSaveSearch = true">保存筛选项</el-button>
-                    <el-button type="primary" size="mini" @click="getBugList()">筛 选</el-button>
+                    <el-button type="text" @click="showSaveSearch = true">保存筛选项</el-button>
+                    <el-button type="primary" style="margin: 0 20px;" size="mini" @click="getBugList()">筛 选</el-button>
                     <el-button size="mini" @click="resetQuery()">重 置</el-button>
                   </div>
                 </el-col>
@@ -560,9 +560,6 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-.save-search {
-  float: left;
-}
 .filter {
   font-size: 14px;
   width: 100%;

src/views/projectManage/iteration/components/iterationTable.vue

@@ -5,14 +5,15 @@
       :id="'schedule-'+id"
       :data="scheduleList"
       :header-cell-style="{'background-color': 'rgba(232,232,232,0.4)'}"
-      :row-style="{'background-color': 'transparent'}"
       style="width: 100%"
       show-overflow-tooltip="true"
       row-key="id"
+      border
+      stripe
     >
       <!-- <el-table-column
         width="80"
-        align="center"
+
       >
         <template>
           <el-tooltip class="item" effect="dark" content="代表移动，鼠标选中区域可以向上移动" placement="bottom">
@@ -26,7 +27,6 @@
         prop="type"
         label="类型"
         min-width="80"
-        align="center"
       >
         <template slot-scope="scope">
           {{ getType(scope.row.type) }}
@@ -37,32 +37,30 @@
         prop="desc"
         label="描述"
         min-width="200"
-        align="center"
+
         show-overflow-tooltip
       />
       <el-table-column
         prop="seperateDaysNoHoliday"
         label="排期"
-        min-width="250"
-        align="center"
+        min-width="100"
+
         show-overflow-tooltip
       />
       <el-table-column
         prop="dayLength"
         label="时长"
-        min-width="80"
-        align="center"
+        min-width="50"
       />
       <el-table-column
         prop="peopleList"
         label="参与人员"
         min-width="150"
-        align="center"
       />
       <el-table-column
         label="操作"
         min-width="150"
-        align="center"
+
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -222,7 +220,6 @@ export default {
   width: calc(100% - 40px);
   margin: 0 20px;
   padding: 0;
-  background:rgba(248,248,248,0.6);
 }
 >>>.el-table, .el-table__expanded-cell{
   background:rgba(248,248,248,0.6);

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

@@ -5,14 +5,14 @@
       :id="'schedule-'+id"
       :data="scheduleList"
       :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)',color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500'}"
-      :row-style="{'background-color': 'transparent'}"
       style="width: 100%"
       show-overflow-tooltip="true"
       row-key="id"
+      border
+      stripe
     >
       <el-table-column
         width="80"
-        align="center"
       >
         <template>
           <el-tooltip class="item" effect="dark" content="代表移动，鼠标选中区域可以向上移动" placement="bottom">
@@ -26,7 +26,6 @@
         prop="type"
         label="类型"
         width="100"
-        align="center"
       >
         <template slot-scope="scope">
           {{ getType(scope.row.type) }}
@@ -37,32 +36,27 @@
         prop="desc"
         label="描述"
         min-width="150"
-        align="left"
         show-overflow-tooltip
       />
       <el-table-column
         prop="seperateDaysNoHoliday"
         label="排期"
-        min-width="200"
-        align="center"
+        min-width="100"
         show-overflow-tooltip
       />
       <el-table-column
         prop="dayLength"
         label="时长"
         width="50"
-        align="center"
       />
       <el-table-column
         prop="peopleList"
         label="参与人员"
         min-width="100"
-        align="center"
       />
       <el-table-column
         label="操作"
         width="200"
-        align="center"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -220,7 +214,6 @@ export default {
   width: calc(100% - 40px);
   margin: 0 20px;
   padding: 0;
-  background:rgba(248,248,248,0.6);
 }
 >>>.el-table, .el-table__expanded-cell{
   background:rgba(248,248,248,0.6);

src/views/projectManage/projectList/components/taskList.vue

@@ -64,12 +64,19 @@
       <el-table-column label="所属模块" width="150" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
       </el-table-column>
-      <el-table-column label="状态" width="105" align="center">
+      <el-table-column label="状态" width="150" align="left">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
-            :class="{'status0':scope.row.status===0,'status1':scope.row.status > 0 && scope.row.status <100,'status2':scope.row.status===100,}"
-            class="btns"
+            :class="{
+              'status0':scope.row.status===0,
+              'status1':scope.row.status > 0 && scope.row.status <100,
+              'status2':scope.row.status===100,
+              'public_btn':scope.row.status!==10 || scope.row.status!==40 || scope.row.status!==20 || scope.row.status!==30,
+              'public_btn1':scope.row.status===40,
+              'public_btn2':scope.row.status===10,
+              'public_btn3':scope.row.status===20 || scope.row.status===30
+            }"
             size="mini"
             @change="changeStatus(scope.row)"
           >

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

@@ -5,11 +5,12 @@
       :id="'schedule-'+id"
       :data="scheduleList"
       :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)', color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500'}"
-      :row-style="{'background-color': 'transparent'}"
       show-overflow-tooltip="true"
       row-key="id"
+      border
+      stripe
     >
-      <el-table-column v-if="noMove" width="80" align="center">
+      <el-table-column v-if="noMove" width="80">
         <template>
           <el-tooltip class="item" effect="dark" content="代表移动，鼠标选中区域可以向上移动" placement="bottom">
             <div class="sortable-tip">
@@ -18,17 +19,17 @@
           </el-tooltip>
         </template>
       </el-table-column>
-      <el-table-column prop="type" label="类型" min-width="100" align="center">
+      <el-table-column prop="type" label="类型" min-width="100">
         <template slot-scope="scope">
           {{ scope.row.name }}
           <div v-show="showunlock" :class="scope.row.isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock'" />
         </template>
       </el-table-column>
       <el-table-column prop="desc" label="描述" min-width="150" align="left" show-overflow-tooltip />
-      <el-table-column prop="seperateDaysNoHoliday" label="排期" min-width="200" align="center" show-overflow-tooltip />
-      <el-table-column prop="dayLength" label="时长" min-width="50" align="center" />
-      <el-table-column prop="peopleList" label="参与人员" min-width="150" align="center" />
-      <el-table-column label="操作" width="200" align="center">
+      <el-table-column prop="seperateDaysNoHoliday" label="排期" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="dayLength" label="时长" min-width="50" />
+      <el-table-column prop="peopleList" label="参与人员" min-width="150" />
+      <el-table-column label="操作" width="200">
         <template slot-scope="scope">
           <div v-if="showunlock">
             <el-button v-if="scope.row.isScheduleLocked === 0" type="text" size="small" @click="editSchedule(scope.row)">编辑</el-button>
@@ -218,7 +219,6 @@ export default {
 .schedule-list {
   margin: 0 20px;
   padding: 0;
-  background:rgba(248,248,248,0.6);
 }
 >>>.el-table, .el-table__expanded-cell{
   background:rgba(248,248,248,0.6);

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

@@ -65,12 +65,19 @@
       <el-table-column label="所属模块" width="150" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
       </el-table-column>
-      <el-table-column label="状态" width="105" align="center">
+      <el-table-column label="状态" width="150" align="left">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
-            :class="{'status0':scope.row.status===0,'status1':scope.row.status > 0 && scope.row.status <100,'status2':scope.row.status===100,}"
-            class="btns"
+            :class="{
+              'status0':scope.row.status===0,
+              'status1':scope.row.status > 0 && scope.row.status <100,
+              'status2':scope.row.status===100,
+              'public_btn':scope.row.status!==10 || scope.row.status!==40 || scope.row.status!==20 || scope.row.status!==30,
+              'public_btn1':scope.row.status===40,
+              'public_btn2':scope.row.status===10,
+              'public_btn3':scope.row.status===20 || scope.row.status===30
+            }"
             size="mini"
             @change="changeStatus(scope.row)"
           >

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

@@ -4,14 +4,14 @@
       :id="'schedule-'+id"
       :data="scheduleList"
       :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)', color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500'}"
-      :row-style="{'background-color': 'transparent'}"
       style="width: 100%"
       show-overflow-tooltip="true"
       row-key="id"
+      border
+      stripe
     >
       <el-table-column
         width="80"
-        align="center"
       >
         <template>
           <el-tooltip class="item" effect="dark" content="代表移动，鼠标选中区域可以向上移动" placement="bottom">
@@ -25,7 +25,6 @@
         prop="type"
         label="类型"
         width="100"
-        align="center"
       >
         <template slot-scope="scope">
           {{ scope.row.name }}
@@ -42,26 +41,24 @@
       <el-table-column
         prop="seperateDaysNoHoliday"
         label="排期"
-        min-width="200"
-        align="center"
+        min-width="100"
+
         show-overflow-tooltip
       />
       <el-table-column
         prop="dayLength"
         label="时长"
         width="50"
-        align="center"
       />
       <el-table-column
         prop="peopleList"
         label="参与人员"
         min-width="100"
-        align="center"
       />
       <el-table-column
         label="操作"
         width="200"
-        align="center"
+
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -237,7 +234,6 @@ export default {
   width: calc(100% - 40px);
   margin: 0 20px;
   padding: 0;
-  background:rgba(248,248,248,0.6);
 }
 >>>.el-table, .el-table__expanded-cell{
   background:rgba(248,248,248,0.6);

src/views/projectManage/taskList/taskViewDetail.vue

@@ -140,7 +140,7 @@
                 <div v-show="isScheduleLocked === 0">
                   <div v-show="BackToTheLatest === true" class="Scheduling" style="margin-right: 20px;" @click="clickAddScheduling()"><i class="el-icon-circle-plus-outline" /> 添加排期</div>
                 </div>
-                <div align="left" class="Scheduling" @click="scheduleHiHide"><div class="el-icon-document" /> 排期变更记录</div>
+                <div v-show="BackToTheLatest === true" align="left" class="Scheduling" @click="scheduleHiHide"><div class="el-icon-document" /> 排期变更记录</div>
                 <download :id="taskId" :name="'任务'" />
               </div>
             </div>

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

@@ -5,14 +5,14 @@
       :id="'schedule-'+id"
       :data="scheduleList"
       :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)',color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500'}"
-      :row-style="{'background-color': 'transparent'}"
       style="width: 100%"
       show-overflow-tooltip="true"
       row-key="id"
+      border
+      stripe
     >
       <el-table-column
         width="80"
-        align="center"
       >
         <template>
           <el-tooltip class="item" effect="dark" content="代表移动，鼠标选中区域可以向上移动" placement="bottom">
@@ -26,7 +26,6 @@
         prop="type"
         label="类型"
         width="100"
-        align="center"
       >
         <template slot-scope="scope">
           {{ getType(scope.row.type) }}
@@ -44,25 +43,23 @@
         prop="seperateDaysNoHoliday"
         label="排期"
         min-width="200"
-        align="center"
+
         show-overflow-tooltip
       />
       <el-table-column
         prop="dayLength"
         label="时长"
         width="50"
-        align="center"
       />
       <el-table-column
         prop="peopleList"
         label="参与人员"
         min-width="100"
-        align="center"
       />
       <el-table-column
         label="操作"
         width="200"
-        align="center"
+
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -220,7 +217,6 @@ export default {
   width: calc(100% - 40px);
   margin: 0 20px;
   padding: 0;
-  background:rgba(248,248,248,0.6);
 }
 >>>.el-table, .el-table__expanded-cell{
   background:rgba(248,248,248,0.6);

src/views/projectManage/version/components/taskList.vue

@@ -43,7 +43,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="任务名称" width="200" align="left" show-overflow-tooltip>
+      <el-table-column label="任务名称" min-width="200" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
           <div class="task-main">
             <span class="task-id">TASK-{{ scope.row.id }}</span>
@@ -51,15 +51,22 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="所属模块" width="150" align="center" show-overflow-tooltip>
+      <el-table-column label="所属模块" min-width="200" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
       </el-table-column>
-      <el-table-column label="状态" width="105" align="center">
+      <el-table-column label="状态" width="150" align="left">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
-            :class="{'status0':scope.row.status===0,'status1':scope.row.status > 0 && scope.row.status <100,'status2':scope.row.status===100,}"
-            class="btns"
+            :class="{
+              'status0':scope.row.status===0,
+              'status1':scope.row.status > 0 && scope.row.status <100,
+              'status2':scope.row.status===100,
+              'public_btn':scope.row.status!==10 || scope.row.status!==40 || scope.row.status!==20 || scope.row.status!==30,
+              'public_btn1':scope.row.status===40,
+              'public_btn2':scope.row.status===10,
+              'public_btn3':scope.row.status===20 || scope.row.status===30
+            }"
             size="mini"
             @change="changeStatus(scope.row)"
           >
@@ -67,10 +74,10 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="健康状态" width="200" align="center" show-overflow-tooltip>
+      <el-table-column label="健康状态" width="150" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.stageString }}</template>
       </el-table-column>
-      <el-table-column label="所属需求" width="200" align="center" show-overflow-tooltip>
+      <el-table-column label="所属需求" min-width="200" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.requireName }}</template>
       </el-table-column>
       <el-table-column label="跟版客户端" width="120" align="center" show-overflow-tooltip>
@@ -82,7 +89,7 @@
       <el-table-column label="测试负责人" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.qaObject ? scope.row.qaObject.name : '' }}</template>
       </el-table-column>
-      <el-table-column label="任务进度" min-width="100" align="center">
+      <el-table-column label="任务进度" width="200" align="center">
         <template slot-scope="scope">
           <el-progress :percentage="Number(scope.row.rate && scope.row.rate.substring(0,4))" color="#409eff" />
         </template>
@@ -487,11 +494,6 @@ export default {
 }
 </style>
 <style lang="scss">
-.btns .el-input--suffix .el-input__inner {
-  padding-right: 10px;
-  padding-left: 10px;
-  width: 73px;
-}
 .item{
   /deep/ input {
     color: rgb(126, 211, 33);

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

@@ -498,6 +498,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.version_list_layout_main {
+  /deep/ .el-tabs__item {
+    font-size: 16px;
+}
+}
 .time-line-container {
   margin-top: 20px;
   border: 1px solid rgba(238,238,238,1);
@@ -580,11 +585,13 @@ export default {
     width: 100%;
     margin: 10px 0;
 }
+
 .version_list_layout_main .el-table__body tr:hover td {
   color: #409eff;
   background: #EDF6FF;
 } /*hover时字体, 背景颜色*/
 .version_el-dropdown-menu {
   max-height: 300px !important;
-  overflow: auto !important;}
+  overflow: auto !important;
+  }
 </style>

src/views/workbench/team/components/taskList.vue

@@ -58,12 +58,19 @@
         </template>
       </el-table-column>
       <el-table-column label="业务线" width="150" align="center" show-overflow-tooltip prop="bizIdString" />
-      <el-table-column label="状态" width="105" align="center">
+      <el-table-column label="状态" width="150" align="left">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
-            :class="{'status0':scope.row.status===0,'status1':scope.row.status > 0 && scope.row.status <100,'status2':scope.row.status===100,}"
-            class="btns"
+            :class="{
+              'status0':scope.row.status===0,
+              'status1':scope.row.status > 0 && scope.row.status <100,
+              'status2':scope.row.status===100,
+              'public_btn':scope.row.status!==10 || scope.row.status!==40 || scope.row.status!==20 || scope.row.status!==30,
+              'public_btn1':scope.row.status===40,
+              'public_btn2':scope.row.status===10,
+              'public_btn3':scope.row.status===20 || scope.row.status===30
+            }"
             size="mini"
             @change="changeStatus(scope.row)"
           >