Jelajahi Sumber

Merge branch 'next' of https://gitee.com/zuohuaijun/Admin.NET into next

zuohuaijun 1 tahun lalu
induk
melakukan
b110da9a0a
2 mengubah file dengan 4 tambahan dan 4 penghapusan
  1. 2 2
      Web/package.json
  2. 2 2
      Web/src/stores/userInfo.ts

+ 2 - 2
Web/package.json

@@ -73,8 +73,8 @@
 		"@types/node": "^20.14.10",
 		"@types/node": "^20.14.10",
 		"@types/nprogress": "^0.2.3",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^7.16.0",
-		"@typescript-eslint/parser": "^7.16.0",
+		"@typescript-eslint/eslint-plugin": "^7.16.1",
+		"@typescript-eslint/parser": "^7.16.1",
 		"@vitejs/plugin-vue": "^5.0.5",
 		"@vitejs/plugin-vue": "^5.0.5",
 		"@vitejs/plugin-vue-jsx": "^4.0.0",
 		"@vitejs/plugin-vue-jsx": "^4.0.0",
 		"@vue/compiler-sfc": "^3.4.31",
 		"@vue/compiler-sfc": "^3.4.31",

+ 2 - 2
Web/src/stores/userInfo.ts

@@ -136,7 +136,7 @@ export const useUserInfo = defineStore('userInfo', {
 				const _val = val.toString();
 				const _val = val.toString();
 				const ds = this.getDictDatasByCode(typePCode);
 				const ds = this.getDictDatasByCode(typePCode);
 				for (const element of ds) {
 				for (const element of ds) {
-					if (element.value === _val) {
+					if (element.code === _val) {
 						return element;
 						return element;
 					}
 					}
 				}
 				}
@@ -150,7 +150,7 @@ export const useUserInfo = defineStore('userInfo', {
 				const _val = val.toString();
 				const _val = val.toString();
 				const ds = this.getDictDatasByCode(typePCode);
 				const ds = this.getDictDatasByCode(typePCode);
 				for (const element of ds) {
 				for (const element of ds) {
-					if (element.code === _val) {
+					if (element.value === _val) {
 						return element;
 						return element;
 					}
 					}
 				}
 				}