ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、新闻动态页面调整 

2、富文本编辑器不显示问题调整
This commit is contained in:
xuhubin 2020-11-05 17:12:10 +08:00
parent 172eb495a8
commit 079bd65cde
9 changed files with 235 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ruoyi-front/src/main/resources/templates/front/carousel/add.html
View File

@ -41,40 +41,40 @@
} }
} }
// $(function() { $(function() {
// $('.summernote').summernote({ $('.summernote').summernote({
// lang: 'zh-CN', lang: 'zh-CN',
// callbacks: { callbacks: {
// onChange: function(contents, $edittable) { onChange: function(contents, $edittable) {
// $("input[name='" + this.id + "']").val(contents); $("input[name='" + this.id + "']").val(contents);
// }, },
// onImageUpload: function(files) { onImageUpload: function(files) {
// var obj = this; var obj = this;
// var data = new FormData(); var data = new FormData();
// data.append("file", files[0]); data.append("file", files[0]);
// $.ajax({ $.ajax({
// type: "post", type: "post",
// url: ctx + "common/upload", url: ctx + "common/upload",
// data: data, data: data,
// cache: false, cache: false,
// contentType: false, contentType: false,
// processData: false, processData: false,
// dataType: 'json', dataType: 'json',
// success: function(result) { success: function(result) {
// if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
// $('#' + obj.id).summernote('insertImage', result.url); $('#' + obj.id).summernote('insertImage', result.url);
// } else { } else {
// $.modal.alertError(result.msg); $.modal.alertError(result.msg);
// } }
// }, },
// error: function(error) { error: function(error) {
// $.modal.alertWarning("图片上传失败。"); $.modal.alertWarning("图片上传失败。");
// } }
// }); });
// } }
// } }
// }); });
// }); });
</script> </script>
</body> </body>
</html> </html>

76
ruoyi-front/src/main/resources/templates/front/carousel/edit.html
View File

@ -34,44 +34,44 @@
$.operate.save(prefix + "/edit", $('#form-carousel-edit').serialize()); $.operate.save(prefix + "/edit", $('#form-carousel-edit').serialize());
} }
} }
// $(function() { $(function() {
// $('.summernote').each(function(i) { $('.summernote').each(function(i) {
// $('#' + this.id).summernote({ $('#' + this.id).summernote({
// lang: 'zh-CN', lang: 'zh-CN',
// callbacks: { callbacks: {
// onChange: function(contents, $edittable) { onChange: function(contents, $edittable) {
// $("input[name='" + this.id + "']").val(contents); $("input[name='" + this.id + "']").val(contents);
// }, },
// onImageUpload: function(files) { onImageUpload: function(files) {
// var obj = this; var obj = this;
// var data = new FormData(); var data = new FormData();
// data.append("file", files[0]); data.append("file", files[0]);
// $.ajax({ $.ajax({
// type: "post", type: "post",
// url: ctx + "common/upload", url: ctx + "common/upload",
// data: data, data: data,
// cache: false, cache: false,
// contentType: false, contentType: false,
// processData: false, processData: false,
// dataType: 'json', dataType: 'json',
// success: function(result) { success: function(result) {
// if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
// $('#' + obj.id).summernote('insertImage', result.url); $('#' + obj.id).summernote('insertImage', result.url);
// } else { } else {
// $.modal.alertError(result.msg); $.modal.alertError(result.msg);
// } }
// }, },
// error: function(error) { error: function(error) {
// $.modal.alertWarning("图片上传失败。"); $.modal.alertWarning("图片上传失败。");
// } }
// }); });
// } }
// } }
// }); });
// var content = $("input[name='" + this.id + "']").val(); var content = $("input[name='" + this.id + "']").val();
// $('#' + this.id).summernote('code', content); $('#' + this.id).summernote('code', content);
// }) })
// }); });
</script> </script>
</body> </body>
</html> </html>

68
ruoyi-front/src/main/resources/templates/front/cases/add.html
View File

