Compare commits

..

No commits in common. "master" and "dev.weiran" have entirely different histories.

8 changed files with 21 additions and 33 deletions

View File

@ -99,11 +99,3 @@ export function carDel(data) {
}) })
} }
// 解绑车辆
export function carButton() {
return request({
url: '/electronic/RunText/text',
method: 'get',
})
}

View File

@ -21,7 +21,7 @@ export function addfirm(data){
//权限分配 //权限分配
export function givepermission(data){ export function givepermission(data){
return request({ return request({
url:"/electronic/permission/permissionupd", url:"/electronic/permission/updpermission",
method: "POST", method: "POST",
data: data data: data
}) })

View File

@ -12,7 +12,7 @@ export function listLogs(query) {
// 查询预警日志详细 // 查询预警日志详细
export function getLogs(id) { export function getLogs(id) {
return request({ return request({
url: '/electronic/logs/' + id, url: '/cloud-warn/logs/' + id,
method: 'get' method: 'get'
}) })
} }
@ -20,7 +20,7 @@ export function getLogs(id) {
// 新增预警日志 // 新增预警日志
export function addLogs(data) { export function addLogs(data) {
return request({ return request({
url: '/electronic/logs', url: '/cloud-warn/logs',
method: 'post', method: 'post',
data: data data: data
}) })
@ -29,7 +29,7 @@ export function addLogs(data) {
// 修改预警日志 // 修改预警日志
export function updateLogs(data) { export function updateLogs(data) {
return request({ return request({
url: '/electronic/logs', url: '/cloud-warn/logs',
method: 'put', method: 'put',
data: data data: data
}) })
@ -38,7 +38,7 @@ export function updateLogs(data) {
// 删除预警日志 // 删除预警日志
export function delLogs(id) { export function delLogs(id) {
return request({ return request({
url: '/electronic/logs/' + id, url: '/cloud-warn/logs/' + id,
method: 'delete' method: 'delete'
}) })
} }

View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询预警规则列表 // 查询预警规则列表
export function listRule(query) { export function listRule(query) {
return request({ return request({
url: '/electronic/rule/list', url: '/cloud-warn/rule/list',
method: 'get', method: 'get',
params: query params: query
}) })
@ -12,7 +12,7 @@ export function listRule(query) {
// 查询预警规则详细 // 查询预警规则详细
export function getRule(id) { export function getRule(id) {
return request({ return request({
url: '/electronic/rule/' + id, url: '/cloud-warn/rule/' + id,
method: 'get' method: 'get'
}) })
} }
@ -20,7 +20,7 @@ export function getRule(id) {
// 新增预警规则 // 新增预警规则
export function addRule(data) { export function addRule(data) {
return request({ return request({
url: '/electronic/rule', url: '/cloud-warn/rule',
method: 'post', method: 'post',
data: data data: data
}) })
@ -29,7 +29,7 @@ export function addRule(data) {
// 修改预警规则 // 修改预警规则
export function updateRule(data) { export function updateRule(data) {
return request({ return request({
url: '/electronic/rule', url: '/cloud-warn/rule',
method: 'put', method: 'put',
data: data data: data
}) })
@ -38,7 +38,7 @@ export function updateRule(data) {
// 删除预警规则 // 删除预警规则
export function delRule(id) { export function delRule(id) {
return request({ return request({
url: '/electronic/rule/' + id, url: '/cloud-warn/rule/' + id,
method: 'delete' method: 'delete'
}) })
} }
@ -46,7 +46,7 @@ export function delRule(id) {
// 查询类型报文模板 // 查询类型报文模板
export function findByMsg(id) { export function findByMsg(id) {
return request({ return request({
url: '/electronic/rule/msg/' + id, url: '/cloud-warn/rule/msg/' + id,
method: 'get' method: 'get'
}) })
} }

View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询预警策略列表 // 查询预警策略列表
export function listStrategy(query) { export function listStrategy(query) {
return request({ return request({
url: '/electronic/strategy/list', url: '/cloud-warn/strategy/list',
method: 'get', method: 'get',
params: query params: query
}) })
@ -12,7 +12,7 @@ export function listStrategy(query) {
// 查询预警策略详细 // 查询预警策略详细
export function getStrategy(id) { export function getStrategy(id) {
return request({ return request({
url: '/electronic/strategy/' + id, url: '/cloud-warn/strategy/' + id,
method: 'get' method: 'get'
}) })
} }
@ -20,7 +20,7 @@ export function getStrategy(id) {
// 新增预警策略 // 新增预警策略
export function addStrategy(data) { export function addStrategy(data) {
return request({ return request({
url: '/electronic/strategy', url: '/cloud-warn/strategy',
method: 'post', method: 'post',
data: data data: data
}) })
@ -29,7 +29,7 @@ export function addStrategy(data) {
// 修改预警策略 // 修改预警策略
export function updateStrategy(data) { export function updateStrategy(data) {
return request({ return request({
url: '/electronic/strategy', url: '/cloud-warn/strategy',
method: 'put', method: 'put',
data: data data: data
}) })
@ -38,7 +38,7 @@ export function updateStrategy(data) {
// 删除预警策略 // 删除预警策略
export function delStrategy(id) { export function delStrategy(id) {
return request({ return request({
url: '/electronic/strategy/' + id, url: '/cloud-warn/strategy/' + id,
method: 'delete' method: 'delete'
}) })
} }
@ -46,7 +46,7 @@ export function delStrategy(id) {
// 查询车辆类型 // 查询车辆类型
export function findByCarType() { export function findByCarType() {
return request({ return request({
url: '/electronic/strategy/findByCarType', url: '/cloud-warn/strategy/findByCarType',
method: 'post', method: 'post',
}) })
} }

View File

@ -90,7 +90,6 @@ export const constantRoutes = [
}, },
] ]
// 动态路由,基于用户权限动态去加载 // 动态路由,基于用户权限动态去加载

View File

@ -363,7 +363,7 @@ export default {
}, },
// //
doupdpermission(){ doupdpermission(){
updperminpmssion(this.updForm).then(response=>{ updpermission(this.updForm).then(response=>{
alert(response.msg) alert(response.msg)
if (response.code==200){ if (response.code==200){
this.getpermissionList() this.getpermissionList()

View File

@ -26,7 +26,6 @@ import 'echarts-gl';
import { ElChart } from 'element-ui'; import { ElChart } from 'element-ui';
// echarts // echarts
import echarts from 'echarts' import echarts from 'echarts'
import { carButton } from '@/api/electronic'
export default { export default {
components: { components: {
@ -36,9 +35,9 @@ export default {
return { return {
modules: [ modules: [
{ id: 1, content: '车辆系统管理', pageUrl: '/car/information' }, { id: 1, content: '车辆系统管理', pageUrl: '/car/information' },
{ id: 2, content: '车辆故障管理', pageUrl: '/fault/faultrule' }, { id: 2, content: '车辆故障管理', pageUrl: '/page2-url' },
{ id: 3, content: '电子围栏管理', pageUrl: '/carFence/fence' }, { id: 3, content: '电子围栏管理', pageUrl: '/page3-url' },
{ id: 4, content: '车辆预警管理', pageUrl: '/platform/strategy' } { id: 4, content: '车辆预警管理', pageUrl: '/page4-url' }
], ],
myChart: '', myChart: '',
chartOptions(){ chartOptions(){
@ -52,13 +51,11 @@ export default {
}; };
}, },
mounted() { mounted() {
// //
this.drawLine(); this.drawLine();
}, },
methods: { methods: {
navigateToPage(url) { navigateToPage(url) {
this.$router.push(url); this.$router.push(url);
}, },