Skip to content

platform
platform
Commit 0dbe5faf authored by 王国存's avatar 王国存
Browse files
Options

Merge branch 'test' into 'master' 

Test

See merge request !31
parents 87ec8165 bf2ccaa3
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 30 deletions
src/main/webapp/WEB-INF/page/education/team_history.jsp
View file @ 0dbe5faf
......@@ -61,6 +61,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
</div>
</div>
</div>
<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>
<!-- 全局js -->
<script
src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script>
......
src/main/webapp/WEB-INF/page/space/team_history.jsp
View file @ 0dbe5faf
......@@ -90,6 +90,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
</div>
</div>
</div>
<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>
<!-- 全局js -->
<script
src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script>
......
src/main/webapp/res/js/education/questionnaire_Information.js
View file @ 0dbe5faf
......@@ -856,7 +856,7 @@ function synchronizeUpperAndLowerFormContents() {
text7.attr("disabled","disabled")
$("#guidingindicators7 #submit16").prepend(text7)
$("#guidingindicators7 table tr").each((index,element)=>{
if ($($(element).children()[12]).children().attr('title')=="否"||$($(element).children()[16]).children().attr('title')=="否") {
if (!($($(element).children()[12]).children().attr('title')=="否"&&$($(element).children()[16]).children().attr('title')=="否")) {
$(element).remove()
}
})
......
src/main/webapp/res/js/education/team_history.js
View file @ 0dbe5faf
......@@ -117,7 +117,37 @@ function getAllTeam_show(teamid){
* @returns
*/
function project_DIV_Derive(){
downloadFile(webroot+"teamMessage/deriveTeamOFFLINE");
showLoading()
//downloadFile(webroot+"teamMessage/deriveTeamONLINE");
var url = webroot+"teamMessage/deriveTeamONLINE";
var xhr = new XMLHttpRequest();
xhr.open('GET', url, true); // 也可以使用POST方式，根据接口
xhr.responseType = "blob"; // 返回类型blob
// 定义请求完成的处理函数，请求前也可以增加加载框/禁用下载按钮逻辑
xhr.onload = function () {
// 请求完成
if (this.status === 200) {
// 返回200
var blob = this.response;
var reader = new FileReader();
reader.readAsDataURL(blob); // 转换为base64，可以直接放入a表情href
reader.onload = function (e) {
// 转换完成，创建一个a标签用于下载
var a = document.createElement('a');
a.download = '团队详细.xls';
a.href = e.target.result;
$("body").append(a); // 修复firefox中无法触发click
a.click();
$(a).remove();
hideLoading()
}
}else {
hideLoading()
swal("失败！", '网络错误，稍后再试', "error");
}
};
// 发送ajax请求
xhr.send()
}
/**
* 下载文件
......@@ -131,4 +161,10 @@ function downloadFile(url){
$('body').append(downloadFrame);
}
downloadFrame.attr('src',url);
}
showLoading = function(){
$('#loadingModal').modal({backdrop: 'static', keyboard: false});
}
hideLoading = function(){
$('#loadingModal').modal('hide');
}
\ No newline at end of file
src/main/webapp/res/js/education/team_library.js
View file @ 0dbe5faf
......@@ -162,4 +162,11 @@ function downloadFile(url){
$('body').append(downloadFrame);
}
downloadFrame.attr('src',url);
}
showLoading = function(){
$('#loadingModal').modal({backdrop: 'static', keyboard: false});
}
hideLoading = function(){
$('#loadingModal').modal('hide');
}
\ No newline at end of file
src/main/webapp/res/js/space/questionnaire_Information.js
View file @ 0dbe5faf
......@@ -23,34 +23,58 @@ var processStatus = 0
// 问卷状态自检
function StatusCheck(processStatus, resultList) {
//驳回框
//驳回框隐藏
$('#rejectMessage1,#rejectMessage2,#rejectMessage3,#rejectMessage4,#rejectMessage5,#rejectMessage6,#rejectMessage7,#rejectMessage8,#rejectMessage9').hide();
//当问卷被驳回
if (processStatus === 2) {
// $('#basicindicators1 input,#basicindicators2 input,#basicindicators3 input,#basicindicators4 input,#basicindicators5 input,#basicindicators6 input,#basicindicators7 input,#basicindicators8 input,#basicindicators9 input').attr("disabled", "disabled")
// $('#basicindicators1 select,#basicindicators2 select,#basicindicators3 select,#basicindicators4 select,#basicindicators5 select,#basicindicators6 select,#basicindicators7 select,#basicindicators8 select,#basicindicators9 select').attr("disabled", "disabled")
// console.log(resultList);
//遍历审批状态
resultList.forEach((item, index) => {
questionsId = item.approvalStatus;
approvalStatus = item.approvalStatus;
if (questionsId == 0) {
// 驳回状态 -0
if (approvalStatus == 0) {
rejectId = item.questionsId
// console.log(rejectId);
//显示驳回原因
$('#rejectMessage' + rejectId + ' textarea').val(item.remark)
//显示驳回框
$('#rejectMessage' + rejectId).show();
// $('#basicindicators'+ questionsId + ' input').removeAttr("disabled")
// $('#basicindicators'+ questionsId + ' select').removeAttr("disabled")
}else {
} else if (approvalStatus == 1) {
// 通过状态 -1
// 禁用已通过的问题
questionsId = item.questionsId
console.log( questionsId);
$('#basicindicators'+ questionsId + ' input').attr("disabled", "disabled")
$('#basicindicators'+ questionsId + ' select').attr("disabled", "disabled")
$('#basicindicators'+ questionsId + ' a').hide()
$('#guidingindicators'+ questionsId + ' input').attr("readonly","readonly")
$('#guidingindicators'+ questionsId + ' select').attr("disabled", "disabled")
$('#guidingindicators'+ questionsId + ' input').attr("disabled", "disabled")
$('#guidingindicators'+ questionsId + ' a').hide()
$('#guidingindicators'+ questionsId + ' input').attr("disabled", "disabled")
if (questionsId <= 9) {
//基础指标禁用
basicId = questionsId
//input框禁用
$('#basicindicators' + basicId + ' input').attr("disabled", "disabled")
//select框禁用
$('#basicindicators' + basicId + ' select').attr("disabled", "disabled")
//添加按钮隐藏
$('#basicindicators' + basicId + ' a').hide()
//删除按钮隐藏
$('#basicindicators' + basicId + ' button').hide()
// console.log(basicId);
//引用指标禁用
} else if (9 < questionsId && questionsId <= 22) {
guidingId = questionsId - 9
$('#guidingindicators' + guidingId + ' select').attr("disabled", "disabled")
$('#guidingindicators' + guidingId + ' input').attr("disabled", "disabled")
$('#guidingindicators' + guidingId + ' a').hide()
$('#guidingindicators' + guidingId + ' button').hide()
// console.log(guidingId);
// console.log("+++");
} else {
//奖励指标禁用
rewardId = questionsId - 22
$('#rewardindicators' + rewardId + ' input').attr("disabled", "disabled")
$('#rewardindicators' + rewardId + ' select').attr("disabled", "disabled")
$('#rewardindicators' + rewardId + ' a').hide()
$('#rewardindicators' + rewardId + ' button').hide()
// console.log(rewardId);
}
}
})
......@@ -59,7 +83,7 @@ function StatusCheck(processStatus, resultList) {
} else {
// $('#rejectLabel').hide();
// $('#rejectReason').hide();
//驳回框隐藏
$('#rejectMessage1,#rejectMessage2,#rejectMessage3,#rejectMessage4,#rejectMessage5,#rejectMessage6,#rejectMessage7,#rejectMessage8,#rejectMessage9').hide();
}
......@@ -1084,7 +1108,8 @@ $(function () {
//判断是否为本年入驻的 将不是的过滤掉
$("#guidingindicators4 table tr").each(function (index, element) {
if ($($(element).children()[5]).children().val() == "否") {
if ($($(element).children()[5]).children().val() == "否" || $($(element).children()[5]).children().val() == "") {
$(element).remove()
}
})
......@@ -1129,14 +1154,15 @@ $(function () {
$("#guidingindicators7 #rejectMessage6").hide()
$("#guidingindicators7 table tr").each(function (index, element) {
//判断是否参加互联网+大赛 将不是的过滤掉
if ($($(element).children()[12]).children().val() == "否") {
$(element).remove()
}
//判断是否为教育部入库创业导师 将不是的过滤掉
if ($($(element).children()[16]).children().val() == "否") {
// 判断是否参加互联网+大赛 将不是的过滤掉
// || $($(element).children()[12]).children().val() == ""
if ($($(element).children()[12]).children().val() == "否" && $($(element).children()[16]).children().val() == "否" ) {
$(element).remove()
}
// 判断是否为教育部入库创业导师 将不是的过滤掉
// if ($($(element).children()[16]).children().val() == "否") {
// $(element).remove()
// }
})
......
src/main/webapp/res/js/space/team_history.js
View file @ 0dbe5faf
......@@ -165,7 +165,37 @@ function getAllTeam_STATE_no2()
* @returns
*/
function project_DIV_Derive(){
downloadFile(webroot+"teamMessage/deriveTeamOFFLINE");
showLoading()
//downloadFile(webroot+"teamMessage/deriveTeamONLINE");
var url = webroot+"teamMessage/deriveTeamONLINE";
var xhr = new XMLHttpRequest();
xhr.open('GET', url, true); // 也可以使用POST方式，根据接口
xhr.responseType = "blob"; // 返回类型blob
// 定义请求完成的处理函数，请求前也可以增加加载框/禁用下载按钮逻辑
xhr.onload = function () {
// 请求完成
if (this.status === 200) {
// 返回200
var blob = this.response;
var reader = new FileReader();
reader.readAsDataURL(blob); // 转换为base64，可以直接放入a表情href
reader.onload = function (e) {
// 转换完成，创建一个a标签用于下载
var a = document.createElement('a');
a.download = '团队详细.xls';
a.href = e.target.result;
$("body").append(a); // 修复firefox中无法触发click
a.click();
$(a).remove();
hideLoading()
}
}else {
hideLoading()
swal("失败！", '网络错误，稍后再试', "error");
}
};
// 发送ajax请求
xhr.send()
}
/**
* 下载文件
......@@ -179,4 +209,10 @@ function downloadFile(url){
$('body').append(downloadFrame);
}
downloadFrame.attr('src',url);
}
showLoading = function(){
$('#loadingModal').modal({backdrop: 'static', keyboard: false});
}
hideLoading = function(){
$('#loadingModal').modal('hide');
}
\ No newline at end of file
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