From 446104c8349fcc2b9e585a0ea4bfc1bbe10bfb97 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Sat, 2 Apr 2022 11:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E9=A1=B5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=86=85=E9=83=A8=E5=9B=BD=E9=99=85=E5=8C=96=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_zh-CN.ini          |    2 +
 templates/admin/cloudbrain/list.tmpl     |   35 +-
 templates/base/footer_content_fluid.tmpl |    2 +-
 templates/custom/select_dataset.tmpl     |   17 +-
 templates/explore/data_analysis.tmpl     |    5 +-
 templates/explore/datasets.tmpl          |   15 +
 templates/repo/datasets/index.tmpl       |   15 +
 web_src/js/components/Contributors.vue   |   13 +
 web_src/js/components/DataAnalysis.vue   |    5 +-
 web_src/js/components/Images.vue         |    6 +-
 web_src/js/components/Model.vue          |   14 +
 web_src/js/components/ProAnalysis.vue    | 1739 +++++++++++-----------
 web_src/js/components/UserAnalysis.vue   |   17 +-
 13 files changed, 1002 insertions(+), 883 deletions(-)

diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 4e73fbad5..fb85f6dfa 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2922,3 +2922,5 @@ cpu_num = CPU数
 memory = 内存
 shared_memory = 共享内存
 
+[mirror]
+imageMirror = 云脑镜像
diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl
index 39b2c21de..2d291d97e 100644
--- a/templates/admin/cloudbrain/list.tmpl
+++ b/templates/admin/cloudbrain/list.tmpl
@@ -315,15 +315,28 @@
 </div>
 {{template "base/footer" .}}
 <script>
-function getParams(){
-    const params = new URLSearchParams(window.location.search)
-    let jobType = !params.get('jobType')? '{{.i18n.Tr "admin.cloudbrain.all_task_types"}}' : params.get('jobType')
-    let listType = !params.get('listType')? '{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}' : params.get('listType')
-    let jobStatus = !params.get('jobStatus')? '{{.i18n.Tr "admin.cloudbrain.all_status"}}' : params.get('jobStatus').toUpperCase()
-    const dropdownValueArray = [jobType,listType,jobStatus]
-    $('#adminCloud .default.text ').each(function(index,e){
-        $(e).text(dropdownValueArray[index])
-    })
-}
-getParams()
+    import Vue from 'vue';   
+    import enLocale from 'element-ui/lib/locale/lang/en'
+    import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+    import locale from 'element-ui/lib/locale'
+
+    var text_langName = document.getElementById("langName").innerText
+    if (text_langName == '简体中文'){
+        locale.use(zhLocale)
+    }
+    else if (text_langName == 'English'){
+        locale.use(enLocale)
+    }
+    
+    function getParams(){
+        const params = new URLSearchParams(window.location.search)
+        let jobType = !params.get('jobType')? '{{.i18n.Tr "admin.cloudbrain.all_task_types"}}' : params.get('jobType')
+        let listType = !params.get('listType')? '{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}' : params.get('listType')
+        let jobStatus = !params.get('jobStatus')? '{{.i18n.Tr "admin.cloudbrain.all_status"}}' : params.get('jobStatus').toUpperCase()
+        const dropdownValueArray = [jobType,listType,jobStatus]
+        $('#adminCloud .default.text ').each(function(index,e){
+            $(e).text(dropdownValueArray[index])
+        })
+    }
+    getParams()
 </script>
diff --git a/templates/base/footer_content_fluid.tmpl b/templates/base/footer_content_fluid.tmpl
index 6d3cada9e..7926e9fe1 100644
--- a/templates/base/footer_content_fluid.tmpl
+++ b/templates/base/footer_content_fluid.tmpl
@@ -19,7 +19,7 @@
 						<div class="header item">{{.i18n.Tr "custom.foot.help"}}</div>
 						<div class="ui language bottom floating slide up dropdown link item">
 							<i class="world icon"></i>
-							<div class="text">{{.LangName}}</div>
+							<div class="text" id ='langName'>{{.LangName}}</div>
 							<div class="menu">
 								{{range .AllLangs}}
 									<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
diff --git a/templates/custom/select_dataset.tmpl b/templates/custom/select_dataset.tmpl
index dc5ca6c9e..be8d95b93 100644
--- a/templates/custom/select_dataset.tmpl
+++ b/templates/custom/select_dataset.tmpl
@@ -135,4 +135,19 @@
     </el-dialog>
 
 
-</div>
\ No newline at end of file
+</div>
+
+<script>
+    import Vue from 'vue';   
+    import enLocale from 'element-ui/lib/locale/lang/en'
+    import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+    import locale from 'element-ui/lib/locale'
+
+    var text_langName = document.getElementById("langName").innerText
+    if (text_langName == '简体中文'){
+        locale.use(zhLocale)
+    }
+    else if (text_langName == 'English'){
+        locale.use(enLocale)
+    }
+</script>
\ No newline at end of file
diff --git a/templates/explore/data_analysis.tmpl b/templates/explore/data_analysis.tmpl
index 34ad3f018..f041c2914 100755
--- a/templates/explore/data_analysis.tmpl
+++ b/templates/explore/data_analysis.tmpl
@@ -8,8 +8,11 @@
 
 <style>
 .full.height {
+    display: flex; 
+    flex-flow: column wrap;
+    padding-bottom:0px;
     /* flex-grow: 1; */
-    padding-bottom: 53px;
+    /* padding-bottom: 53px; */
  }
 
 </style>
\ No newline at end of file
diff --git a/templates/explore/datasets.tmpl b/templates/explore/datasets.tmpl
index ff18a3da3..6f5b86b04 100644
--- a/templates/explore/datasets.tmpl
+++ b/templates/explore/datasets.tmpl
@@ -216,3 +216,18 @@
 	</div>
 </div>
 {{template "base/footer" .}}
