Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web

@@ -144,4 +144,8 @@
     color: #fff;
     font-size: 14px;
     line-height: 28px;
+}
+.flex-border-span{
+    display: flex;
+    align-items: center;
 }
\ No newline at end of file

@@ -30,19 +30,19 @@
                 <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==1}]" @click="clickDaultDefinitionFunc(1)" shadow="hover"><span class="card-name">故障定义</span></el-card>
             </el-col>
             <el-col :span="3">
-                <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==2}]" @click="clickNetworkMonitorFunc(2)" shadow="hover"><span class="card-name">网络检测</span></el-card>
+                <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==6}]" @click="dialtestMonitorFunc(6)" shadow="hover"><span class="card-name">业务拨测</span></el-card>
             </el-col>
             <el-col :span="3">
-                <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==3}]" @click="applicationMonitorFunc(3)" shadow="hover"><span class="card-name">应用检测</span></el-card>
+                <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==2}]" @click="clickNetworkMonitorFunc(2)" shadow="hover"><span class="card-name">网络链路</span></el-card>
             </el-col>
             <el-col :span="3">
-                <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==4}]" @click="basicEnvironmentFunc(4)" shadow="hover"><span class="card-name">基础环境</span></el-card>
+                <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==3}]" @click="applicationMonitorFunc(3)" shadow="hover"><span class="card-name">NPM</span></el-card>
             </el-col>
             <el-col :span="3">
                 <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==5}]" @click="apmMonitorFunc(5)" shadow="hover"><span class="card-name">APM</span></el-card>
             </el-col>
             <el-col :span="3">
-                <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==6}]" @click="dialtestMonitorFunc(6)" shadow="hover"><span class="card-name">拨测分析</span></el-card>
+                <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==4}]" @click="basicEnvironmentFunc(4)" shadow="hover"><span class="card-name">基础环境</span></el-card>
             </el-col>
 <!--            <el-col :span="3">-->
 <!--                <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==6}]" @click="logDetectionFunc(6)" shadow="hover"><span class="card-name">日志检测</span></el-card>-->
@@ -210,13 +210,13 @@
         </el-row>-->
     </div>
 
-    <!--网络检测-->
+    <!--网络链路-->
     <div class="network-monitor  margin-30" v-if="networkMonitorHide">
         <el-row>
             <el-col :span="6">
                 <div class="title-text">
                     <img src="./src/assets/images/faultDiagnosis/icon-wljc.png" class="title-img">
-                    <span>网络检测</span>
+                    <span>网络链路</span>
                 </div>
             </el-col>
         </el-row>
@@ -240,7 +240,7 @@
                         </div>
                     </div>
                     <div class="flex-div btn-el-btn margin-bottom-10" v-if="faultStateRadio==1">
-                        <el-button  :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addNetNode">添加网络检测</el-button>
+                        <el-button  :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addNetNode">添加网络链路</el-button>
                         <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
                     </div>
                 </div>
@@ -248,13 +248,13 @@
         </el-row>
     </div>
 
-    <!--应用检测-->
+    <!--NPM-->
     <div class="application-monitor margin-30" v-if="applicationMonitorHide">
         <el-row>
             <el-col :span="6">
                  <div class="title-text">
                     <img src="./src/assets/images/faultDiagnosis/icon-yyjc.png" class="title-img">
-                    <span>应用检测</span>
+                    <span>NPM</span>
                 </div>
             </el-col>
         </el-row>
@@ -280,7 +280,7 @@
 
                     </div>
                     <div class="flex-div btn-el-btn margin-bottom-10" v-if="faultApplicationRadio==1">
-                        <el-button  :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addApplicationMonitor()">添加应用检测</el-button>
+                        <el-button  :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addApplicationMonitor()">添加NPM</el-button>
                         <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
                     </div>
                 </div>
@@ -411,13 +411,13 @@
 
     </div>
 
-    <!--拨测分析-->
+    <!--业务拨测-->
     <div class="application-monitor margin-30" v-if="dialtestMonitorHide">
         <el-row>
             <el-col :span="6">
                 <div class="title-text">
                     <img src="./src/assets/images/faultDiagnosis/icon-yyjc.png" class="title-img">
-                    <span>拨测分析</span>
+                    <span>业务拨测</span>
                 </div>
             </el-col>
         </el-row>
