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

@@ -15,6 +15,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         var writeBackDirctiveList = (data && data.writeBackDirctiveList) ? data.writeBackDirctiveList : [];
         var writeBackDirctiveList = (data && data.writeBackDirctiveList) ? data.writeBackDirctiveList : [];
         var systemType = (data && data.systemType) ? data.systemType : '';
         var systemType = (data && data.systemType) ? data.systemType : '';
         var protocol = (data && data.protocol) ? data.protocol : '';
         var protocol = (data && data.protocol) ? data.protocol : '';
+        var xjType = (data && data.xjType) ? data.xjType : '';
         var accessToken = sessions.getToken()['access_token'];
         var accessToken = sessions.getToken()['access_token'];
         var loginName = localStorage.getItem("lgn");
         var loginName = localStorage.getItem("lgn");
         var restoreVersionTable = {};
         var restoreVersionTable = {};
@@ -107,7 +108,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
             , where: {
             , where: {
                 access_token: accessToken,
                 access_token: accessToken,
                 dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(),
                 dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(),
-                collScope: $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(),
+                collScope: (data && data.protocol) ? data.protocol :  $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(),
                 systemType: systemType,
                 systemType: systemType,
                 syncFlag: $("#dirctiveSearchForm").find("select[name='syncFlag']").val()
                 syncFlag: $("#dirctiveSearchForm").find("select[name='syncFlag']").val()
             }
             }
