guangyin
/
hbt-prevention-ui
forked from xxhjsb/hbt-prevention-ui
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'feature1.2' of https://git.hanbangtang.com/xxhjsb/hbt-prevention-ui into kongyeqing

dev
kongyeqing 2023-09-05 15:26:33 +08:00
parent aaa9fc1633 e6946df36d
commit 3ebce122b1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/risk/assessment/areaAnal/areaAnal.component.vue
View File

@ -95,7 +95,7 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
}); });
this.tableColumn.push({ this.tableColumn.push({
name: '区域固有风险', render: (data) => { name: '区域固有风险', render: (data) => {
return "<span class='color_level_" + data.analRiskLevel + "'>" + (data.analRiskLevel ? (this.$store.getters.prevention_risk_level_map[data.analRiskLevel] + this.numberForMat[data.analRiskLevel]) : '') + "</span>" return "<span class='color_level_" + data.analRiskLevel + "'>" + (data.analRiskLevel ? (this.$store.getters.prevention_risk_level_map[data.analRiskLevel] + this.numberForMat[data.analRiskLevel]) : '待评估') + "</span>"
} }
}); });
this.tableColumn.push({ this.tableColumn.push({

7
src/views/risk/unit/unit.component.vue
View File

@ -379,9 +379,10 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
this.repairTableColumn.push({ name: "登记时间", key: "registerTime" }); this.repairTableColumn.push({ name: "登记时间", key: "registerTime" });
} }
public getAreaList() {
this.areaService.selectByPage({ pageSize: 10 }).then((res: any) => { public getAreaList(){
this.areaList = res.data.datas.map(item => { this.areaService.selectByPage({pageSize:1000}).then((res:any)=>{
this.areaList = res.data.datas.map(item=>{
this.areaNoMap[item.id] = item.number; this.areaNoMap[item.id] = item.number;
return { return {
name: item.name, name: item.name,