@@ -443,7 +443,7 @@
 
                     </div>
                     <div class="flex-div btn-el-btn margin-bottom-10" v-if="faultDialtestRadio==1">
-                        <el-button  :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addDialtestMonitor()">添加拨测分析</el-button>
+                        <el-button  :size="$global.elementConfig.size.button" class="multiple-choice-button color-999" @click="addDialtestMonitor()">添加业务拨测</el-button>
                         <img src="./src/assets/images/faultDiagnosis/icon-item-add.png" class="multiple-choice-add-icon">
                     </div>
                 </div>
@@ -524,15 +524,15 @@
     </div>
 
     <div class="network-monitor-popup popup-bg">
-        <!--网络检测弹窗-->
+        <!--网络链路弹窗-->
         <DiagnosisNet v-show="networkMonitorVisible" :isDisplay="networkMonitorVisible" :propsData="propsData" @callback="getNetworkMonitorList" ></DiagnosisNet>
-        <!--应用检测弹框-->
+        <!--NPM弹框-->
         <ApplicationMoni v-show="applicationMonitorVisible" :isDisplay="applicationMonitorVisible" :applicationMonitorList="applicationMonitorList" :propsData="propsData"  @callbackApp="getApplicationMoniList"></ApplicationMoni>
         <!--基础环境弹框-->
         <BasicEnvironmentAdd v-show="baseVisible" :isDisplay="baseVisible" :baseList="baseList" :baseCount="count"  :propsData="propsData" @callbackBase="getBasicEnvironmentList"></BasicEnvironmentAdd>
         <!--APM弹框-->
         <APM v-show="APMVisible" :isDisplay="APMVisible"  :apmMonitorList="apmMonitorList"  :propsData="propsData" @callbackAPM="getAPMList"></APM>
-        <!--拨测分析弹框-->
+        <!--业务拨测弹框-->
         <DialTest v-show="dialtestMonitorVisible" :isDisplay="dialtestMonitorVisible" :dialtestMonitorList="dialtestMonitorList" :propsData="propsData"  @callbackDialtest="getDialtestMoniList"></DialTest>
         <!--日志监测弹框-->
         <LogMonition v-if="logMonitionVisible" :propsData="propsData" @callbackLog="getLogMonitionList"></LogMonition>

@@ -17,13 +17,13 @@
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断应用</span>
                     <h class="text-link" @click="openBusScenarios('','诊断应用')">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disKpi.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span>
                     <h class="text-link" @click="openKpiList()">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disItem.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px"> 诊断项</span>
@@ -36,7 +36,7 @@
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
                     <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #febb1a;">
                     <img src="../src/style/img/fault/error.png" style="width: 22px;height: 22px;">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>

@@ -27,13 +27,13 @@
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断业务场景</span>
                     <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
                     <img src="../src/style/img/fault/disKpi.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span>
                     <h class="text-link" @click="openKpiList()">{{ getFaultItemValue(dialTest,'diagnosticIndicators') }}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
                     <img src="../src/style/img/fault/disItem.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px"> 诊断项</span>
@@ -46,7 +46,7 @@
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
                     <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('normal')">{{ getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;align-items: center;">
                     <img src="../src/style/img/fault/error.png" style="width: 22px;height: 22px;">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>

@@ -27,13 +27,13 @@
                     <span style="margin: 0px 6px 0px 6px;width: 105px;">诊断资源</span>
                     <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
                     <img src="../src/style/img/fault/disKpi.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span>
                     <h class="text-link" @click="openKpiList()">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
                     <img src="../src/style/img/fault/disItem.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断项</span>
@@ -46,7 +46,7 @@
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
                     <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;align-items: center;">
                     <img src="../src/style/img/fault/error.png"style="width: 22px;height: 22px">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>

@@ -12,14 +12,14 @@
                 <span style="margin: 0px 6px 0px 6px;width: 105px">诊断资源</span>
                 <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(cardList,'diagnosticResources')}}</h>
             </div>
-            |
-            <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
+            <span class="flex-border-span">|</span>
+            <div style="width: 200px;margin-left: 40px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
                 <img src="../src/style/img/fault/disKpi.png">
                 <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span>
                 <h class="text-link" @click="openKpiList()">{{getFaultItemValue(cardList,'diagnosticIndicators')}}</h>
             </div>
