+1

src/assets/styles/public.scss

@@ -2519,12 +2519,14 @@
               .promoteProject-bottom {
                 margin-top: 16px;
                 display: flex;
-                justify-content: space-between;
+                // justify-content: space-between;
+                align-items: center;
                 width: 85%;
                 .promoteProject-bottom-left {
                   font-family: AlibabaPuHuiTiR;
                   font-size: 14px;
                   color: #666666;
+                  width: 67%;
                   display: flex;
                   .span-two {
                     font-family: AlibabaPuHuiTiM;
@@ -2576,7 +2578,7 @@
                 cursor: pointer;
               }
               .project-trace-table-gray {
-                color: #ccc;
+                color: #747474;
               }
             }
           }

src/views/abnormalRemind/index.vue

@@ -44,10 +44,10 @@
         <my-pagination 
           id="L-pagination"
           :total="total"
-          :page="pagination.current"
+          :page="pagination.pageNum"
-          :limit="pagination.size"
+          :limit="pagination.pageSize"
           @pagination="getPagination"
-          :current-page.sync="pagination.current" 
+          :current-page.sync="pagination.pageNum" 
         ></my-pagination>
       </section>
     </div>
@@ -64,8 +64,8 @@ export default {
       deptId: this.$store.state.user.deptId,
       total:0,
       pagination: {
-        current:1,
+        pageNum:1,
-        size:10,
+        pageSize:10,
         orderChange:1,
       },
       loading:false,
@@ -101,15 +101,15 @@ export default {
     },
     // 获取页码
     getPagination(pages) {
-      this.pagination.current = pages.page;
+      this.pagination.pageNum = pages.page;
-      this.pagination.size = pages.limit;
+      this.pagination.pageSize = pages.limit;
       this.getList();
     },
     // 查询
     handleQuery() {
       this.pagination = {
-        current: 1,
+        pageNum: 1,
-        size: 10
+        pageSize: 10
       }
       this.pagination = { ...this.pagination,...this.formInline };
       this.getList();
@@ -118,8 +118,8 @@ export default {
     resetQuery(formName){
       this.$refs[formName].resetFields();
       this.pagination = {
-        current: 1,
+        pageNum: 1,
-        size: 10
+        pageSize: 10
       }
       this.getList();
     },

src/views/home/index.vue

@@ -56,7 +56,7 @@
                   </div>
                   <div class="promoteProject-bottom-right">
                     申报时间：
-                    <span class="span-three">{{ formatYear(item.createTime) }}</span>
+                    <span class="span-three">{{ formatYear(item) }}</span>
                   </div>
                 </div>
               </div>
@@ -110,7 +110,7 @@
                   </div>
                   <div class="promoteProject-bottom-right">
                     申报时间：
-                    <span class="span-three">{{ formatYear(item.createTime) }}</span>
+                    <span class="span-three">{{ formatYear(item) }}</span>
                   </div>
                 </div>
                 <div class="promoteProject-position" :class="(item.status == 0 || item.status == 1 || item.status == 2 || item.status == 3) ? 'orange' : (item.status == 6) ? 'green' : (item.status == 7 || item.status == 8 || item.status == 9 || item.status == 10) ? 'red' : ''">
@@ -394,13 +394,10 @@ export default {
       }
     },
     formatYear(time){
-      const year = time.slice(0, 4);
+      if(time.fileJson) {
-      let date = new Date();
+        return this.parseTime(time.createTime, '{y}-{m}-{d}')
-      const currentYear = date.getFullYear(); //获取完整的年份(4位)
-      if(Number(year) < Number(currentYear)) {
-        return year;
       } else {
-        return  this.parseTime(time, '{y}-{m}-{d}')
+        return time.projectYear
       }
     },
     formatDate(dateString,id) {

src/views/homeTwo/index.vue

@@ -24,7 +24,7 @@
                   </div>
                   <div class="promoteProject-bottom-right">
                     申报时间：
-                    <span class="span-three">{{ formatYear(item.createTime) }}</span>
+                    <span class="span-three">{{ formatYear(item) }}</span>
                   </div>
                 </div>
               </div>
@@ -48,7 +48,7 @@
                   </div>
                   <div class="promoteProject-bottom-right">
                     申报时间：
-                    <span class="span-three">{{ formatYear(item.createTime) }}</span>
+                    <span class="span-three">{{ formatYear(item) }}</span>
                   </div>
                 </div>
                 <div class="promoteProject-position" :class="(item.status == 0 || item.status == 1 || item.status == 2 || item.status == 3) ? 'orange' : (item.status == 6) ? 'green' : (item.status == 7 || item.status == 8 || item.status == 9 || item.status == 10) ? 'red' : ''">
@@ -362,13 +362,10 @@ export default {
       }
     },
     formatYear(time){
-      const year = time.slice(0, 4);
+      if(time.fileJson) {
-      let date = new Date();
+        return this.parseTime(time.createTime, '{y}-{m}-{d}')
-      const currentYear = date.getFullYear(); //获取完整的年份(4位)
-      if(Number(year) < Number(currentYear)) {
-        return year;
       } else {
-        return  this.parseTime(time, '{y}-{m}-{d}')
+        return time.projectYear
       }
     },
     formatDate(dateString,id) {