diff --git a/src/assets/images/index/linyi.png b/src/assets/images/index/linyi.png new file mode 100644 index 000000000..ae3d58b4a Binary files /dev/null and b/src/assets/images/index/linyi.png differ diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 8400645bb..aa40e7dfb 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -3,9 +3,9 @@ const t = {} t.loading = '加载中...' t.brand = {} -t.brand.lg = 'e联社区数智平台' +t.brand.lg = '临沂市孤困老人志愿服务团数字化服务平台' t.brand.mini = '数字' -t.brand.work = 'e联社区数智平台' +t.brand.work = '临沂市孤困老人志愿服务团数字化服务平台' t.brand.workMini = '工作端' t.add = '新增' diff --git a/src/views/dataBoardMain/main.vue b/src/views/dataBoardMain/main.vue index a147bcea0..08c52ac89 100644 --- a/src/views/dataBoardMain/main.vue +++ b/src/views/dataBoardMain/main.vue @@ -109,6 +109,24 @@ export default { this.$store.state.mainShuju.activeName = tab.menuId; this.$store.state.mainShuju.contentTabsActiveName = tab.name; }, + //获取团长信息 + async getCommanderByUserId(userId){ + const url = "/voluntary/volunteerOrg/getCommanderByUserId/"+userId; + const { data, code, msg } = await requestGet(url); + console.log(data,"sdfjldsflk1;"); + if (code === 0) { + console.log(this.$store.state.user, "sd;klfdslk"); + this.$store.state.user = { + volunteerOrgId: data.volunteerOrgId, + volunteerOrgName: data.volunteerOrgName, + commander: data.commander, + ...this.$store.state.user + }; + console.log(this.$store.state.user, "sd;klfdslk"); + + } + + }, // 获取当前管理员信息 async getWorkUserInfo() { const url = "/epmetuser/customerstaff/staffbasicinfo"; @@ -118,6 +136,7 @@ export default { this.$store.state.user = { ...data, }; + this.getCommanderByUserId(data.id); localStorage.setItem("roleList", data.roleList); localStorage.setItem("customerId", data.customerId); localStorage.setItem("staffId", data.id); diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue index 44f9b29a4..c0141eb48 100644 --- a/src/views/main-shuju/main.vue +++ b/src/views/main-shuju/main.vue @@ -64,6 +64,7 @@ export default { async created() { this.windowResizeHandle(); this.routeHandle(this.$route); + Promise.all([this.getWorkUserInfo()]).then(() => { this.loading = false; }); @@ -109,6 +110,24 @@ export default { this.$store.state.mainShuju.activeName = tab.menuId; this.$store.state.mainShuju.contentTabsActiveName = tab.name; }, + //获取团长信息 + async getCommanderByUserId(userId){ + const url = "/voluntary/volunteerOrg/getCommanderByUserId/"+userId; + const { data, code, msg } = await requestGet(url); + console.log(data,"sdfjldsflk1;"); + if (code === 0) { + console.log(this.$store.state.user, "sd;klfdslk"); + this.$store.state.user = { + volunteerOrgId: data.volunteerOrgId, + volunteerOrgName: data.volunteerOrgName, + commander: data.commander, + ...this.$store.state.user + }; + console.log(this.$store.state.user, "sd;klfdslk"); + + } + + }, // 获取当前管理员信息 async getWorkUserInfo() { const url = "/epmetuser/customerstaff/staffbasicinfo"; @@ -116,6 +135,7 @@ export default { const { data, code, msg } = await requestPost(url, params); if (code === 0) { this.$store.state.user = { ...data }; + await this.getCommanderByUserId(data.id); localStorage.setItem("roleList", data.roleList); localStorage.setItem("customerId", data.customerId); localStorage.setItem("staffId", data.id); diff --git a/src/views/main.vue b/src/views/main.vue index 46a9f58fc..8d86a7be0 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -138,16 +138,23 @@ export default { : []; }, //获取团长信息 - async getCommanderByUserId(userId){ - const url = "/voluntary/volunteerOrg/getCommanderByUserId/"+userId; + //获取团长信息 + async getCommanderByUserId(userId) { + const url = "/voluntary/volunteerOrg/getCommanderByUserId/" + userId; const { data, code, msg } = await requestGet(url); - console.log(data,"sdfjldsflk;"); - if (code===0) { - this.$store.state.user.volunteerOrgId=data.volunteerOrgId - this.$store.state.user.volunteerOrgName=data.volunteerOrgName - this.$store.state.user.commander=data.commander + console.log(data, "sdfjldsflk1;"); + if (code === 0) { + console.log(this.$store.state.user, "sd;klfdslk"); + this.$store.state.user = { + volunteerOrgId: data.volunteerOrgId, + volunteerOrgName: data.volunteerOrgName, + commander: data.commander, + ...this.$store.state.user + }; + console.log(this.$store.state.user, "sd;klfdslk"); + } - + }, // 获取当前管理员信息 async getWorkUserInfo() { diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 7d6ca8425..a7ef9668e 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -32,8 +32,8 @@