liuyg
2021-07-17 21ce171baeba4483c9b446c9ffacc1a23e897ac2
Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity
30 files modified
323 ■■■■ changed files
public/map/popup/js/clientPopup.js 4 ●●●● patch | view | raw | blame | history
public/map/popup/js/equipment-details.js 2 ●●● patch | view | raw | blame | history
public/map/popup/js/equipment-history.js 2 ●●● patch | view | raw | blame | history
public/map/popup/js/owner-details.js 2 ●●● patch | view | raw | blame | history
public/map/popup/js/personnel-information-management.js 2 ●●● patch | view | raw | blame | history
public/map/popup/js/police-details.js 2 ●●● patch | view | raw | blame | history
public/map/popup/js/realtime-equipment-history.js 2 ●●● patch | view | raw | blame | history
public/map/popup/js/realtime-police-details.js 8 ●●●● patch | view | raw | blame | history
public/map/popup/js/route-name-layer.js 2 ●●● patch | view | raw | blame | history
public/map/popup/js/routename-and-peoplename.js 2 ●●● patch | view | raw | blame | history
public/map/widgets/aPoliceTeam/APoliceTeam.js 38 ●●●● patch | view | raw | blame | history
public/map/widgets/alertSecurity/AlertSecurity.js 6 ●●●● patch | view | raw | blame | history
public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js 12 ●●●● patch | view | raw | blame | history
public/map/widgets/patrolManagement/PatrolManagement.js 36 ●●●● patch | view | raw | blame | history
public/map/widgets/policeDispatching/PoliceDispatching.js 36 ●●●● patch | view | raw | blame | history
public/map/widgets/realTimePolice/RealTimePolice.js 14 ●●●● patch | view | raw | blame | history
public/map/widgets/securityMap/SecurityMap.js 4 ●●●● patch | view | raw | blame | history
public/map/widgets/securityMap/SecurityMap_copy1.js 4 ●●●● patch | view | raw | blame | history
src/views/clientManagement/clientManagement.vue 2 ●●● patch | view | raw | blame | history
src/views/clientManagement/clientManagement_copy.vue 2 ●●● patch | view | raw | blame | history
src/views/dataL/dataL.vue 8 ●●●● patch | view | raw | blame | history
src/views/distribution/index.vue 2 ●●● patch | view | raw | blame | history
src/views/policeInformationDistribution/index.vue 2 ●●● patch | view | raw | blame | history
src/views/policeInformationDistribution/patrolManagement.vue 2 ●●● patch | view | raw | blame | history
src/views/policeTracking/policeTracking.vue 4 ●●●● patch | view | raw | blame | history
src/views/realTimePolice/real.vue 103 ●●●● patch | view | raw | blame | history
src/views/security/security copy.vue 8 ●●●● patch | view | raw | blame | history
src/views/security/security.vue 8 ●●●● patch | view | raw | blame | history
src/views/supervisoryConsole/map.vue 2 ●●● patch | view | raw | blame | history
vue.config.js 2 ●●● patch | view | raw | blame | history
public/map/popup/js/clientPopup.js
@@ -31,7 +31,7 @@
        $.ajax({
            url: 'https://web.byisf.com/api/equipment/equipment/detail?id=' + code,
            url: 'http://s16s652780.51mypc.cn/api/equipment/equipment/detail?id=' + code,
            type: 'GET',
            dataType: 'JSON',
            success: function (data) {
@@ -73,7 +73,7 @@
        $("#client_bc").off("click").click(function () {
            $.ajax({
                url: 'https://web.byisf.com/api/equipment/equipment/updateClinent?',
                url: 'http://s16s652780.51mypc.cn/api/equipment/equipment/updateClinent?',
                data: {
                    "id": code,
public/map/popup/js/equipment-details.js
@@ -4,7 +4,7 @@
    // 查看设备的详细信息
    $.ajax({
        url: 'https://web.byisf.com/api/equipment/equipment/detail?id=' + code,
        url: 'http://s16s652780.51mypc.cn/api/equipment/equipment/detail?id=' + code,
        type: 'GET',
        dataType: 'JSON',
        success: function (data) {
public/map/popup/js/equipment-history.js
@@ -3,7 +3,7 @@
  console.log(code, 1212121);
  $.ajax({
    url: 'https://web.byisf.com/api/jingdan/jingdan/selectdInfo?deviceNumber=' + code,
    url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=' + code,
    type: 'POST',
    dataType: 'JSON',
    success: function (data) {
public/map/popup/js/owner-details.js
@@ -4,7 +4,7 @@
    // 查看警情的详细信息
    $.ajax({
        url: 'https://web.byisf.com/api/suser/suser/detail?id=' + code,
        url: 'http://s16s652780.51mypc.cn/api/suser/suser/detail?id=' + code,
        type: 'GET',
        dataType: 'JSON',
        success: function (data) {
public/map/popup/js/personnel-information-management.js
@@ -5,7 +5,7 @@
    var viewVideoLayer = null;
    // 查看保安人员的详细信息
    $.ajax({
        url: 'https://web.byisf.com/api/security/security/selectInfo?snumber=' + code,
        url: 'http://s16s652780.51mypc.cn/api/security/security/selectInfo?snumber=' + code,
        type: 'POST',
        dataType: 'JSON',
        success: function (data) {
public/map/popup/js/police-details.js
@@ -4,7 +4,7 @@
    // 查看警情的详细信息
    $.ajax({
        url: 'https://web.byisf.com/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + code,
        url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + code,
        type: 'POST',
        dataType: 'JSON',
        success: function (data) {
public/map/popup/js/realtime-equipment-history.js
@@ -3,7 +3,7 @@
    console.log(code, 1212121);
    $.ajax({
        url: 'https://web.byisf.com/api/jingdan/jingdan/selectdInfo?deviceNumber=' + code,
        url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=' + code,
        type: 'POST',
        dataType: 'JSON',
        success: function (data) {
public/map/popup/js/realtime-police-details.js
@@ -19,7 +19,7 @@
    // 查看警情的详细信息
    $.ajax({
        url: 'https://web.byisf.com/api/alarm/alarm/selectInfo?id=' + code,
        url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/selectInfo?id=' + code,
        type: 'POST',
        dataType: 'JSON',
        success: function (data) {
@@ -123,7 +123,7 @@
                return
            }
            $.ajax({
                url: 'https://web.byisf.com/api/jingdan/jingdan/saves',
                url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/saves',
                type: 'POST',
                data: {
                    rName: result.rname,
@@ -285,7 +285,7 @@
            layer.confirm('确定撤销该警情?', { icon: 3, title: '提示' }, function (index) {
                $.ajax({
                    url: 'https://web.byisf.com/api/alarm/alarm/deletejj',
                    url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/deletejj',
                    type: 'POST',
                    data: {
                        id: id
@@ -320,7 +320,7 @@
    function updateJType(id, czTime, bz, jjTime) {
        $.ajax({
            url: 'https://web.byisf.com/api/alarm/alarm/updateJtype',
            url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/updateJtype',
            type: 'POST',
            data: {
                id: id,
public/map/popup/js/route-name-layer.js
@@ -16,7 +16,7 @@
    // 查看保安人员下拉
    $.ajax({
        url: 'https://web.byisf.com/api/security/security/selectry',
        url: 'http://s16s652780.51mypc.cn/api/security/security/selectry',
        type: 'GET',
        dataType: 'JSON',
        success: function (data) {
public/map/popup/js/routename-and-peoplename.js
@@ -27,7 +27,7 @@
    // 查看保安人员下拉
    $.ajax({
        url: 'https://web.byisf.com/api/security/security/selectry',
        url: 'http://s16s652780.51mypc.cn/api/security/security/selectry',
        type: 'GET',
        dataType: 'JSON',
        success: function (data) {
public/map/widgets/aPoliceTeam/APoliceTeam.js
@@ -264,7 +264,7 @@
        $('.police-container-distribute-details .content table tbody').empty();
        var str = '';
        $.ajax({
          url: 'https://web.byisf.com/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
          url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
          type: 'POST',
          dataType: 'JSON',
          success: function (data) {
@@ -295,7 +295,7 @@
                  var str = '';
                  $('.police-container-distribute-details .security-guard-nearby .security-staff-content tbody').empty();
                  $.ajax({
                    url: 'https://web.byisf.com/api/position/position/selectry',
                    url: 'http://s16s652780.51mypc.cn/api/position/position/selectry',
                    type: 'POST',
                    data: {
                      coordinate: "point(" + $(this).attr('lgtd') + "," + $(this).attr('lttd') + ")"
@@ -363,7 +363,7 @@
          }
          // 发送请求修改警单数据
          $.ajax({
            url: 'https://web.byisf.com/api/jingdan/jingdan/updateInfo',
            url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/updateInfo',
            type: 'POST',
            data: {
              id: id,
@@ -402,7 +402,7 @@
        var str = '';
        $.ajax({
          url: 'https://web.byisf.com/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
          url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
          type: 'POST',
          dataType: 'JSON',
          success: function (data) {
@@ -769,7 +769,7 @@
        if ($(this).index() == 1) {
          $('.police-dispatching .police-container .police-container-patrol .main-content .select-list ul').empty();
          $.ajax({
            url: 'https://web.byisf.com/api/regions/regions/selectqy',
            url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
            type: 'GET',
            dataType: 'JSON',
            success: function (res) {
@@ -929,7 +929,7 @@
                  that.layuiLayer.msg('人员未更改!');
                } else {
                  $.ajax({
                    url: 'https://web.byisf.com/api/duty/duty/updatedtInfo',
                    url: 'http://s16s652780.51mypc.cn/api/duty/duty/updatedtInfo',
                    type: 'POST',
                    data: {
                      rid: routeId,
@@ -1019,7 +1019,7 @@
            if (that.tabIndex == 1) {
              if (that.patrolIndex == 1) {
                $.ajax({
                  url: 'https://web.byisf.com/api/routeIn/routein/insertlx',
                  url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/insertlx',
                  type: 'POST',
                  dataType: 'JSON',
                  data: {
@@ -1035,7 +1035,7 @@
                      that.polygonData = [];
                      that.getRouteInformation($('.police-dispatching .police-container .police-container-patrol .table .tbody tbody'), '');
                      $.ajax({
                        url: 'https://web.byisf.com/api/duty/duty/insertduty',
                        url: 'http://s16s652780.51mypc.cn/api/duty/duty/insertduty',
                        type: 'POST',
                        dataType: 'JSON',
                        data: {
@@ -1060,7 +1060,7 @@
                // that.pepleRealId = pepleRealId;
              } else {
                $.ajax({
                  url: 'https://web.byisf.com/api/regions/regions/insterqy',
                  url: 'http://s16s652780.51mypc.cn/api/regions/regions/insterqy',
                  type: 'POST',
                  dataType: 'JSON',
                  data: {
@@ -1079,7 +1079,7 @@
              }
            } else if (that.tabIndex == 2) {
              $.ajax({
                url: 'https://web.byisf.com/api/enclosure/enclosure/insertes',
                url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/insertes',
                type: 'POST',
                dataType: 'JSON',
                data: {
@@ -1117,7 +1117,7 @@
      $('.police-dispatching .police-container .distribute-district .select-list ul').empty();
      $('.police-dispatching .police-container .distribute-district .select-list ul').append("<li key='addvcd' addvcd=''>全部</li>");
      $.ajax({
        url: 'https://web.byisf.com/api/district/district/selectList',
        url: 'http://s16s652780.51mypc.cn/api/district/district/selectList',
        type: 'POST',
        dataType: 'JSON',
        success: function (data) {
@@ -1473,7 +1473,7 @@
      dom.empty();
      var that = this;
      $.ajax({
        url: 'https://web.byisf.com/api/jingdan/jingdan/selectList',
        url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectList',
        type: 'POST',
        dataType: 'JSON',
        data: {
@@ -1536,7 +1536,7 @@
      that.currentDrawing = [];
      that.entityPolygonAll.clear();
      $.ajax({
        url: 'https://web.byisf.com/api/regions/regions/selectList',
        url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectList',
        type: 'POST',
        dataType: 'JSON',
        data: {
@@ -1580,7 +1580,7 @@
      that.currentDrawing = [];
      that.entityPolygonAll.clear();
      $.ajax({
        url: 'https://web.byisf.com/api/routeIn/routein/selectList',
        url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/selectList',
        type: 'POST',
        dataType: 'JSON',
        data: {
@@ -1623,7 +1623,7 @@
      that.entityPolygonAll.clear();
      $.ajax({
        url: 'https://web.byisf.com/api/alarm/alarm/queryBa',
        url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/queryBa',
        type: 'POST',
        dataType: 'JSON',
        success: function (data) {
@@ -1671,7 +1671,7 @@
        }
      })
      // $.ajax({
      //     url: 'https://web.byisf.com/api/security/security/selectList',
      //     url: 'http://s16s652780.51mypc.cn/api/security/security/selectList',
      //     type: 'POST',
      //     dataType: 'JSON',
      //     success: function (data) {
@@ -1906,7 +1906,7 @@
          dataStr = dataStr.substring(0, dataStr.length - 1);
          $.ajax({
            url: 'https://web.byisf.com/api/routeIn/routein/updatelx',
            url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/updatelx',
            type: 'POST',
            dataType: 'JSON',
            data: {
@@ -1954,7 +1954,7 @@
          dataStr = dataStr.substring(0, dataStr.length - 1);
          $.ajax({
            url: 'https://web.byisf.com/api/regions/regions/updateqy',
            url: 'http://s16s652780.51mypc.cn/api/regions/regions/updateqy',
            type: 'POST',
            dataType: 'JSON',
            data: {
@@ -2010,7 +2010,7 @@
        dataStr = dataStr.substring(0, dataStr.length - 1);
        $.ajax({
          url: 'https://web.byisf.com/api/enclosure/enclosure/updatee',
          url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/updatee',
          type: 'POST',
          dataType: 'JSON',
          data: {
public/map/widgets/alertSecurity/AlertSecurity.js
@@ -209,7 +209,7 @@
      that.createTwinkleEntitys(that.addEntitys, lgtd, lttd, './images/real-time-callPolice-opcity.png');
      // console.log(deptId,153454)
      $.ajax({
        url: "https://web.byisf.com/api/blade-user/pages?current=1&size=9999&work_status=&deptId=" + deptId,
        url: "http://s16s652780.51mypc.cn/api/blade-user/pages?current=1&size=9999&work_status=&deptId=" + deptId,
        type: 'get',
        dataType: 'JSON',
        success: function (res) {
@@ -237,7 +237,7 @@
    addPoint: function (entitys, lgtd, lttd, img) {
      var symbol = new esri.symbol.PictureMarkerSymbol(img, 22, 32);
      symbol.xoffset = 0;
      symbol.xoffset = 0;
      symbol.yoffset = -2;
      var pt = new Point(lgtd, lttd, new SpatialReference({
        wkid: 4326
@@ -258,7 +258,7 @@
    createEntitys: function (entitys, lgtd, lttd, image) {
      var symbol = new esri.symbol.PictureMarkerSymbol(image, 44, 44);
      var width = 44;
      var height = 44;
      var pt = new Point(lgtd, lttd, new SpatialReference({
public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
@@ -661,7 +661,7 @@
            dom.children('.select-list').children('ul').append($("<li areaid='all'>全部</li>"));
            var that = this;
            $.ajax({
                url: 'https://web.byisf.com/api/blade-system/region/select?code=3601',
                url: 'http://s16s652780.51mypc.cn/api/blade-system/region/select?code=3601',
                type: 'GET',
                dataType: 'JSON',
                success: function (data) {
@@ -684,7 +684,7 @@
            dom.empty();
            var that = this;
            $.ajax({
                url: "https://web.byisf.com/api/alarm/alarm/page?current=1&size=99999&waringType=&beginTime=" + beginTime + "&endTime=" +endTime +"&province=36&city=3601&district=" + addvcd,
                url: "http://s16s652780.51mypc.cn/api/alarm/alarm/page?current=1&size=99999&waringType=&beginTime=" + beginTime + "&endTime=" +endTime +"&province=36&city=3601&district=" + addvcd,
                type: 'get',
                dataType: 'JSON',
                success: function (data) {
@@ -735,7 +735,7 @@
            dom.children('.select-list').children('ul').empty();
            dom.children('.select-list').children('ul').append($("<li ownerid='all'>全部</li>"));
            $.ajax({
                url: 'https://web.byisf.com/api/lx/lx/seleclx',
                url: 'http://s16s652780.51mypc.cn/api/lx/lx/seleclx',
                type: 'GET',
                dataType: 'JSON',
                success: function (data) {
@@ -751,7 +751,7 @@
            dom.children('.select-list').children('ul').empty();
            dom.children('.select-list').children('ul').append($("<li>全部</li>"));
            $.ajax({
                url: 'https://web.byisf.com/api/dj/dj/selectName?tnumbers=' + tnumbers,
                url: 'http://s16s652780.51mypc.cn/api/dj/dj/selectName?tnumbers=' + tnumbers,
                type: 'GET',
                dataType: 'JSON',
                success: function (data) {
@@ -767,7 +767,7 @@
            dom.empty();
            var that = this;
            $.ajax({
                url: 'https://web.byisf.com/api/suser/suser/selectList?type=' + type + '&dj=' + dj,
                url: 'http://s16s652780.51mypc.cn/api/suser/suser/selectList?type=' + type + '&dj=' + dj,
                type: 'GET',
                dataType: 'JSON',
                success: function (data) {
@@ -803,7 +803,7 @@
            dom.empty();
            var that = this;
            $.ajax({
                url: 'https://web.byisf.com/api/equipment/equipment/selectList?deviceType=' + deviceType,
                url: 'http://s16s652780.51mypc.cn/api/equipment/equipment/selectList?deviceType=' + deviceType,
                type: 'GET',
                dataType: 'JSON',
                success: function (data) {
public/map/widgets/patrolManagement/PatrolManagement.js
@@ -256,7 +256,7 @@
                $('.police-container-distribute-details .content table tbody').empty();
                var str = '';
                $.ajax({
                    url: 'https://web.byisf.com/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
                    url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
                    type: 'POST',
                    dataType: 'JSON',
                    success: function (data) {
@@ -287,7 +287,7 @@
                                    var str = '';
                                    $('.police-container-distribute-details .security-guard-nearby .security-staff-content tbody').empty();
                                    $.ajax({
                                        url: 'https://web.byisf.com/api/position/position/selectry',
                                        url: 'http://s16s652780.51mypc.cn/api/position/position/selectry',
                                        type: 'POST',
                                        data: {
                                            coordinate: "point(" + $(this).attr('lgtd') + "," + $(this).attr('lttd') + ")"
@@ -355,7 +355,7 @@
                    }
                    // 发送请求修改警单数据
                    $.ajax({
                        url: 'https://web.byisf.com/api/jingdan/jingdan/updateInfo',
                        url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/updateInfo',
                        type: 'POST',
                        data: {
                            id: id,
@@ -394,7 +394,7 @@
                var str = '';
                $.ajax({
                    url: 'https://web.byisf.com/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
                    url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
                    type: 'POST',
                    dataType: 'JSON',
                    success: function (data) {
@@ -757,7 +757,7 @@
                if ($(this).index() == 1) {
                    $('.police-dispatching .police-container .police-container-patrol .main-content .select-list ul').empty();
                    $.ajax({
                        url: 'https://web.byisf.com/api/regions/regions/selectqy',
                        url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
                        type: 'GET',
                        dataType: 'JSON',
                        success: function (res) {
@@ -917,7 +917,7 @@
                                    that.layuiLayer.msg('人员未更改!');
                                } else {
                                    $.ajax({
                                        url: 'https://web.byisf.com/api/duty/duty/updatedtInfo',
                                        url: 'http://s16s652780.51mypc.cn/api/duty/duty/updatedtInfo',
                                        type: 'POST',
                                        data: {
                                            rid: routeId,
@@ -1007,7 +1007,7 @@
                        if (that.tabIndex == 1) {
                            if (that.patrolIndex == 1) {
                                $.ajax({
                                    url: 'https://web.byisf.com/api/routeIn/routein/insertlx',
                                    url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/insertlx',
                                    type: 'POST',
                                    dataType: 'JSON',
                                    data: {
@@ -1023,7 +1023,7 @@
                                            that.polygonData = [];
                                            that.getRouteInformation($('.police-dispatching .police-container .police-container-patrol .table .tbody tbody'), '');
                                            $.ajax({
                                                url: 'https://web.byisf.com/api/duty/duty/insertduty',
                                                url: 'http://s16s652780.51mypc.cn/api/duty/duty/insertduty',
                                                type: 'POST',
                                                dataType: 'JSON',
                                                data: {
@@ -1048,7 +1048,7 @@
                                // that.pepleRealId = pepleRealId;
                            } else {
                                $.ajax({
                                    url: 'https://web.byisf.com/api/regions/regions/insterqy',
                                    url: 'http://s16s652780.51mypc.cn/api/regions/regions/insterqy',
                                    type: 'POST',
                                    dataType: 'JSON',
                                    data: {
@@ -1067,7 +1067,7 @@
                            }
                        } else if (that.tabIndex == 2) {
                            $.ajax({
                                url: 'https://web.byisf.com/api/enclosure/enclosure/insertes',
                                url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/insertes',
                                type: 'POST',
                                dataType: 'JSON',
                                data: {
@@ -1105,7 +1105,7 @@
            $('.police-dispatching .police-container .distribute-district .select-list ul').empty();
            $('.police-dispatching .police-container .distribute-district .select-list ul').append("<li key='addvcd' addvcd=''>全部</li>");
            $.ajax({
                url: 'https://web.byisf.com/api/district/district/selectList',
                url: 'http://s16s652780.51mypc.cn/api/district/district/selectList',
                type: 'POST',
                dataType: 'JSON',
                success: function (data) {
@@ -1465,7 +1465,7 @@
            dom.empty();
            var that = this;
            $.ajax({
                url: 'https://web.byisf.com/api/jingdan/jingdan/selectList',
                url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectList',
                type: 'POST',
                dataType: 'JSON',
                data: {
@@ -1528,7 +1528,7 @@
            that.currentDrawing = [];
            that.entityPolygonAll.clear();
            $.ajax({
                url: 'https://web.byisf.com/api/regions/regions/selectList',
                url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectList',
                type: 'POST',
                dataType: 'JSON',
                data: {
@@ -1572,7 +1572,7 @@
            that.currentDrawing = [];
            that.entityPolygonAll.clear();
            $.ajax({
                url: 'https://web.byisf.com/api/routeIn/routein/selectList',
                url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/selectList',
                type: 'POST',
                dataType: 'JSON',
                data: {
@@ -1614,7 +1614,7 @@
            that.currentDrawing = [];
            that.entityPolygonAll.clear();
            $.ajax({
                url: 'https://web.byisf.com/api/security/security/selectList',
                url: 'http://s16s652780.51mypc.cn/api/security/security/selectList',
                type: 'POST',
                dataType: 'JSON',
                success: function (data) {
@@ -1845,7 +1845,7 @@
                    dataStr = dataStr.substring(0, dataStr.length - 1);
                    $.ajax({
                        url: 'https://web.byisf.com/api/routeIn/routein/updatelx',
                        url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/updatelx',
                        type: 'POST',
                        dataType: 'JSON',
                        data: {
@@ -1893,7 +1893,7 @@
                    dataStr = dataStr.substring(0, dataStr.length - 1);
                    $.ajax({
                        url: 'https://web.byisf.com/api/regions/regions/updateqy',
                        url: 'http://s16s652780.51mypc.cn/api/regions/regions/updateqy',
                        type: 'POST',
                        dataType: 'JSON',
                        data: {
@@ -1949,7 +1949,7 @@
                dataStr = dataStr.substring(0, dataStr.length - 1);
                $.ajax({
                    url: 'https://web.byisf.com/api/enclosure/enclosure/updatee',
                    url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/updatee',
                    type: 'POST',
                    dataType: 'JSON',
                    data: {
public/map/widgets/policeDispatching/PoliceDispatching.js
@@ -256,7 +256,7 @@
                $('.police-container-distribute-details .content table tbody').empty();
                var str = '';
                $.ajax({
                    url: 'https://web.byisf.com/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
                    url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
                    type: 'POST',
                    dataType: 'JSON',
                    success: function (data) {
@@ -287,7 +287,7 @@
                                    var str = '';
                                    $('.police-container-distribute-details .security-guard-nearby .security-staff-content tbody').empty();
                                    $.ajax({
                                        url: 'https://web.byisf.com/api/position/position/selectry',
                                        url: 'http://s16s652780.51mypc.cn/api/position/position/selectry',
                                        type: 'POST',
                                        data: {
                                            coordinate: "point(" + $(this).attr('lgtd') + "," + $(this).attr('lttd') + ")"
@@ -355,7 +355,7 @@
                    }
                    // 发送请求修改警单数据
                    $.ajax({
                        url: 'https://web.byisf.com/api/jingdan/jingdan/updateInfo',
                        url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/updateInfo',
                        type: 'POST',
                        data: {
                            id: id,
@@ -394,7 +394,7 @@
                var str = '';
                $.ajax({
                    url: 'https://web.byisf.com/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
                    url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
                    type: 'POST',
                    dataType: 'JSON',
                    success: function (data) {
@@ -757,7 +757,7 @@
                if ($(this).index() == 1) {
                    $('.police-dispatching .police-container .police-container-patrol .main-content .select-list ul').empty();
                    $.ajax({
                        url: 'https://web.byisf.com/api/regions/regions/selectqy',
                        url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
                        type: 'GET',
                        dataType: 'JSON',
                        success: function (res) {
@@ -917,7 +917,7 @@
                                    that.layuiLayer.msg('人员未更改!');
                                } else {
                                    $.ajax({
                                        url: 'https://web.byisf.com/api/duty/duty/updatedtInfo',
                                        url: 'http://s16s652780.51mypc.cn/api/duty/duty/updatedtInfo',
                                        type: 'POST',
                                        data: {
                                            rid: routeId,
@@ -1007,7 +1007,7 @@
                        if (that.tabIndex == 1) {
                            if (that.patrolIndex == 1) {
                                $.ajax({
                                    url: 'https://web.byisf.com/api/routeIn/routein/insertlx',
                                    url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/insertlx',
                                    type: 'POST',
                                    dataType: 'JSON',
                                    data: {
@@ -1023,7 +1023,7 @@
                                            that.polygonData = [];
                                            that.getRouteInformation($('.police-dispatching .police-container .police-container-patrol .table .tbody tbody'), '');
                                            $.ajax({
                                                url: 'https://web.byisf.com/api/duty/duty/insertduty',
                                                url: 'http://s16s652780.51mypc.cn/api/duty/duty/insertduty',
                                                type: 'POST',
                                                dataType: 'JSON',
                                                data: {
@@ -1048,7 +1048,7 @@
                                // that.pepleRealId = pepleRealId;
                            } else {
                                $.ajax({
                                    url: 'https://web.byisf.com/api/regions/regions/insterqy',
                                    url: 'http://s16s652780.51mypc.cn/api/regions/regions/insterqy',
                                    type: 'POST',
                                    dataType: 'JSON',
                                    data: {
@@ -1067,7 +1067,7 @@
                            }
                        } else if (that.tabIndex == 2) {
                            $.ajax({
                                url: 'https://web.byisf.com/api/enclosure/enclosure/insertes',
                                url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/insertes',
                                type: 'POST',
                                dataType: 'JSON',
                                data: {
@@ -1105,7 +1105,7 @@
            $('.police-dispatching .police-container .distribute-district .select-list ul').empty();
            $('.police-dispatching .police-container .distribute-district .select-list ul').append("<li key='addvcd' addvcd=''>全部</li>");
            $.ajax({
                url: 'https://web.byisf.com/api/district/district/selectList',
                url: 'http://s16s652780.51mypc.cn/api/district/district/selectList',
                type: 'POST',
                dataType: 'JSON',
                success: function (data) {
@@ -1458,7 +1458,7 @@
            dom.empty();
            var that = this;
            $.ajax({
                url: 'https://web.byisf.com/api/jingdan/jingdan/selectList',
                url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectList',
                type: 'POST',
                dataType: 'JSON',
                data: {
@@ -1521,7 +1521,7 @@
            that.currentDrawing = [];
            that.entityPolygonAll.clear();
            $.ajax({
                url: 'https://web.byisf.com/api/regions/regions/selectList',
                url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectList',
                type: 'POST',
                dataType: 'JSON',
                data: {
@@ -1565,7 +1565,7 @@
            that.currentDrawing = [];
            that.entityPolygonAll.clear();
            $.ajax({
                url: 'https://web.byisf.com/api/routeIn/routein/selectList',
                url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/selectList',
                type: 'POST',
                dataType: 'JSON',
                data: {
@@ -1607,7 +1607,7 @@
            that.currentDrawing = [];
            that.entityPolygonAll.clear();
            $.ajax({
                url: 'https://web.byisf.com/api/security/security/selectList',
                url: 'http://s16s652780.51mypc.cn/api/security/security/selectList',
                type: 'POST',
                dataType: 'JSON',
                success: function (data) {
@@ -1838,7 +1838,7 @@
                    dataStr = dataStr.substring(0, dataStr.length - 1);
                    $.ajax({
                        url: 'https://web.byisf.com/api/routeIn/routein/updatelx',
                        url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/updatelx',
                        type: 'POST',
                        dataType: 'JSON',
                        data: {
@@ -1886,7 +1886,7 @@
                    dataStr = dataStr.substring(0, dataStr.length - 1);
                    $.ajax({
                        url: 'https://web.byisf.com/api/regions/regions/updateqy',
                        url: 'http://s16s652780.51mypc.cn/api/regions/regions/updateqy',
                        type: 'POST',
                        dataType: 'JSON',
                        data: {
@@ -1942,7 +1942,7 @@
                dataStr = dataStr.substring(0, dataStr.length - 1);
                $.ajax({
                    url: 'https://web.byisf.com/api/enclosure/enclosure/updatee',
                    url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/updatee',
                    type: 'POST',
                    dataType: 'JSON',
                    data: {
public/map/widgets/realTimePolice/RealTimePolice.js
@@ -474,7 +474,7 @@
                    }
                    $.ajax({
                        url: 'https://web.byisf.com/api/jingdan/jingdan/saves',
                        url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/saves',
                        type: 'POST',
                        data: {
                            rName: $(_self).data('rname'),
@@ -586,7 +586,7 @@
            // 行政区
            // $.ajax({
            //     url: 'https://web.byisf.com/api/district/district/selectList',
            //     url: 'http://s16s652780.51mypc.cn/api/district/district/selectList',
            //     type: 'POST',
            //     dataType: 'JSON',
            //     success: function (data) {
@@ -603,7 +603,7 @@
            // // 警情类型下拉
            // $.ajax({
            //     url: 'https://web.byisf.com/api/alarm/alarm/selectScount',
            //     url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/selectScount',
            //     type: 'GET',
            //     dataType: 'JSON',
            //     success: function (data) {
@@ -633,7 +633,7 @@
                that.updateRealTable = table.render({
                    elem: '#real_time_table'
                    , height: (layerTabHei - 20)
                    , url: 'https://web.byisf.com/api/alarm/alarm/selectList' //数据接口
                    , url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/selectList' //数据接口
                    , method: "post"
                    , where: { jtype: '', beginTime: that.realBeginTime, endTime: that.realEndTime }
                    , parseData: function (res) { //res 即为原始返回的数据
@@ -1049,7 +1049,7 @@
            that.realTimeQuery = setInterval(function () {
                if (that.historyPoliceId != null) {
                    $.ajax({
                        url: 'https://web.byisf.com/api/alarm/alarm/selecttx',
                        url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/selecttx',
                        type: 'POST',
                        dataType: 'JSON',
                        data: {
@@ -1340,7 +1340,7 @@
                layer.confirm('确定撤销该警情?', { icon: 3, title: '提示' }, function (index) {
                    $.ajax({
                        url: 'https://web.byisf.com/api/alarm/alarm/deletejj',
                        url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/deletejj',
                        type: 'POST',
                        data: {
                            id: id
@@ -1443,7 +1443,7 @@
        updateJType: function (id, czTime, bz, jjTime) {
            $.ajax({
                url: 'https://web.byisf.com/api/alarm/alarm/updateJtype',
                url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/updateJtype',
                type: 'POST',
                data: {
                    id: id,
public/map/widgets/securityMap/SecurityMap.js
@@ -161,7 +161,7 @@
        //基础路径
        //pathUrl: "http://localhost:89",
        pathUrl: "https://web.byisf.com/api/blade-jfpts",
        pathUrl: "http://s16s652780.51mypc.cn/api/blade-jfpts",
        // 电子围栏需要新增的Id
        newElectronicFenceId: null,
@@ -726,4 +726,4 @@
    return Widget;
});
});
public/map/widgets/securityMap/SecurityMap_copy1.js
@@ -165,7 +165,7 @@
        //基础路径
        pathUrl: "http://localhost:89",
        //pathUrl: "https://web.byisf.com/api/blade-jfpts",
        //pathUrl: "http://s16s652780.51mypc.cn/api/blade-jfpts",
        // 电子围栏需要新增的Id
        newElectronicFenceId: null,
@@ -607,4 +607,4 @@
    return Widget;
});
});
src/views/clientManagement/clientManagement.vue
@@ -960,7 +960,7 @@
      this.showMap = true;
      this.$nextTick(() => {
        this.$refs.mapDiv.onload = () => {
          window.frames[1].init("equipment", { x: row.jd, y: row.wd });
          window.frames[0].init("equipment", { x: row.jd, y: row.wd });
        };
      });
    },
src/views/clientManagement/clientManagement_copy.vue
@@ -722,7 +722,7 @@
        this.showMap = true;
        this.$nextTick(() => {
          this.$refs.mapDiv.onload = () => {
            window.frames[1].init("equipment", {x: row.jd, y: row.wd});
            window.frames[0].init("equipment", {x: row.jd, y: row.wd});
          };
        })
      },
src/views/dataL/dataL.vue
@@ -1161,7 +1161,7 @@
      this.startEcharts01();
    },
    getMap() {
      window.frames[1].init("DetailMap", {
      window.frames[0].init("DetailMap", {
        x: this.a.jd,
        y: this.a.wd,
      });
@@ -1314,15 +1314,15 @@
    // this.doEvents();
    // var timel = setTimeout(() => {
    this.$refs.detailMap.onload = () => {
      // window.frames[1].init("DetailMap", {
      // window.frames[0].init("DetailMap", {
      //   x: this.a.jd,
      //   y: this.a.wd,
      // });
      if (window.frames[1].init) {
      if (window.frames[0].init) {
        this.getMap();
      } else {
        // this.re();
        console.log(`没有找到到window.frames[1].init`);
        console.log(`没有找到到window.frames[0].init`);
      }
    };
  },
src/views/distribution/index.vue
@@ -243,7 +243,7 @@
  mounted() {
    this.$refs.DistributionMapDiv.onload = () => {
      window.frames[1].init("AlertSecurity", {
      window.frames[0].init("AlertSecurity", {
        x: this.form.jd,
        y: this.form.wd,
      });
src/views/policeInformationDistribution/index.vue
@@ -538,7 +538,7 @@
        this.showMap = true;
        this.$nextTick(() => {
          this.$refs.mapDiv.onload = () => {
            window.frames[1].init("ClientManagement", {x: row.jd, y: row.wd});
            window.frames[0].init("ClientManagement", {x: row.jd, y: row.wd});
          };
        });
      },
src/views/policeInformationDistribution/patrolManagement.vue
@@ -1,5 +1,5 @@
<template>
<iframe src="https://web.byisf.com/map/index.html?openid=PatrolManagement" style="width: 100%;height: 100%" frameborder="0"></iframe>
<iframe src="http://s16s652780.51mypc.cn/map/index.html?openid=PatrolManagement" style="width: 100%;height: 100%" frameborder="0"></iframe>
</template>
<script>
src/views/policeTracking/policeTracking.vue
@@ -422,7 +422,7 @@
    this.getAudios();
    this.getImgAndVideo();
    this.$refs.mapDiv.onload = () => {
      window.frames[1].init("AlertSecurity", {
      window.frames[0].init("AlertSecurity", {
        x: this.form.jd,
        y: this.form.wd,
      });
@@ -554,7 +554,7 @@
      var userId = JSON.parse(
        window.localStorage.getItem("群防群控后台管理系统-userInfo")
      ).content.real_name;
      ).content.nick_name;
      if (that.form.securityArr != null && that.form.securityArr != "") {
        that.form.jtype = "1";
src/views/realTimePolice/real.vue
@@ -400,18 +400,18 @@
            editDisplay: true,
            viewDisplay: true,
          },
          {
            label: "巡逻路线",
            prop: "xllx",
            hide: true,
            display: true,
            type: "tree",
            filter: false,
            dicUrl: "/api/routeIn/routein/tree",
            props: {
              label: "title",
            },
          },
          // {
          //   label: "巡逻路线",
          //   prop: "xllx",
          //   hide: true,
          //   display: true,
          //   type: "tree",
          //   filter: false,
          //   dicUrl: "/api/routeIn/routein/tree",
          //   props: {
          //     label: "title",
          //   },
          // },
        ],
      },
      data: [],
@@ -475,25 +475,25 @@
      },
      immediate: true,
    },
    "form.alarmType": {
      handler(val) {
        var xllx = this.findObject(this.option.column, "xllx");
        if (val === "巡逻任务") {
          xllx.display = true;
          xllx.rules = [
            {
              required: true,
              message: "请选择巡逻路线",
              trigger: "blur",
            },
          ];
        } else {
          xllx.display = false;
          xllx.rules = [];
        }
      },
      immediate: true,
    },
    // "form.alarmType": {
    //   handler(val) {
    //     var xllx = this.findObject(this.option.column, "xllx");
    //     if (val === "巡逻任务") {
    //       xllx.display = true;
    //       xllx.rules = [
    //         {
    //           required: true,
    //           message: "请选择巡逻路线",
    //           trigger: "blur",
    //         },
    //       ];
    //     } else {
    //       xllx.display = false;
    //       xllx.rules = [];
    //     }
    //   },
    //   immediate: true,
    // },
  },
  computed: {
    ...mapGetters(["permission", "flowRoutes"]),
@@ -527,16 +527,18 @@
      }
      var userId = JSON.parse(
        window.localStorage.getItem("群防群控后台管理系统-userInfo")
      ).content.real_name;
      ).content.nick_name;
      if (row.securityArr == "" || row.securityArr == null) {
        row.jtype = "0";
        row.alarmPeople = "";
      } else {
        row.jtype = "1";
        //已派发保安
        row.alarmPeople = userId;
      if (row.jtype != "2"){
        if (row.securityArr == "" || row.securityArr == null) {
          row.jtype = "0";
          row.alarmPeople = "";
        } else {
          row.jtype = "1";
          //已派发保安
        }
      }
      row.alarmPeople = userId;
      add(row).then(
        () => {
@@ -555,8 +557,7 @@
    rowUpdate(row, index, done, loading) {
      var userId = JSON.parse(
        window.localStorage.getItem("群防群控后台管理系统-userInfo")
      ).content.real_name;
      ).content.nick_name;
      if (typeof row.securityArr != "string") {
        var security = "";
        row.securityArr.forEach((item) => {
@@ -564,16 +565,16 @@
        });
        row.securityArr = security.substring(0, security.length - 1);
      }
      if (row.securityArr == "" || row.securityArr == null) {
        row.jtype = "0";
        row.alarmPeople = "";
      } else {
        row.jtype = "1";
        //已派发保安
        row.alarmPeople = userId;
      if (row.jtype != "2") {
        if (row.securityArr == "" || row.securityArr == null) {
          row.jtype = "0";
          row.alarmPeople = "";
        } else {
          row.jtype = "1";
          //已派发保安
        }
      }
      row.alarmPeople = userId;
      row.coordinate = "";
      update(row).then(
        () => {
@@ -1036,7 +1037,7 @@
      this.showMap = true;
      this.$nextTick(() => {
        this.$refs.mapDiv.onload = () => {
          window.frames[1].init("ClientManagement", {
          window.frames[0].init("ClientManagement", {
            x: row.jd,
            y: row.wd,
            clientID: row.deviceNumber,
src/views/security/security copy.vue
@@ -274,23 +274,23 @@
      this.$nextTick(() => {
        this.$refs.securityMap.onload = () => {
          if (window.frames[1].init) {
          if (window.frames[0].init) {
            if (row.jd == "" || row.jd == "0.0") {
              //如果处警员无位置信息,则赋值一个默认数据,否则地图无法加载
              window.frames[1].init("SecurityMap", {
              window.frames[0].init("SecurityMap", {
                x: rwjd,
                y: rwwd,
                code: row.code,
              });
            } else {
              window.frames[1].init("SecurityMap", {
              window.frames[0].init("SecurityMap", {
                x: row.jd,
                y: row.wd,
                code: row.code,
              });
            }
          } else {
            console.log(`没有找到到window.frames[1].init`);
            console.log(`没有找到到window.frames[0].init`);
          }
        };
      });
src/views/security/security.vue
@@ -834,23 +834,23 @@
      this.$nextTick(() => {
        this.$refs.securityMap.onload = () => {
          if (window.frames[1].init) {
          if (window.frames[0].init) {
            if (row.jd == "" || row.jd == "0.0") {
              //如果处警员无位置信息,则赋值一个默认数据,否则地图无法加载
              window.frames[1].init("SecurityMap", {
              window.frames[0].init("SecurityMap", {
                x: rwjd,
                y: rwwd,
                code: row.code,
              });
            } else {
              window.frames[1].init("SecurityMap", {
              window.frames[0].init("SecurityMap", {
                x: row.jd,
                y: row.wd,
                code: row.code,
              });
            }
          } else {
            console.log(`没有找到到window.frames[1].init`);
            console.log(`没有找到到window.frames[0].init`);
          }
        };
      });
src/views/supervisoryConsole/map.vue
@@ -23,7 +23,7 @@
  },
  mounted() {
    // this.$refs.supervisoryMap.onload = () => {
    //   window.frames[1].init("AlertSecurity", {
    //   window.frames[0].init("AlertSecurity", {
    //     x: this.form.jd,
    //     y: this.form.wd,
    //   });
vue.config.js
@@ -37,7 +37,7 @@
      '/api': {
        //本地服务接口地址
        target: 'http://s16s652780.51mypc.cn/api/',
        //target: 'http://172.20.10.2:82/',
        //target: 'http://localhost:82/',
        //target: 'https://web.byisf.com/api/',
        //远程演示服务地址,可用于直接启动项目
        //target: 'https://saber.bladex.vip/api',