From 61146836c88ed83da823b07e73b72d2377531b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 16 Sep 2021 10:07:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home1/components/release/index.vue  | 29 +++++++----------
 .../components/solicitopinions/index.vue      | 32 ++++++++-----------
 2 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index dda733226..d61f2b528 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -2,9 +2,11 @@
 <template>
   <div class="release">
     <ul>
-      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" v-if="updateTime>=item.issueTime">
-        <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-        <span class="time">{{item.issueTime }}</span>
+      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >
+          <div style="height: 18px;">
+            <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
+              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
+          </div>
       </li>
     </ul>
   </div>
@@ -19,7 +21,6 @@ export default {
     return {
       putTime: '',
       standardReleaseList: [],  //标准发布数据
-      updateTime:""
     }
   },
   computed: {},
@@ -30,19 +31,6 @@ export default {
     this.addDate()
   },
   methods: {
-    //获取当前年月日
-    addDate(){
-      const nowDate = new Date();
-      const date = {
-        year: nowDate.getFullYear(),
-        month: nowDate.getMonth() + 1,
-        date: nowDate.getDate(),
-      }
-      const newmonth = date.month>10?date.month:'0'+date.month
-      const day = date.date>10?date.date:'0'+date.date
-      this.updateTime = date.year + '-' + newmonth + '-' + day
-      console.log("当前时间"+this.updateTime)
-    },
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({
@@ -65,7 +53,12 @@ export default {
       this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
         _this: this
       }, res => {
-        this.standardReleaseList = res.data
+        let arr = res.data
+        arr.forEach(item => {
+          if(item.standName !== ""){
+            this.standardReleaseList.push(item)
+          }
+        })
       }, e => {
       })
     },
diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue
index ab32c8cec..675997379 100644
--- a/src/pages/home1/components/solicitopinions/index.vue
+++ b/src/pages/home1/components/solicitopinions/index.vue
@@ -2,9 +2,11 @@
 <template>
   <div class="solicitopinions">
     <ul>
-      <li v-for="item in domesticDynamics" :key="item.id" class="time-title" v-if="updateTime < item.endTime">
-        <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
-        <span class="time">{{ item.endTime }}</span>
+      <li v-for="item in domesticDynamics" :key="item.id" class="time-title">
+        <div style="height: 18px">
+          <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
+          <span class="time">{{ item.endTime }}</span>
+        </div>
       </li>
     </ul>
   </div>
@@ -27,22 +29,9 @@ export default {
   mounted() {
     this.getDate();
     this.getAdvice();
-    this.addDate();
+    // this.addDate();
   },
   methods: {
-    //获取当前年月日
-    addDate() {
-      const nowDate = new Date();
-      const date = {
-        year: nowDate.getFullYear(),
-        month: nowDate.getMonth() + 1,
-        date: nowDate.getDate()
-      };
-      const newmonth = date.month > 10 ? date.month : "0" + date.month;
-      const day = date.date > 10 ? date.date : "0" + date.date;
-      this.updateTime = date.year + "-" + newmonth + "-" + day;
-      console.log("当前时间" + this.updateTime);
-    },
     //截取时间
     getDate(date) {
       return date != null ? date.substring(0, date.indexOf(" ")) : "";
@@ -51,11 +40,16 @@ export default {
     getAdvice() {
       this.$http.get("slrs/sar-public-idea/SelectAllPage", {
         page: 1,
-        size: 1000,
+        size: 1000
       }, {
         _this: this
       }, res => {
-        this.domesticDynamics = res.data.records
+        let arr = res.data.records;
+        arr.forEach(item => {
+          if (item.cname !== "") {
+            this.domesticDynamics.push(item);
+          }
+        });
       }, e => {
 
       });