Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

liuyg

2021-08-10 a6f0596a6365b3ebdfd32af7fa2a740577aaef9d

 src/views/clientManagement/clientManagement_copy.vue

@@ -260,7 +260,7 @@
              label: "上级菜单",
              prop: "pid",
              type: "tree",
              dicUrl: "/api/blade-jfpts/catalogs/catalogs/tree",
              dicUrl: "/api/catalogs/catalogs/tree",
              hide: true,
              props: {
                label: "title"
@@ -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});
          };
        })
      },