diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 60e1d45..238cf28 100644
--- a/src/assets/styles/public.scss
+++ b/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;
}
}
}
diff --git a/src/views/abnormalRemind/index.vue b/src/views/abnormalRemind/index.vue
index 12d212e..0fa221b 100644
--- a/src/views/abnormalRemind/index.vue
+++ b/src/views/abnormalRemind/index.vue
@@ -44,10 +44,10 @@
@@ -64,8 +64,8 @@ export default {
deptId: this.$store.state.user.deptId,
total:0,
pagination: {
- current:1,
- size:10,
+ pageNum:1,
+ pageSize:10,
orderChange:1,
},
loading:false,
@@ -101,15 +101,15 @@ export default {
},
// 获取页码
getPagination(pages) {
- this.pagination.current = pages.page;
- this.pagination.size = pages.limit;
+ this.pagination.pageNum = pages.page;
+ this.pagination.pageSize = pages.limit;
this.getList();
},
// 查询
handleQuery() {
this.pagination = {
- current: 1,
- size: 10
+ pageNum: 1,
+ 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,
- size: 10
+ pageNum: 1,
+ pageSize: 10
}
this.getList();
},
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 40b6049..1853b59 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -56,7 +56,7 @@
申报时间:
- {{ formatYear(item.createTime) }}
+ {{ formatYear(item) }}
@@ -110,7 +110,7 @@
申报时间:
- {{ formatYear(item.createTime) }}
+ {{ formatYear(item) }}
@@ -394,13 +394,10 @@ export default {
}
},
formatYear(time){
- const year = time.slice(0, 4);
- let date = new Date();
- const currentYear = date.getFullYear(); //获取完整的年份(4位)
- if(Number(year) < Number(currentYear)) {
- return year;
+ if(time.fileJson) {
+ return this.parseTime(time.createTime, '{y}-{m}-{d}')
} else {
- return this.parseTime(time, '{y}-{m}-{d}')
+ return time.projectYear
}
},
formatDate(dateString,id) {
diff --git a/src/views/homeTwo/index.vue b/src/views/homeTwo/index.vue
index 9c96642..3610f42 100644
--- a/src/views/homeTwo/index.vue
+++ b/src/views/homeTwo/index.vue
@@ -24,7 +24,7 @@
申报时间:
- {{ formatYear(item.createTime) }}
+ {{ formatYear(item) }}
@@ -48,7 +48,7 @@
申报时间:
- {{ formatYear(item.createTime) }}
+ {{ formatYear(item) }}
@@ -362,13 +362,10 @@ export default {
}
},
formatYear(time){
- const year = time.slice(0, 4);
- let date = new Date();
- const currentYear = date.getFullYear(); //获取完整的年份(4位)
- if(Number(year) < Number(currentYear)) {
- return year;
+ if(time.fileJson) {
+ return this.parseTime(time.createTime, '{y}-{m}-{d}')
} else {
- return this.parseTime(time, '{y}-{m}-{d}')
+ return time.projectYear
}
},
formatDate(dateString,id) {