From d62ff99e0378ab544ff671af5b934bdb580a6791 Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Sun, 3 Mar 2024 12:46:51 +0800
Subject: [PATCH] news

---
 src/components/WebsiteHeader/index.vue |   4 +-
 src/i18n/message/home/ru.js            |   6 +
 src/i18n/message/home/zh.js            |   6 +
 src/views/website/home/comp/index0.vue |   8 +-
 src/views/website/home/comp/index8.vue |   2 +
 src/views/website/home/comp/index9.vue | 159 +++++++++++++++----------
 src/views/website/home/index.vue       |  44 +++----
 vite.config.js                         |   4 +-
 8 files changed, 142 insertions(+), 91 deletions(-)

diff --git a/src/components/WebsiteHeader/index.vue b/src/components/WebsiteHeader/index.vue
index 8af9bef..390aa93 100644
--- a/src/components/WebsiteHeader/index.vue
+++ b/src/components/WebsiteHeader/index.vue
@@ -5,7 +5,7 @@
       <span>{{ t('common.siteTitle') }}</span>
     </div>
     <el-row style="height: 80px">
-      <el-col :span="16">
+      <el-col :span="20">
         <ul class="menu">
           <li class="menu-item1">
             <div
@@ -298,7 +298,7 @@ dt {
   left: 0;
   width: 100%;
   //height: 80px;
-  padding: 0 260px;
+  padding: 0 120px;
   box-sizing: border-box;
   background: #ffffff;
   box-shadow: 0px 0px 43px 0px rgba(0, 42, 255, 0.09);
diff --git a/src/i18n/message/home/ru.js b/src/i18n/message/home/ru.js
index a64d2c5..acfb68c 100644
--- a/src/i18n/message/home/ru.js
+++ b/src/i18n/message/home/ru.js
@@ -20,5 +20,11 @@ const home = {
   memberServiceContent: "Содержание услуг для членов",
   // 是否确认解绑实验室
   unbindLab: "Вы уверены, что хотите отвязать лабораторию?",
+  // 新闻动态
+  news: "Новости",
+  // 政策解读
+  policyAnalyzing: "анализ политики",
+  // 通知公告
+  announcement: "объявление"
 };
 export default home;
diff --git a/src/i18n/message/home/zh.js b/src/i18n/message/home/zh.js
index 63eea2b..f417e73 100644
--- a/src/i18n/message/home/zh.js
+++ b/src/i18n/message/home/zh.js
@@ -16,6 +16,12 @@ const home = {
   memberServiceContent: "会员服务内容",
   // 是否确认解绑实验室
   unbindLab: "是否确认解绑实验室",
+  // 新闻动态
+  news: "新闻动态",
+  // 政策解读
+  policyAnalyzing: "政策解读",
+  // 通知公告
+  announcement: "通知公告"
 };
 
 export default home;
diff --git a/src/views/website/home/comp/index0.vue b/src/views/website/home/comp/index0.vue
index 96aa349..b5adbc0 100644
--- a/src/views/website/home/comp/index0.vue
+++ b/src/views/website/home/comp/index0.vue
@@ -549,13 +549,13 @@ watch(mapIndex, (newVal, oldVal) => {
         z-index: 101;
 
         &.area {
-          top: 200px;
-          left: 120px;
+          top: 60px;
+          left: 60px;
         }
 
         &.industry {
-          top: 200px;
-          right: 120px;
+          top: 60px;
+          right: 60px;
         }
 
         .table {
diff --git a/src/views/website/home/comp/index8.vue b/src/views/website/home/comp/index8.vue
index 2d5d95e..b9b27b2 100644
--- a/src/views/website/home/comp/index8.vue
+++ b/src/views/website/home/comp/index8.vue
@@ -108,6 +108,7 @@ getInfo();
     }
 
     .tit {
+      visibility: hidden;
       text-align: center;
       font-size: 30px;
       font-family: Source Han Sans CN;
@@ -116,6 +117,7 @@ getInfo();
     }
 
     .content {
+      visibility: hidden;
       font-size: 16px;
       font-family: Source Han Sans CN;
       font-weight: 500;
diff --git a/src/views/website/home/comp/index9.vue b/src/views/website/home/comp/index9.vue
index c149c17..f173fde 100644
--- a/src/views/website/home/comp/index9.vue
+++ b/src/views/website/home/comp/index9.vue
@@ -1,91 +1,128 @@
 <script setup>
-import {reactive, ref, toRefs} from "vue";
-import {listNews} from "@/api/website/home/news";
+import { reactive, ref, toRefs } from "vue";
+import { listNews } from "@/api/website/home/news";
 import Pagination from "@/components/Pagination/index.vue";
+import { useI18n } from "vue-i18n";
+const { t, locale } = useI18n();
+const file_base_url = `${import.meta.env.VITE_APP_BASE_API}/file`;
+const total = ref(0);
+const newsList = ref([]);
 
-const file_base_url = `${import.meta.env.VITE_APP_BASE_API}/file`
-const total = ref(0)
-const newsList = ref([])
 const data = reactive({
+  latestNews: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 4,
-    classification: "0"
-  }
-})
+    pageSize: 8,
+    classification: "0",
+  },
+});
 
