diff --git a/package.json b/package.json index 3deef137..fc76c39c 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "throttle-debounce": "^3.0.1", "v-distpicker": "^1.2.2", "vue": "^2.6.11", + "vue-baidu-map": "^0.21.22", "vue-i18n": "^8.12.0", "vue-quill-editor": "^3.0.6", "vue-router": "^3.0.7", diff --git a/public/index.html b/public/index.html index 6581742c..012587ee 100644 --- a/public/index.html +++ b/public/index.html @@ -8,6 +8,7 @@ + diff --git a/src/assets/img/shuju/measure/jijin.png b/src/assets/img/shuju/measure/jijin.png new file mode 100644 index 00000000..b051139c Binary files /dev/null and b/src/assets/img/shuju/measure/jijin.png differ diff --git a/src/assets/img/shuju/measure/minban.png b/src/assets/img/shuju/measure/minban.png new file mode 100644 index 00000000..735fea83 Binary files /dev/null and b/src/assets/img/shuju/measure/minban.png differ diff --git a/src/assets/img/shuju/measure/other.png b/src/assets/img/shuju/measure/other.png new file mode 100644 index 00000000..d5791f0e Binary files /dev/null and b/src/assets/img/shuju/measure/other.png differ diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue new file mode 100644 index 00000000..0e42a655 --- /dev/null +++ b/src/views/modules/base/organization/organization.vue @@ -0,0 +1,2195 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index 26027e7b..4ca3c39e 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -352,6 +352,18 @@ export default { 4: { color: 'rgba(192, 21, 195, 1)', icon: require('../../../../assets/img/shuju/measure/qita.png') + }, + 5: { + color: '#ee7801', + icon: require('../../../../assets/img/shuju/measure/minban.png') + }, + 6: { + color: '#e70683', + icon: require('../../../../assets/img/shuju/measure/jijin.png') + }, + 7: { + color: '#0189d5', + icon: require('../../../../assets/img/shuju/measure/other.png') } } this.partyItem = data.map((item, index) => { @@ -511,8 +523,14 @@ export default { item.urlIndex = 2 } else if (item.type === '机关直属部门') { item.urlIndex = 3 - } else if (item.type === '其他') { + } 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 } }); @@ -522,7 +540,10 @@ export default { 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/qita.png'),//社会团体 + require('../../../../assets/img/shuju/measure/minban.png'),//民办 + require('../../../../assets/img/shuju/measure/jijin.png'),//基金 + require('../../../../assets/img/shuju/measure/other.png')//其他 ]