From eb74d507411ceb715d128301d546312b53f069e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 5 Feb 2023 14:49:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/routes_xm.js | 18 +++++++++--------- .../xm/core/xmQuestion/XmQuestionEdit.vue | 2 +- src/views/xm/rpt/CompsCard.vue | 15 ++++++++++++++- src/views/xm/rpt/{ => his}/rptDataList.vue | 0 ...xForIteration.vue => indexForIteration.vue} | 0 ...IndexForProduct.vue => indexForProduct.vue} | 0 ...IndexForProject.vue => indexForProject.vue} | 0 ...reportIndexForTest.vue => indexForTest.vue} | 0 8 files changed, 24 insertions(+), 11 deletions(-) rename src/views/xm/rpt/{ => his}/rptDataList.vue (100%) rename src/views/xm/rpt/{reportIndexForIteration.vue => indexForIteration.vue} (100%) rename src/views/xm/rpt/{reportIndexForProduct.vue => indexForProduct.vue} (100%) rename src/views/xm/rpt/{reportIndexForProject.vue => indexForProject.vue} (100%) rename src/views/xm/rpt/{reportIndexForTest.vue => indexForTest.vue} (100%) diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index bd48d292..d56b1d8b 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -220,8 +220,8 @@ export default { hidden:true }, { - path: 'report', - component: _import('xm/rpt/reportIndexForProject'), + path: 'rpt', + component: _import('xm/rpt/indexForProject'), name: 'projectReport', iconCls: 'fa el-icon-menu', meta: { @@ -422,8 +422,8 @@ export default { hidden:true }, { - path: 'report', - component: _import('xm/rpt/reportIndexForProduct'), + path: 'rpt', + component: _import('xm/rpt/indexForProduct'), name: 'productReport', iconCls: 'fa el-icon-menu', meta: { @@ -561,8 +561,8 @@ export default { hidden:true }, { - path: 'report', - component: _import('xm/rpt/reportIndexForIteration'), + path: 'rpt', + component: _import('xm/rpt/indexForIteration'), name: 'iterationReport', iconCls: 'fa el-icon-menu', meta: { @@ -610,7 +610,7 @@ export default { { path: 'flow', component: _import('xm/core/xmTestCase/XmTestCaseFlow'), name: 'testFlow', meta: { title: '用例评审',roles:["user"] },hidden:true}, { path: 'plan', component: _import('xm/core/xmTestPlan/Overview'), name: 'testPlan', meta: { title: '测试计划',roles:["user"] },hidden:true}, { path: 'group', component: _import('xm/core/xmGroup/XmGroupForTest'), name: 'testGroup', meta: { title: '团队',roles:["user"] },hidden:true}, - { path: 'report', component: _import('xm/rpt/reportIndexForTest'), name: 'testReport', meta: { title: '统计分析',roles:["user"] },hidden:true}, + { path: 'rpt', component: _import('xm/rpt/indexForTest'), name: 'testReport', meta: { title: '统计分析',roles:["user"] },hidden:true}, ] }, @@ -634,7 +634,7 @@ export default { { path: '/xm/rpt', - name: 'reportIndex', + name: 'xmRpt', component: Layout, iconCls: 'fa el-icon-menu', meta: { @@ -643,7 +643,7 @@ export default { }, children: [ - { path: 'reportIndex', component: _import('xm/rpt/index'), name: 'reportIndex', meta: { title: '指标分析',roles:["user"] }}, + { path: 'index', component: _import('xm/rpt/index'), name: 'rptIndex', meta: { title: '指标分析',roles:["user"] }}, { path: 'branch/branchDatavFullScreen', name: 'branchDatavFullScreen', meta: { title: '机构效能',openTab:true,outUrl:"${curlDomain}/"+process.env.CONTEXT+"/"+process.env.VERSION+"/#/datav/xm/branch/branchDatavFullScreen" }}, ] }, diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index e61b3c58..23b44c60 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -544,7 +544,7 @@ var curlDomain=window.location.protocol+"//"+window.location.host; // 返回https://mp.csdn.net var link=curlDomain+"/"+process.env.CONTEXT+"/"+process.env.VERSION+"/#/xm/core/xmQuestion/XmQuestionDetailRoute?id="+this.editForm.id this.$copyText(link).then(e => { - this.$notify({position:'bottom-left',showClose:true,message:"拷贝成果",type:'success'}) + this.$notify({position:'bottom-left',showClose:true,message:"拷贝链接成功，您可以黏贴到任何地方",type:'success'}) }); }, onFuncSelected(row){ diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/CompsCard.vue index dacfb31e..79c0b550 100644 --- a/src/views/xm/rpt/CompsCard.vue +++ b/src/views/xm/rpt/CompsCard.vue @@ -17,6 +17,7 @@ 保存报告 隐藏过滤条件 显示过滤条件 + 分享 pdf @@ -69,7 +70,7 @@ import seq from '@/common/js/sequence';//全局公共库 import VueGridLayout from 'vue-grid-layout'; import { mapGetters } from 'vuex' import CompsSet from '@/views/xm/rpt/CompsSet' -import rptDataList from '@/views/xm/rpt/rptDataList' +import rptDataList from '@/views/xm/rpt/his/rptDataList' import { addXmRptData } from '@/api/xm/core/xmRptData'; @@ -242,6 +243,18 @@ export default { } }, + toShareRpt(){ + if(!this.xmRptData||!this.xmRptData.id){ + this.$message.error("只能分享历史报告") + return; + } + + var curlDomain=window.location.protocol+"//"+window.location.host; // 返回https://mp.csdn.net + var link=curlDomain+"/"+process.env.CONTEXT+"/"+process.env.VERSION+"/#/xm/rpt/hisRpt?id="+this.xmRptData.id + this.$copyText(link).then(e => { + this.$notify({position:'bottom-left',showClose:true,message:"拷贝链接成功，您可以黏贴到任何地方",type:'success'}) + }); + }, showCreateRptData(){ if(this.xmRptConfig==null){ this.$message.error("还没制作报告，请先制作报告") diff --git a/src/views/xm/rpt/rptDataList.vue b/src/views/xm/rpt/his/rptDataList.vue similarity index 100% rename from src/views/xm/rpt/rptDataList.vue rename to src/views/xm/rpt/his/rptDataList.vue diff --git a/src/views/xm/rpt/reportIndexForIteration.vue b/src/views/xm/rpt/indexForIteration.vue similarity index 100% rename from src/views/xm/rpt/reportIndexForIteration.vue rename to src/views/xm/rpt/indexForIteration.vue diff --git a/src/views/xm/rpt/reportIndexForProduct.vue b/src/views/xm/rpt/indexForProduct.vue similarity index 100% rename from src/views/xm/rpt/reportIndexForProduct.vue rename to src/views/xm/rpt/indexForProduct.vue diff --git a/src/views/xm/rpt/reportIndexForProject.vue b/src/views/xm/rpt/indexForProject.vue similarity index 100% rename from src/views/xm/rpt/reportIndexForProject.vue rename to src/views/xm/rpt/indexForProject.vue diff --git a/src/views/xm/rpt/reportIndexForTest.vue b/src/views/xm/rpt/indexForTest.vue similarity index 100% rename from src/views/xm/rpt/reportIndexForTest.vue rename to src/views/xm/rpt/indexForTest.vue