Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

2 天以前 116c203f50d03c11300a2f52ec296e871c9ff13e

 src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue

@@ -120,7 +120,7 @@
    textStyle: { fontSize: '100%' },
    formatter: function (params) {
      let result = params[0].axisValueLabel + '<br/>'
      result += `<div>${params[0].marker}${params[0].value}</div>`
      result += `<div>${params[0].marker}${params[0].value}元</div>`
      return result
    },
  }