monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 6552508f5f9315c96894f4e2f91f00d4336e20cf 2 parents b1cadd0a b74a4f25

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

Inline Side-by-side
Showing 8 changed files with 30 additions and 11 deletions
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <el-button type="primary" @click="onReset()">重置</el-button> 31 <el-button type="primary" @click="onReset()">重置</el-button>
32 <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> 32 <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
33 <el-button type="primary" @click="saveAll()" style="margin-left: 10px">添加选中</el-button> 33 <el-button type="primary" @click="saveAll()" style="margin-left: 10px">添加选中</el-button>
34 - <el-button type="primary" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> 34 + <el-button type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button>
35 </div> 35 </div>
36 36
37 </div> 37 </div>
@@ -136,7 +136,7 @@ export default { @@ -136,7 +136,7 @@ export default {
136 } 136 }
137 137
138 proxy.$http.post('/api-web/fault/conf/apm/saveOrUpdate',params,function (res){ 138 proxy.$http.post('/api-web/fault/conf/apm/saveOrUpdate',params,function (res){
139 - if(res && res.object){ 139 + if(res && res.success){
140 proxy.$global.showMsg('添加成功','success'); 140 proxy.$global.showMsg('添加成功','success');
141 proxy.targetId=res.src; 141 proxy.targetId=res.src;
142 proxy.APMVisible=false; 142 proxy.APMVisible=false;
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" 37 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
38 :showIndex="true" :total="count" 38 :showIndex="true" :total="count"
39 :showBorder="true" :loading="false" 39 :showBorder="true" :loading="false"
40 - :showPage="true" :showTools="true" :height="(height - 500)"> 40 + :showPage="true" :showTools="isDetail" :height="(height - 500)">
41 <!-- <template #default="{row,prop,column}"> 41 <!-- <template #default="{row,prop,column}">
42 <div v-if="prop == 'kpiName'" class="list-data"> 42 <div v-if="prop == 'kpiName'" class="list-data">
43 <span class="list-data-text">{{row.kpiName }}</span> 43 <span class="list-data-text">{{row.kpiName }}</span>
@@ -87,6 +87,8 @@ export default { @@ -87,6 +87,8 @@ export default {
87 let busTypeList = Vue.ref([]); 87 let busTypeList = Vue.ref([]);
88 let bizId=Vue.ref();//所属业务id 88 let bizId=Vue.ref();//所属业务id
89 let targetId=Vue.ref();//所属模块id 89 let targetId=Vue.ref();//所属模块id
  90 + //是否是详情页面
  91 + let isDetail=Vue.ref(false);
90 92
91 let init = () =>{ 93 let init = () =>{
92 let params={ 94 let params={
@@ -140,6 +142,7 @@ export default { @@ -140,6 +142,7 @@ export default {
140 142
141 } 143 }
142 return { 144 return {
  145 + isDetail,
143 changeRes, 146 changeRes,
144 setBizId, 147 setBizId,
145 bizId, 148 bizId,
@@ -230,12 +233,26 @@ export default { @@ -230,12 +233,26 @@ export default {
230 pageSize:5 233 pageSize:5
231 234
232 } 235 }
  236 + console.log("*/*/*",this.targetId)
  237 + if(this.targetId){
  238 + //详情页面
  239 + this.isDetail=true;
233 this.$http.get('/api-web/fault/conf/base/getFaultBaseAllResInfo',params,function (res){ 240 this.$http.get('/api-web/fault/conf/base/getFaultBaseAllResInfo',params,function (res){
234 if(res && res.data){ 241 if(res && res.data){
235 that.count = res.count; 242 that.count = res.count;
236 that.tableDataList=res.data; 243 that.tableDataList=res.data;
237 } 244 }
238 }) 245 })
  246 + }else{
  247 + this.isDetail=false;
  248 + this.$http.get('/api-web/fault/base/config/page',params,function (res){
  249 + if(res && res.data){
  250 + that.count = res.count;
  251 + that.tableDataList=res.data;
  252 + }
  253 + })
  254 + }
  255 +
239 } 256 }
240 257
241 258
@@ -704,7 +704,7 @@ export default { @@ -704,7 +704,7 @@ export default {
704 } 704 }
705 705
706 if(this.type){ 706 if(this.type){
707 - if(this.type=='base'){ 707 + if(this.type=='base' && this.faultEnvironmentRadio=='1'){
708 this.saveBase(); 708 this.saveBase();
709 }else{ 709 }else{
710 this.saveConfigDetailOther(); 710 this.saveConfigDetailOther();
@@ -777,7 +777,7 @@ export default { @@ -777,7 +777,7 @@ export default {
777 that.switchModel(); 777 that.switchModel();
778 778
779 }else{ 779 }else{
780 - that.$global.showMsg('保存失败','warning') 780 + that.$global.showMsg('模块保存失败','warning')
781 781
782 } 782 }
783 that.isLoading=false; 783 that.isLoading=false;
@@ -904,11 +904,11 @@ export default { @@ -904,11 +904,11 @@ export default {
904 if(res && res.success){ 904 if(res && res.success){
905 that.targetId=res.str; 905 that.targetId=res.str;
906 that.setTargetId(that.targetId) 906 that.setTargetId(that.targetId)
907 - that.$global.showMsg('保存成功') 907 + that.$global.showMsg(res.msg)
908 // that.alarmList=res.data; 908 // that.alarmList=res.data;
909 that.saveConfigDetailOther(); 909 that.saveConfigDetailOther();
910 }else{ 910 }else{
911 - that.$global.showMsg('保存失败','warning') 911 + that.$global.showMsg('基础环境保存失败','warning')
912 912
913 } 913 }
914 that.isLoading=false; 914 that.isLoading=false;
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </el-row> 10 </el-row>
11 <el-row class="margin-all-30"> 11 <el-row class="margin-all-30">
12 <el-col :span="3" v-for="(item,index) in diagnosisData"> 12 <el-col :span="3" v-for="(item,index) in diagnosisData">
13 - <div class="doc-list flex-clum" @click="detailDiagnosisDoc(item)"> 13 + <div class="doc-list flex-clum margin-bottom-10" @click="detailDiagnosisDoc(item)">
14 <img src="./src/assets/images/faultDiagnosis/icon-doc.png" alt=""> 14 <img src="./src/assets/images/faultDiagnosis/icon-doc.png" alt="">
15 <span class="doc-name">{{item.name}}</span> 15 <span class="doc-name">{{item.name}}</span>
16 </div> 16 </div>
@@ -62,8 +62,8 @@ @@ -62,8 +62,8 @@
62 <i class="icon-step flex-div-center"><img :src="'/src/style/img/restypeimg/'+itemNode[0].resType+'.png'" alt=""></i> 62 <i class="icon-step flex-div-center"><img :src="'/src/style/img/restypeimg/'+itemNode[0].resType+'.png'" alt=""></i>
63 </div> 63 </div>
64 </el-tooltip> 64 </el-tooltip>
65 - <!-- <span :class="['list-line',{'isActive':item.nodeName && index<nodeData.length}]"></span>-->  
66 <span @click="addTableList(false)" v-if="index+1<nodeData.length && itemNode.length<=1" :class="['list-line','cursorClass',{'isActive':itemNode.length>1}]"></span> 65 <span @click="addTableList(false)" v-if="index+1<nodeData.length && itemNode.length<=1" :class="['list-line','cursorClass',{'isActive':itemNode.length>1}]"></span>
  66 +<!-- <span @click="addTableList(false)" v-if="itemNode.length<=1 && itemNode[0].nodeName" :class="['list-line','cursorClass',{'isActive':itemNode.length>1}]"></span>-->
67 67
68 <el-tooltip 68 <el-tooltip
69 class="item" 69 class="item"
@@ -172,11 +172,13 @@ export default { @@ -172,11 +172,13 @@ export default {
172 bNetNodeList.map((item,index)=>{ 172 bNetNodeList.map((item,index)=>{
173 item.sort=index; 173 item.sort=index;
174 }) 174 })
175 - if(proxy.linkId){  
176 - // bNetNodeList.linkId=proxy.linkId; 175 + let linkId='';
  176 + if(proxy.isClickNet!=-1){
  177 + linkId=proxy.linkId;
177 } 178 }
178 let params={ 179 let params={
179 bNetLink:{ 180 bNetLink:{
  181 + id:linkId,
180 linkName:proxy.linkName, 182 linkName:proxy.linkName,
181 bizId:proxy.bizId, 183 bizId:proxy.bizId,
182 targetId:proxy.targetId, 184 targetId:proxy.targetId,