From 13c54c829bf52532741b033007e1d4d9e7ad744e Mon Sep 17 00:00:00 2001
From: dzj <1140318653@qq.com>
Date: Tue, 2 Jul 2024 15:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=88=86=E7=B1=BB=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=BA=E6=89=8D=E6=8B=9B=E8=81=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                 |  2 +-
 src/api/index.js            | 22 +++++++++-
 src/views/HomeView.vue      | 26 +++++++-----
 src/views/detail.vue        | 33 ++++++++++-----
 src/views/honordetail.vue   | 12 +++---
 src/views/news.vue          | 80 +++++++++++++++++++++++++++++++------
 src/views/projectdetail.vue |  4 +-
 src/views/recruit.vue       | 58 ++++++++++++++++-----------
 8 files changed, 175 insertions(+), 62 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6dfbc9b..e546c35 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,7 +7,7 @@
           <el-menu style="margin-right: 15px;float: right;height: 100%;display: flex;align-items: center;background-color:transparent ;border: none;"  :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="switchto" >
             <el-menu-item index="1">首页</el-menu-item>
             <el-menu-item index="2">走进飞阳</el-menu-item>
-            <el-menu-item index="3">新闻资讯</el-menu-item>
+            <el-menu-item index="3">新闻内容</el-menu-item>
             <el-menu-item index="4">工程展示</el-menu-item>
             <el-menu-item index="5">人才招聘</el-menu-item>
             <el-menu-item index="6">联系我们</el-menu-item>
diff --git a/src/api/index.js b/src/api/index.js
index 82ac260..c9c667a 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -99,4 +99,24 @@ export function compony(){
     return request({
         url:'/companyProfile/list'
     })
-}
\ No newline at end of file
+}
+//新闻资讯
+export function getmsg(params){
+    return request({
+        url:'/articleMsg/list',
+        params
+    })
+}
+//新闻详情
+export function msgdetail(params){
+    return request({
+        url:'/articleMsg/articleDetails',
+        params
+    })
+} 
+//新闻详情
+export function getcruit(){
+    return request({
+        url:'/recruit/list'
+    })
+} 
\ No newline at end of file
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index bac85af..6cf6be5 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -20,7 +20,7 @@
 
     </div>
     <div class="Wrapper index" style="">
-      <div class="index_1" style="width: 80%;margin: 0 auto;padding: 50px 0;">
+      <div class="index_1" style="width: 80%;margin: 0 auto;padding: 85px 0;">
         <div class="content-top">
           <div class="content-left">
             <h3>企业新闻</h3>
@@ -44,13 +44,13 @@
     color: #3c3c48;
     color: rgba(60, 60, 72, .8);
     line-height: 30px;">{{ newsitem?.name||'' }}</h3>
-              <h5 style="    width: auto;
+              <!-- <h5 style="    width: auto;
     float: none;
     font-size: 30px;
     color: #c0a988;
     margin: 3px 0 6px;    line-height: 1;
     font-weight: bold;
-    letter-spacing: -.2px;font-family: 'Rajdhani';">{{ newsitem.releaseTime }}</h5>
+    letter-spacing: -.2px;font-family: 'Rajdhani';">{{ newsitem.releaseTime }}</h5> -->
               <div style="    color: rgba(115, 115, 124, .6);    font-size: 13px;
     color: #95959d;
     line-height: 24px;
@@ -83,7 +83,7 @@
 
         </div>
       </div>
-      <div class="index_2" style="padding-bottom: 90px;width: 80%;margin: 0 auto;">
+      <div class="index_2" style="padding-bottom: 135px;width: 80%;margin: 0 auto;">
         <div style="display: flex;">
           <div class="content2-left flow" style="position: relative;">
             <div>
@@ -100,7 +100,10 @@
     -webkit-box-orient: vertical;" class="textbox" v-html="hydata[textindex]?.content">
   
 </div>
