Merge branch 'master-500-dev-xwx' into 'master-500-dev'

资源视图监控状态未监控时健康状态不展示



See merge request !482

@@ -1290,6 +1290,17 @@ layui.define(['xmSelect', 'md5'], function (exports) {
                 param = "=" + encodeURIComponent(layHref.split('=')[1]);
             }
             alink.setAttribute("lay-href",layHref.split('=')[0] + param);
+            document.body.appendChild(alink);
+            alink.click();
+            document.body.removeChild(alink);
+        },
+        openMxgraph: function (layHref) {
+            var alink = document.createElement('a');
+            var param = '';
+            if (layHref.indexOf('=') !== -1) {
+                param = "=" + encodeURIComponent(layHref.split('=')[1]);
+            }
+            alink.setAttribute("lay-href",layHref.split('=')[0] + param);
             admin.req({
                 url: obj.domainName + '/api-web/mxgraph/getJtopoInfoById/'+layHref.split('=')[2],
                 success(response) {

@@ -846,7 +846,6 @@
 </script>
 <!--健康状态-->
 <script type="text/html" id="healthTpl">
-    {{# if(d.state != 'new'){ }}
     {{#  if(d.health === '1'){ }}
     <button type="button" class="layui-btn layui-btn-danger layui-bg-red  layui-btn-radius layui-btn-xs p-0-15 cant-click">中
     </button>
@@ -858,7 +857,6 @@
     {{#  if(d.health === '3'){ }}
     <button type="button" class="layui-btn layui-btn-radius layui-bg-green layui-btn-xs p-0-15 cant-click">优</button>
     {{#  } }}
-    {{# } }}
 </script>
 <!--主机状态-->
 <script type="text/html" id="hostStateTpl">