@@ -417,6 +418,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
             }).done(function (res) {
             }).done(function (res) {
                 xmSelect.render({
                 xmSelect.render({
                     el: '#dir_dirctiveProtocol'
                     el: '#dir_dirctiveProtocol'
+                    ,initValue: protocol.split(',')
                     , filterable: true
                     , filterable: true
                     , tips: '=采集协议='
                     , tips: '=采集协议='
                     , name: 'dirctiveProtocol'
                     , name: 'dirctiveProtocol'
@@ -545,17 +547,29 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         //刷新表格
         //刷新表格
         function reloadTable() {
         function reloadTable() {
             var formData = form.val('dirctive-form');
             var formData = form.val('dirctive-form');
-            dirctiveTable.reload({
-                page: {
-                    curr: 1
-                }
-                ,where: {
+            var wheres={};
+            if(xjType=='xjType'){
+                wheres={
                     access_token: accessToken,
                     access_token: accessToken,
                     dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(),
                     dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(),
                     collScope:  $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(),
                     collScope:  $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(),
+                    systemType: 2,
+                    syncFlag: formData.syncFlag
+                }
+            }else{
+                wheres=   {
+                    access_token: accessToken, dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(),
+                    collScope: $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(),
                     systemType: formData.systemType,
                     systemType: formData.systemType,
                     syncFlag: formData.syncFlag
                     syncFlag: formData.syncFlag
                 }
                 }
+            }
+
+            dirctiveTable.reload({
+                page: {
+                    curr: 1
+                }
+                ,where: wheres
             });
             });
         }
         }
     });
     });

@@ -489,10 +489,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
                 var $that = $(this);
                 var $that = $(this);
                 var $parent = $($that.parents(".proto-tags-box"))
                 var $parent = $($that.parents(".proto-tags-box"))
                 var protocol = $that.data("protocol");
                 var protocol = $that.data("protocol");
+                var resType = $that.data("restype");
                 var params = {
                 var params = {
                     writeBackDirctiveList: $.map($parent.find('.res-tags'), element => $(element).data('dirctiveid')),
                     writeBackDirctiveList: $.map($parent.find('.res-tags'), element => $(element).data('dirctiveid')),
                     systemType: '2',
                     systemType: '2',
-                    protocol: protocol
+                    protocol: protocol,
+                    xjType :'xjType'
                 }
                 }
                 $('[lay-id="/baseconfig/dirctive/index"]').find('.layui-tab-close').trigger('click');
                 $('[lay-id="/baseconfig/dirctive/index"]').find('.layui-tab-close').trigger('click');
                 layer.open({
                 layer.open({

@@ -84,7 +84,7 @@
         </div>
         </div>
         <div class="layui-row" style="padding: 10px 0">
         <div class="layui-row" style="padding: 10px 0">
             <div class="res-tags-box">
             <div class="res-tags-box">
-                <a class="inspection-taskaddres-btn" data-restype="{{resType}}" data-protocol="{{protocol}}" ><i class="layui-icon layui-icon-add-1" ></i>新增资源 </a>
+                <a class="inspection-taskaddres-btn" data-restype="{{resType}}" data-protocol="{{protocol}}" ><i class="layui-icon layui-icon-add-1" ></i>新增资源</a>
                 <div class="div-res-tags">
                 <div class="div-res-tags">
                     {{# layui.each(e,function(j,k){ }}
                     {{# layui.each(e,function(j,k){ }}
                     <label class="res-tags" data-resid="{{k.resId}}">{{k.resName}} <a class="close-icon"><i class="layui-icon layui-icon-close"></i></a></label>
                     <label class="res-tags" data-resid="{{k.resId}}">{{k.resName}} <a class="close-icon"><i class="layui-icon layui-icon-close"></i></a></label>
@@ -94,7 +94,7 @@
         </div>
         </div>
         <div class="layui-row" style="padding: 10px 0">
         <div class="layui-row" style="padding: 10px 0">
             <div class="proto-tags-box">
             <div class="proto-tags-box">
-                <a class="inspection-taskaddprotocol-btn" data-protocol="{{protocol}}"><i class="layui-icon layui-icon-add-1"></i>新增指令 </a>
+                <a class="inspection-taskaddprotocol-btn"   data-protocol="{{protocol}}"><i class="layui-icon layui-icon-add-1"></i>新增指令</a>
                 <div class="div-proto-tags">
                 <div class="div-proto-tags">
                     
                     
                 </div>
                 </div>

@@ -51,6 +51,14 @@ export default {
                 },
                 },
             },
             },
             {
             {
+                text: '最近6小时',
+                value: () => {
+                    const end = new Date();
+                    const start = formatDate(6,'h');
+                    return [start, end]
+                },
+            },
+            {
                 text: '最近1天',
                 text: '最近1天',
                 value: () => {
                 value: () => {
                     const end = new Date();
                     const end = new Date();
@@ -238,7 +246,7 @@ export default {
 
 
         const oneDay=()=>{
         const oneDay=()=>{
             const end = getDateTime(new Date());
             const end = getDateTime(new Date());
-            const start = formatDate(1,'d');
+            const start = formatDate(6,'h');
             dateValue.value=[start,end]
             dateValue.value=[start,end]
             changeDate(dateValue.value)
             changeDate(dateValue.value)
         }
         }

@@ -50,7 +50,7 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
             dataRenderingBase("arms_time_lineChart", resId, "KPI678F9FC3", "响应时间/每分钟", null);
             dataRenderingBase("arms_time_lineChart", resId, "KPI678F9FC3", "响应时间/每分钟", null);
             // Start Wang 2022/2/24 9:29 解决：arms采集结果展示(详情页面开发)
             // Start Wang 2022/2/24 9:29 解决：arms采集结果展示(详情页面开发)
             // 节点详情
             // 节点详情
-            commonDetail.renderTable("arms_node_detail",false,resId,"KPI452C0F78,KPI5769F327,KPI8B2CCCCF,KPI678F9FC3,KPI649E288B,KPI8DC835B1,KPI4D6871EA,KPICC063E40,KPIFC03301B",'节点详情',`detail`,'KPIFC03301B');
+            commonDetail.renderTable("arms_node_detail",false,resId,"KPI452C0F78,KPI5769F327,KPI8B2CCCCF,KPI678F9FC3,KPI649E288B,KPI8DC835B1,KPI4D6871EA,KPICC063E40,KPIFC03301B",'节点详情',`detail`,'KPIFC03301B','desc');
             // End Wang 2022/2/24 9:30
             // End Wang 2022/2/24 9:30
             //活动告警
             //活动告警
             commonDetail.renderActiveAlarms("arms_active_alram", resId);
             commonDetail.renderActiveAlarms("arms_active_alram", resId);