From 19e5c7f3385d6162266e49e90346d9ea8ebfabb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 21 Aug 2019 17:15:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?logo=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 2 +-
 app/views/layouts/_unlogin_header.html.erb | 2 +-
 public/stylesheets/educoder/edu-all.css    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 2274a8ec..453c1150 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -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 mr20 ml25 mt10"), home_path %>
 <div class="educontents fl">
 
   <div class="head-nav pr">
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 6f3b5ed0..dda61a62 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -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 mr20 ml25 mt10 "), home_path %>
 
 <div class="educontents fl">
 
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index a0234137..d88c31c8 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -6,7 +6,7 @@
 .newHeader .logoimg{
     margin-top: 13px;
     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 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{
     margin-top: 5px;
     float: left;
-    width: 36px;}
+    width: 40px;}
 
 .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}

From 21b77d60fb6a27438c4c81b247165caa5a6e6846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 21 Aug 2019 17:16:43 +0800
Subject: [PATCH 2/6] =?UTF-8?q?logo=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 2 +-
 app/views/layouts/_unlogin_header.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 453c1150..d29a3893 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -1,4 +1,4 @@
-<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl mr20 ml25 mt10"), 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="head-nav pr">
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index dda61a62..bf00c8bc 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,5 +1,5 @@
 
-<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl mr20 ml25 mt10 "), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl mr30 ml25 mt10"), home_path %>
 
 <div class="educontents fl">
 

From 59bcc26962b76e3402f84e2ee4050dbe31a2423f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 21 Aug 2019 17:19:58 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_issue_replies.html.erb | 28 +++---------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index ba12a8e7..0374f921 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -69,21 +69,15 @@
               <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
               <div nhname='toolbar_container_<%= @issue.id %>' class="kindeditor" ></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="mt5 fl">
                 <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
               </div>
               <span nhname='contentmsg_<%= @issue.id %>' class="fl mt5"></span>
-              <a id="issue_detail_reply_id" href="javascript:void(0)"
-                 class="shixun-task-btn task-btn-orange fr mt5 mb10"
-                 onclick="getNotesFun()"
-                 >发送</a>
+              <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>
               <div class="cl"></div>
-
-
           <% end %>
-          <span id="isnullbox" class="none color-red">内容不能为空</span>
         </div>
     <% else %>
         <%= render :partial => "users/show_unlogged" %>
@@ -92,20 +86,4 @@
 
   </div>
   <div class="cl"></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>
\ No newline at end of file
+</div>
\ No newline at end of file

From 2554e6dd7243b2760246c1a0f31ec4749c065c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 21 Aug 2019 17:22:15 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/show.html.erb              |  2 +-
 public/javascripts/create_kindeditor.js     | 36 ++++++++++-----------
 public/react/public/js/create_kindeditor.js | 33 +++++++++----------
 3 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index f8c686bd..106d720a 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -3,7 +3,7 @@
     <%= javascript_include_tag 'create_kindeditor'%>
 <% end %>
 <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>
 <style>
   .set_Reply_detail ul li.homepagePostReplyContainer,.set_Reply_detail div.homepagePostReplyContainer{padding-left: 10px;padding-right: 0px }
diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js
index d7b5539a..fdd493d8 100644
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@@ -37,7 +37,7 @@ function sd_create_editor(params){
             //params.toolbar_container.hide();
             $('#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())){
-                params.submit_btn.show();
+                params.submit_btn.hide();
                 params.toolbar_container.hide();
                 this.resize("100%", null);
             }else if(this.edit.html().trim() != ""){
@@ -74,7 +74,7 @@ function sd_create_editor(params){
             $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
             params.toolbar_container.append(toolbar);
             params.toolbar_container.hide();
-            params.submit_btn.show();
+            params.submit_btn.hide();
             //init
             var edit = this.edit;
             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});
             if(this.isEmpty()) {
                 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();
                 this.resize("100%", "30px");
                 $("#dis_reply_id").val("");
@@ -180,7 +180,7 @@ function sd_create_shixun_editor(params){
             $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
             params.toolbar_container.append(toolbar);
             params.toolbar_container.hide();
-            params.submit_btn.show();
+            params.submit_btn.hide();
             //init
             var edit = this.edit;
             var body = edit.doc.body;
@@ -206,20 +206,18 @@ function sd_check_editor_form_field(params){
         if(params.content.isEmpty()){
             result=false;
         }
-        console.log(params.content)
-        // if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-        //     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.contentmsg.html('内容不能为空');
-        //         params.contentmsg.css({color:'#ff0000'});
-        //     }else{
-        //         params.contentmsg.html('填写正确');
-        //         params.contentmsg.css({color:'#008000'});
-        //     }
-        //     params.contentmsg.show();
-        // }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            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.contentmsg.html('内容不能为空');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('填写正确');
+                params.contentmsg.css({color:'#008000'});
+            }
+            params.contentmsg.show();
+        }
     }
     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>");
                 params.toolbar_container.hide();
                 this.resize("100%", "30px");
-                params.submit_btn.show();
+                params.submit_btn.hide();
                 params.notice_msg.hide();
             }
             $('#mini_comment_section').height('auto');
diff --git a/public/react/public/js/create_kindeditor.js b/public/react/public/js/create_kindeditor.js
index 89f1dbbd..434c9b46 100644
--- a/public/react/public/js/create_kindeditor.js
+++ b/public/react/public/js/create_kindeditor.js
@@ -245,22 +245,21 @@ function sd_create_shixun_editor(params){
 function sd_check_editor_form_field(params){
     var result=true;
     if(params.content!=undefined){
-
-        // if(params.content.isEmpty()){
-        //     result=false;
-        // }
-        // if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-        //     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.contentmsg.html('内容不能为空');
-        //         params.contentmsg.css({color:'#ff0000'});
-        //     }else{
-        //         params.contentmsg.html('填写正确');
-        //         params.contentmsg.css({color:'#008000'});
-        //     }
-        //     params.contentmsg.show();
-        // }
+        if(params.content.isEmpty()){
+            result=false;
+        }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            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.contentmsg.html('内容不能为空');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('填写正确');
+                params.contentmsg.css({color:'#008000'});
+            }
+            params.contentmsg.show();
+        }
     }
     return result;
 }
