Authored by 袁晋鹏

Merge remote-tracking branch 'origin/master-500-dev' into master-500-dev

... ... @@ -3616,7 +3616,16 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
<option value="1">=选择告警策略=</option>
</select>
</div>
<div class="layui-form-mid layui-word-aux"><a style="height: 50px;line-height: 50px;" class="layui-btn layui-btn-normal" id="form_detail_add_policy"><i class="layui-icon">&#xe654;</i></a></div>
<div style="display: flex;">
<div class="layui-form-mid layui-word-aux">
<a style="height: 50px;line-height: 50px;" class="layui-btn layui-btn-normal" id="form_detail_add_policy"><i class="layui-icon">&#xe654;</i></a>
</div>
<div class="layui-form-mid layui-word-aux" id="show_corn_info_policy"
style="padding: 0!important;position: relative;line-height: 38px;display: flex;justify-content: center;margin: 0px;margin-left: 5px;">
<i class="layui-icon form-btn-icon">&#xe702;</i>
</div>
</div>
</div>
<div class="layui-form-item icon-label-item">
<label class="layui-form-label" style="text-align: center !important;width: 120px">告警订阅</label>
... ... @@ -3628,7 +3637,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
</div>
</form> `;
common.openWindow('user-add-form-id',$con,"告警设置","45%",'50%',['保存','取消'],function(){
common.openWindow('user-add-form-id',$con,"告警设置","50%",'50%',['保存','取消'],function(){
var kpiPolicy = $("#detil_kpi_policy").val();
var kpiSubscribe = $("#detil_kpi_subscribe").val();
if(!kpiPolicy || !kpiSubscribe){
... ... @@ -3661,6 +3670,25 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
bindAlarmPolicyList(undefined,params.kpiId);
bindAlarmSubscribeList();
$('#show_corn_info_policy').unbind("click").on("click",function (){
layer.open({
type: 1
, title: '告警策略'
, closeBtn: 1
, area: ['20%', '20%']
, shade: 0.8
, id: 'lay_cron_detail_add_policy' //设定一个id,防止重复弹出
, content: '<div id="icon_tips_alarm_Content" style="color:#000000">\n' +
' <p style="margin: 10px auto; padding: 0px;">\n' +
' <strong style="margin: 0px; padding: 0px;"><span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(255, 0, 0);">重点说明</span></strong>\n' +
' </p>\n' +
' <p style="margin: 10px auto; padding: 0px;">\n' +
' <span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(255, 0, 0);"><span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(0, 0, 255);"><span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(0, 0, 0);">(1)</span></span><strong style="margin: 0px; padding: 0px;"><span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(0, 0, 255);"></span></strong>&nbsp;&nbsp;</span>&nbsp;策略类型只包含非默认的策略' +
' </p>\n' +
' </div>'
});
});
//自定义告警策略
$("#form_detail_add_policy").unbind("click").on("click",function (){
params.from = 'detail';
... ...
<script type="text/html" template>
<link rel="stylesheet" href="{{ layui.setter.base }}style/login.css?v={{ layui.admin.v }}-1" media="all">
</script>
<div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
<div class="layadmin-user-login-box layadmin-user-login-header">
<!--<h2>国家税务总局浙江省税务局运行监控平台</h2>-->
<img src="/src/style/img/logo.png">
</div>
<div class="layadmin-user-login-main">
<div class="layadmin-user-login-box layadmin-user-login-body layui-form">
<div class="layui-form-item">
<h2>用户登录</h2>
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon layui-icon layui-icon-username" for="userName"></label>
<input type="text" name="username" id="userName" lay-verify="required" placeholder="用户名" class="layui-input">
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon layui-icon layui-icon-password" for="loginPswd"></label>
<input type="password" name="password" id="loginPswd" lay-verify="required|password" placeholder="密码"
class="layui-input">
</div>
<!--验证码-->
<div class="layui-form-item" id="validCodeLine" style="display: none">
<div class="layui-row">
<div class="layui-col-xs7">
<input id="validCode" name="validCode" style="width:170px" type="text" placeholder="验证码" class="layui-input">
</div>
<div class="layui-col-xs5">
<img class="login-captcha" src="#">
</div>
</div>
</div>
<div class="layui-form-item" style="margin-bottom: 20px;">
<!-- <input type="checkbox" name="remember" lay-skin="primary" title="记住密码">-->
<!-- <a lay-href="/user/forget" class="layadmin-user-jump-change layadmin-link" style="margin-top: 7px;">忘记密码?</a>-->
</div>
<div class="layui-form-item">
<button class="layui-btn layui-btn-fluid login-btn" lay-submit lay-filter="LAY-user-login-submit">登 入</button>
</div>
<div class="layui-form-item">
<span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
</div>
<div style="font-size: 12px;text-align: center;color: #c1c1c1">
技术支持:北京鸿果秋实科技有限公司
</div>
</div>
</div>
</div>
<script>
layui.use('login',function (fn) {
fn();
});
(function() {
// Private array of chars to use
var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
Math.uuid = function (len, radix) {
var chars = CHARS, uuid = [], i;
radix = radix || chars.length;
if (len) {
// Compact form
for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
} else {
// rfc4122, version 4 form
var r;
// rfc4122 requires these characters
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
uuid[14] = '4';
// Fill in random data. At i==19 set the high bits of clock sequence as
// per rfc4122, sec. 4.1.5
for (i = 0; i < 36; i++) {
if (!uuid[i]) {
r = 0 | Math.random()*16;
uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
}
}
}
return uuid.join('');
};
})();
</script>
... ...
<script type="text/html" template>
<link rel="stylesheet" href="{{ layui.setter.base }}style/login-skin1.css?v={{ layui.admin.v }}-1" media="all">
</script>
<div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
<div class="layadmin-user-login-box layadmin-user-login-header">
<!--<h2>国家税务总局浙江省税务局运行监控平台</h2>-->
<img src="/src/style/img/login/skin/1/mingcheng.png">
</div>
<div class="layadmin-user-login-main">
<div class="layadmin-user-login-box layadmin-user-login-body layui-form">
<div class="layui-form-item" style="color: #2887FD;font-weight: bold;text-align: center;font-size: 18px;">
<h2>用户登录</h2>
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon layui-icon layui-icon-username" for="userName"></label>
<input type="text" name="username" id="userName" lay-verify="required" placeholder="用户名" class="layui-input">
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon layui-icon layui-icon-password" for="loginPswd"></label>
<input type="password" name="password" id="loginPswd" lay-verify="required|password" placeholder="密码"
class="layui-input">
</div>
<!--验证码-->
<div class="layui-form-item" id="validCodeLine" style="display: none">
<div class="layui-row">
<div class="layui-col-xs7">
<input id="validCode" name="validCode" style="width:170px" type="text" placeholder="验证码" class="layui-input">
</div>
<div class="layui-col-xs5">
<img class="login-captcha" src="#">
</div>
</div>
</div>
<div class="layui-form-item" style="margin-bottom: 20px;">
<!-- <input type="checkbox" name="remember" lay-skin="primary" title="记住密码">-->
<!-- <a lay-href="/user/forget" class="layadmin-user-jump-change layadmin-link" style="margin-top: 7px;">忘记密码?</a>-->
</div>
<div class="layui-form-item">
<button class="layui-btn layui-btn-fluid login-btn" lay-submit lay-filter="LAY-user-login-submit">登 入</button>
</div>
<div class="layui-form-item">
<span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
</div>
<div style="font-size: 12px;text-align: center;color: #c1c1c1">
技术支持:北京鸿果秋实科技有限公司
</div>
</div>
</div>
</div>
<script>
layui.use('login',function (fn) {
fn();
});
(function() {
// Private array of chars to use
var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
Math.uuid = function (len, radix) {
var chars = CHARS, uuid = [], i;
radix = radix || chars.length;
if (len) {
// Compact form
for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
} else {
// rfc4122, version 4 form
var r;
// rfc4122 requires these characters
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
uuid[14] = '4';
// Fill in random data. At i==19 set the high bits of clock sequence as
// per rfc4122, sec. 4.1.5
for (i = 0; i < 36; i++) {
if (!uuid[i]) {
r = 0 | Math.random()*16;
uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
}
}
}
return uuid.join('');
};
})();
</script>
... ...
<script type="text/html" template>
<link rel="stylesheet" href="{{ layui.setter.base }}style/login-skin2.css?v={{ layui.admin.v }}-1" media="all">
</script>
<div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
<div class="layadmin-user-login-box layadmin-user-login-header">
<!--<h2>国家税务总局浙江省税务局运行监控平台</h2>-->
</div>
<div class="layadmin-user-login-main">
<img src="/src/style/img/login/skin/2/mingcheng2.png" style="border: none;position: absolute;margin-left: calc(100% - 650px);margin-top: 175px;width: 500px;">
<div class="layadmin-user-login-box layadmin-user-login-body layui-form">
<div class="layui-form-item" style="color: #2887FD;font-weight: bold;text-align: center;font-size: 18px;">
<h2>用户登录</h2>
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon layui-icon layui-icon-username" for="userName"></label>
<input type="text" name="username" id="userName" lay-verify="required" placeholder="用户名" class="layui-input">
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon layui-icon layui-icon-password" for="loginPswd"></label>
<input type="password" name="password" id="loginPswd" lay-verify="required|password" placeholder="密码"
class="layui-input">
</div>
<!--验证码-->
<div class="layui-form-item" id="validCodeLine" style="display: none">
<div class="layui-row">
<div class="layui-col-xs7">
<input id="validCode" name="validCode" style="width:170px" type="text" placeholder="验证码" class="layui-input">
</div>
<div class="layui-col-xs5">
<img class="login-captcha" src="#">
</div>
</div>
</div>
<div class="layui-form-item" style="margin-bottom: 20px;">
<!-- <input type="checkbox" name="remember" lay-skin="primary" title="记住密码">-->
<!-- <a lay-href="/user/forget" class="layadmin-user-jump-change layadmin-link" style="margin-top: 7px;">忘记密码?</a>-->
</div>
<div class="layui-form-item">
<button class="layui-btn layui-btn-fluid login-btn" lay-submit lay-filter="LAY-user-login-submit">登 入</button>
</div>
<div class="layui-form-item">
<span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
</div>
<div style="font-size: 12px;text-align: center;color: #c1c1c1">
技术支持:北京鸿果秋实科技有限公司
</div>
</div>
</div>
</div>
<script>
layui.use('login',function (fn) {
fn();
});
(function() {
// Private array of chars to use
var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
Math.uuid = function (len, radix) {
var chars = CHARS, uuid = [], i;
radix = radix || chars.length;
if (len) {
// Compact form
for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
} else {
// rfc4122, version 4 form
var r;
// rfc4122 requires these characters
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
uuid[14] = '4';
// Fill in random data. At i==19 set the high bits of clock sequence as
// per rfc4122, sec. 4.1.5
for (i = 0; i < 36; i++) {
if (!uuid[i]) {
r = 0 | Math.random()*16;
uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
}
}
}
return uuid.join('');
};
})();
</script>
... ...
<script type="text/html" template>
<link rel="stylesheet" href="{{ layui.setter.base }}style/login.css?v={{ layui.admin.v }}-1" media="all">
</script>
<div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
<div class="layadmin-user-login-box layadmin-user-login-header">
<img src="/src/style/img/logo.png">
</div>
<div class="layadmin-user-login-main">
<div class="layadmin-user-login-box layadmin-user-login-body layui-form">
<div class="layui-form-item">
<h2>用户登录</h2>
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon layui-icon layui-icon-username" for="userName"></label>
<input type="text" name="username" id="userName" lay-verify="required" placeholder="用户名" class="layui-input">
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon layui-icon layui-icon-password" for="loginPswd"></label>
<input type="password" name="password" id="loginPswd" lay-verify="required|password" placeholder="密码"
class="layui-input">
</div>
<!--验证码-->
<div class="layui-form-item" id="validCodeLine" style="display: none">
<div class="layui-row">
<div class="layui-col-xs7">
<input id="validCode" name="validCode" style="width:170px" type="text" placeholder="验证码" class="layui-input">
</div>
<div class="layui-col-xs5">
<img class="login-captcha" src="#">
</div>
</div>
</div>
<div class="layui-form-item" style="margin-bottom: 20px;">
<!-- <input type="checkbox" name="remember" lay-skin="primary" title="记住密码">-->
<!-- <a lay-href="/user/forget" class="layadmin-user-jump-change layadmin-link" style="margin-top: 7px;">忘记密码?</a>-->
</div>
<div class="layui-form-item">
<button class="layui-btn layui-btn-fluid login-btn" lay-submit lay-filter="LAY-user-login-submit">登 入</button>
</div>
<div class="layui-form-item">
<span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
</div>
</div>
</div>
</div>
<script>
layui.use('login',function (fn) {
fn();
});
(function() {
// Private array of chars to use
var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
Math.uuid = function (len, radix) {
var chars = CHARS, uuid = [], i;
radix = radix || chars.length;
if (len) {
// Compact form
for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
} else {
// rfc4122, version 4 form
var r;
// rfc4122 requires these characters
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
uuid[14] = '4';
// Fill in random data. At i==19 set the high bits of clock sequence as
// per rfc4122, sec. 4.1.5
for (i = 0; i < 36; i++) {
if (!uuid[i]) {
r = 0 | Math.random()*16;
uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
}
}
}
return uuid.join('');
};
})();
</script>
... ...
该目录存放【用户】的视图文件
\ No newline at end of file
... ...
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>综合监控管理系统</title>
<link rel="shortcut icon" href="../src/style/res/shui.png">
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="/start/layui/css/layui.css" media="all">
<link rel="stylesheet" href="/src/style/css/menuIcon.css" media="all">
<script>
/^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost 下再访问');
</script>
</head>
<body>
<div id="LAY_app"></div>
<script src="/start/layui/layui.js"></script>
<script>
layui.use(['jquery'], function () {
var $ = layui.jquery;
// 读取配置文件
$.when(
$.ajax({
url: '/config/getConfig',
data: {
configName: 'url'
},
async: false
}),$.ajax({
url: '/config/getConfig',
data: {
configName: 'config.audio'
},
}),
).done(function (res1,res2) {
sessionStorage.setItem('domainName', res1[0].gateway);
sessionStorage.setItem('domainInspectionURI', res1[0].inspection_web);
sessionStorage.setItem('domainAssetsManage', res1[0].assetsweb);
sessionStorage.setItem('graphEditorOrigin', res1[0].mxgraph_editor);
sessionStorage.setItem('tingyun', res1[0].tingyun);
sessionStorage.setItem('bigScreen', res1[0].bigScreen);
sessionStorage.setItem('ythView', res1[0].ythView);
sessionStorage.setItem('ajWeb', res1[0].ajWeb);
//xwx add 读取业务健康度页面IP地址 2021-10-25 start
sessionStorage.setItem('ywHealth', res1[0].ywHealth);
//xwx add 读取业务健康度页面IP地址 2021-10-25 end
sessionStorage.setItem('workflow', res1[0].workflow);
sessionStorage.setItem('mp3', res2[0].mp3);
sessionStorage.setItem('jimuReport', res1[0].jimuReport);
sessionStorage.setItem('cmdbWeb', res1[0].cmdbWeb);
})
});
layui.config({
base: '../src/' //指定 layuiAdmin 项目路径,本地开发用 src,线上用 dist
// ,version: '1.2.1'//运行环境用个固定版本号
,version: new Date().getTime()//本地开发环境,避免改动后的文件未及时生效,所以用时间戳作为版本
}).use('index');
</script>
</body>
</html>
... ...