From ae63493e4767c91d0e28cc5368138c00833d096a Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 16 十二月 2025 17:01:58 +0800
Subject: [PATCH] 优化
---
admin/src/assets/icons/ic_2.png | 0
admin/src/assets/icons/sousuo.png | 0
admin/src/assets/icons/ic_4.jpg | 0
admin/src/assets/icons/xl.png | 0
admin/src/assets/icons/菜单图标/__MACOSX/._ic_3.jpg | 0
admin/src/views/login.vue | 2
admin/src/assets/icons/ic_1.jpg | 0
admin/src/assets/icons/菜单图标/__MACOSX/._ic_5.jpg | 0
admin/src/assets/icons/菜单图标/__MACOSX/._ic_8.jpg | 0
admin/src/assets/icons/菜单图标/__MACOSX/._ic_1.jpg | 0
admin/src/assets/icons/ic_6.jpg | 0
admin/src/assets/icons/ic_8.jpg | 0
admin/src/assets/icons/ic_5.jpg | 0
admin/src/assets/icons/菜单图标/__MACOSX/._ic_4.jpg | 0
admin/src/assets/icons/菜单图标/__MACOSX/._ic_2.png | 0
admin/src/assets/icons/菜单图标/__MACOSX/._ic_7.jpg | 0
admin/src/assets/icons/菜单图标/__MACOSX/._ic_6.jpg | 0
admin/src/components/common/CommonHeader.vue | 130 ++++++++++++++++++++++++++++++++++++++-----
admin/src/assets/icons/ic_3.jpg | 0
admin/.env.development | 4
admin/src/assets/icons/ic_7.jpg | 0
21 files changed, 117 insertions(+), 19 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 6a12e20..0b624a7 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -5,9 +5,9 @@
#VUE_APP_API_URL = 'http://192.168.1.45:10010'
-# #VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
+VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
-VUE_APP_API_URL = 'http://localhost:10010'
+# VUE_APP_API_URL = 'http://localhost:10010'
#key锛�045542fc5f436b75e6c911c5c84ff8cd
#瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c
diff --git a/admin/src/assets/icons/ic_1.jpg b/admin/src/assets/icons/ic_1.jpg
new file mode 100644
index 0000000..3ba3f87
--- /dev/null
+++ b/admin/src/assets/icons/ic_1.jpg
Binary files differ
diff --git a/admin/src/assets/icons/ic_2.png b/admin/src/assets/icons/ic_2.png
new file mode 100644
index 0000000..b82dad1
--- /dev/null
+++ b/admin/src/assets/icons/ic_2.png
Binary files differ
diff --git a/admin/src/assets/icons/ic_3.jpg b/admin/src/assets/icons/ic_3.jpg
new file mode 100644
index 0000000..479deec
--- /dev/null
+++ b/admin/src/assets/icons/ic_3.jpg
Binary files differ
diff --git a/admin/src/assets/icons/ic_4.jpg b/admin/src/assets/icons/ic_4.jpg
new file mode 100644
index 0000000..2b8c893
--- /dev/null
+++ b/admin/src/assets/icons/ic_4.jpg
Binary files differ
diff --git a/admin/src/assets/icons/ic_5.jpg b/admin/src/assets/icons/ic_5.jpg
new file mode 100644
index 0000000..b31aeab
--- /dev/null
+++ b/admin/src/assets/icons/ic_5.jpg
Binary files differ
diff --git a/admin/src/assets/icons/ic_6.jpg b/admin/src/assets/icons/ic_6.jpg
new file mode 100644
index 0000000..266ae60
--- /dev/null
+++ b/admin/src/assets/icons/ic_6.jpg
Binary files differ
diff --git a/admin/src/assets/icons/ic_7.jpg b/admin/src/assets/icons/ic_7.jpg
new file mode 100644
index 0000000..95dbc8e
--- /dev/null
+++ b/admin/src/assets/icons/ic_7.jpg
Binary files differ
diff --git a/admin/src/assets/icons/ic_8.jpg b/admin/src/assets/icons/ic_8.jpg
new file mode 100644
index 0000000..8324a81
--- /dev/null
+++ b/admin/src/assets/icons/ic_8.jpg
Binary files differ
diff --git a/admin/src/assets/icons/sousuo.png b/admin/src/assets/icons/sousuo.png
new file mode 100644
index 0000000..eefcbc2
--- /dev/null
+++ b/admin/src/assets/icons/sousuo.png
Binary files differ
diff --git a/admin/src/assets/icons/xl.png b/admin/src/assets/icons/xl.png
new file mode 100644
index 0000000..3e7a0c3
--- /dev/null
+++ b/admin/src/assets/icons/xl.png
Binary files differ
diff --git "a/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_1.jpg" "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_1.jpg"
new file mode 100644
index 0000000..835ea06
--- /dev/null
+++ "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_1.jpg"
Binary files differ
diff --git "a/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_2.png" "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_2.png"
new file mode 100644
index 0000000..835ea06
--- /dev/null
+++ "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_2.png"
Binary files differ
diff --git "a/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_3.jpg" "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_3.jpg"
new file mode 100644
index 0000000..835ea06
--- /dev/null
+++ "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_3.jpg"
Binary files differ
diff --git "a/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_4.jpg" "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_4.jpg"
new file mode 100644
index 0000000..835ea06
--- /dev/null
+++ "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_4.jpg"
Binary files differ
diff --git "a/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_5.jpg" "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_5.jpg"
new file mode 100644
index 0000000..835ea06
--- /dev/null
+++ "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_5.jpg"
Binary files differ
diff --git "a/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_6.jpg" "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_6.jpg"
new file mode 100644
index 0000000..835ea06
--- /dev/null
+++ "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_6.jpg"
Binary files differ
diff --git "a/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_7.jpg" "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_7.jpg"
new file mode 100644
index 0000000..835ea06
--- /dev/null
+++ "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_7.jpg"
Binary files differ
diff --git "a/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_8.jpg" "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_8.jpg"
new file mode 100644
index 0000000..835ea06
--- /dev/null
+++ "b/admin/src/assets/icons/\350\217\234\345\215\225\345\233\276\346\240\207/__MACOSX/._ic_8.jpg"
Binary files differ
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index a52e9a8..9c4dce0 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -10,18 +10,48 @@
</div>
</div>
<div class="user">
- <el-dropdown v-if="isLogined" trigger="click">
- <span class="el-dropdown-link">
- <!-- <img v-if="userInfo != null" :src="userInfo.avatar == null ? `${require('@/assets/avatar/man.png')}` : userInfo.avatar" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i> -->
- <img v-if="userInfo != null" style="width: 30px !important" src="@/assets/avatar/man.png" alt="" />{{
- userInfo | displayName
- }}<i class="el-icon-arrow-down el-icon--right"></i>
- </span>
- <el-dropdown-menu slot="dropdown">
- <el-dropdown-item @click.native="changePwd">淇敼瀵嗙爜</el-dropdown-item>
- <el-dropdown-item @click.native="logout">閫�鍑虹櫥褰�</el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
+ <div class="user-search">
+ <div class="user-search-left">
+ <span>鍏ㄩ儴</span>
+ <img src="@/assets/icons/xl.png" alt="">
+ </div>
+ <div class="user-search-right">
+ <input type="text" placeholder="璇疯緭鍏�" />
+ <img src="@/assets/icons/sousuo.png" alt="">
+ </div>
+ </div>
+ <div class="user-images">
+ <img src="@/assets/icons/ic_1.jpg" alt="">
+ <img src="@/assets/icons/ic_2.png" alt="">
+ <img src="@/assets/icons/ic_3.jpg" alt="">
+ <img src="@/assets/icons/ic_4.jpg" alt="">
+ <img src="@/assets/icons/ic_5.jpg" alt="">
+ <img src="@/assets/icons/ic_6.jpg" alt="">
+ <img src="@/assets/icons/ic_7.jpg" alt="">
+ <img src="@/assets/icons/ic_8.jpg" alt="">
+ </div>
+ <el-dropdown v-if="isLogined" trigger="click">
+ <span class="el-dropdown-link" style="cursor: pointer; color: rgba(255,255,255,.56);">
+ {{ userInfo | displayName }}
+ <i class="el-icon-arrow-down el-icon--right"></i>
+ </span>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item @click.native="changePwd">淇敼瀵嗙爜</el-dropdown-item>
+ <el-dropdown-item @click.native="logout">閫�鍑虹櫥褰�</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+<!-- <el-dropdown v-if="isLogined" trigger="click">-->
+<!-- <span class="el-dropdown-link">-->
+<!-- <!– <img v-if="userInfo != null" :src="userInfo.avatar == null ? `${require('@/assets/avatar/man.png')}` : userInfo.avatar" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i> –>-->
+<!-- <img v-if="userInfo != null" style="width: 30px !important" src="@/assets/avatar/man.png" alt="" />{{-->
+<!-- userInfo | displayName-->
+<!-- }}<i class="el-icon-arrow-down el-icon--right"></i>-->
+<!-- </span>-->
+<!-- <el-dropdown-menu slot="dropdown">-->
+<!-- <el-dropdown-item @click.native="changePwd">淇敼瀵嗙爜</el-dropdown-item>-->
+<!-- <el-dropdown-item @click.native="logout">閫�鍑虹櫥褰�</el-dropdown-item>-->
+<!-- </el-dropdown-menu>-->
+<!-- </el-dropdown>-->
</div>
</div>
<!-- 淇敼瀵嗙爜 -->
@@ -382,15 +412,83 @@
}
.user {
- width: 152px;
+ /*width: 152px;*/
box-sizing: border-box;
height: 56px;
padding-right: 25px;
- background: url("../../assets/images/top_ic_bolang@2x.png") no-repeat;
+ /*background: url("../../assets/images/top_ic_bolang@2x.png") no-repeat;*/
flex-shrink: 0;
text-align: right;
- cursor: pointer;
-
+ display: flex;
+ align-items: center;
+ .user-search {
+ width: 346px;
+ height: 32px;
+ border-radius: 30px;
+ border: 1px solid rgba(255,255,255,.56);
+ margin-right: 15px;
+ display: flex;
+ align-items: center;
+ .user-search-left {
+ flex-shrink: 0;
+ width: 106px;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ span {
+ font-size: 14px;
+ font-weight: 400;
+ color: rgba(255,255,255,.56);
+ margin-right: 10px;
+ }
+ img {
+ top: 0;
+ margin: 0;
+ width: 20px;
+ height: 16px;
+ }
+ }
+ .user-search-right {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding-right: 10px;
+ box-sizing: border-box;
+ input {
+ flex: 1;
+ height: 100%;
+ font-size: 14px;
+ font-weight: 400;
+ color: rgba(255,255,255,.56);
+ border: none;
+ outline: none;
+ background-color: rgba(0,0,0,0);
+ &::placeholder {
+ color: rgba(255,255,255,.56);
+ }
+ }
+ img {
+ top: 0;
+ margin: 0;
+ width: 20px;
+ height: 20px;
+ }
+ }
+ }
+ .user-images {
+ height: 100%;
+ display: flex;
+ align-items: center;
+ img {
+ top: 0 !important;
+ width: 24px;
+ height: 24px;
+ margin-right: 15px;
+ }
+ }
.el-dropdown {
top: 2px;
color: #fff;
diff --git a/admin/src/views/login.vue b/admin/src/views/login.vue
index 12a0bb7..88ffee6 100644
--- a/admin/src/views/login.vue
+++ b/admin/src/views/login.vue
@@ -3,7 +3,7 @@
<img src="@/assets/images/bg@2x.png" class="main_bg" alt="">
<div class="login_wrap">
<div class="login_img">
- <div class="h2">鑺滄箹鐑熻崏鏅烘収瀹夋秷瀹夊叏闃茶寖绯荤粺</div>
+ <div class="h3" style="font-size: 30px; margin-left: 140px; margin-bottom: 0;">鑺滄箹鐑熻崏</div>
<div class="h3">鏅烘収鐗╂祦鍥尯瀹夋秷涓�浣撳寲绯荤粺</div>
</div>
<div class="form_wrap">
--
Gitblit v1.9.3