Merge remote-tracking branch 'origin/dev'

frontend/pc-web/app/view/Interaction/homework/ReleaseController.js

@@ -26,6 +26,7 @@ Ext.define('school.view.interaction.homework.ReleaseController', {
         id = viewModel.data.task_id;
         view.setLoading(true);
         school.util.BaseUtil.request({
+            // url: 'http://10.1.80.180:9520/api/school/homework/publish/' + id,
             url: '/api/school/homework/publish/' + id,
             method: 'POST'
         })

frontend/pc-web/app/view/Interaction/notice/SchoolNotice.js

@@ -59,7 +59,6 @@ Ext.define('school.view.interaction.notice.SchoolNotice', {
                 fieldLabel: '发布时间',
                 readOnly: true,
                 format: 'Y-m-d H:i:s',
-                defaultValue: new Date(),
                 readOnly: true
             }, {
                 xtype: "textfield",

frontend/pc-web/app/view/Interaction/notice/SchoolNoticeController.js

@@ -26,6 +26,7 @@ Ext.define('school.view.interaction.notice.SchoolNoticeController', {
         id = viewModel.data.notify_id;
         view.setLoading(true);
         school.util.BaseUtil.request({
+            // url: 'http://10.1.80.180:9520/api/school/notice/publish/' + id,
             url: '/api/school/notice/publish/' + id,
             method: 'POST'
         })

frontend/pc-web/app/view/basic/student/StudentDetailModel.js

@@ -18,20 +18,13 @@ Ext.define('school.view.basic.student.StudentDetailModel', {
                 
                 var age = 0;
 
-                if(nYear < vYear) {
+                if(nYear > vYear) {
                     age = nYear - vYear;
-                }else {
-                    age = nYear - vYear;
-                    if(nMonth < vMonth) {
+                    if((nMonth < vMonth) || (nMonth == vMonth && nDay < vDay)) {
                         age--;
-                    }else if(nMonth == vMonth){
-                        if(nDay < vDay) {
-                            age--;
-                        }
                     }
                 }
 
-                
                 this.set('stu_age', age);
                 return v;
             }

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

@@ -34,8 +34,8 @@ Ext.define('school.view.viewport.ViewportModel', {
             }],
             proxy: {
                 type: 'ajax',
-                // url: 'http://10.1.80.47:9560/grade/read/1',
-                url: '/api/school/grade/read/' + school.util.BaseUtil.getCurrentUser().school_id,
+                // url: 'http://10.1.80.47:9560/grade/read',
+                url: '/api/school/grade/read',
                 reader: {
                     transform: {
                         fn: function(data) {