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

feat:重大危险源名称bug

dev
kongyeqing 2023-09-08 09:13:23 +08:00
parent f78252cd50
commit 444a52ef1a
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/hiddenDanger/files.component.vue
View File

@ -693,8 +693,8 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
professionClassifyName: this.$store.getters.prevention_major_type_map[row.professionClassify],
reformModeName: this.reformModeMap[row.reformMode],
}, row);
this.updateParams.majorHazardName = !this.updateParams.majorHazard? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard]
this.updateParams.majorHazard = +this.updateParams.majorHazard
this.updateParams.majorHazardName = !this.updateParams.majorHazard? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard]
this.getTableCallback()
// 获取url
if (row.resourceId) {

4
src/views/hiddenDanger/manager.component.vue
View File

@ -856,7 +856,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
if (!end) {
return time.getTime() < moment(start).subtract(1, 'day').toDate().getTime();
} else {
return time.getTime() < moment(start).subtract(1, 'day').toDate().getTime() || time.getTime() > moment(end).subtract(1, 'day').toDate().getTime();
return time.getTime() < moment(start).subtract(1, 'day').toDate().getTime() || time.getTime() > moment(end).toDate().getTime();
}
}
}
@ -934,8 +934,8 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
professionClassifyName: this.$store.getters.prevention_major_type_map[row.professionClassify],
reformModeName: this.reformModeMap[row.reformMode],
}, row);
this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard]
this.updateParams.majorHazard = +this.updateParams.majorHazard
this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard]
this.getTableCallback()
// 获取url
if (row.resourceId) {

8
src/views/hiddenDanger/safe/action.component.vue
View File

@ -538,9 +538,7 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
this.updateParams.resourceName = this.photoList.map(item => item.name).join(",")
this.updateParams.resourceOtherId = this.fileList.map(item => item.id).join(",")
this.updateParams.resourceOtherName = this.fileList.map(item => item.name).join(",")
if (this.updateParams.majorHazard && this.updateParams.majorHazard !== 0) {
this.updateParams.majorHazard = this.updateParams.majorHazard.toString()
}
this.updateParams.majorHazard = this.updateParams.majorHazard.toString()
this.tableService.addOrUpdate(this.updateParams, !this.updateParams.id).then((res: any) => {
this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功");
this.handleClose();
@ -681,8 +679,8 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
professionClassifyName: this.$store.getters.prevention_major_type_map[row.professionClassify],
reformModeName: this.reformModeMap[row.reformMode],
}, row)
this.updateParams.majorHazard = parseInt(this.updateParams.majorHazard)
this.updateParams.majorHazardName = !this.updateParams.majorHazard || this.updateParams.majorHazard === 0 ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard]
this.updateParams.majorHazard = +this.updateParams.majorHazard;
this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard]
// 获取url
if (row.resourceId) {

1
src/views/workprogress/leader.component.vue
View File

@ -46,6 +46,7 @@ export default class LeadershipStructure extends BaseRecordComponent<any> {
public subIsReadonly = false;
public subUpdateActions = [] as any;
public fileList = [] as any;

2
src/views/workprogress/managementSystem.component.vue
View File

@ -60,6 +60,8 @@ export default class ManagementSystem extends BaseRecordComponent<any> {
public subShowUpdate = false;
public subUpdateActions = [] as any;
public formActions = [{
name: "查询",
value: "search",

1
src/views/workprogress/programme.component.vue
View File

@ -65,6 +65,7 @@ export default class Programme extends BaseRecordComponent<any> {
public subShowUpdate = false;
public subUpdateActions = [] as any;
public formActions = [{
name: "查询",
value: "search",