-const {queryParams} = toRefs(data)
+const { queryParams, latestNews } = toRefs(data);
 const getList = () => {
-  listNews(queryParams.value).then(resp => {
-    newsList.value = resp.rows
-    total.value = resp.total
-  })
-}
+  listNews(queryParams.value).then((resp) => {
+    newsList.value = resp.rows;
+    total.value = resp.total;
+  });
+};
+
+const getLatestNews = () => {
+  listNews({ pageNum: 1, pageSize: 1 }).then((resp) => {
+    if (resp.total) {
+      latestNews.value = resp.rows[0];
+    }
+  });
+};
+getLatestNews();
+
 const handleTabChange = (tab) => {
-  queryParams.value.classification = tab
-  getList()
-}
-getList()
+  queryParams.value.classification = tab;
+  getList();
+};
+getList();
 </script>
 
 <template>
-  <div class="app-container" style="height: 100%">
-    <el-tabs @tab-change="handleTabChange" v-model="queryParams.classification">
-      <el-tab-pane name="0" label="新闻"></el-tab-pane>
-      <el-tab-pane name="1" label="政策"></el-tab-pane>
-    </el-tabs>
+  <div class="news-container" style="height: 100%">
+    <div class="left">
+      <img class="cover-image" :src="`${file_base_url}${latestNews?.cover}`" />
+      <p class="title">{{ latestNews?.title }}</p>
+    </div>
+    <div class="right">
+      <el-tabs
+        @tab-change="handleTabChange"
+        v-model="queryParams.classification"
+      >
+        <el-tab-pane name="0" :label="t('home.news')"></el-tab-pane>
+        <el-tab-pane name="1" :label="t('home.policyAnalyzing')"></el-tab-pane>
+        <el-tab-pane name="2" :label="t('home.announcement')"></el-tab-pane>
+      </el-tabs>
+      <ul class="news-list">
+        <li class="news-item" v-for="news in newsList" :key="news.id">
+          <span class="title">{{
+            locale === "zh" ? news.title : locale === "ru" ? news.titleRu : null
+          }}</span>
+          <span class="time">
+            {{ news.create_time }}
+          </span>
+        </li>
+      </ul>
+    </div>
 
-    <div class="news-list">
+    <!-- <div class="news-list">
       <div class="news-item" v-for="item in newsList">
-        <img class="news-cover" alt="cover" :src="`${file_base_url}/${item.cover}`"/>
+        <img
+          class="news-cover"
+          alt="cover"
+          :src="`${file_base_url}/${item.cover}`"
+        />
 
         <p class="news-content">
           {{ item.content }}
         </p>
       </div>
     </div>
+  -->
     <!--    <pagination :total="total"/>-->
   </div>
 </template>
 
 <style scoped lang="scss">
