Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

@@ -6,17 +6,17 @@
 					{{ index == 0 ? parentInfo.configName : '' }}
 				</template>
 				<template #lineName="scope">
-					{{ item.node.configName }}
+					<el-link :underline="false" >{{ item.node.configName }}</el-link>
 				</template>
 
 				<template #timeRange="scope">
 					<div style="margin-left: 10px">
-						{{ item.node.timeScope }}
+						<el-link :underline="false" >{{ item.node.timeScopeName }}</el-link>
 					</div>
 				</template>
 				<template #frequency="scope">
 					<div style="margin-left: 10px">
-						{{ item.node.frequency }}
+						<el-link :underline="false" >{{ item.node.frequencyName }}</el-link>
 					</div>
 				</template>
 

@@ -58,10 +58,20 @@ export default {
             let resList = resource.map(function (v) {
                 return {resId: v.resId, kpiId: v.kpiId, kpiFlg: v.flag}
             });
+            let time = v.node.timeScope;
+            if(time){
+                time = time.replace("time_scope_","");
+            }
+
+            let frequency = v.node.frequency;
+            if(time){
+                let arr = frequency.split('_');
+                frequency = arr[arr.length - 1];
+            }
 
             let p = {
-                "timeScope": v.node.timeScope,
-                "frequency": v.node.frequency,
+                "timeScope": time,
+                "frequency": frequency,
                 "resource": resList,
                 "type": "avg"
             }

@@ -86,7 +86,7 @@ export default {
                             proxy.clickNext()
                         }else{
                             proxy.checkId=listArray[index-1]
-                            if(index==5){
+                            if(index%5==0){
                                 proxy.preNext()
                             }
                         }