From 465674f7f94c38fb25e2029a2b65830aaeaa190f Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 23 Nov 2022 22:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/App.vue                              |  4 ++--
 back/src/assets/scss/common.scss              | 23 +++++++++++++++++++
 .../views/modules/abilityStatistics/index.vue |  9 +++-----
 back/src/views/modules/assetReport/index.vue  |  9 ++++----
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/back/src/App.vue b/back/src/App.vue
index a3ce4034..36cb8b9d 100644
--- a/back/src/App.vue
+++ b/back/src/App.vue
@@ -26,7 +26,7 @@
     min-width: 80px !important;
     border-radius:2px !important;  
   } */
-  .el-button--primary {
+  /* .el-button--primary {
     vertical-align: middle !important;
     align-items: center !important;
     display: inline-flex !important;
@@ -35,7 +35,7 @@
     justify-content: center !important;
     min-width: 80px !important;
     border-radius:2px !important;  
-  } 
+  }  */
 </style>
 <script>
 import Cookies from 'js-cookie'
diff --git a/back/src/assets/scss/common.scss b/back/src/assets/scss/common.scss
index c0d15e50..e6f34ebd 100644
--- a/back/src/assets/scss/common.scss
+++ b/back/src/assets/scss/common.scss
@@ -138,6 +138,28 @@ img {
   color: $--color-text-secondary;
 }
 // 按钮
+.el-button--primary {
+  border-radius: 2px;
+  // vertical-align: middle !important;
+  // align-items: center !important;
+  // display: inline-flex !important;
+  // height:32px !important;
+  // line-height: 32px !important;
+  // justify-content: center !important;
+  // min-width: 80px !important;
+  // border-radius:2px !important;  
+} 
+// .el-button--primary {
+//   vertical-align: middle !important;
+//   align-items: center !important;
+//   display: inline-flex !important;
+//   height:32px !important;
+//   line-height: 32px !important;
+//   justify-content: center !important;
+//   min-width: 80px !important;
+//   border-radius:2px !important;  
+// } 
+
 .aui-button--dashed {
   border-style: dashed;
   &:focus,
@@ -253,6 +275,7 @@ img {
 }
 
 
+
 /* Navbar
 ------------------------------ */
 .aui-navbar {
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 4dfd21b6..0cfe9548 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -1206,16 +1206,13 @@ input::placeholder {
 }
 
 .export {
-  margin-top: 6px;
   display: inline-block;
   width: 80px;
-  height: 32px;
-  line-height: 32px;
+  height: 40px;
+  line-height: 40px;
   text-align: center;
-  border-radius: 2px;
+  border-radius: 4px;
   background: #fff;
-  border: 2px solid #dcdfe6;
-  color: #000;
   color: #fff;
   background-color: #0058e1;
   border-color: #0058e1;
diff --git a/back/src/views/modules/assetReport/index.vue b/back/src/views/modules/assetReport/index.vue
index 45758cca..87ac76dc 100644
--- a/back/src/views/modules/assetReport/index.vue
+++ b/back/src/views/modules/assetReport/index.vue
@@ -348,15 +348,14 @@ export default {
   width: 400px;
 }
 .export {
-  margin-top: 6px;
+  /* margin-top: 6px; */
   display: inline-block;
   width: 80px;
-  height: 32px;
-  line-height: 32px;
+  height: 40px;
+  line-height: 40px;
   text-align: center;
-  border-radius: 2px;
+  border-radius: 4px;
   background: #fff;
-  border: 2px solid #dcdfe6;
   color: #000;
   color: #fff;
   background-color: #0058e1;