diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 014251e..4aa7fb9 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -27,6 +27,13 @@
 </template>
 
 <script>
+  /**
+   * 简单数据块显示，左边文字，右边图片
+   * @vue-prop {String} fontFamily - 数值字体
+   * @vue-prop {Object} options - 字体颜色配置
+   * @vue-prop {Object} data - 数据
+   */
+
 export default {
   name: 'simpleBlock',
   props: {
@@ -38,9 +45,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.25rem',
+          titleSize:'0.3rem',
           valueSize:'0.4rem',
-          unitSize:'0.1rem',
+          unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
@@ -48,10 +55,6 @@
         }
       }
     },
-    size: {
-      type: String,
-      default: ''
-    }, // 大小
     color: {
       type: String,
       default: 'white'

diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 014251e..4aa7fb9 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -27,6 +27,13 @@
 </template>
 
 <script>
+  /**
+   * 简单数据块显示，左边文字，右边图片
+   * @vue-prop {String} fontFamily - 数值字体
+   * @vue-prop {Object} options - 字体颜色配置
+   * @vue-prop {Object} data - 数据
+   */
+
 export default {
   name: 'simpleBlock',
   props: {
@@ -38,9 +45,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.25rem',
+          titleSize:'0.3rem',
           valueSize:'0.4rem',
-          unitSize:'0.1rem',
+          unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
@@ -48,10 +55,6 @@
         }
       }
     },
-    size: {
-      type: String,
-      default: ''
-    }, // 大小
     color: {
       type: String,
       default: 'white'
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index ef5f27a..6d02e1b 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -59,7 +59,7 @@
         text-align: center;
         .text{
           color:#99ccff;
-          font-size: 0.1rem;
+          font-size: 0.3rem;
           line-height: 3;
           margin: 0 auto;
           /*display:-webkit-box;*/

diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 014251e..4aa7fb9 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -27,6 +27,13 @@
 </template>
 
 <script>
+  /**
+   * 简单数据块显示，左边文字，右边图片
+   * @vue-prop {String} fontFamily - 数值字体
+   * @vue-prop {Object} options - 字体颜色配置
+   * @vue-prop {Object} data - 数据
+   */
+
 export default {
   name: 'simpleBlock',
   props: {
@@ -38,9 +45,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.25rem',
+          titleSize:'0.3rem',
           valueSize:'0.4rem',
-          unitSize:'0.1rem',
+          unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
@@ -48,10 +55,6 @@
         }
       }
     },
-    size: {
-      type: String,
-      default: ''
-    }, // 大小
     color: {
       type: String,
       default: 'white'
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index ef5f27a..6d02e1b 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -59,7 +59,7 @@
         text-align: center;
         .text{
           color:#99ccff;
-          font-size: 0.1rem;
+          font-size: 0.3rem;
           line-height: 3;
           margin: 0 auto;
           /*display:-webkit-box;*/
diff --git a/src/views/screen/mainComponents/mapView.vue b/src/views/screen/mainComponents/mapView.vue
index df8d90c..930e8cd 100644
--- a/src/views/screen/mainComponents/mapView.vue
+++ b/src/views/screen/mainComponents/mapView.vue
@@ -10,11 +10,11 @@
     <div class="map-tools">
       <dv-border-box-7 :color="['#006699','#006699']" backgroundColor="#003333">
         <div class="tool-box">
-          <div class="map-tool">
+          <div class="map-tool" :class="{'map-choose':currentMap=='矢量地图'}" @click="changeView('vector')">
             <img :src="require('@/assets/img/map/mapBlu.png')" class="tool-img"/>
             <div class="tool-text">矢量地图</div>
           </div>
-          <div class="map-tool" :class="{'map-choose':currentMap=='影像地图'}">
+          <div class="map-tool" :class="{'map-choose':currentMap=='影像地图'}" @click="changeView('satellite')">
             <img :src="require('@/assets/img/map/mapGray.png')" class="tool-img"/>
             <div class="tool-text">影像地图</div>
           </div>
@@ -56,14 +56,32 @@
     data(){
       return {
         center:this.baseConfig.center,
-        zooms:[13,20],
+        zooms:[13,18],
         zoom:14,
         currentMap:'影像地图',
         layers:[
-          // {name:'tdtMap', show:true, url:this.baseConfig.mapUrl, zooms:[13,20]},
-          {name:'tdtLabel', show:true, url:this.baseConfig.labelUrl, zooms:[13,20]},
-          {name:'satellite', show:true, url:this.baseConfig.satelliteUrl, zooms:[13,20]}
-        ]
+          {name:'tdtMap', show:false, url:this.baseConfig.mapUrl, zooms:[13,18]},
+          {name:'tdtLabel', show:false, url:this.baseConfig.labelUrl, zooms:[13,18]},
+          {name:'satellite', show:true, url:this.baseConfig.satelliteUrl, zooms:[13,18]},
+          {name:'satelliteLabel', show:true, url:this.baseConfig.satelliteLabelUrl, zooms:[13,18]}
+        ],
+      }
+    },
+    methods:{
+      changeView(viewType){
+        if(viewType=='satellite'){
+          this.currentMap==='影像地图'
+          this.layers[0].show = false
+          this.layers[1].show = false
+          this.layers[2].show = true
+          this.layers[3].show = true
+        }else if(viewType=='vector'){
+          this.currentMap==='矢量地图'
+          this.layers[0].show = true
+          this.layers[1].show = true
+          this.layers[2].show = false
+          this.layers[3].show = false
+        }
       }
     }
   }