Pārlūkot izejas kodu

人材机库debug

zhongzewei 6 gadi atpakaļ
vecāks
revīzija
3f7e43661e

+ 1 - 1
web/maintain/std_glj_lib/html/gongliao.html

@@ -273,7 +273,7 @@
             }
             }
         };
         };
         $(document).ready(function(){
         $(document).ready(function(){
-            console.log(scMathUtil.reRoundTo('268.89472', -2));
+            console.log(scMathUtil.roundTo(268.89472, -2));
             //test
             //test
             console.log(scMathUtil.roundTo(parseFloat(25*1.277), -2));
             console.log(scMathUtil.roundTo(parseFloat(25*1.277), -2));
             console.log(25*1.277);
             console.log(25*1.277);

+ 2 - 2
web/maintain/std_glj_lib/js/glj.js

@@ -226,7 +226,8 @@ let repositoryGljObj = {
             sheetCommonObj.setDynamicCombo(me.workBook.getActiveSheet(), 0, 7, me.workBook.getActiveSheet().getRowCount(), me.materialType.comboItems, false, 'text');
             sheetCommonObj.setDynamicCombo(me.workBook.getActiveSheet(), 0, 7, me.workBook.getActiveSheet().getRowCount(), me.materialType.comboItems, false, 'text');
             sheetCommonObj.setDynamicCombo(me.workBook.getActiveSheet(), 0, 9, me.workBook.getActiveSheet().getRowCount(), me.machineModel.comboItems, false, 'text');
             sheetCommonObj.setDynamicCombo(me.workBook.getActiveSheet(), 0, 9, me.workBook.getActiveSheet().getRowCount(), me.machineModel.comboItems, false, 'text');
             cacheSection = null;
             cacheSection = null;
-            me.initSel(0);
+            let selRow =  me.workBook.getActiveSheet().getSelections()[0].row;
+            me.initSel(selRow);
         }
         }
     },
     },
     bindEnterKey: function () {
     bindEnterKey: function () {
@@ -1141,7 +1142,6 @@ let repositoryGljObj = {
     updateRationBasePrcRq: function (basePrcArr) {
     updateRationBasePrcRq: function (basePrcArr) {
         let me = this;
         let me = this;
         me.prevent = true;
         me.prevent = true;
-        me.workBook.focus(false);
         $.bootstrapLoading.start();
         $.bootstrapLoading.start();
         $.ajax({
         $.ajax({
             type: 'post',
             type: 'post',

+ 3 - 3
web/maintain/std_glj_lib/js/gljComponent.js

@@ -21,7 +21,7 @@ let gljComponentOprObj = {
     buildSheet: function(container) {
     buildSheet: function(container) {
         let me = gljComponentOprObj;
         let me = gljComponentOprObj;
         me.workBook = sheetCommonObj.buildSheet(container, me.setting, 30, me);
         me.workBook = sheetCommonObj.buildSheet(container, me.setting, 30, me);
-        sheetCommonObj.bindEscKey(me.workBook, [{sheet: me.workBook.getSheet(0), editStarting: me.onCellEditStart, editEnded: me.onCellEditEnd}]);
+        //sheetCommonObj.bindEscKey(me.workBook, [{sheet: me.workBook.getSheet(0), editStarting: me.onCellEditStart, editEnded: me.onCellEditEnd}]);
         me.workBook.getSheet(0).setColumnWidth(0, 20, GC.Spread.Sheets.SheetArea.rowHeader);
         me.workBook.getSheet(0).setColumnWidth(0, 20, GC.Spread.Sheets.SheetArea.rowHeader);
         me.workBook.getSheet(0).setFormatter(-1, 0, "@", GC.Spread.Sheets.SheetArea.viewport);
         me.workBook.getSheet(0).setFormatter(-1, 0, "@", GC.Spread.Sheets.SheetArea.viewport);
         sheetCommonObj.cleanSheet(me.workBook.getSheet(0), me.setting, -1);
         sheetCommonObj.cleanSheet(me.workBook.getSheet(0), me.setting, -1);
@@ -362,7 +362,7 @@ let gljComponentOprObj = {
         if(updateArr.length > 0){
         if(updateArr.length > 0){
             me.updateComponent(updateArr);
             me.updateComponent(updateArr);
             if(updateBasePrc.length > 0){
             if(updateBasePrc.length > 0){
-                that.updateRationBasePrcRq(updateBasePrc)
+                that.updateRationBasePrcRq(updateBasePrc);
             }
             }
         }
         }
         let focusInter = setInterval(function () {
         let focusInter = setInterval(function () {
@@ -522,7 +522,6 @@ let gljComponentOprObj = {
                 if(result.data.length > 0){
                 if(result.data.length > 0){
                     if(result.data[0]){
                     if(result.data[0]){
                         that.currentComponent =  that.getCurrentComponent(result.data[0].component);
                         that.currentComponent =  that.getCurrentComponent(result.data[0].component);
-                        me.workBook.getSheet(0).getSelections()[0]
                         sheetCommonObj.cleanData(me.workBook.getSheet(0), me.setting, -1);
                         sheetCommonObj.cleanData(me.workBook.getSheet(0), me.setting, -1);
                         sheetsOprObj.showData(me.workBook.getSheet(0), me.setting, that.currentComponent);
                         sheetsOprObj.showData(me.workBook.getSheet(0), me.setting, that.currentComponent);
                     }
                     }
@@ -540,6 +539,7 @@ let gljComponentOprObj = {
         }
         }
         console.log(`scMathUtil.roundTo(gljBasePrc, -2)`);
         console.log(`scMathUtil.roundTo(gljBasePrc, -2)`);
         console.log(scMathUtil.roundTo(gljBasePrc, -2));
         console.log(scMathUtil.roundTo(gljBasePrc, -2));
+        console.log(scMathUtil.roundTo(gljBasePrc, -3));
         return scMathUtil.roundTo(gljBasePrc, -2);
         return scMathUtil.roundTo(gljBasePrc, -2);
     }
     }
 };
 };