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

src/common/scss/globe.scss

@@ -44,7 +44,7 @@ div {
     z-index: 99;
     cursor: pointer;
     // border: 1px solid #526f82;
-    background: url(/static/images/popup/background.png) no-repeat;
+    background: url(/static/images/ghzc/内容框.png) no-repeat;
     background-size: 100% 100%;
     background-position: center;
     //overflow: hidden;
@@ -135,9 +135,11 @@ div {
     padding-left: 15px;
     font-size: 15px;
     border-bottom: 1px solid rgba(38, 38, 38, 0.6);
-    background: url(/static/images/popup/title.png) no-repeat;
+    background: url(/static/images/overview/titlebox.gif) no-repeat;
     background-size: 100% 100%;
     background-position: center;
+    text-align: left;
+    padding-left: 38px;
     @media (max-width: 750px) {
         // height: 35px;
         line-height: 35px;
@@ -558,7 +560,7 @@ input[type="checkbox"]:checked::before {
 .title-txt {
     display: inline-block;
     font-size: 15px;
-    padding: 2px;
+    padding: 0px;
     margin-right: 5px;
     @media (max-width: 1000px) {
         font-size: 14px;

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/cockpit/bjxm.vue

@@ -348,7 +348,7 @@ export default {
   // color: #fff;
   // padding: 2%;
   background: no-repeat;
-  background-image: url("/static/images/overview/标题框.png");
+  background-image: url("/static/images/overview/titlebox.gif");
 
   .icon {
     background: no-repeat;

src/views/cockpit/borderTemplate.vue

@@ -43,7 +43,7 @@ export default {
     width: 100%;
     height: 40px;
     background: no-repeat;
-    background-image: url("/static/images/overview/标题框.png");
+    background-image: url("/static/images/overview/titlebox.gif");
     // background-size: 100% 100%;
     display: flex;
     justify-content: space-between;

src/views/cockpit/hysy.vue

@@ -485,7 +485,7 @@ export default {
     height: 40px;
     background: no-repeat;
     background-size: 116% 100%;
-    background-image: url("/static/images/overview/标题框.png");
+    background-image: url("/static/images/overview/titlebox.gif");
 
     .icon {
         background: no-repeat;

src/views/cockpit/jcbd.vue

@@ -122,7 +122,7 @@ export default {
     width: 100%;
     height: 40px;
     background: no-repeat;
-    background-image: url("/static/images/overview/标题框.png");
+    background-image: url("/static/images/overview/titlebox.gif");
 
     .icon {
         background: no-repeat;

src/views/cockpit/jsyd.vue

@@ -211,7 +211,7 @@ export default {
   // color: #fff;
   // padding: 2%;
   background: no-repeat;
-  background-image: url("/static/images/overview/标题框.png");
+  background-image: url("/static/images/overview/titlebox.gif");
 
   .icon {
     background: no-repeat;

src/views/cockpit/tdsc.vue

@@ -472,7 +472,7 @@ export default {
   // color: #fff;
   // padding: 2%;
   background: no-repeat;
-  background-image: url("/static/images/overview/标题框.png");
+  background-image: url("/static/images/overview/titlebox.gif");
 
   .icon {
     background: no-repeat;

src/views/cockpit/tdsy.vue

@@ -817,7 +817,7 @@ export default {
       width: 100%;
       height: 36px;
       background: no-repeat;
-      background-image: url("/static/images/overview/标题框.png");
+      background-image: url("/static/images/overview/titlebox.gif");
       // background-size: 100% 100%;
       display: flex;
       justify-content: space-between;

src/views/cockpitNew1/bjxm.vue

@@ -291,7 +291,7 @@ export default {
   // color: #fff;
   // padding: 2%;
   background: no-repeat;
-  background-image: url("/static/images/overview/标题框.png");
+  background-image: url("/static/images/overview/titlebox.gif");
 
   .icon {
     background: no-repeat;

src/views/cockpitNew1/borderTemplate.vue

@@ -43,7 +43,7 @@ export default {
     width: 100%;
     height: 40px;
     background: no-repeat;
-    background-image: url("/static/images/overview/标题框.png");
+    background-image: url("/static/images/overview/titlebox.gif");
     // background-size: 100% 100%;
     display: flex;
     justify-content: space-between;

src/views/cockpitNew1/gkzb.vue

@@ -219,7 +219,7 @@ export default {
   // color: #fff;
   // padding: 2%;
   background: no-repeat;
-  background-image: url("/static/images/overview/标题框.png");
+  background-image: url("/static/images/overview/titlebox.gif");
 
   .icon {
     background: no-repeat;

src/views/cockpitNew1/hysy.vue

@@ -424,7 +424,7 @@ export default {
     // color: #fff;
     // padding: 2%;
     background: no-repeat;
-    background-image: url("/static/images/overview/标题框.png");
+    background-image: url("/static/images/overview/titlebox.gif");
 
     .icon {
         background: no-repeat;

src/views/cockpitNew1/tdsc.vue

@@ -655,7 +655,7 @@ export default {
   // color: #fff;
   // padding: 2%;
   background: no-repeat;
-  background-image: url("/static/images/overview/标题框.png");
+  background-image: url("/static/images/overview/titlebox.gif");
 
   .icon {
     background: no-repeat;

src/views/cockpitNew1/tdsy.vue

@@ -1084,7 +1084,7 @@ export default {
       width: 100%;
       height: 36px;
       background: no-repeat;
-      background-image: url("/static/images/overview/标题框.png");
+      background-image: url("/static/images/overview/titlebox.gif");
       // background-size: 100% 100%;
       display: flex;
       justify-content: space-between;

src/views/complianceAnalysis/ghzc.scss

@@ -20,7 +20,7 @@
             box-sizing: border-box;
             width: 100%;
             height: 42px;
-            background: url("/static/images/ghzc/title_bg.png") no-repeat !important;
+            background: url("/static/images/overview/titlebox.gif") no-repeat !important;
             background-size: 100% 100% !important;
             line-height: 43px;
             font-size: 14px;

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"]();
@@ -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-size: 100% 100%;
 }
 
@@ -447,9 +443,9 @@ export default {
 
 .timeline-item-time {
   top: -62px;
-    font-size: 17px;
-    text-align: center;
-    font-weight: bold;
+  font-size: 18px;
+  text-align: center;
+  font-weight: bold;
 }
 
 .el-menu-demo {