Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js

@@ -140,6 +140,9 @@ var bootstrap = function ($, learun) {
                         type: 'input',
                         inputType: 'number',
                         change: function (row, rownum) {
+                            if (row.OrdinaryScore < 0) {
+                                row.OrdinaryScore = '0';
+                            }
                             row.Score = Math.round(parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100));
                             $('#gridtable').jfGridSet('updateRow', rownum);
                         },
@@ -151,6 +154,9 @@ var bootstrap = function ($, learun) {
                         type: 'input',
                         inputType: 'number',
                         change: function (row, rownum) {
+                            if (row.TermInScore < 0) {
+                                row.TermInScore = '0';
+                            }
                             row.Score = Math.round(parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100));
                             $('#gridtable').jfGridSet('updateRow', rownum);
                         },
@@ -162,6 +168,9 @@ var bootstrap = function ($, learun) {
                         type: 'input',
                         inputType: 'number',
                         change: function (row, rownum) {
+                            if (row.TermEndScore < 0) {
+                                row.TermEndScore = '0';
+                            }
                             row.Score = Math.round(parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100));
                             $('#gridtable').jfGridSet('updateRow', rownum);
                         },
@@ -173,6 +182,9 @@ var bootstrap = function ($, learun) {
                         type: 'input',
                         inputType: 'number',
                         change: function (row, rownum) {
+                            if (row.OtherScore < 0) {
+                                row.OtherScore = '0';
+                            }
                             row.Score = Math.round(parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100));
                             $('#gridtable').jfGridSet('updateRow', rownum);
                         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js

@@ -138,6 +138,9 @@ var bootstrap = function ($, learun) {
                         type: 'input',
                         inputType: 'number',
                         change: function (row, rownum) {
+                            if (row.OrdinaryScore < 0) {
+                                row.OrdinaryScore = '0';
+                            }
                             row.Score = Math.round(parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100));
                             $('#gridtable').jfGridSet('updateRow', rownum);
                         },
@@ -149,6 +152,9 @@ var bootstrap = function ($, learun) {
                         type: 'input',
                         inputType: 'number',
                         change: function (row, rownum) {
+                            if (row.TermInScore < 0) {
+                                row.TermInScore = '0';
+                            }
                             row.Score = Math.round(parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100));
                             $('#gridtable').jfGridSet('updateRow', rownum);
                         },
@@ -160,6 +166,9 @@ var bootstrap = function ($, learun) {
                         type: 'input',
                         inputType: 'number',
                         change: function (row, rownum) {
+                            if (row.TermEndScore < 0) {
+                                row.TermEndScore = '0';
+                            }
                             row.Score = Math.round(parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100));
                             $('#gridtable').jfGridSet('updateRow', rownum);
                         },
@@ -171,6 +180,9 @@ var bootstrap = function ($, learun) {
                         type: 'input',
                         inputType: 'number',
                         change: function (row, rownum) {
+                            if (row.OtherScore < 0) {
+                                row.OtherScore = '0';
+                            }
                             row.Score = Math.round(parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100));
                             $('#gridtable').jfGridSet('updateRow', rownum);
                         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js

@@ -139,6 +139,9 @@ var bootstrap = function ($, learun) {
                         type: 'input',
                         inputType: 'number',
                         change: function (row, rownum) {
+                            if (row.TermEndScore < 0) {
+                                row.TermEndScore = '0';
+                            }
                             row.Score = (parseFloat(row.TermEndScore || '0') * 1).toFixed(0);
                             $('#gridtable').jfGridSet('updateRow', rownum);
                         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js

@@ -139,6 +139,9 @@ var bootstrap = function ($, learun) {
                         type: 'input',
                         inputType: 'number',
                         change: function (row, rownum) {
+                            if (row.TermEndScore < 0) {
+                                row.TermEndScore = '0';
+                            }
                             row.Score = (parseFloat(row.TermEndScore || '0') * 1).toFixed(0);
                             $('#gridtable').jfGridSet('updateRow', rownum);
                         },
@@ -377,7 +380,7 @@ var bootstrap = function ($, learun) {
                     learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/AddMinutes', { queryJson: JSON.stringify(query), minutes: newMinutes }, function (res) { });
                 }
             });
-            
+
             //导入
             $('#lr_importScore').on('click', function () {
                 var query = judgeSelect();