-            <div style="color: skyblue;font-size: 50px;position: absolute;bottom: 0;"><span style="margin-right: 20px;cursor: pointer;" @click="back"><</span><span style="cursor: pointer;" @click="next">></span></div>
+            <!-- <div style="color: skyblue;font-size: 50px;position: absolute;bottom: 0;">
+              <span style="margin-right: 20px;cursor: pointer;" @click="back"><</span>
+              <span style="cursor: pointer;" @click="next">></span>
+            </div> -->
           </div>
           <div class="content2-right" style="cursor: pointer;">
             <div ref="swipe" class="swiper-container swiper7" style="height: 300px;">
@@ -112,8 +115,10 @@
 
           </div>
           <div class="swiper-pagination"></div>
+          <div class="swiper-button-prev" @click="back"></div><!--左箭头。如果放置在swiper外面，需要自定义样式。-->
+          <div class="swiper-button-next" @click="next"></div><!--右箭头。如果放置在swiper外面，需要自定义样式。-->
           <div style="position: relative;">
-        
+         
         </div>
         </div>
            
@@ -193,8 +198,8 @@
           <div class="swiper-wrapper swiper9">
             <div class="swiper-slide" v-for="item in achievementarr" :key="item.id"  v-if="item.state=='true'"
             @click="honorto(item.id)"
-              style="background-color: rgb(240,246,250);border-radius: 10px;padding: 40px;box-sizing: border-box;cursor: pointer;">
-              <img :src="item.picture" style=" width: 100%;margin: auto;"></div>
+              style="background-color: rgb(240,246,250);border-radius: 10px;padding: 20px;box-sizing: border-box;cursor: pointer;">
+              <img :src="item.picture" style=" width: 356px;height:239px ;margin: auto;"></div>
                     
           </div>
           <div class="swiper-pagination1" style="text-align: center;"></div>
@@ -274,7 +279,10 @@ export default {
           //   delay: 4100,
           //   disableOnInteraction: false,
           // },
-
+          navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+          },
         
         }
         )
diff --git a/src/views/detail.vue b/src/views/detail.vue
index bbf29fb..33c17fd 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -5,7 +5,7 @@
             <div class="content">
                 <div class="page_nav">
                     <div class="name">
-                        <a style="padding: 0;" href="news">新闻资讯</a> <a href="javascript:;">企业新闻</a>
+                        <a style="padding: 0;" href="news">新闻内容</a> <a href="javascript:;">企业新闻</a>
                     </div>
                     <div class="list" style="bottom:-15px">
                         <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -18,23 +18,25 @@
             </div>
         </div>
         <div class="Wrapper news_d">
-        <div class="content ql-editor" style="text-align: center;">
+        <div class="content ql-editor" style="">
             <div class="name">{{ name }}</div>
-            <div class="top-box">   <div class="date">{{time}}</div> </div>
+            <div class="top-box">  
+                 <div style="text-align: left;font-size: 14px;color: #999999;">发布时间:{{time}}</div>
+                 </div>
             <div class="divider "></div>
             <div class="cont" v-html="content"></div>
            </div>
-             
+            < <div style="width: 80%;margin: auto;text-align: right;    color: #333;font-weight: bold;font-size: 14px;cursor: pointer;" @click="changeto">返回列表</div>
                
                 <div class="con">
               
                 </div>
             </div>
         </div>
-
+        
 </template>
 <script>
