From 9dd6f5de9c0c1cddf6827042235908c78cf7440c Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 18 Nov 2021 14:33:26 +0800
Subject: [PATCH] modify code

---
 web_src/js/components/DataAnalysis.vue |  3 ++-
 web_src/js/components/ProAnalysis.vue  | 14 +++++++++++---
 web_src/js/components/UserAnalysis.vue | 20 +++++++++++---------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/web_src/js/components/DataAnalysis.vue b/web_src/js/components/DataAnalysis.vue
index 20411b3a5..4d771dbb1 100755
--- a/web_src/js/components/DataAnalysis.vue
+++ b/web_src/js/components/DataAnalysis.vue
@@ -20,7 +20,7 @@
                     项目分析 
                 </span> 
             </el-tab-pane>
-            <el-tab-pane name="third" > 
+            <el-tab-pane name="third" id='third'> 
                 <span slot='label'>
                     <el-image style="width: 13px; height: 13px" src="/img/name.png">
                     </el-image>
@@ -72,6 +72,7 @@
                         this.reload()
                         this.isSecond = false
                         this.isThird = true
+                        this.$refs.UserAnalysis.resetPage()
                         this.$refs.UserAnalysis.getUpdateTime()
                         this.$refs.UserAnalysis.getUserList("all_usr",7)
 
diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue
index 4ca7b620d..b627e0d89 100755
--- a/web_src/js/components/ProAnalysis.vue
+++ b/web_src/js/components/ProAnalysis.vue
@@ -1072,13 +1072,21 @@
         .btn:active{
             background-color:#409effd6 ;
         } */
-        /deep/ .el-date-picker {
-            width: 200px;
-        }
+        /* /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;
+        }
+
         .colorChange {
             background-color: #409effd6;
             color: #FFFF;
diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue
index 200f132f3..54ed18a37 100755
--- a/web_src/js/components/UserAnalysis.vue
+++ b/web_src/js/components/UserAnalysis.vue
@@ -163,7 +163,7 @@
                 lastUpdatedTime:'',
                 page:1,
                 pageSize:10,
-                params:{startDate:'',endDate:'',page:1,pagesize:10,userName:''},
+                params:{startDate:'',endDate:'',page:1,pageSize:10,userName:''},
                 tableData: [],
                 totalNum:0,
                 pickerOptions: {
@@ -203,7 +203,7 @@
             handleCurrentChange(val){
                 this.params.page = val
                 this.page = val
-                getUserList(this.type_val,this.dynamic)
+                this.getUserList(this.type_val,this.dynamic)
 
             },
             resetPage(){
@@ -320,7 +320,6 @@
                 this.$axios.get('../tool/query_user_static_page',{
                     params:this.params
                 }).then((res)=>{
-                    this.currentPage = 1
                     this.tableData = res.data.data
                     // console.log("res.data:"+res.data.data)
                    
@@ -407,8 +406,8 @@
         },
         
         mounted() {   
-            document.getElementById("all_usr").style.outline="none"
-            document.getElementById("all_usr").focus()
+            // document.getElementById("all_usr").style.outline="none"
+            // document.getElementById("all_usr").focus()
             this.getUserList("all_usr",7)
         },
         created() {
@@ -462,16 +461,19 @@
     .btn:active{
         background-color:#409effd6 ;
     } */
-    /deep/ .el-date-picker {
-        width: 200px;
-    }
+    /* /deep/ .el-date-picker {
+        width: 220px;
+    } */
     /deep/ .el-table {
     font-size: 12px;
     }
     /deep/ .el-table tbody tr:hover>td { 
             background-color:#D3D3D3!important;
             opacity:1
-        }
+    }
+    /deep/ .el-range-separator{
+            width: 20% !important;
+    }
 
     .colorChange {
     background-color: #409effd6;