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

Merge remote-tracking branch 'origin/new-exam' into new-exam

Browse Source
pg_adapter
wangxy 10 months ago
parent 03eea11b46 751baf45c2
commit aa51d18d92
46 changed files with 274 additions and 278 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdCaseManager.java
Unescape View File

@ -31,8 +31,6 @@ public class TdCaseManager {
return caseService.selectTdCaseList(tdCase); return caseService.selectTdCaseList(tdCase);
} }
public boolean saveOrUpdate(TdCase tdCase) { public boolean saveOrUpdate(TdCase tdCase) {
if (CharSequenceUtil.isNotBlank(tdCase.getId())) { if (CharSequenceUtil.isNotBlank(tdCase.getId())) {
tdCase.setUpdateBy(ShiroUtils.getSysUser().getLoginName()); tdCase.setUpdateBy(ShiroUtils.getSysUser().getLoginName());
@ -44,7 +42,6 @@ public class TdCaseManager {
return caseService.saveOrUpdate(tdCase); return caseService.saveOrUpdate(tdCase);
} }
public TdCase selecttdCase(String id) { public TdCase selecttdCase(String id) {
return caseService.getById(id); return caseService.getById(id);
} }
@ -57,5 +54,4 @@ public class TdCaseManager {
public List<TdCase> selectList() { public List<TdCase> selectList() {
return caseService.lambdaQuery().list(); return caseService.lambdaQuery().list();
} }
} }

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java
Unescape View File

@ -45,7 +45,7 @@ public class SysPropertynumController extends BaseController {
} }
/** /**
* 查询资产登记列表 * 查询密品登记列表
*/ */
@RequiresPermissions("system:propertynum:list") @RequiresPermissions("system:propertynum:list")
@PostMapping("/list") @PostMapping("/list")
@ -62,7 +62,7 @@ public class SysPropertynumController extends BaseController {
*/ */
@RequiresPermissions("system:propertynum:print") @RequiresPermissions("system:propertynum:print")
@GetMapping("/print/{useId}") @GetMapping("/print/{useId}")
@Log(title = "资产设备统计", businessType = BusinessType.PRINT) @Log(title = "密品设备统计", businessType = BusinessType.PRINT)
public String print(@PathVariable("useId") String useId, ModelMap mmap) public String print(@PathVariable("useId") String useId, ModelMap mmap)
{ {
List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoByUseId(useId); List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoByUseId(useId);
@ -78,7 +78,7 @@ public class SysPropertynumController extends BaseController {
/** /**
* *
* 资产统计 * 密品统计
* @return com.ruoyi.common.core.domain.AjaxResult * @return com.ruoyi.common.core.domain.AjaxResult
*/ */
@ -111,7 +111,7 @@ public class SysPropertynumController extends BaseController {
/** /**
* *
* 统计资产报废统计 * 统计密品报废统计
* @return com.ruoyi.common.core.domain.AjaxResult * @return com.ruoyi.common.core.domain.AjaxResult
*/ */
@PostMapping("/countBF") @PostMapping("/countBF")
@ -136,7 +136,7 @@ public class SysPropertynumController extends BaseController {
} }
/** /**
* *
* 统计资产销毁统计 * 统计密品销毁统计
* @return com.ruoyi.common.core.domain.AjaxResult * @return com.ruoyi.common.core.domain.AjaxResult
*/ */
@PostMapping("/countXH") @PostMapping("/countXH")

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java
Unescape View File

@ -30,7 +30,7 @@ public class TdPropertyChangeController extends BaseController {
} }
/** /**
* 资产登记列表 * 密品登记列表
*/ */
@RequiresPermissions("system:changeproperty:list") @RequiresPermissions("system:changeproperty:list")
@PostMapping("/list") @PostMapping("/list")
@ -43,7 +43,7 @@ public class TdPropertyChangeController extends BaseController {
} }
/** /**
* 涉密资产变更 * 密品变更
*/ */
@RequiresPermissions("system:changeproperty:change") @RequiresPermissions("system:changeproperty:change")
@GetMapping("/edit/{id}") @GetMapping("/edit/{id}")
@ -58,7 +58,7 @@ public class TdPropertyChangeController extends BaseController {
* 保存变更修改 * 保存变更修改
*/ */
@RequiresPermissions("system:changeproperty:change") @RequiresPermissions("system:changeproperty:change")
@Log(title = "资产变更", businessType = BusinessType.UPDATE) @Log(title = "密品变更", businessType = BusinessType.UPDATE)
@PostMapping("/edit") @PostMapping("/edit")
@ResponseBody @ResponseBody
public AjaxResult changeSave(TdPropertyInfo tdPropertyInfo) public AjaxResult changeSave(TdPropertyInfo tdPropertyInfo)
@ -67,7 +67,7 @@ public class TdPropertyChangeController extends BaseController {
} }
/** /**
* 涉密资产报废 * 密品报废
*/ */
@RequiresPermissions("system:changeproperty:destory") @RequiresPermissions("system:changeproperty:destory")
@GetMapping("/destory/{id}") @GetMapping("/destory/{id}")
@ -82,7 +82,7 @@ public class TdPropertyChangeController extends BaseController {
* 保存变更修改 * 保存变更修改
*/ */
@RequiresPermissions("system:changeproperty:destory") @RequiresPermissions("system:changeproperty:destory")
@Log(title = "资产变更", businessType = BusinessType.UPDATE) @Log(title = "密品变更", businessType = BusinessType.UPDATE)
@PostMapping("/destory") @PostMapping("/destory")
@ResponseBody @ResponseBody
public AjaxResult destorySave(TdPropertyInfo tdPropertyInfo) public AjaxResult destorySave(TdPropertyInfo tdPropertyInfo)

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java
Unescape View File

@ -19,7 +19,7 @@ import java.util.List;
* @version JDK 8 * @version JDK 8
* @className TdPropertyChangeListController * @className TdPropertyChangeListController
* @date 2024/6/24 * @date 2024/6/24
* @description 资产变更 * @description 密品变更
*/ */
@Controller @Controller
@RequestMapping("/system/change/list") @RequestMapping("/system/change/list")
@ -38,7 +38,7 @@ public class TdPropertyChangeListController extends BaseController {
} }
/** /**
* 查询资产登记列表 * 查询密品登记列表
*/ */
@RequiresPermissions("system:change:list") @RequiresPermissions("system:change:list")
@PostMapping("/list") @PostMapping("/list")
@ -53,7 +53,7 @@ public class TdPropertyChangeListController extends BaseController {
/** /**
* 添加资产条目 * 添加密品条目
*/ */
@RequiresPermissions("system:change:detail") @RequiresPermissions("system:change:detail")
@GetMapping("/detail/{useId}") @GetMapping("/detail/{useId}")

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryController.java
Unescape View File

@ -30,7 +30,7 @@ public class TdPropertyDestoryController extends BaseController {
} }
/** /**
* 资产登记列表 * 密品登记列表
*/ */
@RequiresPermissions("system:destoryproperty:list") @RequiresPermissions("system:destoryproperty:list")
@PostMapping("/list") @PostMapping("/list")
@ -43,7 +43,7 @@ public class TdPropertyDestoryController extends BaseController {
} }
/** /**
* 涉密资产报废 * 密品报废
*/ */
@RequiresPermissions("system:destoryproperty:destory") @RequiresPermissions("system:destoryproperty:destory")
@GetMapping("/destory/{id}") @GetMapping("/destory/{id}")
@ -58,7 +58,7 @@ public class TdPropertyDestoryController extends BaseController {
* 保存变更修改 * 保存变更修改
*/ */
@RequiresPermissions("system:destoryproperty:destory") @RequiresPermissions("system:destoryproperty:destory")
@Log(title = "资产变更", businessType = BusinessType.UPDATE) @Log(title = "密品变更", businessType = BusinessType.UPDATE)
@PostMapping("/destory") @PostMapping("/destory")
@ResponseBody @ResponseBody
public AjaxResult destorySave(TdPropertyInfo tdPropertyInfo) public AjaxResult destorySave(TdPropertyInfo tdPropertyInfo)

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java
Unescape View File

@ -19,7 +19,7 @@ import java.util.List;
* @version JDK 8 * @version JDK 8
* @className TdPropertyDestoryListController * @className TdPropertyDestoryListController
* @date 2024/6/24 * @date 2024/6/24
* @description 资产销毁 * @description 密品销毁
*/ */
@Controller @Controller
@RequestMapping("/system/propertyDestory/list") @RequestMapping("/system/propertyDestory/list")
@ -38,7 +38,7 @@ public class TdPropertyDestoryListController extends BaseController {
} }
/** /**
* 查询资产登记列表 * 查询密品登记列表
*/ */
@RequiresPermissions("system:destory:list") @RequiresPermissions("system:destory:list")
@PostMapping("/list") @PostMapping("/list")
@ -53,7 +53,7 @@ public class TdPropertyDestoryListController extends BaseController {
/** /**
* 资产条目 * 密品条目
*/ */
@RequiresPermissions("system:destory:detail") @RequiresPermissions("system:destory:detail")
@GetMapping("/detail/{useId}") @GetMapping("/detail/{useId}")

28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java
Unescape View File

@ -18,7 +18,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
/** /**
* 资产管理Controller * 密品管理Controller
* *
* @author ruoyi * @author ruoyi
* @date 2024-04-29 * @date 2024-04-29
@ -40,7 +40,7 @@ public class TdPropertyInfoController extends BaseController
} }
/** /**
* 查询资产管理列表 * 查询密品管理列表
*/ */
@RequiresPermissions("system:property:list") @RequiresPermissions("system:property:list")
@PostMapping("/list") @PostMapping("/list")
@ -53,21 +53,21 @@ public class TdPropertyInfoController extends BaseController
} }
/** /**
* 导出资产管理列表 * 导出密品管理列表
*/ */
@RequiresPermissions("system:property:export") @RequiresPermissions("system:property:export")
@Log(title = "资产管理", businessType = BusinessType.EXPORT) @Log(title = "密品管理", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
@ResponseBody @ResponseBody
public AjaxResult export(TdPropertyInfo tdPropertyInfo) public AjaxResult export(TdPropertyInfo tdPropertyInfo)
{ {
List<TdPropertyInfo> list = tdPropertyInfoService.selectTdPropertyInfoList(tdPropertyInfo); List<TdPropertyInfo> list = tdPropertyInfoService.selectTdPropertyInfoList(tdPropertyInfo);
ExcelUtil<TdPropertyInfo> util = new ExcelUtil<TdPropertyInfo>(TdPropertyInfo.class); ExcelUtil<TdPropertyInfo> util = new ExcelUtil<TdPropertyInfo>(TdPropertyInfo.class);
return util.exportExcel(list, "资产管理数据"); return util.exportExcel(list, "密品管理数据");
} }
/** /**
* 新增资产管理 * 新增密品管理
*/ */
@RequiresPermissions("system:property:add") @RequiresPermissions("system:property:add")
@GetMapping("/add/{useId}") @GetMapping("/add/{useId}")
@ -78,10 +78,10 @@ public class TdPropertyInfoController extends BaseController
} }
/** /**
* 新增保存资产管理 * 新增保存密品管理
*/ */
@RequiresPermissions("system:property:add") @RequiresPermissions("system:property:add")
@Log(title = "资产管理", businessType = BusinessType.INSERT) @Log(title = "密品管理", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
@ResponseBody @ResponseBody
public AjaxResult addSave(TdPropertyInfo tdPropertyInfo) public AjaxResult addSave(TdPropertyInfo tdPropertyInfo)
@ -91,7 +91,7 @@ public class TdPropertyInfoController extends BaseController
} }
/** /**
* 修改资产管理 * 修改密品管理
*/ */
@RequiresPermissions("system:property:edit") @RequiresPermissions("system:property:edit")
@GetMapping("/edit/{id}") @GetMapping("/edit/{id}")
@ -102,7 +102,7 @@ public class TdPropertyInfoController extends BaseController
return prefix + "/edit"; return prefix + "/edit";
} }
/** /**
* 修改资产管理 * 修改密品管理
*/ */
@RequiresPermissions("system:property:detail") @RequiresPermissions("system:property:detail")
@GetMapping("/detail/{id}") @GetMapping("/detail/{id}")
@ -113,10 +113,10 @@ public class TdPropertyInfoController extends BaseController
return prefix + "/detail"; return prefix + "/detail";
} }
/** /**
* 修改保存资产管理 * 修改保存密品管理
*/ */
@RequiresPermissions("system:property:edit") @RequiresPermissions("system:property:edit")
@Log(title = "资产管理", businessType = BusinessType.UPDATE) @Log(title = "密品管理", businessType = BusinessType.UPDATE)
@PostMapping("/edit") @PostMapping("/edit")
@ResponseBody @ResponseBody
public AjaxResult editSave(TdPropertyInfo tdPropertyInfo) public AjaxResult editSave(TdPropertyInfo tdPropertyInfo)
@ -125,10 +125,10 @@ public class TdPropertyInfoController extends BaseController
} }
/** /**
* 删除资产管理 * 删除密品管理
*/ */
@RequiresPermissions("system:property:remove") @RequiresPermissions("system:property:remove")
@Log(title = "资产管理", businessType = BusinessType.DELETE) @Log(title = "密品管理", businessType = BusinessType.DELETE)
@PostMapping( "/remove") @PostMapping( "/remove")
@ResponseBody @ResponseBody
public AjaxResult remove(String ids) public AjaxResult remove(String ids)

