luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

必填提示

Browse Source
master
20918 6 months ago
parent 210db3de47
commit 048ecd83d0
14 changed files with 215 additions and 232 deletions
Show Stats Download Patch File Download Diff File

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java
Unescape View File

@ -20,29 +20,18 @@ import java.util.Objects;
*/
@Component
public class SysAreaManager {
@Resource
private SysAreaService sysAreaService;
public List<SysArea> getSysAreaList(String parentId) {
return sysAreaService.lambdaQuery()
.eq(SysArea::getParentId, StringUtils.isEmpty(parentId) ? "29" : parentId)
.orderByAsc(SysArea::getAreaCode)
.list();
}
public String getAreaName(String id) {
return sysAreaService.lambdaQuery()
.eq(SysArea::getId,id).one().getName();
}
}

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java
Unescape View File

@ -26,15 +26,12 @@ public class SysAreaController {
@Resource
private SysAreaManager sysAreaManager;
@ApiOperation("查询区划信息")
@GetMapping("/getSysAreaList")
@ResponseBody
public AjaxResult getSysAreaList(@RequestParam(required = false) String parentId) {
return success(sysAreaManager.getSysAreaList(parentId));
}
@ApiOperation("获取区划名称")
@GetMapping("/getAreaName")
@ResponseBody
@ -42,8 +39,4 @@ public class SysAreaController {
return success(sysAreaManager.getAreaName(id));
}
}

44
ruoyi-admin/src/main/resources/templates/system/check/add.html
Unescape View File

@ -8,72 +8,72 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-check-add" th:object="${user}">
<div class="form-group">
<label class="col-sm-3 control-label">报告人：</label>
<label class="col-sm-3 control-label is-required">报告人：</label>
<div class="col-sm-8">
<input name="user" readonly th:value="*{userName}" class="form-control" type="text">
<input name="user" readonly required th:value="*{userName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">报告人单位：</label>
<label class="col-sm-3 control-label is-required">报告人单位：</label>
<div class="col-sm-8">
<input name="depart" readonly th:value="*{dept.deptName}" class="form-control" type="text">
<input name="depart" readonly required th:value="*{dept.deptName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">检查开始时间：</label>
<label class="col-sm-3 control-label is-required">检查开始时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="checkStartTime" readonly class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="checkStartTime" required readonly class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属市州：</label>
<label class="col-sm-3 control-label is-required">所属市州：</label>
<div class="col-sm-8">
<input name="framework" class="form-control" type="text">
<input name="framework" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属区县：</label>
<label class="col-sm-3 control-label is-required">所属区县：</label>
<div class="col-sm-8">
<input name="area" class="form-control" type="text">
<input name="area" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">人员检查：</label>
<label class="col-sm-3 control-label is-required">人员检查：</label>
<div class="col-sm-8">
<textarea name="checkcontentry" class="form-control" ></textarea>
<textarea name="checkcontentry" required class="form-control" ></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">文件检查：</label>
<label class="col-sm-3 control-label is-required">文件检查：</label>
<div class="col-sm-8">
<textarea name="checkcontentrywj" class="form-control" ></textarea>
<textarea name="checkcontentrywj" required class="form-control" ></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产检查：</label>
<label class="col-sm-3 control-label is-required">资产检查：</label>
<div class="col-sm-8">
<textarea name="checkcontentrysb" class="form-control" ></textarea>
<textarea name="checkcontentrysb" required class="form-control" ></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">管理制度检查：</label>
<label class="col-sm-3 control-label is-required">管理制度检查：</label>
<div class="col-sm-8">
<textarea name="checkcontentryglzd" class="form-control" ></textarea>
<textarea name="checkcontentryglzd" required class="form-control" ></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">泄密事件检查：</label>
<label class="col-sm-3 control-label is-required">泄密事件检查：</label>
<div class="col-sm-8">
<textarea name="checkcontentryxmsj" class="form-control" ></textarea>
<textarea name="checkcontentryxmsj" required class="form-control" ></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">其他项目检查：</label>
<label class="col-sm-3 control-label is-required">其他项目检查：</label>
<div class="col-sm-8">
<textarea name="checkcontentryother" class="form-control" ></textarea>
<textarea name="checkcontentryother" required class="form-control" ></textarea>
</div>
</div>
</form>

46
ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
Unescape View File

