From 908a9d281edda850a9fcddd700beafd4c645f20e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chhk=E2=80=9D?= <“hhk@mail.com”>
Date: Mon, 29 Jul 2024 14:34:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/officialWebsite/about.vue  | 20 +++---
 .../src/views/officialWebsite/platform.vue    | 50 ++++++++-----
 .../src/views/officialWebsite/teaching.vue    | 72 +++++++++++++++++--
 ruoyi-ui/src/views/officialWebsite/team.vue   |  8 +--
 4 files changed, 114 insertions(+), 36 deletions(-)

diff --git a/ruoyi-ui/src/views/officialWebsite/about.vue b/ruoyi-ui/src/views/officialWebsite/about.vue
index dae216e..4d86731 100644
--- a/ruoyi-ui/src/views/officialWebsite/about.vue
+++ b/ruoyi-ui/src/views/officialWebsite/about.vue
@@ -47,9 +47,10 @@
       </div>
       <!-- 组织机构 -->
       <div class="about-conts-item2" v-if="currentActive == 1">
-        <div class="div" v-for="(item, index) in orgList">
+        <!-- <div class="div" v-for="(item, index) in orgList">
           {{ item.contentDetail }}
-        </div>
+        </div> -->
+        <div class="neirong" v-html="orgList"></div>
       </div>
 
       <!-- 现任领导 -->
@@ -67,7 +68,7 @@
             </div>
           </div>
         </div> -->
-        <div class="about-conts-item3-div">
+        <!-- <div class="about-conts-item3-div">
           <div class="left">
             主任
           </div>
@@ -92,7 +93,8 @@
               <div class="tt">钟离</div>
             </div>
           </div>
-        </div>
+        </div> -->
+        <div class="neirong" v-html="leaderList"></div>
       </div>
 
     </div>
@@ -243,7 +245,7 @@ export default {
       ],
       currentActive: 2,
       isMounted: false,
-      orgList:[],
+      orgList:"",
       postList:[],
 //       content: `<p style="box-sizing: inherit; text-align: justify; text-indent: 2em; margin-bottom: 5px; margin-top: 5px; line-height: 1.75em;">
 //     <span style="font-family: 微软雅黑, &quot;Microsoft YaHei&quot;; font-size: 18px;">淄博瑞安输变电工程有限公司成立于2006年，公司原属国网淄博供电公司下属施工企业，现为山东泉舜控股集团有限公司全资子公司，注册资本5000万元。公司设立于历史悠久的齐文化发祥地淄博市，并在济南、青岛、聊城、东营、潍坊、济宁、泰安、李庄、邯郸等各地设有分支机构。企业人才结构合理，大专以上学历及具有各种专业技术职称的近300余人，是一支经过国家电网公司多年锻造、专业技术强、电力工程施工经验丰富的的铁军队伍。<br/></span>
