bonus
/
lp_smz_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复： 3614 首页项目参建单位TOP5展示数据与需求和原型不符

This commit is contained in:
gaowdong 2024-12-31 14:41:00 +08:00
parent c2a12d3463
commit 5bbbae5f70
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/bmw/src/main/resources/mapper/homePage/HomePageMapper.xml
View File

@ -599,19 +599,14 @@
<select id="getProRank" resultType="com.bonus.bmw.homePage.entity.ProMsgBean"> <select id="getProRank" resultType="com.bonus.bmw.homePage.entity.ProMsgBean">
select a.* from ( select a.* from (
select a.*, bp.name as proName, pm.id as subComId, select bs.id as subComId, bs.sub_name as SubComName, a.proNum as subNum, '' as proId
pm.name as SubComName from ( from (
select pro_id as proId, count(DISTINCT sub_id) as subNum from bm_sub_contract select sub_id as subId, count(pro_id) as proNum from bm_sub_contract
where is_active = 1 where is_active = 1
GROUP BY pro_id GROUP BY sub_id
) a ) a
LEFT JOIN bm_project bp ON bp.id = a.proId AND bp.is_active = '1' LEFT JOIN bm_subcontractor bs ON bs.id = a.subId AND bs.is_active = '1'
left join ( ORDER BY a.proNum DESC
SELECT po.id, po.`name`
FROM bm_project_general AS po
WHERE po.is_active = '1'
) pm on pm.id = bp.project_general_id
ORDER BY a.subNum DESC
) a limit 5 ) a limit 5
</select> </select>

4
modules/bmw/src/main/resources/static/js/work/indexScreen/indexScreen.js
View File

@ -795,7 +795,7 @@ function proInformationLevelECharts(listRank) {
let titleName = []; let titleName = [];
let data = []; let data = [];
for (let i = 0; i < listRank.length; i++) { for (let i = 0; i < listRank.length; i++) {
titleName.push([[listRank[i].proName]]); titleName.push([[listRank[i].subComName]]);
data.push([listRank[i].subNum]); data.push([listRank[i].subNum]);
} }
// var myColor = ['#FFA94C', '#8167F5', '#24D2D3', '#52C1F5', '#FF7A8C']; // var myColor = ['#FFA94C', '#8167F5', '#24D2D3', '#52C1F5', '#FF7A8C'];
@ -809,7 +809,7 @@ function proInformationLevelECharts(listRank) {
if (i >= 5) { if (i >= 5) {
break; break;
} else { } else {
$("#proName" + i).text(titleName[i]); $("#subComName" + i).text(titleName[i]);
} }
} }
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {

10
modules/bmw/src/main/resources/static/pages/work/indexScreen/indexScreen.html
View File

@ -213,7 +213,7 @@
<div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.1.png' width="25" height="20"></div> <div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.1.png' width="25" height="20"></div>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="grid-demo" id="proName0"></div> <div class="grid-demo" id="subComName0"></div>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="grid-demo grid-demo-bg1" id="subNum0"></div> <div class="grid-demo grid-demo-bg1" id="subNum0"></div>
@ -225,7 +225,7 @@
<div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.2.png' width="25" height="20"></div> <div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.2.png' width="25" height="20"></div>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="grid-demo" id="proName1"></div> <div class="grid-demo" id="subComName1"></div>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="grid-demo grid-demo-bg1" id="subNum1"></div> <div class="grid-demo grid-demo-bg1" id="subNum1"></div>
@ -237,7 +237,7 @@
<div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.3.png' width="25" height="20"></div> <div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.3.png' width="25" height="20"></div>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="grid-demo" id="proName2"></div> <div class="grid-demo" id="subComName2"></div>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="grid-demo grid-demo-bg1" id="subNum2"></div> <div class="grid-demo grid-demo-bg1" id="subNum2"></div>
@ -249,7 +249,7 @@
<div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.4.png' width="25" height="20"></div> <div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.4.png' width="25" height="20"></div>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="grid-demo" id="proName3"></div> <div class="grid-demo" id="subComName3"></div>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="grid-demo grid-demo-bg1" id="subNum3"></div> <div class="grid-demo grid-demo-bg1" id="subNum3"></div>
@ -261,7 +261,7 @@
<div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.5.png' width="25" height="20"></div> <div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.5.png' width="25" height="20"></div>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="grid-demo" id="proName4"></div> <div class="grid-demo" id="subComName4"></div>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<div class="grid-demo grid-demo-bg1" id="subNum4"></div> <div class="grid-demo grid-demo-bg1" id="subNum4"></div>