diff --git a/frontend/assets/styles.css b/frontend/assets/styles.css index 32c7331..55ad25d 100644 --- a/frontend/assets/styles.css +++ b/frontend/assets/styles.css @@ -2572,8 +2572,10 @@ input[type="date"]::-webkit-calendar-picker-indicator:hover{ .topnav-item{position:relative;display:flex;align-items:center;gap:4px;padding:8px 14px;color:var(--text-2);text-decoration:none;font-size:14px;font-weight:500;border-radius:6px;cursor:pointer;transition:all 0.2s ease;white-space:nowrap} .topnav-item:hover,.topnav-item.active{background:rgba(79,140,255,0.1);color:var(--text)} .topnav-item.active{color:var(--primary);background:rgba(79,140,255,0.15)} -.topnav-caret{margin-left:auto;display:inline-flex;align-items:center;justify-content:center;width:18px;height:18px;font-size:14px;line-height:1;transition:transform 0.2s ease;opacity:.85} -.topnav-item.has-dropdown:hover .topnav-caret,.topnav-item.has-dropdown.open .topnav-caret{transform:rotate(180deg)} +.topnav-caret{margin-left:auto;display:inline-flex;align-items:center;justify-content:center;width:18px;height:18px;font-size:0;line-height:1;transition:all 0.2s ease;opacity:.85} +.topnav-caret::before{content:'';position:absolute;width:6px;height:6px;background:var(--primary);border-radius:50%;box-shadow:0 0 6px var(--primary),0 0 12px var(--primary);opacity:0.6;transition:all 0.2s ease} +.topnav-item.has-dropdown:hover .topnav-caret::before,.topnav-item.has-dropdown.open .topnav-caret::before{opacity:1;box-shadow:0 0 8px var(--primary),0 0 16px var(--primary),0 0 24px var(--primary)} +.topnav-item.has-dropdown:hover .topnav-caret,.topnav-item.has-dropdown.open .topnav-caret{transform:none} .topnav-dropdown{position:absolute;top:100%;left:0;min-width:180px;background:var(--surface);border:1px solid var(--border);border-radius:8px;box-shadow:0 8px 24px rgba(0,0,0,0.3);padding:6px 0;opacity:0;visibility:hidden;transform:translateY(8px);transition:all 0.2s ease;z-index:1000} .topnav-item.has-dropdown:hover .topnav-dropdown,.topnav-item.has-dropdown.open .topnav-dropdown{opacity:1;visibility:visible;transform:translateY(0)} .dropdown-item{display:block;padding:10px 16px;color:var(--text-2);text-decoration:none;font-size:13px;transition:all 0.15s ease} @@ -2622,7 +2624,7 @@ input[type="date"]::-webkit-calendar-picker-indicator:hover{ @media(max-width:768px){.product-card{flex-direction:column}.product-image-wrapper{flex:none;width:100%}.product-features{grid-template-columns:1fr}} [data-theme="light"] body{background:#f1f5f9} -#app.trackit-layout{margin:16px;height:calc(100vh - 32px);border-radius:40px;overflow:hidden;background:#ffffff;border:1px solid rgba(255,255,255,.4);box-shadow:0 24px 64px rgba(15,23,42,.14);display:flex;flex-direction:row} +#app.trackit-layout{margin:0;height:100vh;border-radius:0;overflow:hidden;background:#ffffff;border:none;box-shadow:none;display:flex;flex-direction:row} #app.trackit-layout .content{background:rgba(248,250,252,.6);height:100%} #app.trackit-layout .content.topbar-layout{height:100%;display:flex;flex-direction:column} #app.trackit-layout .content.topbar-layout .view{padding:24px;height:100%;overflow:hidden} @@ -2651,14 +2653,17 @@ input[type="date"]::-webkit-calendar-picker-indicator:hover{ #app.trackit-layout > #sidebar .topnav{flex:1;min-height:0;overflow:visible;padding-right:2px} #app.trackit-layout > #sidebar .sidebar-footer{margin-top:auto;display:flex;flex-direction:column;gap:12px} - #app.trackit-layout > #sidebar .sidebar-actions{display:flex;align-items:center;justify-content:space-between;gap:14px;padding:12px 6px 2px;border-top:1px solid rgba(226,232,240,.85)} + #app.trackit-layout > #sidebar .sidebar-actions{display:flex;align-items:center;justify-content:flex-end;gap:14px;padding:12px 6px 2px;border-top:1px solid rgba(226,232,240,.85)} [data-theme="dark"] #app.trackit-layout > #sidebar .sidebar-actions{border-top:1px solid rgba(255,255,255,.08)} + #app.trackit-layout > #sidebar .sidebar-actions .notification-bell-btn{position:relative;background:none;border:none;cursor:pointer;padding:6px;border-radius:10px;display:flex;align-items:center;justify-content:center;transition:all 0.2s ease;color:var(--text-2)} + #app.trackit-layout > #sidebar .sidebar-actions .notification-bell-btn:hover{background:rgba(79,140,255,0.1);color:var(--primary)} + #app.trackit-layout > #sidebar .sidebar-actions .notification-bell-btn .notification-badge{position:absolute;top:-2px;right:-2px;background:var(--danger);color:#fff;border-radius:10px;padding:2px 6px;font-size:10px;font-weight:700;min-width:18px;text-align:center;line-height:1.2;box-shadow:0 2px 4px rgba(239,68,68,0.3)} #app.trackit-layout > #sidebar .sidebar-actions .user-avatar-btn{padding:0;opacity:1} #app.trackit-layout > #sidebar .sidebar-actions .user-avatar-img{width:36px;height:36px} #app.trackit-layout > #sidebar .sidebar-actions .user-name-display{display:none} #app.trackit-layout > #sidebar .sidebar-actions .user-dropdown{top:auto;bottom:100%;margin-top:0;margin-bottom:8px} - #app.trackit-layout > #sidebar .sidebar-notification-card{position:relative;background:rgba(255,255,255,.78);border:1px solid rgba(226,232,240,.9);border-radius:18px;padding:12px 6px 10px;box-shadow:0 10px 30px rgba(15,23,42,.06),0 0 0 2px rgba(0,0,0,.15);height:220px;display:flex;flex-direction:column;cursor:default;margin:0 -12px;width:calc(100% + 24px)} + #app.trackit-layout > #sidebar .sidebar-notification-card{position:relative;background:rgba(255,255,255,.78);border:1px solid rgba(226,232,240,.9);border-radius:18px;padding:12px 6px 10px;box-shadow:0 10px 30px rgba(15,23,42,.06),0 0 0 2px rgba(0,0,0,.15);height:220px;display:flex;flex-direction:column;cursor:default;margin:12px 0 0 0;width:100%;z-index:1} [data-theme="dark"] #app.trackit-layout > #sidebar .sidebar-notification-card{background:rgba(15,23,42,.25);border-color:rgba(255,255,255,.08);box-shadow:0 0 0 2px rgba(0,0,0,.4)} #app.trackit-layout > #sidebar .sidebar-notification-header{display:flex;align-items:flex-start;justify-content:space-between;gap:10px;margin-bottom:10px;padding:0 6px;cursor:pointer} #app.trackit-layout > #sidebar .sidebar-notification-title{font-size:12px;font-weight:800;color:var(--text);letter-spacing:.02em} @@ -2792,10 +2797,14 @@ input[type="date"]::-webkit-calendar-picker-indicator:hover{ .notification-modal .notification-modal-backdrop{position:absolute;inset:0;background:rgba(2,6,23,.38);backdrop-filter:blur(6px)} .notification-modal .notification-modal-content{position:relative;width:min(720px,calc(100vw - 32px));max-height:min(80vh,680px);margin:10vh auto 0;background:rgba(255,255,255,.92);border:1px solid rgba(226,232,240,.95);border-radius:22px;box-shadow:0 30px 90px rgba(15,23,42,.25);overflow:hidden;display:flex;flex-direction:column} [data-theme="dark"] .notification-modal .notification-modal-content{background:rgba(15,23,42,.88);border-color:rgba(255,255,255,.12);box-shadow:none} - .notification-modal .notification-modal-header{display:flex;align-items:center;justify-content:space-between;padding:14px 16px;border-bottom:1px solid rgba(226,232,240,.9)} + .notification-modal .notification-modal-header{display:flex;align-items:center;justify-content:space-between;padding:14px 16px;border-bottom:1px solid rgba(226,232,240,.9);gap:12px} [data-theme="dark"] .notification-modal .notification-modal-header{border-bottom:1px solid rgba(255,255,255,.10)} - .notification-modal .notification-modal-title{font-size:14px;font-weight:800;color:var(--text)} - .notification-modal .notification-modal-close{background:none;border:0;cursor:pointer;font-size:22px;line-height:1;color:var(--text);width:34px;height:34px;border-radius:10px} + .notification-modal .notification-modal-title{font-size:14px;font-weight:800;color:var(--text);flex:1} + .notification-modal .notification-modal-actions{display:flex;align-items:center;gap:8px} + .notification-modal .notification-modal-actions .btn-text{padding:6px 12px;border-radius:8px;font-size:12px;background:none;border:1px solid var(--border);color:var(--text);cursor:pointer;transition:all 0.2s ease;font-weight:600} + .notification-modal .notification-modal-actions .btn-text:hover{background:rgba(79,140,255,0.1);border-color:var(--primary);color:var(--primary)} + .notification-modal .notification-modal-actions .btn-text.btn-danger:hover{background:rgba(239,68,68,0.1);border-color:var(--danger);color:var(--danger)} + .notification-modal .notification-modal-close{background:none;border:0;cursor:pointer;font-size:22px;line-height:1;color:var(--text);width:34px;height:34px;border-radius:10px;flex-shrink:0} .notification-modal .notification-modal-close:hover{background:rgba(79,140,255,.12)} .notification-modal .notification-modal-list{padding:14px 8px;overflow:auto} .notification-modal .notification-modal-list::-webkit-scrollbar{width:8px} @@ -2808,3 +2817,12 @@ input[type="date"]::-webkit-calendar-picker-indicator:hover{ .notification-modal .notification-modal-list .notification-item{padding:12px 12px;border-radius:16px;border:1px solid transparent;background:rgba(248,250,252,.9);margin-bottom:10px;cursor:pointer} [data-theme="dark"] .notification-modal .notification-modal-list .notification-item{background:rgba(2,6,23,.35)} .notification-modal .notification-modal-list .notification-item.unread{border-color:rgba(79,140,255,.22)} + + /* Dashboard scrollbar */ + .dashboard-container::-webkit-scrollbar{width:8px} + .dashboard-container::-webkit-scrollbar-track{background:var(--bg);border-radius:4px} + .dashboard-container::-webkit-scrollbar-thumb{background:rgba(79,140,255,0.3);border-radius:4px;transition:background 0.2s} + .dashboard-container::-webkit-scrollbar-thumb:hover{background:rgba(79,140,255,0.5)} + [data-theme="dark"] .dashboard-container::-webkit-scrollbar-track{background:var(--bg)} + [data-theme="dark"] .dashboard-container::-webkit-scrollbar-thumb{background:rgba(79,140,255,0.4)} + [data-theme="dark"] .dashboard-container::-webkit-scrollbar-thumb:hover{background:rgba(79,140,255,0.6)} diff --git a/frontend/index.html b/frontend/index.html index 56329ea..131e751 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -91,7 +91,7 @@ 上传 - ▾ +
MAC与批次 良/不良统计 @@ -110,7 +110,7 @@ 出货查询 - ▾ +
详细记录查询 汇总信息查询 @@ -126,7 +126,7 @@ 生产管理 - ▾ +
生产工单下发中心
@@ -143,7 +143,7 @@ 计划管理 - ▾ +
BOM物料清单 期初库存 @@ -163,7 +163,7 @@ 采集 - ▾ +
设备状态 环境参数 @@ -185,7 +185,7 @@ 基站测试 - ▾ +
美团基站测试
@@ -229,20 +229,6 @@
- -
+
+ +
diff --git a/frontend/js/components/ai-report.js b/frontend/js/components/ai-report.js index 35f4d7a..ededc15 100644 --- a/frontend/js/components/ai-report.js +++ b/frontend/js/components/ai-report.js @@ -2,7 +2,7 @@ const AIReport = (() => { // 生成AI报表卡片的HTML const generateAICard = () => { return ` -
+
AI diff --git a/frontend/js/components/dashboard.js b/frontend/js/components/dashboard.js index 38f420b..2e3dde3 100644 --- a/frontend/js/components/dashboard.js +++ b/frontend/js/components/dashboard.js @@ -1979,7 +1979,7 @@ const Dashboard = (() => { window.__auditTimer=setInterval(refreshAll, 10000); },0); return ` -
+
${metricsCard('直通良品数', data.fpyCount || 0, 'success')} @@ -2065,17 +2065,19 @@ const Dashboard = (() => {
-
+
0%
-
- 拼多多 +
+ + 拼多多
0%
-
- 圆通 +
+ + 圆通
@@ -2090,9 +2092,9 @@ const Dashboard = (() => {
-
+
-
+
审计看板 点击查看完整数据
diff --git a/frontend/js/components/notifications.js b/frontend/js/components/notifications.js index c59a2c9..e8452d3 100644 --- a/frontend/js/components/notifications.js +++ b/frontend/js/components/notifications.js @@ -86,10 +86,10 @@ const list = data.list || []; const container = document.getElementById('notification-list'); const modalContainer = document.getElementById('notification-modal-list'); - if (!container) return; + if (!container && !modalContainer) return; if (list.length === 0) { - container.innerHTML = '
暂无消息通知
'; + if (container) container.innerHTML = '
暂无消息通知
'; if (modalContainer) modalContainer.innerHTML = '
暂无消息通知
'; return; } @@ -103,27 +103,29 @@
`).join(''); - container.innerHTML = fullHtml; + if (container) container.innerHTML = fullHtml; if (modalContainer) modalContainer.innerHTML = fullHtml; // 为每个通知项添加点击事件 - container.querySelectorAll('.notification-item').forEach(item => { - item.addEventListener('click', async () => { - const id = item.dataset.id; - if (item.classList.contains('unread')) { - try { - await API.markNotificationRead(id); - item.classList.remove('unread'); - // 同步 modal 中对应项 - const modalItem = document.querySelector(`#notification-modal-list .notification-item[data-id="${id}"]`); - if (modalItem) modalItem.classList.remove('unread'); - await updateUnreadCount(); - } catch (e) { - console.error('标记已读失败:', e); + if (container) { + container.querySelectorAll('.notification-item').forEach(item => { + item.addEventListener('click', async () => { + const id = item.dataset.id; + if (item.classList.contains('unread')) { + try { + await API.markNotificationRead(id); + item.classList.remove('unread'); + // 同步 modal 中对应项 + const modalItem = document.querySelector(`#notification-modal-list .notification-item[data-id="${id}"]`); + if (modalItem) modalItem.classList.remove('unread'); + await updateUnreadCount(); + } catch (e) { + console.error('标记已读失败:', e); + } } - } + }); }); - }); + } if (modalContainer) { modalContainer.querySelectorAll('.notification-item').forEach(item => { @@ -178,21 +180,24 @@ return; // 超级管理员和管理员才显示通知铃铛 } - // 显示侧边栏通知卡片 - const card = document.getElementById('sidebar-notification-card'); - if (!card) { - console.error('[Notifications] 找不到侧边栏通知卡片元素'); + // 绑定铃铛按钮点击事件 + const bellBtn = document.getElementById('notification-bell-btn'); + if (!bellBtn) { + console.error('[Notifications] 找不到铃铛按钮元素'); return; } - card.style.display = 'block'; - console.log('[Notifications] 侧边栏通知卡片已显示'); - - // 点击卡片标题区域打开大弹窗（列表和按钮区域不触发） - card.addEventListener('click', (e) => { - if (e.target.closest('.sidebar-notification-actions')) return; - if (e.target.closest('.sidebar-notification-list')) return; + + // 移除旧的事件监听器 + const newBellBtn = bellBtn.cloneNode(true); + bellBtn.parentNode.replaceChild(newBellBtn, bellBtn); + + newBellBtn.addEventListener('click', (e) => { + e.preventDefault(); + e.stopPropagation(); openModal(); }); + + console.log('[Notifications] 铃铛按钮已绑定'); // 弹窗关闭 const closeBtn = document.getElementById('notification-modal-close'); @@ -209,13 +214,13 @@ if (isModalOpen && e.key === 'Escape') closeModal(); }); - // 绑定全部标记为已读按钮（移除旧的事件监听器） - const markAllBtn = document.getElementById('mark-all-read'); - if (markAllBtn) { - const newMarkAllBtn = markAllBtn.cloneNode(true); - markAllBtn.parentNode.replaceChild(newMarkAllBtn, markAllBtn); + // 绑定弹窗中的全部标记为已读按钮 + const modalMarkAllBtn = document.getElementById('modal-mark-all-read'); + if (modalMarkAllBtn) { + const newModalMarkAllBtn = modalMarkAllBtn.cloneNode(true); + modalMarkAllBtn.parentNode.replaceChild(newModalMarkAllBtn, modalMarkAllBtn); - newMarkAllBtn.addEventListener('click', async (e) => { + newModalMarkAllBtn.addEventListener('click', async (e) => { e.preventDefault(); try { await API.markAllNotificationsRead(); @@ -228,13 +233,13 @@ }); } - // 绑定删除已读消息按钮（移除旧的事件监听器） - const deleteBtn = document.getElementById('delete-read'); - if (deleteBtn) { - const newDeleteBtn = deleteBtn.cloneNode(true); - deleteBtn.parentNode.replaceChild(newDeleteBtn, deleteBtn); + // 绑定弹窗中的删除已读消息按钮 + const modalDeleteBtn = document.getElementById('modal-delete-read'); + if (modalDeleteBtn) { + const newModalDeleteBtn = modalDeleteBtn.cloneNode(true); + modalDeleteBtn.parentNode.replaceChild(newModalDeleteBtn, modalDeleteBtn); - newDeleteBtn.addEventListener('click', async (e) => { + newModalDeleteBtn.addEventListener('click', async (e) => { e.preventDefault(); if (!confirm('确定要删除所有已读消息吗？')) { return; diff --git a/frontend/js/components/upload.js b/frontend/js/components/upload.js index fb56fda..208cf56 100644 --- a/frontend/js/components/upload.js +++ b/frontend/js/components/upload.js @@ -191,7 +191,7 @@ const Upload = (() => { -
+
-
+
`); diff --git a/server/uploads/repair_images/1768377511654_20260114110759_221_541.jpg b/server/uploads/repair_images/1768377511654_20260114110759_221_541.jpg new file mode 100644 index 0000000..e69de29 diff --git a/server/uploads/repair_images/1768377511655_20260114155719_49_2.png b/server/uploads/repair_images/1768377511655_20260114155719_49_2.png new file mode 100644 index 0000000..e69de29 diff --git a/server/uploads/repair_images/1768377852973_20260114111043_225_541.jpg b/server/uploads/repair_images/1768377852973_20260114111043_225_541.jpg new file mode 100644 index 0000000..ad8e41e Binary files /dev/null and b/server/uploads/repair_images/1768377852973_20260114111043_225_541.jpg differ