Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/ConstructionApplication3D/SunlightAnalysis/SunlightAnalysis.vue

@@ -158,6 +158,9 @@ export default {
   },
   computed: {},
   mounted() {
+    if (!window.tooltip) {
+      window.tooltip = createTooltip(viewer._element);
+    }
     this.init();
   },
   methods: {

src/views/siteselection/components/xzjg.vue

@@ -116,7 +116,6 @@
 </template>
 
 <script>
-import { color } from "highcharts";
 import drawData from "./draw.json";
 import ghjgData from "./规划结果.json";
 export default {
@@ -153,13 +152,14 @@ export default {
         zip: "/file/statics/shape/辅助选址报告/6d39b2d4307b46e2a4cf6f8c68a30c31/111_1676448756708.zip",
       },
       geoJsonEntities: null,
-      xzjgObj: ghjgData,
+      xzjgObj: null,
       tempObj: JSON.parse(JSON.stringify(ghjgData)),
       copyData: null,
       arrww: [],
     };
   },
   mounted() {
+    this.xzjgObj = JSON.parse(JSON.stringify(ghjgData))
     this.copyData = JSON.parse(JSON.stringify(ghjgData));
     this.addPolygon("规划结果", "ghjg", "#0000FF");
     this.addPolygon("draw", "draw", "#FF0000");
@@ -212,11 +212,9 @@ export default {
 
     deleteprogramme(e, item) {
       e.stopPropagation();
-      console.log(item,this.bgList);
       this.bgList = this.bgList.filter((item1) => {
         return item1.properties.dkbm != item.properties.dkbm;
       });
-      console.log(this.tempObj);
       const temp = JSON.parse(
         JSON.stringify(
           this.tempObj.features.filter((item1) => {
@@ -242,7 +240,6 @@ export default {
           (accumulator, currentValue) => accumulator.concat(currentValue),
           []
         );
-        console.log(i);
         let entity = new Cesium.Entity({
           name: "地块" + i,
           show: true,