From 994464b128acdb847b64677e26ab488aa2e3697a Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Fri, 13 May 2022 16:33:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B7=E6=96=B0=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=AB=98=E4=BA=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/js/components/DataAnalysis.vue | 25 ++++++++++++-------------
 web_src/js/components/ProAnalysis.vue  |  2 +-
 web_src/js/components/ProTrend.vue     |  6 +++---
 web_src/js/components/UserTrend.vue    |  4 ++--
 web_src/js/router/index.js             |  2 +-
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/web_src/js/components/DataAnalysis.vue b/web_src/js/components/DataAnalysis.vue
index c42133563..4386b15b2 100755
--- a/web_src/js/components/DataAnalysis.vue
+++ b/web_src/js/components/DataAnalysis.vue
@@ -2,30 +2,30 @@
     <el-row style="height:100%;width: 100%; flex:1" >
         <el-col :span="3" style="height:100%;padding-right:15px;">
         <el-menu
-            default-active="this.$route.path"
+            :default-active="this.$router.path"
             class="el-menu-vertical-demo"
             :router="true" style="height:100%; background-color: #F5F5F6;" >
-            <el-menu-item index="Overview" >
+            <el-menu-item index="/Overview" >
                 <i class="ri-home-4-line"></i>
                 <span slot="title">概览</span>
             </el-menu-item>
-            <el-submenu index="1">
+            <el-submenu index="/">
                 <template slot="title">
                 <i class="ri-numbers-line"></i>
                 <span>项目分析</span>
                 </template>
-                <el-menu-item index="ProTrend">增长趋势分析</el-menu-item> 
-                <el-menu-item index="ProAnalysis">详细数据</el-menu-item>
+                <el-menu-item index="/ProTrend">增长趋势分析</el-menu-item> 
+                <el-menu-item index="/ProAnalysis">详细数据</el-menu-item>
             </el-submenu>
             <el-submenu index="2">
                 <template slot="title">
                 <i class="ri-contacts-line"></i>
                 <span>用户分析</span>
                 </template>
-                <el-menu-item index="UserTrend">增长趋势分析</el-menu-item> 
-                <el-menu-item index="UserAnalysis">活动分析</el-menu-item>
+                <el-menu-item index="/UserTrend">增长趋势分析</el-menu-item> 
+                <el-menu-item index="/UserAnalysis">活动分析</el-menu-item>
             </el-submenu>
-            <el-menu-item index="BrainAnalysis">
+            <el-menu-item index="/BrainAnalysis">
                 <i class="ri-server-fill"></i>
                 <span slot="title">云脑分析(建设中..)</span>
             </el-menu-item>
@@ -45,11 +45,10 @@
         },
         created(){ 
             var url_params =  document.getElementById("url_params").value;
-            // console.log('url_params:',url_params);
-            // console.log('this.$router.path:',this.$router.path);
-            if (url_params!='' && url_params!=undefined){
-                this.$router.push(url_params)
-                // console.log('this.$router.pathbefore:',this.$router.path);
+            if (url_params!='' && url_params!=undefined && url_params!='/'){
+                this.$router.path = '/'+url_params.split('/')[0]
+            }else{
+                this.$router.path = '/ProAnalysis'
             }
         },
     }
diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue
index 5fbd5b9b2..0a5212b41 100755
--- a/web_src/js/components/ProAnalysis.vue
+++ b/web_src/js/components/ProAnalysis.vue
@@ -1091,7 +1091,7 @@
                     // this.echartsSelectData.resize()
                     var checkboxs=document.getElementsByName('checkboxchart'); 
                     for(var i=0; i<checkboxs.length; i++){
-                        console.log("selectArr[i]:",this.option.legend.data[i])
+                        // console.log("selectArr[i]:",this.option.legend.data[i])
                         if(checkboxs[i].checked){
                             this.option.legend.selected[this.option.legend.data[i]]=true;
                         }else{
diff --git a/web_src/js/components/ProTrend.vue b/web_src/js/components/ProTrend.vue
index 7974ec46c..9cb10dcbe 100644
--- a/web_src/js/components/ProTrend.vue
+++ b/web_src/js/components/ProTrend.vue
@@ -500,8 +500,8 @@
                     ydata_add_mirror.push(this.tableData[this.tableData.length-1-i].numRepoMirrorAdd)
                     ydata_cumulative_pro.push(this.tableData[this.tableData.length-1-i].numRepos)
                 }
-                console.log("ydata_openI:"+ydata_add_pro)
-                console.log(xdata)
+                // console.log("ydata_openI:"+ydata_add_pro)
+                // console.log(xdata)
                  this.option = {
                         title : {
                             text: '',
@@ -680,7 +680,7 @@
                 // this.echartsSelectData.resize()
                 var checkboxs=document.getElementsByName('checkboxchart'); 
                 for(var i=0; i<checkboxs.length; i++){
-                    console.log("selectArr[i]:",this.option.legend.data[i])
+                    // console.log("selectArr[i]:",this.option.legend.data[i])
                     if(checkboxs[i].checked){
                         this.option.legend.selected[this.option.legend.data[i]]=true;
                     }else{
diff --git a/web_src/js/components/UserTrend.vue b/web_src/js/components/UserTrend.vue
index 55bf6a55a..276c9ae22 100644
--- a/web_src/js/components/UserTrend.vue
+++ b/web_src/js/components/UserTrend.vue
@@ -699,7 +699,7 @@
                
                // $(".checkboxchart").click(function(){
                 for(var i=0; i<checkboxs.length; i++){
-                    console.log("selectArr[i]:",this.option.legend.data[i])
+                    // console.log("selectArr[i]:",this.option.legend.data[i])
                     if(checkboxs[i].checked){
                         this.option.legend.selected[this.option.legend.data[i]]=true;
                     }else{
@@ -747,7 +747,7 @@
                             obj[selectArr[i]] = false;
                         }
                     } 
-                    console.log("obj:",obj)
+                    // console.log("obj:",obj)
                     this.option.legend.selected = obj;
                     this.echartsSelectData.setOption(this.option);
                 // });
diff --git a/web_src/js/router/index.js b/web_src/js/router/index.js
index 70b7f00d3..5714761cc 100644
--- a/web_src/js/router/index.js
+++ b/web_src/js/router/index.js
@@ -21,7 +21,7 @@ export default new Router({
     scrollBehavior: () => ({ y: 0 }),
     routes:[
         {
-            path:'/',
+            path:'/',redirect:'/ProAnalysis',
             name:'ProAnalysis',
             component:ProAnalysis,
         },