@@ -315,7 +314,7 @@ function sd_create_editor_from_data(id){
             params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
             params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
             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.width = width;
             if (params.textarea.data('init') == undefined) {

From 506ecd42fa9ee2056dfb5ad776b9320f369428dd Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 22 Aug 2019 10:04:19 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=AF=95=E4=B8=9A=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?=E5=8F=8A=E5=85=B6=E6=8C=87=E6=A0=87=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/ec_graduation_requirements/edit.js.erb       |  5 +++++
 app/views/ec_years/graduation_requirement.html.erb     | 10 ++++++++++
 .../react/src/modules/ec/css/ecCourseEvaluations.css   |  2 +-
 .../ecCompletion_calculation.js                        | 10 +++++-----
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/views/ec_graduation_requirements/edit.js.erb b/app/views/ec_graduation_requirements/edit.js.erb
index fab4ee00..e79b1e66 100644
--- a/app/views/ec_graduation_requirements/edit.js.erb
+++ b/app/views/ec_graduation_requirements/edit.js.erb
@@ -37,5 +37,10 @@ $("#requirementNew").find("input[name='requirement']").focus();
 }else{
     $("#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); 
 
 
diff --git a/app/views/ec_years/graduation_requirement.html.erb b/app/views/ec_years/graduation_requirement.html.erb
index 76833188..8de398e2 100644
--- a/app/views/ec_years/graduation_requirement.html.erb
+++ b/app/views/ec_years/graduation_requirement.html.erb
@@ -55,6 +55,11 @@
         for(var i=0;i<sub.length;i++){
             $(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 () {
@@ -121,6 +126,11 @@
                   '</form>';
           $(".ListTableLine").append(html);
           $("#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;
       }
 
diff --git a/public/react/src/modules/ec/css/ecCourseEvaluations.css b/public/react/src/modules/ec/css/ecCourseEvaluations.css
index 11ee74bb..80bd587c 100644
--- a/public/react/src/modules/ec/css/ecCourseEvaluations.css
+++ b/public/react/src/modules/ec/css/ecCourseEvaluations.css
@@ -233,7 +233,7 @@ input{
 
 .newSystem .newtarget_scoreclass{
   padding: 10px 0px !important;
-  margin: 0px 30px !important;
+  margin: 0px 20px !important;
 }
 
 .newSystem .newtarget_target{
diff --git a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
index f76e065d..002bb0ab 100644
--- a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
+++ b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
@@ -556,7 +556,7 @@ class EcCompletionCalculation extends Component {
 
                    { Spintype===true?<Spin className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
 
-                   {
+                    {
                         graduation_list.length===0&&Spintype===false?
                         <li className={'clearfix newtarget_scoreclass marlr19'}  style={{minWidth:'1137px'}}>
                         {/* <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){
                                 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="nowrap329">{item.ec_subitem_content}</span>
                                         <span className="column-1 operationright color-666">达成结果</span>
@@ -595,7 +595,7 @@ class EcCompletionCalculation extends Component {
                             Spintype===false?graduation_list.map((item,key)=>{
 
                                 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">{key+1}</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">
 
-                        <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">姓名</span>*/}
@@ -651,7 +651,7 @@ class EcCompletionCalculation extends Component {
                         }
                           { 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>
                             {/*colorTransparent*/}
                             {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent"> 平均数 </span>*/}

From d7beaf926d059a2b58e58056ffbd9033d57eab6f Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 22 Aug 2019 10:26:32 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_requirement_lists.html.erb                      |  8 ++++----
 app/views/ec_graduation_requirements/edit.js.erb     |  4 ++--
 app/views/ec_years/graduation_requirement.html.erb   | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/ec_graduation_requirements/_requirement_lists.html.erb b/app/views/ec_graduation_requirements/_requirement_lists.html.erb
index 623e910a..86988c05 100644
--- a/app/views/ec_graduation_requirements/_requirement_lists.html.erb
+++ b/app/views/ec_graduation_requirements/_requirement_lists.html.erb
@@ -31,7 +31,7 @@
       <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 %>">
           <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">
             <a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i>
             </a>
@@ -40,14 +40,14 @@
         <p class="df mb10">
           <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[]"><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>
         </span>
         </p>
         <p class="df mb10">
           <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">
             <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>
@@ -56,7 +56,7 @@
         <p class="df mb10">
           <span class="column-second lineh-40">
             <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">
             <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>
diff --git a/app/views/ec_graduation_requirements/edit.js.erb b/app/views/ec_graduation_requirements/edit.js.erb
index e79b1e66..6c16b0e2 100644
--- a/app/views/ec_graduation_requirements/edit.js.erb
+++ b/app/views/ec_graduation_requirements/edit.js.erb
@@ -3,7 +3,7 @@ var html_begin = "<form id=\"form_data_for_requirements\"><div class=\"clearfix
 
 var html_requirement = '<p class="df mb20">' +
     '<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">' +
     '<a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i></a>' +
     '</span></p>'
@@ -14,7 +14,7 @@ var html_subitems = "";
       '<span class="column-second lineh-40">' +
       '<span class="color-red">* </span><span class="sequence"><%= "#{@ec_graduation_requirement.position}-#{sub.position}" %></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">' +
       '<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>' +
diff --git a/app/views/ec_years/graduation_requirement.html.erb b/app/views/ec_years/graduation_requirement.html.erb
index 8de398e2..63c901bf 100644
--- a/app/views/ec_years/graduation_requirement.html.erb
+++ b/app/views/ec_years/graduation_requirement.html.erb
@@ -1,9 +1,9 @@
 <script id="t:add-Require-Item" type="text/html">
   <p class="df mb10">
     <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">
-        <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>
   </p>
 </script>
@@ -106,18 +106,18 @@
                   '<p class="df mb20">' +
                   '<input type="hidden" name="year_id" value="<%= @year.id %>">' +
                   '<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">'+
                   '<a href="javascript:void(0)" class="fl subPlus" data-tip-down="添加"><i class="iconfont icon-tianjiafangda color-green"></i></a>'+
                   '</span></p>'+
                   '<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>'+
                   '<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>'+
                   '<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>'+
                   '<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>'+