@ -73,40 +73,40 @@
} }
} }
// $(function() { $(function() {
// $('.summernote').summernote({ $('.summernote').summernote({
// lang: 'zh-CN', lang: 'zh-CN',
// callbacks: { callbacks: {
// onChange: function(contents, $edittable) { onChange: function(contents, $edittable) {
// $("input[name='" + this.id + "']").val(contents); $("input[name='" + this.id + "']").val(contents);
// }, },
// onImageUpload: function(files) { onImageUpload: function(files) {
// var obj = this; var obj = this;
// var data = new FormData(); var data = new FormData();
// data.append("file", files[0]); data.append("file", files[0]);
// $.ajax({ $.ajax({
// type: "post", type: "post",
// url: ctx + "common/upload", url: ctx + "common/upload",
// data: data, data: data,
// cache: false, cache: false,
// contentType: false, contentType: false,
// processData: false, processData: false,
// dataType: 'json', dataType: 'json',
// success: function(result) { success: function(result) {
// if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
// $('#' + obj.id).summernote('insertImage', result.url); $('#' + obj.id).summernote('insertImage', result.url);
// } else { } else {
// $.modal.alertError(result.msg); $.modal.alertError(result.msg);
// } }
// }, },
// error: function(error) { error: function(error) {
// $.modal.alertWarning("图片上传失败。"); $.modal.alertWarning("图片上传失败。");
// } }
// }); });
// } }
// } }
// }); });
// }); });
</script> </script>
</body> </body>
</html> </html>

76
ruoyi-front/src/main/resources/templates/front/cases/edit.html
View File

@ -74,44 +74,44 @@
} }
} }
// $(function() { $(function() {
// $('.summernote').each(function(i) { $('.summernote').each(function(i) {
// $('#' + this.id).summernote({ $('#' + this.id).summernote({
// lang: 'zh-CN', lang: 'zh-CN',
// callbacks: { callbacks: {
// onChange: function(contents, $edittable) { onChange: function(contents, $edittable) {
// $("input[name='" + this.id + "']").val(contents); $("input[name='" + this.id + "']").val(contents);
// }, },
// onImageUpload: function(files) { onImageUpload: function(files) {
// var obj = this; var obj = this;
// var data = new FormData(); var data = new FormData();
// data.append("file", files[0]); data.append("file", files[0]);
// $.ajax({ $.ajax({
// type: "post", type: "post",
// url: ctx + "common/upload", url: ctx + "common/upload",
// data: data, data: data,
// cache: false, cache: false,
// contentType: false, contentType: false,
// processData: false, processData: false,
// dataType: 'json', dataType: 'json',
// success: function(result) { success: function(result) {
// if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
// $('#' + obj.id).summernote('insertImage', result.url); $('#' + obj.id).summernote('insertImage', result.url);
// } else { } else {
// $.modal.alertError(result.msg); $.modal.alertError(result.msg);
// } }
// }, },
// error: function(error) { error: function(error) {
// $.modal.alertWarning("图片上传失败。"); $.modal.alertWarning("图片上传失败。");
// } }
// }); });
// } }
// } }
// }); });
// var content = $("input[name='" + this.id + "']").val(); var content = $("input[name='" + this.id + "']").val();
// $('#' + this.id).summernote('code', content); $('#' + this.id).summernote('code', content);
// }) })
// }); });
</script> </script>
</body> </body>
</html> </html>

7
ruoyi-front/src/main/resources/templates/front/information/add.html
View File

@ -35,11 +35,10 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">状态：</label> <label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="radio-box"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" name="status" value=""> <input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="status" th:text="未知"></label> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div> </div>
</div> </div>
<!--<div class="form-group"> <!--<div class="form-group">

11
ruoyi-front/src/main/resources/templates/front/information/edit.html
View File

@ -27,20 +27,19 @@
<div class="summernote" id="content"></div> <div class="summernote" id="content"></div>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">
<label class="col-sm-3 control-label">点击量：</label> <label class="col-sm-3 control-label">点击量：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="hits" th:field="*{hits}" class="form-control" type="text"> <input name="hits" th:field="*{hits}" class="form-control" type="text">
</div> </div>
</div> </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">状态：</label> <label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="radio-box"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" name="status" value=""> <input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="status" th:text="未知"></label> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div> </div>
</div> </div>
</form> </form>

18
ruoyi-front/src/main/resources/templates/front/information/information.html
View File

