Browse Source

修复展开收起bug

laiguoran 2 years ago
parent
commit
f1d63e4e50

+ 18 - 0
app/public/js/material_exponent.js

@@ -652,4 +652,22 @@ $(document).ready(() => {
     function getObjHeight(select) {
         return select.length > 0 ? select.height() : 0;
     }
+
+    $.subMenu({
+        menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
+        toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
+        key: 'menu.1.0.0',
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1',
+        callback: function (info) {
+            if (info.mini) {
+                $('.panel-title').addClass('fluid');
+                $('#sub-menu').removeClass('panel-sidebar');
+            } else {
+                $('.panel-title').removeClass('fluid');
+                $('#sub-menu').addClass('panel-sidebar');
+            }
+            autoFlashHeight();
+            materialExponentSpread.refresh();
+        }
+    });
 });

+ 3 - 3
app/public/js/stage_gather.js

@@ -135,7 +135,7 @@ $(document).ready(function () {
         gclGatherData = gclGatherModel.gatherGclData();
         gclGatherModel.checkDiffer(gclGatherData);
         checkOverRange(gclGatherData);
-        // 加载清单数据        
+        // 加载清单数据
         SpreadJsObj.loadSheetData(gclSpread.getActiveSheet(), SpreadJsObj.DataType.Data, gclGatherData);
         loadLeafXmjData(0);
         // 章节合计
@@ -295,7 +295,7 @@ $(document).ready(function () {
                         end_gather_qty: xmj.end_gather_qty, end_gather_percent: xmj.end_gather_percent,
                         dwgc: xmj.dwgc, fbgc: xmj.fbgc, fxgc: xmj.fxgc,
                         jldy: xmj.jldy, bwmx: xmj.bwmx, drawing_code: xmj.drawing_code,
-                        end_final_1_percent:: xmj.end_final_1_percent,
+                        end_final_1_percent: xmj.end_final_1_percent,
                     });
                 }
             }
@@ -303,4 +303,4 @@ $(document).ready(function () {
 
         SpreadExcelObj.exportSimpleXlsxSheet(setting, data, $('.sidebar-title').attr('data-original-title') + "-清单汇总.xlsx");
     });
-});
+});

+ 4 - 4
app/view/material/material_sub_menu.ejs

@@ -40,9 +40,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-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 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>

+ 18 - 0
app/view/stage/manager.ejs

@@ -85,4 +85,22 @@
 </div>
 <script type="text/javascript">
     autoFlashHeight();
+    $(function () {
+        $.subMenu({
+            menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
+            toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
+            key: 'menu.1.0.0',
+            miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1',
+            callback: function (info) {
+                if (info.mini) {
+                    $('.panel-title').addClass('fluid');
+                    $('#sub-menu').removeClass('panel-sidebar');
+                } else {
+                    $('.panel-title').removeClass('fluid');
+                    $('#sub-menu').addClass('panel-sidebar');
+                }
+                autoFlashHeight();
+            }
+        });
+    })
 </script>