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

src/store/store.js

@@ -40,6 +40,7 @@ var store2 = {
         sceneLayerlist: [],
         flattenNames: [],//存储压平的名称数组
         cockpit_date: null,
+        cockpit_region: {id:'4602'},//行政区划
         viewer_flag: true,
         xzqh_flag: true,
         query_pick_pane: [],
@@ -269,7 +270,11 @@ var store2 = {
         this.state.cockpit_date = newValue;
     }, setCockpitGkzb(newValue) {
         this.state.cockpit_gkzb = newValue;
-    }, setViewerFlagb(newValue) {
+    }, 
+    setCockpitRegion(newValue) {
+        this.state.cockpit_region = newValue;
+    }, 
+    setViewerFlagb(newValue) {
         this.state.viewer_flag = newValue;
     },
     // 中图添加夜景

src/views/cockpit/borderTemplate.vue

@@ -4,6 +4,7 @@
       <div>
         <div class="icon"></div>
         <span>{{ titleName }}</span>
+        <span class="region">{{ store.state.cockpit_region.name }}</span>
       </div>
       <slot name="title"></slot>
     </div>
@@ -56,7 +57,11 @@ export default {
       font-weight: bold;
       position: relative;
       bottom: -0.3rem;
-      left: 2.4rem;
+      left: 2.7rem;
+    }
+    .region{
+        font-weight: 500;
+        margin-left: 10px;
     }
 
     .selectTab {

src/views/cockpit/common/Title.vue

@@ -2,6 +2,7 @@
     <div class="title">
         <div class="icon"></div>
         <span>{{ title }}</span>
+        <span class="region">{{ store.state.cockpit_region.name }}</span>
     </div>
 </template>
 
@@ -56,5 +57,9 @@ export default {
         font-weight: bold;
         margin-left: 2.7rem;
     }
+    .region{
+        font-weight: 500;
+        margin-left: 10px;
+    }
 }
 </style>

src/views/cockpit/hysy.vue

@@ -1,9 +1,6 @@
 <template>
     <div class="hysy">
-        <div class="title">
-            <div class="icon"></div>
-            <span>重点用地监管</span>
-        </div>
+        <Title title='重点用地监管'></Title>
         <div class="selectTab">
 
             <el-select v-model="left_value" placeholder="请选择" :popper-append-to-body="false" @change="changeChartsLeft">
@@ -40,9 +37,9 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
 import { QueryOne, QueryList } from "../../api/cockpitNew";
 import DiscountedAColumnar from './common/DiscountedAColumnar.vue';
-
+import Title from './common/Title.vue';
 export default {
-    components: { DiscountedAColumnar },
+    components: { DiscountedAColumnar, Title },
     data() {
         return {
             activeName: 'first',
@@ -371,28 +368,28 @@ export default {
 
 
 
-.title {
-
-    border-width: 0px;
-    width: 100%;
-    height: 36px;
-    background: no-repeat;
-    background-size: 100% 100%;
-    background-image: url("/static/images/overview/titlebox.gif");
-    // background-size: 100% 100%;
-    display: flex;
-    justify-content: space-between;
-    position: relative;
-
-    span {
-        color: #fff;
-        font-size: 14px;
-        font-weight: bold;
-        position: absolute;
-        top: 0.3rem;
-        left: 2.5rem;
-    }
-}
+// .title {
+
+//     border-width: 0px;
+//     width: 100%;
+//     height: 36px;
+//     background: no-repeat;
+//     background-size: 100% 100%;
+//     background-image: url("/static/images/overview/titlebox.gif");
+//     // background-size: 100% 100%;
+//     display: flex;
+//     justify-content: space-between;
+//     position: relative;
+
+//     span {
+//         color: #fff;
+//         font-size: 14px;
+//         font-weight: bold;
+//         position: absolute;
+//         top: 0.3rem;
+//         left: 2.5rem;
+//     }
+// }
 
 .text {
     display: inline-block;

src/views/cockpit/tdsy.vue

@@ -1,11 +1,12 @@
 <template>
   <div class="tdsy">
     <div class="box1">
+      <Title title='资源供应'></Title>
       <div class="title">
-        <div>
+        <!-- <div>
           <div class="icon"></div>
           <span>资源供应</span>
-        </div>
+        </div> -->
 
         <div class="selectTab left_tab">
           <el-select v-model="left_value" placeholder="请选择" :popper-append-to-body="false" @change="changeChartsLeft">
@@ -124,13 +125,13 @@ import { QueryOne, QueryList } from "../../api/cockpitNew";
 import pie3d from "../../components/echartsTemplate/3dPie.vue";
 import DialWatch from "./common/DialWatch.vue";
 import Graph3D from "./common/Graph3D.vue";
-
+import Title from './common/Title.vue';
 import parse from "wellknown";
 import * as tdsy from "./js/tdsy";
 let dataSources = {};
 import { mapState, mapGetters } from "vuex";
 export default {
-  components: { pie3d, DialWatch, Graph3D },
+  components: { pie3d, DialWatch, Graph3D, Title },
   data() {
     return {
       vector_data: null,
@@ -1237,23 +1238,23 @@ export default {
     box-shadow: none;
 
     .title {
-      border-width: 0px;
-      width: 100%;
-      height: 36px;
-      background: no-repeat;
-      background-image: url("/static/images/overview/titlebox.gif");
+      // border-width: 0px;
+      // width: 100%;
+      // height: 36px;
+      // background: no-repeat;
+      // background-image: url("/static/images/overview/titlebox.gif");
       // background-size: 100% 100%;
-      display: flex;
+      // display: flex;
       justify-content: space-between;
       position: relative;
 
-      span {
-        color: #fff;
-        font-size: 14px;
-        font-weight: bold;
-        position: relative;
-        bottom: 1.8rem;
-      }
+      // span {
+      //   color: #fff;
+      //   font-size: 14px;
+      //   font-weight: bold;
+      //   position: relative;
+      //   bottom: 1.8rem;
+      // }
     }
 
     .left_tab {

src/views/viewer.vue

@@ -250,6 +250,7 @@ export default {
                             let adcode = obj.adcode
                             that.params.id = adcode
                             that.params.name = pri_name
+                            store.setCockpitRegion(obj)
 
                             that.setDatas()
                             // 管控指标
@@ -268,6 +269,7 @@ export default {
 
                         that.params.id = '4602'
                         that.setDatas()
+                        store.setCockpitRegion({id: '4602'})
 
                     }
                 }