展开收起样式更新

app/controller/material_controller.js

@@ -848,7 +848,6 @@ module.exports = app => {
                         break;
                     default: throw '参数有误';
                 }
-                console.log('find');
                 ctx.body = responseData;
             } catch (err) {
                 this.log(err);

app/public/css/main.css

@@ -1162,9 +1162,33 @@ legend {
 .min-side .side-menu{
   padding-bottom:10px;
 }
+.side-show {
+  position: absolute;
+  z-index:8;
+  right:0;
+  top: 0;
+  width: 15px;
+  height: calc(100vh);
+}
 .side-fold {
-  right:50px;
-  bottom:5px;
+  /*right:50px;*/
+  /*bottom:5px;*/
+  display:none;
+  z-index:9;
+  border-radius:2px;
+  right:0;
+  bottom:50%;
+  width:6px;
+  height:60px;
+  line-height:60px;
+  text-align:center;
+  cursor:pointer;
+  background-color: #2E6BE5;
+  color: #fff;
+}
+.side-fold i{
+  font-size: 20px;
+  vertical-align: text-bottom;
 }
 .side-fold a{
   font-size:24px;

app/view/change/sub_menu.ejs

@@ -2,7 +2,10 @@
     <div class="sidebar-title" data-toggle="tooltip" data-placement="right" data-original-title="变更台账新增部位">变更台账新增部位</div>
     <div class="scrollbar-auto">
         <% include ./sub_menu_list.ejs %>
-        <div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-upload fa-rotate-270"></i></a></div>
+        <div class="side-show"></div>
+        <div class="side-fold" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu">
+            <i class="fa fa-angle-left"></i>
+        </div>
     </div>
     <script>
         new Vue({

app/view/change/sub_mini_menu.ejs

@@ -1,8 +1,8 @@
 <!--折起的菜单-->
 <div class="min-side" id="sub-mini-menu" style="display: none;">
-    <div id="sub-mini-hint" class="side-switch" data-container="body" data-toggle="popover" data-placement="bottom" data-content="这里打开收起的菜单栏"></div>
-    <div class="side-switch">
-        <i class="fa fa-bars"></i>
+    <div class="side-switch" data-toggle="tooltip" data-placement="left" data-original-title="点击这里打开收起的菜单栏">
+        <i class="fa fa-bars mt-2"></i>
+        <i class="fa fa-indent mt-2 text-primary" style="display: none;cursor: pointer;" id="to-menu"></i>
     </div>
     <div class="side-menu" id="mini-menu-list" style="display: none">
         <% include ./sub_menu_list.ejs %>
@@ -13,4 +13,4 @@
     new Vue({
         el: '.side-menu',
     });
-</script>
+</script>

app/view/material/material_sub_menu.ejs

@@ -39,6 +39,10 @@
             </ul>
         </div>
         <% include ./audit_btn.ejs %>
-        <div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-sign-out fa-flip-horizontal"></i></a></div>
+        <!--<div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-sign-out fa-flip-horizontal"></i></a></div>-->
+        <div class="side-show"></div>
+        <div class="side-fold" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu">
+            <i class="fa fa-angle-left"></i>
+        </div>
     </div>
 </div>

app/view/material/material_sub_mini_menu.ejs

@@ -1,7 +1,8 @@
 <!--折起的菜单-->
 <div class="min-side" id="sub-mini-menu" style="display: none;">
-    <div class="side-switch">
-        <i class="fa fa-bars"></i>
+    <div class="side-switch" data-toggle="tooltip" data-placement="left" data-original-title="点击这里打开收起的菜单栏">
+        <i class="fa fa-bars mt-2"></i>
+        <i class="fa fa-indent mt-2 text-primary" style="display: none;cursor: pointer;" id="to-menu"></i>
     </div>
     <div class="side-menu" id="mini-menu-list" style="display: none">
         <% if (ctx.url !== '/tender/' + ctx.tender.id + '/measure/material/' + ctx.material.order + '/checklist') { %>
@@ -40,6 +41,6 @@
             </ul>
         </div>
         <% include ./audit_btn.ejs %>
-        <div class="side-fold"><a href="javascript: void(0);" data-toggle="tooltip" data-placement="top" data-original-title="展开侧栏" id="to-menu"><i class="fa fa-thumb-tack"></i></a></div>
+        <!--<div class="side-fold"><a href="javascript: void(0);" data-toggle="tooltip" data-placement="top" data-original-title="展开侧栏" id="to-menu"><i class="fa fa-thumb-tack"></i></a></div>-->
     </div>
 </div>

app/view/revise/sub_menu.ejs

@@ -2,11 +2,14 @@
     <div class="sidebar-title" data-toggle="tooltip" data-placement="right" data-original-title="<%- ctx.revise.corder %># 台账修订"><%- ctx.revise.corder %># 台账修订</div>
     <div class="scrollbar-auto">
         <% include ./sub_menu_list.ejs %>
-        <div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-upload fa-rotate-270"></i></a></div>
+        <div class="side-show"></div>
+        <div class="side-fold" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu">
+            <i class="fa fa-angle-left"></i>
+        </div>
     </div>
     <script>
         const subMenu = new Vue({
             el: '.scrollbar-auto',
         });
     </script>
-</div>
+</div>

app/view/revise/sub_mini_menu.ejs

@@ -1,8 +1,8 @@
 <!--折起的菜单-->
 <div class="min-side" id="sub-mini-menu" style="display: none;">
-    <div id="sub-mini-hint" class="side-switch" data-container="body" data-toggle="popover" data-placement="bottom" data-content="这里打开收起的菜单栏"></div>
-    <div class="side-switch">
-        <i class="fa fa-bars"></i>
+    <div class="side-switch" data-toggle="tooltip" data-placement="left" data-original-title="点击这里打开收起的菜单栏">
+        <i class="fa fa-bars mt-2"></i>
+        <i class="fa fa-indent mt-2 text-primary" style="display: none;cursor: pointer;" id="to-menu"></i>
     </div>
     <div class="side-menu" id="mini-menu-list" style="display: none">
         <% include ./sub_menu_list.ejs %>
@@ -13,4 +13,4 @@
     const subMiniMenu = new Vue({
         el: '.side-menu',
     });
-</script>
+</script>

app/view/stage/stage_sub_menu.ejs

@@ -94,6 +94,9 @@
         </div>
         <% } %>
         <% include ./audit_btn.ejs %>
-        <div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-upload fa-rotate-270"></i></a></div>
+        <div class="side-show"></div>
+        <div class="side-fold" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu">
+            <i class="fa fa-angle-left"></i>
+        </div>
     </div>
 </div>

app/view/stage/stage_sub_mini_menu.ejs

@@ -1,8 +1,8 @@
 <!--折起的菜单-->
 <div class="min-side" id="sub-mini-menu" style="display: none;">
-    <div id="sub-mini-hint" class="side-switch" data-container="body" data-toggle="popover" data-placement="bottom" data-content="这里打开收起的菜单栏"></div>
-    <div class="side-switch">
-        <i class="fa fa-bars"></i>
+    <div class="side-switch" data-toggle="tooltip" data-placement="left" data-original-title="点击这里打开收起的菜单栏">
+        <i class="fa fa-bars mt-2"></i>
+        <i class="fa fa-indent mt-2 text-primary" style="display: none;cursor: pointer;" id="to-menu"></i>
     </div>
     <div class="side-menu" id="mini-menu-list" style="display: none">
         <div class="nav-box">
@@ -96,6 +96,6 @@
             </div>
         <% } %>
         <% include ./audit_btn.ejs %>
-        <div class="side-fold"><a href="javascript: void(0);" data-toggle="tooltip" data-placement="top" data-original-title="展开侧栏" id="to-menu"><i class="fa fa-upload fa-rotate-90"></i></a></div>
+        <!--<div class="side-fold"><a href="javascript: void(0);" data-toggle="tooltip" data-placement="top" data-original-title="展开侧栏" id="to-menu"><i class="fa fa-upload fa-rotate-90"></i></a></div>-->
     </div>
 </div>

app/view/tender/tender_sub_menu.ejs

@@ -83,8 +83,8 @@
         </div>
         <% } %>
     </div>
-    <div class="side-show" style="position: absolute;z-index:8;right:0;top: 0;width: 15px;height: calc(100vh);"></div>
-    <div class="side-fold" style="display:none;z-index:9;border-radius:2px;right:0;bottom:50%;width:6px;height:60px;line-height:60px;text-align:center;cursor:pointer;background-color: #2E6BE5;color: #fff" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu">
-        <i class="fa fa-angle-left" style="font-size: 20px;vertical-align: text-bottom"></i>
+    <div class="side-show"></div>
+    <div class="side-fold" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu">
+        <i class="fa fa-angle-left"></i>
     </div>
 </div>