@@ -257,7 +259,8 @@ export default {
 // <p style="box-sizing: inherit; margin-top: 0px; text-align: justify; text-indent: 2em; margin-bottom: 5px; line-height: 1.75em;">
 //     <span style="box-sizing: inherit; font-family: 微软雅黑, MicrosoftYaHei;"></span><br/>
 // </p>`
-      content:""
+      content:"",
+      leaderList:"",
     }
   },
   computed: {
@@ -297,7 +300,8 @@ export default {
       };
       getPageData(organizational_structure_param).then(response => {
         response.data.list.forEach(element => {
-          this.orgList.push(element);
+          // this.orgList.push(element);
+          this.orgList += element.contentDetail;
         });
 
       });
@@ -309,7 +313,7 @@ export default {
       };
       getPageData(current_leader_param).then(response => {
         response.data.list.forEach(element => {
-          // this.content += element.contentDetail;
+          this.leaderList += element.contentDetail;
         });
 
       });
diff --git a/ruoyi-ui/src/views/officialWebsite/platform.vue b/ruoyi-ui/src/views/officialWebsite/platform.vue
index 24d8a86..ef28c6b 100644
--- a/ruoyi-ui/src/views/officialWebsite/platform.vue
+++ b/ruoyi-ui/src/views/officialWebsite/platform.vue
@@ -45,7 +45,7 @@
       <!-- 专业平台介绍 -->
       <div class="ayptjs" v-if="currentActive == 0">
         <div class="tt">专业平台介绍</div>
-        <div class="ayptjs-list">
+        <!-- <div class="ayptjs-list">
           <div class="item" v-for="(item, index) in 8">
             <div class="img">
               <img src="../../assets/gw/Snipaste_2024-07-23_22-51-23.jpg" alt="">
@@ -61,15 +61,15 @@
               <p>查看详情</p>
             </div>
           </div>
-        </div>
+        </div> -->
+        <div class="neirong" v-html="professionalResources"></div>
       </div>
 
       <!-- 软硬件资源介绍 -->
       <div class="about-conts-item1" v-if="currentActive == 1">
         <div class="neirong" v-html="content"></div>
       </div>
-
-
+      
     </div>
     <div class="index-footer">
       <div class="footer">
@@ -217,18 +217,20 @@ export default {
       ],
       currentActive: 0,
       isMounted: false,
-      content: `<p style="box-sizing: inherit; text-align: justify; text-indent: 2em; margin-bottom: 5px; margin-top: 5px; line-height: 1.75em;">
-    <span style="font-family: 微软雅黑, &quot;Microsoft YaHei&quot;; font-size: 18px;">淄博瑞安输变电工程有限公司成立于2006年，公司原属国网淄博供电公司下属施工企业，现为山东泉舜控股集团有限公司全资子公司，注册资本5000万元。公司设立于历史悠久的齐文化发祥地淄博市，并在济南、青岛、聊城、东营、潍坊、济宁、泰安、李庄、邯郸等各地设有分支机构。企业人才结构合理，大专以上学历及具有各种专业技术职称的近300余人，是一支经过国家电网公司多年锻造、专业技术强、电力工程施工经验丰富的的铁军队伍。<br/></span>
-</p>
-<p style="text-indent: 2em; margin-bottom: 5px; margin-top: 5px; line-height: 1.75em;">
-    <span style="font-family: 微软雅黑, &quot;Microsoft YaHei&quot;; font-size: 18px;">公司主要经营范围包括:220千伏及以下电力工程总承包施工，电力输配电线路架设施工，变电站电气设备安装，建筑物土建施工，城市及道路照明工程施工；高低压电气设备修试:电力技术咨询；输配变电电力线路设备巡视、维护、维修及带电作业服务；电力销售；房屋、设备、车辆租赁及新能源技术开发、技术转让、技术服务。</span>
-</p>
-<p style="text-indent: 2em; margin-bottom: 5px; margin-top: 5px; line-height: 1.75em;">
-    <span style="font-family: 微软雅黑, &quot;Microsoft YaHei&quot;; font-size: 18px;">公司秉承山东泉舜控股集团有限公司建设“泉心立业、舜势百年”的百年企业的美好愿景，坚持“专业、规范、服务、诚信、创新、实力”的经营宗旨，为广大客户提供“电保姆”式的电力全产业链服务！</span>
-</p>
-<p style="box-sizing: inherit; margin-top: 0px; text-align: justify; text-indent: 2em; margin-bottom: 5px; line-height: 1.75em;">
-    <span style="box-sizing: inherit; font-family: 微软雅黑, MicrosoftYaHei;"></span><br/>
-</p>`
+      professionalResources:"",
+      content:"",
+//       content: `<p style="box-sizing: inherit; text-align: justify; text-indent: 2em; margin-bottom: 5px; margin-top: 5px; line-height: 1.75em;">
+//     <span style="font-family: 微软雅黑, &quot;Microsoft YaHei&quot;; font-size: 18px;">淄博瑞安输变电工程有限公司成立于2006年，公司原属国网淄博供电公司下属施工企业，现为山东泉舜控股集团有限公司全资子公司，注册资本5000万元。公司设立于历史悠久的齐文化发祥地淄博市，并在济南、青岛、聊城、东营、潍坊、济宁、泰安、李庄、邯郸等各地设有分支机构。企业人才结构合理，大专以上学历及具有各种专业技术职称的近300余人，是一支经过国家电网公司多年锻造、专业技术强、电力工程施工经验丰富的的铁军队伍。<br/></span>
+// </p>
+// <p style="text-indent: 2em; margin-bottom: 5px; margin-top: 5px; line-height: 1.75em;">
+//     <span style="font-family: 微软雅黑, &quot;Microsoft YaHei&quot;; font-size: 18px;">公司主要经营范围包括:220千伏及以下电力工程总承包施工，电力输配电线路架设施工，变电站电气设备安装，建筑物土建施工，城市及道路照明工程施工；高低压电气设备修试:电力技术咨询；输配变电电力线路设备巡视、维护、维修及带电作业服务；电力销售；房屋、设备、车辆租赁及新能源技术开发、技术转让、技术服务。</span>
+// </p>
+// <p style="text-indent: 2em; margin-bottom: 5px; margin-top: 5px; line-height: 1.75em;">
+//     <span style="font-family: 微软雅黑, &quot;Microsoft YaHei&quot;; font-size: 18px;">公司秉承山东泉舜控股集团有限公司建设“泉心立业、舜势百年”的百年企业的美好愿景，坚持“专业、规范、服务、诚信、创新、实力”的经营宗旨，为广大客户提供“电保姆”式的电力全产业链服务！</span>
+// </p>
+// <p style="box-sizing: inherit; margin-top: 0px; text-align: justify; text-indent: 2em; margin-bottom: 5px; line-height: 1.75em;">
+//     <span style="box-sizing: inherit; font-family: 微软雅黑, MicrosoftYaHei;"></span><br/>
+// </p>`
     }
   },
   computed: {
@@ -236,7 +238,6 @@ export default {
   },
   mounted() {
     // 页面加载完毕调用
-    debugger;
     this.initPageData();
   },
 
@@ -248,6 +249,7 @@ export default {
       }
       this.currentActive = value
     },