-.app-container {
+.news-container {
+  padding: 20px;
   display: flex;
-  flex-direction: column;
-
-  .news-list {
-    align-items: start;
-    //flex: 1;
-    //display: grid;
-    //grid-template-columns: repeat(2, minmax(0, 1fr));
-    //grid-template-rows: repeat(2, minmax(0, 1fr));
-    //gap: 16px;
-    //padding: 12px;
-    display: flex;
-    flex-wrap: wrap;
-    align-content: flex-start;
-    height: calc(100vh - 240px);
-
-    .news-item {
-      display: flex;
-      justify-content: space-between;
-      padding: 12px;
-      width: 50%;
-      height: 50%;
-
-      .news-cover {
-        flex: 2;
-        width: 80%;
-        height: 100%;
-        object-fit: cover;
-      }
-
-      .news-content {
-        overflow-y: hidden;
-        flex: 3;
-        margin-left: 16px;
+  .left {
+    flex: 4;
+    height: 100%;
+    // display: flex;
+    // flex-direction: column;
+    // justify-content: center;
+    .cover-image {
+      width: 100%;
+      aspect-ratio: 4/3;
+      object-fit: cover;
+    }
+    .title {
+      text-align: center;
+      font-size: 20px;
+      font-weight: bold;
+      margin-top: 12px;
+      margin-bottom: 0;
+    }
+  }
+  .right {
+    flex: 4;
+    margin-left: 12px;
+    height: 100%;
+    padding: 12px;
+    .news-list {
+      .news-item {
+        list-style: disc;
+        height: 40px;
+        display: flex;
+        align-items: center;
+        cursor: pointer;
       }
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/website/home/index.vue b/src/views/website/home/index.vue
index 8d35f6e..1f11d47 100644
--- a/src/views/website/home/index.vue
+++ b/src/views/website/home/index.vue
@@ -2,33 +2,33 @@
   <div ref="fullPageRef" v-loading="loading" class="fullPage">
     <div class="indicator">
       <div
-          v-for="idx in 7"
-          :id="idx.toString()"
-          :key="idx"
-          :class="`${indicatorActiveIndex === idx ? 'active' : ''}`"
-          class="point"
-          @click="handleIndicatorClick(idx)"
+        v-for="idx in 7"
+        :id="idx.toString()"
+        :key="idx"
+        :class="`${indicatorActiveIndex === idx ? 'active' : ''}`"
+        class="point"
+        @click="handleIndicatorClick(idx)"
       ></div>
     </div>
     <div
-        ref="fullPageContainerRef"
-        :data-index="state.fullpage.current"
-        class="fullPageContainer"
-        @mousewheel="mouseWheelHandle"
+      ref="fullPageContainerRef"
+      :data-index="state.fullpage.current"
+      class="fullPageContainer"
+      @mousewheel="mouseWheelHandle"
     >
       <!-- @DOMMouseScroll="mouseWheelHandle" -->
       <div
-          v-for="(item, $index) in state.boxList"
-          :key="$index"
-          :style="`z-index: ${item.zIndex};`"
-          class="section"
+        v-for="(item, $index) in state.boxList"
+        :key="$index"
+        :style="`z-index: ${item.zIndex};`"
+        class="section"
       >
         <!-- v-if="`index${state.fullpage.current}` == item.title" -->
         <component
-            :is="item.comp"
-            v-if="Math.abs(state.fullpage.current - ($index + 1)) <= 1"
-            :map-index="mapIndex"
-            @changeMapIndex="mapIndex = $event"
+          :is="item.comp"
+          v-if="Math.abs(state.fullpage.current - ($index + 1)) <= 1"
+          :map-index="mapIndex"
+          @changeMapIndex="mapIndex = $event"
         ></component>
       </div>
     </div>
@@ -52,7 +52,7 @@
 </template>
 
 <script setup>
-import {computed, onMounted, reactive, ref, shallowRef} from "vue";
+import { computed, onMounted, reactive, ref, shallowRef } from "vue";
 import index0 from "./comp/index0.vue";
 import index1 from "./comp/index1.vue";
 import index8 from "./comp/index8.vue";
@@ -68,8 +68,8 @@ const mapIndex = ref(0); // 0-3
 const mapRef = ref();
 onMounted(() => {
   fullPageContainerRef.value.addEventListener(
-      "DOMMouseScroll",
-      mouseWheelHandle
+    "DOMMouseScroll",
+    mouseWheelHandle
   );
 });
 // onUnmounted(() => {
@@ -180,7 +180,7 @@ const indicatorActiveIndex = computed(() => {
   if (state.fullpage.current === 1) {
     return 1;
   } else if (state.fullpage.current === 2) {
-    return 2
+    return 2;
   } else if (state.fullpage.current === 3) {
     return mapIndex.value + 3;
   } else {
diff --git a/vite.config.js b/vite.config.js
index 79c263d..58ab1f6 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -32,8 +32,8 @@ export default defineConfig(({mode, command}) => {
                 // https://cn.vitejs.dev/config/#server-proxy
                 "/dev-api": {
                     // target: "http://101.34.131.16:1618",
-                    // target: "http://129.211.170.150/api",
-                    target: "http://192.168.0.200:1619",
+                    target: "http://129.211.170.150/api",
+                    // target: "http://192.168.0.200:1619",
                     // target: 'http://172.18.3.127:1618',
                     changeOrigin: true,
                     rewrite: (p) => p.replace(/^\/dev-api/, ""),