Merge remote-tracking branch 'origin/master'

This commit is contained in:
liuwu 2023-09-19 09:52:19 +08:00
commit 09a1d68bd4
2 changed files with 37 additions and 39 deletions

View File

@ -10,12 +10,12 @@
} }
.main_wrap .main_left, .main_wrap .main_right { .main_wrap .main_left, .main_wrap .main_right {
width: 25%; width: 20%;
height: 100vh; height: 100vh;
} }
.main_wrap .main_center { .main_wrap .main_center {
width: 50%; width: 60%;
height: 100vh; height: 100vh;
} }

View File

@ -105,9 +105,13 @@
<span></span> <span></span>
<span>资源交易数据统计</span> <span>资源交易数据统计</span>
</div> </div>
<div style="margin: 2% 0 2% 5%;color: #fff;font-size: 12px"> <div style="margin: 1% 0;color: #fff;font-size: 12px;width: 100%;text-align: center">
<span class="trade_month_num">当月累计交易数0</span>
<span class="trade_month_money" style="margin-left: 20px">当月累计交易额0万元</span>
</div>
<div style="margin: 1% 0;color: #fff;font-size: 12px;width: 100%;text-align: center">
<span class="trade_all_num">全年累计交易数0</span> <span class="trade_all_num">全年累计交易数0</span>
<span class="trade_all_money">全年累计交易额0万元</span> <span class="trade_all_money" style="margin-left: 20px">全年累计交易额0万元</span>
</div> </div>
<div class="center_footer_content" style="height: 20vh" id="center_footer_two"> <div class="center_footer_content" style="height: 20vh" id="center_footer_two">
</div> </div>
@ -474,52 +478,46 @@
dataType:'json', dataType:'json',
success(res){ success(res){
let _data = res.data; let _data = res.data;
let _rData = [],_sData = []; let _xData = [],_sData = [];
let _maxArr = [];
_data.forEach(item => { _data.forEach(item => {
_maxArr.push(item.score) _xData.push(item.shot_name);
});
_maxArr.sort((a,b) => {
return a-b;
})
_data.forEach(item => {
_rData.push({
max:_maxArr[_maxArr.length-1],name:item.shot_name
});
_sData.push(item.nowScore) _sData.push(item.nowScore)
}) })
let chart = echarts.init(document.getElementById('bottom_right_echarts')); let chart = echarts.init(document.getElementById('bottom_right_echarts'));
let option = { let option = {
tooltip: { tooltip: {
trigger: 'item', trigger: 'axis',
}, },
legend: { xAxis: {
data: [''], type: 'category',
boundaryGap: false,
data: _xData,
axisLabel:{
interval:0,
rotate:15,
color:'#FFFFFF'
},
}, },
radar: { yAxis: {
radius: '60%', type: 'value',
indicator: _rData, axisLabel:{
shape: 'circle', color:'#fff'
}
},
grid: {
top: "15%",
left: '5%',
right: '5%',
bottom: '5%',
containLabel: true
}, },
series: [ series: [
{ {
name: '', data: _sData,
type: 'radar', type: 'line',
data: [ areaStyle: {
{ color:'#02abe0'
value: _sData, }
name: '季度考核指标'
},
],
symbol: 'none',
itemStyle: {
color: '#F9713C'
},
tooltip: {
valueFormatter: function (value) {
return value + ' 分';
}
},
} }
] ]
}; };