From e901d4177b609fb70ec8de6741629e1d5db0156b Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 13 Oct 2023 13:12:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B7=A6=E4=BE=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/board/board.css | 2 +- .../resources/mapper/manage/ApiMapper.xml | 1 - .../manage/base_device_info/add.html | 215 ++++++++++-------- .../manage/base_device_info/edit.html | 24 +- 4 files changed, 144 insertions(+), 98 deletions(-) diff --git a/haiwei-admin/src/main/resources/static/board/board.css b/haiwei-admin/src/main/resources/static/board/board.css index f7e0493..d96de0f 100644 --- a/haiwei-admin/src/main/resources/static/board/board.css +++ b/haiwei-admin/src/main/resources/static/board/board.css @@ -59,7 +59,7 @@ body { background-size: 100% 100%; background-repeat: no-repeat; position: absolute; - right: 9vw; + right: 7.5vw; top: 19%; width: 16vw; height: 22.9vw; diff --git a/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml b/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml index fb77f4e..045851d 100644 --- a/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml +++ b/haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml @@ -25,7 +25,6 @@ - +
+
+
+ +
+
-
- -
- +
+
+ +
+ -
- - - - - - - - - - - - - - - -
- -
- -
+
+ + + + + + + + + + + + + + + +
+ +
+ +
-
- -
- -
-
+
+
+ +
+ +
-
- -
- -
-
- -
- - - - - + $(function () { + $('#deviceTypeName').select2({ + placeholder: "请选择设备类型", + allowClear: true + }); + }) + $(function() { + $('.summernote').summernote({ + lang: 'zh-CN', + dialogsInBody: true, + callbacks: { + onChange: function(contents, $edittable) { + $("input[name='" + this.id + "']").val(contents); + }, + // onImageUpload: function(files) { + // var obj = this; + // var data = new FormData(); + // data.append("file", files[0]); + // $.ajax({ + // type: "post", + // url: ctx + "common/upload", + // data: data, + // cache: false, + // contentType: false, + // processData: false, + // dataType: 'json', + // success: function(result) { + // if (result.code == web_status.SUCCESS) { + // $('#' + obj.id).summernote('insertImage', result.url); + // } else { + // $.modal.alertError(result.msg); + // } + // }, + // error: function(error) { + // $.modal.alertWarning("图片上传失败。"); + // } + // }); + // } + } + }); + }); + \ No newline at end of file diff --git a/haiwei-manage/src/main/resources/templates/manage/base_device_info/edit.html b/haiwei-manage/src/main/resources/templates/manage/base_device_info/edit.html index 3b769fd..70fb1d9 100644 --- a/haiwei-manage/src/main/resources/templates/manage/base_device_info/edit.html +++ b/haiwei-manage/src/main/resources/templates/manage/base_device_info/edit.html @@ -3,6 +3,7 @@ +
@@ -42,19 +43,22 @@
- + +
- + +
+ \ No newline at end of file