浏览代码

项目详情页改造

qinzhipeng_v 5 年之前
父节点
当前提交
95cead3aae

+ 32 - 0
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 { // 迭代,项目,任务,需求 主题
   .public_themeName { // 迭代,项目,任务,需求 主题
     font-size: 22px;
     font-size: 22px;
     font-weight: 600;
     font-weight: 600;

+ 1 - 0
src/styles/detail-pages.scss

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

+ 3 - 0
src/views/projectManage/bugList/bugindex.vue

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

+ 3 - 3
src/views/projectManage/bugList/details/bugTableDialog.vue

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

+ 3 - 3
src/views/projectManage/projectList/components/taskList.vue

@@ -54,9 +54,9 @@
             :class="{
             :class="{
               'status_color': scope.row.status === 0,
               'status_color': scope.row.status === 0,
               'status_color1': scope.row.status === 1,
               'status_color1': scope.row.status === 1,
-              'item': scope.row.status === 3,
-              'item1': scope.row.status === 2,
-              'item2': scope.row.status === 4,
+              'status_color4': scope.row.status === 3,
+              'status_color6': scope.row.status === 2,
+              'status_color7': scope.row.status === 4,
               'status_color2': scope.row.status === 5
               'status_color2': scope.row.status === 5
             }"
             }"
             class="btns"
             class="btns"

+ 15 - 9
src/views/projectManage/projectList/projectViewDetails.vue

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

+ 2 - 0
src/views/projectManage/taskList/components/reportList.vue

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