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

性能曲线中自定义时间查询》时间选择框显示不全修改，时间组件增加padding-right,登录日志》部门下拉框宽度增加为230px



See merge request !465

@@ -126,6 +126,10 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
                         },
                         },
                         data: res.data
                         data: res.data
                     })
                     })
+                    if(settingOrgSelect){
+                        //追加样式
+                        $('#settingOrgId').find('.xm-body').eq(0).css("width","230px");
+                    }
                 }
                 }
             })
             })
         }
         }

@@ -128,7 +128,10 @@
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     font-size: 12px;
     font-size: 12px;
-    justify-content: end;
+    justify-content: flex-end;
+}
+.range-padding-right{
+    padding-right: 100px;
 }
 }
 .pie-date-range{
 .pie-date-range{
     flex:1;
     flex:1;

 <el-row class="dataRange-container">
 <el-row class="dataRange-container">
     <el-col :span="24">
     <el-col :span="24">
         <div class="tabs-div date-flex-div-around">
         <div class="tabs-div date-flex-div-around">
-            <el-col :span="24" class="select-div-flex">
+            <el-col :span="24" class="select-div-flex range-padding-right">
                 时间范围：<el-date-picker
                 时间范围：<el-date-picker
                         class="picker-div"
                         class="picker-div"
                         v-model="dateValue"
                         v-model="dateValue"