fix: 权限修改

.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
+VITE_BASE_URL_IMAGE=http://192.168.0.106:12080/admin-api
+

src/pages/index.vue

@@ -46,7 +46,7 @@
 							<!-- 报修图标 -->
 							<image src="../static/images/icon4.svg" mode="" v-if="cur.componentName == 'report'"></image>
 							<!-- 报修确认图标 -->
-							<image src="../static/images/icon4.svg" mode="" v-else-if="cur.componentName == 'reportSure'"></image>
+							<image src="../static/images/icon8.png" mode="" v-else-if="cur.componentName == 'reportSure'"></image>
 							<!-- 维修工单图标 -->
 							<image src="../static/images/icon5.svg" mode="" v-else-if="cur.componentName == 'maintenanceOrder'"></image>
 							<!-- 检修工单图标 -->
@@ -60,7 +60,7 @@
 							<!-- 备件申领审核图标 -->
 							<image src="../static/images/icon7.png" mode="" v-else-if="cur.componentName == 'itemApprove1'"></image>
 							<!-- 备件申领审核图标 -->
-							<image src="../static/images/icon7.png" mode="" v-else-if="cur.componentName == 'itemApprove2'"></image>
+							<image src="../static/images/icon9.png" mode="" v-else-if="cur.componentName == 'itemApprove2'"></image>
 							<!-- 备件维修工单图标 -->
 							<image src="../static/images/icon5.svg" mode="" v-else-if="cur.componentName == 'itemMaintenanceRecord'"></image>
 							<view>{{cur.name}}</view>
@@ -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)

src/plugins/auth.js

@@ -1,62 +1,64 @@
 // import store from '@/store'
-	import { useCountStore } from '@/store'
+import {
-	const store = useCountStore()
+	useCountStore
-	console.log(store)
+} from '@/store'
+const store = useCountStore()
+
 function authPermission(permission) {
-  const all_permission = "*:*:*"
+	const all_permission = "*:*:*"
-  const permissions = store && store.permissions
+	const permissions = store && store.permissions
-  if (permission && permission.length > 0) {
+	if (permission && permission.length > 0) {
-    return permissions.some(v => {
+		return permissions.some(v => {
-      return all_permission === v || v === permission
+			return all_permission === v || v === permission
-    })
+		})
-  } else {
+	} else {
-    return false
+		return false
-  }
+	}
 }
 
 function authRole(role) {
-  const super_admin = "admin"
+	const super_admin = "admin"
-  const roles = store && store.roles
+	const roles = store && store.roles
-  if (role && role.length > 0) {
+	if (role && role.length > 0) {
-    return roles.some(v => {
+		return roles.some(v => {
-      return super_admin === v || v === role
+			return super_admin === v || v === role
-    })
+		})
-  } else {
+	} else {
-    return false
+		return false
-  }
+	}
 }
 
 export default {
-  // 验证用户是否具备某权限
+	// 验证用户是否具备某权限
-  hasPermi(permission) {
+	hasPermi(permission) {
-    return authPermission(permission)
+		return authPermission(permission)
-  },
+	},
-  // 验证用户是否含有指定权限，只需包含其中一个
+	// 验证用户是否含有指定权限，只需包含其中一个
-  hasPermiOr(permissions) {
+	hasPermiOr(permissions) {
-    return permissions.some(item => {
+		return permissions.some(item => {
-      return authPermission(item)
+			return authPermission(item)
-    })
+		})
-  },
+	},
-  // 验证用户是否含有指定权限，必须全部拥有
+	// 验证用户是否含有指定权限，必须全部拥有
-  hasPermiAnd(permissions) {
+	hasPermiAnd(permissions) {
-    return permissions.every(item => {
+		return permissions.every(item => {
-      return authPermission(item)
+			return authPermission(item)
-    })
+		})
-  },
+	},
-  // 验证用户是否具备某角色
+	// 验证用户是否具备某角色
-  hasRole(role) {
+	hasRole(role) {
-    return authRole(role)
+		return authRole(role)
-  },
+	},
-  // 验证用户是否含有指定角色，只需包含其中一个
+	// 验证用户是否含有指定角色，只需包含其中一个
-  hasRoleOr(roles) {
+	hasRoleOr(roles) {
-    return roles.some(item => {
+		return roles.some(item => {
-      return authRole(item)
+			return authRole(item)
-    })
+		})
-  },
+	},
-  // 验证用户是否含有指定角色，必须全部拥有
+	// 验证用户是否含有指定角色，必须全部拥有
-  hasRoleAnd(roles) {
+	hasRoleAnd(roles) {
-    return roles.every(item => {
+		return roles.every(item => {
-      return authRole(item)
+			return authRole(item)
-    })
+		})
-  }
+	}
-}
+}

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 {