提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

options/locale/locale_en-US.ini

@@ -424,7 +424,13 @@ static.openiindex=OpenI Index
 static.registdate=Regist Date
 static.countdate=Count Date
 static.all=All
-
+static.public.user_business_analysis_current_month=Current_Month
+static.public.user_business_analysis_current_week=Current_Week
+static.public.user_business_analysis_current_year=Current_Year
+static.public.user_business_analysis_last30_day=Last_30_day
+static.public.user_business_analysis_last_month=Last_Month
+static.public.user_business_analysis_yesterday=Yesterday
+static.public.user_business_analysis_all=All
 [settings]
 profile = Profile
 account = Account

options/locale/locale_zh-CN.ini

@@ -428,6 +428,13 @@ static.openiindex=OpenI指数
 static.registdate=用户注册时间
 static.countdate=系统统计时间
 static.all=所有
+static.public.user_business_analysis_current_month=本月
+static.public.user_business_analysis_current_week=本周
+static.public.user_business_analysis_current_year=今年
+static.public.user_business_analysis_last30_day=近30天
+static.public.user_business_analysis_last_month=上月
+static.public.user_business_analysis_yesterday=昨天
+static.public.user_business_analysis_all=所有
 [settings]
 profile=个人信息
 account=账号

routers/repo/user_data_analysis.go

@@ -93,7 +93,7 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac
 
 			//设置默认打开的表单
 			xlsx.SetActiveSheet(index)
-			filename := sheetName + "_" + ctx.Tr("user.static.all") + ".xlsx"
+			filename := sheetName + "_" + ctx.Tr("user.static."+tableName) + ".xlsx"
 			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(filename))
 			ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
 			if _, err := xlsx.WriteTo(ctx.Resp); err != nil {

web_src/js/components/UserAnalysis.vue

@@ -27,10 +27,10 @@
             </span>
             <span style="float:right; margin-right: 20px;" >
                 <a style="display:inline-block;margin-left: 20px; " id = 'download'>
-                    <a class="el-icon-download" v-if="tableData!=''" :href= "'../api/v1/query_user_static_page/?startDate='+this.params.startDate+'&endDate='+this.params.endDate+'&IsReturnFile=true'+'&userName='+this.params.userName" ></a>
+                    <a class="el-icon-download" v-if="tableData!=''" :href= "this.dataUrl + '?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= "'../api/v1/query_user_static_page/?startDate='+this.params.startDate+'&endDate='+this.params.endDate+'&IsReturnFile=true'+'&userName='+this.params.userName" >下载报告</a>
+                        <a  v-if="tableData!=''" :href= "this.dataUrl + '?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>  
@@ -175,6 +175,7 @@
                 params:{startDate:'',endDate:'',page:1,pageSize:10,userName:''},
                 tableData: [],
                 totalNum:0,
+                dataUrl:'../api/v1/query_user_static_page',
                 pickerOptions: {
                 },
                 value_time: '',
@@ -274,7 +275,7 @@
                 let lastYear = lastMonthDate.getYear();
                 let lastMonth = lastMonthDate.getMonth();
 
-                var url = '../api/v1/query_user_static_page';
+                this.dataUrl = '../api/v1/query_user_static_page';
 
                 if (typeof type_val=="undefined" || type_val=="null" || type_val==""){
                     this.params.startDate=  this.formatDate(this.value_time[0].getFullYear(),this.value_time[0].getMonth() + 1,this.value_time[0].getDate());
@@ -283,43 +284,43 @@
                     switch(type_val){
                         case "yesterday_usr":{
                             this.value_time=[]
-                            url = '../api/v1/query_user_yesterday';
+                            this.dataUrl = '../api/v1/query_user_yesterday';
                             break
                         }
                         case "current_week_usr":{
                             this.value_time=[]
-                            url = '../api/v1/query_user_current_week';
+                            this.dataUrl = '../api/v1/query_user_current_week';
                             break
                         }
                         case "current_month_usr":{
                             this.value_time=[]
-                            url = '../api/v1/query_user_current_month';
+                            this.dataUrl = '../api/v1/query_user_current_month';
                             break
                         }
                         case "last_month_usr":{
                             this.value_time=[]
-                            url = '../api/v1/query_user_last_month';
+                            this.dataUrl = '../api/v1/query_user_last_month';
                             break
                         }
                         case "monthly_usr":{
                             this.value_time=[]
-                            url = '../api/v1/query_user_last30_day';
+                            this.dataUrl = '../api/v1/query_user_last30_day';
                             break
                         }
                         case "current_year_usr":{
                             this.value_time=[]
-                            url = '../api/v1/query_user_current_year';
+                            this.dataUrl = '../api/v1/query_user_current_year';
                             break
                         }
                         case "all_usr":{
                             this.value_time=[]
-                            url = '../api/v1/query_user_all';
+                            this.dataUrl = '../api/v1/query_user_all';
                             break
                         }
                     }
                 };
 
-                this.$axios.get(url,{
+                this.$axios.get(this.dataUrl,{
                     params:this.params
                 }).then((res)=>{
                     this.tableData = res.data.data