Compare commits
2 Commits
ad6c6aa9c1
...
d840737c5e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d840737c5e | ||
|
|
c761be6e31 |
@@ -12,7 +12,7 @@
|
|||||||
<top-bar id="topbar-container" class="topbar-container" />
|
<top-bar id="topbar-container" class="topbar-container" />
|
||||||
</template>
|
</template>
|
||||||
<div class="right-menu flex align-center">
|
<div class="right-menu flex align-center">
|
||||||
<template v-if="appStore.device !== 'mobile'">
|
<div v-if="appStore.device !== 'mobile'">
|
||||||
<!-- <el-select
|
<!-- <el-select
|
||||||
v-if="userId === 1 && tenantEnabled"
|
v-if="userId === 1 && tenantEnabled"
|
||||||
v-model="companyName"
|
v-model="companyName"
|
||||||
@@ -70,11 +70,11 @@
|
|||||||
<el-tooltip :content="proxy.$t('navbar.layoutSize')" effect="dark" placement="bottom">
|
<el-tooltip :content="proxy.$t('navbar.layoutSize')" effect="dark" placement="bottom">
|
||||||
<size-select id="size-select" class="right-menu-item hover-effect" />
|
<size-select id="size-select" class="right-menu-item hover-effect" />
|
||||||
</el-tooltip> -->
|
</el-tooltip> -->
|
||||||
</template>
|
</div>
|
||||||
<div class="avatar-container">
|
<div class="avatar-container">
|
||||||
<el-dropdown class="right-menu-item hover-effect" trigger="click" @command="handleCommand">
|
<el-dropdown class="right-menu-item hover-effect" trigger="click" @command="handleCommand">
|
||||||
<div class="avatar-wrapper">
|
<div class="avatar-wrapper">
|
||||||
<img :src="userStore.avatar" class="user-avatar" />
|
<img :src="logoUrl" class="user-avatar" />
|
||||||
<el-icon><caret-bottom /></el-icon>
|
<el-icon><caret-bottom /></el-icon>
|
||||||
</div>
|
</div>
|
||||||
<template #dropdown>
|
<template #dropdown>
|
||||||
@@ -111,6 +111,7 @@ import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/
|
|||||||
import { NavTypeEnum } from '@/enums/NavTypeEnum';
|
import { NavTypeEnum } from '@/enums/NavTypeEnum';
|
||||||
import Logo from '@/layout/components/Sidebar/Logo.vue';
|
import Logo from '@/layout/components/Sidebar/Logo.vue';
|
||||||
import TopBar from './TopBar';
|
import TopBar from './TopBar';
|
||||||
|
import { getDemo } from '@/api/systemList/index';
|
||||||
|
|
||||||
const appStore = useAppStore();
|
const appStore = useAppStore();
|
||||||
const userStore = useUserStore();
|
const userStore = useUserStore();
|
||||||
@@ -221,6 +222,18 @@ const refresh = () => {
|
|||||||
const goToWarningList = () => {
|
const goToWarningList = () => {
|
||||||
router.push('/WarningList/WarningList/list');
|
router.push('/WarningList/WarningList/list');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 获取Logo图片
|
||||||
|
const logoUrl = ref();
|
||||||
|
const logoName = ref();
|
||||||
|
onMounted(() => {
|
||||||
|
getDemo().then((res) => {
|
||||||
|
console.log('系统11111111111', res);
|
||||||
|
|
||||||
|
logoName.value = res.data.name;
|
||||||
|
logoUrl.value = res.data.url;
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|||||||
@@ -26,6 +26,14 @@ export const initSSE = (url: any) => {
|
|||||||
|
|
||||||
watch(data, () => {
|
watch(data, () => {
|
||||||
if (!data.value) return;
|
if (!data.value) return;
|
||||||
|
|
||||||
|
// 打印接收到的 SSE 消息
|
||||||
|
console.log('=== SSE 接收到消息 ===');
|
||||||
|
console.log('消息内容:', data.value);
|
||||||
|
console.log('消息类型:', typeof data.value);
|
||||||
|
console.log('接收时间:', new Date().toLocaleString());
|
||||||
|
console.log('=====================');
|
||||||
|
|
||||||
useNoticeStore().addNotice({
|
useNoticeStore().addNotice({
|
||||||
message: data.value,
|
message: data.value,
|
||||||
read: false,
|
read: false,
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<div class="login-brand__logo-wrap">
|
<div class="login-brand__logo-wrap">
|
||||||
<img class="login-brand__logo" :src="logoUrl" alt="" />
|
<img class="login-brand__logo" :src="logoUrl" alt="" />
|
||||||
</div>
|
</div>
|
||||||
<h1 class="login-brand__title">可视化电子围栏管理系统</h1>
|
<h1 class="login-brand__title">{{ logoName }}</h1>
|
||||||
<p class="login-brand__subtitle">智能安防 · 实时监控 · 高效管理</p>
|
<p class="login-brand__subtitle">智能安防 · 实时监控 · 高效管理</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -80,7 +80,8 @@ import { LoginData, TenantVO } from '@/api/types';
|
|||||||
import { to } from 'await-to-js';
|
import { to } from 'await-to-js';
|
||||||
import { HttpStatus } from '@/enums/RespEnum';
|
import { HttpStatus } from '@/enums/RespEnum';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import logoUrl from '@/assets/logo/logo.png';
|
import logo from '@/assets/logo/logo.png';
|
||||||
|
import { getDemo } from '@/api/systemList/index';
|
||||||
|
|
||||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||||
|
|
||||||
@@ -224,6 +225,18 @@ onMounted(() => {
|
|||||||
initTenantList();
|
initTenantList();
|
||||||
getLoginData();
|
getLoginData();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 获取Logo图片
|
||||||
|
const logoUrl = ref();
|
||||||
|
const logoName = ref();
|
||||||
|
onMounted(() => {
|
||||||
|
getDemo().then((res) => {
|
||||||
|
console.log('系统11111111111', res);
|
||||||
|
|
||||||
|
logoName.value = res.data.name;
|
||||||
|
logoUrl.value = res.data.url;
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|||||||
Reference in New Issue
Block a user