Merge remote-tracking branch 'origin/master'

This commit is contained in:
liuwu 2023-09-01 15:38:48 +08:00
commit 9d213d2600
1 changed files with 10 additions and 12 deletions

View File

@ -96,7 +96,7 @@
<div class="center_footer_item">
<div class="echarts_title">
<span></span>
<span>先进成员</span>
<span>重点工作进度</span>
</div>
<div class="center_footer_content" id="center_footer_one">
</div>
@ -104,7 +104,7 @@
<div class="center_footer_item">
<div class="echarts_title">
<span></span>
<span>先进部门</span>
<span>指标汇总情况</span>
</div>
<div class="center_footer_content" id="center_footer_two">
</div>
@ -676,7 +676,7 @@
})
}
//加载先进成员数据
//加载重点工作进度数据
function loadPeopleData(){
_peopleData = [];
$.ajax({
@ -689,8 +689,8 @@
_peopleData = res.data;
_data.forEach(item => {
_strHtml += '<div class="item_inline">' +
'<p>先进党员'+item.name+'</p>' +
'<p>先进事迹'+item.events+'</p>' +
'<p>党风廉政建设'+item.name+'</p>' +
'<p>目前完成度'+item.events+'</p>' +
'</div>';
});
$('#center_footer_one').append(_strHtml);
@ -698,7 +698,7 @@
})
}
//加载部门数据
//加载指标汇总数据
function loadDepData(){
_deptData = [];
$.ajax({
@ -708,15 +708,13 @@
success(res){
let _data = res.data;
let _strHtml = "";
_deptData = res.data;
_data.forEach(item => {
let _json = JSON.parse(item.json);
_strHtml += '<div class="item_inline" style="align-items: flex-start">' +
'<div style="font-size: 14px;color: #ffffff;width: 120px;">'+item.dept+'</div>' +
'<div class="inline_content" style="margin-left: 10px">' +
'<p>日常考核分:'+_json['日常考核指标']+'分</p>' +
'<p>年度考核分:'+_json['年度考核指标']+'分</p>' +
'</div>' +
_strHtml += '<div class="item_inline">' +
'<p>党建及意识形态:'+_json['日常考核指标']+'</p>' +
'<p>目前完成度:'+_json['年度考核指标']+'</p>' +
'</div>';
});
$('#center_footer_two').append(_strHtml);