Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue

@@ -127,13 +127,8 @@
      }
    },
    created(){


      let collectTime = moment(moment().add(-1,'d'),'YYYY-MM-DD');


      this.queryParams.collectTime = collectTime;

      this.queryParams.dateTime = this.queryParams.collectTime.format('YYYYMMDD')
      this.initEquipmentNode()
      this.queryStatistical();
@@ -321,8 +316,8 @@
          },
          legend: {
            orient: 'vertical',
            x: 'left',
            y: 'bottom',
            x: '85%',
            y: '50%',
            data: ['开机时间', '关机时间']
          },
          calculable: true,
@@ -334,7 +329,7 @@
            itemStyle: {
              normal: {
                color: function (params) {
                  let colorList = ['#849db8', '#6496e9'];
                  let colorList = [ '#6496e9','#849db8'];
                  return colorList[params.dataIndex]
                },
                label: {
@@ -363,8 +358,8 @@
          },
          legend: {
            orient: 'vertical',
            x: 'left',
            y: 'bottom',
            x: '85%',
            y: '50%',
            data: ['运行时间', '待机时间']
          },
          calculable: true,