From 771942c89a7c876699509a7e151959297a910345 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期五, 11 七月 2025 16:31:21 +0800
Subject: [PATCH] 修改新增
---
src/views/homePage.vue | 20 ++-
src/assets/icons/menu4.png | 0
src/store/modules/user.js | 1
src/assets/icons/menu2.png | 0
src/store/index.js | 1
src/layout/components/Navbar.vue | 17 ++
src/assets/icons/menu6.png | 0
src/router/index.js | 5
src/views/work/onlineEducation/people/index.vue | 1
src/assets/icons/menu3.png | 0
src/assets/icons/menu1.png | 0
src/views/menuPage.vue | 275 +++++++++++++++++++++++++++++++++++++++++++++
vite.config.js | 4
src/assets/icons/menu5.png | 0
14 files changed, 309 insertions(+), 15 deletions(-)
diff --git a/src/assets/icons/menu1.png b/src/assets/icons/menu1.png
new file mode 100644
index 0000000..c9547e3
--- /dev/null
+++ b/src/assets/icons/menu1.png
Binary files differ
diff --git a/src/assets/icons/menu2.png b/src/assets/icons/menu2.png
new file mode 100644
index 0000000..c2657a0
--- /dev/null
+++ b/src/assets/icons/menu2.png
Binary files differ
diff --git a/src/assets/icons/menu3.png b/src/assets/icons/menu3.png
new file mode 100644
index 0000000..3eccb36
--- /dev/null
+++ b/src/assets/icons/menu3.png
Binary files differ
diff --git a/src/assets/icons/menu4.png b/src/assets/icons/menu4.png
new file mode 100644
index 0000000..815e3f7
--- /dev/null
+++ b/src/assets/icons/menu4.png
Binary files differ
diff --git a/src/assets/icons/menu5.png b/src/assets/icons/menu5.png
new file mode 100644
index 0000000..9872644
--- /dev/null
+++ b/src/assets/icons/menu5.png
Binary files differ
diff --git a/src/assets/icons/menu6.png b/src/assets/icons/menu6.png
new file mode 100644
index 0000000..f294407
--- /dev/null
+++ b/src/assets/icons/menu6.png
Binary files differ
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index e04cd9a..e507d05 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -5,6 +5,7 @@
<top-nav id="topmenu-container" class="topmenu-container" v-if="settingsStore.topNav" />
<div class="right-menu">
+ <div class="backBtn" @click="backToMenu">返回菜单</div>
<template v-if="appStore.device !== 'mobile'">
<!-- <header-search id="header-search" class="right-menu-item" />-->
@@ -74,7 +75,8 @@
import Cookies from "js-cookie";
import {getUserById} from "@/api/sysUsers";
import menu from "@/layout/components/Sidebar/menu";
-import userDialog from '@/views/onlineEducation/systemManage/user/components/userDialog.vue'
+import userDialog from '@/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue'
+import router from "@/router";
const appStore = useAppStore()
const userStore = useUserStore()
@@ -90,8 +92,7 @@
if(getToken()){
userInfo.value = JSON.parse(Cookies.get('userInfo'))
userName.value = userInfo.value.username
- userTypeName.value = userInfo.value.userType == 0 ? '管理员' : userInfo.value.userType == 1 ? '企业级' :userInfo.value.userType == 2 ? '部门级':userInfo.value.userType == 3 ? '车间级' :userInfo.value.userType == 4 ? '其他' : '学员'
- console.log("userInfo",userInfo.value )
+ userTypeName.value = userInfo.value.userType == 0 ? '系统管理员' : userInfo.value.userType == 1 ? '企业管理员' :userInfo.value.userType == 2 ? '部门级':userInfo.value.userType == 3 ? '车间级' :userInfo.value.userType == 6 ? '企业用户' :userInfo.value.userType == 4 ? '其他' : '学员'
}
// getState();
})
@@ -141,7 +142,6 @@
}
function getInfo() {
- console.log("getInfo",userInfo.value)
reviewRef.value.openDialog('view',userInfo.value)
}
function editPsd() {
@@ -171,6 +171,10 @@
location.href = '/homePage';
}).catch(() => { });
+}
+
+const backToMenu = ()=>{
+ router.push({path: '/menuPage'})
}
const emits = defineEmits(['setLayout'])
@@ -224,6 +228,11 @@
&:focus {
outline: none;
}
+ .backBtn{
+ margin-right: 20px;
+ font-size: 16px;
+ cursor: pointer;
+ }
.right-menu-item {
display: inline-block;
diff --git a/src/router/index.js b/src/router/index.js
index aa3e70c..c741cdd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -58,6 +58,11 @@
hidden: true
},
{
+ path: '/menuPage',
+ component: () => import('@/views/menuPage'),
+ hidden: true
+ },
+ {
path: '/courseManage',
component: Layout,
redirect: '/onlineEducation/courseManage',
diff --git a/src/store/index.js b/src/store/index.js
index f10f389..2e68d20 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,3 +1,4 @@
+import { createPinia } from 'pinia'
const store = createPinia()
export default store
\ No newline at end of file
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 20271e6..c0b4cc6 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -2,6 +2,7 @@
import { getToken, setToken, removeToken } from '@/utils/auth'
import defAva from '@/assets/images/profile.jpg'
import Cookies from "js-cookie";
+import { defineStore } from 'pinia'
import {getUserById} from "@/api/onlineEducation/user";
const useUserStore = defineStore(
'user',
diff --git a/src/views/homePage.vue b/src/views/homePage.vue
index acf9425..b733b0d 100644
--- a/src/views/homePage.vue
+++ b/src/views/homePage.vue
@@ -146,14 +146,18 @@
identity: loginForm.value.role
}
userStore.login(param).then(() => {
- const query = route.query;
- const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
- if (cur !== "redirect") {
- acc[cur] = query[cur];
- }
- return acc;
- }, {});
- router.push({ path: redirect.value || "/", query: otherQueryParams });
+ if (redirect.value) {
+ const query = route.query;
+ const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
+ if (cur !== "redirect") {
+ acc[cur] = query[cur];
+ }
+ return acc;
+ }, {});
+ router.push({ path: redirect.value || "/", query: otherQueryParams });
+ } else {
+ router.push({ path: "/menuPage" });
+ }
}).catch(() => {
loading.value = false;
// 重新获取验证码
diff --git a/src/views/menuPage.vue b/src/views/menuPage.vue
new file mode 100644
index 0000000..4ee3d9e
--- /dev/null
+++ b/src/views/menuPage.vue
@@ -0,0 +1,275 @@
+<template>
+ <div class="system-select-container">
+ <!-- 顶部用户信息栏 -->
+ <div class="user-info-bar">
+ <div class="user-left"></div>
+ <h3 class="user-details">欢迎访问多体系建设信息化系统</h3>
+ <div class="avatar-container">
+ <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
+ <div class="avatar-wrapper" style="display: flex;align-items: center">
+ <img src="../assets/images/avator.png" class="user-avatar" />
+ <span style="font-size: 16px">{{userName}}（{{userTypeName}}）</span>
+ <el-icon><caret-bottom /></el-icon>
+ </div>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item command="info">
+ <span>基本信息</span>
+ </el-dropdown-item>
+ <el-dropdown-item command="password">
+ <span>修改密码</span>
+ </el-dropdown-item>
+ <el-dropdown-item divided command="logout">
+ <span>退出登录</span>
+ </el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+ </div>
+ </div>
+
+ <!-- 系统选择区域 -->
+ <div class="systems-container">
+ <div class="systems-grid">
+ <div
+ v-for="system in systems"
+ :key="system.id"
+ class="system-card"
+ @click="enterSystem(system.id)"
+ >
+ <div class="system-icon">
+ <img :src="system.icon"/>
+ </div>
+ <h3>{{ system.name }}</h3>
+ <p>{{ system.description }}</p>
+ </div>
+ </div>
+ </div>
+ <user-dialog ref="reviewRef" ></user-dialog>
+ </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+import {getToken, removeToken} from "@/utils/auth";
+import Cookies from "js-cookie";
+import {ElMessage, ElMessageBox} from "element-plus";
+import useUserStore from '@/store/modules/user'
+import userDialog from '@/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue'
+import menu1 from '@/assets/icons/menu1.png'
+import menu2 from '@/assets/icons/menu2.png'
+import menu3 from '@/assets/icons/menu3.png'
+import menu4 from '@/assets/icons/menu4.png'
+import menu5 from '@/assets/icons/menu5.png'
+import menu6 from '@/assets/icons/menu6.png'
+
+const router = useRouter()
+const route = useRoute();
+const reviewRef = ref();
+const userInfo = ref();
+const userName = ref('')
+const userTypeName = ref('')
+// 组件挂载时获取用户信息和系统列表
+onMounted(() => {
+ if(getToken()){
+ userInfo.value = JSON.parse(Cookies.get('userInfo'))
+ userName.value = userInfo.value.username
+ userTypeName.value = userInfo.value.userType == 0 ? '系统管理员' : userInfo.value.userType == 1 ? '企业管理员' :userInfo.value.userType == 2 ? '部门级':userInfo.value.userType == 3 ? '车间级' :userInfo.value.userType == 6 ? '企业用户' :userInfo.value.userType == 4 ? '其他' : '学员'
+ }
+
+ const userStore = useUserStore()
+ userStore.roles = []
+})
+// 系统列表
+const systems = ref([
+ {
+ id: 1,
+ name: 'ISO 9000 质量管理体系',
+ description: '确保产品和服务质量符合国际标准',
+ icon: menu1
+ },
+ {
+ id: 2,
+ name: 'ISO 27001 信息安全体系',
+ description: '保护企业信息资产安全与机密性',
+ icon: menu2
+ },
+ {
+ id: 3,
+ name: 'ISO 45001 安全体系',
+ description: '实现企业安全的持续改进',
+ icon: menu3
+ },
+ {
+ id: 4,
+ name: '项目管理控制',
+ description: '标准化项目管理流程与方法',
+ icon: menu4
+ },
+ {
+ id: 5,
+ name: '承制评价体系',
+ description: '供应商与承包商能力评估标准',
+ icon: menu5
+ },
+ {
+ id: 6,
+ name: '新体系评价',
+ description: '新体系评价',
+ icon: menu6
+ }
+])
+function handleCommand(command) {
+ switch (command) {
+ case "info":
+ getInfo();
+ break;
+ case "logout":
+ logout();
+ break;
+ case "password":
+ editPsd();
+ break;
+ default:
+ break;
+ }
+}
+// 进入系统
+const enterSystem = (systemId) => {
+ if(systemId == 1){
+ router.push({ path: "/"});
+ }else{
+ ElMessage.warning('系统正在开发中...')
+ }
+}
+function getInfo() {
+ reviewRef.value.openDialog('view',userInfo.value)
+}
+function editPsd() {
+ reviewRef.value.openDialog('pwd',userInfo.value)
+}
+// 退出登录
+function logout() {
+ ElMessageBox.confirm('确定注销并退出系统吗？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ removeToken()
+ location.href = '/homePage';
+
+ }).catch(() => { });
+}
+
+
+</script>
+
+<style scoped lang="scss">
+.system-select-container {
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+ background-color: #f5f7fa;
+}
+
+.user-info-bar {
+ display: flex;
+ height: 100px;
+ align-items: center;
+ justify-content: space-between;
+ padding: 10px 20px;
+ background-color: #ffffff;
+ box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+
+ .user-left{
+ width: 20%;
+ }
+
+ .user-details{
+ width: 60%;
+ margin: 0;
+ color: #333;
+ text-align: center;
+ }
+
+ .avatar-container {
+ width: 20%;
+ display: flex;
+ justify-content: center;
+
+ .avatar-wrapper {
+ margin-top: 15px;
+ position: relative;
+
+ .user-avatar {
+ cursor: pointer;
+ width: 40px;
+ height: 40px;
+ border-radius: 10px;
+ margin-right: 15px;
+ }
+
+ i {
+ cursor: pointer;
+ position: absolute;
+ right: -20px;
+ font-size: 12px;
+ }
+ }
+ }
+
+}
+
+
+.systems-container {
+ flex: 1;
+ padding: 20px;
+ overflow-y: auto;
+ margin-top: 60px;
+}
+
+.systems-grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(500px, 1fr));
+ gap: 20px;
+ max-width: 1500px;
+ margin: 0 auto;
+}
+
+.system-card {
+ display: flex;
+ height: 200px;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 20px;
+ background-color: #ffffff;
+ border-radius: 8px;
+ transition: transform 0.3s, box-shadow 0.3s;
+ cursor: pointer;
+}
+
+.system-card:hover {
+ transform: translateY(-5px);
+ box-shadow: 0 6px 12px rgba(100, 100, 100, 0.1);
+}
+
+.system-icon img {
+ width: 60px;
+ height: 60px;
+ margin-bottom: 15px;
+}
+
+.system-card h3 {
+ margin: 0 0 10px;
+ color: #333;
+}
+
+.system-card p {
+ margin: 0;
+ color: #666;
+ font-size: 14px;
+ text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/work/onlineEducation/people/index.vue b/src/views/work/onlineEducation/people/index.vue
index 91ccbc4..96480ff 100644
--- a/src/views/work/onlineEducation/people/index.vue
+++ b/src/views/work/onlineEducation/people/index.vue
@@ -103,7 +103,6 @@
const userType = ref()
onMounted(async ()=>{
const userInfo = JSON.parse(Cookies.get('userInfo'))
- console.log("userInfo",userInfo)
userType.value = userInfo.userType
if(userInfo.userType === 0){
data.isAdmin = true;
diff --git a/vite.config.js b/vite.config.js
index 094861a..e4ff111 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,7 +7,7 @@
const env = loadEnv(mode, process.cwd())
const { VITE_APP_ENV } = env
return {
- // 部署生产环境和开发环境下的URL。
+ // 部署生产环境和开发环境下的URL。
// 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
base: VITE_APP_ENV === 'production' ? '/' : '/',
@@ -18,7 +18,7 @@
// 设置路径
'~': path.resolve(__dirname, './'),
// 设置别名
- '@': path.resolve(__dirname, './src')
+ '@': path.resolve(__dirname, './src'),
},
// https://cn.vitejs.dev/config/#resolve-extensions
extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
--
Gitblit v1.9.2