zengh
2021-07-20 eb6374fd3670ac6fec2725e5f3ccb708ea76f22c
位置选择
6 files modified
1 files added
154 ■■■■■ changed files
public/img/jfd.png patch | view | raw | blame | history
public/map/widgets/alertSecurity/AlertSecurity.js 29 ●●●●● patch | view | raw | blame | history
src/components/map/main.vue 76 ●●●●● patch | view | raw | blame | history
src/views/feedbackReport/feedbackReport.vue 5 ●●●●● patch | view | raw | blame | history
src/views/policeTracking/policeTracking.vue 2 ●●● patch | view | raw | blame | history
src/views/realTimePolice/real.vue 40 ●●●● patch | view | raw | blame | history
src/views/wel/home.vue 2 ●●● patch | view | raw | blame | history
public/img/jfd.png
public/map/widgets/alertSecurity/AlertSecurity.js
@@ -198,29 +198,6 @@
      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');
      that.createTwinkleEntitys(that.addEntitys, lgtd, lttd, './images/real-time-callPolice-opcity.png');
      // console.log(deptId,153454)
      $.ajax({
        url: "http://s16s652780.51mypc.cn/api/blade-user/pages?current=1&size=9999&work_status=&deptId=" + deptId,
        type: 'get',
        dataType: 'JSON',
        success: function (res) {
          // console.log(res.data.records, oneId)
          res.data.records.forEach((item) => {
            if (item.id == oneId) {
              that.addPoints(that.addEntitys, item.jd, item.wd, './images/security.png')
            }
          });
          res.data.records.forEach((item) => {
            if (item.roleName == "处警员" && item.id != oneId) {
              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,
@@ -236,19 +213,17 @@
                  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(entityData[j].split(' ')[0]), Number(entityData[j].split(' ')[1])]);
                    // entityArr.push([Number(b[0]), Number(b[1])]);
                  }
                }
                that.addPolygonAll(that.addEntitys, entityArr);
            that._map.centerAndZoom(new esri.geometry.Point(entityArr[Math.ceil(entityArr.length / 2 )][0],entityArr[Math.ceil(entityArr.length / 2 )][1], new esri.SpatialReference({ wkid: 4326 })), 14);
              }
            })
          }
        }
      });
    },
    close: function () {
src/components/map/main.vue
@@ -81,16 +81,16 @@
                    zIndex: 4,
                    title: '影像',
                    source: new XYZ({
                        url: 'http://t3.tianditu.com/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0' // 行政区划
              url: 'https://webmap-tile.sf-express.com/MapTileService/rt?fetchtype=static&x={x}&y={y}&z={z}&project=sfmap&pic_size=256&pic_type=png8&data_name=361100&data_format=merged-dat&data_type=normal' // 行政区划
                    })
                }),
                new OlLayerTile({
                    zIndex: 5,
                    title: '道路+中文注记',
                    source: new XYZ({
                        url: 'http://t3.tianditu.com/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0' // 注记
                    })
                })
          // new OlLayerTile({
          //   zIndex: 5,
          //   title: '道路+中文注记',
          //   source: new XYZ({
          //     url: 'http://t3.tianditu.com/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0' // 注记
          //   })
          // })
            ],
            // 注意地图控件的写法
@@ -112,9 +112,9 @@
        var view = ol2d.getView()
        view.setCenter([115.85883507433789, 28.708432053474827])
        view.setZoom(13)
      // view.setCenter([115.85883507433789, 28.708432053474827])
      //
      // view.setZoom(13)
        const ol3d = new OLCesium({ map: window.ol2d })
        window.ol3d = ol3d
@@ -123,7 +123,7 @@
        ol2d.addLayer(this.peopleAddlayer)
        ol2d.addLayer(this.carAddlayer)
        ol2d.addLayer(this.peopleLineAddlayer)
        this.addLines()
      // this.addLines()
    },
    methods: {
        init3D (val) {
@@ -167,18 +167,38 @@
            this[type].getSource().addFeature(iconFeature)
        },
        addLines () {
      addLines(ringId) {
        var that = this;
        if (ringId != null && ringId != "") {
          $.ajax({
            url: "api/routeIn/routein/selectList",
            type: "post",
            data: {
              "id": ringId
            },
            dataType: 'JSON',
            success: function (data) {
              that.peopleLineAddlayer.getSource().clear()
              var entityData = '';
              var entityArr = [];
              entityData = data.data[0].routeInfo.match(/\(([^)]*)\)/);
            // 点坐标
            var lineCoords = [
              [115.87471898408013, 28.720924466928977],
              [115.87471898408013, 28.724163802651635],
              [115.87401037939081, 28.72456871961697],
              [115.87147964835748, 28.7246699488583],
              [115.86925260504815, 28.7246699488583],
              [115.86621572780817, 28.7246699488583],
              [115.8635837675335, 28.72578347051296]
              ];// 线里点的集合
              // 此时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])]);
                }
              }
              var lineCoords = entityArr;// 线里点的集合
              var view = ol2d.getView()
              view.setCenter([lineCoords[Math.ceil(entityArr.length / 2 )][0], lineCoords[Math.ceil(entityArr.length / 2 )][1]])
              view.setZoom(14.5)
            // 要素
            // var lineCoords = [[featureInfo.lineString[0][0],featureInfo.lineString[0][0]],[featureInfo.lineString(0),featureInfo.lineString(0)]];
@@ -198,9 +218,15 @@
                    width: 5
                })
            }))
              that.peopleLineAddlayer.getSource().addFeature(feature_LineString)
            },
            error: function (data) {
              // 请求失败函数
              console.log(data);
            }
          });
        }
            this.peopleLineAddlayer.getSource().addFeature(feature_LineString)
        }
    }
