From 639cf5c8412d16fc08e33aa03c923f3a21816fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 12 Jun 2022 18:55:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=E6=B7=BB=E5=8A=A0=E5=85=B3?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/xm/core/xmMyFocus.js | 2 +- src/router/routes_xm.js | 1 + .../xm/core/xmIteration/XmIterationMng.vue | 25 +++++++++++++-- src/views/xm/core/xmMyFocus/XmMyFocusList.vue | 32 +++++++++++-------- 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/api/xm/core/xmMyFocus.js b/src/api/xm/core/xmMyFocus.js index 8b8f6bc2..3716477d 100644 --- a/src/api/xm/core/xmMyFocus.js +++ b/src/api/xm/core/xmMyFocus.js @@ -47,7 +47,7 @@ export const myFocusForIndex = params => { //初始化页面上的字典 export const initDicts = (that) => { var itemCodes=[];//在此添加要加载的字典 如['sex','grade','lvl'] - that.dicts['focusType']=[{id:'1',name:'项目'},{id:'2',name:'任务'},{id:'3',name:'产品'},{id:'4',name:'需求'},{id:'5',name:'缺陷'},] + that.dicts['focusType']=[{id:'1',name:'项目'},{id:'2',name:'任务'},{id:'3',name:'产品'},{id:'4',name:'需求'},{id:'5',name:'缺陷'},{id:'6',name:'迭代'},] if(itemCodes.length>0){ initSimpleDicts('all',itemCodes).then(res=>{ Object.assign(that.dicts,res.data.data) diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index 32f70d8e..32ba671c 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -113,6 +113,7 @@ export default { { path: 'xmMenu/XmMenuMng', component: _import('xm/core/xmMenu/XmMenuMng'), name: 'XmMenuMng', meta: { title: '需求管理' }}, { path: 'xmMenuExchange/XmMenuExchangeMng', component: _import('xm/core/xmMenuExchange/XmMenuExchangeMng'), name: 'XmMenuExchangeMng', meta: { title: '互动评论' }}, + { path: 'xmIteration/XmIterationMng', component: _import('xm/core/xmIteration/XmIterationMng'), name: 'XmIterationMng', meta: { title: '迭代管理' }}, ] }, diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index 1edcf0f6..be568c39 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -73,8 +73,11 @@ - + @@ -118,7 +121,7 @@ import { mapGetters } from 'vuex' import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue'; - + import { addXmMyFocus , delXmMyFocus } from '@/api/xm/core/xmMyFocus'; export default { computed: { ...mapGetters([ @@ -450,7 +453,23 @@ import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue' this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) }) - } + }, + focusOrUnfocus:function(row){ + if(this.menukey=="myFocus"){ + delXmMyFocus({pbizId:row.productId,focusType:'6',bizId:row.id,bizName:row.iterationName}).then(res=>{ + var tips=res.data.tips; + if(tips.isOk){ + this.getXmIterations(); + } + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); + }) + }else{ + addXmMyFocus({pbizId:row.productId,focusType:'6',bizId:row.id,bizName:row.iterationName}).then(res=>{ + var tips=res.data.tips; + this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); + }) + } + }, },//end methods components: { 'xm-iteration-add':XmIterationAdd, diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusList.vue b/src/views/xm/core/xmMyFocus/XmMyFocusList.vue index dd563bcb..71caecc6 100644 --- a/src/views/xm/core/xmMyFocus/XmMyFocusList.vue +++ b/src/views/xm/core/xmMyFocus/XmMyFocusList.vue @@ -7,11 +7,12 @@
- 产品 + 产品、项目
-
+
+ {{item.name}} {{o.bizName }}
@@ -29,11 +30,12 @@
- 项目 + 迭代、需求
-
+
+ {{item.name}} {{o.bizName }}
@@ -49,11 +51,11 @@
- 需求、任务、缺陷 + 任务、缺陷
-
+
{{item.name}} {{o.bizName }}
@@ -84,14 +86,14 @@ export default { props:['visible'], computed: { ...mapGetters(['userInfo']), - cps(){ - return this.xmMyFocuss.filter(k=>k.focusType=='3') + pps(){ + return this.xmMyFocuss.filter(k=>k.focusType=='1'||k.focusType=='3') }, - xms(){ - return this.xmMyFocuss.filter(k=>k.focusType=='1') + ims(){ + return this.xmMyFocuss.filter(k=>k.focusType=='4'||k.focusType=='6') }, - oths(){ - return this.xmMyFocuss.filter(k=>k.focusType!='1' && k.focusType!='3') + tbs(){ + return this.xmMyFocuss.filter(k=>k.focusType=='2' || k.focusType=='5') } }, @@ -222,7 +224,11 @@ export default { this.$router.push({path:'/xm/core/xmMenu/XmMenuDetailRoute',query:{id:bizObj.bizId}}) }else if(bizObj.focusType=='5'){ this.$router.push({path:'/xm/core/xmQuestion/XmQuestionDetailRoute',query:{id:bizObj.bizId}}) + }else if(bizObj.focusType=='6'){ + this.$router.push({path:'/xm/core/xmIteration/XmIterationInfoRoute',query:{id:bizObj.bizId}}) } + + }, //显示新增界面 XmMyFocus 我关注的项目或者任务 showAdd: function () { @@ -371,7 +377,7 @@ export default { } .list-item{ - margin-bottom: 20px; + margin-bottom: 15px; } .list-item:hover{