Merge branch 'master' into dev

frontend/src/views/chart/components/table/TableNormal.vue

@@ -311,7 +311,12 @@ export default {
                       ',' +
                       yaxisExtFieldId[0] +
                       subEle[yaxisExtFieldId[0]]
-                    ele[key] = subEle[fieldValueName]
+                    ele[key] = subEle[fieldValueName].toFixed(2)
+                    console.log(1, ele[key])
+                    if (this.fields[findValueIndex].summary === 'ratio') {
+                      ele[key] += '%'
+                      console.log(2, ele[key])
+                    }
                     rowSum += subEle[fieldValueName]
                   }
                 })
@@ -323,6 +328,11 @@ export default {
                   ) {
                     const key = yaxisExtFieldId[0] + subEle[yaxisExtFieldId[0]]
                     ele[key] = subEle[fieldValueName]
+                    ele[key] = subEle[fieldValueName].toFixed(2)
+                    if (this.fields[findValueIndex].summary === 'ratio') {
+                      ele[key] += '%'
+                    }
+
                     rowSum += subEle[fieldValueName]
                   }
                 })
@@ -358,7 +368,11 @@ export default {
                       ',' +
                       yaxisExtFieldId[0] +
                       subEle[yaxisExtFieldId[0]]
-                    ele[key] = subEle[fieldValueName]
+                    ele[key] = subEle[fieldValueName].toFixed(2)
+                    if (this.fields[findValueIndex].summary === 'ratio') {
+                      ele[key] += '%'
+                    }
+
                     rowSum += subEle[fieldValueName]
                   }
                 })
@@ -366,7 +380,11 @@ export default {
                 datas.forEach((subEle) => {
                   if (ele[xaxisFieldId[0]] === subEle[xaxisFieldId[0]]) {
                     const key = yaxisExtFieldId[0] + subEle[yaxisExtFieldId[0]]
-                    ele[key] = subEle[fieldValueName]
+                    ele[key] = subEle[fieldValueName].toFixed(2)
+                    if (this.fields[findValueIndex].summary === 'ratio') {
+                      ele[key] += '%'
+                    }
+
                     rowSum += subEle[fieldValueName]
                     console.log(3, subEle)
                   }