Compare commits
No commits in common. "master" and "ui_2024_3_26_chenshengjie" have entirely different histories.
master
...
ui_2024_3_
|
|
@ -36,7 +36,6 @@
|
|||
"url": "https://gitee.com/y_project/MuYu-Cloud.git"
|
||||
},
|
||||
"dependencies": {
|
||||
"@amap/amap-jsapi-loader": "^1.0.1",
|
||||
"@riophae/vue-treeselect": "0.4.0",
|
||||
"axios": "0.24.0",
|
||||
"clipboard": "2.0.8",
|
||||
|
|
@ -47,10 +46,8 @@
|
|||
"fuse.js": "6.4.3",
|
||||
"highlight.js": "9.18.5",
|
||||
"js-beautify": "1.13.0",
|
||||
"js-cookie": "^3.0.1",
|
||||
"js-cookie": "3.0.1",
|
||||
"jsencrypt": "3.0.0-rc.1",
|
||||
"less-loader": "^12.2.0",
|
||||
"maptalks": "^1.0.0-rc.33",
|
||||
"nprogress": "0.2.0",
|
||||
"quill": "1.3.7",
|
||||
"screenfull": "5.0.2",
|
||||
|
|
@ -72,7 +69,7 @@
|
|||
"chalk": "4.1.0",
|
||||
"compression-webpack-plugin": "5.0.2",
|
||||
"connect": "3.6.6",
|
||||
"eslint": "^7.15.0",
|
||||
"eslint": "7.15.0",
|
||||
"eslint-plugin-vue": "7.2.0",
|
||||
"lint-staged": "10.5.3",
|
||||
"runjs": "4.4.2",
|
||||
|
|
@ -80,7 +77,6 @@
|
|||
"sass-loader": "10.1.1",
|
||||
"script-ext-html-webpack-plugin": "2.1.5",
|
||||
"svg-sprite-loader": "5.1.1",
|
||||
"vue-amap": "^0.5.10",
|
||||
"vue-template-compiler": "2.6.12"
|
||||
},
|
||||
"engines": {
|
||||
|
|
|
|||
|
|
@ -1,15 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<!-- <script type="text/javascript">-->
|
||||
<!-- window._AMapSecurityConfig = {-->
|
||||
<!-- securityJsCode: "e4ec82d19a5e0c7a7298911f1e2cd2f1",-->
|
||||
<!-- }-->
|
||||
<!-- </script>-->
|
||||
<!-- <script src="https://webapi.amap.com/loader.js"></script>-->
|
||||
<!-- <script type="text/javascript"-->
|
||||
<!-- src="https://webapi.amap.com/maps?v=2.0&key=1666544c7b614ba063b4c58d5c148248">-->
|
||||
<!-- </script>-->
|
||||
<meta charset="utf-8">
|
||||
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
|
||||
<meta content="webkit" name="renderer">
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
import request from "@/utils/request";
|
||||
import fence from "@/views/system/fence/index.vue";
|
||||
|
||||
/**
|
||||
* 围栏列表
|
||||
* @param data
|
||||
* @returns {*}
|
||||
*/
|
||||
export function fenceList(data){
|
||||
return request({
|
||||
url:'/business/fence/list',
|
||||
method:"post",
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增围栏
|
||||
* @param data
|
||||
* @returns {*}
|
||||
*/
|
||||
export function fenceAdd(data) {
|
||||
return request({
|
||||
url: '/business/fence/fenceAdd',
|
||||
method: 'post',
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除围栏
|
||||
* @param fenceId
|
||||
* @returns {*}
|
||||
*/
|
||||
export function fenceDelete(fenceId) {
|
||||
return request({
|
||||
url: '/business/fence/fenceDelete/'+fenceId,
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 修改围栏
|
||||
* @param data
|
||||
* @returns {*}
|
||||
*/
|
||||
export function fenceUpdate(data) {
|
||||
return request({
|
||||
url: '/business/fence/fenceUpdate',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function fenceUpdateMap(data) {
|
||||
return request({
|
||||
url: '/business/fence/fenceUpdateMap',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
import request from "@/utils/request";
|
||||
import fence from "@/views/system/fence/index.vue";
|
||||
|
||||
/**
|
||||
* 标识列表
|
||||
* @param data
|
||||
* @returns {*}
|
||||
*/
|
||||
export function markersList(data){
|
||||
return request({
|
||||
url:'/business/markers/list',
|
||||
method:"post",
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增标识
|
||||
* @param data
|
||||
* @returns {*}
|
||||
*/
|
||||
export function markersInsert(data) {
|
||||
return request({
|
||||
url: '/business/markers/insert',
|
||||
method: 'post',
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 绑定围栏
|
||||
* @param data
|
||||
* @returns {AxiosPromise}
|
||||
*/
|
||||
export function insertMarkersFence(data) {
|
||||
return request({
|
||||
url: '/business/markers/insertMarkersFence',
|
||||
method: 'post',
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除标识
|
||||
* @param markersId
|
||||
* @returns {*}
|
||||
*/
|
||||
export function markersDelete(markersId) {
|
||||
return request({
|
||||
url: '/business/markers/delete/'+markersId,
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除标识
|
||||
* @param markersId
|
||||
* @returns {*}
|
||||
*/
|
||||
export function markersFenceList(markersId) {
|
||||
return request({
|
||||
url: '/business/markers/markersFenceList/'+markersId,
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 修改标识
|
||||
* @param data
|
||||
* @returns {*}
|
||||
*/
|
||||
export function markersUpdate(data) {
|
||||
return request({
|
||||
url: '/business/markers/update',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -127,7 +127,7 @@ export function updateAuthRole(data) {
|
|||
}
|
||||
|
||||
// 查询部门下拉树结构
|
||||
export function deptTreeSelect(data) {
|
||||
export function deptTreeSelect() {
|
||||
return request({
|
||||
url: '/system/user/deptTree',
|
||||
method: 'get'
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
import request from "@/utils/request";
|
||||
import fence from "@/views/system/fence/index.vue";
|
||||
|
||||
/**
|
||||
* 标识列表
|
||||
* @param data
|
||||
* @returns {*}
|
||||
*/
|
||||
export function vehicleList(data){
|
||||
return request({
|
||||
url:'/business/vehicle/list',
|
||||
method:"post",
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增标识
|
||||
* @param data
|
||||
* @returns {*}
|
||||
*/
|
||||
export function vehicleInsert(data) {
|
||||
return request({
|
||||
url: '/business/vehicle/vehicleInsert',
|
||||
method: 'post',
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 绑定围栏
|
||||
* @param data
|
||||
* @returns {AxiosPromise}
|
||||
*/
|
||||
export function insertMarkersFence(data) {
|
||||
return request({
|
||||
url: '/business/vehicle/insertMarkersFence',
|
||||
method: 'post',
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除标识
|
||||
* @param fenceId
|
||||
* @returns {*}
|
||||
*/
|
||||
export function vehicleDelete(fenceId) {
|
||||
return request({
|
||||
url: '/business/vehicle/vehicleDelete/'+fenceId,
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 修改标识
|
||||
* @param data
|
||||
* @returns {*}
|
||||
*/
|
||||
export function vehicleUpdate(data) {
|
||||
return request({
|
||||
url: '/business/vehicle/vehicleUpdate',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -38,9 +38,6 @@ import VueMeta from 'vue-meta'
|
|||
// 字典数据组件
|
||||
import DictData from '@/components/DictData'
|
||||
|
||||
|
||||
Vue.prototype.$cookies = Cookies; // 注入到Vue原型链上
|
||||
|
||||
// 全局方法挂载
|
||||
Vue.prototype.getDicts = getDicts
|
||||
Vue.prototype.getConfigKey = getConfigKey
|
||||
|
|
|
|||
|
|
@ -73,48 +73,6 @@ export const constantRoutes = [
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: '',
|
||||
component: Layout,
|
||||
redirect: 'index',
|
||||
children: [
|
||||
{
|
||||
path: '/fence',
|
||||
component: () => import('@/views/system/fence/index'),
|
||||
name: 'Index',
|
||||
meta: {title: '电子围栏', icon: 'fence'}
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
path: '',
|
||||
component: Layout,
|
||||
redirect: 'index',
|
||||
children: [
|
||||
{
|
||||
path: '/markers',
|
||||
component: () => import('@/views/system/markers/index'),
|
||||
name: 'Index',
|
||||
meta: {title: '车辆标识', icon: 'markers'}
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
path: '',
|
||||
component: Layout,
|
||||
redirect: 'index',
|
||||
children: [
|
||||
{
|
||||
path: '/vehicle',
|
||||
component: () => import('@/views/system/vehicle/index'),
|
||||
name: 'Index',
|
||||
meta: {title: '车辆管理', icon: 'vehicle'}
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
path: '/user',
|
||||
component: Layout,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
import {getInfo, login, logout, refreshToken} from '@/api/login'
|
||||
import {getToken, removeToken, setExpiresIn, setToken} from '@/utils/auth'
|
||||
import Cookies from "js-cookie";
|
||||
|
||||
const user = {
|
||||
state: {
|
||||
|
|
@ -8,7 +7,6 @@ const user = {
|
|||
id: '',
|
||||
name: '',
|
||||
avatar: '',
|
||||
companySign: '',
|
||||
roles: [],
|
||||
permissions: []
|
||||
},
|
||||
|
|
@ -34,10 +32,6 @@ const user = {
|
|||
},
|
||||
SET_PERMISSIONS: (state, permissions) => {
|
||||
state.permissions = permissions
|
||||
},
|
||||
SET_COMPANY: (state, companySign) => {
|
||||
state.companySign = companySign
|
||||
Cookies.set('companySign', companySign)
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -66,7 +60,6 @@ const user = {
|
|||
GetInfo({commit, state}) {
|
||||
return new Promise((resolve, reject) => {
|
||||
getInfo().then(res => {
|
||||
// debugger
|
||||
const user = res.data.user
|
||||
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
|
||||
if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
|
||||
|
|
@ -77,8 +70,6 @@ const user = {
|
|||
}
|
||||
commit('SET_ID', user.userId)
|
||||
commit('SET_NAME', user.userName)
|
||||
let de = user.dept
|
||||
commit('SET_COMPANY',de.companySign)
|
||||
commit('SET_AVATAR', avatar)
|
||||
resolve(res)
|
||||
}).catch(error => {
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ service.interceptors.request.use(config => {
|
|||
|
||||
// 响应拦截器
|
||||
service.interceptors.response.use(res => {
|
||||
// debugger
|
||||
debugger
|
||||
// 未设置状态码则默认成功状态
|
||||
const code = res.data.code || 200;
|
||||
// 获取错误信息
|
||||
|
|
|
|||
|
|
@ -1,15 +1,7 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
|
||||
<!-- <el-form-item label="企业名称" prop="companySign">-->
|
||||
<!-- <treeselect-->
|
||||
<!-- v-model="queryParams.companySign"-->
|
||||
<!-- :options="deptOptions"-->
|
||||
<!-- :show-count="true"-->
|
||||
<!-- placeholder="请选择上级部门"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="名称" prop="deptName">
|
||||
<el-form-item label="部门名称" prop="deptName">
|
||||
<el-input
|
||||
v-model="queryParams.deptName"
|
||||
clearable
|
||||
|
|
@ -34,17 +26,6 @@
|
|||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5" v-if="'ZL' === this.$cookies.get('companySign')">
|
||||
<el-button
|
||||
v-hasPermi="['system:dept:add']"
|
||||
icon="el-icon-plus"
|
||||
plain
|
||||
size="mini"
|
||||
type="primary"
|
||||
@click="handleAddEnterprise"
|
||||
>企业入驻
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
v-hasPermi="['system:dept:add']"
|
||||
|
|
@ -78,7 +59,7 @@
|
|||
row-key="deptId"
|
||||
>
|
||||
<el-table-column label="部门名称" prop="deptName" width="260"></el-table-column>
|
||||
<el-table-column label="企业标识" prop="companySign" width="200"></el-table-column>
|
||||
<el-table-column label="排序" prop="orderNum" width="200"></el-table-column>
|
||||
<el-table-column label="状态" prop="status" width="100">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
||||
|
|
@ -120,69 +101,6 @@
|
|||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
||||
<!-- 企业入驻对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="openCompany" append-to-body width="600px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="企业名称" prop="deptName">
|
||||
<el-input v-model="form.deptName" placeholder="请输入企业名称"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="显示排序" prop="orderNum">
|
||||
<el-input-number v-model="form.orderNum" :min="0" controls-position="right"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="负责人" prop="leader">
|
||||
<el-input v-model="form.leader" maxlength="20" placeholder="请输入负责人"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item label="联系电话" prop="phone">
|
||||
<el-input v-model="form.phone" maxlength="11" placeholder="请输入联系电话"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="邮箱" prop="email">
|
||||
<el-input v-model="form.email" maxlength="50" placeholder="请输入邮箱"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="企业状态">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{ dict.label }}
|
||||
</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="企业标识" prop="leader">
|
||||
<el-input v-model="form.companySign" maxlength="20" placeholder="请输入企业标识"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</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>
|
||||
|
||||
|
||||
<!-- 添加或修改部门对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" append-to-body width="600px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
|
|
@ -250,7 +168,6 @@
|
|||
import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from "@/api/system/dept";
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
import Cookies from "js-cookie";
|
||||
|
||||
export default {
|
||||
name: "Dept",
|
||||
|
|
@ -270,15 +187,12 @@ export default {
|
|||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 是否显示企业入驻对话框
|
||||
openCompany:false,
|
||||
// 是否展开，默认全部展开
|
||||
isExpandAll: true,
|
||||
// 重新渲染表格状态
|
||||
refreshTable: true,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
companySign: undefined,
|
||||
deptName: undefined,
|
||||
status: undefined
|
||||
},
|
||||
|
|
@ -290,7 +204,7 @@ export default {
|
|||
{required: true, message: "上级部门不能为空", trigger: "blur"}
|
||||
],
|
||||
deptName: [
|
||||
{required: true, message: "部门/企业名称不能为空", trigger: "blur"}
|
||||
{required: true, message: "部门名称不能为空", trigger: "blur"}
|
||||
],
|
||||
orderNum: [
|
||||
{required: true, message: "显示排序不能为空", trigger: "blur"}
|
||||
|
|
@ -316,7 +230,6 @@ export default {
|
|||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
Cookies,
|
||||
/** 查询部门列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
|
|
@ -369,7 +282,6 @@ export default {
|
|||
this.reset();
|
||||
if (row != undefined) {
|
||||
this.form.parentId = row.deptId;
|
||||
this.form.companySign = row.companySign;
|
||||
}
|
||||
this.open = true;
|
||||
this.title = "添加部门";
|
||||
|
|
@ -377,16 +289,6 @@ export default {
|
|||
this.deptOptions = this.handleTree(response.data, "deptId");
|
||||
});
|
||||
},
|
||||
/** 企业入驻操作 */
|
||||
handleAddEnterprise(row) {
|
||||
this.reset();
|
||||
this.form.parentId = 0;
|
||||
this.openCompany = true;
|
||||
this.title = "企业入驻";
|
||||
listDept().then(response => {
|
||||
this.deptOptions = this.handleTree(response.data, "deptId");
|
||||
});
|
||||
},
|
||||
/** 展开/折叠操作 */
|
||||
toggleExpandAll() {
|
||||
this.refreshTable = false;
|
||||
|
|
|
|||
|
|
@ -1,403 +0,0 @@
|
|||
<template>
|
||||
<div>
|
||||
|
||||
<div v-if="showMapp">
|
||||
<el-form :inline="true" :model="queryParams" class="demo-form-inline">
|
||||
|
||||
<el-form-item label="围栏名称">
|
||||
<el-input v-model="queryParams.fenceName" placeholder="模糊查询围栏名称"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="围栏类型">
|
||||
<el-select v-model="queryParams.fenceTypeId" placeholder="请选择围栏类型">
|
||||
<el-option label="驶出" value="1">驶出</el-option>
|
||||
<el-option label="驶入" value="2">驶入</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="围栏状态">
|
||||
<el-select v-model="queryParams.fenceState" placeholder="请选择围栏状态">
|
||||
<el-option label="正常" value="1">正常</el-option>
|
||||
<el-option label="停用" value="2">停用</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="onSubmit" icon="el-icon-search">搜索</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-button type="primary" plain icon="el-icon-plus" @click="fencadd">新增</el-button>
|
||||
|
||||
<el-table :data="fenceList" style="width: 100%" ref="multipleTable">
|
||||
|
||||
<el-table-column label="围栏名称" align="center" prop="fenceName" />
|
||||
|
||||
<el-table-column label="围栏类型"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px" v-if="scope.row.fenceTypeId==1">驶出</span>
|
||||
<span style="margin-left: 10px" v-if="scope.row.fenceTypeId==2">驶入</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="围栏状态"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px" v-if="scope.row.fenceState==1"><el-tag>正常</el-tag></span>
|
||||
<span style="margin-left: 10px" v-if="scope.row.fenceState==2"><el-tag>停用</el-tag></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="经纬度信息" width="280">
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px">{{ scope.row.fenceMessage }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
<el-table-column label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-link type="primary" icon="el-icon-map-location" @click="handleWdit(scope.row)">编辑围栏</el-link>
|
||||
|
||||
<el-link type="primary" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-link>
|
||||
|
||||
<el-link type="primary" icon="el-icon-delete" @click="handleDelete(scope.row.fenceId)">删除</el-link>
|
||||
</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="dialogFormVisible">
|
||||
|
||||
<el-form :model="fences">
|
||||
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="fences.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="围栏类型" :label-width="formLabelWidth">
|
||||
<el-select v-model="fences.fenceTypeId" placeholder="请选择活动区域">
|
||||
<el-option label="驶出" value="1">驶出</el-option>
|
||||
<el-option label="驶入" value="2">驶入</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
</el-form>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogFormVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="addAll">新增</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
<!-- 修改电子围栏-->
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible1">
|
||||
|
||||
<el-form :model="fences">
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth1">
|
||||
<el-input v-model="fences.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="围栏类型" :label-width="formLabelWidth1">
|
||||
<el-select v-model="fences.fenceTypeId" placeholder="请选择活动区域">
|
||||
<el-option label="驶出" value="1">驶出</el-option>
|
||||
<el-option label="驶入" value="2">驶入</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="围栏状态">
|
||||
<el-radio-group v-model="fences.fenceState" :label-width="formLabelWidth1">
|
||||
<el-radio :label="1">正常</el-radio>
|
||||
<el-radio :label="2">停用</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogFormVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="updateAll">修 改</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
<el-button @click="drawPolygon">绘制围栏</el-button>
|
||||
<!-- <el-button @click="saveFenceData">保存围栏</el-button>-->
|
||||
<el-button @click="cleanFence">清除围栏</el-button>
|
||||
|
||||
<div id="container" v-if="showMap"></div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import AMapLoader from '@amap/amap-jsapi-loader';
|
||||
//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
|
||||
//例如：import 《组件名称》 from '《组件路径》,
|
||||
import {fenceAdd, fenceDelete, fenceList, fenceUpdate, fenceUpdateMap} from "@/api/system/fence";
|
||||
import mouseTool from "quill";
|
||||
export default {
|
||||
name: "map-view",
|
||||
//生命周期 - 挂载完成（可以访问DOM元素）",
|
||||
mounted() {
|
||||
this.initAMap();
|
||||
},
|
||||
//import引入的组件需要注入到对象中才能使用"
|
||||
components: {},
|
||||
props: {},
|
||||
data() {
|
||||
//这里存放数据"
|
||||
|
||||
return {
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
fenceName: null,
|
||||
fenceTypeId: null,
|
||||
fenceState: null,
|
||||
},
|
||||
total:0,
|
||||
dialogFormVisible:false,
|
||||
formLabelWidth:'120px',
|
||||
fences:{
|
||||
|
||||
},
|
||||
title:'',
|
||||
dialogFormVisible1:false,
|
||||
formLabelWidth1:'120px',
|
||||
dj:false,
|
||||
mouseTool:null,
|
||||
map:null,
|
||||
Amap:null,
|
||||
|
||||
//跳转地图页面
|
||||
showMap:false,
|
||||
showMapp:true,
|
||||
|
||||
fenceList: [],
|
||||
|
||||
//保存围栏
|
||||
mapRequest:{
|
||||
fenceId:0,
|
||||
jwd:[]
|
||||
}
|
||||
|
||||
};
|
||||
},
|
||||
//计算属性 类似于data概念",
|
||||
computed: {},
|
||||
//监控data中的数据变化",
|
||||
watch: {},
|
||||
//方法集合",
|
||||
methods: {
|
||||
//获取围栏列表
|
||||
getList() {
|
||||
this.loading = true;
|
||||
fenceList(this.queryParams).then(res => {
|
||||
this.fenceList = res.data.rows;
|
||||
this.total = res.data.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 搜索框
|
||||
onSubmit() {
|
||||
this.getList()
|
||||
},
|
||||
|
||||
//修改电子围栏
|
||||
handleEdit(obj) {
|
||||
this.dialogFormVisible1 = true
|
||||
this.fences = obj
|
||||
this.title = '修改电子围栏'
|
||||
|
||||
},
|
||||
|
||||
|
||||
updateAll() {
|
||||
fenceUpdate(this.fences).then(
|
||||
res => {
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
)
|
||||
this.dialogFormVisible1=false;
|
||||
},
|
||||
//新增
|
||||
fencadd() {
|
||||
this.fences = {}
|
||||
this.dialogFormVisible = true
|
||||
this.title = '新增页面'
|
||||
},
|
||||
|
||||
|
||||
addAll() {
|
||||
fenceAdd(this.fences).then(
|
||||
res => {
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
)
|
||||
this.dialogFormVisible = false
|
||||
},
|
||||
|
||||
|
||||
//删除电子围栏
|
||||
handleDelete(fenceId){
|
||||
fenceDelete(fenceId,'deleted').then(
|
||||
res=>{
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
)
|
||||
},
|
||||
|
||||
|
||||
//编辑围栏
|
||||
handleWdit(obj) {
|
||||
this.showMap=true
|
||||
this.showMapp=false
|
||||
this.fences = obj
|
||||
this.initAMap()
|
||||
},
|
||||
|
||||
|
||||
//初始化地图
|
||||
initAMap(){
|
||||
|
||||
AMapLoader.load({
|
||||
key:"1666544c7b614ba063b4c58d5c148248",
|
||||
version:"2.0",
|
||||
plugins:["AMap.Scale","AMap.MouseTool"],
|
||||
})
|
||||
.then((AMap)=>{
|
||||
this.Amap=AMap;
|
||||
this.map=new AMap.Map("container",{
|
||||
//设置地图容器ID
|
||||
viewMode:"2D",
|
||||
zoom:11,
|
||||
center: [116.397428, 39.90923],
|
||||
});
|
||||
|
||||
this.mouseTool=new AMap.MouseTool(this.map);
|
||||
this.mouseTool.on('draw', this.drawReady)
|
||||
})
|
||||
.catch((e)=>{
|
||||
console.log(e);
|
||||
});
|
||||
},
|
||||
|
||||
drawPolygon () {
|
||||
this.mouseTool.polygon({
|
||||
strokeColor: "#FF33FF",
|
||||
strokeOpacity: 1,
|
||||
strokeWeight: 6,
|
||||
strokeOpacity: 0.2,
|
||||
fillColor: '#1791fc',
|
||||
fillOpacity: 0.4,
|
||||
// 线样式还支持 'dashed'
|
||||
strokeStyle: "solid",
|
||||
// strokeStyle是dashed时有效
|
||||
strokeDasharray: [30,10],
|
||||
})
|
||||
},
|
||||
|
||||
// 在 drawReady 方法中获取绘制的围栏的经纬度信息
|
||||
drawReady(event){
|
||||
console.log(event)
|
||||
console.log(event.obj.getPath())
|
||||
const coordinates = event.obj.getPath()
|
||||
|
||||
const coordinatesString = coordinates.map(coord => `${coord.lng},${coord.lat}`).join(';');
|
||||
console.log(coordinatesString);
|
||||
this.fences.fenceMessage = coordinatesString;
|
||||
|
||||
|
||||
|
||||
console.info('覆盖物对象绘制完成')
|
||||
|
||||
// // 获取绘制的围栏经纬度信息
|
||||
// const path =event.obj.getPath()
|
||||
// // 将经纬度信息保存到 scope.row.fenceMessage 中
|
||||
// this.tableData.forEach(item=>{
|
||||
// if(item.fenceId === event.obj.fenceId){ // 假设 fenceId 是围栏的唯一标识符
|
||||
// item.fenceMessage = path.toString(); // 这里使用 toString() 方法将路径转换为字符串形式
|
||||
// }
|
||||
// })
|
||||
fenceUpdateMap(this.fences).then(res=>{
|
||||
// this.$modal.msgSuccess("保存成功")
|
||||
this.getList()
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
//清除围栏
|
||||
cleanFence(){
|
||||
this.mouseTool.close(true)
|
||||
},
|
||||
|
||||
// //保存围栏
|
||||
// saveFenceData(){
|
||||
// console.log(this.mapRequest.jwd)
|
||||
// saveFence(this.mapRequest).then(response=>{
|
||||
// // this.$modal.msgSuccess("保存成功")
|
||||
// })
|
||||
// },
|
||||
|
||||
|
||||
|
||||
},
|
||||
|
||||
//生命周期 - 创建完成（可以访问当前this实例）",
|
||||
created() {
|
||||
// this.list();
|
||||
this.getList();
|
||||
// this.mapRequest.fenceId=this.$router.query.fenceId
|
||||
},
|
||||
beforeCreate() {
|
||||
}, //生命周期 - 创建之前",
|
||||
beforeMount() {
|
||||
}, //生命周期 - 挂载之前",
|
||||
beforeUpdate() {
|
||||
}, //生命周期 - 更新之前",
|
||||
updated() {
|
||||
}, //生命周期 - 更新之后",
|
||||
beforeDestroy() {
|
||||
}, //生命周期 - 销毁之前",
|
||||
destroyed() {
|
||||
}, //生命周期 - 销毁完成",
|
||||
activated() {
|
||||
} //如果页面有keep-alive缓存功能，这个函数会触发",
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.dashboard{
|
||||
&-container{
|
||||
margin: 30px;
|
||||
}
|
||||
&-text{
|
||||
font-size:30px;
|
||||
line-height:46px;
|
||||
}
|
||||
}
|
||||
#container{
|
||||
|
||||
padding:0px;
|
||||
margin:0px;
|
||||
width:100%;
|
||||
height:800px;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,211 +0,0 @@
|
|||
<template>
|
||||
<div>
|
||||
|
||||
<div>
|
||||
<el-form :inline="true" :model="queryParams" class="demo-form-inline">
|
||||
|
||||
<el-form-item label="标识名称">
|
||||
<el-input v-model="queryParams.markersName" placeholder="模糊查询标识名称"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="onSubmit" icon="el-icon-search">搜索</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-button type="primary" plain icon="el-icon-plus" @click="markersAdd">新增</el-button>
|
||||
|
||||
|
||||
|
||||
<el-table :data="markersList" style="width: 100%" ref="multipleTable">
|
||||
|
||||
<el-table-column label="标识编号" align="center" prop="markersId" />
|
||||
|
||||
<el-table-column label="标识名称" align="center" prop="markersName" />
|
||||
|
||||
<el-table-column label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-link type="primary" icon="el-icon-map-location" @click="handleWdit(scope.row)">绑定电子围栏</el-link>
|
||||
|
||||
<el-link type="primary" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-link>
|
||||
|
||||
<el-link type="primary" icon="el-icon-delete" @click="handleDelete(scope.row.markersId)">删除</el-link>
|
||||
</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="dialogFormVisible">
|
||||
|
||||
<el-form :model="markers">
|
||||
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="markers.markersName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
</el-form>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogFormVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="addAll">新增</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
<!-- 修改电子围栏-->
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible1">
|
||||
|
||||
<el-form :model="markers">
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth1">
|
||||
<el-input v-model="markers.markersName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogFormVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="updateAll">修 改</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { markersList, markersInsert, markersDelete, insertMarkersFence, markersUpdate, markersFenceList} from "@/api/system/markers";
|
||||
|
||||
export default {
|
||||
//生命周期 - 挂载完成（可以访问DOM元素）",
|
||||
mounted() {
|
||||
},
|
||||
//import引入的组件需要注入到对象中才能使用"
|
||||
components: {},
|
||||
props: {},
|
||||
data() {
|
||||
//这里存放数据"
|
||||
|
||||
return {
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
markersName: null
|
||||
},
|
||||
markersFences:[],
|
||||
total: 0,
|
||||
dialogFormVisible: false,
|
||||
formLabelWidth: '120px',
|
||||
markers: {},
|
||||
title: '',
|
||||
dialogFormVisible1: false,
|
||||
formLabelWidth1: '120px',
|
||||
markersList: [],
|
||||
|
||||
};
|
||||
},
|
||||
//计算属性 类似于data概念",
|
||||
computed: {},
|
||||
//监控data中的数据变化",
|
||||
watch: {},
|
||||
//方法集合",
|
||||
methods: {
|
||||
//获取围栏列表
|
||||
getList() {
|
||||
this.loading = true;
|
||||
markersList(this.queryParams).then(res => {
|
||||
this.markersList = res.data.rows;
|
||||
this.total = res.data.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
markersFenceShow(){
|
||||
markersFenceList().then(res => {
|
||||
this.markersFences = res.data
|
||||
})
|
||||
},
|
||||
// 搜索框
|
||||
onSubmit() {
|
||||
this.getList()
|
||||
},
|
||||
|
||||
handleWdit(obj) {
|
||||
this.markers = obj
|
||||
this.markersFenceShow(obj.markersId)
|
||||
console.log(this.markersFenceShow)
|
||||
},
|
||||
|
||||
//修改标识
|
||||
handleEdit(obj) {
|
||||
this.dialogFormVisible1 = true
|
||||
this.markers = obj
|
||||
this.title = '修改标识'
|
||||
},
|
||||
|
||||
updateAll() {
|
||||
markersUpdate(this.markers).then(
|
||||
res => {
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
)
|
||||
this.dialogFormVisible1 = false;
|
||||
},
|
||||
//新增
|
||||
markersAdd() {
|
||||
this.markers = {}
|
||||
this.dialogFormVisible = true
|
||||
this.title = '新增页面'
|
||||
},
|
||||
|
||||
addAll() {
|
||||
markersInsert(this.markers).then(
|
||||
res => {
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
)
|
||||
this.dialogFormVisible = false
|
||||
},
|
||||
|
||||
//删除电子围栏
|
||||
handleDelete(markersId) {
|
||||
markersDelete(markersId, 'deleted').then(
|
||||
res => {
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
)
|
||||
},
|
||||
|
||||
},
|
||||
//生命周期 - 创建完成（可以访问当前this实例）",
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
beforeCreate() {
|
||||
}, //生命周期 - 创建之前",
|
||||
beforeMount() {
|
||||
}, //生命周期 - 挂载之前",
|
||||
beforeUpdate() {
|
||||
}, //生命周期 - 更新之前",
|
||||
updated() {
|
||||
}, //生命周期 - 更新之后",
|
||||
beforeDestroy() {
|
||||
}, //生命周期 - 销毁之前",
|
||||
destroyed() {
|
||||
}, //生命周期 - 销毁完成",
|
||||
activated() {
|
||||
} //如果页面有keep-alive缓存功能，这个函数会触发",
|
||||
};
|
||||
</script>
|
||||
|
||||
|
|
@ -141,6 +141,7 @@
|
|||
</el-col>
|
||||
<right-toolbar :columns="columns" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
|
||||
<el-table-column align="center" type="selection" width="50"/>
|
||||
<el-table-column v-if="columns[0].visible" key="userId" align="center" label="用户编号" prop="userId"/>
|
||||
|
|
@ -148,13 +149,11 @@
|
|||
prop="userName"/>
|
||||
<el-table-column v-if="columns[2].visible" key="nickName" :show-overflow-tooltip="true" align="center" label="用户昵称"
|
||||
prop="nickName"/>
|
||||
<el-table-column v-if="columns[3].visible" key="companySign" :show-overflow-tooltip="true" align="center" label="企业标识"
|
||||
prop="dept.companySign"/>
|
||||
<el-table-column v-if="columns[4].visible" key="deptName" :show-overflow-tooltip="true" align="center" label="部门"
|
||||
<el-table-column v-if="columns[3].visible" key="deptName" :show-overflow-tooltip="true" align="center" label="部门"
|
||||
prop="dept.deptName"/>
|
||||
<el-table-column v-if="columns[5].visible" key="phonenumber" align="center" label="手机号码"
|
||||
<el-table-column v-if="columns[4].visible" key="phonenumber" align="center" label="手机号码"
|
||||
prop="phonenumber" width="120"/>
|
||||
<el-table-column v-if="columns[6].visible" key="status" align="center" label="状态">
|
||||
<el-table-column v-if="columns[5].visible" key="status" align="center" label="状态">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.status"
|
||||
|
|
@ -399,7 +398,7 @@ export default {
|
|||
// 弹出层标题
|
||||
title: "",
|
||||
// 部门树选项
|
||||
deptOptions: [],
|
||||
deptOptions: undefined,
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 部门名称
|
||||
|
|
@ -489,7 +488,8 @@ export default {
|
|||
}
|
||||
},
|
||||
created() {
|
||||
this.getDeptTree(1);
|
||||
this.getList();
|
||||
this.getDeptTree();
|
||||
this.getConfigKey("sys.user.initPassword").then(response => {
|
||||
this.initPassword = response.data.msg;
|
||||
});
|
||||
|
|
@ -506,19 +506,10 @@ export default {
|
|||
);
|
||||
},
|
||||
/** 查询部门下拉树结构 */
|
||||
getDeptTree(num) {
|
||||
// debugger
|
||||
getDeptTree() {
|
||||
deptTreeSelect().then(response => {
|
||||
this.deptOptions = response.data;
|
||||
if (1 === num){
|
||||
this.queryParams.deptId = response.data[0].id;
|
||||
this.getList();
|
||||
}
|
||||
});
|
||||
// if (1 === num){
|
||||
// this.queryParams = this.deptOptions[0].id;
|
||||
// this.getList();
|
||||
// }
|
||||
},
|
||||
// 筛选节点
|
||||
filterNode(value, data) {
|
||||
|
|
|
|||
|
|
@ -1,317 +0,0 @@
|
|||
<template>
|
||||
<div>
|
||||
<div>
|
||||
<el-form :inline="true" :model="queryParams" class="demo-form-inline">
|
||||
|
||||
<el-form-item label="车辆VIN">
|
||||
<el-input v-model="queryParams.vehicleVIN" placeholder="车辆VIN"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="车辆类型">
|
||||
<el-input v-model="queryParams.vehicleTypeId" placeholder="车辆类型"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="电机厂商">
|
||||
<el-input v-model="queryParams.motorBusiness" placeholder="电机厂商"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="电池厂商">
|
||||
<el-input v-model="queryParams.batteryBusiness" placeholder="电池厂商"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="电机ID">
|
||||
<el-input v-model="queryParams.MotorID" placeholder="电机ID"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="电池名称">
|
||||
<el-input v-model="queryParams.BatteryID" placeholder="电池ID"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="车辆状态">
|
||||
<el-select v-model="queryParams.vehicleState" placeholder="请选择围栏状态">
|
||||
<el-option label="正常" value="1">正常</el-option>
|
||||
<el-option label="停用" value="2">停用</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="onSubmit" icon="el-icon-search">搜索</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-button type="primary" plain icon="el-icon-plus" @click="vehicleAdd">新增</el-button>
|
||||
|
||||
|
||||
|
||||
<el-table :data="vehicleList" style="width: 100%" ref="multipleTable">
|
||||
|
||||
<el-table-column label="车辆VIN" align="center" prop="vehicleVIN" />
|
||||
<el-table-column label="车辆VIN" align="center" prop="vehicleTypeId" />
|
||||
<el-table-column label="车辆VIN" align="center" prop="motorBusiness" />
|
||||
<el-table-column label="车辆VIN" align="center" prop="batteryBusiness" />
|
||||
<el-table-column label="车辆VIN" align="center" prop="motorID" />
|
||||
<el-table-column label="车辆VIN" align="center" prop="batteryID" />
|
||||
<el-table-column label="车辆VIN" align="center" prop="" />
|
||||
<el-table-column label="车辆VIN" align="center" prop="vehicleVIN" />
|
||||
<el-table-column label="车辆VIN" align="center" prop="vehicleVIN" />
|
||||
|
||||
<el-table-column
|
||||
label="围栏状态"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px" v-if="scope.row.vehicleState==1"><el-tag>正常</el-tag></span>
|
||||
<span style="margin-left: 10px" v-if="scope.row.vehicleState==2"><el-tag>停用</el-tag></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
<el-table-column label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-link type="primary" icon="el-icon-map-location" @click="handleWdit(scope.row)">编辑围栏</el-link>
|
||||
|
||||
<el-link type="primary" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-link>
|
||||
|
||||
<el-link type="primary" icon="el-icon-delete" @click="handleDelete(scope.row.fenceId)">删除</el-link>
|
||||
</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="dialogFormVisible">
|
||||
|
||||
<el-form :model="vehicle">
|
||||
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="围栏类型" :label-width="formLabelWidth">
|
||||
<el-select v-model="vehicle.fenceTypeId" placeholder="请选择活动区域">
|
||||
<el-option label="驶出" value="1">驶出</el-option>
|
||||
<el-option label="驶入" value="2">驶入</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
</el-form>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogFormVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="addAll">新增</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
<!-- 修改电子围栏-->
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible1">
|
||||
|
||||
<el-form :model="vehicle">
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth1">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="围栏名称" :label-width="formLabelWidth">
|
||||
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="围栏类型" :label-width="formLabelWidth1">
|
||||
<el-select v-model="vehicle.fenceTypeId" placeholder="请选择活动区域">
|
||||
<el-option label="驶出" value="1">驶出</el-option>
|
||||
<el-option label="驶入" value="2">驶入</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="围栏状态">
|
||||
<el-radio-group v-model="vehicle.fenceState" :label-width="formLabelWidth1">
|
||||
<el-radio :label="1">正常</el-radio>
|
||||
<el-radio :label="2">停用</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogFormVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="updateAll">修 改</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {vehicleInsert, insertMarkersFence, vehicleList, vehicleDelete, vehicleUpdate} from "@/api/system/vehicle";
|
||||
export default {
|
||||
//生命周期 - 挂载完成（可以访问DOM元素）",
|
||||
mounted() {
|
||||
},
|
||||
//import引入的组件需要注入到对象中才能使用"
|
||||
components: {},
|
||||
props: {},
|
||||
data() {
|
||||
//这里存放数据"
|
||||
|
||||
return {
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
vehicleVIN: null,
|
||||
vehicleTypeId: null,
|
||||
motorBusiness: null,
|
||||
batteryBusiness: null,
|
||||
MotorID: null,
|
||||
BatteryID: null,
|
||||
vehicleState:null
|
||||
|
||||
},
|
||||
total:0,
|
||||
dialogFormVisible:false,
|
||||
formLabelWidth:'120px',
|
||||
|
||||
vehicle:{},
|
||||
title:'',
|
||||
dialogFormVisible1:false,
|
||||
formLabelWidth1:'120px',
|
||||
|
||||
vehicleList: [],
|
||||
|
||||
};
|
||||
},
|
||||
//计算属性 类似于data概念",
|
||||
computed: {},
|
||||
//监控data中的数据变化",
|
||||
watch: {},
|
||||
//方法集合",
|
||||
methods: {
|
||||
//获取围栏列表
|
||||
getList() {
|
||||
this.loading = true;
|
||||
vehicleList(this.queryParams).then(res => {
|
||||
this.vehicleList = res.data.rows;
|
||||
this.total = res.data.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 搜索框
|
||||
onSubmit() {
|
||||
this.getList()
|
||||
},
|
||||
|
||||
//修改电子围栏
|
||||
handleEdit(obj) {
|
||||
this.dialogFormVisible1 = true
|
||||
this.vehicle = obj
|
||||
this.title = '修改车辆信息'
|
||||
|
||||
},
|
||||
|
||||
|
||||
updateAll() {
|
||||
vehicleUpdate(this.vehicle).then(
|
||||
res => {
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
)
|
||||
this.dialogFormVisible1=false;
|
||||
},
|
||||
//新增
|
||||
vehicleAdd() {
|
||||
this.vehicle = {}
|
||||
this.dialogFormVisible = true
|
||||
this.title = '新增页面'
|
||||
},
|
||||
|
||||
addAll() {
|
||||
vehicleInsert(this.vehicle).then(
|
||||
res => {
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
)
|
||||
this.dialogFormVisible = false
|
||||
},
|
||||
|
||||
|
||||
//删除车辆信息
|
||||
handleDelete(vehicleId){
|
||||
vehicleDelete(vehicleId,'deleted').then(
|
||||
res=>{
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
)
|
||||
},
|
||||
|
||||
|
||||
//编辑车辆标识
|
||||
handleWdit(obj) {
|
||||
this.vehicle = obj
|
||||
},
|
||||
},
|
||||
|
||||
//生命周期 - 创建完成（可以访问当前this实例）",
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
beforeCreate() {
|
||||
}, //生命周期 - 创建之前",
|
||||
beforeMount() {
|
||||
}, //生命周期 - 挂载之前",
|
||||
beforeUpdate() {
|
||||
}, //生命周期 - 更新之前",
|
||||
updated() {
|
||||
}, //生命周期 - 更新之后",
|
||||
beforeDestroy() {
|
||||
}, //生命周期 - 销毁之前",
|
||||
destroyed() {
|
||||
}, //生命周期 - 销毁完成",
|
||||
activated() {
|
||||
} //如果页面有keep-alive缓存功能，这个函数会触发",
|
||||
};
|
||||
</script>
|
||||
Loading…
Reference in New Issue