diff --git a/src/main/resources/mybatis/mapper/entityres/entity-res-mapper.xml b/src/main/resources/mybatis/mapper/entityres/entity-res-mapper.xml index 8b9e88e..971c3a8 100644 --- a/src/main/resources/mybatis/mapper/entityres/entity-res-mapper.xml +++ b/src/main/resources/mybatis/mapper/entityres/entity-res-mapper.xml @@ -271,6 +271,7 @@ AND t1.creator = #{creator} + ORDER BY t1.gmt_create DESC diff --git a/src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js b/src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js index 5fe4de0..38aca7f 100644 --- a/src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js +++ b/src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js @@ -50,9 +50,11 @@ 'fullscreen', 'source', '|', 'undo', 'redo', '|', 'bold', 'italic', 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', '|', - 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', + 'removeformat', 'formatmatch', 'blockquote', 'pasteplain', '|', + 'rowspacingtop', 'rowspacingbottom', 'lineheight', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', 'selectall', 'cleardoc', '|', 'directionalityltr', 'directionalityrtl', 'indent', '|', + 'customstyle', 'paragraph', 'fontfamily', 'fontsize', '|', 'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'link', 'unlink', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|', 'simpleupload', 'insertimage', 'insertvideo', 'attachment', '|', @@ -223,7 +225,7 @@ //lineheight //行内间距 值和显示的名字相同 - ,'lineheight':['1', '1.5','1.75','2', '3', '4', '5'] + ,'lineheight':['0.8', '1', '1.5','1.75','2', '2.5','3', '3.5','4', '5'] //customstyle //自定义样式,不支持国际化,此处配置值即可最后显示值 diff --git a/src/main/resources/static/assets/web/css/style.css b/src/main/resources/static/assets/web/css/style.css index d5d7906..62433cc 100644 --- a/src/main/resources/static/assets/web/css/style.css +++ b/src/main/resources/static/assets/web/css/style.css @@ -1,4 +1,4 @@ -.clearFloat:after{content:'';display:block;clear:both} +.clearFloat:after{content:'';display:block;clear:both;} .fl{float:left} .fr{float:right} .banner{position:relative;width:100%;height:456px;min-width:1200px} @@ -102,7 +102,7 @@ .news-detail p{line-height:35px;font-size:16px;color:#333} .news-detail img,.news-detail video{max-width:100%!important} .assessment-header .banner img{width:100%} -.count{width:1200px;margin:20px auto;padding:15px 15px 0;box-sizing:border-box;background:#fff} +.count{width:1200px;margin:20px auto;padding:15px 15px 0;box-sizing:border-box;background:#fff;box-shadow: 0 0 10px #eee;} .count>h3{font-size: 20px;color: #333;font-weight: normal;margin-bottom: 10px;} .chart-box{width:260px} .count-title{padding-left:10px;border-left:5px solid #3d41b7;font-size:16px;color:#333} diff --git a/src/main/resources/static/route/indexaudit/list_1.html b/src/main/resources/static/route/indexaudit/list_1.html index 815040c..d4af84d 100644 --- a/src/main/resources/static/route/indexaudit/list_1.html +++ b/src/main/resources/static/route/indexaudit/list_1.html @@ -38,6 +38,8 @@ + +