diff --git a/src/assets/images/login_left.png b/src/assets/images/login_left.png new file mode 100644 index 0000000..fbefbdb Binary files /dev/null and b/src/assets/images/login_left.png differ diff --git a/src/views/login.vue b/src/views/login.vue index 4af2613..fb9c10a 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,95 +1,93 @@ @@ -248,43 +246,65 @@ getCode(); .login { position: relative; height: 100vh; - background-image: url("../assets/images/login-background.jpg"); + background: #02a5ff; background-size: cover; overflow: hidden; } -.login-form { +.login-container { position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); - background: rgba(255, 255, 255, 0.4); - backdrop-filter: blur(10px); - -webkit-backdrop-filter: blur(10px); - border: 1px solid rgba(255, 255, 255, 0.9); + /* 关键1:替换固定百分比宽度为最大宽度+自适应,避免缩放时过度拉伸 */ + width: clamp(800px, 70%, 1400px); + max-width: 1400px; + min-width: 800px; + height: 80vh; + min-height: 500px; + background: #fff; + display: flex; border-radius: 12px; - box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1); - width: 480px; - padding: 35px 35px 5px 35px; + overflow: hidden; - .el-input { - height: 40px; + .left_img { + background-image: url(../assets/images/login_left.png); + background-size: 100% 100%; + flex: 0 0 50%; + max-width: 50%; + height: 100%; + } +} - input { - height: 40px; - } +.login-form { + flex: 1; + min-width: 350px; + height: 100%; + padding: clamp(40px, 8%, 100px); + box-sizing: border-box; + + + .el-form-item:not(:last-child) { + border-bottom: 1px solid #ccc } - .input-icon { - height: 39px; - width: 14px; - margin-left: 0px; + .no-border { + --el-input-border-color: transparent !important; + --el-input-hover-border-color: transparent !important; + --el-input-focus-border-color: transparent !important; + --el-select-input-border-color: transparent !important; + border-color: transparent !important; + } + + .no-border :deep(.el-input__wrapper), + .no-border :deep(.el-select__wrapper) { + border: none !important; + box-shadow: none !important; } } .login-code { width: 33%; - height: 40px; float: right; img { @@ -296,17 +316,23 @@ getCode(); } } +.login-btn { + background: linear-gradient(#00d3f9, #00b1f3); + border: none; + margin-top: 20px; + width: 100%; + height: 50px; + font-size: 16px; +} + .el-login-footer { - height: 40px; - line-height: 40px; - position: fixed; - bottom: 0; + line-height: 30px; width: 100%; text-align: center; - color: #fff; + color: #000; font-family: Arial; font-size: 12px; - letter-spacing: 1px; + margin-top: 30px; } /* Logo和标题样式 */ @@ -314,11 +340,14 @@ getCode(); display: flex; align-items: center; margin-bottom: 30px; + /* 缩放时标题区域自适应 */ + flex-wrap: nowrap; } .login-logo img { height: 40px; width: auto; + min-height: 30px; } .login-split { @@ -330,28 +359,40 @@ getCode(); .login-title h1 { margin: 0; - font-size: 24px; - color: #1989fa; + font-size: clamp(18px, 2vw, 24px); + color: #000; font-weight: 500; } -/* Tab容器样式(修复冲突) */ +/* Tab容器样式 */ .login-tabs { width: 100%; - height: 350px; + height: clamp(280px, 70%, 350px); + min-height: 280px; overflow: hidden; border-radius: 8px; backdrop-filter: blur(10px); -webkit-backdrop-filter: blur(10px); - border: 1px solid rgba(255, 255, 255, 0.1); padding: 1px 10px 10px; background: transparent; :deep(.el-tabs__header) { - background: transparent; margin: 0; } + :deep(.el-tabs__nav) { + width: 100% !important; + } + + :deep(.el-tabs__item) { + width: 33.33% !important; + + &.is-active { + border-bottom: 2px solid #00d3f9 !important; + } + } + + :deep(.el-tabs__nav-prev), :deep(.el-tabs__nav-next) { display: none !important; // 隐藏Tab左右箭头 @@ -363,8 +404,7 @@ getCode(); } .custom-select { - margin-top: 20px; - /* 可根据需求调整数值 */ + margin-top: 30px; } /* Tab占位样式 */ @@ -375,22 +415,20 @@ getCode(); justify-content: center; padding: 40px 0; color: #666; - height: calc(100% - 40px); // 适配Tab容器高度 + /* 适配Tab容器高度,防止溢出 */ + height: calc(100% - 40px); .placeholder-icon { - font-size: 48px; + font-size: clamp(36px, 8vw, 48px); + /* 图标大小自适应 */ margin-bottom: 20px; color: #ccc; } .wechat-login-btn { margin-top: 20px; - width: 200px; + width: clamp(150px, 40%, 200px); + /* 按钮宽度自适应 */ } } - -/* 隐藏必填项星号 */ -:deep(.el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap .el-form-item__asterisk) { - display: none !important; -} \ No newline at end of file diff --git a/src/views/regional/circulation/bbcx/index.vue b/src/views/regional/circulation/bbcx/index.vue index 820b0fa..46cfa12 100644 --- a/src/views/regional/circulation/bbcx/index.vue +++ b/src/views/regional/circulation/bbcx/index.vue @@ -237,7 +237,7 @@ const rowHandle = (row) => { { title: '标本送检', time: row.sendPackTime }, { title: '标本签收', time: row.signInTime }, { title: '上机检验', time: row.operdatetime }, - { title: '结果审核', time: row.confirmtime }, + { title: '结果审核', time: row.reportTime }, ] } diff --git a/src/views/regional/statistics/overview/index.vue b/src/views/regional/statistics/overview/index.vue index 65a4ea2..5c7143d 100644 --- a/src/views/regional/statistics/overview/index.vue +++ b/src/views/regional/statistics/overview/index.vue @@ -58,7 +58,7 @@
-

当日送检样本情况

+

当月标本全流程监控情况

    @@ -223,6 +223,7 @@ const getEcharts1 = (data: any) => { color: '#fff', } }, + minInterval: 1, axisTick: { show: false }, @@ -362,7 +363,8 @@ const getEcharts3 = () => { }], yAxis: { type: 'value', - + name: '单位:个', + minInterval: 1, axisLine: { show: true, symbol: ['none', 'arrow'],