diff --git a/src/pages/Index/History.vue b/src/pages/Index/History.vue index ffd7e6a..62561e2 100644 --- a/src/pages/Index/History.vue +++ b/src/pages/Index/History.vue @@ -260,6 +260,7 @@ const showActionConfirm = (actionType: string) => { if (selectedItems.value.length === 0) { // 如果没有选中项目,弹出通知框 warnMessage.value = '请先选择项目' + warnIcon = WarnSvg showWarn.value = true return } @@ -618,21 +619,21 @@ onMounted(() => { background: #f5f7fa; } - // 添加表格容器阴影效果 - &::after { - content: ''; - position: absolute; - left: 0; - right: 0; - bottom: 0; - height: 30px; - background: linear-gradient( - to top, - rgba(255, 255, 255, 0.9), - transparent - ); - pointer-events: none; - } + //// 添加表格容器阴影效果 + //&::after { + // content: ''; + // position: absolute; + // left: 0; + // right: 0; + // bottom: 0; + // height: 30px; + // background: linear-gradient( + // to top, + // rgba(255, 255, 255, 0.9), + // transparent + // ); + // pointer-events: none; + //} } .history-function { diff --git a/src/pages/Index/Index.vue b/src/pages/Index/Index.vue index 2f8cb48..5aedb0d 100644 --- a/src/pages/Index/Index.vue +++ b/src/pages/Index/Index.vue @@ -1062,6 +1062,7 @@ watch( position: relative; bottom: 0; margin-top: auto; + background: #f5f7fa; > *:first-child { margin-right: auto; @@ -1101,7 +1102,7 @@ watch( text-overflow: ellipsis; &.Info { color: #333; - background-color: #f5f5f5; + background-color: #ddd; } &.Warn { color: #fa9d3b; diff --git a/src/pages/Index/Regular/TestTube.vue b/src/pages/Index/Regular/TestTube.vue index 1f56c25..e833a1c 100644 --- a/src/pages/Index/Regular/TestTube.vue +++ b/src/pages/Index/Regular/TestTube.vue @@ -234,9 +234,17 @@ const addTubeRack = async () => { loading.value = false } +const projIdsOfTube = (tube) => { + return tube ? (tube.projId || tube.projIds || []) : [] +} + // 处理试管架激活状态变化 const handleActivateChange = async (index: number) => { const rack = testTubeStore.tubeRacks[index] + if(rack.tubeSettings.every((tube) => projIdsOfTube(tube).length === 0)) { + eMessage.error('请为试管配置检测项目') + return + } if (rack.state === 'LOCKED') { eMessage.error('试管已锁定,不能修改') return diff --git a/src/pages/Index/Settings/Users.vue b/src/pages/Index/Settings/Users.vue index 278cc57..d275df3 100644 --- a/src/pages/Index/Settings/Users.vue +++ b/src/pages/Index/Settings/Users.vue @@ -396,7 +396,7 @@ const deleteUserMessage = computed(