Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/reports/rpt_component/helper/jpc_helper_common.js

@@ -144,7 +144,19 @@ const JpcCommonHelper = {
     },
     getSegPageIdxByPage: function(page, page_seg_map) {
         let rst = 0;
-        //
+        for (let pIdx = 0; pIdx < page_seg_map.length; pIdx++) {
+            if (page_seg_map[pIdx][0] === page) {
+                const tmpSeg = page_seg_map[pIdx][1];
+                for (let spIdx = pIdx - 1; spIdx >= 0; spIdx--) {
+                    if (page_seg_map[spIdx][1] === tmpSeg) {
+                        rst++;
+                    } else {
+                        break;
+                    }
+                }
+                break;
+            }
+        }
         return rst;
     },
     getStringLinesInArea: function(area, strVal, chnW, otherW) {

app/reports/rpt_component/helper/jpc_helper_discrete.js

@@ -90,6 +90,7 @@ const JpcDiscreteHelper = {
                                                 value = data[0];
                                             }
                                             value = this._getSegPageValue(value, segPageIdx);
+                                            // console.log(value);
                                         }
                                     } else {
                                         if (map_data_field[JV.PROP_AD_HOC_DATA] && map_data_field[JV.PROP_AD_HOC_DATA].length > 0) {