浏览代码

工具栏问题与行政区划显示问题的修改

lkk 1 年之前
父节点
当前提交
3c6af20b81
共有 3 个文件被更改,包括 11 次插入10 次删除
  1. 10 6
      src/components/Combinations/toolBar/toolBar.vue
  2. 0 3
      src/components/Viewer/smViewer.vue
  3. 1 1
      src/views/map3d.vue

+ 10 - 6
src/components/Combinations/toolBar/toolBar.vue

@@ -1,8 +1,8 @@
 <template>
   <!-- 暂时隐藏工具栏 -->
-  <div v-show="ToolBarShow">
+  <!-- <div v-show="ToolBarShow"> -->
+  <div v-if="ToolBarShow">
     <!-- <div v-if="true"> -->
-
     <!-- <div class="resourceTree" @click="choose(0)"></div> -->
     <div class="toolBar">
       <el-cascader size="mini" :show-all-levels="false" :options="xzqTreeData" placeholder="行政区"
@@ -81,7 +81,11 @@ import Bookmark from "../../Bookmark/Bookmark.vue";
 export default {
   components: { clickQuery, Bookmark },
   name: "ToolBar",
-  props: {},
+  props: {
+    ToolBarShow:{
+      type:Boolean,
+    }
+  },
   data() {
     return {
       sharedState: store.state,
@@ -97,9 +101,9 @@ export default {
     this.getXzqTreeData();
   },
   computed: {
-    ToolBarShow: function () {
-      return this.sharedState.ToolBarShow;
-    },
+    // ToolBarShow: function () {
+    //   return this.sharedState.ToolBarShow;
+    // },
   },
 
   methods: {

+ 0 - 3
src/components/Viewer/smViewer.vue

@@ -160,8 +160,6 @@ export default {
       // iEarth进行初始化设置
       viewer.scene.globe.depthTestAgainstTerrain = true;
       viewer.scene.globe.baseColor = Cesium.Color.BLACK; // 没有影像图层时地球的底色
-
-      this.$emit('updateParent','barShow',true)
       if (viewer.geocoder) {
         // 请开发者自行到supermap online官网(http://www.supermapol.com/)申请key
         viewer.geocoder.viewModel.geoKey = "fvV2osxwuZWlY0wJb8FEb2i5";
@@ -265,7 +263,6 @@ export default {
 
       // }, 3300);
 
-
     },
     viewerChange() {
       this.isbig = !this.isbig

+ 1 - 1
src/views/map3d.vue

@@ -60,7 +60,7 @@
         </el-menu>
       </div>
       <div class="systemTitle">海南省国土空间智慧治理试点(三亚)</div>
-      <tool-bar v-if="barShow"></tool-bar>
+      <tool-bar :barShow="ToolBarShow"></tool-bar>
       <!-- <div class="timeline">
         <div class="timeline-item" v-html="formattedText"></div>
         <div