dev_aliyun
cxt 6 years ago
commit 20668a0467

@ -7,7 +7,7 @@
<div class="clearfix ml30 mr30 pt20 pb20 bor-top-greyE" id="requirementNew"> <div class="clearfix ml30 mr30 pt20 pb20 bor-top-greyE" id="requirementNew">
<p class="df mb20"><input type="hidden" name="year_id" value="<%= @year.id %>"> <p class="df mb20"><input type="hidden" name="year_id" value="<%= @year.id %>">
<span class="column-second lineh-40" id="sequenceNum">1</span> <span class="column-second lineh-40" id="sequenceNum">1</span>
<input type="text" class="input-flex-40 mr20" name="requirement"> <textarea type="text" class="input-flex-40 mr20" name="requirement"></textarea>
<span class="lineh-40"> <span class="lineh-40">
<a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i> <a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i>
</a> </a>
@ -16,14 +16,14 @@
<p class="df mb10"> <p class="df mb10">
<span class="column-second lineh-40"> <span class="column-second lineh-40">
<span class="color-red">* </span><span class="sequence">1-1</span></span> <span class="color-red">* </span><span class="sequence">1-1</span></span>
<input type="text" class="input-flex-40 mr20" name="subitems[]"><span class="lineh-40"> <textarea type="text" class="input-flex-40 mr20" name="subitems[]"><span class="lineh-40"></textarea>
<a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i> <a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i>
</a> </a>
</span> </span>
</p> </p>
<p class="df mb10"> <p class="df mb10">
<span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">1-2</span></span> <span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">1-2</span></span>
<input type="text" class="input-flex-40 mr20" name="subitems[]"> <textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea>
<span class="lineh-40"> <span class="lineh-40">
<a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i> <a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i>
</a> </a>
@ -32,7 +32,7 @@
<p class="df mb10"> <p class="df mb10">
<span class="column-second lineh-40"> <span class="column-second lineh-40">
<span class="color-red">* </span><span class="sequence">1-3</span></span> <span class="color-red">* </span><span class="sequence">1-3</span></span>
<input type="text" class="input-flex-40 mr20" name="subitems[]"> <textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea>
<span class="lineh-40"> <span class="lineh-40">
<a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i> <a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i>
</a> </a>

@ -3,7 +3,7 @@ var html_begin = "<form id=\"form_data_for_requirements\"><li class=\"clearfix\"
var html_requirement = '<p class="df mb20">' + var html_requirement = '<p class="df mb20">' +
'<span class="column-second lineh-40" id="sequenceNum"><%= @ec_graduation_requirement.position %></span>' + '<span class="column-second lineh-40" id="sequenceNum"><%= @ec_graduation_requirement.position %></span>' +
'<input type="text" class="input-flex-40 mr20" name="requirement" value="<%= @ec_graduation_requirement.content %>">' + '<textarea type="text" class="input-flex-40 mr20" name="requirement"><%= @ec_graduation_requirement.content %></textarea>' +
'<span class="lineh-40">' + '<span class="lineh-40">' +
'<a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i></a>' + '<a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i></a>' +
'</span></p>' '</span></p>'
@ -14,7 +14,7 @@ var html_subitems = "";
'<span class="column-second lineh-40">' + '<span class="column-second lineh-40">' +
'<span class="color-red">* </span><span class="sequence"><%= "#{@ec_graduation_requirement.position}-#{sub.position}" %></span>' + '<span class="color-red">* </span><span class="sequence"><%= "#{@ec_graduation_requirement.position}-#{sub.position}" %></span>' +
'</span>' + '</span>' +
'<input type="text" class="input-flex-40 mr20" name="subitems[]" value="<%= sub.content %>">' + '<textarea type="text" class="input-flex-40 mr20" name="subitems[]"><%= sub.content %></textarea>' +
'<span class="lineh-40">' + '<span class="lineh-40">' +
'<a href="javascript:void(0)" class="fl" data-tip-down="删除" onclick="delete_confirm_box_2('+"'<%= ec_graduation_subitem_path(sub) %>'"+', \'确定要删除吗\')"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a>' + '<a href="javascript:void(0)" class="fl" data-tip-down="删除" onclick="delete_confirm_box_2('+"'<%= ec_graduation_subitem_path(sub) %>'"+', \'确定要删除吗\')"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a>' +
'</span>' + '</span>' +
@ -38,5 +38,10 @@ $("#requirementNew").find("input[name='requirement']").focus();
}else{ }else{
$("#edit_add_notice").removeClass("none").html("请先保存!"); $("#edit_add_notice").removeClass("none").html("请先保存!");
} }
var subInputs=document.getElementsByName("subitems[]");
for (var i = 0; i < subInputs.length; i++) {
autoTextarea(subInputs[i], 0, 140);
}
autoTextarea(document.getElementsByName("requirement")[0], 0, 140);