28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java
Unescape View File

@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
* 资产登记Controller * 密品登记Controller
* *
* @author ruoyi * @author ruoyi
* @date 2024-04-26 * @date 2024-04-26
@ -56,7 +56,7 @@ public class TdPropertyManagerController extends BaseController
} }
/** /**
* 查询资产登记列表 * 查询密品登记列表
*/ */
@RequiresPermissions("system:property:list") @RequiresPermissions("system:property:list")
@PostMapping("/list") @PostMapping("/list")
@ -69,10 +69,10 @@ public class TdPropertyManagerController extends BaseController
} }
/** /**
* 导出资产登记列表 * 导出密品登记列表
*/ */
@RequiresPermissions("system:property:export") @RequiresPermissions("system:property:export")
@Log(title = "资产登记", businessType = BusinessType.EXPORT) @Log(title = "密品登记", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
@ResponseBody @ResponseBody
public AjaxResult export(TdPropertyManager tdPropertyManager) public AjaxResult export(TdPropertyManager tdPropertyManager)
@ -83,11 +83,11 @@ public class TdPropertyManagerController extends BaseController
tdPropertyManager1.setAreaId(sysAreaManager.getAreaName(tdPropertyManager1.getAreaId())); tdPropertyManager1.setAreaId(sysAreaManager.getAreaName(tdPropertyManager1.getAreaId()));
}); });
ExcelUtil<TdPropertyManager> util = new ExcelUtil<TdPropertyManager>(TdPropertyManager.class); ExcelUtil<TdPropertyManager> util = new ExcelUtil<TdPropertyManager>(TdPropertyManager.class);
return util.exportExcel(list, "资产登记数据"); return util.exportExcel(list, "密品登记数据");
} }
/** /**
* 新增资产登记 * 新增密品登记
*/ */
@GetMapping("/add") @GetMapping("/add")
public String add(ModelMap mmap) public String add(ModelMap mmap)
@ -97,10 +97,10 @@ public class TdPropertyManagerController extends BaseController
} }
/** /**
* 新增保存资产登记 * 新增保存密品登记
*/ */
@RequiresPermissions("system:property:add") @RequiresPermissions("system:property:add")
@Log(title = "资产登记", businessType = BusinessType.INSERT) @Log(title = "密品登记", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
@ResponseBody @ResponseBody
public AjaxResult addSave(TdPropertyManager tdPropertyManager) public AjaxResult addSave(TdPropertyManager tdPropertyManager)
@ -110,7 +110,7 @@ public class TdPropertyManagerController extends BaseController
} }
/** /**
* 修改资产登记 * 修改密品登记
*/ */
@RequiresPermissions("system:property:edit") @RequiresPermissions("system:property:edit")
@GetMapping("/edit/{useId}") @GetMapping("/edit/{useId}")
@ -122,10 +122,10 @@ public class TdPropertyManagerController extends BaseController
} }
/** /**
* 修改保存资产登记 * 修改保存密品登记
*/ */
@RequiresPermissions("system:property:edit") @RequiresPermissions("system:property:edit")
@Log(title = "资产登记", businessType = BusinessType.UPDATE) @Log(title = "密品登记", businessType = BusinessType.UPDATE)
@PostMapping("/edit") @PostMapping("/edit")
@ResponseBody @ResponseBody
public AjaxResult editSave(TdPropertyManager tdPropertyManager) public AjaxResult editSave(TdPropertyManager tdPropertyManager)
@ -134,10 +134,10 @@ public class TdPropertyManagerController extends BaseController
} }
/** /**
* 删除资产登记 * 删除密品登记
*/ */
@RequiresPermissions("system:property:remove") @RequiresPermissions("system:property:remove")
@Log(title = "资产登记", businessType = BusinessType.DELETE) @Log(title = "密品登记", businessType = BusinessType.DELETE)
@PostMapping( "/remove") @PostMapping( "/remove")
@ResponseBody @ResponseBody
public AjaxResult remove(String ids) public AjaxResult remove(String ids)
@ -149,7 +149,7 @@ public class TdPropertyManagerController extends BaseController
} }
/** /**
* 添加资产条目 * 添加密品条目
*/ */
@RequiresPermissions("system:property:list") @RequiresPermissions("system:property:list")
@GetMapping("/detail/{useId}") @GetMapping("/detail/{useId}")

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

