Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

frontend/pc-web/app/view/main/MainController.js

@@ -22,7 +22,7 @@ Ext.define('school.view.main.MainController', {
             10: { opacity: 0 },
             90: { opacity: 1 }
         },
-        newNavIconStyle = navCollapsed ? { marginLeft: 6, fontSize: 28 } : { marginLeft: 22, fontSize: 24 },
+        newNavIconStyle = navCollapsed ? { marginLeft: 6, fontSize: 28 } : { marginLeft: 16, fontSize: 24 },
         newNavTextStyle = navCollapsed ? { opacity: 0 } : { opacity: 1 },
         ope = navCollapsed ? 'addCls' : 'removeCls',
         toggleIconCls = navCollapsed ? 'sa-arrows-right' : 'sa-arrows-left';

frontend/pc-web/app/view/main/Navigation.scss

@@ -50,12 +50,12 @@ $menu-body-background-color: #65678C;
                                     display: flex;
     
                                     .nav-inner-icon {
+                                        display: inline;
+                                        margin-left: 16px;
+                                        margin-right: 16px;
                                         color: $nav-font-color;
                                         font-size: 24px;
                                         text-align: center;
-                                        margin-left: 22px;
-                                        display: inline;
-                                        margin-right: 16px;
     
                                         &:before {
                                             line-height: 60px;

frontend/pc-web/app/view/viewport/ViewportController.js

@@ -62,7 +62,8 @@ Ext.define('school.view.viewport.ViewportController', {
                     schoolStatus: res.data.school_status,
                     schoolSecret: res.data.school_secret,
                 };
-                me.getViewModel().setData(d)
+                me.getViewModel().setData(d);
+                me.getViewModel().get('store_grade').load();
             }
         })
         .catch(function(e) {

frontend/pc-web/app/view/viewport/ViewportModel.js

@@ -27,7 +27,7 @@ Ext.define('school.view.viewport.ViewportModel', {
         },
         store_grade: {
             type: 'tree',
-            autoLoad: true,
+            autoLoad: false,
             // model: 'school.model.Grade',
             fields: [{
                 name: 'text'