From 4deaf1964af0363702208b544e06a01754f1b84a Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Fri, 19 Nov 2021 15:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=84=E5=88=92=E9=83=A8?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E=E8=B7=B3?=
 =?UTF-8?q?=E5=9B=9E=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/nonConfomity/index.vue  | 10 +++++++---
 .../nonConfomity/pages/keyIssues.vue                   |  3 ++-
 .../nonConfomity/pages/productDetails.vue              |  6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue
index c4f363993..2fbd07e11 100644
--- a/src/pages/regulatoryRepository/nonConfomity/index.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/index.vue
@@ -7,7 +7,7 @@
            <rectification-database></rectification-database>
          </el-tab-pane>
          <el-tab-pane label="重点问题项管控" name="keynote">
-           <key-issues></key-issues>
+           <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
          </el-tab-pane>
        </el-tabs>
      </div>
@@ -24,7 +24,8 @@ export default {
   },
   data () {
     return {
-      activeName: 'database'
+      activeName: 'database',
+      keynoteActiveName: 'cause'
     }
   },
   methods: {
@@ -34,7 +35,10 @@ export default {
       if (this.$route.query.activeName){
         this.activeName = this.$route.query.activeName
       }
-      console.log('35',this.activeName)
+      if (this.$route.query.keynoteActiveName){
+        this.keynoteActiveName = this.$route.query.keynoteActiveName
+      }
+      console.log('35',this.keynoteActiveName)
     }
   },
   created() {
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue b/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue
index 3df10e284..ea9994723 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue
@@ -2,7 +2,7 @@
 <template>
 <div id="key-issues">
   <div class="non-content">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="keynoteActiveName" @tab-click="handleClick">
       <el-tab-pane label="事业部" name="cause">
         <business-division></business-division>
       </el-tab-pane>
@@ -20,6 +20,7 @@ import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/p
 
 export default {
   name: "keyIssues",
+  props:['keynoteActiveName'],
  components: {
    businessDivision,
    productDepartment,
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue b/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
index a1e12dc22..a82a3b4f0 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
@@ -556,7 +556,11 @@ export default {
     },
     back () {
       this.$router.push({
-        name: 'NonConfomity'
+        name: 'NonConfomity',
+        query:{
+          activeName:'keynote',
+          keynoteActiveName:'product'
+        }
       })
     },
     // 未符合项table selected事件