Merge branch 'test' of http://git.izouma.com/licailing/wenlvju into test

src/main/vue/src/components/RichText.vue

@@ -42,14 +42,17 @@ export default {
                 menubar: false,
                 branding: false,
                 statusbar: false,
-                height: 400,
+                height: 600,
+                width: 700,
                 toolbar:
-                    'undo redo | styleselect bold italic strikethrough forecolor backcolor  | image media link blockquote visualblocks insert | formatselect | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | preview fullscreen code help',
+                    'undo redo  | indent2em bold italic strikethrough forecolor backcolor fontsizeselect lineheight | image media link blockquote visualblocks insert  | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | preview fullscreen code help',
                 plugins: [
-                    'advlist autolink lists link image charmap print preview anchor textcolor',
+                    'advlist autolink indent2em lists link image charmap print preview anchor textcolor',
                     'searchreplace visualblocks code fullscreen',
                     'insertdatetime media table contextmenu paste code help imagetools'
                 ],
+                lineheight_formats: '1 1.1 1.2 1.3 1.4 1.5 2',
+                fontsize_formats: '8px 10px 12px 14px 16px 18px 24px 36px 48px',
                 images_upload_url: this.$baseUrl + '/upload/file',
                 images_upload_handler: (blobInfo, success, failure) => {
                     let formData = new FormData();

src/main/vue/src/views/AnnouncementEdit.vue

@@ -7,7 +7,7 @@
             label-width="52px"
             label-position="right"
             size="small"
-            style="max-width: 500px;"
+            style="max-width: 700px;"
         >
             <el-form-item prop="title" label="标题">
                 <el-input v-model="formData.title"></el-input>