From dd2f268e3fbc035a660696ca25cbe3be00a2a7ec Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Thu, 9 May 2024 14:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/TdPropertyInfoController.java | 14 +- .../templates/system/property/data/add.html | 721 ++++++++++++++---- .../system/property/data/detail.html | 650 ++++++++++++++++ .../templates/system/property/data/edit.html | 214 ------ .../system/property/data/propertyinfo.html | 22 +- 5 files changed, 1264 insertions(+), 357 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/system/property/data/detail.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/property/data/edit.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyInfoController.java index e5daddf..6d894e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyInfoController.java @@ -19,7 +19,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 资产管理Controller - * + * * @author ruoyi * @date 2024-04-29 */ @@ -101,7 +101,17 @@ public class TdPropertyInfoController extends BaseController mmap.put("tdPropertyInfo", tdPropertyInfo); return prefix + "/edit"; } - + /** + * 修改资产管理 + */ + @RequiresPermissions("system:property:detail") + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") String id, ModelMap mmap) + { + TdPropertyInfo tdPropertyInfo = tdPropertyInfoService.selectTdPropertyInfoById(id); + mmap.put("tdPropertyInfo", tdPropertyInfo); + return prefix + "/detail"; + } /** * 修改保存资产管理 */ 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 4317094..491ab13 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 @@ -5,194 +5,647 @@ -
+
+
-
-
- -
- + +
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
- -
- + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ -
- -
- + + +
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
- -
- + + + +
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
- -
- + + + +
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
-
- - +
+ +
+
-
- -
- + + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
-
- -
- + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
-
- -
- + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
-
- -
- + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
-
- -
-
- - + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
-
- -
- + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
-
- -
- + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
-
- -
- + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
-
- -
- + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + - \ No newline at end of file + 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 new file mode 100644 index 0000000..4c0bd49 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/property/data/detail.html @@ -0,0 +1,650 @@ + + + + + + + +
+
+ + +
+ +
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/data/edit.html b/ruoyi-admin/src/main/resources/templates/system/property/data/edit.html deleted file mode 100644 index c887133..0000000 --- a/ruoyi-admin/src/main/resources/templates/system/property/data/edit.html +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - \ No newline at end of file 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 f62f260..59fc07a 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 @@ -4,7 +4,7 @@ -
+
@@ -39,7 +39,7 @@