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

@@ -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();

@@ -253,33 +253,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                 // 发送状态 1已发送，2未发送
                 noticeTimely.sendState = 2;//statusChange(document.querySelector("#switch_noticeTimely_sendState").checked ? 0 : 1);
                 noticeTimely.noticeNames = userNames;
-                var noticeStateList = [];
-                //获取消息状态列表
-                $.each($('#editNoticeTimely_add_table').find('tbody tr'), function (i, v) {
-                    var noticeState = {};
-                    noticeState.noticeName = $(this).find('input[name="noticeName"]').val();
-                    noticeState.sendTime = $(this).find('input[name="sendTime"]').val();
-                    noticeState.sendContent = $(this).find('input[name="sendContent"]').val();
-                    noticeState.noticeState = $(this).find('select[name="noticeState"]').val();
-                    noticeStateList.push(noticeState);
-                });
-                noticeTimely.noticeStateList = noticeStateList;
+                // var noticeStateList = [];
+                // //获取消息状态列表
+                // $.each($('#editNoticeTimely_add_table').find('tbody tr'), function (i, v) {
+                //     var noticeState = {};
+                //     noticeState.noticeName = $(this).find('input[name="noticeName"]').val();
+                //     noticeState.sendTime = $(this).find('input[name="sendTime"]').val();
+                //     noticeState.sendContent = $(this).find('input[name="sendContent"]').val();
+                //     noticeState.noticeState = $(this).find('select[name="noticeState"]').val();
+                //     noticeStateList.push(noticeState);
+                // });
+                // noticeTimely.noticeStateList = noticeStateList;
                 if (!noticeTimely.noticeNames) {
                     layer.msg('请选择用户', {icon: 7, time: 3000});
                     return false;
                 }
-                if (!noticeTimely.templates) {
-                    layer.msg('请配置自定义展示中的展示内容', {icon: 7, time: 3000});
-                    return false;
-                }
+
                 noticeTimely.site = $('#notice_timely_select').val() + $('#notice_timely_site').val();
                 //获取配置参数
                 var map = getParam();
                 if(!map){
-                    return ;
+                    return false;
+                }
+                if(map.msgSetting && map.msgSetting != '' && map.msgSetting != null){
+                    noticeTimely.msgSetting = JSON.stringify(map.msgSetting);
                 }
-                noticeTimely.msgSetting = JSON.stringify(map.msgSetting);
                 noticeTimely.templates = map.templates;
+                if (!noticeTimely.templates || map.msgSetting == '' || map.msgSetting == null) {
+                    layer.msg('请配置自定义展示中的展示内容', {icon: 7, time: 3000});
+                    return false;
+                }
                 layer.load(2);
                 admin.req({
                     url: domainName + '/api-web/noticeTimely/save?access_token=' + accessToken,
@@ -449,8 +452,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
             $('#details_tags').append(details_tags);
             $('#details_tags span').on('click',function (){
                 $('[name="templates"]').val($('[name="templates"]').val() + '#{'+$(this).text() + '}');
-                noticeTimely.templates += '#{'+$(this).text() + '}';
-
             });
         }
 
@@ -459,8 +460,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
 
             //获取模板和等级
             var obj = {
-                msgSetting: null,
-                templates: null
+                msgSetting: '',
+                templates: ''
             };
 
             var errMsg = '';

@@ -186,46 +186,41 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                 cols: [[{
                     type: 'checkbox'
                 }, {
-                    field: 'name', title: '名称', align: 'center', width: '250',
+                    field: 'name', title: '名称', align: 'center', width: '15%',
                     templet:
                         '<div>' +
                         '   <span data-id="{{d.id}}" class="link link-noticeTimely-edit">{{d.name}}</span>' +
                         '</div>'
                 }, {
-                    field: 'details', title: '内容', align: 'left', minWidth: '650',
+                    field: 'details', title: '内容', align: 'left', width: '25%',
                     templet: function (d) {
                         // return '<input type="text" class="layui-input"  style= "background-color:transparent;border:0;padding-bottom: 10px" readonly="readonly" name="details" value="' + d.details + '">'
                         return '<code>' + d.details + '</code>'
                     }
                 }, {
-                    field: 'frequency', title: '频率', align: 'center', width: '130'
+                    field: 'frequency', title: '频率', align: 'center', minWidth: '130'
                 }, {
                     field: 'noticeNicknames', title: '用户', align: 'center', minWidth: '180'
                 }, {
-                    field: 'state', title: '是否启用', align: 'center', width: '100',
+                    field: 'lastSendTime', title: '最后发送时间', align: 'center', minWidth: '170',templet: function (d) {
+                        if(d.noticeStateNew && d.noticeStateNew.sendTime){
+                            return d.noticeStateNew.sendTime;
+                        }
+                        return '';
+                    }
+                },{
+                    field: 'state', title: '是否启用', align: 'center', minWidth: '100',
                     templet: function (d) {
                         var checked = d.state == 2 ? 'checked' : '';
                         return '<div><input type="checkbox" data-id="' + d.id + '" lay-filter="switch_noticeTimely_checkbox_state" name="state" lay-skin="switch" lay-text="启用|禁用" ' + checked + ' ></div>'
                     }
-                }, /*{
-                    field: 'broadcast', title: '是否广播', align: 'center', width: '100',
-                    templet: function (d) {
-                        var checked = d.broadcast == 1 ? 'checked' : '';
-                        return '<div><input type="checkbox" data-id="' + d.id + '" lay-filter="switch_noticeTimely_checkbox_broadcast" name="broadcast" lay-skin="switch" lay-text="是|否" ' + checked + ' ></div>'
-                    }
                 }, {
-                    field: 'retry', title: '是否轮循', align: 'center', width: '100',
-                    templet: function (d) {
-                        var checked = d.retry == 1 ? 'checked' : '';
-                        return '<div><input type="checkbox" data-id="' + d.id + '" lay-filter="switch_noticeTimely_checkbox_retry" name="retry" lay-skin="switch" lay-text="重发|不重发" ' + checked + ' ></div>'
-                    }
-                }, */{
-                    title: '操作', align: 'center', minWidth: '150', fixed: 'right',
-                    templet:
-                        '<div>' +
-                        '   <button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-noticeTimely-delete" lay-tips="删除"><i class="layui-icon">&#xe640;</i></button>' +
-                        '   <button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-noticeTimely-history" lay-tips="历史记录"><i class="layui-icon">&#xe705;</i></button>' +
-                        '</div>'
+                title: '操作', align: 'center', minWidth: '120', fixed: 'right',
+                templet:
+                    '<div>' +
+                    '   <button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-noticeTimely-delete" lay-tips="删除"><i class="layui-icon">&#xe640;</i></button>' +
+                    '   <button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-noticeTimely-history" lay-tips="历史记录"><i class="layui-icon">&#xe705;</i></button>' +
+                    '</div>'
                 }]],
                 done: function (res) {
                     // 点击名称编辑事件

@@ -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

@@ -27,10 +27,10 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin'], function
             }
         });
 
