Authored by 王涛

对比分析优化

@@ -279,6 +279,14 @@ export default { @@ -279,6 +279,14 @@ export default {
279 }catch (e) { 279 }catch (e) {
280 timeScope = form.value.scene.timeScope.replace("time_scope_", "") 280 timeScope = form.value.scene.timeScope.replace("time_scope_", "")
281 } 281 }
  282 + let frequency = form.value.scene.frequency;
  283 + try {
  284 + let arr = frequency.split('_');
  285 + frequency = arr[arr.length - 1];
  286 + }catch (e) {
  287 +
  288 + }
  289 +
282 if (timeScope == '') { 290 if (timeScope == '') {
283 proxy.$global.showMsg("请选择时间范围!", "warning"); 291 proxy.$global.showMsg("请选择时间范围!", "warning");
284 return; 292 return;
@@ -294,7 +302,7 @@ export default { @@ -294,7 +302,7 @@ export default {
294 302
295 let p = { 303 let p = {
296 timeScope: timeScope, 304 timeScope: timeScope,
297 - frequency: form.value.scene.frequency, 305 + frequency: frequency,
298 resource: resList, 306 resource: resList,
299 type : 'avg' 307 type : 'avg'
300 } 308 }
@@ -64,9 +64,11 @@ export default { @@ -64,9 +64,11 @@ export default {
64 } 64 }
65 65
66 let frequency = v.node.frequency; 66 let frequency = v.node.frequency;
67 - if(time){ 67 + try {
68 let arr = frequency.split('_'); 68 let arr = frequency.split('_');
69 frequency = arr[arr.length - 1]; 69 frequency = arr[arr.length - 1];
  70 + }catch (e) {
  71 +
70 } 72 }
71 73
72 let p = { 74 let p = {