@ -10,47 +10,47 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-fileprovide-add">
<div class="form-group">
<label class="col-sm-3 control-label">所属市州：</label>
<label class="col-sm-3 control-label is-required">所属市州：</label>
<div class="col-sm-8">
<input name="frameworkId" class="form-control" type="text">
<input name="frameworkId" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属区县：</label>
<label class="col-sm-3 control-label is-required">所属区县：</label>
<div class="col-sm-8">
<input name="areaid" class="form-control" type="text">
<input name="areaid" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">发文单位：</label>
<label class="col-sm-3 control-label is-required">发文单位：</label>
<div class="col-sm-8">
<input name="provideDepart" readonly th:value="${user.dept.deptName}" class="form-control" type="text">
<input name="provideDepart" required readonly th:value="${user.dept.deptName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">发文人员：</label>
<label class="col-sm-3 control-label is-required">发文人员：</label>
<div class="col-sm-8">
<input name="provideUserid" readonly th:value="${user.userName}" class="form-control" type="text">
<input name="provideUserid" required readonly th:value="${user.userName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">发文日期：</label>
<label class="col-sm-3 control-label is-required">发文日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="provideDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="provideDate" required class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">发文份数：</label>
<label class="col-sm-3 control-label is-required">发文份数：</label>
<div class="col-sm-8">
<input name="provideCount" digits="true" class="form-control" type="text">
<input name="provideCount" required digits="true" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">收文单位：</label>
<label class="col-sm-3 control-label is-required">收文单位：</label>
<div class="col-sm-8">
<select name="targetDepart" class="form-control select2-multiple m-b" multiple>
<option th:each="item : ${dept}" th:if="${item.deptId != 100}" th:text="${item.deptName}" th:value="${item.deptName}"></option>
@ -66,9 +66,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">文件标题：</label>
<label class="col-sm-3 control-label is-required">文件标题：</label>
<div class="col-sm-8">
<input name="fileName" class="form-control" type="text">
<input name="fileName" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -78,29 +78,29 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">文件密级：</label>
<label class="col-sm-3 control-label is-required">文件密级：</label>
<div class="col-sm-8">
<select name="fileSecret" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
<select name="fileSecret" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">定密依据：</label>
<label class="col-sm-3 control-label is-required">定密依据：</label>
<div class="col-sm-8">
<input name="allianceFile" class="form-control" type="text">
<input name="allianceFile" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">保密期限：</label>
<label class="col-sm-3 control-label is-required">保密期限：</label>
<div class="col-sm-8">
<input name="releaseSecretid" class="form-control" type="text">
<input name="releaseSecretid" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">文件备注：</label>
<label class="col-sm-3 control-label is-required">文件备注：</label>
<div class="col-sm-8">
<input name="remark" class="form-control" type="text">
<input name="remark" required class="form-control" type="text">
</div>
</div>

22
ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html
Unescape View File

@ -8,7 +8,7 @@
<form class="form-horizontal m" id="form-netinfo-add">
<input name="netId" class="form-control" th:value="${netId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">设备种类：</label>
<label class="col-sm-3 control-label is-required">设备种类：</label>
<div class="col-sm-8">
<select name="netName" class="form-control m-b" th:with="type=${@dict.getType('sys_net_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@ -16,9 +16,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">网络设备品牌：</label>
<label class="col-sm-3 control-label is-required">网络设备品牌：</label>
<div class="col-sm-8">
<input name="netBrand" class="form-control" type="text">
<input name="netBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -28,15 +28,15 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备型号：</label>
<label class="col-sm-3 control-label is-required">设备型号：</label>
<div class="col-sm-8">
<input name="netNo" class="form-control" type="text">
<input name="netNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">序列号：</label>
<label class="col-sm-3 control-label is-required">序列号：</label>
<div class="col-sm-8">
<input name="netSn" class="form-control" type="text">
<input name="netSn" required class="form-control" type="text">
</div>
</div>
@ -59,9 +59,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">密级：</label>
<label class="col-sm-3 control-label is-required">密级：</label>
<div class="col-sm-8">
<select name="netMiji" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
<select name="netMiji" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
@ -73,10 +73,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否属于要害部门部位：</label>
<label class="col-sm-3 control-label is-required">是否属于要害部门部位：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
<input type="radio" th:id="${'isCurcial_' + dict.dictCode}" name="isCurcial" th:value="${dict.dictValue}" th:checked="${dict.default}">
<input type="radio" required th:id="${'isCurcial_' + dict.dictCode}" name="isCurcial" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isCurcial_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>

16
ruoyi-admin/src/main/resources/templates/system/network/network/add.html
Unescape View File

