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

Administrator

2021-05-10 b921db470a289d3a5bdf2db8d60e6e5e6b4b5973

 public/map/popup/html/FlareClusterLayer_v3 copy.html

@@ -401,6 +401,7 @@
                    //     }
                    // }
                    axios.get(url).then((res) => {
                        console.log(typeof res,34234534345341)
                        var data = JSON.parse(res);// JSON转js
                        my.ourd = data.data;
                        my.deptname = my.ourd.deptName;