Skip to content

platform
platform
Commit c76cce7f authored by 赵桢's avatar 赵桢
Browse files
Options

代码合并/修改

parent a90499a4
Show whitespace changes
Inline Side-by-side
Showing with 329 additions and 3 deletions
src/main/java/com/tiptimes/ctrl/GoToCtrl.java
View file @ c76cce7f
...@@ -569,4 +569,19 @@ public class GoToCtrl { ...@@ -569,4 +569,19 @@ public class GoToCtrl {
public String getSpace(HttpServletRequest request) { public String getSpace(HttpServletRequest request) {
return "/web/spaceindex"; return "/web/spaceindex";
} }
@RequestMapping({"/education/questionnaier_Information_new"})
public String getEducationQuestionnaierInformationNew(HttpServletRequest request) {
return "/education/questionnaier_Information_new";
}
@RequestMapping({"/education/questionnaire_Administration_new"})
public String getEducationQuestionnaireAdministrationNew(HttpServletRequest request) {
return "/education/questionnaire_Administration_new";
}
@RequestMapping({"/education/questionnaire_Administration_Tnew"})
public String getEducationQuestionnaireAdministrationTnew(HttpServletRequest request) {
return "/education/questionnaire_Administration_Tnew";
}
} }
src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java
View file @ c76cce7f
...@@ -237,6 +237,9 @@ public class QuestionnaireCtrl { ...@@ -237,6 +237,9 @@ public class QuestionnaireCtrl {
Map<String, Object> map_temp_i = new HashMap(); Map<String, Object> map_temp_i = new HashMap();
map_temp_i.put("createBy", educationQuestionnaireInformation_list_i.getCreateBy()); map_temp_i.put("createBy", educationQuestionnaireInformation_list_i.getCreateBy());
// map_temp_i.put("createTime" ,educationQuestionnaireInformation_list_i.getCreateTime());
if (educationQuestionnaireInformation_list_i.getWritePeople().equals("")){ if (educationQuestionnaireInformation_list_i.getWritePeople().equals("")){
map_temp_i.put("writePeople", "暂无"); map_temp_i.put("writePeople", "暂无");
} else { } else {
...@@ -470,4 +473,26 @@ public class QuestionnaireCtrl { ...@@ -470,4 +473,26 @@ public class QuestionnaireCtrl {
return questionnaireService.generateRecordTask(); return questionnaireService.generateRecordTask();
} }
/**
* 查询
* @param record
* @return
*/
@RequestMapping(value = {"/ceshi"})
@ResponseBody
public List<Record> ListList(Record record) {
return questionnaireService.selectRecordList(record);
}
/**
* 查询
* @param record
* @return
*/
@RequestMapping(value = {"/JackList"})
@ResponseBody
public List<Record> ListListT(Record record) {
return questionnaireService.JackList(record);
}
} }
\ No newline at end of file
src/main/java/com/tiptimes/service/QuestionnaireService.java
View file @ c76cce7f
...@@ -119,6 +119,8 @@ public interface QuestionnaireService { ...@@ -119,6 +119,8 @@ public interface QuestionnaireService {
Map<String,Object> generateTableTask(); Map<String,Object> generateTableTask();
Map<String,Object> generateRecordTask(); Map<String,Object> generateRecordTask();
List<Record> JackList(Record record);
} }
src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
View file @ c76cce7f
...@@ -1292,5 +1292,8 @@ public class QuestionnaireServiceImpl implements QuestionnaireService { ...@@ -1292,5 +1292,8 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
return tblMap; return tblMap;
} }
} }
@Override
public List<Record> JackList(Record record) {
return questionnaireDao.queryRecordList(record);
}
} }
src/main/webapp/WEB-INF/page/education/index.jsp
View file @ c76cce7f
...@@ -169,9 +169,15 @@ ...@@ -169,9 +169,15 @@
</a> </a>
<ul class="nav nav-second-level"> <ul class="nav nav-second-level">
<li><a class="J_menuItem" <li><a class="J_menuItem"
href="<%=request.getContextPath()%>/goto/education/questionnaire_Information_list">2022年天津市高校众创空间绩效评估</a></li> href="<%=request.getContextPath()%>/goto/education/questionnaire_Information_list">2022年前天津市高校众创空间绩效评估</a></li>
<li><a class="J_menuItem" <li><a class="J_menuItem"
href="<%=request.getContextPath()%>/goto/education/questionnaire_Administration_list">2022年天津市高校众创空间绩效汇总</a></li> href="<%=request.getContextPath()%>/goto/education/questionnaire_Administration_list">2022年前天津市高校众创空间绩效汇总</a></li>
<li><a class="J_menuItem"
href="<%=request.getContextPath()%>/goto/education/questionnaier_Information_new">2022年后天津市高校众创空间绩效评估</a></li>
<li><a class="J_menuItem"
href="<%=request.getContextPath()%>/goto/education/questionnaire_Administration_new">2022年后天津市高校众创空间绩效汇总</a></li>
<li><a class="J_menuItem"
href="<%=request.getContextPath()%>/goto/education/questionnaire_Administration_Tnew">2022年后天津市高校众创空间绩效汇总(用户登录应显示页面)</a></li>
</ul></li> </ul></li>
<%-- <li><a class="J_menuItem" href="<%=request.getContextPath()%>/goto/education/space_change_password" data-index="0"> <i class="fa fa-rotate-left"></i> <span class="nav-label">修改密码</span></a></li> <%-- <li><a class="J_menuItem" href="<%=request.getContextPath()%>/goto/education/space_change_password" data-index="0"> <i class="fa fa-rotate-left"></i> <span class="nav-label">修改密码</span></a></li>
......
src/main/webapp/WEB-INF/page/education/questionnaier_Information_new.jsp 0 → 100644
View file @ c76cce7f
<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %>
<%
String path = request.getContextPath();
String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<%--绩效评估--%>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>众创空间</title>
<link rel="shortcut icon" href="favicon.ico">
<link href="<%=request.getContextPath()%>/res/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/font-awesome.css?v=4.4.0" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/plugins/sweetalert/sweetalert.css" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/animate.css" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/style.css?v=4.1.0" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/js/plugins/highlight/highlight.css" rel="stylesheet">
<style type="text/css">
.shadowlight{
border-top: 9px solid #00ff00;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
}
.shadow{
border-top: 9px solid black;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
}
</style>
</head>
<body>
<script type="text/javascript">
var webroot = '<%=request.getContextPath()%>/';
var class_id = '<%=(String)request.getParameter("class_id")%>';
var className = '<%=(String)request.getParameter("className")%>';
</script>
<div style="width: 100%;height: 800px" id="iframe">
</div>
<!-- 全局js -->
<script src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="<%=request.getContextPath()%>/res/js/bootstrap.min.js?v=3.3.6"></script>
<script src="<%=request.getContextPath()%>/res/js/plugins/jeditable/jquery.jeditable.js"></script>
<script src="<%=request.getContextPath()%>/res/js/plugins/highlight/highlight.js"></script>
<script src="<%=request.getContextPath()%>/res/js/plugins/sweetalert/sweetalert.min.js"></script>
<!-- layer javascript -->
<script src="<%=request.getContextPath()%>/res/js/plugins/layer/layer.min.js"></script>
<!-- Data Tables -->
<%--<script src="<%=request.getContextPath()%>/res/js/plugins/dataTables/jquery.dataTables.js"></script>--%>
<script src="<%=request.getContextPath()%>/res/js/plugins/dataTables/dataTables.bootstrap.js"></script>
<!-- 自定义js -->
<script src="<%=request.getContextPath()%>/res/js/education/questionnaire_Administration_list.js"></script>
<script>
$(document).ready(function (){
//获取token里面的内容
<%
Cookie[] cookies = request.getCookies();
String SESSION = "";
for(int i = 0; i < cookies.length; i++) {
if ("SESSION".equals(cookies[i].getName())) {
SESSION = cookies[i].getValue();
}
}
request.setAttribute("SESSION", SESSION);
%>
<%-- http://localhost:8081/#/add--%>
var url="http://localhost:8081/#/add?session=<%=request.getAttribute("SESSION")%>"
// alert(url)
var iframe=$('<iframe width="100%" height="100%" src="'+url+'"></iframe>')
$("#iframe").append(iframe)
})
</script>
<div class="modal fade" id="loadingModal" backdrop="static" keyboard="false">
　　<div style="width: 200px;height:20px; z-index: 20000; position: absolute; text-align: center; left: 50%; top: 50%;margin-left:-100px;margin-top:-10px">
　　　　<div class="progress progress-striped active" style="margin-bottom: 0;background-color:rgba(0,0,0,0)">
　　　　<img src="<%=request.getContextPath()%>/res/image/loading.gif"><span style="color: white">数据加载中,请稍候...</span>
</div>
　　</div>
</div>
</body>
</html>
src/main/webapp/WEB-INF/page/education/questionnaire_Administration_Tnew.jsp 0 → 100644
View file @ c76cce7f
<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %>
<%
String path = request.getContextPath();
String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<%--绩效评估--%>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>众创空间</title>
<link rel="shortcut icon" href="favicon.ico">
<link href="<%=request.getContextPath()%>/res/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/font-awesome.css?v=4.4.0" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/plugins/sweetalert/sweetalert.css" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/animate.css" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/style.css?v=4.1.0" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/js/plugins/highlight/highlight.css" rel="stylesheet">
<style type="text/css">
.shadowlight{
border-top: 9px solid #00ff00;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
}
.shadow{
border-top: 9px solid black;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
}
</style>
</head>
<body>
<script type="text/javascript">
var webroot = '<%=request.getContextPath()%>/';
var class_id = '<%=(String)request.getParameter("class_id")%>';
var className = '<%=(String)request.getParameter("className")%>';
</script>
<div style="width: 100%;height: 800px" id="iframe">
</div>
<!-- 全局js -->
<script src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="<%=request.getContextPath()%>/res/js/bootstrap.min.js?v=3.3.6"></script>
<script src="<%=request.getContextPath()%>/res/js/plugins/jeditable/jquery.jeditable.js"></script>
<script src="<%=request.getContextPath()%>/res/js/plugins/highlight/highlight.js"></script>
<script src="<%=request.getContextPath()%>/res/js/plugins/sweetalert/sweetalert.min.js"></script>
<!-- layer javascript -->
<script src="<%=request.getContextPath()%>/res/js/plugins/layer/layer.min.js"></script>
<!-- Data Tables -->
<%--<script src="<%=request.getContextPath()%>/res/js/plugins/dataTables/jquery.dataTables.js"></script>--%>
<script src="<%=request.getContextPath()%>/res/js/plugins/dataTables/dataTables.bootstrap.js"></script>
<!-- 自定义js -->
<script src="<%=request.getContextPath()%>/res/js/education/questionnaire_Administration_list.js"></script>
<script>
$(document).ready(function (){
//获取token里面的内容
<%
Cookie[] cookies = request.getCookies();
String SESSION = "";
for(int i = 0; i < cookies.length; i++) {
if ("SESSION".equals(cookies[i].getName())) {
SESSION = cookies[i].getValue();
}
}
request.setAttribute("SESSION", SESSION);
%>
<%-- http://localhost:8081/#/add--%>
var url="http://localhost:8081/#/one?session=<%=request.getAttribute("SESSION")%>"
// alert(url)
var iframe=$('<iframe width="100%" height="100%" src="'+url+'"></iframe>')
$("#iframe").append(iframe)
})
</script>
<div class="modal fade" id="loadingModal" backdrop="static" keyboard="false">
　　<div style="width: 200px;height:20px; z-index: 20000; position: absolute; text-align: center; left: 50%; top: 50%;margin-left:-100px;margin-top:-10px">
　　　　<div class="progress progress-striped active" style="margin-bottom: 0;background-color:rgba(0,0,0,0)">
　　　　<img src="<%=request.getContextPath()%>/res/image/loading.gif"><span style="color: white">数据加载中,请稍候...</span>
</div>
　　</div>
</div>
</body>
</html>
src/main/webapp/WEB-INF/page/education/questionnaire_Administration_new.jsp 0 → 100644
View file @ c76cce7f
<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %>
<%
String path = request.getContextPath();
String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<%--绩效汇总--%>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>众创空间</title>
<link rel="shortcut icon" href="favicon.ico">
<link href="<%=request.getContextPath()%>/res/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/font-awesome.css?v=4.4.0" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/plugins/sweetalert/sweetalert.css" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/animate.css" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/css/style.css?v=4.1.0" rel="stylesheet">
<link href="<%=request.getContextPath()%>/res/js/plugins/highlight/highlight.css" rel="stylesheet">
<style type="text/css">
.shadowlight{
border-top: 9px solid #00ff00;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
}
.shadow{
border-top: 9px solid black;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
}
</style>
</head>
<body>
<script type="text/javascript">
var webroot = '<%=request.getContextPath()%>/';
var class_id = '<%=(String)request.getParameter("class_id")%>';
var className = '<%=(String)request.getParameter("className")%>';
</script>
<div style="width: 100%;height: 800px" id="iframe">
</div>
<!-- 全局js -->
<script src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.js"></script>
<script src="<%=request.getContextPath()%>/res/js/bootstrap.min.js?v=3.3.6"></script>
<script src="<%=request.getContextPath()%>/res/js/plugins/jeditable/jquery.jeditable.js"></script>
<script src="<%=request.getContextPath()%>/res/js/plugins/highlight/highlight.js"></script>
<script src="<%=request.getContextPath()%>/res/js/plugins/sweetalert/sweetalert.min.js"></script>
<!-- layer javascript -->
<script src="<%=request.getContextPath()%>/res/js/plugins/layer/layer.min.js"></script>
<!-- Data Tables -->
<%--<script src="<%=request.getContextPath()%>/res/js/plugins/dataTables/jquery.dataTables.js"></script>--%>
<script src="<%=request.getContextPath()%>/res/js/plugins/dataTables/dataTables.bootstrap.js"></script>
<!-- 自定义js -->
<script src="<%=request.getContextPath()%>/res/js/education/questionnaire_Administration_list.js"></script>
<script>
$(document).ready(function (){
//获取token里面的内容
<%
Cookie[] cookies = request.getCookies();
String SESSION = "";
for(int i = 0; i < cookies.length; i++) {
if ("SESSION".equals(cookies[i].getName())) {
SESSION = cookies[i].getValue();
}
}
request.setAttribute("SESSION", SESSION);
%>
var url="http://localhost:8081?session=<%=request.getAttribute("SESSION")%>"
// alert(url)
var iframe=$('<iframe width="100%" height="100%" src="'+url+'"></iframe>')
$("#iframe").append(iframe)
})
</script>
<div class="modal fade" id="loadingModal" backdrop="static" keyboard="false">
　　<div style="width: 200px;height:20px; z-index: 20000; position: absolute; text-align: center; left: 50%; top: 50%;margin-left:-100px;margin-top:-10px">
　　　　<div class="progress progress-striped active" style="margin-bottom: 0;background-color:rgba(0,0,0,0)">
　　　　<img src="<%=request.getContextPath()%>/res/image/loading.gif"><span style="color: white">数据加载中,请稍候...</span>
</div>
　　</div>
</div>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment