cxs 6 months ago
parent
commit
b7f764a2b0

+ 0 - 21
LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Halsey
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

+ 2 - 89
README.md

@@ -1,29 +1,4 @@
-# Geeker-Admin
-
-### 介绍 📖
-
-Geeker-Admin 一款基于 Vue3.4、TypeScript、Vite5、Pinia、Element-Plus 开源的后台管理框架,使用目前最新技术栈开发。项目提供强大的 [ProTable](https://juejin.cn/post/7166068828202336263) 组件,在一定程度上提高您的开发效率。另外本项目还封装了一些常用组件、Hooks、指令、动态路由、按钮级别权限控制等功能。
-
-### React 版本 🔥
-
-- 有需要请加底部微信了解、购买
-
-- Link:https://pro.spicyboy.cn
-
-### 在线预览 👀
-
-- Link:https://admin.spicyboy.cn
-
-### 代码仓库 ⭐
-
-- Gitee:https://gitee.com/HalseySpicy/Geeker-Admin
-- GitHub:https://github.com/HalseySpicy/Geeker-Admin
-
-### 项目文档 📚
-
-- 项目更新日志:[CHANGELOG.md](./CHANGELOG.md)
-
-- 项目文档地址:https://docs.spicyboy.cn
+基于 Vue3.4、TypeScript、Vite5、Pinia、Element-Plus 开源的后台管理框架,使用目前最新技术栈开发。项目提供强大的 [ProTable](https://juejin.cn/post/7166068828202336263) 组件,在一定程度上提高您的开发效率。另外本项目还封装了一些常用组件、Hooks、指令、动态路由、按钮级别权限控制等功能。
 
 ### 项目功能 🔨
 
@@ -43,12 +18,6 @@ Geeker-Admin 一款基于 Vue3.4、TypeScript、Vite5、Pinia、Element-Plus 开
 
 - **Clone:**
 
-```text
-# Gitee
-git clone https://gitee.com/HalseySpicy/Geeker-Admin.git
-# GitHub
-git clone https://github.com/HalseySpicy/Geeker-Admin.git
-```
 
 - **Install:**
 
@@ -95,39 +64,10 @@ pnpm lint:stylelint
 # 提交代码(提交前会自动执行 lint:lint-staged 命令)
 pnpm commit
 ```
-
-### 项目截图 📷
-
-- 登录页:
-
-![login_light](https://i.imgtg.com/2023/04/13/8tknp.png)
-
-![login_dark](https://i.imgtg.com/2023/04/13/8tmpP.png)
-
-- 首页:
-
-![home_light](https://i.imgtg.com/2023/04/13/8tl1j.png)
-
-![home_dark](https://i.imgtg.com/2023/04/13/8tpfb.png)
-
-- 表格页:
-
-![table_light](https://i.imgtg.com/2023/04/13/8tfMx.png)
-
-![table_dark](https://i.imgtg.com/2023/04/13/8tv8F.png)
-
-- 数据可视化
-
-![dashboard](https://i.imgtg.com/2023/04/14/82Grx.png)
-
-- 数据大屏:
-
-![dataScreen](https://i.imgtg.com/2023/01/16/QP8HF.png)
-
 ### 文件资源目录 📚
 
 ```text
-Geeker-Admin
+Admin
 ├─ .husky                  # husky 配置文件
 ├─ .vscode                 # VSCode 推荐配置
 ├─ build                   # Vite 配置项
@@ -166,7 +106,6 @@ Geeker-Admin
 ├─ CHANGELOG.md            # 项目更新日志
 ├─ commitlint.config.cjs   # git 提交规范配置
 ├─ index.html              # 入口 html
-├─ LICENSE                 # 开源协议文件
 ├─ lint-staged.config.cjs  # lint-staged 配置文件
 ├─ package-lock.json       # 依赖包包版本锁
 ├─ package.json            # 依赖包管理
@@ -184,29 +123,3 @@ Geeker-Admin
 | ![IE](https://i.imgtg.com/2023/04/11/8z7ot.png) | ![Edge](https://i.imgtg.com/2023/04/11/8zr3p.png) | ![Firefox](https://i.imgtg.com/2023/04/11/8zKiU.png) | ![Chrome](https://i.imgtg.com/2023/04/11/8zNrx.png) | ![Safari](https://i.imgtg.com/2023/04/11/8zeGj.png) |
 | :---------------------------------------------: | :-----------------------------------------------: | :--------------------------------------------------: | :-------------------------------------------------: | :-------------------------------------------------: |
 |                   not support                   |                  last 2 versions                  |                   last 2 versions                    |                   last 2 versions                   |                   last 2 versions                   |
-
-### 项目后台接口 🧩
-
-项目后台接口完全采用 Mock 数据,感谢以下 Mock 平台支持:
-
-- FastMock: https://www.fastmock.site
-- EasyMock:https://mock.mengxuegu.com
-
-### 微信交流群 👨‍👨‍👦‍👦
-
-微信一群、二群、三群、四群已满,加作者微信进入五群(支持知识付费)🤪
-
-|                                               微信二维码                                                |
-| :-----------------------------------------------------------------------------------------------------: |
-| <img src="https://pic.ziyuan.wang/user/guest/2024/02/WX20240228-162952@2x_d164375fc0c16.png" width=170> |
-
-### 捐赠 🍵
-
-如果你正在使用这个项目或者喜欢这个项目的,可以通过以下方式支持我:
-
-- Star、Fork、Watch 一键三连 🚀
-- 通过微信、支付宝一次性捐款 ❤
-
-|                                        微信                                        |                                       支付宝                                       |
-| :--------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------: |
-| <img src="https://i.imgtg.com/2023/01/16/QRzBX.png" alt="Alipay QRcode" width=170> | <img src="https://i.imgtg.com/2023/01/16/QRFZt.png" alt="Wechat QRcode" width=170> |

+ 2 - 2
package.json

@@ -1,9 +1,9 @@
 {
-  "name": "geeker-admin",
+  "name": "admin",
   "private": true,
   "version": "1.2.0",
   "type": "module",
-  "description": "geeker-admin open source management system",
+  "description": "admin open source management system",
   "author": {
     "name": "Geeker",
     "email": "848130454@qq.com",

BIN
src/assets/images/expand-image.png


BIN
src/assets/images/fold-image.png


+ 1 - 1
src/layouts/components/Footer/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="footer flx-center">
-    <a href="https://github.com/HalseySpicy" target="_blank"> 2022 © Geeker-Admin By Geeker Technology. </a>
+    <a href="#" target="_blank"> 2024 Technology. </a>
   </div>
 </template>
 

+ 6 - 0
src/layouts/components/Header/ToolBarLeft.vue

@@ -2,6 +2,7 @@
   <div class="tool-bar-lf">
     <CollapseIcon id="collapseIcon" />
     <Breadcrumb v-show="globalStore.breadcrumb" id="breadcrumb" />
+    <div v-show="!globalStore.breadcrumb" class="toolText">欢迎进入地面气象观测系统</div>
   </div>
 </template>
 
@@ -20,4 +21,9 @@ const globalStore = useGlobalStore();
   overflow: hidden;
   white-space: nowrap;
 }
+
+.toolText {
+  color: var(--el-header-text-color);
+  font-size: 18px;
+}
 </style>

+ 8 - 1
src/layouts/components/Header/components/CollapseIcon.vue

@@ -1,11 +1,13 @@
 <template>
   <el-icon class="collapse-icon" @click="changeCollapse">
-    <component :is="globalStore.isCollapse ? 'expand' : 'fold'"></component>
+    <img class="img-size" :src="globalStore.isCollapse ? expandImage : foldImage" />
   </el-icon>
 </template>
 
 <script setup lang="ts">
 import { useGlobalStore } from "@/stores/modules/global";
+import expandImage from "@/assets/images/expand-image.png";
+import foldImage from "@/assets/images/fold-image.png";
 
 const globalStore = useGlobalStore();
 const changeCollapse = () => globalStore.setGlobalState("isCollapse", !globalStore.isCollapse);
@@ -18,4 +20,9 @@ const changeCollapse = () => globalStore.setGlobalState("isCollapse", !globalSto
   color: var(--el-header-text-color);
   cursor: pointer;
 }
+
+.img-size {
+  width: 18px;
+  height: 18px;
+}
 </style>

+ 5 - 5
src/layouts/components/Header/components/Message.vue

@@ -12,35 +12,35 @@
             <div class="message-item">
               <img src="@/assets/images/msg01.png" alt="" class="message-icon" />
               <div class="message-content">
-                <span class="message-title">一键三连 Geeker-Admin 🧡</span>
+                <span class="message-title">一键三连 Admin 🧡</span>
                 <span class="message-date">一分钟前</span>
               </div>
             </div>
             <div class="message-item">
               <img src="@/assets/images/msg02.png" alt="" class="message-icon" />
               <div class="message-content">
-                <span class="message-title">一键三连 Geeker-Admin 💙</span>
+                <span class="message-title">一键三连 Admin 💙</span>
                 <span class="message-date">一小时前</span>
               </div>
             </div>
             <div class="message-item">
               <img src="@/assets/images/msg03.png" alt="" class="message-icon" />
               <div class="message-content">
-                <span class="message-title">一键三连 Geeker-Admin 💚</span>
+                <span class="message-title">一键三连 Admin 💚</span>
                 <span class="message-date">半天前</span>
               </div>
             </div>
             <div class="message-item">
               <img src="@/assets/images/msg04.png" alt="" class="message-icon" />
               <div class="message-content">
-                <span class="message-title">一键三连 Geeker-Admin 💜</span>
+                <span class="message-title">一键三连 Admin 💜</span>
                 <span class="message-date">一星期前</span>
               </div>
             </div>
             <div class="message-item">
               <img src="@/assets/images/msg05.png" alt="" class="message-icon" />
               <div class="message-content">
-                <span class="message-title">一键三连 Geeker-Admin 💛</span>
+                <span class="message-title">一键三连Admin 💛</span>
                 <span class="message-date">一个月前</span>
               </div>
             </div>

+ 0 - 2
src/styles/element.scss

@@ -134,8 +134,6 @@
   // el-table 表格样式
   .el-table {
     flex: 1;
-
-    // 修复 safari 浏览器表格错位 https://github.com/HalseySpicy/Geeker-Admin/issues/83
     table {
       width: 100%;
     }

+ 4 - 4
src/styles/theme/menu.ts

@@ -3,12 +3,12 @@ import { Theme } from "@/hooks/interface";
 export const menuTheme: Record<Theme.ThemeType, { [key: string]: string }> = {
   light: {
     "--el-menu-bg-color": "#ffffff",
-    "--el-menu-hover-bg-color": "#cccccc",
+    "--el-menu-hover-bg-color": "#F2F7FF",
     "--el-menu-active-bg-color": "var(--el-color-primary-light-9)",
     "--el-menu-text-color": "#333333",
     "--el-menu-active-color": "var(--el-color-primary)",
     "--el-menu-hover-text-color": "#333333",
-    "--el-menu-horizontal-sub-item-height": "50px"
+    "--el-menu-horizontal-sub-item-height": "45px"
   },
   inverted: {
     "--el-menu-bg-color": "#191a20",
@@ -17,7 +17,7 @@ export const menuTheme: Record<Theme.ThemeType, { [key: string]: string }> = {
     "--el-menu-text-color": "#bdbdc0",
     "--el-menu-active-color": "#ffffff",
     "--el-menu-hover-text-color": "#ffffff",
-    "--el-menu-horizontal-sub-item-height": "50px"
+    "--el-menu-horizontal-sub-item-height": "45px"
   },
   dark: {
     "--el-menu-bg-color": "#141414",
@@ -26,6 +26,6 @@ export const menuTheme: Record<Theme.ThemeType, { [key: string]: string }> = {
     "--el-menu-text-color": "#bdbdc0",
     "--el-menu-active-color": "#ffffff",
     "--el-menu-hover-text-color": "#ffffff",
-    "--el-menu-horizontal-sub-item-height": "50px"
+    "--el-menu-horizontal-sub-item-height": "45px"
   }
 };

+ 1 - 1
src/views/about/index.vue

@@ -3,7 +3,7 @@
     <div class="card mb10">
       <h4 class="title">简介</h4>
       <span class="text">
-        <el-link type="primary" href="https://docs.spicyboy.cn" target="_blank">Geeker-Admin</el-link>
+        <el-link type="primary" href="https://docs.spicyboy.cn" target="_blank">Admin</el-link>
         一款基于 Vue3.4、TypeScript、Vite5、Pinia、Element-Plus 开源的后台管理框架,使用目前最新技术栈开发。项目提供强大的
         <el-link type="primary" href="https://juejin.cn/post/7166068828202336263" target="_blank">ProTable 组件</el-link>
         在一定程度上提高您的开发效率。另外本项目还封装了一些常用组件、Hooks、指令、动态路由、按钮级别权限控制等功能。

+ 1 - 1
src/views/login/components/LoginForm.vue

@@ -83,7 +83,7 @@ const login = (formEl: FormInstance | undefined) => {
       router.push(HOME_URL);
       // ElNotification({
       //   title: getTimeState(),
-      //   message: "欢迎登录 Geeker-Admin",
+      //   message: "欢迎登录",
       //   type: "success",
       //   duration: 3000
       // });