diff --git a/src/views/xm/core/xmProduct/top-nav.vue b/src/views/xm/core/xmProduct/top-nav.vue
index 525452cb..b662faca 100644
--- a/src/views/xm/core/xmProduct/top-nav.vue
+++ b/src/views/xm/core/xmProduct/top-nav.vue
@@ -44,7 +44,16 @@
         </el-sub-menu>  
         <el-menu-item :index="'/xm/product/view/question?productId='+xmProduct.id">
           <template #title><icon icon="fa:bug"/>问题</template>
-        </el-menu-item>
+        </el-menu-item> 
+        <el-sub-menu index="risk">
+          <template #title><icon icon="fa-solid:shield-virus"/>风险</template>
+          <el-menu-item :index="'/xm/pro/product/view/risk/index?productId='+xmProduct.id">
+            <template #title><icon icon="fa-solid:shield-virus"/>风险管理</template>
+          </el-menu-item>
+          <el-menu-item :index="'/xm/pro/product/view/risk/overview?productId='+xmProduct.id">
+            <template #title><icon icon="fa-solid:shield-alt"/>风险分析</template>
+          </el-menu-item>
+        </el-sub-menu>
         <el-menu-item :index="'/xm/product/view/group?productId='+xmProduct.id">
           <template #title><icon icon="fa:sitemap"/>团队</template>
         </el-menu-item> 
@@ -69,11 +78,29 @@
               ><icon icon="fa-solid:user-cog"/>每月工时</template
             >
           </el-menu-item>   
-        </el-sub-menu> 
+        </el-sub-menu>  
         
-        <el-menu-item :index="'/xm/pro/product/view/rpt?productId='+xmProduct.id">
-          <template #title><icon icon="fa:bar-chart"/>效能</template>
-        </el-menu-item>
+        <el-sub-menu index="kpi">
+            <template #title><icon icon="fa:bar-chart"/>效能</template>
+          <el-menu-item :index="'/xm/pro/product/view/kpi/mng?productId='+xmProduct.id">
+            <template #title><icon icon="fa:key"/>kpi管理</template>
+          </el-menu-item>
+          <el-menu-item :index="'/xm/pro/product/view/kpi/kself?productId='+xmProduct.id">
+            <template #title><icon icon="fa-solid:sun"/>我负责的kpi</template>
+          </el-menu-item>
+          <el-menu-item :index="'/xm/pro/product/view/kpi/kadm?productId='+xmProduct.id">
+            <template #title><icon icon="fa-solid:user-check"/>我审核的kpi</template>
+          </el-menu-item>
+          <el-menu-item :index="'/xm/pro/product/view/kpi/overview?productId='+xmProduct.id">
+            <template #title><icon icon="fa-solid:chart-line"/>kpi统计分析</template>
+          </el-menu-item>
+          <el-menu-item :index="'/xm/pro/product/view/kpi/his?productId='+xmProduct.id">
+            <template #title><icon icon="fa:history"/>考核记录</template>
+          </el-menu-item> 
+          <el-menu-item :index="'/xm/pro/product/view/rpt?productId='+xmProduct.id">
+            <template #title><icon icon="fa:bar-chart"/>效能分析</template>
+          </el-menu-item>
+        </el-sub-menu>
         <el-sub-menu index="zhishi">
           <template #title><icon icon="fa:book"/>知识</template>
           <el-menu-item :index="'/xm/product/view/file?productId='+xmProduct.id">
