7 hónapja · 7473a3c92e
--- a/src/components/oa-weather/index.vue
+++ b/src/components/oa-weather/index.vue
@@ -10,7 +10,7 @@
 
				       </view>
			
 
				       <view class="weather-center">
			
 
				         <view class="weather-center-temperature">{{ state.weatherData[0].today.low + "/" + state.weatherData[0].today.high || "0℃" }}</view>
			
 
				-        <image class="weather-center-image" :src="`${'/static/icons/white/' + state.weatherData[0].code.now + '.png'}`" mode="heightFix"></image>
			
 
				+        <image class="weather-center-image" :src="`${'http://172.16.120.165:9300/statics/icons/white/' + state.weatherData[0].code.now + '.png'}`" mode="heightFix"></image>
			
 
				       </view>
			
 
				     </view>
			
 
				   </view>
			
--- a/src/config.js
+++ b/src/config.js
@@ -20,7 +20,7 @@ export default {
 
				     // 应用版本
			
 
				     version: uni.getSystemInfoSync().appWgtVersion || uni.getSystemInfoSync().appVersion,
			
 
				     // 应用logo
			
 
				-    logo: "/static/logo.png",
			
 
				+    logo: "http://172.16.120.165:9300/statics/logo.png",
			
 
				     // 官网邮箱
			
 
				     email: "admin@chinausky.com",
			
 
				     // 服务热线
			
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -199,6 +199,9 @@
 
				             "urlCheck": false,
			
 
				             "checkSiteMap": false
			
 
				         },
			
 
				+        "optimization" : {
			
 
				+            "subPackages" : true
			
 
				+        },
			
 
				         "usingComponents": true
			
 
				     },
			
 
				     "mp-alipay": {
			
--- a/src/pages/business/common/projectMange/mall/components/mall-list.vue
+++ b/src/pages/business/common/projectMange/mall/components/mall-list.vue
@@ -10,7 +10,7 @@
 
				           :key="item.id"
			
 
				           @click="handelClickItem(item)"
			
 
				         >
			
 
				-          <view class="box-list-item-department-pic" v-if="item.children && item.children.length >= 0"><image src="@/static/department-icon.png"></image></view>
			
 
				+          <view class="box-list-item-department-pic" v-if="item.children && item.children.length >= 0"><image src="http://172.16.120.165:9300/statics/department-icon.png"></image></view>
			
 
				           <view class="box-list-item-user-pic flex" v-else>
			
 
				             <u-checkbox class="box-list-item-user-pic-checkbox mr9" :name="item.id"> </u-checkbox>
			
 
				             <u-avatar
			
--- a/src/pages/business/fireIot/facilitiesGather/mapGather.vue
+++ b/src/pages/business/fireIot/facilitiesGather/mapGather.vue
@@ -2,7 +2,7 @@
 
				   <web-view
			
 
				     id="amapView"
			
 
				     ref="amapView"
			
 
				-    src="/static/amap/mapGather.html"
			
 
				+    src="/http://172.16.120.165:9300/statics/amap/mapGather.html"
			
 
				     bindmessage="receiveMessage"
			
 
				     :webview-styles="{
			
 
				       height: proxy.$settingStore.webViewHeight,
			
--- a/src/pages/business/fireIot/facilitiesManage/mapFacilitiesView.vue
+++ b/src/pages/business/fireIot/facilitiesManage/mapFacilitiesView.vue
@@ -2,7 +2,7 @@
 
				   <web-view
			
 
				     id="amapView"
			
 
				     ref="amapView"
			
 
				-    src="/static/amap/mapFacilitiesView.html"
			
 
				+    src="/http://172.16.120.165:9300/statics/amap/mapFacilitiesView.html"
			
 
				     bindmessage="receiveMessage"
			
 
				     :webview-styles="{
			
 
				       height: proxy.$settingStore.webViewHeight,
			
--- a/src/pages/business/mhxf/coordination/index.vue
+++ b/src/pages/business/mhxf/coordination/index.vue
@@ -1,7 +1,7 @@
 
				 <template>
			
 
				   <web-view
			
 
				     ref="amapView"
			
 
				-    src="/static/amap/coordination.html"
			
 
				+    src="/http://172.16.120.165:9300/statics/amap/coordination.html"
			
 
				     bindmessage="receiveMessage"
			
 
				     :webview-styles="{
			
 
				       height: proxy.$settingStore.webViewHeight,
			
--- a/src/pages/business/zhaf/xunJian/plan/components/content.vue
+++ b/src/pages/business/zhaf/xunJian/plan/components/content.vue
@@ -124,7 +124,7 @@ const title = ref("");
 
				 const content = ref("");
			
 
				 const audioUrl = ref("");
			
 
				 function confirm() {
			
 
				-  audioUrl.value = "/static/mp3/XJWC.mp3";
			
 
				+  audioUrl.value = "http://172.16.120.165:9300/statics/mp3/XJWC.mp3";
			
 
				   show.value = false;
			
 
				   uni.$emit("planSelect"); //执行页面中的自定义方法
			
 
				   proxy.$tab.navigateBack(3); //返回到需要执行方法的页面
			
--- a/src/pages/mine/about/index.vue
+++ b/src/pages/mine/about/index.vue
@@ -10,7 +10,7 @@
 
				 
			
 
				     <view class="oa-header-section text-center">
			
 
				       <image style="width: 130rpx; height: 130rpx" mode="heightFix" :src="useStore.loginLogo" v-if="useStore.loginLogo" />
			
 
				-      <image style="width: 130rpx; height: 130rpx" mode="heightFix" src="@/static/logo200.png" v-else />
			
 
				+      <image style="width: 130rpx; height: 130rpx" mode="heightFix" src="http://172.16.120.165:9300/statics/logo200.png" v-else />
			
 
				       <uni-title type="h2" :title="useStore.loginTitle"></uni-title>
			
 
				     </view>
			
 
				 
			
@@ -116,4 +116,4 @@ onShow(() => {
 
				     }
			
 
				   }
			
 
				 }
			
 
				-</style>
			
 
				+</style>
			
--- a/src/static/amap/coordination.html
+++ b/src/static/amap/coordination.html
@@ -1,580 +0,0 @@
 
				-<!doctype html>
			
 
				-<html lang="en">
			
 
				-
			
 
				-<head>
			
 
				-    <meta charset="utf-8">
			
 
				-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				-    <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
			
 
				-    <title>协同作战地图</title>
			
 
				-    <link rel="stylesheet" href="https://a.amap.com/jsapi_demos/static/demo-center/css/demo-center.css" />
			
 
				-    <link rel="stylesheet" type="text/css" href="./js/M_select/M_select.css">
			
 
				-    <link rel="stylesheet" type="text/css" href="./js/notification/index.css">
			
 
				-    <style>
			
 
				-        html,
			
 
				-        body,
			
 
				-        #mapF {
			
 
				-            height: 100%;
			
 
				-            width: 100%;
			
 
				-        }
			
 
				-    </style>
			
 
				-</head>
			
 
				-
			
 
				-<body>
			
 
				-    <div id="mapF" class="map" tabindex="0"></div>
			
 
				-
			
 
				-    <div style="padding: 0 10px;">
			
 
				-        <div style="position: absolute;top: 0;display:inline-block;width: 50%;padding-top: 10px;">
			
 
				-            <select id="selectId" class="select02">
			
 
				-            </select>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-
			
 
				-    <div id="notification" style="display: none;">
			
 
				-        <div class="mask"> </div>
			
 
				-        <div class="content"> </div>
			
 
				-    </div>
			
 
				-
			
 
				-    <script src="https://a.amap.com/jsapi_demos/static/china.js"></script>
			
 
				-    <script type="text/javascript">
			
 
				-        window._AMapSecurityConfig = {
			
 
				-            securityJsCode: 'ce0e44758ad6b69607e23bf8e6a6ac11',
			
 
				-        }
			
 
				-    </script>
			
 
				-    <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=14aefebea926bb958032d5daf836fadf">
			
 
				-    </script>
			
 
				-
			
 
				-
			
 
				-    <!-- <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=8e266e1ac2ad2383c7773ff504ac248f">
			
 
				-    </script> -->
			
 
				-    <!-- <script src="https://webapi.amap.com/loader.js"></script> -->
			
 
				-    <script type="text/javascript" src="https://webapi.amap.com/ui/1.1/main.js"></script>
			
 
				-
			
 
				-    <script type="text/javascript" src="./js/jquery-2.2.1.min.js"></script>
			
 
				-    <script src="./js/M_select/M_select.js"></script>
			
 
				-    <script type="text/javascript" src="http://172.16.120.165:13200/assets/map-data.js.js"></script>
			
 
				-    <script type="text/javascript" src="./js/map-text.js"></script>
			
 
				-
			
 
				-    <script type="text/javascript">
			
 
				-        var checkedArray = {
			
 
				-                checkedData: 1,
			
 
				-                checkedList: [{
			
 
				-                    value: 1,
			
 
				-                    label: "消防站"
			
 
				-                }, {
			
 
				-                    value: 2,
			
 
				-                    label: "消防车"
			
 
				-                }, {
			
 
				-                    value: 3,
			
 
				-                    label: "监控"
			
 
				-                }, {
			
 
				-                    value: 4,
			
 
				-                    label: "重点单位"
			
 
				-                }, {
			
 
				-                    value: 5,
			
 
				-                    label: "消火栓/天然水源"
			
 
				-                }, ],
			
 
				-            } //类型筛选
			
 
				-
			
 
				-        $.each(checkedArray.checkedList, function(i, item) {
			
 
				-            $("#selectId").append(`<option value="${item.value}">${item.label}</option>`)
			
 
				-        })
			
 
				-        $(function() {
			
 
				-            $(".select02").M_select({
			
 
				-                // 手动添加下拉款图片（以html页面为起始位置写路径）
			
 
				-                "Img": "./js/M_select/up4.png",
			
 
				-                "Img2": "./js/M_select/down4.png",
			
 
				-                "radius": "15px",
			
 
				-                "Title": "--请选择--",
			
 
				-                "inputName": "selected_value",
			
 
				-                // 默认选中的值（参数值写需要选中的select的value值）
			
 
				-                "selected": "1",
			
 
				-                Succee: function() {
			
 
				-                    checkedArray.checkedData = parseInt($(".inputHidden").val())
			
 
				-                    mapCluster();
			
 
				-                }
			
 
				-            });
			
 
				-        });
			
 
				-
			
 
				-        //点击遮罩层关闭
			
 
				-        $('#notification .mask').on('click', function(e) {
			
 
				-            $('#notification').css('display', 'none')
			
 
				-
			
 
				-            $('#notification .content #xxxx').remove()
			
 
				-        })
			
 
				-    </script>
			
 
				-
			
 
				-    <script type="text/javascript">
			
 
				-        var cluster, markers = [];
			
 
				-        var map = [];
			
 
				-        var mapPolList = [];
			
 
				-        var colorList = [
			
 
				-            ['#99e', "#F33"],
			
 
				-            ['#ee6', "#c38"],
			
 
				-            ['#c38', "#F33"],
			
 
				-            ['#6E7', '#F33'],
			
 
				-            ['#6A7', "#F33"],
			
 
				-            ['#EF7', "#F33"],
			
 
				-            ['#AF7', "#F33"],
			
 
				-            ['#BAC', "#F33"],
			
 
				-            ['#BEF', "#F33"],
			
 
				-            ['#BBB', "#F33"],
			
 
				-            ['#EFA', "#F33"],
			
 
				-            ['#FE6', "#F33"],
			
 
				-            ['#7F6', "#F33"],
			
 
				-            ['#7dc', "#F33"],
			
 
				-        ];
			
 
				-        var colorIndList = [-1, 7, 21, 26, 31, 37, 46, 52, 57, 66, 68, 71, 74, 100]
			
 
				-
			
 
				-        var polygon1 = null //选中地图区域数据存储
			
 
				-        var textList = [] //地图文字数据存储
			
 
				-
			
 
				-        var streetTown = "" //街镇信息存储
			
 
				-        var streetTownList = [{
			
 
				-            value: "",
			
 
				-            label: "全区"
			
 
				-        }, {
			
 
				-            value: "华漕镇",
			
 
				-            label: "华漕镇"
			
 
				-        }, {
			
 
				-            value: "虹桥镇",
			
 
				-            label: "虹桥镇"
			
 
				-        }, {
			
 
				-            value: "梅陇镇",
			
 
				-            label: "梅陇镇"
			
 
				-        }, {
			
 
				-            value: "七宝镇",
			
 
				-            label: "七宝镇"
			
 
				-        }, {
			
 
				-            value: "颛桥镇",
			
 
				-            label: "颛桥镇"
			
 
				-        }, {
			
 
				-            value: "马桥镇",
			
 
				-            label: "马桥镇"
			
 
				-        }, {
			
 
				-            value: "吴泾镇",
			
 
				-            label: "吴泾镇"
			
 
				-        }, {
			
 
				-            value: "浦江镇",
			
 
				-            label: "浦江镇"
			
 
				-        }, {
			
 
				-            value: "新虹街道",
			
 
				-            label: "新虹街道"
			
 
				-        }, {
			
 
				-            value: "古美路街道",
			
 
				-            label: "古美路街道"
			
 
				-        }, {
			
 
				-            value: "江川路街道",
			
 
				-            label: "江川路街道"
			
 
				-        }, {
			
 
				-            value: "浦锦街道",
			
 
				-            label: "浦锦街道"
			
 
				-        }, {
			
 
				-            value: "莘庄镇",
			
 
				-            label: "莘庄镇"
			
 
				-        }, ]
			
 
				-
			
 
				-        var tankuangXY = {} //撒点弹框坐标
			
 
				-        var arrayList = {} //撒点弹框数据存储
			
 
				-
			
 
				-
			
 
				-        function initMap() {
			
 
				-            map = new AMap.Map("mapF", {
			
 
				-                // mapStyle: 'amap://styles/d0ddc09bd7cbd7331a8e8fa691e5b0da', //设置地图的显示样式
			
 
				-                resizeEnable: true,
			
 
				-                zoom: 13,
			
 
				-                zooms: [3, 16],
			
 
				-            });
			
 
				-
			
 
				-
			
 
				-            AMap.plugin(["AMap.Geolocation"], () => {
			
 
				-                var geolocation = new AMap.Geolocation({
			
 
				-                    showButton: false, //是否显示定位按钮
			
 
				-                    buttonPosition: "RT", //定位按钮的位置
			
 
				-                    /* LT LB RT RB */
			
 
				-                    buttonOffset: new AMap.Pixel(10, 20), //定位按钮距离对应角落的距离
			
 
				-                    zoomToAccuracy: false, //定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
			
 
				-                    showMarker: true, //是否显示定位点
			
 
				-                    markerOptions: {
			
 
				-                        //自定义定位点样式，同Marker的Options
			
 
				-                        offset: new AMap.Pixel(-18, -36),
			
 
				-                        content: '<img src="https://a.amap.com/jsapi_demos/static/resource/img/user.png" style="width:36px;height:36px"/>',
			
 
				-                    },
			
 
				-                    convert: true,
			
 
				-                    showCircle: true, //是否显示定位精度圈
			
 
				-                    circleOptions: {
			
 
				-                        //定位精度圈的样式
			
 
				-                        strokeColor: "#0093FF",
			
 
				-                        noSelect: true,
			
 
				-                        strokeOpacity: 0.5,
			
 
				-                        strokeWeight: 1,
			
 
				-                        fillColor: "#02B0FF",
			
 
				-                        fillOpacity: 0.25,
			
 
				-                    },
			
 
				-                });
			
 
				-                map.addControl(geolocation);
			
 
				-                // geolocation.getCurrentPosition();
			
 
				-            });
			
 
				-
			
 
				-            mapPolList = mapData.map((el, ind) => {
			
 
				-                // console.log(val)
			
 
				-
			
 
				-                let color = colorList[0];
			
 
				-
			
 
				-                let polygon = new AMap.Polygon({
			
 
				-                    map: this.map,
			
 
				-                    zIndex: 2,
			
 
				-                    fillOpacity: 0.5,
			
 
				-                    path: el.value,
			
 
				-                    fillColor: color[0],
			
 
				-                    strokeColor: color[1],
			
 
				-                });
			
 
				-
			
 
				-                //插入覆盖物自定义数据
			
 
				-                polygon.setExtData(el);
			
 
				-
			
 
				-                //鼠标移入覆盖物事件
			
 
				-                polygon.on("mouseover", () => {
			
 
				-                    polygon.setOptions({
			
 
				-                        fillOpacity: 0.4,
			
 
				-                        fillColor: color[1],
			
 
				-                    });
			
 
				-                });
			
 
				-
			
 
				-                //鼠标移出覆盖物事件
			
 
				-                polygon.on("mouseout", (val) => {
			
 
				-                    if (streetTown) {
			
 
				-                        if (streetTown == polygon.getExtData().name) {
			
 
				-                            polygon.setOptions({
			
 
				-                                fillOpacity: 0.4,
			
 
				-                                fillColor: color[1],
			
 
				-                            });
			
 
				-                        } else {
			
 
				-                            polygon.setOptions({
			
 
				-                                fillOpacity: 0.5,
			
 
				-                                fillColor: color[0],
			
 
				-                            });
			
 
				-                        }
			
 
				-                    } else {
			
 
				-                        polygon.setOptions({
			
 
				-                            fillOpacity: 0.5,
			
 
				-                            fillColor: color[0],
			
 
				-                        });
			
 
				-                    }
			
 
				-                });
			
 
				-
			
 
				-                polygon.on("click", (handler, context) => {
			
 
				-                    if (polygon1) {
			
 
				-                        //修改上一次选中样式
			
 
				-                        polygon1.setOptions({
			
 
				-                            fillOpacity: 0.5,
			
 
				-                            fillColor: color[0],
			
 
				-                        });
			
 
				-                    }
			
 
				-                    //存储点击区域元素
			
 
				-                    polygon1 = polygon;
			
 
				-
			
 
				-                    if (streetTown === polygon.getExtData().name) {
			
 
				-                        //修改全局街镇数据
			
 
				-                        streetTown = "";
			
 
				-
			
 
				-                        //修改上一次选中样式
			
 
				-                        polygon1.setOptions({
			
 
				-                            fillOpacity: 0.5,
			
 
				-                            fillColor: color[0],
			
 
				-                        });
			
 
				-                        polygon1 = null;
			
 
				-                    } else {
			
 
				-                        //修改全局街镇数据
			
 
				-                        streetTown = polygon.getExtData().name;
			
 
				-
			
 
				-                        //修改上一次选中样式
			
 
				-                        polygon1.setOptions({
			
 
				-                            fillOpacity: 0.4,
			
 
				-                            fillColor: color[1],
			
 
				-                        });
			
 
				-                    }
			
 
				-
			
 
				-                    mapCluster()
			
 
				-
			
 
				-                    //销毁点位信息弹窗
			
 
				-                    map.clearInfoWindow();
			
 
				-                });
			
 
				-            })
			
 
				-
			
 
				-            mapText.map((val, ind) => {
			
 
				-                let text = new AMap.Text({
			
 
				-                    zIndex: 1,
			
 
				-                    style: {
			
 
				-                        color: "black",
			
 
				-                        backgroundColor: "transparent",
			
 
				-                        border: "none",
			
 
				-                    },
			
 
				-                    position: val.position,
			
 
				-                    text: val.name,
			
 
				-                    angle: val.angle,
			
 
				-                });
			
 
				-
			
 
				-                text.setMap(map);
			
 
				-
			
 
				-                textList.push(text);
			
 
				-            });
			
 
				-
			
 
				-            map.setFitView();
			
 
				-
			
 
				-            var logMapinfo = function() {
			
 
				-                var zoom = map.getZoom(); //获取当前地图级别
			
 
				-
			
 
				-                var dom = document.getElementsByClassName("amap-overlay-text-container");
			
 
				-                for (let i = 0; i <= 13; i++) {
			
 
				-                    if (zoom > 12) {
			
 
				-                        dom[i].style.cssText = "display: block;font-size:13px !important;background: transparent;border: 0px;";
			
 
				-                    } else if (zoom > 10.5 || zoom > 11) {
			
 
				-                        dom[i].style.cssText = "display: block;font-size:11px !important;background: transparent;border: 0px;";
			
 
				-                    } else if (zoom < 10) {
			
 
				-                        dom[i].style.cssText = "display:none !important;font-size:11px;background: transparent;border: 0px;";
			
 
				-                    }
			
 
				-                }
			
 
				-            };
			
 
				-
			
 
				-            map.on("zoomstart", logMapinfo);
			
 
				-        }
			
 
				-
			
 
				-
			
 
				-        /**
			
 
				-         * @聚合撒点
			
 
				-         * @param {数据list} data
			
 
				-         * @param {页面类型} pageType
			
 
				-         * @param {类型} type
			
 
				-         */
			
 
				-        function initMarkers(data, pageType, type) {
			
 
				-            var _this = this;
			
 
				-
			
 
				-            var tag = 1; //1.自定义图标 2.完全自定义 3.默认
			
 
				-            var style = ""; //地图最大化小图标
			
 
				-            var points = []; //地图撒点处理数据存储
			
 
				-
			
 
				-            if (pageType === "警情综合处置") {
			
 
				-                data.forEach((val) => {
			
 
				-                    points.push({
			
 
				-                        lnglat: [val.longitude, val.latitude],
			
 
				-                        array: val
			
 
				-                    });
			
 
				-                });
			
 
				-
			
 
				-                if (type) {
			
 
				-                    if (type == 1) {
			
 
				-                        //消防站
			
 
				-                        style = `background: url('./img/map1.png') no-repeat; height: 53px; width: 47px; border: 0px !important; border-radius: 0px !important; box-shadow: 0 0 0 0 !important;`;
			
 
				-                    } else if (type == 2) {
			
 
				-                        //消防车
			
 
				-                        style = `background: url('./img/map2.png') no-repeat; height: 53px; width: 47px; border: 0px !important; border-radius: 0px !important; box-shadow: 0 0 0 0 !important;`;
			
 
				-                    } else if (type == 3) {
			
 
				-                        //监控
			
 
				-                        style = `background: url('./img/map3.png') no-repeat; height: 53px; width: 47px; border: 0px !important; border-radius: 0px !important; box-shadow: 0 0 0 0 !important;`;
			
 
				-                    } else if (type == 4) {
			
 
				-                        //重点单位
			
 
				-                        style = `background: url('./img/map4.png') no-repeat; height: 53px; width: 47px; border: 0px !important; border-radius: 0px !important; box-shadow: 0 0 0 0 !important;`;
			
 
				-                    } else if (type == 5) {
			
 
				-                        //消火栓/天然水源
			
 
				-                        style = `background: url('./img/map5.png') no-repeat; height: 53px; width: 47px; border: 0px !important; border-radius: 0px !important; box-shadow: 0 0 0 0 !important;`;
			
 
				-                    } else if (type == 6) {
			
 
				-                        //实时告警
			
 
				-                        style = `background: url('./img/map6.png') no-repeat; height: 53px; width: 47px; border: 0px !important; border-radius: 0px !important; box-shadow: 0 0 0 0 !important;`;
			
 
				-                    }
			
 
				-                } else {
			
 
				-                    style = `background-color: hsla(180, 100%, 50%, 0.5); height: 24px; width: 24px; border: 1px solid hsl(180, 100%, 40%); border-radius: 12px; box-shadow: hsl(180, 100%, 50%) 0px 0px 1px;`;
			
 
				-                }
			
 
				-            }
			
 
				-
			
 
				-            var _renderMarker = function(context) {
			
 
				-                var content = `<div style="${style}"></div>`;
			
 
				-                var offset = new AMap.Pixel(-9, -9);
			
 
				-                context.marker.setContent(content);
			
 
				-                context.marker.setOffset(offset);
			
 
				-
			
 
				-                // 给每个点坐标绑定鼠标经过事件，这里是实现点击功能的重点
			
 
				-                context.marker.on("mouseover", (e) => {
			
 
				-                    tankuangXY = {
			
 
				-                        x: e.pixel.x,
			
 
				-                        y: e.pixel.y
			
 
				-                    };
			
 
				-
			
 
				-                    if (pageType === "警情综合处置") {
			
 
				-                        if (type !== 6) {
			
 
				-                            //   console.log(context.data[0].array);
			
 
				-                        }
			
 
				-                    }
			
 
				-                });
			
 
				-
			
 
				-                context.marker.on("click", (e) => {
			
 
				-                    if (pageType === "警情综合处置") {
			
 
				-                        if (type == 1) {
			
 
				-
			
 
				-                            $("#notification .content").append(
			
 
				-                                `
			
 
				-                                <div id="xxxx">
			
 
				-                                    <div class="title">${context.data[0].array.stationName}</div>
			
 
				-                                    <div class="borderBottom"></div>
			
 
				-                                    <div class="ctn">
			
 
				-                                        <div style="text-align: center;">经度：${context.data[0].array.longitude}</div>
			
 
				-                                        <div style="text-align: center;">纬度：${context.data[0].array.latitude}</div>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-                                `)
			
 
				-
			
 
				-                            $('#notification').css('display', 'block')
			
 
				-
			
 
				-                        } else if (type == 4) {
			
 
				-                            $("#notification .content").append(
			
 
				-                                `
			
 
				-                                <div id="xxxx">
			
 
				-                                    <div class="title">${context.data[0].array.companyName}</div>
			
 
				-                                    <div class="borderBottom"></div>
			
 
				-                                    <div class="ctn">
			
 
				-                                        <div style="width:100%">地址：${context.data[0].array.address}</div>
			
 
				-                                        <div style="width:100%">单位性质：${context.data[0].array.companyTypeName}</div>
			
 
				-                                    </div>
			
 
				-                                    <div class="ctn">
			
 
				-                                        <div >所属街镇：${context.data[0].array.streetTown}</div>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-                                `)
			
 
				-
			
 
				-                            $('#notification').css('display', 'block')
			
 
				-                        } else if (type == 5) {
			
 
				-                            $("#notification .content").append(
			
 
				-                                `
			
 
				-                                <div id="xxxx">
			
 
				-                                    <div class="title">${context.data[0].array.waterName}</div>
			
 
				-                                    <div class="borderBottom"></div>
			
 
				-                                    <div class="ctn">
			
 
				-                                        <div style="width:100%">水源所在位置：${context.data[0].array.waterAddress}</div>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-                                `)
			
 
				-
			
 
				-                            $('#notification').css('display', 'block')
			
 
				-                        } else if (type == 6) {
			
 
				-                            //实时告警
			
 
				-                            console.log(context.data[0].array);
			
 
				-                        }
			
 
				-
			
 
				-                        console.log(context.data[0].array);
			
 
				-                    }
			
 
				-                });
			
 
				-            };
			
 
				-
			
 
				-            if (cluster) {
			
 
				-                cluster.setMap(null);
			
 
				-            }
			
 
				-            if (tag == 2) {
			
 
				-                //完全自定义
			
 
				-                this.map.plugin(["AMap.MarkerClusterer"], function() {
			
 
				-                    cluster = new AMap.MarkerCluster(map, points, {
			
 
				-                        gridSize: 80, // 设置网格像素大小
			
 
				-                        renderClusterMarker: function(context) {
			
 
				-                            var factor = Math.pow(context.count / points.length, 1 / 18);
			
 
				-                            var div = document.createElement("div");
			
 
				-                            var Hue = 180 - factor * 180;
			
 
				-                            var bgColor = "hsla(" + Hue + ",100%,40%,0.7)";
			
 
				-                            var fontColor = "hsla(" + Hue + ",100%,90%,1)";
			
 
				-                            var borderColor = "hsla(" + Hue + ",100%,40%,1)";
			
 
				-                            var shadowColor = "hsla(" + Hue + ",100%,90%,1)";
			
 
				-                            div.style.backgroundColor = bgColor;
			
 
				-                            var size = Math.round(30 + Math.pow(context.count / points.length, 1 / 5) * 20);
			
 
				-                            div.style.width = div.style.height = size + "px";
			
 
				-                            div.style.border = "solid 1px " + borderColor;
			
 
				-                            div.style.borderRadius = size / 2 + "px";
			
 
				-                            div.style.boxShadow = "0 0 5px " + shadowColor;
			
 
				-                            div.innerHTML = context.count;
			
 
				-                            div.style.lineHeight = size + "px";
			
 
				-                            div.style.color = fontColor;
			
 
				-                            div.style.fontSize = "14px";
			
 
				-                            div.style.textAlign = "center";
			
 
				-                            context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2));
			
 
				-                            context.marker.setContent(div);
			
 
				-                        }, // 自定义聚合点样式
			
 
				-                        renderMarker: _renderMarker, // 自定义非聚合点样式
			
 
				-                    });
			
 
				-                });
			
 
				-            } else if (tag == 1) {
			
 
				-                //自定义图标
			
 
				-                var sts = [{
			
 
				-                    url: "https://a.amap.com/jsapi_demos/static/images/blue.png",
			
 
				-                    size: new AMap.Size(32, 32),
			
 
				-                    offset: new AMap.Pixel(-16, -16),
			
 
				-                }, {
			
 
				-                    url: "https://a.amap.com/jsapi_demos/static/images/green.png",
			
 
				-                    size: new AMap.Size(32, 32),
			
 
				-                    offset: new AMap.Pixel(-16, -16),
			
 
				-                }, {
			
 
				-                    url: "https://a.amap.com/jsapi_demos/static/images/orange.png",
			
 
				-                    size: new AMap.Size(36, 36),
			
 
				-                    offset: new AMap.Pixel(-18, -18),
			
 
				-                }, {
			
 
				-                    url: "https://a.amap.com/jsapi_demos/static/images/red.png",
			
 
				-                    size: new AMap.Size(48, 48),
			
 
				-                    offset: new AMap.Pixel(-24, -24),
			
 
				-                }, {
			
 
				-                    url: "https://a.amap.com/jsapi_demos/static/images/darkRed.png",
			
 
				-                    size: new AMap.Size(48, 48),
			
 
				-                    offset: new AMap.Pixel(-24, -24),
			
 
				-                }, ];
			
 
				-
			
 
				-                map.plugin(["AMap.MarkerCluster"], function() {
			
 
				-                    cluster = new AMap.MarkerCluster(map, points, {
			
 
				-                        styles: sts,
			
 
				-                        gridSize: 80,
			
 
				-                        renderMarker: _renderMarker, // 自定义非聚合点样式
			
 
				-                    });
			
 
				-                });
			
 
				-            } else {
			
 
				-                //默认样式
			
 
				-                map.plugin(["AMap.MarkerCluster"], function() {
			
 
				-                    cluster = new AMap.MarkerCluster(map, points, {
			
 
				-                        gridSize: 80
			
 
				-                    });
			
 
				-                });
			
 
				-            }
			
 
				-        }
			
 
				-
			
 
				-
			
 
				-        /**
			
 
				-         * @高德地图聚合撒点
			
 
				-         */
			
 
				-        function mapCluster() {
			
 
				-            var label = "";
			
 
				-            checkedArray.checkedList.forEach((val) => {
			
 
				-                if (val.value == checkedArray.checkedData) {
			
 
				-                    label = val.label;
			
 
				-                }
			
 
				-            });
			
 
				-
			
 
				-
			
 
				-            $.get('http://xf.usky.cn:13203/prod-api/service-fire/demPoliceInfo/synthesizePoliceSituationScatterer', {
			
 
				-                    streetTown: streetTown,
			
 
				-                    scattererType: label
			
 
				-                }, function(res) {
			
 
				-                    console.log(res)
			
 
				-
			
 
				-                    if (res.data.length > 0) {
			
 
				-                        initMarkers(res.data, "警情综合处置", checkedArray.checkedData);
			
 
				-                    } else {
			
 
				-                        initMarkers([], "警情综合处置", checkedArray.checkedData);
			
 
				-                    }
			
 
				-                })
			
 
				-                // 
			
 
				-        }
			
 
				-
			
 
				-        initMap();
			
 
				-        mapCluster();
			
 
				-    </script>
			
 
				-    <style>
			
 
				-        .amap-logo,
			
 
				-        .amap-copyright {
			
 
				-            display: none !important;
			
 
				-        }
			
 
				-    </style>
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/src/static/amap/css/common.css
+++ b/src/static/amap/css/common.css
@@ -1,90 +0,0 @@
 
				-.amap-logo,
			
 
				-.amap-copyright {
			
 
				-  display: none !important;
			
 
				-}
			
 
				-
			
 
				-.amap-marker-label {
			
 
				-  position: absolute;
			
 
				-  padding: 0.75rem 1.25rem;
			
 
				-  border-radius: 6px;
			
 
				-  background-color: white;
			
 
				-  border-width: 0;
			
 
				-  box-shadow: 0px 0px 5px 0px rgba(141, 141, 141, 0.4);
			
 
				-  display: none;
			
 
				-}
			
 
				-
			
 
				-.amap-marker-labe .infoLabel {
			
 
				-  width: 100%;
			
 
				-  text-align: center;
			
 
				-  white-space: nowrap;
			
 
				-  overflow: hidden;
			
 
				-  text-overflow: ellipsis;
			
 
				-}
			
 
				-
			
 
				-/* 数字角标 */
			
 
				-.badge {
			
 
				-  position: absolute;
			
 
				-  right: 5px;
			
 
				-  top: -10px;
			
 
				-  padding: 0 6px;
			
 
				-  background-color: #f56c6c;
			
 
				-  color: #fff;
			
 
				-  border-radius: 10px;
			
 
				-  font-size: 12px;
			
 
				-}
			
 
				-
			
 
				-/* 抽屉样式 */
			
 
				-.drawer {
			
 
				-  position: fixed;
			
 
				-  bottom: 0;
			
 
				-  left: 0;
			
 
				-  width: 100%;
			
 
				-  height: 0rem;
			
 
				-  background-color: #fff;
			
 
				-  overflow: hidden;
			
 
				-  transition: height 0.4s ease-in-out;
			
 
				-  border-radius: 10px 10px 0 0;
			
 
				-  box-shadow: 0px 0px 5px 0px rgba(141, 141, 141, 0.4);
			
 
				-}
			
 
				-
			
 
				-.drawer.open {
			
 
				-  height: 23rem;
			
 
				-}
			
 
				-
			
 
				-.drawer .header {
			
 
				-  display: flex;
			
 
				-  height: 35px;
			
 
				-  line-height: 35px;
			
 
				-  padding: 0 8px;
			
 
				-  border-bottom: 1px solid #eaeef1;
			
 
				-}
			
 
				-
			
 
				-.drawer .header .title {
			
 
				-  font-size: 13px;
			
 
				-  font-weight: 600;
			
 
				-  margin-right: auto;
			
 
				-}
			
 
				-
			
 
				-.drawer .center {
			
 
				-  display: flex;
			
 
				-  overflow: auto;
			
 
				-  padding: 8px;
			
 
				-}
			
 
				-
			
 
				-.drawer .center img {
			
 
				-  width: 40%;
			
 
				-  margin-right: 8px;
			
 
				-}
			
 
				-
			
 
				-.drawer .center .model {
			
 
				-  width: 60%;
			
 
				-}
			
 
				-
			
 
				-.drawer .center .model .content {
			
 
				-  display: flex;
			
 
				-  margin-bottom: 8px;
			
 
				-}
			
 
				-
			
 
				-.drawer .center .model .content .icon {
			
 
				-  margin-right: 8px;
			
 
				-}
			
