diff --git a/index.html b/index.html index e624d5a..e726c0d 100644 --- a/index.html +++ b/index.html @@ -4,9 +4,8 @@ - 机具租赁商城 - + 智联装备云控平台
diff --git a/src/components/Navmenu/index.vue b/src/components/Navmenu/index.vue index 8f26109..2c8c27a 100644 --- a/src/components/Navmenu/index.vue +++ b/src/components/Navmenu/index.vue @@ -34,7 +34,8 @@ watch( if (newValue == 1) { navMenuList.value = [ { name: '首页', routerName: 'home', permissions: 'home' }, - { name: '数据大屏', routerName: 'big-screen', permissions: 'home' }, + // { name: '数据大屏', routerName: 'big-screen', permissions: 'home' }, + { name: '数据地图', routerName: '', permissions: 'home' }, { name: '装备共享大厅', routerName: 'equipList', permissions: 'share' }, { name: '租赁需求大厅', routerName: 'parity', permissions: 'demand' }, // { name: '专区设备', routerName: 'zoneEquipment' }, @@ -43,7 +44,8 @@ watch( } else if (newValue == 2) { navMenuList.value = [ { name: '首页', routerName: 'home', permissions: 'home' }, - { name: '数据大屏', routerName: 'big-screen', permissions: 'home' }, + // { name: '数据大屏', routerName: 'big-screen', permissions: 'home' }, + { name: '数据地图', routerName: '', permissions: 'home' }, { name: '装备共享大厅', routerName: 'equipList', permissions: 'home' }, { name: '租赁需求大厅', routerName: 'parity', permissions: 'home' }, // { name: '专区设备', routerName: 'zoneEquipment' }, @@ -54,7 +56,8 @@ watch( } else if (newValue == 3) { navMenuList.value = [ { name: '首页', routerName: 'home', permissions: 'home' }, - { name: '数据大屏', routerName: 'big-screen', permissions: 'home' }, + // { name: '数据大屏', routerName: 'big-screen', permissions: 'home' }, + { name: '数据地图', routerName: '', permissions: 'home' }, { name: '装备共享大厅', routerName: 'equipList', permissions: 'home' }, // { name: '专区设备', routerName: 'zoneEquipment' }, { name: '租赁需求大厅', routerName: 'parity', permissions: 'home' }, diff --git a/src/components/header/index.vue b/src/components/header/index.vue index e7fafbd..1138c28 100644 --- a/src/components/header/index.vue +++ b/src/components/header/index.vue @@ -3,8 +3,7 @@ import $bus from '@/utils/bus' import { mainStore } from 'store/main' import { useStore } from 'store/user' import { ElMessage, ElMessageBox } from 'element-plus' -import headerLogo from 'assets/img/zulinlogo.png' -// import headerLogo from 'assets/img/zulinlogo-gz.png' // 贵州 +import headerLogo from 'assets/img/zulinlogo-gz.png' // 贵州 import userClass from '../../hooks/userClass' import { getUserInfo, //用户信息 diff --git a/src/layout/header.vue b/src/layout/header.vue index 436d4ae..aeb8b06 100644 --- a/src/layout/header.vue +++ b/src/layout/header.vue @@ -817,11 +817,11 @@ onMounted(() => { // width: 286px; // height: 100%; width: 240px; - height: 80px; - /* height: 40px; // 贵州 */ + /* height: 80px; */ + height: 40px; // 贵州 background-color: orange; - background: url('@/assets/img/logo.png') no-repeat; - /* background: url('@/assets/img/logo-gz.png') no-repeat; */ // 贵州 + /* background: url('@/assets/img/logo.png') no-repeat; */ + background: url('@/assets/img/logo-gz.png') no-repeat; // 贵州 background-size: 100% 100%; cursor: pointer; } diff --git a/src/views/Login.vue b/src/views/Login.vue index 21eb1d1..ebf8771 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -122,9 +122,8 @@ onMounted(async () => {