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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
haozq 2026-02-09 14:42:59 +08:00
parent ad64c2c869 927198a4a9
commit 175249cba1
1 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@
margin-bottom: 20px;
box-shadow: 0 2px 12px rgba(0,0,0,0.1);
}
.function-list {
display: flex;
flex-wrap: nowrap;
@ -86,7 +86,7 @@
overflow-x: auto;
padding: 10px 0;
}
.function-item {
min-width: 100px;
padding: 12px 15px;
@ -97,18 +97,18 @@
transition: all 0.3s;
white-space: nowrap;
}
.function-item:hover {
background: #e6f7ff;
color: #1890ff;
}
.function-item i {
display: block;
font-size: 24px;
margin-bottom: 8px;
}
.function-item span {
font-size: 14px;
}
@ -118,39 +118,39 @@
justify-content: space-between;
align-items: center;
}
.settings-btn {
cursor: pointer;
padding: 5px;
color: #666;
transition: all 0.3s;
}
.settings-btn:hover {
color: #1890ff;
}
/* 菜单设置弹窗样式 */
.menu-settings-dialog {
padding: 20px;
}
.menu-settings-list {
max-height: 500px;
overflow-y: auto;
}
.menu-item {
display: flex;
align-items: center;
padding: 10px;
border-bottom: 1px solid #eee;
}
.menu-item:last-child {
border-bottom: none;
}
.menu-item label {
margin: 0;
padding-left: 10px;
@ -159,18 +159,18 @@
align-items: center;
gap: 8px;
}
.dialog-footer {
text-align: right;
padding-top: 20px;
border-top: 1px solid #eee;
}
.menu-item i {
font-size: 16px;
color: #666;
}
.menu-item input[type="checkbox"] {
margin: 0;
cursor: pointer;
@ -183,21 +183,21 @@
margin-top: 2px;
line-height: 1.4;
}
.todo-icon.other {
background: #ffa940;
}
.todo-item:hover {
background: #f5f5f5;
transition: all 0.3s;
}
.todo-content {
flex: 1;
padding-left: 10px;
}
.overview-card .todo-title {
font-weight: 600;
color: #333;
@ -208,7 +208,7 @@
text-overflow: ellipsis;
white-space: nowrap;
}
.overview-card .todo-desc {
font-size: 11px;
color: #666;
@ -218,7 +218,7 @@
text-overflow: ellipsis;
white-space: nowrap;
}
/* 顶部待办事项表格样式 */
.overview-card .todo-list {
padding: 0;
@ -226,7 +226,7 @@
min-height: 460px; /* 确保有足够的高度容纳分页控件 */
width: 100%; /* 确保占满容器宽度 */
}
.todo-table-container {
max-height: 420px;
overflow-y: auto;
@ -239,27 +239,27 @@
margin: 0; /* 移除任何外边距 */
background: linear-gradient(to bottom, #fff 0%, #fafafa 100%);
}
/* 美化滚动条 */
.todo-table-container::-webkit-scrollbar {
width: 8px;
height: 8px;
}
.todo-table-container::-webkit-scrollbar-track {
background: #f5f5f5;
border-radius: 4px;
}
.todo-table-container::-webkit-scrollbar-thumb {
background: #ddd;
border-radius: 4px;
}
.todo-table-container::-webkit-scrollbar-thumb:hover {
background: #ccc;
}
.todo-table {
width: 100% !important;
border-collapse: collapse;
@ -269,7 +269,7 @@
padding: 0;
display: table;
}
.todo-table thead th {
background: #fafafa;
color: #333;
@ -282,29 +282,29 @@
top: 0;
z-index: 10;
}
/* 列宽分配 */
.todo-table th:nth-child(1),
.todo-table td:nth-child(1) {
width: 12% !important;
.todo-table th:nth-child(1),
.todo-table td:nth-child(1) {
width: 12% !important;
}
.todo-table th:nth-child(2),
.todo-table td:nth-child(2) {
width: 35% !important;
.todo-table th:nth-child(2),
.todo-table td:nth-child(2) {
width: 35% !important;
}
.todo-table th:nth-child(3),
.todo-table td:nth-child(3) {
width: 28% !important;
.todo-table th:nth-child(3),
.todo-table td:nth-child(3) {
width: 28% !important;
}
.todo-table th:nth-child(4),
.todo-table td:nth-child(4) {
width: 12% !important;
.todo-table th:nth-child(4),
.todo-table td:nth-child(4) {
width: 12% !important;
}
.todo-table th:nth-child(5),
.todo-table td:nth-child(5) {
width: 13% !important;
.todo-table th:nth-child(5),
.todo-table td:nth-child(5) {
width: 13% !important;
}
.todo-table tbody tr {
cursor: pointer;
transition: all 0.3s;
@ -312,30 +312,30 @@
margin: 4px 0;
border-bottom: 1px solid #f0f0f0;
}
.todo-table tbody tr:hover {
background: #f8f9fa;
box-shadow: 0 2px 8px rgba(0,0,0,0.05);
z-index: 5;
}
.todo-table tbody tr:active {
background: #e6f7ff;
transition: background 0.1s;
}
.todo-table tbody tr:last-child {
border-bottom: none;
}
.todo-table tbody tr:nth-child(even) {
background: #fafafa;
}
.todo-table tbody tr:nth-child(even):hover {
background: #f8f9fa;
}
.todo-table tbody tr:after {
content: '';
position: absolute;
@ -345,7 +345,7 @@
height: 1px;
background: linear-gradient(to right, transparent, #e8e8e8, transparent);
}
.todo-table tbody td {
padding: 14px 10px;
vertical-align: middle;
@ -357,11 +357,11 @@
border-right: 1px solid #f0f0f0;
position: relative;
}
.todo-table tbody td:last-child {
border-right: none;
}
.todo-table tbody td:not(:last-child):after {
content: '';
position: absolute;
@ -371,7 +371,7 @@
width: 1px;
background-color: #f0f0f0;
}
.todo-type-icon {
display: inline-flex;
align-items: center;
@ -386,41 +386,41 @@
font-weight: 600;
box-shadow: 0 1px 2px rgba(0,0,0,0.1);
}
.todo-type-icon.new {
background: linear-gradient(135deg, #52c41a, #389e0d);
}
.todo-type-icon.out {
background: linear-gradient(135deg, #1890ff, #096dd9);
}
.todo-type-icon.return {
background: linear-gradient(135deg, #fa8c16, #d46b08);
}
.todo-type-icon.other {
background: linear-gradient(135deg, #722ed1, #531dab);
}
.todo-type-text {
display: inline-block;
vertical-align: middle;
font-weight: 500;
}
.todo-task-name {
font-weight: 500;
color: #1890ff;
position: relative;
padding-left: 2px;
}
.todo-task-name:hover {
color: #40a9ff;
text-decoration: underline;
}
.todo-code {
color: #666;
font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
@ -430,7 +430,7 @@
font-size: 12px;
border: 1px solid #eee;
}
.todo-user {
color: #333;
font-weight: 500;
@ -440,13 +440,13 @@
display: inline-block;
border: 1px solid #f0f0f0;
}
.todo-time {
color: #999;
font-size: 12px;
white-space: nowrap;
}
/* 分页样式 */
.todo-pagination {
position: absolute;
@ -463,18 +463,18 @@
z-index: 20;
backdrop-filter: blur(2px);
}
.todo-pagination .pagination-info {
color: #666;
font-size: 11px;
}
.todo-pagination .pagination-controls {
display: flex;
gap: 6px;
align-items: center;
}
.todo-pagination button {
padding: 3px 8px;
border: 1px solid #d9d9d9;
@ -486,25 +486,25 @@
transition: all 0.2s;
min-width: 60px;
}
.todo-pagination button:hover:not(:disabled) {
border-color: #1890ff;
color: #1890ff;
background: rgba(24, 144, 255, 0.05);
}
.todo-pagination button:disabled {
background: rgba(245, 245, 245, 0.9);
color: #ccc;
cursor: not-allowed;
}
.todo-pagination .page-size-selector {
margin-left: 12px;
color: #666;
font-size: 11px;
}
.todo-pagination select {
padding: 2px 4px;
border: 1px solid #d9d9d9;
@ -513,7 +513,7 @@
margin-left: 4px;
background: rgba(255, 255, 255, 0.9);
}
#todoPageInfo {
font-size: 11px;
color: #666;
@ -530,7 +530,7 @@
border-radius: 4px;
margin-bottom: 10px;
}
.stat-item {
display: flex;
align-items: center;
@ -540,12 +540,12 @@
border-radius: 3px;
box-shadow: 0 1px 2px rgba(0,0,0,0.05);
}
.stat-label {
color: #666;
font-size: 13px;
}
.stat-number {
color: #1890ff;
font-weight: bold;
@ -732,7 +732,7 @@
</div>
</div>
</div>
<!-- 机具日历 -->
<div class="overview-card">
<h4>机具日历</h4>
@ -768,7 +768,7 @@
</div>
<div id="equipmentCalendar" class="calendar-container"></div>
</div>
<!-- 数据概览 -->
<div class="overview-card">
<div class="overview-title">数据概览</div>
@ -810,19 +810,19 @@
<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="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 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>
</div>
</div>
</div>
@ -830,7 +830,7 @@
<script src="${bonuspath}/static/js/index/jquery.min.js"></script>
<script src="${bonuspath}/static/js/index/layer.min.js"></script>
<script src="${bonuspath}/static/js/index/bootstrap.bundle.min.js"></script>
<script src="${bonuspath}/static/js/index/indexHome.js?v=1"></script>
<script src="${bonuspath}/static/js/index/indexHome.js?v=1"></script>
<script src="${bonuspath}/static/js/sys/index.js"></script>
<script src="${bonuspath}/static/js/ace/ace-extra.min.js"></script>
<script src="${bonuspath}/static/js/bootstrap/bootstrap.min.js"></script>
@ -842,7 +842,7 @@
<script src="${bonuspath}/static/plugins/tabs/js/tab-control.min.js"></script>
<script src="${bonuspath}/static/js/sys/main.js"></script>
<script src="${bonuspath}/static/js/layer.js"></script>
<script>
// 将函数定义移到全局作用域
@ -868,9 +868,9 @@
const menuItem = document.createElement('div');
menuItem.className = 'menu-item';
menuItem.innerHTML = `
<input type="checkbox"
id="menu_${menu.rsId}"
value="${menu.rsId}"
<input type="checkbox"
id="menu_${menu.rsId}"
value="${menu.rsId}"
${menu.isCheck ? 'checked' : ''}>
<label for="menu_${menu.rsId}">
<i class="${menu.rsIcon || 'layui-icon-app'}"></i>
@ -927,7 +927,7 @@
}
});
}
function showEquipmentTypes() {
layer.open({
type: 2,
@ -1024,6 +1024,6 @@
</script>
</body>
</html>