@ -89,9 +89,9 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label is-required">资产检查：</label> <label class="col-sm-2 control-label is-required">密品检查：</label>
<div class="col-sm-10"> <div class="col-sm-10">
<textarea name="checkcontentrysb" placeholder="请输入资产检查" required class="form-control" ></textarea> <textarea name="checkcontentrysb" placeholder="请输入密品检查" required class="form-control" ></textarea>
</div> </div>
</div> </div>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/check/detail.html
Unescape View File

@ -90,7 +90,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">资产检查：</label> <label class="col-sm-2 control-label">密品检查：</label>
<div class="col-sm-10"> <div class="col-sm-10">
<textarea name="checkcontentrysb" disabled th:field="*{checkcontentrysb}" class="form-control" ></textarea> <textarea name="checkcontentrysb" disabled th:field="*{checkcontentrysb}" class="form-control" ></textarea>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/check/edit.html
Unescape View File

@ -90,7 +90,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label is-required">资产检查：</label> <label class="col-sm-2 control-label is-required">密品检查：</label>
<div class="col-sm-10"> <div class="col-sm-10">
<textarea name="checkcontentrysb" required th:field="*{checkcontentrysb}" class="form-control" ></textarea> <textarea name="checkcontentrysb" required th:field="*{checkcontentrysb}" class="form-control" ></textarea>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html
Unescape View File

@ -80,7 +80,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label is-required">资产检查：</label> <label class="col-sm-2 control-label is-required">密品检查：</label>
<div class="col-sm-10"> <div class="col-sm-10">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
<input type="radio" required th:id="${'checkcontentrysbjt_' + dict.dictCode}" name="checkcontentrysbjt" th:value="${dict.dictValue}" th:field="*{checkcontentrysbjt}"> <input type="radio" required th:id="${'checkcontentrysbjt_' + dict.dictCode}" name="checkcontentrysbjt" th:value="${dict.dictValue}" th:field="*{checkcontentrysbjt}">

2
ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html
Unescape View File

@ -1495,7 +1495,7 @@
</tr> </tr>
<tr height=70 style='mso-height-source:userset;height:53pt' id='r5'> <tr height=70 style='mso-height-source:userset;height:53pt' id='r5'>
<td height=68 class=x67 style='height:51.5pt;'>三</td> <td height=68 class=x67 style='height:51.5pt;'>三</td>
<td class=x66>资产检查</td> <td class=x66>密品检查</td>
<td class=x66 style="overflow-wrap: break-word;white-space: pre-line;word-wrap: break-word;">[[${tdCheckResult.checkcontentrysb}]]</td> <td class=x66 style="overflow-wrap: break-word;white-space: pre-line;word-wrap: break-word;">[[${tdCheckResult.checkcontentrysb}]]</td>
<td class=x66 th:text="${tdCheckResult.checkresult3} == '0' ? '合格' : '不合格'"></td> <td class=x66 th:text="${tdCheckResult.checkresult3} == '0' ? '合格' : '不合格'"></td>
<td class=x66 style="overflow-wrap: break-word;white-space: pre-line;word-wrap: break-word;">[[${tdCheckResult.remark3}]]</td> <td class=x66 style="overflow-wrap: break-word;white-space: pre-line;word-wrap: break-word;">[[${tdCheckResult.remark3}]]</td>

2
ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html
Unescape View File

@ -169,7 +169,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="form-group"> <div class="form-group">
<label class="col-xs-2 control-label is-required">资产检查：</label> <label class="col-xs-2 control-label is-required">密品检查：</label>
<div class="col-xs-10"> <div class="col-xs-10">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
<input type="radio" th:id="${'checkresult3_' + dict.dictCode}" name="checkresult3" th:value="${dict.dictValue}" th:field="*{checkresult3}"> <input type="radio" th:id="${'checkresult3_' + dict.dictCode}" name="checkresult3" th:value="${dict.dictValue}" th:field="*{checkresult3}">

2
ruoyi-admin/src/main/resources/templates/system/elExam/exam/exam.html
Unescape View File

