diff --git a/src/pages/home1/components/navMenu/index.vue b/src/pages/home1/components/navMenu/index.vue index b8aa9bbd2..8baa1966d 100644 --- a/src/pages/home1/components/navMenu/index.vue +++ b/src/pages/home1/components/navMenu/index.vue @@ -9,13 +9,13 @@
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 6254b0035..6058ed1af 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -540,7 +540,7 @@ export default { applyType: this.dynamic.keyword },{ _this: this, - }, res=> { + }, res => { const result = res.data[0] for(const type in result) { this[type] = result[type].records @@ -558,6 +558,28 @@ export default { //取消预警 cancelWarning (index, row) { console.log(index, row) + this.$confirm('确认取消预警?','提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + type: 'warning', + roundButton: false + }).then(() => { + this.$http.get('sys/EarlyWarning/ChangePermissions', { + id: row.id, + }, res => { + this.pageConfig.newItemsPage = 1 + this.pageConfig.oldItemsPage = 1 + this.pageConfig.newStandPage = 1 + this.pageConfig.oldStandPage = 1 + this.pageConfig.newPolicyPage = 1 + this.pageConfig.oldPolicyPage = 1 + this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate() + } + ) + }).catch(() => { + this.$message.warning('取消事件') + }) }, showStandDetails(item) { let getStandId = item.sarId; @@ -614,28 +636,28 @@ export default { }, e => { }); }, - queryProductionVehicleByPage() { - this.$http.get("sys/EarlyWarning/StandWarning", { - sarPutType: "ZCCSSRQ", - pageSize: 5 - }, { - _this: this - }, res => { - this.productionVehicleDatas = res.data.list; - }, e => { - }); - }, - queryNewTypeByPage() { - this.$http.get("sys/EarlyWarning/StandWarning", { - sarPutType: "XCXSSRQ", - pageSize: 5 - }, { - _this: this - }, res => { - // this.newTypeDatas = res.data.list; - }, e => { - }); - }, + // queryProductionVehicleByPage() { + // this.$http.get("sys/EarlyWarning/StandWarning", { + // sarPutType: "ZCCSSRQ", + // pageSize: 5 + // }, { + // _this: this + // }, res => { + // this.productionVehicleDatas = res.data.list; + // }, e => { + // }); + // }, + // queryNewTypeByPage() { + // this.$http.get("sys/EarlyWarning/StandWarning", { + // sarPutType: "XCXSSRQ", + // pageSize: 5 + // }, { + // _this: this + // }, res => { + // // this.newTypeDatas = res.data.list; + // }, e => { + // }); + // }, /** * @description: 日期转换 * @author: chenxiaoxi @@ -707,8 +729,8 @@ export default { window.onresize = () => { this.height = $(".content").height() * 0.4; }; - this.queryNewTypeByPage(); - this.queryProductionVehicleByPage(); + // this.queryNewTypeByPage(); + // this.queryProductionVehicleByPage(); // 四个预警同时查询,loading全部打开 for (const loading in this.loading) { this.loading[loading] = true } this.getEarlyDate();