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

app/reports/rpt_component/helper/jpc_helper_discrete.js

@@ -89,6 +89,9 @@ const JpcDiscreteHelper = {
                                 item[JV.PROP_AREA] = JpcAreaHelper.outputArea(df[JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, multiCols, multiColIdx, false, false);
                                 if (isPic && item[JV.PROP_VALUE] !== undefined && item[JV.PROP_VALUE] !== null && item[JV.PROP_VALUE] !== '') {
                                     if (Array.isArray(signatureRst)) {
+                                        if (item[JV.PROP_VALUE][0] !== '/') {
+                                            item[JV.PROP_VALUE] = '/' + item[JV.PROP_VALUE];
+                                        }
                                         const signatureItem = { signature_name: JV.SIGNATURE_NAME_DUMMY, path: null, pic: item[JV.PROP_VALUE] }; // 这里的pic数据在指标中里已经处理过了
                                         signatureItem[JV.PROP_CONTROL] = item[[JV.PROP_CONTROL]];
                                         signatureItem[JV.PROP_STYLE] = item[[JV.PROP_STYLE]];

app/reports/rpt_component/jpc_field.js

@@ -65,6 +65,9 @@ const JpcField = {
                     item.flexiblePrecisionRefObj = fieldNode.flexiblePrecisionRefObj;
                 }
             }
+            if (fieldNode.hasOwnProperty('isPic')) {
+                item.isPic = fieldNode.isPic;
+            }
             item.DataNodeName = dataNodeName;
             item.DataSeq = sequence;
             parentObj[JV.PROP_ID + '_' + fieldNode[JV.PROP_ID]] = item;