Merge branch 'master' of http://192.168.1.3:3000/project_boditech_vidas_a8000_v3/A8000

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 {

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;

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

src/pages/Index/Settings/Users.vue

@@ -396,7 +396,7 @@ const deleteUserMessage = computed(
 <style scoped lang="less">
 .user-management {
   width: 100%;
-  height: 91.5vh;
+  height: 90vh;
   padding: 20px;
   box-sizing: border-box;
   background-color: #f5f7fa;
@@ -404,6 +404,7 @@ const deleteUserMessage = computed(
   flex-direction: column;
 
   .user-table {
+    height: 80%;
     flex: 1;
     background-color: #fff;
     border-radius: 12px;

src/pages/Index/Settings/Version.vue

@@ -44,7 +44,7 @@ onActivated(() => {
 .version-setting {
   background-color: #f5f7fa;
   width: 100%;
-  height: 91.5h;
+  height: 91.5vh;
   box-sizing: border-box;
   padding: 20px;
   display: flex;

src/pages/Index/components/Setting/EnterPinModal.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="modal-body">
           <div class="input-container">
-            <input :type="isShowType?'text':'password'" v-model="pin" placeholder="输入密码" @focus="showKeyboard()" class="pin-input" />
+            <input :maxlength="4" :type="isShowType?'text':'password'" v-model="pin" placeholder="输入密码" @focus="showKeyboard()" class="pin-input" />
             <el-icon class="pwd-view" @click="isShowType = !isShowType"><View /></el-icon>
           </div>
         </div>
@@ -75,7 +75,7 @@ const handleKeyboardInput = (value: string) => {
   // 更新当前输入值
   currentInputValue.value = value
   // 更新对应字段的值
-  pin.value = value
+  pin.value = value.slice(0, 4)
 }
 
 // 处理键盘按键

src/pages/Index/components/Setting/UpdatePinModal.vue

@@ -10,6 +10,7 @@
           <div class="input-container">
             <div>
               <input
+                :maxlength="4"
                 :type="showoldpasswd ? 'text' : 'password'"
                 v-model="oldpasswd"
                 placeholder="输入旧密码"
@@ -23,6 +24,7 @@
             <br />
             <div>
               <input
+                :maxlength="4"
                 :type="showPassword ? 'text' : 'password'"
                 v-model="password"
                 placeholder="输入新密码"
@@ -36,6 +38,7 @@
             <br />
             <div>
               <input
+                :maxlength="4"
                 :type="showConfirmPassword ? 'text' : 'password'"
                 v-model="confirmPassword"
                 placeholder="输入确认新密码"
@@ -171,11 +174,11 @@ const handleKeyboardInput = (value: string) => {
   // 更新对应字段的值
 
   if (currentInputField.value === 'oldpasswd') {
-    oldpasswd.value = value
+    oldpasswd.value = value.slice(0, 4)
   } else if (currentInputField.value == 'password') {
-    password.value = value
+    password.value = value.slice(0, 4)
   } else if (currentInputField.value == 'confirmPassword') {
-    confirmPassword.value = value
+    confirmPassword.value = value.slice(0, 4)
   }
 }
 

src/pages/Login/Login.vue

@@ -180,6 +180,7 @@ watch(loginStatus, () => {
   align-items: center;
   box-shadow: 0 4px 10px rgba(0, 0, 0, 0.15);
   margin-right: 20px;
+  overflow: auto;
 
   ul {
     list-style: none;