monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 48a357997b2135d2b8f9326979bf035dd4b07be8 2 parents d2d0454d 8e0a800b

Merge branch 'master-V32-XuHaoJie' into 'master' 

宁夏-即时消息配置-前端页面优化



See merge request !411
Inline Side-by-side
Showing 3 changed files with 50 additions and 28 deletions
... ... @@ -276,13 +276,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
type: 1
, title: '及时消息自定义展示示例'
, closeBtn: 1
, area: ['60%', '70%']
, area: ['60%', '40%']
, shade: 0.8
, id: 'lay_cron_noticeTimely' //设定一个id，防止重复弹出
, content: $("#notice_timely_template").html()
});
});
//及时消息配置地址提示信息
$('#show_corn_info_state').unbind("click").on("click", function () {
layer.open({
type: 1
, title: '及时消息地址配置示例'
, closeBtn: 1
, area: ['60%', '30%']
, shade: 0.8
, id: 'lay_cron_noticeTimely_state' //设定一个id，防止重复弹出
, content: $("#notice_timely_site_template").html()
});
});
//获取列明
function getRowName() {
var map = {
... ...
... ... @@ -17,33 +17,34 @@
placeholder="请输入频率" class="layui-input">
</div>
<div class="layui-form-mid layui-word-aux" id="show_corn_info_frequency"
style="padding: 0!important;position: relative;line-height: 38px;">
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">
<div class="layui-inline">
<div class="layui-form-item" style="display: flex;justify-content: space-between;">
<div class="layui-inline" style="flex: 1;">
<label class="layui-form-label">状态</label>
<div class="layui-input-inline" style="width: calc(20vw - 142px);margin-right:105px">
<div class="layui-input-inline" style="margin-left: 20px;;width: 100px">
<!-- <div class="layui-input-inline" style="width: calc(20vw - 142px);margin-right:65px;margin-left: 50px;">-->
<input type="checkbox" id="switch_noticeTimely_state" name="state" lay-skin="switch" lay-text="启用|禁用" value="0" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">是否广播</label>
<div class="layui-input-inline" style="width: calc(20vw - 142px);margin-right:105px">
<div class="layui-inline" style="flex: 1;">
<label class="layui-form-label" >是否广播</label>
<div class="layui-input-inline" style="margin-left: 20px;width: 100px">
<input type="checkbox" id="switch_noticeTimely_broadcast" name="broadcast" lay-skin="switch" lay-text="是|否" value="0" >
</div>
</div>
<div class="layui-inline">
<div class="layui-inline" style="">
<label class="layui-form-label">是否轮循</label>
<div class="layui-input-inline" style="width: calc(20vw - 142px);margin-right:105px">
<div class="layui-input-inline" style="margin-left: 20px;width: 100px">
<input type="checkbox" id="switch_noticeTimely_retry" name="retry" lay-skin="switch" lay-text="轮循|不轮循" value="0" >
</div>
</div>
<div class="layui-inline" style="display: none !important;">
<label class="layui-form-label">发送状态</label>
<div class="layui-input-inline" style="width: calc(20vw - 142px);margin-right:0px">
<div class="layui-input-inline" style="width: calc(20vw - 142px);margin-right:0px;margin-left: 50px;">
<input type="checkbox" id="switch_noticeTimely_sendState" name="sendState" lay-skin="switch" lay-text="已发送|未发送" value="0" >
</div>
</div>
... ... @@ -55,15 +56,21 @@
<input type="text" name="retryTime" placeholder="请输入重发延迟时间(秒)" class="layui-input">
</div>
</div>
<div class="inline-half layui-inline" style="width: 80%">
<div class="inline-half layui-inline" style="width: 100%">
<label class="layui-form-label">跳转地址</label>
<div class="layui-input-inline">
<select id="notice_timely_select">
<option selected="selected" disabled="disabled" style='display: none' value=''></option>
</select>
</div>
<div class="layui-input-inline" style="margin-left: 10px">
<input type="text" name="site" id="notice_timely_site" placeholder="请输入详情页地址" class="layui-input">
<div style="width: 95%">
<div class="layui-input-inline" style="width: 46%;">
<select id="notice_timely_select">
<option selected="selected" disabled="disabled" style='display: none' value=''></option>
</select>
</div>
<div class="layui-input-inline" style="margin-left: 1px;width: 52%;">
<input type="text" name="site" id="notice_timely_site" placeholder="请输入详情页地址" class="layui-input">
</div>
<div class="layui-form-mid layui-word-aux" id="show_corn_info_state"
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>
... ... @@ -87,16 +94,15 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label">用户</label>
<div class="layui-input-block tags-input" style="height: auto">
<div class="layui-input-block tags-input" style="height: auto;width: 90% !important;">
<div class="tags" id="select_noticeTimely_id_user"></div>
</div>
<div class="layui-form-mid layui-word-aux" style="padding: 0!important;position: relative;top: -28px;left: 98%"><i class="layui-icon form-btn-icon" id="noticeTimely-form-select-users">&#xe615;</i></div>
<div class="layui-form-mid layui-word-aux" style="padding: 0!important;position: relative;top: -28px;left: 98%;justify-content: center;margin-left: 10px; "><i class="layui-icon form-btn-icon" id="noticeTimely-form-select-users">&#xe615;</i></div>
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label">内容</label>
<div class="layui-input-block" style="display: flex;">
<textarea name="details" placeholder="请输入内容(SQL)" class="layui-textarea" style="width: 93%"
id="layui-notice_timely_sql"></textarea>
<div class="layui-input-block" style="display: flex;flex-direction: column;align-items: flex-end;">
<textarea name="details" placeholder="请输入内容(SQL)" class="layui-textarea" id="layui-notice_timely_sql" style="width: 100%"></textarea>
<div style="width: 100px;height: auto;">
<div style="background-color: #1E9FFF;width: 90px;float: right;display: flex;justify-content: center;height: 40px;line-height: 40px;margin-top: 30px; color: #fff;"
id="layui-notice_timely_sql_test">测试
... ... @@ -185,9 +191,12 @@
<p style="margin: 10px auto; padding: 0px;">
　　<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);">（3）</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>
<p>
&nbsp;
</p>
</div>
</script>
<!--及时消息跳转地址示例-->
<script type="text/html" id="notice_timely_site_template">
<div id="cronContent_site" style="color:#000000">
<p style="margin: 10px auto; padding: 0px;">
　　<strong style="margin: 0px; padding: 0px;"><span style="margin: 0px; padding: 0px; line-height: 18px; color: rgb(255, 0, 0);">跳转地址用法详解</span></strong>
</p>
... ...
... ... @@ -50,7 +50,7 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
dataRenderingBase("arms_time_lineChart", resId, "KPI678F9FC3", "响应时间/每分钟", null);
// Start Wang 2022/2/24 9:29 解决：arms采集结果展示(详情页面开发)
// 节点详情
commonDetail.renderTable("arms_node_detail",false,resId,"KPI452C0F78,KPI678F9FC3,KPIFC03301B,KPI4D6871EA,KPI649E288B,KPI5769F327,KPI8B2CCCCF",'节点详情',`detail`);
commonDetail.renderTable("arms_node_detail",false,resId,"KPI452C0F78,KPI5769F327,KPI8B2CCCCF,KPI678F9FC3,KPI649E288B,KPI8DC835B1,KPI4D6871EA,KPICC063E40,KPIFC03301B",'节点详情',`detail`);
// End Wang 2022/2/24 9:30
//活动告警
commonDetail.renderActiveAlarms("arms_active_alram", resId);
... ...