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

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



See merge request !87

@@ -56,6 +56,14 @@ export const monitorTreeShape = {
       },
       {
         type: 'el-input-text',
+        label: '业务三级页不同类型相关页面编码',
+        name: 'serviceTertiaryCode',
+        required: false,
+        placeholder: '',
+        value: 'service_capacity_analysis_tertiary,service_capacity_analysis_tertiary,service_capacity_analysis_tertiary_tps',
+      },
+      {
+        type: 'el-input-text',
         label: '资源系统相关页面编码',
         name: 'resourceCode',
         required: false,
@@ -72,6 +80,14 @@ export const monitorTreeShape = {
       },
       {
         type: 'el-input-text',
+        label: '资源三级页不同类型相关页面编码',
+        name: 'resourceTertiaryCode',
+        required: false,
+        placeholder: '',
+        value: 'service_capacity_analysis_tertiary,service_capacity_analysis_tertiary,service_capacity_analysis_tertiary_tps',
+      },
+      {
+        type: 'el-input-text',
         label: '字树节点',
         name: 'propsChildren',
         required: false,

@@ -466,7 +466,6 @@ export default {
       }
       let toolTip=this.options.tooltip;
       toolTip.formatter=function (params) {
-        console.log("1234",params)
           return (
             params[2].name +
             '<br /><div style="text-align: left;">' +

@@ -137,13 +137,15 @@ export default {
       // serviceCode,resourceCode
       let codeArr=[];
       let codeArrSecond=[];
+      let codeArrTertiary=[];
       if(this.activeName=='bos'){
         codeArr=this.optionsSetup.serviceCode.split(',');
         codeArrSecond=this.optionsSetup.serviceSecondCode?this.optionsSetup.serviceSecondCode.split(','):[];
+        codeArrTertiary=this.optionsSetup.serviceTertiaryCode?this.optionsSetup.serviceTertiaryCode.split(','):[];
       }else{
         codeArr=this.optionsSetup.resourceCode.split(',');
         codeArrSecond=this.optionsSetup.resourceSecondCode?this.optionsSetup.resourceSecondCode.split(','):[];
-
+        codeArrTertiary=this.optionsSetup.resourceTertiaryCode?this.optionsSetup.resourceTertiaryCode.split(','):[];
       }
       // if(level>0){
       if(data.propType){
@@ -160,7 +162,15 @@ export default {
             srcName+=codeArr[1];
           }
         }else if(data.propType=='res'){
-          srcName+=codeArr[2];
+          if(data.isOracle==1){
+            srcName+=codeArrTertiary[0];
+          }else if(data.isOracle==2){
+            srcName+=codeArrTertiary[1];
+          }else if(data.isOracle==3){
+            srcName+=codeArrTertiary[2];
+          }else{
+            srcName+=codeArr[2];
+          }
         }else{
           if(data.isOracle==1){
             srcName+=codeArrSecond[0];