Browse Source

指标看板key值加上统计方式名

zhuth 6 years ago
parent
commit
8d5f8f205e

+ 1 - 1
package.json

@@ -13,7 +13,7 @@
     "antd": "^3.12.4",
     "canvas2image": "^1.0.5",
     "copy-to-clipboard": "^3.1.0",
-    "dva": "^2.3.1",
+    "dva": "^2.4.1",
     "dva-loading": "^2.0.3",
     "echarts": "^4.1.0",
     "echarts-for-react": "^2.0.14",

+ 0 - 1
src/components/dashboardDesigner/chooseChartBox.jsx

@@ -3,7 +3,6 @@ import '../../models/dashboardDesigner'
 import { Modal, Checkbox, Row, Col, Table, message } from 'antd'
 import { connect } from 'dva'
 import moment from 'moment'
-import 'braft-editor/dist/braft.css'
 import ListFilter from '../common/listFilter/index'
 import EllipsisTooltip from '../common/ellipsisTooltip/index'
 import './chooseChartBox.less'

+ 1 - 1
src/models/parseChartOption.js

@@ -554,7 +554,7 @@ function indicatorOption(data, indicatorConfig, themeConfig, styleConfig) {
         themeConfig,
         data: (data.serieses || []).map(d => ({
             name: xAxis.column.type === 'time' ? (moment(d.name).isValid() ? moment(d.name).format('YYYY-MM-DD') : d.name) : d.name,
-            key: yAxis.column.label,
+            key: `${yAxis.column.label}(${yAxis.gauge.label})`,
             value: d.value,
             others: otherColumn.map(c => ({
                 name: c.label,