地图文件相关修改

shuishen

2021-03-20 1961bed1f17c953cab383102b28498152f1e6f70

地图文件相关修改

 public/map/widgets/aPoliceTeam/APoliceTeam.js

@@ -174,12 +174,18 @@
            objThis = this;


            this.addEntitys = new GraphicsLayer({id: 'addEntitys'});
      this.addEntitys = new GraphicsLayer({
        id: 'addEntitys'
      });

            // 添加点面线的图层
            this.addPolygonEntitys = new GraphicsLayer({id: 'addPolygonEntitys'});
      this.addPolygonEntitys = new GraphicsLayer({
        id: 'addPolygonEntitys'
      });
            // 添加所有图层的地方
            this.entityPolygonAll = new GraphicsLayer({id: 'entityPolygonAll'});
      this.entityPolygonAll = new GraphicsLayer({
        id: 'entityPolygonAll'
      });


            this._map.addLayer(this.addEntitys);
@@ -233,7 +239,9 @@
            $('.police-container .police-container-distribute .table .tbody').off('click', 'tr').on('click', 'tr', function () {
                var lgtd = Number($(this).attr('lgtd'));
                var lttd = Number($(this).attr('lttd'));
                var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({wkid: 4326}));//根据输入坐标信息找地图上的点
        var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({
          wkid: 4326
        })); //根据输入坐标信息找地图上的点
                that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
            })
            // 编辑，跟进按钮元素的父元素的点击事件
@@ -298,7 +306,7 @@
                                            var result = data.data;

                                            for (var i = 0; i < result.length; i++) {
                                                str += "<tr> <td>" + (Number(i) + 1) + "</td> <td>" + result[i].sname + "</td> <td>" + result[i].distance.toFixed(2) + "</td> <td><input type='radio' name='securityStaff' securityid=" + result[i].snumber + " securityname=" + result[i].sname + "> </td> </tr>"
                        str += "<tr> <td>" + (Number(i) + 1) + "</td> <td>" + result[i].real_name + "</td> <td>" + result[i].distance.toFixed(2) + "</td> <td><input type='radio' name='securityStaff' securityid=" + result[i].CODE + " securityname=" + result[i].real_name + "> </td> </tr>"
                                            }

                                            $('.police-container-distribute-details .security-guard-nearby .security-staff-content tbody').append(str);
@@ -681,7 +689,9 @@
                event.stopPropagation();
                var lgtd = Number($(this).parent().parent().attr('lgtd'));
                var lttd = Number($(this).parent().parent().attr('lttd'));
                var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({wkid: 4326}));//根据输入坐标信息找地图上的点
        var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({
          wkid: 4326
        })); //根据输入坐标信息找地图上的点
                that.newElectronicFenceId = null;
                that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
                var graphic = that.entityPolygonAll.graphics;
@@ -705,7 +715,9 @@
                event.stopPropagation();
                var lgtd = Number($(this).attr('lgtd'));
                var lttd = Number($(this).attr('lttd'));
                var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({wkid: 4326}));//根据输入坐标信息找地图上的点
        var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({
          wkid: 4326
        })); //根据输入坐标信息找地图上的点

                that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大

@@ -1596,7 +1608,7 @@
                        objId.routeName = result[i].routeName;
                        objId.remarks = result[i].remarks;
                        that.addPolygonAll(that.entityPolygonAll, entityArr, objId);
                        str += "<tr flyid=" + result[i].id + " flyname=" + result[i].routeName + "> <td>" + (Number(i) + 1) + "</td> <td>" + result[i].sname + "</td> <td>" + result[i].routeName + "</td> <td> <a href='javascript:;' title=" + result[i].rtime + ">" + result[i].rtime.substr(5, 11) + "</a></td> <td><input type='button' value='编辑'></td> </tr>";
            str += "<tr flyid=" + result[i].id + " flyname=" + result[i].routeName + "> <td>" + (Number(i) + 1) + "</td> <td>" + result[i].real_name + "</td> <td>" + result[i].routeName + "</td> <td> <a href='javascript:;' title=" + result[i].rtime + ">" + result[i].rtime.substr(5, 11) + "</a></td> <td><input type='button' value='编辑'></td> </tr>";
                        dom.append(str);
                        str = '';
                    }
