From cbad0f06cf19c7bf4fd63b9bd4dbcc28b4d1d0fd Mon Sep 17 00:00:00 2001 From: zhushengzhe Date: Fri, 15 Sep 2023 13:39:56 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=8C=BA=E5=9F=9F=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B7=BB=E5=8A=A0=E9=A3=8E=E9=99=A9=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/area.service.ts | 6 ++++++ src/service/unit.service.ts | 8 ++++++++ src/views/risk/area/area.component.vue | 22 ++++++++++++++++++++++ src/views/risk/unit/unit.component.vue | 23 ++++++++++++++++++++++- 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/src/service/area.service.ts b/src/service/area.service.ts index f112dd6..f45beb8 100644 --- a/src/service/area.service.ts +++ b/src/service/area.service.ts @@ -6,6 +6,12 @@ export default class AreaService extends BaseService{ super() } // 查询列表 + public selectByPageList(params: any):Promise>>{ + const url = this.prefix.prevention+'/risk/area/listLevel'; + return this.get(url,params,true) + } + + // 查询下拉列表 public selectByPage(params: any):Promise>>{ const url = this.prefix.prevention+'/risk/area/list'; return this.get(url,params,true) diff --git a/src/service/unit.service.ts b/src/service/unit.service.ts index 3afb334..463e4ed 100644 --- a/src/service/unit.service.ts +++ b/src/service/unit.service.ts @@ -5,6 +5,14 @@ export default class UnitService extends BaseService{ constructor(){ super() } + + // 查询列表 + public selectByPageList(params: any,showLoading?):Promise>>{ + const url = this.prefix.prevention+'/risk/unit/listLevel'; + return this.get(url,params,showLoading) + } + + // 查询下拉列表 public selectByPage(params: any,showLoading?):Promise>>{ const url = this.prefix.prevention+'/risk/unit/listAll'; return this.get(url,params,showLoading) diff --git a/src/views/risk/area/area.component.vue b/src/views/risk/area/area.component.vue index 787ff25..8c21e7b 100644 --- a/src/views/risk/area/area.component.vue +++ b/src/views/risk/area/area.component.vue @@ -114,6 +114,15 @@ export default class AreaManagerComponent extends BaseRecordComponent { // } + public getTableData(){ + this.tableService.selectByPageList(this.params).then((res:any)=>{ + this.tableData = res.data + if(this.getTableCallback){ + this.getTableCallback(res.data) + } + }) + } + public buildFormOptions() { this.updateOptions = [{ name: "区域编号", @@ -281,6 +290,19 @@ export default class AreaManagerComponent extends BaseRecordComponent { return this.$store.getters.common_yes_no_map[data.majorHazardFlag] } }); + this.tableColumn.push({ + name: '风险等级', key: "riskLevel", width: "150px", render: (data) => { + return "" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '待评估') + "" + }, + filters: this.$store.state.prevention_risk_level.map(item => { + return { + text: item.name, + value: item.value, + } + }), filterMethod: (data, row) => { + return row.riskLevel === data; + } + }); this.tableColumn.push({ name: '绘制情况', filters: this.filters, filterMethod: (data, row) => { if (data) { diff --git a/src/views/risk/unit/unit.component.vue b/src/views/risk/unit/unit.component.vue index f6feb11..f79b85e 100644 --- a/src/views/risk/unit/unit.component.vue +++ b/src/views/risk/unit/unit.component.vue @@ -123,6 +123,15 @@ export default class UnitManagerComponent extends BaseRecordComponent { this.getAreaList(); } + public getTableData(){ + this.tableService.selectByPageList(this.params,true).then((res:any)=>{ + this.tableData = res.data + if(this.getTableCallback){ + this.getTableCallback(res.data) + } + }) + } + public buildTurnOffForm() { this.turnOffForm = [{ name: "停用/恢复", @@ -355,6 +364,19 @@ export default class UnitManagerComponent extends BaseRecordComponent { this.tableColumn.push({ name: '风险分析单元', key: "name" }); this.tableColumn.push({ name: '责任部门', key: "chargeDeptName" }); this.tableColumn.push({ name: '责任人', key: "chargeUserName" }); + this.tableColumn.push({ + name: '风险等级', key: "riskLevel", width: "150px", render: (data) => { + return "" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '待评估') + "" + }, + filters: this.$store.state.prevention_risk_level.map(item => { + return { + text: item.name, + value: item.value, + } + }), filterMethod: (data, row) => { + return row.riskLevel === data; + } + }); this.tableColumn.push({ name: '绘制情况', filters: this.filters, filterMethod: (data, row) => { if (data) { @@ -370,7 +392,6 @@ export default class UnitManagerComponent extends BaseRecordComponent { } } }); - this.repairTableColumn.push({ name: "序号", key: "index" }); this.repairTableColumn.push({ name: "停用开始时间", key: "startTime" }); this.repairTableColumn.push({ name: "停用开始时间", key: "endTime" });