@ -131,7 +131,7 @@
$.table.init(options); $.table.init(options);
}); });
/*资产列表-详细*/ /*列表-详细*/
function detail(id) { function detail(id) {
var url = prefixUser + '/toExam/' + id; var url = prefixUser + '/toExam/' + id;
$.modal.openTab("考试人员", url); $.modal.openTab("考试人员", url);

4
ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html
Unescape View File

@ -85,14 +85,14 @@
$.table.init(options); $.table.init(options);
}); });
/*资产列表-详细*/ /*列表-详细*/
function detail(id,userId) { function detail(id,userId) {
var url = prefix + '/detail/' + id +'/'+userId; var url = prefix + '/detail/' + id +'/'+userId;
$.modal.openNOButton("考试明细", url); $.modal.openNOButton("考试明细", url);
} }
/*资产列表-详细*/ /*列表-详细*/
function toBook(id) { function toBook(id) {
var url = prefixBook + '/toBook/' + id; var url = prefixBook + '/toBook/' + id;
$.modal.openTab("考试错题", url); $.modal.openTab("考试错题", url);

2
ruoyi-admin/src/main/resources/templates/system/elExam/userExam/userExam.html
Unescape View File

@ -97,7 +97,7 @@
return search; return search;
} }
/*资产列表-详细*/ /*列表-详细*/
function detail(id,userId) { function detail(id,userId) {
var url = prefix + '/detail/' + id +'/'+userId; var url = prefix + '/detail/' + id +'/'+userId;
$.modal.openNOButton("考试明细", url); $.modal.openNOButton("考试明细", url);

2
ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html
Unescape View File

@ -91,7 +91,7 @@
}); });
/*资产列表-详细*/ /*列表-详细*/
function detail(id,userId) { function detail(id,userId) {
var url = prefixUser + '/detail/' + id +'/'+userId; var url = prefixUser + '/detail/' + id +'/'+userId;
$.modal.openNOButton("考试明细", url); $.modal.openNOButton("考试明细", url);

2
ruoyi-admin/src/main/resources/templates/system/network/networknum/print.html
Unescape View File

@ -1663,7 +1663,7 @@
<td class=x77 style="font-weight: bold">品牌</td> <td class=x77 style="font-weight: bold">品牌</td>
<td class=x77 style="font-weight: bold">型号</td> <td class=x77 style="font-weight: bold">型号</td>
<td class=x77 style="font-weight: bold">Ip地址</td> <td class=x77 style="font-weight: bold">Ip地址</td>
<td class=x77 style="font-weight: bold">资产SN码</td> <td class=x77 style="font-weight: bold">设备SN码</td>
<td class=x77 style="font-weight: bold">备注信息</td> <td class=x77 style="font-weight: bold">备注信息</td>
</tr> </tr>
<![if supportMisalignedColumns]> <![if supportMisalignedColumns]>

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

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('新增资产管理')" /> <th:block th:include="include :: header('新增密品管理')" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
@ -9,7 +9,7 @@
<form class="form-horizontal m" id="form-propertyinfo-add"> <form class="form-horizontal m" id="form-propertyinfo-add">
<input name="useId" class="form-control" type="hidden" th:value="${useId}"> <input name="useId" class="form-control" type="hidden" th:value="${useId}">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产种类：</label> <label class="col-sm-3 control-label is-required">密品种类：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="propertyType" id="select1" required 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 value="">---请选择---</option> <option value="">---请选择---</option>
@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -60,7 +60,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required ">资产型号：</label> <label class="col-sm-3 control-label is-required ">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -105,7 +105,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -134,7 +134,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -163,7 +163,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -192,7 +192,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -220,7 +220,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -248,7 +248,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -276,7 +276,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -304,7 +304,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -332,7 +332,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -360,7 +360,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -388,7 +388,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>
@ -416,7 +416,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产型号：</label> <label class="col-sm-3 control-label is-required">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" required class="form-control" type="text"> <input name="propertyNo" required class="form-control" type="text">
</div> </div>

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

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('修改资产管理')" /> <th:block th:include="include :: header('修改密品管理')" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
@ -10,7 +10,7 @@
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<input name="useId" class="form-control" th:field="*{useId}" type="hidden"> <input name="useId" class="form-control" th:field="*{useId}" type="hidden">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产种类：</label> <label class="col-sm-3 control-label">密品种类：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="propertyType" id="select1" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}"> <select name="propertyType" id="select1" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:field="*{propertyType}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:field="*{propertyType}" th:value="${dict.dictValue}"></option>
@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -60,7 +60,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -104,7 +104,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -133,7 +133,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -162,7 +162,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -191,7 +191,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -219,7 +219,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -247,7 +247,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -275,7 +275,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -303,7 +303,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -331,7 +331,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -359,7 +359,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -387,7 +387,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -415,7 +415,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
@ -435,7 +435,7 @@
</div> </div>
<!--其他结束--> <!--其他结束-->
<!-- <div class="form-group"> --> <!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">资产编号：</label>--> <!-- <label class="col-sm-3 control-label">密品编号：</label>-->
<!-- <div class="col-sm-8">--> <!-- <div class="col-sm-8">-->
<!-- <input name="useId" th:field="*{useId}" class="form-control" type="text">--> <!-- <input name="useId" th:field="*{useId}" class="form-control" type="text">-->
<!-- </div>--> <!-- </div>-->
@ -461,7 +461,7 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="form-group"> --> <!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">资产种类：</label>--> <!-- <label class="col-sm-3 control-label">密品种类：</label>-->
<!-- <div class="col-sm-8">--> <!-- <div class="col-sm-8">-->
<!-- <select name="propertyType" class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}">--> <!-- <select name="propertyType" class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{propertyType}"></option>--> <!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{propertyType}"></option>-->
@ -469,13 +469,13 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="form-group"> --> <!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">资产型号：</label>--> <!-- <label class="col-sm-3 control-label">密品型号：</label>-->
<!-- <div class="col-sm-8">--> <!-- <div class="col-sm-8">-->
<!-- <input name="propertyNo" th:field="*{propertyNo}" class="form-control" type="text">--> <!-- <input name="propertyNo" th:field="*{propertyNo}" class="form-control" type="text">-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="form-group"> --> <!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">资产名称：</label>--> <!-- <label class="col-sm-3 control-label">密品名称：</label>-->
<!-- <div class="col-sm-8">--> <!-- <div class="col-sm-8">-->
<!-- <input name="propertyName" th:field="*{propertyName}" class="form-control" type="text">--> <!-- <input name="propertyName" th:field="*{propertyName}" class="form-control" type="text">-->
<!-- </div>--> <!-- </div>-->
@ -487,7 +487,7 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="form-group"> --> <!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">资产密级：</label>--> <!-- <label class="col-sm-3 control-label">密品密级：</label>-->
<!-- <div class="col-sm-8">--> <!-- <div class="col-sm-8">-->
<!-- <select name="propertyMiji" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">--> <!-- <select name="propertyMiji" 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}" th:field="*{propertyMiji}"></option>--> <!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{propertyMiji}"></option>-->

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

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('资产管理列表')" /> <th:block th:include="include :: header('密品管理列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div" id="app"> <div class="container-div" id="app">
@ -16,7 +16,7 @@
<input type="hidden" name="useId" th:value="*{useId}"/> <input type="hidden" name="useId" th:value="*{useId}"/>
</li> </li>
<li> <li>
<label>资产种类：</label> <label>密品种类：</label>
<select name="propertyType" th:with="type=${@dict.getType('sys_sm_property')}"> <select name="propertyType" th:with="type=${@dict.getType('sys_sm_property')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@ -83,7 +83,7 @@
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
queryParams: queryParams, queryParams: queryParams,
modalName: "资产管理", modalName: "密品管理",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
@ -93,7 +93,7 @@
}, },
// { // {
// field: 'useId', // field: 'useId',
// title: '资产编号' // title: '密品编号'
// }, // },
{ {
field: 'propertyBrand', field: 'propertyBrand',
@ -101,7 +101,7 @@
}, },
{ {
field: 'propertyType', field: 'propertyType',
title: '资产种类', title: '密品种类',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(propertyTypeDatas, value); return $.table.selectDictLabel(propertyTypeDatas, value);
} }
@ -112,7 +112,7 @@
}, },
{ {
field: 'propertyNo', field: 'propertyNo',
title: '资产型号' title: '密品型号'
}, },
{ {
field: 'propertySn', field: 'propertySn',
@ -120,7 +120,7 @@
}, },
{ {
field: 'propertyName', field: 'propertyName',
title: '资产名称' title: '密品名称'
}, },
{ {
field: 'part', field: 'part',

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

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('新增资产登记')" /> <th:block th:include="include :: header('新增密品登记')" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
@ -81,7 +81,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产数量：</label> <label class="col-sm-3 control-label is-required">密品数量：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNum" digits="true" class="form-control" type="text" required> <input name="propertyNum" digits="true" class="form-control" type="text" required>
</div> </div>

6
ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('修改资产登记')" /> <th:block th:include="include :: header('修改密品登记')" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
@ -9,7 +9,7 @@
<form class="form-horizontal m" id="form-property-edit" th:object="${tdPropertyManager}"> <form class="form-horizontal m" id="form-property-edit" th:object="${tdPropertyManager}">
<input name="useId" th:field="*{useId}" type="hidden"> <input name="useId" th:field="*{useId}" type="hidden">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产编号：</label> <label class="col-sm-3 control-label is-required">密品编号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input disabled name="useId" required th:field="*{useId}" class="form-control" type="text"> <input disabled name="useId" required th:field="*{useId}" class="form-control" type="text">
</div> </div>
@ -89,7 +89,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">资产数量：</label> <label class="col-sm-3 control-label is-required">密品数量：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNum" required digits="true" th:field="*{propertyNum}" class="form-control" type="text"> <input name="propertyNum" required digits="true" th:field="*{propertyNum}" class="form-control" type="text">
</div> </div>

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

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('资产登记列表')" /> <th:block th:include="include :: header('密品登记列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div" id="app"> <div class="container-div" id="app">
@ -15,7 +15,7 @@
<input type="text" name="frameworkId"/> <input type="text" name="frameworkId"/>
</li> </li>
<li> <li>
<label>资产编号：</label> <label>密品编号：</label>
<input type="text" name="useId"/> <input type="text" name="useId"/>
</li> </li>
<li> <li>
@ -77,13 +77,13 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "资产登记", modalName: "密品登记",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'useId', field: 'useId',
title: '资产编号' title: '密品编号'
}, },
{ {
field: 'part', field: 'part',
@ -171,10 +171,10 @@
} }
} }
}) })
/*资产列表-详细*/ /*密品列表-详细*/
function detail(useId) { function detail(useId) {
var url = prefix + '/detail/' + useId; var url = prefix + '/detail/' + useId;
$.modal.openTab("资产列表数据", url); $.modal.openTab("密品列表数据", url);
} }
</script> </script>
</body> </body>

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

@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产编号：</label> <label class="col-sm-3 control-label">密品编号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="useId" disabled th:field="*{useId}" class="form-control" type="text"> <input name="useId" disabled th:field="*{useId}" class="form-control" type="text">
</div> </div>
@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产种类：</label> <label class="col-sm-3 control-label">密品种类：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="propertyType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}"> <select name="propertyType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}">
<option value="">---请选择---</option> <option value="">---请选择---</option>
@ -36,13 +36,13 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="propertySn" disabled th:field="*{propertySn}" class="form-control" type="text"> <input name="propertySn" disabled th:field="*{propertySn}" class="form-control" type="text">
</div> </div>

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