@ -1,9 +1,9 @@
<script id="t:add-Require-Item" type="text/html"> <script id="t:add-Require-Item" type="text/html">
<p class="df mb10"> <p class="df mb10">
<span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">1-1</span></span> <span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">1-1</span></span>
<input type="text" class="input-flex-40 mr20" name="subitems[]"/> <textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea>
<span class="lineh-40"> <span class="lineh-40">
<a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a> <a href="javascript:void(0)" class="fl subDel" data-tip-down="删除"><i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a>
</span> </span>
</p> </p>
</script> </script>
@ -55,6 +55,12 @@
for(var i=0;i<sub.length;i++){ for(var i=0;i<sub.length;i++){
$(sub).eq(i).html(num+"-"+(i+1)); $(sub).eq(i).html(num+"-"+(i+1));
} }
var subInputs=document.getElementsByName("subitems[]");
for (var i = 0; i < subInputs.length; i++) {
autoTextarea(subInputs[i], 0, 140);
}
autoTextarea(document.getElementsByName("requirement")[0], 0, 140);
}); });
//删除子项 //删除子项
$(".subDel").live('click', function () { $(".subDel").live('click', function () {
@ -101,18 +107,18 @@
'<p class="df mb20">' + '<p class="df mb20">' +
'<input type="hidden" name="year_id" value="<%= @year.id %>">' + '<input type="hidden" name="year_id" value="<%= @year.id %>">' +
'<span class="column-second lineh-40" id="sequenceNum">'+liNum+'</span>'+ '<span class="column-second lineh-40" id="sequenceNum">'+liNum+'</span>'+
'<input type="text" class="input-flex-40 mr20" name="requirement"/>'+ '<textarea type="text" class="input-flex-40 mr20" name="requirement"></textarea>'+
'<span class="lineh-40">'+ '<span class="lineh-40">'+
'<a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i></a>'+ '<a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i></a>'+
'</span></p>'+ '</span></p>'+
'<p class="df mb10"><span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">'+liNum+'-1</span></span>'+ '<p class="df mb10"><span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">'+liNum+'-1</span></span>'+
'<input type="text" class="input-flex-40 mr20" name="subitems[]"><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+ '<textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+
'<i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a></span></p>'+ '<i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a></span></p>'+
'<p class="df mb10"><span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">'+liNum+'-2</span></span>'+ '<p class="df mb10"><span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">'+liNum+'-2</span></span>'+
'<input type="text" class="input-flex-40 mr20" name="subitems[]"><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+ '<textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+
'<i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a></span></p>'+ '<i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a></span></p>'+
'<p class="df mb10"><span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">'+liNum+'-3</span></span>'+ '<p class="df mb10"><span class="column-second lineh-40"><span class="color-red">* </span><span class="sequence">'+liNum+'-3</span></span>'+
'<input type="text" class="input-flex-40 mr20" name="subitems[]"><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+ '<textarea type="text" class="input-flex-40 mr20" name="subitems[]"></textarea><span class="lineh-40"><a href="javascript:void(0)" class="fl subDel" data-tip-down="删除">'+
'<i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a></span></p>'+ '<i class="iconfont icon-shanchu color-grey-c font-15 fl mt2"></i></a></span></p>'+
'<p class="edu-txt-right clearfix pr35" id="AddPanelOperation"><span class="color-red mt3 fl ml60 none" id="option_Item_notice">内容不能为空</span>'+ '<p class="edu-txt-right clearfix pr35" id="AddPanelOperation"><span class="color-red mt3 fl ml60 none" id="option_Item_notice">内容不能为空</span>'+
'<a href="javascript:void(0)" class="defalutSubmitbtn fr" id="submit_sure" onclick="submit_data_for_requirement(\'post\', \'<%= ec_graduation_requirements_path %>\')">保存</a>'+ '<a href="javascript:void(0)" class="defalutSubmitbtn fr" id="submit_sure" onclick="submit_data_for_requirement(\'post\', \'<%= ec_graduation_requirements_path %>\')">保存</a>'+
@ -121,6 +127,11 @@
'</form>'; '</form>';
$(".ListTableLine").append(html); $(".ListTableLine").append(html);
$("#requirementNew").find("input[name='requirement']").focus(); $("#requirementNew").find("input[name='requirement']").focus();
var subInputs=document.getElementsByName("subitems[]");
for (var i = 0; i < subInputs.length; i++) {
autoTextarea(subInputs[i], 0, 140);
}
autoTextarea(document.getElementsByName("requirement")[0], 0, 140);
flagAdd=false; flagAdd=false;
} }

@ -69,21 +69,15 @@
<input type="hidden" name="issue_id" value="<%=@issue.id%>"/> <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
<div nhname='toolbar_container_<%= @issue.id %>' class="kindeditor" ></div> <div nhname='toolbar_container_<%= @issue.id %>' class="kindeditor" ></div>
<div class="cl"></div> <div class="cl"></div>
<textarea placeholder="有问题或有建议,请直接给我留言吧!" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' id="notes" name="notes"></textarea> <textarea placeholder="有问题或有建议,请直接给我留言吧!" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
<div class="cl"></div> <div class="cl"></div>
<div class="mt5 fl"> <div class="mt5 fl">
<%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %> <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
</div> </div>
<span nhname='contentmsg_<%= @issue.id %>' class="fl mt5"></span> <span nhname='contentmsg_<%= @issue.id %>' class="fl mt5"></span>
<a id="issue_detail_reply_id" href="javascript:void(0)" <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="shixun-task-btn task-btn-orange fr mt5 mb10" style="display:none;">发送</a>
class="shixun-task-btn task-btn-orange fr mt5 mb10"
onclick="getNotesFun()"
>发送</a>
<div class="cl"></div> <div class="cl"></div>
<% end %> <% end %>
<span id="isnullbox" class="none color-red">内容不能为空</span>
</div> </div>
<% else %> <% else %>
<%= render :partial => "users/show_unlogged" %> <%= render :partial => "users/show_unlogged" %>
@ -92,20 +86,4 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<script>
function getNotesFun() {
var val = reply_editor.text();
console.log(val);
if(val==""||val==undefined||val==null){
$("#isnullbox").show();}
// return
else
{
$("#issue_detail_reply_id").submit();
}
}
</script>

@ -3,7 +3,7 @@
<%= javascript_include_tag 'create_kindeditor'%> <%= javascript_include_tag 'create_kindeditor'%>
<% end %> <% end %>
<script> <script>
var reply_editor = sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>"); sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
</script> </script>
<style> <style>
.set_Reply_detail ul li.homepagePostReplyContainer,.set_Reply_detail div.homepagePostReplyContainer{padding-left: 10px;padding-right: 0px } .set_Reply_detail ul li.homepagePostReplyContainer,.set_Reply_detail div.homepagePostReplyContainer{padding-left: 10px;padding-right: 0px }

@ -1,4 +1,4 @@
<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl ml25 mr60"), home_path %> <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl mr30 ml25 mt10"), home_path %>
<div class="educontents fl"> <div class="educontents fl">
<div class="head-nav pr"> <div class="head-nav pr">

@ -1,5 +1,5 @@
<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl ml25 mr60 "), home_path %> <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl mr30 ml25 mt10"), home_path %>
<div class="educontents fl"> <div class="educontents fl">

