bihuisong 1 год назад
Родитель
Сommit
55f92d4b83

+ 4 - 4
songhua-admin/src/main/java/com/songhua/web/controller/park/ParkingLotController.java

@@ -1,5 +1,6 @@
 package com.songhua.web.controller.park;
 
+import com.songhua.common.core.domain.AjaxResult;
 import com.songhua.common.utils.SignatureUtil;
 import com.songhua.system.domain.dto.ParkData;
 import com.songhua.system.service.IParkDataService;
@@ -13,7 +14,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
+import static com.songhua.common.core.domain.AjaxResult.success;
 
 
 @Slf4j
@@ -90,8 +91,7 @@ public class ParkingLotController {
 
 
     @GetMapping("/selectParkData")
-    public List<ParkData> selectParkData(ParkData parkData) {
-        List<ParkData> list = parkDataService.selectParkData(parkData);
-        return list;
+    public AjaxResult selectParkData(ParkData parkData) {
+        return success(parkDataService.selectParkData(parkData));
     }
 }

+ 14 - 31
songhua-ui/src/views/index1/index.vue

@@ -4,33 +4,14 @@
       <h1 class="header_title">松花湖景区通</h1>
       <span class="time">{{ currentTime }}</span>
     </div>
-    <div class="shh_part" v-for="item in parkingLots" :key="item.id" >
-      <div class="shh_part_div">
-        <img src="@/assets/images/shh_part1.png"/>
-        <div class="parking-lot">
-          <h1>{{ getParkingLotName(item.parkId) }}</h1>
-          <p>总车位数:{{ item.allSpaceNumber }}</p>
-          <p>当日营收:{{ item.totalOutMoney }}</p>
-          <p>当月营收:{{ item.totalPreMoney }}</p>
-        </div>
-      </div>
-
-      <div class="shh_part_div">
-        <img src="@/assets/images/shh_part4.png"/>
-        <div class="shh_txt">
-          <h1>四号松花湖停车场</h1>
-          <p>总车位数:100</p>
-          <p>当日营收:100</p>
-          <p>当月营收:100</p>
-        </div>
-      </div>
-      <div class="shh_part_div">
-        <img src="@/assets/images/shh_part5.png"/>
+    <div id="parkCar" class="shh_part">
+      <div class="shh_part_div"  v-for="(item,index) in parkingLots" :key="index">
+        <img :src="getImgUrl(index + 1)"/>
         <div class="shh_txt">
-          <h1>五号松花湖停车场</h1>
-          <p>总车位数:100</p>
-          <p>当日营收:100</p>
-          <p>当月营收:100</p>
+          <h1>{{getParkingLotName(item.parkId)}}</h1>
+          <p>总车位数:{{ item.allSpaceNumber }}</p >
+          <p>当日营收:{{ item.totalOutMoney }}</p >
+          <p>当月营收:{{ item.totalPreMoney }}</p >
         </div>
       </div>
     </div>
@@ -95,9 +76,11 @@ export default {
     },
     fetchParkingLots() {
       getParkData().then(response => {
-          this.parkingLots = response.data;
-          console.log(response)
-        })
+        this.parkingLots = response.data;
+      })
+    },
+    getImgUrl (index) {
+      return require("@/assets/images/shh_part" + index + ".png");
     },
     getParkingLotName(parkId) {
       // 在这里根据 parkId 返回停车场名称
@@ -121,7 +104,7 @@ export default {
           let ul;
           let dataList = that.dataSource
           that.map = new BMap.Map('map'); // 创建Map实例
-          that.map.centerAndZoom(new BMap.Point(126.85912,43.671033), 13); // 初始化地图,设置中心点坐标和地图级别
+          that.map.centerAndZoom(new BMap.Point(126.85912, 43.671033), 13); // 初始化地图,设置中心点坐标和地图级别
           that.map.enableScrollWheelZoom(true);
           let mapStyle = {
             style: 'midnight',
@@ -134,7 +117,7 @@ export default {
             }
             // 创建小船图标
             var myIcon = new BMap.Icon(require("@/assets/images/ship.png"), new BMap.Size(52, 26));
-            var  marker = new BMap.Marker(new BMap.Point(dataList[i].polylinePath[0].lng, dataList[i].polylinePath[0].lat), {icon: myIcon}); // 创建点
+            var marker = new BMap.Marker(new BMap.Point(dataList[i].polylinePath[0].lng, dataList[i].polylinePath[0].lat), {icon: myIcon}); // 创建点
             var opts = {
               width: 100,     // 信息窗口宽度
               height: 80,     // 信息窗口高度