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

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

@@ -538,7 +538,6 @@
 
 <script>
 const _ = require('lodash')
-import { mapGetters } from 'vuex'
 import { EncryptId, analysisBizId_id } from '@/utils/crypto-js.js'
 import statusChange from '@/views/projectManage/bugList/details/statusChange'
 import '@/styles/PublicStyle/index.scss'
@@ -604,6 +603,7 @@ export default {
   data() {
     return {
       bugId: -1, // 当前缺陷Id
+      bizId: -1, // 当前缺陷BizId
       configure: {
         language_url: '/tinymce/langs/zh_CN.js',
         language: 'zh_CN',
@@ -698,9 +698,6 @@ export default {
       theBugTypeEnumList: [] // 缺陷类型
     }
   },
-  computed: {
-    ...mapGetters(['bizId'])
-  },
   watch: {
     id(newVal, oldVal) {
       this.bug = {}
@@ -1052,6 +1049,7 @@ export default {
             document.getElementsByClassName('scop')[0].scrollTop = 0
           }
           this.bug = res.data
+          this.bizId = this.bug.bizId
           this.bug.currentHandler = res.data.currentHandler.split(',')
           this.bug.assigner = res.data.assigner.split(',')
           this.bugModel = JSON.parse(JSON.stringify(res.data))

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

@@ -2,12 +2,12 @@
   <div>
     <div class="table-top">
       <label>{{ name }}的需求</label>
-      <span class="new-tab-open">
+      <!-- <span class="new-tab-open">
         <el-switch
           v-model="newTabOpen"
           active-text="新标签页跳转"
         />
-      </span>
+      </span> -->
     </div>
     <el-table
       ref="planTable"
@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column label="需求名称" fixed min-width="300" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
-          <div class="table-project-name" @click="needs_link(scope.row.id)">
+          <div class="table-project-name" @click="needs_link(scope.row.id,scope.row.bizId)">
             <span class="id">
               {{ scope.row.requirementDisplayId }}
               <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;">
@@ -206,8 +206,8 @@ export default {
       this.rqmtStatusShow = false
       this.$emit('change', '需求')// 通知父组件，让父组件去执行子组件的数据更新
     },
-    needs_link(id) {
-      const bizId_id = EncryptId(`${this.bizId}_${id}`)
+    needs_link(id, bizId) {
+      const bizId_id = EncryptId(`${bizId}_${id}`)
       if (this.newTabOpen) {
         const newTab = this.$router.resolve({ name: '需求详情', query: { bizId_id: bizId_id }})
         window.open(newTab.href, '_blank')

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

@@ -5,12 +5,12 @@
       <span :class="{'color-blue': status===1}" @click="setStatus(1)">进行中的项目</span>
       <span :class="{'color-blue': status===0}" @click="setStatus(0)">未开始的项目</span>
       <span :class="{'color-blue': status===2}" @click="setStatus(2)">已完成的项目</span>
-      <span class="new-tab-open">
+      <!-- <span class="new-tab-open">
         <el-switch
           v-model="newTabOpen"
           active-text="新标签页跳转"
         />
-      </span>
+      </span> -->
     </div>
     <div class="splice-line" />
     <el-table
@@ -33,7 +33,7 @@
       </el-table-column>
       <el-table-column label="项目名称" min-width="250" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
-          <div class="table-project-name" @click="project_link(scope.row.id)">
+          <div class="table-project-name" @click="project_link(scope.row.id,scope.row.bizId)">
             <span class="id">PROJECT-{{ scope.row.id }}</span>
             <span class="name">{{ scope.row.name }}</span>
           </div>
@@ -173,8 +173,8 @@ export default {
         this.getProjectList()
       }
     },
-    project_link(id) {
-      const bizId_id = EncryptId(`${this.bizId}_${id}`)
+    project_link(id, bizId) {
+      const bizId_id = EncryptId(`${bizId}_${id}`)
       if (this.newTabOpen) {
         const newTab = this.$router.resolve({ name: '项目详情', query: { bizId_id: bizId_id }})
         window.open(newTab.href, '_blank')

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

@@ -2,12 +2,12 @@
   <div>
     <div class="table-top">
       <label>{{ name }}的任务</label>
-      <span class="new-tab-open">
+      <!-- <span class="new-tab-open">
         <el-switch
           v-model="newTabOpen"
           active-text="新标签页跳转"
         />
-      </span>
+      </span> -->
     </div>
     <el-row v-if="!showHeader" class="select-main" type="flex" align="center">
       <el-col :span="1" class="flex-align-center">
@@ -56,7 +56,7 @@
                 {{ scope.row.tagNotification }}
               </span>
             </span>
-            <span class="task-title" @click="link_task(scope.row.id)">{{ scope.row.name }}</span>
+            <span class="task-title" @click="link_task(scope.row.id,scope.row.bizId)">{{ scope.row.name }}</span>
           </div>
         </template>
       </el-table-column>
@@ -357,8 +357,8 @@ export default {
         })
       }
     },
-    link_task(id) { // 跳转到任务详情页
-      const bizId_id = EncryptId(`${this.bizId}_${id}`)
+    link_task(id, bizId) { // 跳转到任务详情页
+      const bizId_id = EncryptId(`${bizId}_${id}`)
       if (this.newTabOpen) {
         const newTab = this.$router.resolve({ name: '任务详情', query: { bizId_id: bizId_id }})
         window.open(newTab.href, '_blank')