完善停车区域

web/src/api/channel.js

@@ -2,51 +2,51 @@ import service from '@/utils/request'
 
 // 创建通道
 export const addChannel = (data) => {
-    return service({
-        url: '/parking/channel/create',
-        method: 'post',
-        data
-    })
+  return service({
+    url: '/parking/channel/create',
+    method: 'post',
+    data
+  })
 }
 
 // 更新通道
 export const editChannel = (data) => {
-    return service({
-        url: '/parking/channel/update',
-        method: 'put',
-        data
-    })
+  return service({
+    url: '/parking/channel/update',
+    method: 'put',
+    data
+  })
 }
 
 // 根据ID获取通道
 export const obtainChannelId = (id) => {
-    return service({
-        url: '/parking/channel/get?id=' + id,
-        method: 'get'
-    })
+  return service({
+    url: '/parking/channel/get?id=' + id,
+    method: 'get'
+  })
 }
 
 // 根据编码获取通道
 export const obtainChannelCode = (code) => {
-    return service({
-        url: '/parking/channel/get-by-code?code=' + code,
-        method: 'get'
-    })
+  return service({
+    url: '/parking/channel/get-by-code?code=' + code,
+    method: 'get'
+  })
 }
 
 // 获取通道列表
 export const obtainChannelList = (params) => {
-    return service({
-        url: '/parking/channel/list',
-        method: 'get',
-        params
-    })
+  return service({
+    url: '/parking/channel/list',
+    method: 'get',
+    params
+  })
 }
 
 // 删除通道
 export const deleteChannel = (id) => {
-    return service({
-        url: '/parking/channel/delete?id=' + id,
-        method: 'delete'
-    })
+  return service({
+    url: '/parking/channel/delete?id=' + id,
+    method: 'delete'
+  })
 }

web/src/lang/en.js

