From 41cb769fbaca457a3ef6729643b85725c3551681 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 3 Apr 2019 17:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E7=9A=84=E6=B7=BB=E5=8A=A0=E5=90=88=E4=BD=9C=E4=BC=99=E4=BC=B4?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_add_auto_users_trial.html.erb            |  5 +-
 .../managements/_partner_addManage.html.erb   | 84 +++++++++++++++++++
 .../managements/_partner_addUnit.html.erb     | 71 ++++++++++++++++
 .../_unit_cooperativePartner.html.erb         | 75 +++++++++++++++++
 public/stylesheets/educoder/edu-all.css       | 23 +++++
 public/stylesheets/educoder/edu-main.css      |  2 +-
 6 files changed, 255 insertions(+), 5 deletions(-)
 create mode 100644 app/views/managements/_partner_addManage.html.erb
 create mode 100644 app/views/managements/_partner_addUnit.html.erb
 create mode 100644 app/views/managements/_unit_cooperativePartner.html.erb

diff --git a/app/views/managements/_add_auto_users_trial.html.erb b/app/views/managements/_add_auto_users_trial.html.erb
index 2de606dc..ea67bba3 100644
--- a/app/views/managements/_add_auto_users_trial.html.erb
+++ b/app/views/managements/_add_auto_users_trial.html.erb
@@ -1,8 +1,5 @@
 <div style="width:400px" class="task-popup">
-  <div class="task-popup-title clearfix ">
-    <h3 class="fl color-grey mt10 ml5">新增自动授权单位</h3>
-    <a href="javascript:void(0)" id="closeIcon" style="top: -48px;right: -20px;z-index: 100000;"><i class="iconfont icon-shanchudiao"></i></a>
-  </div>
+  <div class="task-popup-title clearfix ">新增自动授权单位</div>
   <div class="mt10 ml30">
     <span class="fl font-16 color-grey mr10 mt3 ">单位名称:</span>
     <input nhname="tag" name="school" class="task-height-40 panel-box-sizing fl" type="text"  placeholder="请输入单位名称" style="width: 260px" value="<%= @schools %>" />
