Commit 44050385d2cf6de589a50a6ba3c5d1aeb2b41351

Authored by yiming
1 parent d22c2dee

考生创建时新增班级

src/main/resources/static/pages/ddexam/index.html
@@ -157,7 +157,7 @@ @@ -157,7 +157,7 @@
157 if($('input[name="isNew"]:checked').val()==2) { 157 if($('input[name="isNew"]:checked').val()==2) {
158 className=$("#className2").val(); 158 className=$("#className2").val();
159 }else { 159 }else {
160 - className=$("#className").val(); 160 + className=$("#className").val()=='全部'?'':$("#className").val();
161 } 161 }
162 var params ={ 162 var params ={
163 userName : $("#userName").val(), 163 userName : $("#userName").val(),
@@ -251,7 +251,7 @@ @@ -251,7 +251,7 @@
251 $.get('/user/classList',function(result){ 251 $.get('/user/classList',function(result){
252 var data=[]; 252 var data=[];
253 if(firstLoad){ 253 if(firstLoad){
254 - data.push({id: "", text:"请选择"}); 254 + data.push({id: "全部", text:"全部"});
255 } 255 }
256 for(var code in result){ 256 for(var code in result){
257 data.push({id: result[code], text: result[code]}); 257 data.push({id: result[code], text: result[code]});
src/main/resources/static/pages/subjectUser/selectSubject.html
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 sum+=Number(inputs[i].value); 129 sum+=Number(inputs[i].value);
130 } 130 }
131 let isOperate=$('input[name="isOperate"]:checked').val(); 131 let isOperate=$('input[name="isOperate"]:checked').val();
132 - let className=$("#className").val(); 132 + let className = $("#className").val()=='全部'?'':$("#className").val();
133 /*if(sum != 100){ 133 /*if(sum != 100){
134 layer.alert("总分必须为100"); 134 layer.alert("总分必须为100");
135 return; 135 return;
@@ -157,7 +157,7 @@ @@ -157,7 +157,7 @@
157 $.get('/user/classList',function(result){ 157 $.get('/user/classList',function(result){
158 var data=[]; 158 var data=[];
159 if(firstLoad){ 159 if(firstLoad){
160 - data.push({id: "请选择", text:"请选择"}); 160 + data.push({id: "全部", text:"全部"});
161 } 161 }
162 for(var code in result){ 162 for(var code in result){
163 data.push({id: result[code], text: result[code]}); 163 data.push({id: result[code], text: result[code]});
src/main/resources/static/pages/subjectUser/subjectUserList.html
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 96
97 $.get('/user/userNameList',function(result){ 97 $.get('/user/userNameList',function(result){
98 var data=[]; 98 var data=[];
99 - data.push({id: "", text:"请选择"}); 99 + data.push({id: "全部", text:"全部"});
100 for(var code in result){ 100 for(var code in result){
101 data.push({id: result[code].userName, text: result[code].userName}); 101 data.push({id: result[code].userName, text: result[code].userName});
102 } 102 }
@@ -105,8 +105,8 @@ @@ -105,8 +105,8 @@
105 //查询 105 //查询
106 $("#query").on('click',function(){ 106 $("#query").on('click',function(){
107 var date = $("#date").val(); 107 var date = $("#date").val();
108 - var userName = $("#userName").val()=='请选择'?'':$("#userName").val();  
109 - var className = $("#className").val()=='请选择'?'':$("#className").val(); 108 + var userName = $("#userName").val()=='全部'?'':$("#userName").val();
  109 + var className = $("#className").val()=='全部'?'':$("#className").val();
110 $get('/subjectUser/subjectUserList',{date:date,userName:userName,className:className,type:'query'},function(result){ 110 $get('/subjectUser/subjectUserList',{date:date,userName:userName,className:className,type:'query'},function(result){
111 var subjectUserList = template('subjectUserList',{list:result}); 111 var subjectUserList = template('subjectUserList',{list:result});
112 $('#forms tbody').html(subjectUserList); 112 $('#forms tbody').html(subjectUserList);
@@ -131,15 +131,6 @@ @@ -131,15 +131,6 @@
131 }); 131 });
132 }); 132 });
133 } 133 }
134 -  
135 - $.get('/user/classList',function(result){  
136 - var data=[];  
137 - data.push({id: "请选择", text:"请选择"});  
138 - for(var code in result){  
139 - data.push({id: result[code], text: result[code]});  
140 - }  
141 - initPinYinSelect2('#className',data,'');  
142 - })  
143 }); 134 });
144 </script> 135 </script>
145 <script type="text/html" id="subjectUserList"> 136 <script type="text/html" id="subjectUserList">