Просмотр исходного кода

解决菜单不起作用问题

吴学文 лет назад: 7
Родитель
Сommit
70273b49a7

+ 2 - 1
WebService/src/main/resources/components/common/commonBottom.html

@@ -1,4 +1,3 @@
-<script src="/js/bootstrap/jquery-3.3.1.min.js"></script>
 <script src="/js/bootstrap/bootstrap.min.js" ></script>
 <script src="/js/common.js" ></script>
 
@@ -6,7 +5,9 @@
 <!-- Mainly scripts -->
 <script src="/js/popper.min.js"></script>
 <script src="/js/bootstrap/bootstrap.js"></script>
+<!--
 <script src="/js/plugins/metisMenu/jquery.metisMenu.js"></script>
+-->
 <script src="/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
 
 <!-- Flot -->

+ 2 - 1
WebService/src/main/resources/components/common/commonTop.html

@@ -9,4 +9,5 @@
 <link rel="stylesheet" href="/css/common.css"/>
 <script src="/js/vue/vue.min.js" ></script>
 <script src="/js/vue/vue-resource.min.js" ></script>
-<script src="/js/core.js" ></script>
+<script src="/js/bootstrap/jquery-3.3.1.min.js"></script>
+<script src="/js/core.js" ></script>

+ 2 - 2
WebService/src/main/resources/components/menu/menu.html

@@ -13,13 +13,13 @@
             </li>
 
             <li v-for="menu in menus" v-bind:class="{ active: menu.active }"  :key="menu.id">
-                <a v-if="menu.childs != undefined && menu.childs.length >0" href="#">
+                <a v-if="menu.childs != undefined && menu.childs.length >0" href="#" v-on:click="switchMenu(menu.id)">
                     <i class="fa " v-bind:class="menu.icon"></i>
                     <span class="nav-label">{{menu.name}}</span>
                     <span v-if="menu.label != undefined && menu.label != ''" class="float-right label label-primary">{{menu.label}}</span>
                     <span v-if="menu.label == undefined || menu.label == ''" class="fa arrow"></span>
                 </a>
-                <ul v-if="menu.childs != undefined && menu.childs.length >0" class="nav nav-second-level collapse">
+                <ul v-if="menu.childs != undefined && menu.childs.length >0" class="nav nav-second-level collapse" v-bind:class="{in: menu.active}">
                     <li v-for="subMenu in menu.childs"><a v-bind:href="subMenu.href">{{subMenu.name}}</a></li>
                 </ul>
                 <a v-if="menu.childs == undefined || menu.childs.length ==0" v-bind:href="menu.href">

+ 13 - 4
WebService/src/main/resources/components/menu/menu.js

@@ -23,15 +23,21 @@
                             'getMenus',
                              param,
                              function(json,res){
-                                vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                                var _menus = JSON.parse(json);
+                                vm.menus = vm.refreshMenuActive(_menus,_menus[0].id);
                              },function(errInfo,error){
                                 console.log('请求失败处理');
                              }
                            );
            },
-           refreshMenuActive:function(jsonArray,offset){
+           refreshMenuActive:function(jsonArray,_id){
                 for(var menuIndex =0 ; menuIndex < jsonArray.length;menuIndex ++){
-                    if(offset == menuIndex){
+                    if(_id === jsonArray[menuIndex].id){
+                        if(jsonArray[menuIndex].active === true){
+                            //如果当前本身是打开状态,说明 需要关闭
+                             jsonArray[menuIndex].active=false;
+                             continue;
+                        }
                         jsonArray[menuIndex].active=true;
                         continue;
                     }
@@ -39,8 +45,11 @@
                 }
 
                 return  jsonArray;
+           },
+           switchMenu:function(_id){
+                vm.menus = vm.refreshMenuActive(vm.menus,_id);
            }
-       }
+       },
 
     });
 

+ 5 - 3
WebService/src/main/resources/components/validate_code/validate-code.html

@@ -1,4 +1,6 @@
-<div class="form-group" component="validate-code">
-    <input type="text" v-model="validateCode" class="form-control" placeholder="请输入验证码" required=""/><slot></slot>
-    <img v-bind:src="codeImage" v-on:click="generateCode()"/>
+<div class="form-group row" component="validate-code">
+    <div class="col-sm-8 ">
+        <input type="text" class="form-control" v-model="validateCode" placeholder="请输入验证码" required=""/>
+    </div>
+    <img v-bind:src="codeImage" class="col-sm-4 form-control" v-on:click="generateCode()"/>
 </div>

+ 6 - 6
WebService/src/main/resources/static/js/inspinia.js

@@ -19,12 +19,12 @@ $(document).ready(function () {
         $('body').removeClass('body-small')
     }
 
-    // MetisMenu
-    var sideMenu = $('#side-menu').metisMenu();
-
-    sideMenu.on('shown.metisMenu', function (e) {
-        fix_height();
-    });
+//    // MetisMenu
+//    var sideMenu = $('#side-menu').metisMenu();
+//
+//    sideMenu.on('shown.metisMenu', function (e) {
+//        fix_height();
+//    });
 
     // Collapse ibox function
     $('.collapse-link').on('click', function (e) {