-
+
+
@@ -332,6 +332,6 @@ const settingWidth = computed(() => {
border: 1px solid red;
}
.config-btn{
- margin-top: -4rem
+ //margin-top: -3rem
}
diff --git a/src/components/home/config.vue b/src/components/home/config.vue
index 296e73c..b3212a7 100644
--- a/src/components/home/config.vue
+++ b/src/components/home/config.vue
@@ -151,7 +151,7 @@ const onDefaultFormula = () => {
diff --git a/src/stores/settingStore.ts b/src/stores/settingStore.ts
index 437f2e2..73e6c00 100644
--- a/src/stores/settingStore.ts
+++ b/src/stores/settingStore.ts
@@ -17,7 +17,7 @@ export const useSettingStore = defineStore('setting', () => {
name: '用户管理',
code: 'user',
}, {
- name: '日期/时间设置',
+ name: '日期设置',
code: 'date',
}, {
name: '设备信息',
diff --git a/src/stores/systemStore.ts b/src/stores/systemStore.ts
index f1e4bd0..49b652a 100644
--- a/src/stores/systemStore.ts
+++ b/src/stores/systemStore.ts
@@ -18,7 +18,7 @@ export const useSystemStore = defineStore('system', () => {
name: '中文',
value: 'zh-cn',
}, {
- name: '英文',
+ name: 'English',
value: 'en',
}]
diff --git a/src/views/audit/index.vue b/src/views/audit/index.vue
index 1a507a8..17fc039 100644
--- a/src/views/audit/index.vue
+++ b/src/views/audit/index.vue
@@ -105,7 +105,7 @@ const handleSelectionChange = (users: Audit.AuditItem[]) => {
/>
-
+
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index a63c183..8f03993 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -146,10 +146,10 @@ const nowLiquid = computed(() => {
display: grid;
grid-template-columns: repeat(2, 1fr);
grid-template-rows: repeat(2, auto);
- gap:1rem;
+ gap:.5rem;
.card {
text-align: center;
- height: 40.5vh;
+ height: 41.5vh;
width: 30.5vw;
border: 1px solid rgb(225, 225, 225);
position: relative;
@@ -188,9 +188,10 @@ const nowLiquid = computed(() => {
}
.home-right{
- width: 34.5vw;
+ width: 36vw;
background: $gradient-color;
position: relative;
+ border-radius: 10px
}
.el-button {
background-color: #2892F3 !important;
diff --git a/src/views/liquid/index.vue b/src/views/liquid/index.vue
index 5671655..44b179f 100644
--- a/src/views/liquid/index.vue
+++ b/src/views/liquid/index.vue
@@ -183,7 +183,7 @@ const onStopDrainLiquid = async () => {
type="primary"
:button-text="`${liquidTotoal}g`"
bg-color="#2892F3"
- border-radius="0 5px 5px 0"
+ border-radius="0 var(--el-border-radius-base) var(--el-border-radius-base) 0"
text-color="#ffffff"
height="4rem"
text-size="24px"
diff --git a/src/views/setting/index.vue b/src/views/setting/index.vue
index ad9f7ac..7ed8c2d 100644
--- a/src/views/setting/index.vue
+++ b/src/views/setting/index.vue
@@ -87,7 +87,6 @@ const selectItem = (menuCode: string) => {
display: flex;
align-items: center;
border-radius: 10px;
- font-family: serif;
height: 5rem;
}
li.active {