Эх сурвалжийг харах

工具栏样式的修改以及控制台报错的解决

lkk 11 сар өмнө
parent
commit
c8014e2388

+ 3 - 1
src/common/scss/globe.scss

@@ -8,7 +8,9 @@ div {
 
 .sm-btn {
     display: inline-block;
-    color: #51E9FF;
+    // color: #51E9FF;
+    // color: #5ECDF0;
+    color: #64DAFF;
     background-color: rgba(38, 38, 38, 0.75);
     margin-bottom: 0;
     text-align: center;

+ 21 - 3
src/components/Combinations/toolBar/toolBar.scss

@@ -1,6 +1,6 @@
 .sm-tool-btn {
-    width: 32px;
-    height: 32px;
+    width: 28px;
+    height: 28px;
     box-sizing: border-box;
     background: transparent;
     z-index: 100;
@@ -8,18 +8,31 @@
     // background-color: rgba(0, 0, 0, .25);
     justify-content: center;
     align-items: center;
+
+
+
+    background: rgba(100, 218, 255, 0.1);
+    border-radius: 2px 10px 2px 10px;
+    border: 1.5px solid #5ecef09a;
+    margin-right: 5px;
+    margin-top: 3px;
+
+
     @media (max-width: 750px) {
         width: 35px;
         height: 35px;
     }
+
     @media (max-height: 480px) {
         width: 35px;
         height: 35px;
     }
+
     @media (max-height: 300px) {
         width: 30px;
         height: 30px;
     }
+
     .iconfont {
         font-size: 18px;
     }
@@ -78,6 +91,11 @@ ul {
 }
 
 /deep/ .el-input__inner {
-    background: transparent !important;
+    // background: transparent !important;
     color: white !important;
+    background: rgba(100, 218, 255, 0.1);
+    border-radius: 2px 10px 2px 10px;
+    border-color: #5ecef09a;
+    // color: #64daff;
+    // font-size: 12px;
 }

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

@@ -160,6 +160,8 @@ 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";

+ 7 - 3
src/views/map3d.vue

@@ -60,7 +60,7 @@
         </el-menu>
       </div>
       <div class="systemTitle">海南省国土空间智慧治理试点(三亚)</div>
-      <tool-bar></tool-bar>
+      <tool-bar v-if="barShow"></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"> </sm-viewer>
+    <sm-viewer @viewerChange="viewerChange" :isdefaultbig="true" @updateParent="changeData"> </sm-viewer>
     <!-- <div class="masking_top">
       <div class="top_left"></div>
       <div class="top_right"></div>
@@ -117,7 +117,8 @@ export default {
       formattedTime: "",
       activeMenuId: 0,
       drawer: false,
-      aiModel: window.aiModel
+      aiModel: window.aiModel,
+      barShow:false,
     };
   },
   created() {
@@ -132,6 +133,9 @@ 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"]();