Merge branch 'master-V32-XuHaoJie' into 'master'
杭州-arms详情页-响应时间折线图修改 See merge request !256
Showing
1 changed file
with
4 additions
and
7 deletions
@@ -71,15 +71,12 @@ layui.define(['commonDetail','common', 'admin'], function (exports) { | @@ -71,15 +71,12 @@ layui.define(['commonDetail','common', 'admin'], function (exports) { | ||
71 | if (response.success && !response.msg) {//有数据 | 71 | if (response.success && !response.msg) {//有数据 |
72 | dataList.legend = response.map.legend; | 72 | dataList.legend = response.map.legend; |
73 | dataList.x = response.map.x; | 73 | dataList.x = response.map.x; |
74 | - if (response.map.y != null && response.map.y.length === 1) { | ||
75 | - dataList.y = response.map.y; | ||
76 | - } else { | ||
77 | - var series=[]; | 74 | + if (response.map.y != null) { |
75 | + var series = []; | ||
78 | $.each(response.map.y, function (i, v) { | 76 | $.each(response.map.y, function (i, v) { |
79 | - var lineIndex = Math.ceil(Math.random() * 6); | ||
80 | var item = { | 77 | var item = { |
81 | - name:dataList.legend[i], | ||
82 | - stack:'Total', | 78 | + name: dataList.legend[i], |
79 | + stack: 'Total', | ||
83 | type: 'line', | 80 | type: 'line', |
84 | emphasis: { | 81 | emphasis: { |
85 | focus: 'series' | 82 | focus: 'series' |
-
Please register or login to post a comment