Skip to content

platform
platform
Commit 2d204b47 authored by 王国存's avatar 王国存
Browse files
Options

Merge branch 'test' into 'master' 

Test

See merge request !32
parents 0dbe5faf 147fe388
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 18 deletions
src/main/webapp/WEB-INF/page/education/questionnaire_information.jsp
View file @ 2d204b47
...@@ -1177,7 +1177,7 @@ ...@@ -1177,7 +1177,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px"> <div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<table class="incubates" border="1" <table border="1"
style="max-width: 1000px"> style="max-width: 1000px">
<thead> <thead>
<tr> <tr>
...@@ -1276,7 +1276,7 @@ ...@@ -1276,7 +1276,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px"> <div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<table class="incubates" border="1" <table border="1"
style="max-width: 1000px"> style="max-width: 1000px">
<thead> <thead>
<tr> <tr>
...@@ -1378,7 +1378,7 @@ ...@@ -1378,7 +1378,7 @@
<div class="col-sm-10"> <div class="col-sm-10">
<div class="row" style="padding-left: 40px"> <div class="row" style="padding-left: 40px">
<div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px"> <div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<table class="newPost" border="1" <table border="1"
style="max-width: 1000px"> style="max-width: 1000px">
<thead> <thead>
<tr> <tr>
...@@ -1573,7 +1573,7 @@ ...@@ -1573,7 +1573,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px"> <div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<table class="newTeacher" border="1" <table border="1"
style="max-width: 1000px"> style="max-width: 1000px">
<thead> <thead>
<tr> <tr>
...@@ -1787,7 +1787,7 @@ ...@@ -1787,7 +1787,7 @@
style="font-size: 15px;padding-left: 25px">组织双创活动情况:</label> style="font-size: 15px;padding-left: 25px">组织双创活动情况:</label>
</div> </div>
<div class="form-group"> <div class="form-group">
<table class="activity" border="1" <table border="1"
style="max-width: 1000px"> style="max-width: 1000px">
<thead> <thead>
<tr> <tr>
......
src/main/webapp/WEB-INF/page/space/questionnaire_information.jsp
View file @ 2d204b47
...@@ -1277,7 +1277,7 @@ ...@@ -1277,7 +1277,7 @@
<div class="row" style="padding-left: 40px"> <div class="row" style="padding-left: 40px">
<label class="question_label">入孵企业情况 ：</label> <label class="question_label">入孵企业情况 ：</label>
<div style="width:1100px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px"> <div style="width:1100px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<table class="incubates" border="1" <table border="1"
style="max-width: 1100px"> style="max-width: 1100px">
<thead> <thead>
<tr> <tr>
...@@ -1369,7 +1369,7 @@ ...@@ -1369,7 +1369,7 @@
<div class="row" style="padding-left: 40px"> <div class="row" style="padding-left: 40px">
<label class="question_label">入孵企业情况 ：</label> <label class="question_label">入孵企业情况 ：</label>
<div style="width:1100px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px"> <div style="width:1100px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<table class="incubates" border="1" <table border="1"
style="max-width: 1100px"> style="max-width: 1100px">
<thead> <thead>
<tr> <tr>
...@@ -1461,7 +1461,7 @@ ...@@ -1461,7 +1461,7 @@
<div class="row" style="padding-left: 40px"> <div class="row" style="padding-left: 40px">
<label class="question_label">新增就业情况 ：</label> <label class="question_label">新增就业情况 ：</label>
<div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px"> <div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<table class="newPost" border="1" style="max-width: 1000px"> <table border="1" style="max-width: 1000px">
<thead> <thead>
<tr> <tr>
<th nowrap>序号</th> <th nowrap>序号</th>
...@@ -1620,7 +1620,7 @@ ...@@ -1620,7 +1620,7 @@
<div class="row" style="padding-left: 40px"> <div class="row" style="padding-left: 40px">
<label class="question_label">签约创业导师情况 ：</label> <label class="question_label">签约创业导师情况 ：</label>
<div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px"> <div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<table class="newTeacher" border="1" <table border="1"
style="max-width: 1000px"> style="max-width: 1000px">
<thead> <thead>
<tr> <tr>
...@@ -1843,7 +1843,7 @@ ...@@ -1843,7 +1843,7 @@
<div class="row" style="padding-left: 40px"> <div class="row" style="padding-left: 40px">
<label class="question_label">组织双创活动情况 ：</label> <label class="question_label">组织双创活动情况 ：</label>
<div style="width:1100px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px"> <div style="width:1100px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<table class="activity" border="1" <table border="1"
style="max-width: 1100px"> style="max-width: 1100px">
<thead> <thead>
<tr> <tr>
......
src/main/webapp/res/js/education/questionnaire_Information.js
View file @ 2d204b47
...@@ -856,7 +856,7 @@ function synchronizeUpperAndLowerFormContents() { ...@@ -856,7 +856,7 @@ function synchronizeUpperAndLowerFormContents() {
text7.attr("disabled","disabled") text7.attr("disabled","disabled")
$("#guidingindicators7 #submit16").prepend(text7) $("#guidingindicators7 #submit16").prepend(text7)
$("#guidingindicators7 table tr").each((index,element)=>{ $("#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() $(element).remove()
} }
}) })
...@@ -889,6 +889,7 @@ function synchronizeUpperAndLowerFormContents() { ...@@ -889,6 +889,7 @@ function synchronizeUpperAndLowerFormContents() {
//审核方法 //审核方法
function submitForReview(questionNum) { function submitForReview(questionNum) {
notesDisplay()
formData=[] formData=[]
if($(`#submit${questionNum} input:radio:checked`).val()){ if($(`#submit${questionNum} input:radio:checked`).val()){
if($(`#submit${questionNum} input:radio:checked`).val()==1){ if($(`#submit${questionNum} input:radio:checked`).val()==1){
...@@ -1235,3 +1236,63 @@ function emptyContent(questionNum) { ...@@ -1235,3 +1236,63 @@ function emptyContent(questionNum) {
$(`#submit${questionNum} textarea[name='question_${questionNum}']`).val('') $(`#submit${questionNum} textarea[name='question_${questionNum}']`).val('')
} }
//实时同步备注
function notesDisplay() {
//引导指标1
var text1=$("#basicindicators1 textarea").clone(false)
text1.removeAttr("name")
text1.attr("disabled","disabled")
text1.val($("#basicindicators1 textarea").val())
$("#guidingindicators1 #submit10 textarea")[0].remove()
$("#guidingindicators1 #submit10").prepend(text1)
//引导指标2
var text2=$("#basicindicators1 textarea").clone(false)
text2.removeAttr("name")
text2.attr("disabled","disabled")
text2.val($("#basicindicators1 textarea").val())
$("#guidingindicators2 #submit11 textarea")[0].remove()
$("#guidingindicators2 #submit11").prepend(text2)
//引导指标3
var text3=$("#basicindicators3 textarea").clone(false)
text3.removeAttr("name")
text3.attr("disabled","disabled")
text3.val($("#basicindicators3 textarea").val())
$("#guidingindicators3 #submit12 textarea")[0].remove()
$("#guidingindicators3 #submit12").prepend(text3)
//引导指标4
var text4=$("#basicindicators3 textarea").clone(false)
text4.removeAttr("name")
text4.attr("disabled","disabled")
text4.val($("#basicindicators3 textarea").val())
$("#guidingindicators4 #submit13 textarea")[0].remove()
$("#guidingindicators4 #submit13").prepend(text4)
//引导指标5
var text5=$("#basicindicators4 textarea").clone(false)
text5.removeAttr("name")
text5.attr("disabled","disabled")
text5.val($("#basicindicators4 textarea").val())
$("#guidingindicators5 #submit14 textarea")[0].remove()
$("#guidingindicators5 #submit14").prepend(text5)
//引导指标7
var text7=$("#basicindicators6 textarea").clone(false)
text7.removeAttr("name")
text7.attr("disabled","disabled")
text7.val($("#basicindicators6 textarea").val())
$("#guidingindicators7 #submit16 textarea")[0].remove()
$("#guidingindicators7 #submit16").prepend(text7)
//引导指标8
var text8=$("#basicindicators7 textarea").clone(false)
text8.removeAttr("name")
text8.attr("disabled","disabled")
text8.val($("#basicindicators7 textarea").val())
$("#guidingindicators8 #submit17 textarea")[0].remove()
$("#guidingindicators8 #submit17").prepend(text8)
}
src/main/webapp/res/js/space/questionnaire_Information.js
View file @ 2d204b47
...@@ -514,8 +514,6 @@ function fun(table, row1, max) { ...@@ -514,8 +514,6 @@ 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 {
} }
} }
...@@ -1155,14 +1153,9 @@ $(function () { ...@@ -1155,14 +1153,9 @@ $(function () {
$("#guidingindicators7 table tr").each(function (index, element) { $("#guidingindicators7 table tr").each(function (index, element) {
// 判断是否参加互联网+大赛 将不是的过滤掉 // 判断是否参加互联网+大赛 将不是的过滤掉
// || $($(element).children()[12]).children().val() == ""
if ($($(element).children()[12]).children().val() == "否" && $($(element).children()[16]).children().val() == "否" ) { if ($($(element).children()[12]).children().val() == "否" && $($(element).children()[16]).children().val() == "否" ) {
$(element).remove() $(element).remove()
} }
// 判断是否为教育部入库创业导师 将不是的过滤掉
// if ($($(element).children()[16]).children().val() == "否") {
// $(element).remove()
// }
}) })
......
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