From b0adad42ce2735ec322e48d5fafca899bb40f44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 26 May 2021 15:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/newStyle.less                          | 4 ++--
 src/pages/home1/components/searchGroup/index.vue         | 2 +-
 src/pages/home1/components/todoList/index.vue            | 4 ++--
 src/pages/login/index.vue                                | 7 ++++---
 .../domesticStandardsAndRegulations/index.vue            | 9 ++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less
index f1c2d4da7..d4cbb9ac8 100644
--- a/src/assets/styles/newStyle.less
+++ b/src/assets/styles/newStyle.less
@@ -553,7 +553,7 @@ tr.el-table__row{
   height: 44px;
 }
 .el-table--border td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
-  border-right: 1px dashed rgba(209, 209, 209, 1);
+  border-right: 1px solid rgba(209, 209, 209, 1);
 }
 .el-table td, .el-table th.is-leaf{
   border-bottom: 1px solid rgba(209, 209, 209, 1);
@@ -569,7 +569,7 @@ tr.el-table__row{
   input.el-input__inner{
     display: inline-block;
     width: 180px;
-    colro: #999;
+    color: #999;
     height: 30px;
     line-height: 30px;
     font-family: MicrosoftYaHei,微软雅黑;
diff --git a/src/pages/home1/components/searchGroup/index.vue b/src/pages/home1/components/searchGroup/index.vue
index f214aee2d..f80e55a66 100644
--- a/src/pages/home1/components/searchGroup/index.vue
+++ b/src/pages/home1/components/searchGroup/index.vue
@@ -98,7 +98,7 @@ export default {
   .primary_button {
     width: 8.2vw;
     height: 40px;
-    background-color: #007dfe;
+    background-color: #1885f5;
   }
 }
 </style>
diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue
index 29aa14229..0eb3a868b 100644
--- a/src/pages/home1/components/todoList/index.vue
+++ b/src/pages/home1/components/todoList/index.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="to-do-list">
     <div>
-      <h3 class="task">待办任务</h3>
+      <span class="task">待办任务</span>
       <span class="more">MORE</span>
     </div>
     <ul>
@@ -53,7 +53,7 @@ export default {
     display: inline-block;
     margin: 15px;
     color: #FFFFFF;
-    font-size: 14px;
+    font-size: 16px;
   }
   .more {
     float: right;
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 43d43d320..bcd816e7f 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -58,6 +58,7 @@ export default {
       } else if (this.password === '') {
         this.$message.warning('密码不能为空')
       } else {
+        // this.$router.push('/home1')
         this.loginUser(this.username, this.password)
         this.getEditPermission()
       }
@@ -119,7 +120,7 @@ export default {
                       if (hasHomeMenu) {
                         this.setMenu(JSON.stringify(menuList)).then(res => {
                           this.loading = false
-                          this.$router.push('/home')
+                          this.$router.push('/home1')
                         }, e => {
                           this.loading = false
                           this.$message.warning('未获取到菜单')
@@ -160,7 +161,7 @@ export default {
                     })
                     if (hasHomeMenu) {
                       this.setMenu(JSON.stringify(menuList)).then(res => {
-                        this.$router.push('/home')
+                        this.$router.push('/home1')
                       }, e => {
                         this.$message.warning('未获取到菜单')
                       })
@@ -203,7 +204,7 @@ export default {
                   })
                   if (hasHomeMenu) {
                     this.setMenu(JSON.stringify(menuList)).then(res => {
-                      this.$router.push('/home')
+                      this.$router.push('/home1')
                     }, e => {
                       this.$message.warning('未获取到菜单')
                     })
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index bd0f5aacb..c24945521 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -62,18 +62,17 @@
                 <el-form-item class="search-item btn-box">
                   <el-button
                     :loading="searching"
-                    icon="el-icon-search"
                     type="primary"
                     size="mini"
                     class="common-button-primary"
                     @click="searchBtnClick(standCommonlySearch)">
+                    搜索
                   </el-button>
                   <el-button
                     size="mini"
                     class="common-button-default"
-                    icon="el-icon-refresh-left"
-                    @click="clearAllSearch('standCommonlySearch')"></el-button>
-                  <el-button size="mini" type="primary" class="common-button-primary"  @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级查询</el-button>
+                    @click="clearAllSearch('standCommonlySearch')">清空</el-button>
+                  <el-button size="mini" type="primary" class="common-button-primary"  @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级检索</el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -134,7 +133,7 @@
             height="100%"
             :row-class-name="dragRowClassName"
             @sort-change="sortChange"
-            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+            :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
             @selection-change="standSelectChange">
             <el-table-column