diff --git a/.env.development b/.env.development index 84af96b..c3f886a 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,5 @@ VITE_BASE_URL=http://192.168.0.106:12080/admin-api #VITE_BASE_URL=http://dev.ccwin-in.com:25202/api/admin-api -VITE_BASE_URL_IMAGE=http://localhost:12080/admin-api \ No newline at end of file +VITE_BASE_URL_IMAGE=http://192.168.0.106:12080/admin-api + diff --git a/src/pages/index.vue b/src/pages/index.vue index 9e955c2..3118b01 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -46,7 +46,7 @@ - + @@ -60,7 +60,7 @@ - + {{cur.name}} @@ -93,7 +93,6 @@ getAccessToken } from '@/utils/auth' import { storeToRefs } from 'pinia' - import auth from '@/plugins/auth' import { useCountStore } from '@/store' import * as sparePartsApplicationApproveApi from "@/api/sparePartsApplicationApprove.js" @@ -143,7 +142,6 @@ }) // 获取一级待审核数据 async function sparePartsApplicationApprovePage(){ - await sparePartsApplicationApproveApi.sparePartsApplicationApprovePage(params.value).then((res) => { number1.value = res.data.total console.log(res.data.total) diff --git a/src/plugins/auth.js b/src/plugins/auth.js index 3ef15d0..fb5665d 100644 --- a/src/plugins/auth.js +++ b/src/plugins/auth.js @@ -1,62 +1,64 @@ // import store from '@/store' - import { useCountStore } from '@/store' - const store = useCountStore() - console.log(store) +import { + useCountStore +} from '@/store' +const store = useCountStore() + function authPermission(permission) { - const all_permission = "*:*:*" - const permissions = store && store.permissions - if (permission && permission.length > 0) { - return permissions.some(v => { - return all_permission === v || v === permission - }) - } else { - return false - } + const all_permission = "*:*:*" + const permissions = store && store.permissions + if (permission && permission.length > 0) { + return permissions.some(v => { + return all_permission === v || v === permission + }) + } else { + return false + } } function authRole(role) { - const super_admin = "admin" - const roles = store && store.roles - if (role && role.length > 0) { - return roles.some(v => { - return super_admin === v || v === role - }) - } else { - return false - } + const super_admin = "admin" + const roles = store && store.roles + if (role && role.length > 0) { + return roles.some(v => { + return super_admin === v || v === role + }) + } else { + return false + } } export default { - // 验证用户是否具备某权限 - hasPermi(permission) { - return authPermission(permission) - }, - // 验证用户是否含有指定权限,只需包含其中一个 - hasPermiOr(permissions) { - return permissions.some(item => { - return authPermission(item) - }) - }, - // 验证用户是否含有指定权限,必须全部拥有 - hasPermiAnd(permissions) { - return permissions.every(item => { - return authPermission(item) - }) - }, - // 验证用户是否具备某角色 - hasRole(role) { - return authRole(role) - }, - // 验证用户是否含有指定角色,只需包含其中一个 - hasRoleOr(roles) { - return roles.some(item => { - return authRole(item) - }) - }, - // 验证用户是否含有指定角色,必须全部拥有 - hasRoleAnd(roles) { - return roles.every(item => { - return authRole(item) - }) - } -} + // 验证用户是否具备某权限 + hasPermi(permission) { + return authPermission(permission) + }, + // 验证用户是否含有指定权限,只需包含其中一个 + hasPermiOr(permissions) { + return permissions.some(item => { + return authPermission(item) + }) + }, + // 验证用户是否含有指定权限,必须全部拥有 + hasPermiAnd(permissions) { + return permissions.every(item => { + return authPermission(item) + }) + }, + // 验证用户是否具备某角色 + hasRole(role) { + return authRole(role) + }, + // 验证用户是否含有指定角色,只需包含其中一个 + hasRoleOr(roles) { + return roles.some(item => { + return authRole(item) + }) + }, + // 验证用户是否含有指定角色,必须全部拥有 + hasRoleAnd(roles) { + return roles.every(item => { + return authRole(item) + }) + } +} \ No newline at end of file diff --git a/src/static/images/icon8.png b/src/static/images/icon8.png new file mode 100644 index 0000000..414fc84 Binary files /dev/null and b/src/static/images/icon8.png differ diff --git a/src/static/images/icon9.png b/src/static/images/icon9.png new file mode 100644 index 0000000..2c8dbd2 Binary files /dev/null and b/src/static/images/icon9.png differ diff --git a/src/store/modules/countStore.ts b/src/store/modules/countStore.ts index 45883e5..c77fc99 100644 --- a/src/store/modules/countStore.ts +++ b/src/store/modules/countStore.ts @@ -68,21 +68,6 @@ const useStore = defineStore('storeId', { } }) - // if (menus.filter(item => item.path == 'device') && menus.filter(item => item.path == 'device').length > 0) { - // this.deviceMenus = menus.filter(item => item.path == 'device')[0].children - // } else { - // this.deviceMenus = [] - // } - // if (menus.filter(item => item.path == 'mold') && menus.filter(item => item.path == 'mold').length > 0) { - // this.moldMenus = menus.filter(item => item.path == 'mold')[0].children - // } else { - // this.moldMenus = [] - // } - // if (menus.filter(item => item.path != 'device' && item.path != 'mold') && menus.filter(item => item.path != 'device' && item.path != 'mold').length > 0) { - // this.thchMenus = menus.filter(item => item.path != 'device' && item.path != 'mold') - // } else { - // this.thchMenus = [] - // } this.meaus = menus } else {