提交一下 错误

1

src/views/businessManager/shopManager/shopOperation.vue

@@ -775,7 +775,7 @@ export default {
             // if (result.organIdList) {
             //   organIdList = result.organIdList.split(",");
             // }
-                let studentShowOrganId = [];
+               let studentShowOrganId = [];
             if (result.studentShowOrganId) {
               studentShowOrganId = result.studentShowOrganId.split(",");
             }

src/views/main/baseinfo/index.vue

@@ -58,7 +58,7 @@
       <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
         <useCourse :data="dataInfo" />
       </el-col> -->
-      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
+      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
         <management
           ref="management"
           :data="dataInfo"
@@ -66,7 +66,7 @@
           @resetDate="resetDate"
         />
       </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
+      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
         <business
           ref="business"
           :data="dataInfo"

src/views/main/baseinfo/management.vue

@@ -14,7 +14,7 @@
       style="height: 68px"
       v-if="JSON.stringify(items) == '{}'"
     ></div>
-    <statistic :col="5" class="statistic" :cols="0">
+    <statistic :col="10" class="statistic" :cols="0">
       <statistic-item
         v-for="(item, key) in items"
         :key="key"
@@ -22,7 +22,7 @@
         @click="active = key"
       >
         <span>
-          {{ item.title+"(元)" }}
+          {{ item.title + "(元)" }}
           <el-tooltip
             v-if="item.desc"
             :content="item.desc"
@@ -48,13 +48,13 @@
           <el-radio-button label="month">按月</el-radio-button>
         </el-radio-group>
       </div>
-      <!--   v-if="timer == 'day'"    DD-->
+      <!--   v-if="timer == 'day'"     :settings="chartSettings"   DD-->
       <ve-histogram
         :data="timer == 'day' ? chartData : chartDataForMoth"
         height="350px"
         :data-empty="dataEmpty"
         :extend="chartExtend"
-        :settings="chartSettings"
+
         :legend="legend"
       />
       <!-- <ve-line
@@ -103,7 +103,12 @@ export default {
         "TOTAL_AMOUNT",
         "FINANCE_AMOUNT",
         "FINANCE_BALANCE_AMOUNT",
-        "FINANCE_PAY"
+        "FINANCE_PAY",
+        "APPLY_AMOUNT",
+        "PRACTICE_AMOUNT",
+        "OTHER_AMOUNT",
+        "RENEW_AMOUNT",
+        "VIP_AMOUNT",
       ];
       arr.forEach((str) => {
         if (this.data[str]) {
@@ -137,19 +142,23 @@ export default {
             formatter: "{value}元",
           },
         },
-        tooltip: {
-          formatter: (item) => {
-            return [
+        /**          return [
               item[0].axisValueLabel,
               `<br/><span style="margin-right:5px;border-radius:10px;width:10px;height:10px;display:inline-block;"></span>总收入:${this.$helpers
                 .numeral(item[0].value + item[1].value)
                 .format("0,0.00")}元`,
               ...item.map((d) => {
-                return `<br/>${d.marker}${
-                  d.seriesName
-                }: ${this.$helpers.numeral(d.value).format("0,0.00")}元`;
+                return `<br/>${d.marker}${d.seriesName}: ${this.$helpers
+                  .numeral(d.value)
+                  .format("0,0.00")}元`;
               }),
-            ].join("");
+            ].join("");  */
+        tooltip: {
+          axisPointer: {
+            type: "shadow",
+            shadowStyle: {
+              color: "rgba(150,150,150,0.2)",
+            },
           },
         },
       };
@@ -180,7 +189,18 @@ export default {
       }
       // console.log(values);
       return {
-        columns: ["日期", "现金收入", "余额收入", "财务支出"],
+        columns: [
+          "日期",
+          "总收入",
+          "现金收入",
+          "余额收入",
+          "财务支出",
+          "报名缴费收入",
+          "网管课收入",
+          "其他收入",
+          "乐团续费收入",
+          "VIP课收入",
+        ],
         rows: Object.values(months),
         loading: true,
       };
@@ -207,7 +227,15 @@ export default {
         }
       }
       return {
-        columns: ["月份", "现金收入", "余额收入", "财务支出"],
+        columns: ["月份",  "总收入",
+          "现金收入",
+          "余额收入",
+          "财务支出",
+          "报名缴费收入",
+          "网管课收入",
+          "其他收入",
+          "乐团续费收入",
+          "VIP课收入",],
         rows: Object.values(months),
         loading: true,
       };
@@ -217,9 +245,9 @@ export default {
     },
   },
   data() {
-    this.chartSettings = {
-      stack: { 总收入: [`现金收入`, `余额收入`] },
-    };
+    // this.chartSettings = {
+    //   stack: { 总收入: [`现金收入`, `余额收入`] },
+    // };
     return {
       active: "SHOULD_INCOME_MONEY",
       timer: "day",