-        // //按钮搜索
-        // $('#heartbeatQueryBtn').unbind().on('click',function (e) {
-        //     reloadTable();
-        // })
+        //按钮搜索
+        $('#heartbeatQueryBtn').unbind().on('click',function (e) {
+            reloadTable();
+        })
 
 
         // 渲染表格
@@ -63,10 +63,12 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin'], function
                 }, {
                     field: 'currTime', title: '最近心跳时间', align: 'center',sort: true,
                     templet: function (d) {
+                        var durationVal = $('[name="durationVal"]').val();
+                        if(!durationVal || durationVal == '' || durationVal == null){
+                            durationVal = 10;
+                        }
                         var beatTime = new Date(d.currTime);
-                        var time = new Date();
-                        time.setMinutes(time.getMinutes() - 10);
-                        if (time > beatTime) {
+                        if (d.between > parseInt(durationVal)) {
                             return `<div class="red">${beatTime.format("yyyy-MM-dd HH:mm:ss")}</div>`
                         } else {
                             return `<div>${beatTime.format("yyyy-MM-dd HH:mm:ss")}</div>`
@@ -85,7 +87,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin'], function
             heartbeatTable.reload({
                 where: {
                     access_token: accessToken,
-                    keyword: $('#condition-heartbeat-name').val(),
+                    keyword: $('#condition-heartbeat-name').val()
                 },
                 page: {
                     curr: 1
@@ -93,4 +95,4 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin'], function
             });
         }
     });
-});
\ No newline at end of file
+});

@@ -8032,4 +8032,11 @@ form[lay-filter="activewarning-form"] .layui-inline {
     cursor: pointer;
     text-decoration: underline;
 }
-/*end lsq 2022-06-28*/
\ No newline at end of file
+/*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>

@@ -13,8 +13,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <button id="noticeTimelyQueryBtn" type="button" class="layui-btn layui-btn-normal" ><i
-                                            class="layui-icon layui-icon-search"></i>查询
+                                    <button id="noticeTimelyQueryBtn" type="button" class="layui-btn layui-btn-normal" >查询
                                     </button>
                                 </div>
                             </div>

@@ -14,11 +14,16 @@
                            placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input">
                   </div>
                 </div>
-<!--                <div class="layui-inline">-->
-<!--                  <button id="heartbeatQueryBtn" type="button" class="layui-btn layui-btn-normal" ><i-->
-<!--                          class="layui-icon layui-icon-search"></i>查询-->
-<!--                  </button>-->
-<!--                </div>-->
+                <div class="layui-inline">
+                  <div class="layui-input-inline">
+                    <input type="number" name="durationVal"
+                           lay-tips="最近心跳时间（单位：分钟）" placeholder="最近心跳时间" value="10" class="layui-input">
+                    <!--                      <span>分钟</span>-->
+                  </div>
+                </div>
+                <div class="layui-inline">
+                  <button id="heartbeatQueryBtn" type="button" class="layui-btn layui-btn-normal">查询</button>
+                </div>
               </div>
             </form>
           </div>
@@ -45,4 +50,4 @@
   layui.use('selfmonitor', function (fn) {
     fn();
   });
-</script>
\ No newline at end of file
+</script>