monitor_v3 / anji-plus-report · Commits

Go to a project

Authored by 王涛
Commit 5b329df5aa3f1a679d44dfc8d9d9a7f2abd31fa5 2 parents 0d1fbe91 34b1ad7f

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev' 

树结构增加三级页面isOracle的判断



See merge request !87
Inline Side-by-side
Showing 3 changed files with 27 additions and 2 deletions
@@ -56,6 +56,14 @@ export const monitorTreeShape = { @@ -56,6 +56,14 @@ export const monitorTreeShape = {
56 }, 56 },
57 { 57 {
58 type: 'el-input-text', 58 type: 'el-input-text',
  59 + label: '业务三级页不同类型相关页面编码',
  60 + name: 'serviceTertiaryCode',
  61 + required: false,
  62 + placeholder: '',
  63 + value: 'service_capacity_analysis_tertiary,service_capacity_analysis_tertiary,service_capacity_analysis_tertiary_tps',
  64 + },
  65 + {
  66 + type: 'el-input-text',
59 label: '资源系统相关页面编码', 67 label: '资源系统相关页面编码',
60 name: 'resourceCode', 68 name: 'resourceCode',
61 required: false, 69 required: false,
@@ -72,6 +80,14 @@ export const monitorTreeShape = { @@ -72,6 +80,14 @@ export const monitorTreeShape = {
72 }, 80 },
73 { 81 {
74 type: 'el-input-text', 82 type: 'el-input-text',
  83 + label: '资源三级页不同类型相关页面编码',
  84 + name: 'resourceTertiaryCode',
  85 + required: false,
  86 + placeholder: '',
  87 + value: 'service_capacity_analysis_tertiary,service_capacity_analysis_tertiary,service_capacity_analysis_tertiary_tps',
  88 + },
  89 + {
  90 + type: 'el-input-text',
75 label: '字树节点', 91 label: '字树节点',
76 name: 'propsChildren', 92 name: 'propsChildren',
77 required: false, 93 required: false,
@@ -466,7 +466,6 @@ export default { @@ -466,7 +466,6 @@ export default {
466 } 466 }
467 let toolTip=this.options.tooltip; 467 let toolTip=this.options.tooltip;
468 toolTip.formatter=function (params) { 468 toolTip.formatter=function (params) {
469 - console.log("1234",params)  
470 return ( 469 return (
471 params[2].name + 470 params[2].name +
472 '<br /><div style="text-align: left;">' + 471 '<br /><div style="text-align: left;">' +
@@ -137,13 +137,15 @@ export default { @@ -137,13 +137,15 @@ export default {
137 // serviceCode,resourceCode 137 // serviceCode,resourceCode
138 let codeArr=[]; 138 let codeArr=[];
139 let codeArrSecond=[]; 139 let codeArrSecond=[];
  140 + let codeArrTertiary=[];
140 if(this.activeName=='bos'){ 141 if(this.activeName=='bos'){
141 codeArr=this.optionsSetup.serviceCode.split(','); 142 codeArr=this.optionsSetup.serviceCode.split(',');
142 codeArrSecond=this.optionsSetup.serviceSecondCode?this.optionsSetup.serviceSecondCode.split(','):[]; 143 codeArrSecond=this.optionsSetup.serviceSecondCode?this.optionsSetup.serviceSecondCode.split(','):[];
  144 + codeArrTertiary=this.optionsSetup.serviceTertiaryCode?this.optionsSetup.serviceTertiaryCode.split(','):[];
143 }else{ 145 }else{
144 codeArr=this.optionsSetup.resourceCode.split(','); 146 codeArr=this.optionsSetup.resourceCode.split(',');
145 codeArrSecond=this.optionsSetup.resourceSecondCode?this.optionsSetup.resourceSecondCode.split(','):[]; 147 codeArrSecond=this.optionsSetup.resourceSecondCode?this.optionsSetup.resourceSecondCode.split(','):[];
146 - 148 + codeArrTertiary=this.optionsSetup.resourceTertiaryCode?this.optionsSetup.resourceTertiaryCode.split(','):[];
147 } 149 }
148 // if(level>0){ 150 // if(level>0){
149 if(data.propType){ 151 if(data.propType){
@@ -160,7 +162,15 @@ export default { @@ -160,7 +162,15 @@ export default {
160 srcName+=codeArr[1]; 162 srcName+=codeArr[1];
161 } 163 }
162 }else if(data.propType=='res'){ 164 }else if(data.propType=='res'){
  165 + if(data.isOracle==1){
  166 + srcName+=codeArrTertiary[0];
  167 + }else if(data.isOracle==2){
  168 + srcName+=codeArrTertiary[1];
  169 + }else if(data.isOracle==3){
  170 + srcName+=codeArrTertiary[2];
  171 + }else{
163 srcName+=codeArr[2]; 172 srcName+=codeArr[2];
  173 + }
164 }else{ 174 }else{
165 if(data.isOracle==1){ 175 if(data.isOracle==1){
166 srcName+=codeArrSecond[0]; 176 srcName+=codeArrSecond[0];