需求业务线改版

src/layout/components/Sidebar/SidebarItem.vue

@@ -2,13 +2,13 @@
   <div v-if="!item.hidden" class="menu-wrapper">
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
+        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}" :disabled="isBizSelectPage">
           <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
           <div v-show="onlyOneChild.meta.title === '个人工作台' && showTips" class="if-notice" />
         </el-menu-item>
       </app-link>
     </template>
-    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body :disabled="isBizSelectPage">
       <template slot="title">
         <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
       </template>
@@ -62,6 +62,11 @@ export default {
     return {
     }
   },
+  computed: {
+    isBizSelectPage() {
+      return this.$route.name === '业务线选择'
+    }
+  },
   watch: {
     showTips: {
       handler(newV) {},

src/views/projectManage/components/demand.vue

@@ -168,6 +168,7 @@
   </div>
 </template>
 <script>
+import { analysisBizId_id } from '@/utils/crypto-js.js'
 import { listByRequire, taskListAvailableDpmTask, taskSetTaskRelated, taskDeleteRelationship, taskShowRelatedDpmTask, taskSyncScheduleToDpm } from '@/api/requirement.js'
 import scheduleList from '@/views/projectManage/components/scheduleList.vue'
 import '@/styles/PublicStyle/index.scss' // 通用css
@@ -201,7 +202,7 @@ export default {
   },
   data() {
     return {
-      requirementId: Number(this.$route.query.id),
+      requirementId: -1,
       allStatus: [], // task状态
       taskDataList: [], // 同步排期到望岳的任务
       memberIDAP: [],
@@ -245,6 +246,9 @@ export default {
     requiredList: {
       handler(newV, old) {
         if (newV.length === 0) {
+          const bizId_id = analysisBizId_id(this.$route.query.bizId_id)
+          this.requirementId = bizId_id[1]
+          if (this.requirementId === -1) return
           this.listByTask(this.requirementId)
         } else {
           this.tableData = newV.taskDetailList // 任务list

src/views/projectManage/iteration/components/demand.vue

@@ -93,7 +93,7 @@ export default {
   },
   data() {
     return {
-      requirementId: Number(this.$route.query.id),
+      requirementId: -1,
       tableData: [],
       checkAlls: false,
       taskScheduleList: [],
@@ -126,6 +126,7 @@ export default {
   watch: {
     id: {
       handler(newV, old) {
+        if (newV === -1) return
         this.newID = newV
         this.listByTask(newV)
       },

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

@@ -86,7 +86,7 @@
   </div>
 </template>
 <script>
-import { analysisBizId_id } from '@/utils/crypto-js.js'
+import { analysisBizId_id, EncryptId } from '@/utils/crypto-js.js'
 import { mapGetters } from 'vuex'
 import { requirementQueryRequirementInfoList } from '@/api/projectIndex'
 import { configShowRequireStatusEnum, updateRequirementStatus } from '@/api/requirement'
@@ -151,7 +151,8 @@ export default {
       }
     },
     needs_link(id) {
-      this.$router.push({ name: '需求详情', query: { id: id }})
+      const bizId_id = EncryptId(`${this.bizId}_${id}`)
+      this.$router.push({ name: '需求详情', query: { bizId_id: bizId_id }})
     }
   }
 }

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

@@ -120,7 +120,7 @@
   </div>
 </template>
 <script>
-import { analysisBizId_id } from '@/utils/crypto-js.js'
+import { analysisBizId_id, EncryptId } from '@/utils/crypto-js.js'
 import { mapGetters } from 'vuex'
 import imgUrl from '@/assets/建立档案@2x.png'
 import TestReport from '@/views/reportManagement/components/TestingReport' // 提测
@@ -145,6 +145,7 @@ export default {
   },
   data() {
     return {
+      projectId: -1, // 项目id
       imgUrl: imgUrl,
       tableList: [], // 排期bable验证
       changeData: new Map(),
@@ -325,7 +326,8 @@ export default {
     },
 
     link_task(id) { // 跳转到任务详情页
-      this.$router.push({ name: '任务详情', query: { id: id }})
+      const bizId_id = EncryptId(`${this.bizId}_${id}`)
+      this.$router.push({ name: '任务详情', query: { bizId_id: bizId_id }})
     }
   }
 }

src/views/projectManage/projectList/projectViewDetails.vue

@@ -283,8 +283,8 @@ export default {
     activeName: {
       handler(newV) {
         Number(newV) > 0
-          ? this.$router.push({ path: this.$route.path, query: { ...this.$route.query, page: newV }})
-          : this.$router.push({ path: this.$route.path, query: { ...this.$route.query, page: '1' }})
+          ? this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, page: newV }})
+          : this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, page: '1' }})
       }
     }
   },

src/views/projectManage/requirement/components/BasicsCode.vue

@@ -170,6 +170,8 @@
 
 <script>
 const _ = require('lodash')
+import { EncryptId } from '@/utils/crypto-js.js'
+import { mapGetters } from 'vuex'
 import '@/styles/PublicStyle/index.scss'
 import searchPeople from '@/components/select/searchPeople'
 import overClick from '@/components/click/overClick'
@@ -205,6 +207,9 @@ export default {
       }
     }
   },
+  computed: {
+    ...mapGetters(['bizId'])
+  },
   watch: {
     value: {
       handler(newV, old) {
@@ -213,11 +218,14 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    bizId: {
+      handler(newV) {
+        if (newV !== -1) this.showRequirementEnum()
+      },
+      immediate: true
     }
   },
-  created() {
-    this.showRequirementEnum()
-  },
   methods: {
     async changeArea(e) { // area修改
       const requirementInfo = _.cloneDeep(this.form_query)
@@ -251,18 +259,20 @@ export default {
     },
     belongingProject(e) {
       if (e.belongingProject && e.belongingProject !== -1) {
-        this.Jump.url = { name: '项目详情', query: { id: e.belongingProject }}
+        const bizId_id = EncryptId(`${this.bizId}_${e.belongingProject}`)
+        this.Jump.url = { name: '项目详情', query: { bizId_id: bizId_id }}
       }
       if (e.iterationId !== -1 && e.iterationId) {
-        this.Jump.url1 = { name: '迭代详情', query: { id: e.iterationId }}
+        const bizId_id = EncryptId(`${this.bizId}_${e.iterationId}`)
+        this.Jump.url1 = { name: '迭代详情', query: { bizId_id: bizId_id }}
       }
     },
     async showRequirementEnum() { // 获取需求状态列表，优先级列表，需求来源
-      const res1 = await projectListProject({ bizId: Number(localStorage.getItem('bizId')) })
+      const res1 = await projectListProject({ bizId: this.bizId })
       if (res1.code === 200) {
         this.belongProjectList = res1.data
       }
-      const res4 = await iterationList({ bizId: Number(localStorage.getItem('bizId')), curIndex: 1, pageSize: 999 }) // 获取所属迭代列表
+      const res4 = await iterationList({ bizId: this.bizId, curIndex: 1, pageSize: 999 }) // 获取所属迭代列表
       if (res4.code === 200) {
         this.iterationList = res4.data.list
       }
@@ -289,7 +299,7 @@ export default {
           }
         })
       }
-      const res3 = await settingQueryBizRqmtOrntList(localStorage.getItem('bizId'))
+      const res3 = await settingQueryBizRqmtOrntList(this.bizId)
       if (res3.code === 200) { // 需求方向
         this.demandDirection = this.getTreeData(res3.data)
       }

src/views/projectManage/requirement/components/dataStatistics.vue

@@ -35,6 +35,7 @@
   </div>
 </template>
 <script>
+import { analysisBizId_id } from '@/utils/crypto-js.js'
 import normalEchart from '@/components/chart/normalEchart'
 import openDialog from '@/views/projectManage/dialog_vue'
 import createdBug from '@/views/projectManage/bugList/file/createdBug'
@@ -49,6 +50,7 @@ export default {
   },
   data() {
     return {
+      requirementId: -1, // 需求id
       taskImg: taskImg,
       bugImg: bugImg,
       edit: false,
@@ -67,7 +69,10 @@ export default {
   },
   methods: {
     async getRequireSumData() { // 获取数据
-      const res = await getRequireSumData(this.$route.query.id)
+      const bizId_id = analysisBizId_id(this.$route.query.bizId_id)
+      this.requirementId = bizId_id[1]
+      if (this.requirementId === -1) return
+      const res = await getRequireSumData(this.requirementId)
       if (res.code === 200) {
         this.taskData = res.data.taskData
         this.bugData = res.data.bugData

src/views/projectManage/requirement/components/ganntViews.vue

@@ -11,6 +11,7 @@
 </template>
 
 <script>
+import { analysisBizId_id } from '@/utils/crypto-js.js'
 import GanttElastic from 'gantt-elastic'
 import GanttHeader from 'gantt-elastic-header'
 import teamGanttOptions from './../gannttOptions/requireGannt'
@@ -37,7 +38,10 @@ export default {
   },
   methods: {
     async listByRequire() { // 获取排期列表
-      const res = await listByRequire(Number(this.$route.query.id))
+      const bizId_id = analysisBizId_id(this.$route.query.bizId_id)
+      this.requirementId = bizId_id[1]
+      if (this.requirementId === -1) return
+      const res = await listByRequire(this.requirementId)
       if (res.code === 200) {
         this.mun = res.data.scheduleDetailRespons
         this.handleData(res.data.taskDetailList)

src/views/projectManage/requirement/components/modifySchedule.vue

@@ -1,425 +0,0 @@
-<template>
-  <normal-dialog
-    :show-dialog.sync="show"
-    :title="title"
-    :is-default-close="false"
-    :submit-button="isDeleteStatus?'我知道了，删除':'确定'"
-    :buttom-type="isDeleteStatus?'danger':'primary'"
-    :width="isDeleteStatus?'45%':'55%'"
-    @confirm="confirmForm()"
-    @cancel="cancel()"
-  >
-    <article v-if="!isDeleteStatus">
-      <el-form ref="form" :model="form" :rules="form_rules" label-width="100px" :label-position="'left'">
-        <el-form-item label="排期类型" prop="type">
-          <el-select v-model="form.type" clearable placeholder="请选择" style="width: 100%" :disabled="disabled">
-            <el-option v-for="item in taskScheduleEvent" :key="item.code" :label="item.msg" :value="item.code" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="参与人员" prop="peopleList">
-          <search-people :value.sync="form.peopleList" style="width: 100%" :size="'medium'" :disabled="disabled" :multiple="true" />
-        </el-form-item>
-        <el-form-item label="排期" prop="dayList">
-          <div v-show="form.dayList.length > 0 ">{{ schedule }}（用时<span class="blue">{{ detailDayList.length }}</span>天）</div>
-          <div v-show="form.dayList.length <= 0 " class="empty-schedule">添加排期</div>
-          <div v-if="!disabled" class="picker-hidden">
-            <sel-date-picker :start-end.sync="form.dayList" :detail-day-list="detailDayList" @getDetailDay="getDetailDay" />
-          </div>
-        </el-form-item>
-        <el-form-item label="描述">
-          <el-input v-model="form.desc" autocomplete="off" placeholder="请输入问题描述内容..." :disabled="disabled" />
-        </el-form-item>
-        <el-form-item label="关联任务" prop="taskList">
-          <el-select
-            v-model="selectTask"
-            filterable
-            remote
-            reserve-keyword
-            placeholder="请输入任务名称或ID"
-            :remote-method="remoteMethod"
-            :loading="loading"
-            style="width: 100%"
-            :disabled="disabled"
-            @change="tasksChange"
-          >
-            <el-option
-              v-for="item in tasksOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-              :disabled="item.isScheduleLocked === 1"
-            >
-              <div class="Layout_space_between">
-                <span>{{ item.name }}</span>
-                <div :class="item.isScheduleLocked === 1 ? 'el-icon-lock': 'el-icon-unlock'" />
-              </div>
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div class="task-list-show">
-        <div v-for="item in tasksDetailList" :key="'task'+item.id" class="task-list-item">
-          <div v-if="item.taskIdSting" class="item-id">{{ item.taskIdSting }}</div>
-          <div v-if="item.taskId" class="item-id">{{ item.taskId }}</div>
-          <div class="item-name"><span>{{ item.name }}</span></div>
-          <div class="item-qa">测试负责人：<span>{{ item.qaObject !== null?item.qaObject.name: '' }}</span></div>
-          <div class="item-rd">开发负责人：<span>{{ item.rdObject !== null?item.rdObject.name: '' }}</span></div>
-          <i class="el-icon-circle-close item-cancel" @click="cancelTask(item.id)" />
-        </div>
-      </div>
-    </article>
-    <article v-if="isDeleteStatus">
-      <div class="danger-img">
-        <img :src="dangerImg">
-      </div>
-      <div class="delete-title">
-        执行删除后，所有关联任务下的此排期均会被删除，并无法恢复，请谨慎操作！
-      </div>
-      <div class="people-list-show">
-        <p>参与人：</p>
-        <span>{{ peopleObjectList.join('，') }}</span>
-      </div>
-      <div class="task-list-show">
-        <p>关联任务：</p>
-        <div v-for="item in tasksDetailList" :key="'task'+item.id" class="task-list-item">
-          <div v-if="item.taskIdSting" class="item-id">{{ item.taskIdSting }}</div>
-          <div v-if="item.taskId" class="item-id">{{ item.taskId }}</div>
-          <div class="item-name"><span>{{ item.name }}</span></div>
-        </div>
-      </div>
-    </article>
-  </normal-dialog>
-</template>
-<script>
-const _ = require('lodash')
-import searchPeople from '@/components/select/searchPeople'
-import normalDialog from '@/components/dialog/normalDialog'
-import selDatePicker from '@/components/picker/SelDatePicker'
-import { taskList } from '@/api/projectIndex'
-import { taskList as allTaskList, configShowTaskEnum } from '@/api/taskIndex'
-import { getSeprateDayInfo, scheduleCreate, scheduleGet, scheduleUpdate, scheduleDelete } from '@/api/projectViewDetails'
-import danger from '@/assets/感叹@2x.png'
-import '@/styles/PublicStyle/index.scss'
-export default {
-  components: {
-    searchPeople,
-    normalDialog,
-    selDatePicker
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false,
-      required: true
-    },
-    title: {
-      type: String,
-      default: '新建排期',
-      required: false
-    },
-    detailData: { // 详细日期
-      type: Object,
-      default: () => null,
-      required: false
-    },
-    selectTaskList: { // 已选任务列表
-      type: Array,
-      default: () => [],
-      required: false
-    },
-    disabled: {// 是否查看状态，不能被编辑
-      type: Boolean,
-      default: false,
-      required: false
-    },
-    isDelete: {// 是否删除状态
-      type: Boolean,
-      default: false,
-      required: false
-    }
-  },
-  data() {
-    return {
-      dangerImg: danger,
-      form_rules: {
-        type: [{ required: true, message: '事件类型不能为空', trigger: 'blur' }],
-        peopleList: [{ required: true, message: '参与人员不能为空', trigger: 'blur' }],
-        dayList: [{ required: true, message: '排期不能为空', trigger: 'blur' }],
-        taskList: [{ required: true, message: '关联任务不能为空', trigger: 'blur' }]
-      },
-      show: this.visible,
-      isDeleteStatus: this.isDelete,
-      taskScheduleEvent: [],
-      form: {
-        bizId: localStorage.getItem('bizId'),
-        type: '',
-        peopleList: [],
-        taskList: [],
-        desc: '',
-        dayList: [] // 日期列表
-      },
-      detailDayList: [], // 详细的日期
-      schedule: '',
-      selectTask: null, // 选择的任务id
-      tasksOptions: [], // 任务下拉选项
-      tasksDetailList: [], // 已有任务项目
-      loading: false,
-      peopleObjectList: [] // 参与人
-    }
-  },
-  watch: {
-    visible: {
-      handler(newV, old) {
-        this.show = newV
-      },
-      immediate: true
-    },
-    detailData: {
-      handler(newV, old) {
-        if (newV) {
-          this.getScheduleData(newV.id)
-        }
-      },
-      immediate: true
-    },
-    selectTaskList: { // 已选择任务列表
-      handler(newV, old) {
-        if (newV && newV.length > 0) {
-          this.tasksOptions = newV
-          this.tasksDetailList = [...newV]
-          this.form.taskList = newV.map(item => item.id)
-        }
-      },
-      immediate: true
-    },
-    title(newV, oldV) {
-      this.title = newV
-    },
-    isDelete: {
-      handler(newV, old) {
-        this.isDeleteStatus = newV
-      },
-      immediate: true,
-      deep: true
-    }
-  },
-  created() {
-    this.getType()
-    this.getNowTask()
-  },
-  methods: {
-    async getScheduleData(id) { // 当有传入的详细信息的时候
-      const res = await scheduleGet(id)
-      let obj
-      if (res.code === 200) {
-        obj = res.data
-      } else {
-        return false
-      }
-      this.form = {
-        id: obj.id,
-        bizId: localStorage.getItem('bizId'),
-        type: obj.type,
-        peopleList: obj.peopleList || [],
-        taskList: obj.taskObjectList.map(item => item.id),
-        desc: obj.desc,
-        dayList: [obj.dayList[0], obj.dayList[obj.dayList.length - 1]] // 日期列表
-      }
-      this.detailDayList = obj.dayList || []
-      this.schedule = obj.seperateDaysNoHoliday
-      this.tasksDetailList = obj.taskObjectList || []
-      this.peopleObjectList = obj.peopleObjectList.map(item => item.name) || []
-    },
-    async getType() {
-      const resEnum = await configShowTaskEnum()
-      if (resEnum.code === 200) {
-        this.taskScheduleEvent = resEnum.data.taskScheduleEvent
-      }
-    },
-    async getNowTask() { // 获取当前需求下任务
-      const res = await taskList({
-        requireId: this.$route.query.id
-      })
-      if (res.code === 200) {
-        this.tasksOptions = res.data.taskDetails
-      }
-    },
-    async remoteMethod(query) { // 远程搜索任务
-      this.loading = true
-      const res = await allTaskList({
-        bizId: Number(localStorage.getItem('bizId')),
-        name: query
-      })
-      if (res.code === 200) {
-        this.loading = false
-        this.tasksOptions = res.data
-      } else {
-        this.loading = false
-      }
-    },
-    tasksChange(id) { // 任务列表变动
-      const isEx = this.tasksDetailList.find(item => item.id === id)
-      if (isEx) {
-        this.$message({ message: '任务已存在', type: 'warning', duration: 1000, offset: 150 })
-        this.selectTask = null
-        return false
-      }
-      const res = this.tasksOptions.find(item => {
-        return item.id === id
-      })
-      this.tasksDetailList.push(res)
-      this.form.taskList.push(res.id)
-      this.selectTask = null
-    },
-    cancelTask(id) { // 删除单个关联任务
-      if (this.disabled) {
-        return false
-      }
-      this.tasksDetailList = this.tasksDetailList.filter(item => item.id !== id)
-      this.form.taskList = this.form.taskList.filter(item => item !== id)
-    },
-    getDetailDay(e) { // 获取详细排期日期
-      this.detailDayList = e
-      this.getSeprateDayInfo(e)
-    },
-    async getSeprateDayInfo(dataArr) { // 获取选中时间中的工作日时间
-      const res = await getSeprateDayInfo(dataArr)
-      if (res.code === 200) {
-        this.schedule = res.data.seperateDaysNoHoliday
-      }
-    },
-    async scheduleCreate(params) { // 创建排期
-      const res = await scheduleCreate(params)
-      if (res.code === 200) {
-        this.$message({ message: '添加成功', type: 'success', duration: 1000, offset: 150 })
-        this.$emit('update')
-        this.cancel()
-      }
-    },
-    async scheduleUpdate(params) { // 更新排期
-      const res = await scheduleUpdate(params)
-      if (res.code === 200) {
-        this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
-        this.$emit('update')
-        this.cancel()
-      }
-    },
-    async scheduleDelete() { // 删除排期
-      const res = await scheduleDelete(this.form.id)
-      if (res.code === 200) {
-        this.$message({ message: '删除成功', type: 'success', duration: 1000, offset: 150 })
-        this.$emit('update')
-        this.cancel()
-      }
-    },
-    confirmForm() { // 确认提交表单
-      if (this.isDeleteStatus) {
-        this.scheduleDelete()
-        return
-      }
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          const params = _.cloneDeep(this.form)
-          params.dayList = this.detailDayList
-          params.id ? this.scheduleUpdate(params) : this.scheduleCreate(params)
-        }
-      })
-    },
-    cancel() { // 关闭弹框
-      this.show = false
-      this.isDeleteStatus = false
-      this.$emit('update:visible', this.show)
-      this.$emit('update:isDelete', this.isDeleteStatus)
-    }
-  }
-}
-</script>
-<style scoped lang="scss">
-article {
-  max-height: 60vh;
-  overflow: scroll;
-    .blue {
-    color: #409EFF;
-  }
-}
->>>.el-form {
-  padding: 0 156px 0 60px;
-}
-.picker-hidden {
-  opacity: 0;
-  position: absolute;
-  top: 0;
-}
-.empty-schedule {
-  color:rgba(51,51,51,0.45);
-}
-.task-list-show {
-  width: 100%;
-  padding: 0 60px;
-  p {
-    color: #666666;
-    font-size: 14px;
-    margin-bottom: 20px;
-  }
-  span {
-    color: #333333;
-  }
-  .task-list-item {
-    width: 100%;
-    display: flex;
-    margin: 10px 0;
-    .item-id {
-      width: 15%;
-    }
-    .item-name {
-      width: 40%;
-    }
-    .item-qa {
-      width: 20%;
-    }
-    .item-rd {
-      width: 20%;
-    }
-    .item-cancel {
-      font-size: 20px;
-    }
-    div {
-      overflow: hidden;
-      text-overflow:ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
-.danger-img {
-  width: 100%;
-  padding: 0 60px 50px 60px;
-  margin-bottom: 50px;
-  position: relative;
-  img {
-    height: 50px;
-    width: 50px;
-    position: absolute;
-    left: 50%;
-    transform: translate(-50%,0);
-  }
-}
-.delete-title {
-  width: 100%;
-  padding: 0 60px 60px 60px;
-  color: #333B4A;
-  font-size: 18px;
-  text-align: center;
-}
-.people-list-show {
-  width: 100%;
-  padding: 0 60px 40px 60px;
-  p {
-    color: #666666;
-    font-size: 14px;
-    margin-bottom: 20px;
-  }
-  span {
-    color: #333333;
-  }
-}
-</style>

src/views/projectManage/requirement/components/scheduleList.vue

@@ -67,7 +67,7 @@ import moment from 'moment'
 import 'moment/locale/zh-cn'
 import { listByRequire } from '@/api/requirement.js'
 import { listByTask, sortForTask } from '@/api/projectViewDetails'
-import modifySchedule from './modifySchedule'
+import modifySchedule from '@/views/projectManage/projectList/components/modifySchedule'
 import move from '@/assets/麻将@2x.png'
 import '@/styles/PublicStyle/index.scss' // 通用css
 export default {
@@ -82,7 +82,7 @@ export default {
   props: {
     id: {
       type: Number,
-      default: NaN,
+      default: -1,
       required: true
     },
     all: {
@@ -131,6 +131,7 @@ export default {
   watch: {
     id: {
       handler(newV, oldV) {
+        if (newV === -1) return
         this.listByTask(newV)
       },
       immediate: true

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

@@ -122,6 +122,8 @@
   </div>
 </template>
 <script>
+import { analysisBizId_id, EncryptId } from '@/utils/crypto-js.js'
+import { mapGetters } from 'vuex'
 import imgUrl from '@/assets/建立档案@2x.png'
 import TestReport from '@/views/reportManagement/components/TestingReport' // 提测
 import DailyReport from '@/views/reportManagement/components/DailyReport' // 日报
@@ -145,6 +147,7 @@ export default {
   },
   data() {
     return {
+      requireId: -1, // 需求id
       imgUrl: imgUrl,
       tableList: [], // 排期bable验证
       allChange: false, // 是否全展开
@@ -168,14 +171,27 @@ export default {
       selectTaskList: [] // 已选任务的id
     }
   },
+  computed: {
+    ...mapGetters(['bizId'])
+  },
+  watch: {
+    bizId: {
+      handler() {
+        this.getTaskStatus()
+      },
+      immediate: true
+    }
+  },
   created() {
-    this.getTaskStatus()
     this.get_allTask()
   },
   methods: {
     async get_allTask() { // 获取全部任务
+      const bizId_id = analysisBizId_id(this.$route.query.bizId_id)
+      this.requireId = bizId_id[1]
+      if (this.requireId === -1) return
       const res = await taskList({
-        requireId: this.$route.query.id
+        requireId: this.requireId
       })
       if (res.code === 200) {
         this.all_task = res.data
@@ -186,7 +202,7 @@ export default {
       if (res.code === 200) {
         this.taskScheduleEvent = res.data.taskScheduleEvent || []
       }
-      const res1 = await configShowTaskStatusEnum(localStorage.getItem('bizId'))
+      const res1 = await configShowTaskStatusEnum(this.bizId)
       if (res1.code === 200) {
         this.allStatus = res1.data.taskStatus
       }
@@ -317,7 +333,8 @@ export default {
     },
 
     link_task(id) { // 跳转到任务详情页
-      this.$router.push({ name: '任务详情', query: { id: id }})
+      const bizId_id = EncryptId(`${this.bizId}_${id}`)
+      this.$router.push({ name: '任务详情', query: { bizId_id: bizId_id }})
     }
   }
 }

src/views/projectManage/requirement/list/create.vue

@@ -130,6 +130,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import { getMemberInfo, createRequirement, updateRequirement, showRequirementEnum, settingGetBizList, projectListProject, settingQueryBizRqmtOrntList } from '@/api/requirement.js'
 import { iterationList } from '@/api/requirement.js'
 import urgentUrl from '@/assets/紧急.png'
@@ -184,7 +185,7 @@ export default {
         belongingProject: '-1',
         priority: null,
         sourceType: null,
-        bizId: null,
+        bizId: this.bizId,
         pm: null,
         mrdUrl: null,
         dependOnRelease: 0,
@@ -220,6 +221,9 @@ export default {
       userLoading: false
     }
   },
+  computed: {
+    ...mapGetters(['bizId'])
+  },
   watch: {
     visible: function(newVisible, oldVisible) {
       this.isVisible = newVisible
@@ -255,7 +259,7 @@ export default {
       }
     },
     isVisible: function(newIsVisible, oldIsVisible) {
-      this.form.bizId = Number(localStorage.getItem('bizId'))
+      this.form.bizId = this.bizId
       if (!newIsVisible) {
         if (this.title === '新建需求') {
           for (const i in this.form) {
@@ -272,14 +276,16 @@ export default {
     }
   },
   mounted() {
-    this.getBizId()
+    this.settingGetBizList()
+    this.projectListProject()
+    this.settingQueryBizRqmtOrntList()
     this.getIterationList()
     this.showRequirementEnum()
   },
   methods: {
     async getIterationList() { // 获取所属迭代列表
       const res = await iterationList({
-        bizId: Number(localStorage.getItem('bizId')),
+        bizId: this.bizId,
         curIndex: 1,
         pageSize: 999
       })
@@ -288,17 +294,18 @@ export default {
       }
       this.iterationList.unshift({ id: -1, name: '无' })
     },
-    async getBizId() {
-      await settingGetBizList({}).then(res => {
-        this.all_bizId = res.data
-        this.$set(this.form, 'bizId', Number(localStorage.getItem('bizId')))
-      })
-      await projectListProject({ bizId: Number(localStorage.getItem('bizId')) }).then(res => {
-        this.AttributionItems = res.data.filter(item => item.id !== -1)
-      })
-      const res3 = await settingQueryBizRqmtOrntList(localStorage.getItem('bizId'))
-      if (res3.code === 200) { // 需求方向
-        this.demandDirection = this.getTreeData(res3.data)
+    async settingGetBizList() {
+      const res = await settingGetBizList({})
+      this.all_bizId = res.data
+    },
+    async projectListProject() {
+      const res = await projectListProject({ bizId: this.bizId })
+      this.AttributionItems = res.data.filter(item => item.id !== -1)
+    },
+    async settingQueryBizRqmtOrntList() {
+      const res = await settingQueryBizRqmtOrntList(this.bizId)
+      if (res.code === 200) { // 需求方向
+        this.demandDirection = this.getTreeData(res.data)
       }
     },
     getTreeData(data) {
@@ -318,11 +325,11 @@ export default {
         this.formBackgroungInfo = res.data
       })
     },
-    cancel: function() {
+    cancel() {
       this.$emit('cancel', false)
       this.isVisible = false
     },
-    confirm: function() {
+    confirm() {
       this.$refs.form.validate(async(valid) => {
         if (valid) {
           for (const i in this.form) {

src/views/projectManage/requirement/requirementDetail.vue

@@ -232,7 +232,7 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="变更记录" name="second">
-              <record :id="requirementId" ref="record" :name="'需求'" />
+              <record v-if="requirementId !== -1" :id="requirementId" ref="record" :name="'需求'" />
             </el-tab-pane>
           </el-tabs>
 
@@ -314,6 +314,7 @@ const _ = require('lodash')
 import Vue from 'vue'
 import VueClipboard from 'vue-clipboard2'
 Vue.use(VueClipboard)
+import { analysisBizId_id } from '@/utils/crypto-js.js'
 import {
   getRequirementById,
   updateRequirementStatus,
@@ -401,7 +402,7 @@ export default {
       scheduleVisble: false, // 排期锁定
       activeName: '1', // 顶部tab切换
       textarea: '', // 评论
-      requirementId: Number(this.$route.query.id), // 需求id
+      requirementId: -1, // 需求id
       // statusList: [], // 状态列表
       taskScheduleEvent: [], // 排期类型列表
       form_query: { pm: null, rqmtOrntIds: [], qaLeader: [] },
@@ -422,7 +423,7 @@ export default {
       isScheduleLocked: '', // 锁定状态1锁定0未锁定
       SchedulingContent: [], // 排期历史变更记录
       listOrGannt: '列表',
-      bugListQuery: { requireId: Number(this.$route.query.id) }// 缺陷列表的搜索项
+      bugListQuery: { requireId: this.requirementId }// 缺陷列表的搜索项
     }
   },
   computed: {
@@ -434,27 +435,31 @@ export default {
     activeName: {
       handler(newV) {
         Number(newV) > 0
-          ? this.$router.push({ path: this.$route.path, query: { id: this.$route.query.id, page: newV }})
-          : this.$router.push({ path: this.$route.path, query: { id: this.$route.query.id, page: '1' }})
+          ? this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, page: newV }})
+          : this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, page: '1' }})
       }
     }
   },
   created() {
+    this.analysisBizId_id()
     this.$nextTick(() => {
       this.activeName = this.$route.query.page ? this.$route.query.page : '1'
     })
-    this.getRequirementById()
-    this.getCommentList()
-    this.getTaskStatus()
-    this.GetRequireScheduleHistory()
     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: {
+    analysisBizId_id() { // 解析路由中的bizId_id
+      if (!this.$route.query.bizId_id) return
+      const bizId_id = analysisBizId_id(this.$route.query.bizId_id)
+      this.requirementId = bizId_id[1]
+      this.getRequirementById()
+      this.getCommentList()
+      this.getTaskStatus()
+      this.GetRequireScheduleHistory()
+    },
     async GetRequireScheduleHistory() {
       this.scheduleVisble = false
       const res = await scheduleGetRequireScheduleHistory(this.requirementId)
@@ -559,7 +564,7 @@ export default {
       this.getRequirementById()
     },
     async getRequirementById() { // 获取需求详情
-      const res = await getRequirementById({ id: this.$route.query.id })
+      const res = await getRequirementById({ id: this.requirementId })
       if (res.code === 200) {
         this.form_query = _.cloneDeep(res.data)
         if (this.form_query.rdLeader === null || this.form_query.rdLeader === '') {
@@ -627,7 +632,7 @@ export default {
       }
     },
     async getCommentList() { // 获取需求评论
-      const res = await getCommentList({ type: 4, joinId: this.$route.query.id })
+      const res = await getCommentList({ type: 4, joinId: this.requirementId })
       if (res.code === 200) {
         this.comments = res.data
         this.commentContent = ''
@@ -640,7 +645,7 @@ export default {
       }
       const user = localStorage.getItem('username')
       const res = await addComment({
-        commentInfo: { joinId: this.$route.query.id, type: 4, content: this.commentContent },
+        commentInfo: { joinId: this.requirementId, type: 4, content: this.commentContent },
         user: { ename: user }
       })
       if (res.code === 200) {
@@ -655,7 +660,7 @@ export default {
         this.dialogStatusVisible = true
         return false
       }
-      const res = await updateRequirementStatus({ id: this.$route.query.id, status: status.value, modifier: localStorage.getItem('username') })
+      const res = await updateRequirementStatus({ id: this.requirementId, status: status.value, modifier: localStorage.getItem('username') })
       if (res.code === 200) {
         this.$refs.timeLine1.taskGetWorkFlow()
         this.$refs.record.operationLogTask()
@@ -672,7 +677,7 @@ export default {
     },
     async deleteRequirement() { // 删除需求
       const res = await deleteRequirement({
-        id: this.$route.query.id,
+        id: this.requirementId,
         modifier: localStorage.getItem('username')
       })
       if (res.code === 200) {
@@ -683,7 +688,7 @@ export default {
     reated_task() { // 新建任务
       this.task_open = true
       this.$nextTick(() => {
-        this.$refs.task_createdUpdata.init(4, this.$route.query.id,
+        this.$refs.task_createdUpdata.init(4, this.requirementId,
           {
             requirementId: this.requirementId,
             name: `${this.form_query.name}的任务`,

src/views/projectManage/schedule.vue

@@ -27,7 +27,7 @@ import { configShowTaskEnum, scheduleLockTaskSchedule, scheduleUnlockTaskSchedul
 export default {
   props: {
     visible: { type: Boolean, default: false },
-    requireId: { type: Number, required: true },
+    requireId: { type: Number, default: -1, required: true },
     name: { type: String, required: true },
     isScheduleLocked: { type: [String, Number], required: true }
   },
@@ -43,6 +43,13 @@ export default {
     }
   },
   watch: {
+    requireId: {
+      handler(newV) {
+        if (newV === -1) return
+        this.getTaskEnum()
+      },
+      immediate: true
+    },
     visible(val) {
       this.dialogVisible = val
     },
@@ -54,9 +61,6 @@ export default {
       this.codeName = val
     }
   },
-  created() {
-    this.getTaskEnum()
-  },
   methods: {
     async getTaskEnum() { // 获取解锁原因下拉数据
       const res = await configShowTaskEnum()

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

@@ -1,403 +0,0 @@
-<template>
-  <normal-dialog
-    :show-dialog.sync="show"
-    :title="title"
-    :is-default-close="false"
-    :submit-button="isDeleteStatus?'我知道了，删除':'确定'"
-    :buttom-type="isDeleteStatus?'danger':'primary'"
-    :width="isDeleteStatus?'45%':'55%'"
-    @confirm="confirmForm()"
-    @cancel="cancel()"
-  >
-    <article v-if="!isDeleteStatus">
-      <el-form ref="form" :model="form" :rules="form_rules" label-width="100px" :label-position="'left'">
-        <el-form-item label="排期类型" prop="type">
-          <el-select v-model="form.type" clearable placeholder="请选择" style="width: 100%" :disabled="disabled">
-            <el-option v-for="item in taskScheduleEvent" :key="item.code" :label="item.msg" :value="item.code" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="参与人员" prop="peopleList">
-          <search-people :value.sync="form.peopleList" style="width: 100%" :size="'medium'" :disabled="disabled" :multiple="true" />
-        </el-form-item>
-        <el-form-item label="排期" prop="dayList">
-          <div v-show="form.dayList.length > 0 ">{{ schedule }}（用时<span class="blue">{{ detailDayList.length }}</span>天）</div>
-          <div v-show="form.dayList.length <= 0 " class="empty-schedule">添加排期</div>
-          <div v-if="!disabled" class="picker-hidden">
-            <sel-date-picker :start-end.sync="form.dayList" :detail-day-list="detailDayList" @getDetailDay="getDetailDay" />
-          </div>
-        </el-form-item>
-        <el-form-item label="描述">
-          <el-input v-model="form.desc" autocomplete="off" placeholder="请输入问题描述内容..." :disabled="disabled" />
-        </el-form-item>
-        <el-form-item label="关联任务" prop="taskList">
-          <el-select
-            v-model="selectTask"
-            filterable
-            remote
-            reserve-keyword
-            placeholder="请输入任务名称或ID"
-            :remote-method="remoteMethod"
-            :loading="loading"
-            style="width: 100%"
-            :disabled="disabled"
-            @change="tasksChange"
-          >
-            <el-option
-              v-for="item in tasksOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-              :disabled="item.isScheduleLocked === 1"
-            >
-              <div class="Layout_space_between">
-                <span>{{ item.name }}</span>
-                <div :class="item.isScheduleLocked === 1 ? 'el-icon-lock': 'el-icon-unlock'" />
-              </div>
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div class="task-list-show">
-        <div v-for="item in tasksDetailList" :key="'task'+item.id" class="task-list-item">
-          <div v-if="item.taskIdSting" class="item-id">{{ item.taskIdSting }}</div>
-          <div v-if="item.taskId" class="item-id">{{ item.taskId }}</div>
-          <div class="item-name">{{ item.name }}</div>
-          <div class="item-qa">测试负责人：{{ item.qaObject !== null?item.qaObject.name: '' }}</div>
-          <div class="item-rd">开发负责人：{{ item.rdObject !== null?item.rdObject.name: '' }}</div>
-          <i class="el-icon-circle-close item-cancel" @click="cancelTask(item.id)" />
-        </div>
-      </div>
-    </article>
-    <article v-if="isDeleteStatus">
-      <div class="danger-img">
-        <img :src="dangerImg">
-      </div>
-      <div class="delete-title">
-        执行删除后，所有关联任务下的此排期均会被删除，并无法恢复，请谨慎操作！
-      </div>
-      <div class="people-list-show">
-        <p>参与人：</p>
-        <span>{{ peopleObjectList.join('，') }}</span>
-      </div>
-      <div class="task-list-show">
-        <p>关联任务：</p>
-        <div v-for="item in tasksDetailList" :key="'task'+item.id" class="task-list-item">
-          <div v-if="item.taskIdSting" class="item-id">{{ item.taskIdSting }}</div>
-          <div v-if="item.taskId" class="item-id">{{ item.taskId }}</div>
-          <div class="item-name"><span>{{ item.name }}</span></div>
-        </div>
-      </div>
-    </article>
-  </normal-dialog>
-</template>
-<script>
-const _ = require('lodash')
-import searchPeople from '@/components/select/searchPeople'
-import normalDialog from '@/components/dialog/normalDialog'
-import selDatePicker from '@/components/picker/SelDatePicker'
-import { taskList as allTaskList, configShowTaskEnum, taskGet } from '@/api/taskIndex'
-import { getSeprateDayInfo, scheduleCreate, scheduleGet, scheduleUpdate, scheduleDelete } from '@/api/projectViewDetails'
-import danger from '@/assets/感叹@2x.png'
-import '@/styles/PublicStyle/index.scss'
-export default {
-  components: {
-    searchPeople,
-    normalDialog,
-    selDatePicker
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false,
-      required: true
-    },
-    title: {
-      type: String,
-      default: '新建排期',
-      required: false
-    },
-    detailData: { // 详细日期
-      type: Object,
-      default: () => null,
-      required: false
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-      required: false
-    },
-    isDelete: {// 是否删除状态
-      type: Boolean,
-      default: false,
-      required: false
-    }
-  },
-  data() {
-    return {
-      dangerImg: danger,
-      form_rules: {
-        type: [{ required: true, message: '事件类型不能为空', trigger: 'blur' }],
-        peopleList: [{ required: true, message: '参与人员不能为空', trigger: 'blur' }],
-        dayList: [{ required: true, message: '排期不能为空', trigger: 'blur' }],
-        taskList: [{ required: true, message: '关联任务不能为空', trigger: 'blur' }]
-      },
-      show: this.visible,
-      isDeleteStatus: this.isDelete,
-      taskScheduleEvent: [],
-      form: {
-        bizId: localStorage.getItem('bizId'),
-        type: '',
-        peopleList: [],
-        taskList: [],
-        desc: '',
-        dayList: [] // 日期列表
-      },
-      detailDayList: [], // 详细的日期
-      schedule: '',
-      selectTask: null, // 选择的任务id
-      tasksOptions: [], // 任务下拉选项
-      tasksDetailList: [], // 已有任务项目
-      loading: false,
-      peopleObjectList: [] // 参与人
-    }
-  },
-  watch: {
-    visible: {
-      handler(newV, old) {
-        this.show = newV
-      },
-      immediate: true
-    },
-    detailData: {
-      handler(newV, old) {
-        if (newV) {
-          this.getScheduleData(newV.id)
-        }
-      },
-      immediate: true
-    },
-    title(newV, oldV) {
-      this.title = newV
-    },
-    isDelete: {
-      handler(newV, old) {
-        this.isDeleteStatus = newV
-      },
-      immediate: true,
-      deep: true
-    }
-  },
-  created() {
-    this.getType()
-    if (this.detailData === null) {
-      this.init()
-    }
-  },
-  methods: {
-    async init() {
-      const res = await taskGet(this.$route.query.id)
-      if (res.code === 200) {
-        this.tasksOptions = [res.data]
-        this.tasksDetailList = [res.data]
-        this.form.taskList = [res.data.id]
-      }
-    },
-    async getScheduleData(id) { // 当有传入的详细信息的时候
-      const res = await scheduleGet(id)
-      let obj
-      if (res.code === 200) {
-        obj = res.data
-      } else {
-        return false
-      }
-      this.form = {
-        id: obj.id,
-        bizId: localStorage.getItem('bizId'),
-        type: obj.type,
-        peopleList: obj.peopleList || [],
-        taskList: obj.taskObjectList.map(item => item.id),
-        desc: obj.desc,
-        dayList: [obj.dayList[0], obj.dayList[obj.dayList.length - 1]] // 日期列表
-      }
-      this.detailDayList = obj.dayList || []
-      this.schedule = obj.seperateDaysNoHoliday
-      this.tasksDetailList = obj.taskObjectList || []
-      this.peopleObjectList = obj.peopleObjectList.map(item => item.name) || []
-    },
-    async getType() {
-      const resEnum = await configShowTaskEnum()
-      if (resEnum.code === 200) {
-        this.taskScheduleEvent = resEnum.data.taskScheduleEvent
-      }
-    },
-    async remoteMethod(query) { // 远程搜索任务
-      this.loading = true
-      const res = await allTaskList({
-        bizId: Number(localStorage.getItem('bizId')),
-        name: query
-      })
-      if (res.code === 200) {
-        this.loading = false
-        this.tasksOptions = res.data
-      } else {
-        this.loading = false
-      }
-    },
-    tasksChange(id) { // 任务列表变动
-      const isEx = this.tasksDetailList.find(item => item.id === id)
-      if (isEx) {
-        this.$message({ message: '任务已存在', type: 'warning', duration: 1000, offset: 150 })
-        this.selectTask = null
-        return false
-      }
-      const res = this.tasksOptions.find(item => {
-        return item.id === id
-      })
-      this.tasksDetailList.push(res)
-      this.form.taskList.push(res.id)
-      this.selectTask = null
-    },
-    cancelTask(id) { // 删除单个关联任务
-      if (this.disabled) {
-        return false
-      }
-      this.tasksDetailList = this.tasksDetailList.filter(item => item.id !== id)
-      this.form.taskList = this.form.taskList.filter(item => item !== id)
-    },
-    getDetailDay(e) { // 获取详细排期日期
-      this.detailDayList = e
-      this.getSeprateDayInfo(e)
-    },
-    async getSeprateDayInfo(dataArr) { // 获取选中时间中的工作日时间
-      const res = await getSeprateDayInfo(dataArr)
-      if (res.code === 200) {
-        this.schedule = res.data.seperateDaysNoHoliday
-      }
-    },
-    async scheduleCreate(params) { // 创建排期
-      const res = await scheduleCreate(params)
-      if (res.code === 200) {
-        this.$message({ message: '添加成功', type: 'success', duration: 1000, offset: 150 })
-        this.$emit('update')
-        this.cancel()
-      }
-    },
-    async scheduleUpdate(params) { // 更新排期
-      const res = await scheduleUpdate(params)
-      if (res.code === 200) {
-        this.$message({ message: '更新成功', type: 'success', duration: 1000, offset: 150 })
-        this.$emit('update')
-        this.cancel()
-      }
-    },
-    async scheduleDelete() { // 删除排期
-      const res = await scheduleDelete(this.form.id)
-      if (res.code === 200) {
-        this.$message({ message: '删除成功', type: 'success', duration: 1000, offset: 150 })
-        this.$emit('update')
-        this.cancel()
-      }
-    },
-    confirmForm() { // 确认提交表单
-      if (this.isDeleteStatus) {
-        this.scheduleDelete()
-        return
-      }
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          const params = _.cloneDeep(this.form)
-          params.dayList = this.detailDayList
-          params.id ? this.scheduleUpdate(params) : this.scheduleCreate(params)
-        }
-      })
-    },
-    cancel() { // 关闭弹框
-      this.show = false
-      this.isDeleteStatus = false
-      this.$emit('update:visible', this.show)
-      this.$emit('update:isDelete', this.isDeleteStatus)
-    }
-  }
-}
-</script>
-<style scoped lang="scss">
-article {
-  max-height: 60vh;
-  overflow: scroll;
-    .blue {
-    color: #409EFF;
-  }
-}
->>>.el-form {
-  padding: 0 156px 0 60px;
-}
-.picker-hidden {
-  opacity: 0;
-  position: absolute;
-  top: 0;
-}
-.empty-schedule {
-  color:rgba(51,51,51,0.45);
-}
-.task-list-show {
-  width: 100%;
-  padding: 0 60px;
-  .task-list-item {
-    width: 100%;
-    display: flex;
-    margin: 10px 0;
-    .item-id {
-      width: 15%;
-    }
-    .item-name {
-      width: 40%;
-    }
-    .item-qa {
-      width: 20%;
-    }
-    .item-rd {
-      width: 20%;
-    }
-    .item-cancel {
-      font-size: 20px;
-    }
-    div {
-      overflow: hidden;
-      text-overflow:ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
-.danger-img {
-  width: 100%;
-  padding: 0 60px 50px 60px;
-  margin-bottom: 50px;
-  position: relative;
-  img {
-    height: 50px;
-    width: 50px;
-    position: absolute;
-    left: 50%;
-    transform: translate(-50%,0);
-  }
-}
-.delete-title {
-  width: 100%;
-  padding: 0 60px 60px 60px;
-  color: #333B4A;
-  font-size: 18px;
-  text-align: center;
-}
-.people-list-show {
-  width: 100%;
-  padding: 0 60px 40px 60px;
-  p {
-    color: #666666;
-    font-size: 14px;
-    margin-bottom: 20px;
-  }
-  span {
-    color: #333333;
-  }
-}
-</style>

src/views/workbench/person/index.vue

@@ -374,8 +374,8 @@ export default {
     activeName: {
       handler(newV) {
         Number(newV) > 0
-          ? this.$router.push({ path: this.$route.path, query: { ...this.$route.query, page: newV }})
-          : this.$router.push({ path: this.$route.path, query: { ...this.$route.query, page: '1' }})
+          ? this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, page: newV }})
+          : this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, page: '1' }})
       }
     }
   },

src/views/workbench/team/index.vue

@@ -335,8 +335,8 @@ export default {
     activeName: {
       handler(newV) {
         Number(newV) > 0
-          ? this.$router.push({ path: this.$route.path, query: { ...this.$route.query, page: newV }})
-          : this.$router.push({ path: this.$route.path, query: { ...this.$route.query, page: '1' }})
+          ? this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, page: newV }})
+          : this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, page: '1' }})
       }
     }
   },