monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit b82bac5707a02e50d137c553e78f44161aed3b25 1 parent 1e49d6e5

【#1163】 连接失败该指标状态变化-基本信息列表信息增加了resType

Inline Side-by-side
Showing 2 changed files with 29 additions and 30 deletions
@@ -152,7 +152,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -152,7 +152,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
152 rowMenu.attr('data-nature', 'true');//性能趋势 152 rowMenu.attr('data-nature', 'true');//性能趋势
153 // rowMenu.attr('data-canca', data.canCA); 153 // rowMenu.attr('data-canca', data.canCA);
154 // rowMenu.attr('data-incaing', data.inCAing); 154 // rowMenu.attr('data-incaing', data.inCAing);
155 - // rowMenu.attr('data-restype', data.resType); 155 + rowMenu.attr('data-restype', data[0]?data[0].resType:'');
156 //监听告警压制等操作配置 156 //监听告警压制等操作配置
157 $('#' + targetId + "_detail_row_menu").hover(function () { 157 $('#' + targetId + "_detail_row_menu").hover(function () {
158 var $that = $(this); 158 var $that = $(this);
@@ -253,6 +253,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -253,6 +253,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
253 rowMenu.attr("data-unit", ""); 253 rowMenu.attr("data-unit", "");
254 rowMenu.attr('data-hidem', 'true'); 254 rowMenu.attr('data-hidem', 'true');
255 rowMenu.attr('data-nature', 'true');//性能趋势 255 rowMenu.attr('data-nature', 'true');//性能趋势
  256 + rowMenu.attr('data-restype', data[0]?data[0].resType:'');
  257 +
256 //监听告警压制等操作配置 258 //监听告警压制等操作配置
257 $('#' + targetId + "_detail_row_menu").hover(function () { 259 $('#' + targetId + "_detail_row_menu").hover(function () {
258 var $that = $(this); 260 var $that = $(this);
@@ -13,7 +13,16 @@ export default { @@ -13,7 +13,16 @@ export default {
13 const {proxy} = Vue.getCurrentInstance(); 13 const {proxy} = Vue.getCurrentInstance();
14 let dateType=Vue.ref('oneDay'); 14 let dateType=Vue.ref('oneDay');
15 let optionData=Vue.ref(''); 15 let optionData=Vue.ref('');
16 - let names = Vue.ref(['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00']); 16 + //series接口无数据时默认数据
  17 + let seriesData = Vue.ref([{
  18 + "data": [['2022-05-13','02:00'],['2022-05-15','03:00'],['2022-05-17','04:00']],
  19 + // "name": kpiName.value
  20 + "name": '成功'
  21 + },{
  22 + "data": [['2022-05-14','08:00'],['2022-05-16','09:00'],['2022-05-17','10:00']],
  23 + // "name": kpiName.value
  24 + "name": '失败'
  25 + }]);
17 let series = Vue.ref([]); 26 let series = Vue.ref([]);
18 let rateData = Vue.ref([]); 27 let rateData = Vue.ref([]);
19 let kpiUnit = Vue.ref(''); 28 let kpiUnit = Vue.ref('');
@@ -105,6 +114,7 @@ export default { @@ -105,6 +114,7 @@ export default {
105 dateType.value=val; 114 dateType.value=val;
106 if(val=='custom'){ 115 if(val=='custom'){
107 }else{ 116 }else{
  117 + getMonthDay();
108 getLineChart(); 118 getLineChart();
109 119
110 } 120 }
@@ -131,18 +141,10 @@ export default { @@ -131,18 +141,10 @@ export default {
131 let url = '/api-web/scatter/getByResId?dateType=' + dateType.value + 141 let url = '/api-web/scatter/getByResId?dateType=' + dateType.value +
132 '&resId=' + resourceId + '&kpiId=' + idStr + '&resType=' + resType; 142 '&resId=' + resourceId + '&kpiId=' + idStr + '&resType=' + resType;
133 proxy.$http.get(url, {},function (res){ 143 proxy.$http.get(url, {},function (res){
134 - kpiUnit.value = res.data.kpiUnit == null ? "" : res.data.kpiUnit; 144 + kpiUnit.value = (!res.data || res.data.kpiUnit == null) ? "" : res.data.kpiUnit;
135 if (res.data && res.data.length == 0) { 145 if (res.data && res.data.length == 0) {
136 rateData.value = { 146 rateData.value = {
137 - series: [{  
138 - "data": [['2022-05-03','02:00'],['2022-05-05','03:00'],['2022-05-07','04:00']],  
139 - // "name": kpiName.value  
140 - "name": '成功'  
141 - },{  
142 - "data": [['2022-05-04','08:00'],['2022-05-06','09:00'],['2022-05-07','10:00']],  
143 - // "name": kpiName.value  
144 - "name": '失败'  
145 - }], 147 + series: seriesData.value,
146 kpiUnit: kpiUnit.value 148 kpiUnit: kpiUnit.value
147 } 149 }
148 } else { 150 } else {
@@ -151,15 +153,7 @@ export default { @@ -151,15 +153,7 @@ export default {
151 setSeries(); 153 setSeries();
152 },function (error){ 154 },function (error){
153 rateData.value = { 155 rateData.value = {
154 - series: [{  
155 - "data": [['2022-05-03','02:00'],['2022-05-05','03:00'],['2022-05-07','04:00']],  
156 - // "name": kpiName.value  
157 - "name": '成功'  
158 - },{  
159 - "data": [['2022-05-04','08:00'],['2022-05-06','09:00'],['2022-05-07','10:00']],  
160 - // "name": kpiName.value  
161 - "name": '失败'  
162 - }], 156 + series: seriesData.value,
163 kpiUnit: kpiUnit.value 157 kpiUnit: kpiUnit.value
164 } 158 }
165 setSeries(); 159 setSeries();
@@ -227,7 +221,6 @@ export default { @@ -227,7 +221,6 @@ export default {
227 }, 221 },
228 xAxis: { 222 xAxis: {
229 type: 'category', 223 type: 'category',
230 - // data: rateData.value.names,  
231 data: xAxisData.value, 224 data: xAxisData.value,
232 axisLine: { 225 axisLine: {
233 lineStyle: { 226 lineStyle: {
@@ -289,19 +282,19 @@ export default { @@ -289,19 +282,19 @@ export default {
289 let xAxisData=Vue.ref([]); 282 let xAxisData=Vue.ref([]);
290 const getMonthDay=()=>{ 283 const getMonthDay=()=>{
291 let m=24; 284 let m=24;
292 - if(dateType=='oneDay'){ 285 + if(dateType.value=='oneDay'){
293 m=24; 286 m=24;
294 - }else if(dateType=='week'){ 287 + }else if(dateType.value=='week'){
295 m=7; 288 m=7;
296 - }else if(dateType=='month'){ 289 + }else if(dateType.value=='month'){
297 m=30; 290 m=30;
298 } 291 }
299 let dateArr=[]; 292 let dateArr=[];
300 for(let i=0;i<=m;i++){ 293 for(let i=0;i<=m;i++){
301 let myDate=new Date(); 294 let myDate=new Date();
302 - if(dateType=='oneDay'){  
303 - myDate.setHours(myDate.getHours()-m)  
304 - }else if(dateType=='week' || dateType=='month'){ 295 + if(dateType.value=='oneDay'){
  296 + myDate.setHours(myDate.getHours()-i)
  297 + }else if(dateType.value=='week' || dateType.value=='month'){
305 myDate.setDate(myDate.getDate() - i); 298 myDate.setDate(myDate.getDate() - i);
306 } 299 }
307 let lowData =getDateTime(myDate); //用了上面转年月日的方法 300 let lowData =getDateTime(myDate); //用了上面转年月日的方法
@@ -322,7 +315,11 @@ export default { @@ -322,7 +315,11 @@ export default {
322 if(day < 10){ 315 if(day < 10){
323 day = '0'+day; 316 day = '0'+day;
324 } 317 }
325 - dateTime= year+'-'+month+'-'+day;//+' '+hours+':'+minutes+':'+seconds; 318 + if(dateType.value=='oneDay'){
  319 + dateTime= year+'-'+month+'-'+day+' '+hours+':00';//+minutes;//+':'+seconds;
  320 + }else{
  321 + dateTime= year+'-'+month+'-'+day;//+' '+hours+':'+minutes+':'+seconds;
  322 + }
326 return dateTime; 323 return dateTime;
327 } 324 }
328 //转换个位数为 00 325 //转换个位数为 00
@@ -367,7 +364,7 @@ export default { @@ -367,7 +364,7 @@ export default {
367 timeFormat, 364 timeFormat,
368 dateType, 365 dateType,
369 optionData, 366 optionData,
370 - names, 367 + seriesData,
371 series, 368 series,
372 rateData, 369 rateData,
373 kpiUnit, 370 kpiUnit,