--- a/src/static/amap/css/input.css
+++ b/src/static/amap/css/input.css
@@ -1,62 +0,0 @@
 
				-* {
			
 
				-  box-sizing: border-box;
			
 
				-}
			
 
				-body {
			
 
				-  margin: 0;
			
 
				-}
			
 
				-html {
			
 
				-  font-size: 12px;
			
 
				-}
			
 
				-.amap-copyright {
			
 
				-  box-sizing: content-box;
			
 
				-}
			
 
				-
			
 
				-button,
			
 
				-input,
			
 
				-select {
			
 
				-  margin: 0;
			
 
				-  font-family: inherit;
			
 
				-  font-size: inherit;
			
 
				-  line-height: inherit;
			
 
				-  overflow: visible;
			
 
				-  text-transform: none;
			
 
				-}
			
 
				-
			
 
				-input {
			
 
				-  width: 100%;
			
 
				-  border: 0px solid #ced4da;
			
 
				-  border-radius: 10px;
			
 
				-  padding: 5px;
			
 
				-  caret-color: #2a98ff;
			
 
				-  font-size: 13px;
			
 
				-}
			
 
				-
			
 
				-input:focus {
			
 
				-  outline: none;
			
 
				-  border-radius: 10px;
			
 
				-  border: 0px solid #25a5f7;
			
 
				-}
			
 
				-
			
 
				-.ui-input {
			
 
				-  display: flex;
			
 
				-  height: 40px;
			
 
				-  font-size: 14px;
			
 
				-  border-radius: 10px;
			
 
				-  background-color: #fff;
			
 
				-  box-shadow: 0px 0px 5px 0px rgba(141, 141, 141, 0.4);
			
 
				-}
			
 
				-
			
 
				-.ui-input .icon {
			
 
				-  color: #2a98ff;
			
 
				-  font-size: 1.5rem;
			
 
				-  padding: 0 0 0 8px;
			
 
				-  margin: auto 0;
			
 
				-}
			
 
				-
			
 
				-input::-webkit-input-placeholder,
			
 
				-:-moz-placeholder,
			
 
				-::-moz-placeholder,
			
 
				-input:-ms-input-placeholder,
			
 
				-input::-ms-input-placeholder {
			
 
				-  color: #c0c4cc;
			
 
				-}
			
