monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit f717a31adad434af1381fd1f60108fb293fb3b43 2 parents b7cc4cc6 931ed34d

Merge branch 'master-mj-ztq' into 'master-mj' 

feat:任务管理--通过任务名称下探--采集器信息被资源遮挡



See merge request !1156
Inline Side-by-side
Showing 1 changed file with 10 additions and 10 deletions
@@ -18,16 +18,6 @@ @@ -18,16 +18,6 @@
18 <button class="hide" id="btn-task-add-submit" lay-filter="btn-task-add-submit" lay-submit>提交</button> 18 <button class="hide" id="btn-task-add-submit" lay-filter="btn-task-add-submit" lay-submit>提交</button>
19 </form> 19 </form>
20 <div id="div-task-other-info"> 20 <div id="div-task-other-info">
21 - <form class="layui-form form-edit layui-form-pane">  
22 - <fieldset class="layui-elem-field layui-field-title">  
23 - <legend>指令模板信息 &nbsp;  
24 - <a class="layui-btn layui-btn-xs layui-btn-normal" id="btn-task-checktemp-add">选择模板</a>  
25 - </legend>  
26 - </fieldset>  
27 - <div id="from-task-add-checktemp-info">  
28 -  
29 - </div>  
30 - </form>  
31 <form class="layui-form form-edit layui-form-pane div_task_collector hide"> 21 <form class="layui-form form-edit layui-form-pane div_task_collector hide">
32 <fieldset class="layui-elem-field layui-field-title"> 22 <fieldset class="layui-elem-field layui-field-title">
33 <legend>采集器信息</legend> 23 <legend>采集器信息</legend>
@@ -41,6 +31,16 @@ @@ -41,6 +31,16 @@
41 <span class="link" id="link-task-collector-unbind">取消绑定</span> 31 <span class="link" id="link-task-collector-unbind">取消绑定</span>
42 </div> 32 </div>
43 </form> 33 </form>
  34 + <form class="layui-form form-edit layui-form-pane">
  35 + <fieldset class="layui-elem-field layui-field-title">
  36 + <legend>指令模板信息 &nbsp;
  37 + <a class="layui-btn layui-btn-xs layui-btn-normal" id="btn-task-checktemp-add">选择模板</a>
  38 + </legend>
  39 + </fieldset>
  40 + <div id="from-task-add-checktemp-info">
  41 +
  42 + </div>
  43 + </form>
44 </div> 44 </div>
45 <script id="taskLinkStateListTpl" type="text/html"> 45 <script id="taskLinkStateListTpl" type="text/html">
46 {{# if(d.linkState != null && d.linkState.indexOf('连接失败') != -1){ }} 46 {{# if(d.linkState != null && d.linkState.indexOf('连接失败') != -1){ }}