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

liuyg

2021-05-08 9d48a3d80632ba01f21bdd57290dc9404b09203d

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

 public/img/bjkeji.jpg

 public/img/bjkeji3.jpg

 public/weather/index.html

@@ -8,10 +8,7 @@
    <title>天气</title>
    <!-- axios -->
    <script src='../map/lib/axios.js'></script>
    <script type="text/javascript" charset="utf-8"
        src="http://webapi.amap.com/maps?v=1.3&key=xxxxxx&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
    <script src="https://cdn.jsdelivr.net/npm/vue@2.6.12"></script>
    <script src="http://pv.sohu.com/cityjson?ie=utf-8"></script>
    <style>
        #weather {
            font-weight: 400;

 src/views/clientManagement/clientManagement.vue

@@ -1125,7 +1125,7 @@
        this.showMap = true;
        this.$nextTick(() => {
          this.$refs.mapDiv.onload = () => {
            window.frames[0].init("equipment", {x: row.jd, y: row.wd});
            window.frames[1].init("equipment", {x: row.jd, y: row.wd});
          };
        })
      },rightClick(row, event) {

 src/views/clientManagement/clientManagement_copy.vue

@@ -722,7 +722,7 @@
        this.showMap = true;
        this.$nextTick(() => {
          this.$refs.mapDiv.onload = () => {
            window.frames[0].init("equipment", {x: row.jd, y: row.wd});
            window.frames[1].init("equipment", {x: row.jd, y: row.wd});
          };
        })
      },

 src/views/dataL/dataL.vue

@@ -1186,7 +1186,7 @@
      this.startEcharts01();
    },
    getMap() {
      window.frames[0].init("DetailMap", {
      window.frames[1].init("DetailMap", {
        x: this.a.jd,
        y: this.a.wd,
      });
@@ -1297,15 +1297,15 @@
    // this.doEvents();
    // var timel = setTimeout(() => {
    this.$refs.detailMap.onload = () => {
      // window.frames[0].init("DetailMap", {
      // window.frames[1].init("DetailMap", {
      //   x: this.a.jd,
      //   y: this.a.wd,
      // });
      if (window.frames[0].init) {
      if (window.frames[1].init) {
        this.getMap();
      } else {
        // this.re();
        console.log(`没有找到到window.frames[0].init`);
        console.log(`没有找到到window.frames[1].init`);
      }
    };
  },

 src/views/distribution/index.vue

@@ -243,7 +243,7 @@

  mounted() {
    this.$refs.DistributionMapDiv.onload = () => {
      window.frames[0].init("AlertSecurity", {
      window.frames[1].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[0].init("ClientManagement", {x: row.jd, y: row.wd});
            window.frames[1].init("ClientManagement", {x: row.jd, y: row.wd});
          };
        });
      },

 src/views/policeTracking/policeTracking.vue

@@ -604,7 +604,7 @@
    this.getAudios();
    this.getImgAndVideo();
    this.$refs.mapDiv.onload = () => {
      window.frames[0].init("AlertSecurity", {
      window.frames[1].init("AlertSecurity", {
        x: this.form.jd,
        y: this.form.wd,
      });

 src/views/realTimePolice/real.vue

@@ -800,7 +800,7 @@
      this.showMap = true;
      this.$nextTick(() => {
        this.$refs.mapDiv.onload = () => {
          window.frames[0].init("ClientManagement", { x: row.jd, y: row.wd });
          window.frames[1].init("ClientManagement", { x: row.jd, y: row.wd });
        };
      });
    },

 src/views/security/security.vue

@@ -260,16 +260,16 @@
        }
        this.showMap=true;
        this.$refs.securityMap.onload = () => {
          if (window.frames[0].init) {
          if (window.frames[1].init) {
            if(row.jd=="" || row.jd=="0.0"){
              //如果处警员无位置信息，则赋值一个默认数据，否则地图无法加载
              window.frames[0].init("SecurityMap", {
              window.frames[1].init("SecurityMap", {
                              x: rwjd,
                              y: rwwd,
                              code:row.code
                          });
            }else{
              window.frames[0].init("SecurityMap", {
              window.frames[1].init("SecurityMap", {
                              x: row.jd,
                              y: row.wd,
                              code:row.code
@@ -277,7 +277,7 @@
            }
            
          } else {
            console.log(`没有找到到window.frames[0].init`)
            console.log(`没有找到到window.frames[1].init`)
          }
        }
      },

 src/views/supervisoryConsole/map.vue

@@ -23,7 +23,7 @@
  },
  mounted() {
    // this.$refs.supervisoryMap.onload = () => {
    //   window.frames[0].init("AlertSecurity", {
    //   window.frames[1].init("AlertSecurity", {
    //     x: this.form.jd,
    //     y: this.form.wd,
    //   });