修改bug
This commit is contained in:
		@@ -45,8 +45,11 @@ export default {
 | 
			
		||||
    legend() {
 | 
			
		||||
      let items = [];
 | 
			
		||||
      var day1 = new Date();
 | 
			
		||||
      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
 | 
			
		||||
      var day2 = new Date();
 | 
			
		||||
      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
 | 
			
		||||
      day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
 | 
			
		||||
      var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
 | 
			
		||||
      var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
 | 
			
		||||
      //今天的时间
 | 
			
		||||
      // var day2 = new Date();
 | 
			
		||||
      // day2.setTime(day2.getTime());
 | 
			
		||||
@@ -58,13 +61,13 @@ export default {
 | 
			
		||||
      const year = new Date().getFullYear();
 | 
			
		||||
      if (this.period === '日' && this.than === '同比') {
 | 
			
		||||
        items = [
 | 
			
		||||
          { label: `${year-1}年${month}月${today}日`, color: "#12f7f1" },
 | 
			
		||||
          { label: `${month}月${today}日`, color: "#58adfa" },
 | 
			
		||||
          { label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
 | 
			
		||||
          { label: `${yesterday}日`, color: "#58adfa" },
 | 
			
		||||
        ];
 | 
			
		||||
      } else if (this.period === '日' && this.than === '环比') {
 | 
			
		||||
        items = [
 | 
			
		||||
          { label: `${yesterday}日`, color: "#12f7f1" },
 | 
			
		||||
          { label: `${month}月${today}日`, color: "#58adfa" },
 | 
			
		||||
          { label: `${dayBeYes}日`, color: "#12f7f1" },
 | 
			
		||||
          { label: `${yesterday}日`, color: "#58adfa" },
 | 
			
		||||
        ];
 | 
			
		||||
      } else if (this.period === '周' && this.than === '同比') {
 | 
			
		||||
        items = [
 | 
			
		||||
@@ -150,9 +153,15 @@ export default {
 | 
			
		||||
 | 
			
		||||
function getTemplate(period, dataList,than) {
 | 
			
		||||
  let items = [];
 | 
			
		||||
  // var day1 = new Date();
 | 
			
		||||
  // day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
 | 
			
		||||
  // var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
 | 
			
		||||
  var day1 = new Date();
 | 
			
		||||
  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
 | 
			
		||||
  var day2 = new Date();
 | 
			
		||||
  day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000)
 | 
			
		||||
  day2.setTime(day2.getTime() - 48 * 60 * 60 * 1000)
 | 
			
		||||
  var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
 | 
			
		||||
  var dayBeYes = (day2.getMonth() + 1) + "月" + day2.getDate()
 | 
			
		||||
  //今天的时间
 | 
			
		||||
  // var day2 = new Date();
 | 
			
		||||
  // day2.setTime(day2.getTime());
 | 
			
		||||
@@ -165,11 +174,11 @@ function getTemplate(period, dataList,than) {
 | 
			
		||||
  if (period === '日' && than === '同比') {
 | 
			
		||||
    items = [
 | 
			
		||||
      {
 | 
			
		||||
        name: `${year-1}年${month}月${today}日`,
 | 
			
		||||
        name: `${year - 1}年${yesterday}日`,
 | 
			
		||||
        data: dataList ? dataList[0] : [],
 | 
			
		||||
      },
 | 
			
		||||
      {
 | 
			
		||||
        name: `${month}月${today}日`,
 | 
			
		||||
        name: `${yesterday}日`,
 | 
			
		||||
        data: dataList ? dataList[1] : [],
 | 
			
		||||
        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
 | 
			
		||||
      },
 | 
			
		||||
@@ -177,11 +186,11 @@ function getTemplate(period, dataList,than) {
 | 
			
		||||
  } else if (period === '日' && than === '环比') {
 | 
			
		||||
    items = [
 | 
			
		||||
      {
 | 
			
		||||
        name: `${yesterday}日`,
 | 
			
		||||
        name: `${dayBeYes}日`,
 | 
			
		||||
        data: dataList ? dataList[0] : [],
 | 
			
		||||
      },
 | 
			
		||||
      {
 | 
			
		||||
        name: `${month}月${today}日`,
 | 
			
		||||
        name: `${yesterday}日`,
 | 
			
		||||
        data: dataList ? dataList[1] : [],
 | 
			
		||||
        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
 | 
			
		||||
      },
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user