修改添加通知

src/main/webapp/WEB-INF/common/_dialog.html

@@ -135,6 +135,9 @@
     @if(array.contain(plugins,"validation")){
     @if(array.contain(plugins,"validation")){
     <script src="${ctxPath}/assets/common/plugins/validation/validation.js"></script>
     <script src="${ctxPath}/assets/common/plugins/validation/validation.js"></script>
     @}
     @}
+    @if(array.contain(plugins,"wangEditor")){
+    <script src="${ctxPath}/assets/common/plugins/wangEditor/wangEditor.min.js"></script>
+    @}
 @}
 @}
 
 
 <!--其他业务用的js-->
 <!--其他业务用的js-->

src/main/webapp/WEB-INF/system/notice/notice_add.html

-@layout("/common/_dialog.html",{plugins:["sweet-alert","layer"],js:["/assets/modular/system/notice/notice_add.js"]}){
+@layout("/common/_dialog.html",{plugins:["sweet-alert","layer","wangEditor"],js:["/assets/modular/system/notice/notice_add.js"]}){
 <div class="container-fluid">
 <div class="container-fluid">
-    <form id="noticeForm" \@submit="submitForm">
+    <form id="noticeForm">
         <div class="row">
         <div class="row">
             <div class="col-12">
             <div class="col-12">
                 <div class="form-group">
                 <div class="form-group">
                     <h5>标题 <span class="text-danger">*</span></h5>
                     <h5>标题 <span class="text-danger">*</span></h5>
                     <div class="controls">
                     <div class="controls">
-                        <input v-model="title" type="text" class="form-control">
+                        <input id="title" type="text" class="form-control">
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="form-group">
                 <div class="form-group">
                     <h5>内容 <span class="text-danger">*</span></h5>
                     <h5>内容 <span class="text-danger">*</span></h5>
-                    <div class="controls">
-                        <input v-model="content" type="text" class="form-control">
-                    </div>
+                    <div id="editor"></div>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
         <div class="row">
         <div class="row">
             <div class="col-6">
             <div class="col-6">
                 <div class="text-xs-right">
                 <div class="text-xs-right">
-                    <button class="btn btn-info normal-button-width" \@click="ensure">提交</button>
-                    <button class="btn btn-inverse normal-button-width m-l-10" \@click="close">取消</button>
+                    <button class="btn btn-info normal-button-width" onclick="NoticeAddDlg.ensure()">提交</button>
+                    <button class="btn btn-inverse normal-button-width m-l-10" onclick="NoticeAddDlg.close()">取消</button>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>

src/main/webapp/assets/modular/system/notice/notice_add.js

@@ -21,6 +21,10 @@ NoticeAddDlg.close = function () {
  */
  */
 NoticeAddDlg.validateForm = function () {
 NoticeAddDlg.validateForm = function () {
 
 
+    //接收数据
+    NoticeAddDlg.data.title = $("#title").val();
+    NoticeAddDlg.data.content = NoticeAddDlg.editor.txt.html();
+
     var data = NoticeAddDlg.data;
     var data = NoticeAddDlg.data;
 
 
     if (!data.title) {
     if (!data.title) {
@@ -49,26 +53,31 @@ NoticeAddDlg.addSubmit = function () {
     ajax.start();
     ajax.start();
 };
 };
 
 
+/**
+ * 确认按钮
+ */
+NoticeAddDlg.ensure = function () {
+    var result = NoticeAddDlg.validateForm();
+    if (result === true) {
+        NoticeAddDlg.addSubmit();
+    } else {
+        Feng.alert(result);
+    }
+};
+
+/**
+ * 取消按钮
+ */
+NoticeAddDlg.close = function () {
+    NoticeAddDlg.close();
+};
+
 $(function () {
 $(function () {
-    NoticeAddDlg.app = new Vue({
-        el: '#noticeForm',
-        data: NoticeAddDlg.data,
-        methods: {
-            submitForm: function (e) {
-                e.preventDefault();
-            },
-            ensure: function () {
-                var result = NoticeAddDlg.validateForm();
-                if (result === true) {
-                    NoticeAddDlg.addSubmit();
-                } else {
-                    Feng.alert(result);
-                }
-            },
-            close: function () {
-                NoticeAddDlg.close();
-            }
-        }
-    });
+
+    //初始化富文本编辑器
+    var E = window.wangEditor;
+    var editor2 = new E('#editor');
+    editor2.create();
+    NoticeAddDlg.editor = editor2;
 
 
 });
 });