+
     initPageData() {
       let param = {
         "categoryId": "1813827750121836544",
@@ -258,9 +260,19 @@ export default {
         response.data.list.forEach(element => {
           this.content += element.contentDetail;
         });
-
-        
       })
+      
+      let professionalResourcesParam = {
+        "categoryId": "1816771598271778816",
+        "pageNum": 1,
+        "pageSize": 10
+      }
+      getPageData(professionalResourcesParam).then(response => {
+        response.data.list.forEach(element => {
+          this.professionalResources += element.contentDetail;
+        });
+      })
+
     },
   }
 
diff --git a/ruoyi-ui/src/views/officialWebsite/teaching.vue b/ruoyi-ui/src/views/officialWebsite/teaching.vue
index 135c23f..e348a09 100644
--- a/ruoyi-ui/src/views/officialWebsite/teaching.vue
+++ b/ruoyi-ui/src/views/officialWebsite/teaching.vue
@@ -40,9 +40,11 @@
         </div>
       </div>
     </div>
-    <div class="teaching">
-      <div class="teaching-list">
-        <div class="item" v-for="(item, index) in 8">
+    <div class="teaching" v-bind:class="[currentActive == 0 ? 'bj' : '']">
+
+      <!-- 教学大纲 -->
+      <div class="teaching-list" v-if="currentActive == 0">
+        <!-- <div class="item" v-for="(item, index) in 8">
           <div class="img">
             <img src="../../assets/gw/Snipaste_2024-07-23_22-51-23.jpg" alt="" class="imgWO">
           </div>
@@ -52,8 +54,20 @@
             <div class="btn">在线预览</div>
             <p>资源下载</p>
           </div>
