Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-joke

@@ -21,7 +21,7 @@
     position: absolute;
     left: 0px;
     top: 0px;
-    z-index: 999;
+    z-index: 9999;
     width: 100%;
 }
 

@@ -1999,12 +1999,16 @@ blockquote:before {
 }
 .info-intro{
     padding-top:20px;
-    text-indent:28px;
+    /*text-indent:28px;*/
+    text-indent:2em;
     font-size: 16px;
     color:#666;
     font-family: 'PingFang-SC-medium';
     line-height: 32px;
 }
+.not-text-indent{
+    text-indent: 0;
+}
 .info-character{
     padding:0 50px;
     display: flex;
@@ -2356,12 +2360,18 @@ blockquote:before {
     margin-left: 10px;
     font-size: 12px;
 }
-.btn-service{
+.text-align-center .btn-service{
     background-color:rgba(69, 69, 69,.73);
 }
-.btn-service:hover{
+.text-align-center .btn-service:hover{
     background-color:rgba(69, 69, 69,1);
 }
+.btn-service{
+    background-color: rgba(52, 161, 255,.73);
+}
+.btn-service:hover{
+    background-color: rgba(52, 161, 255,1);
+}
 .btn-concat{
     background-color: rgba(52, 161, 255,.73);
 }

@@ -3,14 +3,17 @@ export function Information() {
     let res={
         title:'信息化协同管理支撑平台',
         introduction:'基于“人工智能+大数据”底座对全新业务、系统、流程、管理、虚拟团队“全新”模式下的信息化协同。',
+        indent:true,
         data:[
             {
                 title:'产品信息',
+                indent:true,
                 introduction:'魔镜智能将为“智慧税务”提供一个可视化、全局化、智能化、标准化、自动化的“全流程击穿协同管理”平台。实时洞察数字化业务与用户体验、主动保障核心征管、电子税务局等核心业务系统稳定、持续高效运行，构建基于“人工智能+大数据”底座的异常检测、智能告警分析、高效信息协同的大运维工作体系。',
                 type:'info'
             },
             {
                 title:'产品特点',
+                indent:false,
                 introduction:'',
                 data:[
                     {
@@ -33,12 +36,14 @@ export function Information() {
             },
             {
                 title:'系统框架',
+                indent:false,
                 introduction:'安全运维服务流程的系统架构',
                 img:'assets/img/serviceSecond/information/system.jpg',
                 type:'system'
             },
             {
                 title:'产品优势',
+                indent:false,
                 introduction:'',
                 dataSecond:[
                     {
@@ -88,7 +93,7 @@ export function Information() {
                         img:'assets/img/serviceSecond/information/value-bg.jpg'
                     }
                 ],
-                type:'value'
+                type:'system'
             },
         ]
     }
@@ -714,7 +719,7 @@ export function cmdb() {
                 type:'system'
             },
             {
-                title:'CMDB主要实现五个方面的功能',
+                title:'CMDB核心功能', //CMDB主要实现五个方面的功能
                 introduction:'',
                 dataFunc:[
                     {
@@ -751,7 +756,7 @@ export function cmdb() {
                 type:'func'
             },
             {
-                title: 'IT资产生命周期流程化管理',
+                title: '资产生命周期管理',//IT资产生命周期流程化管理
                 introduction: '',
                 icon:'assets/img/serviceSecond/cmdb/lifeCycle.jpg',
                 dataLife:[

@@ -82,7 +82,7 @@ export default {
         }
         // 设置导航的样式
         let setNavStyle=()=>{
-            if(i.value==1 || i.value==2 || i.value==4 || i.value==6){
+            if(i.value==1 || i.value==2 || i.value==4){
                 $('.navigation').removeClass('navigation-white');
                 $('.logo-outer .hg-logo').attr('src','assets/img/logo.png');
 

@@ -52,7 +52,7 @@
                         <div class="tech-title-num">{{index+1}}</div>
                         <div class="tech-title pt-30 pb-30">{{item.title}}</div>
                         <div :class="[ 'tooltip', 'tooltip-self','flex-column-center',{'opacity1':item.isHover,'opacity0':!item.isHover}]">
-                            <div>{{item.title}}</div>
+                            <div><b>{{item.title}}</b></div>
                             <div>{{item.tipIntro}}</div>
                         </div>
                         <div class="tech-introCon-sm">
@@ -144,7 +144,7 @@
 </section>
 <section class="about-section route-section">
     <div class="step-route-bg">
-        <img src="assets/img/index/step-route-bg.jpg" alt="">
+        <img src="assets/img/index/step-route-bg.png" alt="">
     </div>
     <div class="step-route-bg-sm">
         <img src="assets/img/index/step-route-bg-sm.jpg" alt="">

@@ -31,7 +31,7 @@
     <div class="div-type" :data-type="item.type"></div>
     <div class="container">
         <div class="info-title">{{item.title}}</div>
-        <div :class="['info-intro',{'text-align-center':item.type=='system' || item.type=='value'},{'max-width-600':item.type=='value'}]" v-if="item.introduction">{{item.introduction}}</div>
+        <div :class="['info-intro',{'text-align-center':item.type=='system' || item.type=='value'},{'max-width-600':item.type=='value'},{'not-text-indent':!item.indent}]" v-if="item.introduction">{{item.introduction}}</div>
         <div class="row"  v-if="item.data && item.data.length>0">
             <div class="info-character col-md-4" v-for="(itemC,indexC) in item.data">
                 <img class="pt-50" :src="itemC.icon" alt="">