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

树结构组件调整了根据isOracle数值判断显示哪个页面



See merge request !86

@@ -48,6 +48,14 @@ export const monitorTreeShape = {
       },
       {
         type: 'el-input-text',
+        label: '业务二级页不同类型相关页面编码',
+        name: 'serviceSecondCode',
+        required: false,
+        placeholder: '',
+        value: 'service_capacity_analysis_second,service_capacity_analysis_second_mem,service_capacity_analysis_second_tps',
+      },
+      {
+        type: 'el-input-text',
         label: '资源系统相关页面编码',
         name: 'resourceCode',
         required: false,
@@ -56,6 +64,14 @@ export const monitorTreeShape = {
       },
       {
         type: 'el-input-text',
+        label: '资源二级页不同类型相关页面编码',
+        name: 'resourceSecondCode',
+        required: false,
+        placeholder: '',
+        value: 'resource_capacity_analysis,service_capacity_analysis_second_mem,service_capacity_analysis_second_tps',
+      },
+      {
+        type: 'el-input-text',
         label: '字树节点',
         name: 'propsChildren',
         required: false,

@@ -136,24 +136,52 @@ export default {
       let srcName=origin+'/#/bigscreen/viewer?reportCode=';
       // serviceCode,resourceCode
       let codeArr=[];
+      let codeArrSecond=[];
       if(this.activeName=='bos'){
         codeArr=this.optionsSetup.serviceCode.split(',');
+        codeArrSecond=this.optionsSetup.serviceSecondCode?this.optionsSetup.serviceSecondCode.split(','):[];
       }else{
         codeArr=this.optionsSetup.resourceCode.split(',');
+        codeArrSecond=this.optionsSetup.resourceSecondCode?this.optionsSetup.resourceSecondCode.split(','):[];
+
       }
       // if(level>0){
       if(data.propType){
         if(data.propType=='busType'){
           srcName+=codeArr[0];
         }else if(data.propType=='resType'){
-          srcName+=codeArr[1];
+          if(data.isOracle==1){
+            srcName+=codeArrSecond[0];
+          }else if(data.isOracle==2){
+            srcName+=codeArrSecond[1];
+          }else if(data.isOracle==3){
+            srcName+=codeArrSecond[2];
+          }else{
+            srcName+=codeArr[1];
+          }
         }else if(data.propType=='res'){
           srcName+=codeArr[2];
         }else{
-          srcName+=codeArr[0];
+          if(data.isOracle==1){
+            srcName+=codeArrSecond[0];
+          }else if(data.isOracle==2){
+            srcName+=codeArrSecond[1];
+          }else if(data.isOracle==3){
+            srcName+=codeArrSecond[2];
+          }else{
+            srcName+=codeArr[0];
+          }
         }
       }else{
-        srcName+=codeArr[0];
+        if(data.isOracle==1){
+          srcName+=codeArrSecond[0];
+        }else if(data.isOracle==2){
+          srcName+=codeArrSecond[1];
+        }else if(data.isOracle==3){
+          srcName+=codeArrSecond[2];
+        }else{
+          srcName+=codeArr[0];
+        }
       }
 
       /*if(data.id==1){