@@ -1609,8 +1621,9 @@
            var that = this;
            that.currentDrawing = [];
            that.entityPolygonAll.clear();

            $.ajax({
                url: 'https://web.byisf.com:18001/api/blade-jfpts/security/security/selectList',
        url: 'https://web.byisf.com:18001/api/blade-jfpts/alarm/alarm/queryBa',
                type: 'POST',
                dataType: 'JSON',
                success: function (data) {
@@ -1620,7 +1633,6 @@
                    that.addEntitys.clear();
                    var entityArr = [];
                    var objId = {};
                    var entityData = '';
                    for (var a, i = 0; i < result.length; i++) {


@@ -1631,13 +1643,12 @@
                        }, result[i].jd, result[i].wd, './images/security.png');
                        entityArr = [];
                        objId = {};
                        entityData = result[i].coordinate.match(/\(([^)]*)\)/);

                        a = Number(i) + 1;
                        str += "<tr term-snumber=" + result[i].snumber + " lgtd=" + result[i].jd + " lttd=" + result[i].wd + ">";
            str += "<tr term-snumber=" + result[i].CODE + " lgtd=" + result[i].jd + " lttd=" + result[i].wd + ">";
                        str += '<td>' + a + '</td>';
                        str += '<td title=' + result[i].snumber + '>' + result[i].snumber + '</td>';
                        str += '<td title=' + result[i].sname + '>' + result[i].sname + '</td>';
            str += '<td title=' + result[i].CODE + '>' + result[i].CODE + '</td>';
            str += '<td title=' + result[i].real_name + '>' + result[i].real_name + '</td>';
                        str += '<td title=' + result[i].phone + '>' + result[i].phone + '</td>';
                        str += "<td> <input type='button' value='编辑' resultid=" + result[i].id + "> </td>";
                        str += '</tr>';
@@ -1646,15 +1657,12 @@


                        // 此时result＝["(dsfasjfj3124123)", "dsfasjfj3124123"];
                        if (entityData && entityData != '') {
                            entityData = entityData[1].split(',');
                            for (var j = 0; j < entityData.length; j++) {
                                entityArr.push([Number(entityData[j].split(' ')[0]), Number(entityData[j].split(' ')[1])]);
                            }
                        }

            entityArr.push([Number(result[i].jd), Number(result[i].wd)]);

                        objId.id = result[i].id;
                        objId.anumber = result[i].snumber;
                        objId.aname = result[i].sname;
            objId.anumber = result[i].CODE;
            objId.aname = result[i].real_name;

                        that.addPolygonAll(that.entityPolygonAll, entityArr, objId);
                    }
@@ -1662,13 +1670,68 @@

                }
            })
      // $.ajax({
      //     url: 'https://web.byisf.com:18001/api/blade-jfpts/security/security/selectList',
      //     type: 'POST',
      //     dataType: 'JSON',
      //     success: function (data) {
      //         var result = data.data;
      //         var str = '';
      //         that.entitysData = [];
      //         that.addEntitys.clear();
      //         var entityArr = [];
      //         var objId = {};
      //         var entityData = '';
      //         for (var a, i = 0; i < result.length; i++) {


      //             that.createEntitys(that.addEntitys, that.entitysData, '出警信息', {
      //                 lgtd: result[i].jd,
      //                 lttd: result[i].wd,
      //                 id: result[i].id
      //             }, result[i].jd, result[i].wd, './images/security.png');
      //             entityArr = [];
      //             objId = {};
      //             entityData = result[i].coordinate.match(/\(([^)]*)\)/);

      //             a = Number(i) + 1;
      //             str += "<tr term-snumber=" + result[i].snumber + " lgtd=" + result[i].jd + " lttd=" + result[i].wd + ">";
      //             str += '<td>' + a + '</td>';
      //             str += '<td title=' + result[i].snumber + '>' + result[i].snumber + '</td>';
      //             str += '<td title=' + result[i].sname + '>' + result[i].sname + '</td>';
      //             str += '<td title=' + result[i].phone + '>' + result[i].phone + '</td>';
      //             str += "<td> <input type='button' value='编辑' resultid=" + result[i].id + "> </td>";
      //             str += '</tr>';
      //             dom.append(str);
      //             str = '';


      //             // 此时result＝["(dsfasjfj3124123)", "dsfasjfj3124123"];
      //             if (entityData && entityData != '') {
      //                 entityData = entityData[1].split(',');
      //                 for (var j = 0; j < entityData.length; j++) {
      //                     entityArr.push([Number(entityData[j].split(' ')[0]), Number(entityData[j].split(' ')[1])]);
      //                 }
      //             }
      //             objId.id = result[i].id;
      //             objId.anumber = result[i].snumber;
      //             objId.aname = result[i].sname;

      //             that.addPolygonAll(that.entityPolygonAll, entityArr, objId);
      //         }


      //     }
      // })
        },
        // 创建实体图层
        createEntitys: function (entitys, entityContent, name, item, lgtd, lttd, outlineColors) {

            var symbol = new esri.symbol.PictureMarkerSymbol(outlineColors, 26, 26);
            symbol.name = name;
            var pt = new Point(lgtd, lttd, new esri.SpatialReference({wkid: 4326}));
      var pt = new Point(lgtd, lttd, new esri.SpatialReference({
        wkid: 4326
      }));
            pt.entityData = item;
            var graphic = new esri.Graphic(pt, symbol);
            entitys.add(graphic);
@@ -1678,7 +1741,9 @@
        },
        addPoint: function (entitys, lgtd, lttd) {
            var symbol = new esri.symbol.PictureMarkerSymbol('./images/real-time-callPolice.png', 10, 10);
            var pt = new Point(lgtd, lttd, new SpatialReference({wkid: 4326}));
      var pt = new Point(lgtd, lttd, new SpatialReference({
        wkid: 4326
      }));
            var graphic = new esri.Graphic(pt, symbol);
            entitys.add(graphic);
        },
