Merge branch 'master' of http://39.101.69.29:3000/sunzehao/cesium_three

src/views/cesium.vue

@@ -2007,7 +2007,7 @@ export default {
     },
     showMessage(type, val, viewer) {
       console.log("type===>>>", type);
-      if (type !== "windbasic2d" || type !== "windbasic3d") {
+      if (type !== "windbasic2d" && type !== "windbasic3d") {
         this.windDrawer = true;
         this.windDrawerHeader = val.name + "数据详情";