@ -18,15 +18,15 @@
<label>简介：</label> <label>简介：</label>
<input type="text" name="introduction"/> <input type="text" name="introduction"/>
</li> </li>
<li> <!--<li>
<label>点击量：</label> <label>点击量：</label>
<input type="text" name="hits"/> <input type="text" name="hits"/>
</li> </li>-->
<li> <li>
<label>状态：</label> <label>状态：</label>
<select name="status"> <select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option> <option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li>
@ -48,9 +48,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="front:information:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="front:information:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="front:information:export"> <!--<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="front:information:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>-->
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
@ -61,6 +61,7 @@
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('front:information:edit')}]]; var editFlag = [[${@permission.hasPermi('front:information:edit')}]];
var removeFlag = [[${@permission.hasPermi('front:information:remove')}]]; var removeFlag = [[${@permission.hasPermi('front:information:remove')}]];
var dictStatus = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "front/information"; var prefix = ctx + "front/information";
$(function() { $(function() {
@ -97,7 +98,10 @@
}, },
{ {
field: 'status', field: 'status',
title: '状态' title: '状态',
formatter: function(value, item, index) {
return $.table.selectDictLabel(dictStatus, item.status);
}
}, },
{ {
title: '操作', title: '操作',

68
ruoyi-front/src/main/resources/templates/front/recruitment/add.html
View File

@ -69,40 +69,40 @@
$.operate.save(prefix + "/add", $('#form-recruitment-add').serialize()); $.operate.save(prefix + "/add", $('#form-recruitment-add').serialize());
} }
} }
// $(function() { $(function() {
// $('.summernote').summernote({ $('.summernote').summernote({
// lang: 'zh-CN', lang: 'zh-CN',
// callbacks: { callbacks: {
// onChange: function(contents, $edittable) { onChange: function(contents, $edittable) {
// $("input[name='" + this.id + "']").val(contents); $("input[name='" + this.id + "']").val(contents);
// }, },
// onImageUpload: function(files) { onImageUpload: function(files) {
// var obj = this; var obj = this;
// var data = new FormData(); var data = new FormData();
// data.append("file", files[0]); data.append("file", files[0]);
// $.ajax({ $.ajax({
// type: "post", type: "post",
// url: ctx + "common/upload", url: ctx + "common/upload",
// data: data, data: data,
// cache: false, cache: false,
// contentType: false, contentType: false,
// processData: false, processData: false,
// dataType: 'json', dataType: 'json',
// success: function(result) { success: function(result) {
// if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
// $('#' + obj.id).summernote('insertImage', result.url); $('#' + obj.id).summernote('insertImage', result.url);
// } else { } else {
// $.modal.alertError(result.msg); $.modal.alertError(result.msg);
// } }
// }, },
// error: function(error) { error: function(error) {
// $.modal.alertWarning("图片上传失败。"); $.modal.alertWarning("图片上传失败。");
// } }
// }); });
// } }
// } }
// }); });
// }); });
</script> </script>
</body> </body>
</html> </html>

76
ruoyi-front/src/main/resources/templates/front/recruitment/edit.html
View File

@ -70,44 +70,44 @@
$.operate.save(prefix + "/edit", $('#form-recruitment-edit').serialize()); $.operate.save(prefix + "/edit", $('#form-recruitment-edit').serialize());
} }
} }
// $(function() { $(function() {
// $('.summernote').each(function(i) { $('.summernote').each(function(i) {
// $('#' + this.id).summernote({ $('#' + this.id).summernote({
// lang: 'zh-CN', lang: 'zh-CN',
// callbacks: { callbacks: {
// onChange: function(contents, $edittable) { onChange: function(contents, $edittable) {
// $("input[name='" + this.id + "']").val(contents); $("input[name='" + this.id + "']").val(contents);
// }, },
// onImageUpload: function(files) { onImageUpload: function(files) {
// var obj = this; var obj = this;
// var data = new FormData(); var data = new FormData();
// data.append("file", files[0]); data.append("file", files[0]);
// $.ajax({ $.ajax({
// type: "post", type: "post",
// url: ctx + "common/upload", url: ctx + "common/upload",
// data: data, data: data,
// cache: false, cache: false,
// contentType: false, contentType: false,
// processData: false, processData: false,
// dataType: 'json', dataType: 'json',
// success: function(result) { success: function(result) {
// if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
// $('#' + obj.id).summernote('insertImage', result.url); $('#' + obj.id).summernote('insertImage', result.url);
// } else { } else {
// $.modal.alertError(result.msg); $.modal.alertError(result.msg);
// } }
// }, },
// error: function(error) { error: function(error) {
// $.modal.alertWarning("图片上传失败。"); $.modal.alertWarning("图片上传失败。");
// } }
// }); });
// } }
// } }
// }); });
// var content = $("input[name='" + this.id + "']").val(); var content = $("input[name='" + this.id + "']").val();
// $('#' + this.id).summernote('code', content); $('#' + this.id).summernote('code', content);
// }) })
// }); });
</script> </script>
</body> </body>
</html> </html>