From 39a76c67f20eb913dcb4b32df66c194d18b887c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 22 Nov 2021 14:51:24 +0800
Subject: [PATCH 1/4] commit

---
 src/components/personalCenter/index.vue        | 18 ++++--------------
 .../searchCenter/pages/standardSearch.vue      |  1 -
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue
index 85867ce15..5d75c2133 100644
--- a/src/components/personalCenter/index.vue
+++ b/src/components/personalCenter/index.vue
@@ -1,14 +1,5 @@
 <template>
   <div class="header">
-    <div style="background-color: #0068B7; height: 65px; width: 100%;">
-      <div class="header-left">
-        <div class="logo">
-          <img src="@/assets/images/shangqi/img/logo2.png" style="height: 61px; width: 160px;" />
-        </div>
-      </div>
-          <span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
-            标准法规管理系统  Standard and Regulation Management System
-          </span>
       <!-- header头部 右侧内容 当前登录人和退出-->
 <!--      <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">-->
 <!--        <div>-->
@@ -55,7 +46,6 @@
 <!--        </el-dropdown>-->
 <!--      </div>-->
 <!--    </div>-->
-  </div>
 </template>
 
 <script>
@@ -128,10 +118,10 @@ export default {
 
 <style lang="less" scoped>
 .header {
-  display: flex;
-  justify-content: space-between;
-  background-color: #171E4A;
-  color: #fff;
+  //display: flex;
+  //justify-content: space-between;
+  //background-color: #171E4A;
+  //color: #fff;
 
   .header-left {
     float: left;
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index de91fb48c..efcb33c68 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -2760,7 +2760,6 @@
         }
         @media screen and (min-width: 1920px) {
             .header{
-                height: 65px;
             }
         }
         .standard-search-content{

From 1bd8be8d04afa61e49a8c7caffaab3e2d669a075 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 22 Nov 2021 14:58:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localTool/standardRecognition/index.vue   | 11 ++++----
 .../pages/creatProcess/bzrk/step1.vue         | 25 +++++++++++--------
 .../pages/creatProcess/bzrk/step4.vue         | 11 ++++----
 .../tabComponents/processCenter/index.vue     |  6 ++---
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index e758a060c..669fd8666 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -272,20 +272,21 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                icon="el-icon-search"
                 type="primary"
                 class="common-button-primary"
-                round
+                size="small"
                 @click="searchLawBtn">
+              查询
             </el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
                 class="common-button-default"
-                icon="el-icon-refresh-left"
-                round
                 type="default"
-                @click="clearLawBtn"></el-button>
+                size="small"
+                @click="clearLawBtn">
+              清空
+            </el-button>
           </el-form-item>
         </el-form>
         <loading :loading="lawInfoTableLoading">数据获取中</loading>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 0cfdaa0bc..ea6b7430c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -956,20 +956,21 @@
                         </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
-                                    icon="el-icon-search"
+                                    size="mini"
                                     type="primary"
                                     class="common-button-primary"
-                                    round
                                     @click="getReplaceLawsNumRowFirst">
+                              查询
                             </el-button>
                         </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
                                     class="common-button-default"
-                                    icon="el-icon-refresh-left"
-                                    round
+                                    size="mini"
                                     type="default"
-                                    @click="getResetLawsNumRow"></el-button>
+                                    @click="getResetLawsNumRow">
+                              清空
+                            </el-button>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -1126,17 +1127,19 @@
                             </el-form-item>
                             <el-form-item>
                                 <el-button
-                                        icon="el-icon-search"
                                         type="primary"
                                         class="common-button-primary"
-                                        @click="handleSearchStandard"
-                                        round>
+                                        size="mini"
+                                        style="margin-left: 5px"
+                                        @click="handleSearchStandard">
+                                  查询
                                 </el-button>
                                 <el-button
                                         class="common-button-default"
-                                        icon="el-icon-refresh-left"
-                                        @click="handleResetSearch"
-                                        round></el-button>
+                                        size="mini"
+                                        @click="handleResetSearch">
+                                  清空
+                                </el-button>
                             </el-form-item>
                         </el-form>
                     </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 119525d4d..5ebcc9eac 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1257,20 +1257,21 @@
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
-                      icon="el-icon-search"
+                      size="mini"
                       type="primary"
                       class="common-button-primary"
-                      round
                       @click="getReplaceLawsNumRowFirst">
+                查询
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
                       class="common-button-default"
-                      icon="el-icon-refresh-left"
-                      round
+                      size="mini"
                       type="default"
-                      @click="getResetLawsNumRow"></el-button>
+                      @click="getResetLawsNumRow">
+                清空
+              </el-button>
             </el-form-item>
           </el-form>
         </div>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 4a0427751..73022ed85 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -36,16 +36,14 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-              icon="el-icon-search"
               type="primary"
               class="common-button-primary"
               size="mini"
-              @click="selectProcessBtn"></el-button>
+              @click="selectProcessBtn">查询</el-button>
             <el-button
               class="common-button-default"
-              icon="el-icon-refresh-left"
               size="mini"
-              @click="resetSelect"></el-button>
+              @click="resetSelect">清空</el-button>
           </el-form-item>
         </div>
         <div class="search-area-item">

From 8c2f82442d4ae45a08fe0f342bdeed2e56dce9ca Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 22 Nov 2021 14:59:08 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E5=9C=A8?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=87=BA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 20b84633e..2f9429400 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="app">
 <!--    <router-view v-if="!isBoolean"/>-->
-    <span v-if="this.$route.name === 'Login'">
+    <span v-if="this.$route.name === 'Login'|| !isBoolean">
       <router-view />
     </span>
     <span v-else>

From 08e8156edb0a9f7089da4c7f6beb560f574264ff Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 22 Nov 2021 15:00:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listTracking.vue                             | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index 2b1e09ec3..7606c4c8b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -285,20 +285,21 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                icon="el-icon-search"
+                size="small"
                 type="primary"
                 class="common-button-primary"
-                round
                 @click="searchLawBtn">
+              查询
             </el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
                 class="common-button-default"
-                icon="el-icon-refresh-left"
-                round
+                size="small"
                 type="default"
-                @click="clearLawBtn"></el-button>
+                @click="clearLawBtn">
+              清空
+            </el-button>
           </el-form-item>
         </el-form>
         <loading :loading="lawInfoTableLoading">数据获取中</loading>