@ -37,7 +37,7 @@ function sd_create_editor(params){
//params.toolbar_container.hide(); //params.toolbar_container.hide();
$('#reply_image_' + id).addClass('imageFuzzy'); $('#reply_image_' + id).addClass('imageFuzzy');
if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())){ if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())){
params.submit_btn.show(); params.submit_btn.hide();
params.toolbar_container.hide(); params.toolbar_container.hide();
this.resize("100%", null); this.resize("100%", null);
}else if(this.edit.html().trim() != ""){ }else if(this.edit.html().trim() != ""){
@ -74,7 +74,7 @@ function sd_create_editor(params){
$(".ke-outline>.ke-toolbar-icon",toolbar).append('表情'); $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
params.toolbar_container.append(toolbar); params.toolbar_container.append(toolbar);
params.toolbar_container.hide(); params.toolbar_container.hide();
params.submit_btn.show(); params.submit_btn.hide();
//init //init
var edit = this.edit; var edit = this.edit;
var body = edit.doc.body; var body = edit.doc.body;
@ -124,7 +124,7 @@ function sd_create_shixun_editor(params){
sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea}); sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
if(this.isEmpty()) { if(this.isEmpty()) {
this.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>"); this.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>");
params.submit_btn.show(); params.submit_btn.hide();
params.toolbar_container.hide(); params.toolbar_container.hide();
this.resize("100%", "30px"); this.resize("100%", "30px");
$("#dis_reply_id").val(""); $("#dis_reply_id").val("");
@ -180,7 +180,7 @@ function sd_create_shixun_editor(params){
$(".ke-outline>.ke-toolbar-icon",toolbar).append('表情'); $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
params.toolbar_container.append(toolbar); params.toolbar_container.append(toolbar);
params.toolbar_container.hide(); params.toolbar_container.hide();
params.submit_btn.show(); params.submit_btn.hide();
//init //init
var edit = this.edit; var edit = this.edit;
var body = edit.doc.body; var body = edit.doc.body;
@ -206,20 +206,18 @@ function sd_check_editor_form_field(params){
if(params.content.isEmpty()){ if(params.content.isEmpty()){
result=false; result=false;
} }
console.log(params.content) if(params.content.html()!=params.textarea.html() || params.issubmit==true){
// if(params.content.html()!=params.textarea.html() || params.issubmit==true){ params.textarea.html(params.content.html());
// params.textarea.html(params.content.html()); params.content.sync();
// if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
// params.content.sync(); params.contentmsg.html('内容不能为空');
// if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){ params.contentmsg.css({color:'#ff0000'});
// params.contentmsg.html('内容不能为空'); }else{
// params.contentmsg.css({color:'#ff0000'}); params.contentmsg.html('填写正确');
// }else{ params.contentmsg.css({color:'#008000'});
// params.contentmsg.html('填写正确'); }
// params.contentmsg.css({color:'#008000'}); params.contentmsg.show();
// } }
// params.contentmsg.show();
// }
} }
return result; return result;
} }
@ -434,7 +432,7 @@ function sd_create_message_editor(params){
this.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>"); this.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>");
params.toolbar_container.hide(); params.toolbar_container.hide();
this.resize("100%", "30px"); this.resize("100%", "30px");
params.submit_btn.show(); params.submit_btn.hide();
params.notice_msg.hide(); params.notice_msg.hide();
} }
$('#mini_comment_section').height('auto'); $('#mini_comment_section').height('auto');

