From 963f5a4f0a477dea44806c923764a0b55ce20375 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 12 Jul 2025 15:59:45 +0800
Subject: [PATCH] 车辆功能测试完成

---
 src/App.vue                                      |  5 +++++
 src/components/car/SearchParkingSpace.vue        |  4 ++--
 src/components/car/deleteOwnerCar.vue            |  2 +-
 src/components/car/importOwnerCar.vue            |  2 +-
 src/components/fee/addFeeConfig.vue              | 49 +++++++++++++++++++------------------------------
 src/components/fee/carCreateFeeAdd.vue           |  2 +-
 src/components/fee/exportCarFeeImportExcel.vue   |  2 +-
 src/components/fee/simplifyRoomFee.vue           |  2 +-
 src/components/system/carDetailHis.vue           | 14 +++++++-------
 src/views/aCommunity/aCarDetailFeeLang.js        | 36 ++----------------------------------
 src/views/aCommunity/aCarDetailHisLang.js        | 38 ++------------------------------------
 src/views/aCommunity/adminCarDetailLang.js       | 37 +++----------------------------------
 src/views/car/carDetailFeeLang.js                | 48 ++----------------------------------------------
 src/views/car/carDetailLang.js                   | 22 ++++++++++++++++++++++
 src/views/car/listOwnerCarList.vue               | 44 ++++++++++++++++++++++++--------------------
 src/views/car/parkingAreaManageList.vue          | 26 +++++++++++++++++---------
 src/views/car/tempCarPaymentList.vue             |  2 +-
 src/views/fee/carCreateFeeList.vue               |  3 ++-
 src/views/fee/feeConfigDetailList.vue            |  6 ++++--
 src/views/fee/feeConfigManageList.vue            | 15 +++++++++------
 src/views/fee/payFeeConfigDiscountManageList.vue |  7 ++++++-
 src/views/system/operateDataLogLang.js           | 38 ++------------------------------------
 22 files changed, 134 insertions(+), 270 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 25103c0..ecf3e70 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -548,4 +548,9 @@ h3 {
   color: #fff;
   font-weight: bold;
 }
+.table-desc {
+    text-align: left;
+    font-size: 13px;
+    color: #606266;
+  }
 </style> 
\ No newline at end of file
diff --git a/src/components/car/SearchParkingSpace.vue b/src/components/car/SearchParkingSpace.vue
index e15a1da..8eb71c6 100644
--- a/src/components/car/SearchParkingSpace.vue
+++ b/src/components/car/SearchParkingSpace.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="$t('searchParkingSpace.title')" :visible.sync="visible" width="80%" @close="handleClose">
-    <el-card>
+
       <el-row v-if="showSearchCondition" :gutter="20">
         <el-col :span="8">
           <el-select v-model="searchParkingSpaceInfo.areaNum" class="w-full"
@@ -44,7 +44,7 @@
       <el-pagination class="mt-20" :current-page="pagination.currentPage" :page-sizes="[10, 20, 30, 50]"
         :page-size="pagination.pageSize" :total="pagination.total" layout="total, sizes, prev, pager, next, jumper"
         @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-    </el-card>
+
   </el-dialog>
 </template>
 
