初始化

ema-admin/src/main/java/com/ema/admin/modules/system/controller/SysRoleController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -57,13 +58,14 @@ public class SysRoleController {
     /**
      * 根据主键删除系统角色信息表。
      *
-     * @param id 主键
+     * @param ids 主键
      * @return {@code true} 删除成功，{@code false} 删除失败
      */
-    @DeleteMapping("remove/{id}")
+    @DeleteMapping("remove/{ids}")
     @ApiOperation("根据主键系统角色信息表")
-    public boolean remove(@PathVariable @ApiParam("系统角色信息表主键") String id) {
-        return sysRoleService.removeById(id);
+    public boolean remove(@PathVariable @ApiParam("系统角色信息表主键") String ids) {
+        List<String> idList = Arrays.asList(ids.split(","));
+        return sysRoleService.removeByIds(idList);
     }
 
     /**

ema-admin/src/main/java/com/ema/admin/modules/system/controller/SysUserController.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -62,13 +63,14 @@ public class SysUserController {
     /**
      * 根据主键删除系统用户信息表。
      *
-     * @param id 主键
+     * @param ids 主键
      * @return {@code true} 删除成功，{@code false} 删除失败
      */
-    @DeleteMapping("remove/{id}")
-    @ApiOperation("根据主键系统用户信息表")
-    public boolean remove(@PathVariable @ApiParam("系统用户信息表主键") String id) {
-        return sysUserService.removeById(id);
+    @DeleteMapping("remove/{ids}")
+    @ApiOperation("根据主键系统用户信息表(多个可用,分隔)")
+    public boolean remove(@PathVariable @ApiParam("系统用户信息表主键") String ids) {
+        List<String> idList = Arrays.asList(ids.split(","));
+        return sysUserService.removeByIds(idList);
     }
 
     /**

ema-admin/src/main/java/com/ema/admin/modules/system/service/impl/SysOperLogServiceImpl.java

@@ -33,7 +33,6 @@ public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOper
         queryWrapper.orderBy(SysOperLog::getOperTime, false);
         Page<SysOperLog> page = this.page(new Page<>(queryVo.getPageNumber(), queryVo.getPageSize()), queryWrapper);
         page.getRecords().forEach(operLog -> {
-            operLog.setUserName(operLog.getUserName());
             operLog.setType(LogTypeEnum.getDescribe(operLog.getType()));
         });
         return page;

ema-admin/src/main/resources/web/js/main.js

@@ -182,7 +182,7 @@ layui.use(['element', 'layer'], function () {
     $('#updatePwd').click(function () {
         Common.open({
             title: '修改密码',
-            area: ['450px', '300px'],
+            area: ['50%', '80%'],
             content: 'user/update_pwd.html'
         });
     });

ema-admin/src/main/resources/web/pages/assets/asset_status_history_form.html

@@ -39,28 +39,28 @@
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="required">*</span>使用公司</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="useCompany" lay-verify="required" placeholder="请输入使用公司" class="layui-input" style="width: 300px;">
+                    <input type="text" name="useCompany" lay-verify="required" placeholder="请输入使用公司" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="required">*</span>使用部门</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="useDept" lay-verify="required" placeholder="请输入使用部门" class="layui-input" style="width: 300px;">
+                    <input type="text" name="useDept" lay-verify="required" placeholder="请输入使用部门" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="required">*</span>使用人</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="useUser" lay-verify="required" placeholder="请输入使用人" class="layui-input" style="width: 300px;">
+                    <input type="text" name="useUser" lay-verify="required" placeholder="请输入使用人" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="required">*</span>使用状态</label>
                 <div class="layui-input-inline">
-                    <select name="useStatus" lay-verify="required" class="layui-select" style="width: 300px;">
+                    <select name="useStatus" lay-verify="required" class="layui-select">
                         <option value="">请选择使用状态</option>
                         <option value="在库">在库</option>
                         <option value="正常使用">正常使用</option>
@@ -73,7 +73,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">当前位置</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="curLocation" placeholder="请输入当前位置" class="layui-input" style="width: 300px;">
+                    <input type="text" name="curLocation" placeholder="请输入当前位置" class="layui-input">
                 </div>
             </div>
         </div>
@@ -84,14 +84,14 @@
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="required">*</span>生效开始</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="startDate" id="startDate" lay-verify="required"  placeholder="yyyy-MM-dd" class="layui-input" style="width: 300px;">
+                    <input type="text" name="startDate" id="startDate" lay-verify="required"  placeholder="yyyy-MM-dd" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="required">*</span>生效结束</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="endDate" id="endDate" lay-verify="required" placeholder="yyyy-MM-dd" class="layui-input" style="width: 300px;">
+                    <input type="text" name="endDate" id="endDate" lay-verify="required" placeholder="yyyy-MM-dd" class="layui-input">
                 </div>
             </div>
         </div>
@@ -102,14 +102,14 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">操作人</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="operatorName" placeholder="请输入操作人" class="layui-input" style="width: 300px;">
+                    <input type="text" name="operatorName" placeholder="请输入操作人" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label">协管员</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="assistantName" placeholder="请输入协管员" class="layui-input" style="width: 300px;">
+                    <input type="text" name="assistantName" placeholder="请输入协管员" class="layui-input">
                 </div>
             </div>
         </div>
@@ -120,7 +120,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">备注</label>
                 <div class="layui-input-block">
-                    <textarea name="remark" placeholder="请输入备注" class="layui-textarea" style="width: 350px; height: 80px;"></textarea>
+                    <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
                 </div>
             </div>
         </div>

ema-admin/src/main/resources/web/pages/assets/assets_form.html

@@ -38,34 +38,34 @@
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="required">*</span>管理部门</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="deptName" lay-verify="required" placeholder="请输入资产管理部门" class="layui-input" style="width: 300px;">
+                    <input type="text" name="deptName" lay-verify="required" placeholder="请输入资产管理部门" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="required">*</span>资产编码</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="assetCode" lay-verify="required" placeholder="请输入资产编码" class="layui-input" style="width: 300px;">
+                    <input type="text" name="assetCode" lay-verify="required" placeholder="请输入资产编码" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="required">*</span>资产类型</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="assetType" lay-verify="required" placeholder="请输入资产类型" class="layui-input" style="width: 300px;">
+                    <input type="text" name="assetType" lay-verify="required" placeholder="请输入资产类型" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">品牌</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="brand" placeholder="请输入品牌" class="layui-input" style="width: 300px;">
+                    <input type="text" name="brand" placeholder="请输入品牌" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label">型号</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="model" placeholder="请输入型号" class="layui-input" style="width: 300px;">
+                    <input type="text" name="model" placeholder="请输入型号" class="layui-input">
                 </div>
             </div>
         </div>
@@ -76,14 +76,14 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">购买日期</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="purchaseDate" id="purchaseDate" placeholder="请选择购买日期" class="layui-input" style="width: 300px;">
+                    <input type="text" name="purchaseDate" id="purchaseDate" placeholder="请选择购买日期" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label">采购价值</label>
                 <div class="layui-input-inline">
-                    <input type="number" name="purchaseValue" placeholder="请输入采购价值" class="layui-input" style="width: 300px;">
+                    <input type="number" name="purchaseValue" placeholder="请输入采购价值" class="layui-input">
                 </div>
             </div>
         </div>
@@ -94,7 +94,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">盘点状态</label>
                 <div class="layui-input-inline">
-                    <select name="invstkStatus" class="layui-select" style="width: 300px;">
+                    <select name="invstkStatus" class="layui-select">
                         <option value="0">未盘点</option>
                         <option value="1">已盘点</option>
                     </select>
@@ -104,7 +104,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">最后盘点时间</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="lastInvstkTime" id="lastInvstkTime" placeholder="请选择最后盘点时间" class="layui-input" style="width: 300px;">
+                    <input type="text" name="lastInvstkTime" id="lastInvstkTime" placeholder="请选择最后盘点时间" class="layui-input">
                 </div>
             </div>
         </div>
@@ -115,7 +115,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">备注</label>
                 <div class="layui-input-block">
-                    <textarea name="remark" placeholder="请输入备注" class="layui-textarea" style="width: 400px; height: 80px;"></textarea>
+                    <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
                 </div>
             </div>
         </div>
@@ -126,28 +126,28 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">扩展字段1</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="attribute1" placeholder="请输入扩展字段1" class="layui-input" style="width: 300px;">
+                    <input type="text" name="attribute1" placeholder="请输入扩展字段1" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label">扩展字段2</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="attribute2" placeholder="请输入扩展字段2" class="layui-input" style="width: 300px;">
+                    <input type="text" name="attribute2" placeholder="请输入扩展字段2" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label">扩展字段3</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="attribute3" placeholder="请输入扩展字段3" class="layui-input" style="width: 300px;">
+                    <input type="text" name="attribute3" placeholder="请输入扩展字段3" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label">扩展字段4</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="attribute4" placeholder="请输入扩展字段4" class="layui-input" style="width: 300px;">
+                    <input type="text" name="attribute4" placeholder="请输入扩展字段4" class="layui-input">
                 </div>
             </div>
         </div>

ema-admin/src/main/resources/web/pages/assets/assets_list.html

@@ -590,7 +590,7 @@
             $('#btnAddAsset').click(function() {
                 Common.open({
                     title: '添加资产',
-                    area: ['650px', '600px'],
+                    area: ['50%', '80%'],
                     content: 'assets_form.html'
                 });
             });
@@ -603,7 +603,7 @@
                 }
                 Common.open({
                     title: '编辑资产',
-                    area: ['650px', '600px'],
+                    area: ['50%', '80%'],
                     content: 'assets_form.html?id=' + currentAsset.id
                 });
             });
@@ -634,7 +634,7 @@
                 }
                 Common.open({
                     title: '添加状态历史',
-                    area: ['650px', '550px'],
+                    area: ['50%', '80%'],
                     content: 'asset_status_history_form.html?assetId=' + currentAsset.id
                 });
             }
@@ -651,7 +651,7 @@
                 if (event === 'edit') {
                     Common.open({
                         title: '编辑资产',
-                        area: ['650px', '600px'],
+                        area: ['50%', '80%'],
                         content: 'assets_form.html?id=' + data.id
                     });
                 } else if (event === 'del') {
@@ -678,7 +678,7 @@
                 if (event === 'edit') {
                     Common.open({
                         title: '编辑状态历史',
-                        area: ['650px', '550px'],
+                        area: ['50%', '80%'],
                         content: 'asset_status_history_form.html?assetId=' + currentAsset.id + '&id=' + data.id
                     });
                 } else if (event === 'del') {

ema-admin/src/main/resources/web/pages/department/department_form.html

@@ -17,14 +17,14 @@
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>部门名称</label>
             <div class="layui-input-block">
-                <input type="text" name="deptName" lay-verify="required" placeholder="请输入部门名称" class="layui-input" style="width: 300px;">
+                <input type="text" name="deptName" lay-verify="required" placeholder="请输入部门名称" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label">上级部门</label>
-            <div class="layui-input-block">
-                <select name="parentId" id="parentSelect" class="layui-select" style="width: 300px;">
+            <div class="layui-input-block" style="width: 300px;">
+                <select name="parentId" id="parentSelect" class="layui-select">
                     <option value="0">顶级部门</option>
                 </select>
             </div>
@@ -33,14 +33,14 @@
         <div class="layui-form-item">
             <label class="layui-form-label">部门编码</label>
             <div class="layui-input-block">
-                <input type="text" name="deptCode" placeholder="请输入部门编码" class="layui-input" style="width: 200px;">
+                <input type="text" name="deptCode" placeholder="请输入部门编码" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label">排序</label>
             <div class="layui-input-block">
-                <input type="number" name="sort" value="0" class="layui-input" style="width: 150px;">
+                <input type="number" name="sort" value="0" class="layui-input">
             </div>
         </div>
         

ema-admin/src/main/resources/web/pages/department/department_list.html

@@ -501,7 +501,7 @@
             var url = parentId === 0 ? 'department_form.html?id=' : 'department_form.html?parentId=' + parentId;
             Common.open({
                 title: parentId === 0 ? '添加顶级部门' : '添加下级部门',
-                area: ['550px', '450px'],
+                area: ['50%', '80%'],
                 content: url,
                 end: function() {
                     loadDeptTree();
@@ -513,7 +513,7 @@
         function editDept(id) {
             Common.open({
                 title: '编辑部门',
-                area: ['550px', '450px'],
+                area: ['50%', '80%'],
                 content: 'department_form.html?id=' + id,
                 end: function() {
                     loadDeptTree();

ema-admin/src/main/resources/web/pages/dict/dict_data_form.html

@@ -17,20 +17,20 @@
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>数据编码</label>
             <div class="layui-input-block">
-                <input type="text" name="code" lay-verify="required" placeholder="请输入数据编码" class="layui-input" style="width: 250px;">
+                <input type="text" name="code" lay-verify="required" placeholder="请输入数据编码" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>数据值</label>
             <div class="layui-input-block">
-                <textarea name="value" lay-verify="required" placeholder="请输入数据值" class="layui-textarea" style="width: 300px; height: 80px;"></textarea>
+                <textarea name="value" lay-verify="required" placeholder="请输入数据值" class="layui-textarea"></textarea>
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label">排序</label>
             <div class="layui-input-block">
-                <input type="number" name="sort" value="0" class="layui-input" style="width: 150px;">
+                <input type="number" name="sort" value="0" class="layui-input">
             </div>
         </div>
         
@@ -45,7 +45,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">备注</label>
             <div class="layui-input-block">
-                <textarea name="remark" placeholder="请输入备注" class="layui-textarea" style="width: 300px; height: 80px;"></textarea>
+                <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
             </div>
         </div>
         

ema-admin/src/main/resources/web/pages/dict/dict_type_form.html

@@ -17,28 +17,28 @@
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>字典名称</label>
             <div class="layui-input-block">
-                <input type="text" name="name" lay-verify="required" placeholder="请输入字典名称" class="layui-input" style="width: 250px;">
+                <input type="text" name="name" lay-verify="required" placeholder="请输入字典名称" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>字典类型</label>
             <div class="layui-input-block">
-                <input type="text" name="code" lay-verify="required" placeholder="请输入字典类型编码" class="layui-input" style="width: 250px;">
+                <input type="text" name="code" lay-verify="required" placeholder="请输入字典类型编码" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label">排序</label>
             <div class="layui-input-block">
-                <input type="number" name="sort" value="0" class="layui-input" style="width: 150px;">
+                <input type="number" name="sort" value="0" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label">备注</label>
             <div class="layui-input-block">
-                <textarea name="remark" placeholder="请输入备注" class="layui-textarea" style="width: 300px; height: 80px;"></textarea>
+                <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
             </div>
         </div>
         

ema-admin/src/main/resources/web/pages/dict/dict_type_list.html

@@ -464,7 +464,7 @@
             $('#btnAddType').click(function() {
                 Common.open({
                     title: '添加字典类型',
-                    area: ['500px', '380px'],
+                    area: ['50%', '80%'],
                     content: 'dict_type_form.html?id='
                 });
             });
@@ -477,7 +477,7 @@
                 }
                 Common.open({
                     title: '添加字典数据',
-                    area: ['500px', '400px'],
+                    area: ['50%', '80%'],
                     content: 'dict_data_form.html?typeCode=' + currentType.code
                 });
             });
@@ -490,7 +490,7 @@
                 }
                 Common.open({
                     title: '编辑字典类型',
-                    area: ['500px', '380px'],
+                    area: ['50%', '80%'],
                     content: 'dict_type_form.html?id=' + currentType.id
                 });
             });
@@ -519,7 +519,7 @@
                 if (event === 'edit') {
                     Common.open({
                         title: '编辑字典数据',
-                        area: ['500px', '400px'],
+                        area: ['50%', '80%'],
                         content: 'dict_data_form.html?typeCode=' + currentType.code + '&id=' + data.id
                     });
                 } else if (event === 'del') {

ema-admin/src/main/resources/web/pages/file/file_list.html

@@ -29,7 +29,7 @@
     
     <div class="layui-form" style="margin-bottom: 15px;">
         <div class="layui-inline">
-            <input type="text" name="keyword" placeholder="搜索文件名" class="layui-input" style="width: 200px;">
+            <input type="text" name="keyword" placeholder="搜索文件名" class="layui-input">
         </div>
         <button type="button" class="layui-btn" id="btnSearch"><i class="layui-icon layui-icon-search"></i></button>
     </div>

ema-admin/src/main/resources/web/pages/job/job_form.html

@@ -18,28 +18,28 @@
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>任务名称</label>
             <div class="layui-input-block">
-                <input type="text" name="jobName" lay-verify="required" placeholder="请输入任务名称" class="layui-input" style="width: 300px;">
+                <input type="text" name="jobName" lay-verify="required" placeholder="请输入任务名称" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label">任务分组</label>
             <div class="layui-input-block">
-                <input type="text" name="jobGroup" placeholder="请输入任务分组" class="layui-input" style="width: 200px;">
+                <input type="text" name="jobGroup" placeholder="请输入任务分组" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>执行类</label>
             <div class="layui-input-block">
-                <input type="text" name="actionClass" lay-verify="required" placeholder="如: com.example.job.TestJob" class="layui-input" style="width: 350px;">
+                <input type="text" name="actionClass" lay-verify="required" placeholder="如: com.example.job.TestJob" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>CRON表达式</label>
             <div class="layui-input-block">
-                <input type="text" name="cron" lay-verify="required" placeholder="如: 0/5 * * * * ?" class="layui-input" style="width: 200px;">
+                <input type="text" name="cron" lay-verify="required" placeholder="如: 0/5 * * * * ?" class="layui-input">
                 <div class="cron-hint">
                     格式: 秒 分 时 日 月 周 [年]<br>
                     示例: 0/5 * * * * ? (每5秒执行一次)<br>
@@ -59,7 +59,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">备注</label>
             <div class="layui-input-block">
-                <textarea name="remark" placeholder="请输入备注" class="layui-textarea" style="width: 350px; height: 80px;"></textarea>
+                <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
             </div>
         </div>
         

ema-admin/src/main/resources/web/pages/job/job_list.html

@@ -97,7 +97,7 @@
             $('#btnAdd').click(function() {
                 Common.open({
                     title: '添加定时任务',
-                    area: ['600px', '480px'],
+                    area: ['50%', '80%'],
                     content: 'job_form.html?id='
                 });
             });
@@ -125,7 +125,7 @@
                 } else if (event === 'edit') {
                     Common.open({
                         title: '编辑定时任务',
-                        area: ['600px', '480px'],
+                        area: ['50%', '80%'],
                         content: 'job_form.html?id=' + data.id
                     });
                 } else if (event === 'del') {

ema-admin/src/main/resources/web/pages/log/log_list.html

@@ -105,7 +105,7 @@
                 if (event === 'detail') {
                     Common.open({
                         title: '日志详情',
-                        area: ['700px', '500px'],
+                        area: ['50%', '80%'],
                         content: 'log_detail.html?id=' + data.id
                     });
                 }

ema-admin/src/main/resources/web/pages/menu/menu_form.html

@@ -30,14 +30,14 @@
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>菜单名称</label>
             <div class="layui-input-block">
-                <input type="text" name="menuName" lay-verify="required" placeholder="请输入菜单名称" class="layui-input" style="width: 300px;">
+                <input type="text" name="menuName" lay-verify="required" placeholder="请输入菜单名称" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>上级菜单</label>
             <div class="layui-input-block">
-                <select name="parentId" id="parentSelect" class="layui-select" style="width: 300px;">
+                <select name="parentId" id="parentSelect" class="layui-select">
                     <option value="0">顶级菜单</option>
                 </select>
             </div>
@@ -46,28 +46,28 @@
         <div class="layui-form-item">
             <label class="layui-form-label">路由地址</label>
             <div class="layui-input-block">
-                <input type="text" name="path" placeholder="如: user/user_list.html" class="layui-input" style="width: 300px;">
+                <input type="text" name="path" placeholder="如: user/user_list.html" class="layui-input">
             </div>
         </div>
         
 <!--        <div class="layui-form-item">
             <label class="layui-form-label">组件路径</label>
             <div class="layui-input-block">
-                <input type="text" name="component" placeholder="" class="layui-input" style="width: 300px;">
+                <input type="text" name="component" placeholder="" class="layui-input">
             </div>
         </div>-->
         
         <div class="layui-form-item">
             <label class="layui-form-label">权限标识</label>
             <div class="layui-input-block">
-                <input type="text" name="perms" placeholder="如: system:user:list" class="layui-input" style="width: 300px;">
+                <input type="text" name="perms" placeholder="如: system:user:list" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label">菜单图标</label>
             <div class="layui-input-block">
-                <input type="text" name="icon" id="iconInput" placeholder="选择图标" class="layui-input" style="width: 200px;" readonly>
+                <input type="text" name="icon" id="iconInput" placeholder="选择图标" class="layui-input" readonly>
                 <button type="button" class="layui-btn layui-btn-primary" id="selectIcon">选择</button>
                 <i class="layui-icon" id="iconPreview" style="margin-left: 10px; font-size: 24px;"></i>
             </div>
@@ -76,7 +76,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">排序</label>
             <div class="layui-input-block">
-                <input type="number" name="sort" value="0" class="layui-input" style="width: 150px;">
+                <input type="number" name="sort" value="0" class="layui-input">
             </div>
         </div>
         
@@ -91,7 +91,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">备注</label>
             <div class="layui-input-block">
-                <textarea name="remark" placeholder="请输入备注" class="layui-textarea" style="width: 350px; height: 80px;"></textarea>
+                <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
             </div>
         </div>
         

ema-admin/src/main/resources/web/pages/menu/menu_list.html

@@ -46,7 +46,7 @@
         }
         
         .search-box input {
-            width: 100%;
+            width: 92%;
             padding: 8px 12px;
             border: 1px solid #dcdfe6;
             border-radius: 4px;
@@ -546,7 +546,7 @@
             var url = parentId === 0 ? 'menu_form.html?id=' : 'menu_form.html?parentId=' + parentId;
             Common.open({
                 title: parentId === 0 ? '添加顶级菜单' : '添加下级菜单',
-                area: ['600px', '550px'],
+                area: ['50%', '80%'],
                 content: url,
                 end: function() {
                     loadMenuTree();
@@ -558,7 +558,7 @@
         function editMenu(id) {
             Common.open({
                 title: '编辑菜单',
-                area: ['600px', '550px'],
+                area: ['50%', '80%'],
                 content: 'menu_form.html?id=' + id,
                 end: function() {
                     loadMenuTree();

ema-admin/src/main/resources/web/pages/role/role_form.html

@@ -17,14 +17,14 @@
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>角色名称</label>
             <div class="layui-input-block">
-                <input type="text" name="roleName" lay-verify="required" placeholder="请输入角色名称" class="layui-input" style="width: 250px;">
+                <input type="text" name="roleName" lay-verify="required" placeholder="请输入角色名称" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>权限标识</label>
             <div class="layui-input-block">
-                <input type="text" name="roleKey" lay-verify="required" placeholder="如: system:user:add" class="layui-input" style="width: 250px;">
+                <input type="text" name="roleKey" lay-verify="required" placeholder="如: system:user:add" class="layui-input">
             </div>
         </div>
         
@@ -39,7 +39,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">备注</label>
             <div class="layui-input-block">
-                <textarea name="remark" placeholder="请输入备注" class="layui-textarea" style="width: 350px; height: 80px;"></textarea>
+                <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
             </div>
         </div>
         

ema-admin/src/main/resources/web/pages/role/role_list.html

@@ -81,9 +81,9 @@
                     { field: 'roleName', title: '角色名称', width: 150 },
                     { field: 'roleKey', title: '权限标识', width: 200 },
                     { field: 'status', title: '状态', width: 100, templet: '#statusTpl' },
-                    { field: 'createTime', title: '创建时间', width: 150, templet: function(d) { return Common.formatDate(d.createTime); } },
-                    { field: 'remark', title: '备注',  width: 170,},
-                    { fixed: 'right', title: '操作',  align: 'center', toolbar: '#toolbar' }
+                    { field: 'createTime', title: '创建时间', width: 200, templet: function(d) { return Common.formatDate(d.createTime); } },
+                    { field: 'remark', title: '备注'},
+                    { fixed: 'right', title: '操作', width: 250,  align: 'center', toolbar: '#toolbar' }
                 ]]
             });
             
@@ -98,7 +98,7 @@
             $('#btnAdd').click(function() {
                 Common.open({
                     title: '添加角色',
-                    area: ['600px', '450px'],
+                    area: ['50%', '80%'],
                     content: 'role_form.html?id='
                 });
             });
@@ -127,13 +127,13 @@
                 if (event === 'edit') {
                     Common.open({
                         title: '编辑角色',
-                        area: ['600px', '450px'],
+                        area: ['50%', '80%'],
                         content: 'role_form.html?id=' + data.id
                     });
                 } else if (event === 'assignMenu') {
                     Common.open({
                         title: '分配菜单 - ' + data.roleName,
-                        area: ['400px', '500px'],
+                        area: ['50%', '80%'],
                         content: 'role_menu.html?roleId=' + data.id
                     });
                 } else if (event === 'del') {

ema-admin/src/main/resources/web/pages/user/update_pwd.html

@@ -15,21 +15,21 @@
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>原密码</label>
             <div class="layui-input-block">
-                <input type="password" name="oldPassword" lay-verify="required" placeholder="请输入原密码" class="layui-input" style="width: 250px;">
+                <input type="password" name="oldPassword" lay-verify="required" placeholder="请输入原密码" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>新密码</label>
             <div class="layui-input-block">
-                <input type="password" name="newPassword" lay-verify="required|password" placeholder="请输入新密码" class="layui-input" style="width: 250px;">
+                <input type="password" name="newPassword" lay-verify="required|password" placeholder="请输入新密码" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>确认密码</label>
             <div class="layui-input-block">
-                <input type="password" name="confirmPassword" lay-verify="required|confirmPwd" placeholder="请再次输入新密码" class="layui-input" style="width: 250px;">
+                <input type="password" name="confirmPassword" lay-verify="required|confirmPwd" placeholder="请再次输入新密码" class="layui-input">
             </div>
         </div>
         

ema-admin/src/main/resources/web/pages/user/user_form.html

@@ -17,42 +17,42 @@
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>用户账号</label>
             <div class="layui-input-block">
-                <input type="text" name="account" lay-verify="required" placeholder="请输入用户账号" class="layui-input" style="width: 300px;">
+                <input type="text" name="account" lay-verify="required" placeholder="请输入用户账号" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label"><span id="pwdLabel"><span class="required">*</span>密码</span></label>
             <div class="layui-input-block">
-                <input type="password" name="password" id="password" placeholder="请输入密码" class="layui-input" style="width: 300px;">
+                <input type="password" name="password" id="password" placeholder="请输入密码" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>姓名</label>
             <div class="layui-input-block">
-                <input type="text" name="name" lay-verify="required" placeholder="请输入姓名" class="layui-input" style="width: 300px;">
+                <input type="text" name="name" lay-verify="required" placeholder="请输入姓名" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label">手机号</label>
             <div class="layui-input-block">
-                <input type="text" name="phone" placeholder="请输入手机号" class="layui-input" style="width: 300px;">
+                <input type="text" name="phone" placeholder="请输入手机号" class="layui-input">
             </div>
         </div>
         
         <div class="layui-form-item">
             <label class="layui-form-label">邮箱</label>
             <div class="layui-input-block">
-                <input type="text" name="email" placeholder="请输入邮箱" class="layui-input" style="width: 300px;">
+                <input type="text" name="email" placeholder="请输入邮箱" class="layui-input">
             </div>
         </div>
         
     <!--    <div class="layui-form-item">
             <label class="layui-form-label">头像</label>
             <div class="layui-input-block">
-                <input type="text" name="avatar" placeholder="请输入头像URL" class="layui-input" style="width: 300px;">
+                <input type="text" name="avatar" placeholder="请输入头像URL" class="layui-input">
             </div>
         </div>-->
         
@@ -66,7 +66,7 @@
         
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="required">*</span>角色</label>
-            <div class="layui-input-block" id="roleCheckboxes" style="width: 400px;">
+            <div class="layui-input-block" id="roleCheckboxes">
                 <!-- 角色选项将通过JS动态加载 -->
             </div>
         </div>
@@ -74,7 +74,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">备注</label>
             <div class="layui-input-block">
-                <textarea name="remark" placeholder="请输入备注" class="layui-textarea" style="width: 400px; height: 80px;"></textarea>
+                <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
             </div>
         </div>
         

ema-admin/src/main/resources/web/pages/user/user_info.html

@@ -23,28 +23,28 @@
                 <label class="layui-form-label">账号</label>
                 <div class="layui-input-block">
                     <input type="text" name="id" class="layui-input" style="display: none;">
-                    <input type="text" name="account" class="layui-input" readonly style="width: 300px; background: #f5f5f5;">
+                    <input type="text" name="account" class="layui-input" readonly style="background: #f5f5f5;">
                 </div>
             </div>
             
             <div class="layui-form-item">
                 <label class="layui-form-label">姓名</label>
                 <div class="layui-input-block">
-                    <input type="text" name="name" class="layui-input" style="width: 300px;">
+                    <input type="text" name="name" class="layui-input">
                 </div>
             </div>
             
             <div class="layui-form-item">
                 <label class="layui-form-label">手机号</label>
                 <div class="layui-input-block">
-                    <input type="text" name="phone" class="layui-input" style="width: 300px;">
+                    <input type="text" name="phone" class="layui-input">
                 </div>
             </div>
             
             <div class="layui-form-item">
                 <label class="layui-form-label">邮箱</label>
                 <div class="layui-input-block">
-                    <input type="text" name="email" class="layui-input" style="width: 300px;">
+                    <input type="text" name="email" class="layui-input">
                 </div>
             </div>
             

ema-admin/src/main/resources/web/pages/user/user_list.html

@@ -111,8 +111,8 @@
                     { field: 'status', title: '状态', width: 80, templet: '#statusTpl' },
                     { field: 'roles', title: '角色', width: 200, templet: '#roleNamesTpl' },
                     { field: 'createTime', title: '创建时间', width: 150 },
-                    { field: 'remark', title: '备注', width: 150 },
-                    { fixed: 'right', title: '操作',  align: 'center', toolbar: '#toolbar' }
+                    { field: 'remark', title: '备注' },
+                    { fixed: 'right', title: '操作', width: 200,  align: 'center', toolbar: '#toolbar' }
                 ]]
             });
             
@@ -129,7 +129,7 @@
             $('#btnAdd').click(function() {
                 Common.open({
                     title: '添加用户',
-                    area: ['700px', '550px'],
+                    area: ['50%', '80%'],
                     content: 'user_form.html?id='
                 });
             });
@@ -160,7 +160,7 @@
                 if (event === 'edit') {
                     Common.open({
                         title: '编辑用户',
-                        area: ['700px', '550px'],
+                        area: ['50%', '80%'],
                         content: 'user_form.html?id=' + data.id
                     });
                 } else if (event === 'del') {