-import { newsdetail } from '@/api';
+import { newsdetail,msgdetail } from '@/api';
 export default{
     data(){
         return{
@@ -44,15 +46,28 @@ export default{
         }
     },
     methods:{
-
+changeto(){
+    this.$router.push({path:'news'})
+}
     },
     mounted(){
-        newsdetail(this.$route.query).then((res)=>{
+
+        if(this.$route.query.type=='1'){
+           msgdetail({id:this.$route.query.id}).then((res)=>{
                 this.content=res.data.content
                 this.name=res.data.name
                 this.time=res.data.releaseTime
 
         })
+        }else{
+            newsdetail({id:this.$route.query.id}).then((res)=>{
+                this.content=res.data.content
+                this.name=res.data.name
+                this.time=res.data.releaseTime
+
+        })
+        }
+      
     },
 }
 </script>
@@ -60,7 +75,7 @@ export default{
  .divider {
     width: 100%;
     height: 3px;
-    background-color: #0059a7;
+    /* background-color: #0059a7; */
     position: static;
     margin-bottom: 28px;
 }
diff --git a/src/views/honordetail.vue b/src/views/honordetail.vue
index 54ee6ae..fa2ec84 100644
--- a/src/views/honordetail.vue
+++ b/src/views/honordetail.vue
@@ -9,18 +9,18 @@
                     </div>
                     <div class="list" style="bottom:-15px">
                         <el-tabs v-model="activeName" @tab-click="handleClick">
-                            <el-tab-pane label="荣誉详情" name="first"></el-tab-pane>
-                                                 
+                            <el-tab-pane label="荣誉详情" name="first"></el-tab-pane>                
                         </el-tabs>
-
                     </div>
                 </div>
             </div>
         </div>
         <div class="Wrapper news_d">
-        <div class="content ql-editor" style="text-align: center;">
+        <div class="content ql-editor" >
             <div class="name">{{ name }}</div>
-            <div class="top-box">   <div class="date">{{time}}</div> </div>
+            <div class="top-box"> 
+                <div style="text-align: left;font-size: 14px;color: #999999;">发布时间:{{time}}</div>
+                 </div>
             <div class="divider"></div>
             <div class="cont" v-html="content"></div>
            </div>
@@ -59,7 +59,7 @@ export default{
  .divider {
     width: 100%;
     height: 3px;
-    background-color: #0059a7;
+    /* background-color: #0059a7; */
     position: static;
     margin-bottom: 28px;
 }
diff --git a/src/views/news.vue b/src/views/news.vue
index ccbbc40..cd2f07f 100644
--- a/src/views/news.vue
+++ b/src/views/news.vue
@@ -5,12 +5,15 @@
             <div class="content">
                 <div class="page_nav">
                     <div class="name">
-                        <a style="padding: 0;" href="">新闻资讯</a> <a href="javascript:;">企业新闻</a>
+                        <a style="padding: 0;" href="">新闻内容</a>
                     </div>
                     <div class="list" style="bottom:-15px">
-                        <el-tabs v-model="activeName" >
-                            <el-tab-pane label="企业新闻" name="first"></el-tab-pane>
+                        <el-tabs v-model="activeName" @tab-click="handleClick">
+                             <el-tab-pane label="企业新闻" name="企业新闻"></el-tab-pane>
+                            <el-tab-pane label="新闻资讯" name="新闻资讯"></el-tab-pane>
+                           
                         </el-tabs>
+
                     </div>
                 </div>
             </div>
@@ -23,7 +26,7 @@
     <div @click="changeto(item.id)">
     <el-card :body-style="{ padding: '0px' }"  >
       <div class="card_img1 mark" :style="{ 'background-image': 'url(' + item.pic + ')' }"  >
-        <div class="date">{{item.releaseTime}}</div>
+        <!-- <div class="date">{{item.releaseTime}}</div> -->
       </div>
       <div>
         <div class="news_li_con"><div class="title">{{item.name}}</div> <div class="introduction" v-html="item.content"></div>  </div>
@@ -45,11 +48,11 @@
     margin-top: 15px;">
                     {{item.name}}
 </div>
-                <div style="font-size: 14px;
+                <!-- <div style="font-size: 14px;
                 margin-top: 7px;
     color: #ababab;">
                     {{item.releaseTime}}
-                </div>
+                </div> -->
                 
  <div style="font-size: 14px;
     color: #666666;
@@ -71,11 +74,11 @@
 </template>
 <script>
 import '@/assets/images/news1.png'
-import { getnews } from '@/api';
+import { getnews,getmsg} from '@/api';
 export default{
     data(){
         return{
-            activeName:'first',
+            activeName:'企业新闻',
             newshow:[],
             rest:[],
             newslist:[],
@@ -89,7 +92,7 @@ export default{
                   // 遍历数组，对每个对象的richText属性进行处理
                   res.data.content.forEach(item => {
   // 去除所有标签和空格
-  item.content = item.content.replace(/<[^>]+>/g, '').trim();
+  item.content = item.content?.replace(/<[^>]+>/g, '').trim();
 });   
            this.newslist=res.data.content
       
@@ -102,11 +105,43 @@ export default{
     },
     methods:{
         handleClick(){
+            this.rest=[]
+        if(this.activeName=='新闻资讯'){
+             getmsg({'page':0}).then((res)=>{
+        
+                  // 遍历数组，对每个对象的richText属性进行处理
+                  res.data.content.forEach(item => {
+  // 去除所有标签和空格
+  item.content = item.content?.replace(/<[^>]+>/g, '').trim();
+});   
+           this.newslist=res.data.content
+      
+           let arr=this.newslist.slice(0,3)
+               this.newshow=arr
 
+       })
+        }else if(this.activeName=='企业新闻'){
+            getnews({'page':0}).then((res)=>{
+        
+       
+        res.data.content.forEach(item => {
+
+item.content = item.content.replace(/<[^>]+>/g, '').trim();
+});   
+ this.newslist=res.data.content
+
+ let arr=this.newslist.slice(0,3)
+
+
+this.newshow=arr   
+
+})
+        }
         },
         addnews(){
             this.page=this.page+1
-            getnews({'page':this.page}).then((res)=>{
+            if(this.activeName=='新闻资讯'){
+                getmsg({'page':this.page}).then((res)=>{
                 //    console.log(res)
                 for(let i=0;i<res.data.content.length;i++){
                     res.data.content[i].content= res.data.content[i].content.replace(/<[^>]+>/g, '').trim();
@@ -117,11 +152,32 @@ export default{
                 }
                    
             })
+            }else if(this.activeName=='企业新闻'){
+                getnews({'page':this.page}).then((res)=>{
+                //    console.log(res)
+                for(let i=0;i<res.data.content.length;i++){
+                    res.data.content[i].content= res.data.content[i].content.replace(/<[^>]+>/g, '').trim();
+      
+      res.data.content[i].day=res.data.content[i].releaseTime.slice(-2)
+      res.data.content[i].year=res.data.content[i].releaseTime.slice(0,7)
+                    this.rest.push(res.data.content[i])
+                }
+                   
+            })
+            }
+            
         },
         changeto(id){
-            this.$router.push({
-             path:'/detail?id='+id
+            if(this.activeName=='新闻资讯'){
+                this.$router.push({
+             path:'/detail?type=1&&id='+id
     })
+            }else if(this.activeName=='企业新闻'){
+                this.$router.push({
+             path:'/detail?type=2&&id='+id
+    })
+            }
+           
     }
 }
 }
diff --git a/src/views/projectdetail.vue b/src/views/projectdetail.vue
index 069672e..46925b5 100644
--- a/src/views/projectdetail.vue
+++ b/src/views/projectdetail.vue
@@ -37,7 +37,9 @@
     <div style="width: 70%;">   
         <div class="content ql-editor" style="text-align: center;">
             <div class="name">{{ name }}</div>
-            <div class="top-box">   <div class="date">{{time}}</div> </div>
+            <div class="top-box">   
+                <!-- <div class="date">{{time}}</div>  -->
+        </div>
             <div class="divider"></div>
             <div class="cont" v-html="content"></div>
            </div>
diff --git a/src/views/recruit.vue b/src/views/recruit.vue
index 3c0dd3f..27fa744 100644
--- a/src/views/recruit.vue
+++ b/src/views/recruit.vue
@@ -13,44 +13,56 @@
         </div>
         <div class="content">
             <div style="height: 60px;"></div>
-            <div style="font-size: 26px;color:rgba(0,0,0,.6)">我们坚信</div>
-            <div style="color:rgba(60,115,164);font-size:34px">人力资源是公司的核心竞争力之一</div>
+            <div style="font-size: 26px;color:rgba(0,0,0,.6)">{{componyarr[0].titleUp}}</div>
+            <div style="color:rgba(60,115,164);font-size:34px">{{componyarr[0].sketchUp}}</div>
             <div style="height: 40px;"></div>
-            <div style="color: rgba(0,0,0,.6);line-height: 30px;">
-                对于中国建筑而言，最能体现竞争优势的一个方面就是拥有一大批忠诚于企业、 忠于事业、坚信团队利益高于个人利益，能够自我约束、自我激励和自我发 展的懂技术、
-会管理、擅营销的人才团队。
+            <div style="color: rgba(0,0,0,.6);line-height: 30px;"v-html="componyarr[0].contentUp">
+                 
+                
+                </div>
+            
 
                 <div style="height: 30px;"></div>
             <img src="@/assets/images/人才招聘.png" style="display: block;width: 100%;object-fit: contain;">
-        
-        </div>
+            <div style="height: 30px;"></div>
+    
         <div style="height: 60px;"></div>
-            <div style="font-size: 26px;color:rgba(0,0,0,.6)">我们将始终遵循</div>
-            <div style="color:rgba(60,115,164);font-size:34px;line-height: normal;">"事业留人、感情留人、待遇留人”和“关注个体”的基本人力资源管理理念
+            <div style="font-size: 26px;color:rgba(0,0,0,.6)">{{componyarr[0].titleIn}}</div>
+            <div style="color:rgba(60,115,164);font-size:34px;line-height: normal;">{{componyarr[0].sketchIn}}
 </div>
             <div style="height: 40px;"></div>
-            <div style="color: rgba(0,0,0,.6);line-height: 30px;">
-                并将这一理念贯彻于我们的各项人力资源管理政策当中，通过职业规划、教育培训和绩效考核的三个全员覆盖，建立与个人价值创造和能力结合、共享企业发展成果的薪
-酬激励机制，强化人才的吸引发展力度，更好地为企业发展提供强有力的人才支撑。      
-            <div style="height: 60px;"></div>
-        </div>
-      
-            <div style="font-size: 26px;color:rgba(0,0,0,.6)">我们将始终坚持</div>
-            <div style="color:rgba(60,115,164);font-size:34px;line-height: normal;">德才兼备、以德为先的用人原则
+            <div style="color: rgba(0,0,0,.6);line-height: 18px;" class="init" v-html="componyarr[0].contentIn">
+                    
+                </div>
+                <div style="height: 60px;"></div>
+            <div style="font-size: 26px;color:rgba(0,0,0,.6)">{{componyarr[0].titleDown}}</div>
+            <div style="color:rgba(60,115,164);font-size:34px;line-height: normal;">{{componyarr[0].sketchDown}}
 </div>
             <div style="height: 40px;"></div>
-            <div style="color: rgba(0,0,0,.6);line-height: 30px;">
-                尺有所短、寸有所长，我们不追求完人，而是遵循“用人所长”的理念。我们始终坚持“绩效原则”，通过“赛马机制”以“业绩论英雄”。
-唯一可以否定一个人的便是他的“品行”， 我们绝对不会使用“品行不端” 之人。
+            <div style="color: rgba(0,0,0,.6);line-height: 18px;" class="init" v-html="componyarr[0].contentDown">
+                   
 
-
-           
+                 
+                </div>
+                
             <div style="height: 100px;"></div>
         </div>
-        </div>
     </div>
 </template>
 <script>
+import { getcruit } from '@/api';
+export default{
+    data(){
+        return{
+            componyarr:[]
+        }
+    },
+    mounted(){
+        getcruit().then((res)=>{
+            this.componyarr=res.data  
+        })
+    }
+}
 </script>
 <style scoped>
 .content{