Three_Group
/
ZhiLian-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:围栏，围栏组，高德

profession
hbr 2024-06-02 15:11:47 +08:00
parent ec9c24be10
commit 1a3cb46396
6 changed files with 475 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/api/group/group.js 100644
View File

@ -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'
})
}

79
src/views/amap/tool/index.vue
View File

@ -3,18 +3,77 @@
<el-button type="primary" @click="drawRectangle">绘制多边形</el-button>
<el-button type="primary" @click="editRectangle">编辑多边形</el-button>
<el-button type="primary" @click="deleRectangle">删除多边形</el-button>
<el-button type="primary" @click="handleAdd">添加电子围栏</el-button>
<div id="amapContainer"></div>
<!-- 添加或修改围栏对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="围栏名称" prop="name">
<el-input v-model="form.name" placeholder="请输入围栏名称" />
</el-form-item>
<!-- <el-form-item label="围栏经纬" prop="fenceLongitudeLatitude">-->
<!-- <el-input v-model="form.fenceLongitudeLatitude" placeholder="请输入围栏经纬" />-->
<!-- </el-form-item>-->
<el-form-item label="围栏备注" prop="fenceDescription">
<el-input v-model="form.fenceDescription" placeholder="请输入围栏备注" />
</el-form-item>
<el-form-item label="围栏猪ID" prop="fenceDescription">
<el-input v-model="form.groupId" placeholder="请输入围栏猪ID" />
</el-form-item>
<!-- <el-form-item label="是否删除 0 不删除 1删除" prop="isDelete">-->
<!-- <el-input v-model="form.isDelete" placeholder="请输入是否删除 0 不删除 1删除" />-->
<!-- </el-form-item>-->
<el-form-item label="围栏状态" prop="fenceState">
<el-input v-model="form.fenceState" placeholder="请输入围栏状态" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="addRectangle">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {addFence} from "@/api/fence/fence";
export default {
name: 'amapFence',
computed: {
rules() {
return rules
}
},
data () {
return {
rules: {
},
title: "",
form: {},
open: false,
path: [], // 当前绘制的多边形经纬度数组
polygonItem: [], // 地图上绘制的所有多边形对象
polyEditors: [] // 所有编辑对象数组
polyEditors: [] ,// 所有编辑对象数组
reset() {
this.form = {
id: null,
name: null,
fenceLongitudeLatitude: null,
fenceDescription: null,
groupId: null,
isDelete: null,
fenceState: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
}
},
props: {
@ -131,6 +190,24 @@ export default {
});
this.map.clearMap(); // 删除地图所有覆盖物
},
handleAdd(){
this.reset();
this.open = true;
this.title = "添加围栏";
},
addRectangle(){
this.form.path=this.path
console.log(this.fDorm)
addFence(this.form).then(res=>{
console.log(res)
})
//取消编辑状态
this.polyEditors.forEach(v => {
v.close();
});
this.map.clearMap();
}
}
}
</script>

82
src/views/business/busin/index.vue
View File

