monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 6a67ab28620abd6ceac6c07218b128613616361c 2 parents 901a1556 d83068e0

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

【无】对比分析列表搜索条件在一行；设置默认搜索条件，既默认第一个业务、第一个指标；添加/删除完成后重新加载整个页面



See merge request !920
Inline Side-by-side
Showing 3 changed files with 23 additions and 18 deletions
@@ -532,8 +532,8 @@ export default { @@ -532,8 +532,8 @@ export default {
532 // 已选择列表 532 // 已选择列表
533 tabFirstList.value = []; 533 tabFirstList.value = [];
534 // 关闭谈画框 534 // 关闭谈画框
535 -  
536 - 535 + // lsq 刷新菜单 2022-08-29
  536 + window.top.location.reload();
537 // window.top.location.href = window.top.location.origin + "/#/analysis/view/id=105" 537 // window.top.location.href = window.top.location.origin + "/#/analysis/view/id=105"
538 window.top.location.href = window.top.location.origin + '/#/' + res.str; 538 window.top.location.href = window.top.location.origin + '/#/' + res.str;
539 } 539 }
@@ -555,12 +555,23 @@ export default { @@ -555,12 +555,23 @@ export default {
555 proxy.$http.get("/api-web/manage/kpi/list", {}, function (res) { 555 proxy.$http.get("/api-web/manage/kpi/list", {}, function (res) {
556 if (res && res.data) { 556 if (res && res.data) {
557 kpiList.value = res.data; 557 kpiList.value = res.data;
  558 + //lsq 给默认数据，第一个数据
  559 + if(kpiList.value.length>0){
  560 + kpiTypeArr.value=[kpiList.value[0].kpiId];
  561 + getParams.value.kpiId=kpiList.value[0].kpiId;
  562 + }
  563 + loeadTable();
558 } 564 }
559 }) 565 })
560 566
561 proxy.$http.get("/api-web/home/business/findAllBusType", {}, function (res) { 567 proxy.$http.get("/api-web/home/business/findAllBusType", {}, function (res) {
562 if (res && res.data) { 568 if (res && res.data) {
563 busTypeList.value = res.data; 569 busTypeList.value = res.data;
  570 + //lsq 给一个默认数据，第一个数据 2022-08-29
  571 + if(busTypeList.value.length>0){
  572 + busTypeArr.value=[busTypeList.value[0].busId];
  573 + getParams.value.busId=busTypeList.value[0].busId;
  574 + }
564 } 575 }
565 }) 576 })
566 577
@@ -577,7 +588,6 @@ export default { @@ -577,7 +588,6 @@ export default {
577 }); 588 });
578 } 589 }
579 }); 590 });
580 -  
581 //LH 591 //LH
582 setTimeout(function () { 592 setTimeout(function () {
583 let arrs = timeRangeArr.value 593 let arrs = timeRangeArr.value
@@ -598,7 +608,7 @@ export default { @@ -598,7 +608,7 @@ export default {
598 608
599 // 挂载完 609 // 挂载完
600 Vue.onMounted(() => { 610 Vue.onMounted(() => {
601 - 611 + init();
602 612
603 if (!id) { 613 if (!id) {
604 activeName.value = 'second'; 614 activeName.value = 'second';
@@ -609,7 +619,6 @@ export default { @@ -609,7 +619,6 @@ export default {
609 //编辑追加场景分类数据加载 619 //编辑追加场景分类数据加载
610 analysisChange(true); 620 analysisChange(true);
611 } 621 }
612 - loeadTable();  
613 622
614 // 先加载时间范围，然后在加载 623 // 先加载时间范围，然后在加载
615 loadTimeRange(function (defCode) { 624 loadTimeRange(function (defCode) {
@@ -620,12 +629,12 @@ export default { @@ -620,12 +629,12 @@ export default {
620 } 629 }
621 }); 630 });
622 }); 631 });
623 - init();  
624 console.log('onMounted'); 632 console.log('onMounted');
625 }) 633 })
626 634
627 635
628 return { 636 return {
  637 + getParams,
629 resTypeList, 638 resTypeList,
630 kpiList, 639 kpiList,
631 busTypeList, 640 busTypeList,
@@ -20,22 +20,17 @@ @@ -20,22 +20,17 @@
20 <el-button :size="$global.elementConfig.size.button" @click="searchData" class="search-text button-flex-div-center" 20 <el-button :size="$global.elementConfig.size.button" @click="searchData" class="search-text button-flex-div-center"
21 type="primary">搜索 21 type="primary">搜索
22 </el-button> 22 </el-button>
23 - 23 + <!--lsq 条件在一行 2022-08-29-->
  24 + <router-link :to="'/analysis/add'" class="analysis link-type">
  25 + <el-button :size="$global.elementConfig.size.button" style="margin-left:6px;" class="button-flex-div-center" type="primary">
  26 + <i class="el-icon-plus"></i>新增
  27 + </el-button>
  28 + </router-link>
24 </div> 29 </div>
25 30
26 </el-col> 31 </el-col>
27 </el-row> 32 </el-row>
28 - <el-row class="list-title">  
29 - <el-col :span="24" class="text-left">  
30 - <router-link :to="'/analysis/add'" class="analysis link-type">  
31 - <el-button :size="$global.elementConfig.size.button" class="button-flex-div-center" type="primary">  
32 - <i class="el-icon-plus"></i>新增  
33 - </el-button>  
34 - </router-link>  
35 33
36 - <!-- <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-delete"></i>删除</el-button>-->  
37 - </el-col>  
38 - </el-row>  
39 <el-row class="analysis-table-div"> 34 <el-row class="analysis-table-div">
40 <el-col :span="24"> 35 <el-col :span="24">
41 <el-table :data="tableData" @selection-change="handleSelectionChange" border ref="multipleTable" stripe 36 <el-table :data="tableData" @selection-change="handleSelectionChange" border ref="multipleTable" stripe
@@ -28,7 +28,6 @@ export default { @@ -28,7 +28,6 @@ export default {
28 // 挂载完 28 // 挂载完
29 Vue.onMounted(() => { 29 Vue.onMounted(() => {
30 proxy.getData(); 30 proxy.getData();
31 -  
32 }) 31 })
33 //获取对比分析列表 32 //获取对比分析列表
34 const getData = () => { 33 const getData = () => {
@@ -83,6 +82,8 @@ export default { @@ -83,6 +82,8 @@ export default {
83 $.get(proxy.domainName + proxy.apiUrl1 + '?access_token=' + localStorage.getItem('access_token'), params, function () { 82 $.get(proxy.domainName + proxy.apiUrl1 + '?access_token=' + localStorage.getItem('access_token'), params, function () {
84 proxy.$global.showMsg("删除成功", "success"); 83 proxy.$global.showMsg("删除成功", "success");
85 proxy.getData(); 84 proxy.getData();
  85 + // lsq 刷新菜单 2022-08-29
  86 + window.top.location.reload();
86 }) 87 })
87 } else { 88 } else {
88 proxy.$global.showMsg("删除失败", "warning"); 89 proxy.$global.showMsg("删除失败", "warning");