@ -19,7 +19,7 @@
<input type="text" name="propertyBrand"/> <input type="text" name="propertyBrand"/>
</li> </li>
<li> <li>
<label>资产型号：</label> <label>密品型号：</label>
<input type="text" name="propertyNo"/> <input type="text" name="propertyNo"/>
</li> </li>
<li> <li>
@ -68,18 +68,18 @@
}, },
{ {
field: 'propertyType', field: 'propertyType',
title: '资产种类', title: '密品种类',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(propertyTypeDatas, value); return $.table.selectDictLabel(propertyTypeDatas, value);
} }
}, },
{ {
field: 'propertyNo', field: 'propertyNo',
title: '资产型号' title: '密品型号'
}, },
{ {
field: 'propertySn', field: 'propertySn',
title: '资产SN码' title: '密品SN码'
}, },
{ {
field: 'destoryType', field: 'destoryType',
@ -116,7 +116,7 @@
function destory(id) { function destory(id) {
var url = prefix + '/destory/' + id; var url = prefix + '/destory/' + id;
$.modal.open("资产报废", url); $.modal.open("密品报废", url);
} }
</script> </script>
</body> </body>

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

@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产编号：</label> <label class="col-sm-3 control-label">密品编号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="useId" disabled th:field="*{useId}" class="form-control" type="text"> <input name="useId" disabled th:field="*{useId}" class="form-control" type="text">
</div> </div>
@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产种类：</label> <label class="col-sm-3 control-label">密品种类：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="propertyType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}"> <select name="propertyType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}">
<option value="">---请选择---</option> <option value="">---请选择---</option>
@ -36,13 +36,13 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="propertySn" disabled th:field="*{propertySn}" class="form-control" type="text"> <input name="propertySn" disabled th:field="*{propertySn}" class="form-control" type="text">
</div> </div>

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

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('资产登记列表')" /> <th:block th:include="include :: header('密品登记列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div" id="app"> <div class="container-div" id="app">
@ -15,7 +15,7 @@
<input type="text" name="frameworkId"/> <input type="text" name="frameworkId"/>
</li> </li>
<li> <li>
<label>资产编号：</label> <label>密品编号：</label>
<input type="text" name="useId"/> <input type="text" name="useId"/>
</li> </li>
<li> <li>
@ -64,11 +64,11 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "资产登记", modalName: "密品登记",
columns: [ columns: [
{ {
field: 'useId', field: 'useId',
title: '资产编号' title: '密品编号'
}, },
{ {
field: 'part', field: 'part',
@ -154,10 +154,10 @@
} }
} }
}) })
/*资产列表-详细*/ /*密品列表-详细*/
function detail(useId) { function detail(useId) {
var url = prefix + '/detail/' + useId; var url = prefix + '/detail/' + useId;
$.modal.openTab("资产列表数据", url); $.modal.openTab("密品列表数据", url);
} }
</script> </script>
</body> </body>

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

@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产编号：</label> <label class="col-sm-3 control-label">密品编号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="useId" disabled th:field="*{useId}" class="form-control" type="text"> <input name="useId" disabled th:field="*{useId}" class="form-control" type="text">
</div> </div>
@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产种类：</label> <label class="col-sm-3 control-label">密品种类：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="propertyType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}"> <select name="propertyType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}">
<option value="">---请选择---</option> <option value="">---请选择---</option>
@ -36,13 +36,13 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">资产型号：</label> <label class="col-sm-3 control-label">密品型号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text"> <input name="propertyNo" disabled th:field="*{propertyNo}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="propertySn" disabled th:field="*{propertySn}" class="form-control" type="text"> <input name="propertySn" disabled th:field="*{propertySn}" class="form-control" type="text">
</div> </div>

10
ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destoryproperty.html
Unescape View File

@ -19,7 +19,7 @@
<input type="text" name="propertyBrand"/> <input type="text" name="propertyBrand"/>
</li> </li>
<li> <li>
<label>资产型号：</label> <label>密品型号：</label>
<input type="text" name="propertyNo"/> <input type="text" name="propertyNo"/>
</li> </li>
<li> <li>
@ -68,18 +68,18 @@
}, },
{ {
field: 'propertyType', field: 'propertyType',
title: '资产种类', title: '密品种类',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(propertyTypeDatas, value); return $.table.selectDictLabel(propertyTypeDatas, value);
} }
}, },
{ {
field: 'propertyNo', field: 'propertyNo',
title: '资产型号' title: '密品型号'
}, },
{ {
field: 'propertySn', field: 'propertySn',
title: '资产SN码' title: '密品SN码'
}, },
{ {
field: 'destoryState', field: 'destoryState',
@ -110,7 +110,7 @@
function destory(id) { function destory(id) {
var url = prefix + '/destory/' + id; var url = prefix + '/destory/' + id;
$.modal.open("资产报废", url); $.modal.open("密品报废", url);
} }
</script> </script>
</body> </body>

12
ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('资产登记列表')" /> <th:block th:include="include :: header('密品登记列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div" id="app"> <div class="container-div" id="app">
@ -15,7 +15,7 @@
<input type="text" name="frameworkId"/> <input type="text" name="frameworkId"/>
</li> </li>
<li> <li>
<label>资产编号：</label> <label>密品编号：</label>
<input type="text" name="useId"/> <input type="text" name="useId"/>
</li> </li>
<li> <li>
@ -64,11 +64,11 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "资产登记", modalName: "密品登记",
columns: [ columns: [
{ {
field: 'useId', field: 'useId',
title: '资产编号' title: '密品编号'
}, },
{ {
field: 'part', field: 'part',
@ -154,10 +154,10 @@
} }
} }
}) })
/*资产列表-详细*/ /*密品列表-详细*/
function detail(useId) { function detail(useId) {
var url = prefix + '/detail/' + useId; var url = prefix + '/detail/' + useId;
$.modal.openTab("资产列表数据", url); $.modal.openTab("密品列表数据", url);
} }
</script> </script>
</body> </body>

22
ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html
Unescape View File

