Browse Source

微调样式

feature/tray
zhangjiming 6 months ago
parent
commit
e067efd1bb
  1. 5
      src/assets/style/base.css
  2. 6
      src/assets/style/tailwind.css
  3. 4
      src/views/expeRecord/index.vue
  4. 4
      src/views/liquidConfig/index.vue
  5. 4
      src/views/logRecord/index.vue
  6. 1
      src/views/login/index.vue
  7. 4
      src/views/oreManage/index.vue
  8. 4
      src/views/userManage/UserManage.vue

5
src/assets/style/base.css

@ -16,12 +16,11 @@ body {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
user-select: none;
background-color: rgb(244, 244, 244);
background-color: rgb(244, 244, 244);
}
:root {
font-size: 32px; /* 设计稿是双倍设计的 */
--primaryColor: #1989fa;
--headerHeight: 4.375rem;
--footerHeight: 4.375rem;

6
src/assets/style/tailwind.css

@ -8,7 +8,7 @@
justify-content: center;
align-items: center;
background: var(--primaryColor);
border: solid 2px var(--primaryColor);
border: solid 1px var(--primaryColor);
border-radius: 4px;
color: white;
}
@ -19,11 +19,11 @@
background-color: transparent;
border-radius: 4px;
color: var(--primaryColor);
border: solid 2px var(--primaryColor);
border: solid 1px var(--primaryColor);
}
.btn-light-disabled {
color: #d6d6d6;
border: solid 2px #d6d6d6;
border: solid 1px #d6d6d6;
}
.component-page {
height: calc(100vh - var(--headerHeight) - var(--footerHeight));

4
src/views/expeRecord/index.vue

@ -8,7 +8,7 @@
<section>
<header class="h-10 flex items-center bg-[#000]/[0.02] text-xs pr-3 text-text">
<div class="w-10 self-stretch flex justify-center items-center">
<img src="@/assets/Icon-unselect.svg" alt="icon" />
<img class="w-4 h-4" src="@/assets/Icon-unselect.svg" alt="icon" />
</div>
<p class="w-[10rem]">时间</p>
<p class="w-[8rem]">用户名</p>
@ -16,7 +16,7 @@
</header>
<div class="h-10 flex items-center text-xs pr-3 text-[#6e6e6e] border-b border-b-[#f8f8f8]">
<div class="w-10 self-stretch flex justify-center items-center">
<img :src="isSelect ? icon_select : icon_unselect" alt="" />
<img class="w-4 h-4" :src="isSelect ? icon_select : icon_unselect" alt="" />
</div>
<p class="w-[10rem]">2025年6月24日 13:16:45</p>
<p class="w-[8rem]">admin</p>

4
src/views/liquidConfig/index.vue

@ -9,14 +9,14 @@
<section>
<header class="h-10 flex items-center bg-[#000]/[0.02] text-xs pr-3 text-text">
<div class="w-10 self-stretch flex justify-center items-center">
<img src="@/assets/Icon-unselect.svg" alt="icon" />
<img class="w-4 h-4" src="@/assets/Icon-unselect.svg" alt="icon" />
</div>
<p class="w-16">序号</p>
<p>溶液名称</p>
</header>
<div class="h-10 flex items-center text-xs pr-3 text-[#6e6e6e] border-b border-b-[#f8f8f8]">
<div class="w-10 self-stretch flex justify-center items-center">
<img :src="isSelect ? icon_select : icon_unselect" alt="" />
<img class="w-4 h-4" :src="isSelect ? icon_select : icon_unselect" alt="" />
</div>
<p class="w-16">1</p>
<p class="flex-auto">溶液名称1</p>

4
src/views/logRecord/index.vue

@ -8,7 +8,7 @@
<section>
<header class="h-10 flex items-center bg-[#000]/[0.02] text-xs pr-3 text-text">
<div class="w-10 self-stretch flex justify-center items-center">
<img src="@/assets/Icon-unselect.svg" alt="icon" />
<img class="w-4 h-4" src="@/assets/Icon-unselect.svg" alt="icon" />
</div>
<p class="w-[10rem]">时间</p>
<p class="w-[8rem]">用户名</p>
@ -16,7 +16,7 @@
</header>
<div class="h-10 flex items-center text-xs pr-3 text-[#6e6e6e] border-b border-b-[#f8f8f8]">
<div class="w-10 self-stretch flex justify-center items-center">
<img :src="isSelect ? icon_select : icon_unselect" alt="" />
<img class="w-4 h-4" :src="isSelect ? icon_select : icon_unselect" alt="" />
</div>
<p class="w-[10rem]">2025年6月24日 13:16:45</p>
<p class="w-[8rem]">admin</p>

1
src/views/login/index.vue

@ -31,7 +31,6 @@
import { ref } from "vue";
import { useRouter } from "vue-router";
import { showToast } from "vant";
import { login } from "@/services/user/userManager";
import logoSvg from '@/assets/logo.svg'
import userIconSvg from '@/assets/user_icon.svg'
import pwdIconSvg from '@/assets/pwdw_icon.svg'

4
src/views/oreManage/index.vue

@ -13,7 +13,7 @@
<section>
<header class="h-10 flex items-center bg-[#000]/[0.02] text-xs pr-3 text-text">
<div class="w-10 self-stretch flex justify-center items-center">
<img src="@/assets/Icon-unselect.svg" alt="icon" />
<img class="w-4 h-4" src="@/assets/Icon-unselect.svg" alt="icon" />
</div>
<p class="w-14">序号</p>
<p class="w-[18rem]">矿石名称</p>
@ -21,7 +21,7 @@
</header>
<div class="h-10 flex items-center text-xs pr-3 text-[#6e6e6e] border-b border-b-[#f8f8f8]">
<div class="w-10 self-stretch flex justify-center items-center">
<img :src="isSelect ? icon_select : icon_unselect" alt="" />
<img class="w-4 h-4" :src="isSelect ? icon_select : icon_unselect" alt="" />
</div>
<p class="w-14">1</p>
<p class="w-[18rem]">矿石名称1</p>

4
src/views/userManage/UserManage.vue

@ -13,7 +13,7 @@
<section>
<header class="h-10 flex items-center bg-[#000]/[0.02] text-xs pr-3 text-text">
<div class="w-10 self-stretch flex justify-center items-center" @click="onSelectAll">
<img
<img class="w-4 h-4"
:src="
selectedIds.length > 0
? selectedIds.length === userList.length
@ -33,7 +33,7 @@
class="h-10 flex items-center text-xs pr-3 text-[#6e6e6e] border-b border-b-[#f8f8f8]"
@click="onItemSelect(user)">
<div class="w-10 self-stretch flex justify-center items-center">
<img :src="selectedIds.includes(user.id) ? icon_select : icon_unselect" alt="" />
<img class="w-4 h-4" :src="selectedIds.includes(user.id) ? icon_select : icon_unselect" alt="" />
</div>
<p class="w-40">{{ user.username }}</p>
<p class="w-40">{{ user.nickname }}</p>

Loading…
Cancel
Save