Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station

fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue

@@ -25,17 +25,17 @@
           <div class="heng-box" v-if="radio1 == '积分商城分析'"></div>
           <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
         </div>
-        <div class="nbox" :class="pointerClass" @click="updateRedio('支付方式分析')">
-          <div class="fount-box" :style="{ color: radio1 === '支付方式分析' ? '#FF770F' : '#999999' }">支付方式分析</div>
-          <div class="heng-box" v-if="radio1 == '支付方式分析'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
+<!--        <div class="nbox" :class="pointerClass" @click="updateRedio('支付方式分析')">-->
+<!--          <div class="fount-box" :style="{ color: radio1 === '支付方式分析' ? '#FF770F' : '#999999' }">支付方式分析</div>-->
+<!--          <div class="heng-box" v-if="radio1 == '支付方式分析'"></div>-->
+<!--          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>-->
 
-        </div>
-        <div class="nbox"  :class="pointerClass" @click="updateRedio('支付通道分析')">
-          <div class="fount-box" :style="{ color: radio1 === '支付通道分析' ? '#FF770F' : '#999999' }">支付通道分析</div>
-          <div class="heng-box" v-if="radio1 == '支付通道分析'"></div>
-          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
-        </div>
+<!--        </div>-->
+<!--        <div class="nbox"  :class="pointerClass" @click="updateRedio('支付通道分析')">-->
+<!--          <div class="fount-box" :style="{ color: radio1 === '支付通道分析' ? '#FF770F' : '#999999' }">支付通道分析</div>-->
+<!--          <div class="heng-box" v-if="radio1 == '支付通道分析'"></div>-->
+<!--          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>-->
+<!--        </div>-->
       </div>
     </el-card>
 

fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue

@@ -41,8 +41,8 @@
       </el-form>
       <div class="wrap-box">
         <div class="k_" id="k_1">
-          <div class="size_">累计交易金额（万元）</div>
-          <div class="title_">{{ orderStatistics.paidInfo?(orderStatistics.paidInfo/10000).toFixed(4) : 0 }}</div>
+          <div class="size_">累计交易金额（元）</div>
+          <div class="title_">{{ orderStatistics.paidInfo ||0}}</div>
         </div>
         <div class="k_" id="k_2">
           <div class="size_">累计交易笔数</div>
@@ -65,9 +65,9 @@
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
-          <el-table-column prop="paidInfo" label="累计交易金额 (万元)" width="150" align="center">
+          <el-table-column prop="paidInfo" label="累计交易金额 (元)" width="150" align="center">
             <template>
-              {{this.orderStatistics.paidInfo?(this.orderStatistics.paidInfo/10000).toFixed(6) : 0 }}
+              {{this.orderStatistics.paidInfo}}
             </template>
           </el-table-column>
           <el-table-column prop="count" label="累计交易笔数" width="150" align="center"></el-table-column>

fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue

@@ -1,4 +1,4 @@
-<!-- 收银台订单-->
+<!-- 油品分析 -->
 <template>
   <div style="padding-top: 20px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
     <div class="card-change2-1" shadow="never" >
@@ -43,28 +43,28 @@
       </el-form>
       <div class="wrap-box">
         <div class="k_" id="k_1">
-          <div class="size_">累计交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.amount?(orderStatistics.amount/10000).toFixed(4) : '0'}}</div>
+          <div class="size_">累计交易金额（元）</div>
+          <div class="title_">{{orderStatistics.amount}}</div>
         </div>
         <div class="k_" id="k_2">
           <div class="size_">累计交易升数</div>
           <div class="title_">{{orderStatistics.num || 0}}</div>
         </div>
         <div class="k_" id="k_3">
-          <div class="size_">92#汽油交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.amount92?(orderStatistics.amount92/10000).toFixed(4) : '0'}}</div>
+          <div class="size_">92#汽油交易金额（元）</div>
+          <div class="title_">{{orderStatistics.amount92}}</div>
         </div>
         <div class="k_" id="k_4">
-          <div class="size_">95#汽油交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.amount95?(orderStatistics.amount95/10000).toFixed(4) : '0'}}</div>
+          <div class="size_">95#汽油交易金额（元）</div>
+          <div class="title_">{{orderStatistics.amount95}}</div>
         </div>
         <div class="k_" id="k_5">
-          <div class="size_">98#汽油交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.amount98?(orderStatistics.amount98/10000).toFixed(4) : '0'}}</div>
+          <div class="size_">98#汽油交易金额（元）</div>
+          <div class="title_">{{orderStatistics.amount98}}</div>
         </div>
         <div class="k_" id="k_5">
-          <div class="size_">0#柴油交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.amount0?(orderStatistics.amount0/10000).toFixed(4) : '0'}}</div>
+          <div class="size_">0#柴油交易金额（元）</div>
+          <div class="title_">{{orderStatistics.amount0}}</div>
         </div>
       </div>
           </div>
@@ -78,40 +78,40 @@
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column align="center" prop="storeName" label="机构名称"></el-table-column>
-          <el-table-column align="center" prop="payAmount" label="累计交易金额(万元)"></el-table-column>
+          <el-table-column align="center" prop="payAmount" label="累计交易金额(元)"></el-table-column>
           <el-table-column align="center" prop="sum" label="累计交易笔数"></el-table-column>
           <el-table-column align="center" prop="oilNum" label="累计交易升数"></el-table-column>
           <el-table-column align="center" label="92#汽油">
-            <el-table-column align="center" prop="amount92" label="交易金额(万元)">
+            <el-table-column align="center" prop="amount92" label="交易金额(元)">
               <template slot-scope="scope">
