diff --git a/src/api/group/group.js b/src/api/group/group.js
new file mode 100644
index 0000000..5293459
--- /dev/null
+++ b/src/api/group/group.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询围栏组列表
+export function listGroup(query) {
+ return request({
+ url: '/vehicle/group/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询围栏组详细
+export function getGroup(id) {
+ return request({
+ url: '/vehicle/group/' + id,
+ method: 'get'
+ })
+}
+
+// 新增围栏组
+export function addGroup(data) {
+ return request({
+ url: '/vehicle/group',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改围栏组
+export function updateGroup(data) {
+ return request({
+ url: '/vehicle/group',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除围栏组
+export function delGroup(id) {
+ return request({
+ url: '/vehicle/group/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/views/amap/tool/index.vue b/src/views/amap/tool/index.vue
index 7597efe..437176f 100644
--- a/src/views/amap/tool/index.vue
+++ b/src/views/amap/tool/index.vue
@@ -3,18 +3,77 @@
绘制多边形
编辑多边形
删除多边形
+ 添加电子围栏
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/busin/index.vue b/src/views/business/busin/index.vue
index dbe889e..5515b63 100644
--- a/src/views/business/busin/index.vue
+++ b/src/views/business/busin/index.vue
@@ -134,46 +134,73 @@
-
+
+
-
- 姓名: {{ scope.row.name }}
- 住址: {{ scope.row.address }}
-
- {{ scope.row.name }}
-
-
+ {{ scope.row.id }}
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ scope.row.businessPerson }}
+
+
+
+
+ {{ scope.row.businessLincenseNumber }}
-
-
-
-
-
{{ parseTime(scope.row.businessCreateTime, '{y}-{m}-{d}') }}
-
-
-
-
-
-
+
+
+ {{ scope.row.businessPhone }}
+
+
+
+
+ {{ scope.row.businessEmail }}
+
+
+
+
+ 待认证
+ 待开通服务
+
+
{{ parseTime(scope.row.businessRegistrationDate, '{y}-{m}-{d}') }}
-
-
+
+
+
+ 免费服务
+ VIP服务
+ 超级VIP服务
+
+
+
+ 认证
+
修改
- 认证
+
{
this.businessList = response.data.rows;
- this.total = response.total;
+ this.total = response.data.total;
this.loading = false;
});
},
diff --git a/src/views/fen/fence/index.vue b/src/views/fen/fence/index.vue
index 49589b7..46d3209 100644
--- a/src/views/fen/fence/index.vue
+++ b/src/views/fen/fence/index.vue
@@ -49,14 +49,14 @@
- 新增
+
+
+
+
+
+
+
+
+
- 修改
+
+
+
+
+
+
+
{
- this.fenceList = response.rows;
- this.total = response.total;
+ this.fenceList = response.data.rows;
+ this.total = response.data.total;
this.loading = false;
});
},
diff --git a/src/views/gro/group/index.vue b/src/views/gro/group/index.vue
new file mode 100644
index 0000000..8b6919a
--- /dev/null
+++ b/src/views/gro/group/index.vue
@@ -0,0 +1,276 @@
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/vehicle/veh/index.vue b/src/views/vehicle/veh/index.vue
index d2d66a3..15962b6 100644
--- a/src/views/vehicle/veh/index.vue
+++ b/src/views/vehicle/veh/index.vue
@@ -123,6 +123,7 @@
+
@@ -169,6 +170,9 @@
+
+
+
@@ -228,6 +232,7 @@ export default {
number: null,
typeId: null,
electonicId: null,
+ groupId: null,
motor: null,
battery: null,
motorNumber: null,
@@ -250,7 +255,7 @@ export default {
this.loading = true;
listVehicle(this.queryParams).then(response => {
this.vehicleList = response.data.rows;
- this.total = response.total;
+ this.total = response.data.total;
this.loading = false;
});
},
@@ -266,6 +271,7 @@ export default {
number: null,
typeId: null,
electonicId: null,
+ groupId: null,
motor: null,
battery: null,
motorNumber: null,