From 419e877993c06c36abffb66abd4d9fb2ccf08927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Tue, 26 Oct 2021 15:58:47 +0800
Subject: [PATCH] up

---
 src/components/Pagination/index.vue   |  24 ++--
 src/views/components/footer/index.vue |   8 +-
 src/views/customerService.vue         |   2 +-
 src/views/home/achievements.vue       | 158 ++++++++++++++++----------
 src/views/home/demand.vue             |   2 +-
 src/views/home/home.vue               |  25 ++++
 src/views/home/news.vue               |   2 +-
 src/views/home/notice.vue             |   6 +-
 src/views/home/ollection.vue          |   2 +-
 src/views/portrait.vue                |  16 ++-
 src/views/result.vue                  |   2 +-
 11 files changed, 157 insertions(+), 90 deletions(-)

diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index c815e13..af652cc 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="{'hidden':hidden}" class="pagination-container">
+  <div :class="{ hidden: hidden }" class="pagination-container">
     <el-pagination
       :background="background"
       :current-page.sync="currentPage"
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { scrollTo } from '@/utils/scroll-to'
+import { scrollTo } from '@/utils/scroll-to';
 
 export default {
   name: 'Pagination',
@@ -35,7 +35,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [15, 30, 50];
       }
     },
     layout: {
@@ -58,36 +58,36 @@ export default {
   computed: {
     currentPage: {
       get() {
-        return this.page
+        return this.page;
       },
       set(val) {
-        this.$emit('update:page', val)
+        this.$emit('update:page', val);
       }
     },
     pageSize: {
       get() {
-        return this.limit
+        return this.limit;
       },
       set(val) {
-        this.$emit('update:limit', val)
+        this.$emit('update:limit', val);
       }
     }
   },
   methods: {
     handleSizeChange(val) {
-      this.$emit('pagination', { page: this.currentPage, limit: val })
+      this.$emit('pagination', { page: this.currentPage, limit: val });
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        scrollTo(0, 800);
       }
     },
     handleCurrentChange(val) {
-      this.$emit('pagination', { page: val, limit: this.pageSize })
+      this.$emit('pagination', { page: val, limit: this.pageSize });
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        scrollTo(0, 800);
       }
     }
   }
-}
+};
 </script>
 
 <style scoped>
diff --git a/src/views/components/footer/index.vue b/src/views/components/footer/index.vue
index 5c64396..4caee00 100644
--- a/src/views/components/footer/index.vue
+++ b/src/views/components/footer/index.vue
@@ -76,10 +76,10 @@ export default {
   },
   created() {
     if (!this.flag) return false;
-    getRead({ id: 1 }).then(({ data }) => {
-      this.totalNum = data.count;
-      this.goldNum = data.today;
-    });
+    // getRead({ id: 1 }).then(({ data }) => {
+    //   this.totalNum = data.count;
+    //   this.goldNum = data.today;
+    // });
   }
 };
 </script>
diff --git a/src/views/customerService.vue b/src/views/customerService.vue
index 33517d3..e0f8d76 100644
--- a/src/views/customerService.vue
+++ b/src/views/customerService.vue
@@ -71,7 +71,7 @@ export default {
       queryParams: {
         userId: '1385154178159804416',
         pageNum: 1,
-        pageSize: 10
+        pageSize: 15
       },
       msgTotal: 0,
       // 待发送信息
diff --git a/src/views/home/achievements.vue b/src/views/home/achievements.vue
index e149edd..1a482f6 100644
--- a/src/views/home/achievements.vue
+++ b/src/views/home/achievements.vue
@@ -61,40 +61,43 @@
         </div>
         <!-- 检索列表 -->
         <div class="screen_l_b">
-          <div v-for="item in listData" :key="item.id">
+          <div class="screen_item" v-for="item in listData" :key="item.id">
             <router-link
+              class="box_item"
               target="_blank"
               :to="{
                 path: '/result',
                 query: { key: 'scienceResult', id: item.id }
               }"
             >
-              <div class="screen_item">
-                <div class="screen_item_l">
-                  <img :src="item.picList[0]" alt="" />
-                </div>
-                <div class="screen_item_r">
-                  <div class="title">{{ item.title }}</div>
-                  <div class="text_hidden_two text" v-html="item.text"></div>
-                  <div class="tags">
-                    <el-tag type="warning" effect="dark">
-                      {{ item.fieldName }}
-                    </el-tag>
-                    <el-tag type="warning" effect="dark">
-                      {{ item.maturityName }}
-                    </el-tag>
-                    <el-tag type="warning" effect="dark">
-                      {{ item.labelName }}
-                    </el-tag>
-                  </div>
-                  <div class="time">
-                    {{ parseTime(item.createTime, '{y}-{m}-{d}') }}发布
-                  </div>
+              <div class="title text_hidden_two">
+                <span style="text-align:left">{{ item.title }}</span>
+              </div>
+
+              <div v-html="item.text" class="text text_hidden_four"></div>
+              <!-- <div class="time">
+                {{ parseTime(item.createTime, '{y}-{m}-{d}') }}发布
+              </div> -->
+              <div class="tags">
+                <div>
+                  <el-tag size="mini" effect="dark">{{
+                    item.fieldName
+                  }}</el-tag>
+                  <el-tag size="mini" effect="dark">{{
+                    item.maturityName
+                  }}</el-tag>
+                  <el-tag size="mini" effect="dark">{{
+                    item.labelName
+                  }}</el-tag>
                 </div>
               </div>