-                {{(scope.row.amount92/10000).toFixed(6)}}
+                {{scope.row.amount92}}
               </template>
             </el-table-column>
             <el-table-column align="center" prop="count92" label="交易笔数"></el-table-column>
             <el-table-column align="center" prop="num92" label="交易升数"></el-table-column>
           </el-table-column>
           <el-table-column align="center" label="95#汽油">
-            <el-table-column align="center" prop="amount95" label="交易金额(万元)">
+            <el-table-column align="center" prop="amount95" label="交易金额(元)">
               <template slot-scope="scope">
-                {{(scope.row.amount95/10000).toFixed(6)}}
+                {{scope.row.amount95}}
               </template>
             </el-table-column>
             <el-table-column align="center" prop="count95" label="交易笔数"></el-table-column>
             <el-table-column prop="num95" label="交易升数"></el-table-column>
           </el-table-column>
           <el-table-column align="center" label="98#汽油">
-            <el-table-column align="center" prop="amount98" label="交易金额(万元)">
+            <el-table-column align="center" prop="amount98" label="交易金额(元)">
               <template slot-scope="scope">
-                {{(scope.row.amount98/10000).toFixed(6)}}
+                {{scope.row.amount98}}
               </template>
             </el-table-column>
             <el-table-column align="center" prop="count98" label="交易笔数" ></el-table-column>
             <el-table-column align="center" prop="num98" label="交易升数" ></el-table-column>
           </el-table-column>
           <el-table-column align="center" label="0#柴油">
-            <el-table-column align="center" prop="amount0" label="交易金额(万元)" >
+            <el-table-column align="center" prop="amount0" label="交易金额(元)" >
               <template slot-scope="scope">
-                {{(scope.row.amount0/10000).toFixed(6)}}
+                {{scope.row.amount0}}
               </template>
             </el-table-column>
             <el-table-column align="center" prop="count0" label="交易笔数" ></el-table-column>
@@ -279,6 +279,16 @@ import {parseTime} from "@/utils/fuint";
         }
         getFenXiOilOrderDataApi(this.addDateRange(this.queryParams, this.value2)).then(res=>{
           this.orderStatistics = res.data
+          if (res.data == null){
+            this.orderStatistics = {
+              amount:'0',
+              num:'0',
+              amount92:'0',
+              amount95:'0',
+              amount98:'0',
+              amount0:'0',
+            }
+          }
           console.log("res.data1111",res.data)
         })
       },

fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue

@@ -42,20 +42,20 @@
       </el-form>
       <div class="wrap-box">
         <div class="k_" id="k_1">
-          <div class="size_">累计交易金额（万元）</div>
-          <div class="title_">{{orderStatistics.payAmount?(orderStatistics.payAmount/10000).toFixed(4) : 0}}</div>
+          <div class="size_">累计交易金额（元）</div>
+          <div class="title_">{{orderStatistics.payAmount || 0}}</div>
         </div>
         <div class="k_" id="k_2">
           <div class="size_">累计交易笔数</div>
-          <div class="title_">{{orderStatistics.count/10000  || 0}}</div>
+          <div class="title_">{{orderStatistics.count  || 0}}</div>
         </div>
         <div class="k_" id="k_3">
           <div class="size_">累计销售商品数量</div>
-          <div class="title_">{{orderStatistics.goodsNum/10000  || 0}}</div>
+          <div class="title_">{{orderStatistics.goodsNum || 0}}</div>
         </div>
         <div class="k_" id="k_4">
           <div class="size_">热销品类数量</div>
-          <div class="title_">{{orderStatistics.cvg/10000  || 0}}</div>
+          <div class="title_">{{orderStatistics.cvg  || 0}}</div>
         </div>
       </div>
       </div>
@@ -66,9 +66,9 @@
             style="width: 100%">
             <el-table-column type="index" width="50" align="center" label="序号"/>
             <el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
-            <el-table-column prop="payAmounts" label="累计交易金额 (万元)"  align="center">
+            <el-table-column prop="payAmounts" label="累计交易金额 (元)"  align="center">
               <template slot-scope="scope">
-                {{(scope.row.payAmounts/10000).toFixed(6)}}
+                {{scope.row.payAmounts}}
               </template>
             </el-table-column>
             <el-table-column prop="counts" label="累计交易笔数"  align="center"></el-table-column>
@@ -76,9 +76,9 @@
             <el-table-column label="商品信息" align="center">
                   <el-table-column prop="cvgNum" label="品类数量" width="100" align="center"></el-table-column>
                   <el-table-column prop="goodsNum" label="商品数量" width="100" align="center"></el-table-column>
-                  <el-table-column prop="payAmounts" label="累计交易金额 (万元)" width="150" align="center">
+                  <el-table-column prop="payAmounts" label="累计交易金额 (元)" width="150" align="center">
                     <template slot-scope="scope">
-                      {{(scope.row.payAmounts/10000).toFixed(6)}}
+                      {{scope.row.payAmounts}}
                     </template>
                   </el-table-column>
 
@@ -254,6 +254,14 @@ import {parseTime} from "@/utils/fuint";
         }
         getFenXiStoreDataApi(this.addDateRange(this.queryParams, this.value2)).then(res=>{
           this.orderStatistics = res.data
+          if (res.data == null){
+            this.orderStatistics = {
+              count:'0',
+              cvg:'0',
+              goodsNum:'0',
+              payAmount:'0',
+            }
+          }
           console.log("res.data1111",res.data)
         })
       },