@ -134,46 +134,73 @@
</el-row>
<el-table v-loading="loading" :data="businessList" @selection-change="handleSelectionChange">
<el-table-column
label="姓名"
width="180">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="企业主键" width="180">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
<p>姓名: {{ scope.row.name }}</p>
<p>住址: {{ scope.row.address }}</p>
<div slot="reference" class="name-wrapper">
<el-tag size="medium">{{ scope.row.name }}</el-tag>
</div>
</el-popover>
<el-tag size="medium">{{ scope.row.id }}</el-tag>
</template>
</el-table-column>
<el-table-column label="企业名称" width="180">
<template slot-scope="scope">
<el-tag size="medium">{{ scope.row.name }}</el-tag>
</template>
</el-table-column>
<el-table-column label="企业法定代表人" width="180">
<template slot-scope="scope">
<el-tag size="medium">{{ scope.row.businessPerson }}</el-tag>
</template>
</el-table-column>
<el-table-column label="营业编码" width="180">
<template slot-scope="scope">
<el-tag size="medium">{{ scope.row.businessLincenseNumber }}</el-tag>
</template>
</el-table-column>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="企业主键" align="center" prop="id" />
<el-table-column label="企业名称" align="center" prop="name" />
<el-table-column label="企业法定代表人" align="center" prop="businessPerson" />
<el-table-column label="营业编码" align="center" prop="businessLincenseNumber" />
<el-table-column label="企业创建时间" align="center" prop="businessCreateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.businessCreateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="企业电话" align="center" prop="businessPhone" />
<el-table-column label="企业邮箱" align="center" prop="businessEmail" />
<el-table-column v-if="businessStates==1" label="企业状态" align="center" prop="注入中" />
<el-table-column v-if="businessStates==2" label="企业状态" align="center" prop="认证中" />
<el-table-column v-if="businessStates==3" label="企业状态" align="center" prop="服务中" />
<el-table-column label="企业电话" width="180">
<template slot-scope="scope">
<el-tag size="medium">{{ scope.row.businessPhone }}</el-tag>
</template>
</el-table-column>
<el-table-column label="企业邮箱" width="180">
<template slot-scope="scope">
<el-tag size="medium">{{ scope.row.businessEmail }}</el-tag>
</template>
</el-table-column>
<el-table-column label="企业状态" width="180">
<template slot-scope="scope">
<span v-if="scope.row.businessStates==0" >待认证</span>
<span v-if="scope.row.businessStates==1" >待开通服务</span>
</template>
</el-table-column>
<el-table-column label="入驻车联网平台时间" align="center" prop="businessRegistrationDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.businessRegistrationDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="服务等级" align="center" prop="serviceLevel" />
<el-table-column label="认证等级" align="center" prop="authentication" />
<el-table-column label="服务等级" width="180">
<template slot-scope="scope">
<span v-if="scope.row.serviceLevel==0" >免费服务</span>
<span v-if="scope.row.serviceLevel==1" >VIP服务</span>
<span v-if="scope.row.serviceLevel==2" >超级VIP服务</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button v-if="scope.row.businessStates==0"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdateRen(scope.row)"
>认证</el-button>
<el-button
size="mini"
type="text"
@ -181,12 +208,7 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['system:business:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdateRen(scope.row)"
>认证</el-button>
<el-button
size="mini"
type="text"
@ -324,7 +346,7 @@ export default {
this.loading = true;
listBusiness(this.queryParams).then(response => {
this.businessList = response.data.rows;
this.total = response.total;
this.total = response.data.total;
this.loading = false;
});
},

35
src/views/fen/fence/index.vue
View File

@ -49,14 +49,14 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:fence:add']"
>新增</el-button>
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['system:fence:add']"-->
<!-- >新增</el-button>-->
</el-col>
<el-col :span="1.5">
<el-button
@ -98,19 +98,20 @@
<el-table-column label="围栏主键" align="center" prop="id" />
<el-table-column label="围栏名称" align="center" prop="name" />
<el-table-column label="围栏经纬" align="center" prop="fenceLongitudeLatitude" />
<el-table-column label="围栏组ID" align="center" prop="groupId" />
<el-table-column label="围栏备注" align="center" prop="fenceDescription" />
<el-table-column label="是否删除 0 不删除 1删除" align="center" prop="isDelete" />
<el-table-column label="围栏状态" align="center" prop="fenceState" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:fence:edit']"
>修改</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['system:fence:edit']"-->
<!-- >修改</el-button>-->
<el-button
size="mini"
type="text"
@ -210,8 +211,8 @@ export default {
getList() {
this.loading = true;
listFence(this.queryParams).then(response => {
this.fenceList = response.rows;
this.total = response.total;
this.fenceList = response.data.rows;
this.total = response.data.total;
this.loading = false;
});
},

276
src/views/gro/group/index.vue 100644
View File

@ -0,0 +1,276 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="围栏组名称" prop="groupName">
<el-input
v-model="queryParams.groupName"
placeholder="请输入围栏组名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="修改时间" prop="updateTime">
<el-date-picker clearable
v-model="queryParams.updateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择修改时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:group:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:group:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:group:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:group:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="groupList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="围栏组ID" align="center" prop="id" />
<el-table-column label="围栏组名称" align="center" prop="groupName" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="修改时间" align="center" prop="updateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:group:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:group:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改围栏组对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="围栏组名称" prop="groupName">
<el-input v-model="form.groupName" placeholder="请输入围栏组名称" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="修改时间" prop="updateTime">
<el-date-picker clearable
v-model="form.updateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择修改时间">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listGroup, getGroup, delGroup, addGroup, updateGroup } from "@/api/group/group";
export default {
name: "Group",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 围栏组表格数据
groupList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
groupName: null,
updateTime: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询围栏组列表 */
getList() {
this.loading = true;
listGroup(this.queryParams).then(response => {
this.groupList = response.data.rows;
this.total = response.data.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
groupName: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加围栏组";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getGroup(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改围栏组";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateGroup(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addGroup(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除围栏组编号为"' + ids + '"的数据项？').then(function() {
return delGroup(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/group/export', {
...this.queryParams
}, `group_${new Date().getTime()}.xlsx`)
}
}
};
</script>

8
src/views/vehicle/veh/index.vue
View File

@ -123,6 +123,7 @@
<el-table-column label="车辆vin" align="center" prop="number" />
<el-table-column label="车辆类型" align="center" prop="typeId" />
<el-table-column label="电子围栏ID" align="center" prop="electonicId" />
<el-table-column label="围栏组ID" align="center" prop="groupId" />
<el-table-column label="电机厂商" align="center" prop="motor" />
<el-table-column label="电池厂商" align="center" prop="battery" />
<el-table-column label="电机编号" align="center" prop="motorNumber" />
@ -169,6 +170,9 @@
<el-form-item label="电子围栏ID" prop="electonicId">
<el-input v-model="form.electonicId" placeholder="请输入电子围栏ID" />
</el-form-item>
<el-form-item label="围栏组ID" prop="electonicId">
<el-input v-model="form.groupId" placeholder="请输入围栏组ID" />
</el-form-item>
<el-form-item label="电机厂商" prop="motor">
<el-input v-model="form.motor" placeholder="请输入电机厂商" />
</el-form-item>
@ -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,