样式调整

admin-web/src/views/admin/index.vue

@@ -110,7 +110,7 @@ const state = reactive({
   } as any,
   homeOne: [
     {
-      num1: '125,12',
+      num1: '0',
       num2: '-12.32',
       num3: '今日充电量（kwh）',
       num4: 'fa fa-meetup',
@@ -119,7 +119,7 @@ const state = reactive({
       color3: '--el-color-primary',
     },
     {
-      num1: '653,33',
+      num1: '0',
       num2: '+42.32',
       num3: '今日充电总金额（元）',
       num4: 'iconfont icon-ditu',
@@ -128,7 +128,7 @@ const state = reactive({
       color3: '--el-color-success',
     },
     {
-      num1: '125,65',
+      num1: '0',
       num2: '+17.32',
       num3: '今日总电费（元）',
       num4: 'iconfont icon-zaosheng',
@@ -137,7 +137,7 @@ const state = reactive({
       color3: '--el-color-warning',
     },
     {
-      num1: '520,43',
+      num1: '0',
       num2: '-10.01',
       num3: '今日总服务费（元）',
       num4: 'fa fa-github-alt',
@@ -146,7 +146,7 @@ const state = reactive({
       color3: '--el-color-danger',
     },
     {
-      num1: '520,43',
+      num1: '0',
       num2: '-10.01',
       num3: '今日充电人数',
       num4: 'fa fa-github-alt',
@@ -155,7 +155,7 @@ const state = reactive({
       color3: '--el-color-danger',
     },
     {
-      num1: '520,43',
+      num1: '0',
       num2: '-10.01',
       num3: '今日充电订单数（笔）',
       num4: 'fa fa-github-alt',
@@ -273,7 +273,7 @@ const initLineChart = (dataList:Array<any>) => {
       x: 'left',
       textStyle: {fontSize: '15', color: state.charts.color},
     },
-    grid: {top: 70, right: 40, bottom: 30, left: 30},
+    grid: {top: 70, right: 0, bottom: 30, left: 50},
     tooltip: {trigger: 'axis'},
     legend: {data: ['充电量', /*'总金额','电费',*/'服务费',], right: 0},
     xAxis: {
@@ -283,13 +283,7 @@ const initLineChart = (dataList:Array<any>) => {
     yAxis: [
       {
         type: 'value',
-        name: '费用/元',
-        position:'right',
-        splitLine: {show: true, lineStyle: {type: 'dashed', color: '#f5f5f5'}},
-      },
-      {
-        type: 'value',
-        name: '充电量/度',
+        name: '费用/元 充电量/度',
         position:'left',
         splitLine: {show: true, lineStyle: {type: 'dashed', color: '#f5f5f5'}},
       },
@@ -506,8 +500,8 @@ const loadStationStat = ()=>{
 const loadStationStatToday = ()=>{
   $get(`stat/stationTodayStat`).then((res:any)=>{
     console.log(res)
-    if(!u.isEmptyOrNull(res.list)){
-      let {chargeUsers,totalOrders,totalPower,totalMoney,elecMoney,serviceMoney}  = res.list[0]
+    if(!u.isEmptyOrNull(res)){
+      let {chargeUsers,totalOrders,totalPower,totalMoney,elecMoney,serviceMoney}  = res
       state.homeOne[0].num1 = totalPower;
       state.homeOne[1].num1 = u.fmt.fmtMoney(totalMoney);
       state.homeOne[2].num1 =  u.fmt.fmtMoney(elecMoney);

admin/src/main/java/com/kym/admin/controller/StatController.java

@@ -37,9 +37,9 @@ public class StatController {
      *
      * @return
      */
-    @GetMapping({"/stationTodayStat/{stationId}", "/stationTodayStat"})
-    R stationTodayStat(@PathVariable(required = false) String stationId) {
-        var res = chargeOrderService.stationTodayStat(stationId);
+    @GetMapping( "/stationTodayStat")
+    R stationTodayStat() {
+        var res = chargeOrderService.stationTodayStat();
         return R.success(res);
     }
 }

mapper/src/main/java/com/kym/mapper/miniapp/ChargeOrderMapper.java

@@ -25,5 +25,5 @@ public interface ChargeOrderMapper extends BaseMapper<ChargeOrder> {
 
     List<StationStatVo> stationStat(@Param("params") StatQueryParam params);
 
-    List<Map> stationTodayStat(@Param("stationId") String stationId);
+    Map stationTodayStat(@Param("stationId") String stationId);
 }

mapper/src/main/resources/mappers/miniapp/ChargeOrderMapper.xml

@@ -44,7 +44,7 @@
     </resultMap>
 
     <resultMap id="StationStatMap" type="com.kym.entity.admin.vo.StationStatVo">
-        <result column="station_id" property="stationId"/>
+<!--        <result column="station_id" property="stationId"/>-->
         <result column="start_time" property="startTime"/>
         <result column="total_orders" property="totalOrders"/>
         <result column="total_power" property="totalPower"/>
@@ -146,7 +146,6 @@
 
     <select id="stationTodayStat" resultType="java.util.Map" parameterType="String">
         SELECT
-        t1.station_id stationId,
         COUNT(DISTINCT (t1.user_id)) chargeUsers,
         COUNT(t1.id) totalOrders,
         SUM(t1.total_power) totalPower,
@@ -162,11 +161,8 @@
             <if test="stationId != null">
                 AND station_id = #{stationId}
             </if>
-            AND start_time &gt;= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
-            AND start_time &lt;= DATE_FORMAT(NOW(), '%Y-%m-%d 23:59:59')) t1
+            start_time > '2023-09-15 00:00:00') t1
         </where>
-
-        GROUP BY t1.station_id
     </select>
 
 </mapper>

service/src/main/java/com/kym/service/miniapp/ChargeOrderService.java

@@ -33,5 +33,5 @@ public interface ChargeOrderService extends IService<ChargeOrder> {
 
     PageBean<StationStatVo> stationStat(StatQueryParam params);
 
-    List<Map> stationTodayStat(String stationId);
+    Map stationTodayStat();
 }

service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -97,7 +97,9 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
      * @return
      */
     @Override
-    public List<Map> stationTodayStat(String stationId) {
+    public Map stationTodayStat() {
+        // TODO: 2023-09-18 判断数据权限
+        String stationId = null;
         return baseMapper.stationTodayStat(stationId);
     }