-        </div>
+        </div> -->
+        <div class="neirong" v-html="syllabus"></div>
       </div>
+
+      <!-- 实验指导书 -->
+      <div class="teaching-list" v-if="currentActive == 1">
+        <div class="neirong" v-html="guideBook"></div>
+      </div>
+
+      <!-- 资源共享 -->
+      <div class="teaching-list" v-if="currentActive == 2">
+        <div class="neirong" v-html="resourceSharing"></div>
+      </div>
+
       <div class="page"><el-pagination background layout="prev, pager, next" :total="1000" class="">
         </el-pagination></div>
 
@@ -172,6 +186,7 @@
 <script>
 import { Swiper, SwiperSlide } from "vue-awesome-swiper";
 import "swiper/css/swiper.min.css";
+import { getPageData } from "@/api/officialWebsite/getPageData";
 export default {
   components: {
     Swiper,
@@ -203,9 +218,16 @@ export default {
         { name: '资源共享' },
       ],
       currentActive: 2,
+      resourceSharing:"",
+      guideBook:"",
+      syllabus:"",
 
     }
   },
+  mounted() {
+    // 页面加载完毕调用
+    this.initPageData();
+  },
   computed: {
 
   },
@@ -217,7 +239,43 @@ export default {
         return
       }
       this.currentActive = value
-    }
+    },
+    initPageData() {
+      //资源共享
+      let resourceSharingParam = {
+        "categoryId": "1816771402032877568",
+        "pageNum": 1,
+        "pageSize": 10
+      }
+      getPageData(resourceSharingParam).then(response => {
+        response.data.list.forEach(element => {
+          this.resourceSharing += element.contentDetail;
+        });
+      })
+      //实验指导书
+      let guideBookParam = {
+        "categoryId": "1813828546838269952",
+        "pageNum": 1,
+        "pageSize": 10
+      }
+      getPageData(guideBookParam).then(response => {
+        response.data.list.forEach(element => {
+          this.guideBook += element.contentDetail;
+        });
+      })
+      //教学大纲
+      let syllabusParam = {
+        "categoryId": "1813828322673692672",
+        "pageNum": 1,
+        "pageSize": 10
+      }
+      getPageData(syllabusParam).then(response => {
+        response.data.list.forEach(element => {
+          this.syllabus += element.contentDetail;
+        });
+      })
+
+    },
   }
 
 }
@@ -623,4 +681,8 @@ export default {
   line-height: 18px;
 
 }
+
+.about-conts {
+  padding: 40px 0;
+}
 </style>
diff --git a/ruoyi-ui/src/views/officialWebsite/team.vue b/ruoyi-ui/src/views/officialWebsite/team.vue
index e1e2f95..df5117e 100644
--- a/ruoyi-ui/src/views/officialWebsite/team.vue
+++ b/ruoyi-ui/src/views/officialWebsite/team.vue
@@ -45,7 +45,7 @@
       <!-- 教学成果 -->
       <div class="ayptjs" v-if="currentActive == 1">
         <div class="tt">教学成果</div>
-        <div class="ayptjs-list">
+        <!-- <div class="ayptjs-list">
           <div class="item" v-for="(item, index) in 8">
             <div class="img">
               <img src="../../assets/gw/Snipaste_2024-07-23_22-51-23.jpg" alt="">
@@ -61,20 +61,20 @@
               <p>查看详情</p>
             </div>
           </div>
-        </div>
+        </div> -->
       </div>
 
       <!-- 教学团队 -->
       <div class="team" v-if="currentActive == 0">
         <div class="tt">教学团队</div>
-        <div class="team-list">
+        <!-- <div class="team-list">
           <div class="item" v-for="(item, index) in 8">
             <div class="img">
               <img src="../../assets/gw/Snipaste_2024-07-23_22-51-23.jpg" alt="" class="imgWO">
             </div>
             <div class="tts">王尔特</div>
           </div>
-        </div>
+        </div> -->
       </div>