Merge pull request '颜色对齐方式修改，并增加内测字样' (#963) from wangjr_new into V20211115

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/963
Reviewed-by: zhoupzh <zhoupzh@pcl.ac.cn>

options/locale/locale_zh-CN.ini

@@ -229,7 +229,7 @@ organizations=组织
 images = 云脑镜像
 search=搜索
 code=代码
-data_analysis=数字看板
+data_analysis=数字看板(内测)
 repo_no_results=未找到匹配的项目。
 dataset_no_results = 未找到匹配的数据集。
 user_no_results=未找到匹配的用户。

web_src/js/components/ProAnalysis.vue

@@ -53,7 +53,7 @@
                     :cell-style='cellStyle'>
                     <el-table-column
                         label="ID"
-                        align="center"
+                        align="left"
                         prop="repo_id"
                         stripe
                         >
@@ -61,9 +61,9 @@
                     <el-table-column
                         label="项目名称"
                         width="125px"
-                        align="center"
+                        align="left"
                         prop="name"
-                        style="color:#0366D6 100%;"
+                        style="color:#0366D6;font-family: Roboto"
                         >
                         <template slot-scope="scope">
                             <a @click=goToDetailPage(scope.row.repo_id,scope.row.name,scope.row.ownerName)>{{scope.row.name}} </a>
@@ -197,7 +197,7 @@
                 <el-row :gutter="20">
                     <el-col :span=18 >                    
                         <div class="item_l"  id="charts">
-                            <div style="font-size:14px;color:#409eff;margin:20px 5px;">OpenI指数：{{tableDataIDTotal.openi | rounding}}</div>
+                            <div style="font-size:14px;color:#0366D6;margin:20px 5px;">OpenI指数：{{tableDataIDTotal.openi | rounding}}</div>
                             <div >
                                 <el-col :span='8' id="radar_openi" :style="{ height: '300px'}"></el-col>
     
@@ -208,7 +208,7 @@
                     <el-col :span=6 >
                         <div class="item_r">
                             <div style="margin:0 5px;">
-                                <div style="font-size:14px;color:rgb(0,0,0);margin:10px 0px">贡献者TOP10</div>
+                                <div style="font-size:14px;color:rgb(0,0,0);margin:10px 5px">贡献者TOP10</div>
                                 <div>
                                     <el-table
                                         :data="tableDataContTop10"
@@ -237,6 +237,7 @@
                                         <el-table-column
                                             prop="pr"
                                             label="PR"
+                                            width="50px"
                                             align="center">
                                         </el-table-column>
                                         <el-table-column
@@ -825,14 +826,14 @@
                                 type: 'radar',
                                 lineStyle:{
                                     width:2,
-                                    color: '#409effd6',
+                                    color: '#0366D6',
                                     normal:{
-                                        color:'#409effd6 '
+                                        color:'#0366D6 '
                                     }
                                 },
                                 itemStyle : {
                                     normal : {
-                                        color:'#409effd6'
+                                        color:'#0366D6'
                                     }
                                 }, 
                                 data: [{
@@ -914,12 +915,12 @@
                                     lineStyle:{
                                         width:1,
                                         normal:{
-                                            color:'#409effd6'
+                                            color:'#0366D6'
                                         }
                                     },
                                     itemStyle : {
                                         normal : {
-                                            color:'#409effd6'
+                                            color:'#0366D6'
                                         }
                                     },      
                                 }
@@ -1023,6 +1024,7 @@
 
                             ]
                     }; 
+                    // this.echartsSelectData.resize()
                     this.echartsSelectData.setOption(this.option)
                     // setTimeout(function (){
                     //     window.onresize = function () {
@@ -1189,10 +1191,10 @@
         .btnFirst{ 
             line-height: 1.5;
             margin: -3.5px;
-            border: 1px solid #409eff;
+            border:  1px solid rgba(22, 132, 252, 100);
             border-right: none;
             background: #FFFF;
-            color: #409eff;
+            color: #1684FC;
             width: 60px;
             height: 30px;
             border-radius:4px 0px 0px 4px;
@@ -1200,20 +1202,20 @@
         .btn{ 
             line-height: 1.5;
             margin: -3.5px;
-            border: 1px  solid #409eff;
+            border:  1px solid rgba(22, 132, 252, 100);
             border-right: none;
             background: #FFFF;
-            color: #409eff;
+            color: #1684FC;
             width: 60px;
             height: 30px;
         }
         .btnLast{ 
             line-height: 1.5;
             margin: -3.5px;
-            border: 1px solid #409eff;
+            border: 1px solid rgba(22, 132, 252, 100);
             /* border-right: none; */
             background: #FFFF;
-            color: #409eff;
+            color: #1684FC;
             width: 60px;
             height: 30px;
             border-radius:0px 4px 4px 0px;
@@ -1244,7 +1246,7 @@
         }
 
         .colorChange {
-            background-color: #409effd6;
+            background-color: #1684FC;
             color: #FFFF;
             cursor: default;
         }
@@ -1272,7 +1274,7 @@
             width: 100%;
         }
         .item_content{
-            color: #409eff;
+            color:#0366D6;
             margin-top: 10px;
             font-weight:bold;
         }

web_src/js/components/UserAnalysis.vue

@@ -49,15 +49,18 @@
                 <el-table-column
                     label="ID"
                     prop="ID"
-                    align="center"
+                    align="left"
                     stripe
                     >
                 </el-table-column>
                 <el-table-column
                     label="用户名"
-                    align="center"
+                    align="left"
                     prop="Name"
                     width="100px">
+                    <template slot-scope="scope">
+                        <a :href="AppSubUrl +'../../../'+ scope.row.Name">{{scope.row.Name}} </a>    
+                    </template>  
                 </el-table-column>
                 <el-table-column
                     prop="CodeMergeCount"
@@ -475,10 +478,10 @@
     .btnFirst{ 
             line-height: 1.5;
             margin: -3.5px;
-            border: 1px solid #409eff;
+            border: 1px solid rgba(22, 132, 252, 100);
             border-right: none;
             background: #FFFF;
-            color: #409eff;
+            color: #1684FC;
             width: 60px;
             height: 30px;
             border-radius:4px 0px 0px 4px;
@@ -486,20 +489,20 @@
     .btn{ 
         line-height: 1.5;
         margin: -3.5px;
-        border: 1px  solid #409eff;
+        border: 1px  solid rgba(22, 132, 252, 100);
         border-right: none;
         background: #FFFF;
-        color: #409eff;
+        color: #1684FC;
         width: 60px;
         height: 30px;
     }
     .btnLast{ 
         line-height: 1.5;
         margin: -3.5px;
-        border: 1px solid #409eff;
+        border: 1px solid rgba(22, 132, 252, 100);
         /* border-right: none; */
         background: #FFFF;
-        color: #409eff;
+        color: #1684FC;
         width: 60px;
         height: 30px;
         border-radius:0px 4px 4px 0px;
@@ -528,7 +531,7 @@
     }
 
     .colorChange {
-        background-color: #409effd6;
+        background-color: #1684FC;
         color: #FFFF;
         cursor: default;
     }