Merge branch 'ld_databoard_fix' into 230829_wlh_fix

# Conflicts:
#	src/module/api/apiList.js
#	src/module/databoard/index.vue

src/module/databoard/components/chart/ar-company-bar.vue

@@ -114,7 +114,7 @@ export default {
   mounted() {
     // 获取图表数据
     arCompanyBar().then(res => {
-      let data = res.data.data
+      let data = res.data
       let xAxisData = []
       let seriesData = []
       for (let item of data) {

src/module/databoard/components/chart/ar-company-monthly-bar.vue

@@ -121,7 +121,7 @@ export default {
     // 获取图表数据
 
     arCompanyMonthlyBar(company).then(res => {
-      let data = res.data.data
+      let data = res.data
       let xAxisData = []
       let seriesData0 = []
       let seriesData1 = []

src/module/databoard/components/chart/ar-monthly-bar.vue

@@ -109,7 +109,7 @@ export default {
   mounted() {
     // 获取图表数据
     arMonthlyBar().then(res => {
-      let data = res.data.data
+      let data = res.data
       let xAxisData = []
       let seriesData = []
       for (let item of data) {

src/module/databoard/components/chart/ar-monthly-company-bar.vue

@@ -106,7 +106,7 @@ export default {
     this.barChart.title.text = month + " 已开票未收款（结算单位）"
     // 获取图表数据
     arMonthlyCompanyBar(month).then(res => {
-      let data = res.data.data
+      let data = res.data
       let xAxisData = []
       let seriesData = []
       for (let item of data) {

src/module/databoard/index.vue

@@ -152,6 +152,7 @@ import TableColumn from "./components/table/table-column.vue";
 import RingPieChart from "./components/chart/ring-pie-chart.vue";
 import {calc_hb_str, calc_tb_str, conver_amont} from "../util/util";
 import {arSummaryBar, arCompanyList,getBusinessConditionDatas} from "../api/apiList"
+import {calc_hb_str, calc_tb_str, conver_amont} from "../utils/numUtil";
 // import {refreshData} from "./databoard/js/api";
 
 export default {
@@ -408,7 +409,7 @@ export default {
   methods: {
     cellStyleFunction(data) {
       let res = {color: '#33ff66'};
-      console.log(data+":"+data.indexOf('+'))
+      console.log(data + ":" + data.indexOf('+'))
       if (data.indexOf('-') !== -1) {
         res.color = '#ff3300'
       }