Commit 81df8ce6de7879d75e2e334d1bcca13ea31407ff

Authored by 孙向锦
1 parent c83d0804

去掉多余的信息

WebRoot/WEB-INF/jsp/feedback/feedback/feedback_list.jsp
... ... @@ -33,27 +33,8 @@
33 33 <form action="feedback/list.do" method="post" name="Form" id="Form">
34 34 <table style="margin-top:5px;">
35 35 <tr>
36   - <td>
37   - <div class="nav-search">
38   - <span class="input-icon">
39   - <input type="text" placeholder="这里输入关键词" class="nav-search-input" id="nav-search-input" autocomplete="off" name="keywords" value="${pd.keywords }" placeholder="这里输入关键词"/>
40   - <i class="ace-icon fa fa-search nav-search-icon"></i>
41   - </span>
42   - </div>
43   - </td>
44   - <td style="padding-left:2px;"><input class="span10 date-picker" name="lastStart" id="lastStart" value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="开始日期" title="开始日期"/></td>
45   - <td style="padding-left:2px;"><input class="span10 date-picker" name="lastEnd" name="lastEnd" value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="结束日期" title="结束日期"/></td>
46   - <td style="vertical-align:top;padding-left:2px;">
47   - <select class="chosen-select form-control" name="name" id="id" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
48   - <option value=""></option>
49   - <option value="">全部</option>
50   - <option value="">1</option>
51   - <option value="">2</option>
52   - </select>
53   - </td>
54   - <c:if test="${QX.cha == 1 }">
55   - <td style="vertical-align:top;padding-left:2px"><a class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i id="nav-search-icon" class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
56   - </c:if>
  36 +
  37 +
57 38 <c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
58 39 </tr>
59 40 </table>
... ... @@ -110,7 +91,8 @@
110 91 <td class='center'>${var.SOFTWARE_NAME}</td>
111 92 <td class='center'>${var.EXCEPTION_NUM}</td>
112 93 <td class='center'>${var.DESCRIPTION}</td>
113   - <td class='center'>${var.PROBLEM_PATH}</td>
  94 + <%-- <td class='center'>${var.PROBLEM_PATH}</td> --%>
  95 + <td><img src="../../../../SunvoteEducation/images/${var.PROBLEM_PATH}" class="img-responsive" alt="Responsive image"></td>
114 96 <td class='center'>${var.CUSTOMER_CODE}</td>
115 97 <td class='center'>${var.PERSON_LIABLE}</td>
116 98 <td class='center'>${var.CREATE_DATE}</td>
... ...
WebRoot/WEB-INF/jsp/feedback/problemphenomenon/problemphenomenon_list.jsp
... ... @@ -31,32 +31,7 @@
31 31  
32 32 <!-- 检索 -->
33 33 <form action="problemphenomenon/list.do" method="post" name="Form" id="Form">
34   - <table style="margin-top:5px;">
35   - <tr>
36   - <td>
37   - <div class="nav-search">
38   - <span class="input-icon">
39   - <input type="text" placeholder="这里输入关键词" class="nav-search-input" id="nav-search-input" autocomplete="off" name="keywords" value="${pd.keywords }" placeholder="这里输入关键词"/>
40   - <i class="ace-icon fa fa-search nav-search-icon"></i>
41   - </span>
42   - </div>
43   - </td>
44   - <td style="padding-left:2px;"><input class="span10 date-picker" name="lastStart" id="lastStart" value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="开始日期" title="开始日期"/></td>
45   - <td style="padding-left:2px;"><input class="span10 date-picker" name="lastEnd" name="lastEnd" value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="结束日期" title="结束日期"/></td>
46   - <td style="vertical-align:top;padding-left:2px;">
47   - <select class="chosen-select form-control" name="name" id="id" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
48   - <option value=""></option>
49   - <option value="">全部</option>
50   - <option value="">1</option>
51   - <option value="">2</option>
52   - </select>
53   - </td>
54   - <c:if test="${QX.cha == 1 }">
55   - <td style="vertical-align:top;padding-left:2px"><a class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i id="nav-search-icon" class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
56   - </c:if>
57   - <c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
58   - </tr>
59   - </table>
  34 +
60 35 <!-- 检索 -->
61 36  
62 37 <table id="simple-table" class="table table-striped table-bordered table-hover" style="margin-top:5px;">
... ...
WebRoot/WEB-INF/jsp/system/index/left.jsp
... ... @@ -3,7 +3,7 @@
3 3 try{ace.settings.check('sidebar' , 'fixed')}catch(e){}
4 4 </script>
5 5  
6   - <div class="sidebar-shortcuts" id="sidebar-shortcuts">
  6 + <div style="display:none" class="sidebar-shortcuts" id="sidebar-shortcuts">
