diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdCaseManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdCaseManager.java index 7360d76..1372f4e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdCaseManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdCaseManager.java @@ -31,8 +31,6 @@ public class TdCaseManager { return caseService.selectTdCaseList(tdCase); } - - public boolean saveOrUpdate(TdCase tdCase) { if (CharSequenceUtil.isNotBlank(tdCase.getId())) { tdCase.setUpdateBy(ShiroUtils.getSysUser().getLoginName()); @@ -44,7 +42,6 @@ public class TdCaseManager { return caseService.saveOrUpdate(tdCase); } - public TdCase selecttdCase(String id) { return caseService.getById(id); } @@ -57,5 +54,4 @@ public class TdCaseManager { public List selectList() { return caseService.lambdaQuery().list(); } - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java index 3b966f5..5bdb00e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java @@ -45,7 +45,7 @@ public class SysPropertynumController extends BaseController { } /** - * 查询资产登记列表 + * 查询密品登记列表 */ @RequiresPermissions("system:propertynum:list") @PostMapping("/list") @@ -62,7 +62,7 @@ public class SysPropertynumController extends BaseController { */ @RequiresPermissions("system:propertynum:print") @GetMapping("/print/{useId}") - @Log(title = "资产设备统计", businessType = BusinessType.PRINT) + @Log(title = "密品设备统计", businessType = BusinessType.PRINT) public String print(@PathVariable("useId") String useId, ModelMap mmap) { List tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoByUseId(useId); @@ -78,7 +78,7 @@ public class SysPropertynumController extends BaseController { /** * - * 资产统计 + * 密品统计 * @return com.ruoyi.common.core.domain.AjaxResult */ @@ -111,7 +111,7 @@ public class SysPropertynumController extends BaseController { /** * - * 统计资产报废统计 + * 统计密品报废统计 * @return com.ruoyi.common.core.domain.AjaxResult */ @PostMapping("/countBF") @@ -136,7 +136,7 @@ public class SysPropertynumController extends BaseController { } /** * - * 统计资产销毁统计 + * 统计密品销毁统计 * @return com.ruoyi.common.core.domain.AjaxResult */ @PostMapping("/countXH") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java index 8d858ca..5a32a94 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java @@ -30,7 +30,7 @@ public class TdPropertyChangeController extends BaseController { } /** - * 资产登记列表 + * 密品登记列表 */ @RequiresPermissions("system:changeproperty:list") @PostMapping("/list") @@ -43,7 +43,7 @@ public class TdPropertyChangeController extends BaseController { } /** - * 涉密资产变更 + * 密品变更 */ @RequiresPermissions("system:changeproperty:change") @GetMapping("/edit/{id}") @@ -58,7 +58,7 @@ public class TdPropertyChangeController extends BaseController { * 保存变更修改 */ @RequiresPermissions("system:changeproperty:change") - @Log(title = "资产变更", businessType = BusinessType.UPDATE) + @Log(title = "密品变更", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody public AjaxResult changeSave(TdPropertyInfo tdPropertyInfo) @@ -67,7 +67,7 @@ public class TdPropertyChangeController extends BaseController { } /** - * 涉密资产报废 + * 密品报废 */ @RequiresPermissions("system:changeproperty:destory") @GetMapping("/destory/{id}") @@ -82,7 +82,7 @@ public class TdPropertyChangeController extends BaseController { * 保存变更修改 */ @RequiresPermissions("system:changeproperty:destory") - @Log(title = "资产变更", businessType = BusinessType.UPDATE) + @Log(title = "密品变更", businessType = BusinessType.UPDATE) @PostMapping("/destory") @ResponseBody public AjaxResult destorySave(TdPropertyInfo tdPropertyInfo) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java index 98c865e..028e671 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java @@ -19,7 +19,7 @@ import java.util.List; * @version JDK 8 * @className TdPropertyChangeListController * @date 2024/6/24 - * @description 资产变更 + * @description 密品变更 */ @Controller @RequestMapping("/system/change/list") @@ -38,7 +38,7 @@ public class TdPropertyChangeListController extends BaseController { } /** - * 查询资产登记列表 + * 查询密品登记列表 */ @RequiresPermissions("system:change:list") @PostMapping("/list") @@ -53,7 +53,7 @@ public class TdPropertyChangeListController extends BaseController { /** - * 添加资产条目 + * 添加密品条目 */ @RequiresPermissions("system:change:detail") @GetMapping("/detail/{useId}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryController.java index 3622380..bc59b8d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryController.java @@ -30,7 +30,7 @@ public class TdPropertyDestoryController extends BaseController { } /** - * 资产登记列表 + * 密品登记列表 */ @RequiresPermissions("system:destoryproperty:list") @PostMapping("/list") @@ -43,7 +43,7 @@ public class TdPropertyDestoryController extends BaseController { } /** - * 涉密资产报废 + * 密品报废 */ @RequiresPermissions("system:destoryproperty:destory") @GetMapping("/destory/{id}") @@ -58,7 +58,7 @@ public class TdPropertyDestoryController extends BaseController { * 保存变更修改 */ @RequiresPermissions("system:destoryproperty:destory") - @Log(title = "资产变更", businessType = BusinessType.UPDATE) + @Log(title = "密品变更", businessType = BusinessType.UPDATE) @PostMapping("/destory") @ResponseBody public AjaxResult destorySave(TdPropertyInfo tdPropertyInfo) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java index 5861f49..c7e8952 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java @@ -19,7 +19,7 @@ import java.util.List; * @version JDK 8 * @className TdPropertyDestoryListController * @date 2024/6/24 - * @description 资产销毁 + * @description 密品销毁 */ @Controller @RequestMapping("/system/propertyDestory/list") @@ -38,7 +38,7 @@ public class TdPropertyDestoryListController extends BaseController { } /** - * 查询资产登记列表 + * 查询密品登记列表 */ @RequiresPermissions("system:destory:list") @PostMapping("/list") @@ -53,7 +53,7 @@ public class TdPropertyDestoryListController extends BaseController { /** - * 资产条目 + * 密品条目 */ @RequiresPermissions("system:destory:detail") @GetMapping("/detail/{useId}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java index 638e26e..387babb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java @@ -18,7 +18,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** - * 资产管理Controller + * 密品管理Controller * * @author ruoyi * @date 2024-04-29 @@ -40,7 +40,7 @@ public class TdPropertyInfoController extends BaseController } /** - * 查询资产管理列表 + * 查询密品管理列表 */ @RequiresPermissions("system:property:list") @PostMapping("/list") @@ -53,21 +53,21 @@ public class TdPropertyInfoController extends BaseController } /** - * 导出资产管理列表 + * 导出密品管理列表 */ @RequiresPermissions("system:property:export") - @Log(title = "资产管理", businessType = BusinessType.EXPORT) + @Log(title = "密品管理", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody public AjaxResult export(TdPropertyInfo tdPropertyInfo) { List list = tdPropertyInfoService.selectTdPropertyInfoList(tdPropertyInfo); ExcelUtil util = new ExcelUtil(TdPropertyInfo.class); - return util.exportExcel(list, "资产管理数据"); + return util.exportExcel(list, "密品管理数据"); } /** - * 新增资产管理 + * 新增密品管理 */ @RequiresPermissions("system:property:add") @GetMapping("/add/{useId}") @@ -78,10 +78,10 @@ public class TdPropertyInfoController extends BaseController } /** - * 新增保存资产管理 + * 新增保存密品管理 */ @RequiresPermissions("system:property:add") - @Log(title = "资产管理", businessType = BusinessType.INSERT) + @Log(title = "密品管理", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody public AjaxResult addSave(TdPropertyInfo tdPropertyInfo) @@ -91,7 +91,7 @@ public class TdPropertyInfoController extends BaseController } /** - * 修改资产管理 + * 修改密品管理 */ @RequiresPermissions("system:property:edit") @GetMapping("/edit/{id}") @@ -102,7 +102,7 @@ public class TdPropertyInfoController extends BaseController return prefix + "/edit"; } /** - * 修改资产管理 + * 修改密品管理 */ @RequiresPermissions("system:property:detail") @GetMapping("/detail/{id}") @@ -113,10 +113,10 @@ public class TdPropertyInfoController extends BaseController return prefix + "/detail"; } /** - * 修改保存资产管理 + * 修改保存密品管理 */ @RequiresPermissions("system:property:edit") - @Log(title = "资产管理", businessType = BusinessType.UPDATE) + @Log(title = "密品管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody public AjaxResult editSave(TdPropertyInfo tdPropertyInfo) @@ -125,10 +125,10 @@ public class TdPropertyInfoController extends BaseController } /** - * 删除资产管理 + * 删除密品管理 */ @RequiresPermissions("system:property:remove") - @Log(title = "资产管理", businessType = BusinessType.DELETE) + @Log(title = "密品管理", businessType = BusinessType.DELETE) @PostMapping( "/remove") @ResponseBody public AjaxResult remove(String ids) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java index 72da46b..333e725 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java @@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import javax.annotation.Resource; /** - * 资产登记Controller + * 密品登记Controller * * @author ruoyi * @date 2024-04-26 @@ -56,7 +56,7 @@ public class TdPropertyManagerController extends BaseController } /** - * 查询资产登记列表 + * 查询密品登记列表 */ @RequiresPermissions("system:property:list") @PostMapping("/list") @@ -69,10 +69,10 @@ public class TdPropertyManagerController extends BaseController } /** - * 导出资产登记列表 + * 导出密品登记列表 */ @RequiresPermissions("system:property:export") - @Log(title = "资产登记", businessType = BusinessType.EXPORT) + @Log(title = "密品登记", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody public AjaxResult export(TdPropertyManager tdPropertyManager) @@ -83,11 +83,11 @@ public class TdPropertyManagerController extends BaseController tdPropertyManager1.setAreaId(sysAreaManager.getAreaName(tdPropertyManager1.getAreaId())); }); ExcelUtil util = new ExcelUtil(TdPropertyManager.class); - return util.exportExcel(list, "资产登记数据"); + return util.exportExcel(list, "密品登记数据"); } /** - * 新增资产登记 + * 新增密品登记 */ @GetMapping("/add") public String add(ModelMap mmap) @@ -97,10 +97,10 @@ public class TdPropertyManagerController extends BaseController } /** - * 新增保存资产登记 + * 新增保存密品登记 */ @RequiresPermissions("system:property:add") - @Log(title = "资产登记", businessType = BusinessType.INSERT) + @Log(title = "密品登记", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody public AjaxResult addSave(TdPropertyManager tdPropertyManager) @@ -110,7 +110,7 @@ public class TdPropertyManagerController extends BaseController } /** - * 修改资产登记 + * 修改密品登记 */ @RequiresPermissions("system:property:edit") @GetMapping("/edit/{useId}") @@ -122,10 +122,10 @@ public class TdPropertyManagerController extends BaseController } /** - * 修改保存资产登记 + * 修改保存密品登记 */ @RequiresPermissions("system:property:edit") - @Log(title = "资产登记", businessType = BusinessType.UPDATE) + @Log(title = "密品登记", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody public AjaxResult editSave(TdPropertyManager tdPropertyManager) @@ -134,10 +134,10 @@ public class TdPropertyManagerController extends BaseController } /** - * 删除资产登记 + * 删除密品登记 */ @RequiresPermissions("system:property:remove") - @Log(title = "资产登记", businessType = BusinessType.DELETE) + @Log(title = "密品登记", businessType = BusinessType.DELETE) @PostMapping( "/remove") @ResponseBody public AjaxResult remove(String ids) @@ -149,7 +149,7 @@ public class TdPropertyManagerController extends BaseController } /** - * 添加资产条目 + * 添加密品条目 */ @RequiresPermissions("system:property:list") @GetMapping("/detail/{useId}") diff --git a/ruoyi-admin/src/main/resources/templates/system/case/add.html b/ruoyi-admin/src/main/resources/templates/system/case/add.html index 382615b..90d1d68 100644 --- a/ruoyi-admin/src/main/resources/templates/system/case/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/case/add.html @@ -85,7 +85,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/case/edit.html b/ruoyi-admin/src/main/resources/templates/system/case/edit.html index 216f089..9ab6b92 100644 --- a/ruoyi-admin/src/main/resources/templates/system/case/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/case/edit.html @@ -86,7 +86,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/add.html b/ruoyi-admin/src/main/resources/templates/system/check/add.html index 51c17fa..79ff1fb 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/add.html @@ -89,9 +89,9 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/detail.html b/ruoyi-admin/src/main/resources/templates/system/check/detail.html index a063f27..90fae7a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/detail.html @@ -90,7 +90,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/edit.html b/ruoyi-admin/src/main/resources/templates/system/check/edit.html index 29eeb2c..0b637f8 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/edit.html @@ -90,7 +90,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html b/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html index 535934c..2ba0041 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html @@ -80,7 +80,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html index f7ade48..4f3df78 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html @@ -1495,7 +1495,7 @@ 三 - 资产检查 + 密品检查 [[${tdCheckResult.checkcontentrysb}]] [[${tdCheckResult.remark3}]] diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html index ec069c8..c0600db 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html @@ -169,7 +169,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/exam/exam.html b/ruoyi-admin/src/main/resources/templates/system/elExam/exam/exam.html index 3602c60..3fc7984 100644 --- a/ruoyi-admin/src/main/resources/templates/system/elExam/exam/exam.html +++ b/ruoyi-admin/src/main/resources/templates/system/elExam/exam/exam.html @@ -131,7 +131,7 @@ $.table.init(options); }); - /*资产列表-详细*/ + /*列表-详细*/ function detail(id) { var url = prefixUser + '/toExam/' + id; $.modal.openTab("考试人员", url); diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html index c08aa3a..23bd4d9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html +++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html @@ -85,14 +85,14 @@ $.table.init(options); }); - /*资产列表-详细*/ + /*列表-详细*/ function detail(id,userId) { var url = prefix + '/detail/' + id +'/'+userId; $.modal.openNOButton("考试明细", url); } - /*资产列表-详细*/ + /*列表-详细*/ function toBook(id) { var url = prefixBook + '/toBook/' + id; $.modal.openTab("考试错题", url); diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/userExam.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/userExam.html index 019e7fa..4cbd8c3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/userExam.html +++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/userExam.html @@ -97,7 +97,7 @@ return search; } - /*资产列表-详细*/ + /*列表-详细*/ function detail(id,userId) { var url = prefix + '/detail/' + id +'/'+userId; $.modal.openNOButton("考试明细", url); diff --git a/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html b/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html index d5da2ce..dadcbfd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html +++ b/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html @@ -91,7 +91,7 @@ }); - /*资产列表-详细*/ + /*列表-详细*/ function detail(id,userId) { var url = prefixUser + '/detail/' + id +'/'+userId; $.modal.openNOButton("考试明细", url); diff --git a/ruoyi-admin/src/main/resources/templates/system/network/networknum/print.html b/ruoyi-admin/src/main/resources/templates/system/network/networknum/print.html index 9200f63..1ce5ced 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/networknum/print.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/networknum/print.html @@ -1663,7 +1663,7 @@ 品牌 型号 Ip地址 - 资产SN码 + 设备SN码 备注信息 diff --git a/ruoyi-admin/src/main/resources/templates/system/property/data/add.html b/ruoyi-admin/src/main/resources/templates/system/property/data/add.html index 37dfdec..f03ae25 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/data/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/data/add.html @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@
- +
@@ -60,7 +60,7 @@
- +
@@ -105,7 +105,7 @@
- +
@@ -134,7 +134,7 @@
- +
@@ -163,7 +163,7 @@
- +
@@ -192,7 +192,7 @@
- +
@@ -220,7 +220,7 @@
- +
@@ -248,7 +248,7 @@
- +
@@ -276,7 +276,7 @@
- +
@@ -304,7 +304,7 @@
- +
@@ -332,7 +332,7 @@
- +
@@ -360,7 +360,7 @@
- +
@@ -388,7 +388,7 @@
- +
@@ -416,7 +416,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/data/detail.html b/ruoyi-admin/src/main/resources/templates/system/property/data/detail.html index 4c0bd49..2bf4f3c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/data/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/data/detail.html @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@
- +
@@ -60,7 +60,7 @@
- +
@@ -104,7 +104,7 @@
- +
@@ -133,7 +133,7 @@
- +
@@ -162,7 +162,7 @@
- +
@@ -191,7 +191,7 @@
- +
@@ -219,7 +219,7 @@
- +
@@ -247,7 +247,7 @@
- +
@@ -275,7 +275,7 @@
- +
@@ -303,7 +303,7 @@
- +
@@ -331,7 +331,7 @@
- +
@@ -359,7 +359,7 @@
- +
@@ -387,7 +387,7 @@
- +
@@ -415,7 +415,7 @@
- +
@@ -435,7 +435,7 @@
- + @@ -461,7 +461,7 @@ - + @@ -469,13 +469,13 @@ - + - + @@ -487,7 +487,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html index 95dfcb0..d756c80 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html @@ -1,7 +1,7 @@ - +
@@ -16,7 +16,7 @@
  • - +
  • diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html index 41779cf..0797e68 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@
    - +
    @@ -89,7 +89,7 @@
    - +
    diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/property.html b/ruoyi-admin/src/main/resources/templates/system/property/property/property.html index 5e2ccbf..4ed7262 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/property.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/property.html @@ -1,7 +1,7 @@ - +
    @@ -15,7 +15,7 @@
  • - +
  • @@ -77,13 +77,13 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", - modalName: "资产登记", + modalName: "密品登记", columns: [{ checkbox: true }, { field: 'useId', - title: '资产编号' + title: '密品编号' }, { field: 'part', @@ -171,10 +171,10 @@ } } }) - /*资产列表-详细*/ + /*密品列表-详细*/ function detail(useId) { var url = prefix + '/detail/' + useId; - $.modal.openTab("资产列表数据", url); + $.modal.openTab("密品列表数据", url); } diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/change.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/change.html index d5bacb4..b3ed723 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/change.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/change.html @@ -15,7 +15,7 @@
  • - +
    @@ -27,7 +27,7 @@
    - +
    - +
    diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html index 7f4f0ef..ebd79da 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html @@ -19,7 +19,7 @@
  • - +
  • @@ -68,18 +68,18 @@ }, { field: 'propertyType', - title: '资产种类', + title: '密品种类', formatter: function(value, row, index) { return $.table.selectDictLabel(propertyTypeDatas, value); } }, { field: 'propertyNo', - title: '资产型号' + title: '密品型号' }, { field: 'propertySn', - title: '资产SN码' + title: '密品SN码' }, { field: 'destoryType', @@ -116,7 +116,7 @@ function destory(id) { var url = prefix + '/destory/' + id; - $.modal.open("资产报废", url); + $.modal.open("密品报废", url); } diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/destory.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/destory.html index e38b4da..31d3003 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/destory.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/destory.html @@ -15,7 +15,7 @@
  • - +
    @@ -27,7 +27,7 @@
    - +
    - +
    diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html index 34f6151..361fba3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html @@ -1,7 +1,7 @@ - +
    @@ -15,7 +15,7 @@
  • - +
  • @@ -64,11 +64,11 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", - modalName: "资产登记", + modalName: "密品登记", columns: [ { field: 'useId', - title: '资产编号' + title: '密品编号' }, { field: 'part', @@ -154,10 +154,10 @@ } } }) - /*资产列表-详细*/ + /*密品列表-详细*/ function detail(useId) { var url = prefix + '/detail/' + useId; - $.modal.openTab("资产列表数据", url); + $.modal.openTab("密品列表数据", url); } diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destory.html b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destory.html index ecbba03..783c0a4 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destory.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destory.html @@ -15,7 +15,7 @@
  • - +
    @@ -27,7 +27,7 @@
    - +
    - +
    diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destoryproperty.html b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destoryproperty.html index d4c96e7..1f94725 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destoryproperty.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destoryproperty.html @@ -19,7 +19,7 @@
  • - +
  • @@ -68,18 +68,18 @@ }, { field: 'propertyType', - title: '资产种类', + title: '密品种类', formatter: function(value, row, index) { return $.table.selectDictLabel(propertyTypeDatas, value); } }, { field: 'propertyNo', - title: '资产型号' + title: '密品型号' }, { field: 'propertySn', - title: '资产SN码' + title: '密品SN码' }, { field: 'destoryState', @@ -110,7 +110,7 @@ function destory(id) { var url = prefix + '/destory/' + id; - $.modal.open("资产报废", url); + $.modal.open("密品报废", url); } diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html index bb11da3..890e98a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html @@ -1,7 +1,7 @@ - +
    @@ -15,7 +15,7 @@
  • - +
  • @@ -64,11 +64,11 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", - modalName: "资产登记", + modalName: "密品登记", columns: [ { field: 'useId', - title: '资产编号' + title: '密品编号' }, { field: 'part', @@ -154,10 +154,10 @@ } } }) - /*资产列表-详细*/ + /*密品列表-详细*/ function detail(useId) { var url = prefix + '/detail/' + useId; - $.modal.openTab("资产列表数据", url); + $.modal.openTab("密品列表数据", url); } diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html index fb330b5..941c691 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html @@ -1,10 +1,10 @@ - + + - + @@ -721,7 +721,7 @@ - [[${sysuser.dept.deptName}]]资产统计信息表 + [[${sysuser.dept.deptName}]]密品统计信息表 单位:[[${sysuser.dept.deptName}]] @@ -751,17 +751,17 @@ 接收时间 [[${tdPropertyManager.useDate}]] 登记编号 - [[${tdPropertyInfos[0].useId}]] - 资产总数 + [[${tdPropertyManager.useId}]] + 密品总数 [[${tdPropertyManager.propertyNum}]] - 资产编号 - 资产名称 + 密品编号 + 密品名称 品牌 型号 - 资产SN码 - 资产种类 + 密品SN码 + 密品种类 备注信息 @@ -796,7 +796,7 @@ document.querySelector('#recoverDate').innerHTML =conversionDate(new Date(document.querySelector('#recoverDate').innerHTML)) document.querySelector('#useDate').innerHTML =conversionDate(new Date(document.querySelector('#useDate').innerHTML)) - //资产种类 + //密品种类 var examinestateDatas = [[${@dict.getType('sys_sm_property')}]]; var examinestateToFind = []; document.querySelectorAll('.propertyType').forEach(function(element) { diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html index 2b075d0..06ff883 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html @@ -1,7 +1,7 @@ - +