@@ -1977,7 +2042,9 @@
            //init the layer, more options are available and explained in the cluster layer constructor
            that.clusterLayer = new FlareClusterLayer({
                id: "flare-cluster-layer",
                spatialReference: new esri.SpatialReference({"wkid": 4326}),
        spatialReference: new esri.SpatialReference({
          "wkid": 4326
        }),
                subTypeFlareProperty: "facilityType",
                singleFlareTooltipProperty: "name",
                displaySubTypeFlares: true,
@@ -2011,10 +2078,21 @@
            //set up a popup template
            var template = new PopupTemplate({
                title: "{name}",
                fieldInfos: [
                    {fieldName: "facilityType", label: "Facility Type", visible: true},
                    {fieldName: "postcode", label: "Post Code", visible: true},
                    {fieldName: "isOpen", label: "Opening Hours", visible: true}
        fieldInfos: [{
            fieldName: "facilityType",
            label: "Facility Type",
            visible: true
          },
          {
            fieldName: "postcode",
            label: "Post Code",
            visible: true
          },
          {
            fieldName: "isOpen",
            label: "Opening Hours",
            visible: true
          }
                ]
            });

@@ -2027,8 +2105,8 @@
            that.clusterLayer.addData(datas);


        }
        , clearLayer: function () {
    },
    clearLayer: function () {
            var that = this;
            that._map.removeLayer(that.clusterLayer);
            that.clusterLayer = null;

 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js

@@ -684,22 +684,19 @@
            dom.empty();
            var that = this;
            $.ajax({
                url: 'https://web.byisf.com:18001/api/blade-jfpts/jingdan/jingdan/selectList',
                type: 'POST',
                url: "https://web.byisf.com:18001/api/blade-jfpts/alarm/alarm/page?current=1&size=99999&waringType=&beginTime=" + beginTime + "&endTime=" +endTime +"&province=36&city=3601&district=" + addvcd,
                type: 'get',
                dataType: 'JSON',
                data: {
                    beginTime: beginTime,
                    endTime: endTime,
                    waringType: waringType,
                    district: addvcd,
                    type: ''
                },
                success: function (data) {
                    var result = data.data;
                    var result = data.data.records;
                    var str = '';
                    that.entitysData = [];
                    that.analysisAddEntitys.clear();
                    for (var a, time, t, e, y, h, i = 0; i < result.length; i++) {

                        if (result[i].waringType == "紧急求救") {
                            result[i].waringType = "一键求助"
                        }

                        that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '警情信息', {
                            lgtd: result[i].jd,
@@ -707,17 +704,16 @@
                            id: result[i].id
                        }, result[i].jd, result[i].wd, './images/police-situation.png');


                        t = result[i].galarmTime.substr(0, 10);
                        e = result[i].galarmTime.substr(11);
                        t = result[i].alarmTime.substr(0, 10);
                        e = result[i].alarmTime.substr(11);
                        time = t + '&nbsp;' + e;
                        y = result[i].galarmTime.substr(5, 5);
                        h = result[i].galarmTime.substr(11, 5);
                        y = result[i].alarmTime.substr(5, 5);
                        h = result[i].alarmTime.substr(11, 5);
                        a = Number(i) + 1;
                        str += '<tr term-list=' + result[i].id + '>';
                        str += '<td>' + a + '</td>';
                        str += '<td title=' + result[i].waringType + '>' + result[i].waringType + '</td>';
                        str += '<td title=' + result[i].addvnm + '>' + result[i].addvnm + '</td>';
                        str += '<td title=' + result[i].alarmPeople + '>' + result[i].alarmPeople + '</td>';
                        str += "<td><a href='javascript:;' title=" + time + ">" + y + ' ' + h + "</a></td>";
                        str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
                        str += '</tr>';

 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment1.css

File was deleted

 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment1.js

File was deleted

 public/map/widgets/analysisAndJudgment/template.html

@@ -21,14 +21,7 @@
                        <div class='select-list'>
                            <ul>
                                <li>全部</li>
                                <li>医疗求助</li>
                                <li>火警</li>
                                <li>紧急求救</li>
                                <li>盗警</li>
                                <li>普通报警</li>
                                <li>交通</li>
                                <li>中心调度</li>
                                <li>电话报警</li>
                                <li>一键求助</li>
                            </ul>
                        </div>
                    </li>
@@ -62,7 +55,7 @@
                                <tr>
                                    <th>序号</th>
                                    <th>类别</th>
                                    <th>行政区</th>
                                    <th>接警员</th>
                                    <th>日期</th>
                                    <th>操作</th>
                                </tr>

 public/map/widgets/analysisAndJudgment/template1.html

File was deleted