monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 6e0834f4769d896758c707688e75396be44e1f9d 2 parents 0c35a395 9408bdaf

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

故障管理基础资源提示框



See merge request !797
Inline Side-by-side
Showing 12 changed files with 107 additions and 61 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="d-flex"> 2 <div class="d-flex">
3 <img src="../src/style/img/fault/apm.gif"> 3 <img src="../src/style/img/fault/apm.gif">
4 <h3 style="margin-left: 10px;color: #666666;font-size: 18px">APM</h3> 4 <h3 style="margin-left: 10px;color: #666666;font-size: 18px">APM</h3>
5 - <div style="width: calc(100% - 170px);line-height: 54px;font-size: 14px" class="align-right"> 5 + <div style="width: calc(100% - 200px);line-height: 54px;font-size: 14px" class="align-right">
6 <a class="m-r-20" v-if="card && card.length > 0" @click="openMoreDialog">更多</a> 6 <a class="m-r-20" v-if="card && card.length > 0" @click="openMoreDialog">更多</a>
7 <a v-model="cardName" v-if="card && card.length > 0" @click="openOrCloseApm()">{{cardName}}</a> 7 <a v-model="cardName" v-if="card && card.length > 0" @click="openOrCloseApm()">{{cardName}}</a>
8 </div> 8 </div>
@@ -62,26 +62,26 @@ @@ -62,26 +62,26 @@
62 <div style="padding-top: 30px;font-size: 18px;color: #333333">应用：<span class="text-link">{{item.applicationName}}</span></div> 62 <div style="padding-top: 30px;font-size: 18px;color: #333333">应用：<span class="text-link">{{item.applicationName}}</span></div>
63 <hr style="FILTER: alpha(opacity=100,finishopacity=0,style=3)" width="80%" color=#aed6f4 size=1> 63 <hr style="FILTER: alpha(opacity=100,finishopacity=0,style=3)" width="80%" color=#aed6f4 size=1>
64 <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 76px;font-size: 18px;"> 64 <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 76px;font-size: 18px;">
65 - <div style="width: 200px;margin-left: 10px;display: flex;align-self: center;"> 65 + <div style="width: 230px;display: flex;align-self: center;">
66 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;"> 66 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
67 - <span style="margin: 0px 6px;width: 95px">响应时间:</span> 67 + <span style="margin: 0px 6px;width: 133px;">响应时间告警量:</span>
68 <span class="text-link">{{item.responseNum}}</span> 68 <span class="text-link">{{item.responseNum}}</span>
69 </div> 69 </div>
70 - <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;"> 70 + <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;">
71 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;"> 71 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
72 - <span style="margin: 0px 6px 0px 6px;width: 95px">Fullgc:</span> 72 + <span style="margin: 0px 6px 0px 6px;width: 115px;">Fullgc告警量:</span>
73 <span class="text-link">{{item.FullGcNum}}</span> 73 <span class="text-link">{{item.FullGcNum}}</span>
74 </div> 74 </div>
75 </div> 75 </div>
76 <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 76px;font-size: 18px;"> 76 <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 76px;font-size: 18px;">
77 - <div style="width: 200px;margin-left: 10px;display: flex;align-self: center;"> 77 + <div style="width: 230px;display: flex;align-self: center;">
78 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;"> 78 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
79 - <span style="margin: 0px 6px;width: 95px">线程总数:</span> 79 + <span style="margin: 0px 6px;width: 133px;">线程总数告警量:</span>
80 <span class="text-link">{{item.threadNum}}</span> 80 <span class="text-link">{{item.threadNum}}</span>
81 </div> 81 </div>
82 - <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;"> 82 + <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;">
83 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;"> 83 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
84 - <span style="margin: 0px 6px 0px 6px;width: 95px">错误率:</span> 84 + <span style="margin: 0px 6px 0px 6px;width: 115px;">错误率告警量:</span>
85 <span class="text-link">{{item.errorNum}}</span> 85 <span class="text-link">{{item.errorNum}}</span>
86 </div> 86 </div>
87 </div> 87 </div>
@@ -95,11 +95,20 @@ export default { @@ -95,11 +95,20 @@ export default {
95 //诊断应用 95 //诊断应用
96 const openBusScenarios = () => { 96 const openBusScenarios = () => {
97 let param = [{ 97 let param = [{
98 - prop: 'taskName', 98 + prop: 'extendCol3',
99 label: '名称', 99 label: '名称',
100 },{ 100 },{
101 - prop: 'taskType',  
102 - label: '类型', 101 + prop: 'collProtocol',
  102 + label: '连接方式',
  103 + },{
  104 + prop: 'resName',
  105 + label: '资源名称',
  106 + },{
  107 + prop: 'resTypeName',
  108 + label: '资源类型',
  109 + },{
  110 + prop: 'os',
  111 + label: '操作系统',
103 }] 112 }]
104 service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param); 113 service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param);
105 } 114 }
@@ -45,13 +45,13 @@ @@ -45,13 +45,13 @@
45 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;"> 45 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;">
46 <img src="../src/style/img/fault/success.png" style="width: 22px;height: 22px;"> 46 <img src="../src/style/img/fault/success.png" style="width: 22px;height: 22px;">
47 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span> 47 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
48 - <h class="text-link" style="font-size: 24px">{{ getFaultItemValue(dialTest,'normal')}}</h> 48 + <h class="text-link" style="font-size: 24px"@click="openDiagnosticItem('normal')" >{{ getFaultItemValue(dialTest,'normal')}}</h>
49 </div> 49 </div>
50 | 50 |
51 - <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;" @click="openAlarm"> 51 + <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;">
52 <img src="../src/style/img/fault/error.png" style="width: 22px;height: 22px;"> 52 <img src="../src/style/img/fault/error.png" style="width: 22px;height: 22px;">
53 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span> 53 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>
54 - <h class="text-link" style="font-size: 24px">{{ getFaultItemValue(dialTest,'abnormal') }}</h> 54 + <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('abnormal')">{{ getFaultItemValue(dialTest,'abnormal') }}</h>
55 </div> 55 </div>
56 </div> 56 </div>
57 </div> 57 </div>
@@ -76,12 +76,7 @@ export default { @@ -76,12 +76,7 @@ export default {
76 console.log(cardData.value) 76 console.log(cardData.value)
77 } 77 }
78 78
79 - const openAlarm = () => {  
80 - service.sendEventAlarmDialog(emit, {  
81 - faultNo: props.faultNo,  
82 - targetType: props.targetType  
83 - });  
84 - } 79 +
85 80
86 const openBusScenarios = () => { 81 const openBusScenarios = () => {
87 let param = [{ 82 let param = [{
@@ -107,6 +102,9 @@ export default { @@ -107,6 +102,9 @@ export default {
107 const openMoreDialog = () => { 102 const openMoreDialog = () => {
108 service.sendEventMoreDialog(emit, proxy.$global, card.value); 103 service.sendEventMoreDialog(emit, proxy.$global, card.value);
109 } 104 }
  105 + const openDiagnosticItem = (type) => {
  106 + service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type);
  107 + }
110 108
111 // 挂载完 109 // 挂载完
112 Vue.onMounted(() => { 110 Vue.onMounted(() => {
@@ -119,13 +117,13 @@ export default { @@ -119,13 +117,13 @@ export default {
119 cardName, 117 cardName,
120 cardOpen, 118 cardOpen,
121 dialTest, 119 dialTest,
122 - openAlarm,  
123 getDialtestCard, 120 getDialtestCard,
124 cardData, 121 cardData,
125 openMoreDialog, 122 openMoreDialog,
126 openBusScenarios, 123 openBusScenarios,
127 openKpiList, 124 openKpiList,
128 getFaultItemValue: service.getFaultItemValue, 125 getFaultItemValue: service.getFaultItemValue,
  126 + openDiagnosticItem
129 } 127 }
130 } 128 }
131 } 129 }
@@ -2,8 +2,18 @@ @@ -2,8 +2,18 @@
2 <div class="d-flex"> 2 <div class="d-flex">
3 <img src="../src/style/img/fault/base.gif"> 3 <img src="../src/style/img/fault/base.gif">
4 <h3 style="margin-left: 10px;color: #666666;font-size: 18px">基础资源</h3> 4 <h3 style="margin-left: 10px;color: #666666;font-size: 18px">基础资源</h3>
5 - <div style="width: calc(100% - 225px);line-height: 54px;" class="align-right">  
6 - <a class="m-r-20" v-if="card && card.length > 0" @click="openMoreDialog">更多</a> 5 + <div style="line-height: 60px;" class="m-l-6">
  6 + <el-tooltip
  7 + effect="light"
  8 + placement="top-start">
  9 + <template #content>
  10 + 以图标方式展示每个资源类型的告警结果，颜色代表告警结果 <br/>
  11 + 红色：存在严重告警； 橙色：存在重要告警; 橙色：存在一般告警; 绿色：无告警
  12 + </template>
  13 + <i class="iconfont icon-tishi" />
  14 + </el-tooltip>
  15 + </div>
  16 + <div style="width: calc(100% - 252px);line-height: 54px;" class="align-right">
7 <a v-model="cardName" v-if="card && card.length > 0" @click="openOrCloseBase()">{{cardName}}</a> 17 <a v-model="cardName" v-if="card && card.length > 0" @click="openOrCloseBase()">{{cardName}}</a>
8 </div> 18 </div>
9 </div> 19 </div>
@@ -65,9 +65,7 @@ export default { @@ -65,9 +65,7 @@ export default {
65 targetType: props.targetType.toLocaleLowerCase() 65 targetType: props.targetType.toLocaleLowerCase()
66 }); 66 });
67 } 67 }
68 - const openMoreDialog = () => {  
69 - service.sendEventMoreDialog(emit, proxy.$global, card.value);  
70 - } 68 +
71 //诊断资源 69 //诊断资源
72 const openBusScenarios = () => { 70 const openBusScenarios = () => {
73 let param = [{ 71 let param = [{
@@ -76,6 +74,15 @@ export default { @@ -76,6 +74,15 @@ export default {
76 }, { 74 }, {
77 prop: 'ip', 75 prop: 'ip',
78 label: 'IP地址', 76 label: 'IP地址',
  77 + },{
  78 + prop: 'resTypeName',
  79 + label: '资源类型',
  80 + },{
  81 + prop: 'os',
  82 + label: '操作系统',
  83 + },{
  84 + prop: 'createBy',
  85 + label: '创建用户',
79 }] 86 }]
80 service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo, props.targetType.toLocaleLowerCase(), param); 87 service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo, props.targetType.toLocaleLowerCase(), param);
81 } 88 }
@@ -94,7 +101,6 @@ export default { @@ -94,7 +101,6 @@ export default {
94 dialTest, 101 dialTest,
95 cardName, 102 cardName,
96 openOrCloseBase, 103 openOrCloseBase,
97 - openMoreDialog,  
98 openAlarm, 104 openAlarm,
99 getFaultItemValue: service.getFaultItemValue, 105 getFaultItemValue: service.getFaultItemValue,
100 openBusScenarios, 106 openBusScenarios,
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: red"> 41 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: red">
42 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;"> 42 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
43 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px;"> 告警</span> 43 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px;"> 告警</span>
44 - <h style="font-size: 24px" class="text-link">{{getFaultItemValue(cardList,'abnormal')}}</h> 44 + <h style="font-size: 24px" class="text-link" @click="openAlarm()">{{getFaultItemValue(cardList,'abnormal')}}</h>
45 </div> 45 </div>
46 </div> 46 </div>
47 </div> 47 </div>
@@ -74,16 +74,16 @@ @@ -74,16 +74,16 @@
74 <el-col :span="12" class="align-right border-solid p-6"> 74 <el-col :span="12" class="align-right border-solid p-6">
75 {{item.linkState}} 75 {{item.linkState}}
76 </el-col> 76 </el-col>
77 - <el-col :span="12" class="align-left border-solid p-6" > 77 + <el-col :span="12" class="align-left border-solid p-6" v-if="resClass!='database'">
78 CPU 78 CPU
79 </el-col> 79 </el-col>
80 - <el-col :span="12" class="align-right border-solid p-6"> 80 + <el-col :span="12" class="align-right border-solid p-6" v-if="resClass!='database'">
81 {{item.cpu}} 81 {{item.cpu}}
82 </el-col> 82 </el-col>
83 - <el-col :span="12" class="align-left border-solid p-6"> 83 + <el-col :span="12" class="align-left border-solid p-6" v-if="resClass!='database'">
84 内存 84 内存
85 </el-col> 85 </el-col>
86 - <el-col :span="12" class="align-right border-solid p-6"> 86 + <el-col :span="12" class="align-right border-solid p-6" v-if="resClass!='database'">
87 {{item.men}} 87 {{item.men}}
88 </el-col> 88 </el-col>
89 <el-col :span="12" class="align-left border-solid p-6"> 89 <el-col :span="12" class="align-left border-solid p-6">
@@ -47,7 +47,8 @@ export default { @@ -47,7 +47,8 @@ export default {
47 } 47 }
48 } 48 }
49 let faultNo=props.faultNo; 49 let faultNo=props.faultNo;
50 - let targetType=props.targetType; 50 + let targetType=props.targetType.toLocaleLowerCase();
  51 + let resClass=props.cardList.resClass;
51 let getDialtestList = (data) => { 52 let getDialtestList = (data) => {
52 for (let i = 0; i < data.length; i++) { 53 for (let i = 0; i < data.length; i++) {
53 let resItem={ 54 let resItem={
@@ -82,25 +83,28 @@ export default { @@ -82,25 +83,28 @@ export default {
82 console.log(dialTest.value) 83 console.log(dialTest.value)
83 } 84 }
84 let getAlarmColor = (cardList) =>{ 85 let getAlarmColor = (cardList) =>{
85 - if (cardList.alarmLevel = '0'){ 86 + if (cardList.alarmLevel == '0'){
86 alarmColor.value = '#00A522'; 87 alarmColor.value = '#00A522';
87 - }else if (cardList.alarmLevel = '1'){ 88 + }else if (cardList.alarmLevel == '1'){
88 alarmColor.value = '#f97d04'; 89 alarmColor.value = '#f97d04';
89 - }else if (cardList.alarmLevel = '2'){ 90 + }else if (cardList.alarmLevel == '2'){
90 alarmColor.value = '#ffde00'; 91 alarmColor.value = '#ffde00';
91 - }else if (cardList.alarmLevel = '3'){ 92 + }else if (cardList.alarmLevel == '3'){
92 alarmColor.value = '#ff0000'; 93 alarmColor.value = '#ff0000';
93 } 94 }
94 } 95 }
95 const openAlarm = () => { 96 const openAlarm = () => {
96 - service.sendEventAlarmDialog(emit, { 97 + service.sendEventAlarmDialog(props.parentEmit, {
97 cardList: props.cardList, 98 cardList: props.cardList,
98 - targetType: props.targetType 99 + targetType: targetType,
  100 + faultNo: faultNo,
  101 + resClass:resClass
99 }); 102 });
100 } 103 }
101 const openMoreDialog = () => { 104 const openMoreDialog = () => {
102 service.sendEventMoreDialog(emit, proxy.$global, cardList.faultFixInfoList); 105 service.sendEventMoreDialog(emit, proxy.$global, cardList.faultFixInfoList);
103 } 106 }
  107 +
104 //诊断资源 108 //诊断资源
105 const openBusScenarios = () => { 109 const openBusScenarios = () => {
106 let param = [{ 110 let param = [{
@@ -109,12 +113,21 @@ export default { @@ -109,12 +113,21 @@ export default {
109 },{ 113 },{
110 prop: 'ip', 114 prop: 'ip',
111 label: 'IP地址', 115 label: 'IP地址',
  116 + },{
  117 + prop: 'resTypeName',
  118 + label: '资源类型',
  119 + },{
  120 + prop: 'os',
  121 + label: '操作系统',
  122 + },{
  123 + prop: 'createBy',
  124 + label: '创建用户',
112 }] 125 }]
113 - service.sendEventDiagnoseBusinessScenarios(props.parentEmit, props.faultNo,props.targetType.toLocaleLowerCase(),param,props.cardList.resClass); 126 + service.sendEventDiagnoseBusinessScenarios(props.parentEmit, faultNo,targetType,param,resClass);
114 } 127 }
115 //诊断指标 128 //诊断指标
116 const openKpiList = () => { 129 const openKpiList = () => {
117 - service.sendEventDiagnoseKpiList(props.parentEmit, props.faultNo,props.targetType.toLocaleLowerCase()); 130 + service.sendEventDiagnoseKpiList(props.parentEmit, faultNo,targetType);
118 } 131 }
119 132
120 // 挂载完 133 // 挂载完
@@ -136,7 +149,8 @@ export default { @@ -136,7 +149,8 @@ export default {
136 faultNo, 149 faultNo,
137 targetType, 150 targetType,
138 openBusScenarios, 151 openBusScenarios,
139 - openKpiList 152 + openKpiList,
  153 + resClass
140 } 154 }
141 } 155 }
142 } 156 }
@@ -70,18 +70,18 @@ @@ -70,18 +70,18 @@
70 <p style="width: 290px;margin-left: 40px;font-size: 16px">{{item.streamName}}</p> 70 <p style="width: 290px;margin-left: 40px;font-size: 16px">{{item.streamName}}</p>
71 <div style="margin-top: 35px;"> 71 <div style="margin-top: 35px;">
72 <p style="width: 85%;text-align: left;padding-left: 50px;">业务量 72 <p style="width: 85%;text-align: left;padding-left: 50px;">业务量
73 - <h style="margin-left: 6px;text-decoration: underline">{{item.busNum}}</h> 73 + <h class="text-link" style="margin-left: 6px;">{{item.busNum}}</h>
74 </p> 74 </p>
75 </div> 75 </div>
76 <div style="display: flex;text-align: left;margin-top: -17px;margin-left: 50px;"> 76 <div style="display: flex;text-align: left;margin-top: -17px;margin-left: 50px;">
77 <p style="width: 50%;">响应率 77 <p style="width: 50%;">响应率
78 - <h style="margin-left: 6px;text-decoration: underline"  
79 - :style="{color: item.responseColor}">{{item.responseNum}}% 78 + <h class="text-link" style="margin-left: 6px;"
  79 + :style="{color: item.responseColor}" @click="openResPonse(item.kpiId,item.resId)">{{item.responseNum}}%
80 </h> 80 </h>
81 </p> 81 </p>
82 <p style="width: 50%;">成功率 82 <p style="width: 50%;">成功率
83 - <h style="margin-left: 6px;text-decoration: underline"  
84 - :style="{color: item.successColor}">{{item.successNum}}% 83 + <h class="text-link" style="margin-left: 6px;"
  84 + :style="{color: item.successColor}" @click="openResPonse(item.kpiId,item.resId)">{{item.successNum}}%
85 </h> 85 </h>
86 </p> 86 </p>
87 </div> 87 </div>
@@ -47,10 +47,14 @@ export default { @@ -47,10 +47,14 @@ export default {
47 successNum:'0', 47 successNum:'0',
48 successColor:'red', 48 successColor:'red',
49 responseNum:'0', 49 responseNum:'0',
50 - responseColor:'red' 50 + responseColor:'red',
  51 + kpiId:'',
  52 + resId:''
51 } 53 }
52 for (let j = 0; j < data[i].length; j++) { 54 for (let j = 0; j < data[i].length; j++) {
53 resItem.streamName=data[i][j].streamName; 55 resItem.streamName=data[i][j].streamName;
  56 + resItem.kpiId=data[i][j].kpiId;
  57 + resItem.resId=data[i][j].resId;
54 if (data[i][j].kpiId=='KPI5F8CCDA0'){ 58 if (data[i][j].kpiId=='KPI5F8CCDA0'){
55 resItem.busNum=data[i][j].diagnosisResult; 59 resItem.busNum=data[i][j].diagnosisResult;
56 }else if (data[i][j].kpiId=='KPIFE85BE59'){ 60 }else if (data[i][j].kpiId=='KPIFE85BE59'){
@@ -80,12 +84,6 @@ export default { @@ -80,12 +84,6 @@ export default {
80 console.log(e); 84 console.log(e);
81 }) 85 })
82 } 86 }
83 - const openAlarm = () => {  
84 - service.sendEventAlarmDialog(emit, {  
85 - faultNo: props.faultNo,  
86 - targetType: props.targetType  
87 - });  
88 - }  
89 const openMoreDialog = () => { 87 const openMoreDialog = () => {
90 service.sendEventMoreDialog(emit, proxy.$global, card.value); 88 service.sendEventMoreDialog(emit, proxy.$global, card.value);
91 } 89 }
@@ -101,6 +99,16 @@ export default { @@ -101,6 +99,16 @@ export default {
101 service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param); 99 service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param);
102 } 100 }
103 101
  102 + let openResPonse = (kpiId,redId) =>{
  103 + let param = {
  104 + faultNo: props.faultNo,
  105 + targetType: props.targetType.toLocaleLowerCase(),
  106 + resId: redId,
  107 + kpiId: kpiId
  108 + }
  109 + service.sendEventLineDialog(emit, param);
  110 + }
  111 +
104 //诊断指标 112 //诊断指标
105 const openKpiList = () => { 113 const openKpiList = () => {
106 service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase()); 114 service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
@@ -121,10 +129,10 @@ export default { @@ -121,10 +129,10 @@ export default {
121 getDialtestCard, 129 getDialtestCard,
122 cardData, 130 cardData,
123 openMoreDialog, 131 openMoreDialog,
124 - openAlarm,  
125 getFaultItemValue: service.getFaultItemValue, 132 getFaultItemValue: service.getFaultItemValue,
126 openBusScenarios, 133 openBusScenarios,
127 - openKpiList 134 + openKpiList,
  135 + openResPonse
128 } 136 }
129 } 137 }
130 } 138 }
@@ -145,9 +145,9 @@ export default { @@ -145,9 +145,9 @@ export default {
145 } 145 }
146 146
147 // 展示弹框 147 // 展示弹框
148 - const openDialog = (type, {faultNo, targetType, resId, kpiId, flag}, obj) => { 148 + const openDialog = (type, {faultNo, targetType, resId, kpiId, flag,resClass}, obj) => {
149 if (type === 'alarm') { 149 if (type === 'alarm') {
150 - service.openAlarmDialog(proxy, faultNo, targetType, resId, kpiId, flag); 150 + service.openAlarmDialog(proxy, faultNo, targetType, resId, kpiId, flag,resClass);
151 } else /*if (type === 'resList') { 151 } else /*if (type === 'resList') {
152 service.handleClick(proxy, faultNo, targetType, resId, kpiId, flag); 152 service.handleClick(proxy, faultNo, targetType, resId, kpiId, flag);
153 } else*/ if (type === 'line') { 153 } else*/ if (type === 'line') {
@@ -85,7 +85,7 @@ const alarmService = () => { @@ -85,7 +85,7 @@ const alarmService = () => {
85 // 基础更多查询需要传入对应的资源类型 85 // 基础更多查询需要传入对应的资源类型
86 resClass: resClass, 86 resClass: resClass,
87 faultNo: faultNo, 87 faultNo: faultNo,
88 - type: targetType, 88 + targetType: targetType,
89 resId: resId, 89 resId: resId,
90 kpiId: kpiId, 90 kpiId: kpiId,
91 flag: flag 91 flag: flag
@@ -244,7 +244,8 @@ const faultEvent = () => { @@ -244,7 +244,8 @@ const faultEvent = () => {
244 targetType: '', 244 targetType: '',
245 resId: '', 245 resId: '',
246 kpiId: '', 246 kpiId: '',
247 - flag: '' 247 + flag: '',
  248 + resClass:''
248 }, params); 249 }, params);
249 } 250 }
250 251