From 407578b89f769b8f23e0fa72252902205fff083e Mon Sep 17 00:00:00 2001 From: 86191 <2160251938@qq.com> Date: Mon, 30 Sep 2024 16:14:49 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/menu.js | 1 - src/api/saas/saas.js | 40 ++++++++++++++++----------- src/views/saas/breakLog/index.vue | 2 +- src/views/saas/fenceMap/map.vue | 2 +- src/views/saas/warn/index.vue | 45 ++++++++++++++++++++++++------- 5 files changed, 62 insertions(+), 28 deletions(-) diff --git a/src/api/menu.js b/src/api/menu.js index ceefe2f..8c1c21a 100644 --- a/src/api/menu.js +++ b/src/api/menu.js @@ -6,5 +6,4 @@ export const getRouters = () => { url: '/system/menu/getRouters', method: 'get' }) - } diff --git a/src/api/saas/saas.js b/src/api/saas/saas.js index b016db4..d7d8a60 100644 --- a/src/api/saas/saas.js +++ b/src/api/saas/saas.js @@ -129,7 +129,7 @@ export function findGroupByid(id) { //分页查询企业信息 export function enterpriseList(data) { return request({ - url: '/saas/selectEnterprise', + url: '/saas/enterprise/selectEnterprise', method: 'post', data }) @@ -139,7 +139,7 @@ export function enterpriseList(data) { //新增企业信息 export function insert(data) { return request({ - url: '/saas/insert', + url: '/saas/enterprise/insert', method: 'post', data: data }) @@ -149,7 +149,7 @@ export function insert(data) { //根据编号查询企业信息 export function searchById(enterpriseId) { return request({ - url: '/saas/searchById', + url: '/saas/enterprise/searchById', method: 'get', params: {enterpriseId} }) @@ -160,7 +160,7 @@ export function searchById(enterpriseId) { //修改企业信息 export function updateEnterEnterprise(data) { return request({ - url: '/saas/updateEnterEnterprise', + url: '/saas/enterprise/updateEnterEnterprise', method: 'post', data: data }) @@ -171,7 +171,7 @@ export function updateEnterEnterprise(data) { //删除企业信息 export function deleteByIds(data) { return request({ - url: '/saas/deleteByIds', + url: '/saas/enterprise/deleteByIds', method: 'post', data: data }) @@ -205,7 +205,7 @@ export function getCar(id) { // 新增车辆基础信息 export function addCar(data) { return request({ - url: '/saas/addSysCar', + url: '/saas/sysCar/addSysCar', method: 'post', data: data }) @@ -223,7 +223,7 @@ export function updateCar(data) { // 删除车辆基础信息 export function delCar(id) { return request({ - url: '/saas/sysCar/' + id, + url: '/saas/sysCar/deleteSysCarById/' + id, method: 'delete' }) } @@ -247,7 +247,7 @@ export function getLogCar() { //对应车辆VIN码查询对应故障 预警 电子围栏 export function findFaultData(carVin) { return request({ - url: '/saas/sysCar/findFenceByCarVin/'+carVin, + url: '/saas/sysCar/findFenceCarVin/'+carVin, method: 'post' }) } @@ -259,7 +259,6 @@ export function findFaultData(carVin) { - // 查询报文模版列表 export function messageTemplateTypeList() { return request({ @@ -304,12 +303,12 @@ export function findvehicleData(templatedId,code) { }) } //设备状态 -export function finddeviceStatusData(templatedId,code) { - return request({ - url: '/saas/sysCar/findFenceByCarVin?templatedId='+templatedId+"&code="+code, - method: 'post' - }) -} +// export function finddeviceStatusData(templatedId,code) { +// return request({ +// url: '/saas/sysCar/findFenceByCarVin?templatedId='+templatedId+"&code="+code, +// method: 'post' +// }) +// } //设备状态 export function findVehicleFaultData(param) { @@ -382,6 +381,17 @@ export function selectListByCarType(carTypeId) { } + +//删除策略 +export function deleteStrategy(id) { + return request({ + url: '/saas/strategy/deleteWarnStrategy/'+id, + method: 'delete' + }) +} + + + //根据车辆类型查策略 export function selectById(id) { return request({ diff --git a/src/views/saas/breakLog/index.vue b/src/views/saas/breakLog/index.vue index f61c08e..6a011a9 100644 --- a/src/views/saas/breakLog/index.vue +++ b/src/views/saas/breakLog/index.vue @@ -320,7 +320,7 @@ export default { }, /** 导出按钮操作 */ handelExport(){ - this.download('breakdown/log/export',{ + this.download('/saas/log/export',{ ...this.queryParams },`log_${new Date().getTime()}.xlsx`) }, diff --git a/src/views/saas/fenceMap/map.vue b/src/views/saas/fenceMap/map.vue index 3538e18..e973885 100644 --- a/src/views/saas/fenceMap/map.vue +++ b/src/views/saas/fenceMap/map.vue @@ -159,7 +159,7 @@ export default { if (200 == res.code) { this.$modal.msgSuccess('设置位置成功') this.$router.push({ - path: 'list' + path: 'fenceList' }) } }) diff --git a/src/views/saas/warn/index.vue b/src/views/saas/warn/index.vue index 139ac94..58d3e67 100644 --- a/src/views/saas/warn/index.vue +++ b/src/views/saas/warn/index.vue @@ -4,9 +4,15 @@ + + + + + + @@ -17,8 +23,8 @@ @@ -87,7 +93,7 @@ size="mini" type="text" icon="el-icon-delete" - @click="handleDelete(scope.row)" + @click="handleDelete(scope.row.id)" v-hasPermi="['platform:strategy:remove']" >删除策略 @@ -169,7 +175,7 @@ //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）, //例如：import 《组件名称》 from '《组件路径》, import { - addWarnStrategy, selectById, + addWarnStrategy, deleteStrategy, selectById, selectListByStrategyId, selectWarnStrategyList, updWarnStrategy @@ -210,9 +216,6 @@ export default { disabled:false, rules:{}, inShow:true - - - }; }, //计算属性 类似于data概念", @@ -221,6 +224,28 @@ export default { watch: {}, //方法集合", methods: { + + //删除策略 + handleDelete(id){ + this.$confirm('是否确认删除?', "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(function() { + return deleteStrategy(id) + }).then(() => { + this.getList(); + this.msgSuccess("删除成功"); + }).catch(function() { + this.msgError("删除失败"); + }); + }, + + + cancel(){ + this.open = false; + }, + /** 查询预警策略列表 */ getList() { this.loading = true; @@ -316,7 +341,7 @@ export default { const id = row.id const templateId = row.templateId this.$router.push({ - path: 'rule', + path: 'warnRule', query: {id:id,templateId:templateId} }) },