monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 8c93016b8dfb0479acf73efc93cbe1ba05b02705 2 parents c3925ff2 86ddf072

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

Inline Side-by-side
Showing 10 changed files with 131 additions and 121 deletions
... ... @@ -131,7 +131,7 @@ MODIFY COLUMN `state` int NULL DEFAULT 0 COMMENT '0:正常，1:延期，3:预留
FOR EACH ROW
begin
IF NEW.isLeaf = 1 THEN
INSERT INTO `itsm_demo`.`system_handler` (`system_id`, `system_name`, `sort`, `system_type`, `enable`,`isvirtual`) VALUES (NEW.busId, NEW.busTypeName, NEW.sort, "0",NEW.isUse,"1");
INSERT INTO `itsm_demo`.`system_handler` (`system_id`, `system_name`, `sort`, `system_type`, `enable`,`isvirtual`) VALUES (NEW.busId, NEW.busTypeName, NEW.sort, "0","0","1");
END IF;
end$$
DELIMITER ;
... ... @@ -143,7 +143,7 @@ MODIFY COLUMN `state` int NULL DEFAULT 0 COMMENT '0:正常，1:延期，3:预留
FOR EACH ROW
begin
IF NEW.isLeaf = 1 and OLD.isLeaf =1 THEN
UPDATE `itsm_demo`.`system_handler` SET `system_name` = NEW.busTypeName, `enable`= NEW.isUse, `sort` = NEW.sort WHERE `system_id` = OLD.busId;
UPDATE `itsm_demo`.`system_handler` SET `system_name` = NEW.busTypeName, `sort` = NEW.sort WHERE `system_id` = OLD.busId;
ELSE
DELETE FROM `itsm_demo`.`system_handler` where `system_id` = OLD.busId;
END IF;
... ...
... ... @@ -30,7 +30,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
sessions: layui.sessions,
// 获取编辑指标
getEditKpiList:function (){
var editFlag = localStorage.getItem("editFlag");//是否编辑状态
if(!(editFlag && editFlag == "true")){
editKpiList.push('----');
... ... @@ -197,46 +196,46 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
//获取编辑状态
var editFlag = localStorage.getItem("editFlag");//是否编辑状态
var piechbox = '<div class="layui-form" style="float: left;top: 15px;position: relative;left: 12px;" >' +
'<input lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" data-unit="'+data.kpiUnit+'" ' +
'data-id="' + kpiId + '" data-kpiname="' + data.name + '" data-flag="' + data.flag + '" data-name='+data.name+'></div>';
'<input lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" data-unit="' + data.kpiUnit + '" ' +
'data-id="' + kpiId + '" data-kpiname="' + data.name + '" data-flag="' + data.flag + '" data-name=' + data.name + '></div>';
pie.find("li").attr("data-degree", val);
var resStyle = obj.alarmEleMatchStyle(data.flag,kpiId);
// Start Wang 2021/11/18 15:03 查询字典编辑指标，判断编辑状态
// // 可编辑状态的性能指标
// if(data.ident=='1' && editFlag && editFlag == "true"){
// pie.find(".pie-half-text").html(piechbox+"<b><u style='"+resStyle+"'>"+val + "%</u></b>");
// form.render();
// }else{
// pie.find(".pie-half-text").find("b").html("<u style='"+resStyle+"'>"+val + "%</u>"); //增加下划线
var resStyle = obj.alarmEleMatchStyle(data.flag, kpiId);
// 获取配置指标 ww 优化
// var kpiList = obj.getEditKpiList();
//
// // 没有配置字典指标则按照性能指标判断
// if(kpiList.length == 1){
// // 可编辑状态的性能指标
// if(data.ident=='1' && editFlag && editFlag == "true"){
// pie.find(".pie-half-text").html(piechbox+"<b><u style='"+resStyle+"'>"+val + "%</u></b>");
// form.render();
// }else{
// pie.find(".pie-half-text").find("b").html("<u style='"+resStyle+"'>"+val + "%</u>"); //增加下划线
// }
// } else {
// // 按照指标配置展示
// let kpiObject = obj.checkKpi(kpiId)
// if(kpiObject[data.id] && kpiObject[data.id] == true && editFlag && editFlag == "true"){
// pie.find(".pie-half-text").html(piechbox+"<b><u style='"+resStyle+"'>"+val + "%</u></b>");
// form.render();
// } else {
// pie.find(".pie-half-text").find("b").html("<u style='"+resStyle+"'>"+val + "%</u>"); //增加下划线
// }
// }
// 获取配置指标
var kpiList = obj.getEditKpiList();
// 没有配置字典指标则按照性能指标判断
if(kpiList.length == 1){
// 可编辑状态的性能指标
if(data.ident=='1' && editFlag && editFlag == "true"){
pie.find(".pie-half-text").html(piechbox+"<b><u style='"+resStyle+"'>"+val + "%</u></b>");
form.render();
}else{
pie.find(".pie-half-text").find("b").html("<u style='"+resStyle+"'>"+val + "%</u>"); //增加下划线
}
// End Wang 2021/11/18 15:04 查询字典编辑指标，判断编辑状态
//可编辑状态的性能指标 徐毫杰还原
if (data.ident == '1' && editFlag && editFlag == "true") {
pie.find(".pie-half-text").html(piechbox + "<b><u style='" + resStyle + "'>" + val + "%</u></b>");
form.render();
} else {
// 按照指标配置展示
let kpiObject = obj.checkKpi(kpiId)
if(kpiObject[data.id] && kpiObject[data.id] == true && editFlag && editFlag == "true"){
pie.find(".pie-half-text").html(piechbox+"<b><u style='"+resStyle+"'>"+val + "%</u></b>");
form.render();
} else {
pie.find(".pie-half-text").find("b").html("<u style='"+resStyle+"'>"+val + "%</u>"); //增加下划线
}
pie.find(".pie-half-text").find("b").html("<u style='" + resStyle + "'>" + val + "%</u>"); //增加下划线
}
// End Wang 2021/11/18 15:04 查询字典编辑指标，判断编辑状态
pie.find(".pie-half-text").find("span").text(data.name);
pie.find(".pie-half-text").find("b").css('cursor','pointer'); //增加悬浮显示手指样式
pie.find(".pie-half-text").css('padding-top','50px');
pie.find(".pie-half-text").find("b").css('cursor', 'pointer'); //增加悬浮显示手指样式
pie.find(".pie-half-text").css('padding-top', '50px');
pie.find(".pie-half-text").find("span").hide();
//计算仪表盘的旋转角度
... ... @@ -1736,79 +1735,79 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
}
if (d[v.id] && d[v.id].kpiId) {
var value = d[v.id];
var resStyle = obj.alarmEleMatchStyle(value.flag,v.id);
// Start Wang 2021/11/18 15:03 查询字典编辑指标，判断编辑状态
// //拼接表空间名称、文件系统名称等等,如果是性能指标或者趋势指标，则可以下探
// if (value.kpiIdent == '1' || value.isWarning == '1') {
// var chbox = '';
// if(editFlag && editFlag == "true" && value.kpiIdent == '1'){
// chbox = '<input lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" ' +
// 'data-id="' + v.id + '" data-kpiname="' + v.name + '" data-flag="' + value.flag + '" data-name="' + kpiname + '" data-unit="'+v.unit+'">';
// }
// return chbox + '<a class="link showlinechart_' + tableId + '" style="padding-left:5px;'+resStyle+'" ' + 'data-isWarning="'+value.isWarning+'" data-ident="'+value.kpiIdent+'"'+
// 'data-trend="'+value.isTrend+'" data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '">' + value.kpiValue + '</a>' +
// '<a class="detail_row_menu hide" data-isWarning="'+value.isWarning+'" data-ident="'+value.kpiIdent+'" data-trend="'+value.isTrend+'" ' +
// 'data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '"' +
// 'data-canca="' + value.canCA + '" data-incaing="' + value.inCAing + '" data-restype="'+resType+'"' +
// '>' +
// '<img style="width: 20px;height: 20px;" src="/src/style/img/icon_row_menu.png"></a>';
var resStyle = obj.alarmEleMatchStyle(value.flag, v.id);
// let arr = obj.getEditKpiList();
// var chbox = '<input lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" ' +
// 'data-id="' + v.id + '" data-kpiname="' + v.name + '" data-flag="' + value.flag + '" data-name="' + kpiname + '" data-unit="' + v.unit + '">';
// if(arr.length == 1){
// if (value.kpiIdent == '1' || value.isWarning == '1') {
//
// if (!(editFlag && editFlag == "true" && value.kpiIdent == '1')) {
// chbox = '';
// }
// return chbox + '<a class="link showlinechart_' + tableId + '" style="padding-left:5px;' + resStyle + '" ' + 'data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '"' +
// 'data-trend="' + value.isTrend + '" data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '">' + value.kpiValue + '</a>' +
// '<a class="detail_row_menu hide" data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '" data-trend="' + value.isTrend + '" ' +
// 'data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '"' +
// 'data-canca="' + value.canCA + '" data-incaing="' + value.inCAing + '" data-restype="' + resType + '"' +
// '>' +
// '<img style="width: 20px;height: 20px;" src="/src/style/img/icon_row_menu.png"></a>';
//
// } else {
// var $html = addIconByValue(value.kpiValue);
// //根据资源类型判断 修改样式
// if ($html != "" && resType != "" && resType == "HOST_X86SERVER" && $html == '<i class="iconfont icon-size serious">\ue668</i>') {
// $html = '<i class="iconfont icon-size grayColor">\ue61e</i>';
// }
// return '<a data-id="' + v.id + '"data-flag="' + value.flag + '">' + $html + value.kpiValue + '</a>';
// }
// } else {
// var $html = addIconByValue(value.kpiValue);
// //根据资源类型判断 修改样式
// if($html!="" && resType!="" && resType=="HOST_X86SERVER" && $html=='<i class="iconfont icon-size serious">\ue668</i>'){
// $html='<i class="iconfont icon-size grayColor">\ue61e</i>';
// var kpiId = d[v.id].kpiId;
// // 按照指标配置展示
// let kpiObject = obj.checkKpi(kpiId)
// if(kpiObject[kpiId] && kpiObject[kpiId] == true && editFlag && editFlag == "true"){
// return chbox + '<a class="link showlinechart_' + tableId + '" style="padding-left:5px;' + resStyle + '" ' + 'data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '"' +
// 'data-trend="' + value.isTrend + '" data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '">' + value.kpiValue + '</a>' +
// '<a class="detail_row_menu hide" data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '" data-trend="' + value.isTrend + '" ' +
// 'data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '"' +
// 'data-canca="' + value.canCA + '" data-incaing="' + value.inCAing + '" data-restype="' + resType + '"' +
// '>' +
// '<img style="width: 20px;height: 20px;" src="/src/style/img/icon_row_menu.png"></a>';
// } else {
// var $html = addIconByValue(value.kpiValue);
// //根据资源类型判断 修改样式
// if ($html != "" && resType != "" && resType == "HOST_X86SERVER" && $html == '<i class="iconfont icon-size serious">\ue668</i>') {
// $html = '<i class="iconfont icon-size grayColor">\ue61e</i>';
// }
// return '<a data-id="' + v.id + '"data-flag="' + value.flag + '">' + $html + value.kpiValue + '</a>';
// }
// return '<a data-id="' + v.id + '"data-flag="' + value.flag + '">' + $html + value.kpiValue + '</a>';
// }
let arr = obj.getEditKpiList();
var chbox = '<input lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" ' +
'data-id="' + v.id + '" data-kpiname="' + v.name + '" data-flag="' + value.flag + '" data-name="' + kpiname + '" data-unit="' + v.unit + '">';
if(arr.length == 1){
if (value.kpiIdent == '1' || value.isWarning == '1') {
if (!(editFlag && editFlag == "true" && value.kpiIdent == '1')) {
chbox = '';
}
return chbox + '<a class="link showlinechart_' + tableId + '" style="padding-left:5px;' + resStyle + '" ' + 'data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '"' +
'data-trend="' + value.isTrend + '" data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '">' + value.kpiValue + '</a>' +
'<a class="detail_row_menu hide" data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '" data-trend="' + value.isTrend + '" ' +
'data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '"' +
'data-canca="' + value.canCA + '" data-incaing="' + value.inCAing + '" data-restype="' + resType + '"' +
'>' +
'<img style="width: 20px;height: 20px;" src="/src/style/img/icon_row_menu.png"></a>';
} else {
var $html = addIconByValue(value.kpiValue);
//根据资源类型判断 修改样式
if ($html != "" && resType != "" && resType == "HOST_X86SERVER" && $html == '<i class="iconfont icon-size serious">\ue668</i>') {
$html = '<i class="iconfont icon-size grayColor">\ue61e</i>';
}
return '<a data-id="' + v.id + '"data-flag="' + value.flag + '">' + $html + value.kpiValue + '</a>';
//
// // End Wang 2021/11/18 15:03 查询字典编辑指标，判断编辑状态
//拼接表空间名称、文件系统名称等等,如果是性能指标或者趋势指标，则可以下探 徐毫杰还原
if (value.kpiIdent == '1' || value.isWarning == '1') {
var chbox = '';
if (editFlag && editFlag == "true" && value.kpiIdent == '1') {
chbox = '<input lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" ' +
'data-id="' + v.id + '" data-kpiname="' + v.name + '" data-flag="' + value.flag + '" data-name="' + kpiname + '" data-unit="' + v.unit + '">';
}
return chbox + '<a class="link showlinechart_' + tableId + '" style="padding-left:5px;' + resStyle + '" ' + 'data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '"' +
'data-trend="' + value.isTrend + '" data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '">' + value.kpiValue + '</a>' +
'<a class="detail_row_menu hide" data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '" data-trend="' + value.isTrend + '" ' +
'data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '"' +
'data-canca="' + value.canCA + '" data-incaing="' + value.inCAing + '" data-restype="' + resType + '"' +
'>' +
'<img style="width: 20px;height: 20px;" src="/src/style/img/icon_row_menu.png"></a>';
} else {
var kpiId = d[v.id].kpiId;
// 按照指标配置展示
let kpiObject = obj.checkKpi(kpiId)
if(kpiObject[kpiId] && kpiObject[kpiId] == true && editFlag && editFlag == "true"){
return chbox + '<a class="link showlinechart_' + tableId + '" style="padding-left:5px;' + resStyle + '" ' + 'data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '"' +
'data-trend="' + value.isTrend + '" data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '">' + value.kpiValue + '</a>' +
'<a class="detail_row_menu hide" data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '" data-trend="' + value.isTrend + '" ' +
'data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '"' +
'data-canca="' + value.canCA + '" data-incaing="' + value.inCAing + '" data-restype="' + resType + '"' +
'>' +
'<img style="width: 20px;height: 20px;" src="/src/style/img/icon_row_menu.png"></a>';
} else {
var $html = addIconByValue(value.kpiValue);
//根据资源类型判断 修改样式
if ($html != "" && resType != "" && resType == "HOST_X86SERVER" && $html == '<i class="iconfont icon-size serious">\ue668</i>') {
$html = '<i class="iconfont icon-size grayColor">\ue61e</i>';
}
return '<a data-id="' + v.id + '"data-flag="' + value.flag + '">' + $html + value.kpiValue + '</a>';
var $html = addIconByValue(value.kpiValue);
//根据资源类型判断 修改样式
if ($html != "" && resType != "" && resType == "HOST_X86SERVER" && $html == '<i class="iconfont icon-size serious">\ue668</i>') {
$html = '<i class="iconfont icon-size grayColor">\ue61e</i>';
}
return '<a data-id="' + v.id + '"data-flag="' + value.flag + '">' + $html + value.kpiValue + '</a>';
}
// End Wang 2021/11/18 15:03 查询字典编辑指标，判断编辑状态
} else {
return d[v.id];
}
... ...
... ... @@ -20,6 +20,8 @@ url:
bigScreen: http://127.0.0.1:8081
# 一体化视图
ythView: http://192.168.0.69:18089
# cmdb
CMDB: http://192.168.0.68:80
# 业务健康度
ywHealth: http://80.12.92.117:83
#流程系统路径，当ssl.enabled=true时，http要改为https,并修改流程nginx的conf文件
... ...
... ... @@ -673,6 +673,16 @@ layui.define(['view'], function(exports){
, toDZSWJScreen: function () {
window.open(window.location.origin + '/vue3/index.html#/zj/dp?access_token=' + localStorage.getItem("access_token"));
}
// xwx add 首页增加CMDB入口 2021-11-21
, toCMDB: function () {
var roles=sessionStorage.getItem('roles');
if (roles=='zichanyw' || roles=='zichanAdmin'){
window.open(sessionStorage.getItem("CMDB"));
}else{
layer.msg('当前用户没有权限', {icon: 0, time: 3000});
}
}
//向右滚动页面标签
, leftPage: function () {
... ...
... ... @@ -74,6 +74,7 @@
<dd layadmin-event="toDZSWJScreen" style="text-align: left;"><a><img src="/src/style/img/icon-dianzishuiwuju.png" style="width: 16px;height: 16px">&nbsp;&nbsp;电子税务大屏</a></dd>
<dd layadmin-event="toYTHViewScreen" style="text-align: left;"><a><img src="/src/style/img/icon-yitihuadaping.png" style="width: 16px;height: 16px">&nbsp;&nbsp;一体化视图</a></dd>
<dd layadmin-event="toBiZhEalZhSYS" style="text-align: left;"><a><img src="/src/style/img/icon-YWJKD.png" style="width: 16px;height: 16px">&nbsp;&nbsp;业务健康度</a></dd>
<dd layadmin-event="toCMDB" style="text-align: left;"><a><img src="/src/style/img/loading-mj.png" style="width: 16px;height: 16px">&nbsp;&nbsp;CMDB</a></dd>
</dl>
</script>
</li>
... ...
... ... @@ -42,6 +42,7 @@
sessionStorage.setItem('ythView', res1[0].ythView);
//xwx add 读取业务健康度页面IP地址 2021-10-25 start
sessionStorage.setItem('ywHealth', res1[0].ywHealth);
sessionStorage.setItem('CMDB', res1[0].CMDB);
//xwx add 读取业务健康度页面IP地址 2021-10-25 end
sessionStorage.setItem('workflow', res1[0].workflow);
sessionStorage.setItem('mp3', res2[0].mp3);
... ...
... ... @@ -41,17 +41,17 @@ export default {
// 半透明的颜色值
const colorArr1 = [
'rgba(151,213,244, 0.8)',
'rgba(239,224,167, 0.8)',
'rgba(44, 110, 255, 0.8)',
'rgba(151,170,255, 0.8)'
'rgba(255,0,255, 0.8)',
'rgba(23,212,152, 0.8)',
'rgba(253,152,58, 0.8)',
'rgba(255,113,66, 0.8)'
]
// 全透明的颜色值
const colorArr2 = [
'rgba(151,213,244, 0)',
'rgba(239,224,167, 0)',
'rgba(44, 110, 255, 0)',
'rgba(151,170,255, 0)'
'rgba(255,0,255, 0)',
'rgba(23,212,152, 0)',
'rgba(253,152,58, 0)',
'rgba(255,113,66, 0)'
]
// 挂载完
Vue.onMounted(() => {
... ...
... ... @@ -19,7 +19,6 @@ export default {
timer:null,
domainName:sessionStorage.getItem('domainName'),
apiUrl:'/api-web/sxview/getbizListByUser?access_token=',
apiUrl1:'/api-web/sxview/getHealthDegree?busId=53bebbd79f384f619513b50666ea1d48&kpiId=KPIFB844B8B',
checkId:0,//当前选中的tabs
listItem:1,//轮播数-总页数
pageSize:5,//每页显示5条数据
... ...
... ... @@ -46,20 +46,18 @@ export default {
});
// 半透明的颜色值
const colorArr1 = [
'rgba(151,213,244, 0.8)',
'rgba(239,224,167, 0.8)',
'rgba(44, 110, 255, 0.8)',
'rgba(151,170,255, 0.8)'
'rgba(255,0,255, 0.8)',
'rgba(23,212,152, 0.8)',
'rgba(253,152,58, 0.8)',
'rgba(255,113,66, 0.8)'
]
// 全透明的颜色值
const colorArr2 = [
'rgba(151,213,244, 0)',
'rgba(239,224,167, 0)',
'rgba(44, 110, 255, 0)',
'rgba(151,170,255, 0)'
'rgba(255,0,255, 0)',
'rgba(23,212,152, 0)',
'rgba(253,152,58, 0)',
'rgba(255,113,66, 0)'
]
// 挂载完
Vue.onMounted(() => {
proxy.getData();
... ...