浏览代码

完善功能

lishuwen79 6 年之前
父节点
当前提交
24e2c466f1

+ 2 - 0
src/main/java/com/lsw/controller/admin/work/news/NewsController.java

@@ -81,6 +81,7 @@ public class NewsController extends BaseController {
      * 编辑
      */
     @RequiresPermissions("news:edit")
+    @Before(NewsValidator.class)
     public void edit() {
         News news = FastJson.getJson().parse(getPara("news"), News.class);
         news.setTypeName(news.getTypeName().equals("1") ? "时政信息" : "政策宣传");
@@ -91,6 +92,7 @@ public class NewsController extends BaseController {
      * 文章审核
      */
     @RequiresPermissions("news:audit")
+    @Before(NewsValidator.class)
     public void audit() {
         News news = FastJson.getJson().parse(getPara("news"), News.class);
         news.setTypeName(news.getTypeName().equals("1") ? "时政信息" : "政策宣传");

+ 5 - 0
src/main/java/com/lsw/controller/admin/work/news/NewsValidator.java

@@ -17,5 +17,10 @@ public class NewsValidator extends BaseValidator {
         if(StrKit.isBlank(news.getMContent())){
             addError("msg","文章内容不能为空");
         }
+        if(news.getMAudit()==2){
+            if(StrKit.isBlank(news.getMsg())){
+                addError("msg","请输入审核不过的原因");
+            }
+        }
     }
 }

+ 8 - 0
src/main/java/com/lsw/model/work/base/BaseNews.java

@@ -97,6 +97,14 @@ public abstract class BaseNews<M extends BaseNews<M>> extends Model<M> implement
 		return getInt("isTop");
 	}
 
+	public void setMsg(java.lang.String msg) {
+		set("msg", msg);
+	}
+
+	public java.lang.String getMsg() {
+		return getStr("msg");
+	}
+
 	public void setMTime(java.util.Date mTime) {
 		set("mTime", mTime);
 	}

+ 11 - 10
src/main/webapp/WEB-INF/view/admin/system/index/welcome.html

@@ -13,9 +13,10 @@
 	.col-sm-8{text-align: center;}
 	.input-append{background-color: white;margin-top: 7px;box-shadow: 0 1px 6px #ccc;}
 	.bb{border-bottom: 3px solid #243747;padding-bottom: 10px;color: #243747;}
-	.cd{display: block;margin-top: 5px;padding-right: 15px;}
 	.item{padding: 12px;border-bottom: 1px solid #efefef;}
-	.ls{display: block;margin-top: -19px;padding-right: 5px;}
+	/**超出显示省略号**/
+	.omit{white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
+	table{table-layout: fixed}
 </style>
 <body style="background-color: #E7ECEF;">
 	<div class="wrapper wrapper-content animated fadeInRight">
@@ -90,7 +91,7 @@
 				<div class="cos">
 					<div class="box" style="height: 460px;">
 						<div class="title"><span class="bb">最新新闻</span><a class="J_menuItem pull-right" href="#(path)/admin/work/news/list" style="color: darkgray">更多新闻</a></div>
-						<table class="table" style="margin-top: 3px;">
+						<table class="table table-responsive" style="margin-top: 3px;">
 							<thead style="background: #e7ecef;">
 							<tr>
 								<th>新闻标题</th>
@@ -101,9 +102,9 @@
 							<tbody>
 							#for(x:news_list)
 							<tr>
-								<td style="padding: 15px;">#(x.mTitle)</td>
-								<td style="padding: 15px;">#(x.typeName)</td>
-								<td style="padding: 15px;">#date(x.mTime,"yyyy-MM-dd hh:mm")</td>
+								<td><div class="omit">#(x.mTitle)</div></td>
+								<td>#(x.typeName)</td>
+								<td>#date(x.mTime,"yyyy-MM-dd hh:mm")</td>
 							</tr>
 							#end
 							</tbody>
@@ -125,10 +126,10 @@
 							<tbody>
 							#for(x:user_list)
 							<tr>
-								<td style="padding: 15px;"><img src="#(path)#(x.header)" style="width: 45px;height: 45px;border-radius: 50%;"></td>
-								<td style="padding: 15px;">#(x.account)</td>
-								<td style="padding: 15px;">#(x.mType==0?'个人用户':'企业用户')</td>
-								<td style="padding: 15px;">#date(x.mTime,"yyyy-MM-dd hh:mm")</td>
+								<td><img src="#(path)#(x.header)" style="width: 45px;height: 45px;border-radius: 50%;"></td>
+								<td>#(x.account)</td>
+								<td>#(x.mType==0?'个人用户':'企业用户')</td>
+								<td>#date(x.mTime,"yyyy-MM-dd hh:mm")</td>
 							</tr>
 							#end
 							</tbody>

+ 1 - 0
src/main/webapp/WEB-INF/view/admin/system/letter/add.html

@@ -52,6 +52,7 @@
     var ids=[]; //获取通知对象id
     var check_type=""; //是否选择全部对象
     UE.getEditor('editor',{
+        serverUrl:'#(path)/admin/upload/',
         toolbars:[['FullScreen', 'Undo','Redo','forecolor','bold', 'italic','formatmatch', 'autotypeset','justifyleft', 'justifycenter', 'justifyright', 'justifyjustify','insertorderedlist', 'insertunorderedlist',
             'rowspacingtop', 'rowspacingbottom', 'lineheight','simpleupload','insertvideo','customstyle','paragraph','fontfamily', 'fontsize','inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols']]
     });

+ 1 - 0
src/main/webapp/WEB-INF/view/admin/system/letter/edit.html

@@ -47,6 +47,7 @@
 #@js()
 <script>
     UE.getEditor('editor',{
+        serverUrl:'#(path)/admin/upload/',
         toolbars:[['FullScreen', 'Undo','Redo','forecolor','bold', 'italic','formatmatch', 'autotypeset','justifyleft', 'justifycenter', 'justifyright', 'justifyjustify','insertorderedlist', 'insertunorderedlist',
             'rowspacingtop', 'rowspacingbottom', 'lineheight','simpleupload','customstyle','paragraph','fontfamily', 'fontsize','inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols']]
     });

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/work/banner/form.html

@@ -17,7 +17,7 @@
             <tr>
                 <td width="150">选择图片 <span>*</span></td>
                 <td colspan="3">
-                    <img class="img" alt="添加封面" :src="mCove==''?'#(path)/static/ui/img/icon_p.png':mCove">
+                    <img class="img" alt="添加封面" :src="mCove==''?'#(path)/static/ui/img/icon_p.png':'#(path)'+mCove">
                     <input type="file" accept="image/*" accept='image/*' v-on:change="change($event,0)" style="margin-top:-128px;width:70%;margin-left: -30px;">
                     <span class="pull-right" @click="review">照片预览</span>
                 </td>

+ 42 - 5
src/main/webapp/WEB-INF/view/admin/work/news/form.html

@@ -65,11 +65,25 @@
                     </el-switch>
                 </td>
             </tr>
+            #if(shiro.hasPermission('news:audit')==false)
+            <tr v-if="item.mAudit==2">
+                <td class="l" style="vertical-align: top">审核不过原因 <span style="color: red;font-weight: bold;"> *</span></td>
+                <td colspan="3">
+                    <textarea style="height: 70px;" class="form-control" placeholder="输入原因" readonly v-model="item.msg"></textarea>
+                </td>
+            </tr>
+            #end
             #if(shiro.hasPermission('news:audit'))
             <tr>
                 <td class="l" style="vertical-align: top;">文章审核  <span>*</span></td>
                 <td colspan="3">
-                    <label class="spa" :class="{active:item.mAudit==index}"  v-for="(audit,index) in audit_list" @click="item.mAudit=index">{{audit}}</label>
+                    <label class="spa" :class="{active:item.mAudit==index}"  v-for="(audit,index) in audit_list" @click="audits(index)">{{audit}}</label>
+                </td>
+            </tr>
+            <tr v-if="zt">
+                <td class="l" style="vertical-align: top;">审核不过原因  <span>*</span></td>
+                <td colspan="3">
+                    <textarea style="height: 70px;" id="msg" name="msg" class="form-control" placeholder="输入原因" v-model="item.msg"></textarea>
                 </td>
             </tr>
             #end
@@ -96,9 +110,11 @@
 #@js()
 <script>
     var ue=UE.getEditor('editor',{
+        serverUrl:'#(path)/admin/upload/',
         toolbars:[['FullScreen', 'Undo','Redo','forecolor','bold', 'italic','formatmatch', 'autotypeset','justifyleft', 'justifycenter', 'justifyright', 'justifyjustify','insertorderedlist', 'insertunorderedlist',
             'rowspacingtop', 'rowspacingbottom', 'lineheight','simpleupload','insertvideo','customstyle','paragraph','fontfamily', 'fontsize','inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols']]
     });
+    ue.set
     var cropper = null;
     var vm = new Vue({
         el: "#app",
@@ -106,12 +122,14 @@
             audit_list:['待审核','审核通过','审核不通过'],
             type_list:[{name:'时政信息',id:1},{name:'政策宣传',id:2}],
             colmun_list:[],
-            item: {mTitle:'',mContent:'',typeName:1,mRelease:true,columnId:1,isTop:false,mAudit:0,mCove:'',mTime:''},
+            item: {mTitle:'',mContent:'',typeName:1,mRelease:true,columnId:1,isTop:false,mAudit:0,mCove:'',mTime:'',msg:''},
             show: false,
             mCove: '',
             dataImage: '',
             select:false,
             columnId:0,
+            zt:false,
+            f:true
         },
         mounted: function () {
             if ('#(op)' == 'edit'||'#(op)' == 'audit') {
@@ -121,6 +139,7 @@
                 this.item.isTop=this.item.isTop==0?false:true;
                 this.now=this.item.mAudit;
                 this.columnId=this.item.columnId;
+                this.f=false;
             }
             this.getColmun(this.item.typeName);
         },
@@ -128,21 +147,31 @@
             //选择分类
             selected:function(){
                 this.select=true;
+                this.f=false;
                 this.getColmun(vm.item.typeName);
+
             },
             //选择栏目
             getColmun:function(e){
-                console.log("zx4:"+this.item.columnId);
                 sendAjax("#(path)/admin/work/news/colmun_list",{type:e},function(res){
                     cancelLoding();
                     vm.colmun_list=res;
-                    if(vm.select){
+                    if(vm.select||vm.f){
                         vm.item.columnId=res[0].id;
                     }else{
                         vm.item.columnId=vm.columnId;
                     }
+                    console.log("vm.item.columnId2:"+vm.item.columnId);
                 });
             },
+            audits:function(index){
+                vm.item.mAudit=index;
+                if(index==2){
+                    vm.zt=true;
+                }else{
+                    vm.zt=false;
+                }
+            },
             //创建列表
             change: function (e, index) {
                 var objUrl = vm.getUri(e.currentTarget.files[0]);
@@ -185,9 +214,17 @@
         }
     })
     $("#add").click(function () {
+            if(vm.item.mTitle==''){
+                showToastError("输入标题")
+                return;
+            }
+            vm.item.mContent = ue.getContent();
+            if(vm.item.mContent==''){
+                showToastError("输入内容")
+                return;
+            }
             vm.item.isTop = vm.item.isTop == true ? 1 : 0;
             vm.item.mRelease = vm.item.mRelease == true ? 0 :1;
-            vm.item.mContent = ue.getContent();
             vm.item.mTime=$('#max').val();
             var data = {news: JSON.stringify(vm.item)};
             ajaxSubmit("#(path)/admin/work/news/#(op)", data);

+ 6 - 2
src/main/webapp/WEB-INF/view/admin/work/user/form.html

@@ -85,9 +85,13 @@
             $('#zt').hide();
         }
     });
-    function view(){
+    function view(_this){
         var json={"id":123,"start":0,"data":[{"alt":"营业执照查看","pid":666,"src":'#(path)#(app.fj)',"thumb":""}]}
-        layer.photos({photos:json,anim: 2});
+        layer.photos({
+            photos:json,
+            anim: 2,
+            area: ['65%', 'auto'],
+        });
     }
     $("#add").click(function() {
         if($("#mSate").val()==3&&$('#msg').val()==''){