@ -1,10 +1,10 @@
<!doctype html public "-//w3c//dtd xhtml 1.0 transitional//en" "http://www.w3.org/tr/xhtml1/dtd/xhtml1-transitional.dtd"> <!doctype html public "-//w3c//dtd xhtml 1.0 transitional//en" "http://www.w3.org/tr/xhtml1/dtd/xhtml1-transitional.dtd">
<html <html>
xmlns="http://www.w3.org/TR/REC-html40"> <!-- xmlns="http://www.w3.org/TR/REC-html40">-->
<head> <head>
<th:block th:include="include :: header('涉密资产打印')" /> <th:block th:include="include :: header('密品打印')" />
<meta http-equiv=Content-Type content="text/html; charset=utf-8"> <meta http-equiv=Content-Type content="text/html; charset=utf-8">
<meta name=ProgId content=Excel.Sheet> <meta name=ProgId content=Excel.Sheet>
<meta name=Generator content="Aspose.Cell "> <meta name=Generator content="Aspose.Cell ">
@ -721,7 +721,7 @@
<col width=131 style='mso-width-source:userset;width:157.25pt'> <col width=131 style='mso-width-source:userset;width:157.25pt'>
<col width=219 style='mso-width-source:userset;width:164.25pt'> <col width=219 style='mso-width-source:userset;width:164.25pt'>
<tr height=55 style='mso-height-source:userset;height:41.5pt' id='r0'> <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r0'>
<td colspan=7 height=53 class=x24 width=1024 style='border:none;height:40pt;'>[[${sysuser.dept.deptName}]]资产统计信息表</td> <td colspan=7 height=53 class=x24 width=1024 style='border:none;height:40pt;'>[[${sysuser.dept.deptName}]]密品统计信息表</td>
</tr> </tr>
<tr height=55 style='mso-height-source:userset;height:41.5pt' id='r1'> <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r1'>
<td colspan=2 height=53 class=x27 style='border-bottom:1px solid windowtext;border-top:none;border-left:none;height:40pt;'>单位：[[${sysuser.dept.deptName}]]</td> <td colspan=2 height=53 class=x27 style='border-bottom:1px solid windowtext;border-top:none;border-left:none;height:40pt;'>单位：[[${sysuser.dept.deptName}]]</td>
@ -751,17 +751,17 @@
<td height=53 class=x21 style='height:40pt;'>接收时间</td> <td height=53 class=x21 style='height:40pt;'>接收时间</td>
<td class=x21 id="useDate">[[${tdPropertyManager.useDate}]]</td> <td class=x21 id="useDate">[[${tdPropertyManager.useDate}]]</td>
<td class=x21>登记编号</td> <td class=x21>登记编号</td>
<td colspan=2 class=x22 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdPropertyInfos[0].useId}]]</td> <td colspan=2 class=x22 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdPropertyManager.useId}]]</td>
<td class=x21>资产总数</td> <td class=x21>密品总数</td>
<td class=x21>[[${tdPropertyManager.propertyNum}]]</td> <td class=x21>[[${tdPropertyManager.propertyNum}]]</td>
</tr> </tr>
<tr height=55 style='mso-height-source:userset;height:41.5pt;font-weight: bold' id='r5'> <tr height=55 style='mso-height-source:userset;height:41.5pt;font-weight: bold' id='r5'>
<td height=53 class=x21 style='height:40pt;font-weight: bold'>资产编号</td> <td height=53 class=x21 style='height:40pt;font-weight: bold'>密品编号</td>
<td class=x21 style="font-weight: bold">资产名称</td> <td class=x21 style="font-weight: bold">密品名称</td>
<td class=x21 style="font-weight: bold">品牌</td> <td class=x21 style="font-weight: bold">品牌</td>
<td class=x21 style="font-weight: bold">型号</td> <td class=x21 style="font-weight: bold">型号</td>
<td class=x21 style="font-weight: bold">资产SN码</td> <td class=x21 style="font-weight: bold">密品SN码</td>
<td class=x21 style="font-weight: bold">资产种类</td> <td class=x21 style="font-weight: bold">密品种类</td>
<td class=x21 style="font-weight: bold">备注信息</td> <td class=x21 style="font-weight: bold">备注信息</td>
</tr> </tr>
<tr height=55 style='mso-height-source:userset;height:41.5pt' id='r6' th:each="propertynum : ${tdPropertyInfos}"> <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r6' th:each="propertynum : ${tdPropertyInfos}">
@ -796,7 +796,7 @@
document.querySelector('#recoverDate').innerHTML =conversionDate(new Date(document.querySelector('#recoverDate').innerHTML)) document.querySelector('#recoverDate').innerHTML =conversionDate(new Date(document.querySelector('#recoverDate').innerHTML))
document.querySelector('#useDate').innerHTML =conversionDate(new Date(document.querySelector('#useDate').innerHTML)) document.querySelector('#useDate').innerHTML =conversionDate(new Date(document.querySelector('#useDate').innerHTML))
//资产种类 //密品种类
var examinestateDatas = [[${@dict.getType('sys_sm_property')}]]; var examinestateDatas = [[${@dict.getType('sys_sm_property')}]];
var examinestateToFind = []; var examinestateToFind = [];
document.querySelectorAll('.propertyType').forEach(function(element) { document.querySelectorAll('.propertyType').forEach(function(element) {

12
ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('涉密资产统计')" /> <th:block th:include="include :: header('密品统计')" />
</head> </head>
<style> <style>
.echart{ .echart{
@ -96,7 +96,7 @@
<input type="text" name="frameworkId"/> <input type="text" name="frameworkId"/>
</li> </li>
<li> <li>
<label>资产编号：</label> <label>密品编号：</label>
<input type="text" name="useId"/> <input type="text" name="useId"/>
</li> </li>
<li> <li>
@ -196,12 +196,12 @@
$(function() { $(function() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
modalName: "资产登记", modalName: "密品登记",
pageSize:'5', pageSize:'5',
columns: [ columns: [
{ {
field: 'useId', field: 'useId',
title: '资产编号' title: '密品编号'
}, },
{ {
field: 'part', field: 'part',
@ -245,7 +245,7 @@
}; };
$.table.init(options); $.table.init(options);
}); });
/*资产列表-详细*/ /*密品列表-详细*/
function print(useId) { function print(useId) {
var url = prefix + '/print/' + useId; var url = prefix + '/print/' + useId;
$.modal.openTab("打印", url); $.modal.openTab("打印", url);
@ -255,7 +255,7 @@
if (response.data.code == web_status.SUCCESS){ if (response.data.code == web_status.SUCCESS){
myChart.setOption({ myChart.setOption({
title: { title: {
text: '资产种类统计' text: '密品种类统计'
}, },
tooltip: {}, tooltip: {},
legend: { legend: {

8
ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java
Unescape View File

@ -99,12 +99,12 @@ public class TdCheck extends BaseEntity
@Excel(name = "文件状态") @Excel(name = "文件状态")
private String checkcontentrywjjt; private String checkcontentrywjjt;
/** 资产检查 */ /** 密品检查 */
@Excel(name = "资产检查") @Excel(name = "密品检查")
private String checkcontentrysb; private String checkcontentrysb;
/** 资产状态 */ /** 密品状态 */
@Excel(name = "资产状态") @Excel(name = "密品状态")
private String checkcontentrysbjt; private String checkcontentrysbjt;
/** 管理制度检查 */ /** 管理制度检查 */

22
ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java
Unescape View File

@ -8,7 +8,7 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 资产管理对象 td_property_info * 密品管理对象 td_property_info
* *
* @author ruoyi * @author ruoyi
* @date 2024-04-29 * @date 2024-04-29
@ -20,8 +20,8 @@ public class TdPropertyInfo extends BaseEntity
/** 登记编号 */ /** 登记编号 */
private String id; private String id;
/** 资产编号 */ /** 密品编号 */
@Excel(name = "资产编号") @Excel(name = "密品编号")
private String useId; private String useId;
/** 设备品牌 */ /** 设备品牌 */
@ -36,24 +36,24 @@ public class TdPropertyInfo extends BaseEntity
@Excel(name = "涉密网络终端") @Excel(name = "涉密网络终端")
private String propertyNetstyle; private String propertyNetstyle;
/** 资产种类 */ /** 密品种类 */
@Excel(name = "资产种类", readConverterExp = "0=单项导入设备,1=涉密计算机,2=移动硬盘,3=涉密U盘,4=复印机,5=打印机,6=录音带,7=录像带,8=传真机,9=照相机,10=录音笔,11=光盘,12=软盘,13=其他") @Excel(name = "密品种类", readConverterExp = "0=单项导入设备,1=涉密计算机,2=移动硬盘,3=涉密U盘,4=复印机,5=打印机,6=录音带,7=录像带,8=传真机,9=照相机,10=录音笔,11=光盘,12=软盘,13=其他")
private String propertyType; private String propertyType;
/** 资产型号 */ /** 密品型号 */
@Excel(name = "资产型号") @Excel(name = "密品型号")
private String propertyNo; private String propertyNo;
/** 资产名称 */ /** 密品名称 */
@Excel(name = "资产名称") @Excel(name = "密品名称")
private String propertyName; private String propertyName;
/** 计算机类型 */ /** 计算机类型 */
@Excel(name = "计算机类型") @Excel(name = "计算机类型")
private String computerType; private String computerType;
/** 资产密级 */ /** 密品密级 */
@Excel(name = "资产密级") @Excel(name = "密品密级")
private String propertyMiji; private String propertyMiji;
/** 设备SN */ /** 设备SN */

4
ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyManager.java
Unescape View File

@ -17,8 +17,8 @@ public class TdPropertyManager extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 资产编号 */ /** 密品编号 */
@Excel(name = "资产编号") @Excel(name = "密品编号")
private String useId; private String useId;
/** 下属部门 */ /** 下属部门 */

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java
Unescape View File

@ -33,7 +33,7 @@ public class TdTrain extends BaseEntity
private String trainType; private String trainType;
/** 培训对象 */ /** 培训对象 */
@Excel(name = "培训对象",readConverterExp = "0=涉密文件,1=涉密设备,2=涉密资产3=涉密人员") @Excel(name = "培训对象",readConverterExp = "0=涉密文件,1=涉密设备,2=密品3=涉密人员")
private String trainSubject; private String trainSubject;
/** 培训地点 */ /** 培训地点 */

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/count/PropertyDesCountDTO.java
Unescape View File

@ -7,7 +7,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@Data @Data
@ApiModel(value="资产销毁统计", description="资产销毁统计") @ApiModel(value="密品销毁统计", description="密品销毁统计")
public class PropertyDesCountDTO implements Serializable { public class PropertyDesCountDTO implements Serializable {
@ApiModelProperty(value = "未销毁") @ApiModelProperty(value = "未销毁")

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/count/PropertyStateCountDTO.java
Unescape View File

@ -7,7 +7,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@Data @Data
@ApiModel(value="资产报废统计", description="资产报废统计") @ApiModel(value="密品报废统计", description="密品报废统计")
public class PropertyStateCountDTO implements Serializable { public class PropertyStateCountDTO implements Serializable {
@ApiModelProperty(value = "未报废") @ApiModelProperty(value = "未报废")

28
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyInfoMapper.java
Unescape View File

@ -9,7 +9,7 @@ import com.ruoyi.system.domain.count.PropertyStateCountDTO;
import com.ruoyi.system.domain.count.UserCountDTO; import com.ruoyi.system.domain.count.UserCountDTO;
/** /**
* 资产管理Mapper接口 * 密品管理Mapper接口
* *
* @author ruoyi * @author ruoyi
* @date 2024-04-29 * @date 2024-04-29
@ -17,49 +17,49 @@ import com.ruoyi.system.domain.count.UserCountDTO;
public interface TdPropertyInfoMapper extends BaseMapper<TdPropertyInfo> public interface TdPropertyInfoMapper extends BaseMapper<TdPropertyInfo>
{ {
/** /**
* 查询资产管理 * 查询密品管理
* *
* @param id 资产管理主键 * @param id 密品管理主键
* @return 资产管理 * @return 密品管理
*/ */
public TdPropertyInfo selectTdPropertyInfoById(String id); public TdPropertyInfo selectTdPropertyInfoById(String id);
public List<TdPropertyInfo> selectTdPropertyInfoByUseId(String id); public List<TdPropertyInfo> selectTdPropertyInfoByUseId(String id);
/** /**
* 查询资产管理列表 * 查询密品管理列表
* *
* @param tdPropertyInfo 资产管理 * @param tdPropertyInfo 密品管理
* @return 资产管理集合 * @return 密品管理集合
*/ */
public List<TdPropertyInfo> selectTdPropertyInfoList(TdPropertyInfo tdPropertyInfo); public List<TdPropertyInfo> selectTdPropertyInfoList(TdPropertyInfo tdPropertyInfo);
/** /**
* 新增资产管理 * 新增密品管理
* *
* @param tdPropertyInfo 资产管理 * @param tdPropertyInfo 密品管理
* @return 结果 * @return 结果
*/ */
public int insertTdPropertyInfo(TdPropertyInfo tdPropertyInfo); public int insertTdPropertyInfo(TdPropertyInfo tdPropertyInfo);
/** /**
* 修改资产管理 * 修改密品管理
* *
* @param tdPropertyInfo 资产管理 * @param tdPropertyInfo 密品管理
* @return 结果 * @return 结果
*/ */
public int updateTdPropertyInfo(TdPropertyInfo tdPropertyInfo); public int updateTdPropertyInfo(TdPropertyInfo tdPropertyInfo);
/** /**
* 删除资产管理 * 删除密品管理
* *
* @param id 资产管理主键 * @param id 密品管理主键
* @return 结果 * @return 结果
*/ */
public int deleteTdPropertyInfoById(String id); public int deleteTdPropertyInfoById(String id);
/** /**
* 批量删除资产管理 * 批量删除密品管理
* *
* @param ids 需要删除的数据主键集合 * @param ids 需要删除的数据主键集合
* @return 结果 * @return 结果

28
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java
Unescape View File

@ -4,7 +4,7 @@ import java.util.List;
import com.ruoyi.system.domain.TdPropertyManager; import com.ruoyi.system.domain.TdPropertyManager;
/** /**
* 资产登记Mapper接口 * 密品登记Mapper接口
* *
* @author ruoyi * @author ruoyi
* @date 2024-04-26 * @date 2024-04-26
@ -12,47 +12,47 @@ import com.ruoyi.system.domain.TdPropertyManager;
public interface TdPropertyManagerMapper public interface TdPropertyManagerMapper
{ {
/** /**
* 查询资产登记 * 查询密品登记
* *
* @param useId 资产登记主键 * @param useId 密品登记主键
* @return 资产登记 * @return 密品登记
*/ */
public TdPropertyManager selectTdPropertyManagerByUseId(String useId); public TdPropertyManager selectTdPropertyManagerByUseId(String useId);
/** /**
* 查询资产登记列表 * 查询密品登记列表
* *
* @param tdPropertyManager 资产登记 * @param tdPropertyManager 密品登记
* @return 资产登记集合 * @return 密品登记集合
*/ */
public List<TdPropertyManager> selectTdPropertyManagerList(TdPropertyManager tdPropertyManager); public List<TdPropertyManager> selectTdPropertyManagerList(TdPropertyManager tdPropertyManager);
/** /**
* 新增资产登记 * 新增密品登记
* *
* @param tdPropertyManager 资产登记 * @param tdPropertyManager 密品登记
* @return 结果 * @return 结果
*/ */
public int insertTdPropertyManager(TdPropertyManager tdPropertyManager); public int insertTdPropertyManager(TdPropertyManager tdPropertyManager);
/** /**
* 修改资产登记 * 修改密品登记
* *
* @param tdPropertyManager 资产登记 * @param tdPropertyManager 密品登记
* @return 结果 * @return 结果
*/ */
public int updateTdPropertyManager(TdPropertyManager tdPropertyManager); public int updateTdPropertyManager(TdPropertyManager tdPropertyManager);
/** /**
* 删除资产登记 * 删除密品登记
* *
* @param useId 资产登记主键 * @param useId 密品登记主键
* @return 结果 * @return 结果
*/ */
public int deleteTdPropertyManagerByUseId(String useId); public int deleteTdPropertyManagerByUseId(String useId);
/** /**
* 批量删除资产登记 * 批量删除密品登记
* *
* @param useIds 需要删除的数据主键集合 * @param useIds 需要删除的数据主键集合
* @return 结果 * @return 结果

30
ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyInfoService.java
Unescape View File

@ -9,7 +9,7 @@ import com.ruoyi.system.domain.count.PropertyStateCountDTO;
import com.ruoyi.system.domain.count.UserCountDTO; import com.ruoyi.system.domain.count.UserCountDTO;
/** /**
* 资产管理Service接口 * 密品管理Service接口
* *
* @author ruoyi * @author ruoyi
* @date 2024-04-29 * @date 2024-04-29
@ -17,51 +17,51 @@ import com.ruoyi.system.domain.count.UserCountDTO;
public interface ITdPropertyInfoService extends IService<TdPropertyInfo> public interface ITdPropertyInfoService extends IService<TdPropertyInfo>
{ {
/** /**
* 查询资产管理 * 查询密品管理
* *
* @param id 资产管理主键 * @param id 密品管理主键
* @return 资产管理 * @return 密品管理
*/ */
public TdPropertyInfo selectTdPropertyInfoById(String id); public TdPropertyInfo selectTdPropertyInfoById(String id);
public List<TdPropertyInfo> selectTdPropertyInfoByUseId(String id); public List<TdPropertyInfo> selectTdPropertyInfoByUseId(String id);
/** /**
* 查询资产管理列表 * 查询密品管理列表
* *
* @param tdPropertyInfo 资产管理 * @param tdPropertyInfo 密品管理
* @return 资产管理集合 * @return 密品管理集合
*/ */
public List<TdPropertyInfo> selectTdPropertyInfoList(TdPropertyInfo tdPropertyInfo); public List<TdPropertyInfo> selectTdPropertyInfoList(TdPropertyInfo tdPropertyInfo);
/** /**
* 新增资产管理 * 新增密品管理
* *
* @param tdPropertyInfo 资产管理 * @param tdPropertyInfo 密品管理
* @return 结果 * @return 结果
*/ */
public int insertTdPropertyInfo(TdPropertyInfo tdPropertyInfo); public int insertTdPropertyInfo(TdPropertyInfo tdPropertyInfo);
/** /**
* 修改资产管理 * 修改密品管理
* *
* @param tdPropertyInfo 资产管理 * @param tdPropertyInfo 密品管理
* @return 结果 * @return 结果
*/ */
public int updateTdPropertyInfo(TdPropertyInfo tdPropertyInfo); public int updateTdPropertyInfo(TdPropertyInfo tdPropertyInfo);
/** /**
* 批量删除资产管理 * 批量删除密品管理
* *
* @param ids 需要删除的资产管理主键集合 * @param ids 需要删除的密品管理主键集合
* @return 结果 * @return 结果
*/ */
public int deleteTdPropertyInfoByIds(String ids); public int deleteTdPropertyInfoByIds(String ids);
/** /**
* 删除资产管理信息 * 删除密品管理信息
* *
* @param id 资产管理主键 * @param id 密品管理主键
* @return 结果 * @return 结果
*/ */
public int deleteTdPropertyInfoById(String id); public int deleteTdPropertyInfoById(String id);

30
ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java
Unescape View File

@ -4,7 +4,7 @@ import java.util.List;
import com.ruoyi.system.domain.TdPropertyManager; import com.ruoyi.system.domain.TdPropertyManager;
/** /**
* 资产登记Service接口 * 密品登记Service接口
* *
* @author ruoyi * @author ruoyi
* @date 2024-04-26 * @date 2024-04-26
@ -12,49 +12,49 @@ import com.ruoyi.system.domain.TdPropertyManager;
public interface ITdPropertyManagerService public interface ITdPropertyManagerService
{ {
/** /**
* 查询资产登记 * 查询密品登记
* *
* @param useId 资产登记主键 * @param useId 密品登记主键
* @return 资产登记 * @return 密品登记
*/ */
public TdPropertyManager selectTdPropertyManagerByUseId(String useId); public TdPropertyManager selectTdPropertyManagerByUseId(String useId);
/** /**
* 查询资产登记列表 * 查询密品登记列表
* *
* @param tdPropertyManager 资产登记 * @param tdPropertyManager 密品登记
* @return 资产登记集合 * @return 密品登记集合
*/ */
public List<TdPropertyManager> selectTdPropertyManagerList(TdPropertyManager tdPropertyManager); public List<TdPropertyManager> selectTdPropertyManagerList(TdPropertyManager tdPropertyManager);
/** /**
* 新增资产登记 * 新增密品登记
* *
* @param tdPropertyManager 资产登记 * @param tdPropertyManager 密品登记
* @return 结果 * @return 结果
*/ */
public int insertTdPropertyManager(TdPropertyManager tdPropertyManager); public int insertTdPropertyManager(TdPropertyManager tdPropertyManager);
/** /**
* 修改资产登记 * 修改密品登记
* *
* @param tdPropertyManager 资产登记 * @param tdPropertyManager 密品登记
* @return 结果 * @return 结果
*/ */
public int updateTdPropertyManager(TdPropertyManager tdPropertyManager); public int updateTdPropertyManager(TdPropertyManager tdPropertyManager);
/** /**
* 批量删除资产登记 * 批量删除密品登记
* *
* @param useIds 需要删除的资产登记主键集合 * @param useIds 需要删除的密品登记主键集合
* @return 结果 * @return 结果
*/ */
public int deleteTdPropertyManagerByUseIds(String useIds); public int deleteTdPropertyManagerByUseIds(String useIds);
/** /**
* 删除资产登记信息 * 删除密品登记信息
* *
* @param useId 资产登记主键 * @param useId 密品登记主键
* @return 结果 * @return 结果
*/ */
public int deleteTdPropertyManagerByUseId(String useId); public int deleteTdPropertyManagerByUseId(String useId);

30
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyInfoServiceImpl.java
Unescape View File

@ -13,7 +13,7 @@ import com.ruoyi.system.service.ITdPropertyInfoService;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
/** /**
* 资产管理Service业务层处理 * 密品管理Service业务层处理
* *
* @author ruoyi * @author ruoyi
* @date 2024-04-29 * @date 2024-04-29
@ -25,10 +25,10 @@ public class TdPropertyInfoServiceImpl extends ServiceImpl<TdPropertyInfoMapper,
private TdPropertyInfoMapper tdPropertyInfoMapper; private TdPropertyInfoMapper tdPropertyInfoMapper;
/** /**
* 查询资产管理 * 查询密品管理
* *
* @param id 资产管理主键 * @param id 密品管理主键
* @return 资产管理 * @return 密品管理
*/ */
@Override @Override
public TdPropertyInfo selectTdPropertyInfoById(String id) public TdPropertyInfo selectTdPropertyInfoById(String id)
@ -43,10 +43,10 @@ public class TdPropertyInfoServiceImpl extends ServiceImpl<TdPropertyInfoMapper,
} }
/** /**
* 查询资产管理列表 * 查询密品管理列表
* *
* @param tdPropertyInfo 资产管理 * @param tdPropertyInfo 密品管理
* @return 资产管理 * @return 密品管理
*/ */
@Override @Override
public List<TdPropertyInfo> selectTdPropertyInfoList(TdPropertyInfo tdPropertyInfo) public List<TdPropertyInfo> selectTdPropertyInfoList(TdPropertyInfo tdPropertyInfo)
@ -55,9 +55,9 @@ public class TdPropertyInfoServiceImpl extends ServiceImpl<TdPropertyInfoMapper,
} }
/** /**
* 新增资产管理 * 新增密品管理
* *
* @param tdPropertyInfo 资产管理 * @param tdPropertyInfo 密品管理
* @return 结果 * @return 结果
*/ */
@Override @Override
@ -67,9 +67,9 @@ public class TdPropertyInfoServiceImpl extends ServiceImpl<TdPropertyInfoMapper,
} }
/** /**
* 修改资产管理 * 修改密品管理
* *
* @param tdPropertyInfo 资产管理 * @param tdPropertyInfo 密品管理
* @return 结果 * @return 结果
*/ */
@Override @Override
@ -79,9 +79,9 @@ public class TdPropertyInfoServiceImpl extends ServiceImpl<TdPropertyInfoMapper,
} }
/** /**
* 批量删除资产管理 * 批量删除密品管理
* *
* @param ids 需要删除的资产管理主键 * @param ids 需要删除的密品管理主键
* @return 结果 * @return 结果
*/ */
@Override @Override
@ -91,9 +91,9 @@ public class TdPropertyInfoServiceImpl extends ServiceImpl<TdPropertyInfoMapper,
} }
/** /**
* 删除资产管理信息 * 删除密品管理信息
* *
* @param id 资产管理主键 * @param id 密品管理主键
* @return 结果 * @return 结果
*/ */
@Override @Override

30
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java
Unescape View File

@ -9,7 +9,7 @@ import com.ruoyi.system.service.ITdPropertyManagerService;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
/** /**
* 资产登记Service业务层处理 * 密品登记Service业务层处理
* *
* @author ruoyi * @author ruoyi
* @date 2024-04-26 * @date 2024-04-26
@ -21,10 +21,10 @@ public class TdPropertyManagerServiceImpl implements ITdPropertyManagerService
private TdPropertyManagerMapper tdPropertyManagerMapper; private TdPropertyManagerMapper tdPropertyManagerMapper;
/** /**
* 查询资产登记 * 查询密品登记
* *
* @param useId 资产登记主键 * @param useId 密品登记主键
* @return 资产登记 * @return 密品登记
*/ */
@Override @Override
public TdPropertyManager selectTdPropertyManagerByUseId(String useId) public TdPropertyManager selectTdPropertyManagerByUseId(String useId)
@ -33,10 +33,10 @@ public class TdPropertyManagerServiceImpl implements ITdPropertyManagerService
} }
/** /**
* 查询资产登记列表 * 查询密品登记列表
* *
* @param tdPropertyManager 资产登记 * @param tdPropertyManager 密品登记
* @return 资产登记 * @return 密品登记
*/ */
@Override @Override
public List<TdPropertyManager> selectTdPropertyManagerList(TdPropertyManager tdPropertyManager) public List<TdPropertyManager> selectTdPropertyManagerList(TdPropertyManager tdPropertyManager)
@ -45,9 +45,9 @@ public class TdPropertyManagerServiceImpl implements ITdPropertyManagerService
} }
/** /**
* 新增资产登记 * 新增密品登记
* *
* @param tdPropertyManager 资产登记 * @param tdPropertyManager 密品登记
* @return 结果 * @return 结果
*/ */
@Override @Override
@ -57,9 +57,9 @@ public class TdPropertyManagerServiceImpl implements ITdPropertyManagerService
} }
/** /**
* 修改资产登记 * 修改密品登记
* *
* @param tdPropertyManager 资产登记 * @param tdPropertyManager 密品登记
* @return 结果 * @return 结果
*/ */
@Override @Override
@ -69,9 +69,9 @@ public class TdPropertyManagerServiceImpl implements ITdPropertyManagerService
} }
/** /**
* 批量删除资产登记 * 批量删除密品登记
* *
* @param useIds 需要删除的资产登记主键 * @param useIds 需要删除的密品登记主键
* @return 结果 * @return 结果
*/ */
@Override @Override
@ -81,9 +81,9 @@ public class TdPropertyManagerServiceImpl implements ITdPropertyManagerService
} }
/** /**
* 删除资产登记信息 * 删除密品登记信息
* *
* @param useId 资产登记主键 * @param useId 密品登记主键
* @return 结果 * @return 结果
*/ */
@Override @Override

Write Preview
Loading…
Cancel
Save