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 @@
-
@@ -352,15 +352,10 @@ export default { } }, handleChangeAgency(val) { - - this.sarr = [] - const map = new Map(); - this.getLastItem( - this.orgOptions, - val, - "agencyId" - ); - this.level = this.sarr[this.sarr.length - 1].level + console.log(val,"sfdsdl;ksdl;"); + this.formData.agencyId=this.formData.agencyId.toString() + this.initChart() + this.initEcharts(); }, //获取街道 getOrgTreeList() { @@ -391,7 +386,7 @@ export default { initChart() { const url = "/voluntary/volunteerInfo/homePage/staticAgencyVolunteerInfo"; let params = { - agencyId:"" + agencyId:this.formData.agencyId }; requestGet(url,params).then(res=>{ const chartDom = this.$refs.chart; @@ -483,7 +478,7 @@ export default { initEcharts() { const url = "/voluntary/volunteerInfo/homePage/staticVolunteerInfoByTime"; let params = { - agencyId: "" + agencyId: this.formData.agencyId }; requestGet(url, params).then(res => { console.log(res, "s2342df;lsdl;"); diff --git a/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue b/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue index cf2041380..f0337a494 100644 --- a/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue +++ b/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue @@ -8,7 +8,7 @@ - @@ -364,7 +364,7 @@ formType:"add", agencyIdArray: [], formData: { - volunteers:"1", + volunteers:1, volunteerOrgId: '', orgIdPath: '', headImg: '', @@ -456,14 +456,20 @@ label: "是" }, ], - ServiceGroupList:[] - + ServiceGroupList:[], + disabled:false } + }, components: {Tinymce, UploadImage }, mounted() { + // const { user } = this.$store.state + // if (user.commander) { + // this.disabled = true + // this.formData.volunteerOrgId = user.volunteerOrgId + // } this.getelderlyStatus() this.gethealthStatus() this.loadNations() @@ -558,7 +564,7 @@ } }, async initForm(row, type) { - this.startLoading() + // this.startLoading() this.formType = type if (type === 'edit') { this.formData = row @@ -578,7 +584,7 @@ this.formData = { } } - this.endLoading() + // this.endLoading() }, async handleComfirm() { @@ -617,7 +623,7 @@ let url = '/voluntary/elderlyInfo/save' let combinedString = this.typefatherId + "," + this.childrenId; this.formData.serviceDemand=combinedString - this.formData.statusCategory=this.formData.statusCategory.join(",") + this.formData.statusCategory=this.formData.statusCategory?this.formData.statusCategory.join(","):this.formData.statusCategory const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { this.$message({ diff --git a/src/views/modules/informationArchive/elderlyArchives/index.vue b/src/views/modules/informationArchive/elderlyArchives/index.vue index 032e08bdc..d1be7a6c7 100644 --- a/src/views/modules/informationArchive/elderlyArchives/index.vue +++ b/src/views/modules/informationArchive/elderlyArchives/index.vue @@ -415,7 +415,6 @@ if (code === 0) { this.tableData = data.list this.total=data.total - } else { this.$message.error(msg) } @@ -666,7 +665,7 @@ }); // this.loadTable() - this.communityActivityList() + this.getElderlyInfo() } else { this.$message.error(msg) } @@ -718,7 +717,7 @@ computed: { tableHeight () { - return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 470 + return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 450 }, diff --git a/src/views/modules/informationArchive/volunteerProfile/index.vue b/src/views/modules/informationArchive/volunteerProfile/index.vue index 601219400..03e025407 100644 --- a/src/views/modules/informationArchive/volunteerProfile/index.vue +++ b/src/views/modules/informationArchive/volunteerProfile/index.vue @@ -5,7 +5,7 @@
@@ -108,7 +108,7 @@ - @@ -235,7 +235,7 @@ // 获取所属组织列表 getFormInfo() { this.$http - .post(`/gov/org/agency/getOrgTreeListByCustomerId`) + .post(`/gov/org/userhouse/service/serviceScopeTree`) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 12ad1a647..1ada10025 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -6,8 +6,11 @@
- -

{{ $t("brand.work") }}

+ +
+

{{ $t("brand.work") }}

+
+