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

frontend/pc-web/app.json

@@ -298,8 +298,8 @@
             "type": "yui"
         },
         "server": {
-            "basePath": "https://school-api.ubtob.com/api/school",
-            "urlPattern": "^\/"
+            "basePath": "https://school-api.ubtob.com",
+            "urlPattern": "^\/api\/"
         }
     },
 
@@ -321,8 +321,8 @@
             "delay": 250
         },
         "server": {
-            "basePath": "https://school-api.ubtob.com/api/school",
-            "urlPattern": "^\/"
+            "basePath": "https://school-api.ubtob.com",
+            "urlPattern": "^\/api\/"
         }
     },
 

frontend/pc-web/app/model/Score.js

@@ -1,5 +1,5 @@
 /**
- * 年级
+ * 成绩
  */
 Ext.define('school.model.Score', {
     extend: 'school.model.Base',

frontend/pc-web/app/model/Session.js

@@ -13,7 +13,8 @@ Ext.define('school.model.Session', {
         login: function(username, password) {
             return new Ext.Promise(function (resolve, reject) {
 				Ext.Ajax.request({
-                    url: '/api/oper_auth/authorize',
+                    // url: 'http://10.1.80.23:9520/api/auth/authorize',
+                    url: '/api/auth/authorize',
                     params: {
                         username: username,
                         password: password
@@ -23,8 +24,7 @@ Ext.define('school.model.Session', {
                         var res = Ext.decode(response.responseText);
                         if (res.success) {
                             var session = school.model.Session.loadData(res.data.token), 
-                                account = res.data.account, companyId = res.data.companyId;
-                            account.companyId = companyId;
+                                account = res.data.account;
                             session.set('account', account);
                             // 服务端与本地存在时间差
                             session.set('span', session.get('timestamp') - new Date().getTime());

frontend/pc-web/app/view/auth/ReLoginController.js

@@ -25,7 +25,6 @@ Ext.define('school.view.auth.ReLoginController', {
         var me = this,
             view = me.getView(),
             viewModel = me.getViewModel(),
-            companyId = school.util.BaseUtil.getCurrentUser().companyId,
             form = me.lookup('reloginform'),
             values = form.getValues();
 
@@ -35,13 +34,11 @@ Ext.define('school.view.auth.ReLoginController', {
 
         view.mask('请稍等...');
 
-        school.model.Session.login(values.username, values.password, companyId)
+        school.model.Session.login(values.username, values.password)
         .then(function (session) {
             view.isMasked() && view.unmask();
             viewModel.set('session', session);
 
-            session.get('account').companyId = companyId;
-            
             me.successReLogin();
             me.fireEvent('login', session);
             return session;

frontend/pc-web/app/view/basic/class/ClassDetail.js

@@ -11,7 +11,7 @@ Ext.define('school.view.basic.class.ClassDetail', {
     _auditmanField: 'pu_auditman',
     _auditdateField: 'pu_auditdate',
     _relationColumn: 'pd_puid',
-    _readUrl: '/class/read',
+    _readUrl: '/api/school/class/read',
     _saveUrl: '/api/purchase/purchase/save',
     _auditUrl: '/api/purchase/purchase/audit',
     _unAuditUrl: '/api/purchase/purchase/unAudit',

frontend/pc-web/app/view/basic/class/ClassInfo.js

@@ -50,7 +50,7 @@ Ext.define('school.view.basic.class.ClassInfo', {
             xtype: 'actioncolumn',
             width: 30,
             items: [{
-                iconCls: 'action-icon x-hidden x-ss ss-deleta',
+                iconCls: 'action-icon x-hidden x-ss ss-delete',
                 tooltip: '删除',
                 handler: 'onTreeDeleteClick'
             }]

frontend/pc-web/app/view/basic/class/ListCard.js

@@ -56,7 +56,7 @@ Ext.define('school.view.basic.class.ListCard', {
             classDetail.setVisible(true);
             classDetail.setLoading(true);
             school.util.BaseUtil.request({
-                url: '/class/read/' + node.data._id
+                url: '/api/school/class/read/' + node.data._id
             }).then(function(res) {
                 classDetail.setLoading(false);
                 if(res.success) {

frontend/pc-web/app/view/basic/school/SchoolInfo.js

@@ -10,7 +10,7 @@ Ext.define('school.view.basic.school.SchoolInfo', {
     // viewModel: 'purchase-purchase-formpanel',
 
     // readUrl: 'http://10.1.80.35:9560/school/read',
-    readUrl: '/school/read',
+    readUrl: '/api/school/school/read',
 
     layout: 'column',
     autoScroll: true,

frontend/pc-web/app/view/basic/staff/StaffDetail.js

@@ -14,7 +14,7 @@ Ext.define('school.view.basic.staff.StaffDetail', {
     _auditmanField: null,
     _auditdateField: null,
     // _readUrl: 'http://10.1.80.35:8560/api/sale/saledown/read',
-    _readUrl: '/api/sale/saledown/read',
+    _readUrl: '/api/school/teacher/read',
     // _saveUrl: 'http://10.1.80.35:8560/api/sale/saledown/update',
     _saveUrl: '/api/sale/saledown/update',
     // _toSaleUrl: 'http://10.1.80.35:8560/api/sale/saledown/toSale',

frontend/pc-web/app/view/basic/staff/StaffList.js

@@ -5,7 +5,7 @@ Ext.define('school.view.basic.staff.StaffList', {
     extend: 'school.view.core.base.BasePanel',
     xtype: 'basic-staff-stafflist',
 
-    dataUrl: '/teacher/list',
+    dataUrl: '/api/school/teacher/list',
     initComponent: function() {
         var me = this;
         Ext.apply(this, {
@@ -68,8 +68,12 @@ Ext.define('school.view.basic.staff.StaffList', {
                     text: '新增'
                 }],
                 columns : [{
+                    text: 'ID',
+                    dataIndex: 'teacher_id',
+                    hidden: true
+                }, {
                     text: '工号',
-                    dataIndex: 'code',
+                    dataIndex: 'teacher_number',
                     width: 150
                 }, {
                     text: '绑定手机号',
@@ -77,23 +81,28 @@ Ext.define('school.view.basic.staff.StaffList', {
                     width: 120
                 }, {
                     text: '姓名',
-                    dataIndex: 'name',
+                    dataIndex: 'teacher_name',
                     width: 120
                 }, {
-                    text: '职位',
-                    dataIndex: 'job',
-                    width: 120
+                    text: '性别',
+                    dataIndex: 'teacher_sex',
+                    renderer: function(v, m, r) {
+                        return v == 1 ? '男' : (v == 0 ? '女' : '未知');
+                    }
+                }, {
+                    text: '工龄',
+                    dataIndex: 'teacher_working_age'
                 }, {
                     text: '是否开通',
                     dataIndex: 'open'
                 }, {
                     text: '状态',
-                    dataIndex: 'status'
+                    dataIndex: 'teacher_status'
                 }],
                 listeners: {
                     itemclick: function(view, record, item, index, e, eOpts) {
-                        school.util.BaseUtil.openTab('basic-staff-staffdetail', '教职工信息', 'basic-staff-staffdetail'+record.get('id'), {
-                            initId: record.get('id')
+                        school.util.BaseUtil.openTab('basic-staff-staffdetail', '教职工信息', 'basic-staff-staffdetail'+record.get('teacher_id'), {
+                            initId: record.get('teacher_id')
                         }); 
                     }
                 }

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

@@ -14,7 +14,7 @@ Ext.define('school.view.basic.student.StudentDetail', {
     _auditmanField: null,
     _auditdateField: null,
     // _readUrl: 'http://10.1.80.35:8560/api/sale/saledown/read',
-    _readUrl: '/student/read',
+    _readUrl: '/api/school/student/read',
     // _saveUrl: 'http://10.1.80.35:8560/api/sale/saledown/update',
     _saveUrl: '/api/sale/saledown/update',
     // _toSaleUrl: 'http://10.1.80.35:8560/api/sale/saledown/toSale',

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

@@ -5,7 +5,7 @@ Ext.define('school.view.basic.student.StudentList', {
     extend: 'school.view.core.base.BasePanel',
     xtype: 'basic-student-studentlist',
 
-    dataUrl: '/student/list',
+    dataUrl: '/api/school/student/list',
     initComponent: function() {
         var me = this;
         Ext.apply(this, {
@@ -84,7 +84,7 @@ Ext.define('school.view.basic.student.StudentList', {
                     width: 150
                 }, {
                     text: '学生姓名',
-                    dataIndex: 'stu_number',
+                    dataIndex: 'stu_name',
                     width: 120
                 }, {
                     text: '性别',

frontend/pc-web/app/view/core/form/FormPanelController.js

@@ -458,9 +458,8 @@ Ext.define('school.view.core.form.FormPanelController', {
                 reportName = data.reportName,
                 title = data.title,
                 userName = data.userName,
-                whereCondition = data.whereCondition,
-                companyId = school.util.BaseUtil.getCurrentUser().companyId;
-                var url = printurl + '?' + 'reportName=' + reportName + '&' + 'companyId=' + companyId + '&whereCondition=' + whereCondition + (userName ? '&userName=' + userName : "");
+                whereCondition = data.whereCondition;
+                var url = printurl + '?' + 'reportName=' + reportName + '&whereCondition=' + whereCondition + (userName ? '&userName=' + userName : "");
     
                 window.open(url);
             }).catch(function(res) {

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

@@ -38,11 +38,17 @@ Ext.define('school.view.viewport.ViewportController', {
     },
 
     showAuth: function() {
+        this.showMain();return;
+        var me = this;
+        this.showView('login');
+    },
+
+    showMain: function() {
         var me = this;
         //读取学校
         school.util.BaseUtil.request({
             // url:'http://10.1.80.35:9560/school/read/1'
-            url:'/school/read/1'
+            url:'/api/school/school/read/1'
         })
         .then(function(res) {
             if(res.success) {
@@ -62,32 +68,6 @@ Ext.define('school.view.viewport.ViewportController', {
         .catch(function(e) {
             console.error(e);
         });
-        this.showView('main');
-    },
-
-    showMain: function() {
-        var me = this;
-        //读取学校
-        school.util.BaseUtil.request({
-            // url:'http://10.1.80.35:9560/school/read/1'
-            url:'/api/school/read/1'
-        })
-        .then(function(res) {
-            if(res.success) {
-                debugger
-                // var list = res.data.list;
-                // if(list.length>0){
-                //     var d = {};
-                //     Ext.each(list, function(item, index){
-                //         d[item.code] = item.data;
-                //     });
-                //     me.getViewModel().setData(d)
-                // }
-            }
-        })
-        .catch(function(e) {
-            console.error(e);
-        });
         me.showView('main');
     },
 

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

@@ -7,12 +7,6 @@ Ext.define('school.view.viewport.ViewportModel', {
     },
 
     formulas: {
-        company: function (get) {
-            var account = get('account');
-            return account && account.companies.find(function (c) {
-                return c.id == account.companyId;
-            });
-        },
         avatarUrl: function (get) {
             var account = get('account');
             return (account && account.avatarUrl) || 'resources/images/default/user-icon.png'
@@ -41,7 +35,7 @@ Ext.define('school.view.viewport.ViewportModel', {
             proxy: {
                 type: 'ajax',
                 // url: 'http://10.1.80.35:9520/grade/read/1',
-                url: '/grade/read/1',
+                url: '/api/school/grade/read/1',
                 reader: {
                     transform: {
                         fn: function(data) {