7 7 <div class="sidebar-shortcuts-large" id="sidebar-shortcuts-large">
8 8  
9 9 <button class="btn btn-info" onclick="changeMenus('index');" title="业务菜单">
... ...
WebRoot/WEB-INF/jsp/system/index/login.jsp
... ... @@ -249,7 +249,7 @@
249 249 if(check()){
250 250 var loginname = $("#loginname").val();
251 251 var password = $("#password").val();
252   - var code = "elvis"+loginname+",fh,"+password+"elvis"+",fh,"+$("#code").val();
  252 + var code = loginname+";;;"+password+";;;" + $("#code").val();
253 253 $.ajax({
254 254 type: "POST",
255 255 url: 'login_login',
... ...
WebRoot/WEB-INF/jsp/system/role/role_list.jsp
... ... @@ -53,7 +53,7 @@
53 53  
54 54 <table>
55 55 <tr height="7px;"><td colspan="100"></td></tr>
56   - <tr>
  56 + <tr style="display:none">
57 57 <td><font color="#808080">本组:</font></td>
58 58 <td>
59 59 <c:if test="${QX.edit == 1 }">
... ... @@ -64,10 +64,10 @@
64 64 </c:when>
65 65 <c:otherwise>
66 66 <c:if test="${QX.edit == 1 }">
67   - <a class="btn btn-mini btn-purple" onclick="editRights('${pd.ROLE_ID }');">
  67 + <a class="btn btn-mini btn-purple" onclick="editRights('${pd.ROLE_ID }');">
68 68 <i class="icon-pencil"></i>
69   - <c:if test="${pd.ROLE_ID == '1'}">Admin 菜单权限</c:if>
70   - <c:if test="${pd.ROLE_ID != '1'}">组菜单权限</c:if>
  69 + <c:if test="${pd.ROLE_ID == '12121221'}">Admin 菜单权限</c:if>
  70 + <c:if test="${pd.ROLE_ID == '112121221'}">组菜单权限</c:if>
71 71 </a>
72 72 </c:if>
73 73 </c:otherwise>
... ...
src/com/fh/controller/api/ApiServer.java
... ... @@ -294,13 +294,13 @@ public class ApiServer extends BaseController {
294 294 if (content[0].contains("image")) {
295 295 fileType = content[0].substring(11,content[0].length());
296 296 }
297   - File dir = new File(path + File.separator + "fb_"
298   - + System.currentTimeMillis() + "." + fileType);
  297 + String filename = "fb_" + System.currentTimeMillis() + "." + fileType ;
  298 + File dir = new File(path + File.separator + filename );
299 299 if (!dir.exists()) {
300 300 dir.createNewFile();
301 301 }
302 302 generateImage(content[1], dir.getAbsolutePath());
303   - pd.put("PROBLEM_PATH", dir.getAbsolutePath());
  303 + pd.put("PROBLEM_PATH", filename);
304 304 }
305 305 }
306 306 }
... ...
src/com/fh/controller/system/login/LoginController.java
... ... @@ -96,7 +96,7 @@ public class LoginController extends BaseController {
96 96 PageData pd = new PageData();
97 97 pd = this.getPageData();
98 98 String errInfo = "";
99   - String KEYDATA[] = pd.getString("KEYDATA").replaceAll("elvis", "").split(",fh,");
  99 + String KEYDATA[] = pd.getString("KEYDATA").split(";;;");
100 100 if(null != KEYDATA && KEYDATA.length >= 2){
101 101 Session session = Jurisdiction.getSession();
102 102 String sessionCode = (String)session.getAttribute(Const.SESSION_SECURITY_CODE); //获取session中的验证码
... ...
src/com/fh/util/Const.java
... ... @@ -32,7 +32,7 @@ public class Const {
32 32 public static final String FILEPATHFILE = "uploadFiles/file/"; //文件上传路径
33 33 public static final String FILEPATHFILEOA = "uploadFiles/uploadFile/"; //文件上传路径(oa管理)
34 34 public static final String FILEPATHTWODIMENSIONCODE = "uploadFiles/twoDimensionCode/"; //二维码存放路径
35   - public static final String NO_INTERCEPTOR_PATH = ".*/((login)|(logout)|(code)|(app)|(weixin)|(static)|(afterService)|(main)|(api)|(websocket)|(uploadImgs)).*"; //不对匹配该值的访问路径拦截(正则)
  35 + public static final String NO_INTERCEPTOR_PATH = ".*/((login)|(logout)|(code)|(app)|(weixin)|(static)|(images)|(afterService)|(main)|(api)|(websocket)|(uploadImgs)).*"; //不对匹配该值的访问路径拦截(正则)
36 36 public static ApplicationContext WEB_APP_CONTEXT = null; //该值会在web容器启动时由WebAppContextListener初始化
37 37  
38 38 /**
... ...