+
{{ item.name }}
@@ -166,13 +166,12 @@
import { set } from 'lodash-es'
import { EChartsOption } from 'echarts'
import { formatTime } from '@/utils'
-
import { useUserStore } from '@/store/modules/user'
import { useWatermark } from '@/hooks/web/useWatermark'
import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'
import { pieOptions, barOptions } from './echarts-data'
import {HomeApi} from "@/api/home/info";
-import {WeatherVO} from "@/api/home/info";
+import { WeatherVO } from "@/api/home/info";
defineOptions({ name: 'Home' })
@@ -192,7 +191,7 @@ let totalSate = reactive({
const weatherList = ref([])
const weatherEnable = ref(false)
-let todayWeather = null
+const todayWeather = ref({} as WeatherVO)
let weatherCity = ""
/** 初始化 **/
onMounted(async () => {
@@ -201,7 +200,7 @@ onMounted(async () => {
weatherEnable.value = data.isEnable
if(data.isEnable && weatherList){
weatherList.value = data.casts
- todayWeather = weatherList.value[0]
+ todayWeather.value = weatherList.value[0]
weatherCity = data.city
}
@@ -306,37 +305,44 @@ const getShortcut = async () => {
{
name: '生产任务',
icon: 'akar-icons:github-fill',
- url: 'github.io'
+ url: '/mes/plan'
},
{
name: '用户管理',
icon: 'logos:vue',
- url: 'vuejs.org'
+ url: '/system/user'
},
{
name: '采购订单',
icon: 'vscode-icons:file-type-vite',
- url: 'https://vitejs.dev/'
+ url: '/erp/purchase/order'
},
{
name: '报表看板',
icon: 'logos:angular-icon',
- url: 'github.io'
+ url: '/erp/home'
},
{
name: '物联数据',
icon: 'logos:react',
- url: 'github.io'
+ url: '/iot/kanban'
},
{
name: '仓库管理',
icon: 'logos:webpack',
- url: 'github.io'
+ url: '/erp/stock/warehouse'
}
]
shortcut = Object.assign(shortcut, data)
}
+// 跳转路由
+
+const router = useRouter()
+const navigateToRoute = (url: string)=> {
+ router.push(url)
+}
+
// 用户来源
const getUserAccessSource = async () => {
const data = [
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index bdc33179..842c0f94 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -9,7 +9,7 @@
>
-
+
- 
+
{{ underlineToHump(appStore.getTitle) }}
@@ -19,8 +19,8 @@
enter-active-class="animate__animated animate__bounceInLeft"
tag="div"
>
-
+
{{ underlineToHump(appStore.getTitle) }}
- {{ t('login.welcome') }}
+ {{ t('login.welcome') }}
{{ t('login.message') }}
@@ -64,12 +64,10 @@