布局调整

src/components/newLayout/Main.vue

@@ -110,6 +110,7 @@ export default {
 <style lang="scss" scoped>
 .zhihui-main {
   height: 100vh;
+  background-color: #f2f3f6;
 }
 .hide-sidebar {
   width: calc(100% - 95px);

src/router/newRouter.js

@@ -77,19 +77,6 @@ const layout = [
         component: () => import('@/views/projectManage/requirement/requirementDetail.vue'),
         meta: { title: '需求详情' }
       },
-      {
-        path: 'iteration',
-        name: '迭代',
-        component: () => import('@/views/projectManage/iteration/index'),
-        meta: { title: '迭代' }
-      },
-      {
-        path: 'iterationDetails',
-        name: '迭代详情',
-        hidden: true,
-        component: () => import('@/views/projectManage/iteration/details/iterationDetails.vue'),
-        meta: { title: '迭代详情' }
-      },
       {
         path: 'taskIndex',
         name: '任务',
@@ -111,17 +98,17 @@ const layout = [
         meta: { title: '子任务详情' }
       },
       {
-        path: 'version',
-        name: '版本',
-        component: () => import('@/views/projectManage/version/list/index.vue'),
-        meta: { title: '版本' }
+        path: '/projectManage/bugList/bugindex',
+        name: '缺陷',
+        component: () => import('@/views/projectManage/bugList/bugindex'),
+        meta: { title: '缺陷' }
       },
       {
-        path: 'versionsCalendar',
-        name: '版本日历',
+        path: 'bugDetails',
+        name: '缺陷详情',
         hidden: true,
-        component: () => import('@/views/projectManage/taskList/versionsCalendar'),
-        meta: { title: '版本日历' }
+        component: () => import('@/views/projectManage/bugList/details/index.vue'),
+        meta: { title: '缺陷详情' }
       },
       {
         path: 'reportManagement',
@@ -171,9 +158,37 @@ const layout = [
         component: () => import('@/views/Platform/presentation/ResultPageyL'),
         meta: { title: '准出预览' }
       },
+      {
+        path: 'iteration',
+        name: '迭代',
+        cutOff: true,
+        component: () => import('@/views/projectManage/iteration/index'),
+        meta: { title: '迭代' }
+      },
+      {
+        path: 'iterationDetails',
+        name: '迭代详情',
+        hidden: true,
+        component: () => import('@/views/projectManage/iteration/details/iterationDetails.vue'),
+        meta: { title: '迭代详情' }
+      },
+      {
+        path: 'version',
+        name: '版本',
+        component: () => import('@/views/projectManage/version/list/index.vue'),
+        meta: { title: '版本' }
+      },
+      {
+        path: 'versionsCalendar',
+        name: '版本日历',
+        hidden: true,
+        component: () => import('@/views/projectManage/taskList/versionsCalendar'),
+        meta: { title: '版本日历' }
+      },
       {
         path: 'requireStatistics',
         name: '需求统计',
+        cutOff: true,
         component: () => import('@/views/quality/requireStatistics.vue'),
         meta: { title: '需求统计' }
       },

src/styles/detail-pages.scss

@@ -11,7 +11,7 @@
   display:flex;
   align-items: center;
   justify-content: center;
-  padding-top: 70px;
+  margin-top: 10px;
   .el-main {
     background-color: #FFFFFF;
     border-radius: 4px;
@@ -29,16 +29,15 @@
   background-color:#F2F3F6;
 }
 @mixin main-header { 
+  position: relative;
   margin: 0 10px 10px 10px;
   height: 60px;
+  width: 100%;
   padding-left: 30px;
   background-color: #ffffff;
   display: flex;
-  z-index: 99;
   justify-content: space-between;
   align-items: center;
-  position: fixed;
-  top: 55px;
   .header-title{
     float: left;
     font-size:18px;

src/views/projectManage/components/demand.vue

@@ -170,6 +170,7 @@
 </template>
 <script>
 import { EncryptId, analysisBizId_id } from '@/utils/crypto-js.js'
+import { mapGetters } from 'vuex'
 import _ from 'lodash'
 import { listByRequire, taskListAvailableDpmTask, taskSetTaskRelated, taskDeleteRelationship, taskShowRelatedDpmTask, taskSyncScheduleToDpm } from '@/api/requirement.js'
 import scheduleList from '@/views/projectManage/components/scheduleList.vue'
@@ -244,6 +245,9 @@ export default {
       isDelete: false // 删除排期操作
     }
   },
+  computed: {
+    ...mapGetters(['bizId'])
+  },
   watch: {
     requiredList: {
       handler(newV, old) {
@@ -271,11 +275,15 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    bizId: {
+      handler(newV) {
+        if (newV === -1) return
+        this.configShowTaskStatusEnum()
+      },
+      immediate: true
     }
   },
-  created() {
-    this.configShowTaskStatusEnum()
-  },
   methods: {
     async listByTask(id) { // 获取排期列表
       this.taskList = []
@@ -298,7 +306,7 @@ export default {
     },
 
     async configShowTaskStatusEnum() { // 获取任务下拉数据
-      const res = await configShowTaskStatusEnum(this.$store.state.data.bizId)
+      const res = await configShowTaskStatusEnum(this.$store.state.global.bizId)
       if (res.code === 200) {
         this.allStatus = res.data.taskStatus
       }

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

@@ -175,7 +175,8 @@ export default {
   },
   watch: {
     bizId: {
-      handler() {
+      handler(newV) {
+        if (newV == -1) return
         this.getTaskStatus()
       },
       immediate: true

src/views/workbench/person/index.vue

@@ -36,7 +36,7 @@
       </el-header>
       <!-- 顶部导航栏 -->
       <!-- 工作台简介 -->
-      <el-container v-show="activeName === '1'" class="is-vertical">
+      <!-- <el-container v-show="activeName === '1'" class="is-vertical">
         <section class="main-section">
           <div class="el-main-title">
             <div class="title-name">{{ realname }}</div>
@@ -63,7 +63,7 @@
             <div v-show="teamInfoDialogVisible" class="more" @click="teamInfoDialogVisible = false">收起</div>
           </div>
         </section>
-      </el-container>
+      </el-container> -->
       <el-container v-if="activeName === '2'">
         <section class="main-section">
           <project-list :search-form="searchForm" type="person" />
@@ -669,7 +669,7 @@ export default {
 @include hide-open-header;
 .bg-person {
   @include bg-project;
-  padding-top: 60px;
+  margin-top: 0;
 }
 .main-header {
   @include main-header;

src/views/workbench/team/index.vue

@@ -627,7 +627,7 @@ export default {
 @include hide-open-header;
 .bg-team {
   @include bg-project;
-  padding-top: 60px;
+  margin-top: 0;
 }
 .main-header {
   @include main-header;