@ -8,15 +8,15 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-network-add">
<div class="form-group">
<label class="col-sm-3 control-label">所属市州：</label>
<label class="col-sm-3 control-label is-required">所属市州：</label>
<div class="col-sm-8">
<input name="framework" class="form-control" type="text">
<input name="framework" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属区县：</label>
<label class="col-sm-3 control-label is-required">所属区县：</label>
<div class="col-sm-8">
<input name="area" class="form-control" type="text">
<input name="area" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -47,17 +47,17 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备密级：</label>
<label class="col-sm-3 control-label is-required">设备密级：</label>
<div class="col-sm-8">
<select name="netMiji" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
<select name="netMiji" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备数量：</label>
<label class="col-sm-3 control-label is-required">设备数量：</label>
<div class="col-sm-8">
<input name="terminalNum" digits="true" class="form-control" type="text">
<input name="terminalNum" required digits="true" class="form-control" type="text">
</div>
</div>
</form>

24
ruoyi-admin/src/main/resources/templates/system/notify/add.html
Unescape View File

@ -8,27 +8,27 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-notify-add">
<div class="form-group">
<label class="col-sm-3 control-label">所属市州：</label>
<label class="col-sm-3 control-label is-required">所属市州：</label>
<div class="col-sm-8">
<input name="framework" class="form-control" type="text">
<input name="framework" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属区县：</label>
<label class="col-sm-3 control-label is-required">所属区县：</label>
<div class="col-sm-8">
<input name="area" class="form-control" type="text">
<input name="area" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">通知人：</label>
<label class="col-sm-3 control-label is-required">通知人：</label>
<div class="col-sm-8">
<input name="notifyUser" class="form-control" readonly th:value="${sysuser.userName}" type="text">
<input name="notifyUser" required class="form-control" readonly th:value="${sysuser.userName}" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位：</label>
<label class="col-sm-3 control-label is-required">单位：</label>
<div class="col-sm-8">
<input name="notifyDepart" class="form-control" readonly th:value="${sysuser.dept.deptName}" type="text">
<input name="notifyDepart" required class="form-control" readonly th:value="${sysuser.dept.deptName}" type="text">
</div>
</div>
<div class="form-group">
@ -41,15 +41,15 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">被通知人：</label>
<label class="col-sm-3 control-label is-required">被通知人：</label>
<div class="col-sm-8">
<input name="notifyBeuser" class="form-control" type="text">
<input name="notifyBeuser" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">内容：</label>
<label class="col-sm-3 control-label is-required">内容：</label>
<div class="col-sm-8">
<textarea name="notifyContent" class="form-control"></textarea>
<textarea name="notifyContent" required class="form-control"></textarea>
</div>
</div>

134
ruoyi-admin/src/main/resources/templates/system/property/data/add.html
Unescape View File

@ -9,9 +9,9 @@
<form class="form-horizontal m" id="form-propertyinfo-add">
<input name="useId" class="form-control" type="hidden" th:value="${useId}">
<div class="form-group">
<label class="col-sm-3 control-label">资产种类：</label>
<label class="col-sm-3 control-label is-required">资产种类：</label>
<div class="col-sm-8">
<select name="propertyType" id="select1" class="form-control m-b" v-model="selectType" th:with="type=${@dict.getType('sys_sm_property')}">
<select name="propertyType" id="select1" required class="form-control m-b" v-model="selectType" th:with="type=${@dict.getType('sys_sm_property')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
@ -19,19 +19,19 @@
<!-- 单向导入设备开始-->
<div id="box0" class="contentBox" v-if="selectType === '0'">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备SN：</label>
<label class="col-sm-3 control-label ">设备SN：</label>
<div class="col-sm-8">
<input name="propertySn" class="form-control" type="text">
</div>
@ -47,21 +47,21 @@
<!--涉密计算机开始-->
<div id="box1" v-if="selectType === '1'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">计算机类型：</label>
<label class="col-sm-3 control-label is-required">计算机类型：</label>
<div class="col-sm-8">
<input name="computerType" class="form-control" type="text">
<input name="computerType" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required ">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -77,9 +77,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否安装防护软件：</label>
<label class="col-sm-3 control-label is-required ">是否安装防护软件：</label>
<div class="col-sm-8">
<select name="isSoftware" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
<select name="isSoftware" required class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
@ -97,15 +97,15 @@
<!--移动硬盘开始-->
<div id="box2" v-if="selectType === '2'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -126,15 +126,15 @@
<!--涉密U盘开始-->
<div id="box3" v-if="selectType === '3'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -155,15 +155,15 @@
<!--涉密复印机开始-->
<div id="box4" v-if="selectType === '4'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -184,15 +184,15 @@
<!--涉密打印机开始-->
<div id="box5" v-if="selectType === '5'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -212,15 +212,15 @@
<!--录音带开始-->
<div id="box6" v-if="selectType === '6'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -240,15 +240,15 @@
<!--录象带开始-->
<div id="box7" v-if="selectType === '7'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -268,15 +268,15 @@
<!--传真机开始-->
<div id="box8" v-if="selectType === '8'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -296,15 +296,15 @@
<!--照相机开始-->
<div id="box9" v-if="selectType === '9'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -324,15 +324,15 @@
<!--录音笔开始-->
<div id="box10" v-if="selectType === '10'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -352,15 +352,15 @@
<!--光盘开始-->
<div id="box11" v-if="selectType === '11'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -380,15 +380,15 @@
<!--软盘开始-->
<div id="box12" v-if="selectType === '12'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -408,15 +408,15 @@
<!--其他开始-->
<div id="box13" v-if="selectType === '13'" class="contentBox">
<div class="form-group">
<label class="col-sm-3 control-label">设备品牌：</label>
<label class="col-sm-3 control-label is-required">设备品牌：</label>
<div class="col-sm-8">
<input name="propertyBrand" class="form-control" type="text">
<input name="propertyBrand" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label>
<label class="col-sm-3 control-label is-required">资产型号：</label>
<div class="col-sm-8">
<input name="propertyNo" class="form-control" type="text">
<input name="propertyNo" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -446,9 +446,9 @@
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">设备品牌：</label>-->
<!-- <label class="col-sm-3 control-label is-required">设备品牌：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="propertyBrand" class="form-control" type="text">-->
<!-- <input name="propertyBrand" required class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
@ -467,9 +467,9 @@
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">资产型号：</label>-->
<!-- <label class="col-sm-3 control-label is-required">资产型号：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="propertyNo" class="form-control" type="text">-->
<!-- <input name="propertyNo" required class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->

