update

liujie

2023-08-16 db7fa6a91b9534ac90e219b6f554c54c43c83a5a

 management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageMap.html

@@ -9,12 +9,6 @@

                <div class="row row-lg">
                    <div class="col-sm-12" >
<!--                        <div class="initialLevel col-sm-12 control-label form-group" style="cursor: pointer;text-align: left;">-->
<!--                            <div class="initialLevel col-sm-3 control-label form-group"  >-->
<!--                                <label class="control-label" >运营数据总览/车辆地图总览/</label>-->
<!--                                <label class="control-label" style="color: red">订单热点图</label>-->
<!--                            </div>-->
<!--                        </div>-->

                        <div class="initialLevel col-sm-12 control-label form-group" style="cursor: pointer;text-align: left;">
                            <div class="initialLevel col-sm-1 control-label form-group"  >
@@ -34,9 +28,13 @@
                                    <option value="4">已取消</option>
                                </select>
                            </div>
                            <div class="initialLevel col-sm-2 control-label form-group"  >
                                <#button name="查询" icon="fa-search" clickFun="getData()"/>
                                <#button name="重置" icon="fa-trash" clickFun="reset()" space="true"/>
                            <div class="col-sm-2">
                                <button type="button" class="btn btn-primary " onclick="getData()" style="height: 33px">
                                    <i class="fa fa-search"></i>&nbsp;查询
                                </button>
                                <button type="button" class="btn btn-primary button-margin" onclick="reset()" style="height: 33px">
                                    <i class="fa fa-trash"></i>&nbsp;重置
                                </button>
                            </div>
                        </div>
                        <div class="col-sm-10" >
@@ -126,6 +124,9 @@
        border-bottom-right-radius: 4px;
        overflow: hidden;
    }
    .btn{
        height: 33px
    }
</style>
<script type="text/javascript">

@@ -213,7 +214,7 @@
            M.forEach(function(marker) {
                new AMap.Marker({
                    map: map,
                    icon: marker[2]==301?'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-1.png':((marker[2]==109||marker[2]==107||marker[2]==108)?'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-2.png':
                    icon: marker[2]==301?'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-1.png':((marker[2]==109||marker[2]==107||marker[2]==108)?'https://csxdj.obs.cn-south-1.myhuaweicloud.com/c1d2f38187de40daa353fcc70993288e.png':
                            (marker[2]==101?'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-3.png':'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-4.png')
                    ),
                    position: [marker[0], marker[1]],
@@ -230,7 +231,7 @@
            M.forEach(function(marker) {
                new AMap.Marker({
                    map: map,
                    icon: marker[2]==1?'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-5.png':'//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-6.png',
                    icon: 'https://csxdj.obs.cn-south-1.myhuaweicloud.com/c1d2f38187de40daa353fcc70993288e.png',
                    position: [marker[0], marker[1]],
                    offset: new AMap.Pixel(-13, -30)
                });
@@ -278,6 +279,7 @@


    $(function(){
        $('.btn').css('height','33px')
        map("");
        getOrder();
    })