Merge branch 'test'

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",

public/index.html

@@ -8,6 +8,7 @@
 
   <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico" />
   <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=LWBBZ-TIGC3-VFP3L-YNMWH-FJB7T-JFBLO"></script>
+  <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77"></script>
   <!-- f2图表 -->
   <!-- <script src="https://gw.alipayobjects.com/os/lib/antv/f2/3.8.1/dist/f2.min.js"></script> -->
 

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')//其他
         ]