完善停车区域

web/src/api/device.js

@@ -2,51 +2,59 @@ import service from '@/utils/request'
 
 // 创建设备
 export const addDevice = (data) => {
-    return service({
-        url: '/parking/device/create',
-        method: 'post',
-        data
-    })
+  return service({
+    url: '/parking/device/create',
+    method: 'post',
+    data
+  })
 }
 
 // 更新设备
 export const editDevice = (data) => {
-    return service({
-        url: '/parking/device/update',
-        method: 'put',
-        data
-    })
+  return service({
+    url: '/parking/device/update',
+    method: 'put',
+    data
+  })
 }
 
 // 根据ID获取设备
 export const obtainDeviceId = (id) => {
-    return service({
-        url: '/parking/device/get?id=' + id,
-        method: 'get'
-    })
+  return service({
+    url: '/parking/device/get?id=' + id,
+    method: 'get'
+  })
 }
 
 // 根据编码获取设备
 export const obtainDeviceCode = (code) => {
-    return service({
-        url: '/parking/device/get-by-code?code=' + code,
-        method: 'get'
-    })
+  return service({
+    url: '/parking/device/get-by-code?code=' + code,
+    method: 'get'
+  })
 }
 
 // 获取设备列表
 export const obtainDeviceList = (params) => {
-    return service({
-        url: '/parking/device/list',
-        method: 'get',
-        params
-    })
+  return service({
+    url: '/parking/device/list',
+    method: 'get',
+    params
+  })
 }
 
 // 删除设备
 export const deleteDevice = (id) => {
-    return service({
-        url: '/parking/device/delete?id=' + id,
-        method: 'delete'
-    })
+  return service({
+    url: '/parking/device/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 连接设备
+export const joinDevice = (id) => {
+  return service({
+    url: '/parking/device/connectedDevice?id=' + id,
+    method: 'get'
+  })
 }

web/src/view/parking/parkingInfo.vue

@@ -110,7 +110,10 @@
               align="center"
               prop="description"
             />
-            <el-table-column label="操作" align="center">
+            <el-table-column
+              label="操作"
+              align="center"
+            >
               <template #default="scope">
                 <el-button
                   text
@@ -323,18 +326,13 @@
               align="center"
             >
               <template #default="scope">
-                <el-tooltip
-                  :content="scope.row.description"
-                  placement="top"
-                  effect="light"
-                >
-                  <el-button
-                    type="primary"
-                    icon="edit"
-                    text
-                  >备注
-                  </el-button>
-                </el-tooltip>
+                <el-button
+                  type="primary"
+                  icon="Link"
+                  text
+                  @click="connectDevice(scope.row)"
+                >连接
+                </el-button>
                 <el-button
                   type="primary"
                   icon="edit"
@@ -646,7 +644,7 @@ import {
   editChannel,
   obtainChannelList,
 } from '@/api/channel'
-import { addDevice, obtainDeviceList, editDevice, deleteDevice } from '@/api/device'
+import { addDevice, obtainDeviceList, editDevice, deleteDevice, joinDevice } from '@/api/device'
 import { addPullOver, editPullOver, obtainPullOverList, removePullOver } from '@/api/pullOver'
 import { ElMessage, ElMessageBox } from 'element-plus'
 
@@ -1075,6 +1073,16 @@ const removeDevice = async(id) => {
     })
 }
 
+const connectDevice = async(data) => {
+  await joinDevice(data.ID).then(res => {
+    if (res.code === 0) {
+      ElMessage.success('连接成功')
+    } else {
+      ElMessage.error(res.data.msg)
+    }
+  })
+}
+
 // 停车区域....................................
 const regionList = reactive([])
 // 查询停车区域