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

jsk 机具占比 修改

This commit is contained in:
jiask 2026-02-06 10:22:52 +08:00
parent a391018944
commit cf226ddae7
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
WebContent/WEB-INF/views/index/indexHome.jsp
View File

@ -810,12 +810,12 @@
<div class="overview-card">
<div class="section-title">入库占比&nbsp; &nbsp;&nbsp; / &nbsp;&nbsp;&nbsp;机具类别</div>
<div class="chart-grid">
<div id="storageChart1" class="chart-item" onclick="showEquipmentTypes()"></div>
<div id="storageChart2" class="chart-item" onclick="showEquipmentTypes()"></div>
<div id="storageChart3" class="chart-item" onclick="showEquipmentTypes()"></div>
<div id="storageChart4" class="chart-item" onclick="showEquipmentTypes()"></div>
<div id="storageChart5" class="chart-item" onclick="showEquipmentTypes()"></div>
<div id="storageChart6" class="chart-item" onclick="showEquipmentTypes()"></div>
<div id="storageChart1" class="chart-item" onclick="showEquipmentTypes1('入库占比','1')"></div>
<div id="storageChart2" class="chart-item" onclick="showEquipmentTypes1('入库占比','2')"></div>
<div id="storageChart3" class="chart-item" onclick="showEquipmentTypes1('入库占比','3')"></div>
<div id="storageChart4" class="chart-item" onclick="showEquipmentTypes1('入库占比','4')"></div>
<div id="storageChart5" class="chart-item" onclick="showEquipmentTypes2('机具占比','5')"></div>
<div id="storageChart6" class="chart-item" onclick="showEquipmentTypes2('编码占比','6')"></div>
</div>
</div>
</div>
@ -931,7 +931,7 @@
function showEquipmentTypes() {
layer.open({
type: 2,
title: '机具类别明细',
title: '入库占比',
area: ['1500px', '700px'],
content: '${bonuspath}/backstage/indexHome/dataOverview/equipment/index',
btn: ['关闭'], // 添加关闭按钮
@ -941,6 +941,32 @@
});
}
function showEquipmentTypes1(name,type) {
layer.open({
type: 2,
title: ''+name,
area: ['1500px', '700px'],
content: '${bonuspath}/backstage/indexHome/dataOverview/equipmentProportion/index?type='+type,
btn: ['关闭'], // 添加关闭按钮
yes: function(index, layero) {
layer.close(index); // 关闭当前弹窗
}
});
}
function showEquipmentTypes2(name,type) {
layer.open({
type: 2,
title: ''+name,
area: ['1500px', '700px'],
content: '${bonuspath}/backstage/indexHome/dataOverview/equipmentType/index?type='+type,
btn: ['关闭'], // 添加关闭按钮
yes: function(index, layero) {
layer.close(index); // 关闭当前弹窗
}
});
}
function showProjectDetail() {
layer.open({
type: 2,

6
WebContent/static/js/index/indexHome.js
View File

@ -1230,6 +1230,7 @@ $(function() {
{ key: 'repairStorage', index: 2, title: '修试后入库', color: '#36cfc9' },
{ key: 'inventoryStorage', index: 3, title: '盘点入库', color: '#73d13d' },
{ key: 'returnStorage', index: 4, title: '退料入库', color: '#ffc53d' },
// { key: 'repairStorage', index: 4, title: '退料入库', color: '#ffc53d' },
{ key: 'equipmentCount', index: 5, title: '机具数量', color: '#ff7a45' },
{ key: 'deviceCount', index: 6, title: '编码数量', color: '#722ed1' }
];
@ -1241,7 +1242,10 @@ $(function() {
continue;
}
const chartData = data[config.key] || { value: 0, total: 100 };
let chartData = data[config.key] || { value: 0, total: 100 };
if(config.key=='returnStorage'){
chartData=data['repairStorage'] || { value: 0, total: 100 };
}
const option = createCircleChartOption(chartData, config.title, config.color);
try {