新功能 页面弹窗适应高DPI

admin-role-2.html

@@ -449,6 +449,10 @@
                                 <label class="custom-control-label" for="role2-radio-22">本人</label>
                             </div>
                             <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-22" name="role2-radio2">
+                                <label class="custom-control-label" for="role2-radio-22">本人及下属</label>
+                            </div>
+                            <div class="custom-control custom-radio mb-3 ml-3">
                                 <input type="radio" class="custom-control-input" id="role2-radio-23" name="role2-radio2">
                                 <label class="custom-control-label" for="role2-radio-23">本部门</label>
                             </div>
@@ -470,6 +474,10 @@
                                 <label class="custom-control-label" for="role2-radio-12">本人</label>
                             </div>
                             <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-22" name="role2-radio2">
+                                <label class="custom-control-label" for="role2-radio-22">本人及下属</label>
+                            </div>
+                            <div class="custom-control custom-radio mb-3 ml-3">
                                 <input type="radio" class="custom-control-input" id="role2-radio-13" name="role2-radio">
                                 <label class="custom-control-label" for="role2-radio-13">本部门</label>
                             </div>
@@ -491,6 +499,10 @@
                                 <label class="custom-control-label" for="role2-radio-2">本人</label>
                             </div>
                             <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-22" name="role2-radio2">
+                                <label class="custom-control-label" for="role2-radio-22">本人及下属</label>
+                            </div>
+                            <div class="custom-control custom-radio mb-3 ml-3">
                                 <input type="radio" class="custom-control-input" id="role2-radio-3" name="role2-radio1">
                                 <label class="custom-control-label" for="role2-radio-3">本部门</label>
                             </div>

admin-role-3.html

@@ -464,6 +464,10 @@
                                 <label class="custom-control-label" for="role2-radio-22">本人</label>
                             </div>
                             <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-22" name="role2-radio2">
+                                <label class="custom-control-label" for="role2-radio-22">本人及下属</label>
+                            </div>
+                            <div class="custom-control custom-radio mb-3 ml-3">
                                 <input type="radio" class="custom-control-input" id="role2-radio-23" name="role2-radio2">
                                 <label class="custom-control-label" for="role2-radio-23">本部门</label>
                             </div>
@@ -485,6 +489,35 @@
                                 <label class="custom-control-label" for="role2-radio-12">本人</label>
                             </div>
                             <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-22" name="role2-radio2">
+                                <label class="custom-control-label" for="role2-radio-22">本人及下属</label>
+                            </div>
+                            <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-13" name="role2-radio">
+                                <label class="custom-control-label" for="role2-radio-13">本部门</label>
+                            </div>
+                            <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-14"  name="role2-radio">
+                                <label class="custom-control-label" for="role2-radio-14">本部门及下属部门</label>
+                            </div>
+                            <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-15"  name="role2-radio">
+                                <label class="custom-control-label" for="role2-radio-15">全部</label>
+                            </div>
+                            <h4>更换负责人</h4>
+                            <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-11" checked="" name="role2-radio">
+                                <label class="custom-control-label" for="role2-radio-11">无</label>
+                            </div>
+                            <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-12" name="role2-radio">
+                                <label class="custom-control-label" for="role2-radio-12">本人</label>
+                            </div>
+                            <div class="custom-control custom-radio mb-3 ml-3">
+                                <input type="radio" class="custom-control-input" id="role2-radio-22" name="role2-radio2">
+                                <label class="custom-control-label" for="role2-radio-22">本人及下属</label>
+                            </div>
+                            <div class="custom-control custom-radio mb-3 ml-3">
                                 <input type="radio" class="custom-control-input" id="role2-radio-13" name="role2-radio">
                                 <label class="custom-control-label" for="role2-radio-13">本部门</label>
                             </div>

company.html

@@ -104,6 +104,12 @@
      							<span class="nav-link-text">客户</span>
      						</a>
             </li>
+            <li class="">
+              <a href="business.html" title="商机" data-filter-tags="商机">
+                  <i class="fas fa-usd-circle"></i>
+                  <span class="nav-link-text">商机</span>
+                </a>
+            </li>
           </ul>
           <div class="filter-message js-filter-message bg-success-600"></div>
         </nav>

contact.html

@@ -101,9 +101,15 @@
             </li>
             <li class="">
               <a href="company.html" title="客户" data-filter-tags="客户">
-     							<i class="fal fa-building "></i>
-     							<span class="nav-link-text">客户</span>
-     						</a>
+                  <i class="fal fa-building "></i>
+                  <span class="nav-link-text">客户</span>
+                </a>
+            </li>
+            <li class="">
+              <a href="business.html" title="商机" data-filter-tags="商机">
+                  <i class="fas fa-usd-circle"></i>
+                  <span class="nav-link-text">商机</span>
+                </a>
             </li>
           </ul>
           <div class="filter-message js-filter-message bg-success-600"></div>

contract.html

@@ -25,7 +25,7 @@
   <link rel="stylesheet" media="screen, print" href="css/formplugins/bootstrap-datepicker/bootstrap-datepicker.css">
 </head>
 
-<body class="mod-bg-1 nav-function-fixed header-function-fixed">
+<body class="mod-bg-1 nav-function-fixed header-function-fixed zoom2x">
   <!-- DOC: script to save and load page settings -->
   <script>
     /**
@@ -3583,6 +3583,8 @@
     height: 'auto',
     railVisible: true
   });
+  if(window.devicePixelRatio == 2 )
+  $("body").addClass("zoom2x");
 </script>
 
 </html>

css/cld-custom.css

@@ -192,6 +192,14 @@
 .sheet-panel-log{
   height:314px;
 }
+ @media screen and (min-resolution: 1.5dppx),     /*通用像素密度*/
+         (min-device-pixel-ratio: 1.5),/*安卓ios使用谷歌火狐浏览器也可使用*/
+ {
+ /*样式书写处*/
+ .sheet-panel-log{
+  height:174px;
+}
+ }
 .sheet-btns {
   height:24px;
 }

js/cld-custom.js

@@ -1,5 +1,9 @@
 function autoFlashHeight(){
+    function getObjHeight(select) {
+        return select.length > 0 ? select.height() : 0;
+    }
+    var splog = getObjHeight($(".sheet-panel-log"));
     $(".sheet-panel-content").height($(window).height()-138);
     $(".modal-search-height").height($(window).height()-226);
-    $(".sheet-panel-righttop").height($(window).height()-550);
+    $(".sheet-panel-righttop").height($(window).height()-splog-236);
 };

product-yun-yh.html

@@ -277,6 +277,9 @@
                                                 <option value="2">超过3小时</option>
                                             </select>
                                         </div>
+                                        <div class="col-auto pr-0">
+                                            用户 30
+                                        </div>
                                         <!-- <div class="col-auto pr-0">
                                             <input type="text" class="form-control form-control-sm" id="datepicker-1" placeholder="注册时间" value="01/01/2018 - 01/15/2018">
                                         </div> -->
@@ -347,6 +350,12 @@
                                                       <label class="custom-control-label" for="lie7">注册时间</label>
                                                     </div>
                                                   </li>
+                                                  <li class="mb-2">
+                                                    <div class="custom-control custom-switch">
+                                                      <input type="checkbox" class="custom-control-input" id="lie7">
+                                                      <label class="custom-control-label" for="lie7">已升级专业版</label>
+                                                    </div>
+                                                  </li>
                                                 </ul>
                                               </div>
                                           </div>