完善停车区域

server/config.yaml

@@ -125,7 +125,7 @@ mysql:
     config: charset=utf8mb4&parseTime=True&loc=Local
     db-name: lc_garage
     username: root
-    password: Mysql123@
+    password: 123456
 
     path: 127.0.0.1
     engine: ""

web/src/lang/en.js

@@ -108,5 +108,8 @@ export default {
   rfidLabel: 'RFID Tag (For UHF)',
   placeholderPorsche: 'e.g. Porsche',
   placeholderBlack: 'e.g. Black',
-  tempCarOptional: 'Optional for temporary vehicles'
+  tempCarOptional: 'Optional for temporary vehicles',
+  parkTip: 'e.g. Monthly Rental Car',
+  licensePlate: 'License Plate',
+  view: 'View'
 }

web/src/lang/zh-CN.js

@@ -44,6 +44,7 @@ export default {
   Black_White: '黑白名单',
   Search: '搜索',
   LicensePlateNo: '车牌号码',
+  licensePlate: '车牌',
   RFID_Tag: 'RFID标签',
   List_Type: '名单类型',
   Reset: '重置',
@@ -109,4 +110,6 @@ export default {
   placeholderPorsche: '如：保时捷',
   placeholderBlack: '如：黑色',
   tempCarOptional: '临时车可不选',
+  parkTip: '如：月租车',
+  view: '查看'
 }

web/src/lang/zh-HK.js

@@ -108,5 +108,8 @@ export default {
   rfidLabel: 'RFID標籤（UHF用）',
   placeholderPorsche: '如：保時捷',
   placeholderBlack: '如：黑色',
-  tempCarOptional: '臨時車可唔選擇'
+  tempCarOptional: '臨時車可唔選擇',
+  parkTip: '如：月租車',
+  licensePlate: '車牌',
+  view: '查看'
 }

web/src/lang/zh-TW.js

@@ -108,5 +108,8 @@ export default {
   rfidLabel: 'RFID標籤（UHF用）',
   placeholderPorsche: '如：保時捷',
   placeholderBlack: '如：黑色',
-  tempCarOptional: '臨時車可不選'
+  tempCarOptional: '臨時車可不選',
+  parkTip: '如：月租車',
+  licensePlate: '車牌',
+  view: '檢視'
 }

web/src/view/layout/search/search.vue

@@ -46,7 +46,7 @@ defineOptions({
   name: 'BtnBox',
 })
 
-const languageType = ref('zh')
+const languageType = ref('')
 
 const changeLanguageType = (val) => {
   setLang(val)
@@ -64,6 +64,9 @@ const toService = () => {
   window.open('https://support.qq.com/product/371961')
 }
 
+// onMounted(() => {
+//   setLang('zh-CN')
+// })
 </script>
 <style scoped lang="scss">
 .search-component {

web/src/view/parking/carInfo.vue

@@ -168,13 +168,13 @@
         <el-form-item :label="$t.value.ElectronicTag">
           <el-input
             v-model="formData.rfid_tag"
-            placeholder="RFID标签（UHF用）"
+            :placeholder="$t.value.rfidLabel"
           />
         </el-form-item>
         <el-form-item :label="$t.value.VehicleType">
           <el-select
             v-model="formData.vehicle_type_id"
-            placeholder="请选择"
+            placeholder=""
             style="width:100%"
           >
             <el-option
@@ -188,19 +188,19 @@
         <el-form-item :label="$t.value.VehicleBrand">
           <el-input
             v-model="formData.vehicle_brand"
-            placeholder="如：保时捷"
+            :placeholder="$t.value.placeholderPorsche"
           />
         </el-form-item>
         <el-form-item :label="$t.value.VehicleColor">
           <el-input
             v-model="formData.vehicle_color"
-            placeholder="如：黑色"
+            :placeholder="$t.value.placeholderBlack"
           />
         </el-form-item>
         <el-form-item :label="$t.value.BindOwner">
           <el-select
             v-model="formData.owner_id"
-            placeholder="临时车可不选"
+            :placeholder="$t.value.tempCarOptional"
             clearable
             style="width: 100%"
           >
@@ -300,7 +300,7 @@
         <el-form-item :label="$t.value.typeName">
           <el-input
             v-model="typeForm.name"
-            placeholder="如：月租车、VIP车"
+            :placeholder="$t.value.parkTip"
           />
         </el-form-item>
         <el-form-item :label="$t.value.Remarks">
@@ -424,7 +424,9 @@ const submitForm = async() => {
 }
 
 const deleteVehicle = async(id) => {
-  await ElMessageBox.confirm(t.value.confirmDeleteCar, t.value.tip, { type: 'warning' })
+  await ElMessageBox.confirm(t.value.confirmDeleteCar, t.value.tip,
+    { type: 'warning', confirmButtonText: t.value.Confirm,
+      cancelButtonText: t.value.Cancel })
   try {
     await removeVehicleList({ id })
     ElMessage.success(t.value.deleteSuccess)

web/src/view/parking/parkingInfo.vue

@@ -622,12 +622,12 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="regionShow = false">取消</el-button>
+          <el-button @click="regionShow = false">{{ $t.value.Cancel }}</el-button>
           <el-button
             type="primary"
             @click="regionOperation"
           >
-            确认
+            {{ $t.value.Confirm }}
           </el-button>
         </div>
       </template>

web/src/view/parking/pricing.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
     <el-form inline>
-      <el-form-item label="车辆类型">
+      <el-form-item :label="$t.value.VehicleType">
         <el-select
           v-model="getPricingData.vehicle_type_id"
-          placeholder="全部"
+          :placeholder="$t.value.carTypeSelect"
           clearable
           style="width: 180px"
         >
@@ -21,14 +21,14 @@
           type="primary"
           icon="Search"
           @click="getPricingList"
-        >搜索</el-button>
+        >{{ $t.value.Search }}</el-button>
       </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
           icon="Plus"
           @click="openPricing('新增收费配置','')"
-        >新增</el-button>
+        >{{ $t.value.new }}</el-button>
       </el-form-item>
     </el-form>
 
@@ -37,25 +37,25 @@
       height="605"
     >
       <el-table-column
-        label="车辆类型"
+        :label="$t.value.VehicleType"
         align="center"
         width="180"
         prop="vehicle_type.name"
       />
       <el-table-column
-        label="初始费用"
+        :label="$t.value.StartFee"
         align="center"
         width="180"
         prop="start_fee"
       />
       <el-table-column
-        label="单位费用"
+        :label="$t.value.UnitFee"
         align="center"
         width="180"
         prop="unit_fee"
       />
       <el-table-column
-        label="是否为VIP免费"
+        :label="$t.value.IsVipFree"
         align="center"
         width="180"
       >
@@ -69,19 +69,19 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="每日最大费用"
+        :label="$t.value.DailyMaxFee"
         align="center"
         width="180"
         prop="daily_max_fee"
       />
       <el-table-column
-        label="vip折扣"
+        :label="$t.value.VipDiscount"
         align="center"
         width="180"
         prop="vip_discount"
       />
       <el-table-column
-        label="操作"
+        :label="$t.value.Action"
         align="center"
       >
         <template #default="scope">
@@ -94,20 +94,20 @@
               text
               type="primary"
               icon="MessageBox"
-            >备注</el-button>
+            >{{ $t.value.Remarks }}</el-button>
           </el-tooltip>
           <el-button
             icon="edit"
             text
             type="primary"
             @click="openPricing('编辑收费配置', scope.row)"
-          >编辑</el-button>
+          >{{ $t.value.modify }}</el-button>
           <el-button
             icon="delete"
             text
             type="primary"
             @click="deletePricing(scope.row)"
-          >删除</el-button>
+          >{{ $t.value.remove }}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -131,10 +131,10 @@
       width="650"
     >
       <el-form
-        label-width="120"
+        label-width="150"
         size="large"
       >
-        <el-form-item label="车辆类型：">
+        <el-form-item :label="$t.value.VehicleType + '：'">
           <el-select
             v-model="pricingData.vehicle_type_id"
             placeholder="请选择车辆类型"
@@ -147,49 +147,49 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="免费时长(分钟)：">
+        <el-form-item :label="$t.value.FreeDuration + '：'">
           <el-input
             v-model.number="pricingData.start_time"
             type="number"
           />
         </el-form-item>
-        <el-form-item label="起步费用：">
+        <el-form-item :label="$t.value.StartFee + '：'">
           <el-input
             v-model.number="pricingData.start_fee"
             type="number"
           />
         </el-form-item>
-        <el-form-item label="单位时间(分钟)：">
+        <el-form-item :label="$t.value.UnitTime + '：'">
           <el-input
             v-model.number="pricingData.unit_time"
             type="number"
           />
         </el-form-item>
-        <el-form-item label="单位费用：">
+        <el-form-item :label="$t.value.UnitFee + '：'">
           <el-input
             v-model.number="pricingData.unit_fee"
             type="number"
           />
         </el-form-item>
-        <el-form-item label="每日最大费用：">
+        <el-form-item :label="$t.value.DailyMaxFee + '：'">
           <el-input
             v-model.number="pricingData.daily_max_fee"
             type="number"
           />
         </el-form-item>
-        <el-form-item label="是否vip免费：">
+        <el-form-item :label="$t.value.IsVipFree + '：'">
           <el-radio-group v-model="pricingData.is_vip_free">
-            <el-radio-button :label="false">否</el-radio-button>
-            <el-radio-button :label="true">是</el-radio-button>
+            <el-radio-button :label="false">{{ $t.value.no }}</el-radio-button>
+            <el-radio-button :label="true">{{ $t.value.yes }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="vip折扣：">
+        <el-form-item :label="$t.value.VipDiscount + '：'">
           <el-input
             v-model.number="pricingData.vip_discount"
             type="number"
           />
         </el-form-item>
-        <el-form-item label="描述：">
+        <el-form-item :label="$t.value.Remarks + '：'">
           <el-input
             v-model="pricingData.description"
             type="textarea"
@@ -201,12 +201,12 @@
         <el-button
           size="large"
           @click="pricingShow = false"
-        >取消</el-button>
+        >{{ $t.value.Cancel }}</el-button>
         <el-button
           type="primary"
           size="large"
           @click="pricingOperation"
-        >确认</el-button>
+        >{{ $t.value.Confirm }}</el-button>
       </template>
     </el-dialog>
   </div>
@@ -217,6 +217,7 @@ import { obtainPricingList, addPricing, editPricing, removePricing } from '@/api
 import { getAllVehicleTypes } from '@/api/vehicle'
 import { onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { t } from '@/lang/index.js'
 
 const pricingList = ref([])
 const pricingShow = ref(false)

web/src/view/report/enter.vue

@@ -2,18 +2,18 @@
   <div>
     <!-- 搜索表单 -->
     <el-form inline>
-      <el-form-item label="车牌号码">
+      <el-form-item :label="$t.value.LicensePlateNo">
         <el-input
           v-model="queryForm.plate_number"
-          placeholder="请输入车牌"
+          :placeholder="$t.value.carPlateInput"
           clearable
         />
       </el-form-item>
 
-      <el-form-item label="RFID标签">
+      <el-form-item :label="$t.value.RFID_Tag">
         <el-input
           v-model="queryForm.rfid_tag"
-          placeholder="请输入RFID"
+          placeholder="RFID"
           clearable
         />
       </el-form-item>
@@ -22,8 +22,8 @@
         <el-button
           type="primary"
           @click="getRecordList"
-        >搜索</el-button>
-        <el-button @click="resetQuery">重置</el-button>
+        >{{$t.value.Search}}</el-button>
+        <el-button @click="resetQuery">{{$t.value.Reset}}</el-button>
       </el-form-item>
     </el-form>
 
@@ -34,18 +34,18 @@
       border
     >
       <el-table-column
-        label="车牌"
+        :label="$t.value.licensePlate"
         prop="plate_number"
         align="center"
       />
       <el-table-column
-        label="RFID标签"
+          :label="$t.value.RFID_Tag"
         prop="rfid_tag"
         align="center"
       />
 
       <el-table-column
-        label="入场时间"
+          :label="$t.value.EntryTime"
         align="center"
       >
         <template #default="scope">
@@ -54,7 +54,7 @@
       </el-table-column>
 
       <el-table-column
-        label="出场时间"
+          :label="$t.value.ExitTime"
         align="center"
       >
         <template #default="scope">
@@ -63,7 +63,7 @@
       </el-table-column>
 
       <el-table-column
-        label="停留时长"
+          :label="$t.value.ExitTime"
         align="center"
       >
         <template #default="scope">
@@ -72,7 +72,7 @@
       </el-table-column>
 
       <el-table-column
-        label="费用"
+        :label="$t.value.Fee"
         align="center"
       >
         <template #default="scope">
@@ -81,7 +81,7 @@
       </el-table-column>
 
       <el-table-column
-        label="支付状态"
+        :label="$t.value.PayStatus"
         align="center"
       >
         <template #default="scope">
@@ -92,7 +92,7 @@
       </el-table-column>
 
       <el-table-column
-        label="操作"
+        :label="$t.value.Action"
         align="center"
         width="100"
       >
@@ -103,7 +103,7 @@
             icon="View"
             @click="openDetail(scope.row)"
           >
-            查看
+            {{ $t.value.view }}
           </el-button>
         </template>
       </el-table-column>