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

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;

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;
 }

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";

src/views/cockpit/tdsy.vue

@@ -68,13 +68,13 @@
           <div class="space">
             <div class="lt_box box">
               <div class="text">
-                <p>计划出让海域</p>
+                <p>计划供应</p>
                 <span>66.23</span>公顷
               </div>
             </div>
             <div class="lb_box box">
               <div class="text">
-                <p>计划出让海域</p>
+                <p>完成供应</p>
                 <span>66.23</span>公顷
               </div>
             </div>
@@ -84,14 +84,14 @@
             </div>
             <div class="rt_box box">
               <div class="text">
-                <p>计划出让海域</p>
-                <span>66.23</span>公顷
+                <p>计划供应项目</p>
+                <span>66.23</span>个
               </div>
             </div>
             <div class="rb_box box">
               <div class="text">
-                <p>计划出让海域</p>
-                <span>66.23</span>公顷
+                <p>完成供应项目</p>
+                <span>66.23</span>个
               </div>
             </div>
           </div>
@@ -182,17 +182,14 @@ export default {
         result: store.state.cockpit_tdgy.gy_jg.result
       }
 
-      console.log('mockData: ', mockData);
-
-
-      const mockData1 = {
-        xdata: ['居民用地', '公共管理用地', '商业商服用地', '工矿用地', '工矿用地仓储用地', "交通运输用地"],
-        result: [
-          { name: '计划收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 10) * 1000).toFixed(0)) },
-          { name: '完成收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 0.5) * 1000).toFixed(0)) },
-        ]
-      }
-      console.log('mockData1: ', mockData1);
+      // const mockData1 = {
+      //   xdata: ['居民用地', '公共管理用地', '商业商服用地', '工矿用地', '工矿用地仓储用地', "交通运输用地"],
+      //   result: [
+      //     { name: '计划收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 10) * 1000).toFixed(0)) },
+      //     { name: '完成收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 0.5) * 1000).toFixed(0)) },
+      //   ]
+      // }
+      // console.log('mockData1: ', mockData1);
 
       const color = [
         [{ offset: 0, color: 'rgba(183, 117, 12, 0.8)' }, { offset: 0.5, color: 'rgba(183, 117, 12, 0.8)' }, { offset: 0.5, color: 'rgba(249, 180, 71, 0.8)' }, { offset: 1, color: 'rgba(249, 180, 71, 0.8)' }],
@@ -258,11 +255,9 @@ export default {
         axisTick: { show: false },
       }]
       const diamondData = mockData.result.reduce((pre, cur, index) => {
-        console.log('pre, cur, index: ', pre, cur, index);
         pre[index] = cur.data.map((el, id) => el + (pre[index - 1] ? pre[index - 1][id] : 0))
         return pre
       }, [])
-      console.log('diamondData: ', diamondData);
 
       let series = mockData.result.reduce((p, c, i, array) => {
         p.push({
@@ -750,7 +745,8 @@ export default {
       store.state.cockpit_tdgy.gy_jg.result = result
       that.init_gy_jg_echart();
 
-    }
+    },
+
   },
   mounted() {
     const that = this;

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"]();