|
@@ -495,11 +495,17 @@ export default {
|
|
|
this.PageBaseData = JSON.parse(res.data[0][0].json);
|
|
this.PageBaseData = JSON.parse(res.data[0][0].json);
|
|
|
if(this.pType == 1){
|
|
if(this.pType == 1){
|
|
|
this.aArray = res.data[0];
|
|
this.aArray = res.data[0];
|
|
|
- this.timeListA = this.aArray.map(i=>{return {value:i.time,label:i.timeLabel}})
|
|
|
|
|
|
|
+ this.timeListA = this.aArray.map(i=>{return {value:i.time,label:i.timeLabel,createAt:i.create_at}})
|
|
|
|
|
+ this.timeListA.sort((a,b)=>{
|
|
|
|
|
+ return new Date(b.createAt) - new Date(a.createAt)
|
|
|
|
|
+ })
|
|
|
if(this.timeListA.length>0)this.timeA = this.timeListA[0].value;
|
|
if(this.timeListA.length>0)this.timeA = this.timeListA[0].value;
|
|
|
}else {
|
|
}else {
|
|
|
this.bArray = res.data[0];
|
|
this.bArray = res.data[0];
|
|
|
- this.timeListB = this.bArray.map(i=>{return {value:i.time,label:i.timeLabel}})
|
|
|
|
|
|
|
+ this.timeListB = this.bArray.map(i=>{return {value:i.time,label:i.timeLabel,createAt:i.create_at}})
|
|
|
|
|
+ this.timeListB.sort((a,b)=>{
|
|
|
|
|
+ return new Date(b.createAt) - new Date(a.createAt)
|
|
|
|
|
+ })
|
|
|
if(this.timeListB.length>0)this.timeB = this.timeListB[0].value;
|
|
if(this.timeListB.length>0)this.timeB = this.timeListB[0].value;
|
|
|
if(!this.bArray.length){
|
|
if(!this.bArray.length){
|
|
|
this.pType = 1
|
|
this.pType = 1
|
|
@@ -515,7 +521,7 @@ export default {
|
|
|
// 获取页面基础ui信息
|
|
// 获取页面基础ui信息
|
|
|
// getPageBase2() {
|
|
// getPageBase2() {
|
|
|
// console.log('6666');
|
|
// console.log('6666');
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// let params = {
|
|
// let params = {
|
|
|
// typ: this.pType,
|
|
// typ: this.pType,
|
|
|
// org: this.org,
|
|
// org: this.org,
|