Merge remote-tracking branch 'origin/main'

fuintAdmin/src/api/allOrder.js

@@ -193,6 +193,17 @@ export function getDataBoard(query) {
   });
 }
 
+
+// 油站首页   数据看板
+export function getDataBoardNew(query) {
+  return request({
+    url: 'business/allOrderInfo/getDataBoardNew',
+    method: 'get',
+    params:query
+  });
+}
+
+
 // 油站首页数据分析
 export function getDataAnalysis(query) {
   return request({

fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue

@@ -165,16 +165,6 @@
           </el-table-column>
           <el-table-column prop="userName" align="center" label="付款用户"></el-table-column>
           <el-table-column prop="payType" align="center" label="支付方式">
-            <template slot-scope="scope">
-              <span v-if="scope.row.payType == 'CASH'">现金</span>
-              <span v-else-if="scope.row.payType == 'WECHAT'">微信</span>
-              <span v-else-if="scope.row.payType == 'ALIPAY'">支付宝</span>
-              <span v-else-if="scope.row.payType == 'UNIONPAY'">银联二维码</span>
-              <span v-else-if="scope.row.payType == 'credit'">挂账</span>
-              <span v-else-if="scope.row.payType == 'oilCard'">囤油卡</span>
-              <span v-else-if="scope.row.payType == 'balance'">储值卡</span>
-              <span v-else>未知</span>
-            </template>
           </el-table-column>
           <el-table-column prop="status" align="center" label="支付状态">
             <template slot-scope="scope">

fuintAdmin/src/views/shopowner.vue

@@ -76,28 +76,28 @@
               <div class="sian"></div>
               <div style="color: #333">油品销售金额（元）/交易笔数</div>
             </div>
-            <div class="num-size">{{ storeAmount.oilAmount || 0 }}/{{ storeAmount.oilNum || 0 }}</div>
+            <div class="num-size">{{ storeAmount.s1 || 0 }}/{{ storeAmount.s2 || 0 }}</div>
           </div>
           <div class="k-box">
             <div class="d-s" style="font-size: 12px;color: #999999;">
               <div class="sian"></div>
               <div style="color: #333">会员充值金额（元）/充值笔数</div>
             </div>
-            <div class="num-size">{{ storeAmount.userRechargeAmount || 0 }}/{{ storeAmount.userRechargeNum || 0 }}</div>
+            <div class="num-size">{{ storeAmount.s5 || 0 }}/{{ storeAmount.s6 || 0 }}</div>
           </div>
           <div class="k-box">
             <div class="d-s" style="font-size: 12px;color: #999999;">
               <div class="sian"></div>
               <div style="color: #333">便利店销售金额（元）/交易笔数</div>
             </div>
-            <div class="num-size">{{ storeAmount.minimartAmount || 0 }}/{{ storeAmount.minimartNum || 0 }}</div>
+            <div class="num-size">{{ storeAmount.s3 || 0 }}/{{ storeAmount.s4 || 0 }}</div>
           </div>
           <div class="k-box">
             <div class="d-s" style="font-size: 12px;color: #999999;">
               <div class="sian"></div>
               <div style="color: #333">积分商城销售金额（元）/兑换笔数</div>
             </div>
-            <div class="num-size">{{ storeAmount.pointMallAmount || 0 }}/{{ storeAmount.pointMallNum || 0 }}</div>
+            <div class="num-size">{{ storeAmount.s7 || 0 }}/{{ storeAmount.s8 || 0 }}</div>
           </div>
         </div>
         <div class="hui-hang"></div>
@@ -262,8 +262,7 @@ import {getBannerListApi} from "@/api/sys/banner";
 import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
 import {employeeSalesApi} from "@/api/indexStatistics";
 import {
-  getDataAnalysis,
-  getDataBoard,
+  getDataBoardNew,
   getDataCount,
   getDataShow,
   getTotalAmount,
@@ -630,6 +629,8 @@ export default
         this.dataAnalysisAllList = res.data
         console.log("饼状图三数据",this.dataAnalysisAllList )
       })
+    //
+    //   this.initChart()
     },
     //油站首页数据展示
     getDataShow() {
@@ -713,11 +714,16 @@ export default
       })
     },
     getStoreAmount() {
-      getDataBoard(this.addDateRange(this.queryParams, this.value1)).then(res => {
+      let data = {
+        startTime: this.value1[0],
+        endTime: this.value1[1]
+      }
+      getDataBoardNew(data).then(res => {
         this.storeAmount = res.data
         this.getDataAnalysis()
         this.initChart()
       })
+
     },
     countPercentage(upNum, downNum) {
       let percentage = 0;
@@ -784,21 +790,16 @@ export default
       let cshow = ['product', ...this.dataShows.oilNames]
       showCount.push(cshow)
       let showCountType = []
-      console.log("看看执行")
       this.dataShows.oilNames.forEach(item => {
         let type = {
           type: 'bar'
         }
         showCountType.push(type)
       })
-      console.log(this.dataShows.oilData)
       this.dataShows.oilData.forEach(item => {
         let a = [item.day, ...item.oilPrices]
         showCount.push(a)
-        console.log("showCount", a)
       })
-      console.log("showCount", showCount)
-      console.log("showCountType", showCountType)
 
       const option = {
         color: [
@@ -922,7 +923,6 @@ export default
         ]
       };
 
-
       const option3 = {
         tooltip: {
           trigger: 'axis',
@@ -1024,13 +1024,15 @@ export default
           containLabel: true
         }
       };
+
       chart.setOption(option)
       chart1.setOption(option1)
       chart2.setOption(option2)
       chart3.setOption(option3)
       chart4.setOption(option4)
 
-    }
+    },
+
 
   }