@@ -163,18 +248,27 @@ function addNewRow(button) {
cell3.innerHTML = '
';
cell4.innerHTML = '
';
- // 重置表单和状态
- resetForm();
-
- // 重置灯光状态监控
- resetLights();
-
- // 重置检测状态记录
- resetCheckList();
-
- // 清空app.py的信号数据
+ // 直接设置新行的状态（不依赖updateTestResult函数）
+ const newCheckbox = newRow.querySelector('.form-check-input');
+ const newLabel = newRow.querySelector('.form-check-label');
+ const newPendingSpan = newLabel.querySelector('.pending');
+ const newPassSpan = newLabel.querySelector('.pass');
+ const newFailSpan = newLabel.querySelector('.fail');
+
+ newCheckbox.disabled = true;
+ newCheckbox.checked = false;
+ newPendingSpan.style.display = 'inline';
+ newPassSpan.style.display = 'none';
+ newFailSpan.style.display = 'none';
+ newRow.classList.add('pending-row');
+ newRow.classList.remove('pass-row', 'fail-row');
+
+ // 重置其他状态
+ resetLightStatus();
clearSignalData();
-
+ resetDetectionStatus();
+ resetCheckList();
+
// 聚焦到新的设备序列号输入框
const newSerialInput = newRow.querySelector('.serial-number');
newSerialInput.focus();
@@ -229,11 +323,23 @@ function resetForm() {
// 重置测试结果为待测试状态
resetTestResult();
+ // 重置灯光状态
+ resetLightStatus();
+
+ // 重置检测状态记录
+ resetCheckList();
+
// 重置检测状态记录
resetDetectionStatus();
- // 重置灯光状态
- resetLightStatus();
+ // 清空信号数据
+ clearSignalData();
+
+ // 重新初始化灯光显示
+ updateDeviceTypeDisplay();
+
+ // 确保 allTestsPassed 被重置
+ allTestsPassed = false;
}
function clearSignalData() {
@@ -255,6 +361,7 @@ function clearSignalData() {
function exportToExcel() {
const table = document.getElementById('resultTable');
const deviceType = document.getElementById('deviceType').value;
+ const deviceModel = document.getElementById('deviceModel').value;
const tester = document.getElementById('tester').value;
const orderNumber = document.getElementById('orderNumber').value;
const testDate = document.getElementById('testDate').value;
@@ -262,7 +369,8 @@ function exportToExcel() {
const data = [];
// 添加测试信息
- data.push(['设备型号', deviceType === '5' ? '五孔' : '四孔']);
+ data.push(['设备类型', deviceType]);
+ data.push(['设备型号', deviceModel]);
data.push(['检测人员', tester]);
data.push(['订单编号', orderNumber]);
data.push(['测试日期', testDate]);
@@ -319,38 +427,71 @@ function disableInfoInputs() {
function setupDeviceTypeListener() {
const deviceTypeSelect = document.getElementById('deviceType');
+ const deviceModelSelect = document.getElementById('deviceModel');
+
if (deviceTypeSelect) {
deviceTypeSelect.addEventListener('change', function() {
- currentDeviceType = this.value;
+ const selectedType = this.value;
+
+ // 根据设备类型更新 currentDeviceType
+ if (selectedType === 'A类-4孔') {
+ currentDeviceType = '4'; // 对应四孔
+ } else if (selectedType === 'B类-5孔') {
+ currentDeviceType = '5'; // 对应五孔
+ } else {
+ currentDeviceType = '';
+ }
+
+ // 更新显示
updateDeviceTypeDisplay();
+
+ // 重置检测状态
+ resetForm();
+
+ // 重新开始监控灯光状态
+ updateLights();
});
}
}
function updateDeviceTypeDisplay() {
- const deviceType = document.getElementById('deviceType').value;
const fiveHoleLights = document.getElementById('fiveHoleLights');
const fourHoleLights = document.getElementById('fourHoleLights');
const statusCheckList5 = document.getElementById('statusCheckList5');
const statusCheckList4 = document.getElementById('statusCheckList4');
- if (deviceType === '5') {
- fiveHoleLights.style.display = 'flex';
- fourHoleLights.style.display = 'none';
- statusCheckList5.style.display = 'block';
- statusCheckList4.style.display = 'none';
- } else if (deviceType === '4') {
- fiveHoleLights.style.display = 'none';
- fourHoleLights.style.display = 'flex';
- statusCheckList5.style.display = 'none';
- statusCheckList4.style.display = 'block';
- } else {
- fiveHoleLights.style.display = 'none';
- fourHoleLights.style.display = 'none';
- statusCheckList5.style.display = 'none';
- statusCheckList4.style.display = 'none';
+ // 首先隐藏所有元素
+ if (fiveHoleLights) fiveHoleLights.style.display = 'none';
+ if (fourHoleLights) fourHoleLights.style.display = 'none';
+ if (statusCheckList5) statusCheckList5.style.display = 'none';
+ if (statusCheckList4) statusCheckList4.style.display = 'none';
+
+ // 根据当前设备类型显示相应元素
+ if (currentDeviceType === '5') { // B类-5孔
+ if (fiveHoleLights) {
+ fiveHoleLights.style.display = 'flex';
+ // 确保所有灯初始状态为关闭
+ const lights = fiveHoleLights.querySelectorAll('.light');
+ lights.forEach(light => {
+ light.classList.remove('on');
+ light.classList.add('off');
+ });
+ }
+ if (statusCheckList5) statusCheckList5.style.display = 'block';
+ } else if (currentDeviceType === '4') { // A类-4孔
+ if (fourHoleLights) {
+ fourHoleLights.style.display = 'flex';
+ // 确保所有灯初始状态为关闭
+ const lights = fourHoleLights.querySelectorAll('.light');
+ lights.forEach(light => {
+ light.classList.remove('on');
+ light.classList.add('off');
+ });
+ }
+ if (statusCheckList4) statusCheckList4.style.display = 'block';
}
+ // 重置检查列表状态
resetCheckList();
}
@@ -416,7 +557,57 @@ function setupPortSelection() {
});
}
+async function loadDeviceData() {
+ try {
+ const response = await fetch('../static/config/model.json');
+ const data = await response.json();
+
+ // 获取所有不重复的设备型
+ const deviceTypes = [...new Set(data.map(item => item.Type))];
+
+ // 填充设备类型下拉框
+ const deviceTypeSelect = document.getElementById('deviceType');
+ deviceTypeSelect.innerHTML = '
';
+ deviceTypes.forEach(type => {
+ const option = document.createElement('option');
+ option.value = type;
+ option.textContent = type;
+ deviceTypeSelect.appendChild(option);
+ });
+
+ // 设置设备类型变化时的监听器
+ deviceTypeSelect.addEventListener('change', function() {
+ const selectedType = this.value;
+ const deviceModelSelect = document.getElementById('deviceModel');
+
+ if (selectedType === '请选择...') {
+ deviceModelSelect.innerHTML = '
';
+ deviceModelSelect.disabled = true;
+ return;
+ }
+
+ // 获取选中类型对应的型号
+ const models = data.filter(item => item.Type === selectedType);
+
+ // 填充设备型号下拉框
+ deviceModelSelect.innerHTML = '
';
+ models.forEach(model => {
+ const option = document.createElement('option');
+ option.value = model.Model;
+ option.textContent = model.Model;
+ deviceModelSelect.appendChild(option);
+ });
+
+ deviceModelSelect.disabled = false;
+ });
+
+ } catch (error) {
+ console.error('加载设备数据失败:', error);
+ }
+}
+
document.addEventListener('DOMContentLoaded', function() {
+ loadDeviceData();
setupDeviceTypeListener();
setupPortSelection();
@@ -431,6 +622,8 @@ document.addEventListener('DOMContentLoaded', function() {
// 初始化设备类型显示
updateDeviceTypeDisplay();
- // 每100毫秒更新一次灯光状态
- setInterval(updateLights, 300);
+ // 每300毫秒更新一次灯光状态
+ if (!window.lightUpdateInterval) {
+ window.lightUpdateInterval = setInterval(updateLights, 300);
+ }
});
diff --git a/templates/index.html b/templates/index.html
index 3652721..f15ee45 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -29,11 +29,15 @@
-
+
+
+
+
+
@@ -52,6 +56,9 @@
+
+
+