44
ruoyi-admin/src/main/resources/templates/system/property/property/add.html
Unescape View File

@ -7,6 +7,24 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-property-add">
<div class="form-group">
<label class="col-sm-3 control-label is-required">所属市州：</label>
<div class="col-sm-8">
<input name="part" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">所属区县：</label>
<div class="col-sm-8">
<input name="areaId" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">单位名称：</label>
<div class="col-sm-8">
<input name="frameworkId" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">使用部门：</label>
<div class="col-sm-8">
@ -14,9 +32,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">使用人员：</label>
<label class="col-sm-3 control-label is-required">使用人员：</label>
<div class="col-sm-8">
<input name="userName" class="form-control" type="text">
<input name="userName" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
@ -28,12 +46,6 @@
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位名称：</label>
<div class="col-sm-8">
<input name="frameworkId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">登记部门：</label>
<div class="col-sm-8">
@ -56,21 +68,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属市州：</label>
<div class="col-sm-8">
<input name="part" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属区县：</label>
<div class="col-sm-8">
<input name="areaId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">资产数量：</label>
<label class="col-sm-3 control-label is-required">资产数量：</label>
<div class="col-sm-8">
<input name="propertyNum" digits="true" class="form-control" type="text">
<input name="propertyNum" digits="true" class="form-control" type="text" required>
</div>
</div>
</form>

8
ruoyi-admin/src/main/resources/templates/system/property/propertychange/change.html
Unescape View File

@ -47,15 +47,15 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">使用人员：</label>
<label class="col-sm-3 control-label is-required">使用人员：</label>
<div class="col-sm-8">
<input name="username" th:field="*{username}" class="form-control" type="text">
<input name="username" required th:field="*{username}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">使用部门：</label>
<label class="col-sm-3 control-label is-required">使用部门：</label>
<div class="col-sm-8">
<input name="part" th:field="*{part}" class="form-control" type="text">
<input name="part" required th:field="*{part}" class="form-control" type="text">
</div>
</div>
</form>

8
ruoyi-admin/src/main/resources/templates/system/property/propertychange/destory.html
Unescape View File