--- a/src/static/amap/img/hz.png
+++ b/src/static/amap/img/hz.png
--- a/src/static/amap/img/lc1.png
+++ b/src/static/amap/img/lc1.png
--- a/src/static/amap/img/lc2.png
+++ b/src/static/amap/img/lc2.png
--- a/src/static/amap/img/lc3.png
+++ b/src/static/amap/img/lc3.png
--- a/src/static/amap/img/lc4.png
+++ b/src/static/amap/img/lc4.png
--- a/src/static/amap/img/map1.png
+++ b/src/static/amap/img/map1.png
--- a/src/static/amap/img/map2.png
+++ b/src/static/amap/img/map2.png
--- a/src/static/amap/img/map3.png
+++ b/src/static/amap/img/map3.png
--- a/src/static/amap/img/map4.png
+++ b/src/static/amap/img/map4.png
--- a/src/static/amap/img/map5.png
+++ b/src/static/amap/img/map5.png
--- a/src/static/amap/img/map6.png
+++ b/src/static/amap/img/map6.png
--- a/src/static/amap/img/qxjy.png
+++ b/src/static/amap/img/qxjy.png
--- a/src/static/amap/img/shjz.png
+++ b/src/static/amap/img/shjz.png
--- a/src/static/amap/js/jquery-2.2.1.min.js
+++ b/src/static/amap/js/jquery-2.2.1.min.js
--- a/src/static/amap/js/map-text.js
+++ b/src/static/amap/js/map-text.js
@@ -1,64 +0,0 @@
 
				-let mapText = [
			
 
				-  {
			
 
				-    name: "华漕镇",
			
 
				-    position: [121.27407048990926, 31.229681167163594],
			
 
				-  },
			
 
				-  {
			
 
				-    name: "新虹街道",
			
 
				-    position: [121.31678665915922, 31.19989814653268],
			
 
				-    angle: 60,
			
 
				-  },
			
 
				-  {
			
 
				-    name: "虹桥镇",
			
 
				-    position: [121.37366566911481, 31.181242256925685],
			
 
				-  },
			
 
				-  {
			
 
				-    name: "七宝镇",
			
 
				-    position: [121.34441049144561, 31.15667306144681],
			
 
				-  },
			
 
				-  {
			
 
				-    name: "古美路街道",
			
 
				-    position: [121.38821132466296, 31.148895426383994],
			
 
				-  },
			
 
				-  {
			
 
				-    name: "莘庄镇",
			
 
				-    position: [121.36694572304782, 31.11778473697853],
			
 
				-  },
			
 
				-  {
			
 
				-    name: "梅陇镇",
			
 
				-    position: [121.42546463091776, 31.11280588046885],
			
 
				-    angle: 60,
			
 
				-  },
			
 
				-  {
			
 
				-    name: "莘庄工业区",
			
 
				-    position: [121.38039416771352, 31.0791917698708],
			
 
				-    angle: 90,
			
 
				-  },
			
 
				-  {
			
 
				-    name: "颛桥镇",
			
 
				-    position: [121.41674131545886, 31.06891841957895],
			
 
				-    angle: 70,
			
 
				-  },
			
 
				-  {
			
 
				-    name: "马桥镇",
			
 
				-    position: [121.35277033542707, 31.0296826923654],
			
 
				-  },
			
 
				-  {
			
 
				-    name: "江川路街道",
			
 
				-    position: [121.39384261237933, 31.008189608073348],
			
 
				-  },
			
 
				-  {
			
 
				-    name: "吴泾镇",
			
 
				-    position: [121.44363820479037, 31.047745591865926],
			
 
				-  },
			
 
				-  {
			
 
				-    name: "浦锦街道",
			
 
				-    position: [121.48798172503979, 31.097556508056314],
			
 
				-    angle: 70,
			
 
				-  },
			
 
				-
			
 
				-  {
			
 
				-    name: "浦江镇",
			
 
				-    position: [121.51633250028107, 31.04245164875196],
			
 
				-  },
			
 
				-];
			
