Browse Source

Merge pull request '无数据时下载报告置灰,弹框提示不可下载' (#890) from wangjr_pro into V20211115

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/890
Reviewed-by: zhoupzh <zhoupzh@pcl.ac.cn>
tags/v1.21.12.1
zhoupzh 4 years ago
parent
commit
3b0b60983b
2 changed files with 32 additions and 19 deletions
  1. +23
    -17
      web_src/js/components/ProAnalysis.vue
  2. +9
    -2
      web_src/js/components/UserAnalysis.vue

+ 23
- 17
web_src/js/components/ProAnalysis.vue View File

@@ -29,9 +29,13 @@
</span>
<span style="float:right; margin-right: 20px;">
<div style="display:inline-block;margin-left: 20px; ">
<i class="el-icon-download"></i>
<span ><a id = "download_file" :href= "'../api/v1/projectboard/downloadAll/?type='+this.params.type+'&beginTime='+this.params.beginTime+'&endTime='+this.params.endTime+'&q='+this.params.q+'&sort=openi'" @click="isExport();return false;" >下载报告</a> </span>
<!-- <span ><a id = "download_file" :href= "downLoadSrc" @click="jugeExport();" target="_black">下载报告</a> </span> -->
<a class="el-icon-download" v-if="tableData!=''" :href= "'../api/v1/projectboard/downloadAll/?type='+this.params.type+'&beginTime='+this.params.beginTime+'&endTime='+this.params.endTime+'&q='+this.params.q+'&sort=openi'" ></a>
<i class="el-icon-download" v-else="tableData=''" href="#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'></i>
<!-- <span ><a id = "download_file" :href= "'../api/v1/projectboard/downloadAll/?type='+this.params.type+'&beginTime='+this.params.beginTime+'&endTime='+this.params.endTime+'&q='+this.params.q+'&sort=openi'" >下载报告</a> </span> -->
<span >
<a id = "download_file" v-if="tableData!=''" :href= "'../api/v1/projectboard/downloadAll/?type='+this.params.type+'&beginTime='+this.params.beginTime+'&endTime='+this.params.endTime+'&q='+this.params.q+'&sort=openi'">下载报告</a>
<a id = "download_file" v-else="tableData=''" href= "#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'>下载报告</a>
</span>
</div>


@@ -269,8 +273,12 @@
</span>
<span style="float:right; margin-right: 20px;">
<div style="display:inline-block;margin-left: 20px;">
<i class="el-icon-download"></i>
<span ><a @click="exportData()">下载报告</a> </span>
<a v-if="tableDataID!=''" @click="exportData()" class="el-icon-download"></a>
<a v-else="tableDataID=''" @click="exportData()" style="color:rgba(187, 187, 187, 100);" class="el-icon-download"></a>
<span >
<a v-if="tableDataID!=''" @click="exportData()">下载报告</a>
<a v-else="tableDataID=''" @click="exportData()" style="color:rgba(187, 187, 187, 100);">下载报告</a>
</span>
</div>
</span>
</div>
@@ -391,24 +399,22 @@
// download_file(){
// this.params.type='all'
// },
jugeExport(){
if(typeof this.tableData=="undefined" || this.tableData=="null" || this.tableData==""){
// let self=this;
return
}
else{
// let self=this;
this.downLoadSrc= '../api/v1/projectboard/downloadAll/?type='+this.params.type+'&beginTime='+this.params.beginTime+'&endTime='+this.params.endTime+'&q='+this.params.q+'&sort=openi';
}
popMark(){
alert("数据为空时,不能下载!")
},
exportData(){
// this.getOneProList(this.pro_id,'all',true,7)
// this.getOneProList(this.pro_id,'all',false,7)
// this.fileName()
this.currentPage=1
var saveFileName = this.getFileName()
export2Excel(this.columns,this.tableDataID,saveFileName)
if (this.tableDataID!=''){
this.currentPage=1
var saveFileName = this.getFileName()
export2Excel(this.columns,this.tableDataID,saveFileName)
}else{
alert("数据为空时,不能下载!")
}
},
getFileName(){



+ 9
- 2
web_src/js/components/UserAnalysis.vue View File

@@ -27,8 +27,12 @@
</span>
<span style="float:right; margin-right: 20px;" >
<a style="display:inline-block;margin-left: 20px; " id = 'download'>
<i class="el-icon-download"></i>
<span ><a :href= "'../tool/query_user_static_page/?startDate='+this.params.startDate+'&endDate='+this.params.endDate+'&IsReturnFile=true'+'&userName='+this.params.userName" >下载报告</a> </span>
<a class="el-icon-download" v-if="tableData!=''" :href= "'../tool/query_user_static_page/?startDate='+this.params.startDate+'&endDate='+this.params.endDate+'&IsReturnFile=true'+'&userName='+this.params.userName" ></a>
<i class="el-icon-download" v-else="tableData=''" href="#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'></i>
<span >
<a v-if="tableData!=''" :href= "'../tool/query_user_static_page/?startDate='+this.params.startDate+'&endDate='+this.params.endDate+'&IsReturnFile=true'+'&userName='+this.params.userName" >下载报告</a>
<a v-else="tableData=''" href= "#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'>下载报告</a>
</span>
</a>
<span style="display:inline-block;margin-left: 20px; ">
<el-input size="small" placeholder="输入用户名搜索" v-model="search" class="input-with-select" @keyup.enter.native="searchName() "><i slot="suffix" class="el-input__icon el-icon-search" @click="searchName() "></i>
@@ -183,6 +187,9 @@
},
methods: {

popMark(){
alert("数据为空时,不能下载!")
},
exportData(){
// this.getUserList('all_usr',7)
var saveFileName = this.getFileName()


Loading…
Cancel
Save