@ -59,18 +59,18 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">销毁日期：</label>
<label class="col-sm-3 control-label is-required">销毁日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="destoryDate" th:value="${#dates.format(tdPropertyInfo.destoryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="destoryDate" required th:value="${#dates.format(tdPropertyInfo.destoryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">销毁描述：</label>
<label class="col-sm-3 control-label is-required">销毁描述：</label>
<div class="col-sm-8">
<input name="propertyRefer" th:field="*{propertyRefer}" class="form-control" type="text">
<input name="propertyRefer" required th:field="*{propertyRefer}" class="form-control" type="text">
</div>
</div>
</form>

43
ruoyi-admin/src/main/resources/templates/system/train/add.html
Unescape View File

@ -19,7 +19,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属区县：</label>
<label class="col-sm-3 control-label is-required">所属区县：</label>
<div class="col-sm-8">
<select id="Area" name="FRAMEWORK" v-model="Area" class="form-control m-b">
<option value="">请选择</option>
@ -30,46 +30,52 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">人员名称：</label>
<label class="col-sm-3 control-label is-required">人员名称：</label>
<div class="col-sm-8">
<input name="USERNAME" class="form-control" type="text">
<input name="USERNAME" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位名称：</label>
<label class="col-sm-3 control-label is-required ">单位名称：</label>
<div class="col-sm-8">
<input name="deptName" class="form-control" type="text">
<input name="deptName" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">培训类型：</label>
<label class="col-sm-3 control-label is-required">部门：</label>
<div class="col-sm-8">
<select name="trainType" class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
<input name="PART" required class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">培训类型：</label>
<div class="col-sm-8">
<select name="trainType" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">培训对象：</label>
<label class="col-sm-3 control-label is-required">培训对象：</label>
<div class="col-sm-8">
<select name="trainSubject" class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
<select name="trainSubject" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">培训地点：</label>
<label class="col-sm-3 control-label is-required">培训地点：</label>
<div class="col-sm-8">
<textarea name="trainAddress" class="form-control"></textarea>
<textarea name="trainAddress" required class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">培训日期：</label>
<label class="col-sm-3 control-label is-required">培训日期：</label>
<div class="col-sm-8">
<div class="input-daterange input-group">
<input type="text" class="input-sm form-control" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
<div class="input-daterange input-group ">
<input type="text" class="input-sm form-control" required name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
<span class="input-group-addon">到</span>
<input type="text" class="input-sm form-control" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
<input type="text" class="input-sm form-control" required name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
</div>
</div>
</div>
@ -96,12 +102,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门：</label>
<div class="col-sm-8">
<input name="PART" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />

36
ruoyi-admin/src/main/resources/templates/system/user/add.html
Unescape View File

@ -21,10 +21,10 @@
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">归属部门：</label>
<label class="col-sm-4 control-label is-required" >归属部门：</label>
<div class="col-sm-8">
<div class="input-group">
<input name="deptName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择归属部门" class="form-control">
<input name="deptName" required onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择归属部门" class="form-control">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
@ -81,9 +81,9 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">用户性别：</label>
<label class="col-sm-4 control-label is-required">用户性别：</label>
<div class="col-sm-8">
<select name="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<select name="sex" required class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
@ -102,20 +102,20 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">岗位：</label>
<label class="col-sm-4 control-label is-required">岗位：</label>
<div class="col-sm-8">
<select id="post" class="form-control select2-multiple" multiple>
<option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:disabled="${post.status == '1'}"></option>
<select id="post" class="form-control select2-multiple" multiple>
<option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:disabled="${post.status == '1'}" required></option>
</select>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">角色：</label>
<label class="col-sm-4 control-label is-required">角色：</label>
<div class="col-sm-8">
<label th:each="role:${roles}" class="check-box">
<input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:disabled="${role.status == '1'}">
<label th:each="role:${roles}" class="check-box">
<input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:disabled="${role.status == '1'}" >
</label>
</div>
</div>
@ -124,17 +124,17 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">用户地区：</label>
<label class="col-sm-4 control-label is-required">用户地区：</label>
<div class="col-sm-8">
<input name="userarea" class="form-control" type="text">
<input name="userarea" required class="form-control" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">民族：</label>
<label class="col-sm-4 control-label is-required">民族：</label>
<div class="col-sm-8">
<select name="nation" class="form-control m-b" th:with="type=${@dict.getType('sys_user_nation')}">
<select name="nation" required class="form-control m-b" th:with="type=${@dict.getType('sys_user_nation')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
@ -144,10 +144,10 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">出生年月：</label>
<label class="col-sm-4 control-label is-required">出生年月：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="birthday" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="birthday" required class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -167,9 +167,9 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">涉密程度：</label>
<label class="col-sm-4 control-label is-required">涉密程度：</label>
<div class="col-sm-8">
<select name="shemichengdu" class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">
<select name="shemichengdu" required class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>

4
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
Unescape View File

@ -200,8 +200,8 @@ public class GenController extends BaseController
try
{
SqlUtil.filterKeyword(sql);
List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.mysql);
//List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.kingbase);
// List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.mysql);
List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.kingbase);
List<String> tableNames = new ArrayList<>();
for (SQLStatement sqlStatement : sqlStatements)
{

Write Preview
Loading…
Cancel
Save