src/views/feedbackReport/feedbackReport.vue
@@ -189,6 +189,7 @@
            {
              label: "备注",
              prop: "result",
              span: 24,
              rules: [
                {
                  required: true,
@@ -330,6 +331,8 @@
          stime: row.stime,
          result: row.result,
          place: row.place,
          jd: row.jd,
          wd: row.wd,
        };
        if (row.images.length > 0) {
          var imageArr = row.images;
@@ -372,6 +375,8 @@
          stime: row.stime,
          result: row.result,
          place: row.place,
          jd: row.jd,
          wd: row.wd,
        };
        if (row.images.length > 0) {
          var imageArr = row.images;
src/views/policeTracking/policeTracking.vue
@@ -419,7 +419,7 @@
    this.getReceivingAlarm();
    if (this.form.alarmType == "巡逻任务"){
      this.baseUrl = `/map/index.html?ISinit=1&openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}&pid=${this.form.deptId}&deptId=${this.form.deptId}&oneId=${this.form.oneId}&baid=${this.form.baid}`;
      this.baseUrl = `/map/index.html?openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}&pid=${this.form.deptId}&deptId=${this.form.deptId}&oneId=${this.form.oneId}&baid=${this.form.xllx}`;
    }else{
      this.baseUrl = `/map/index.html?ISinit=1&openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}&pid=${this.form.deptId}&deptId=${this.form.deptId}&oneId=${this.form.oneId}`;
    }
src/views/realTimePolice/real.vue
@@ -118,7 +118,7 @@
      </template>
      <template slot-scope="{type,disabled}" slot="xllxzsForm">
        <div style="width: 200px;height: 200px">
        <div class="mapClassMain" style="width: 860px;height: 400px">
          <Map ref="modalForm" />
        </div>
      </template>
@@ -200,9 +200,8 @@
              dicUrl:
                "/api/blade-system/dict-biz/child-list?parentId=1356523651644043266",
              control: (val, form) => {
                if (val) {
                  debugger;
                }
                // if (val) {
                // }
                return {
                  text2: {
                    display: true,
@@ -368,6 +367,7 @@
              width: 96,
              search: true,
              slot: true,
              value: "0",
              searchPlaceholder: "请选择",
              prop: "jtype",
              type: "select",
@@ -424,7 +424,7 @@
              label: "路线展示",
              labelWidth: "0",
              prop: "xllxzs",
              className: "cityreal3",
              className: "mapClass",
              hide: true,
              display: true,
              formslot:true,
@@ -495,8 +495,10 @@
      "form.alarmType": {
        handler(val) {
          var xllx = this.findObject(this.option.column, "xllx");
          var xllxzs = this.findObject(this.option.column, "xllxzs");
          if (val === "巡逻任务") {
            xllx.display = true;
            xllxzs.display = true;
            xllx.rules = [
              {
                required: true,
@@ -506,11 +508,21 @@
            ];
          } else {
            xllx.display = false;
            xllxzs.display = false;
            xllx.rules = [];
          }
        },
        immediate: true,
      },
      "form.xllx":{
        handler(val) {
          if (val){
            this.getxllx(val)
          }
        },
        immediate: true,
      }
    },
    computed: {
      ...mapGetters(["permission", "flowRoutes"]),
@@ -579,6 +591,16 @@
            loading();
          }
        );
      },
      getxllx(val){
        var that = this;
        if (this.$refs.modalForm == undefined) {
          setTimeout(function () {
            that.$refs.modalForm.addLines(val);
          }, 1500)
        } else {
          that.$refs.modalForm.addLines(val);
        }
      },
      rowUpdate(row, index, done, loading) {
        var userId = JSON.parse(
@@ -1220,6 +1242,14 @@
    width: 12%;
  }
  .mapClass div label {
    display: none;
  }
  .mapClassMain {
    padding-left: 25px !important;
  }
  .cityreal2 div label,
  .cityreal3 div label {
    display: none;
src/views/wel/home.vue
@@ -36,7 +36,7 @@
                    <span> 保安员队伍 </span>
                  </div>
                  <div>
                    <div><img src="/img/ldz.png" alt="" /><span>25</span></div>
                    <div><img src="/img/jfd.png" alt="" /><span>25</span></div>
                    <span> 警务辅助队伍</span>
                  </div>
                </div>