Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-05-21 e96d6c76904bf9cab3658606476d2429cae4ebad

 src/views/realTimePolice/real.vue

@@ -731,7 +731,7 @@
      this.$router.push({ query: {} });
      var today = new Date();
      var params ={};
     

      if(e==0){
        params = {
          beginTime: this.showToDay(today)+" 00:00:00",
@@ -867,7 +867,7 @@
      this.showMap = true;
      this.$nextTick(() => {
        this.$refs.mapDiv.onload = () => {
          window.frames[1].init("ClientManagement", { x: row.jd, y: row.wd });
          window.frames[1].init("ClientManagement", { x: row.jd, y: row.wd , clientID: row.deviceNumber});
        };
      });
    },