diff --git a/src/views/xm/pro/kpi/Index.vue b/src/views/xm/pro/kpi/Index.vue
index 273b1974..b35546b6 100644
--- a/src/views/xm/pro/kpi/Index.vue
+++ b/src/views/xm/pro/kpi/Index.vue
@@ -343,7 +343,7 @@ export default {
     },
     computed: {
         ...mapState(useUserStore, ['userInfo']),
-        ...mapState(useXmStore, ['projectInfo', 'xmCollect']),
+        ...mapState(useXmStore, ['projectInfo', 'xmCollect','xmProduct']),
 
         ganttData() {
             return this.treeToList(this.treeData)
@@ -546,6 +546,15 @@ export default {
             if (this.project?.id) {
                 params.projectId = this.project.id
             }
+            if(this.projectInfo?.id){
+                params.projectId=this.projectInfo.id
+            }
+            if(this.xmProduct?.id){
+                params.linkProductId=this.xmProduct.id
+            }
+            if(this.xmCollect?.id){
+                params.collectId=this.xmCollect.id
+            }
             if (this.parent?.id) {
                 params.parentId = this.parent.id
             }
diff --git a/src/views/xm/pro/kpi/IndexHis.vue b/src/views/xm/pro/kpi/IndexHis.vue
index e95ad458..52f8bdb3 100644
--- a/src/views/xm/pro/kpi/IndexHis.vue
+++ b/src/views/xm/pro/kpi/IndexHis.vue
@@ -228,7 +228,7 @@ export default {
     },
     computed: {
         ...mapState(useUserStore,['userInfo']),
-        ...mapState(useXmStore,['projectInfo','xmCollect']),
+        ...mapState(useXmStore,['projectInfo', 'xmCollect','xmProduct']),
         
         ganttData(){ 
             return this.treeToList(this.treeData)
@@ -353,6 +353,15 @@ export default {
             if(this.project?.id){
                 params.projectId=this.project.id
             }
+            if(this.projectInfo?.id){
+                params.projectId=this.projectInfo.id
+            }
+            if(this.xmProduct?.id){
+                params.linkProductId=this.xmProduct.id
+            }
+            if(this.xmCollect?.id){
+                params.collectId=this.xmCollect.id
+            }
             if(this.parent?.id){
                 params.id=this.parent.id
             }
diff --git a/src/views/xm/pro/kpi/XmKpiOverview.vue b/src/views/xm/pro/kpi/XmKpiOverview.vue
index 765dfdce..ec3a7041 100644
--- a/src/views/xm/pro/kpi/XmKpiOverview.vue
+++ b/src/views/xm/pro/kpi/XmKpiOverview.vue
@@ -102,7 +102,7 @@ import { getXmKpiAttDist } from '@/api/xm/pro/xmKpi';
 export default {
   computed: {
     ...mapState(useUserStore, ["userInfo"]),
-    ...mapState(useXmStore, ['projectInfo']),
+    ...mapState(useXmStore, ['projectInfo', 'xmCollect','xmProduct']),
      
   },
 
@@ -520,10 +520,20 @@ export default {
   },
 
   mounted() {
+    let params={}
+    if(this.projectInfo?.id){
+        params.projectId=this.projectInfo.id
+    }
+    if(this.xmProduct?.id){
+        params.linkProductId=this.xmProduct.id
+    }
+    if(this.xmCollect?.id){
+        params.collectId=this.xmCollect.id
+    }
     this.selProject = this.projectInfo ||{}
     this.$mdp.getDictOptions('kstatus').then(o=>{
       this.kstatusOptions=o
-      getXmKpiAttDist({groupBy:'kstatus',projectId:this.selProject.id}).then(res=>{
+      getXmKpiAttDist({groupBy:'kstatus',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.kstatusDatas=this.kstatusOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -543,7 +553,7 @@ export default {
     
     this.$mdp.getDictOptions('ktype').then(o=>{
       this.ktypeOptions=o
-      getXmKpiAttDist({groupBy:'ktype',projectId:this.selProject.id}).then(res=>{
+      getXmKpiAttDist({groupBy:'ktype',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.ktypeDatas=this.ktypeOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -563,7 +573,7 @@ export default {
     
     this.$mdp.getDictOptions('kclass').then(o=>{
       this.kclassOptions=o
-      getXmKpiAttDist({groupBy:'kclass',projectId:this.selProject.id}).then(res=>{
+      getXmKpiAttDist({groupBy:'kclass',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.kclassDatas=this.kclassOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -583,7 +593,7 @@ export default {
     
     this.$mdp.getDictOptions('kadmStatus').then(o=>{
       this.kadmStatusOptions=o
-      getXmKpiAttDist({groupBy:'kadm_status',projectId:this.selProject.id}).then(res=>{
+      getXmKpiAttDist({groupBy:'kadm_status',projectId:this.selProject.id,...params}).then(res=>{
       let datas=res.data
       this.kadmStatusDatas=this.kadmStatusOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -603,7 +613,7 @@ export default {
     
     this.$mdp.getDictOptions('calcType').then(o=>{
       this.calcTypeOptions=o
-      getXmKpiAttDist({groupBy:'calc_type',projectId:this.selProject.id}).then(res=>{
+      getXmKpiAttDist({groupBy:'calc_type',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.calcTypeDatas=this.calcTypeOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -622,7 +632,7 @@ export default {
     }) 
     this.$mdp.getDictOptions('kwarnStatus').then(o=>{
       this.kwarnStatusOptions=o
-      getXmKpiAttDist({groupBy:'kwarn_status',projectId:this.selProject.id}).then(res=>{
+      getXmKpiAttDist({groupBy:'kwarn_status',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data  
         this.kwarnStatusDatas=this.kwarnStatusOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -639,14 +649,14 @@ export default {
         
       })
     }) 
-    getXmKpiAttDist({groupBy:'deptid',projectId:this.selProject.id}).then(res=>{
+    getXmKpiAttDist({groupBy:'deptid',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.deptidDatas=datas.map(k=>{ 
            return k
         })
         
       })
-      getXmKpiAttDist({groupBy:'project_id',projectId:this.selProject.id}).then(res=>{
+      getXmKpiAttDist({groupBy:'project_id',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.projectIdDatas=datas.map(k=>{
            return k
diff --git a/src/views/xm/pro/xmCollect/top-nav.vue b/src/views/xm/pro/xmCollect/top-nav.vue
index b5cbef36..64e42e41 100644
--- a/src/views/xm/pro/xmCollect/top-nav.vue
+++ b/src/views/xm/pro/xmCollect/top-nav.vue
@@ -47,6 +47,33 @@
         <el-menu-item :index="'/xm/pro/collect/view/question?collectId='+xmCollect.id">
           <template #title><icon icon="fa:bug"/>问题</template>
         </el-menu-item>
+        <el-sub-menu index="risk">
+          <template #title><icon icon="fa-solid:shield-virus"/>风险</template>
+          <el-menu-item :index="'/xm/pro/collect/view/risk/index?collectId='+xmCollect.id">
+            <template #title><icon icon="fa-solid:shield-virus"/>风险管理</template>
+          </el-menu-item>
+          <el-menu-item :index="'/xm/pro/collect/view/risk/overview?collectId='+xmCollect.id">
+            <template #title><icon icon="fa-solid:shield-alt"/>风险分析</template>
+          </el-menu-item>
+        </el-sub-menu> 
+          <el-sub-menu index="kpi">
+            <template #title><icon icon="fa:key"/>kpi</template>
+          <el-menu-item :index="'/xm/pro/collect/view/kpi/mng?collectId='+xmCollect.id">
+            <template #title><icon icon="fa:key"/>kpi管理</template>
+          </el-menu-item>
+          <el-menu-item :index="'/xm/pro/collect/view/kpi/kself?collectId='+xmCollect.id">
+            <template #title><icon icon="fa-solid:sun"/>我负责的kpi</template>
+          </el-menu-item>
+          <el-menu-item :index="'/xm/pro/collect/view/kpi/kadm?collectId='+xmCollect.id">
+            <template #title><icon icon="fa-solid:user-check"/>我审核的kpi</template>
+          </el-menu-item>
+          <el-menu-item :index="'/xm/pro/collect/view/kpi/overview?collectId='+xmCollect.id">
+            <template #title><icon icon="fa-solid:chart-line"/>kpi统计分析</template>
+          </el-menu-item>
+          <el-menu-item :index="'/xm/pro/collect/view/kpi/his?collectId='+xmCollect.id">
+            <template #title><icon icon="fa:history"/>考核记录</template>
+          </el-menu-item>  
+        </el-sub-menu>
         <el-menu-item :index="'/xm/pro/collect/view/group?collectId='+xmCollect.id">
           <template #title><icon icon="fa:sitemap"/>团队</template>
         </el-menu-item> 
diff --git a/src/views/xm/pro/xmRisk/Index.vue b/src/views/xm/pro/xmRisk/Index.vue
index be2b7025..28947c93 100644
--- a/src/views/xm/pro/xmRisk/Index.vue
+++ b/src/views/xm/pro/xmRisk/Index.vue
@@ -160,7 +160,7 @@ export default {
     computed: {
         ...mapState(useUserStore,['userInfo']),
         
-        ...mapState(useXmStore,['projectInfo'])
+        ...mapState(useXmStore,['projectInfo','xmCollect','xmProduct'])
     },
     props:{
          // 是否开启editSomeField模式
@@ -217,6 +217,12 @@ export default {
           preQueryParamCheck(params){
             if(this.projectInfo?.id){
                 params.projectId=this.projectInfo.id
+            }
+            if(this.xmProduct?.id){
+                params.linkProductId=this.xmProduct.id
+            }
+            if(this.xmCollect?.id){
+                params.collectId=this.xmCollect.id
             }
               return true;
           },
diff --git a/src/views/xm/pro/xmRisk/Overview.vue b/src/views/xm/pro/xmRisk/Overview.vue
index 4736f383..38455d9d 100644
--- a/src/views/xm/pro/xmRisk/Overview.vue
+++ b/src/views/xm/pro/xmRisk/Overview.vue
@@ -102,7 +102,7 @@ import { getXmRiskAttDist } from '@/api/xm/pro/xmRisk';
 export default {
   computed: {
     ...mapState(useUserStore, ["userInfo"]),
-    ...mapState(useXmStore, ['projectInfo']),
+    ...mapState(useXmStore, ['projectInfo','xmCollect','xmProduct']),
      
   },
 
@@ -520,10 +520,21 @@ export default {
   },
 
   mounted() {
+    let params={}
+    if(this.projectInfo?.id){
+        params.projectId=this.projectInfo.id
+    }
+    if(this.xmProduct?.id){
+        params.linkProductId=this.xmProduct.id
+    }
+    if(this.xmCollect?.id){
+        params.collectId=this.xmCollect.id
+    }
+
     this.selProject = this.projectInfo ||{}
     this.$mdp.getDictOptions('rstatus').then(o=>{
       this.rstatusOptions=o
-      getXmRiskAttDist({groupBy:'rstatus',projectId:this.selProject.id}).then(res=>{
+      getXmRiskAttDist({groupBy:'rstatus',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.rstatusDatas=this.rstatusOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -543,7 +554,7 @@ export default {
     
     this.$mdp.getDictOptions('risk_type').then(o=>{
       this.rtypeOptions=o
-      getXmRiskAttDist({groupBy:'rtype',projectId:this.selProject.id}).then(res=>{
+      getXmRiskAttDist({groupBy:'rtype',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.rtypeDatas=this.rtypeOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -563,7 +574,7 @@ export default {
     
     this.$mdp.getDictOptions('odds').then(o=>{
       this.oddsOptions=o
-      getXmRiskAttDist({groupBy:'odds',projectId:this.selProject.id}).then(res=>{
+      getXmRiskAttDist({groupBy:'odds',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.oddsDatas=this.oddsOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -583,7 +594,7 @@ export default {
     
     this.$mdp.getDictOptions('impact').then(o=>{
       this.impactOptions=o
-      getXmRiskAttDist({groupBy:'impact',projectId:this.selProject.id}).then(res=>{
+      getXmRiskAttDist({groupBy:'impact',projectId:this.selProject.id,...params}).then(res=>{
       let datas=res.data
       this.impactDatas=this.impactOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -603,7 +614,7 @@ export default {
     
     this.$mdp.getDictOptions('rlvl').then(o=>{
       this.rlvlOptions=o
-      getXmRiskAttDist({groupBy:'rlvl',projectId:this.selProject.id}).then(res=>{
+      getXmRiskAttDist({groupBy:'rlvl',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.rlvlDatas=this.rlvlOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -622,7 +633,7 @@ export default {
     }) 
     this.$mdp.getDictOptions('rsgy').then(o=>{
       this.rsgyOptions=o
-      getXmRiskAttDist({groupBy:'rsgy',projectId:this.selProject.id}).then(res=>{
+      getXmRiskAttDist({groupBy:'rsgy',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data  
         this.rsgyDatas=this.rsgyOptions.map((k,index)=>{
           let data=datas.find(d=>d.name==k.id) 
@@ -639,14 +650,14 @@ export default {
         
       })
     }) 
-    getXmRiskAttDist({groupBy:'deptid',projectId:this.selProject.id}).then(res=>{
+    getXmRiskAttDist({groupBy:'deptid',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.deptidDatas=datas.map(k=>{ 
            return k
         })
         
       })
-      getXmRiskAttDist({groupBy:'project_id',projectId:this.selProject.id}).then(res=>{
+      getXmRiskAttDist({groupBy:'project_id',projectId:this.selProject.id,...params}).then(res=>{
         let datas=res.data
         this.projectIdDatas=datas.map(k=>{
            return k