4.11更新
黄大举
parent
61090ebb20
commit
b630094c4f
|
|
@ -36,11 +36,12 @@
|
|||
"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",
|
||||
"core-js": "3.25.3",
|
||||
"echarts": "5.4.0",
|
||||
"echarts": "^5.5.0",
|
||||
"element-ui": "2.15.13",
|
||||
"file-saver": "2.0.5",
|
||||
"fuse.js": "6.4.3",
|
||||
|
|
@ -51,7 +52,9 @@
|
|||
"nprogress": "0.2.0",
|
||||
"quill": "1.3.7",
|
||||
"screenfull": "5.0.2",
|
||||
"sockjs-client": "^1.6.1",
|
||||
"sortablejs": "1.10.2",
|
||||
"stompjs": "^2.3.3",
|
||||
"vue": "2.6.12",
|
||||
"vue-count-to": "1.0.13",
|
||||
"vue-cropper": "0.5.5",
|
||||
|
|
|
|||
|
|
@ -6,6 +6,15 @@
|
|||
<meta content="webkit" name="renderer">
|
||||
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
|
||||
<link href="<%= BASE_URL %>favicon.ico" rel="icon">
|
||||
<!-- <script type="text/javascript">-->
|
||||
<!-- window._AMapSecurityConfig = {-->
|
||||
<!-- securityJsCode: "「bb3924cc27a38c7bf8caaab8300a76a9」",-->
|
||||
<!-- }-->
|
||||
<!-- </script>-->
|
||||
<!-- <script src="https://webapi.amap.com/loader.js"></script>-->
|
||||
<!-- <script type="text/javascript"-->
|
||||
<!-- src="https://webapi.amap.com/maps?v=2.0&key=「ce38a6b072b603934f6270bd9e97ed49」">-->
|
||||
<!-- </script>-->
|
||||
<title><%= webpackConfig.name %></title>
|
||||
<!--[if lt IE 11]>
|
||||
<script>window.location.href = '/html/ie.html';</script><![endif]-->
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
// 查询报警记录列表
|
||||
export function listAlarmLogs(query) {
|
||||
return request({
|
||||
url: '/business/alarmLogs/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询报警记录详细
|
||||
export function getAlarmLogs(alarmId) {
|
||||
return request({
|
||||
url: '/business/alarmLogs/' + alarmId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增报警记录
|
||||
export function addAlarmLogs(data) {
|
||||
return request({
|
||||
url: '/business/alarmLogs',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改报警记录
|
||||
export function updateAlarmLogs(data) {
|
||||
return request({
|
||||
url: '/business/alarmLogs',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除报警记录
|
||||
export function delAlarmLogs(alarmId) {
|
||||
return request({
|
||||
url: '/business/alarmLogs/' + alarmId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
|
@ -1,17 +1,7 @@
|
|||
import request from '@/utils/request'
|
||||
import FaultCodes from "@/views/business/faultCodes/index.vue";
|
||||
|
||||
// 查询故障码列表
|
||||
export function listFaultCodes(query) {
|
||||
return request({
|
||||
url: '/business/faultCodes/current/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询实时故障列表
|
||||
export function faultCodesCurrentList(query) {
|
||||
return request({
|
||||
url: '/business/faultCodes/list',
|
||||
method: 'get',
|
||||
|
|
@ -58,15 +48,6 @@ export function changeFaultCodesStatus(faultId, status){
|
|||
})
|
||||
}
|
||||
|
||||
// 修改故障码报警状态
|
||||
export function batchChangeAlarm(faultCodesList){
|
||||
return request({
|
||||
url: '/business/faultCodes/batchChangeAlarm',
|
||||
method: 'put',
|
||||
data: faultCodesList
|
||||
})
|
||||
}
|
||||
|
||||
// 删除故障码
|
||||
export function delFaultCodes(faultId) {
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
// 查询电子围栏列表
|
||||
export function listFence(query) {
|
||||
return request({
|
||||
url: '/business/fence/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询电子围栏详细
|
||||
export function getFence(fenceId) {
|
||||
return request({
|
||||
url: '/business/fence/findById/' + fenceId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增电子围栏
|
||||
export function addFence(data) {
|
||||
return request({
|
||||
url: '/business/fence/insert',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改电子围栏
|
||||
export function updateFence(data) {
|
||||
return request({
|
||||
url: '/business/fence/update',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除电子围栏
|
||||
export function delFence(fenceId) {
|
||||
return request({
|
||||
url: '/business/fence/delete/' + fenceId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
// 保存电子围栏
|
||||
export function savePolygon(data) {
|
||||
return request({
|
||||
url: '/business/fence/savePolygon',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
// 查询标识列表列表
|
||||
export function listMarking(query) {
|
||||
return request({
|
||||
url: '/business/marking/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询标识列表详细
|
||||
export function getMarking(markingId) {
|
||||
return request({
|
||||
url: '/business/marking/findById/' + markingId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增标识列表
|
||||
export function addMarking(data) {
|
||||
return request({
|
||||
url: '/business/marking/insert',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改标识列表
|
||||
export function updateMarking(data) {
|
||||
return request({
|
||||
url: '/business/marking/update',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除标识列表
|
||||
export function delMarking(markingId) {
|
||||
return request({
|
||||
url: '/business/marking/delete/' + markingId,
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
export function findFence(data) {
|
||||
return request({
|
||||
url: '/business/fence/findFence',
|
||||
method: 'get',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
// 查询车辆历史轨迹列表
|
||||
export function listRecords(query) {
|
||||
return request({
|
||||
url: '/business/records/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 删除车辆历史轨迹
|
||||
export function delRecords(recordsId) {
|
||||
return request({
|
||||
url: '/business/records/delete/' + recordsId,
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
// 根据ID获取历史车辆数据
|
||||
export function vehicleData(recordsId) {
|
||||
return request({
|
||||
url: '/business/vehicleData/findVDByRecordsId/' + recordsId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 获取历史经纬度
|
||||
export function getPosition(recordsId) {
|
||||
return request({
|
||||
url: '/business/vehicleData/getPosition/' + recordsId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
// 查询菜单列表
|
||||
export function list(data) {
|
||||
export function list(params) {
|
||||
return request({
|
||||
url: '/system/car/list',
|
||||
method: 'get',
|
||||
data
|
||||
params
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -50,9 +50,26 @@ export function del(carIds) {
|
|||
});
|
||||
}
|
||||
|
||||
export function close(carVin) {
|
||||
return request({
|
||||
url: '/system/car/close/'+carVin,
|
||||
method: 'post'
|
||||
});
|
||||
}
|
||||
export function open(carVin) {
|
||||
return request({
|
||||
url: '/system/car/open/'+carVin,
|
||||
method: 'post'
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
export function selectMarking(data) {
|
||||
return request({
|
||||
url: '/system/car/selectMarking',
|
||||
method: 'get',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function findById(carId) {
|
||||
return request({
|
||||
|
|
@ -62,3 +79,16 @@ export function findById(carId) {
|
|||
}
|
||||
|
||||
|
||||
export function getRealTimeData() {
|
||||
return request({
|
||||
url: '/analyze/realTimeData',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function getRealTimeDataTwo(vin) {
|
||||
return request({
|
||||
url: '/analyze/realTimeDataTwo/' +vin,
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
|
|
|||
10
src/main.js
10
src/main.js
|
|
@ -78,6 +78,16 @@ Vue.use(Element, {
|
|||
|
||||
Vue.config.productionTip = false
|
||||
|
||||
//配置安全密钥
|
||||
window._AMapSecurityConfig = {
|
||||
securityJsCode: 'bb3924cc27a38c7bf8caaab8300a76a9' //* 安全密钥
|
||||
}
|
||||
|
||||
// 引入 echarts
|
||||
import * as echarts from 'echarts'
|
||||
Vue.prototype.$echarts = echarts
|
||||
|
||||
|
||||
new Vue({
|
||||
el: '#app',
|
||||
router,
|
||||
|
|
|
|||
|
|
@ -87,6 +87,34 @@ export const constantRoutes = [
|
|||
meta: { title: '个人中心', icon: 'user' }
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: '/fence',
|
||||
component: Layout,
|
||||
hidden: true,
|
||||
redirect: 'fence',
|
||||
children: [
|
||||
{
|
||||
path: 'map',
|
||||
component: () => import('@/views/business/fence/map'),
|
||||
name: 'fenMap',
|
||||
meta: { title: '地图' }
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: '/vehicleData',
|
||||
component: Layout,
|
||||
hidden: true,
|
||||
redirect: 'vehicleData',
|
||||
children: [
|
||||
{
|
||||
path: 'data',
|
||||
component: () => import('@/views/business/records/history'),
|
||||
name: 'vehicleData',
|
||||
meta: { title: '历史轨迹' }
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
|
|
@ -162,7 +190,7 @@ export const dynamicRoutes = [
|
|||
meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
]
|
||||
|
||||
// 防止连续点击多次路由报错
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ service.interceptors.request.use(config => {
|
|||
const s_url = sessionObj.url; // 请求地址
|
||||
const s_data = sessionObj.data; // 请求数据
|
||||
const s_time = sessionObj.time; // 请求时间
|
||||
const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
|
||||
const interval = 500; // 间隔时间(ms)，小于此时间视为重复提交
|
||||
if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
|
||||
const message = '数据正在处理，请勿重复提交';
|
||||
console.warn(`[${s_url}]: ` + message)
|
||||
|
|
|
|||
|
|
@ -1,326 +0,0 @@
|
|||
<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="disposeStatus">
|
||||
<el-select v-model="queryParams.disposeStatus" placeholder="请选择处理状态" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.vehicle_dispose_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="处理方式" prop="disposeMethods">
|
||||
<el-select v-model="queryParams.disposeMethods" placeholder="请选择处理方式" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.dispose_methods"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"/>
|
||||
</el-select>
|
||||
</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="['business:alarmLogs: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="['business:alarmLogs: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="['business:alarmLogs:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="alarmLogsList" @selection-change="handleSelectionChange">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" />-->
|
||||
<!-- <el-table-column label="报警记录主键" align="center" prop="alarmId" />-->
|
||||
<el-table-column label="车辆VIN" align="center" prop="carVin" />
|
||||
<el-table-column label="故障码" align="center" prop="faultCode" />
|
||||
<el-table-column label="故障名称" align="center" prop="faultName" width="180"/>
|
||||
<el-table-column label="故障类型" align="center" prop="faultType">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.fault_type" :value="scope.row.faultType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="故障等级" align="center" prop="faultLevel">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.fault_level" :value="scope.row.faultLevel"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否产生报警" align="center" prop="alarmFlag">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.vehicle_alarm_status" :value="scope.row.alarmFlag"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="故障描述" align="center" prop="faultDesc" />
|
||||
<el-table-column label="开始报警时间" align="center" prop="startAlarmTime" width="180" />
|
||||
<el-table-column label="结束报警时间" align="center" prop="endAlarmTime" width="180" />
|
||||
<el-table-column label="处理时间" align="center" prop="disposeTime" width="180"/>
|
||||
<el-table-column label="处理人" align="center" prop="disposeBy" />
|
||||
<el-table-column label="处理状态" align="center" prop="disposeStatus">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.vehicle_dispose_status" :value="scope.row.disposeStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="处理方式" align="center" prop="disposeMethods">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.dispose_methods" :value="scope.row.disposeMethods"/>
|
||||
</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="['business:alarmLogs:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['business:alarmLogs: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="logId">
|
||||
<el-input v-model="form.logId" placeholder="请输入故障日志" />
|
||||
</el-form-item>
|
||||
<el-form-item label="车辆VIN" prop="carVin">
|
||||
<el-input v-model="form.carVin" placeholder="请输入车辆VIN" />
|
||||
</el-form-item>
|
||||
<el-form-item label="处理时间" prop="disposeTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.disposeTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择处理时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="处理人" prop="disposeBy">
|
||||
<el-input v-model="form.disposeBy" placeholder="请输入处理人" />
|
||||
</el-form-item>
|
||||
<el-form-item label="处理状态:0-解决 1-处理中 2-忽略" prop="disposeStatus">
|
||||
<el-select v-model="form.disposeStatus" placeholder="请选择处理状态:0-解决 1-处理中 2-忽略">
|
||||
<el-option
|
||||
v-for="dict in dict.type.vehicle_dispose_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="处理方式" prop="disposeMethods">
|
||||
<el-select v-model="form.disposeMethods" placeholder="请选择处理方式">
|
||||
<el-option
|
||||
v-for="dict in dict.type.dispose_methods"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="parseInt(dict.value)"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</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="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listAlarmLogs, getAlarmLogs, delAlarmLogs, addAlarmLogs, updateAlarmLogs } from "@/api/business/alarmLogs";
|
||||
|
||||
export default {
|
||||
name: "AlarmLogs",
|
||||
dicts: ['fault_type','fault_level','vehicle_alarm_status','vehicle_dispose_status', 'dispose_methods'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 报警记录表格数据
|
||||
alarmLogsList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
faultCode: null,
|
||||
disposeStatus: null,
|
||||
disposeMethods: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询报警记录列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listAlarmLogs(this.queryParams).then(res => {
|
||||
this.alarmLogsList = res.data.rows;
|
||||
this.total = res.data.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
alarmId: null,
|
||||
logId: null,
|
||||
carVin: null,
|
||||
faultCode: null,
|
||||
disposeTime: null,
|
||||
disposeBy: null,
|
||||
disposeStatus: null,
|
||||
disposeMethods: null,
|
||||
sendCount: null,
|
||||
readFlag: null,
|
||||
remark: 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.alarmId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加报警记录";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const alarmId = row.alarmId || this.ids
|
||||
getAlarmLogs(alarmId).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改报警记录";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.alarmId != null) {
|
||||
updateAlarmLogs(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addAlarmLogs(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const alarmIds = row.alarmId || this.ids;
|
||||
this.$modal.confirm('是否确认删除报警记录编号为"' + alarmIds + '"的数据项？').then(function() {
|
||||
return delAlarmLogs(alarmIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('business/alarmLogs/export', {
|
||||
...this.queryParams
|
||||
}, `alarmLogs_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -1,350 +0,0 @@
|
|||
<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="faultName">
|
||||
<el-input
|
||||
v-model="queryParams.faultName"
|
||||
placeholder="请输入故障名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="故障码" prop="faultCode">
|
||||
<el-input
|
||||
v-model="queryParams.faultCode"
|
||||
placeholder="请输入故障码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否产生报警" prop="alarmFlag" :label-width="100">
|
||||
<el-select v-model="queryParams.alarmFlag" placeholder="请选择是否产生报警" clearable size="mini">
|
||||
<el-option
|
||||
v-for="dict in dict.type.vehicle_alarm_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</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="['business:faultCodes: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="['business:faultCodes: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="['business:faultCodes:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="faultCodesList" @selection-change="handleSelectionChange" stripe border>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="故障码" align="center" prop="faultCode" />
|
||||
<el-table-column label="故障名称" align="center" prop="faultName" />
|
||||
<el-table-column label="故障类型" align="center" prop="faultType">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.fault_type" :value="scope.row.faultType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="故障等级" align="center" prop="faultLevel">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.fault_level" :value="scope.row.faultLevel"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否产生报警" align="center" prop="alarmFlag">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.vehicle_alarm_status" :value="scope.row.alarmFlag"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="故障描述" align="center" prop="faultDesc" />
|
||||
<el-table-column label="故障码状态" align="center" key="status" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#ff4949"
|
||||
@change="handleStatusChange(scope.row)"
|
||||
></el-switch>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="故障位" align="center" prop="faultLocation" />
|
||||
<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="['business:faultCodes:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['business:faultCodes: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="faultName">
|
||||
<el-input v-model="form.faultName" placeholder="请输入故障名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="故障码" prop="faultCode">
|
||||
<el-input v-model="form.faultCode" placeholder="请输入故障码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="故障类型" prop="faultType">
|
||||
<el-select v-model="form.faultType" placeholder="请选择故障类型">
|
||||
<el-option
|
||||
v-for="dict in dict.type.fault_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="parseInt(dict.value)"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="故障等级" prop="faultLevel">-->
|
||||
<!-- <el-radio-group v-model="form.faultLevel">-->
|
||||
<!-- <el-radio-->
|
||||
<!-- v-for="dict in dict.type.fault_level"-->
|
||||
<!-- :key="dict.value"-->
|
||||
<!-- :label="parseInt(dict.value)"-->
|
||||
<!-- >{{dict.label}}</el-radio>-->
|
||||
<!-- </el-radio-group>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="故障描述" prop="faultDesc">
|
||||
<el-input v-model="form.faultDesc" placeholder="请输入故障描述" />
|
||||
</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 { faultCodesCurrentList, getFaultCodes, delFaultCodes, addFaultCodes, updateFaultCodes, changeFaultCodesStatus, batchChangeAlarm } from "@/api/business/fault_code_info";
|
||||
|
||||
export default {
|
||||
name: "FaultCodes",
|
||||
dicts: ['fault_type','fault_level','vehicle_alarm_status'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 故障码表格数据
|
||||
faultCodesList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
faultName: null,
|
||||
faultCode: null,
|
||||
alarmFlag: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询故障码列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
faultCodesCurrentList(this.queryParams).then(res => {
|
||||
this.faultCodesList = res.data.rows;
|
||||
this.total = res.data.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 故障码状态修改
|
||||
handleStatusChange(row) {
|
||||
let text = row.status === "0" ? "启用" : "停用";
|
||||
this.$confirm('确认要"' + text + '""' + row.faultName + '"故障码吗?', "警告", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(function() {
|
||||
return changeFaultCodesStatus(row.faultId, row.status);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$message.success(text + "成功");
|
||||
}).catch(function() {
|
||||
row.status = row.status === "0" ? "1" : "0";
|
||||
});
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
faultId: null,
|
||||
faultName: null,
|
||||
faultCode: null,
|
||||
faultType: null,
|
||||
faultLevel: null,
|
||||
alarmFlag: null,
|
||||
faultDesc: null,
|
||||
faultLocation: null,
|
||||
status: null,
|
||||
delFlag: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
remark: 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.faultId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加故障码";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const faultId = row.faultId || this.ids
|
||||
getFaultCodes(faultId).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改故障码";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.faultId != null) {
|
||||
updateFaultCodes(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addFaultCodes(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const faultIds = row.faultId || this.ids;
|
||||
this.$modal.confirm('是否确认删除故障码编号为"' + faultIds + '"的数据项？').then(function() {
|
||||
return delFaultCodes(faultIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/**修改报警状态*/
|
||||
async batchChangeAlarmFlag() {
|
||||
try {
|
||||
// 调用列表数据
|
||||
const list = await this.getList();
|
||||
// 调用批量修改报警状态
|
||||
list.forEach(info => {
|
||||
if (0 === info.faultLocation) {
|
||||
info.alarmFlag = 'Y';
|
||||
} else {
|
||||
info.alarmFlag = 'N';
|
||||
}
|
||||
});
|
||||
// 调用批量修改报警状态的函数
|
||||
await this.batchChangeAlarm(list);
|
||||
// 刷新
|
||||
this.getList()
|
||||
} catch (e) {
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
<el-form-item label="是否产生报警" prop="alarmFlag" :label-width="100">
|
||||
<el-select v-model="queryParams.alarmFlag" placeholder="请选择是否产生报警" clearable size="mini">
|
||||
<el-option
|
||||
v-for="dict in dict.type.vehicle_alarm_status"
|
||||
v-for="dict in dict.type.sys_yes_no"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
|
|
@ -34,20 +34,59 @@
|
|||
</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="['business:faultCodes: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="['business:faultCodes: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="['business:faultCodes:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="faultCodesList" stripe border>
|
||||
<el-table v-loading="loading" :data="faultCodesList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="故障码" align="center" prop="faultCode" />
|
||||
<el-table-column label="故障名称" align="center" prop="faultName" />
|
||||
<el-table-column label="故障类型" align="center" prop="faultType">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.fault_type" :value="scope.row.faultType"/>
|
||||
<span v-if="scope.row.faultType==1">通讯丢失故障</span>
|
||||
<span v-if="scope.row.faultType==2">车身故障</span>
|
||||
<span v-if="scope.row.faultType==3">底盘故障</span>
|
||||
<span v-if="scope.row.faultType==4">电子围栏故障</span>
|
||||
<span v-if="scope.row.faultType==5">其他故障</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="故障等级" align="center" prop="faultLevel">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.fault_level" :value="scope.row.faultLevel"/>
|
||||
<span v-if="scope.row.faultLevel==1">高级故障</span>
|
||||
<span v-if="scope.row.faultLevel==2">中级故障</span>
|
||||
<span v-if="scope.row.faultLevel==3">低级故障</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否产生报警" align="center" prop="alarmFlag">
|
||||
|
|
@ -57,6 +96,34 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="故障描述" align="center" prop="faultDesc" />
|
||||
<el-table-column label="故障位" align="center" prop="faultLocation" />
|
||||
<el-table-column label="故障值" align="center" prop="faultValue" />
|
||||
<el-table-column label="故障码状态" align="center" key="status" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#ff4949"
|
||||
@change="handleStatusChange(scope.row)"
|
||||
></el-switch>
|
||||
</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="['business:faultCodes:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['business:faultCodes:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
|
|
@ -66,15 +133,56 @@
|
|||
: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="faultName">
|
||||
<el-input v-model="form.faultName" placeholder="请输入故障名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="故障码" prop="faultCode">
|
||||
<el-input v-model="form.faultCode" placeholder="请输入故障码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="故障类型" prop="faultType">
|
||||
<el-select v-model="form.faultType" placeholder="请选择故障类型">
|
||||
<el-option label="通讯丢失故障" value="1"></el-option>
|
||||
<el-option label="车身故障" value="2"></el-option>
|
||||
<el-option label="底盘故障" value="3"></el-option>
|
||||
<el-option label="电子围栏故障" value="4"></el-option>
|
||||
<el-option label="其他故障" value="5"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="故障等级" prop="faultLevel">
|
||||
<el-select v-model="form.faultLevel" placeholder="请选择故障等级">
|
||||
<el-option label="高级故障" value="1"></el-option>
|
||||
<el-option label="中级故障" value="2"></el-option>
|
||||
<el-option label="低级故障" value="3"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="故障描述" prop="faultDesc">
|
||||
<el-input v-model="form.faultDesc" placeholder="请输入故障描述" />
|
||||
</el-form-item>
|
||||
<el-form-item label="故障位" prop="faultLocation">
|
||||
<el-input v-model="form.faultLocation" placeholder="请输入故障位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="故障值" prop="faultValue">
|
||||
<el-input v-model="form.faultValue" placeholder="请输入故障值" />
|
||||
</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 { listFaultCodes, batchChangeAlarm } from '@/api/business/fault_code_info'
|
||||
import { listFaultCodes, getFaultCodes, delFaultCodes, addFaultCodes, updateFaultCodes, changeFaultCodesStatus } from "@/api/business/fault_code_info";
|
||||
|
||||
export default {
|
||||
name: "FaultCodes",
|
||||
dicts: ['fault_type','fault_level','vehicle_alarm_status'],
|
||||
dicts: ['sys_yes_no','vehicle_alarm_status'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
|
|
@ -98,7 +206,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
pageSize: 10,
|
||||
faultName: null,
|
||||
faultCode: null,
|
||||
alarmFlag: null,
|
||||
|
|
@ -112,7 +220,6 @@ export default {
|
|||
},
|
||||
created() {
|
||||
this.getList();
|
||||
this.batchChangeAlarmFlag();
|
||||
},
|
||||
methods: {
|
||||
/** 查询故障码列表 */
|
||||
|
|
@ -129,6 +236,44 @@ export default {
|
|||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 故障码状态修改
|
||||
handleStatusChange(row) {
|
||||
let text = row.status === "0" ? "启用" : "停用";
|
||||
this.$confirm('确认要"' + text + '""' + row.faultName + '"故障码吗?', "警告", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(function() {
|
||||
return changeFaultCodesStatus(row.faultId, row.status);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$message.success(text + "成功");
|
||||
}).catch(function() {
|
||||
row.status = row.status === "0" ? "1" : "0";
|
||||
});
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
faultId: null,
|
||||
faultName: null,
|
||||
faultCode: null,
|
||||
faultType: null,
|
||||
faultLevel: null,
|
||||
alarmFlag: null,
|
||||
faultDesc: null,
|
||||
faultLocation: null,
|
||||
faultValue: null,
|
||||
status: null,
|
||||
delFlag: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
remark: null
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
|
|
@ -139,25 +284,63 @@ export default {
|
|||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
/**修改报警状态*/
|
||||
batchChangeAlarmFlag() {
|
||||
try {
|
||||
// 调用列表数据
|
||||
const list = this.getList();
|
||||
// 调用批量修改报警状态
|
||||
list.forEach(info => {
|
||||
if (0 === info.faultLocation) {
|
||||
info.alarmFlag = 'Y';
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.faultId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加故障码";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const faultId = row.faultId || this.ids
|
||||
getFaultCodes(faultId).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改故障码";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.faultId != null) {
|
||||
updateFaultCodes(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
info.alarmFlag = 'N';
|
||||
addFaultCodes(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
});
|
||||
// 调用批量修改报警状态的函数
|
||||
this.batchChangeAlarm(list);
|
||||
// 刷新
|
||||
this.getList()
|
||||
} catch (e) {
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const faultIds = row.faultId || this.ids;
|
||||
this.$modal.confirm('是否确认删除故障码编号为"' + faultIds + '"的数据项？').then(function() {
|
||||
return delFaultCodes(faultIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('business/faultCodes/export', {
|
||||
...this.queryParams
|
||||
}, `faultCodes_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,21 +17,19 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="故障名称" prop="faultName">
|
||||
<el-input
|
||||
v-model="queryParams.faultName"
|
||||
placeholder="请输入故障名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="开始报警时间" prop="startAlarmTime">
|
||||
<el-date-picker clearable v-model="queryParams.startAlarmTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开始报警时间"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="结束报警时间" prop="endAlarmTime">
|
||||
<el-date-picker clearable v-model="queryParams.endAlarmTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择结束报警时间"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="处理状态" prop="disposeStatus" >
|
||||
<el-select v-model="queryParams.disposeStatus" placeholder="请选择处理状态" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.vehicle_dispose_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-date-picker clearable v-model="queryParams.endAlarmTime" type="datetime" placeholder="请选择结束报警时间"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
|
|
@ -40,44 +38,80 @@
|
|||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="primary"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-plus"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="handleAdd"-->
|
||||
<!-- v-hasPermi="['business:faultLogs: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="['business:faultLogs: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="['business:faultLogs:remove']"-->
|
||||
<!-- >删除</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="faultLogsList" border stripe>
|
||||
<el-table v-loading="loading" :data="faultLogsList" >
|
||||
<!-- <el-table-column type="selection" width="55" align="center" />@selection-change="handleSelectionChange"-->
|
||||
<!-- <el-table-column label="故障码主键" align="center" prop="logId" />-->
|
||||
<el-table-column label="车辆VIN" align="center" prop="carVin" />
|
||||
<el-table-column label="故障码" align="center" prop="faultCode" />
|
||||
<el-table-column label="故障名称" align="center" prop="faultName" />
|
||||
<el-table-column label="故障等级" align="center" prop="faultLevel">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.fault_level" :value="scope.row.faultLevel"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="故障描述" align="center" prop="faultDesc" />
|
||||
<el-table-column label="是否产生报警" align="center" prop="alarmFlag" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.vehicle_alarm_status" :value="scope.row.alarmFlag"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="开始报警时间" align="center" prop="startAlarmTime" width="180" />
|
||||
<el-table-column label="结束报警时间" align="center" prop="endAlarmTime" width="180" />
|
||||
<el-table-column label="故障等级" align="center" prop="faultLevel" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.fault_level" :value="scope.row.faultLevel"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="开始报警时间" align="center" prop="startAlarmTime" width="180"/>
|
||||
<el-table-column label="结束报警时间" align="center" prop="endAlarmTime" width="180"/>.
|
||||
<el-table-column label="最近报警时间" align="center" prop="recentlyAlarmTime" width="180"/>
|
||||
<el-table-column label="处理时间" align="center" prop="disposeTime" width="180"/>
|
||||
<el-table-column label="处理人" align="center" prop="disposeBy" />
|
||||
<el-table-column label="处理状态" align="center" prop="disposeStatus">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.vehicle_dispose_status" :value="scope.row.disposeStatus"/>
|
||||
</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-refresh-right" @click="handleUpdate(scope.row)" v-hasPermi="['business:faultLogs:edit']">忽略</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-check" @click="handleUpdate(scope.row)" v-hasPermi="['business:faultLogs:edit']">解决</el-button>
|
||||
</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="['business:faultLogs:edit']"-->
|
||||
<!-- >修改</el-button>-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- @click="handleDelete(scope.row)"-->
|
||||
<!-- v-hasPermi="['business:faultLogs:remove']"-->
|
||||
<!-- >删除</el-button>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
|
|
@ -87,6 +121,36 @@
|
|||
: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="120px">-->
|
||||
<!-- <el-form-item label="车辆VIN" prop="carVin">-->
|
||||
<!-- <el-input v-model="form.carVin" placeholder="请输入车辆VIN"></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="故障码" prop="faultCode">-->
|
||||
<!-- <el-input v-model="form.faultCode" placeholder="请输入故障码"></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="故障名称" prop="faultName">-->
|
||||
<!-- <el-input v-model="form.faultName" placeholder="请输入故障名称"></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="是否产生报警">-->
|
||||
<!-- <el-radio-group v-model="form.alarmFlag">-->
|
||||
<!-- <el-radio v-for="dict in dict.type.vehicle_alarm_status" :key="dict.value"-->
|
||||
<!-- :label="dict.value">{{dict.label}}</el-radio></el-radio-group>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="开始报警时间">-->
|
||||
<!-- <el-date-picker v-model="form.startAlarmTime" type="datetime" placeholder="请选择开始报警时间"></el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="备注">-->
|
||||
<!-- <editor v-model="form.remark" :min-height="192"/>-->
|
||||
<!-- </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>
|
||||
|
||||
|
|
@ -96,7 +160,7 @@
|
|||
import { listFaultLogs, addFaultLogs, getFaultLogs, editFaultLogs, delFaultLogs } from '@/api/business/faultLogs'
|
||||
export default {
|
||||
name: "FaultLogs",
|
||||
dicts: ['vehicle_alarm_status','fault_level','vehicle_dispose_status'],
|
||||
dicts: ['vehicle_alarm_status','vehicle_dispose_status'],
|
||||
data() {
|
||||
//这里存放数据
|
||||
return {
|
||||
|
|
@ -124,15 +188,28 @@ export default {
|
|||
pageSize: 10,
|
||||
carVin: null,
|
||||
faultCode: null,
|
||||
faultName: '',
|
||||
startAlarmTime: null,
|
||||
endAlarmTime: null,
|
||||
alarmFlag: ''
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
},
|
||||
// 列信息
|
||||
columns:[
|
||||
{ key: 0, label: `车辆VIN`, visible: true },
|
||||
{ key: 1, label: `故障码`, visible: true },
|
||||
{ key: 2, label: `故障名称`, visible: true },
|
||||
{ key: 3, label: `是否产生报警`, visible: true },
|
||||
{ key: 4, label: `开始报警时间`, visible: true },
|
||||
{ key: 5, label: `结束报警时间`, visible: true },
|
||||
{ key: 6, label: `最近报警时间`, visible: true },
|
||||
{ key: 7, label: `处理时间`, visible: true },
|
||||
{ key: 8, label: `处理人`, visible: true },
|
||||
{ key: 9, label: `处理状态`, visible: true },
|
||||
]
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
|
@ -156,11 +233,18 @@ export default {
|
|||
logId: null,
|
||||
carVin: null,
|
||||
faultCode: null,
|
||||
alarmFlag: null,
|
||||
faultName: null,
|
||||
alarmFalg: null,
|
||||
startAlarmTime: null,
|
||||
endAlarmTime: null,
|
||||
recentlyAlarmTime: null,
|
||||
disposeTime: null,
|
||||
disposeBy: null,
|
||||
disposeStatus: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
remark: null
|
||||
};
|
||||
this.resetForm("form")
|
||||
|
|
@ -175,6 +259,63 @@ export default {
|
|||
this.resetForm("queryForm")
|
||||
this.handleQuery()
|
||||
},
|
||||
// 筛选节点
|
||||
filterNode(value, data) {
|
||||
if (!value) return true;
|
||||
return data.label.indexOf(value) !== -1;
|
||||
},
|
||||
// /**多选框选中数据*/
|
||||
// handleSelectionChange(selection){
|
||||
// this.ids = selection.map(item => item.logId)
|
||||
// this.single = selection.length !== 1
|
||||
// this.multiple = !selection.length
|
||||
// },
|
||||
// /**新增故障日志记录*/
|
||||
// handleAdd(){
|
||||
// this.reset()
|
||||
// this.open = true;
|
||||
// this.title = "添加故障日志"
|
||||
// },
|
||||
// /**修改按钮操作*/
|
||||
// handleUpdate(row){
|
||||
// this.reset()
|
||||
// const logId = row.logId || this.ids
|
||||
// getFaultLogs(logId).then(res => {
|
||||
// this.form = res.data
|
||||
// this.open = true
|
||||
// this.title = "修改故障日志"
|
||||
// })
|
||||
// },
|
||||
// /**提交按钮*/
|
||||
// submitForm(){
|
||||
// this.$refs["form"].validate(valid => {
|
||||
// if (valid){
|
||||
// if (null != this.form.logId){
|
||||
// editFaultLogs(this.form).then(res => {
|
||||
// this.$message.success('修改成功')
|
||||
// this.open = false
|
||||
// this.getList()
|
||||
// })
|
||||
// }else {
|
||||
// addFaultLogs(this.form).then(res => {
|
||||
// this.$message.success('新增成功')
|
||||
// this.open = false
|
||||
// this.getList()
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// },
|
||||
// /**删除按钮操作*/
|
||||
// handleDelete(row){
|
||||
// const logIds = row.logId || this.ids
|
||||
// this.$modal.confirm('是否确认删除故障记录编号为"' + logIds + '"的数据项?').then(function (){
|
||||
// return delFaultLogs(logIds)
|
||||
// }).then(() => {
|
||||
// this.getList()
|
||||
// this.$message.success('删除成功')
|
||||
// }).catch(() => {})
|
||||
// }
|
||||
},
|
||||
//声明周期 - 创建完成（可以访问当前this实例）,
|
||||
created() {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,300 @@
|
|||
<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="fenceName">
|
||||
<el-input
|
||||
v-model="queryParams.fenceName"
|
||||
placeholder="请输入围栏名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="围栏类型" prop="fenceType">
|
||||
<el-input
|
||||
v-model="queryParams.fenceType"
|
||||
placeholder="请输入围栏类型"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="围栏状态" prop="fenceState">
|
||||
<el-select v-model="queryParams.fenceState" placeholder="请选择围栏状态" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</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="['business:fence: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="['business:fence: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="['business:fence: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="['business:fence:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="fenceList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="围栏名称" align="center" prop="fenceName" />
|
||||
<el-table-column label="围栏类型" align="center" prop="fenceType" />
|
||||
<el-table-column label="围栏状态" align="center" prop="fenceState">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.fenceState"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="经纬度信息" align="center" prop="fenceRadius" />
|
||||
<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-map-location"
|
||||
@click="$router.push({
|
||||
path:'/fence/map',
|
||||
query:{
|
||||
fenceId:scope.row.fenceId,
|
||||
}})"
|
||||
>编辑围栏</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['business:fence:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['business:fence: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="fenceName">
|
||||
<el-input v-model="form.fenceName" placeholder="请输入围栏名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="围栏类型" prop="fenceType">
|
||||
<el-radio v-model="form.fenceType" label="驶出">驶出</el-radio>
|
||||
<el-radio v-model="form.fenceType" label="驶入">驶入</el-radio>
|
||||
</el-form-item>
|
||||
<el-form-item label="围栏状态" prop="fenceState">
|
||||
<el-select v-model="form.fenceState" placeholder="请选择围栏状态">
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="parseInt(dict.value)"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</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 { listFence, getFence, delFence, addFence, updateFence } from "@/api/business/fence";
|
||||
|
||||
export default {
|
||||
name: "Fence",
|
||||
dicts: ['sys_normal_disable'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 电子围栏表格数据
|
||||
fenceList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
fenceName: null,
|
||||
fenceType: null,
|
||||
fenceState: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询电子围栏列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listFence(this.queryParams).then(res => {
|
||||
this.fenceList = res.data.list;
|
||||
this.total = res.data.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
fenceId: null,
|
||||
fenceEncoding: null,
|
||||
fenceName: null,
|
||||
fenceType: null,
|
||||
fenceState: null,
|
||||
fenceRadius: 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.fenceId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加电子围栏";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const fenceId = row.fenceId || this.ids
|
||||
getFence(fenceId).then(response => {
|
||||
this.form = response;
|
||||
this.open = true;
|
||||
this.title = "修改电子围栏";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.fenceId != null) {
|
||||
updateFence(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addFence(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const fenceIds = row.fenceId || this.ids;
|
||||
this.$modal.confirm('是否确认删除电子围栏编号为"' + fenceIds + '"的数据项？').then(function() {
|
||||
return delFence(fenceIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('business/fence/export', {
|
||||
...this.queryParams
|
||||
}, `fence_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -0,0 +1,102 @@
|
|||
<template>
|
||||
<div class="dashboard-container">
|
||||
<el-button @click="drawPolygon()">绘制围栏</el-button>
|
||||
<el-button @click="cleanPolygon()">清除围栏</el-button>
|
||||
<el-button @click="savePolygon()">保存围栏</el-button>
|
||||
<div id="container"></div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import AMapLoader from "@amap/amap-jsapi-loader";
|
||||
import log from "@/views/monitor/job/log.vue";
|
||||
import { savePolygon } from "@/api/business/fence";
|
||||
|
||||
export default {
|
||||
name: "map-view",
|
||||
created() {
|
||||
this.mapRequest.fenceId = this.$route.query.fenceId;
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
map: null,
|
||||
_Amap: null,
|
||||
mouseTool: null,
|
||||
mapRequest: {
|
||||
fenceId: 0,
|
||||
jwd: {}
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.initAMap();
|
||||
},
|
||||
unmounted() {
|
||||
this.map?.destroy();
|
||||
},
|
||||
methods: {
|
||||
initAMap() {
|
||||
AMapLoader.load({
|
||||
key: "ce38a6b072b603934f6270bd9e97ed49", // 申请好的Web端开发者Key，首次调用 load 时必填
|
||||
version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
|
||||
plugins: ["AMap.Scale","AMap.MouseTool"], //需要使用的的插件列表，如比例尺'AMap.Scale'，支持添加多个如：['...','...']
|
||||
})
|
||||
.then((AMap) => {
|
||||
this._Amap = AMap;
|
||||
this.map = new AMap.Map("container", {
|
||||
// 设置地图容器id
|
||||
viewMode: "3D", // 是否为3D地图模式
|
||||
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],
|
||||
})
|
||||
},
|
||||
|
||||
cleanPolygon () {
|
||||
this.mouseTool.close(true)
|
||||
},
|
||||
|
||||
drawReady(event) {
|
||||
|
||||
this.mapRequest.jwd=event.obj.getPath();
|
||||
|
||||
console.info('覆盖物对象绘制完成')
|
||||
},
|
||||
|
||||
savePolygon() {
|
||||
console.log(this.mapRequest.jwd)
|
||||
savePolygon(this.mapRequest).then(response => {
|
||||
this.$modal.msgSuccess("保存成功");
|
||||
this.$router.push({path: '/etcfence/fence'})
|
||||
});
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
#container{
|
||||
padding:0px;
|
||||
margin: 0px;
|
||||
width: 100%;
|
||||
height: 800px;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,307 @@
|
|||
<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="markingName">
|
||||
<el-input
|
||||
v-model="queryParams.markingName"
|
||||
placeholder="请输入标识名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</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="['business:marking: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="['business:marking: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="['business:marking: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="['business:marking:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="markingList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="标识表主键" align="center" prop="markingId" />
|
||||
<el-table-column label="标识名称" align="center" prop="markingName" />
|
||||
<el-table-column label="电子围栏" align="center" prop="markingFenceIds" />
|
||||
<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="['business:marking:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['business:marking: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="markingName">
|
||||
<el-input v-model="form.markingName" placeholder="请输入标识名称" />
|
||||
</el-form-item>
|
||||
<el-divider content-position="center">电子围栏信息</el-divider>
|
||||
<el-form-item label="围栏名称" prop="markingFenceIds">
|
||||
<el-checkbox-group v-model="markingFenceIds">
|
||||
<el-checkbox v-for="item in fence"
|
||||
:key="item.fenceId"
|
||||
:label="item.fenceId"
|
||||
>
|
||||
{{ item.fenceName }}
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</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 {listMarking, getMarking, delMarking, addMarking, updateMarking, findFence} from "@/api/business/marking";
|
||||
|
||||
export default {
|
||||
name: "Marking",
|
||||
dicts: ['sys_normal_disable'],
|
||||
data() {
|
||||
return {
|
||||
markingFenceIds:[],
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 子表选中数据
|
||||
checkedFenceInfo: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 标识列表表格数据
|
||||
markingList: [],
|
||||
// 电子围栏表格数据
|
||||
fenceInfoList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
markingName: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
},
|
||||
fence: []
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
this.findFence()
|
||||
},
|
||||
methods: {
|
||||
findFence() {
|
||||
findFence().then(res => {
|
||||
this.fence = res
|
||||
})
|
||||
},
|
||||
/** 查询标识列表列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listMarking(this.queryParams).then(res => {
|
||||
this.markingList = res.data.list;
|
||||
this.total = res.data.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
markingId: null,
|
||||
markingName: null,
|
||||
markingFenceIds: null
|
||||
};
|
||||
this.fenceInfoList = [];
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.markingId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.markingFenceIds = []
|
||||
this.reset();
|
||||
this.open = true;
|
||||
// this.findFence()
|
||||
this.title = "添加标识列表";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const markingId = row.markingId || this.ids
|
||||
getMarking(markingId).then(res => {
|
||||
this.findFence()
|
||||
this.form = res;
|
||||
this.form.markingFenceIds = res.markingFenceIds.split(',')
|
||||
// this.markingFenceIds = res.markingFenceIds != null ? res.markingFenceIds.split(',') : []
|
||||
this.open = true;
|
||||
this.title = "修改标识列表";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
this.form.markingFenceIds=this.markingFenceIds.join(",")
|
||||
if (this.form.markingId != null) {
|
||||
updateMarking(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addMarking(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const markingIds = row.markingId || this.ids;
|
||||
this.$modal.confirm('是否确认删除标识列表编号为"' + markingIds + '"的数据项？').then(function() {
|
||||
return delMarking(markingIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 电子围栏序号 */
|
||||
rowFenceInfoIndex({ row, rowIndex }) {
|
||||
row.index = rowIndex + 1;
|
||||
},
|
||||
/** 电子围栏添加按钮操作 */
|
||||
handleAddFenceInfo() {
|
||||
let obj = {};
|
||||
obj.fenceName = "";
|
||||
obj.fenceType = "";
|
||||
obj.fenceState = "";
|
||||
obj.fenceRadius = "";
|
||||
this.fenceInfoList.push(obj);
|
||||
},
|
||||
/** 电子围栏删除按钮操作 */
|
||||
handleDeleteFenceInfo() {
|
||||
if (this.checkedFenceInfo.length == 0) {
|
||||
this.$modal.msgError("请先选择要删除的电子围栏数据");
|
||||
} else {
|
||||
const fenceInfoList = this.fenceInfoList;
|
||||
const checkedFenceInfo = this.checkedFenceInfo;
|
||||
this.fenceInfoList = fenceInfoList.filter(function(item) {
|
||||
return checkedFenceInfo.indexOf(item.index) == -1
|
||||
});
|
||||
}
|
||||
},
|
||||
/** 复选框选中数据 */
|
||||
handleFenceInfoSelectionChange(selection) {
|
||||
this.checkedFenceInfo = selection.map(item => item.index)
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('business/marking/export', {
|
||||
...this.queryParams
|
||||
}, `marking_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -0,0 +1,189 @@
|
|||
<template>
|
||||
<div>
|
||||
|
||||
<div class="dashboard-container">
|
||||
<div id="container"></div>
|
||||
</div>
|
||||
|
||||
{{ this.vehicle }}
|
||||
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import AMapLoader from "@amap/amap-jsapi-loader";
|
||||
import {getPosition, vehicleData} from "@/api/business/records";
|
||||
|
||||
export default {
|
||||
name: "map-view",
|
||||
data() {
|
||||
return {
|
||||
carPosition: ["116.397428", "39.90923"], // 初始化小汽车位置
|
||||
carMarker: null, // 存储小汽车Marker
|
||||
animationInterval: null,//存储动画定时器
|
||||
lineArr: [],
|
||||
recordsId: 0,
|
||||
vehicle: {}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.recordsId = this.$route.query.recordsId;
|
||||
this.getFindVD()
|
||||
},
|
||||
mounted() {
|
||||
this.initAMap();
|
||||
// 初始化 echarts
|
||||
this.initBarChart();
|
||||
},
|
||||
beforeDestroy() {
|
||||
clearInterval(this.animationInterval);//清除定时器
|
||||
this.map?.destroy();
|
||||
},
|
||||
methods: {
|
||||
getFindVD() {
|
||||
vehicleData(this.recordsId)
|
||||
},
|
||||
|
||||
initAMap() {
|
||||
AMapLoader.load({
|
||||
key: "ce38a6b072b603934f6270bd9e97ed49", // 申请好的Web端开发者Key，首次调用 load 时必填
|
||||
version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
|
||||
plugins: ["AMap.Scale"], //需要使用的的插件列表，如比例尺'AMap.Scale'，支持添加多个如：['...','...']
|
||||
})
|
||||
.then((AMap) => {
|
||||
this.map = new AMap.Map("container", {
|
||||
// 设置地图容器id
|
||||
viewMode: "3D", // 是否为3D地图模式
|
||||
zoom: 11, // 初始化地图级别
|
||||
center: [116.397428, 39.90923], // 初始化地图中心点位置
|
||||
});
|
||||
|
||||
// 车辆初始化
|
||||
this.carMarker = new AMap.Marker({
|
||||
position: this.carPosition,
|
||||
icon: 'https://webapi.amap.com/images/car.png',
|
||||
map: this.map, // 将Marker添加到地图上
|
||||
});
|
||||
|
||||
// 在地图初始化完成后启动小车动画
|
||||
this.startCarAnimation();
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
});
|
||||
},
|
||||
|
||||
startCarAnimation() {
|
||||
this.animationInterval = setInterval(() => {
|
||||
this.getRealTimeDataAndUpdatePosition();
|
||||
}, 1000);
|
||||
},
|
||||
|
||||
getRealTimeDataAndUpdatePosition() {
|
||||
getPosition(this.recordsId)
|
||||
.then(response => {
|
||||
this.vehicle = response.data
|
||||
//更新小汽车位置
|
||||
this.carPosition = [this.vehicle.longitude, this.vehicle.latitude];
|
||||
//更新小汽车Marker的位置
|
||||
this.carMarker.setPosition(this.carPosition);
|
||||
})
|
||||
},
|
||||
|
||||
// initBarChart() {
|
||||
// // 通过 $ref 进行挂载
|
||||
// let myChart = this.$echarts.init(this.$refs.barChart);
|
||||
// let option = {
|
||||
// series: [
|
||||
// {
|
||||
// type: 'gauge',
|
||||
// axisLine: {
|
||||
// lineStyle: {
|
||||
// width: 30,
|
||||
// color: [
|
||||
// [0.3, '#67e0e3'],
|
||||
// [0.7, '#37a2da'],
|
||||
// [1, '#fd666d']
|
||||
// ]
|
||||
// }
|
||||
// },
|
||||
// pointer: {
|
||||
// itemStyle: {
|
||||
// color: 'auto'
|
||||
// }
|
||||
// },
|
||||
// axisTick: {
|
||||
// distance: -30,
|
||||
// length: 8,
|
||||
// lineStyle: {
|
||||
// color: '#fff',
|
||||
// width: 2
|
||||
// }
|
||||
// },
|
||||
// splitLine: {
|
||||
// distance: -30,
|
||||
// length: 30,
|
||||
// lineStyle: {
|
||||
// color: '#fff',
|
||||
// width: 4
|
||||
// }
|
||||
// },
|
||||
// axisLabel: {
|
||||
// color: 'inherit',
|
||||
// distance: 40,
|
||||
// fontSize: 20
|
||||
// },
|
||||
// detail: {
|
||||
// valueAnimation: true,
|
||||
// formatter: '{value} km/h',
|
||||
// color: 'inherit'
|
||||
// },
|
||||
// data: [
|
||||
// {
|
||||
// value: 70
|
||||
// }
|
||||
// ]
|
||||
// }
|
||||
// ]
|
||||
// };
|
||||
// setInterval(function () {
|
||||
// myChart.setOption({
|
||||
// series: [
|
||||
// {
|
||||
// data: [
|
||||
// {
|
||||
// value: +(Math.random() * 100).toFixed(2)
|
||||
// }
|
||||
// ]
|
||||
// }
|
||||
// ]
|
||||
// });
|
||||
// }, 2000);
|
||||
// myChart.setOption(option);
|
||||
// },
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
#container{
|
||||
padding:0px;
|
||||
margin: 0px;
|
||||
width: 25%;
|
||||
height: 200px;
|
||||
}
|
||||
.amap-marker-icon {
|
||||
border: none !important; /* 移除Marker的边框 */
|
||||
box-shadow: none !important; /* 移除Marker的阴影 */
|
||||
}
|
||||
.home {
|
||||
width: 500px;
|
||||
height: 400px;
|
||||
margin: auto;
|
||||
border: 3px solid lightcoral;
|
||||
|
||||
// 宽高是必须给的，可以给百分比、具体的像素等....
|
||||
.barChart {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,278 @@
|
|||
<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="VIN" prop="vin">
|
||||
<el-input
|
||||
v-model="queryParams.vin"
|
||||
placeholder="请输入VIN"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="开始时间" prop="startTime">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.startTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="结束时间" prop="overTime">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.overTime"
|
||||
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="['business:records: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="['business:records: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="['business:records: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="['business:records:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="recordsList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="VIN" align="center" prop="vin" />
|
||||
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="结束时间" align="center" prop="overTime" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.overTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</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-map-location"
|
||||
@click="$router.push({
|
||||
path:'/vehicleData/data',
|
||||
query:{
|
||||
recordsId:scope.row.recordsId
|
||||
}})"
|
||||
>历史轨迹</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['business:records: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>
|
||||
<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 { listRecords, getRecords, delRecords, addRecords, updateRecords } from "@/api/business/records";
|
||||
|
||||
export default {
|
||||
name: "Records",
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 车辆历史轨迹表格数据
|
||||
recordsList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
vin: null,
|
||||
startTime: null,
|
||||
overTime: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询车辆历史轨迹列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listRecords(this.queryParams).then(response => {
|
||||
this.recordsList = response.data.list;
|
||||
this.total = response.data.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
recordsId: null,
|
||||
vin: null,
|
||||
startTime: null,
|
||||
overTime: 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.recordsId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加车辆历史轨迹";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const recordsId = row.recordsId || this.ids
|
||||
getRecords(recordsId).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改车辆历史轨迹";
|
||||
});
|
||||
},
|
||||
getTrajectory(row) {
|
||||
this.reset();
|
||||
const recordsId = row.recordsId || this.ids
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.recordsId != null) {
|
||||
updateRecords(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addRecords(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const recordsIds = row.recordsId || this.ids;
|
||||
this.$modal.confirm('是否确认删除车辆历史轨迹编号为"' + recordsIds + '"的数据项？').then(function() {
|
||||
return delRecords(recordsIds);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('business/records/export', {
|
||||
...this.queryParams
|
||||
}, `records_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -115,9 +115,10 @@
|
|||
<el-table v-loading="loading" :data="carList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="id" align="center" prop="carId" />
|
||||
<el-table-column label="车辆vin码" align="center" prop="carVin" />
|
||||
<el-table-column label="车辆vin" align="center" prop="carVin" />
|
||||
<el-table-column label="车辆类型" align="center" prop="carType" />
|
||||
<el-table-column label="电子围栏id" align="center" prop="carFenceId" />
|
||||
<!-- <el-table-column label="电子围栏" align="center" prop="carFenceId" />-->
|
||||
<el-table-column label="车辆标识" align="center" prop="carMarking" />
|
||||
<el-table-column label="车辆状态" align="center" prop="state">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.car_state" :value="scope.row.state"/>
|
||||
|
|
@ -130,6 +131,22 @@
|
|||
<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-success"
|
||||
v-if="scope.row.state === 1"
|
||||
@click="handleUpdateOpen(scope.row.carVin)"
|
||||
v-hasPermi="['system:car:edit']"
|
||||
>上线</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-error"
|
||||
v-if="scope.row.state === 0"
|
||||
@click="handleUpdateClose(scope.row.carVin)"
|
||||
v-hasPermi="['system:car:edit']"
|
||||
>下线</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
|
|
@ -144,6 +161,15 @@
|
|||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:car:remove']"
|
||||
>删除</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-eleme"
|
||||
@click="$router.push({
|
||||
path:'track',
|
||||
query:{
|
||||
carVin:scope.row.carVin}})"
|
||||
>实时轨迹查询</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -164,28 +190,19 @@
|
|||
<el-input v-model="form.carType" placeholder="请输入车辆类型" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="电子围栏" prop="carFenceId">
|
||||
<el-checkbox-group v-model="selectedFenceIds">
|
||||
<!-- <el-form-item label="电子围栏" prop="carFenceId">-->
|
||||
<el-form-item label="车辆标识" prop="carMarking">
|
||||
<el-checkbox-group v-model="selectedMarkingIds">
|
||||
<el-checkbox
|
||||
v-for="fence in selectFence"
|
||||
:key="fence.fenceId"
|
||||
:label="fence.fenceId"
|
||||
:value="fence.fenceId"
|
||||
v-for="marking in selectMarking"
|
||||
:key="marking.markingId"
|
||||
:label="marking.markingId"
|
||||
:value="marking.markingId"
|
||||
>
|
||||
{{ fence.fenceName }}
|
||||
{{ marking.markingName }}
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="车辆状态" prop="state">
|
||||
<el-select v-model="form.state" placeholder="请选择车辆状态">
|
||||
<el-option
|
||||
v-for="dict in dict.type.car_state"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="parseInt(dict.value)"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="电机厂商" prop="carElectricalmachiney">
|
||||
<el-input v-model="form.carElectricalmachiney" placeholder="请输入电机厂商" />
|
||||
</el-form-item>
|
||||
|
|
@ -211,14 +228,17 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {list, add, update, findById, del, exportA, selectFence} from "@/api/system/car";
|
||||
import {list, add, update, findById, del, exportA, selectFence,open,close,selectMarking} from "@/api/system/car";
|
||||
|
||||
export default {
|
||||
name: "Car",
|
||||
dicts: ['car_state'],
|
||||
data() {
|
||||
return {
|
||||
selectFence:[],
|
||||
//电子围栏表循环查询
|
||||
// selectFence:[],
|
||||
//标识表循环查询
|
||||
selectMarking:[],
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
|
|
@ -231,10 +251,10 @@ export default {
|
|||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
//电子围栏空数组
|
||||
fenceIds:[],
|
||||
//电子围栏选中的数组
|
||||
selectedFenceIds: [],
|
||||
// selectedFenceIds: [],
|
||||
//标识表选中的数组
|
||||
selectedMarkingIds:[],
|
||||
// 车辆管理表格数据
|
||||
carList: [],
|
||||
// 弹出层标题
|
||||
|
|
@ -245,9 +265,8 @@ export default {
|
|||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
carVin: '',
|
||||
carType: '',
|
||||
carFenceId: '',
|
||||
carVin: null,
|
||||
carType: null,
|
||||
state: null,
|
||||
carElectricalmachiney: null,
|
||||
carBattery: null,
|
||||
|
|
@ -256,7 +275,7 @@ export default {
|
|||
},
|
||||
// 表单参数
|
||||
form: {
|
||||
|
||||
carMarking:[]
|
||||
},
|
||||
// 表单校验
|
||||
rules: {
|
||||
|
|
@ -265,18 +284,19 @@ export default {
|
|||
},
|
||||
created() {
|
||||
this.getList();
|
||||
|
||||
this.selectFenceList()
|
||||
// this.selectFenceList()
|
||||
this.selectMarkingList()
|
||||
},
|
||||
methods: {
|
||||
selectFenceList(){
|
||||
selectFence().then(res=>{
|
||||
this.selectFence=res.data
|
||||
console.log(this.selectFence)
|
||||
this.fenceIds = this.selectFence
|
||||
console.log(this.fenceIds)
|
||||
|
||||
|
||||
// selectFenceList(){
|
||||
// selectFence().then(res=>{
|
||||
// this.selectFence=res.data
|
||||
// console.log(this.selectFence)
|
||||
// })
|
||||
// },
|
||||
selectMarkingList(){
|
||||
selectMarking().then(res=>{
|
||||
this.selectMarking=res.data
|
||||
})
|
||||
},
|
||||
/** 查询车辆管理列表 */
|
||||
|
|
@ -295,11 +315,13 @@ export default {
|
|||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.selectedMarkingIds=[]
|
||||
this.form = {
|
||||
carId: null,
|
||||
carVin: null,
|
||||
carType: '',
|
||||
carFenceId: '',
|
||||
carType: null,
|
||||
// carFenceId: null,
|
||||
carMarking: null,
|
||||
state: null,
|
||||
carElectricalmachiney: null,
|
||||
carBattery: null,
|
||||
|
|
@ -331,9 +353,11 @@ export default {
|
|||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.selectedMarkingIds=[]
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.selectFenceList()
|
||||
// this.selectFenceList()
|
||||
// this.selectMarkingList()
|
||||
this.title = "添加车辆管理";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
|
|
@ -342,22 +366,40 @@ export default {
|
|||
const carId = row.carId || this.ids
|
||||
findById(carId).then(response => {
|
||||
this.form = response.data;
|
||||
this.form.carFenceId = this.form.carFenceId.split(",");
|
||||
// this.selectedFenceIds = this.form.carFenceId.split(",");
|
||||
// this.selectMarking=response.data.carMarking.split(",")
|
||||
// this.selectedMarkingIds=this.form.carMarking.split(",")
|
||||
|
||||
this.open = true;
|
||||
this.title = "修改车辆管理";
|
||||
});
|
||||
},
|
||||
/** 启用车辆 **/
|
||||
handleUpdateOpen(carVin){
|
||||
open(carVin).then(res=>{
|
||||
this.$message.success('上线成功')
|
||||
this.getList();
|
||||
})
|
||||
},
|
||||
/** 禁用车辆 **/
|
||||
handleUpdateClose(carVin){
|
||||
close(carVin).then(res=>{
|
||||
this.$message.success('下线成功')
|
||||
this.getList();
|
||||
})
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (!Array.isArray(this.form.carFenceId)){
|
||||
this.form.carFenceId=[this.form.carFenceId]
|
||||
//判断是否为数组，如果不正确转为数组
|
||||
if (!Array.isArray(this.form.carMarking)){
|
||||
this.form.carMarking=[this.form.carMarking]
|
||||
}
|
||||
this.form.carFenceId = this.form.carFenceId.map(item => String(item)); // 将每个元素转换为字符串
|
||||
|
||||
this.form.carFenceId = this.selectedFenceIds.join(",");
|
||||
// this.form.carFenceId = this.form.carFenceId.join(",");
|
||||
//将每个元素转换为字符串
|
||||
this.form.carMarking = this.form.carMarking.map(item => String(item)); //
|
||||
//拼接获取到数据的数组，切割
|
||||
this.form.carMarking = this.selectedMarkingIds.join(",");
|
||||
if (this.form.carId != null) {
|
||||
update(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
|
|
@ -384,13 +426,6 @@ export default {
|
|||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
// handleExport() {
|
||||
// this.download('system/car/export', {
|
||||
// ...this.queryParams
|
||||
// }, `car_${new Date().getTime()}.xlsx`)
|
||||
// }
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
exportA(this.queryParams).then(response => {
|
||||
// 创建一个 Blob 对象，指定 MIME 类型为 Excel 文件类型
|
||||
|
|
|
|||
|
|
@ -0,0 +1,109 @@
|
|||
<template>
|
||||
<div>
|
||||
<div id="container" style="width: 25%; height: 250px;"></div>
|
||||
<div>
|
||||
{{carData}}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import AMapLoader from "@amap/amap-jsapi-loader";
|
||||
import {getRealTimeDataTwo} from "@/api/system/car";
|
||||
|
||||
|
||||
export default {
|
||||
name: "map-view",
|
||||
data() {
|
||||
return {
|
||||
carPosition: ["116.397428", "39.90923"], // 初始化小汽车位置
|
||||
carMarker: null, // 存储小汽车Marker
|
||||
animationInterval:null,//存储动画定时器
|
||||
lastUpdateTime:0,//上次更新时间
|
||||
animationFramId:null,//存储动画帧的ID
|
||||
carData:[],//小汽车经纬度
|
||||
};
|
||||
},
|
||||
|
||||
mounted() {
|
||||
this.initAMap()
|
||||
// this.getRealTimeDataAndUpdatePosition(this.$route.query.carVin); // 添加此行
|
||||
},
|
||||
beforeDestroy() {
|
||||
clearInterval(this.animationInterval);//清除定时器
|
||||
this.map?.destroy();
|
||||
cancelAnimationFrame(this.animationFramId);//取消动画帧请求
|
||||
},
|
||||
methods: {
|
||||
initAMap() {
|
||||
AMapLoader.load({
|
||||
key: "e7398786b61ee782417e1749de1f2b39", // 申请好的Web端开发者Key，首次调用 load 时必填
|
||||
version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
|
||||
plugins: ["AMap.Scale"], // 需要使用的的插件列表，如比例尺'AMap.Scale'，支持添加多个如：['...','...']
|
||||
})
|
||||
.then((AMap) => {
|
||||
this.map = new AMap.Map("container", {
|
||||
// 设置地图容器id
|
||||
viewMode: "3D", // 是否为3D地图模式
|
||||
zoom: 11, // 初始化地图级别
|
||||
center: ["116.397428", "39.90923"], // 初始化地图中心点位置
|
||||
});
|
||||
|
||||
// 车辆初始化
|
||||
this.carMarker = new AMap.Marker({
|
||||
position: this.carPosition,
|
||||
icon: 'https://webapi.amap.com/images/car.png',
|
||||
map: this.map, // 将Marker添加到地图上
|
||||
});
|
||||
|
||||
// 在地图初始化完成后启动小车动画
|
||||
this.startCarAnimation();
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
});
|
||||
},
|
||||
startCarAnimation() {
|
||||
// this.animationInterval = setInterval(() => {
|
||||
// let vin = this.$route.query.carVin;
|
||||
// this.getRealTimeDataAndUpdatePosition(vin);
|
||||
// }, 1000);
|
||||
const animate = () => {
|
||||
const currentTime = Date.now();
|
||||
const deltaTime = currentTime - this.lastUpdateTime;
|
||||
|
||||
if (deltaTime > 1000) {
|
||||
//每秒更新一次位置
|
||||
this.lastUpdateTime = currentTime;
|
||||
let vin = this.$route.query.carVin;
|
||||
this.getRealTimeDataAndUpdatePosition(vin);
|
||||
}
|
||||
this.animationFramId = requestAnimationFrame(animate);
|
||||
};
|
||||
this.animationFramId = requestAnimationFrame(animate);
|
||||
|
||||
|
||||
},
|
||||
getRealTimeDataAndUpdatePosition(vin) {
|
||||
getRealTimeDataTwo(vin)
|
||||
.then(response => {
|
||||
console.log('Response from getRealTimeDataTwo:', response);
|
||||
// this.$message.success('Real-time data:',response);
|
||||
this.carData = response
|
||||
//更新小汽车位置
|
||||
this.carPosition = [this.carData.longitude, this.carData.latitude];
|
||||
//更新小汽车Marker的位置
|
||||
this.carMarker.setPosition(this.carPosition);
|
||||
//显示实时数据
|
||||
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
</style>
|
||||
Loading…
Reference in New Issue