Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/qdtlui

# Conflicts:
#	src/views/introduction/index.vue

src/views/introduction/index.vue

@@ -4,18 +4,20 @@
       <!-- <LivePlayer :videoUrl="videoUrl" fluent autoplay live stretch></LivePlayer> -->
       <!-- <mapdiv ref="mapdiv" style=""></mapdiv> -->
       <!-- <zhgl></zhgl> -->
-      <introduction></introduction>
-      <!-- <zone></zone> -->
-       <!-- <communication></communication> -->
+      <introduction v-if="currentindex==1"></introduction>
+      <zone v-if="currentindex==2"></zone>
+      <communication v-if="currentindex==3"></communication>
     </div>
    <headerdiv ref="headerDiv" :currentindexP = currentindexNew></headerdiv>
 
-    <!-- <div class="bottombg">
-      <div class="item item2" @click="changeMapTab(1)"><div class="num">1123</div><div>静态资源</div></div>
-      <div class="item item1 item2" @click="changeMapTab(2)"><div class="num">113</div><div>动态资源</div></div>
-      <div class="item item1 item2" @click="changeMapTab(3)"><div class="num">531</div><div>重点区域</div></div>
-      <div class="item"><div class="num" @click="changeMapTab(4)">16</div><div>实时告警</div></div>
-    </div> -->
+
+
+    <div class="bottombg1">
+      <div class="itemt item2" @click="currentindex=1"></div>
+      <div class="itemt item1 item2" @click="currentindex=2"></div>
+      <div class="itemt item1 item2" @click="currentindex=3"></div>
+
+    </div>
 
     <!-- <videodiv :cameracode="ccode" style="width:700px;height:300px;position:absolute;top:100px;left:100px"></videodiv> -->
 
@@ -42,7 +44,8 @@ import videodiv from "../../components/Videoplayer/index.vue"
 export default {
     name: "big",
     data() {
-        return {
+      return {
+            currentindex:1,
             videoUrl:'rtmp://39.104.22.45:30498/rtp/34020001001320000001_34020001001320000001',
             currenttime: moment().format("YYYY-MM-DD HH:mm:ss"),
             currentindexNew:7,
@@ -148,8 +151,10 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.bottombg{
-  background: url("../../assets/images/底部菜单bg@2x.png");
+
+
+.bottombg1{
+
   position: absolute;
   background-size: 100% 100%;
   z-index: 1;
@@ -164,12 +169,16 @@ export default {
   color:#fff;
   font-size:1.6rem;
 
-
-  .item{
+  .itemt:hover{
+    cursor: pointer;
+  }
+  .itemt{
     width: 33%;
     text-align: center;
     justify-content: center;
     position: relative;
+    // background: #25f8bd;
+    height: 100%;
     .num{
       font-size:3rem;
       color:#25f8bd;
@@ -180,7 +189,7 @@ export default {
   }
   .item2::after{
     content: "";
-    background: url("../../assets/images/图层\ 2@2x.png");
+    // background: url("../../assets/images/图层\ 2@2x.png");
     background-size: 100% 100%;
     width: 0.2rem;
     height: 7.3rem;