|
@@ -139,19 +139,13 @@ export default {
|
|
|
},
|
|
|
//时间戳转string 例:标准时间 => 20190929120000
|
|
|
date2String(d) {
|
|
|
- let dateString = new Date(d).toLocaleString().split("/");
|
|
|
- if (dateString[1].length == 1) {
|
|
|
- dateString[1] = '0' + dateString[1];
|
|
|
- }
|
|
|
- dateString = dateString.toString();
|
|
|
- dateString = dateString.split(/(\d\d)/);
|
|
|
- var r = [];
|
|
|
- dateString.map((value, key) => {
|
|
|
- if (key % 2 != 0) {
|
|
|
- r.push(value);
|
|
|
- }
|
|
|
- })
|
|
|
- return r.join("");
|
|
|
+ let localeString = new Date(d).toLocaleString();
|
|
|
+ let timeString = new Date(d).toTimeString();
|
|
|
+ let localArr = localeString.match(/(\d\d|\/\d+)/g).slice(0, 4);
|
|
|
+ let timeArr = timeString.match(/(\d\d)/g).slice(0, 3);
|
|
|
+ localArr[2] = localArr[2].length == 2 ? `0${localArr[2].substring(1, 2)}` : localArr[2].substring(1, 3);
|
|
|
+ localArr[3] = localArr[3].length == 2 ? `0${localArr[3].substring(1, 2)}` : localArr[3].substring(1, 3);
|
|
|
+ return localArr.concat(timeArr).join('');
|
|
|
},
|
|
|
init() {
|
|
|
this.lineChart = echarts.init(this.$refs.chart);
|