Skip to content

platform
platform
Commit 87ec8165 authored by 王国存's avatar 王国存
Browse files
Options

Merge branch 'test' into 'master' 

Test

See merge request !30
parents 6854c9e2 461b3bc0
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 5 deletions
src/main/webapp/WEB-INF/page/education/team_library.jsp
View file @ 87ec8165
...@@ -52,6 +52,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. ...@@ -52,6 +52,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
</div> </div>
</div> </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 --> <!-- 全局js -->
<script src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script> <script src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script>
<script src="<%=request.getContextPath()%>/res/js/bootstrap.min.js?v=3.3.6"></script> <script src="<%=request.getContextPath()%>/res/js/bootstrap.min.js?v=3.3.6"></script>
......
src/main/webapp/WEB-INF/page/space/team_library.jsp
View file @ 87ec8165
...@@ -49,6 +49,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. ...@@ -49,6 +49,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
</div> </div>
</div> </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 --> <!-- 全局js -->
<script src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script> <script src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script>
<script src="<%=request.getContextPath()%>/res/js/bootstrap.min.js?v=3.3.6"></script> <script src="<%=request.getContextPath()%>/res/js/bootstrap.min.js?v=3.3.6"></script>
......
src/main/webapp/res/js/education/questionnaire_Information.js
View file @ 87ec8165
...@@ -63,6 +63,7 @@ function StatusCheck() { ...@@ -63,6 +63,7 @@ function StatusCheck() {
$('#reject_btn').hide() $('#reject_btn').hide()
//$('textarea[name*="question_"]').prop('readonly', true) //$('textarea[name*="question_"]').prop('readonly', true)
for (let i = 1; i < 28; i++) { for (let i = 1; i < 28; i++) {
$(`#submit${i} a`).hide()
$(`#submit${i} input[type='number']`).val(()=>{ $(`#submit${i} input[type='number']`).val(()=>{
try { try {
if(data.reviews.length>0){ if(data.reviews.length>0){
...@@ -607,6 +608,8 @@ function saveQuestionnaire(isAuto){ ...@@ -607,6 +608,8 @@ function saveQuestionnaire(isAuto){
} else { } else {
swal("成功！", '暂存成功', "success"); swal("成功！", '暂存成功', "success");
} }
}else {
swal("成功！", '没有要暂存的备注', "success");
} }
} }
}); });
...@@ -927,6 +930,7 @@ function submitForReview(questionNum) { ...@@ -927,6 +930,7 @@ function submitForReview(questionNum) {
if(result.result==true){ if(result.result==true){
swal("成功！", '审核成功', "success"); swal("成功！", '审核成功', "success");
$(`#submit${questionNum} a`).attr('disabled',"true") $(`#submit${questionNum} a`).attr('disabled',"true")
$(`#submit${questionNum} a`).removeAttr('onclick')
}else{ }else{
swal("失败！", result.msg, "error"); swal("失败！", result.msg, "error");
} }
...@@ -1215,6 +1219,7 @@ function scoreSubmission(questionNum) { ...@@ -1215,6 +1219,7 @@ function scoreSubmission(questionNum) {
if(result.result==true){ if(result.result==true){
swal("成功！", '审核成功', "success"); swal("成功！", '审核成功', "success");
$(`#submit${questionNum} a`).attr('disabled',"true") $(`#submit${questionNum} a`).attr('disabled',"true")
$(`#submit${questionNum} a`).removeAttr('onclick')
}else{ }else{
swal("失败！", result.msg, "error"); swal("失败！", result.msg, "error");
} }
......
src/main/webapp/res/js/education/team_library.js
View file @ 87ec8165
...@@ -118,7 +118,37 @@ function getAllTeam_show(teamid){ ...@@ -118,7 +118,37 @@ function getAllTeam_show(teamid){
* @returns * @returns
*/ */
function project_DIV_Derive(){ function project_DIV_Derive(){
downloadFile(webroot+"teamMessage/deriveTeamONLINE"); 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()
} }
/** /**
* 下载文件 * 下载文件
......
src/main/webapp/res/js/space/questionnaire_Information.js
View file @ 87ec8165
...@@ -27,13 +27,30 @@ function StatusCheck(processStatus, resultList) { ...@@ -27,13 +27,30 @@ function StatusCheck(processStatus, resultList) {
$('#rejectMessage1,#rejectMessage2,#rejectMessage3,#rejectMessage4,#rejectMessage5,#rejectMessage6,#rejectMessage7,#rejectMessage8,#rejectMessage9').hide(); $('#rejectMessage1,#rejectMessage2,#rejectMessage3,#rejectMessage4,#rejectMessage5,#rejectMessage6,#rejectMessage7,#rejectMessage8,#rejectMessage9').hide();
if (processStatus === 2) { 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) => { resultList.forEach((item, index) => {
questionsId = item.approvalStatus; questionsId = item.approvalStatus;
if (questionsId == 0) { if (questionsId == 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 {
questionsId = item.questionsId questionsId = item.questionsId
$('#rejectMessage' + questionsId + ' textarea').val(item.remark) console.log( questionsId);
$('#basicindicators'+ questionsId + ' input').attr("disabled", "disabled")
$('#rejectMessage' + questionsId).show(); $('#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")
} }
}) })
...@@ -42,6 +59,7 @@ function StatusCheck(processStatus, resultList) { ...@@ -42,6 +59,7 @@ function StatusCheck(processStatus, resultList) {
} else { } else {
// $('#rejectLabel').hide(); // $('#rejectLabel').hide();
// $('#rejectReason').hide(); // $('#rejectReason').hide();
$('#rejectMessage1,#rejectMessage2,#rejectMessage3,#rejectMessage4,#rejectMessage5,#rejectMessage6,#rejectMessage7,#rejectMessage8,#rejectMessage9').hide(); $('#rejectMessage1,#rejectMessage2,#rejectMessage3,#rejectMessage4,#rejectMessage5,#rejectMessage6,#rejectMessage7,#rejectMessage8,#rejectMessage9').hide();
} }
......
src/main/webapp/res/js/space/team_library.js
View file @ 87ec8165
...@@ -110,7 +110,37 @@ function getAllTeam_STATE(teamMessageID) ...@@ -110,7 +110,37 @@ function getAllTeam_STATE(teamMessageID)
* @returns * @returns
*/ */
function project_DIV_Derive(){ function project_DIV_Derive(){
downloadFile(webroot+"teamMessage/deriveTeamONLINE"); 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()
} }
/** /**
* 下载文件 * 下载文件
...@@ -126,6 +156,12 @@ function downloadFile(url){ ...@@ -126,6 +156,12 @@ function downloadFile(url){
downloadFrame.attr('src',url); downloadFrame.attr('src',url);
} }
showLoading = function(){
$('#loadingModal').modal({backdrop: 'static', keyboard: false});
}
hideLoading = function(){
$('#loadingModal').modal('hide');
}
//删除当前页最后一条记录，跳到上一页 //删除当前页最后一条记录，跳到上一页
function changPage(){ function changPage(){
......
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