Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

liuyg

2021-07-20 401c42a85d4c33b40b4a5902e9f21b01830e80c5

 public/map/widgets/alertSecurity/AlertSecurity.js

@@ -132,11 +132,6 @@
    entitysData: [],







    // 巡逻区域或者巡逻路线的描述
    routeOrRegionDescribe: null,

@@ -186,8 +181,6 @@
      objThis._map.addLayer(objThis._siteLayer);




    },

    getQueryStringByKey: function (key) {
@@ -201,8 +194,9 @@
      var openid = that.getQueryStringByKey('id');
      var lgtd = that.getQueryStringByKey('jd');
      var lttd = that.getQueryStringByKey('wd');
      var deptId = that.getQueryStringByKey('deptId').slice(0,19);//报错deptId格式不对liu.2021.5.7
      var deptId = that.getQueryStringByKey('deptId').slice(0, 19);//报错deptId格式不对liu.2021.5.7
      var oneId = that.getQueryStringByKey('oneId');
      var baid = that.getQueryStringByKey('baid');

      that.addPoint(that.addEntitys, lgtd, lttd, './images/jingbaored.png');
      that.createEntitys(that.addEntitys, lgtd, lttd, './images/real-time-callPolice-opcity.png');
@@ -227,14 +221,54 @@
              that.addPoints(that.addEntitys, item.jd, item.wd, './images/security.png')
            }
          });
          if (baid != null && baid != ""){
            $.ajax({
              url: "http://localhost:82/routeIn/routein/selectList?id=" + baid,
              type: 'post',
              dataType: 'JSON',
              success: function (res) {
                var entityData = '';
                var entityArr = [];
                entityData = res.data[0].routeInfo.match(/\(([^)]*)\)/);

                // 此时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(b[0]), Number(b[1])]);
                  }

                }
                that.addPolygonAll(that.addEntitys, entityArr);

              }
            })
          }
        }
      })
      });

    },
    close: function () {

    },

    addPolygonAll: function (entitys, rings) {
      // entitys.clear();
      var graphic = null;
      var polylineSymbol = new SimpleLineSymbol();
      polylineSymbol.color = [255, 0, 0, 1];
      polylineSymbol.width = 4;
      var polyline = new Polyline({
        "paths": [rings],
        "spatialReference": {
          "wkid": 4326
        }
      });
      graphic = new Graphic(polyline, polylineSymbol)
      entitys.add(graphic);
    },
    addPoint: function (entitys, lgtd, lttd, img) {
      var symbol = new esri.symbol.PictureMarkerSymbol(img, 22, 32);
      symbol.xoffset = 0;