Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

fuintAdmin/src/views/order/order_Vip.vue

@@ -550,12 +550,10 @@ export default {
 .size-hui{
   display: flex;
   align-items: center;
-  //width: 200px;
   font-family: Source Han Sans CN, Source Han Sans CN;
   font-weight: 400;
   font-size: 13px;
   color: #888888;
-  //line-height: 0px;
   text-align: left;
   font-style: normal;
   text-transform: none;
@@ -564,15 +562,12 @@ export default {
   }
 }
 .size-bole{
-  //font-weight: bold;
 
-  //width: 53px;
+  height:31px;
-  height: 31px;
   font-family: YouSheBiaoTiHei;
   font-weight: 400;
   font-size: 24px;
   color: #555555;
-  //line-height: 0px;
   text-align: left;
   font-style: normal;
   text-transform: none;

fuintAdmin_zt/src/views/Site/add.vue

@@ -282,12 +282,13 @@ export default {
         }else {
           this.checked = false
         }
+        console.log(this.ruleForm.checkedKeys,22,this.ruleForm.roleCode)
         return;
       }
       let ids = []
       let show = false;
+      if (!row.show) show = true
       this.tableData.forEach(item => {
-        if (!row.show) show = true
         item.list.forEach(item1 => {
           if (item1.id == row.id) {
             ids.push(item1.id)
@@ -334,6 +335,7 @@ export default {
       }else {
         this.checked = false
       }
+      console.log(this.ruleForm.checkedKeys,11,uniqueArr,show)
     }
   }
 }

fuintAdmin_zt/src/views/index.vue

@@ -59,9 +59,9 @@
             <el-select v-model="value" clearable placeholder="请选择">
               <el-option
                 v-for="item in options"
-                :key="item.value"
+                :key="item.deptId"
-                :label="item.label"
+                :label="item.deptName"
-                :value="item.value">
+                :value="item.deptId">
               </el-option>
             </el-select>
           </div>
@@ -72,35 +72,35 @@
               <div class="sian"></div>
               <div>活跃油站数</div>
             </div>
-            <div class="num-size">868</div>
+            <div class="num-size">{{ storeAmount.storeTotal || 0 }}</div>
           </div>
           <div class="k-box">
             <div class="d-s" style="font-size: 12px;color: #999999;">
               <div class="sian"></div>
               <div>交易金额(万元)/交易笔数</div>
             </div>
-            <div class="num-size">1080.50</div>
+            <div class="num-size">{{ storeAmount.tradeAmount || 0 }}/{{ storeAmount.tradeTotal || 0 }}</div>
           </div>
           <div class="k-box">
             <div class="d-s" style="font-size: 12px;color: #999999;">
               <div class="sian"></div>
               <div>退款金额(元)/退款笔数</div>
             </div>
-            <div class="num-size">1868.20</div>
+            <div class="num-size">{{ storeAmount.refundAmount || 0 }}/{{ storeAmount.refundTotal || 0 }}</div>
           </div>
           <div class="k-box">
             <div class="d-s" style="font-size: 12px;color: #999999;">
               <div class="sian"></div>
               <div>笔均单价(元)</div>
             </div>
-            <div class="num-size">508.00</div>
+            <div class="num-size">{{ storeAmount.averagePrice || 0 }}</div>
           </div>
           <div class="k-box">
             <div class="d-s" style="font-size: 12px;color: #999999;">
               <div class="sian"></div>
               <div>日均交易额(万元)/日均交易笔数</div>
             </div>
-            <div class="num-size">5208.60 / 90</div>
+            <div class="num-size">{{ storeAmount.dayTradeAmount || 0 }}/{{ storeAmount.dayTradeTotal || 0 }}</div>
           </div>
         </div>
         <div class="hui-hang"></div>
@@ -153,6 +153,7 @@
 <script>
 import echarts from "echarts";
 import {storeAmountIndex, storeTotalIndex} from "@/api/indexBanner";
+import {selectChildByDeptId} from "@/api/system/Site/site";
 export default {
 
   data(){
@@ -184,6 +185,7 @@ export default {
       value: '',
       value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
       imagePath: process.env.VUE_APP_SERVER_URL,
+      queryParams:{},
       // 店铺数量
       storeTotal:{},
       // 店铺金额
@@ -192,20 +194,27 @@ export default {
   },
   created() {
     this.getStoreTotal()
+    this.selectChildByDeptIdApi()
     this.getStoreAmount()
   },
   mounted() {
     this.initChart()
   },
   methods:{
+    // 查询
+    selectChildByDeptIdApi() {
+      selectChildByDeptId().then(res => {
+        this.options = res.data
+      })
+    },
     getStoreTotal(){
       storeTotalIndex().then(res => {
         this.storeTotal = res.data
       })
     },
     getStoreAmount(){
-      storeAmountIndex().then(res => {
+      storeAmountIndex(this.addDateRange(this.queryParams,this.value1)).then(res => {
-        console.log(res)
+        this.storeAmount = res.data
       })
     },
     initChart() {
@@ -459,6 +468,7 @@ export default {
   margin-top: 20px;
 }
 .left-box{
+  width: 73%;
   background: #FFFFFF;
   border-radius: 10px 10px 10px 10px;
   border: 1px solid #FFFFFF;
@@ -470,6 +480,7 @@ export default {
   padding: 15px;
 }
 .left-box-t{
+  width: 73%;
   box-sizing: border-box;
   padding: 15px;
   border-radius: 8px;
@@ -479,7 +490,7 @@ export default {
 
 }
 .right-box{
-  width: 435px;
+  width: 25%;
   border-radius: 8px;
   background: #fff;
   border: 1px solid #FFFFFF;
@@ -488,7 +499,7 @@ export default {
   padding: 15px;
 }
 .right-box-t{
-  width: 435px;
+  width: 25%;
   border-radius: 8px;
   background: #fff;
   border: 1px solid #FFFFFF;
@@ -537,7 +548,6 @@ export default {
   font-size: 14px;
   color: #777777;
   margin: 14px auto;
-  overflow: auto;
 }
 .h-tt{
   font-size: 16px;

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java

@@ -1026,13 +1026,17 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
             map1.put("endTime", allOrderInfoVo.getParams().get("endTime").toString());
         }
         Integer storeTotal = selectStoreTotal(map1);
+        DecimalFormat df = new DecimalFormat("#.00"); // 格式化字符串，表示两位小数
+
+        // 设置格式化器
+        df.setRoundingMode(RoundingMode.HALF_UP); // 可选，设置四舍五入模式
 
         map.put("tradeTotal",tradeTotal);
-        map.put("tradeAmount",tradeAmount);
+        map.put("tradeAmount",tradeAmount > 0 ? df.format(tradeAmount) : 0);
         map.put("refundTotal",refundTotal);
-        map.put("refundAmount",refundAmount);
+        map.put("refundAmount",refundAmount > 0 ? df.format(refundAmount) : 0);
-        map.put("averagePrice",averagePrice);
+        map.put("averagePrice",averagePrice > 0 ? df.format(averagePrice) : 0);
-        map.put("dayTradeAmount",dayTradeAmount);
+        map.put("dayTradeAmount",dayTradeAmount > 0 ? df.format(dayTradeAmount) : 0);
         map.put("dayTradeTotal",dayTradeTotal);
         map.put("storeTotal",storeTotal);
         return map;

fuintCashierWeb/src/views/cashier/NewComponents/credit.vue

@@ -1,3 +1,4 @@
+
 <template>
   <div class="app-center">
 <!--    查询-->

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -4714,8 +4714,9 @@
   }
   .of-title{
     font-weight: bold;
-    font-size: 22px;
+    font-size: 26px;
     text-align: center;
+    font-family: YouSheBiaoTiHei;
     margin: 13px;
   }
   .data-top{