ljh 2 years ago
parent
commit
b9f7ef922a

+ 1 - 1
nngkxxdp/src/main/resources/static/impression/css/imperssion.css

@@ -537,7 +537,7 @@ a {
 }
 }
 .block2 .el-timeline-item__tail {
 .block2 .el-timeline-item__tail {
     border-left: 5px solid #1B3A7B;
     border-left: 5px solid #1B3A7B;
-    height: 126.9%;
+    height: 130.9%;
 }
 }
 @media screen and (max-width: 1700px) {
 @media screen and (max-width: 1700px) {
     .block2 {
     .block2 {

+ 9 - 7
nngkxxdp/src/main/resources/static/impression/js/inperssion.js

@@ -148,21 +148,23 @@ new Vue({
                 success: function (json) {
                 success: function (json) {
                     var content = json.data.data;
                     var content = json.data.data;
                     if (content && content.length>0) {
                     if (content && content.length>0) {
-                        var arr = [];
                         var obj = []
                         var obj = []
                         obj.unshift([]);
                         obj.unshift([]);
-                        for (var i = 0; i < content.length; i++) {
-                            var year = content[i].vestingData.split('-');
-                            arr.push(year);
+                        for (var i = content.length-1; i >= 0; i--) {
+                            var year = content[i].vestingDate.substr(0,4);
+                            var month= content[i].vestingDate.substr(5,2);
+                            var data= content[i].vestingDate.substr(8,2);
+                            console.log(year,month,data)
                             obj.push({
                             obj.push({
-                                content: arr[i][0],
-                                time: arr[i][1] + '/' + arr[i][2].slice(0, 2),
+                                content: year,
+                                time: month + '/' + data,
                                 author: '《' + (content[i].pictureTitle || '无') + '》作者:' + (content[i].pictureAuthor || '无'),
                                 author: '《' + (content[i].pictureTitle || '无') + '》作者:' + (content[i].pictureAuthor || '无'),
                                 img: PATH + '/' + content[i].urlAddress,
                                 img: PATH + '/' + content[i].urlAddress,
                                 synopsis: content[i].pictureDescription
                                 synopsis: content[i].pictureDescription
                             })
                             })
                         }
                         }
-                        _this.activities = obj
+                        _this.activities = obj;
+
                         obj.push([]);
                         obj.push([]);
                     } else {
                     } else {
                         _this.activities = [];
                         _this.activities = [];