Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing

@@ -68,7 +68,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
           //   }
           //   }
           // },
           // },
           {
           {
-            field: 'childrenNum',title: '压制数量', align: 'center',width:'8%',
+            field: 'childrenNum',title: '压缩条数', align: 'center',width:'8%',
             templet:
             templet:
                 '<div>' +
                 '<div>' +
                 '  <span data-id="{{d.batchNo}}" class="layui-table-link btn-childrenNum-show">{{d.childrenNum}}</span>' +
                 '  <span data-id="{{d.batchNo}}" class="layui-table-link btn-childrenNum-show">{{d.childrenNum}}</span>' +

@@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
     //对外暴露的接口
     //对外暴露的接口
     exports("workReportIndex", function () {
     exports("workReportIndex", function () {
         var accessToken = session.getToken()['access_token']
         var accessToken = session.getToken()['access_token']
-        var createTime = 'today'
+        var createTime = ''
         var isRead = ''
         var isRead = ''
         var repType = ''
         var repType = ''
 
 

@@ -472,9 +472,13 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
             admin.req({
             admin.req({
                 url: common.domainName + "/api-web/datavis/getResTotal/?busId=" + bizId
                 url: common.domainName + "/api-web/datavis/getResTotal/?busId=" + bizId
                 , done: function (res) {
                 , done: function (res) {
-                    laytpl($('#bizindexTpl').html()).render({list: res.data}, function (html) {
-                        bizindexTable.html(html);
-                    });
+                    if (res.data!=null){
+                        laytpl($('#bizindexTpl').html()).render({list: res.data}, function (html) {
+                            bizindexTable.html(html);
+                        });
+                    }else {
+                        layer.msg('该业务暂无绑定资源!', {icon: 2,time:3000});
+                    }
                 }
                 }
             });
             });
         }
         }

@@ -44,7 +44,7 @@
                     </div>
                     </div>
                     <div class="lay-row">
                     <div class="lay-row">
                         <div class="lay-row-item">
                         <div class="lay-row-item">
-                            <h5 class="lay-row-title">节点详情</h5>
+                            <h5 class="lay-row-title">节点详情<span id="arms_node_detailDownload" class="layui-table-link"  style="margin-left: 10px;">下载</span><span id="arms_node_detailMore" class="layui-table-link">更多</span></h5>
                             <div id="arms_node_detail"></div>
                             <div id="arms_node_detail"></div>
                         </div>
                         </div>
                     </div>
                     </div>