Authored by xwx

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

... ... @@ -276,7 +276,13 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
return str.slice(0,str.length-1);
}
//保存
var str=0;
$("#alarmsubscribe-form-save-id").on("click",function (){
if(str==1){
layer.msg("数据正在保存,请稍后在试!");
return false;
}
var data = form.val("add-alarmsubscribe-form");
var val=1;
var timeVal={val};
... ... @@ -344,6 +350,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
}else{
data.sentFrequency = $("#sentFrequency_input").val();
}
str=1;
admin.req({
url : domainName + '/api-web/alarmsubscribe/save?access_token='+accessToken
,data:JSON.stringify(data)
... ... @@ -356,6 +363,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
receiveUserInfos = [];
if(layui.alarmsubscribeIndex && layui.alarmsubscribeIndex()){
layer.closeAll();
str=0;
layui.alarmsubscribeIndex().reloadsubscribe();
}
});
... ... @@ -364,7 +372,6 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
}
}
});
return false;//必须要写,解决禁用submit提交,ajax方法才能正确执行,且表单不会自动刷新
})
});
... ...
import __global from "./global.js";
let http = {
proxy: null,
isJson: function (obj) {
var isjson = typeof (obj) == "object" && Object.prototype.toString.call(obj).toLowerCase() ==
"[object object]" &&
... ... @@ -14,23 +14,39 @@ let http = {
window.top.location.reload();
//window.top.location.href = localStorage.getItem('loginUrl');
} else {
http.proxy.$global.showMsg("服务异常,请联系管理员!","error");
__global.showMsg("服务异常,请联系管理员!","error");
}
}catch (e){
}
},
getUrl: function (){
let gateWay = http.getGateWay();
if (gateWay && gateWay != null && gateWay != '') {
return;
}
http.get(window.location.origin + '/config/getConfig',{configName:'url'},function(res){
sessionStorage.setItem('domainName', res.gateway);
// sessionStorage.setItem('domainInspectionURI', res.inspection_web);
// sessionStorage.setItem('domainAssetsManage', res.assetsweb);
// sessionStorage.setItem('graphEditorOrigin', res.mxgraph_editor);
// sessionStorage.setItem('tingyun', res.tingyun);
// sessionStorage.setItem('bigScreen', res.bigScreen);
// sessionStorage.setItem('sxView', res.sxView);
// sessionStorage.setItem('workflow', res.workflow);
// sessionStorage.setItem('mp3', res.mp3);
// sessionStorage.setItem('jimuReport', res.jimuReport);
// sessionStorage.setItem('cmdbWeb', res.cmdbWeb);
})
},
post: function (requestUrl, data, callback, errFunc,showLoadding,setToken) {
if (http.proxy == null) {
const {proxy} = Vue.getCurrentInstance()
http.proxy = proxy;
}
// 默认展示加载狂
if(showLoadding == undefined){
showLoadding = true;
}
let loading = null;
if(showLoadding && showLoadding == true){
loading = http.proxy.$global.showLoading();
loading = __global.showLoading();
}
if(setToken == undefined || setToken == true){
var access_token = 'access_token=' + http.getToken();
... ... @@ -41,7 +57,7 @@ let http = {
}
}
$.ajax({
url: sessionStorage.getItem('domainName') + requestUrl,
url: http.getGateWay() + requestUrl,
method: "post",
processData: false,
contentType: "application/json;charset=UTF-8",
... ... @@ -72,17 +88,14 @@ let http = {
},
get: function (requestUrl, data, callback, errFunc,showLoadding,setToken) {
if (http.proxy == null) {
const {proxy} = Vue.getCurrentInstance()
http.proxy = proxy;
}
// 默认展示加载狂
if(showLoadding == undefined){
showLoadding = true;
}
let loading = null;
if(showLoadding == true){
loading = http.proxy.$global.showLoading();
loading = __global.showLoading();
}
let header = {};
if(setToken == undefined || setToken == true){
... ... @@ -99,7 +112,7 @@ let http = {
}
$.ajax({
url: sessionStorage.getItem('domainName') + requestUrl,
url: http.getGateWay() + requestUrl,
method: "get",
headers: header,
data: data,
... ... @@ -128,11 +141,7 @@ let http = {
},
uploadFile(requestUrl, parmas,callback) {
if (http.proxy == null) {
const {proxy} = Vue.getCurrentInstance()
http.proxy = proxy;
}
const loading = http.proxy.$global.showLoading();
const loading = __global.showLoading();
var access_token = 'access_token=' + http.getToken();
if (requestUrl.indexOf('?') == -1) {
requestUrl += '?' + access_token;
... ... @@ -146,7 +155,7 @@ let http = {
})(parmas);
$.ajax({
url: sessionStorage.getItem('domainName') + requestUrl,
url: http.getGateWay() + requestUrl,
type: 'POST',
processData: false,
mimeType: "multipart/form-data",
... ... @@ -157,7 +166,7 @@ let http = {
loading.close();
// console.log("==>", requestUrl, xhr, textStatus)
http.reqErr(xhr);
http.proxy.$global.showMsg("上传失败,请您确认文件是否存在!","error");
__global.showMsg("上传失败,请您确认文件是否存在!","error");
},
success: function (data, textStatus, jqXHR) {
... ... @@ -187,11 +196,16 @@ let http = {
return `${keys}`;
}
let p = formart(parmas);
window.open(sessionStorage.getItem('domainName') + requestUrl + "&" + p);
window.open( http.getGateWay() + requestUrl + "&" + p);
},
getToken() {
return localStorage.getItem('access_token');
},
getGateWay () {
let gateway = sessionStorage.getItem('domainName');
return gateway == null ? '' : gateway;
}
}
// 获取url
http.getUrl();
export default http
... ...
... ... @@ -116,7 +116,22 @@ export default {
proxy.$http.post("/api-web/bOpsScoreDetails/page", params, function (res) {
if(res && res.code == 0){
closeDetail(true);
dataList.value = res.data;
//Strat XuHaoJie 2021/12/31 10:56 TODO 解决列表不能展示数字类型的数据 暂时处理
let li =res.data.map(item =>{
let element = {
deduction: item.deduction,
id: item.id,
item: item.item,
projectScoreId: item.projectScoreId,
rater: item.rater,
remark: item.remark+'',
score: item.score+'',
standardScore: item.standardScore+''
}
return element;
});
dataList.value =li;
//End XuHaoJie 2021/12/31 10:56 TODO 解决列表不能展示数字类型的数据 暂时处理
}
});
}
... ... @@ -127,7 +142,11 @@ export default {
// 柱状图
let score = () => {
proxy.$http.post("/api-web/bOpsScore/scoreRatio", {}, function (res) {
let url = "/api-web/bOpsScore/scoreRatio";
if (props.projectId == 1) {
url = "/api-web/bOpsScore/scoreRatio?ops=dzswj"
}
proxy.$http.post(url, {}, function (res) {
if (res && res.data) {
let arr = [];
res.data.forEach(item => {
... ...
... ... @@ -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){
... ...