--- a/src/static/amap/js/uni.webview.1.5.4.js
+++ b/src/static/amap/js/uni.webview.1.5.4.js
--- a/src/static/amap/mapFacilitiesView.html
+++ b/src/static/amap/mapFacilitiesView.html
@@ -1,422 +0,0 @@
 
				-<!doctype html>
			
 
				-<html lang="en">
			
 
				-
			
 
				-<head>
			
 
				-    <meta charset="utf-8">
			
 
				-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				-    <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
			
 
				-    <title>设施查看</title>
			
 
				-    <link rel="stylesheet" href="./css/input.css" />
			
 
				-    <link rel="stylesheet" href="./css/common.css" />
			
 
				-    <link rel="stylesheet" type="text/css" href="./js/M_select/M_select.css">
			
 
				-    <link rel="stylesheet" type="text/css" href="./js/notification/index.css">
			
 
				-    <style>
			
 
				-        html,
			
 
				-        body,
			
 
				-        #mapF {
			
 
				-            height: 100%;
			
 
				-            width: 100%;
			
 
				-        }
			
 
				-    </style>
			
 
				-    <style>
			
 
				-        @font-face {
			
 
				-            font-family: "iconfont";
			
 
				-            /* Project id 3620854 */
			
 
				-            src: url('https://at.alicdn.com/t/c/font_3620854_18olo3dgg2h.woff2?t=1691473656726') format('woff2'),
			
 
				-                url('https://at.alicdn.com/t/c/font_3620854_18olo3dgg2h.woff?t=1691473656726') format('woff'),
			
 
				-                url('https://at.alicdn.com/t/c/font_3620854_18olo3dgg2h.ttf?t=1691473656726') format('truetype');
			
 
				-        }
			
 
				-
			
 
				-        /* 定义使用的样式 iconfont */
			
 
				-        .iconfont {
			
 
				-            font-family: "iconfont" !important;
			
 
				-            font-size: 1rem;
			
 
				-            font-style: normal;
			
 
				-            -webkit-font-smoothing: antialiased;
			
 
				-            -moz-osx-font-smoothing: grayscale;
			
 
				-        }
			
 
				-    </style>
			
 
				-</head>
			
 
				-
			
 
				-<body>
			
 
				-    <div id="mapF" class="map" tabindex="0"></div>
			
 
				-
			
 
				-    <div id="myPageTop">
			
 
				-        <!-- <div class="ui-input">
			
 
				-            <i class="iconfont icon">&#xe60d;</i>
			
 
				-            <input id="uiInput" placeholder="请输入设施名称" />
			
 
				-        </div> -->
			
 
				-
			
 
				-        <div id="myPageRight">
			
 
				-            <div class="myPageType" style="text-align: center;">
			
 
				-                <i class="iconfont icon" style="font-size: 1.5rem;">&#xe60e;</i>
			
 
				-                <div style="font-size: 12px;">设施</div>
			
 
				-            </div>
			
 
				-            <div style="margin: 5px 0 5px 0;border-bottom: 1px solid #eaeef1;"></div>
			
 
				-            <div class="myPageLabel" style="text-align: center;">
			
 
				-                <i class="iconfont icon" style="font-size: 1.5rem;">&#xe60e;</i>
			
 
				-                <div style="font-size: 12px;">标签</div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-
			
 
				-        <div id="myPageDialog">
			
 
				-            <div class="title">设施汇总（0）</div>
			
 
				-            <div class="center"></div>
			
 
				-            <div class="bottom" style="text-align: center;">
			
 
				-                <i class="iconfont icon" style="color: #a8abb2; font-size: 18px;">&#xe63d;</i>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-
			
 
				-    <div class="drawer">
			
 
				-        <div class="header">
			
 
				-            <div class="title"></div>
			
 
				-            <i class="iconfont icon close" style="color: #a8abb2; font-size: 12px;">&#xe695;</i>
			
 
				-        </div>
			
 
				-        <div class="center">
			
 
				-            <img src="" alt="">
			
 
				-            <div class="model">
			
 
				-                <div class="content">
			
 
				-                    <i class="iconfont icon" style="color:#0C83FA;font-size: 16px;">&#xe60f;</i>
			
 
				-                    <div class="address"></div>
			
 
				-                </div>
			
 
				-                <div class="content">
			
 
				-                    <i class="iconfont icon" style="color:#01b713;font-size: 16px;">&#xe616;</i>
			
 
				-                    <div class="facilityType"></div>
			
 
				-                </div>
			
 
				-                <div class="content">
			
 
				-                    <i class="iconfont icon" style="color:#ed480e;font-size: 16px;">&#xe617;</i>
			
 
				-                    <div class="branch"></div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-
			
 
				-    <script src="https://a.amap.com/jsapi_demos/static/china.js"></script>
			
 
				-    <script type="text/javascript">
			
 
				-        window._AMapSecurityConfig = {
			
 
				-            securityJsCode: 'ce0e44758ad6b69607e23bf8e6a6ac11',
			
 
				-        }
			
 
				-    </script>
			
 
				-    <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=14aefebea926bb958032d5daf836fadf">
			
 
				-    </script>
			
 
				-
			
 
				-    <script type="text/javascript" src="https://webapi.amap.com/ui/1.1/main.js"></script>
			
 
				-    <script type="text/javascript" src="./js/jquery-2.2.1.min.js"></script>
			
 
				-
			
 
				-    <!-- uni 的 SDK -->
			
 
				-    <!-- 需要把 uni.webview.1.5.4.js 下载到自己的服务器 -->
			
 
				-    <script type="text/javascript" src="./js/uni.webview.1.5.4.js"></script>
			
 
				-
			
 
				-    <script type="text/javascript">
			
 
				-        var dataList = [];//初始化数据存储
			
 
				-        var dataListCheckBox = [];//初始化数据选中数据存储
			
 
				-        var facilityNum = 0;//设施汇总数据存储
			
 
				-
			
 
				-        var map = [];
			
 
				-        var marker = null;//创建点标记
			
 
				-
			
 
				-        var myPageRight = {
			
 
				-            myPageTypeBool: 'none',//设施类型
			
 
				-            myPageLabelBool: 'none',//标签
			
 
				-        };//右侧小按钮绑定值存储
			
 
				-
			
 
				-        /**
			
 
				-         * 初始化
			
 
				-         */
			
 
				-        function initMap() {
			
 
				-            map = new AMap.Map("mapF", {
			
 
				-                // mapStyle: 'amap://styles/d0ddc09bd7cbd7331a8e8fa691e5b0da', //设置地图的显示样式
			
 
				-                resizeEnable: true,
			
 
				-                center: [121.4737021, 31.2303904],
			
 
				-                zoom: 13,
			
 
				-                zooms: [3, 16],
			
 
				-            });
			
 
				-
			
 
				-            map.setFitView();
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * 撒点
			
 
				-         */
			
 
				-        function handleMarker(data) {
			
 
				-            AMap.plugin(["AMap.PolygonEditor,AMap.PolylineEditor", "AMap.Marker"], function () {
			
 
				-                map.clearMap(); // 清除地图覆盖物
			
 
				-
			
 
				-                if (data.length > 0) {
			
 
				-                    marker = new AMap.Marker({});//初始化点标记
			
 
				-
			
 
				-                    var markerData = data.map((item) => {
			
 
				-                        return {
			
 
				-                            position: [Number(item.longitude), Number(item.latitude)],
			
 
				-                            icon: new AMap.Icon({
			
 
				-                                image: item.icon || item.typeImg,
			
 
				-                                size: new AMap.Size(28, 35), //图标大小
			
 
				-                                imageSize: new AMap.Size(28, 35),
			
 
				-                            }),
			
 
				-                            data: item
			
 
				-                        };
			
 
				-                    })
			
 
				-
			
 
				-                    for (var i = 0, marker; i < markerData.length; i++) {
			
 
				-                        marker = new AMap.Marker({
			
 
				-                            map: map,
			
 
				-                            icon: markerData[i].icon,
			
 
				-                            position: markerData[i].position,
			
 
				-                            offset: new AMap.Pixel(-10, -10),
			
 
				-                        });
			
 
				-                        marker.data = markerData[i]
			
 
				-                        marker.setLabel({
			
 
				-                            direction: 'top-left',
			
 
				-                            offset: new AMap.Pixel(-5, -10), //设置文本标注偏移量
			
 
				-                            content: `<div class='infoLabel'>${marker.data.data.facilityName}</div>`, //设置文本标注内容
			
 
				-                        });
			
 
				-                        marker.on('click', function (e) {
			
 
				-                            var data = e.target.data.data
			
 
				-                            handleDrawer(data)
			
 
				-                        });
			
 
				-                    }
			
 
				-
			
 
				-                    handleRightBtn();
			
 
				-                    marker.setMap(map);
			
 
				-                    map.setFitView(null, false, [150, 60, 100, 60]);
			
 
				-                }
			
 
				-            })
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * 初始化数据
			
 
				-         */
			
 
				-        function initData() {
			
 
				-            $('#myPageDialog .title').html(`设施汇总（${facilityNum}）`)
			
 
				-            var html = ``
			
 
				-            dataList.forEach(el => {
			
 
				-                html += `
			
 
				-                <div id="${el.typeCode}" class="center-col" onclick="checkbox(${el.typeCode})">
			
 
				-                    <div class="image">
			
 
				-                        <img style="max-width:40px;height:40px;margin: auto;"
			
 
				-                            src="${el.typeImg}" />
			
 
				-                        <div class="badge"> ${el.typeFacilityNum >= 100 ? '99+' : el.typeFacilityNum || 0} </div>
			
 
				-                    </div>
			
 
				-                    <div style="text-align: center;font-size: 12px;margin-bottom: 5px;">${el.typeName}</div>
			
 
				-                </div>
			
 
				-                `
			
 
				-            });
			
 
				-
			
 
				-            $('#myPageDialog .center').append(html)
			
 
				-
			
 
				-
			
 
				-            $('#myPageRight .myPageLabel').on('click', function (e) {
			
 
				-                if (myPageRight.myPageLabelBool == "none") {
			
 
				-                    myPageRight.myPageLabelBool = "block";
			
 
				-                    $('#myPageRight .myPageLabel').css('color', '#2a98ff')
			
 
				-                } else {
			
 
				-                    myPageRight.myPageLabelBool = "none";
			
 
				-                    $('#myPageRight .myPageLabel').css('color', '#000000')
			
 
				-                }
			
 
				-
			
 
				-                $('.amap-marker-label').css('display', myPageRight.myPageLabelBool)
			
 
				-            })
			
 
				-
			
 
				-            $('#myPageRight .myPageType').on('click', function (e) {
			
 
				-                if (myPageRight.myPageTypeBool == "none") {
			
 
				-                    myPageRight.myPageTypeBool = "block";
			
 
				-                    $('#myPageRight .myPageType').css('color', '#2a98ff')
			
 
				-                } else {
			
 
				-                    myPageRight.myPageTypeBool = "none";
			
 
				-                    $('#myPageRight .myPageType').css('color', '#000000')
			
 
				-                }
			
 
				-
			
 
				-                $('#myPageDialog').css('display', myPageRight.myPageTypeBool)
			
 
				-            })
			
 
				-
			
 
				-            var display = "flex"
			
 
				-            $('#myPageDialog .bottom').on('click', function (e) {
			
 
				-                if (display == "none") {
			
 
				-                    $('#myPageDialog .bottom').css('transform', 'rotate(-180deg)')
			
 
				-                    display = "flex"
			
 
				-                } else {
			
 
				-                    $('#myPageDialog .bottom').css('transform', 'rotate(0deg)')
			
 
				-                    display = "none"
			
 
				-                }
			
 
				-                $('#myPageDialog .center').css('display', display)
			
 
				-            })
			
 
				-
			
 
				-            initMap()
			
 
				-        }
			
 
				-
			
 
				-
			
 
				-        /**
			
 
				-         * 校验右侧小按钮
			
 
				-         */
			
 
				-        function handleRightBtn() {
			
 
				-            if (myPageRight.myPageLabelBool == 'block') {
			
 
				-                // $('#myPageRight .myPageLabel').trigger('click')
			
 
				-                $('.amap-marker-label').css('display', myPageRight.myPageLabelBool)
			
 
				-            }
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * 复选事件
			
 
				-         */
			
 
				-        function checkbox(typeCode) {
			
 
				-            if (dataListCheckBox.includes(typeCode)) {
			
 
				-                dataListCheckBox.splice(dataListCheckBox.indexOf(typeCode), 1);
			
 
				-                $(`#${typeCode}`).attr('class', 'center-col')
			
 
				-            } else {
			
 
				-                dataListCheckBox.push(typeCode)
			
 
				-                $(`#${typeCode}`).attr('class', 'center-col mask')
			
 
				-            }
			
 
				-
			
 
				-            parentMessage("撒点", dataListCheckBox.join(','));
			
 
				-        }
			
 
				-
			
 
				-        /*
			
 
				-         * 抽屉事件
			
 
				-         */
			
 
				-        function handleDrawer(data) {
			
 
				-            $(`.drawer`).attr('class', 'drawer open')
			
 
				-            $(`.drawer .header .title`).html(data.facilityName)
			
 
				-            $(`.drawer .center img`).attr("src", data.imagesUrl ? data.imagesUrl : "../images/404.png")
			
 
				-            $(`.drawer .center .model .content .address`).html(data.address)
			
 
				-            $(`.drawer .center .model .content .facilityType`).html(data.typeName)
			
 
				-            $(`.drawer .center .model .content .branch`).html(data.deptId)
			
 
				-
			
 
				-            $(`.drawer .header .close`).on('click', function (e) {
			
 
				-                $(`.drawer`).attr('class', 'drawer')
			
 
				-            })
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * 向父页面发送数据
			
 
				-         */
			
 
				-        function parentMessage(type, data) {
			
 
				-            var message = {
			
 
				-                funcName: type,
			
 
				-                param: data,
			
 
				-            };
			
 
				-
			
 
				-            //APP-PLUS
			
 
				-            uni.postMessage({
			
 
				-                data: message
			
 
				-            });
			
 
				-
			
 
				-            //H5
			
 
				-            if (window.parent) {
			
 
				-                window.parent.postMessage(message, '*');
			
 
				-            }
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * APP-PLUS || H5
			
 
				-         * 接收父页面传过来的值
			
 
				-         */
			
 
				-        window.receiveData = function (msg) {
			
 
				-            analysisData(msg)
			
 
				-        }
			
 
				-        window.addEventListener("message", function (event) {
			
 
				-            analysisData(event.data)
			
 
				-        });
			
 
				-
			
 
				-        /**
			
 
				-         * 解析数据
			
 
				-         */
			
 
				-        function analysisData(data) {
			
 
				-            if ("funcName" in data) {
			
 
				-                if (data.funcName == "初始化") {
			
 
				-                    var param = JSON.parse(data.param);
			
 
				-                    dataList = param.baseGgpFacilityTypeNumVO;
			
 
				-                    facilityNum = param.facilityNum;
			
 
				-                    initData();
			
 
				-                } else if (data.funcName == "撒点") {
			
 
				-                    var param = JSON.parse(data.param);
			
 
				-                    param.forEach((e) => {
			
 
				-                        dataList.forEach(el => {
			
 
				-                            if (e.facilityType === el.typeCode) {
			
 
				-                                e.typeImg = el.typeImg
			
 
				-                                e.typeName = el.typeName
			
 
				-                            }
			
 
				-                        });
			
 
				-                    })
			
 
				-                    handleMarker(param)
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    </script>
			
 
				-    <style>
			
 
				-        #myPageTop {
			
 
				-            position: absolute;
			
 
				-            left: 8px;
			
 
				-            top: 8px;
			
 
				-            background: transparent;
			
 
				-            font-family: "Microsoft Yahei", "微软雅黑", "Pinghei";
			
 
				-            font-size: 13px;
			
 
				-            width: calc(100% - 16px);
			
 
				-        }
			
 
				-
			
 
				-        #myPageRight {
			
 
				-            position: absolute;
			
 
				-            right: 0px;
			
 
				-            background-color: #fff;
			
 
				-            margin-top: 8px;
			
 
				-            padding: 5px;
			
 
				-            border-radius: 10px;
			
 
				-            box-shadow: 0px 0px 5px 0px rgba(141, 141, 141, 0.4);
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop #myPageDialog {
			
 
				-            position: absolute;
			
 
				-            right: calc(34px + 8px);
			
 
				-            width: 14rem;
			
 
				-            width: calc(100% - 34px - 8px);
			
 
				-            padding: 10px 10px 5px 10px;
			
 
				-            margin-top: 8px;
			
 
				-            background: #fff;
			
 
				-            box-shadow: 0px 0px 5px 0px rgba(141, 141, 141, 0.4);
			
 
				-            display: none;
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop #myPageDialog .title {
			
 
				-            font-weight: 600;
			
 
				-            text-align: center;
			
 
				-            margin-bottom: 10px;
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop #myPageDialog .center {
			
 
				-            display: flex;
			
 
				-            max-height: 260px;
			
 
				-            overflow: auto;
			
 
				-            flex-wrap: wrap;
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop #myPageDialog .center .mask {
			
 
				-            border-radius: 4px;
			
 
				-            background: #c2ddf6;
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop #myPageDialog .center .center-col {
			
 
				-            /* max-width: calc(25% - 2.5px);
			
 
				-            flex: 0 0 calc(25% - 2.5px); */
			
 
				-
			
 
				-            max-width: calc(25% - 3.75px);
			
 
				-            flex: 0 0 calc(25% - 3.75px);
			
 
				-            margin: 0px 5px 5px 0;
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop #myPageDialog .center .center-col:nth-child(4n) {
			
 
				-            margin-right: 0;
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop #myPageDialog .center .center-col .image {
			
 
				-            position: relative;
			
 
				-            display: flex;
			
 
				-            margin: 15px 0 5px 0;
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop #myPageDialog .bottom {
			
 
				-            transform: rotate(-180deg);
			
 
				-        }
			
 
				-    </style>
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/src/static/amap/mapGather.html
+++ b/src/static/amap/mapGather.html
@@ -1,349 +0,0 @@
 
				-<!doctype html>
			
 
				-<html lang="en">
			
 
				-
			
 
				-<head>
			
 
				-    <meta charset="utf-8">
			
 
				-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				-    <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
			
 
				-    <title>地图采集</title>
			
 
				-    <link rel="stylesheet" href="https://a.amap.com/jsapi_demos/static/demo-center/css/demo-center.css" />
			
 
				-    <link rel="stylesheet" type="text/css" href="./js/M_select/M_select.css">
			
 
				-    <link rel="stylesheet" type="text/css" href="./js/notification/index.css">
			
 
				-    <style>
			
 
				-        html,
			
 
				-        body,
			
 
				-        #mapF {
			
 
				-            height: 100%;
			
 
				-            width: 100%;
			
 
				-        }
			
 
				-    </style>
			
 
				-</head>
			
 
				-
			
 
				-<body>
			
 
				-    <div id="mapF" class="map" tabindex="0"></div>
			
 
				-
			
 
				-    <div id="myPageTop">
			
 
				-        <input id="tipinput" />
			
 
				-    </div>
			
 
				-
			
 
				-    <div style="display:flex; width: 100%; position: absolute; bottom: 50px;justify-content: center;">
			
 
				-        <button class="btn" onclick="handleButtom('重画')"
			
 
				-            style="width: 80px;border: 0;background-color: #d9001b; color:#fff;padding: 0.60rem 0.5rem;margin-right: 15px;">重画</button>
			
 
				-        <button class="btn" onclick="handleButtom('保存')"
			
 
				-            style="width: 80px;border: 0;background-color: #25A5F7; color:#fff;padding: 0.60rem 0.5rem;margin-left: 15px;">保存</button>
			
 
				-    </div>
			
 
				-
			
 
				-    <script src="https://a.amap.com/jsapi_demos/static/china.js"></script>
			
 
				-    <script type="text/javascript">
			
 
				-        window._AMapSecurityConfig = {
			
 
				-            securityJsCode: 'ce0e44758ad6b69607e23bf8e6a6ac11',
			
 
				-        }
			
 
				-    </script>
			
 
				-    <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=14aefebea926bb958032d5daf836fadf">
			
 
				-    </script>
			
 
				-
			
 
				-    <script type="text/javascript" src="https://webapi.amap.com/ui/1.1/main.js"></script>
			
 
				-    <script type="text/javascript" src="./js/jquery-2.2.1.min.js"></script>
			
 
				-
			
 
				-    <!-- uni 的 SDK -->
			
 
				-    <!-- 需要把 uni.webview.1.5.4.js 下载到自己的服务器 -->
			
 
				-    <script type="text/javascript" src="./js/uni.webview.1.5.4.js"></script>
			
 
				-
			
 
				-    <script type="text/javascript">
			
 
				-
			
 
				-        var form = {};
			
 
				-        var typeName = "";
			
 
				-
			
 
				-        var map = [];
			
 
				-
			
 
				-        var marker = null;//创建点标记
			
 
				-        var regeocode = {};//获取解析详细地址数据存储
			
 
				-        var longitude = "";//点标记经度数据存储
			
 
				-        var latitude = "";//点标记纬度数据存储
			
 
				-
			
 
				-        var polyEditor = null; //创建画布
			
 
				-        var polyEditorArray = [];//画布数据存储
			
 
				-
			
 
				-
			
 
				-        /**
			
 
				-         * 初始化
			
 
				-         */
			
 
				-        function initMap() {
			
 
				-            map = new AMap.Map("mapF", {
			
 
				-                // mapStyle: 'amap://styles/d0ddc09bd7cbd7331a8e8fa691e5b0da', //设置地图的显示样式
			
 
				-                resizeEnable: true,
			
 
				-                center: [121.4737021, 31.2303904],
			
 
				-                zoom: 13,
			
 
				-                zooms: [3, 16],
			
 
				-            });
			
 
				-
			
 
				-            map.setFitView();
			
 
				-
			
 
				-            setTimeout(() => {
			
 
				-                AMap.plugin(["AMap.PolygonEditor,AMap.PolylineEditor"], function () {
			
 
				-                    handleAutoComplete();//调用输入提示功能
			
 
				-
			
 
				-                    if (typeName === "点") {
			
 
				-                        marker = new AMap.Marker({});//初始化点标记
			
 
				-                        handleMarker();
			
 
				-                    } else if (typeName === "线") {
			
 
				-                        polyEditor = new AMap.PolylineEditor(map);//初始化画布
			
 
				-                        handlePolyline();
			
 
				-                    } else if (typeName === "面") {
			
 
				-                        polyEditor = new AMap.PolygonEditor(map);//初始化画布
			
 
				-                        handlePolygon();
			
 
				-                    }
			
 
				-                })
			
 
				-            }, 1000);
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * 输入提示
			
 
				-         */
			
 
				-        function handleAutoComplete() {
			
 
				-            AMap.plugin(["AMap.PlaceSearch", "AMap.AutoComplete", "AMap.Geocoder"], function () {
			
 
				-                var autoOptions = {
			
 
				-                    input: "tipinput",
			
 
				-                };
			
 
				-                var auto = new AMap.AutoComplete(autoOptions);
			
 
				-
			
 
				-                var placeSearch = new AMap.PlaceSearch({
			
 
				-                    city: "全国",
			
 
				-                    map: map,
			
 
				-                }); //构造地点查询类
			
 
				-                auto.on("select", select); //注册监听，当选中某条记录时会触发
			
 
				-                function select(e) {
			
 
				-                    longitude = e.lnglat.getLng()
			
 
				-                    latitude = e.lnglat.getLat()
			
 
				-
			
 
				-                    placeSearch.setCity(e.poi.adcode);
			
 
				-                    placeSearch.search(e.poi.name); //关键字查询查询
			
 
				-
			
 
				-                    handleAddress()
			
 
				-                }
			
 
				-            });
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * 点
			
 
				-         */
			
 
				-        function handleMarker() {
			
 
				-            //地图点标记回显
			
 
				-            if (form.longitude && form.latitude) {
			
 
				-                longitude = form.longitude
			
 
				-                latitude = form.latitude
			
 
				-
			
 
				-                marker = new AMap.Marker({
			
 
				-                    position: new AMap.LngLat(form.longitude, form.latitude), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
			
 
				-                });
			
 
				-
			
 
				-                handleAddress()
			
 
				-            }
			
 
				-
			
 
				-            //为地图注册click事件获取鼠标点击出的经纬度坐标
			
 
				-            map.on("click", function (e) {
			
 
				-                longitude = e.lnglat.getLng()
			
 
				-                latitude = e.lnglat.getLat()
			
 
				-
			
 
				-                map.remove([marker]);
			
 
				-                marker = new AMap.Marker({
			
 
				-                    position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
			
 
				-                });
			
 
				-
			
 
				-                handleAddress()
			
 
				-            });
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * 线
			
 
				-         */
			
 
				-        function handlePolyline() {
			
 
				-            var polygon = new AMap.Polyline({
			
 
				-                path: form.gpsAreas
			
 
				-            })
			
 
				-
			
 
				-            if (form.gpsAreas.length > 0) {
			
 
				-                map.add([polygon]);
			
 
				-
			
 
				-                polyEditor.close();
			
 
				-                polyEditor.setTarget(polygon);
			
 
				-                polyEditor.open();
			
 
				-
			
 
				-                polyEditorArray = form.gpsAreas
			
 
				-            } else {
			
 
				-                polyEditor.close();
			
 
				-                polyEditor.setTarget();
			
 
				-                polyEditor.open();
			
 
				-            }
			
 
				-
			
 
				-            polyEditor.on("end", function (event) {
			
 
				-                //绘制结束后坐标集合
			
 
				-                polyEditorArray = event.target.$x[0]
			
 
				-            });
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * 面
			
 
				-         */
			
 
				-        function handlePolygon() {
			
 
				-            var polygon = new AMap.Polygon({
			
 
				-                path: form.gpsAreas
			
 
				-            })
			
 
				-
			
 
				-            if (form.gpsAreas.length > 0) {
			
 
				-                map.add([polygon]);
			
 
				-
			
 
				-                polyEditor.close();
			
 
				-                polyEditor.setTarget(polygon);
			
 
				-                polyEditor.open();
			
 
				-
			
 
				-                polyEditorArray = form.gpsAreas
			
 
				-            } else {
			
 
				-                polyEditor.close();
			
 
				-                polyEditor.setTarget();
			
 
				-                polyEditor.open();
			
 
				-            }
			
 
				-
			
 
				-            polyEditor.on("end", function (event) {
			
 
				-                //绘制结束后坐标集合
			
 
				-                polyEditorArray = event.target._opts.path
			
 
				-            });
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * 反解析地址
			
 
				-         */
			
 
				-        function handleAddress() {
			
 
				-            AMap.plugin(["AMap.Geocoder"], function () {
			
 
				-                let zb = [longitude, latitude];
			
 
				-                map.add(marker);
			
 
				-                marker.setPosition(zb);
			
 
				-                var geocoder = new AMap.Geocoder({
			
 
				-                    city: "", //城市设为北京，默认：“全国”
			
 
				-                    radius: 1000, //范围，默认：500
			
 
				-                });
			
 
				-                geocoder.getAddress(zb, function (status, result) {
			
 
				-                    if (status === "complete" && result.regeocode) {
			
 
				-                        regeocode = result.regeocode
			
 
				-                    } else {
			
 
				-                        alert("根据经纬度查询地址失败");
			
 
				-                    }
			
 
				-                });
			
 
				-            });
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * APP-PLUS
			
 
				-         * 接收父页面传过来的值
			
 
				-         */
			
 
				-        window.receiveData = function (msg) {
			
 
				-            // console.log("子页面：", msg)
			
 
				-            // alert(msg.dataType)
			
 
				-            form = msg.dataArray
			
 
				-            typeName = msg.dataType
			
 
				-            initMap();
			
 
				-        }
			
 
				-
			
 
				-        /**
			
 
				-         * H5
			
 
				-         * 接收父页面传过来的值
			
 
				-         */
			
 
				-        window.addEventListener("message", function (event) {
			
 
				-            if ("funcName" in event.data) {
			
 
				-                console.log("子页面：", event);
			
 
				-                form = JSON.parse(event.data.param)
			
 
				-                typeName = event.data.typeName
			
 
				-            }
			
 
				-            initMap();
			
 
				-        });
			
 
				-
			
 
				-        /**
			
 
				-         * 按钮点击事件
			
 
				-         */
			
 
				-        function handleButtom(value) {
			
 
				-            if (value == '重画') {
			
 
				-                if (typeName === "点") {
			
 
				-                    map.remove([marker]);
			
 
				-                    form.longitude = ""
			
 
				-                    form.latitude = ""
			
 
				-                    form.province = ""
			
 
				-                    form.city = ""
			
 
				-                    form.area = ""
			
 
				-                    form.streetTown = ""
			
 
				-                    form.facilityAddress = ""
			
 
				-                    form.address = ""
			
 
				-                } else if (typeName === "线" || typeName === "面") {
			
 
				-                    polyEditor.close();
			
 
				-                    polyEditor.setTarget();
			
 
				-                    polyEditor.open();
			
 
				-                    map.clearMap();
			
 
				-                    polyEditorArray = []
			
 
				-                }
			
 
				-
			
 
				-            } else if (value == '保存') {
			
 
				-
			
 
				-                if (typeName === "点") {
			
 
				-                    form.longitude = longitude
			
 
				-                    form.latitude = latitude
			
 
				-
			
 
				-                    form.province = regeocode.addressComponent.province
			
 
				-                    form.city = regeocode.addressComponent.city
			
 
				-                    form.area = regeocode.addressComponent.district
			
 
				-                    form.streetTown = regeocode.addressComponent.township;
			
 
				-                    form.facilityAddress = regeocode.addressComponent.street + regeocode.addressComponent.streetNumber;
			
 
				-                    form.address =
			
 
				-                        form.province + form.city + form.area + form.streetTown + regeocode.addressComponent.street + regeocode.addressComponent.streetNumber;
			
 
				-                } else if (typeName === "线" || typeName === "面") {
			
 
				-                    polyEditor.close();
			
 
				-                    form.gpsAreas = polyEditorArray
			
 
				-                }
			
 
				-
			
 
				-                //向主页面推送消息
			
 
				-
			
 
				-                //APP-PLUS
			
 
				-                uni.postMessage({
			
 
				-                    data: JSON.stringify(form)
			
 
				-                });
			
 
				-
			
 
				-                //H5
			
 
				-                var message = {
			
 
				-                    funcName: "message",
			
 
				-                    param: JSON.stringify(form),
			
 
				-                };
			
 
				-                if (window.parent) {
			
 
				-                    window.parent.postMessage(message, '*');
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    </script>
			
 
				-    <style>
			
 
				-        .amap-logo,
			
 
				-        .amap-copyright {
			
 
				-            display: none !important;
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop {
			
 
				-            position: absolute;
			
 
				-            left: 10px;
			
 
				-            top: 10px;
			
 
				-            background: transparent;
			
 
				-            font-family: "Microsoft Yahei", "微软雅黑", "Pinghei";
			
 
				-            font-size: 13px;
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop input {
			
 
				-            width: 18rem;
			
 
				-            border: 1px solid #ced4da;
			
 
				-            border-radius: 5px;
			
 
				-            padding: 5px;
			
 
				-        }
			
 
				-
			
 
				-        #myPageTop input:focus {
			
 
				-            outline: none;
			
 
				-            border-radius: 5px;
			
 
				-            border: 1px solid #25A5F7;
			
 
				-        }
			
 
				-    </style>
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/src/static/department-icon.png
+++ b/src/static/department-icon.png
--- a/src/static/icons/tabBar/analyse-selected.png.svg
+++ b/src/static/icons/tabBar/analyse-selected.png.svg
@@ -1,21 +0,0 @@
 
				-<?xml version="1.0" encoding="utf-8"?>
			
 
				-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
			
 
				-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
			
 
				-	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
			
 
				-<style type="text/css">
			
 
				-	.st0{fill:#252525;}
			
 
				-</style>
			
 
				-<path class="st0" d="M36.2,26.6c-0.5-2.1-1.8-3.8-3.6-4.8c-0.3-0.2-0.7-0.4-1.1-0.5v0c-0.3-3.9-2.3-7.4-5.4-9.6
			
 
				-	c0-0.4,0.1-0.8,0.1-1.2c0-4.4-3.5-7.9-7.7-7.9c-4.3,0-7.7,3.5-7.7,7.9c0,0.4,0,0.8,0.1,1.2c-3.1,2.3-5.1,5.8-5.4,9.7
			
 
				-	c-0.3,0.2-0.7,0.3-1,0.5c-3.6,2.2-4.9,7-2.8,10.8c1,1.8,2.7,3.2,4.6,3.7c0.7,0.2,1.3,0.3,2.1,0.3c1.3,0,2.7-0.4,3.9-1.1
			
 
				-	c0.4-0.2,0.7-0.5,1-0.7l0,0c1.7,0.8,3.5,1.2,5.4,1.2c1.9,0,3.7-0.4,5.4-1.2c0.3,0.2,0.6,0.5,1,0.7c1.2,0.7,2.5,1.1,3.9,1.1
			
 
				-	c0.8,0,1.4-0.1,2-0.3c1.9-0.5,3.6-1.8,4.7-3.7C36.5,30.8,36.8,28.6,36.2,26.6z M18.5,4.9c2.9,0,5.3,2.4,5.3,5.4c0,3-2.4,5.4-5.3,5.4
			
 
				-	c-2.9,0-5.3-2.4-5.3-5.4C13.2,7.4,15.5,4.9,18.5,4.9z M10.9,33.3C10.1,33.8,9.1,34,8.2,34c-0.5,0-0.9-0.1-1.4-0.2
			
 
				-	c-1.4-0.4-2.5-1.3-3.2-2.5c-1.4-2.6-0.6-6,2-7.4c0.8-0.5,1.7-0.7,2.6-0.7c0.5,0,0.9,0.1,1.4,0.2c1.4,0.4,2.6,1.3,3.3,2.5
			
 
				-	c0.7,1.2,0.9,2.7,0.5,4.1C13,31.4,12.1,32.6,10.9,33.3z M14.7,32.8c0.4-0.7,0.7-1.4,0.9-2.1c0.6-2,0.3-4.2-0.8-6
			
 
				-	c-1-1.8-2.7-3.1-4.7-3.7c-0.8-0.2-1.5-0.3-2.3-0.3c0.4-2.6,1.8-5,3.7-6.7c1.3,2.5,3.9,4.3,6.9,4.3c3,0,5.6-1.7,6.9-4.3
			
 
				-	c2,1.7,3.3,4.1,3.7,6.7c-0.8,0-1.5,0.1-2.2,0.3c-1.9,0.5-3.6,1.8-4.7,3.7c-1,1.7-1.3,3.8-0.8,6c0.2,0.8,0.5,1.5,0.9,2.2
			
 
				-	C19.8,33.7,17.1,33.7,14.7,32.8z M33.4,31.3c-0.8,1.3-1.9,2.2-3.2,2.5l-0.1,0C29.7,34,29.3,34,28.8,34c-0.9,0-1.8-0.2-2.7-0.7
			
 
				-	c-0.9-0.6-2.1-1.6-2.5-3.3c-0.4-1.5-0.2-2.9,0.5-4.1c0.8-1.3,1.9-2.2,3.3-2.5c0.5-0.1,0.9-0.2,1.4-0.2c0.9,0,1.8,0.2,2.6,0.7
			
 
				-	C34,25.4,34.9,28.7,33.4,31.3C33.4,31.3,33.4,31.3,33.4,31.3z"/>
			
 
				-</svg>
			
--- a/src/static/icons/tabBar/analyse.svg
+++ b/src/static/icons/tabBar/analyse.svg
@@ -1,21 +0,0 @@
 
				-<?xml version="1.0" encoding="utf-8"?>
			
 
				-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
			
 
				-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
			
 
				-	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
			
 
				-<style type="text/css">
			
 
				-	.st0{fill:#898989;}
			
 
				-</style>
			
 
				-<path class="st0" d="M36.2,26.6c-0.5-2.1-1.8-3.8-3.6-4.8c-0.3-0.2-0.7-0.4-1.1-0.5v0c-0.3-3.9-2.3-7.4-5.4-9.6
			
 
				-	c0-0.4,0.1-0.8,0.1-1.2c0-4.4-3.5-7.9-7.7-7.9c-4.3,0-7.7,3.5-7.7,7.9c0,0.4,0,0.8,0.1,1.2c-3.1,2.3-5.1,5.8-5.4,9.7
			
 
				-	c-0.3,0.2-0.7,0.3-1,0.5c-3.6,2.2-4.9,7-2.8,10.8c1,1.8,2.7,3.2,4.6,3.7c0.7,0.2,1.3,0.3,2.1,0.3c1.3,0,2.7-0.4,3.9-1.1
			
 
				-	c0.4-0.2,0.7-0.5,1-0.7l0,0c1.7,0.8,3.5,1.2,5.4,1.2c1.9,0,3.7-0.4,5.4-1.2c0.3,0.2,0.6,0.5,1,0.7c1.2,0.7,2.5,1.1,3.9,1.1
			
 
				-	c0.8,0,1.4-0.1,2-0.3c1.9-0.5,3.6-1.8,4.7-3.7C36.5,30.8,36.8,28.6,36.2,26.6z M18.5,4.9c2.9,0,5.3,2.4,5.3,5.4c0,3-2.4,5.4-5.3,5.4
			
 
				-	c-2.9,0-5.3-2.4-5.3-5.4C13.2,7.4,15.5,4.9,18.5,4.9z M10.9,33.3C10.1,33.8,9.1,34,8.2,34c-0.5,0-0.9-0.1-1.4-0.2
			
 
				-	c-1.4-0.4-2.5-1.3-3.2-2.5c-1.4-2.6-0.6-6,2-7.4c0.8-0.5,1.7-0.7,2.6-0.7c0.5,0,0.9,0.1,1.4,0.2c1.4,0.4,2.6,1.3,3.3,2.5
			
 
				-	c0.7,1.2,0.9,2.7,0.5,4.1C13,31.4,12.1,32.6,10.9,33.3z M14.7,32.8c0.4-0.7,0.7-1.4,0.9-2.1c0.6-2,0.3-4.2-0.8-6
			
 
				-	c-1-1.8-2.7-3.1-4.7-3.7c-0.8-0.2-1.5-0.3-2.3-0.3c0.4-2.6,1.8-5,3.7-6.7c1.3,2.5,3.9,4.3,6.9,4.3c3,0,5.6-1.7,6.9-4.3
			
 
				-	c2,1.7,3.3,4.1,3.7,6.7c-0.8,0-1.5,0.1-2.2,0.3c-1.9,0.5-3.6,1.8-4.7,3.7c-1,1.7-1.3,3.8-0.8,6c0.2,0.8,0.5,1.5,0.9,2.2
			
 
				-	C19.8,33.7,17.1,33.7,14.7,32.8z M33.4,31.3c-0.8,1.3-1.9,2.2-3.2,2.5l-0.1,0C29.7,34,29.3,34,28.8,34c-0.9,0-1.8-0.2-2.7-0.7
			
 
				-	c-0.9-0.6-2.1-1.6-2.5-3.3c-0.4-1.5-0.2-2.9,0.5-4.1c0.8-1.3,1.9-2.2,3.3-2.5c0.5-0.1,0.9-0.2,1.4-0.2c0.9,0,1.8,0.2,2.6,0.7
			
 
				-	C34,25.4,34.9,28.7,33.4,31.3C33.4,31.3,33.4,31.3,33.4,31.3z"/>
			
 
				-</svg>
			
--- a/src/static/icons/tabBar/home-selected.svg
+++ b/src/static/icons/tabBar/home-selected.svg
@@ -1,13 +0,0 @@
 
				-<?xml version="1.0" encoding="utf-8"?>
			
 
				-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
			
 
				-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
			
 
				-	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
			
 
				-<style type="text/css">
			
 
				-	.st0{fill:#252525;}
			
 
				-</style>
			
 
				-<path class="st0" d="M36,16.1L21.1,3.4c-1.4-1.2-3.5-1.2-4.9,0L1,16.1c-0.3,0.3-0.5,0.6-0.5,1c0,0.7,0.6,1.3,1.3,1.3
			
 
				-	c0.3,0,0.6-0.1,0.8-0.3l0.4-0.4v14.4c0,2.9,2.2,5.3,5,5.3h21c2.7,0,4.9-2.4,4.9-5.3V17.7l0.4,0.3c0.3,0.2,0.5,0.3,0.9,0.3
			
 
				-	c0.7,0,1.3-0.6,1.3-1.3C36.5,16.8,36.3,16.4,36,16.1z M15.9,34.9v-9.1c0-0.7,0.6-1.3,1.3-1.3h2.6c0.7,0,1.3,0.6,1.3,1.3v9.1H15.9z
			
 
				-	 M31.4,32.2c0,1.5-1.1,2.7-2.4,2.7h-5.3v-9.1c0-2.1-1.7-3.9-3.9-3.9h-2.6c-2.1,0-3.9,1.7-3.9,3.9v9.1H8.1c-1.3,0-2.4-1.2-2.4-2.7
			
 
				-	V15.6L17.7,5.4c0.4-0.4,1.2-0.4,1.7,0l12,10.1V32.2z"/>
			
 
				-</svg>
			
--- a/src/static/icons/tabBar/home.svg
+++ b/src/static/icons/tabBar/home.svg
@@ -1,13 +0,0 @@
 
				-<?xml version="1.0" encoding="utf-8"?>
			
 
				-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
			
 
				-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
			
 
				-	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
			
 
				-<style type="text/css">
			
 
				-	.st0{fill:#898989;}
			
 
				-</style>
			
 
				-<path class="st0" d="M36,16.1L21.1,3.4c-1.4-1.2-3.5-1.2-4.9,0L1,16.1c-0.3,0.3-0.5,0.6-0.5,1c0,0.7,0.6,1.3,1.3,1.3
			
 
				-	c0.3,0,0.6-0.1,0.8-0.3l0.4-0.4v14.4c0,2.9,2.2,5.3,5,5.3h21c2.7,0,4.9-2.4,4.9-5.3V17.7l0.4,0.3c0.3,0.2,0.5,0.3,0.9,0.3
			
 
				-	c0.7,0,1.3-0.6,1.3-1.3C36.5,16.8,36.3,16.4,36,16.1z M15.9,34.9v-9.1c0-0.7,0.6-1.3,1.3-1.3h2.6c0.7,0,1.3,0.6,1.3,1.3v9.1H15.9z
			
 
				-	 M31.4,32.2c0,1.5-1.1,2.7-2.4,2.7h-5.3v-9.1c0-2.1-1.7-3.9-3.9-3.9h-2.6c-2.1,0-3.9,1.7-3.9,3.9v9.1H8.1c-1.3,0-2.4-1.2-2.4-2.7
			
 
				-	V15.6L17.7,5.4c0.4-0.4,1.2-0.4,1.7,0l12,10.1V32.2z"/>
			
 
				-</svg>
			
--- a/src/static/icons/tabBar/info-selected.svg
+++ b/src/static/icons/tabBar/info-selected.svg
@@ -1,23 +0,0 @@
 
				-<?xml version="1.0" encoding="utf-8"?>
			
 
				-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
			
 
				-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
			
 
				-	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
			
 
				-<style type="text/css">
			
 
				-	.st0{fill:#252525;}
			
 
				-</style>
			
 
				-<path class="st0" d="M8.1,5.5c0.5-0.3,0.7-1,0.4-1.5C8.2,3.4,7.6,3.3,7,3.6c0,0,0,0,0,0c-4,2.7-6.4,7.1-6.5,11.9
			
 
				-	c0,0.6,0.4,1.1,1,1.2c0,0,0,0,0,0h0c0.6,0,1.1-0.5,1.1-1.1C2.8,11.6,4.8,7.8,8.1,5.5z M30,3.6c-0.5-0.3-1.2-0.1-1.5,0.4c0,0,0,0,0,0
			
 
				-	c-0.3,0.5-0.1,1.2,0.4,1.5c0,0,0,0,0,0c3.3,2.3,5.3,6.1,5.4,10.1c0,0.6,0.5,1.1,1.1,1.1h0c0.6,0,1.1-0.6,1-1.2
			
 
				-	C36.4,10.7,34,6.3,30,3.6L30,3.6z M15.4,34.7V35c0,0.1,0,0.1,0,0.3v0c0,0.1,0,0.2,0.1,0.2v0c0,0.1,0.1,0.1,0.1,0.2v0l0.1,0.2v0
			
 
				-	c0,0.1,0.1,0.1,0.2,0.2c0,0,0,0,0,0c0,0.1,0.1,0.1,0.2,0.2c0,0,0,0,0,0c0,0.1,0.1,0.1,0.2,0.2c1.3,1.2,3.3,1.2,4.6,0
			
 
				-	c0.1,0,0.1-0.1,0.1-0.2c0,0,0,0,0,0c0-0.1,0.1-0.1,0.1-0.2c0,0,0,0,0,0c0-0.1,0.1-0.1,0.1-0.2v0l0.1-0.2v0c0-0.1,0.1-0.1,0.1-0.2v0
			
 
				-	c0-0.1,0.1-0.1,0.1-0.2v0c0-0.1,0-0.2,0-0.3v-0.3l-5.2,0L15.4,34.7L15.4,34.7z M30.6,26.8c-0.4-0.3-0.7-0.7-0.7-1.3V14.7
			
 
				-	c0-1.3-0.3-2.7-0.9-3.9c-0.6-1.2-1.4-2.3-2.5-3.1c-1.1-0.9-2.3-1.6-3.7-2.2c-0.5-0.2-1-0.3-1.6-0.4V4c-0.3-1.6-1.8-2.8-3.4-2.5
			
 
				-	c-1.3,0.2-2.3,1.2-2.5,2.5v1.1c-0.5,0.1-1,0.3-1.6,0.5c-1.4,0.5-2.6,1.2-3.7,2.2c-1,0.9-1.9,1.9-2.5,3.1c-0.6,1.2-0.9,2.5-0.9,3.9
			
 
				-	v10.8c0,0.5-0.3,1-0.7,1.3l-2.5,1.7c-0.5,0.3-0.8,0.7-1,1.3c-0.3,1,0.1,2,1,2.5c0.5,0.3,1.1,0.5,1.7,0.5h26.1c0.6,0,1.2-0.2,1.7-0.5
			
 
				-	c1-0.4,1.5-1.5,1.2-2.5c-0.2-0.5-0.5-1-1-1.3L30.6,26.8L30.6,26.8z M17.9,4.2C18.1,4,18.2,4,18.4,4C18.6,4,18.8,4,19,4.2v0.7h-1.1
			
 
				-	C17.9,4.6,17.9,4.4,17.9,4.2z M17.9,3.6c-0.1,0.1-0.3,0.2-0.3,0.3C17.6,3.8,17.7,3.7,17.9,3.6z M17.6,3.9c-0.1,0-0.1,0.1-0.1,0.1
			
 
				-	C17.5,4,17.5,4,17.6,3.9z M31.5,30.5H5.2l2.3-1.6c1.1-0.7,1.7-1.9,1.8-3.2V14.9c0-1,0.2-1.9,0.7-2.8c0.5-0.9,1.1-1.7,1.9-2.4
			
 
				-	c0.9-0.7,1.9-1.3,2.9-1.7c0.4-0.1,0.9-0.3,1.3-0.4l1.6-0.4h1.6l1.7,0.4c0.4,0.1,0.8,0.2,1.2,0.4c1.1,0.4,2.1,1,2.9,1.7
			
 
				-	c0.8,0.7,1.4,1.5,1.9,2.4c0.4,0.9,0.7,1.8,0.7,2.8v10.8c0,1.3,0.7,2.5,1.7,3.2l2.3,1.6H31.5z"/>
			
 
				-</svg>
			
--- a/src/static/icons/tabBar/info.svg
+++ b/src/static/icons/tabBar/info.svg
@@ -1,23 +0,0 @@
 
				-<?xml version="1.0" encoding="utf-8"?>
			
 
				-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
			
 
				-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
			
 
				-	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
			
 
				-<style type="text/css">
			
 
				-	.st0{fill:#898989;}
			
 
				-</style>
			
 
				-<path class="st0" d="M8.1,5.5c0.5-0.3,0.7-1,0.4-1.5C8.2,3.4,7.6,3.3,7,3.6c0,0,0,0,0,0c-4,2.7-6.4,7.1-6.5,11.9
			
 
				-	c0,0.6,0.4,1.1,1,1.2c0,0,0,0,0,0h0c0.6,0,1.1-0.5,1.1-1.1C2.8,11.6,4.8,7.8,8.1,5.5z M30,3.6c-0.5-0.3-1.2-0.1-1.5,0.4c0,0,0,0,0,0
			
 
				-	c-0.3,0.5-0.1,1.2,0.4,1.5c0,0,0,0,0,0c3.3,2.3,5.3,6.1,5.4,10.1c0,0.6,0.5,1.1,1.1,1.1h0c0.6,0,1.1-0.6,1-1.2
			
 
				-	C36.4,10.7,34,6.3,30,3.6L30,3.6z M15.4,34.7V35c0,0.1,0,0.2,0,0.3v0c0,0.1,0,0.2,0.1,0.2v0c0,0.1,0.1,0.1,0.1,0.2v0l0.1,0.2v0
			
 
				-	c0,0.1,0.1,0.1,0.2,0.2c0,0,0,0,0,0c0,0.1,0.1,0.1,0.2,0.2c0,0,0,0,0,0c0,0.1,0.1,0.1,0.2,0.1c1.3,1.2,3.3,1.2,4.6,0
			
 
				-	c0.1,0,0.1-0.1,0.1-0.2c0,0,0,0,0,0c0-0.1,0.1-0.1,0.1-0.2c0,0,0,0,0,0c0-0.1,0.1-0.1,0.1-0.2v0l0.1-0.2v0c0-0.1,0.1-0.1,0.1-0.2v0
			
 
				-	c0-0.1,0.1-0.1,0.1-0.2v0c0-0.1,0-0.1,0-0.3v-0.3l-5.2,0L15.4,34.7L15.4,34.7z M30.6,26.8c-0.4-0.3-0.7-0.7-0.7-1.3V14.7
			
 
				-	c0-1.3-0.3-2.7-0.9-3.9c-0.6-1.2-1.4-2.3-2.5-3.1c-1.1-0.9-2.3-1.6-3.7-2.2c-0.5-0.2-1-0.3-1.6-0.4V4c-0.3-1.6-1.8-2.8-3.4-2.5
			
 
				-	c-1.3,0.2-2.3,1.2-2.5,2.5v1.1c-0.5,0.1-1,0.3-1.6,0.5c-1.4,0.5-2.6,1.2-3.7,2.2c-1,0.9-1.9,1.9-2.5,3.1c-0.6,1.2-0.9,2.5-0.9,3.9
			
 
				-	v10.8c0,0.5-0.3,1-0.7,1.3l-2.5,1.7c-0.5,0.3-0.8,0.7-1,1.3c-0.3,1,0.1,2,1,2.5c0.5,0.3,1.1,0.5,1.7,0.5h26.1c0.6,0,1.2-0.2,1.7-0.5
			
 
				-	c1-0.4,1.5-1.5,1.2-2.5c-0.2-0.5-0.5-1-1-1.3L30.6,26.8L30.6,26.8z M17.9,4.2C18.1,4,18.2,4,18.4,4C18.6,4,18.8,4,19,4.2v0.7h-1.1
			
 
				-	C17.9,4.6,17.9,4.4,17.9,4.2z M17.9,3.6c-0.1,0.1-0.3,0.2-0.3,0.3C17.6,3.8,17.7,3.7,17.9,3.6z M17.6,3.9c-0.1,0-0.1,0.1-0.1,0.1
			
 
				-	C17.5,4,17.5,4,17.6,3.9z M31.5,30.5H5.2l2.3-1.6c1.1-0.7,1.7-1.9,1.8-3.2V14.9c0-1,0.2-1.9,0.7-2.8c0.5-0.9,1.1-1.7,1.9-2.4
			
 
				-	c0.9-0.7,1.9-1.3,2.9-1.7c0.4-0.1,0.9-0.3,1.3-0.4l1.6-0.4h1.6l1.7,0.4c0.4,0.1,0.8,0.2,1.2,0.4c1.1,0.4,2.1,1,2.9,1.7
			
 
				-	c0.8,0.7,1.4,1.5,1.9,2.4c0.4,0.9,0.7,1.8,0.7,2.8v10.8c0,1.3,0.7,2.5,1.7,3.2l2.3,1.6H31.5z"/>
			
 
				-</svg>
			
--- a/src/static/icons/tabBar/setting-selected.svg
+++ b/src/static/icons/tabBar/setting-selected.svg
@@ -1,13 +0,0 @@
 
				-<?xml version="1.0" encoding="utf-8"?>
			
 
				-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
			
 
				-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
			
 
				-	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
			
 
				-<style type="text/css">
			
 
				-	.st0{fill:#252525;}
			
 
				-</style>
			
 
				-<path class="st0" d="M35.5,33.7c-0.1-6.2-3.4-11.6-8.3-14.5c3.4-4.3,3.1-10.5-0.8-14.5c-2.1-2.1-4.8-3.2-7.6-3.2
			
 
				-	c-2.7,0-5.5,1.1-7.6,3.2c-3.8,3.9-4.2,10-1,14.2c0,0,0,0,0,0c-5.2,2.9-8.7,8.4-8.8,14.8h0v1.7c0,1.1,0.9,2,2,2h30c1.1,0,2-0.9,2-2
			
 
				-	L35.5,33.7L35.5,33.7L35.5,33.7z M12.7,6.1c1.6-1.7,3.8-2.6,6.2-2.6c2.3,0,4.5,0.9,6.2,2.6c1.6,1.7,2.6,3.9,2.6,6.3
			
 
				-	c0,2.4-0.9,4.6-2.6,6.3c-1.6,1.7-3.8,2.6-6.2,2.6c-2.3,0-4.5-0.9-6.2-2.6C9.3,15.2,9.3,9.6,12.7,6.1z M31.5,35.5h-26h-2V34l0,0
			
 
				-	c0-5.9,3.3-11,8.2-13.5c2,1.9,4.6,2.8,7.2,2.8c2.5,0,4.9-0.9,6.9-2.6c4.6,2.6,7.7,7.6,7.7,13.3v1.5H31.5z"/>
			
 
				-</svg>
			
--- a/src/static/icons/tabBar/setting.svg
+++ b/src/static/icons/tabBar/setting.svg
@@ -1,13 +0,0 @@
 
				-<?xml version="1.0" encoding="utf-8"?>
			
 
				-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
			
 
				-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
			
 
				-	 viewBox="0 0 38 38" style="enable-background:new 0 0 38 38;" xml:space="preserve">
			
 
				-<style type="text/css">
			
 
				-	.st0{fill:#898989;}
			
 
				-</style>
			
 
				-<path class="st0" d="M35.5,33.7c-0.1-6.2-3.4-11.6-8.3-14.5c3.4-4.3,3.1-10.5-0.8-14.5c-2.1-2.1-4.8-3.2-7.6-3.2
			
 
				-	c-2.7,0-5.5,1.1-7.6,3.2c-3.8,3.9-4.2,10-1,14.2c0,0,0,0,0,0c-5.2,2.9-8.7,8.4-8.8,14.8h0v1.7c0,1.1,0.9,2,2,2h30c1.1,0,2-0.9,2-2
			
 
				-	L35.5,33.7L35.5,33.7L35.5,33.7z M12.7,6.1c1.6-1.7,3.8-2.6,6.2-2.6c2.3,0,4.5,0.9,6.2,2.6c1.6,1.7,2.6,3.9,2.6,6.3
			
 
				-	c0,2.4-0.9,4.6-2.6,6.3c-1.6,1.7-3.8,2.6-6.2,2.6c-2.3,0-4.5-0.9-6.2-2.6C9.3,15.2,9.3,9.6,12.7,6.1z M31.5,35.5h-26h-2V34l0,0
			
 
				-	c0-5.9,3.3-11,8.2-13.5c2,1.9,4.6,2.8,7.2,2.8c2.5,0,4.9-0.9,6.9-2.6c4.6,2.6,7.7,7.6,7.7,13.3v1.5H31.5z"/>
			
 
				-</svg>
			
--- a/src/static/icons/white/0.png
+++ b/src/static/icons/white/0.png
--- a/src/static/icons/white/1.png
+++ b/src/static/icons/white/1.png
--- a/src/static/icons/white/10.png
+++ b/src/static/icons/white/10.png
--- a/src/static/icons/white/11.png
+++ b/src/static/icons/white/11.png
--- a/src/static/icons/white/12.png
+++ b/src/static/icons/white/12.png
--- a/src/static/icons/white/13.png
+++ b/src/static/icons/white/13.png
--- a/src/static/icons/white/14.png
+++ b/src/static/icons/white/14.png
--- a/src/static/icons/white/15.png
+++ b/src/static/icons/white/15.png
--- a/src/static/icons/white/16.png
+++ b/src/static/icons/white/16.png
--- a/src/static/icons/white/17.png
+++ b/src/static/icons/white/17.png
--- a/src/static/icons/white/18.png
+++ b/src/static/icons/white/18.png
--- a/src/static/icons/white/19.png
+++ b/src/static/icons/white/19.png
--- a/src/static/icons/white/2.png
+++ b/src/static/icons/white/2.png
--- a/src/static/icons/white/20.png
+++ b/src/static/icons/white/20.png
--- a/src/static/icons/white/21.png
+++ b/src/static/icons/white/21.png
--- a/src/static/icons/white/22.png
+++ b/src/static/icons/white/22.png
--- a/src/static/icons/white/23.png
+++ b/src/static/icons/white/23.png
--- a/src/static/icons/white/24.png
+++ b/src/static/icons/white/24.png
--- a/src/static/icons/white/25.png
+++ b/src/static/icons/white/25.png
--- a/src/static/icons/white/26.png
+++ b/src/static/icons/white/26.png
--- a/src/static/icons/white/27.png
+++ b/src/static/icons/white/27.png
--- a/src/static/icons/white/28.png
+++ b/src/static/icons/white/28.png
--- a/src/static/icons/white/29.png
+++ b/src/static/icons/white/29.png
--- a/src/static/icons/white/3.png
+++ b/src/static/icons/white/3.png
--- a/src/static/icons/white/30.png
+++ b/src/static/icons/white/30.png
--- a/src/static/icons/white/31.png
+++ b/src/static/icons/white/31.png
--- a/src/static/icons/white/32.png
+++ b/src/static/icons/white/32.png
--- a/src/static/icons/white/33.png
+++ b/src/static/icons/white/33.png
--- a/src/static/icons/white/34.png
+++ b/src/static/icons/white/34.png
--- a/src/static/icons/white/35.png
+++ b/src/static/icons/white/35.png
--- a/src/static/icons/white/36.png
+++ b/src/static/icons/white/36.png
--- a/src/static/icons/white/37.png
+++ b/src/static/icons/white/37.png
--- a/src/static/icons/white/38.png
+++ b/src/static/icons/white/38.png
--- a/src/static/icons/white/4.png
+++ b/src/static/icons/white/4.png
--- a/src/static/icons/white/5.png
+++ b/src/static/icons/white/5.png
--- a/src/static/icons/white/6.png
+++ b/src/static/icons/white/6.png
--- a/src/static/icons/white/7.png
+++ b/src/static/icons/white/7.png
--- a/src/static/icons/white/8.png
+++ b/src/static/icons/white/8.png
--- a/src/static/icons/white/9.png
+++ b/src/static/icons/white/9.png
--- a/src/static/icons/white/99.png
+++ b/src/static/icons/white/99.png
--- a/src/static/logo.png
+++ b/src/static/logo.png
--- a/src/static/logo200.png
+++ b/src/static/logo200.png
--- a/src/static/mp3/XJWC.mp3
+++ b/src/static/mp3/XJWC.mp3