Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-14 26e2592813b9263124d518d238262910e817d323

 cloud-server-management/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html

@@ -3,23 +3,27 @@
    <div class="ibox-content">
        <div class="form-horizontal" id="noticeInfoForm">

            <input type="hidden" id="id" value="${notice.id}">
            <input type="hidden" id="contentVal" value='${notice.content}'>
            <input type="hidden" id="id" value="${item.id}">

            <div class="row">
                <div class="col-sm-12">
                    <div class="form-group">
                        <label class="col-sm-1 control-label">标题</label>
                        <div class="col-sm-11">
                            <input class="form-control" id="title" name="title" type="text" value="${notice.title}">
                        <label class="col-sm-1 control-label">公告名称</label>
                        <div class="col-sm-5">
                            <input class="form-control" id="name" name="name" type="text" value="${item.name}">

                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-1 control-label">内容</label>
                        <div class="col-sm-11">
                            <div id="editor" class="editorHeight">
                            </div>
                        <label class="col-sm-1 control-label">公告内容：</label>
                        <div class="col-sm-5">
                            <textarea type="text/plain" id="editor"  style="height: 300px;width: 800px;">${item.content}</textarea>
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-1 control-label">排序：</label>
                        <div class="col-sm-5">
                            <input  class="form-control" type="text" id="sort" name="sort" value="${item.sort}">
                        </div>
                    </div>
                </div>
@@ -27,7 +31,9 @@

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    @if(type==1){
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="NoticeInfoDlg.editSubmit()"/>
                    @}
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="NoticeInfoDlg.close()"/>
                </div>
            </div>