-            |
-            <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
+            <span class="flex-border-span">|</span>
+            <div style="width: 200px;margin-left: 40px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
                 <img src="../src/style/img/fault/disItem.png">
                 <span style="margin: 0px 6px 0px 6px;width: 105px">诊断项</span>
                 <h class="text-link" @click="openDiagnosticItem('')">{{getFaultItemValue(cardList,'diagnosticItem')}}</h>
@@ -31,14 +31,14 @@
                 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px;">正常</span>
                 <h style="font-size: 20px" class="text-link" @click="openDiagnosticItem('normal')">{{getFaultItemValue(cardList,'normal')}}</h>
             </div>
-            |
-            <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;align-items: center;">
+            <span class="flex-border-span">|</span>
+            <div style="width: 200px;margin-left: 40px;display: flex;align-self: center;color: #febb1a;align-items: center;">
                 <img src="../src/style/img/fault/error.png" style="width:22px;height: 22px;">
                 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px;"> 异常</span>
                 <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('abnormal')">{{getFaultItemValue(cardList,'abnormal')}}</h>
             </div>
-            |
-            <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: red;align-items: center;">
+            <span class="flex-border-span">|</span>
+            <div style="width: 200px;margin-left: 40px;display: flex;align-self: center;color: red;align-items: center;">
                 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
                 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px;"> 告警</span>
                 <h style="font-size: 24px" class="text-link" @click="openAlarm()">{{getFaultItemValue(cardList,'alarm')}}</h>
@@ -114,7 +114,7 @@
                     </el-tooltip>
                 </el-col>
                 <el-col :span="1" style="line-height: 36px;color: gainsboro;">
-                    |
+                    <span class="flex-border-span">|</span>
                 </el-col>
                 <el-col :span="4" class="align-center">
                     <img src="../src/style/img/fault/base/CPU-green.png"><br/>
@@ -157,7 +157,7 @@
                     </el-tooltip>
                 </el-col>
                 <el-col :span="2" class="align-center" style="color: gainsboro;">
-                    |
+                    <span class="flex-border-span">|</span>
                 </el-col>
                 <el-col :span="1" class="align-center">
                     <img src="../src/style/img/fault/base/alarm.png">

@@ -27,13 +27,13 @@
                     <span style="margin: 0px 6px 0px 6px;width: 105px" >诊断链路场景</span>
                     <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disKpi.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span>
                     <h class="text-link" @click="openKpiList()">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disItem.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px"> 诊断项</span>
@@ -46,7 +46,7 @@
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
                     <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
-                |
+                <span class="flex-border-span">|</span>
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #febb1a;">
                     <img src="../src/style/img/fault/error.png" style="width: 20px;height: 20px">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>

@@ -33,13 +33,6 @@ export default {
             kpiId: '',
             flag: '',
             items: [{
-                faultType: 'NETLINK',
-                faultTypeName: '网络链路',
-                components: 'netLinks',
-                color: '#409EFF',
-                detail: true,
-                state: '0'
-            }, {
                 faultType: 'DIALTEST',
                 faultTypeName: '拨测',
                 components: 'dialtest-item',
@@ -49,6 +42,13 @@ export default {
                 colType: 'kpi',
                 state: '0'
             }, {
+                faultType: 'NETLINK',
+                faultTypeName: '网络链路',
+                components: 'netLinks',
+                color: '#409EFF',
+                detail: true,
+                state: '0'
+            }, {
                 faultType: 'NPM',
                 faultTypeName: 'NPM',
                 components: 'npm-item',
@@ -58,19 +58,19 @@ export default {
                 colType: 'kpi',
                 state: '0'
             }, {
-                faultType: 'BASE',
-                faultTypeName: '基础',
-                components: 'result-item',
-                color: '#67C23A',
+                faultType: 'APM',
+                faultTypeName: 'APM',
+                components: 'apm-item',
+                color: '#F56C6C',
                 itemName: '检测指标',
                 detail: true,
                 colType: 'flag',
                 state: '0'
             }, {
-                faultType: 'APM',
-                faultTypeName: 'APM',
-                components: 'apm-item',
-                color: '#F56C6C',
+                faultType: 'BASE',
+                faultTypeName: '基础',
+                components: 'result-item',
+                color: '#67C23A',
                 itemName: '检测指标',
                 detail: true,
                 colType: 'flag',