Merge branch 'master-v32-lushangqing' into 'master'

大屏的业务性能指标右y轴的最大值显示



See merge request !322

@@ -115,17 +115,17 @@ export default {
 
         const optionInit=()=>{
 
-            let data3=proxy.yAxisData[0];
+            let data3=proxy.yAxisData[2];
             let data4=proxy.yAxisData[3];
             let min2=proxy.calMin([data3,data4]);
             let max2=proxy.calMax([data3,data4]);
             let ySeriesCommon=[];
             proxy.legendData.map((item,index)=>{
                 let i=0;
-                if(index%2==0 ||index%3==0){
-                    i=0;
-                }else{
+                if(index!=0 && (index%2==0 ||index%3==0)){
                     i=1;
+                }else{
+                    i=0;
                 }
                 let areaStyle=0;
                 if(i==2){

@@ -120,8 +120,6 @@ export default {
                 proxy.modleId=props.propsData.modleId;
                 proxy.name=props.propsData.name;
             }
-            console.log("*",props.propsData,proxy.bizId,proxy.busTypeArr)
-
         }
         //添加Apm
         let addRes=(row,index)=>{
@@ -258,7 +256,6 @@ export default {
         //显示已添加过的应用列表数据
         let apmMonitorListChecked=Vue.ref([]);
         let setListData=()=>{
-            console.log("()",proxy.apmMonitorListChecked)
             if(props.apmMonitorList){
                 props.apmMonitorList.map((item,index)=>{
                     proxy.tableDataList.map(v=>{

@@ -51,7 +51,6 @@ export default {
         let applicationMonitorVisible=Vue.ref(false);
 
         Vue.watch(()=>props.isDisplay,(newValue, oldValue)=>{
-            console.log("010101",newValue)
             proxy.applicationMonitorVisible=newValue;
             if(newValue){
                 proxy.setBizId();
@@ -94,8 +93,6 @@ export default {
                 proxy.modleId=props.propsData.modleId;
                 proxy.name=props.propsData.name;
             }
-            console.log("*",props.propsData,proxy.bizId,proxy.busTypeArr)
-
         }
         //添加应用
         let addRes=(row,index)=>{
@@ -179,7 +176,6 @@ export default {
                     v.checked=false;
                 })
             }
-            console.log("selectchange",val,proxy.tableDataList)
         }
 
         //添加选中的

@@ -94,7 +94,6 @@ export default {
         }
         //获取接收到的传值 bizid
         let setBizId=()=>{
-            console.log("props.propsData",props.propsData)
             if(props.propsData){
                 proxy.bizId=props.propsData.bizId;
                 proxy.targetId=props.propsData.targetId;
@@ -105,8 +104,6 @@ export default {
             }else{
                 proxy.isDetail=false;
             }
-            console.log("*",props.propsData,proxy.bizId,proxy.busTypeArr)
-
         }
         // 监听编辑状态
         Vue.watch(() => props.propsData.bizId, (newValue,oldValue) => {
@@ -119,7 +116,6 @@ export default {
         });
         //资源类型改变查找基础列表
         let changeRes=(val)=>{
-            console.log(val)
             proxy.getEnvironmentData();
 
         }
@@ -139,8 +135,6 @@ export default {
                 pageSize:proxy.pageSize
 
             }
-            console.log("*/*/*",proxy.targetId)
-
             proxy.$http.get('/api-web/fault/conf/base/getFaultBaseAllResInfo',params,function (res){
                 if(res && res.data){
                     proxy.count = res.count;

@@ -85,9 +85,7 @@ export default {
                     })
 
                 })
-                console.log("baseListChecked",proxy.baseListChecked)
             }
-            console.log("hahahah",props.baseCount,proxy.count)
             if(props.baseCount==proxy.count){
                 proxy.isLoading=true;
             }else{
@@ -98,7 +96,6 @@ export default {
 
         // 监听编辑状态
         Vue.watch(()=>props.isDisplay,(newValue, oldValue)=>{
-            console.log("base",newValue)
             proxy.baseVisible=newValue;
             if(newValue){
                 proxy.setBizId();
@@ -135,7 +132,6 @@ export default {
         }
         //获取接收到的传值 bizid
         let setBizId=()=>{
-            console.log("props.propsData",props.propsData)
             if(props.propsData){
                 proxy.bizId=props.propsData.bizId;
                 proxy.targetId=props.propsData.targetId;
@@ -151,7 +147,6 @@ export default {
 
         //资源类型改变查找基础列表
         let changeRes=(val)=>{
-            console.log(val)
             proxy.getEnvironmentData();
 
         }

@@ -194,7 +194,6 @@ export default {
         //获取已添加的环境基础
         let callbackBaseList=(val)=>{
             proxy.baseList=val;
-            console.log("callbackBaseList",val,proxy.baseList)
         }
 
          return{
@@ -494,8 +493,6 @@ export default {
         setDetailConfig(typeVal){
             let that=this;
             if(this.configData && this.configData.length>0){
-                console.log("configData",this.configData,typeVal)
-                console.log("that.docid",that.docId)
                 this.configData.map((item,index)=>{
                     if(item.type==typeVal){
                         // that.targetId=item.targetId;
@@ -518,7 +515,6 @@ export default {
             if(typeVal=='base'){
                 this.getTargetId(typeVal);
             }
-            console.log("lll",this.targetId)
             this.propsData={
                 bizId:this.busTypeArr,
                 docId:this.docId,
@@ -531,7 +527,6 @@ export default {
         },
         //设置state
         switchState(typeVal,state){
-        console.log("state",typeVal,state)
             switch (typeVal) {
 
                 case "netlink":
@@ -582,7 +577,6 @@ export default {
         },
         //关闭网络测试添加配置节点弹框
         getNetworkMonitorList(itemData){
-            console.log("itemdata",itemData)
             this.networkMonitorVisible=false;
             this.networkMonitorList=itemData.networkMonitorList;
             if(itemData.faultConfId){
@@ -598,7 +592,6 @@ export default {
                     item.targetId=val;
                 }
             })
-            console.log("modeldata",this.modelData);
         },
         //获取模块对应的targetId
         getTargetId(type){
@@ -634,7 +627,6 @@ export default {
                 bizId:this.busTypeArr
 
             }
-            console.log("applist",params)
             this.$http.get('/api-web/fault/conf/npm/npmList',params,function (res){
                 if(res && res.data){
                     that.applicationMonitorList=res.data;
@@ -659,7 +651,6 @@ export default {
             this.getBaseList();
         },
         getBaseList(){
-            console.log('basic',this.$refs.basic)
             this.$refs.basic.getEnvironmentData();
 
         },
@@ -821,7 +812,6 @@ export default {
         },
         //保存模块类型-不包含故障定义模块
         saveConfigDetailOther(){
-            console.log("save",this.state)
             let that=this;
             this.setState();
             this.getTargetId(this.type);
@@ -833,7 +823,6 @@ export default {
                 }
 
             }else if(this.type=='npm'){
-                console.log("aaa",this.applicationMonitorList)
                 if(this.applicationMonitorList.length==0){
                     this.$global.showMsg('请先选择添加应用配置','warning');
                     return;
@@ -1100,7 +1089,6 @@ export default {
 
             this.$http.get('/api-web/fault/conf/isExistByBizId/'+this.busTypeArr, {},function (res){
                 if(res && res.success){
-                    console.log('sssss',that.busTypeArr)
                     that.busTypeArr=val;
                     that.$forceUpdate();
 
@@ -1148,7 +1136,6 @@ export default {
     },
     watch:{
         busTypeArr(newValue, oldValue) {
-            console.log("busTypeArr",newValue)
 
         }
 

@@ -104,7 +104,6 @@ export default {
         let name=Vue.ref();
 
         Vue.watch(()=>props.isDisplay,(newValue, oldValue)=>{
-console.log("jdjdjdjdj",newValue)
             proxy.networkMonitorVisible=newValue;
             if(newValue){
                 proxy.setBizId();
@@ -159,7 +158,6 @@ console.log("jdjdjdjdj",newValue)
 
         //获取链路信息列表
         let getNetLinkList=()=>{
-            console.log("333",proxy.targetId)
             let params={
                 targetId:proxy.targetId
 
@@ -181,13 +179,11 @@ console.log("jdjdjdjdj",newValue)
         let saveLinkAndNodeInfo=()=>{
             if(proxy.linkName){
                 let bNetNodeList=proxy.nodeData.flat(2);
-                console.log('aarr--',bNetNodeList)
                 // bNetNodeList.nodeName=proxy.nodeName;
                 if(bNetNodeList[bNetNodeList.length-1].isAdd){
                     bNetNodeList.splice(bNetNodeList.length-1,1);
 
                 }
-                console.log('&&',bNetNodeList)
                 bNetNodeList.map((item,index)=>{
                     item.sort=index;
                 })
@@ -234,7 +230,6 @@ console.log("jdjdjdjdj",newValue)
         }
         //添加节点
         let addRes=(row,index)=>{
-            console.log("row",row,proxy.nodeDataChecked)
             let checked=false;
             proxy.nodeDataChecked.map((item,index)=>{
                 if(row.id==item.id){
@@ -258,7 +253,6 @@ console.log("jdjdjdjdj",newValue)
                     if(!proxy.nodeName){
                         proxy.$global.showMsg('请填写链路节点名称','warning')
                     }else{
-                        console.log("2*2")
                         bNetNodeList.nodeName=proxy.nodeName;
                         bNetNodeList.type='point';
                         bNetNodeList.nodeType='point';
@@ -286,7 +280,6 @@ console.log("jdjdjdjdj",newValue)
 
                 if(proxy.flag){
                     //插入的是点
-                    console.log("isadd",row.isAdd)
                     // if(row.isAdd){
                         //isAdd为true代表是添加
                         // proxy.nodeData.splice(length-1,0,[row]);
@@ -309,8 +302,6 @@ console.log("jdjdjdjdj",newValue)
                 // proxy.nodeData.push([{nodeName:'',id:'',isAdd:true}])
 
             }
-            console.log(" proxy.nodeData", proxy.nodeData,proxy.nodeData.length)
-
             proxy.nodeDataChecked=proxy.nodeData.flat(2);
             proxy.addSetLIstVisible=false;
 
@@ -326,8 +317,6 @@ console.log("jdjdjdjdj",newValue)
                 proxy.modleId=props.propsData.modleId;
                 proxy.name=props.propsData.name;
             }
-            console.log("*",props.propsData,proxy.bizId,proxy.busTypeArr)
-
         }
 
 
@@ -425,7 +414,6 @@ console.log("jdjdjdjdj",newValue)
 
                 that.nodeDataChecked=that.nodeData.flat(2);
                 that.nodeName='';
-                console.log("delette",that.nodeData.length)
                 if(that.nodeData.length<1){
                     that.addSetLIstVisible=true;
                 }else{
@@ -460,14 +448,11 @@ console.log("jdjdjdjdj",newValue)
                         for(let i=0;i<resData.length;i+=2){
                             arr.push(resData.slice(i,i+2))
                         }
-                        console.log("有节点",arr,arr.length)
                         that.nodeData=arr;
-                        console.log('nodedata',that.nodeData,that.nodeData.length)
                         let length=that.nodeData.length;
                         if(that.nodeData.length>0){
                             that.addSetLIstVisible=false;
                             let length1=that.nodeData[length-1].length;
-                            console.log("length1",length1)
                             if(length1>1){
                                 that.nodeData.push([{nodeName:'',id:'',isAdd:true}])
 
@@ -489,7 +474,6 @@ console.log("jdjdjdjdj",newValue)
         },
         //点击进入添加节点页面
         addTableList(flag,itemNode){
-            console.log("itemNode",itemNode)
             // if(itemNode==-1 || itemNode.length>0){
             //     if(itemNode.length==1){
             //         if(itemNode[0])

@@ -61,7 +61,6 @@ export default {
     methods: {
         //处理
         handleFault(item){
-            console.log("333",item)
             this.faultHandleForm=item;
             this.faultDiagnosisVisible=true;
 

@@ -119,17 +119,17 @@ export default {
         }
         const optionInit=()=>{
 
-            let data3=proxy.yAxisData[0];
+            let data3=proxy.yAxisData[2];
             let data4=proxy.yAxisData[3];
             let min2=proxy.calMin([data3,data4]);
             let max2=proxy.calMax([data3,data4]);
             let ySeriesCommon=[];
             proxy.legendData.map((item,index)=>{
                 let i=0;
-                if(index%2==0 ||index%3==0){
-                    i=0;
-                }else{
+                if(index!=0 && (index%2==0 ||index%3==0)){
                     i=1;
+                }else{
+                    i=0;
                 }
                 let areaStyle=0;
                 if(i==2){