From 262ab5cf7ad5b54c9b3ca6eac33131907c8346ab Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 28 Sep 2023 09:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E6=A0=87=E9=A2=98=E6=A0=8F?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/release/index.vue |  9 ++++++-
 src/pages/home2/index.vue                    | 28 +++++++++++---------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index 491c9622e..71ce2c5a5 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -71,6 +71,12 @@ export default {
         standardReleaseList: [],  //标准发布数据
     }
   },
+  props: {
+    messageType: {
+      type: String,
+      required: true
+    }
+  },
   computed: {},
   watch: {},
   mounted() {
@@ -112,7 +118,8 @@ export default {
     getAdvice() {
       this.loading = true
       this.$http.get("/lawss/NewsFeed/getNewsFeed", {
-            messageType: 'GNWBZFG',
+            // messageType: 'GNWBZFG',
+            messageType: this.messageType,
             page: this.page,
             pageSize: this.pageSize
         }, {
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index dd4ae132b..e3cd4e00b 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -15,22 +15,26 @@
                  <span slot="label"><i class="el-icon-s-order"></i> 标准征求意见</span>
                  <solicitOpinions></solicitOpinions>
              </el-tab-pane>
-             <el-tab-pane name="release" style="overflow-y: auto;height: 100%">
-                 <span slot="label"><i class="el-icon-s-promotion"></i> 国内外标准法规入库</span>
-                 <release></release>
-             </el-tab-pane>
-            <el-tab-pane name="releaseUs" style="overflow-y: auto;height: 100%">
-               <span slot="label"><i class="el-icon-s-operation"></i> 在研标准法规入库</span>
-               <releaseUs></releaseUs>
-            </el-tab-pane>
-           <el-tab-pane name="releaseBuss" style="overflow-y: auto;height: 100%">
-               <span slot="label"><i class="el-icon-s-promotion"></i> 企业标准发布</span>
-               <releaseBuss></releaseBuss>
-           </el-tab-pane>
              <el-tab-pane name="releaseZL" style="overflow-y: auto;height: 100%">
                <span slot="label"><i class="el-icon-chat-line-round"></i> 标准化动态</span>
                <releaseZL></releaseZL>
              </el-tab-pane>
+             <el-tab-pane name="releaseUs" style="overflow-y: auto;height: 100%">
+               <span slot="label"><i class="el-icon-s-operation"></i> 在研标准法规动态</span>
+               <releaseUs></releaseUs>
+             </el-tab-pane>
+             <el-tab-pane name="releaseCn" style="overflow-y: auto;height: 100%">
+                 <span slot="label"><i class="el-icon-s-promotion"></i> 国内标准法规动态</span>
+                 <release messageType="GNBZFG"></release>
+             </el-tab-pane>
+             <el-tab-pane name="release" style="overflow-y: auto;height: 100%">
+               <span slot="label"><i class="el-icon-s-promotion"></i> 国外标准法规动态</span>
+               <release messageType="GWBZFG"></release>
+             </el-tab-pane>
+           <el-tab-pane name="releaseBuss" style="overflow-y: auto;height: 100%">
+               <span slot="label"><i class="el-icon-s-promotion"></i> 企业标准发布</span>
+               <releaseBuss></releaseBuss>
+           </el-tab-pane>
            <el-tab-pane name="releaseQA" style="overflow-y: auto;height: 100%">
                    <span slot="label"><i class="el-icon-chat-line-round"></i> 标准问答</span>
                    <releaseQA></releaseQA>