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

src/components/Query/clickQuery/CockpitVector.vue

@@ -17,7 +17,10 @@
               item.name !== 'type' &&
               item.name !== 'create_time' &&
               item.name !== 'val1' &&
-              item.name !== 'val2'
+              item.name !== 'val2'&&
+              item.name !== 'xmmc' &&
+              item.name !== 'zlmj' &&
+              item.name !== 'tzje' 
           )
         "
         style="width: 100%"
@@ -36,7 +39,7 @@
         >
         </el-table-column>
       </el-table>
-      <div id="seaTransferCharts" ref="echartsRef"></div>
+      <div id="seaTransferCharts" ref="echartsRef" v-if="store.state.vectordataid !=0"></div>
     </div>
   </div>
 </template>
@@ -58,7 +61,6 @@ export default {
       timeout: null,
       pick_entity: null,
       dataid: 0,
-      tempData: [],
     };
   },
   //监听属性 类似于data概念
@@ -84,6 +86,7 @@ export default {
     viewer_flag(newVal) {
       if (newVal) {
         viewer.dataSources.removeAll();
+        store.state.vectordataid = 0
       }
     },
   },

src/views/complianceAnalysis/components/lsjl.vue

@@ -215,7 +215,7 @@ export default {
     },
     zoomItem(item) {
       this.now = item.bsm;
-      this.addPolygon(parse(item.geom));
+      item.geom && this.addPolygon(parse(item.geom));
     },
     // 加载GeoJSON数据
     addPolygon(geojson) {