+
+<script>
+	import Vue from 'vue';   
+    import enLocale from 'element-ui/lib/locale/lang/en'
+    import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+    import locale from 'element-ui/lib/locale'
+
+    var text_langName = document.getElementById("langName").innerText
+    if (text_langName == '简体中文'){
+        locale.use(zhLocale)
+    }
+    else if (text_langName == 'English'){
+        locale.use(enLocale)
+    }
+</script>
diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl
index a38e86525..7a021eb56 100755
--- a/templates/repo/datasets/index.tmpl
+++ b/templates/repo/datasets/index.tmpl
@@ -344,3 +344,18 @@
   {{template "base/delete_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
+
+<script>
+	  import Vue from 'vue';   
+    import enLocale from 'element-ui/lib/locale/lang/en'
+    import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+    import locale from 'element-ui/lib/locale'
+
+    var text_langName = document.getElementById("langName").innerText
+    if (text_langName == '简体中文'){
+        locale.use(zhLocale)
+    }
+    else if (text_langName == 'English'){
+        locale.use(enLocale)
+    }
+</script>
\ No newline at end of file
diff --git a/web_src/js/components/Contributors.vue b/web_src/js/components/Contributors.vue
index cd85f6ae9..380617515 100644
--- a/web_src/js/components/Contributors.vue
+++ b/web_src/js/components/Contributors.vue
@@ -36,7 +36,20 @@
     </div>
 </template>
 
+
 <script>
+	import Vue from 'vue';   
+    import enLocale from 'element-ui/lib/locale/lang/en'
+    import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+    import locale from 'element-ui/lib/locale'
+
+    var text_langName = document.getElementById("langName").innerText
+    if (text_langName == '简体中文'){
+        locale.use(zhLocale)
+    }
+    else if (text_langName == 'English'){
+        locale.use(enLocale)
+    }
 
 const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
 
diff --git a/web_src/js/components/DataAnalysis.vue b/web_src/js/components/DataAnalysis.vue
index ae536db28..d5468ddf5 100755
--- a/web_src/js/components/DataAnalysis.vue
+++ b/web_src/js/components/DataAnalysis.vue
@@ -1,5 +1,5 @@
 <template>
-    <div  style="height:100%">
+    <div  style="height:100%;flex:1" >
         <el-tabs tab-position="left" v-model="activeName" style="height:100%" @tab-click="handleClick" >
             <el-tab-pane label="概览" name="first" >
                 <span slot="label"> 
@@ -130,5 +130,8 @@
     /deep/ .el-image{
         filter:grayscale(100%)
     }
+    /deep/ .el-pagination {
+        padding-bottom: 30px;
+    }
   
     </style>
\ No newline at end of file
diff --git a/web_src/js/components/Images.vue b/web_src/js/components/Images.vue
index 5ca7626b7..78f5403d1 100644
--- a/web_src/js/components/Images.vue
+++ b/web_src/js/components/Images.vue
@@ -257,8 +257,8 @@
 </template>
 
 
-
 <script>
+
     import Vue from 'vue';   
     import enLocale from 'element-ui/lib/locale/lang/en'
     import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
@@ -272,12 +272,8 @@
         locale.use(enLocale)
     }
 
-
 const {_AppSubUrl, _StaticUrlPrefix, csrf} = window.config;
 
-
-
-
 export default {
   components: {
     
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index fefe596d2..a755a78c5 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -131,8 +131,22 @@
   
 </template>
 
+
 <script>
 
+    import Vue from 'vue';   
+    import enLocale from 'element-ui/lib/locale/lang/en'
+    import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+    import locale from 'element-ui/lib/locale'
+
+    var text_langName = document.getElementById("langName").innerText
+    if (text_langName == '简体中文'){
+        locale.use(zhLocale)
+    }
+    else if (text_langName == 'English'){
+        locale.use(enLocale)
+    }
+
 const {_AppSubUrl, _StaticUrlPrefix, csrf} = window.config;
 
 export default {
diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue
index bdc874c27..9c61d2f0c 100755
--- a/web_src/js/components/ProAnalysis.vue
+++ b/web_src/js/components/ProAnalysis.vue
@@ -377,960 +377,975 @@
     
         </div>
     </div>
-    </template>
-    
-    <script>
-        // import barLabel from './basic/barLabel.vue';
-        const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
-
-        import { export2Excel } from '../excel/util.js'
-        export default{
-            name:'ProAnalysis',
-            components: {
-                // barLabel,
-            },
-            data() {
-                return {
-                    recordBeginTime:'',
-                    lastUpdatedTime:'',
-                    page:1,
-                    pageSize:10,
-                    params:{type:'all',page:1,pagesize:10,beginTime:'',endTime:'',q:'',sort:'openi'},
-                    tableData: [],
-                    totalPage:0,
-                    totalNum:0,
-                    pickerOptions: {
-                    },
-                    value_time: '',
-                    search:'',
-                    dynamic:7,
-                    download_a:"",
-                    downLoadSrc:'',
+</template>
 
-    
-                    //单个项目参数
-                    columns: [{title: '日期',key: 'date'},{title: '浏览量',key: 'view'},{title: '下载量',key: 'download'},{title: 'commit',key: 'commit'}],
-                    currentPage:1,
-                    pageSize1:10,
-                    paramsID:{type:'all' ,beginTime:'',endTime:'',openi:'false'},
-                    tableDataIDTotal: [],
-                    tableDataID: [],
-                    tableDataIDOpenI:[],  
-                    tableDataContTop10:[],
-                    create_time_pro: '',
-                    dynamic_pro:7,
-                    pro_name:'',
-                    alias:'',
-                    pro_id:'',
-                    ownerName:'',
-                    radarOpenI:'',
-                    echartsOITd:'',
-                    echartsSelectData:'',
-                    option:'',
-
-    
-                };
-             },
-            methods: {
-                // download_file(){
-                //     this.params.type='all'
-                // },
-                popMark(){
-                    alert("数据为空时，不能下载！")
-                },
-                exportData(){
-                    
-                    // this.getOneProList(this.pro_id,'all',true,7)
-                    // this.getOneProList(this.pro_id,'all',false,7)
-                    // this.fileName()
-                    if (this.tableDataID!=''){
-                        this.currentPage=1
-                        var saveFileName = this.getFileName()
-                        export2Excel(this.columns,this.tableDataID,saveFileName)
-                    }else{
-                        alert("数据为空时，不能下载！")
-                    }
-               
-                },
-                getFileName(){
-
-                    var now = new Date(); // 当前日期
-                    var nowDayOfWeek = now.getDay(); // 今天本周的第几天
-                    var nowDay = now.getDate(); // 当前日
-                    var nowMonth = now.getMonth(); // 当前月
-                    var nowYear = now.getFullYear(); // 当前年     
-                    var today = this.saveFormatDate(nowYear,nowMonth+1,nowDay);
-                    var tmp = new Date(now.setTime(now.getTime()-24*60*60*1000));
-                    var yesterday = this.saveFormatDate(tmp.getFullYear(),tmp.getMonth()+1,tmp.getDate());
-                    var yesterday_tmp = this.formatDate(tmp.getFullYear(),tmp.getMonth()+1,tmp.getDate())
-
-                   
-                    var startDate=''
-                    var endDate=''
-                    var saveFileName = ''
-                    
-                    if (typeof this.paramsID.type=="undefined" || this.paramsID.type=="null" || this.paramsID.type==""){
-                        
-                        // startDate=  this.saveFormatDate(this.create_time_pro[0].getFullYear(),this.create_time_pro[0].getMonth() + 1,this.create_time_pro[0].getDate());
-                        endDate = this.saveFormatDate(this.create_time_pro[1].getFullYear(),this.create_time_pro[1].getMonth() + 1,this.create_time_pro[1].getDate());
-                        
-                        var tmp = this.formatDate(this.create_time_pro[0].getFullYear(),this.create_time_pro[0].getMonth() + 1,this.create_time_pro[0].getDate())
-                        startDate = this.comparedate(tmp,this.recordBeginTime)
+<script>
+    import Vue from 'vue';   
+    import enLocale from 'element-ui/lib/locale/lang/en'
+    import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+    import locale from 'element-ui/lib/locale'
 
-                        console.log("comparedate:"+startDate)
-                        saveFileName = this.alias+"_"+startDate+'_'+endDate
-                    }else{
-                        switch(this.paramsID.type){
-                            case "yesterday":{
-                                
-                                startDate = this.comparedate(yesterday_tmp,this.recordBeginTime)
-                                endDate = startDate
+    var text_langName = document.getElementById("langName").innerText
+    if (text_langName == '简体中文'){
+        locale.use(zhLocale)
+    }
+    else if (text_langName == 'English'){
+        locale.use(enLocale)
+    }
+    // import barLabel from './basic/barLabel.vue';
+    const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
 
-                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
-                                break
-                            }
-                            case "current_week":{
-                                var now = new Date(); // 当前日期
-                                var nowDayOfWeek = now.getDay(); // 今天本周的第几天
-                                var day = nowDayOfWeek || 7;
-                                startDate = this.formatDate(now.getFullYear(), nowMonth+1, nowDay + 1 - day);
-                                startDate = this.comparedate(startDate,this.recordBeginTime)
-        
+    import { export2Excel } from '../excel/util.js'
+    export default{
+        name:'ProAnalysis',
+        components: {
+            // barLabel,
+        },
+        data() {
+            return {
+                recordBeginTime:'',
+                lastUpdatedTime:'',
+                page:1,
+                pageSize:10,
+                params:{type:'all',page:1,pagesize:10,beginTime:'',endTime:'',q:'',sort:'openi'},
+                tableData: [],
+                totalPage:0,
+                totalNum:0,
+                pickerOptions: {
+                },
+                value_time: '',
+                search:'',
+                dynamic:7,
+                download_a:"",
+                downLoadSrc:'',
 
-                                endDate = yesterday
-                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
-                                break
-                            }
-                            case "current_month":{
-                               
-                                startDate =  this.formatDate(nowYear,nowMonth+1,1);
-                                startDate = this.comparedate(startDate,this.recordBeginTime)
 
-                                endDate = yesterday
-                                
-                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
-                                break
-                            }
-                            case "last_month":{
+                //单个项目参数
+                columns: [{title: '日期',key: 'date'},{title: '浏览量',key: 'view'},{title: '下载量',key: 'download'},{title: 'commit',key: 'commit'}],
+                currentPage:1,
+                pageSize1:10,
+                paramsID:{type:'all' ,beginTime:'',endTime:'',openi:'false'},
+                tableDataIDTotal: [],
+                tableDataID: [],
+                tableDataIDOpenI:[],  
+                tableDataContTop10:[],
+                create_time_pro: '',
+                dynamic_pro:7,
+                pro_name:'',
+                alias:'',
+                pro_id:'',
+                ownerName:'',
+                radarOpenI:'',
+                echartsOITd:'',
+                echartsSelectData:'',
+                option:'',
 
-                                let lastMonthDate = new Date();  // 上月日期
-                                lastMonthDate.setDate(1);
-                                lastMonthDate.setMonth(lastMonthDate.getMonth()-1);
-                                let lastYear = lastMonthDate.getFullYear();
-                                let lastMonth = lastMonthDate.getMonth();
 
-                                startDate=this.formatDate(lastYear, lastMonth+1, 1);
-                                startDate = this.comparedate(startDate,this.recordBeginTime)
+            };
+            },
+        methods: {
+            // download_file(){
+            //     this.params.type='all'
+            // },
+            popMark(){
+                alert("数据为空时，不能下载！")
+            },
+            exportData(){
+                
+                // this.getOneProList(this.pro_id,'all',true,7)
+                // this.getOneProList(this.pro_id,'all',false,7)
+                // this.fileName()
+                if (this.tableDataID!=''){
+                    this.currentPage=1
+                    var saveFileName = this.getFileName()
+                    export2Excel(this.columns,this.tableDataID,saveFileName)
+                }else{
+                    alert("数据为空时，不能下载！")
+                }
+            
+            },
+            getFileName(){
 
+                var now = new Date(); // 当前日期
+                var nowDayOfWeek = now.getDay(); // 今天本周的第几天
+                var nowDay = now.getDate(); // 当前日
+                var nowMonth = now.getMonth(); // 当前月
+                var nowYear = now.getFullYear(); // 当前年     
+                var today = this.saveFormatDate(nowYear,nowMonth+1,nowDay);
+                var tmp = new Date(now.setTime(now.getTime()-24*60*60*1000));
+                var yesterday = this.saveFormatDate(tmp.getFullYear(),tmp.getMonth()+1,tmp.getDate());
+                var yesterday_tmp = this.formatDate(tmp.getFullYear(),tmp.getMonth()+1,tmp.getDate())
 
-                                var monthStartDate = new Date(lastYear, lastMonth, 1);
-                                var monthEndDate = new Date(lastYear, lastMonth+1, 1);
-                                var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24)
+                
+                var startDate=''
+                var endDate=''
+                var saveFileName = ''
+                
+                if (typeof this.paramsID.type=="undefined" || this.paramsID.type=="null" || this.paramsID.type==""){
+                    
+                    // startDate=  this.saveFormatDate(this.create_time_pro[0].getFullYear(),this.create_time_pro[0].getMonth() + 1,this.create_time_pro[0].getDate());
+                    endDate = this.saveFormatDate(this.create_time_pro[1].getFullYear(),this.create_time_pro[1].getMonth() + 1,this.create_time_pro[1].getDate());
+                    
+                    var tmp = this.formatDate(this.create_time_pro[0].getFullYear(),this.create_time_pro[0].getMonth() + 1,this.create_time_pro[0].getDate())
+                    startDate = this.comparedate(tmp,this.recordBeginTime)
 
-                                endDate=this.saveFormatDate(lastYear, lastMonth+1, days);  //月份从0开始，所以+1保存月份 
-                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
-                                break
-                            }
-                            case "monthly":{
-                                var temp=new Date(now - 1000 * 60 * 60 * 24 * 30)
-                                startDate = this.formatDate(temp.getFullYear(),temp.getMonth()+1,temp.getDate());
-                                startDate = this.comparedate(startDate,this.recordBeginTime)
-
-                                endDate = yesterday
-                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
-                                break
-                            }
-                            case "current_year":{
-                                startDate = this.formatDate(now.getFullYear(), 1, 1);
-                                startDate = this.comparedate(startDate,this.recordBeginTime)
+                    console.log("comparedate:"+startDate)
+                    saveFileName = this.alias+"_"+startDate+'_'+endDate
+                }else{
+                    switch(this.paramsID.type){
+                        case "yesterday":{
+                            
+                            startDate = this.comparedate(yesterday_tmp,this.recordBeginTime)
+                            endDate = startDate
 
-                                endDate = yesterday
-                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
-                                break
-                            }
-                            case "all":{
-                                console.log("e:"+today)
-                                startDate = 'all'
-                                endDate = yesterday
-                                saveFileName = this.alias+'_所有'
-                                break
-                            }
+                            saveFileName = this.alias+"_"+startDate+'_'+ endDate
+                            break
                         }
-                    }
-                    return saveFileName
-
-                },
-                resetPage(){
-                    this.page=1
-                    this.params.page = 1
-                },
-                resetCurrentPage(){
-                    this.currentPage=1
-                },
-                handleSizeChange(val){
-                    this.params.pagesize = val
-                    this.resetPage()
-                    this.getAllProList(this.params.type, this.dynamic)
-                },
-                handleCurrentChange(val){
-                    console.log(val)
-                    this.params.page = val
-                    this.page = val
-                    switch(this.params.type){
-                        case "yesterday":{
-                                this.value_time=''
-                                this.getAllProList(this.params.type,1)
-                                break
-                            }
                         case "current_week":{
-                            this.value_time=''
-                            this.getAllProList(this.params.type,2)
+                            var now = new Date(); // 当前日期
+                            var nowDayOfWeek = now.getDay(); // 今天本周的第几天
+                            var day = nowDayOfWeek || 7;
+                            startDate = this.formatDate(now.getFullYear(), nowMonth+1, nowDay + 1 - day);
+                            startDate = this.comparedate(startDate,this.recordBeginTime)
+    
+
+                            endDate = yesterday
+                            saveFileName = this.alias+"_"+startDate+'_'+ endDate
                             break
                         }
                         case "current_month":{
-                            this.value_time=''
-                            this.getAllProList(this.params.type,3)
+                            
+                            startDate =  this.formatDate(nowYear,nowMonth+1,1);
+                            startDate = this.comparedate(startDate,this.recordBeginTime)
+
+                            endDate = yesterday
+                            
+                            saveFileName = this.alias+"_"+startDate+'_'+ endDate
                             break
                         }
                         case "last_month":{
-                            this.value_time=''
-                            this.getAllProList(this.params.type,4)
+
+                            let lastMonthDate = new Date();  // 上月日期
+                            lastMonthDate.setDate(1);
+                            lastMonthDate.setMonth(lastMonthDate.getMonth()-1);
+                            let lastYear = lastMonthDate.getFullYear();
+                            let lastMonth = lastMonthDate.getMonth();
+
+                            startDate=this.formatDate(lastYear, lastMonth+1, 1);
+                            startDate = this.comparedate(startDate,this.recordBeginTime)
+
+
+                            var monthStartDate = new Date(lastYear, lastMonth, 1);
+                            var monthEndDate = new Date(lastYear, lastMonth+1, 1);
+                            var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24)
+
+                            endDate=this.saveFormatDate(lastYear, lastMonth+1, days);  //月份从0开始，所以+1保存月份 
+                            saveFileName = this.alias+"_"+startDate+'_'+ endDate
                             break
-    
                         }
                         case "monthly":{
-                            this.value_time=''
-                            this.getAllProList(this.params.type,5)
+                            var temp=new Date(now - 1000 * 60 * 60 * 24 * 30)
+                            startDate = this.formatDate(temp.getFullYear(),temp.getMonth()+1,temp.getDate());
+                            startDate = this.comparedate(startDate,this.recordBeginTime)
+
+                            endDate = yesterday
+                            saveFileName = this.alias+"_"+startDate+'_'+ endDate
                             break
                         }
                         case "current_year":{
-                            this.value_time=''
-                            this.getAllProList(this.params.type,6)
+                            startDate = this.formatDate(now.getFullYear(), 1, 1);
+                            startDate = this.comparedate(startDate,this.recordBeginTime)
+
+                            endDate = yesterday
+                            saveFileName = this.alias+"_"+startDate+'_'+ endDate
                             break
                         }
                         case "all":{
-                            this.value_time=''
-                            this.getAllProList(this.params.type,7)
+                            console.log("e:"+today)
+                            startDate = 'all'
+                            endDate = yesterday
+                            saveFileName = this.alias+'_所有'
                             break
                         }
-                        case "":{
-                            // this.value_time=''
-                            this.getAllProList(this.params.type,0)
+                    }
+                }
+                return saveFileName
+
+            },
+            resetPage(){
+                this.page=1
+                this.params.page = 1
+            },
+            resetCurrentPage(){
+                this.currentPage=1
+            },
+            handleSizeChange(val){
+                this.params.pagesize = val
+                this.resetPage()
+                this.getAllProList(this.params.type, this.dynamic)
+            },
+            handleCurrentChange(val){
+                console.log(val)
+                this.params.page = val
+                this.page = val
+                switch(this.params.type){
+                    case "yesterday":{
+                            this.value_time=''
+                            this.getAllProList(this.params.type,1)
                             break
                         }
+                    case "current_week":{
+                        this.value_time=''
+                        this.getAllProList(this.params.type,2)
+                        break
                     }
-                },
-                saveFormatDate(myyear,mymonth,myweekday) {
-                    // var myyear = this.date.getFullYear();
-                    // var mymonth = this.date.getMonth() + 1;
-                    // var myweekday = this.date.getDate();
-            
-                    if (mymonth < 10) {
-                        mymonth = "0" + mymonth;
+                    case "current_month":{
+                        this.value_time=''
+                        this.getAllProList(this.params.type,3)
+                        break
                     }
-                    if (myweekday < 10) {
-                        myweekday = "0" + myweekday;
+                    case "last_month":{
+                        this.value_time=''
+                        this.getAllProList(this.params.type,4)
+                        break
+
                     }
-                    console.log((myyear +''+ mymonth  +''+ myweekday))
-                    return (myyear +''+ mymonth  +''+ myweekday);
-                },
-                formatDate(myyear,mymonth,myweekday) {
-                    // var myyear = this.date.getFullYear();
-                    // var mymonth = this.date.getMonth() + 1;
-                    // var myweekday = this.date.getDate();
-            
-                    if (mymonth < 10) {
-                        mymonth = "0" + mymonth;
+                    case "monthly":{
+                        this.value_time=''
+                        this.getAllProList(this.params.type,5)
+                        break
                     }
-                    if (myweekday < 10) {
-                        myweekday = "0" + myweekday;
+                    case "current_year":{
+                        this.value_time=''
+                        this.getAllProList(this.params.type,6)
+                        break
                     }
-                    return (myyear +'-'+ mymonth  +'-'+ myweekday);
-                },
-                //获得某月的天数
-               
-                
-                
-                getAllProList(type_val,index){
-                    console.log("类型："+type_val)
-                    this.dynamic = index
-                    if (typeof type_val=="undefined" || type_val=="null" || type_val==""){
-                        this.params.type=''
-                        this.params.beginTime=this.formatDate(this.value_time[0].getFullYear(),this.value_time[0].getMonth() + 1,this.value_time[0].getDate())
-                        this.params.endTime=this.formatDate(this.value_time[1].getFullYear(),this.value_time[1].getMonth() + 1,this.value_time[1].getDate())
-                    }else{
-                        this.params.type=type_val
-                        this.params.beginTime=''
-                        this.params.endTime=''
-                        this.value_time=[]
+                    case "all":{
+                        this.value_time=''
+                        this.getAllProList(this.params.type,7)
+                        break
                     }
-    
-                    this.$axios.get('../api/v1/projectboard/project',{
-                        params:this.params
-                    }).then((res)=>{
-                
-                    this.recordBeginTime=res.data.recordBeginTime
-                    this.lastUpdatedTime=res.data.lastUpdatedTime
-                    this.tableData = res.data.pageRecords
-                    this.totalPage=res.data.totalPage
-                    this.totalNum = res.data.totalCount//this.totalPage*this.params.pagesize
-                    // console.log("this.totalPage:"+this.totalPage)
-    
-                    })
-                },
-                searchName(){
-                    this.params.q = this.search
-                    this.params.page = 1
-                    this.page=1
-                    this.getAllProList(this.params.type, this.dynamic)
-                },
-    
-                goToDetailPage(pro_id,pro_name,ownerName,alias){
-                    this.currentPage=1
-                    document.getElementById("pro_main").style.display="none";
-                    document.getElementById("pro_detail").style.display="block";
-                    // console.log(pro_id)
-                    // console.log(pro_name)
-                    this.pro_name=pro_name;
-                    this.alias=alias;
-                    this.pro_id=pro_id;
-                    this.ownerName=ownerName
-                    this.getOneProData(pro_id);
-                    this.getOneProList(pro_id,"current_year",true,0);
-                    this.getOneProList(pro_id,"monthly",false,5);
-                },
-                tableHeaderStyle({row,column,rowIndex,columnIndex}){
+                    case "":{
+                        // this.value_time=''
+                        this.getAllProList(this.params.type,0)
+                        break
+                    }
+                }
+            },
+            saveFormatDate(myyear,mymonth,myweekday) {
+                // var myyear = this.date.getFullYear();
+                // var mymonth = this.date.getMonth() + 1;
+                // var myweekday = this.date.getDate();
+        
+                if (mymonth < 10) {
+                    mymonth = "0" + mymonth;
+                }
+                if (myweekday < 10) {
+                    myweekday = "0" + myweekday;
+                }
+                console.log((myyear +''+ mymonth  +''+ myweekday))
+                return (myyear +''+ mymonth  +''+ myweekday);
+            },
+            formatDate(myyear,mymonth,myweekday) {
+                // var myyear = this.date.getFullYear();
+                // var mymonth = this.date.getMonth() + 1;
+                // var myweekday = this.date.getDate();
+        
+                if (mymonth < 10) {
+                    mymonth = "0" + mymonth;
+                }
+                if (myweekday < 10) {
+                    myweekday = "0" + myweekday;
+                }
+                return (myyear +'-'+ mymonth  +'-'+ myweekday);
+            },
+            //获得某月的天数
             
-                    if(rowIndex===0){
-                        return 'background:#f5f5f6;color:#606266'
-                    }       
-                },
-                cellStyle({row,column,rowIndex,columnIndex}){
             
-                    if(rowIndex%2 === 1){
-                        return 'background:#f5f5f6;color:#606266'
-                    }       
-                },
-                handleSizeChangeID(val){
-                    this.pageSize1=val                   
-                },
+            
+            getAllProList(type_val,index){
+                console.log("类型："+type_val)
+                this.dynamic = index
+                if (typeof type_val=="undefined" || type_val=="null" || type_val==""){
+                    this.params.type=''
+                    this.params.beginTime=this.formatDate(this.value_time[0].getFullYear(),this.value_time[0].getMonth() + 1,this.value_time[0].getDate())
+                    this.params.endTime=this.formatDate(this.value_time[1].getFullYear(),this.value_time[1].getMonth() + 1,this.value_time[1].getDate())
+                }else{
+                    this.params.type=type_val
+                    this.params.beginTime=''
+                    this.params.endTime=''
+                    this.value_time=[]
+                }
 
-                handleCurrentChangeID(currentPage){
-                    this.currentPage = currentPage;
-                },
+                this.$axios.get('../api/v1/projectboard/project',{
+                    params:this.params
+                }).then((res)=>{
+            
+                this.recordBeginTime=res.data.recordBeginTime
+                this.lastUpdatedTime=res.data.lastUpdatedTime
+                this.tableData = res.data.pageRecords
+                this.totalPage=res.data.totalPage
+                this.totalNum = res.data.totalCount//this.totalPage*this.params.pagesize
+                // console.log("this.totalPage:"+this.totalPage)
+
+                })
+            },
+            searchName(){
+                this.params.q = this.search
+                this.params.page = 1
+                this.page=1
+                this.getAllProList(this.params.type, this.dynamic)
+            },
+
+            goToDetailPage(pro_id,pro_name,ownerName,alias){
+                this.currentPage=1
+                document.getElementById("pro_main").style.display="none";
+                document.getElementById("pro_detail").style.display="block";
+                // console.log(pro_id)
+                // console.log(pro_name)
+                this.pro_name=pro_name;
+                this.alias=alias;
+                this.pro_id=pro_id;
+                this.ownerName=ownerName
+                this.getOneProData(pro_id);
+                this.getOneProList(pro_id,"current_year",true,0);
+                this.getOneProList(pro_id,"monthly",false,5);
+            },
+            tableHeaderStyle({row,column,rowIndex,columnIndex}){
+        
+                if(rowIndex===0){
+                    return 'background:#f5f5f6;color:#606266'
+                }       
+            },
+            cellStyle({row,column,rowIndex,columnIndex}){
+        
+                if(rowIndex%2 === 1){
+                    return 'background:#f5f5f6;color:#606266'
+                }       
+            },
+            handleSizeChangeID(val){
+                this.pageSize1=val                   
+            },
+
+            handleCurrentChangeID(currentPage){
+                this.currentPage = currentPage;
+            },
+            
+            getOneProData(pro_id){
+                this.$axios.get('../api/v1/projectboard/project/'+pro_id,{
+                }).then((res)=>{
+                this.tableDataIDTotal = res.data
+                this.tableDataContTop10=res.data.top10
+                // this.drawLine()
+                this.drawRadarOpenI()
                 
-                getOneProData(pro_id){
-                    this.$axios.get('../api/v1/projectboard/project/'+pro_id,{
-                    }).then((res)=>{
-                    this.tableDataIDTotal = res.data
-                    this.tableDataContTop10=res.data.top10
-                    // this.drawLine()
-                    this.drawRadarOpenI()
-                    
-                    })
-                },
-                getOneProList(pro_id,type_val,bool_val,index){
-                    this.dynamic_pro=index
-                    console.log("日期类型："+type_val)
-                    if (typeof type_val=="undefined" || type_val=="null" || type_val==""){
-                        this.paramsID.type='' 
-                        this.paramsID.beginTime= this.formatDate(this.create_time_pro[0].getFullYear(),this.create_time_pro[0].getMonth() + 1,this.create_time_pro[0].getDate()) 
-                        this.paramsID.endTime=this.formatDate(this.create_time_pro[1].getFullYear(),this.create_time_pro[1].getMonth() + 1,this.create_time_pro[1].getDate())
+                })
+            },
+            getOneProList(pro_id,type_val,bool_val,index){
+                this.dynamic_pro=index
+                console.log("日期类型："+type_val)
+                if (typeof type_val=="undefined" || type_val=="null" || type_val==""){
+                    this.paramsID.type='' 
+                    this.paramsID.beginTime= this.formatDate(this.create_time_pro[0].getFullYear(),this.create_time_pro[0].getMonth() + 1,this.create_time_pro[0].getDate()) 
+                    this.paramsID.endTime=this.formatDate(this.create_time_pro[1].getFullYear(),this.create_time_pro[1].getMonth() + 1,this.create_time_pro[1].getDate())
+                }else{
+                    this.create_time_pro=[]
+                    this.paramsID.type=type_val
+                    this.paramsID.beginTime=''
+                    this.paramsID.endTime=''
+                }
+                this.paramsID.openi=bool_val
+                this.$axios.get('../api/v1/projectboard/project/'+pro_id+"/period",{
+                    params:this.paramsID
+                }).then((res)=>{
+                    if (bool_val){
+                        this.tableDataIDOpenI = res.data            
+                        this.drawOpenItrend()
+                        
+                        
+                        
                     }else{
-                        this.create_time_pro=[]
-                        this.paramsID.type=type_val
-                        this.paramsID.beginTime=''
-                        this.paramsID.endTime=''
-                    }
-                    this.paramsID.openi=bool_val
-                    this.$axios.get('../api/v1/projectboard/project/'+pro_id+"/period",{
-                        params:this.paramsID
-                    }).then((res)=>{
-                        if (bool_val){
-                            this.tableDataIDOpenI = res.data            
-                            this.drawOpenItrend()
-                           
-                            
-                            
-                        }else{
-                            this.tableDataID = res.data
-                            this.drawSelectData()
-                            
-                        }
+                        this.tableDataID = res.data
+                        this.drawSelectData()
                         
-                    })
-                },
-                drawRadarOpenI(){
+                    }
                     
-                    var ydata = [this.roundingF(this.tableDataIDTotal.impact),this.roundingF(this.tableDataIDTotal.completeness),this.roundingF(this.tableDataIDTotal.liveness),this.roundingF(this.tableDataIDTotal.projectHealth),this.roundingF(this.tableDataIDTotal.teamHealth),this.roundingF(this.tableDataIDTotal.growth)]
-                    console.log("ydata:",ydata)
-                    var i = -1;
-                    var option = {
-                            titile:{
-                                text:""
+                })
+            },
+            drawRadarOpenI(){
+                
+                var ydata = [this.roundingF(this.tableDataIDTotal.impact),this.roundingF(this.tableDataIDTotal.completeness),this.roundingF(this.tableDataIDTotal.liveness),this.roundingF(this.tableDataIDTotal.projectHealth),this.roundingF(this.tableDataIDTotal.teamHealth),this.roundingF(this.tableDataIDTotal.growth)]
+                console.log("ydata:",ydata)
+                var i = -1;
+                var option = {
+                        titile:{
+                            text:""
+                        },
+                        tooltip: {
+                            trigger: 'item',
+                            backgroundColor:'rgba(255,255,255,0.8)',
+                            color:'black',
+                            borderWidth:'1',
+                            borderColor:'gray',
+                            textStyle:{
+                                color:'black'
                             },
-                            tooltip: {
-                                trigger: 'item',
-                                backgroundColor:'rgba(255,255,255,0.8)',
-                                color:'black',
-                                borderWidth:'1',
-                                borderColor:'gray',
-                                textStyle:{
-                                    color:'black'
-                                },
-                                position: 'right',
+                            position: 'right',
 
 
 
-                                // formatter: function (params) {
-                                //     console.log('params:',params)
-                                //     console.log('params.data:',params[0])
-                                //     let str = params.data.name + "<br />";
-                                //     params.data.forEach((item) => {
-                                //     str +=
-                                //         '<span style="display:inline-block;margin-right:5px;border-radius:50%;width:10px;height:10px;left:5px;background-color:'+params.color+'"></span>' + item.seriesName + " : " + '<span style="float:right">'+item.data[1] +'</span>'+ "<br />";
-                                //     });
-                                //     return str;
-                                // },
-                                // formatter: function (params, ticket, callback) {
-                                //     console.log(params);
-                                //     var showHtm="";
-                                //     var data = params.data.value
-                                //     for(var i=0;i<data.length;i++){
-                                //         //x轴名称
-                                //         var name = data[i];
-                                //          //值
-                                //         var value = params[i][2];
-                                //         showHtm+= text+ '--' + name + ' :' + value+'<br>'
-                                //     }
-                                //     return showHtm;
-                                // }
+                            // formatter: function (params) {
+                            //     console.log('params:',params)
+                            //     console.log('params.data:',params[0])
+                            //     let str = params.data.name + "<br />";
+                            //     params.data.forEach((item) => {
+                            //     str +=
+                            //         '<span style="display:inline-block;margin-right:5px;border-radius:50%;width:10px;height:10px;left:5px;background-color:'+params.color+'"></span>' + item.seriesName + " : " + '<span style="float:right">'+item.data[1] +'</span>'+ "<br />";
+                            //     });
+                            //     return str;
+                            // },
+                            // formatter: function (params, ticket, callback) {
+                            //     console.log(params);
+                            //     var showHtm="";
+                            //     var data = params.data.value
+                            //     for(var i=0;i<data.length;i++){
+                            //         //x轴名称
+                            //         var name = data[i];
+                            //          //值
+                            //         var value = params[i][2];
+                            //         showHtm+= text+ '--' + name + ' :' + value+'<br>'
+                            //     }
+                            //     return showHtm;
+                            // }
 
 
 
 
 
 
-                                
-                            },//提示层
-                            legend: {
-                                // data: ['']
+                            
+                        },//提示层
+                        legend: {
+                            // data: ['']
+                        },
+                        radar: {
+                            name: {
+                                textStyle: {
+                                    color: 'rgb(0,0,0)', //字体颜色
+                                    borderRadius: 3, //圆角
+                                    padding: [3, 5] //padding
+                                }
                             },
-                            radar: {
-                                name: {
-                                    textStyle: {
-                                        color: 'rgb(0,0,0)', //字体颜色
-                                        borderRadius: 3, //圆角
-                                        padding: [3, 5] //padding
-                                    }
+                            slpitNumber:5,
+                            center: ['50%', '50%'],
+                            splitArea: { // 坐标轴在 grid 区域中的分隔区域
+                                show: false,                            
+                            },
+
+                            indicator: [{
+                                    name: '社区影响力',
+                                    max: 100
                                 },
-                                slpitNumber:5,
-                                center: ['50%', '50%'],
-                                splitArea: { // 坐标轴在 grid 区域中的分隔区域
-                                    show: false,                            
+                                {
+                                    name: '项目成熟度',
+                                    max: 100
                                 },
+                                {
+                                    name: '开发活跃度',
+                                    max: 100
+                                },
+                                {
+                                    name: '项目健康度',
+                                    max: 100
+                                },
+                                {
+                                    name: '团队健康度',
+                                    max: 100
+                                },
+                                {
+                                    name: '项目发展趋势',
+                                    max: 100
+                                }
+                            ],
+                        },
+                        series: [{
+                            type: 'radar',
+                            lineStyle:{
+                                width:2,
+                                color: '#0366D6',
+                                normal:{
+                                    color:'#0366D6 '
+                                }
+                            },
+                            itemStyle : {
+                                normal : {
+                                    color:'#0366D6'
+                                }
+                            }, 
+                            data: [{
+                                value: ydata,
+                                name:"数据"
+                            }]
+                        }]
 
-                                indicator: [{
-                                        name: '社区影响力',
-                                        max: 100
-                                    },
-                                    {
-                                        name: '项目成熟度',
-                                        max: 100
-                                    },
-                                    {
-                                        name: '开发活跃度',
-                                        max: 100
-                                    },
-                                    {
-                                        name: '项目健康度',
-                                        max: 100
-                                    },
-                                    {
-                                        name: '团队健康度',
-                                        max: 100
-                                    },
-                                    {
-                                        name: '项目发展趋势',
-                                        max: 100
-                                    }
-                                ],
+                }
+                this.radarOpenI.setOption(option)         
+
+            },
+            drawOpenItrend(){
+                var xdata_openI=[]
+                var ydata_openI=[]
+                for(var i =0;i<this.tableDataIDOpenI.length;i++){
+                    xdata_openI.push(this.tableDataIDOpenI[i].date);
+                    ydata_openI.push(this.roundingF(this.tableDataIDOpenI[i].openi))
+                }
+                console.log("ydata_openI:"+ydata_openI)
+                console.log(xdata_openI)
+                var option = {
+                        title : {
+                            text: 'OpenI指数趋势',
+
+
+                            textStyle: {
+                                    fontSize: 12,
+                                },
+                            left:'center',
+                            top:'bottom',
+
+                            subtext: '',
+
+                        },
+                        tooltip : {
+                            trigger: 'axis',
+                            backgroundColor:'rgba(255,255,255,0.8)',
+                            color:'black',
+                            borderWidth:'1',
+                            borderColor:'#DCE7FB',
+                            textStyle:{
+                                color:'black'
                             },
-                            series: [{
-                                type: 'radar',
+                        },
+                        legend: {
+                            orient: 'vertical',
+                            top:'top',　　
+                        },
+                        // calculable : true,
+                        xAxis : [
+                            {
+                                type : 'category',
+                                boundaryGap: false,
+                                data : xdata_openI,
+                                
+                            }
+                        ],
+                        yAxis : [
+                            {
+                                type : 'value',
+
+                            }
+                        ],
+
+                        series : [
+                            {
+                                data: ydata_openI,
+                                type: 'line',
+                                areaStyle: {
+                                    type:'linear',
+                                    color:'#DCE7FB',
+                                    opacity: 0.3,
+                                    origin:"start",
+                                    normal:{
+                                        color:'#DCE7FB'
+                                    }
+                                },
                                 lineStyle:{
-                                    width:2,
-                                    color: '#0366D6',
+                                    width:1,
                                     normal:{
-                                        color:'#0366D6 '
+                                        color:'#0366D6'
                                     }
                                 },
                                 itemStyle : {
                                     normal : {
                                         color:'#0366D6'
                                     }
-                                }, 
-                                data: [{
-                                    value: ydata,
-                                    name:"数据"
-                                }]
-                            }]
-    
-                    }
-                    this.radarOpenI.setOption(option)         
-    
-                },
-                drawOpenItrend(){
-                    var xdata_openI=[]
-                    var ydata_openI=[]
-                    for(var i =0;i<this.tableDataIDOpenI.length;i++){
-                        xdata_openI.push(this.tableDataIDOpenI[i].date);
-                        ydata_openI.push(this.roundingF(this.tableDataIDOpenI[i].openi))
-                    }
-                    console.log("ydata_openI:"+ydata_openI)
-                    console.log(xdata_openI)
-                    var option = {
-                            title : {
-                                text: 'OpenI指数趋势',
-
-
-                                textStyle: {
-                                        fontSize: 12,
-                                    },
-                                left:'center',
-                                top:'bottom',
-
-                                subtext: '',
-
-                            },
-                            tooltip : {
-                                trigger: 'axis',
-                                backgroundColor:'rgba(255,255,255,0.8)',
-                                color:'black',
-                                borderWidth:'1',
-                                borderColor:'#DCE7FB',
-                                textStyle:{
-                                    color:'black'
-                                },
-                            },
-                            legend: {
-                                orient: 'vertical',
-                                top:'top',　　
-                            },
-                            // calculable : true,
-                            xAxis : [
-                                {
-                                    type : 'category',
-                                    boundaryGap: false,
-                                    data : xdata_openI,
-                                    
-                                }
-                            ],
-                            yAxis : [
-                                {
-                                    type : 'value',
-    
-                                }
-                            ],
-
-                            series : [
-                                {
-                                    data: ydata_openI,
-                                    type: 'line',
-                                    areaStyle: {
-                                        type:'linear',
-                                        color:'#DCE7FB',
-                                        opacity: 0.3,
-                                        origin:"start",
-                                        normal:{
-                                            color:'#DCE7FB'
-                                        }
-                                    },
-                                    lineStyle:{
-                                        width:1,
-                                        normal:{
-                                            color:'#0366D6'
-                                        }
-                                    },
-                                    itemStyle : {
-                                        normal : {
-                                            color:'#0366D6'
-                                        }
-                                    },      
-                                }
-                            ]
-                    }; 
-                    this.echartsOITd.setOption(option)
-                    // setTimeout(function (){
-                    //     window.onresize = function () {
-                    //         this.echartsOITd.resize();
-                    //     }
-                    // },200)
-                    
-                },
-                drawSelectData(){
-                    
-                    // $("#selectData").removeAttr("selectData").empty();
-                    var xdata=[]
-                    var ydata_view=[]
-                    var ydata_download=[]
-                    var ydata_commit=[]
-                    // if ()
-                    for(var i =0;i<this.tableDataID.length;i++){
-                        xdata.push(this.tableDataID[this.tableDataID.length-1-i].date);
-                        ydata_view.push(this.tableDataID[this.tableDataID.length-1-i].view)
-                        ydata_download.push(this.tableDataID[this.tableDataID.length-1-i].download)
-                        ydata_commit.push(this.tableDataID[this.tableDataID.length-1-i].commit)
-                    }
-                    console.log("ydata_openI:"+ydata_download)
-                    console.log(xdata)
-                     this.option = {
-                            title : {
-                                text: '',
+                                },      
+                            }
+                        ]
+                }; 
+                this.echartsOITd.setOption(option)
+                // setTimeout(function (){
+                //     window.onresize = function () {
+                //         this.echartsOITd.resize();
+                //     }
+                // },200)
+                
+            },
+            drawSelectData(){
+                
+                // $("#selectData").removeAttr("selectData").empty();
+                var xdata=[]
+                var ydata_view=[]
+                var ydata_download=[]
+                var ydata_commit=[]
+                // if ()
+                for(var i =0;i<this.tableDataID.length;i++){
+                    xdata.push(this.tableDataID[this.tableDataID.length-1-i].date);
+                    ydata_view.push(this.tableDataID[this.tableDataID.length-1-i].view)
+                    ydata_download.push(this.tableDataID[this.tableDataID.length-1-i].download)
+                    ydata_commit.push(this.tableDataID[this.tableDataID.length-1-i].commit)
+                }
+                console.log("ydata_openI:"+ydata_download)
+                console.log(xdata)
+                    this.option = {
+                        title : {
+                            text: '',
 
 
-                                textStyle: {
-                                        fontSize: 12,
-                                    },
-                                left:'center',
-                                top:'bottom',
+                            textStyle: {
+                                    fontSize: 12,
+                                },
+                            left:'center',
+                            top:'bottom',
 
-                                subtext: '',
+                            subtext: '',
 
+                        },
+                        tooltip : {
+                            trigger: 'axis',
+                            backgroundColor:'rgba(255,255,255,0.8)',
+                            color:'black',
+                            borderWidth:'1',
+                            borderColor:'gray',
+                            textStyle:{
+                                color:'black'
                             },
-                            tooltip : {
-                                trigger: 'axis',
-                                backgroundColor:'rgba(255,255,255,0.8)',
-                                color:'black',
-                                borderWidth:'1',
-                                borderColor:'gray',
-                                textStyle:{
-                                    color:'black'
-                                },
-                          
+                        
+                        },
+                        legend: {
+                            data:['浏览量','下载量','commit'],
+                            // orient: 'vertical',
+                            // top:'top',　　
+                        },
+                        toolbox: {
+                            show : false,
+                            feature : {
+                                mark : {show: true},
+                                dataView : {show: false, readOnly: false},
+                                magicType : {show: true, type: ['line', 'bar']},
+                                restore : {show: false},
+                                saveAsImage : {show: true}
+                            }
+                        },
+                        calculable : true,
+                        xAxis : [
+                            {
+                                type : 'category',
+                                data : xdata,
+                                
+                            }
+                        ],
+                        yAxis : [
+                            {
+                                type : 'value',   
+                            }
+                        ],
+                        series : [
+                            {   name:"浏览量",
+                                data: ydata_view,
+                                type: 'line',
+                                areaStyle: {},
                             },
-                            legend: {
-                                data:['浏览量','下载量','commit'],
-                                // orient: 'vertical',
-                                // top:'top',　　
+                            {
+                                name:"下载量",
+                                data: ydata_download,
+                                type: 'line',
+                                areaStyle: {},
                             },
-                            toolbox: {
-                                show : false,
-                                feature : {
-                                    mark : {show: true},
-                                    dataView : {show: false, readOnly: false},
-                                    magicType : {show: true, type: ['line', 'bar']},
-                                    restore : {show: false},
-                                    saveAsImage : {show: true}
-                                }
+                            {
+                                name:"commit",
+                                data: ydata_commit,
+                                type: 'line',
+                                areaStyle: {},
                             },
-                            calculable : true,
-                            xAxis : [
-                                {
-                                    type : 'category',
-                                    data : xdata,
-                                    
-                                }
-                            ],
-                            yAxis : [
-                                {
-                                    type : 'value',   
-                                }
-                            ],
-                            series : [
-                                {   name:"浏览量",
-                                    data: ydata_view,
-                                    type: 'line',
-                                    areaStyle: {},
-                                },
-                                {
-                                    name:"下载量",
-                                    data: ydata_download,
-                                    type: 'line',
-                                    areaStyle: {},
-                                },
-                                {
-                                    name:"commit",
-                                    data: ydata_commit,
-                                    type: 'line',
-                                    areaStyle: {},
-                                },
-
-                            ]
-                    }; 
-                    // this.echartsSelectData.resize()
-                    this.echartsSelectData.setOption(this.option)
-                    // setTimeout(function (){
-                    //     window.onresize = function () {
-                    //         this.echartsSelectData.resize;
-                    //     }
-                    // },200)
-
-                    // // 使用刚指定的选择项数据显示图表。
-                    // var selectArr = this.echartsSelectData.getOption().legend[0].data;//legend所有值
-                    // var checkboxs=document.getElementsByName('checkboxchart'); 
-                    // $(".checkboxchart").click(function(){
-                    //     var obj = {};
-                    //     for(var i=0; i<checkboxs.length; i++){
-                    //         if(checkboxs[i].checked){
-                    //             obj[selectArr[i]] = true;
-                    //         }else{
-                    //             obj[selectArr[i]] = false;
-                    //         }
-                    //     } 
-                    //     option.legend.selected = obj;
-                    //     this.echartsSelectData.setOption(option);
-                    // });
-                    
 
+                        ]
+                }; 
+                // this.echartsSelectData.resize()
+                this.echartsSelectData.setOption(this.option)
+                // setTimeout(function (){
+                //     window.onresize = function () {
+                //         this.echartsSelectData.resize;
+                //     }
+                // },200)
 
-                },
-                roundingF(value){
-                    return Number(value).toFixed(2)
-                },
-                clickCheckBox(){
-                    // 使用刚指定的选择项数据显示图表。
-                    var selectArr = this.echartsSelectData.getOption().legend[0].data;//legend所有值
-                    var checkboxs=document.getElementsByName('checkboxchart'); 
-                    // $(".checkboxchart").click(function(){
-                        var obj = {};
-                        for(var i=0; i<checkboxs.length; i++){
-                            if(checkboxs[i].checked){
-                                obj[selectArr[i]] = true;
-                            }else{
-                                obj[selectArr[i]] = false;
-                            }
-                        } 
-                        this.option.legend.selected = obj;
-                        this.echartsSelectData.setOption(this.option);
-                    // });
+                // // 使用刚指定的选择项数据显示图表。
+                // var selectArr = this.echartsSelectData.getOption().legend[0].data;//legend所有值
+                // var checkboxs=document.getElementsByName('checkboxchart'); 
+                // $(".checkboxchart").click(function(){
+                //     var obj = {};
+                //     for(var i=0; i<checkboxs.length; i++){
+                //         if(checkboxs[i].checked){
+                //             obj[selectArr[i]] = true;
+                //         }else{
+                //             obj[selectArr[i]] = false;
+                //         }
+                //     } 
+                //     option.legend.selected = obj;
+                //     this.echartsSelectData.setOption(option);
+                // });
+                
 
-                },
-                comparedate(date1,date2){
-                    console.log("date1:"+date1)
-                    console.log("date1:"+date2)
-                    var oDate1 = new Date(date1);
-                    var oDate2 = new Date(date2);
-                    if(oDate1.getTime() < oDate2.getTime()){
-                        var data = date2.split('-')
-                        return data[0]+''+data[1]+''+data[2]
-                    } else {
-                        var data = date1.split('-')
-                        return data[0]+''+data[1]+''+data[2]
-                    }
-                },
-                goBack(){
-                    if( $("#pro_detail").is(':visible') ){
-                        document.getElementById("pro_main").style.display = "block";
-                        document.getElementById("pro_detail").style.display = "none";
-                    }
-                },
 
             },
-            filters:{
+            roundingF(value){
+                return Number(value).toFixed(2)
+            },
+            clickCheckBox(){
+                // 使用刚指定的选择项数据显示图表。
+                var selectArr = this.echartsSelectData.getOption().legend[0].data;//legend所有值
+                var checkboxs=document.getElementsByName('checkboxchart'); 
+                // $(".checkboxchart").click(function(){
+                    var obj = {};
+                    for(var i=0; i<checkboxs.length; i++){
+                        if(checkboxs[i].checked){
+                            obj[selectArr[i]] = true;
+                        }else{
+                            obj[selectArr[i]] = false;
+                        }
+                    } 
+                    this.option.legend.selected = obj;
+                    this.echartsSelectData.setOption(this.option);
+                // });
 
-                rounding (value) {
-                    return Number(value).toFixed(2)
-                },
-                changeType(value){
-                    if(value==false){
-                        return "否"
-                    }else{
-                        return "是"
-                    }
-                },
-                discriptionFun(value){
-                    if(value==''){
-                        return "暂无描述"
-                    }
-                },
-                showMode(value){
-                    if(value==1){
-                        return "可读权限"
-                    }else if(value==2){
-                        return "可写权限"
-                    }else if(value==3){
-                        return "管理员"
-                    }else if(value==4){
-                        return "所有者"
-                    }else{
-                         return "未定义"
-                    }
-                },
-                showContext(value){
-                    if (value.mode!=-1){
-                       return  " <img class=\"ui avatar image\" src= \" "+ value.RelAvatarLink+ " \" > "+" <a href= \" " + AppSubUrl+"/"+value.user+ "\">"+value.user+" </a>"
-                    }
-                    else{
-                        return " <a href=\" mailto:" + value.email + "class=\"circular ui button\">"  +value.user+ "</a>"
-                    }			
-                    
-                },
-                transformTimestamp(timestamp){
-                    let a = new Date(timestamp*1000);
-                    const date = new Date(a);
-                    const Y = date.getFullYear() + '/';
-                    const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '/';
-                    const D = (date.getDate() < 10 ? '0'+date.getDate() : date.getDate()) + '  ';
-                    const h = (date.getHours() < 10 ? '0'+date.getHours() : date.getHours()) + ':';
-                    const m = (date.getMinutes() <10 ? '0'+date.getMinutes() : date.getMinutes());
-                    const dateString = Y + M + D + h + m ;//+ s;
-                    return dateString;
-                },              
             },
-    
-    
-            mounted() {   
-
-                this.getAllProList("all",7)
-                console.log("id:"+this.pro_id);
-
-                document.getElementById('radar_openi').style.width = document.getElementById('pro_main').offsetWidth*0.22+'px'
-                document.getElementById('line_openi').style.width  = document.getElementById('pro_main').offsetWidth*0.33+'px'
-                document.getElementById('selectData').style.width  = document.getElementById('pro_main').offsetWidth*0.8+'px' 
-                this.radarOpenI = this.$echarts.init(document.getElementById('radar_openi'))
-                this.echartsOITd = this.$echarts.init(document.getElementById('line_openi'))
-                this.echartsSelectData = this.$echarts.init(document.getElementById('selectData'))
-                if (window.history && window.history.pushState) {
-                    history.pushState(null, null, document.URL);
-                    window.addEventListener('popstate', this.goBack, false);
+            comparedate(date1,date2){
+                console.log("date1:"+date1)
+                console.log("date1:"+date2)
+                var oDate1 = new Date(date1);
+                var oDate2 = new Date(date2);
+                if(oDate1.getTime() < oDate2.getTime()){
+                    var data = date2.split('-')
+                    return data[0]+''+data[1]+''+data[2]
+                } else {
+                    var data = date1.split('-')
+                    return data[0]+''+data[1]+''+data[2]
                 }
-                // window.onresize=function(){
-                //     this.radarOpenI.resize();
-                //     this.echartsOITd.resize();
-                //     this.echartsSelectData.resize();
-                // }
-                // console.log("this.radarOpenI:"+this.radarOpenI)
             },
-
-            watch:{
-                search(val){
-                    if(!val){
-                        this.params.q = this.search
-                        this.params.page = 1
-                        this.page=1
-                        this.getAllProList(this.params.type, this.dynamic)
-                    } 
+            goBack(){
+                if( $("#pro_detail").is(':visible') ){
+                    document.getElementById("pro_main").style.display = "block";
+                    document.getElementById("pro_detail").style.display = "none";
                 }
-
             },
 
-            created() {
-                // this.download_a=document.getElementById("download_file")
+        },
+        filters:{
+
+            rounding (value) {
+                return Number(value).toFixed(2)
+            },
+            changeType(value){
+                if(value==false){
+                    return "否"
+                }else{
+                    return "是"
+                }
+            },
+            discriptionFun(value){
+                if(value==''){
+                    return "暂无描述"
+                }
+            },
+            showMode(value){
+                if(value==1){
+                    return "可读权限"
+                }else if(value==2){
+                    return "可写权限"
+                }else if(value==3){
+                    return "管理员"
+                }else if(value==4){
+                    return "所有者"
+                }else{
+                        return "未定义"
+                }
             },
-            updated(){
-                if(document.querySelectorAll('img[avatar]').length!==0){
-                    window.LetterAvatar.transform()
+            showContext(value){
+                if (value.mode!=-1){
+                    return  " <img class=\"ui avatar image\" src= \" "+ value.RelAvatarLink+ " \" > "+" <a href= \" " + AppSubUrl+"/"+value.user+ "\">"+value.user+" </a>"
                 }
+                else{
+                    return " <a href=\" mailto:" + value.email + "class=\"circular ui button\">"  +value.user+ "</a>"
+                }			
+                
+            },
+            transformTimestamp(timestamp){
+                let a = new Date(timestamp*1000);
+                const date = new Date(a);
+                const Y = date.getFullYear() + '/';
+                const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '/';
+                const D = (date.getDate() < 10 ? '0'+date.getDate() : date.getDate()) + '  ';
+                const h = (date.getHours() < 10 ? '0'+date.getHours() : date.getHours()) + ':';
+                const m = (date.getMinutes() <10 ? '0'+date.getMinutes() : date.getMinutes());
+                const dateString = Y + M + D + h + m ;//+ s;
+                return dateString;
+            },              
+        },
+
+
+        mounted() {   
+
+            this.getAllProList("all",7)
+            console.log("id:"+this.pro_id);
+
+            document.getElementById('radar_openi').style.width = document.getElementById('pro_main').offsetWidth*0.22+'px'
+            document.getElementById('line_openi').style.width  = document.getElementById('pro_main').offsetWidth*0.33+'px'
+            document.getElementById('selectData').style.width  = document.getElementById('pro_main').offsetWidth*0.8+'px' 
+            this.radarOpenI = this.$echarts.init(document.getElementById('radar_openi'))
+            this.echartsOITd = this.$echarts.init(document.getElementById('line_openi'))
+            this.echartsSelectData = this.$echarts.init(document.getElementById('selectData'))
+            if (window.history && window.history.pushState) {
+                history.pushState(null, null, document.URL);
+                window.addEventListener('popstate', this.goBack, false);
+            }
+            // window.onresize=function(){
+            //     this.radarOpenI.resize();
+            //     this.echartsOITd.resize();
+            //     this.echartsSelectData.resize();
+            // }
+            // console.log("this.radarOpenI:"+this.radarOpenI)
+        },
+
+        watch:{
+            search(val){
+                if(!val){
+                    this.params.q = this.search
+                    this.params.page = 1
+                    this.page=1
+                    this.getAllProList(this.params.type, this.dynamic)
+                } 
+            }
+
+        },
+
+        created() {
+            // this.download_a=document.getElementById("download_file")
+        },
+        updated(){
+            if(document.querySelectorAll('img[avatar]').length!==0){
+                window.LetterAvatar.transform()
             }
         }
-    </script>
-    
-    <style scoped>
-        .pro_item{
-            font-size: 16px;
-            color:  rgba(16, 16, 16, 100);
-            font-family: SourceHanSansSC-bold;
-        }
-        .sta_item{
-            font-size: 14px;
-            color: rgb(0 0 0);
-            font-family: SourceHanSansSC-bold;
-        }
-        .update_time{
-            line-height: 17px;
-            font-size: 12px;
-            color:rgba(187, 187, 187, 100);
-            margin-left: 10px;
-        }
-        .btnFirst{ 
-            line-height: 1.5;
-            margin: -3.5px;
-            border:  1px solid rgba(22, 132, 252, 100);
-            border-right: none;
-            background: #FFFF;
-            color: #1684FC;
-            width: 60px;
-            height: 30px;
-            border-radius:4px 0px 0px 4px;
-        }
-        .btn{ 
-            line-height: 1.5;
-            margin: -3.5px;
-            border:  1px solid rgba(22, 132, 252, 100);
-            border-right: none;
-            background: #FFFF;
-            color: #1684FC;
-            width: 60px;
-            height: 30px;
-        }
-        .btnLast{ 
-            line-height: 1.5;
-            margin: -3.5px;
-            border: 1px solid rgba(22, 132, 252, 100);
-            /* border-right: none; */
-            background: #FFFF;
-            color: #1684FC;
-            width: 60px;
-            height: 30px;
-            border-radius:0px 4px 4px 0px;
-        }
-        .btnFirst, .btn, .btnLast {
-            cursor: pointer;
-        }
-  
+    }
+</script>
+
+<style scoped>
+    .pro_item{
+        font-size: 16px;
+        color:  rgba(16, 16, 16, 100);
+        font-family: SourceHanSansSC-bold;
+    }
+    .sta_item{
+        font-size: 14px;
+        color: rgb(0 0 0);
+        font-family: SourceHanSansSC-bold;
+    }
+    .update_time{
+        line-height: 17px;
+        font-size: 12px;
+        color:rgba(187, 187, 187, 100);
+        margin-left: 10px;
+    }
+    .btnFirst{ 
+        line-height: 1.5;
+        margin: -3.5px;
+        border:  1px solid rgba(22, 132, 252, 100);
+        border-right: none;
+        background: #FFFF;
+        color: #1684FC;
+        width: 60px;
+        height: 30px;
+        border-radius:4px 0px 0px 4px;
+    }
+    .btn{ 
+        line-height: 1.5;
+        margin: -3.5px;
+        border:  1px solid rgba(22, 132, 252, 100);
+        border-right: none;
+        background: #FFFF;
+        color: #1684FC;
+        width: 60px;
+        height: 30px;
+    }
+    .btnLast{ 
+        line-height: 1.5;
+        margin: -3.5px;
+        border: 1px solid rgba(22, 132, 252, 100);
+        /* border-right: none; */
+        background: #FFFF;
+        color: #1684FC;
+        width: 60px;
+        height: 30px;
+        border-radius:0px 4px 4px 0px;
+    }
+    .btnFirst, .btn, .btnLast {
+        cursor: pointer;
+    }
+
 
 /*     
-        .btn:focus,
-        .btn:active{
-            background-color:#409effd6 ;
-        } */
-        /* /deep/ .el-date-picker {
-            width: 250px;
-        } */
-        /deep/ .el-table tbody tr:hover>td { 
-            background-color:#D3D3D3!important;
-            opacity:1
-        }
-        /deep/ .el-table {
-            font-size: 12px;
-        }
-     
-        /deep/ .el-range-separator{
-            width: 20% !important;
-        }
+    .btn:focus,
+    .btn:active{
+        background-color:#409effd6 ;
+    } */
+    /* /deep/ .el-date-picker {
+        width: 250px;
+    } */
+    /deep/ .el-table tbody tr:hover>td { 
+        background-color:#D3D3D3!important;
+        opacity:1
+    }
+    /deep/ .el-table {
+        font-size: 12px;
+    }
+    
+    /deep/ .el-range-separator{
+        width: 20% !important;
+    }
+    /deep/ .el-pagination {
+        padding-bottom: 30px;
+    }
 
-        .colorChange {
-            background-color: #1684FC;
-            color: #FFFF;
-            cursor: default;
-        }
-        .items{
-            text-align: center;
-            border-right:1px solid rgba(219, 219, 219, 100);
-        }  
-        .item_l{
-            margin-right: 5px;
-            border:1px solid rgba(219, 219, 219, 100);
-            height: 370px;
-            width: 100%;
-        }
-        .item_r{
-            margin-right:5px;
-            border:1px solid rgba(219, 219, 219, 100);
-            height: 370px;
-            overflow:auto
-        }
-        .item_echart{
-            margin-top: 10px;
-            margin-right: 5px;
-            border:1px solid rgba(219, 219, 219, 100);
-            height: 350px;
-            width: 100%;
-        }
-        .item_content{
-            color:#0366D6;
-            margin-top: 10px;
-            font-weight:bold;
-        }
-    </style>
+    .colorChange {
+        background-color: #1684FC;
+        color: #FFFF;
+        cursor: default;
+    }
+    .items{
+        text-align: center;
+        border-right:1px solid rgba(219, 219, 219, 100);
+    }  
+    .item_l{
+        margin-right: 5px;
+        border:1px solid rgba(219, 219, 219, 100);
+        height: 370px;
+        width: 100%;
+    }
+    .item_r{
+        margin-right:5px;
+        border:1px solid rgba(219, 219, 219, 100);
+        height: 370px;
+        overflow:auto
+    }
+    .item_echart{
+        margin-top: 10px;
+        margin-right: 5px;
+        border:1px solid rgba(219, 219, 219, 100);
+        height: 350px;
+        width: 100%;
+    }
+    .item_content{
+        color:#0366D6;
+        margin-top: 10px;
+        font-weight:bold;
+    }
+</style>
diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue
index 682dbc78c..2b579fd16 100755
--- a/web_src/js/components/UserAnalysis.vue
+++ b/web_src/js/components/UserAnalysis.vue
@@ -159,6 +159,19 @@
 </template>
 
 <script>
+    import Vue from 'vue';   
+    import enLocale from 'element-ui/lib/locale/lang/en'
+    import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+    import locale from 'element-ui/lib/locale'
+
+    var text_langName = document.getElementById("langName").innerText
+    if (text_langName == '简体中文'){
+        locale.use(zhLocale)
+    }
+    else if (text_langName == 'English'){
+        locale.use(enLocale)
+    }
+
     import { export2Excel } from '../excel/util.js'
     export default{
         name:'UserAnalysis',
@@ -468,7 +481,9 @@
     /deep/ .el-range-separator{
             width: 20% !important;
     }
-
+    /deep/ .el-pagination {
+        padding-bottom: 30px;
+    }
     .colorChange {
         background-color: #1684FC;
         color: #FFFF;