UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4/2 优化

Browse Source
dev2.5_scan
wangwei 2 days ago
parent 367fa63866
commit 9a90409b15
2 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File

9
src/views/collect/PannelOrderBiz.vue
Unescape Escape View File

@ -135,12 +135,12 @@
<div :style="{ fontSize: '26px' }">{{ scope.row.count }}</div>
</template>
</el-table-column>
<el-table-column label="应扫码数量" prop="scanActCount">
<el-table-column label="应扫码数量" prop="scanActCount" :min-width="120">
<template v-slot="scope">
<div v-if="scope.row.autoTagStatus == 2" :style="getCellStyle1(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 40px;">
无需扫码
</div>
<div :style="getCellStyle(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 40px;" v-else>
<div :style="getCellStyle(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 60px;" v-else>
{{ scope.row.scanCount }}/{{ scope.row.shouldCount }}
</div>
</template>
@ -415,6 +415,10 @@ export default {
this.codingStatus = '预赋码'
return 'warning' // 黄色
}
if (row.scanActCount == null){
this.codingStatus = '未赋码'
return 'danger' //
}
if (row.scanActCount < row.count) {
this.codingStatus = '未赋码'
return 'danger' // 红色
@ -422,6 +426,7 @@ export default {
this.codingStatus = '已赋码'
return 'success' // 绿色
}
}
},

87
src/views/myLogin.vue
Unescape Escape View File

@ -5,28 +5,28 @@
<div class="left-panel">
<!-- Left side is now empty, just for visual design -->
</div>
<!-- Right side: Logo, Title and Login Form together -->
<div class="right-panel">
<div class="login-panel">
<div class="header-section">
<div class="logo-section">
<div v-if="webLogo == ''">
<div v-if="webLogo == null">
<img alt="logo" src="@/assets/logo/wyLogo.png" class="logo-image">
</div>
<div v-else>
<img alt="logo" :src="webLogo" class="logo-image">
</div>
</div>
<div class="title-section">
<h1 class="system-title">{{ title }}</h1>
<!-- <h2 class="system-subtitle">{{ webVersionName }}</h2> -->
</div>
</div>
<!-- <h3 class="login-heading">用户登录</h3> -->
<el-form
class="login-form"
autocomplete="on"
@ -48,7 +48,7 @@
>
</el-input>
</el-form-item>
<el-form-item prop="password" class="form-item">
<el-input
v-model="pwdCover"
@ -71,7 +71,7 @@
</i>
</el-input>
</el-form-item>
<el-form-item
prop="verificationCode"
class="form-item verify-section"
@ -90,7 +90,7 @@
></Verify>
</div>
</el-form-item>
<div class="login-button-container">
<el-button
type="primary"
@ -105,10 +105,10 @@
</div>
</div>
<el-dialog
title="修改密码"
:visible.sync="passwordFormVisible"
width="400px"
<el-dialog
title="修改密码"
:visible.sync="passwordFormVisible"
width="400px"
top="20vh"
:close-on-click-modal="false"
:show-close="false"
@ -188,7 +188,7 @@ export default {
title: "福建省XXX医院",
subTitle: "医院药械追溯管理系统",
webVersionName: "医院药械追溯管理系统",
webLogo: "",
webLogo: null,
passwordFormVisible: false,
passwordFormData: {
oldPassword: "",
@ -394,7 +394,10 @@ export default {
if (!isBlank(res.data.webVersion)){
this.webVersionName = res.data.webVersion
}
this.webLogo = res.data.webLogo
if (!isBlank(res.data.webLogo)){
this.webLogo = res.data.webLogo
}
});
},
passwdSubmit() {
@ -486,21 +489,21 @@ $success-color: #67c23a;
background: linear-gradient(15deg, rgba(0,0,0,0.3) 0%, rgba(0,0,0,0.15) 100%);
z-index: 1;
}
.split-layout {
position: relative;
z-index: 2;
display: flex;
width: 100%;
height: 100vh;
.left-panel {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
}
.right-panel {
width: 30%;
min-width: 420px;
@ -510,27 +513,27 @@ $success-color: #67c23a;
background-color: rgba(255, 255, 255, 0.05);
backdrop-filter: blur(10px);
box-shadow: -10px 0 30px rgba(0, 0, 0, 0.15);
.login-panel {
width: 85%;
padding: 50px 0;
animation: slideInRight 0.8s ease-out;
}
.header-section {
text-align: center;
margin-bottom: 30px;
.logo-section {
margin-bottom: 20px;
.logo-image {
width: 120px;
height: auto;
object-fit: contain;
}
}
.title-section {
.system-title {
font-size: 28px;
@ -539,7 +542,7 @@ $success-color: #67c23a;
margin-bottom: 10px;
text-shadow: 0 2px 10px rgba(0, 0, 0, 0.3);
}
.system-subtitle {
font-size: 18px;
font-weight: 400;
@ -548,7 +551,7 @@ $success-color: #67c23a;
}
}
}
.login-heading {
font-size: 24px;
font-weight: 600;
@ -576,11 +579,11 @@ $success-color: #67c23a;
.form-item {
margin-bottom: 25px;
.el-form-item__content {
display: flex;
}
.el-input__inner {
height: 45px;
border-radius: 8px;
@ -589,18 +592,18 @@ $success-color: #67c23a;
border: 1px solid rgba(255, 255, 255, 0.2);
transition: all 0.3s;
color: white;
&::placeholder {
color: rgba(255, 255, 255, 0.6);
}
&:focus {
border-color: $primary-color;
background-color: rgba(255, 255, 255, 0.25);
box-shadow: 0 0 0 2px rgba($primary-color, 0.2);
}
}
.el-input__icon {
line-height: 45px;
font-size: 18px;
@ -611,11 +614,11 @@ $success-color: #67c23a;
.verify-section {
margin-top: 10px;
margin-bottom: 30px;
.el-form-item__content {
width: 100%;
display: block !important;
/* Override verify component styles to fix compression */
.verify-component {
width: 100% !important;
@ -635,7 +638,7 @@ $success-color: #67c23a;
font-size: 18px;
margin-right: 10px;
line-height: 45px;
&:hover {
color: white;
}
@ -654,7 +657,7 @@ $success-color: #67c23a;
border: none;
font-weight: 600;
font-size: 16px;
&:hover, &:focus {
background: #2a70d8;
}
@ -678,30 +681,30 @@ $success-color: #67c23a;
border-radius: 12px;
overflow: hidden;
}
.el-dialog__header {
background-color: $primary-color;
padding: 15px 20px;
.el-dialog__title {
color: white;
font-weight: 500;
}
}
.el-dialog__body {
padding: 30px 20px;
}
.el-form-item__label {
font-weight: 500;
}
.el-button--primary {
background-color: $primary-color;
border-color: $primary-color;
width: 120px;
&:hover {
background-color: #2a70d8;
border-color: #2a70d8;
@ -752,16 +755,16 @@ $success-color: #67c23a;
.login-container {
.split-layout {
flex-direction: column;
.left-panel {
display: none;
}
.right-panel {
width: 100%;
height: 100vh;
min-width: auto;
.login-panel {
width: 90%;
max-width: 400px;

Write Preview
Loading…
Cancel
Save