Pre Merge pull request !873 from Defry/dev

pull/873/MERGE
Defry 2026-05-03 01:19:18 +00:00 committed by Gitee
commit 65944f6f45
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 34 additions and 30 deletions

4
.env
View File

@ -1,5 +1,5 @@
# 标题 # 标题
VITE_APP_TITLE=芋道管理系统 VITE_APP_TITLE=X管理平台
# 项目本地运行端口号 # 项目本地运行端口号
VITE_PORT=80 VITE_PORT=80
@ -20,7 +20,7 @@ VITE_APP_DOCALERT_ENABLE=true
VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
# 默认账户密码 # 默认账户密码
VITE_APP_DEFAULT_LOGIN_TENANT = 芋道源码 VITE_APP_DEFAULT_LOGIN_TENANT = 888888
VITE_APP_DEFAULT_LOGIN_USERNAME = admin VITE_APP_DEFAULT_LOGIN_USERNAME = admin
VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123 VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123

View File

@ -30,5 +30,7 @@ VITE_MALL_H5_DOMAIN='http://localhost:3000'
# 验证码的开关 # 验证码的开关
VITE_APP_CAPTCHA_ENABLE=false VITE_APP_CAPTCHA_ENABLE=false
# GoView域名 # 大屏设计器GoView独立前端地址需另起仓库 yudao-ui-go-viewpnpm dev默认端口 3000
# 仓库https://gitee.com/yudaocode/yudao-ui-go-view 文档https://doc.iocoder.cn/report/screen/
# 若 GoView 改端口请同步修改此处并保证与芋道后端的跨域、Token 配置按 go-view 项目说明一致
VITE_GOVIEW_URL='http://127.0.0.1:3000' VITE_GOVIEW_URL='http://127.0.0.1:3000'

View File

@ -201,7 +201,7 @@ export default {
workplace: { workplace: {
welcome: '你好', welcome: '你好',
happyDay: '祝你开心每一天!', happyDay: '祝你开心每一天!',
toady: '今日晴', toady: '今日晴,鸿运当头',
notice: '通知公告', notice: '通知公告',
project: '项目数', project: '项目数',
access: '项目访问', access: '项目访问',
@ -455,4 +455,4 @@ export default {
preview: '预览' preview: '预览'
}, },
'OAuth 2.0': 'OAuth 2.0' // 避免菜单名是 OAuth 2.0 时,一直 warn 报错 'OAuth 2.0': 'OAuth 2.0' // 避免菜单名是 OAuth 2.0 时,一直 warn 报错
} }

View File

@ -210,9 +210,9 @@ let totalSate = reactive<WorkplaceTotal>({
const getCount = async () => { const getCount = async () => {
const data = { const data = {
project: 40, project: 4,
access: 2340, access: 2340,
todo: 10 todo: 0
} }
totalSate = Object.assign(totalSate, data) totalSate = Object.assign(totalSate, data)
} }
@ -245,7 +245,7 @@ const getProject = async () => {
time: new Date('2025-03-04'), time: new Date('2025-03-04'),
color: '#ff4d4f' color: '#ff4d4f'
}, },
{ /*{
name: 'yudao-cloud', name: 'yudao-cloud',
icon: 'material-symbols:cloud-outline', icon: 'material-symbols:cloud-outline',
message: 'github.com/YunaiV/yudao-cloud', message: 'github.com/YunaiV/yudao-cloud',
@ -260,7 +260,7 @@ const getProject = async () => {
personal: 'Vue3 + vben5(antd) 管理后台', personal: 'Vue3 + vben5(antd) 管理后台',
time: new Date('2025-05-06'), time: new Date('2025-05-06'),
color: '#e18525' color: '#e18525'
}, },*/
{ {
name: 'yudao-ui-admin-uniapp', name: 'yudao-ui-admin-uniapp',
icon: 'ant-design:mobile', icon: 'ant-design:mobile',
@ -277,24 +277,6 @@ const getProject = async () => {
let notice = reactive<Notice[]>([]) let notice = reactive<Notice[]>([])
const getNotice = async () => { const getNotice = async () => {
const data = [ const data = [
{
title: '系统支持 JDK 8/17/21Vue 2/3',
type: '技术兼容性',
keys: ['JDK', 'Vue'],
date: new Date()
},
{
title: '后端提供 Spring Boot 2.7/3.2 + Cloud 双架构',
type: '架构灵活性',
keys: ['Boot', 'Cloud'],
date: new Date()
},
{
title: '全部开源,个人与企业可 100% 直接使用,无需授权',
type: '开源免授权',
keys: ['无需授权'],
date: new Date()
},
{ {
title: '国内使用最广泛的快速开发平台,远超 10w+ 企业使用', title: '国内使用最广泛的快速开发平台,远超 10w+ 企业使用',
type: '广泛企业认可', type: '广泛企业认可',

View File

@ -199,9 +199,9 @@ const loginData = reactive({
captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false', captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false',
tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false', tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false',
loginForm: { loginForm: {
tenantName: '芋道源码', tenantName: '',
username: 'admin', username: '',
password: 'admin123', password: '',
captchaVerification: '', captchaVerification: '',
rememberMe: false rememberMe: false
} }

View File

@ -1,6 +1,26 @@
<template> <template>
<doc-alert title="大屏设计器" url="https://doc.iocoder.cn/report/screen/" /> <doc-alert title="大屏设计器" url="https://doc.iocoder.cn/report/screen/" />
<el-alert
class="!mb-12px"
type="warning"
show-icon
:closable="false"
title="本页为 iframe 嵌入「GoView 大屏」独立前端,与当前管理端不是同一个进程。"
>
<template #default>
<p class="m-0 leading-relaxed">
若出现127.0.0.1 拒绝连接请先克隆并启动
<el-link type="primary" href="https://gitee.com/yudaocode/yudao-ui-go-view" target="_blank">
yudao-ui-go-view
</el-link>
在项目根目录执行 <code>pnpm install</code> <code>pnpm dev</code>默认地址
<strong>http://127.0.0.1:3000</strong> <code>.env.local</code>
<code>VITE_GOVIEW_URL</code> go-view 项目内对接后端的配置
</p>
</template>
</el-alert>
<ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0"> <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
<IFrame :src="src" /> <IFrame :src="src" />
</ContentWrap> </ContentWrap>