zhangchao/Visualize-electronic-fences
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat 系统修改

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
Ironsp
2026-05-26 16:33:40 +08:00
parent 9fd64e62da
commit ad6c6aa9c1
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/layout/components/Sidebar/Logo.vue
View File

@@ -2,12 +2,12 @@
<div class="sidebar-logo-container" :class="{ collapse: collapse }">
<transition :enter-active-class="proxy?.animate.logoAnimate.enter" mode="out-in">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 v-else class="sidebar-title">可视化电子围栏管理系统</h1>
<img v-if="logo" :src="logoUrl" class="sidebar-logo" />
<h1 v-else class="sidebar-title">{{ logoName }}</h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 class="sidebar-title">可视化电子围栏管理系统</h1>
<img v-if="logo" :src="logoUrl" class="sidebar-logo" />
<h1 class="sidebar-title">{{ logoName }}</h1>
</router-link>
</transition>
</div>
@@ -19,6 +19,7 @@ import logo from '@/assets/logo/logo.png';
import { useSettingsStore } from '@/store/modules/settings';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
import { NavTypeEnum } from '@/enums/NavTypeEnum';
import { getDemo } from '@/api/systemList/index';
defineProps({
collapse: {
@@ -52,6 +53,18 @@ const getLogoTextColor = computed(() => {
}
return sideTheme.value === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor;
});
// 获取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>
<style lang="scss" scoped>

2
src/views/systemList/role/role.vue
View File

@@ -40,7 +40,7 @@
<el-table-column v-if="false" label="角色编号" prop="roleId" />
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" />
<el-table-column label="角色描述" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作人" prop="createBy" :show-overflow-tooltip="true" />
<el-table-column label="操作人" prop="createUserName" :show-overflow-tooltip="true" />
<el-table-column label="排序" prop="roleSort" />
<el-table-column label="状态" align="center" width="100">
<template #default="scope">