From bb81f1e59cac5758d9ddd52f23403416e0f68fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chhk=E2=80=9D?= <“hhk@mail.com”>
Date: Tue, 30 Jul 2024 15:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/officialWebsite/contact.vue     | 29 +++++++--------
 ruoyi-ui/src/views/officialWebsite/team.vue   | 37 ++++++++++---------
 2 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/ruoyi-ui/src/views/officialWebsite/contact.vue b/ruoyi-ui/src/views/officialWebsite/contact.vue
index b2adf55..45d1507 100644
--- a/ruoyi-ui/src/views/officialWebsite/contact.vue
+++ b/ruoyi-ui/src/views/officialWebsite/contact.vue
@@ -20,16 +20,17 @@
     <div class="contact">
       <div class="info">
         <!-- main -->
-        <div v-for="(item, index) in nav " :key=index>
+        <!-- <div v-for="(item, index) in nav " :key=index>
           <div class="about-conts-item1" v-if="currentActive == index">
             <div class="neirong" v-html="pageContextList[index]"></div>
           </div>
+        </div> -->
+
+        <div class="info-item" v-for="(item,index) in fourlist" :key="index">
+          <img :src="imgurl + item.contentImg" alt="">
+          <div class="p">{{item.contentTitle}}</div>
+          <div class="desc" v-html="item.contentDetail"></div>
         </div>
-<!--  <div class="info-item" v-for="(item,index) in fourlist" :key="index">-->
-<!--          <img :src=" imgurl + item.contentImg " alt="">-->
-<!--          <div class="p">{{item.contentTitle}}</div>-->
-<!--          <div class="desc" v-html="item.contentDetail"></div>-->
-<!--        </div>-->
 
       </div>
       <div class="map">
@@ -71,7 +72,7 @@ export default {
       isMounted: false,
     }
   },
-  mounted() {
+  created() {
     // 页面加载完毕调用
     this.initPageData();
   },
@@ -85,7 +86,7 @@ export default {
       if (this.currentActive == value) {
         return
       }
-      this.currentActive = value
+      this.currentActive = value;
     },
     initPageData() {
 
@@ -94,16 +95,12 @@ export default {
         "pageNum": 1,
         "pageSize": 10
       }
+      debugger;
       getPageColumn(routeParam).then(response => {
-        response.data.forEach(cloumnItem => {
-          this.nav.push(cloumnItem);
+      debugger;
 
-          let context = "";
-          cloumnItem.children.list.forEach(element => {
-            context += element.contentDetail;
-          });
-
-          this.pageContextList.push(context);
+        response.data[0].children.list.forEach(cloumnItem => {
+          this.fourlist.push(cloumnItem);
 
           // cloumnItem.categoryName
         });
diff --git a/ruoyi-ui/src/views/officialWebsite/team.vue b/ruoyi-ui/src/views/officialWebsite/team.vue
index c053328..913de9a 100644
--- a/ruoyi-ui/src/views/officialWebsite/team.vue
+++ b/ruoyi-ui/src/views/officialWebsite/team.vue
@@ -22,25 +22,20 @@
       </div>
     </div>
     <div class="about-conts">
-      <!-- main -->
-      <div v-for="(item, index) in nav " :key=index>
-        <div class="teaching-list" v-if="currentActive == index">
-          <div class="neirong" v-html="pageContextList[index]"></div>
-        </div>
-      </div>
 
       <!-- 教学成果 -->
-      <!-- <div class="ayptjs" v-if="currentActive == 1">
+      <div class="ayptjs" v-if="currentActive == 1">
         <div class="tt">教学成果</div>
         <div class="ayptjs-list">
-          <div class="item" v-for="(item, index) in 8">
+          <div class="item" v-for="(item, index) in teachingAchievements" :key="index" @click="showDetails(item)">
             <div class="img">
-              <img src="../../assets/gw/Snipaste_2024-07-23_22-51-23.jpg" alt="">
+              <img :src="imgurl + item.contentImg" alt="">
+              <!-- <img src="../../assets/gw/Snipaste_2024-07-23_22-51-23.jpg" alt=""> -->
             </div>
             <div class="text">
-              <div class="tts">人机工程仿真分析平台</div>
+              <div class="tts">{{item.contentTitle}}</div>
               <div class="desc">
-                人机工程学是一门涉及人体测量学、工业设计、工业工程、心理学、美学等多个领域的交叉学科，其研究目的是实现不同的作业中人、机器、环境三者间的协调。即运用上述学科的知识、研究方法、评价手段，对工作器具、工作方式和工作环境的设计进行分析，并提出改造建议，使得作业在效率、安全、健康、舒适等方面的性能得以有效提高。
+                <div class="desc" v-html="item.summary"></div>  
               </div>
             </div>
             <div class="more">
@@ -49,10 +44,10 @@
             </div>
           </div>
         </div>
-      </div> -->
+      </div>
 
       <!-- 教学团队 -->
-      <!-- <div class="team" v-if="currentActive == 0">
+      <div class="team" v-if="currentActive == 0">
         <div class="tt">教学团队</div>
         <div class="team-list">
           <div class="item" v-for="(item, index) in 8">
@@ -62,6 +57,13 @@
             <div class="tts">王尔特</div>
           </div>
         </div>
+      </div>
+
+            <!-- main -->
+      <!-- <div v-for="(item, index) in nav " :key=index>
+        <div class="teaching-list" v-if="currentActive == index">
+          <div class="neirong" v-html="pageContextList[index]"></div>
+        </div>
       </div> -->
 
 
@@ -89,7 +91,9 @@ export default {
   },
   data() {
     return {
+      imgurl: process.env.VUE_APP_BASE_API,
       pageContextList: [],
+      teachingAchievements:[],
       nav: [
         // { name: '教学团队' },
         // { name: '教学成果' },
@@ -99,7 +103,7 @@ export default {
 
     }
   },
-  mounted() {
+  created() {
     // 页面加载完毕调用
     this.initPageData();
   },
@@ -125,13 +129,10 @@ export default {
       getPageColumn(routeParam).then(response => {
         response.data.forEach(cloumnItem => {
           this.nav.push(cloumnItem);
-
-          let context = "";
           cloumnItem.children.list.forEach(element => {
-            context += element.contentDetail;
+            this.teachingAchievements.push(element);
           });
 
-          this.pageContextList.push(context);
 
           // cloumnItem.categoryName
         });