From 5d12a2b284fbbb7c3db017bc82df9c07e2f1cf51 Mon Sep 17 00:00:00 2001 From: gjq Date: Fri, 10 Dec 2021 18:31:14 +0800 Subject: [PATCH] ... --- .../controller/ContentController.java | 10 ++++ .../templates/content/application.html | 39 ++++++------ .../resources/templates/content/edit2.html | 2 +- .../resources/templates/content/list2.html | 59 +++++++++++-------- 4 files changed, 66 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/nbclass/activity/controller/ContentController.java b/src/main/java/com/nbclass/activity/controller/ContentController.java index 0cc30b9..faf94ae 100644 --- a/src/main/java/com/nbclass/activity/controller/ContentController.java +++ b/src/main/java/com/nbclass/activity/controller/ContentController.java @@ -81,11 +81,21 @@ public class ContentController extends BaseController { return "content/application"; } + /** + * 案例统计列表 + * @param model + * @return + */ @GetMapping("/index-census") public String census(Model model){ return "content/census"; } + @GetMapping("/index-logger") + public String logger(Model model){ + return "content-logger/list"; + } + /** * i技术开发案例页面 * @param model diff --git a/src/main/resources/templates/content/application.html b/src/main/resources/templates/content/application.html index 21ec885..6651e86 100644 --- a/src/main/resources/templates/content/application.html +++ b/src/main/resources/templates/content/application.html @@ -186,14 +186,14 @@ var delFlag = "[[${@perms.hasPerm('cases-h5')}]]"; var columns = [ {checkbox: true }, - {field: 'id', title: '案例编号', align : "center", width: "50"}, - {field: 'title', title: '标题', align : "center", width: "155"}, - /* {field: 'title', title: '标题', align : "left", width: "25%", formatter: function(value, row, index) { + {field: 'id', title: '案例编号', align : "center"}, + //{field: 'title', title: '标题', align : "center", width: "155"}, + {field: 'title', title: '标题', align : "center", formatter: function(value, row, index) { if(value!=null && $.trim(value)!='' && value.length>25){ value = value.substring(0, 25)+' ......'; } return value; - }},*/ + }}, {field: 'status', title: '状态', align : "center", width: "60", formatter:function(value,row, index){ if(row.status === 1){ return "待审核"; @@ -208,11 +208,11 @@ } }}, - {field: 'visibility', title: '可见性', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'visibility', title: '可见性', align : "center", formatter:function(value,row, index){ return row.visibility === 1 ? "可见" : "不可见"; }}, - {field: 'labelFeedback', title: '索引标签反馈次数', align : "center", width: "50"}, - {field: 'purposeCase', title: '案例用途', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'labelFeedback', title: '标签反馈数', align : "center"}, + {field: 'purposeCase', title: '案例用途', align : "center", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 19){ return row.tagList[i].tagName; @@ -220,7 +220,7 @@ } return ""; }}, - {field: 'formCreative', title: '创意形式', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'formCreative', title: '创意形式', align : "center", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 20){ return row.tagList[i].tagName; @@ -228,7 +228,7 @@ } return ""; }}, - {field: 'eventsFestival', title: '节日事件', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'eventsFestival', title: '节日事件', align : "center",formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 21){ return row.tagList[i].tagName; @@ -236,7 +236,7 @@ } return ""; }}, - {field: 'typeCase', title: '案例类型', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'typeCase', title: '案例类型', align : "center",formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 18){ return row.tagList[i].tagName; @@ -244,7 +244,7 @@ } return ""; }}, - {field: 'brandCompany', title: '品牌公司', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'brandCompany', title: '品牌公司', align : "center", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 23){ return row.tagList[i].tagName; @@ -252,7 +252,7 @@ } return ""; }}, - {field: 'advertisingAgency', title: '广告公司', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'advertisingAgency', title: '广告公司', align : "center",formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 24){ return row.tagList[i].tagName; @@ -260,12 +260,12 @@ } return ""; }}, - {field: 'collectionNumber', title: '被收藏数', align : "center", width: "50"}, - {field: 'comments', title: '评论数', align : "center", width: "50"}, - {field: 'createtime', title: '创建时间', align : "center", width: "50"}, - {field: 'updatetime', title: '修改时间', align : "center", width: "50"}, - {field: 'onlineTime', title: '上线时间', align : "center", width: "50"}, - {field: 'position', title: '关联部门', align : "center", width: "50", formatter:function(value,row, index){ + {field: 'collectionNumber', title: '收藏数', align : "center"}, + {field: 'comments', title: '评论数', align : "center"}, + {field: 'createtime', title: '创建时间', align : "center"}, + // {field: 'updatetime', title: '修改时间', align : "center"}, + {field: 'onlineTime', title: '上线时间', align : "center"}, + {field: 'position', title: '关联部门', align : "center", width: "170", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 26){ return row.tagList[i].tagName; @@ -288,7 +288,7 @@ } return value; }},*/ - {field : 'operation', title : '操作', align : "left", width: '450px', formatter: function(value, row, index) { + {field : 'operation', title : '操作', align : "center", formatter: function(value, row, index) { let adoptHtml = ""; let rejectHtml = ""; let seeHtml = ""; @@ -535,3 +535,4 @@ + diff --git a/src/main/resources/templates/content/edit2.html b/src/main/resources/templates/content/edit2.html index eef203c..5e0bdf5 100644 --- a/src/main/resources/templates/content/edit2.html +++ b/src/main/resources/templates/content/edit2.html @@ -538,7 +538,7 @@ var caseType = [[${caseType}]]; var str = $("#desct").val(); str = str.substr(str.length-1,1); if(str === ">"){ - alert("请输入文本值！"); + alert("请在视频或图片后面输入文本值！"); return; } diff --git a/src/main/resources/templates/content/list2.html b/src/main/resources/templates/content/list2.html index 4107689..dbf8ba3 100644 --- a/src/main/resources/templates/content/list2.html +++ b/src/main/resources/templates/content/list2.html @@ -205,14 +205,14 @@ var delFlag = "[[${@perms.hasPerm('cases-h5')}]]"; var columns = [ {checkbox: true }, - {field: 'id', title: '案例编号', align : "center", width: "50"}, - {field: 'title', title: '标题', align : "left", width: "155"}, - /* {field: 'title', title: '标题', align : "left", width: "25%", formatter: function(value, row, index) { + {field: 'id', title: '案例编号', align : "center"}, + //{field: 'title', title: '标题', align : "left", width: "155"}, + {field: 'title', title: '标题', align : "center", formatter: function(value, row, index) { if(value!=null && $.trim(value)!='' && value.length>25){ value = value.substring(0, 25)+' ......'; } return value; - }},*/ + }}, {field: 'status', title: '状态', align : "center", width: "60", formatter:function(value,row, index){ if(row.status === 1){ return "待审核"; @@ -227,11 +227,13 @@ } }}, - {field: 'visibility', title: '可见性', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'visibility', title: '可见性', align : "center", formatter:function(value,row, index){ return row.visibility === 1 ? "可见" : "不可见"; }}, - {field: 'labelFeedback', title: '索引标签反馈次数', align : "center", width: "50"}, - {field: 'purposeCase', title: '案例用途', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'labelFeedback', title: '标签反馈数', align : "center",formatter:function(value,row, index){ + + }}, + {field: 'purposeCase', title: '案例用途', align : "center", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 19){ return row.tagList[i].tagName; @@ -239,7 +241,7 @@ } return ""; }}, - {field: 'formCreative', title: '创意形式', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'formCreative', title: '创意形式', align : "center", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 20){ return row.tagList[i].tagName; @@ -247,7 +249,7 @@ } return ""; }}, - {field: 'eventsFestival', title: '节日事件', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'eventsFestival', title: '节日事件', align : "center", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 21){ return row.tagList[i].tagName; @@ -255,7 +257,7 @@ } return ""; }}, - {field: 'typeCase', title: '案例类型', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'typeCase', title: '案例类型', align : "center", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 18){ return row.tagList[i].tagName; @@ -263,7 +265,7 @@ } return ""; }}, - {field: 'brandCompany', title: '品牌公司', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'brandCompany', title: '品牌公司', align : "center", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 23){ return row.tagList[i].tagName; @@ -271,7 +273,7 @@ } return ""; }}, - {field: 'advertisingAgency', title: '广告公司', align : "center", width: "60", formatter:function(value,row, index){ + {field: 'advertisingAgency', title: '广告公司', align : "center", formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 24){ return row.tagList[i].tagName; @@ -279,12 +281,12 @@ } return ""; }}, - {field: 'collectionNumber', title: '被收藏数', align : "center", width: "50"}, - {field: 'comments', title: '评论数', align : "center", width: "50"}, - {field: 'createtime', title: '创建时间', align : "center", width: "50"}, - {field: 'updatetime', title: '修改时间', align : "center", width: "50"}, - {field: 'onlineTime', title: '上线时间', align : "center", width: "50"}, - {field: 'position', title: '关联部门', align : "center", width: "50", formatter:function(value,row, index){ + {field: 'collectionNumber', title: '收藏数', align : "center" }, + {field: 'comments', title: '评论数', align : "center" }, + {field: 'createtime', title: '创建时间', align : "center"}, + //{field: 'updatetime', title: '修改时间', align : "center"}, + {field: 'onlineTime', title: '上线时间', align : "center"}, + {field: 'position', title: '关联部门', align : "center",width:170,formatter:function(value,row, index){ for(var i = 0; i < row.tagList.length;i++){ if(row.tagList[i].id === 26){ return row.tagList[i].tagName; @@ -292,7 +294,7 @@ } return ""; }}, - {field: 'userName', title: '创建者', align : "center", width: "450"}, + {field: 'userName', title: '创建者', align : "center"}, /* {field: 'title', title: '标题', align : "left", width: "25%", formatter: function(value, row, index) { if(value!=null && $.trim(value)!='' && value.length>25){ value = value.substring(0, 25)+' ......'; @@ -307,7 +309,7 @@ } return value; }},*/ - {field : 'operation', title : '操作', align : "left", width: '450%', formatter: function(value, row, index) { + {field : 'operation', title : '操作', align : "center", formatter: function(value, row, index) { let submitHtml = ""; let offlineHtml = ""; let editHtml = ""; @@ -334,7 +336,7 @@ seeHtml = '查看'; delHtml = ' 删除'; submitHtml = '撤回'; - }else if(row.status === 2 || row.status === 3){ + }else if(row.status === 3){ /*if($("#name").val() !== 'admin'){ submitHtml = '更新'; }*/ @@ -347,8 +349,8 @@ offlineHtml = '下线'; }*/ offlineHtml = '下线'; + submitHtml = '更新'; seeHtml = '查看'; - delHtml = ' 删除'; } /*if(row.status === 3){ delHtml = ' 删除'; @@ -592,8 +594,17 @@ todayBtn: true//显示今日按钮 }) + /*$("#labelFeedback").on('click',function(id){ + layer.open({ + type: 2, + title: '用户登录', + maxmin: true, + skin: 'layui-layer-lan', + shadeClose: true, //点击遮罩关闭层 + area : ['1400px' , '1280px'], + content:'http://localhost:8081/cases/console/content/index-logger'//弹框显示的url,对应的页面 + }); - - + });*/