diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 58105013..789f50f8 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.mini = '党群' -t.brand.work = '党群e事通工作端' +t.brand.lg = '数字社区工作平台' +t.brand.mini = '数字' +t.brand.work = '数字社区工作平台' t.brand.workMini = '工作端' t.add = '新增' diff --git a/src/router/index.js b/src/router/index.js index 314a89b5..edcfb020 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,19 +35,13 @@ export const pageRoutes = [ { path: "/", name: "index", - redirect: { - name: "indexWork", - }, - meta: { - title: "首页", - }, + component: () => import("@/views/pages/index"), }, { path: "/indexWork", - component: () => import("@/views/pages/indexWork"), name: "indexWork", - meta: { - title: "工作端首页", + redirect: { + name: "index", }, }, ]; @@ -58,7 +52,7 @@ export const moduleRoutes = { component: () => import("@/views/main"), name: "main", redirect: { - name: "home", + path: "/main/base-resi", }, meta: { title: "主入口布局", @@ -233,18 +227,18 @@ router.beforeEach((to, from, next) => { id: "22213213", name: "基础信息", url: "visual/basicinfo/basicInfoMain", - children: [ - { - url: "/visual/basicinfo/basicInfoMain", - name: "基础信息", - id: "5feawfwaefwa5", - }, - { - url: "/visual/basicinfo/basicInfoMain", - name: "人员类别分析", - id: "5fwaefwaefawef5", - }, - ], + // children: [ + // // { + // // url: "/visual/basicinfo/basicInfoMain", + // // name: "基础信息", + // // id: "5feawfwaefwa5", + // // }, + // // { + // // url: "/visual/basicinfo/basicInfoMain", + // // name: "人员类别分析", + // // id: "5fwaefwaefawef5", + // // }, + // ], }, { icon: "icon-setting", @@ -278,7 +272,6 @@ router.beforeEach((to, from, next) => { id: "distributionAnalyze", }, ], - }, { icon: "icon-setting", @@ -296,7 +289,7 @@ router.beforeEach((to, from, next) => { name: "区域化党建", id: "5fwaefwaefawef588", }, - ], + ], }, { icon: "icon-setting", @@ -321,8 +314,7 @@ router.beforeEach((to, from, next) => { id: "2221321fefefaewfa123", name: "初心互助", url: "visual/heart/index", - children: [ - ], + children: [], }, ]; fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); diff --git a/src/views/modules/customer/feedback/CustomerInfo.vue b/src/views/modules/customer/feedback/CustomerInfo.vue index 3e7bb85b..69bcf816 100644 --- a/src/views/modules/customer/feedback/CustomerInfo.vue +++ b/src/views/modules/customer/feedback/CustomerInfo.vue @@ -135,24 +135,24 @@ export default { uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/function/upload', dataForm: { rootAgencyDTO: { - agencyName: '成都市', - level: 'city', - areaCode: '123456', - province: '四川省', - city: '成都市', - district: 'SN4FHbIZtK', + agencyName: '', + level: '', + areaCode: '', + province: '', + city: '', + district: '', }, customerInfoDTO: { - customerName: '成都市', - organizationLevel: 'city', + customerName: '', + organizationLevel: '', logo: '' }, managers: [ { - realName: '王显章', - gender: '1', - mobile: '18560677960' + realName: '', + gender: '', + mobile: '' } ] } diff --git a/src/views/modules/customer/manage/CustomerInfo.vue b/src/views/modules/customer/manage/CustomerInfo.vue index a0709b4d..cd4d99c2 100644 --- a/src/views/modules/customer/manage/CustomerInfo.vue +++ b/src/views/modules/customer/manage/CustomerInfo.vue @@ -77,7 +77,7 @@ - +
- -
-

{{ $t('home.desc.title') }}

-
    -
  • -
-
- + diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue index 44b697ca..2035625f 100644 --- a/src/views/modules/visual/measure/volunteer.vue +++ b/src/views/modules/visual/measure/volunteer.vue @@ -1,97 +1,114 @@ @@ -129,6 +146,8 @@ export default { // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'], ], value2: '', + selectAgency: '', + propTree: [], visibleLoading: true, pageNo: 1, pageSize: 10, @@ -163,12 +182,13 @@ export default { }, async mounted () { await nextTick(100); - this.getPie() + await this.getAgencyList() + this.getPie(this.$store.state.user.agencyId) // this.initCharts() // this.initCount() await this.getWorkUserInfo() - await this.getMapUnitList() + await this.getMapUnitList(this.$store.state.user.agencyId) }, methods: { initCharts (total, data) { @@ -286,12 +306,12 @@ export default { option && _charts.setOption(option); }, - async getPie () { + async getPie (agencyId) { const url = "/data/report/heart/demand/volunteer/service"; - // let params = { - // agencyId: this.$store.state.user.agencyId, - // }; - const { data, code, msg } = await requestPost(url); + let params = { + agencyId, + }; + const { data, code, msg } = await requestPost(url, params); if (code === 0) { console.log('data-ddd', data) this.vInfo = data @@ -317,7 +337,7 @@ export default { }, { name: '居民数量', value: data.resiServiceTotal, - temStyle: { + itemStyle: { color: 'rgba(250, 193, 38, 1)' } }] @@ -331,6 +351,52 @@ export default { this.$message.error(msg) } }, + async getAgencyList() { + // const url = "/gov/org/customeragency/staffinagencylist"; + const url = '/gov/org/customeragency/agencygridtree' + // let params = { + // agencyId: this.$store.state.user.agencyId, + // }; + const { data, code, msg } = await requestPost(url); + if (code === 0) { + console.log('data-org----o', data) + this.selectAgency = [`${data.agencyId}-${data.level}`] + let arr = [] + arr.push(data) + this.propTree = arr && this.getTreeData(arr) + + } else { + this.$message.error(msg) + } + }, + getTreeData(data){ + if (!Array.isArray(data)) return [] + let arr = data.map(item => { + let _item = {} + if (item.subAgencyList) { + if (item.subAgencyList.length === 0) { + _item = { + label: item.agencyName, + value: item.agencyId + '-' + item.level, + level: item.level, + children: undefined + } + } else _item = { + label: item.agencyName, + value: item.agencyId + '-' + item.level, + level: item.level, + children: this.getTreeData(item.subAgencyList)} + } else { + _item = { + label: item.agencyName, + value: item.agencyId + '-' + item.level, + level: item.level, + } + } + return _item + }) + return arr + }, // 【人员预警】 楼宇预警数量列表 pageSizeChangeHandleNew (val) { this.pageNo = 1; @@ -370,12 +436,13 @@ export default { //获取联建单位分布图 - async getMapUnitList () { + async getMapUnitList (agencyId) { const url = "/epmetuser/volunteer/distribution" // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution" let params = { - customerId: this.$store.state.user.customerId + customerId: this.$store.state.user.customerId, + agencyId } const { data, code, msg } = await requestPost(url, params) @@ -427,7 +494,17 @@ export default { }, - + handleCascader(val) { + console.log('val-vvv', val) + if (val.length > 0) { + const _arr = val[val.length - 1].split('-') + const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' + // this.getServicePie(_arr[0], orgType) + this.getPie(_arr[0]) + this.getMapUnitList(_arr[0]) + } + + }, //加载地图数据 loadMap () { if (this.isfirstInit) { @@ -534,7 +611,10 @@ export default { >