diff --git a/package.json b/package.json
index f951a7d7..d711e0b3 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
"vue-qr": "^4.0.6",
"vue-qriously": "^1.1.1",
"vue-router": "3.0.1",
+ "vue-to-pdf": "^1.0.0",
"vuedraggable": "2.15.0",
"vuex": "3.0.1",
"wl-gantt": "^1.0.6",
diff --git a/src/main.js b/src/main.js
index d4a781e1..457c396c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -45,6 +45,9 @@ Vue.component('mdp-date-x',MdpDateX)
Vue.component('mdp-date-range-x',MdpDateRangeX)
Vue.component('mdp-select-user-x',MdpSelectUserX)
+import vueToPdf from 'vue-to-pdf';
+Vue.use(vueToPdf);
+
Vue.use(Element, {
size: 'small', // set element-ui default size
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index a3c19c4e..1d390ab4 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
@@ -29,7 +29,7 @@
统计
- 打印
+ 导出
配置报告
@@ -149,9 +149,8 @@ export default {
showRptConfig(){
this.$refs['rpt'].isRptCfg=true
},
- print(){
- this.$refs['rpt'].isRptShow=true
- this.$refs['rpt'].showPrint()
+ showExportToolBar(){
+ this.$refs['rpt'].showExportToolBar()
},
calcRptData(){
diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/CompsCard.vue
index 524bbd13..83988fe0 100644
--- a/src/views/xm/rpt/CompsCard.vue
+++ b/src/views/xm/rpt/CompsCard.vue
@@ -8,16 +8,16 @@
取消
- 打印
- pdf
+ 打印
+ pdf
-
@@ -101,7 +101,7 @@ export default {
xmBranchMenuDayAccumulate:()=>import('./branch/menuDayAccumulate.vue'),
},
- props:['xmTestCasedb','xmTestPlan','xmProduct','xmProject','xmIteration','showToolBar','category','showParams','isRptCfg','exportToolBarVisible','isRptShow'],
+ props:['xmTestCasedb','xmTestPlan','xmProduct','xmProject','xmIteration','showToolBar','category','showParams','isRptCfg','isRptShow'],
computed: {
...mapGetters(['userInfo']),
compIds(){
@@ -197,11 +197,14 @@ export default {
],
// 布局列数
layoutColNum: 12,
+ paramsVisible:false,
+ exportToolBarVisible:true,
}
},
methods: {
initData(){
+ this.paramsVisible=this.showParams
this.getXmRptConfig();
},
getXmRptConfig(){
@@ -312,6 +315,10 @@ export default {
this.$refs[k.id][0].sizeAutoChange();
}
+ },
+ exportToPdf(){
+ this.paramsVisible=false
+ this.$PDFSave(this.$refs.rptBox, this.rptConfigParamsCpd.name+"-报告");
}
},
diff --git a/src/views/xm/rpt/index.vue b/src/views/xm/rpt/index.vue
index 43ae0113..cb101fec 100644
--- a/src/views/xm/rpt/index.vue
+++ b/src/views/xm/rpt/index.vue
@@ -42,8 +42,8 @@ export default {
}
this.$refs['compsCard'].submitXmPrtConfig(callback)
},
- showPrint(){
- this.$refs.compsCard.printVisible=true;
+ showExportToolBar(){
+ this.$refs.compsCard.exportToolBarVisible=true;
}
},