qinzhipeng_v 5 жил өмнө
parent
commit
a7671e428a

+ 7 - 3
src/layout/components/Navbar.vue

@@ -69,6 +69,7 @@ export default {
       sumTypeArray: [],
       sumType: '',
       formulaArea: '', // 公式的文本框
+      typeObj: {},
       bizID: localStorage.getItem('bizId'),
       bizShow: {
         id: ''
@@ -91,12 +92,15 @@ export default {
   },
   mounted() {
     Utils.$on('demo', msg => {
-      const bizId = {}
-      bizId.code = msg
       this.$alert('提示:任务所属业务线和当前设置业务线不一致,将修改用户所在业务线为任务所属业务线,请知晓!', '提示', {
         confirmButtonText: '确定',
         callback: action => {
-          this.sumTypeCkeck(bizId)
+          settingGetBizList({}).then(res => {
+            res.data.map(item => {
+              item.code === msg ? this.typeObj = item : ''
+            })
+            this.sumTypeCkeck(this.typeObj)
+          })
         }
       })
     })

+ 10 - 0
src/views/projectManage/bugList/details/index.vue

@@ -564,6 +564,7 @@
 <script>
 import fackClickOutSide from './fackClickOutSide.js'
 import E from 'wangeditor'
+import Utils from '../../../../util.js'
 // import { settingGetTypeMap } from '@/api/taskIndex'
 import { getCommentList, addComment } from '@/api/requirement.js'
 import {
@@ -686,6 +687,8 @@ export default {
     }
   },
   created() {
+    this.$store.state.data.status = true
+    this.$store.state.data.bizId = true
     if (this.type !== 'page') {
       var height = window.innerHeight > document.body.clientHeight ? window.innerHeight : document.body.clientHeight
       height -= 130
@@ -720,6 +723,10 @@ export default {
     })
     this.getCommentList()
   },
+  destroyed() {
+    this.$store.state.data.status = false
+    this.$store.state.data.bizId = false
+  },
   methods: {
     closeDrawer() {
       this.$emit('close', false)
@@ -889,6 +896,9 @@ export default {
       return bugDetails({ id: id }).then(res => {
         this.loading.fullscreen = false
         if (res.code === 200) {
+          if (res.data.bizId !== Number(localStorage.getItem('bizId'))) {
+            Utils.$emit('demo', res.data.bizId)
+          }
           this.bug = res.data
           this.bugModel = JSON.parse(JSON.stringify(res.data))
           this.bugDescribe = this.bug.bugDescribe

+ 2 - 2
src/views/projectManage/dialog_vue.vue

@@ -55,8 +55,8 @@
           <div>
             <el-form-item label="是否免测" prop="notest">
               <el-radio-group v-model="task_form.notest">
-                <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
+                <el-radio :label="1">是</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item label="模块" prop="moduleIds">
@@ -81,8 +81,8 @@
         <div style="display:flex;align-items: center;justify-content: space-between;">
           <el-form-item label="是否跟版" prop="followVersion">
             <el-radio-group v-model="task_form.followVersion" @change="get_followVersion(task_form.followVersion)">
-              <el-radio :label="1">是</el-radio>
               <el-radio :label="2">否</el-radio>
+              <el-radio :label="1">是</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item v-if="show_Client" label="涉及的客户端" prop="involveApp">

+ 12 - 2
src/views/projectManage/projectList/projectViewDetails.vue

@@ -14,7 +14,6 @@
           <el-dropdown placement="bottom" @command="handleCommand">
             <el-button
               size="mini"
-              type="info"
               plain
               class="el-dropdown-link drop_down"
               style="cursor: pointer;"
@@ -33,7 +32,7 @@
           </el-dropdown>
         </span>
         <span style="float: right;">
-          <el-button size="mini" type="info" plain @click="dele_pro()">删除项目</el-button>
+          <el-button size="mini" plain @click="dele_pro()">删除项目</el-button>
           <el-dropdown placement="bottom" style="margin-left: 10px;">
             <el-button size="mini" type="primary">
               新建
@@ -593,6 +592,7 @@ import {
   requirementQueryRequirementInfoList
 } from '@/api/projectIndex'
 import openDialog from '@/views/projectManage/dialog_vue'
+import Utils from '../../../util.js'
 import RequirementCreate from '@/views/projectManage/requirement/list/create'
 import { showRequirementEnum } from '@/api/requirement.js'
 import createdBug from '@/views/projectManage/bugList/file/createdBug'
@@ -755,6 +755,12 @@ export default {
   created() {
     this.get_list()
     this.initRequirementCreateDialog()
+    this.$store.state.data.status = true
+    this.$store.state.data.bizId = true
+  },
+  destroyed() {
+    this.$store.state.data.status = false
+    this.$store.state.data.bizId = false
   },
   methods: {
     initRequirementCreateDialog() {
@@ -797,6 +803,10 @@ export default {
         curIndex: this.curIndex,
         pageSize: this.pageSize
       }).then(res => {
+        if (res.data[0].bizId !== Number(localStorage.getItem('bizId'))) {
+          console.log(res.data.bizId)
+          Utils.$emit('demo', res.data[0].bizId)
+        }
         this.form_query = res.data[0]
         this.project_from = res.data[0]
         if (this.form_query.target === '' || this.form_query.target === null) {

+ 12 - 1
src/views/projectManage/requirement/details/index.vue

@@ -257,6 +257,7 @@ import {
   getCommentList,
   addComment
 } from '@/api/requirement.js'
+import Utils from '../../../../util.js'
 import { listByVersionTypeWithTime } from '@/api/version.js'
 import RequirementChart from '@/components/chart/index.vue'
 import RequirementUpdate from '@/views/projectManage/requirement/list/create.vue'
@@ -468,6 +469,10 @@ export default {
       }
     }
   },
+  created() {
+    this.$store.state.data.status = true
+    this.$store.state.data.bizId = true
+  },
   mounted() {
     this.showRequirementEnum().then(res => {
       this.getRequirementById()
@@ -476,6 +481,10 @@ export default {
     this.getBugStatusMapInfo()
     this.getCommentList()
   },
+  destroyed() {
+    this.$store.state.data.status = false
+    this.$store.state.data.bizId = false
+  },
   methods: {
     getScheduleCollect() {
       if (this.task && this.task.reqStartTime && this.task.reqEndTime) {
@@ -523,6 +532,9 @@ export default {
       return getRequirementById({
         id: this.id
       }).then(res => {
+        if (res.data.bizId !== Number(localStorage.getItem('bizId'))) {
+          Utils.$emit('demo', res.data.bizId)
+        }
         this.requirement = res.data
         this.loading.info = false
         this.getTaskByRequireId()
@@ -717,7 +729,6 @@ export default {
       this.$nextTick(() => { this.$refs.task_createdUpdata.init(4, this.id) })
     },
     updateRequirementStatus(status) {
-      console.log(status)
       const modifier = localStorage.getItem('username')
       updateRequirementStatus({ id: this.id, status: status.code, modifier: modifier }).then(
         res => {