@@ -51,6 +51,7 @@ export default {
   BlackList: 'Black List',
   SelectVehicle: 'Select Vehicle',
   CarOwner: 'Car Owner',
+  AddCarOwner: 'Add Car Owner',
   ElectronicTag: 'Electronic Tag',
   VehicleType: 'Vehicle Type',
   VehicleBrand: 'Vehicle Brand',
@@ -90,4 +91,7 @@ export default {
   deletePassageTip: 'Are you sure you want to delete this access?',
   deleteDeviceTip: 'Are you sure you want to delete this device?',
   tip: 'Prompt',
+  deleteSuccess: 'Deleted successfully',
+  deleteFailed: 'Deletion failed',
+  cancelDelete: 'Delete canceled'
 }

web/src/lang/zh-CN.js

@@ -51,6 +51,7 @@ export default {
   BlackList: '黑名单',
   SelectVehicle: '选择车辆',
   CarOwner: '车主',
+  AddCarOwner: '新增车主',
   ElectronicTag: '电子标签',
   VehicleType: '车辆类型',
   VehicleBrand: '车辆品牌',
@@ -89,5 +90,8 @@ export default {
   deleteBoothTip: '确定要删除该岗亭吗？',
   deletePassageTip: '确定删除该通道吗？',
   deleteDeviceTip: '确定要删除该设备吗？',
-  tip: '提示'
+  tip: '提示',
+  deleteSuccess: '删除成功',
+  deleteFailed: '删除失败',
+  cancelDelete: '取消删除'
 }

web/src/lang/zh-HK.js

@@ -51,6 +51,7 @@ export default {
   BlackList: '黑名單',
   SelectVehicle: '選擇車輛',
   CarOwner: '車主',
+  AddCarOwner: '新增車主',
   ElectronicTag: '電子標籤',
   VehicleType: '車輛類型',
   VehicleBrand: '車輛品牌',
@@ -90,4 +91,7 @@ export default {
   deletePassageTip: '確定刪除此通道嗎？',
   deleteDeviceTip: '確定要刪除此設備嗎？',
   tip: '提示',
+  deleteSuccess: '刪除成功',
+  deleteFailed: '刪除失敗',
+  cancelDelete: '取消刪除'
 }

web/src/lang/zh-TW.js

@@ -51,6 +51,7 @@ export default {
   BlackList: '黑名單',
   SelectVehicle: '選擇車輛',
   CarOwner: '車主',
+  AddCarOwner: '新增車主',
   ElectronicTag: '電子標籤',
   VehicleType: '車輛類型',
   VehicleBrand: '車輛品牌',
@@ -90,4 +91,7 @@ export default {
   deletePassageTip: '確定刪除此通道嗎？',
   deleteDeviceTip: '確定要刪除此設備嗎？',
   tip: '提示',
+  deleteSuccess: '刪除成功',
+  deleteFailed: '刪除失敗',
+  cancelDelete: '取消刪除'
 }

web/src/view/parking/carOwner.vue

@@ -35,13 +35,13 @@
           type="primary"
           icon="Search"
           @click="getCarOwnerList"
-        >搜索</el-button>
+        >{{ $t.value.Search }}</el-button>
       </el-form-item>
       <el-form-item>
         <el-button
           icon="Plus"
           @click="openCarOwner('新增车主','')"
-        >新增</el-button>
+        >{{ $t.value.new }}</el-button>
       </el-form-item>
       <el-form-item>
         <el-button @click="$setLang('en')">English</el-button>
@@ -89,7 +89,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="操作"
+        :label="$t.value.Action"
         align="center"
       >
         <template #default="scope">
@@ -134,16 +134,16 @@
       width="650"
     >
       <el-form
-        label-width="100"
+        label-width="120"
         size="large"
       >
-        <el-form-item label="名称：">
+        <el-form-item :label="$t.value.Name + '：'">
           <el-input v-model="carOwnerData.owner_name" />
         </el-form-item>
-        <el-form-item label="姓氏：">
+        <el-form-item :label="$t.value.Surname + '：'">
           <el-input v-model="carOwnerData.owner_surname" />
         </el-form-item>
-        <el-form-item label="手机：">
+        <el-form-item :label="$t.value.Mobile_Phone + '：'">
           <el-input v-model="carOwnerData.owner_phone" />
         </el-form-item>
         <el-form-item label="vip：">
@@ -153,11 +153,11 @@
             fill="#409eff"
           >
             <el-radio-button
-              label="否"
+              :label="$t.value.no"
               :value="false"
             />
             <el-radio-button
-              label="是"
+              :label="$t.value.yes"
               :value="true"
             />
           </el-radio-group>
@@ -174,12 +174,12 @@
         <el-button
           size="large"
           @click="carOwnerShow = false"
-        >取消</el-button>
+        >{{$t.value.Confirm}}</el-button>
         <el-button
           type="primary"
           size="large"
           @click="carOwnerOperation"
-        >确认</el-button>
+        >{{$t.value.Cancel}}</el-button>
       </template>
     </el-dialog>
   </div>
@@ -189,6 +189,7 @@
 import { obtainCarOwnerList, addCarOwner, editCarOwner, removeCarOwner } from '@/api/carOwner'
 import { onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { t } from '@/lang/index.js'
 const carOwnerList = reactive([1])
 const carOwnerShow = ref(false)
 const carOwnerTitle = ref('')

web/src/view/parking/parkingInfo.vue

@@ -225,13 +225,14 @@
                 icon="edit"
                 text
                 @click="openChannel('通道编辑', scope.row)"
-              >{{$t.value.modify}}
+              >{{ $t.value.modify }}
               </el-button>
               <el-button
                 type="primary"
                 icon="delete"
                 text
-              >{{$t.value.remove}}
+                @click="removeChannel(scope.row.ID)"
+              >{{ $t.value.remove }}
               </el-button>
             </el-table-column>
           </el-table>
@@ -259,7 +260,7 @@
                 text
                 type="success"
                 @click="openDevice('新增设备','')"
-              >{{$t.value.new}}
+              >{{ $t.value.new }}
               </el-button>
             </el-form-item>
             <el-form-item>
@@ -268,7 +269,7 @@
                 text
                 type="primary"
                 @click="getDeviceList"
-              >{{$t.value.reload}}
+              >{{ $t.value.reload }}
               </el-button>
             </el-form-item>
           </el-form>
@@ -338,14 +339,14 @@
                   icon="edit"
                   text
                   @click="openDevice('编辑设备', scope.row)"
-                >{{$t.value.modify}}
+                >{{ $t.value.modify }}
                 </el-button>
                 <el-button
                   type="primary"
                   icon="delete"
                   text
                   @click="removeDevice(scope.row.ID)"
-                >{{$t.value.remove}}
+                >{{ $t.value.remove }}
                 </el-button>
               </template>
             </el-table-column>
@@ -481,13 +482,13 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="channelShow = false">
-            {{$t.value.Cancel}}
+            {{ $t.value.Cancel }}
           </el-button>
           <el-button
             type="primary"
             @click="channelOperation"
           >
-            {{$t.value.Confirm}}
+            {{ $t.value.Confirm }}
           </el-button>
         </div>
       </template>
@@ -584,12 +585,12 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="deviceShow = false">{{$t.value.Cancel}}</el-button>
+          <el-button @click="deviceShow = false">{{ $t.value.Cancel }}</el-button>
           <el-button
             type="primary"
             @click="deviceOperation"
           >
-            {{$t.value.Confirm}}
+            {{ $t.value.Confirm }}
           </el-button>
         </div>
       </template>
@@ -647,10 +648,12 @@ import {
   addChannel,
   editChannel,
   obtainChannelList,
+  deleteChannel
 } from '@/api/channel'
 import { addDevice, obtainDeviceList, editDevice, deleteDevice, joinDevice } from '@/api/device'
 import { addPullOver, editPullOver, obtainPullOverList, removePullOver } from '@/api/pullOver'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { t } from '@/lang/index.js'
 
 const activeName = ref('detail')
 const handleClick = () => {
@@ -919,6 +922,40 @@ const getChannelList = () => {
   })
 }
 
+const removeChannel = (id) => {
+  ElMessageBox.confirm(
+    t.value.deletePassageTip,
+    t.value.tip,
+    {
+      confirmButtonText: t.value.Confirm,
+      cancelButtonText: t.value.Cancel,
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      deleteChannel(id).then(res => {
+        if (res.code === 0) {
+          ElMessage({
+            type: 'success',
+            message: t.value.deleteSuccess,
+          })
+          getChannelList()
+        } else {
+          ElMessage({
+            type: 'error',
+            message: t.value.deleteFailed,
+          })
+        }
+      })
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: t.value.cancelDelete,
+      })
+    })
+}
+
 // 设备管理...............................................
 const deviceData = reactive({
   id: 0,
@@ -1045,11 +1082,11 @@ const getDeviceList = async() => {
 
 const removeDevice = async(id) => {
   ElMessageBox.confirm(
-    this.$t.deleteDeviceTip,
-    '提示',
+    t.value.deleteDeviceTip,
+    t.value.tip,
     {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
+      confirmButtonText: t.value.Confirm,
+      cancelButtonText: t.value.Cancel,
       type: 'warning',
     }
   )