diff --git a/cyx-admin/src/main/resources/static/css/main_center.css b/cyx-admin/src/main/resources/static/css/main_center.css index fee20b2..cb0b561 100644 --- a/cyx-admin/src/main/resources/static/css/main_center.css +++ b/cyx-admin/src/main/resources/static/css/main_center.css @@ -10,12 +10,12 @@ } .main_wrap .main_left, .main_wrap .main_right { - width: 25%; + width: 20%; height: 100vh; } .main_wrap .main_center { - width: 50%; + width: 60%; height: 100vh; } diff --git a/cyx-admin/src/main/resources/templates/main.html b/cyx-admin/src/main/resources/templates/main.html index 316233a..686ef2b 100644 --- a/cyx-admin/src/main/resources/templates/main.html +++ b/cyx-admin/src/main/resources/templates/main.html @@ -105,7 +105,11 @@ 资源交易数据统计 -
+
+ 当月累计交易数:0 + 当月累计交易额:0万元 +
+
全年累计交易数:0 全年累计交易额:0万元
@@ -474,52 +478,46 @@ dataType:'json', success(res){ let _data = res.data; - let _rData = [],_sData = []; - let _maxArr = []; + let _xData = [],_sData = []; _data.forEach(item => { - _maxArr.push(item.score) - }); - _maxArr.sort((a,b) => { - return a-b; - }) - _data.forEach(item => { - _rData.push({ - max:_maxArr[_maxArr.length-1],name:item.shot_name - }); + _xData.push(item.shot_name); _sData.push(item.nowScore) }) let chart = echarts.init(document.getElementById('bottom_right_echarts')); let option = { tooltip: { - trigger: 'item', + trigger: 'axis', }, - legend: { - data: [''], + xAxis: { + type: 'category', + boundaryGap: false, + data: _xData, + axisLabel:{ + interval:0, + rotate:15, + color:'#FFFFFF' + }, }, - radar: { - radius: '60%', - indicator: _rData, - shape: 'circle', + yAxis: { + type: 'value', + axisLabel:{ + color:'#fff' + } + }, + grid: { + top: "15%", + left: '5%', + right: '5%', + bottom: '5%', + containLabel: true }, series: [ { - name: '', - type: 'radar', - data: [ - { - value: _sData, - name: '季度考核指标' - }, - ], - symbol: 'none', - itemStyle: { - color: '#F9713C' - }, - tooltip: { - valueFormatter: function (value) { - return value + ' 分'; - } - }, + data: _sData, + type: 'line', + areaStyle: { + color:'#02abe0' + } } ] };