Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

liuyg

2021-07-04 db9cf0e24e4d0a3953a98eb222a643eece4a6748

 xcxMapJQLG/js/vueMain.js

@@ -31,6 +31,7 @@
      wentifankui: '',
      oldlat: '',
      oldlng: '',
      haveJDWD: true,

   },
   methods: {
@@ -52,17 +53,20 @@
         this.getdata = this.getQueryVariable('data') || data;
         // this.getdata = data;
         this.changeDom(this.getdata[0]);
         console.log(this.getdata[0]);
         this.map = this.beginMap(this.map, this.getdata); //创建并接受map
         // this.move = new myDomMove('#seedata', '.title', '#map');
         this.map.invalidateSize(true); //应用地图高度
         // this.move.followFinger(this.map, 'down');
         this.lat = data[0].wd;
         this.lng = data[0].jd;
         this.oldlat = data[0].wd;
         this.oldlng = data[0].jd;
         // this.lat = data[0].wd;
         // this.lng = data[0].jd;
         // this.oldlat = data[0].wd;
         // this.oldlng = data[0].jd;
         this.oldlat = this.getdata[0].wd;
         this.oldlng = this.getdata[0].jd;
      },
      changeDom(data) {
         console.log(data, 'changeDom');
         // console.log(data, 'changeDom');

         function changeDoms(dom, item) {
            $(dom).empty();
@@ -71,21 +75,17 @@
         changeDoms('#um-m-t-bz', data.bz);
         changeDoms('#um-m-t-dz', data.place);
         // console.log(data.jtype, data.securityId, '11111111111')
         if (data.jtype == 2) {
            changeDoms('#um-m-t-states', '已处理');

         } else if (data.jtype == 1) {
         if (data.jtype == 1 && data.securityId != '') {
            changeDoms('#um-m-t-states', '处理中');
            $('#jieshou').hide();
            $('#wanchen').show();
         } else {
         } else if (data.jtype == 2) {
            changeDoms('#um-m-t-states', '已处理');
         } else if (data.securityId == null || data.securityId == '') {
            changeDoms('#um-m-t-states', '未处理');
            $('#jieshou').show();
            $('#wanchen').hide();
         }
         // if (this.isFromJQ == false) {
         //    $('#wanchen').show();
         // }

      },
      //url解码
@@ -168,17 +168,20 @@
         for (var i = 0; i < data.length; i++) {
            var a = data[i];
            if (a.jd == '' || a.wd == '') {
               console.log('没有坐标', i)
               console.log('没有坐标', i);
               that.haveJDWD = false;
            } else {
               setData(a);
            }
            markers.addLayer(marker);
         }
         map.addLayer(markers);
         if (that.haveJDWD) {
            markers.addLayer(marker);
            map.addLayer(markers);

         }
         var i = 0;
         markers.on('click', function(a) {
            if (i == 0) {

               console.log(that.getdata)

            } else if (i == 1) {
@@ -191,17 +194,48 @@
         return map; //抛出map
      },
      Submit() {
         $('#loding').show();
         var time = setTimeout(() => {
            $('#loding').hide();
         }, 2000)
         var data = this.getdata[0];
         // console.log(data)
         // receives() {// 接受任务
         var url = data.url,
            Pid = data.id,
            id = data.userid, //警察id
            name = data.username, //警察id
            datas = {
               id: Pid,
               securityId: id,
               alarmPeople: name
            };
         // console.log(datas);
         axios({
            url: url +
               `?securityId=${datas.securityId}&id=${datas.id}&alarmPeople=datas.alarmPeople`,
            // data: datas,
            header: {
               "content-type": "application/x-www-form-urlencoded"
            },
            method: 'POST',

         }).then(res => {
            // console.log(res, 123);

            $('#loding').show();
            var time = setTimeout(() => {
               $('#loding').hide();
            }, 1000)
            $('#jieshou').hide();
            $('#wanchen').show();
            $('#um-m-t-states').empty();
            $('#um-m-t-states').append('处理中');
         })
         // console.log( 123);

      },
      SubmitDown() {
         // $('#SubmitDown').show();
         console.log(uni.navigateTo)
         // console.log(uni.navigateTo)
         uni.navigateTo({
             url: '/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao'
            url: '/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao?id=' + this.getdata[0].id
         });
      },
      SubmitSD() {
@@ -227,7 +261,7 @@
         // console.log([this.lat, this.lng])
         this.map.setView([this.lat, this.lng], 20);
      },
      toJQposition(){
      toJQposition() {
         this.map.setView([this.oldlat, this.oldlng], 20);
      },
      // 获取实时位置
@@ -248,7 +282,7 @@
            that.lat = position.lat; //
            that.lng = position.lng; //火星坐标 //TODO 实现业务代码逻辑 
            that.haveShishiweizhi++; //控制只执行一次
            console.log(that.haveShishiweizhi)
            // console.log(that.haveShishiweizhi)
            if (that.haveShishiweizhi == 2) {
               // console.log(position)
               if (that.LXdhStart == null) {
@@ -279,6 +313,9 @@
               that.LXdhStart.addLayer(L.marker([that.lat, that.lng], {
                  icon: qd,
               }));
               if (that.haveJDWD == false) {
                  that.map.setView([that.lat, that.lng], 20);
               }

               that.map.addLayer(that.LXdhStart);
               that.getDHLine(+that.oldlng, +that.oldlat)
@@ -320,7 +357,7 @@
            } else {

               var resdata = res.data.result.coords;
               console.log(resdata)
               // console.log(res)
               var data = [];
               for (var i = 0; i < resdata.length; i++) {
                  var xy = [];
@@ -328,15 +365,15 @@
                  xy.push(resdata[i][0]);
                  data.push(xy);
               }
               var w = resdata[0][0] - resdata[resdata.length - 1][0];
               w = Math.abs(w);
               w = w / 0.00000899;
               w = w.toFixed(2);
               console.log(w);
               // var w = resdata[0][0] - resdata[resdata.length - 1][0];
               // w = Math.abs(w);
               // w = w / 0.00000899;
               // w = w.toFixed(2);
               // console.log(w);
               $('#t-mi').empty();
               $('#t-mi').append(w + '米');
               $('#t-mi').append(res.data.result.dist + '米');
               $('#t-fz').empty();
               $('#t-fz').append(w / 30 + '分钟');
               $('#t-fz').append(res.data.result.flen + '分钟');

               if (that.LXdhEnd != null) {
                  that.map.removeLayer(that.LXdhEnd);
@@ -390,10 +427,6 @@
         console.log('shuaxin')

      },
      // resultFeedbackClick() { //结果反馈跳转小程序
      //    uni.webView.navigateTo({
      //       url: `../poput/workbench/policeDetails/policeDetails?id=${this.seedata.id}`
      //    });
   },
   created() {},
   mounted() {
@@ -401,7 +434,7 @@
      var time = setInterval(() => {
         if (this.haveShishiweizhi == 1) {
            this.getLocationData();
            console.log(this.haveShishiweizhi)
            // console.log(this.haveShishiweizhi)

         } else if (this.haveShishiweizhi == 2) {
            clearInterval(time);