Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/resources/templates/monitor/operlog/operlog.html

@@ -50,7 +50,8 @@
              <a class="btn btn-danger" onclick="$.operate.clean()" shiro:hasPermission="monitor:operlog:remove">
                   <i class="fa fa-trash"></i> [[#{basis.clear}]]
               </a>
               <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:operlog:export">
               <a style="background-color: #a87242;border-color: #a87242;color: #FFFFFF"
               class="btn" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:operlog:export">
                  <i class="fa fa-download"></i> [[#{basis.export}]]
              </a>
           </div>
@@ -140,7 +141,7 @@
                  align: 'center',
                  formatter: function(value, row, index) {
                      var actions = [];
                      actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.operId + '\')"><i class="fa fa-search"></i>[[#{detailed.detailed}]]</a>');
                      actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.operId + '\')"><i class="fa fa-search"></i>[[#{detailed.detailed}]]</a>');
                      return actions.join('');
                  }
              }]