Commit 233f1e96 authored by 王国存's avatar 王国存

Merge branch 'test' into 'master'

Test

See merge request !24
parents 85687f2c e556c35d
...@@ -48,7 +48,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. ...@@ -48,7 +48,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
</select> </select>
<input type="text" id="title" class="form-control" placeholder="众创空间" /> <input type="text" id="title" class="form-control" placeholder="众创空间" />
<button style="margin-top: 5px" class=" btn btn-sm btn-primary m-t-n-xs" onclick="search();">搜 索</button> <button style="margin-top: 5px" class=" btn btn-sm btn-primary m-t-n-xs" onclick="search();">搜 索</button>
<button style="margin-top: 5px" class=" btn btn-sm btn-primary m-t-n-xs" onclick="">导 出</button> <button style="margin-top: 5px" class=" btn btn-sm btn-primary m-t-n-xs" onclick="ShowCreateModal()">导 出</button>
</div> </div>
<table id="hidden-table-info" width="100%" class="table table-striped table-bordered table-hover dataTables-example"></table> <table id="hidden-table-info" width="100%" class="table table-striped table-bordered table-hover dataTables-example"></table>
</div> </div>
...@@ -87,6 +87,69 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. ...@@ -87,6 +87,69 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="createFileMModal" style="padding-left: 10%" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" style="padding-top: 10%;" role="document">
<div class="modal-content" style="width: 710px">
<div id="exportSelect" class="modal-body">
<h5>请选择需要导出的指标</h5>
<br>
<form>
<h5>基础指标</h5>
<div>
<span style="line-height: 14px">基础指标1<input name="index" type="radio" value="1"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标2<input name="index" type="radio" value="2"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标3<input name="index" type="radio" value="3"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标4<input name="index" type="radio" value="4"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标5<input name="index" type="radio" value="5"></span>
</div>
<div>
<span style="line-height: 14px">基础指标6<input name="index" type="radio" value="6"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标7<input name="index" type="radio" value="7"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标8<input name="index" type="radio" value="8"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标9<input name="index" type="radio" value="9"></span>
</div>
<br>
<h5>引导指标</h5>
<div>
<span style="line-height: 14px">引导指标1<input name="index" type="radio" value="10"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标2<input name="index" type="radio" value="11"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标3<input name="index" type="radio" value="12"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标4<input name="index" type="radio" value="13"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标5<input name="index" type="radio" value="14"></span>
</div>
<div>
<span style="line-height: 14px">引导指标6<input name="index" type="radio" value="15"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标7<input name="index" type="radio" value="16"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标8<input name="index" type="radio" value="17"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标9<input name="index" type="radio" value="18"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标10<input name="index" type="radio" value="19"></span>
</div>
<div>
<span style="line-height: 14px">引导指标11<input name="index" type="radio" value="20"></span>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;
<span style="line-height: 14px">引导指标12<input name="index" type="radio" value="21"></span>&emsp;&emsp;&emsp;&emsp;&nbsp;
<span style="line-height: 14px">引导指标13<input name="index" type="radio" value="22"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
</div>
<br>
<h5>奖励指标</h5>
<div>
<span style="line-height: 14px">奖励指标1<input name="index" type="radio" value="23"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标2<input name="index" type="radio" value="24"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标3<input name="index" type="radio" value="25"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标4<input name="index" type="radio" value="26"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标5<input name="index" type="radio" value="27"></span>
</div>
<br>
<div class="ibox-content">
<div class="form-inline pull-right ">
<button style="margin-top: 5px" class=" btn btn-sm btn-primary m-t-n-xs" onclick="exportData()">确定</button>
<button id="abadonExport" style="margin-top: 5px;background-color: white;" class=" btn btn-sm btn-primary m-t-n-xs"><span style="color: black">取消</span></button>
</div>
</div>
</form>
</div>
</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>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -114,3 +114,20 @@ function setAllMaterial_detail(projectID){ ...@@ -114,3 +114,20 @@ function setAllMaterial_detail(projectID){
window.location.href=webroot+"goto/education/questionnaire_information?recordId="+projectID; window.location.href=webroot+"goto/education/questionnaire_information?recordId="+projectID;
} }
// 修改弹出框的title, 显示弹框
function ShowCreateModal(){
$('#createFileMModal').modal('show');
}
// 关闭弹框, 获取输入值,然后执行逻辑
$("#abadonExport").click(function (){
$("#createFileMModal").modal("hide");
});
//导出
function exportData() {
if($("#exportSelect input:radio:checked").val()){
window.open(webroot+"questionnaire/exportFullTimeWorkPerson?index="+$("#exportSelect input:radio:checked").val(),"_parent")
}else {
swal("失败!", "请选择导出指标!", "error");
}
}
...@@ -14,7 +14,6 @@ $(function () { ...@@ -14,7 +14,6 @@ $(function () {
all_order(); all_order();
getSaveData(); getSaveData();
StatusCheck();
}) })
var ocarina = self.setInterval("timeCircleSave()", 600000); var ocarina = self.setInterval("timeCircleSave()", 600000);
...@@ -23,13 +22,28 @@ var oTable; ...@@ -23,13 +22,28 @@ var oTable;
var processStatus = 0 var processStatus = 0
// 问卷状态自检 // 问卷状态自检
function StatusCheck() { function StatusCheck(processStatus, resultList) {
//驳回框
$('#rejectMessage1,#rejectMessage2,#rejectMessage3,#rejectMessage4,#rejectMessage5,#rejectMessage6,#rejectMessage7,#rejectMessage8,#rejectMessage9').hide();
if (processStatus === 2) { if (processStatus === 2) {
$('#rejectLabel').show(); resultList.forEach((item, index) => {
$('#rejectReason').show(); questionsId = item.approvalStatus;
if (questionsId == 0) {
questionsId = item.questionsId
$('#rejectMessage' + questionsId + ' textarea').val(item.remark)
$('#rejectMessage' + questionsId).show();
}
})
// $('#rejectLabel').show();
// $('#rejectReason').show();
} else { } else {
$('#rejectLabel').hide(); // $('#rejectLabel').hide();
$('#rejectReason').hide(); // $('#rejectReason').hide();
} }
} }
...@@ -39,14 +53,14 @@ var option_list = [ ...@@ -39,14 +53,14 @@ var option_list = [
{num: 2, name: '2.众创空间场地情况', table: '', max: 0}, {num: 2, name: '2.众创空间场地情况', table: '', max: 0},
{num: 3, name: '3.是否租赁场地', table: '', max: 0}, {num: 3, name: '3.是否租赁场地', table: '', max: 0},
{num: 4, name: '4.众创空间配备专职工作人员情况', table: 'professionalEmploy', max: 20}, {num: 4, name: '4.众创空间配备专职工作人员情况', table: 'professionalEmploy', max: 20},
{num: 5, name: '5.入孵企业情况', table: 'incubates', max: 80}, {num: 5, name: '5.入孵企业情况', table: 'incubates', max: 55},
{num: 6, name: '6.新增就业情况', table: 'newPost', max: 80}, {num: 6, name: '6.新增就业情况', table: 'newPost', max: 80},
{num: 7, name: '7.开设创新创业课程情况', table: 'newCourse', max: 20}, {num: 7, name: '7.开设创新创业课程情况', table: 'newCourse', max: 20},
{num: 8, name: '8.签约创业导师情况', table: 'newTeacher', max: 40}, {num: 8, name: '8.签约创业导师情况', table: 'newTeacher', max: 40},
{num: 9, name: '9.组织双创活动情况', table: 'activity', max: 13}, {num: 9, name: '9.组织双创活动情况', table: 'activity', max: 13},
{num: 10, name: '10.参赛情况', table: 'competition', max: 5}, {num: 10, name: '10.参赛情况', table: 'competition', max: 5},
{num: 11, name: '11.2021年创新创业工作经费', table: '', max: 0}, {num: 11, name: '11.2021年创新创业工作经费', table: '', max: 0},
{num: 12, name: '12.申报成功高校众创空间联盟发布的创新创业研究课题信息', table: 'twelve', max: 2}, {num: 12, name: '12.申报成功高校众创空间联盟发布的创新创业研究课题信息', table: 'twelve', max: 6},
{num: 13, name: '13.在孵企业销售收入或累计合同额情况(表1)', table: 'thirteen', max: 80}, {num: 13, name: '13.在孵企业销售收入或累计合同额情况(表1)', table: 'thirteen', max: 80},
{num: 14, name: '13.本评估周期实现股权或债权融资情况(表2)', table: 'borrow', max: 10}, {num: 14, name: '13.本评估周期实现股权或债权融资情况(表2)', table: 'borrow', max: 10},
{num: 15, name: '14.主办或承办市级及以上级别路演、双创周活动', table: 'fourteen', max: 10}, {num: 15, name: '14.主办或承办市级及以上级别路演、双创周活动', table: 'fourteen', max: 10},
...@@ -458,7 +472,10 @@ function fun(table, row1, max) { ...@@ -458,7 +472,10 @@ function fun(table, row1, max) {
all_order(); all_order();
var lastRow = $(tempTable).find('tr:last') //将尾行元素克隆来的保存的值清空 var lastRow = $(tempTable).find('tr:last') //将尾行元素克隆来的保存的值清空
$(lastRow).find('[name*="option_"]').val(''); $(lastRow).find('[name*="option_"]').val('');
} else {
} }
} }
// 表格删除当前行方法 // 表格删除当前行方法
...@@ -666,6 +683,8 @@ function getSaveData() { ...@@ -666,6 +683,8 @@ function getSaveData() {
}) })
img_DIV_List_Show(); img_DIV_List_Show();
StatusCheck(result.data.processStatus, result.data.reviews);
} }
}); });
...@@ -772,7 +791,9 @@ function saveQuestionnaire(type, isAuto) { ...@@ -772,7 +791,9 @@ function saveQuestionnaire(type, isAuto) {
type: type, type: type,
answersList: formData, answersList: formData,
writePeople: writePeople, writePeople: writePeople,
phoneNumber: phoneNumber phoneNumber: phoneNumber,
createId : createId,
questionnaireName:"2022季度问卷"
}; };
$.ajax({ $.ajax({
...@@ -965,9 +986,9 @@ function file_DIV_List_Show(option) { ...@@ -965,9 +986,9 @@ function file_DIV_List_Show(option) {
//表格数据回显同步上下表单内容 //表格数据回显同步上下表单内容
$(function () { $(function () {
//获取上方填写内容对象 //获取上方填写内容对象
$("#basicindicators1,#basicindicators2,#basicindicators3,#basicindicators4,#basicindicators5,#basicindicators6,#basicindicators7,#basicindicators8,#basicindicators9").mouseout(function () { $("#basicindicators1,#basicindicators2,#basicindicators3,#basicindicators4,#basicindicators5,#basicindicators6,#basicindicators7,#basicindicators8,#basicindicators9").mouseleave(function () {
//克隆元素到下方实现回显同步 // 克隆元素到下方实现回显同步
//同步基础指标1和引导指标1引导指标2 // 同步基础指标1和引导指标1引导指标2
var guidingindicators1 = $("#basicindicators1").clone(false) var guidingindicators1 = $("#basicindicators1").clone(false)
//置空防止元素重复 //置空防止元素重复
$("#guidingindicators1").empty() $("#guidingindicators1").empty()
...@@ -981,8 +1002,10 @@ $(function () { ...@@ -981,8 +1002,10 @@ $(function () {
//移除name属性 防止提交 //移除name属性 防止提交
$("#guidingindicators1 [name]").removeAttr("name") $("#guidingindicators1 [name]").removeAttr("name")
//将输入框和选择框置为不可操作 //将输入框和选择框置为不可操作
$("#guidingindicators1 input").attr("disabled","disabled") $("#guidingindicators1 input").attr("disabled", "disabled")
$("#guidingindicators1 select").attr("disabled","disabled") $("#guidingindicators1 select").attr("disabled", "disabled")
$("#guidingindicators1 #rejectMessage1" ).hide()
//引导指标2 //引导指标2
var guidingindicators2 = $("#basicindicators1").clone(false) var guidingindicators2 = $("#basicindicators1").clone(false)
...@@ -992,8 +1015,9 @@ $(function () { ...@@ -992,8 +1015,9 @@ $(function () {
$("#guidingindicators2 #remove1-1").hide() $("#guidingindicators2 #remove1-1").hide()
$("#guidingindicators2 #remove1-2").hide() $("#guidingindicators2 #remove1-2").hide()
$("#guidingindicators2 [name]").removeAttr("name") $("#guidingindicators2 [name]").removeAttr("name")
$("#guidingindicators2 input").attr("disabled","disabled") $("#guidingindicators2 input").attr("disabled", "disabled")
$("#guidingindicators2 select").attr("disabled","disabled") $("#guidingindicators2 select").attr("disabled", "disabled")
$("#guidingindicators2 #rejectMessage1" ).hide()
//引导指标3 //引导指标3
var guidingindicators3 = $("#basicindicators3").clone(false) var guidingindicators3 = $("#basicindicators3").clone(false)
...@@ -1010,10 +1034,14 @@ $(function () { ...@@ -1010,10 +1034,14 @@ $(function () {
$("#guidingindicators3 #remove3-1").hide() $("#guidingindicators3 #remove3-1").hide()
$("#guidingindicators3 #remove3-2").hide() $("#guidingindicators3 #remove3-2").hide()
$("#guidingindicators3 [name]").removeAttr("name") $("#guidingindicators3 [name]").removeAttr("name")
$("#guidingindicators3 input").attr("disabled","disabled") $("#guidingindicators3 table").removeAttr("class")
$("#guidingindicators3 select").attr("disabled","disabled") $("#guidingindicators3 table tr").removeAttr("id")
$("#guidingindicators3 input").attr("disabled", "disabled")
$("#guidingindicators3 select").attr("disabled", "disabled")
$("#guidingindicators3 #rejectMessage3" ).hide()
//引导指标4 //引导指标4
var guidingindicators4 = $("#basicindicators3").clone(false) var guidingindicators4 = $("#basicindicators3").clone(false)
$("#guidingindicators4").empty() $("#guidingindicators4").empty()
$("#guidingindicators4").append(guidingindicators4) $("#guidingindicators4").append(guidingindicators4)
...@@ -1022,14 +1050,27 @@ $(function () { ...@@ -1022,14 +1050,27 @@ $(function () {
$("#basicindicators3 select").each(function (index, element) { $("#basicindicators3 select").each(function (index, element) {
dataListguide4.push(element.value) dataListguide4.push(element.value)
}) })
$("#guidingindicators4 select").each(function (index, element) { $("#guidingindicators4 select").each(function (index, element) {
element.value = dataListguide4[index] element.value = dataListguide4[index]
}) })
$("#guidingindicators4 #remove3-1").hide() $("#guidingindicators4 #remove3-1").hide()
$("#guidingindicators4 #remove3-2").hide() $("#guidingindicators4 #remove3-2").hide()
$("#guidingindicators4 [name]").removeAttr("name") $("#guidingindicators4 [name]").removeAttr("name")
$("#guidingindicators4 input").attr("disabled","disabled") $("#guidingindicators4 table").removeAttr("class")
$("#guidingindicators4 select").attr("disabled","disabled") $("#guidingindicators4 table tr").removeAttr("id")
$("#guidingindicators4 input").attr("disabled", "disabled")
$("#guidingindicators4 select").attr("disabled", "disabled")
$("#guidingindicators4 #rejectMessage3" ).hide()
//判断是否为本年入驻的 将不是的过滤掉
$("#guidingindicators4 table tr").each(function (index, element) {
if ($($(element).children()[5]).children().val() == "否") {
$(element).remove()
}
})
//引导指标5 //引导指标5
var guidingindicators5 = $("#basicindicators4").clone(false) var guidingindicators5 = $("#basicindicators4").clone(false)
...@@ -1046,8 +1087,9 @@ $(function () { ...@@ -1046,8 +1087,9 @@ $(function () {
$("#guidingindicators5 #remove4-1").hide() $("#guidingindicators5 #remove4-1").hide()
$("#guidingindicators5 #remove4-2").hide() $("#guidingindicators5 #remove4-2").hide()
$("#guidingindicators5 [name]").removeAttr("name") $("#guidingindicators5 [name]").removeAttr("name")
$("#guidingindicators5 input").attr("disabled","disabled") $("#guidingindicators5 input").attr("disabled", "disabled")
$("#guidingindicators5 select").attr("disabled","disabled") $("#guidingindicators5 select").attr("disabled", "disabled")
$("#guidingindicators5 #rejectMessage4" ).hide()
//引导指标7 //引导指标7
var guidingindicators7 = $("#basicindicators6").clone(false) var guidingindicators7 = $("#basicindicators6").clone(false)
...@@ -1064,8 +1106,21 @@ $(function () { ...@@ -1064,8 +1106,21 @@ $(function () {
$("#guidingindicators7 #remove6-1").hide() $("#guidingindicators7 #remove6-1").hide()
$("#guidingindicators7 #remove6-2").hide() $("#guidingindicators7 #remove6-2").hide()
$("#guidingindicators7 [name]").removeAttr("name") $("#guidingindicators7 [name]").removeAttr("name")
$("#guidingindicators7 input").attr("disabled","disabled") $("#guidingindicators7 input").attr("disabled", "disabled")
$("#guidingindicators7 select").attr("disabled","disabled") $("#guidingindicators7 select").attr("disabled", "disabled")
$("#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).remove()
}
})
//引导指标8 //引导指标8
var guidingindicators8 = $("#basicindicators7").clone(false) var guidingindicators8 = $("#basicindicators7").clone(false)
...@@ -1082,8 +1137,9 @@ $(function () { ...@@ -1082,8 +1137,9 @@ $(function () {
$("#guidingindicators8 #remove7-1").hide() $("#guidingindicators8 #remove7-1").hide()
$("#guidingindicators8 #remove7-2").hide() $("#guidingindicators8 #remove7-2").hide()
$("#guidingindicators8 [name]").removeAttr("name") $("#guidingindicators8 [name]").removeAttr("name")
$("#guidingindicators8 input").attr("disabled","disabled") $("#guidingindicators8 input").attr("disabled", "disabled")
$("#guidingindicators8 select").attr("disabled","disabled") $("#guidingindicators8 select").attr("disabled", "disabled")
$("#guidingindicators8 #rejectMessage7" ).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