Merge branch 'master-v32-xwx' into 'master'

故障诊断弹框名称调整 See merge request !804

Merge branch 'master-v32-xwx' into 'master'
故障诊断弹框名称调整 See merge request !804
王涛
Commit 605dd2afecd77270fde3f7c1d53f247ea518ad20 2 parents 0a1ad7fa d63a4d0b
Showing 5 changed files with 18 additions and 18 deletions
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.js
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.html
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/index.html
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.html
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.js
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.js
View file @605dd2a
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.js
View file @605dd2a
@@ -115,7 +115,7 @@ export default {
                 prop: 'os',
                 label: '操作系统',
             }]
-            service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,resClass);
+            service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,resClass,'','诊断应用');
         }
         const openKpiList = () => {
             service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.html
View file @605dd2a
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.html
View file @605dd2a
@@ -23,32 +23,32 @@
         <div style="width: 200px;text-align: center;color: #666666;font-size: 18px">汇总信息</div>
         <div>
             <div class="d-flex align-left">
-                <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
+                <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
                     <img src="../src/style/img/fault/disRes.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断业务场景</span>
                     <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
                 </div>
                 |
-                <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
+                <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>
                 |
-                <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
+                <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>
                     <h class="text-link" @click="openDiagnosticItem('')">{{ getFaultItemValue(dialTest,'diagnosticItem') }}</h>
                 </div>
             </div>
             <div style="text-align: left;display: flex;margin-top: 10px;">
-                <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;">
+                <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;align-items: center;">
                     <img src="../src/style/img/fault/success.png" style="width: 22px;height: 22px;">
                     <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>
                 |
-                <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;">
+                <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>
                     <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('abnormal')">{{ getFaultItemValue(dialTest,'abnormal') }}</h>
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/index.html
View file @605dd2a
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/index.html
View file @605dd2a
@@ -23,32 +23,32 @@
         <div style="width: 200px;text-align: center;color: #666666;font-size: 18px">汇总信息</div>
         <div>
             <div class="d-flex align-left">
-                <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
+                <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
                     <img src="../src/style/img/fault/disRes.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;">诊断资源</span>
                     <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
                 </div>
                 |
-                <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
+                <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>
                 |
-                <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
+                <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>
                     <h class="text-link" @click="openDiagnosticItem('')">{{getFaultItemValue(dialTest,'diagnosticItem')}}</h>
                 </div>
             </div>
             <div style="text-align: left;display: flex;margin-top: 10px;">
-                <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;">
+                <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;align-items: center;">
                     <img src="../src/style/img/fault/success.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('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
                 |
-                <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;">
+                <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>
                     <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('abnormal')">{{getFaultItemValue(dialTest,'abnormal')}}</h>
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.html
View file @605dd2a
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.html
View file @605dd2a
@@ -7,38 +7,38 @@
     </div>
     <div>
         <div class="d-flex align-left">
-            <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
+            <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px;align-items: center;">
                 <img src="../src/style/img/fault/disRes.png">
                 <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">
+            <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(cardList,'diagnosticIndicators')}}</h>
             </div>
             |
-            <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
+            <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>
                 <h class="text-link" @click="openDiagnosticItem('')">{{getFaultItemValue(cardList,'diagnosticItem')}}</h>
             </div>
         </div>
         <div style="text-align: left;display: flex;margin-top: 10px;">
-            <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;">
+            <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;align-items: center;">
                 <img src="../src/style/img/fault/success.png" style="width:22px;height: 22px;">
                 <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;">
+            <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>
                 <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">
+            <div style="width: 200px;margin-left: 20px;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,'abnormal')}}</h>
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.js
View file @605dd2a
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.js
View file @605dd2a
@@ -96,7 +96,7 @@ export default {
                 prop: 'createBy',
                 label: '创建用户',
             }]
-            service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param);
+            service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,'','诊断链路场景');
         }
         let openResPonse = (kpiId,redId) =>{