Compare commits

..

No commits in common. "32515be0bbb2b992f65da07a85228a6f6b60b9a5" and "d237715c52bdca54c2bf04aae18a67cfa1b031b4" have entirely different histories.

7 changed files with 14 additions and 54 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 677 KiB

View File

@ -1,22 +1,16 @@
<script setup lang="ts">
import { useStore } from '../../store/user'
const store = useStore()
const router = useRouter()
const route = useRoute()
// const navMenuList = [
// { name: '', routerName: 'home' },
// { name: '', routerName: 'equipList' },
// { name: '', routerName: 'parity' },
// // { name: '', routerName: '/home' },
// { name: '', routerName: '/home' },
// // { name: '', routerName: '/home' },
// { name: '', routerName: 'enterpriseZone' },
// // { name: '', routerName: 'enterpriseZone' },
// ]
const navMenuList = computed(() => {
return store.leaseAndLesseeList
})
const navMenuList = [
{ name: '首页', routerName: 'home' },
{ name: '装备共享大厅', routerName: 'equipList' },
{ name: '租赁需求大厅', routerName: 'parity' },
{ name: '装备管理', routerName: '/home' },
{ name: '订单管理', routerName: '/home' },
{ name: '基础管理', routerName: '/home' },
{ name: '消息通知', routerName: 'enterpriseZone' },
{ name: '综合查询', routerName: 'enterpriseZone' },
]
const navMenuClick = (name: any) => {
router.push({ name })

View File

@ -1,11 +1,8 @@
<script setup lang="ts">
import $bus from '@/utils/bus'
import { mainStore } from 'store/main'
import { useStore } from 'store/user'
import { ElMessage, ElMessageBox } from 'element-plus'
const store: any = mainStore()
const userStore = useStore()
userStore.editMenuList(1)
const route = useRoute()
const router = useRouter()
@ -93,10 +90,8 @@ const onRolesCheck = () => {
const onSelectRoles = (type: number) => {
if (type === 1) {
rolesName.value = '出租方'
userStore.editMenuList(1)
} else {
rolesName.value = '承租方'
userStore.editMenuList(2)
}
isRolesSelect.value = false
}

View File

@ -1,13 +1,9 @@
<script setup lang="ts">
import $bus from '@/utils/bus'
import { mainStore } from 'store/main'
import { useStore } from 'store/user'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getHotSearchListApi } from '../http/api/home/index'
const store: any = mainStore()
const userStore = useStore()
userStore.editMenuList(1)
const route = useRoute()
const router = useRouter()
@ -105,10 +101,8 @@ const onRolesCheck = () => {
const onSelectRoles = (type: number) => {
if (type === 1) {
rolesName.value = '出租方'
userStore.editMenuList(1)
} else {
rolesName.value = '承租方'
userStore.editMenuList(2)
}
isRolesSelect.value = false
}

View File

@ -1,4 +1,4 @@
import { createRouter, RouteRecordRaw, createWebHistory } from 'vue-router'
import { createRouter, createWebHashHistory, RouteRecordRaw, useRouter } from 'vue-router'
import test from './module/test'
import myInfo from './module/myInfo'
@ -419,7 +419,7 @@ const routes: Array<RouteRecordRaw> = [
const router = createRouter({
// 路由模式
history: createWebHistory(),
history: createWebHashHistory(),
routes
})

View File

@ -1,7 +1,5 @@
import { el } from 'element-plus/es/locale'
import { get, post } from 'http/index'
export const useStore = defineStore('myUser', {
state: () => {
return {
@ -23,7 +21,6 @@ export const useStore = defineStore('myUser', {
deviceTypeList: [], // 设备类型大类
deviceTypeSonList: [], // 设备类型子类
deviceTypeSunList: [], // 设备类型小类
leaseAndLesseeList: []
}
},
getters: {
@ -101,23 +98,6 @@ export const useStore = defineStore('myUser', {
console.log(res, '设备类型小类**---***');
},
// 修改承租方 出租方菜单
editMenuList(type: number) {
let baseList: any = [
{ name: '首页', routerName: 'home' },
{ name: '装备共享大厅', routerName: 'equipList' },
{ name: '租赁需求大厅', routerName: 'parity' },
{ name: '装备管理', routerName: '/home' },
{ name: '订单管理', routerName: '/home' },
{ name: '消息通知', routerName: 'enterpriseZone' },
]
if (type == 1) {
this.leaseAndLesseeList = baseList
} else {
this.leaseAndLesseeList = baseList
this.leaseAndLesseeList.splice(3, 1)
}
}
},
persist: {
enabled: true, // 开启数据缓存
@ -127,7 +107,7 @@ export const useStore = defineStore('myUser', {
key: 'myUser',
storage: sessionStorage, //缓存模式 可选 localStorage sessionStorage
// state 中的字段名,按组打包储存
paths: ['currentMenuType', 'currentMenuItem', 'menuList', 'leaseAndLesseeList'] //需要缓存的字段 与 state中相关联
paths: ['currentMenuType', 'currentMenuItem', 'menuList'] //需要缓存的字段 与 state中相关联
}
]
}

View File

@ -8,8 +8,6 @@ import { getHotList } from 'http/api/equip'
import { reactive, ref } from 'vue'
import baseData from '@/assets/baseInformation.json'
import imgSrc from '../../assets/img/home/nw.png'
const router: any = useRouter()
// const leftNavList: any = ref([])
@ -21,8 +19,7 @@ const selectOptionsValue = ref<string>('分类筛选')
const loopList = ref([
'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png',
// 'https://jmy-pic.baidu.com/0/pic/-1857035387_-1067811148_-1621691324.png',
imgSrc,
'https://jmy-pic.baidu.com/0/pic/-1857035387_-1067811148_-1621691324.png',
])
//
const getGoodsClassList = async () => {