monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 4e31a440cb02ad2ea18056e4744c036363fdede3 2 parents c0260628 3ed7ba70

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

Inline Side-by-side
Showing 5 changed files with 33 additions and 8 deletions
... ... @@ -67,10 +67,10 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','laydate','admin',
, height: 'full-80'
, data: dataArr
, cols: [[
{field: 'dirctiveName', title: '指令名称', align: 'center', width: 230
{field: 'dirctiveName', title: '指令名称', align: 'center', minWidth: 230
,templet:'<div><span data-id="{{d.dirctiveId}}" >{{d.dirctiveName}}</span></div>'}
, {field: 'outputNum', title: '输出指标数量', align: 'center', width: 150}
, {field: 'frequencyType', title: '周期时间类型', align: 'center', minWidth: 80,templet: function (d) {
, {field: 'frequencyType', title: '周期时间类型', align: 'center', width:180,minWidth: 180,templet: function (d) {
var html = '<select name="frequencyType" lay-filter="frequency-type">' +
'<option value="often" >常用周期</option>'+
'<option value="cron">CronTab表达式</option>'+
... ... @@ -83,7 +83,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','laydate','admin',
})
return $dom.prop("outerHTML");
}}
, {field: 'collFrequency', title: '周期', align: 'center', width: 220,templet:function (d) {
, {field: 'collFrequency', title: '周期', align: 'center', width: 180,templet:function (d) {
var selectStr = getTableSelectDom().select;
var inputStr = getTableSelectDom().input;
if(d.frequencyType == 'often'){
... ... @@ -100,7 +100,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','laydate','admin',
return $dom.prop("outerHTML");
}
}}
, {title: '操作', align: 'center', minWidth: 100,templet: '<div><span checkTemplate-data-delete="{{d.dirctiveId}}" class="layui-table-link">删除</span>'}
, {title: '操作', align: 'center', width:100,minWidth: 100,templet: '<div><span checkTemplate-data-delete="{{d.dirctiveId}}" class="layui-table-link">删除</span>'}
]],
done: function (res, curr, count) {
form.render();
... ...
... ... @@ -20,7 +20,8 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
var list = [];
var dataList = [];
var date = '2021';
//lsq 调用获取今年和去年年份 2022-07-04
getYearDate();
getChartData();
// loadAlarmOverChart1(alarmTrendChart,null,'24小时趋势表');
loadResourceTable('resType','overviewResTypeTable');
... ... @@ -435,5 +436,22 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
alink.click();
document.body.removeChild(alink);
}
//lsq 获取今年和去年的年份赋值给按钮 2022-07-04
function getYearDate(){
let myDate=new Date();
let thisYear=getDateTime(myDate);
myDate.setFullYear(myDate.getFullYear()-1);
let lastYear=getDateTime(myDate);
$('#thisYear').attr('data-years',thisYear);
$('#lastYear').attr('data-years',lastYear);
date=thisYear;
}
//获取时间点 转年月日的方法
function getDateTime(newDate){
let year=newDate.getFullYear();//获取年
return year;
}
});
});
\ No newline at end of file
... ...
... ... @@ -8033,3 +8033,10 @@ form[lay-filter="activewarning-form"] .layui-inline {
text-decoration: underline;
}
/*end lsq 2022-06-28*/
/*lsq 指令模板编辑指令时的指令名称样式 2022-07-04*/
.table-edit.table-edit-textoverflow td[data-field="dirctiveName"] .layui-table-cell{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
\ No newline at end of file
... ...
... ... @@ -69,8 +69,8 @@
<li>业务系统</li>
<li>业务域</li>
<div class="layui-btn-group time-group" id="overview_time" style="margin-left: 60%">
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-years="2020">去年</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm active" data-years="2021">今年</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="lastYear" data-years="2020">去年</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm active" id="thisYear" data-years="2021">今年</button>
</div>
<button class="layui-btn layui-btn-sm layui-btn-normal tab-button" id="btn_overview_export_excel">
<i class="layui-icon">&#xe60a;</i>导出到Excel
... ...
... ... @@ -36,7 +36,7 @@
<a class="layui-btn layui-btn-xs layui-btn-normal" id="checkTemplateChooseKpi"><i class="layui-icon">&#xe624;</i></a>
</legend>
</fieldset>
<div class="layui-form-item table-edit">
<div class="layui-form-item table-edit table-edit-textoverflow">
<table id="checkTemplate_add_table"></table>
</div>
</form>
... ...