图表修改

src/components/pages/PaymentManagement/SystemReconciliation.vue

@@ -9,18 +9,17 @@
       </a-select>
       <a-button type="primary" @click="init">查询</a-button>
     </div>
-    <div class="title">账单汇总</div>
-    <div style="width: 100%;">
+    <div style="width: 100%;border: 1px solid #dddddd;margin-bottom: 20px">
       <div id="rechargeLine" :style="{width: '100%', height: '300px'}"></div>
     </div>
-    <div style="width: 100%;scroll;position: relative;">
+    <div style="width: 100%;scroll;position: relative;border: 1px solid #dddddd;margin-bottom: 20px">
       <div id="subsidyList" :style="{width: '100%', height: '300px'}"></div>
       <a-select placeholder="津贴类型" v-model="sceneType" style="width: 120px;position: absolute;right: 10%;top: 0;" @change="changeSceneType">
         <a-select-option value="MEAL">餐补</a-select-option>
         <a-select-option value="TRAVEL">交通补贴</a-select-option>
       </a-select>
     </div>
-    <div style="width: 100%;overflow-x:scroll">
+    <div style="width: 100%;overflow-x:scroll;border: 1px solid #dddddd;margin-bottom: 20px">
       <div id="consumeLine" :style="{width: '100%', height: '300px'}"></div>
     </div>
   </div>
@@ -79,7 +78,7 @@ export default {
       this.SubsidyListDataList.map(item => {
         xAxisData.push(parseInt(item.abscissaKey))
         data.push(item.subsidyTotalAmount ? item.subsidyTotalAmount : 0)
-        dataAmount = dataAmount + item.subsidyTotalAmount
+        dataAmount = (dataAmount * 100 + item.subsidyTotalAmount * 100) / 100
       })
       let unit = this.month === undefined ? '月' : '日'
       let color = this.sceneType === 'MEAL' ? ['#3F9EFE'] : [`#FF4A7A`]
@@ -146,14 +145,20 @@ export default {
       this.RechargeDataList.map(item => {
         xAxisData.push(parseInt(item.abscissaKey))
         data1.push(item.externalRechargeAmount ? item.externalRechargeAmount : 0)
-        data1Amount += item.externalRechargeAmount
+        data1Amount =  (data1Amount * 100 + item.externalRechargeAmount * 100) / 100
         data2.push(item.internalRechargeAmount ? item.internalRechargeAmount : 0)
-        data2Amount += item.internalRechargeAmount
+        data2Amount = (item.internalRechargeAmount * 100 + data2Amount * 100) /100
       })
       let unit = this.month === undefined ? '月' : '日'
       myChart.setOption({
         color: ['#3F9EFE', '#FF4A7A'],
-        title: { text: '充值金额' },
+        title: {
+          text: '充值金额',
+          textStyle: {
+            fontSize: 14,
+            fontWeight: 'normal'
+          }
+        },
         legend: {
           data: ['支付宝充值', '现金充值'],
           formatter: function (name) {
@@ -227,15 +232,21 @@ export default {
       this.ConsumeDataList.map(item => {
         xAxisData.push(parseInt(item.abscissaKey))
         data1.push(item.internalConsumeRealityAmount ? item.internalConsumeRealityAmount : 0.00)
-        data1Amount = data1Amount + item.internalConsumeRealityAmount
+        data1Amount = (data1Amount * 100 + item.internalConsumeRealityAmount * 100) / 100
         data2.push(item.internalConsumeSubsidyAmount ? item.internalConsumeSubsidyAmount : 0.00)
-        data2Amount = data1Amount + item.internalConsumeSubsidyAmount
+        data2Amount = (data2Amount * 100 + item.internalConsumeSubsidyAmount * 100) / 100
         data3.push(item.externalConsumeRealityAmount ? item.externalConsumeRealityAmount : 0.00)
-        data3Amount = data1Amount + item.externalConsumeRealityAmount
+        data3Amount = (data3Amount * 100 + item.externalConsumeRealityAmount * 100) / 100
       })
       myChart.setOption({
         color: ['#B87EE5', '#0066CC', '#EB597B'],
-        title: { text: '消费金额' },
+        title: {
+          text: '消费金额',
+          textStyle: {
+            fontSize: 14,
+            fontWeight: 'normal'
+          }
+        },
         legend: {
           data: [`员工现金消费`, `员工津贴消费`, `访客消费`],
           formatter: function (name) {