工具栏版本更新

src/components/Combinations/toolBar/toolBar.vue

@@ -1,8 +1,8 @@
 <template>
   <!-- 暂时隐藏工具栏 -->
-  <!-- <div v-show="ToolBarShow"> -->
-  <div v-if="ToolBarShow">
+  <div v-show="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,11 +81,7 @@ import Bookmark from "../../Bookmark/Bookmark.vue";
 export default {
   components: { clickQuery, Bookmark },
   name: "ToolBar",
-  props: {
-    ToolBarShow:{
-      type:Boolean,
-    }
-  },
+  props: {},
   data() {
     return {
       sharedState: store.state,
@@ -101,9 +97,9 @@ export default {
     this.getXzqTreeData();
   },
   computed: {
-    // ToolBarShow: function () {
-    //   return this.sharedState.ToolBarShow;
-    // },
+    ToolBarShow: function () {
+      return this.sharedState.ToolBarShow;
+    },
   },
 
   methods: {

src/components/Viewer/smViewer.vue

@@ -263,6 +263,7 @@ export default {
 
       // }, 3300);
 
+
     },
     viewerChange() {
       this.isbig = !this.isbig

src/views/map3d.vue

@@ -60,7 +60,7 @@
         </el-menu>
       </div>
       <div class="systemTitle">海南省国土空间智慧治理试点（三亚）</div>
-      <tool-bar :barShow="ToolBarShow"></tool-bar>
+      <tool-bar></tool-bar>
       <!-- <div class="timeline">
         <div class="timeline-item" v-html="formattedText"></div>
         <div
@@ -82,7 +82,7 @@
     <div class="routerContainer">
       <router-view ref="routeViewRef"></router-view>
     </div>
-    <sm-viewer @viewerChange="viewerChange" :isdefaultbig="true" @updateParent="changeData"> </sm-viewer>
+    <sm-viewer @viewerChange="viewerChange" :isdefaultbig="true"> </sm-viewer>
     <!-- <div class="masking_top">
       <div class="top_left"></div>
       <div class="top_right"></div>
@@ -117,8 +117,7 @@ export default {
       formattedTime: "",
       activeMenuId: 0,
       drawer: false,
-      aiModel: window.aiModel,
-      barShow:false,
+      aiModel: window.aiModel
     };
   },
   created() {
@@ -133,9 +132,6 @@ export default {
     this.updateTime();
   },
   methods: {
-    changeData(name, updata) {
-      this[name] = updata;
-    },
     viewerChange(isbig) {
       // this.$refs.routeViewRef[ isbig ? 'switchPack_down':'switchPack_up']()
       this.$refs.routeViewRef["switch"]();
@@ -298,7 +294,7 @@ export default {
 }
 
 .header {
-  height: 74px;
+  height: 60px;
   position: fixed;
   top: 0px;
   width: 100%;
@@ -308,8 +304,8 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  // background-image: url("/static/images/overview/title_new.png");
-  background-image: url("/static/images/overview/title.gif");
+  background-image: url("/static/images/overview/title_new.png");
+
   background-size: 100% 100%;
 }
 
@@ -433,7 +429,7 @@ export default {
   height: 25px;
   line-height: 25px;
   /* text-align: center; */
-  text-align: center;
+  text-align: left;
   width: 100%;
   display: inline-block;
   position: relative;
@@ -447,9 +443,8 @@ export default {
 
 .timeline-item-time {
   top: -62px;
-    font-size: 17px;
-    text-align: center;
-    font-weight: bold;
+  font-size: 14px;
+  text-align: left;
 }
 
 .el-menu-demo {