From 522d00bca35b3637fca807000d53855eb42b9ff1 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 9 Jun 2022 15:34:28 +0800 Subject: [PATCH] dd --- .../visual/communityParty/community.vue | 76 ++++++++++++++----- .../visual/components/screen-map/index.vue | 6 +- 2 files changed, 59 insertions(+), 23 deletions(-) diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index 79f533a5..9ff87022 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -523,8 +523,38 @@ export default { index: index + 1 } }) - const url = require('../../../../assets/img/shuju/measure/other.png') - this.iconUrlArray = [url] + this.unitTableData.forEach(item => { + + if (item.type === '楼宇党建') { + item.urlIndex = 0 + } else if (item.type === '两新组织') { + item.urlIndex = 1 + } else if (item.type === '区域单位党建') { + item.urlIndex = 2 + } else if (item.type === '机关直属部门') { + item.urlIndex = 3 + } else if (item.type === '社会团体') { + item.urlIndex = 4 + } else if (item.type === '民办非企业单位') { + item.urlIndex = 5 + } else if (item.type === '基金会') { + item.urlIndex = 6 + } else if (item.type === '其他') { + item.urlIndex = 7 + } + }); + // const url = require('../../../../assets/img/shuju/measure/other.png') + // this.iconUrlArray = [url] + this.iconUrlArray = [ + require('../../../../assets/img/shuju/measure/lxdj.png'),//楼宇党建 + require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织 + require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建 + require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门 + require('../../../../assets/img/shuju/measure/other.png'),//社会团体 + require('../../../../assets/img/shuju/measure/minban.png'),//民办 + require('../../../../assets/img/shuju/measure/jijin.png'),//基金 + require('../../../../assets/img/shuju/measure/qita.png')//其他 + ] this.showMap = true //第一次加载完置为false @@ -655,11 +685,11 @@ export default { // this.cateInfo = data const colorItem = { 0: { - color: 'rgba(250, 32, 10, 1)', + color: '#FA200A', icon: require('../../../../assets/img/shuju/measure/lxdj.png') }, 1: { - color: 'rgba(251, 177, 4, 1)', + color: '#FBB104', icon: require('../../../../assets/img/shuju/measure/lxzz.png') }, 2: { @@ -667,12 +697,12 @@ export default { icon: require('../../../../assets/img/shuju/measure/qydw.png') }, 3: { - color: 'rgba(65, 181, 104, 1)', + color: '#41B568', icon: require('../../../../assets/img/shuju/measure/jgzs.png') }, 4: { - color: 'rgba(192, 21, 195, 1)', - icon: require('../../../../assets/img/shuju/measure/qita.png') + color: '#50C2ED', + icon: require('../../../../assets/img/shuju/measure/other.png') }, 5: { color: '#ee7801', @@ -684,17 +714,21 @@ export default { }, 7: { color: '#0189d5', - icon: require('../../../../assets/img/shuju/measure/other.png') + + icon: require('../../../../assets/img/shuju/measure/qita.png') } } this.partyItem = data.map((item, index) => { return { ...item, - ...colorItem[index], + itemStyle: { + ...colorItem[item.code] + }, name: item.label, isClick: false } }) + console.log('this.partyItem----', this.partyItem) this.totalCount = 0 data.forEach(item => { this.totalCount += Number(item.value) @@ -869,18 +903,18 @@ export default { item.urlIndex = 7 } }); - const url = require('../../../../assets/img/shuju/measure/other.png') - // this.iconUrlArray = [ - // require('../../../../assets/img/shuju/measure/lxdj.png'),//楼宇党建 - // require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织 - // require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建 - // require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门 - // require('../../../../assets/img/shuju/measure/qita.png'),//社会团体 - // require('../../../../assets/img/shuju/measure/minban.png'),//民办 - // require('../../../../assets/img/shuju/measure/jijin.png'),//基金 - // require('../../../../assets/img/shuju/measure/other.png')//其他 - // ] - this.iconUrlArray = [url, url, url, url, url, url, url, url] + // const url = require('../../../../assets/img/shuju/measure/other.png') + this.iconUrlArray = [ + require('../../../../assets/img/shuju/measure/lxdj.png'),//楼宇党建 + require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织 + require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建 + require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门 + require('../../../../assets/img/shuju/measure/qita.png'),//社会团体 + require('../../../../assets/img/shuju/measure/minban.png'),//民办 + require('../../../../assets/img/shuju/measure/jijin.png'),//基金 + require('../../../../assets/img/shuju/measure/other.png')//其他 + ] + // this.iconUrlArray = [url, url, url, url, url, url, url, url] //第一次加载完置为false diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index af528b54..1ccb4d13 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -372,7 +372,7 @@ const vueGis = { id: oneIcon.id_ } }); - // console.log('oneIcon----', oneIcon) + console.log('oneIcon----ddd', oneIcon) let polyIconStyle = new Style({ image: new Icon({ // anchor: [0.5, 0.5], @@ -408,12 +408,14 @@ const vueGis = { info: { ...oneIcon } } }); + console.log('oneIcon----', oneIcon) let iconStyle = new Style({ image: new Icon({ // anchor: [0.5, 0.5], // imgSize: [32, 32], // scale: 0.5, - src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] + // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0] + src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index &&this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0] }), // text: createTextStyle(oneIcon) });