!1 登录页背景图修改,快捷入口路由跳转

Merge pull request !1 from guopeiyu/guopeiyu
liutao_branch
chenshuichuan 2 years ago committed by Gitee
commit e821ad10dd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 93 KiB

@ -113,8 +113,8 @@ export default {
small: 'Small' small: 'Small'
}, },
login: { login: {
welcome: 'Welcome to the system', "welcome": "Pulp Molding Intelligent Manufacturing Production Operation Management System",
message: 'Backstage management system', "message": "Integrates information and resources in the production process to achieve an integrated system of production management, process control, quality management, and data analysis.",
tenantname: 'TenantName', tenantname: 'TenantName',
username: 'Username', username: 'Username',
password: 'Password', password: 'Password',

@ -113,8 +113,8 @@ export default {
small: '小' small: '小'
}, },
login: { login: {
welcome: '欢迎使用本系统', welcome: '纸浆模塑智能制造生产运营管理系统',
message: '开箱即用的中后台管理系统', message: '通过整合生产过程中的信息和资源,实现了生产管理、过程控制、质量管理和数据分析的一体化系统',
tenantname: '租户名称', tenantname: '租户名称',
username: '用户名', username: '用户名',
password: '密码', password: '密码',

@ -121,7 +121,7 @@
<el-skeleton :loading="loading" animated> <el-skeleton :loading="loading" animated>
<el-row> <el-row>
<el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-8px"> <el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-8px">
<div class="flex items-center"> <div class="flex items-center" @click="navigateToRoute(item.url)">
<Icon :icon="item.icon" class="mr-8px" /> <Icon :icon="item.icon" class="mr-8px" />
<el-link type="default" :underline="false" @click="setWatermark(item.name)"> <el-link type="default" :underline="false" @click="setWatermark(item.name)">
{{ item.name }} {{ item.name }}
@ -166,13 +166,12 @@
import { set } from 'lodash-es' import { set } from 'lodash-es'
import { EChartsOption } from 'echarts' import { EChartsOption } from 'echarts'
import { formatTime } from '@/utils' import { formatTime } from '@/utils'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { useWatermark } from '@/hooks/web/useWatermark' import { useWatermark } from '@/hooks/web/useWatermark'
import type { WorkplaceTotal, Project, Notice, Shortcut } from './types' import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'
import { pieOptions, barOptions } from './echarts-data' import { pieOptions, barOptions } from './echarts-data'
import {HomeApi} from "@/api/home/info"; import {HomeApi} from "@/api/home/info";
import {WeatherVO} from "@/api/home/info"; import { WeatherVO } from "@/api/home/info";
defineOptions({ name: 'Home' }) defineOptions({ name: 'Home' })
@ -192,7 +191,7 @@ let totalSate = reactive<WorkplaceTotal>({
const weatherList = ref<WeatherVO[]>([]) const weatherList = ref<WeatherVO[]>([])
const weatherEnable = ref(false) const weatherEnable = ref(false)
let todayWeather = null const todayWeather = ref({} as WeatherVO)
let weatherCity = "" let weatherCity = ""
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
@ -201,7 +200,7 @@ onMounted(async () => {
weatherEnable.value = data.isEnable weatherEnable.value = data.isEnable
if(data.isEnable && weatherList){ if(data.isEnable && weatherList){
weatherList.value = data.casts weatherList.value = data.casts
todayWeather = weatherList.value[0] todayWeather.value = weatherList.value[0]
weatherCity = data.city weatherCity = data.city
} }
@ -306,37 +305,44 @@ const getShortcut = async () => {
{ {
name: '生产任务', name: '生产任务',
icon: 'akar-icons:github-fill', icon: 'akar-icons:github-fill',
url: 'github.io' url: '/mes/plan'
}, },
{ {
name: '用户管理', name: '用户管理',
icon: 'logos:vue', icon: 'logos:vue',
url: 'vuejs.org' url: '/system/user'
}, },
{ {
name: '采购订单', name: '采购订单',
icon: 'vscode-icons:file-type-vite', icon: 'vscode-icons:file-type-vite',
url: 'https://vitejs.dev/' url: '/erp/purchase/order'
}, },
{ {
name: '报表看板', name: '报表看板',
icon: 'logos:angular-icon', icon: 'logos:angular-icon',
url: 'github.io' url: '/erp/home'
}, },
{ {
name: '物联数据', name: '物联数据',
icon: 'logos:react', icon: 'logos:react',
url: 'github.io' url: '/iot/kanban'
}, },
{ {
name: '仓库管理', name: '仓库管理',
icon: 'logos:webpack', icon: 'logos:webpack',
url: 'github.io' url: '/erp/stock/warehouse'
} }
] ]
shortcut = Object.assign(shortcut, data) shortcut = Object.assign(shortcut, data)
} }
//
const router = useRouter()
const navigateToRoute = (url: string)=> {
router.push(url)
}
// //
const getUserAccessSource = async () => { const getUserAccessSource = async () => {
const data = [ const data = [

@ -9,7 +9,7 @@
> >
<!-- 左上角的 logo + 系统标题 --> <!-- 左上角的 logo + 系统标题 -->
<div class="relative flex items-center text-white"> <div class="relative flex items-center text-white">
<img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" /> <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" width="32"/>
<span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span> <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
</div> </div>
<!-- 左边的背景图 + 欢迎语 --> <!-- 左边的背景图 + 欢迎语 -->
@ -19,8 +19,8 @@
enter-active-class="animate__animated animate__bounceInLeft" enter-active-class="animate__animated animate__bounceInLeft"
tag="div" tag="div"
> >
<img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" /> <div class="flex items-center justify-center"><img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg"/></div>
<div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div> <div key="2" class="text-3xl text-white flex items-center justify-center">{{ t('login.welcome') }}</div>
<div key="3" class="mt-5 text-14px font-normal text-white"> <div key="3" class="mt-5 text-14px font-normal text-white">
{{ t('login.message') }} {{ t('login.message') }}
</div> </div>
@ -64,12 +64,10 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { underlineToHump } from '@/utils' import { underlineToHump } from '@/utils'
import { useDesign } from '@/hooks/web/useDesign' import { useDesign } from '@/hooks/web/useDesign'
import { useAppStore } from '@/store/modules/app' import { useAppStore } from '@/store/modules/app'
import { ThemeSwitch } from '@/layout/components/ThemeSwitch' import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
import { LocaleDropdown } from '@/layout/components/LocaleDropdown' import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue } from './components' import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue } from './components'
defineOptions({ name: 'Login' }) defineOptions({ name: 'Login' })

Loading…
Cancel
Save