+              <span class="txt">{{
+                parseTime(item.createTime, '{y}-{m}-{d}')
+              }}</span>
             </router-link>
           </div>
         </div>
+
         <div style="text-align: center;margin:30px 0" v-show="!total">
           <div style="height:210px;display: inline-block;color:#999">
             <img
@@ -106,13 +109,24 @@
           </div>
         </div>
         <!-- 分页 -->
-        <pagination
+        <el-pagination
+          v-show="total > 0"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="queryParams.pageNum"
+          :page-sizes="[8, 16, 24]"
+          :page-size="queryParams.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
+        <!-- <pagination
           v-show="total > 0"
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
-        />
+        /> -->
       </div>
     </div>
   </div>
@@ -127,7 +141,7 @@ export default {
       loading: true,
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 8,
         title: '',
         field: '',
         maturityId: '', // 成熟度id
@@ -164,8 +178,14 @@ export default {
       });
     },
     handleClick() {},
-    handleSizeChange() {},
-    handleCurrentChange() {}
+    handleSizeChange(val) {
+      this.queryParams.pageSize = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.queryParams.pageNum = val;
+      this.getList();
+    }
   },
   created() {
     // 技术领域
@@ -256,53 +276,69 @@ export default {
         }
       }
       .screen_l_b {
-        // margin-top: 10px;
-        // padding: 10px 0;
-        // display: flex;
-        // flex-wrap: wrap;
-        // justify-content: flex-start;
+        margin-top: 10px;
+        padding: 10px 0;
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
         .screen_item {
-          cursor: pointer;
-          display: flex;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: space-between;
+          width: calc((100% - 30px) / 4);
+          // height: 292px;
+          margin-right: 10px;
+          box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.08);
           border: 1px solid #ffa32c;
-          padding: 15px;
-          margin-top: 15px;
-          .screen_item_l {
-            width: 300px;
-            height: 160px;
-            img {
-              width: 100%;
-              height: 100%;
-            }
-          }
-          .screen_item_r {
-            width: calc(100% - 225px);
-            margin-left: 15px;
+          margin-bottom: 10px;
+          cursor: pointer;
+          border-radius: 6px;
+          overflow: hidden;
+          padding: 10px;
+          .box_item {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: 100%;
             .title {
-              font-size: 18px;
-              font-weight: bold;
-              color: #ffa32c;
-              padding: 10px 0;
               text-align: left;
-            }
-            .text {
-              font-size: 14px;
-              line-height: 20px;
-              color: #999;
+              font-size: 16px;
+              font-weight: bold;
+              color: #333;
             }
             .tags {
-              margin-top: 15px;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              font-size: 14px;
+              margin-top: 10px;
               .el-tag {
-                margin-right: 15px;
+                margin-right: 10px;
               }
             }
-            .time {
-              font-size: 14px;
-              color: #999;
+            .txt {
               text-align: right;
+              margin-top: 5px;
+              color: #999;
+            }
+            .text {
+              min-height: 124px;
+              // max-height: 134px;
+              font-size: 14px;
+              color: #666;
+              line-height: 27px;
+            }
+            .time {
+              margin-top: 20px;
+              text-align: right;
+              font-size: 16px;
+              color: #999;
             }
           }
         }
+        .screen_item:nth-of-type(4n + 0) {
+          margin-right: 0;
+        }
       }
       .el-pagination {
         text-align: right;
diff --git a/src/views/home/demand.vue b/src/views/home/demand.vue
index aaf5a80..a5a7691 100644
--- a/src/views/home/demand.vue
+++ b/src/views/home/demand.vue
@@ -97,7 +97,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="queryParams.pageNum"
-          :page-sizes="[8, 16, 24, 32]"
+          :page-sizes="[8, 16, 24]"
           :page-size="queryParams.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"
diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index ba67803..3e3f545 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -489,6 +489,12 @@
         </div>
       </div>
     </div>
+
+    <div ref="myBox" style="height:345px;overflow:hidden">
+      <div class="row" style="display:flex">
+        <div v-for="item in 100" :key="item">{{ item }}</div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -551,9 +557,28 @@ export default {
     getAboutUs().then(res => {
       this.aboutInfo = res.data;
     });
+  },
+  mounted() {
+    console.log(this.$refs.myBox);
   }
 };
 </script>
+<style scoped>
+.row {
+  position: relative;
+  animation: 20s mymove infinite linear;
+  animation-iteration-count: infinite;
+  /* animation-timing-function: linear; */
+}
+@keyframes mymove {
+  from {
+    left: 0px;
+  }
+  to {
+    left: -100%;
+  }
+}
+</style>
 <style lang="scss" scoped>
 // /deep/.el-carousel__button {
 //   width: 8px;
diff --git a/src/views/home/news.vue b/src/views/home/news.vue
index 257b742..685813b 100644
--- a/src/views/home/news.vue
+++ b/src/views/home/news.vue
@@ -54,7 +54,7 @@ export default {
     return {
       queryParams: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 15
       },
       total: 0,
       newsList: []
diff --git a/src/views/home/notice.vue b/src/views/home/notice.vue
index 68e5bb3..78c4bc7 100644
--- a/src/views/home/notice.vue
+++ b/src/views/home/notice.vue
@@ -245,7 +245,7 @@ export default {
       city: '', // 临时城市
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 15,
         city: '',
         attribute: '',
         labelId: [],
@@ -355,7 +355,7 @@ export default {
     // 获取标签
     getLabelList(flag) {
       getLabel().then(({ data }) => {
-        this.labelList = data;
+        this.labelList = [data[0]];
         for (let i = 0; i < this.labelList.length; i++) {
           this.queryParams.labelIds.push('');
         }
@@ -538,7 +538,7 @@ export default {
       .screen_l_b {
         // .screen_l_b_item {
         padding: 0 20px;
-        height: 75px;
+        height: 70px;
         display: flex;
         justify-content: space-between;
         align-items: center;
diff --git a/src/views/home/ollection.vue b/src/views/home/ollection.vue
index e63dfca..661d659 100644
--- a/src/views/home/ollection.vue
+++ b/src/views/home/ollection.vue
@@ -72,7 +72,7 @@ export default {
     return {
       queryParams: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 15
       },
       total: 0,
       policyList: [],
diff --git a/src/views/portrait.vue b/src/views/portrait.vue
index 71b224b..44c6b5d 100644
--- a/src/views/portrait.vue
+++ b/src/views/portrait.vue
@@ -21,6 +21,7 @@
       <div class="header" v-if="type == 'policy'">
         <span class="span">{{ val }}：</span>
         <el-radio
+          size="small"
           v-model="queryParams.labelId"
           v-for="item in portraitList"
           :key="item.id"
@@ -33,6 +34,7 @@
       <div class="header" v-else-if="type == 'policyRead'">
         <span class="span">{{ val }}：</span>
         <el-radio
+          size="small"
           v-model="queryParams.attribute"
           v-for="item in attributeOptions"
           :key="item.value"
@@ -45,6 +47,7 @@
       <div class="header" v-else-if="type == 'policyNotice'">
         <span class="span">{{ val }}：</span>
         <el-radio
+          size="small"
           v-model="queryParams.labelId"
           v-for="item in policyNoticeOptions"
           :key="item.value"
@@ -125,7 +128,7 @@ export default {
       val: '',
       queryParams: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 15
       },
       total: 0,
       portraitList: [], // 企业画像
@@ -290,8 +293,8 @@ export default {
     .header {
       display: flex;
       align-items: center;
-      height: 70px;
-      padding: 30px;
+      height: 50px;
+      padding: 0 30px;
       background-color: #f5f5f5;
       .el-tabs {
         margin-left: 20px;
@@ -302,12 +305,15 @@ export default {
       /deep/.el-radio__input {
         display: none;
       }
+      /deep/.el-radio {
+        margin-right: 10px;
+      }
     }
 
     .screen_l_b {
       padding: 0 20px;
-      height: 50px;
-      line-height: 50px;
+      height: 44px;
+      line-height: 44px;
       // display: flex;
       flex-direction: column;
       justify-content: center;
diff --git a/src/views/result.vue b/src/views/result.vue
index 8bb1b8d..2ef5611 100644
--- a/src/views/result.vue
+++ b/src/views/result.vue
@@ -35,7 +35,7 @@
 
     <div class="my_main content p0-100 min_h_285" style="display: flex">
       <div class="l" style="width: 77%; background-color: #fff; padding: 30px">
-        <h2>{{ formData.title }}</h2>
+        <h2 style="text-align:center">{{ formData.title }}</h2>
         <div class="info" v-if="type != 'information'">
           <span v-if="type != 'companyNeed' && type != 'scienceResult'"
             >来源：{{ formData.source }}</span