From de22833d402d45d1ff57425694e21d1d254588f8 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 1 Feb 2024 14:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E5=85=B3=E6=80=80=EF=BC=8C?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86title=E9=AB=98=E5=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dialog-module/zdyf-center/qyjj/index.vue  |  8 +-
 .../dialog-module/zdyf-left/ldgh/index.vue    | 97 ++++++++++++++++---
 .../dialog-module/zdyf-left/yfcj/index.vue    |  6 +-
 .../dialog-module/zdyf-right/kyll/garden.vue  |  6 +-
 .../dialog-module/zdyf-right/kyll/talents.vue |  5 +-
 .../screen-content-left/hsyf-left/index.vue   |  8 +-
 .../screen-content-left/zdyf-left/index.vue   |  4 +-
 7 files changed, 99 insertions(+), 35 deletions(-)

diff --git a/src/views/next/dialog-module/zdyf-center/qyjj/index.vue b/src/views/next/dialog-module/zdyf-center/qyjj/index.vue
index 2e44e48..e0cb0fe 100644
--- a/src/views/next/dialog-module/zdyf-center/qyjj/index.vue
+++ b/src/views/next/dialog-module/zdyf-center/qyjj/index.vue
@@ -207,21 +207,19 @@ export default {
             .title-container {
                 align-items: center;
                 background: url('~@/assets/images/common/dialog-header.png') no-repeat;
-                background-size: 100% 118%;
+                background-size: 100% 100%;
                 display: flex;
-                justify-content: center;
-                align-items: center;
+                justify-content: center; 
                 height: 60px;
                 font-size: 26px;
 
                 .title {
                     font-family: zaozigongfang;
                     letter-spacing: 2px;
-
+                    line-height: 50px;   
                     background-size: 100% 100%;
                     display: flex;
                     justify-content: center;
-                    align-items: center;
                     height: 60px;
                     font-size: 26px;
                     color: #fff;
diff --git a/src/views/next/dialog-module/zdyf-left/ldgh/index.vue b/src/views/next/dialog-module/zdyf-left/ldgh/index.vue
index 2546f2a..50ce201 100644
--- a/src/views/next/dialog-module/zdyf-left/ldgh/index.vue
+++ b/src/views/next/dialog-module/zdyf-left/ldgh/index.vue
@@ -11,7 +11,19 @@
             </div>
             <div class="dialog_body">
                 <div class="content">
-                        <img src="@/assets/images/index/ldgh.png" alt="">
+                    <img src="@/assets/images/index/ldgh.png" alt="">
+                    <div class="header" style="margin: 20px 0 40px;">
+                        <img src="@/assets/images/common/title-small.png" alt="" style="width: 20px;height: 20px;">习近平主席历年历次会议的讲话
+                    </div>
+                    <div class="flow">
+                        <el-timeline>
+                            <el-timeline-item v-for="(activity, index) in activities" :key="index" :icon="activity.icon"
+                                :type="activity.type" :color="activity.color" :size="activity.size"
+                                :timestamp="activity.timestamp">
+                                {{ activity.content }}
+                            </el-timeline-item>
+                        </el-timeline>
+                    </div>
                 </div>
             </div>
         </section>
@@ -25,7 +37,44 @@ export default {
     data() {
         return {
             dialogTitle: '领导关怀',
-        
+            activities: [
+                {
+                    content: '“要以市场需求为导向调整完普农业生产结构和产品结构，以科技为支撑走内通式现代农业发展道路，以健全市场机制为目标，改革完善农业支持保护政策，以家庭农场和农民合作社为抓手发展农业适度规模经营。要研究和完善粮食安全政策，把产能建设作为根本，实现藏粮于地、藏粮于技。”',
+                    timestamp: '2016年3月8日《十二届全国人大四次会议湖南代表团审议》',
+                    color: '#fff'
+                }, {
+                    content: '“种业是一个很伟大的事业。”“十几亿人口要吃饭，这是我国最大的国情。良种在促进粮食增产方面具有十分关键的作用。要下决心把我国种业搞上去，抓紧培育具有自主知识产权的优良品种，从源头上保障国家粮食安全。”-----2018年4月12日，在海南考察南繁育种基地。',
+                    timestamp: '2018年4月12日《海南考察南繁育种基地》',
+                    color: '#fff'
+                }, {
+                    content: '要拿出攻破“卡脖子”技术的干劲，明确方向和目标，加快实施农业生物育种重大科技项目，早日实现重要农产品的种源自主可控。',
+                    timestamp: '2020年12月28日《中央农村工作会议》',
+                    color: '#fff'
+
+                }, {
+                    content: '保证粮食安全必须把种子牢牢攥在自己手中。要坚持农业科技自立自强，从培育好种子做起，加强良种技术攻关，靠中国种子来保障中国粮食安全。',
+                    timestamp: '2021年5月13日《河南考察》',
+                    color: '#fff'
+
+                }, {
+                    content: '农业现代化，种子是基础，必须把民族种业搞上去，把种源安全提升到关系国家安全的战略高度，集中力量破难题、补短板、强优势、控风险，实现种业科技自立自强、种源自主可控。',
+                    timestamp: '2021年7月9日《中央全面深化改革委员会第二十次会议》',
+                    color: '#fff'
+
+                }, {
+                    content: '解决吃饭问题，根本出路在科技。种源安全关系到国家安全，必须下决心把我国种业搞上去，实现种业科技自立自强、种源自主可控。',
+                    timestamp: '2022年3月6日《我国政协十三届五次会议的农业界社会福利和社会保障界委员》',
+                    color: '#fff'
+
+                },
+                {
+                    content: '中国人的饭碗要牢牢端在自己手中，就必须把种子牢牢攥在自己手里。要围绕保障粮食安全和重要农产品供给集中攻关，实现种业科技自立自强、种源自主可控，用中国种子保障中国粮食安全。',
+                    timestamp: '2022年4月10日~13日《海南考察》',
+                    color: '#fff'
+
+                }
+            ]
+
         }
     },
     computed: {
@@ -52,6 +101,17 @@ export default {
 </script>
   
 <style lang="scss" scoped>
+::v-deep .el-timeline-item__content {
+    font-size: 18px;
+}
+
+::v-deep .el-timeline-item__timestamp {
+    color: #B5D9FF;
+    font-size: 16px;
+}
+::v-deep .el-timeline{
+    padding: 0;
+}
 .modal {
     width: 100%;
     height: 100%;
@@ -63,6 +123,16 @@ export default {
     justify-content: center;
     z-index: 150;
 
+    .header {
+        width: 100%;
+        height: 30px;
+        text-align: left;
+        background: linear-gradient(90deg, rgb(26, 109, 224) 0%, rgba(13, 113, 248, 0) 50%);
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+    }
+
     >section {
         display: flex;
         flex-direction: column;
@@ -89,21 +159,19 @@ export default {
             .title-container {
                 align-items: center;
                 background: url('~@/assets/images/common/dialog-header.png') no-repeat;
-                background-size: 100% 118%;
+                background-size: 100% 100%;
                 display: flex;
                 justify-content: center;
-                align-items: center;
                 height: 60px;
                 font-size: 26px;
 
                 .title {
                     font-family: zaozigongfang;
                     letter-spacing: 2px;
-
+                    line-height: 50px;
                     background-size: 100% 100%;
                     display: flex;
                     justify-content: center;
-                    align-items: center;
                     height: 60px;
                     font-size: 26px;
                     color: #fff;
@@ -135,8 +203,17 @@ export default {
             .content {
                 color: #fff;
                 width: 100%;
-                height: 100%;
                 display: flex;
+                flex-direction: column;
+
+                img {
+                    width: 1706px;
+                    height: 372px;
+                }
+
+                .flow {
+                    width: 100%;
+                }
             }
 
 
@@ -144,11 +221,5 @@ export default {
     }
 
 }
-.m-r16{
-    margin-right: 16px;
-}
-.m-l16{
-    margin-left: 16px;
-}
 </style>
   
\ No newline at end of file
diff --git a/src/views/next/dialog-module/zdyf-left/yfcj/index.vue b/src/views/next/dialog-module/zdyf-left/yfcj/index.vue
index c0fb696..633add6 100644
--- a/src/views/next/dialog-module/zdyf-left/yfcj/index.vue
+++ b/src/views/next/dialog-module/zdyf-left/yfcj/index.vue
@@ -169,21 +169,19 @@ export default {
             .title-container {
                 align-items: center;
                 background: url('~@/assets/images/common/dialog-header.png') no-repeat;
-                background-size: 100% 118%;
+                background-size: 100% 100%;
                 display: flex;
                 justify-content: center;
-                align-items: center;
                 height: 60px;
                 font-size: 26px;
 
                 .title {
                     font-family: zaozigongfang;
                     letter-spacing: 2px;
-
+                    line-height: 50px;
                     background-size: 100% 100%;
                     display: flex;
                     justify-content: center;
-                    align-items: center;
                     height: 60px;
                     font-size: 26px;
                     color: #fff;
diff --git a/src/views/next/dialog-module/zdyf-right/kyll/garden.vue b/src/views/next/dialog-module/zdyf-right/kyll/garden.vue
index 3861949..a4ddcb6 100644
--- a/src/views/next/dialog-module/zdyf-right/kyll/garden.vue
+++ b/src/views/next/dialog-module/zdyf-right/kyll/garden.vue
@@ -137,21 +137,19 @@ export default {
             .title-container {
                 align-items: center;
                 background: url('~@/assets/images/common/dialog-header.png') no-repeat;
-                background-size: 100% 118%;
+                background-size: 100% 100%;
                 display: flex;
                 justify-content: center;
-                align-items: center;
                 height: 60px;
                 font-size: 26px;
 
                 .title {
                     font-family: zaozigongfang;
                     letter-spacing: 2px;
-                    // background: url('~@/assets/images/common/dialog-header.png') no-repeat;
+                    line-height: 50px;
                     background-size: 100% 100%;
                     display: flex;
                     justify-content: center;
-                    align-items: center;
                     height: 60px;
                     font-size: 26px;
                     color: #fff;
diff --git a/src/views/next/dialog-module/zdyf-right/kyll/talents.vue b/src/views/next/dialog-module/zdyf-right/kyll/talents.vue
index 7cb07f2..904085e 100644
--- a/src/views/next/dialog-module/zdyf-right/kyll/talents.vue
+++ b/src/views/next/dialog-module/zdyf-right/kyll/talents.vue
@@ -176,7 +176,7 @@ export default {
             .title-container {
                 align-items: center;
                 background: url('~@/assets/images/common/dialog-header.png') no-repeat;
-                background-size: 100% 118%;
+                background-size: 100% 100%;
                 display: flex;
                 justify-content: center;
                 align-items: center;
@@ -186,11 +186,10 @@ export default {
                 .title {
                     font-family: zaozigongfang;
                     letter-spacing: 2px;
-
+                    line-height: 50px;
                     background-size: 100% 100%;
                     display: flex;
                     justify-content: center;
-                    align-items: center;
                     height: 60px;
                     font-size: 26px;
                     color: #fff;
diff --git a/src/views/next/screen-content-left/hsyf-left/index.vue b/src/views/next/screen-content-left/hsyf-left/index.vue
index 64de337..c4d4e72 100644
--- a/src/views/next/screen-content-left/hsyf-left/index.vue
+++ b/src/views/next/screen-content-left/hsyf-left/index.vue
@@ -4,7 +4,7 @@
                 <div class='card h292'>
                         <screen-title>
                                 <div slot="left" class="screen-title-left">组织建设</div>
-                                <div slot="right" class="screen-title-right">组织架构</div>
+                                <div slot="right" class="screen-title-right"><span>组织架构</span></div>
                         </screen-title>
                         <div class="card-item-zzjs">
                                 <div class="top">
@@ -34,7 +34,7 @@
                                                 <div></div>
                                                 <img src="@/assets/images/common/echarts-header.png" alt="">
                                         </div>
-                                        <div id="charts" style="width: 100%; height:100%; z-index: 10;"></div>
+                                        <div id="charts" style="width: 201px; height:203px; z-index: 10;"></div>
                                         <div class="buttomCharts"></div>
                                 </div>
                                 <div class="bar">
@@ -739,7 +739,7 @@ export default {
                 flex-direction: column;
                 padding: 25px 25px 30px 20px;
                 box-sizing: border-box;
-
+                height: 100%;
                 .top {
                         display: flex;
                         justify-content: space-between;
@@ -797,7 +797,7 @@ export default {
                                 display: flex;
                                 flex-direction: column;
                                 align-items: center;
-
+                                justify-content: space-around;
                                 img {
                                         width: 120px;
                                         height: 100px;
diff --git a/src/views/next/screen-content-left/zdyf-left/index.vue b/src/views/next/screen-content-left/zdyf-left/index.vue
index 090af45..68aafc8 100644
--- a/src/views/next/screen-content-left/zdyf-left/index.vue
+++ b/src/views/next/screen-content-left/zdyf-left/index.vue
@@ -3,7 +3,7 @@
                 <div class='card h292'>
                         <screen-title>
                                 <div slot="left" class="screen-title-left">领导关怀</div>
-                                <div slot="right" class="screen-title-right" @click="set_ldhg(true)">更多</div>
+                                <div slot="right" class="screen-title-right" @click="set_ldhg(true)"><span>更多</span></div>
                         </screen-title>
                         <div class="card-item-ldgh">
                                 <img src="@/assets/images/index/banner.png" alt="">
@@ -52,7 +52,7 @@
                 <div class='card h292 m-top12'>
                         <screen-title>
                                 <div slot="left" class="screen-title-left">移风成就</div>
-                                <div slot="right" @click='set_yfcj(true)' class="screen-title-right">发展历程</div>
+                                <div slot="right" @click='set_yfcj(true)' class="screen-title-right"><span>发展历程</span></div>
                         </screen-title>
                         <div class="card-item-yfcj">
                                 <div class="card-item-yfcj-1" style="color: #7AFAFF; top: 10px; left: 15%">省级农业产业强镇</div>