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

工作日志默认查询优化 See merge request !468

Merge branch 'master-500-dev-xwx' into 'master-500-dev'
工作日志默认查询优化 See merge request !468
王涛
Commit 8d31c118a8cce0bb2c53e4eaf72098cce0f9dfd3 2 parents 48995eae b924f687
Showing 2 changed files with 2 additions and 2 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/workReportIndex.js
hg-monitor-web-zj/src/main/resources/static/src/views/template/detail/arms.html
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/workReportIndex.js
View file @8d31c11
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/workReportIndex.js
View file @8d31c11
@@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
     //对外暴露的接口
     exports("workReportIndex", function () {
         var accessToken = session.getToken()['access_token']
-        var createTime = 'today'
+        var createTime = ''
         var isRead = ''
         var repType = ''
--- a/hg-monitor-web-zj/src/main/resources/static/src/views/template/detail/arms.html
View file @8d31c11
+++ b/hg-monitor-web-zj/src/main/resources/static/src/views/template/detail/arms.html
View file @8d31c11
@@ -44,7 +44,7 @@
                     </div>
                     <div class="lay-row">
                         <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>
                     </div>