陈裕财 3 years ago
parent
commit
424976576a
  1. 5
      package.json
  2. 1
      src/styles/mdp.scss
  3. 34
      src/views/xm/rpt/CompsCard.vue

5
package.json

@ -23,6 +23,7 @@
"driver.js": "^0.9.8", "driver.js": "^0.9.8",
"dropzone": "5.2.0", "dropzone": "5.2.0",
"echarts": "^5.3.2", "echarts": "^5.3.2",
"element-china-area-data": "^5.0.2",
"element-ui": "^2.15.8", "element-ui": "^2.15.8",
"file-saver": "2.0.1", "file-saver": "2.0.1",
"font-awesome": "4.7.0", "font-awesome": "4.7.0",
@ -32,6 +33,7 @@
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
"jsonlint": "1.6.2", "jsonlint": "1.6.2",
"jspdf": "^2.5.1",
"jszip": "3.2.1", "jszip": "3.2.1",
"mockjs": "1.0.1-beta3", "mockjs": "1.0.1-beta3",
"moment": "^2.24.0", "moment": "^2.24.0",
@ -59,8 +61,7 @@
"vuedraggable": "2.15.0", "vuedraggable": "2.15.0",
"vuex": "3.0.1", "vuex": "3.0.1",
"wl-gantt": "^1.0.6", "wl-gantt": "^1.0.6",
"xlsx": "^0.14.5",
"element-china-area-data": "^5.0.2"
"xlsx": "^0.14.5"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.15.8", "@babel/core": "^7.15.8",

1
src/styles/mdp.scss

@ -370,7 +370,6 @@ table tr.hover-row{
overflow-y: 'hidden'; overflow-y: 'hidden';
width:100%; width:100%;
} }
/*此处根据不同屏幕分配率显示不同的样式*/ /*此处根据不同屏幕分配率显示不同的样式*/
/*手机端*/ /*手机端*/
@media only screen and (min-width: 0px) and (max-width: 768px) { @media only screen and (min-width: 0px) and (max-width: 768px) {

34
src/views/xm/rpt/CompsCard.vue

@ -5,36 +5,20 @@
<comps-set :comp-ids="compIds" :category="category" @row-click="onCompSelect"></comps-set> <comps-set :comp-ids="compIds" :category="category" @row-click="onCompSelect"></comps-set>
</el-col> </el-col>
<el-col :span="18" ref="table" class="border"> <el-col :span="18" ref="table" class="border">
<el-row v-if="printVisible">
<span style="float:right;"><el-button @click="printVisible=false">取消打印</el-button> <el-button v-print="'#printBody'">打印</el-button></span>
<el-row v-if="exportToolBarVisible">
<span style="float:right;">
<el-button @click="exportToolBarVisible=false">取消</el-button>
<el-button v-print="'#printBody'">打印</el-button>
<el-button v-print="'#printBody'">pdf</el-button>
</span>
</el-row> </el-row>
<div :style="{height:maxTableHeight+'px',overflow:'auto'}"> <div :style="{height:maxTableHeight+'px',overflow:'auto'}">
<div class="empty" v-if="compCfgList.length == 0" > <div class="empty" v-if="compCfgList.length == 0" >
<el-empty description="暂未选择模块"></el-empty> <el-empty description="暂未选择模块"></el-empty>
</div> </div>
<div v-else id="printBody"> <div v-else id="printBody">
<grid-layout
:layout.sync="compCfgList"
:col-num="layoutColNum"
:row-height="120"
:is-draggable="true"
:is-resizable="true"
:is-mirrored="false"
:vertical-compact="true"
:margin="[10, 10]"
:use-css-transforms="true"
>
<grid-item
v-for="(item,index) in compCfgList"
:x="item.x"
:y="item.y"
:w="item.w"
:h="item.h"
:i="item.i"
:key="index" @resize="sizeAutoChange(item)">
<component :is="item.compId" :xm-test-plan="xmTestPlan" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration" :xm-test-casedb="xmTestCasedb" :category="category" :cfg="item.cfg" :ref="item.id" @delete="doDelete(item)" :init-group-by="item.initGroupBy" :id="item.id" :show-tool-bar="showToolBar" :show-params="showParams"></component>
</grid-item>
</grid-layout>
<component v-for="(item,index) in compCfgList" :key="index" :is="item.compId" :xm-test-plan="xmTestPlan" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration" :xm-test-casedb="xmTestCasedb" :category="category" :cfg="item.cfg" :ref="item.id" @delete="doDelete(item)" :init-group-by="item.initGroupBy" :id="item.id" :show-tool-bar="showToolBar" :show-params="showParams"></component>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -117,7 +101,7 @@ export default {
xmBranchMenuDayAccumulate:()=>import('./branch/menuDayAccumulate.vue'), 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: { computed: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
compIds(){ compIds(){

Loading…
Cancel
Save