diff --git a/app/views/managements/_partner_addManage.html.erb b/app/views/managements/_partner_addManage.html.erb
new file mode 100644
index 00000000..818a4777
--- /dev/null
+++ b/app/views/managements/_partner_addManage.html.erb
@@ -0,0 +1,84 @@
+<div class="task-popup" style="width: 572px;">
+  <div class="task-popup-title clearfix">添加管理员</div>
+  <div class="task_popup_con">
+    <div class="clearfix mb20" id="add_major_manager">
+      <li class="">
+        <input id="object_id" type="hidden" value="">
+        <input id="object_type" type="hidden" value="">
+        <p class="clearfix mb15">
+          <span class="fl">姓名：<input placeholder="请输入真实姓名" type="text" name="name" class="winput-120-30 greyInput"/></span>
+          <span class="ml20 fl">单位：<input placeholder="请输入单位名称" name="school" value="" type="text" class="winput-240-30 greyInput"/></span>
+        </p>
+        <div class="df">
+          <span class="fl lineh-35">职业：</span>
+          <div class="pr flex1" select-for>
+            <input type="hidden" name="identity">
+            <input type="text" class="input-100-35 color-grey-3" readonly value="请选择职业" placeholder="请选择职业"/>
+            <div class="down-select bor-grey-e user_bg_shadow" id="vecation_option">
+              <p>请选择职业</p>
+              <p data-shixun-value="0">教师</p>
+              <p data-shixun-value="1">学生</p>
+              <p data-shixun-value="2">专业人士</p>
+            </div>
+          </div>
+          <a href="javascript:void(0);" onclick="submit_search_user()" class="white-btn mt6 edu-blueback-btn fl ml15">搜索</a>
+        </div>
+      </li>
+    </div>
+    <div class="mb20 clearfix">
+      <p class="pl10 color-grey-6 clearfix">
+        <span class="fl edu-txt-w90 pl10">姓名</span>
+        <span class="fl edu-txt-w90 edu-txt-center">职称</span>
+        <span class="fl edu-txt-w200 edu-txt-left">单位</span>
+        <span class="fl edu-txt-w100 edu-txt-center">手机号</span>
+      </p>
+      <div class="edu-back-skyblue clearfix pl10 over280" id="serch_user_list">
+        <p class="clearfix">
+          <span class="fl edu-txt-w90">
+            <input type="checkbox" name="user_id[]" value="12545" id="user_12545" class="magic-checkbox">
+            <label for="user_12545">李健</label>
+          </span>
+          <span class="fl edu-txt-w90 mt5 edu-txt-center color-grey-6 pointer">学生</span>
+          <span class="fl task-hide edu-txt-w200 mt5 edu-txt-left color-grey-9">湖北工业大学 </span>
+          <span class="fl edu-txt-w100 mt5 edu-txt-center color-grey-9">156****9087</span>
+        </p>
+        <p class="clearfix">
+          <span class="fl edu-txt-w90">
+            <input type="checkbox" name="user_id[]" value="12545" id="user_12545" class="magic-checkbox">
+            <label for="user_12545">李健</label>
+          </span>
+          <span class="fl edu-txt-w90 mt5 edu-txt-center color-grey-6 pointer">学生</span>
+          <span class="fl task-hide edu-txt-w200 mt5 edu-txt-left color-grey-9">湖北工业大学 </span>
+          <span class="fl edu-txt-w100 mt5 edu-txt-center color-grey-9"></span>
+        </p>
+      </div>
+    </div>
+    <p class="color-orange-tip" id="form_notice"></p>
+    <li class="clearfix mt10 edu-txt-center">
+      <a href="javascript:void(0);" class="task-btn mr10" onclick="hideModal()">取消</a>
+      <a href="javascript:void(0);" class="task-btn task-btn-orange ml20" onclick="submit_add_manager()">确定</a>
+    </li>
+  </div>
+</div>
+<script>
+    $(function() {
+        unitDownOption();
+
+        $("#add_major_manager").on("keydown", "input[name='name'],input[name='school']", function(e){
+            // 兼容FF和IE和Opera
+            var theEvent = e || window.event;
+            var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+            if (code == 13) {
+                //回车执行查询
+                submit_search_user();
+            }
+        });
+
+        function submit_search_user(){
+            if($("input[name='name']").val()==""){
+                $("input[name='name']").addClass("bor-red");
+                return;
+            }
+        }
+    })
+</script>
\ No newline at end of file
diff --git a/app/views/managements/_partner_addUnit.html.erb b/app/views/managements/_partner_addUnit.html.erb
new file mode 100644
index 00000000..1001d32c
--- /dev/null
+++ b/app/views/managements/_partner_addUnit.html.erb
@@ -0,0 +1,71 @@
+<div class="task-popup" style="width: 572px;">
+  <div class="task-popup-title clearfix">添加合作伙伴</div>
+  <div class="task_popup_con">
+    <div class="clearfix mb20 df">
+      <div class="flex1">
+        <div class="df">
+          <span class="fl lineh-35">地区：</span>
+          <select placeholder="请选择地区" id="province" class="flex1"></select>
+        </div>
+        <div class="df mt15">
+          <span class="fl lineh-35">单位：</span>
+          <input placeholder="请输入单位关键字" class="input-flex-35"/>
+        </div>
+      </div>
+      <a href="javascript:void(0);" onclick="submit_search_user()" class="white-btn mt6 edu-blueback-btn fl ml15 mt55">搜索</a>
+    </div>
+    <div class="mb20 clearfix">
+      <p class="pl10 color-grey-6 clearfix">
+        <span class="fl ml25">单位</span>
+        <span class="fr with30">地区</span>
+      </p>
+      <div class="edu-back-skyblue clearfix pl10 over280" id="serch_user_list">
+        <p class="clearfix mt5">
+          <span class="fl with70">
+            <span>
+                <input type="checkbox" name="user_id[]" value="1" id="user_1" class="magic-checkbox">
+                <label for="user_1">国防科技大学</label>
+            </span>
+          </span>
+          <span class="fl with30">湖南</span>
+        </p>
+        <p class="clearfix mt5">
+          <span class="fl with70">
+            <span>
+                <input type="checkbox" name="user_id[]" value="12" id="user_12" class="magic-checkbox">
+                <label for="user_12">国防科技大学</label>
+            </span>
+          </span>
+          <span class="fl with30">湖南</span>
+        </p>
+        <p class="clearfix mt5">
+          <span class="fl with70">
+            <span>
+                <input type="checkbox" name="user_id[]" value="125" id="user_125" class="magic-checkbox">
+                <label for="user_125">国防科技大学</label>
+            </span>
+          </span>
+          <span class="fl with30">湖南</span>
+        </p>
+      </div>
+      <p class="clearfix" style="height: 20px;"><span class="fl lineh-20 none color-red" id="checkNotice"></span></p>
+    </div>
+    <li class="clearfix mt10 edu-txt-center">
+      <a href="javascript:void(0);" class="task-btn mr10" onclick="hideModal()">取消</a>
+      <a href="javascript:void(0);" class="task-btn task-btn-orange ml20" onclick="submit_add_partner()">确定</a>
+    </li>
+  </div>
+</div>
+<script>
+    $(function() {
+        unitDownOption();
+        showprovince("province");
+    })
+
+        function submit_add_partner(){
+            if($("input[name='user_id[]']:checked").length==0){
+                $("#checkNotice").html("请选择需要添加的内容").removeClass("none");
+                return;
+            }
+        }
+</script>
\ No newline at end of file
diff --git a/app/views/managements/_unit_cooperativePartner.html.erb b/app/views/managements/_unit_cooperativePartner.html.erb
new file mode 100644
index 00000000..4106dfa9
--- /dev/null
+++ b/app/views/managements/_unit_cooperativePartner.html.erb
@@ -0,0 +1,75 @@
+<div class="mt20">
+    <div class="clearfix edu-back-white padding20-30">
+      <input class="fl task-form-20 task-height-30" placeholder="输入合作伙伴名称进行搜索">
+      <a href="javascript:void(0)" class="fl task-btn task-btn-orange ml10">搜索</a>
+      <a href="javascript:void(0)" class="fl task-btn ml10">清除</a>
+    </div>
+  <div class="clearfix mt20">
+    <div class="with25 fl edu-back-white">
+      <a href="javascript:void(0)" class="color-blue addOperation">+添加</a>
+      <ul class="partnerList">
+        <li><a class="active" href="javascript:void(0)">北京真假科技有限公司</a></li>
+        <li><a href="javascript:void(0)">北京真假科技有限公司</a></li>
+        <li><a href="javascript:void(0)">北京真假科技有限公司</a></li>
+        <li><a href="javascript:void(0)">北京真假科技有限公司</a></li>
+        <li><a href="javascript:void(0)">北京真假科技有限公司</a></li>
+      </ul>
+    </div>
+    <div class="with75 fl pl20">
+      <div class="edu-back-white">
+        <div>
+          <div class="padding10-20">
+              <p class="mb20"><span class="mr30 color-grey-9">添加时间</span><span class="color-grey-6">2019-04-03 15:40</span></p>
+              <div class="clearfix">
+                <span class="mr45 color-grey-9 fl">管理员</span>
+                <ul class="manageList">
+                  <li><a href="javascript:void(0)" class="addManage">+</a></li>
+                  <li><img src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=105293018,2500805440&fm=27&gp=0.jpg"/><a href="javascript:void(0)" class="removeImg"><i class="iconfont icon-htmal5icon19 color-grey-9"></i></a></li>
+                </ul>
+              </div>
+          </div>
+          <div class="tableList">
+            <li class="clearfix tableHead">
+                <span>序号</span>
+                <span>客户名称</span>
+                <span><a href="javascript:void(0)" class="color-blue">+添加</a></span>
+                <span>添加时间</span>
+            </li>
+            <li>
+              <span>1</span>
+              <span class="task-hide">国防科技大学</span>
+              <span>
+                <a href="javascript:void(0)" class="color-grey-9">删除</a>
+              </span>
+              <span>
+                2019-04-03 16:04
+              </span>
+            </li>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<script>
+  $(function(){
+      $(".partnerList li").on("click","a",function(){
+          $(".partnerList li a").removeClass("active");
+          $(this).addClass("active");
+      })
+
+      $(".removeImg").on("click",function(){
+          $(this).parents("li").remove();
+      })
+
+      $(".addOperation").on("click",function(){
+          var html="<%= escape_javascript(render :partial => "managements/partner_addUnit") %>";
+          pop_box_new(html,572,500);
+      })
+
+      $(".manageList").on("click",".addManage",function(){
+          var html="<%= escape_javascript(render :partial => "managements/partner_addManage") %>";
+          pop_box_new(html,572,500);
+      })
+  })
+</script>
\ No newline at end of file
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index a0a9aebe..9502bf4c 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -2973,6 +2973,29 @@ a.singlepublishtwo{
 /*合作伙伴*/
 .edu-cooperation li{height: 60px;width: 210px;padding: 10px 0px;margin-left: 20px;float: left;margin-bottom: 20px;text-align: center;line-height: 40px;box-sizing: border-box}
 .edu-cooperation li img{height: 40px;width: 210px;}
+/*单位-合作伙伴*/
+.addOperation{width: 100%;display: block;height: 56px;line-height: 56px;text-align: center;border-bottom: 1px solid #eee;}
+.partnerList li a{
+    display: block;height: 40px;line-height: 40px;padding:0px 10px;width: 100%;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;
+    box-sizing: border-box;position: relative;
+}
+.partnerList li a.active:after{
+    position: absolute;left: 0px;height: 100%;width: 2px;content: '';background: #4cacff;
+}
+.partnerList{max-height: 500px;overflow-y: auto;}
+.manageList{float: left}
+.manageList li{width: 60px;height: 60px;float: left;margin-right: 15px;border-radius: 50%;text-align: center;position: relative;margin-bottom: 10px;}
+.manageList li>a.addManage,.manageList li>img{width: 60px;height: 60px;line-height: 49px;float: left;margin-right: 10px;border-radius: 50%;}
+.addManage{display: block;background: #cdcdcd;color: #fff!important;font-size: 55px;}
+.removeImg{position: absolute;right: 1px;top: -12px;}
+.tableList .tableHead{background: #fafafa}
+.tableList{min-height: 400px;}
+.tableList li{height: 45px;line-height: 45px;}
+.tableList li span{float: left;display: block;text-align: center}
+.tableList li span:nth-child(1){width: 10%}
+.tableList li span:nth-child(2){width: 60%;text-align: left}
+.tableList li span:nth-child(3){width: 10%;float: right}
+.tableList li span:nth-child(4){width: 20%;float: right}
 
 
 /* 兼容（小屏幕）手机浏览器 */
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index c4c10a29..019b94e3 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -100,7 +100,7 @@ a.decoration{text-decoration: underline}
 .panel-form-label{ display:inline-block; width:10%; min-width:90px; text-align:right; line-height:40px; font-weight: normal; }
 
 /*通用内外边距*/
-.mt-10{ margin-top:-10px;}.mt-3{ margin-top:-3px;}.mt0{ margin-top:0px!important;} .mt1{ margin-top:1px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt4{ margin-top:4px;}.mt5{ margin-top:5px!important;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px!important;}.mt8{ margin-top:8px;}.mt9{ margin-top:9px;}.mt10{ margin-top:10px!important;}.mt12{ margin-top:12px;}.mt13{ margin-top:13px;}.mt14{ margin-top:14px;}.mt15{ margin-top:15px!important;}.mt16{ margin-top:16px;}.mt17{ margin-top:17px;}.mt18{ margin-top:18px;}.mt20{ margin-top:20px!important;}.mt22{ margin-top:22px!important;}.mt23{ margin-top:23px!important;}.mt24{ margin-top:24px!important;}.mt25{ margin-top:25px;}.mt28{ margin-top:28px;}.mt30{ margin-top:30px!important;}.mt34{ margin-top:34px!important;}.mt35{ margin-top:35px!important;}.mt36{ margin-top:36px!important;}.mt40{ margin-top:40px;}.mt45{ margin-top:45px;}.mt46{ margin-top:46px;}.mt50{ margin-top:50px;!important;}.mt56{ margin-top:56px;!important;}.mt60{ margin-top:60px;}.mt70{ margin-top:70px;}.mt80{ margin-top:80px;}.mt95{ margin-top:95px;}.mt100{ margin-top:100px;}.mt110{ margin-top:110px;}.mt120{ margin-top:120px;}.mt130{ margin-top:130px;}.mt140{ margin-top:140px;}.mt150{ margin-top:150px;}.mt160{ margin-top:160px;}
+.mt-10{ margin-top:-10px;}.mt-3{ margin-top:-3px;}.mt0{ margin-top:0px!important;} .mt1{ margin-top:1px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt4{ margin-top:4px;}.mt5{ margin-top:5px!important;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px!important;}.mt8{ margin-top:8px;}.mt9{ margin-top:9px;}.mt10{ margin-top:10px!important;}.mt12{ margin-top:12px;}.mt13{ margin-top:13px;}.mt14{ margin-top:14px;}.mt15{ margin-top:15px!important;}.mt16{ margin-top:16px;}.mt17{ margin-top:17px;}.mt18{ margin-top:18px;}.mt20{ margin-top:20px!important;}.mt22{ margin-top:22px!important;}.mt23{ margin-top:23px!important;}.mt24{ margin-top:24px!important;}.mt25{ margin-top:25px;}.mt28{ margin-top:28px;}.mt30{ margin-top:30px!important;}.mt34{ margin-top:34px!important;}.mt35{ margin-top:35px!important;}.mt36{ margin-top:36px!important;}.mt40{ margin-top:40px;}.mt45{ margin-top:45px;}.mt46{ margin-top:46px;}.mt50{ margin-top:50px;!important;}.mt55{ margin-top:55px;!important;}.mt56{ margin-top:56px;!important;}.mt60{ margin-top:60px;}.mt70{ margin-top:70px;}.mt80{ margin-top:80px;}.mt95{ margin-top:95px;}.mt100{ margin-top:100px;}.mt110{ margin-top:110px;}.mt120{ margin-top:120px;}.mt130{ margin-top:130px;}.mt140{ margin-top:140px;}.mt150{ margin-top:150px;}.mt160{ margin-top:160px;}
 .mb3{ margin-bottom: 3px;}.mb5{ margin-bottom: 5px;}.mb7{ margin-bottom: 7px;}.mb9{ margin-bottom: 9px;}.mb10{ margin-bottom: 10px;}.mb11{ margin-bottom: 11px;}.mb14{ margin-bottom: 14px;}.mb15{ margin-bottom: 15px;}.mb16{ margin-bottom: 16px;}.mb20{ margin-bottom: 20px!important;}.mb25{ margin-bottom: 25px;}.mb26{ margin-bottom: 26px;}.mb28{ margin-bottom: 28px;}.mb30{ margin-bottom: 30px!important;}.mb40{ margin-bottom: 40px!important;}.mb50{ margin-bottom: 50px!important;}.mb60{ margin-bottom: 60px!important;}.mb70{ margin-bottom: 70px!important;}.mb80{ margin-bottom: 80px!important;}.mb90{ margin-bottom: 90px!important;}.mb100{ margin-bottom: 100px!important;}.mb110{ margin-bottom: 110px;}
 .ml-3{ margin-left: -3px;}.ml1{margin-left: 1px;}.ml2{margin-left: 2px;}.ml3{margin-left: 3px;}.ml4{margin-left: 4px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml12{ margin-left:12px!important;}.ml13{ margin-left:13px!important;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml22{ margin-left: 22px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml45{ margin-left: 45px;}.ml50{ margin-left: 50px;}.ml55{ margin-left: 55px;}.ml60{ margin-left: 60px;}.ml72{ margin-left: 72px;}.ml73{ margin-left: 73px;}.ml75{ margin-left: 75px;}.ml80{ margin-left: 80px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml123{ margin-left: 123px;}.ml150{ margin-left: 150px;}.ml180{ margin-left: 180px;}.ml230{ margin-left: 230px;}
 .mr3{margin-right: 3px}.mr4{margin-right: 4px}.mr5{ margin-right: 5px;}.mr8{ margin-right: 8px;}.mr10{ margin-right: 10px;}.mr12{ margin-right:12px!important;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr24{ margin-right: 24px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr35{margin-right:35px;}.mr40{margin-right:40px;}.mr45{margin-right:45px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}.mr70{ margin-right: 70px;}.mr75{ margin-right: 75px;}.mr80{ margin-right:80px;}.mr90{ margin-right:90px;}.mr100{ margin-right: 100px;}.mr110{ margin-right:110px;}.mr350{ margin-right:350px;}