Authored by 王涛

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【1390】【 告警中心】通知统计样式调整,增加查看更多,活动告警样式调整 ,#1



See merge request !678
... ... @@ -48,10 +48,34 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions'], func
histogramECharts(res.map.business, 'count_notice_send_business', '业务子系统告警发送统计');
//初始化人员告警发送告警统计
histogramECharts(res.map.user, 'count_notice_send_user', '人员告警发送统计');
$("#businessMore").unbind('click').on('click',function (){
queryData('业务子系统告警发送统计',res.map.business)
})
$("#userMore").unbind('click').on('click',function (){
queryData('人员告警发送统计',res.map.user)
})
}
}
})
}
//lsq 弹框打开更多 2022-06-21
function queryData(title,data){
let html=`
<div class="pie-chart pie-chart-custom" id="more_notice" style="height: 60vh"></div>
`
layer.open({
type: 1
, title: title //不显示标题栏
, area: ["91%", "800px"]
, id: 'moreData' //设定一个id,防止重复弹出
, btn: ['取消']
, content: html
, success: function (layero, index) {
histogramECharts(data,'more_notice',title)
}
})
}
//初始化表格
function initTable() {
... ... @@ -149,7 +173,8 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions'], func
var row = data.row;
//列
var line = data.line;
var myChart = echarts.init(document.getElementById(id));
let el=document.getElementById(id);
var myChart = echarts.init(el);
var option;
option = {
tooltip: {
... ... @@ -222,6 +247,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions'], func
//start x轴拖动 lsq 2022-03-10
dataZoom: [
{
show:id=='more_notice'?true:false,
type: "slider",
realtime: true, //拖动滚动条时是否动态的更新图表数据
height: 25, //滚动条高度
... ...
... ... @@ -2625,6 +2625,7 @@ grayColor{
}
.page-panel .main .layui-card .layui-card-header {
padding:0 3px;
height: auto;
}
... ... @@ -3653,6 +3654,8 @@ grayColor{
-webkit-box-sizing: border-box;
box-sizing: border-box;
background-color: #f1f1f1;
/*lsq 活动告警列表卡片样式调整 2022-06-21*/
min-height: 74px;
}
.warn-count-item {
... ... @@ -7820,6 +7823,8 @@ table.table-duty tbody td div.table-duty-td-day .duty-td-div-now {
#inline-condition-duration .duration-desc, #his_inline-condition-duration .duration-desc {
float: left;
/*lsq 告警中心搜索条件栏样式 2022-06-21*/
line-height: 38px;
}
... ... @@ -7839,6 +7844,8 @@ table.table-duty tbody td div.table-duty-td-day .duty-td-div-now {
form[lay-filter="activewarning-form"] .layui-inline {
margin-right: 5px;
/*lsq 告警中心搜索条件栏样式 2022-06-21*/
margin-top:5px;
}
.div-link-state-list .layui-badge-dot {
... ...
... ... @@ -18,11 +18,17 @@
<div class="layui-card-body noticeCount-ECharts" id="count_notice_send">
<div class="layui-noticeCount-ECharts">
<div>
<h5 class="lay-row-title" style="color: #666;">业务子系统告警发送统计</h5>
<h5 class="lay-row-title">
业务子系统告警发送统计
<span id="businessMore">查看更多</span>
</h5>
<div class="pie-chart pie-chart-custom" id="count_notice_send_business" style="height: 30vh"></div>
</div>
<div>
<h5 class="lay-row-title" style="color: #666;">人员告警发送统计</h5>
<h5 class="lay-row-title">人员告警发送统计
<span id="userMore">查看更多</span>
</h5>
<div class="pie-chart pie-chart-custom" id="count_notice_send_user" style="height: 30vh"></div>
</div>
</div>
... ... @@ -35,9 +41,9 @@
</div>
</div>
<div class="layui-card-body noticeCount-table" id="table_notice_send_year" style="margin-top: 5px">
<h5 class="lay-row-title" style="font-weight: bold;color: #666;">业务子系统年统计</h5>
<h5 class="lay-row-title">业务子系统年统计</h5>
<table lay-filter="table_notice_send_business" id="table_notice_send_business"></table>
<h5 class="lay-row-title" style="font-weight: bold;background-color: #FFF;color: #666;">人员年统计</h5>
<h5 class="lay-row-title" >人员年统计</h5>
<table lay-filter="table_notice_send_user" id="table_notice_send_user" ></table>
</div>
... ... @@ -46,7 +52,15 @@
</div>
</div>
</article>
<style>
.layui-card-body .lay-row-title {
font-size: 14px;
line-height: 2;
padding: 2px 10px;
background: #f6f6f6;
margin: 0px 3px;
}
</style>
<script>
layui.use('noticeCountIndex', function (fn) {
fn();
... ...