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

src/styles/PublicStyle/index.scss

@@ -142,6 +142,38 @@
     }
   }
 
+  .status_color6 { // 迭代状态样式修改（颜色）
+    /deep/ input {
+      color: #2F54EB !important;
+       border: 1px solid #2F54EB !important;
+       border-color: #2F54EB !important;
+           font-weight: 900 !important;
+    }
+    /deep/ .el-input__suffix {
+      color: #2F54EB !important;
+      right: 1px !important;
+    }
+    /deep/ .el-select__caret {
+      color: #2F54EB !important;
+    }
+  }
+
+  .status_color7 { // 迭代状态样式修改（颜色）
+    /deep/ input {
+      color: #F56C6C !important;
+       border: 1px solid #F56C6C !important;
+       border-color: #F56C6C !important;
+           font-weight: 900 !important;
+    }
+    /deep/ .el-input__suffix {
+      color: #F56C6C !important;
+      right: 1px !important;
+    }
+    /deep/ .el-select__caret {
+      color: #F56C6C !important;
+    }
+  }
+
   .public_themeName { // 迭代，项目，任务，需求 主题
     font-size: 22px;
     font-weight: 600;

src/styles/detail-pages.scss

@@ -87,6 +87,7 @@
 }
 @mixin main-section{
   width: calc(100% - 20px);
+  min-height: 99%;
   margin: 0 10px 10px 10px;
   background-color: #ffffff;
   .el-main-title {

src/views/projectManage/bugList/bugindex.vue

@@ -364,6 +364,9 @@ export default {
     this.getFilterList() // 筛选项保存
     this.$store.state.data.status = true
   },
+  mounted() {
+    this.$refs.bugTableDialog.bugGetTableList()
+  },
   destroyed() {
     this.$store.state.data.status = false
   },

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

@@ -97,9 +97,9 @@ export default {
       this.drawerShow = false
     }
   },
-  created() {
-    this.bugGetTableList()
-  },
+  // created() {
+  //   this.bugGetTableList()
+  // },
   methods: {
     bugGetTableList(e) {
       let extend = {}

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

@@ -51,7 +51,14 @@
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
-            :class="['status'+scope.row.status]"
+            :class="{
+              'status_color': scope.row.status === 0,
+              'status_color1': scope.row.status === 1,
+              'status_color4': scope.row.status === 3,
+              'status_color6': scope.row.status === 2,
+              'status_color7': scope.row.status === 4,
+              'status_color2': scope.row.status === 5
+            }"
             class="btns"
             size="mini"
             @change="changeStatus(scope.row)"
@@ -81,6 +88,7 @@
     <TestReport v-if="dialogTestReport" ref="TestReport" />
     <DailyReport v-if="dialogDailyReport" ref="DailyReport" />
     <ClientReport v-if="dialogClientReport" ref="ClientReport" />
+    <task-dialog v-if="showTaskDialog" :show.sync="showTaskDialog" :task-id="taskId.id" :status-name="taskId.statusString" @getList="get_allTask" />
     <normal-dialog :show-dialog.sync="statusDialog" :title="'状态变更：已上线'" :width="'50%'" @confirm="confirmStatus()">
       <div class="dialog-change-status">
         <span>实际上线时间：</span>
@@ -90,6 +98,7 @@
   </div>
 </template>
 <script>
+import '@/styles/PublicStyle/index.scss'
 import TestReport from '@/views/Platform/presentation/Templates/TestReport' // 提测
 import DailyReport from '@/views/Platform/presentation/Templates/DailyReport' // 日报
 import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
@@ -98,19 +107,22 @@ import { taskUpdate } from '@/api/projectViewDetails'
 import { configShowTaskEnum } from '@/api/taskIndex'
 import scheduleList from './scheduleList'
 import normalDialog from '@/components/dialog/normalDialog'
+import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改（已上线/已提测/已准出）
 export default {
   components: {
     normalDialog,
     TestReport,
     DailyReport,
     ClientReport,
-    scheduleList
+    scheduleList,
+    taskDialog
   },
   data() {
     return {
       changeData: new Map(),
       allChange: false, // 是否全展开
       expandArr: [], // 展开行数组
+      showTaskDialog: false, // 状态弹窗
       inputValue: '',
       all_task: [], // 任务列表
       allStatus: [], // 任务所有状态
@@ -125,7 +137,8 @@ export default {
       dialogClientReport: false, // 准出
       statusDialog: false, // 修改状态弹框
       changeStatusDate: null, // 状态改变时间
-      nowChangeTask: null // 当前正在改变的任务对象
+      nowChangeTask: null, // 当前正在改变的任务对象
+      taskId: '' // 将要修改状态的任务id
     }
   },
   watch: {
@@ -173,9 +186,14 @@ export default {
       isEx ? this.expandArr = this.all_task.map(item => item.id) : this.expandArr = []
     },
     async changeStatus(e) { // 状态改变
-      if (e.status === 5) { // 已上线
-        this.statusDialog = true
+      if (e.status === 2 || e.status === 4 || e.status === 5) {
+        this.taskId = e
+        this.allStatus.map(item => {
+          item.code === e.status ? this.taskId.statusString = item.msg : ''
+        })
+        this.showTaskDialog = true
         this.nowChangeTask = e
+        return
       } else {
         const user = {
           name: localStorage.getItem('username'),
@@ -190,11 +208,7 @@ export default {
       }
     },
     async confirmStatus() { // 确认更改状态
-      const user = {
-        name: localStorage.getItem('username'),
-        ename: localStorage.getItem('realname'),
-        id: ''
-      }
+      const user = { name: localStorage.getItem('username'), ename: localStorage.getItem('realname'), id: '' }
       const taskInfoDO = this.nowChangeTask
       taskInfoDO.onlineRealTime = this.changeStatusDate
       const resTask = await taskUpdate({ taskInfoDO, user })
@@ -388,3 +402,85 @@ export default {
   white-space:nowrap;
 }
 </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);
+    border: 1px solid rgb(126, 211, 33);
+     border-color: rgb(126, 211, 33) !important;
+         font-weight: 900;
+  }
+  /deep/ .el-input__suffix {
+    color: rgb(126, 211, 33) !important;
+    right: 1px;
+  }
+  /deep/ .el-select__caret {
+    color: rgb(126, 211, 33) !important;
+  }
+}
+.item1 {
+  /deep/ input {
+    color: rgb(255, 204, 102);
+     border: 1px solid rgb(255, 204, 102);
+     border-color: rgb(255, 204, 102) !important;
+         font-weight: 900;
+  }
+  /deep/ .el-input__suffix {
+    color: rgb(255, 204, 102) !important;
+    right: 1px;
+  }
+  /deep/ .el-select__caret {
+    color: rgb(255, 204, 102) !important;
+  }
+}
+.item2 {
+  /deep/ input {
+    color: rgb(245, 108, 108);
+    border: 1px solid rgb(245, 108, 108);
+    border-color: rgb(245, 108, 108) !important;
+        font-weight: 900;
+  }
+   /deep/ .el-input__suffix {
+    color: rgb(245, 108, 108) !important;
+    right: 1px;
+  }
+  /deep/ .el-select__caret {
+   color: rgb(245, 108, 108) !important;
+  }
+}
+.item3 {
+  /deep/ input {
+    color: #D675F0;
+    border: 1px solid #D675F0;
+    border-color: #D675F0 !important;
+        font-weight: 900;
+  }
+    /deep/ .el-input__suffix {
+    color: #D675F0 !important;
+    right: 1px;
+  }
+   /deep/ .el-select__caret {
+   color: #D675F0 !important;
+  }
+}
+.item-color {
+  /deep/ input {
+    color: rgb(106, 180, 255);
+    border: 1px solid rgb(106, 180, 255);
+    border-color: rgb(106, 180, 255) !important;
+        font-weight: 900;
+  }
+    /deep/ .el-input__suffix {
+    color: rgb(106, 180, 255) !important;
+    right: 1px;
+  }
+   /deep/ .el-select__caret {
+   color: rgb(106, 180, 255) !important;
+  }
+}
+</style>

src/views/projectManage/projectList/css/index.css

@@ -64,10 +64,6 @@
   border-radius: 4px;
 }
 
-.el-dialog__header {
-    padding: 0px 0px 0px;
-}
-
 .footer {
   text-align: right;
   margin: 1%;
@@ -112,9 +108,6 @@
   white-space: nowrap;
 }
 
-.dialog .el-dialog__header {
-  padding: 0;
-}
 
 .time-horizontal li {
   display: inline-block;

src/views/projectManage/projectList/projectViewDetails.vue

@@ -116,28 +116,29 @@
       </el-container>
       <!-- 概览 -->
       <!-- 需求 -->
-      <el-container v-show="activeName === '2'">
+      <el-container v-show="activeName === '2'" style="height: calc(100vh - 125px);">
         <section class="main-section">
           <needs-list />
         </section>
       </el-container>
       <!-- 需求 -->
       <!-- 任务 -->
-      <el-container v-show="activeName === '3'" class="is-vertical">
+      <el-container v-show="activeName === '3'" class="is-vertical" style="height: calc(100vh - 125px);">
         <section class="main-section">
           <tasks-list />
         </section>
       </el-container>
       <!-- 任务 -->
       <!-- 缺陷 -->
-      <el-container v-show="activeName === '4'" class="is-vertical">
+      <el-container v-show="activeName === '4'" class="is-vertical" style="height: calc(100vh - 125px);">
         <section class="main-section">
-          <bugs-list />
+          <!-- <bugs-list /> -->
+          <bugTableDialog ref="bugTableDialog" />
         </section>
       </el-container>
       <!-- 缺陷 -->
       <!-- 统计 -->
-      <el-container v-if="activeName === '5'" class="is-vertical">
+      <el-container v-if="activeName === '5'" class="is-vertical" style="height: calc(100vh - 125px);">
         <section class="main-section">
           <data-statistics @change="get_list" />
         </section>
@@ -191,7 +192,7 @@ import mileStone from './components/mileStone'
 import dataStatistics from './components/dataStatistics'
 import tasksList from './components/taskList'
 import needsList from './components/needsList'
-import bugsList from './components/bugsList'
+// import bugsList from './components/bugsList'
 import modifyProject from './components/modifyProject'
 import openDialog from '@/views/projectManage/dialog_vue'
 import Utils from '../../../util.js'
@@ -200,6 +201,7 @@ import createdBug from '@/views/projectManage/bugList/file/createdBug'
 import '@/views/projectManage/projectList/css/index.css'
 import drawer from '@/views/projectManage/Drawer'
 import image_url from '@/assets/home_images/home_u.png'
+import bugTableDialog from '@/views/projectManage/bugList/details/bugTableDialog' // 缺陷表格
 export default {
   components: {
     openDialog,
@@ -212,8 +214,9 @@ export default {
     dataStatistics,
     tasksList,
     needsList,
-    bugsList,
-    modifyProject
+    // bugsList,
+    modifyProject,
+    bugTableDialog
   },
   filters: {
     ellipsis(value, num) {
@@ -271,6 +274,9 @@ export default {
     this.$store.state.data.status = true
     this.$store.state.data.bizId = true
   },
+  mounted() {
+    this.$refs.bugTableDialog.bugGetTableList({ projectId: Number(this.$route.query.id) })
+  },
   destroyed() {
     this.$store.state.data.status = false
     this.$store.state.data.bizId = false
@@ -355,7 +361,7 @@ export default {
     reated_task(e) { // 新建任务
       this.task_open = true
       this.$nextTick(() => {
-        this.$refs.task_createdUpdata.init(3)
+        this.$refs.task_createdUpdata.init(2)
       })
     }
   }

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

@@ -154,8 +154,8 @@
 </template>
 <script>
 import {
-  projectTestReport,
   dailyReport,
+  projectTestReport,
   launchTest,
   launchTestUpdate,
   launchTestDelete

src/views/projectManage/taskList/dialog/taskDialog.vue

@@ -30,7 +30,7 @@ export default {
   props: {
     show: { type: Boolean, default: false }, // 弹窗展示
     statusName: { type: String, default: null }, // 状态name
-    taskId: { type: String, default: null } // 任务ID
+    taskId: { type: [String, Number], default: null } // 任务ID
   },
   data() {
     return {
@@ -64,6 +64,7 @@ export default {
     statusName: {
       immediate: true,
       handler(statusName) {
+        console.log(statusName, 'ddddd')
         if (statusName === '已提测') {
           this.name = this.measurementTime
           this.codeName = this.measurementTimeName

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

@@ -227,25 +227,6 @@ export default {
 }
 </script>
 
-<style>
-.workbench_schedule__dialog .el-dialog {
-  border-radius:4px;
-}
-.workbench_schedule__dialog .el-dialog__header {
-  padding: 20px 70px;
-}
-.workbench_schedule__dialog .el-dialog__body {
-  padding: 0px 70px;
-}
-.workbench_schedule__dialog .el-dialog__footer {
-  padding: 40px 70px;
-}
-.workbench_schedule__dialog .el-form-item__label {
-  color: #666666;
-  font-weight: 400;
-}
-</style>
-
 <style scoped lang="scss">
 article{
   padding: 0 50px;