Prechádzať zdrojové kódy

fix: 增加组态编辑时候创建文件夹名称从 【默认分类】改为【默认分类-deptName】兼容部门权限的人创建组态不报错

yanglzh 10 mesiacov pred
rodič
commit
490752a38d

+ 1 - 0
src/router/backEnd.ts

@@ -57,6 +57,7 @@ export async function initBackEndControlRoutes() {
 export async function getBackEndControlRoutes() {
 	return api.login.currentUser().then((res: any) => {
 		Session.set('userMenu', res.Data || [])
+		Session.set('userInfo', res.Info);
 		// Session.set('permissions',res.data.permissions)
 		// store.dispatch('userInfos/setPermissions',res.data.permissions)
 	})

+ 2 - 1
src/views/iot/configuration/list/edit.vue

@@ -23,6 +23,7 @@ import api from '/@/api/configuration';
 import { ruleRequired } from '/@/utils/validator';
 import { ElMessage } from 'element-plus';
 import pako from 'pako'
+import { Session } from '/@/utils/storage';
 
 const emit = defineEmits(['getList']);
 
@@ -62,7 +63,7 @@ const onSubmit = async () => {
         formData.folderId = res.topology[0].id;
         toSend(theApi, formData)
       } else {
-        api.addFolder({ types: 'topology', name: '默认分类' }).then(({ folderId }: any) => {
+        api.addFolder({ types: 'topology', name: '默认分类-' + Session.get('userInfo')?.dept?.deptName }).then(({ folderId }: any) => {
           formData.folderId = folderId
           toSend(theApi, formData)
         })

+ 2 - 0
src/views/login/component/account.vue

@@ -218,6 +218,8 @@ export default defineComponent({
 		const currentUser = async () => {
 			api.login.currentUser().then(async (res: any) => {
 				localStorage.setItem('userId', res.Info.id);
+				Session.set('userInfo', res.Info);
+
 				// 设置用户菜单
 				Session.set('userMenu', res.Data || []);
 				store.dispatch('requestOldRoutes/setBackEndControlRoutes', res || []);

+ 1 - 0
src/views/sso/component/account.vue

@@ -171,6 +171,7 @@ export default defineComponent({
 		const currentUser = async () => {
 			api.login.currentUser().then(async (res: any) => {
 				localStorage.setItem('userId', res.Info.id);
+				Session.set('userInfo', res.Info);
 				// 设置用户菜单
 				Session.set('userMenu', res.Data || []);
 				store.dispatch('requestOldRoutes/setBackEndControlRoutes', res || []);

+ 3 - 1
src/views/sso/index.vue

@@ -59,7 +59,7 @@ export default defineComponent({
 		const userInfo = ref<any>({})
 
 		api.sso.callback(route.query).then(async (res: any) => {
-		
+
 			if (!res.loginUser) {
 				userInfo.value = res.oauthUser
 				return
@@ -91,6 +91,8 @@ export default defineComponent({
 		const currentUser = async () => {
 			api.login.currentUser().then(async (res: any) => {
 				localStorage.setItem('userId', res.Info.id);
+				Local.set('userInfo', res.Info);
+				Session.set('userInfo', res.Info);
 				// 设置用户菜单
 				Session.set('userMenu', res.Data || []);
 				store.dispatch('requestOldRoutes/setBackEndControlRoutes', res || []);