Merge branch 'master-mj-joke' into 'master-mj'

chore:日志视图样式优化

chore:日志视图样式优化

See merge request !1191

@@ -419,7 +419,7 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin',
                     , '<div class="layui-tab-item" id="time"><div class="site-demo-laydate"><div class="layui-inline" id="datetimeRange"></div></div></div>'
                     , '</div>'
                     , '</div>'].join('')
-                , style: 'min-width: 370px; height: auto; padding: 0 15px;margin-left:15px; box-shadow: 1px 1px 30px rgb(0 0 0 / 12%);'
+                , style: 'min-width: 370px; height: auto; padding: 0 15px;margin-left:0px; box-shadow: 1px 1px 30px rgb(0 0 0 / 12%);'
                 , click: function (data, othis) {
                     $(".layui-dropdown").css("display","block");
                 }
@@ -491,7 +491,7 @@ layui.define(['jquery','tree', 'treeTable', 'table', 'form', 'laydate', 'admin',
                     , range: true
                     , btns:['clear', 'confirm']
                     , ready: function (date) {
-                        $('.layui-dropdown').css({'left': 'calc(100% - 620px)'});
+                        // $('.layui-dropdown').css({'left': 'calc(100% - 620px)'});
                     }
                     , done: function (value, date, endDate) {
                         $('#time-select-span').text(value);

@@ -136,18 +136,10 @@
         border-top: dashed 1px grey;
     }
 
-    xm-select > .xm-body{
-        max-width: 240px;
-    }
-    #searchKeyWords{
-        width: 240px!important;
-    }
-
-
 </style>
 <article class="page-container">
     <div class="page-panel">
-        <div class="main commonDiv">
+        <div class="main commonDiv newLog">
             <div class="layui-card">
                 <div class="layui-card-header">
                     <form class="layui-form layui-card-header" lay-filter="form_log_condition" onsubmit="return false;">