Merge branch 'zz-test' into master

app/src/components/Header.vue

@@ -2,15 +2,13 @@
     <div>
 <div class="header">
  <div class="title-card">  
-    <ul  v-for="(item,index) in titleList" :key="id">  
+    <ul  v-for="(item,index) in titleList" :key="index">  
         <li class="bg-img">{{ item.name }}</li> 
  </ul>
  </div>
  <div class="title-card"> 
-     <ul class="tab-list" v-for="(item,index) in imgList" :key="index">  
-        <li>
-            <img :src="item.load" alt="">       
-        </li>
+     <ul v-for="(item,index) in titleList1" :key="index">  
+        <li class="bg-img">{{ item.name }}</li> 
  </ul></div>
 </div>
     </div>
@@ -48,6 +46,21 @@ export default{
                     id:4
                 },
             ],
+            titleList1:[
+                {
+                    name:'警情动态',
+                    id:5
+                },
+                {
+                    name:'火灾情况',
+                    id:6
+                },
+                {
+                    name:'消防物联网',
+                    id:7
+                },
+            
+            ],
             test:1
         }
     },
@@ -85,13 +98,13 @@ img{
   
     width: 100%;
     display: flex;
-    justify-content: space-around;
+    justify-content: space-between;
 }
 .bg-img{
     width: 120px;
     height: 40px;
     background: url('../assets/btn.png') no-repeat;
-    background-size: 100% 100%;
+    background-size: 120% 100%;
     text-align: center;
     line-height: 40px;
 }