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

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



See merge request !1156

@@ -18,16 +18,6 @@
     <button class="hide" id="btn-task-add-submit" lay-filter="btn-task-add-submit" lay-submit>提交</button>
 </form>
 <div id="div-task-other-info">
-    <form class="layui-form form-edit layui-form-pane">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>指令模板信息 &nbsp;
-                <a class="layui-btn layui-btn-xs layui-btn-normal" id="btn-task-checktemp-add">选择模板</a>
-            </legend>
-        </fieldset>
-        <div id="from-task-add-checktemp-info">
-
-        </div>
-    </form>
     <form class="layui-form form-edit layui-form-pane div_task_collector hide">
         <fieldset class="layui-elem-field layui-field-title">
             <legend>采集器信息</legend>
@@ -41,6 +31,16 @@
             <span class="link" id="link-task-collector-unbind">取消绑定</span>
         </div>
     </form>
+    <form class="layui-form form-edit layui-form-pane">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>指令模板信息 &nbsp;
+                <a class="layui-btn layui-btn-xs layui-btn-normal" id="btn-task-checktemp-add">选择模板</a>
+            </legend>
+        </fieldset>
+        <div id="from-task-add-checktemp-info">
+
+        </div>
+    </form>
 </div>
 <script id="taskLinkStateListTpl" type="text/html">
     {{#  if(d.linkState != null && d.linkState.indexOf('连接失败') != -1){ }}