@ -245,22 +245,21 @@ function sd_create_shixun_editor(params){
function sd_check_editor_form_field(params){ function sd_check_editor_form_field(params){
var result=true; var result=true;
if(params.content!=undefined){ if(params.content!=undefined){
if(params.content.isEmpty()){
// if(params.content.isEmpty()){ result=false;
// result=false; }
// } if(params.content.html()!=params.textarea.html() || params.issubmit==true){
// if(params.content.html()!=params.textarea.html() || params.issubmit==true){ params.textarea.html(params.content.html());
// params.textarea.html(params.content.html()); params.content.sync();
// params.content.sync(); if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
// if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){ params.contentmsg.html('内容不能为空');
// params.contentmsg.html('内容不能为空'); params.contentmsg.css({color:'#ff0000'});
// params.contentmsg.css({color:'#ff0000'}); }else{
// }else{ params.contentmsg.html('填写正确');
// params.contentmsg.html('填写正确'); params.contentmsg.css({color:'#008000'});
// params.contentmsg.css({color:'#008000'}); }
// } params.contentmsg.show();
// params.contentmsg.show(); }
// }
} }
return result; return result;
} }
@ -315,7 +314,7 @@ function sd_create_editor_from_data(id){
params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form); params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form); params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
params.cancel_btn = $("#new_message_cancel_btn_" + id); params.cancel_btn = $("#new_message_cancel_btn_" + id);
params.submit_btn = $("#fnew_message_submit_btn_" + id); params.submit_btn = $("#new_message_submit_btn_" + id);
params.height = height; params.height = height;
params.width = width; params.width = width;
if (params.textarea.data('init') == undefined) { if (params.textarea.data('init') == undefined) {

@ -233,7 +233,7 @@ input{
.newSystem .newtarget_scoreclass{ .newSystem .newtarget_scoreclass{
padding: 10px 0px !important; padding: 10px 0px !important;
margin: 0px 30px !important; margin: 0px 20px !important;
} }
.newSystem .newtarget_target{ .newSystem .newtarget_target{

@ -556,7 +556,7 @@ class EcCompletionCalculation extends Component {
{ Spintype===true?<Spin className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" } { Spintype===true?<Spin className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
{ {
graduation_list.length===0&&Spintype===false? graduation_list.length===0&&Spintype===false?
<li className={'clearfix newtarget_scoreclass marlr19'} style={{minWidth:'1137px'}}> <li className={'clearfix newtarget_scoreclass marlr19'} style={{minWidth:'1137px'}}>
{/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */} {/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */}
@ -575,7 +575,7 @@ class EcCompletionCalculation extends Component {
if(key===0){ if(key===0){
return( return(
<p key={key} className="clearfix lipadding20im" style={{minWidth: 228*ec_course_targets_count>1300?168.6*(ec_course_targets_count+3):1200+"px"}}> <p key={key} className="clearfix lipadding20im" style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}>
<span className="column-1 color-666 mr16">毕业要求</span> <span className="column-1 color-666 mr16">毕业要求</span>
<span className="nowrap329">{item.ec_subitem_content}</span> <span className="nowrap329">{item.ec_subitem_content}</span>
<span className="column-1 operationright color-666">达成结果</span> <span className="column-1 operationright color-666">达成结果</span>
@ -595,7 +595,7 @@ class EcCompletionCalculation extends Component {
Spintype===false?graduation_list.map((item,key)=>{ Spintype===false?graduation_list.map((item,key)=>{
return( return(
<li className={key+1===target_list.length?"clearfix newtarget_target marlr19":"clearfix newtarget_scoreclass marlr19"} key={key} style={{minWidth: 227.4*ec_course_targets_count>1300?162*(ec_course_targets_count+3):1137+"px"}}> <li className={key+1===target_list.length?"clearfix newtarget_target marlr19":"clearfix newtarget_scoreclass marlr19"} key={key} style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380):1200+"px"}}>
{/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */} {/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */}
<span className="column-1 color-05101A ec_graduation_name">{key+1}</span> <span className="column-1 color-05101A ec_graduation_name">{key+1}</span>
<span className="column-500 color-05101A" data-tip-down={item.content}>{item.ec_subitem_content}</span> <span className="column-500 color-05101A" data-tip-down={item.content}>{item.ec_subitem_content}</span>
@ -621,7 +621,7 @@ class EcCompletionCalculation extends Component {
<div className="ListTableLine newSystem mb20" id="school_major_list"> <div className="ListTableLine newSystem mb20" id="school_major_list">
<p className="clearfix padding10im" style={{width: 113*(total_rate_data+4)>1200?(113*(total_rate_data+4.5))+63:1200+"px"}}> <p className="clearfix padding10im" style={{width: total_rate_data > 5 ? (180 * total_rate_data+226+16) : 1200+"px"}}>
{/*<span className="column-1 color-666 mr16 width86">序号</span>*/} {/*<span className="column-1 color-666 mr16 width86">序号</span>*/}
<span className="column-1 color-666 mr16 width86">课程目标</span> <span className="column-1 color-666 mr16 width86">课程目标</span>
{/*<span className="column-1 color-666 mr16">姓名</span>*/} {/*<span className="column-1 color-666 mr16">姓名</span>*/}
@ -651,7 +651,7 @@ class EcCompletionCalculation extends Component {
} }
{ Spintype===true?<Spin className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" } { Spintype===true?<Spin className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
{ {
Spintype===false? <li className={"clearfix newtarget_scoreclass lipadding10im margin64px"} style={{width: 113*(total_rate_data+4)>1200?(113*(total_rate_data+4.5))+63:1200+"px"}}> Spintype===false? <li className={"clearfix newtarget_scoreclass lipadding10im margin64px"} style={{width: total_rate_data > 5 ? (180 * total_rate_data+226+16) : 1200 + "px"}}>
<span className="column-1 color-05101A mr16 width86">占比</span> <span className="column-1 color-05101A mr16 width86">占比</span>
{/*colorTransparent*/} {/*colorTransparent*/}
{/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent"> 平均数 </span>*/} {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent"> 平均数 </span>*/}

@ -6,7 +6,7 @@
.newHeader .logoimg{ .newHeader .logoimg{
margin-top: 13px; margin-top: 13px;
float: left; float: left;
width: 36px; width: 40px;
} }
.head-nav{float: left;width: 800px;text-align: center;height: 60px;box-sizing: border-box; min-width: 400px;} .head-nav{float: left;width: 800px;text-align: center;height: 60px;box-sizing: border-box; min-width: 400px;}
.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;} .head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;}
@ -618,7 +618,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
#competition-header .logoimg{ #competition-header .logoimg{
margin-top: 5px; margin-top: 5px;
float: left; float: left;
width: 36px;} width: 40px;}
.nav-game{position: relative;} .nav-game{position: relative;}
.nav-game li{position: relative;float: left;width: 110px;height: 60px;line-height: 60px;text-align: center;box-sizing: border-box} .nav-game li{position: relative;float: left;width: 110px;height: 60px;line-height: 60px;text-align: center;box-sizing: border-box}

Loading…
Cancel
Save