From d02fdcbb78e1908f65b43e4d2e160dc2d9e7dd6f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 21 Apr 2019 14:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/notice/add.html          | 19 ++++++++++---------
 .../templates/system/notice/edit.html         | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/add.html b/ruoyi-admin/src/main/resources/templates/system/notice/add.html
index b105ab33..d4c2fdb0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/notice/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/notice/add.html
@@ -8,29 +8,29 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-notice-add">
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">公告标题：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-2 control-label">公告标题：</label>
+				<div class="col-sm-10">
 					<input id="noticeTitle" name="noticeTitle" class="form-control" type="text" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">公告类型：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-2 control-label">公告类型：</label>
+				<div class="col-sm-10">
 					<select name="noticeType" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_type')}">
 	                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 	                </select>
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">公告内容：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-2 control-label">公告内容：</label>
+				<div class="col-sm-10">
 				    <input id="noticeContent" name="noticeContent" type="hidden">
 				    <div class="summernote"></div>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">公告状态：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-2 control-label">公告状态：</label>
+				<div class="col-sm-10">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_notice_status')}">
 						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
@@ -45,7 +45,8 @@
         var prefix = ctx + "system/notice";
 
 	    $('.summernote').summernote({
-			height : '220px',
+	    	placeholder: '请输入公告内容',
+			height : 192,
 			lang : 'zh-CN',
 			callbacks: {
                 onImageUpload: function (files) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/edit.html b/ruoyi-admin/src/main/resources/templates/system/notice/edit.html
index b31f427c..cfc74436 100644
--- a/ruoyi-admin/src/main/resources/templates/system/notice/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/notice/edit.html
@@ -9,29 +9,29 @@
         <form class="form-horizontal m" id="form-notice-edit" th:object="${notice}">
             <input id="noticeId" name="noticeId" th:field="*{noticeId}"  type="hidden">
             <div class="form-group">	
-                <label class="col-sm-3 control-label">公告标题：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">公告标题：</label>
+                <div class="col-sm-10">
                     <input id="noticeTitle" name="noticeTitle" th:field="*{noticeTitle}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">
-				<label class="col-sm-3 control-label">公告类型：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-2 control-label">公告类型：</label>
+				<div class="col-sm-10">
 					<select name="noticeType" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_type')}">
 	                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{noticeType}"></option>
 	                </select>
 				</div>
 			</div>
             <div class="form-group">	
-                <label class="col-sm-3 control-label">公告内容：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">公告内容：</label>
+                <div class="col-sm-10">
                     <input id="noticeContent" name="noticeContent" th:field="*{noticeContent}" type="hidden">
                     <div id="editor" class="summernote"></div>
                 </div>
             </div>
             <div class="form-group">
-				<label class="col-sm-3 control-label">公告状态：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-2 control-label">公告状态：</label>
+				<div class="col-sm-10">
 					<div class="radio-box" th:each="dict : ${@dict.getType('sys_notice_status')}">
 						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
@@ -47,7 +47,8 @@
     
 	    $(function() {
 		    $('.summernote').summernote({
-		    	height : '220px',
+		    	placeholder: '请输入公告内容',
+		    	height : 192,
 				lang : 'zh-CN',
 				callbacks: {
 	                onImageUpload: function (files) {