From ea09b5f0bf5b2d821152f3c90a7322da6be38d95 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 14 Apr 2023 16:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=97=BB=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/column/index.vue          | 110 +++++++++++++++++++---------
 src/pages/newsPress/index.vue       |   2 +-
 src/pages/newsProcurement/index.vue |   2 +-
 3 files changed, 79 insertions(+), 35 deletions(-)

diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index f7b1f39..4cd8806 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -63,36 +63,45 @@
 
             <div class="article-wrap">
               <ul class="articles">
-                <li v-for="(item, i) in articles" :key="i" @click="toArtice(item)">
-                  <div class="texts">
-                    <p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName"
-                      class="type">
-                      {{ item.classificationName }}
-                    </p>
-                    <h6>{{ item.title }}</h6>
-                    <template v-if="item.listStyleId === 11">
-                      <span class="meta">{{ item.releaseTime }}</span>
-                      <div class="des" v-html="item.mainBody"></div>
-                    </template>
-                    <span v-if="item.listStyleId === 10" class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
-                      item.labelName }}</span>
-                    <template v-if="item.listStyleId === 15 || item.listStyleId === 16">
-                      <div v-if="item.keynoteSpeaker" class="meta m-b-10">
-                        <img class="icon" src="@/assets/images/mine.png" alt="" /> {{ item.keynoteSpeaker }}
-                      </div>
-                      <div v-if="item.activityStartTime" class="meta m-b-10">
-                        <img class="icon" src="@/assets/images/time.png" alt="" />
-                        {{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
-                      </div>
-                      <div v-if="item.offlineLocation" class="meta m-b-10">
-                        <img class="icon" src="@/assets/images/location.png" alt="" /> {{ item.offlineLocation }}
-                      </div>
-                      <div v-if="item.onlineLocation" class="meta">
-                        <img class="icon" src="@/assets/images/online.png" alt="" /> {{ item.onlineLocation }}
-                      </div>
-                    </template>
-                  </div>
-                  <img class="pic" :src="item.titleImg" alt="" onerror="javascript:this.src='./images/1.png';" />
+                <li v-for="(item, i) in articles" :key="i" :class="{'news-notice': info.listStyleId === 55}" @click="toArtice(item)">
+                  <template v-if="info.listStyleId === 55">
+                    <div class="releaseTime">
+                      <p class="d">{{ item.date }}</p>
+                      <p class="m">{{ item.month }}</p>
+                    </div>
+                    <div class="news-title">{{ item.title }}</div>
+                  </template>
+                  <template v-else>
+                    <div class="texts">
+                      <p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName"
+                        class="type">
+                        {{ item.classificationName }}
+                      </p>
+                      <h6>{{ item.title }}</h6>
+                      <template v-if="item.listStyleId === 11">
+                        <span class="meta">{{ item.releaseTime }}</span>
+                        <div class="des" v-html="item.mainBody"></div>
+                      </template>
+                      <span v-if="item.listStyleId === 10" class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
+                        item.labelName }}</span>
+                      <template v-if="item.listStyleId === 15 || item.listStyleId === 16">
+                        <div v-if="item.keynoteSpeaker" class="meta m-b-10">
+                          <img class="icon" src="@/assets/images/mine.png" alt="" /> {{ item.keynoteSpeaker }}
+                        </div>
+                        <div v-if="item.activityStartTime" class="meta m-b-10">
+                          <img class="icon" src="@/assets/images/time.png" alt="" />
+                          {{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
+                        </div>
+                        <div v-if="item.offlineLocation" class="meta m-b-10">
+                          <img class="icon" src="@/assets/images/location.png" alt="" /> {{ item.offlineLocation }}
+                        </div>
+                        <div v-if="item.onlineLocation" class="meta">
+                          <img class="icon" src="@/assets/images/online.png" alt="" /> {{ item.onlineLocation }}
+                        </div>
+                      </template>
+                    </div>
+                    <img class="pic" :src="item.titleImg" alt="" onerror="javascript:this.src='./images/1.png';" />
+                  </template>
                 </li>
               </ul>
               <div v-if="articles.length" class="pagination">
@@ -154,7 +163,7 @@ export default {
       sameStyle: 1,
       allColumnId: [],
       showNav: false,
-      showNavIds: [10, 11, 12, 16], // 显示侧导航的模板id
+      showNavIds: [10, 11, 12, 16, 55], // 显示侧导航的模板id
       isFilter: false,
       page: 1,
       pageSize: 10,
@@ -435,7 +444,16 @@ export default {
         ...this.form
       })
         .then(({ data }) => {
-          this.articles = Util.removeTag(data.records);
+          const articles = Util.removeTag(data.records);
+          articles.forEach(e => {
+            // 把发布日期分割成年月和日，新闻中心-通知公告要展示
+            if (e.releaseTime) {
+              const date = e.releaseTime.split('-')
+              e.date = date[2]
+              e.month = date[0] + '/' + date[1]
+            }
+          })
+          this.articles = articles
           this.total = +data.total;
           // 如果栏目那勾选了“只有一篇文章时，以详情方式展示”，并且只有一篇文章，则跳转到详情页
           // this.total == 1 && this.info.showWithDetails && this.$router.push(`/article?articleId=${this.articles[0].id}&id=${this.articles[0].columnId}`)
@@ -751,7 +769,33 @@ export default {
       height: 244px;
     }
   }
-
+  .news-notice {
+    .releaseTime {
+      width: 88px;
+      height: 88px;
+      padding: 10px 0 16px;
+      margin-right: 24px;
+      color: #fff;
+      text-align: center;
+      background: #0B5086;
+    }
+    .d {
+      font-size: 2rem;
+      font-family: DINCondensed-Bold, DINCondensed;
+      font-weight: bold;
+      line-height: 43px;
+    }
+    .m {
+      font-size: .9rem;
+      line-height: 20px;
+    }
+    .news-title {
+      width: calc(100% - 110px);
+      font-size: 1.1rem;
+      color: #333;
+      line-height: 1.6;
+    }
+  }
   .right {
     width: 14%;
     min-width: 240px;
diff --git a/src/pages/newsPress/index.vue b/src/pages/newsPress/index.vue
index 54b3f39..e083ff1 100644
--- a/src/pages/newsPress/index.vue
+++ b/src/pages/newsPress/index.vue
@@ -89,7 +89,7 @@ export default {
     },
     // 获取上级面包屑
     getColumn() {
-      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}&isSort=1`).then(({ data }) => {
+      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}&isSort=1&siteId=${this.site}`).then(({ data }) => {
         this.getParent(data, this.id)
       }).catch(err => {})
     },
diff --git a/src/pages/newsProcurement/index.vue b/src/pages/newsProcurement/index.vue
index 4dd748f..bc7283a 100644
--- a/src/pages/newsProcurement/index.vue
+++ b/src/pages/newsProcurement/index.vue
@@ -89,7 +89,7 @@ export default {
     },
     // 获取上级面包屑
     getColumn() {
-      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}&isSort=1`).then(({ data }) => {
+      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}&isSort=1&siteId=${this.site}`).then(({ data }) => {
         this.getParent(data, this.id)
       }).catch(err => {})
     },