From 9dec8518b63fcb58adf6c8f59ecfac4263f9a14f Mon Sep 17 00:00:00 2001
From: zhujida <zhujida@ldxinyong.com>
Date: Mon, 25 Jan 2021 11:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=8C=87=E6=A0=87=E9=A1=B9?=
 =?UTF-8?q?=20=E7=AD=9B=E9=80=89=E6=8C=89=E9=92=AE=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ChooseTarget/index.vue | 34 +++++++++++++++++++++++----
 src/icons/svg/filtrate.svg            |  1 +
 src/views/kpi/set/index.vue           |  4 +---
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 src/icons/svg/filtrate.svg

diff --git a/src/components/ChooseTarget/index.vue b/src/components/ChooseTarget/index.vue
index 31802e5..3194762 100644
--- a/src/components/ChooseTarget/index.vue
+++ b/src/components/ChooseTarget/index.vue
@@ -14,12 +14,15 @@
         class="popup-choose-target"
       >
         <div class="popup-choose-target-header">
-          <el-button
+          <div
+            class="popup-choose-target-header-filtrate"
             @click="isShowPopupFiltrate = true"
-            type="primary"
-            plain
-            size="small"
-          >筛选</el-button>
+          >
+            <svg-icon
+              icon-class="filtrate"
+              class-name='icon'
+            />筛选
+          </div>
           <el-input
             @change="handleSearch"
             v-model="queryData.name"
@@ -194,11 +197,32 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+.icon {
+  width: 15px !important;
+  height: 15px !important;
+  margin-right: 5px;
+}
 .popup {
   &-choose-target {
     &-header {
       display: flex;
       margin-bottom: 10px;
+      &-filtrate {
+        margin-right: 10px;
+        width: 80px;
+        height: 32px;
+        display: flex;
+        text-align: center;
+        align-items: center;
+        padding: 5px;
+        border-radius: 5px;
+        color: @mianBlue;
+        border: 1px solid @mianBlue;
+      }
+      &-filtrate:hover {
+        background-color: #e1f0fb;
+        cursor: pointer;
+      }
       .el-button {
         margin-right: 10px;
       }
diff --git a/src/icons/svg/filtrate.svg b/src/icons/svg/filtrate.svg
new file mode 100644
index 0000000..37efb1c
--- /dev/null
+++ b/src/icons/svg/filtrate.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M829.803766 127.599661H191.598637c-35.346569 0-64.101365 28.756843-64.101365 64.103412 0 16.857248 6.506791 32.642488 18.379766 44.722287a7.763099 7.763099 0 0 0 1.343337 1.80511l224.303582 224.323036v116.277537h-0.002047v20.109108h0.005119c0 0.071672-0.005119 0.144368-0.005119 0.21604 0 14.663062 11.886285 26.551394 26.55037 26.551394 14.663062 0 26.549346-11.887309 26.549346-26.551394 0-0.071672-0.005119-0.144368-0.005119-0.21604h0.005119v-0.844706c0.003072-0.09215 0.014334-0.183275 0.014335-0.275425V443.778521a7.787672 7.787672 0 0 0-2.279169-5.503384L185.899691 201.835442a7.744669 7.744669 0 0 0-1.517398-1.752891c-1.521494-1.303406-4.079159-4.125234-4.079159-8.378454 0-6.228294 5.068232-11.295503 11.296527-11.295503h638.205129c6.218056 0 11.277073 5.068232 11.277073 11.295503 0 4.267554-2.543331 7.081191-4.061753 8.379478a7.777433 7.777433 0 0 0-1.547091 1.796918L599.064041 438.258755a7.775385 7.775385 0 0 0-2.281217 5.505431c0 2.110228 0.098293 212.999888 0.098293 386.390773 0 6.216008-5.103044 11.278097-11.37639 11.278096-4.308509 0-7.166173-2.564833-8.486985-4.091445a7.783576 7.783576 0 0 0-1.829683-1.555282l-60.912986-60.041659a7.781528 7.781528 0 0 0-10.963764 0.036859L476.693362 802.381045a7.78972 7.78972 0 0 0-2.28224 5.528981 7.782552 7.782552 0 0 0 2.3191 5.514646l62.049499 61.176125a7.678116 7.678116 0 0 0 1.822516 1.33617c12.142256 11.843282 27.989953 18.334715 44.901467 18.334715 35.504248 0 64.389076-28.756843 64.389076-64.103413V462.553506l224.302558-224.323036a7.835794 7.835794 0 0 0 1.362791-1.837874c11.852497-12.07468 18.348025-27.847633 18.348026-44.688499 0.003072-35.346569-28.755819-64.104436-64.102389-64.104436z" fill="#1296db" /><path d="M398.07228 664.419665c-16.785576 0-30.439087 13.654535-30.439087 30.439087s13.653511 30.441135 30.439087 30.441134c16.783528 0 30.439087-13.656582 30.439087-30.441134s-13.655559-30.439087-30.439087-30.439087z" fill="#1296db" /></svg>
\ No newline at end of file
diff --git a/src/views/kpi/set/index.vue b/src/views/kpi/set/index.vue
index b273893..4da330b 100644
--- a/src/views/kpi/set/index.vue
+++ b/src/views/kpi/set/index.vue
@@ -55,11 +55,9 @@ export default {
     } else if (!this.auth.setIndicatrix) {
       this.activeIndex = '2'
     } else {
-      this.activeIndex = ''
+      this.activeIndex = '0'
     }
     if (this.auth.evaluationSet && this.auth.roleSet && this.auth.setIndicatrix) {
-      this.activeIndex = this.$route.query.activeIndex
-    } else {
       this.activeIndex = this.$route.query.activeIndex || '0'
     }
   },