diff --git a/src/components/car/deleteOwnerCar.vue b/src/components/car/deleteOwnerCar.vue
index ed29047..747fd7f 100644
--- a/src/components/car/deleteOwnerCar.vue
+++ b/src/components/car/deleteOwnerCar.vue
@@ -37,7 +37,7 @@ export default {
       
       this.loading = true
       try {
-        await deleteOwnerCars({ carId: this.carInfo.carId })
+        await deleteOwnerCars({ carId: this.carInfo.carId,memberId:this.carInfo.memberId })
         this.$message.success(this.$t('listOwnerCar.deleteSuccess'))
         this.$emit('success')
         this.visible = false
diff --git a/src/components/car/importOwnerCar.vue b/src/components/car/importOwnerCar.vue
index 6a1a151..efb4be0 100644
--- a/src/components/car/importOwnerCar.vue
+++ b/src/components/car/importOwnerCar.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="$t('listOwnerCar.importCarTitle')" :visible.sync="visible" width="600px" @close="resetForm">
-    <el-form :model="form" label-width="120px">
+    <el-form :model="form" label-width="120px" class="text-left">
       <el-form-item :label="$t('listOwnerCar.selectFile')">
         <el-upload class="upload-demo" action="" :on-change="handleFileChange" :auto-upload="false"
           :show-file-list="false">
diff --git a/src/components/fee/addFeeConfig.vue b/src/components/fee/addFeeConfig.vue
index 9a1fb53..439d7b3 100644
--- a/src/components/fee/addFeeConfig.vue
+++ b/src/components/fee/addFeeConfig.vue
@@ -4,12 +4,8 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item :label="$t('feeConfigManage.feeType')" prop="feeTypeCd" required>
-            <el-select 
-              v-model="form.feeTypeCd" 
-              @change="changeAddFeeTypeCd"
-              :placeholder="$t('feeConfigManage.selectFeeType')"
-              class="full-width-select"
-            >
+            <el-select v-model="form.feeTypeCd" @change="changeAddFeeTypeCd"
+              :placeholder="$t('feeConfigManage.feeType')" class="full-width-select">
               <el-option v-for="item in feeTypeCds" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
             </el-select>
           </el-form-item>
@@ -21,22 +17,16 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('feeConfigManage.feeFlag')" prop="feeFlag" required>
-            <el-select 
-              v-model="form.feeFlag" 
-              :placeholder="$t('feeConfigManage.selectFeeFlag')"
-              class="full-width-select"
-            >
+            <el-select v-model="form.feeFlag" :placeholder="$t('feeConfigManage.selectFeeFlag')"
+              class="full-width-select">
               <el-option v-for="item in feeFlags" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('feeConfigManage.paymentType')" prop="paymentCd" required>
-            <el-select 
-              v-model="form.paymentCd" 
-              :placeholder="$t('feeConfigManage.selectPaymentType')"
-              class="full-width-select"
-            >
+            <el-select v-model="form.paymentCd" :placeholder="$t('feeConfigManage.selectPaymentType')"
+              class="full-width-select">
               <el-option v-for="item in paymentCds" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
             </el-select>
           </el-form-item>
@@ -107,12 +97,10 @@
 
         <el-col :span="24">
           <el-form-item :label="$t('feeConfigManage.formula')" prop="computingFormula" required>
-            <el-select 
-              v-model="form.computingFormula" 
-              :placeholder="$t('feeConfigManage.selectFormula')"
-              class="full-width-select"
-            >
-              <el-option v-for="item in computingFormulas" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
+            <el-select v-model="form.computingFormula" :placeholder="$t('feeConfigManage.selectFormula')"
+              class="full-width-select">
+              <el-option v-for="item in computingFormulas" :key="item.statusCd" :label="item.name"
+                :value="item.statusCd" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -136,7 +124,8 @@
         <template v-if="form.computingFormula == '7007'">
           <el-col :span="24">
             <el-form-item :label="$t('feeConfigManage.formula')" prop="computingFormulaText" required>
-              <el-input type="textarea" v-model="form.computingFormulaText" :placeholder="$t('feeConfigManage.enterFormula')" :rows="4" />
+              <el-input type="textarea" v-model="form.computingFormulaText"
+                :placeholder="$t('feeConfigManage.enterFormula')" :rows="4" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -188,9 +177,9 @@ export default {
         decimalPlace: '2',
         state: 'Y',
         computingFormulaText: '',
-        startTime:'2025-01-01',
-        endTime:'2050-01-01',
-        billType:'002',
+        startTime: '2025-01-01',
+        endTime: '2050-01-01',
+        billType: '002',
         communityId: this.getCommunityId()
       },
       feeTypeCds: [],
@@ -228,7 +217,7 @@ export default {
           getDict('pay_fee_config', 'fee_flag'),
           getDict('pay_fee_config', 'payment_cd')
         ])
-        
+
         this.feeTypeCds = feeTypeCds
         this.computingFormulas = computingFormulas
         this.feeFlags = feeFlags
@@ -339,9 +328,9 @@ export default {
         scale: '1',
         decimalPlace: '2',
         state: 'Y',
-        startTime:'2025-01-01',
-        endTime:'2050-01-01',
-        billType:'002',
+        startTime: '2025-01-01',
+        endTime: '2050-01-01',
+        billType: '002',
         computingFormulaText: '',
         communityId: this.getCommunityId()
       }
diff --git a/src/components/fee/carCreateFeeAdd.vue b/src/components/fee/carCreateFeeAdd.vue
index df57c4e..0b460ff 100644
--- a/src/components/fee/carCreateFeeAdd.vue
+++ b/src/components/fee/carCreateFeeAdd.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="$t('carCreateFeeAdd.createFee')" :visible.sync="visible" width="40%" @close="handleClose">
-    <el-form :model="form" label-width="150px" ref="form">
+    <el-form :model="form" label-width="150px" ref="form" class="text-left">
       <el-form-item v-if="isMore" :label="$t('carCreateFeeAdd.chargeScope')" prop="locationTypeCd"
         :rules="[{ required: true, message: $t('carCreateFeeAdd.requiredChargeScope') }]">
         <el-select v-model="form.locationTypeCd" style="width:100%">
diff --git a/src/components/fee/exportCarFeeImportExcel.vue b/src/components/fee/exportCarFeeImportExcel.vue
index 9dc4733..bf59425 100644
--- a/src/components/fee/exportCarFeeImportExcel.vue
+++ b/src/components/fee/exportCarFeeImportExcel.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="$t('exportCarFeeImportExcel.templateExport')" :visible.sync="visible" width="50%">
-    <el-form label-width="150px">
+    <el-form label-width="150px" class="text-left">
       <el-form-item :label="$t('exportCarFeeImportExcel.parkingLot')">
         <div>
           <el-checkbox v-model="isParkingAreaAll" @change="changeAllParkingAreas">
diff --git a/src/components/fee/simplifyRoomFee.vue b/src/components/fee/simplifyRoomFee.vue
index c6b8c1b..a49bc0c 100644
--- a/src/components/fee/simplifyRoomFee.vue
+++ b/src/components/fee/simplifyRoomFee.vue
@@ -248,7 +248,7 @@
     </div>
 
     <el-row>
-      <el-col :span="12" class="text-left">
+      <el-col :span="12" class="text-left table-desc">
         <div>{{ $t('simplifyRoomFee.note1') }}</div>
         <div>{{ $t('simplifyRoomFee.note2') }}</div>
       </el-col>
diff --git a/src/components/system/carDetailHis.vue b/src/components/system/carDetailHis.vue
index a24cea0..f4f5d32 100644
--- a/src/components/system/carDetailHis.vue
+++ b/src/components/system/carDetailHis.vue
@@ -9,12 +9,12 @@
           <span v-else>{{ scope.row.leaseTypeName }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('carDetailHis.carTypeName')" align="center">
+      <el-table-column :label="$t('carDetailHis.carType')" align="center">
         <template slot-scope="scope">
           {{ scope.row.carTypeName || '-' }}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('carDetailHis.carColor')" align="center">
+      <el-table-column :label="$t('carDetailHis.color')" align="center">
         <template slot-scope="scope">
           {{ scope.row.carColor || '-' }}
         </template>
@@ -32,11 +32,11 @@
             {{ scope.row.areaNum }}-{{ scope.row.num }}
           </span>
           <span v-else>
-            {{ $t('carDetailHis.released') }}
+            {{ $t('carDetailHis.spaceReleased') }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('carDetailHis.validityPeriod')" align="center">
+      <el-table-column :label="$t('carDetailHis.validPeriod')" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.leaseType === 'H'">
             {{ scope.row.startTime }}<br>~{{ scope.row.endTime }}
@@ -44,17 +44,17 @@
           <div v-else>--</div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('carDetailHis.operate')" align="center">
+      <el-table-column :label="$t('common.operation')" align="center">
         <template slot-scope="scope">
           {{ _getHisOperate(scope.row) }}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('carDetailHis.userName')" align="center">
+      <el-table-column :label="$t('carDetailHis.operator')" align="center">
         <template slot-scope="scope">
           {{ scope.row.userName || '-' }}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('carDetailHis.createTime')" align="center">
+      <el-table-column :label="$t('carDetailHis.operateTime')" align="center">
         <template slot-scope="scope">
           {{ scope.row.createTime }}
         </template>
diff --git a/src/views/aCommunity/aCarDetailFeeLang.js b/src/views/aCommunity/aCarDetailFeeLang.js
index fee96ea..881ba76 100644
--- a/src/views/aCommunity/aCarDetailFeeLang.js
+++ b/src/views/aCommunity/aCarDetailFeeLang.js
@@ -1,40 +1,8 @@
 export const messages = {
   en: {
-    carDetailFee: {
-      feeItem: 'Fee Item',
-      feeFlag: 'Fee Flag',
-      feeType: 'Fee Type',
-      amountOwed: 'Amount Owed',
-      createTime: 'Create Time',
-      duePeriod: 'Due Period',
-      remark: 'Remark',
-      preDegrees: 'Previous Degrees',
-      curDegrees: 'Current Degrees',
-      unitPrice: 'Unit Price',
-      additionalFee: 'Additional Fee',
-      fixedFee: 'Fixed Fee',
-      status: 'Status',
-      operation: 'Operation',
-      paymentNotice: 'Please go to the business acceptance page for payment'
-    }
+   
   },
   zh: {
-    carDetailFee: {
-      feeItem: '费用项目',
-      feeFlag: '费用标识',
-      feeType: '费用类型',
-      amountOwed: '应收金额',
-      createTime: '建账时间',
-      duePeriod: '应收时间段',
-      remark: '说明',
-      preDegrees: '上期度数',
-      curDegrees: '本期度数',
-      unitPrice: '单价',
-      additionalFee: '附加费',
-      fixedFee: '固定费',
-      status: '状态',
-      operation: '操作',
-      paymentNotice: '缴费请到业务受理页面缴费'
-    }
+  
   }
 }
\ No newline at end of file
diff --git a/src/views/aCommunity/aCarDetailHisLang.js b/src/views/aCommunity/aCarDetailHisLang.js
index edbef1a..6774ad6 100644
--- a/src/views/aCommunity/aCarDetailHisLang.js
+++ b/src/views/aCommunity/aCarDetailHisLang.js
@@ -1,42 +1,8 @@
 export const messages = {
   en: {
-    carDetailHis: {
-      carNum: 'License Plate',
-      leaseType: 'Plate Type',
-      tempCar: 'Temporary Car',
-      carType: 'Car Type',
-      color: 'Color',
-      owner: 'Owner',
-      parkingSpace: 'Parking Space',
-      spaceReleased: 'Space Released',
-      validPeriod: 'Valid Period',
-      action: 'Action',
-      operator: 'Operator',
-      operateTime: 'Operate Time',
-      add: 'Add',
-      delete: 'Delete',
-      modifyNew: 'Modify(New)',
-      modifyOld: 'Modify(Old)'
-    }
+
   },
   zh: {
-    carDetailHis: {
-      carNum: '车牌号',
-      leaseType: '车牌类型',
-      tempCar: '临时车',
-      carType: '车辆类型',
-      color: '颜色',
-      owner: '业主',
-      parkingSpace: '车位',
-      spaceReleased: '车位已释放',
-      validPeriod: '有效期',
-      action: '动作',
-      operator: '操作人',
-      operateTime: '操作时间',
-      add: '添加',
-      delete: '删除',
-      modifyNew: '修改(新)',
-      modifyOld: '修改(旧)'
-    }
+
   }
 }
\ No newline at end of file
diff --git a/src/views/aCommunity/adminCarDetailLang.js b/src/views/aCommunity/adminCarDetailLang.js
index 9a4ec38..85f0098 100644
--- a/src/views/aCommunity/adminCarDetailLang.js
+++ b/src/views/aCommunity/adminCarDetailLang.js
@@ -27,23 +27,7 @@ export const messages = {
       status: 'Status:',
       relatedHouse: 'Related House:'
     },
-    carDetailFee: {
-      feeItem: 'Fee Item',
-      feeFlag: 'Fee Flag',
-      feeType: 'Fee Type',
-      amountOwed: 'Amount Owed',
-      createTime: 'Create Time',
-      duePeriod: 'Due Period',
-      remark: 'Remark',
-      preDegrees: 'Previous Degrees',
-      curDegrees: 'Current Degrees',
-      unitPrice: 'Unit Price',
-      additionalFee: 'Additional Fee',
-      fixedFee: 'Fixed Fee',
-      status: 'Status',
-      operation: 'Operation',
-      paymentNotice: 'Please go to the business acceptance page for payment'
-    },
+    
     carDetailHis: {
       carNum: 'License Plate',
       leaseType: 'Plate Type',
@@ -183,29 +167,14 @@ export const messages = {
       plateType: '车牌类型：',
       leaseStartTime: '起租时间：',
       leaseEndTime: '结租时间：',
+      validityPeriod: '有效期：',
       remark: '备注：',
       parkingLot: '停车场：',
       parkingSpace: '车位：',
       status: '状态：',
       relatedHouse: '关联房屋：'
     },
-    carDetailFee: {
-      feeItem: '费用项目',
-      feeFlag: '费用标识',
-      feeType: '费用类型',
-      amountOwed: '应收金额',
-      createTime: '建账时间',
-      duePeriod: '应收时间段',
-      remark: '说明',
-      preDegrees: '上期度数',
-      curDegrees: '本期度数',
-      unitPrice: '单价',
-      additionalFee: '附加费',
-      fixedFee: '固定费',
-      status: '状态',
-      operation: '操作',
-      paymentNotice: '缴费请到业务受理页面缴费'
-    },
+    
     carDetailHis: {
       carNum: '车牌号',
       leaseType: '车牌类型',
diff --git a/src/views/car/carDetailFeeLang.js b/src/views/car/carDetailFeeLang.js
index 8de9978..085ef19 100644
--- a/src/views/car/carDetailFeeLang.js
+++ b/src/views/car/carDetailFeeLang.js
@@ -1,52 +1,8 @@
 export const messages = {
   en: {
-    carDetailFee: {
-      createFee: 'Create Fee',
-      feeItem: 'Fee Item',
-      feeFlag: 'Fee Flag',
-      feeType: 'Fee Type',
-      amountReceivable: 'Amount Receivable',
-      accountingTime: 'Accounting Time',
-      receivablePeriod: 'Receivable Period',
-      remark: 'Remark',
-      status: 'Status',
-      operation: 'Operation',
-      previousReading: 'Previous Reading',
-      currentReading: 'Current Reading',
-      unitPrice: 'Unit Price',
-      additionalFee: 'Additional Fee',
-      fixedFee: 'Fixed Fee',
-      payment: 'Payment',
-      history: 'History',
-      cancel: 'Cancel',
-      change: 'Change',
-      detail: 'Detail',
-      paymentNotice: 'Please go to the business acceptance page for payment'
-    }
+ 
   },
   zh: {
-    carDetailFee: {
-      createFee: '创建费用',
-      feeItem: '费用项目',
-      feeFlag: '费用标识',
-      feeType: '费用类型',
-      amountReceivable: '应收金额',
-      accountingTime: '建账时间',
-      receivablePeriod: '应收时间段',
-      remark: '说明',
-      status: '状态',
-      operation: '操作',
-      previousReading: '上期度数',
-      currentReading: '本期度数',
-      unitPrice: '单价',
-      additionalFee: '附加费',
-      fixedFee: '固定费',
-      payment: '缴费',
-      history: '历史',
-      cancel: '取消',
-      change: '变更',
-      detail: '详情',
-      paymentNotice: '缴费请到业务受理页面缴费'
-    }
+ 
   }
 }
\ No newline at end of file
diff --git a/src/views/car/carDetailLang.js b/src/views/car/carDetailLang.js
index e29a18a..ba7e9af 100644
--- a/src/views/car/carDetailLang.js
+++ b/src/views/car/carDetailLang.js
@@ -133,6 +133,17 @@ export const messages = {
       machine: 'Machine',
       verifyTime: 'Verify Time',
       remark: 'Remark'
+    },
+    ownerDetailOweFee: {
+      paymentObject: 'Payment Object',
+      ownerName: 'Owner Name',
+      phone: 'Owner Phone',
+      startTime: 'Start Time',
+      endTime: 'End Time',
+      totalAmount: 'Total Amount',
+      updateTime: 'Update Time',
+      paymentNotice: 'Payment Notice',
+      batchPayment: 'Batch Payment'
     }
   },
   zh: {
@@ -268,6 +279,17 @@ export const messages = {
       machine: '道闸',
       verifyTime: '核销时间',
       remark: '说明'
+    },
+    ownerDetailOweFee: {
+      paymentObject: '缴费对象',
+      ownerName: '业主姓名',
+      phone: '业主手机',
+      startTime: '开始时间',
+      endTime: '结束时间',
+      totalAmount: '总金额',
+      updateTime: '更新时间',
+      paymentNotice: '缴费通知',
+      batchPayment: '批量缴费'
     }
   }
 }
diff --git a/src/views/car/listOwnerCarList.vue b/src/views/car/listOwnerCarList.vue
index 2587652..5e2f216 100644
--- a/src/views/car/listOwnerCarList.vue
+++ b/src/views/car/listOwnerCarList.vue
@@ -2,14 +2,18 @@
   <div class="list-owner-car-container">
     <el-row :gutter="20">
       <el-col :span="3">
-        <el-card class="tree-card">
-          <ul class="lease-type-list">
-            <li v-for="(item, index) in leaseTypes" :key="index" @click="switchLeaseType(item)"
-              :class="{ 'selected': conditions.leaseType === item.statusCd }">
-              {{ item.name }}
-            </li>
-          </ul>
-        </el-card>
+        
+        <div class="list-group-border-radius">
+          <div class=" treeview">
+            <ul class="list-group text-center ">
+              <li v-for="(item, index) in leaseTypes" :key="index" @click="switchLeaseType(item)"
+                :class="{ 'vc-node-selected': conditions.leaseType === item.statusCd }"
+                class="list-group-item node-orgTree">
+                {{ item.name }}
+              </li>
+            </ul>
+          </div>
+        </div>
       </el-col>
       <el-col :span="21">
         <el-card class="search-card">
@@ -17,32 +21,27 @@
             <span>{{ $t('listOwnerCar.searchCondition') }}</span>
           </div>
           <el-row :gutter="20">
-            <el-col :span="6">
+            <el-col :span="4">
               <el-input v-model.trim="conditions.carNumLike" :placeholder="$t('listOwnerCar.inputCarNum')" clearable />
             </el-col>
-            <el-col :span="6">
+            <el-col :span="4">
               <el-input v-model.trim="conditions.num" :placeholder="$t('listOwnerCar.inputParkingSpaceNum')" clearable />
             </el-col>
-            <el-col :span="6">
+            <el-col :span="4">
               <el-select v-model="conditions.valid" :placeholder="$t('listOwnerCar.selectParkingSpaceStatus')" clearable>
                 <el-option value="1" :label="$t('listOwnerCar.normal')"></el-option>
                 <el-option value="3" :label="$t('listOwnerCar.expired')"></el-option>
                 <el-option value="2" :label="$t('listOwnerCar.noParkingSpace')"></el-option>
               </el-select>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="4">
               <el-input v-model.trim="conditions.ownerName" :placeholder="$t('listOwnerCar.inputOwnerName')" clearable />
             </el-col>
-          </el-row>
-          <el-row :gutter="20" class="mt-10">
-            <el-col :span="6">
+ 
+            <el-col :span="4">
               <el-input v-model.trim="conditions.link" :placeholder="$t('listOwnerCar.inputContact')" clearable />
             </el-col>
-            <el-col :span="6">
-              <el-input v-model.trim="conditions.memberCarNumLike" :placeholder="$t('listOwnerCar.inputMemberCarNum')"
-                clearable />
-            </el-col>
-            <el-col :span="12" class="text-right">
+            <el-col :span="4" class="text-left">
               <el-button type="primary" @click="queryMethod" icon="el-icon-search">
                 {{ $t('listOwnerCar.query') }}
               </el-button>
@@ -50,6 +49,11 @@
                 {{ $t('listOwnerCar.reset') }}
               </el-button>
             </el-col>
+            <el-col :span="4" class="margin-top">
+              <el-input v-model.trim="conditions.memberCarNumLike" :placeholder="$t('listOwnerCar.inputMemberCarNum')"
+                clearable />
+            </el-col>
+           
           </el-row>
         </el-card>
 
diff --git a/src/views/car/parkingAreaManageList.vue b/src/views/car/parkingAreaManageList.vue
index a38bbe2..9d4517c 100644
--- a/src/views/car/parkingAreaManageList.vue
+++ b/src/views/car/parkingAreaManageList.vue
@@ -6,26 +6,26 @@
           <div slot="header" class="text-left">
             <span>{{ $t('parkingAreaManage.queryTitle') }}</span>
           </div>
-          <el-form :inline="true" :model="parkingAreaManageInfo.conditions" class="text-left">
-            <el-form-item :label="$t('parkingAreaManage.parkingNum')">
+          <div class="flex justify-start">
+            <div class="width-100">
               <el-input v-model.trim="parkingAreaManageInfo.conditions.num"
                 :placeholder="$t('parkingAreaManage.inputParkingNum')" clearable />
-            </el-form-item>
-            <el-form-item :label="$t('parkingAreaManage.parkingType')">
+            </div>
+            <div class="width-100">
               <el-select v-model="parkingAreaManageInfo.conditions.typeCd"
                 :placeholder="$t('parkingAreaManage.selectParkingType')" clearable style="width: 100%">
                 <el-option v-for="item in parkingTypes" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
-            </el-form-item>
-            <el-form-item>
+            </div>
+            <div class="width-100">
               <el-button type="primary" @click="_queryParkingAreaMethod">
                 {{ $t('common.search') }}
               </el-button>
               <el-button @click="_resetParkingAreaMethod">
                 {{ $t('common.reset') }}
               </el-button>
-            </el-form-item>
-          </el-form>
+            </div>
+          </div>
         </el-card>
       </el-col>
     </el-row>
@@ -46,7 +46,8 @@
             <el-table-column prop="num" :label="$t('parkingAreaManage.parkingNum')" align="center" />
             <el-table-column :label="$t('parkingAreaManage.parkingType')" align="center">
               <template slot-scope="scope">
-                {{ scope.row.typeCd === '1001' ? $t('parkingAreaManage.aboveGround') : $t('parkingAreaManage.underground')
+                {{ scope.row.typeCd === '1001' ? $t('parkingAreaManage.aboveGround') :
+                  $t('parkingAreaManage.underground')
                 }}
               </template>
             </el-table-column>
@@ -95,6 +96,7 @@ import AddParkingArea from '@/components/car/addParkingArea'
 import EditParkingArea from '@/components/car/editParkingArea'
 import DeleteParkingArea from '@/components/car/deleteParkingArea'
 import { getCommunityId } from '@/api/community/communityApi'
+import {jumpToIot} from '@/api/user/menuApi.js'
 
 export default {
   name: 'ParkingAreaManageList',
@@ -236,6 +238,7 @@ export default {
     _openParkingAreaTotalControl(parkingArea) {
       // 跳转到控制台逻辑
       console.log('打开控制台', parkingArea)
+      jumpToIot(`/#/pages/car/parkingAreaTotalControl?paId=${parkingArea.paId}`)
     }
   }
 }
@@ -249,4 +252,9 @@ export default {
 .float-right {
   float: right;
 }
+
+.width-100 {
+  width: 250px;
+  margin-right: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/car/tempCarPaymentList.vue b/src/views/car/tempCarPaymentList.vue
index c55202c..0318813 100644
--- a/src/views/car/tempCarPaymentList.vue
+++ b/src/views/car/tempCarPaymentList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="animated fadeInRight">
+  <div class="animated fadeInRight padding">
     <el-row :gutter="20">
       <el-col :span="3" class="left-panel">
         <el-card class="box-card">
diff --git a/src/views/fee/carCreateFeeList.vue b/src/views/fee/carCreateFeeList.vue
index 6aea08c..506cfa6 100644
--- a/src/views/fee/carCreateFeeList.vue
+++ b/src/views/fee/carCreateFeeList.vue
@@ -18,7 +18,8 @@
             @keyup.enter.native="handleQuery" />
         </el-col>
         <el-col :span="4">
-          <el-select v-model="queryParams.state" :placeholder="$t('carCreateFee.parkingSpaceStatus')" style="width:100%">
+          <el-select v-model="queryParams.state" :placeholder="$t('carCreateFee.parkingSpaceStatus')"
+            style="width:100%">
             <el-option v-for="item in states" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
           </el-select>
         </el-col>
diff --git a/src/views/fee/feeConfigDetailList.vue b/src/views/fee/feeConfigDetailList.vue
index d217a1f..ba95ee2 100644
--- a/src/views/fee/feeConfigDetailList.vue
+++ b/src/views/fee/feeConfigDetailList.vue
@@ -110,7 +110,7 @@
         </el-row>
       </div>
 
-      <el-divider></el-divider>
+      <divider></divider>
 
       <div class="tab-wrapper">
         <el-tabs v-model="feeDetailInfo.currentTab" @tab-click="changeTab(feeDetailInfo.currentTab)">
@@ -137,13 +137,15 @@ import { getFeeConfigDetail } from '@/api/fee/feeConfigDetailApi'
 import FeeConfigDetailHis from '@/components/fee/FeeConfigDetailHis'
 import FeeDetailFeeObj from '@/components/fee/FeeDetailFeeObj'
 import FeeConfigDetailDiscount from '@/components/fee/FeeConfigDetailDiscount'
+import divider from '@/components/system/divider'
 
 export default {
   name: 'FeeConfigDetailList',
   components: {
     FeeConfigDetailHis,
     FeeDetailFeeObj,
-    FeeConfigDetailDiscount
+    FeeConfigDetailDiscount,
+    divider
   },
   data() {
     return {
diff --git a/src/views/fee/feeConfigManageList.vue b/src/views/fee/feeConfigManageList.vue
index 7f0c47a..6d8a0d5 100644
--- a/src/views/fee/feeConfigManageList.vue
+++ b/src/views/fee/feeConfigManageList.vue
@@ -89,9 +89,9 @@
           <div slot="header" class="flex justify-between">
             <span>{{ $t('feeConfigManage.feeItems') }}</span>
             <div style="float: right;">
-              <el-button type="primary" size="small" icon="el-icon-document" @click="showMarkdown">
+              <!-- <el-button type="primary" size="small" icon="el-icon-document" @click="showMarkdown">
                 {{ $t('common.document') }}
-              </el-button>
+              </el-button> -->
               <el-button v-if="hasPrivilege('502022022571930560')" type="primary" size="small"
                 @click="_openAddFeeConfigModal">
                 {{ $t('common.add') }}
@@ -148,7 +148,7 @@
           </el-table>
 
           <el-row :gutter="20" style="margin-top: 15px;">
-            <el-col :span="18" class="text-left">
+            <el-col :span="18" class="text-left fee-detail-desc">
               <div>
                 <p>{{ $t('feeConfigManage.feeFlagTip') }}</p>
                 <p>{{ $t('feeConfigManage.paymentTypeTip') }}</p>
@@ -310,9 +310,6 @@ export default {
 </script>
 
 <style scoped>
-
-
-
 .margin-xs-r {
   margin-right: 5px;
 }
@@ -320,4 +317,10 @@ export default {
 .ibox {
   margin-bottom: 20px;
 }
+
+.fee-detail-desc {
+  text-align: left;
+  font-size: 13px;
+  color: #606266;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/fee/payFeeConfigDiscountManageList.vue b/src/views/fee/payFeeConfigDiscountManageList.vue
index f6c9b79..339ece6 100644
--- a/src/views/fee/payFeeConfigDiscountManageList.vue
+++ b/src/views/fee/payFeeConfigDiscountManageList.vue
@@ -48,7 +48,7 @@
     </el-table>
 
     <el-row class="margin-top-xs">
-      <el-col :span="21" class="text-left">
+      <el-col :span="21" class="text-left discount-desc">
         <div>{{ $t('payFeeConfigDiscountManage.paymentPeriodTip') }}</div>
         <div>{{ $t('payFeeConfigDiscountManage.discountEndTimeTip') }}</div>
         <div>{{ $t('payFeeConfigDiscountManage.currentYearTip1') }}</div>
@@ -148,5 +148,10 @@ export default {
   .text-right {
     text-align: right;
   }
+  .discount-desc {
+    text-align: left;
+    font-size: 13px;
+    color: #606266;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/system/operateDataLogLang.js b/src/views/system/operateDataLogLang.js
index c61d196..474e28e 100644
--- a/src/views/system/operateDataLogLang.js
+++ b/src/views/system/operateDataLogLang.js
@@ -68,24 +68,7 @@ export const messages = {
       modifyNew: 'modify(new)',
       modifyOld: 'modify(old)'
     },
-    carDetailHis: {
-      carNum: 'car number',
-      leaseType: 'lease type',
-      tempCar: 'temp car',
-      carTypeName: 'car type',
-      carColor: 'color',
-      owner: 'owner',
-      parkingSpace: 'parking space',
-      released: 'released',
-      validityPeriod: 'validity period',
-      operate: 'action',
-      userName: 'operator',
-      createTime: 'create time',
-      add: 'add',
-      delete: 'delete',
-      modifyNew: 'modify(new)',
-      modifyOld: 'modify(old)'
-    },
+   
     contractDetailChange: {
       contractName: 'contract name',
       contractCode: 'contract code',
@@ -170,24 +153,7 @@ export const messages = {
       modifyNew: '修改(新)',
       modifyOld: '修改(旧)'
     },
-    carDetailHis: {
-      carNum: '车牌号',
-      leaseType: '车牌类型',
-      tempCar: '临时车',
-      carTypeName: '车辆类型',
-      carColor: '颜色',
-      owner: '业主',
-      parkingSpace: '车位',
-      released: '车位已释放',
-      validityPeriod: '有效期',
-      operate: '动作',
-      userName: '操作人',
-      createTime: '操作时间',
-      add: '添加',
-      delete: '删除',
-      modifyNew: '修改(新)',
-      modifyOld: '修改(旧)'
-    },
+
     contractDetailChange: {
       contractName: '合同名称',
       contractCode: '合同编号',
--
libgit2 0.21.4