8/10 车位信息-车辆信息，

.env.development

@@ -9,9 +9,9 @@ VITE_APP_ENV='development'
 # 开发环境
 VITE_APP_BASE_API='/dev-api'
 # # 开发环境  接口代理地址
-#VITE_APP_PROXY_API='http://192.168.1.222:8080'
+VITE_APP_PROXY_API='http://192.168.1.222:8080'
 # 开发环境  接口代理地址
-VITE_APP_PROXY_API='http://192.168.1.6:8080'
+#VITE_APP_PROXY_API='http://192.168.1.6:8080'
 # 图片基础地址
 VITE_IMG_URL='http://192.168.1.222:8080'
 

src/views/system/Repair/repairMain.vue

@@ -77,8 +77,8 @@
                           :min-scale="0.2"
                           :preview-src-list="form.problemImageUrlList"
                           show-progress
-                          :initial-index="0"
                           v-for="(item, index) in form.problemImageUrlList"
+                          :initial-index="index"
                           :key="index"
                           :src="item"
                           lazy

src/views/system/Sdb/statistics/index.vue

@@ -10,15 +10,14 @@
                 clearable
                 v-model="SearchTime"
                 @change="
-                  (val) => {
+                  (val: string[]) => {
                     if (!val) {
                       queryParams.startDate = '';
                       queryParams.endDate = '';
                       return;
                     }
                     SearchTime = val;
-                    const days = val;
+                    const [star, end] = val.map((item) => item.split(' ')[0]);
-                    const [star, end] = days.map((item) => item.split(' ')[0]);
                     queryParams.startDate = star + ' 00:00:00';
                     queryParams.endDate = end + ' 23:59:59';
                   }
@@ -38,7 +37,7 @@
           <el-button @click="handleExport" v-has-permi="['water:topupRecord:export']" type="warning">导出统计</el-button>
         </div>
       </template>
-      <el-table v-loading="loading" border :data="topupRecordList">
+      <el-table :span-method="handleSpanMethod" v-loading="loading" border :data="topupRecordList">
         <el-table-column label="充值时间" align="center" prop="rechargeTime">
           <template #default="scope">
             <span v-if="scope.row.rechargeTime">{{ scope.row.rechargeTime }}</span>
@@ -92,12 +91,31 @@
 </template>
 
 <script setup lang="ts">
-import { getTopupRecordByDate, type TopupRecordList } from '@/api/system/SdbTopupRecord/index';
+import { getTopupRecordByDate, type TopupRecordList } from '@/api/system/SdbTopupRecord';
 import { checkPermi } from '@/utils/permission';
 import { sum } from '@/utils/money';
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const topupRecordList = ref<TopupRecordList[]>([]);
+function handleSpanMethod({ rowIndex, columnIndex }) {
+  if (rowIndex === topupRecordList.value.length - 1) {
+    const rowspan = 7;
+    if (columnIndex === 0) {
+      return [1, rowspan];
+    }
+    if (columnIndex < rowspan) {
+      return [0, 0];
+    }
+    if (columnIndex === 8) {
+      return [0, 0];
+    }
+    if (columnIndex === 7) {
+      return [1, 2];
+    }
+  }
+  return [1, 1];
+}
 const loading = ref(false);
 const total = ref(0);
 
@@ -121,9 +139,18 @@ const getList = async () => {
   loading.value = true;
   const res = await getTopupRecordByDate(queryParams.value);
   topupRecordList.value = res.rows;
+  topupRecordList.value[topupRecordList.value.length - 1].rechargeTime = '合计';
   total.value = res.total;
   loading.value = false;
-  totalMoney.value = sum(topupRecordList.value.map((item) => item.rechargeAmount));
+  totalMoney.value = sum(
+    topupRecordList.value.map((item) => {
+      if (item.id) {
+        return item.rechargeAmount;
+      } else {
+        return 0;
+      }
+    })
+  );
 };
 
 onMounted(() => {

src/views/system/inspection/Record/RecordMain.vue

@@ -263,7 +263,7 @@ const cancelForm = () => {
     display: flex;
     align-items: center;
     .label {
-      width: 100px;
+      width: 120px;
       text-align: right;
       margin-right: 10px;
     }

src/views/system/parking/parkMain.vue

@@ -83,19 +83,19 @@
                   <el-col :span="8">
                     <div class="carInfo_item">
                       <div class="label">车牌号：</div>
-                      <div class="main">浙B·N6688</div>
+                      <div class="main">{{ parkingReviewInfo.car.carNum }}</div>
                     </div>
                   </el-col>
                   <el-col :span="8">
                     <div class="carInfo_item">
                       <div class="label">车辆品牌：</div>
-                      <div class="main">宝马</div>
+                      <div class="main">{{ parkingReviewInfo.car.carBrand }}</div>
                     </div>
                   </el-col>
                   <el-col :span="8">
                     <div class="carInfo_item">
                       <div class="label">车辆型号</div>
-                      <div class="main">X5</div>
+                      <div class="main">{{ parkingReviewInfo.car.carModel }}</div>
                     </div>
                   </el-col>
                 </el-row>
@@ -103,13 +103,13 @@
                   <el-col :span="8">
                     <div class="carInfo_item">
                       <div class="label">车身颜色：</div>
-                      <div class="main">白色</div>
+                      <div class="main">{{ parkingReviewInfo.car.carColor }}</div>
                     </div>
                   </el-col>
                   <el-col :span="8">
                     <div class="carInfo_item">
                       <div class="label">备注：</div>
-                      <div class="main">无</div>
+                      <div class="main">{{ parkingReviewInfo.car.remark }}</div>
                     </div>
                   </el-col>
                   <el-col :span="8"> </el-col>
@@ -120,8 +120,13 @@
                       <div class="label">车辆照片：</div>
                       <div class="main">
                         <el-image
+                          v-for="(item, index) in parkingReviewInfo.car.carImageUrlList"
+                          :key="index"
                           class="carInfoImage"
-                          src="https://ts1.tc.mm.bing.net/th?id=ORMS.76ee9c7ea9fe203b608f9048f54b3cbd&pid=Wdp&w=268&h=140&qlt=90&c=1&rs=1&dpr=1&p=0"
+                          :src="item"
+                          :initial-index="index"
+                          :preview-src-list="parkingReviewInfo.car.carImageUrlList"
+                          preview-teleported
                         ></el-image>
                       </div>
                     </div>
@@ -172,7 +177,24 @@ type parkingReviewType = {
     createTime: string;
     delFlag: any;
   };
-  car: any;
+  car: {
+    'id': string;
+    'areaId': null;
+    'villageId': string;
+    'parkingId': string;
+    'residentId': null;
+    'residentName': null;
+    'carNum': string;
+    'carBrand': string;
+    'carModel': string;
+    'carColor': string;
+    'remark': null;
+    'carImageUrl': string;
+    'userName': null;
+    'userId': string;
+
+    carImageUrlList?: string[];
+  };
   parkingReviewProcess: {
     submitStatus: null;
     propertyStatus: null;
@@ -205,7 +227,22 @@ const parkingReviewInfo = ref<parkingReviewType>({
     'createTime': '',
     'delFlag': null
   },
-  car: null,
+  car: {
+    'id': '',
+    'areaId': null,
+    'villageId': '',
+    'parkingId': '',
+    'residentId': null,
+    'residentName': null,
+    'carNum': '',
+    'carBrand': '',
+    'carModel': '',
+    'carColor': '',
+    'remark': null,
+    'carImageUrl': '',
+    'userName': null,
+    'userId': ''
+  },
   parkingReviewProcess: {
     submitStatus: null,
     propertyStatus: null,
@@ -220,6 +257,9 @@ function getInfo() {
   if (route.query.id) {
     id.value = route.query.id as string;
     getParkingReviewInfo(id.value).then((res) => {
+      if (res.data.car) {
+        res.data.car.carImageUrlList = res.data.car.carImageUrl.split(',').filter(Boolean) ?? [];
+      }
       parkingReviewInfo.value = res.data;
     });
   }

src/views/system/parking/parkReview.vue

@@ -66,68 +66,6 @@
             </el-card>
           </div>
           <!-- 车辆信息 -->
-          <div class="mb-10">
-            <el-card>
-              <template #header>
-                <div class="card-header">
-                  <span>车辆信息</span>
-                </div>
-              </template>
-              <div class="w-full h-full CarInfoBox" v-if="parkingReviewInfo.car">
-                <el-row>
-                  <el-col :span="8">
-                    <div class="carInfo_item">
-                      <div class="label">车牌号：</div>
-                      <div class="main">浙B·N6688</div>
-                    </div>
-                  </el-col>
-                  <el-col :span="8">
-                    <div class="carInfo_item">
-                      <div class="label">车辆品牌：</div>
-                      <div class="main">宝马</div>
-                    </div>
-                  </el-col>
-                  <el-col :span="8">
-                    <div class="carInfo_item">
-                      <div class="label">车辆型号</div>
-                      <div class="main">X5</div>
-                    </div>
-                  </el-col>
-                </el-row>
-                <el-row class="mt-30px mb-30px">
-                  <el-col :span="8">
-                    <div class="carInfo_item">
-                      <div class="label">车身颜色：</div>
-                      <div class="main">白色</div>
-                    </div>
-                  </el-col>
-                  <el-col :span="8">
-                    <div class="carInfo_item">
-                      <div class="label">备注：</div>
-                      <div class="main">无</div>
-                    </div>
-                  </el-col>
-                  <el-col :span="8"> </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="24">
-                    <div class="carInfo_item flex-items-start">
-                      <div class="label">车辆照片：</div>
-                      <div class="main">
-                        <el-image
-                          class="carInfoImage"
-                          src="https://ts1.tc.mm.bing.net/th?id=ORMS.76ee9c7ea9fe203b608f9048f54b3cbd&pid=Wdp&w=268&h=140&qlt=90&c=1&rs=1&dpr=1&p=0"
-                        ></el-image>
-                      </div>
-                    </div>
-                  </el-col>
-                </el-row>
-              </div>
-              <div class="w-full h-full CarInfoBox flex flex-center min-h-17rem" v-else>
-                <span style="color: #999; font-weight: 500; font-size: larger; letter-spacing: 10px">暂无信息</span>
-              </div>
-            </el-card>
-          </div>
           <div class="">
             <el-card>
               <template #header>
@@ -271,7 +209,6 @@ type parkingReviewProcess = {
   propertyTime: string;
   certificationTime: string;
 };
-
 const parkingReviewInfo = ref<parkingReviewType>({
   parking: {
     'id': '',