提交

1

src/views/main/baseinfo/management.vue

@@ -60,6 +60,12 @@ export default {
         "FINANCE_AMOUNT",
         "FINANCE_BALANCE_AMOUNT",
         "FINANCE_PAY",
+        "ORGAN_ORGAN_APPLY_AMOUNT",
+        "ORGAN_RENEW_AMOUNT",
+        "ORGAN_ORGAN_VIP_AMOUNT",
+        "ORGAN_PRACTICE_AMOUN",
+        "ORGAN_OTHER_AMOUNT",
+        "ORGAN_TOTAL_AMOUNT",
       ];
       arr.forEach((str) => {
         if (this.data[str]) {
@@ -77,12 +83,6 @@ export default {
         "VIP_AMOUNT",
         "PRACTICE_AMOUNT",
         "OTHER_AMOUNT",
-        "ORGAN_ORGAN_APPLY_AMOUNT",
-        "ORGAN_RENEW_AMOUNT",
-        "ORGAN_ORGAN_VIP_AMOUNT",
-        "ORGAN_PRACTICE_AMOUN",
-        "ORGAN_OTHER_AMOUNT",
-        "ORGAN_TOTAL_AMOUNT",
       ];
       arr.forEach((str) => {
         if (this.data[str]) {
@@ -258,7 +258,7 @@ export default {
           ...getTimes(this.mdate, ["startDate", "endDate"]),
           //
           dataTypes:
-            "FINANCE_AMOUNT,FINANCE_BALANCE_AMOUNT,FINANCE_PAY,TOTAL_AMOUNT",
+            "FINANCE_AMOUNT,FINANCE_BALANCE_AMOUNT,FINANCE_PAY,TOTAL_AMOUNT,ORGAN_FINANCE_AMOUNT",
         });
         for (const item of res.data) {
           // 再循环一遍

src/views/main/baseinfo/modals/manageOrgan.vue

@@ -13,10 +13,11 @@
         height="524px"
         :data-empty="dataEmpty"
         :extend="chartExtend"
-        :legend="legend"
+            :legend="legend"
         :data-zoom="dataZoom"
       />
       <!-- <ve-line
+
       v-else
         :data-zoom="dataZoom"
         :settings="{
@@ -55,7 +56,7 @@ export default {
   computed: {
     legend() {
       return {
-        left: "10px",
+        show:false,
       };
     },
     items() {
@@ -77,9 +78,9 @@ export default {
     items2() {
       let obj = {};
       let arr = [
-        "ORGAN_ORGAN_APPLY_AMOUNT",
+        "ORGAN_APPLY_AMOUNT",
         "ORGAN_RENEW_AMOUNT",
-        "ORGAN_ORGAN_VIP_AMOUNT",
+        "ORGAN_VIP_AMOUNT",
         "ORGAN_PRACTICE_AMOUN",
         "ORGAN_OTHER_AMOUNT",
       ];
@@ -191,6 +192,7 @@ export default {
     chartData() {
       //
       const values = Object.values({ ...this.items, ...this.items2 });
+
       const organ = {};
       const organNameList = [];
       // 计算总的百分比
@@ -212,6 +214,7 @@ export default {
           }
         }
       }
+            console.log(values,'values',organ)
       for (const item of values) {
         for (const row of item.indexMonthData || []) {
           if (item.title == row.title) {