diff --git a/package.json b/package.json index bec0c726..f951a7d7 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "driver.js": "^0.9.8", "dropzone": "5.2.0", "echarts": "^5.3.2", + "element-china-area-data": "^5.0.2", "element-ui": "^2.15.8", "file-saver": "2.0.1", "font-awesome": "4.7.0", @@ -32,6 +33,7 @@ "js-cookie": "2.2.0", "js-md5": "^0.7.3", "jsonlint": "1.6.2", + "jspdf": "^2.5.1", "jszip": "3.2.1", "mockjs": "1.0.1-beta3", "moment": "^2.24.0", @@ -59,8 +61,7 @@ "vuedraggable": "2.15.0", "vuex": "3.0.1", "wl-gantt": "^1.0.6", - "xlsx": "^0.14.5", - "element-china-area-data": "^5.0.2" + "xlsx": "^0.14.5" }, "devDependencies": { "@babel/core": "^7.15.8", diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss index d5975cc7..793d8856 100644 --- a/src/styles/mdp.scss +++ b/src/styles/mdp.scss @@ -369,8 +369,7 @@ table tr.hover-row{ max-height: calc(80vh); overflow-y: 'hidden'; width:100%; -} - +} /*此处根据不同屏幕分配率显示不同的样式*/ /*手机端*/ @media only screen and (min-width: 0px) and (max-width: 768px) { diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/CompsCard.vue index 0cb23c26..524bbd13 100644 --- a/src/views/xm/rpt/CompsCard.vue +++ b/src/views/xm/rpt/CompsCard.vue @@ -5,36 +5,20 @@ - - 取消打印 打印 + + + 取消 + 打印 + pdf +
-
- - - - - +
+ +
@@ -117,7 +101,7 @@ export default { xmBranchMenuDayAccumulate:()=>import('./branch/menuDayAccumulate.vue'), }, - props:['xmTestCasedb','xmTestPlan','xmProduct','xmProject','xmIteration','showToolBar','category','showParams','isRptCfg','printVisible','isRptShow'], + props:['xmTestCasedb','xmTestPlan','xmProduct','xmProject','xmIteration','showToolBar','category','showParams','isRptCfg','exportToolBarVisible','isRptShow'], computed: { ...mapGetters(['userInfo']), compIds(){ diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue index e3a6c3b3..ca226dd5 100644 --- a/src/views/xm/rpt/product/questionSort.vue +++ b/src/views/xm/rpt/product/questionSort.vue @@ -1,6 +1,6 @@