From 16f8e29e7c7013fbf9a2663374e47a2c4bc4afea Mon Sep 17 00:00:00 2001 From: kongyeqing <2697454777@qq.com> Date: Mon, 28 Aug 2023 16:15:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=A1=B5=E9=9D=A2bug=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=8C=85=E4=BF=9D=E8=B4=A3=E4=BB=BB=E5=88=B6=E5=92=8C?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=A0=94=E5=88=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/analEvaluation.component.vue | 3 +- src/components/companyTree.component.vue | 34 + src/components/measure.component.vue | 61 +- src/components/notice.component.vue | 273 +++++ src/mock/judgment.ts | 91 ++ src/mock/teamCommitmentLetter.ts | 544 ++++++++++ src/router/index.ts | 78 +- src/service/businessInfo.service.ts | 48 + src/service/checkResumption.service.ts | 46 + src/service/checkTasks.service.ts | 68 ++ src/service/hiddendangerResumption.service.ts | 18 + src/service/maintenanceInfo.service.ts | 58 ++ src/service/majorHazard.service.ts | 35 + src/service/publicityResumption.service.ts | 12 + src/service/workFlow.service.ts | 5 - src/store/index.ts | 68 ++ src/views/blank.component.vue | 44 + .../estimate/checkResumption.component.vue | 428 ++++++++ src/views/estimate/estimate.component.html | 160 +++ .../hiddendangerResumption.component.vue | 265 +++++ .../publicityResumption.component.html | 61 ++ .../publicityResumption.component.vue | 359 +++++++ src/views/hiddenDanger/clap.component.vue | 45 +- src/views/hiddenDanger/common.component.html | 8 +- src/views/hiddenDanger/files.component.vue | 30 +- src/views/hiddenDanger/manager.component.vue | 66 +- .../hiddenDanger/safe/action.component.vue | 34 +- .../checkTasks/checkTasks.component.html | 191 ++++ .../checkTasks/checkTasks.component.vue | 782 +++++++++++++++ .../majorHazard/majorHazard.component.html | 93 ++ .../majorHazard/majorHazard.component.vue | 705 +++++++++++++ .../device/deviceAnal.component.vue | 27 + .../assessment/work/workAnal.component.html | 20 - .../assessment/work/workAnal.component.vue | 42 +- src/views/risk/duty/duty.component.vue | 5 +- .../measuresReport.component.html | 9 +- .../measuresReport.component.vue | 6 +- .../businessInfo/businessInfo.component.html | 67 ++ .../businessInfo/businessInfo.component.vue | 932 ++++++++++++++++++ .../maintenanceInfo.component.html | 152 +++ .../maintenanceInfo.component.vue | 792 +++++++++++++++ .../riskJudgment/riskJudgment.component.html | 214 ++++ .../riskJudgment/riskJudgment.component.vue | 457 +++++++++ .../safetyNotice/safetyNotice.component.html | 127 +++ .../safetyNotice/safetyNotice.component.vue | 351 +++++++ .../workprogress/trainRecords.component.vue | 1 + 46 files changed, 7828 insertions(+), 87 deletions(-) create mode 100644 src/components/companyTree.component.vue create mode 100644 src/components/notice.component.vue create mode 100644 src/mock/judgment.ts create mode 100644 src/mock/teamCommitmentLetter.ts create mode 100644 src/service/businessInfo.service.ts create mode 100644 src/service/checkResumption.service.ts create mode 100644 src/service/checkTasks.service.ts create mode 100644 src/service/hiddendangerResumption.service.ts create mode 100644 src/service/maintenanceInfo.service.ts create mode 100644 src/service/majorHazard.service.ts create mode 100644 src/service/publicityResumption.service.ts create mode 100644 src/views/estimate/checkResumption.component.vue create mode 100644 src/views/estimate/estimate.component.html create mode 100644 src/views/estimate/hiddendangerResumption.component.vue create mode 100644 src/views/estimate/publicityResumption/publicityResumption.component.html create mode 100644 src/views/estimate/publicityResumption/publicityResumption.component.vue create mode 100644 src/views/responsibility/checkTasks/checkTasks.component.html create mode 100644 src/views/responsibility/checkTasks/checkTasks.component.vue create mode 100644 src/views/responsibility/majorHazard/majorHazard.component.html create mode 100644 src/views/responsibility/majorHazard/majorHazard.component.vue create mode 100644 src/views/riskAssessment/businessInfo/businessInfo.component.html create mode 100644 src/views/riskAssessment/businessInfo/businessInfo.component.vue create mode 100644 src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.html create mode 100644 src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.vue create mode 100644 src/views/riskAssessment/riskJudgment/riskJudgment.component.html create mode 100644 src/views/riskAssessment/riskJudgment/riskJudgment.component.vue create mode 100644 src/views/riskAssessment/safetyNotice/safetyNotice.component.html create mode 100644 src/views/riskAssessment/safetyNotice/safetyNotice.component.vue diff --git a/src/components/analEvaluation.component.vue b/src/components/analEvaluation.component.vue index a612fd5..f64892d 100644 --- a/src/components/analEvaluation.component.vue +++ b/src/components/analEvaluation.component.vue @@ -85,7 +85,7 @@ + :tabledata.sync="analysisUpdateParams" :isReadonly="measureIsReadonly" :outermostData="outermostData"> @@ -206,6 +206,7 @@ export default class AnalEvaluationComponent extends Vue { @PropSync("tabledata", { required: true, }) + public outermostData!:any public updateParams: any; @Prop() diff --git a/src/components/companyTree.component.vue b/src/components/companyTree.component.vue new file mode 100644 index 0000000..57a05e7 --- /dev/null +++ b/src/components/companyTree.component.vue @@ -0,0 +1,34 @@ + + + \ No newline at end of file diff --git a/src/components/measure.component.vue b/src/components/measure.component.vue index 16ae591..15fab85 100644 --- a/src/components/measure.component.vue +++ b/src/components/measure.component.vue @@ -121,7 +121,7 @@ export default class MeasureComponent extends Vue { width: "25%", datas: this.secondTypeItem }, { - name:"", + name: "", key: "thirdType", type: "text", require: true, @@ -164,7 +164,8 @@ export default class MeasureComponent extends Vue { width: "100%", labelWidth: '210px', require: true, - showError:false, + showError: false, + disable: this.outermostData.majorSign && this.outermostData.majorSign.includes(0), datas: [ { name: "否", @@ -185,7 +186,7 @@ export default class MeasureComponent extends Vue { datas: this.taskType, expandLevel: Infinity, disable: !(this.taskUpdataParams.insuranceDutyFlag === 1), - showError:false, + showError: false, }, { name: "包保任务对应项", key: "taskItem", @@ -203,7 +204,7 @@ export default class MeasureComponent extends Vue { type: "textarea", width: "100%", require: true, - showError:false, + showError: false, }, { name: "执行岗位", key: "executePostCode", @@ -212,7 +213,7 @@ export default class MeasureComponent extends Vue { width: "calc(50% - 20px)", require: true, datas: this.$store.state.postList, - showError:false, + showError: false, }, { name: "责任人", @@ -222,14 +223,14 @@ export default class MeasureComponent extends Vue { width: "calc(50% - 20px)", require: true, datas: this.$store.state.userList, - showError:false, + showError: false, }, { name: "排查周期 每隔", key: "reviewCycleValue", type: "number", width: "calc(50% - 20px)", require: true, - showError:false, + showError: false, // labelWidth:"130px" }, { key: "reviewCycleUnit", @@ -238,14 +239,14 @@ export default class MeasureComponent extends Vue { format: 'reviewCycleValueName', datas: this.$store.state.prevention_cycle_unit, width: "calc(30% - 20px)", - showError:false, + showError: false, }, { name: "1次", key: "times", type: 'null', width: "30px", labelWidth: "50px", - showError:false, + showError: false, }, { name: "工作开始时间", key: "startTime", @@ -253,7 +254,7 @@ export default class MeasureComponent extends Vue { width: "calc(50% - 20px)", require: true, hide: !(this.taskUpdataParams.reviewCycleUnit === 7), - showError:false, + showError: false, }, { name: "工作结束时间", key: "endTime", @@ -261,16 +262,16 @@ export default class MeasureComponent extends Vue { width: "calc(50% - 20px)", require: true, hide: !(this.taskUpdataParams.reviewCycleUnit === 7), - showError:false, - },{ + showError: false, + }, { name: "开始执行时间", key: "executeStartTime", format: "yyyy-MM-dd HH:mm", type: "date", - subType:'datetime', + subType: 'datetime', width: "calc(50% - 20px)", require: true, - showError:false, + showError: false, },] } @@ -296,6 +297,9 @@ export default class MeasureComponent extends Vue { @Prop() public isReadonly: boolean; + @Prop() + public outermostData!: any + @PropSync("show", { required: true, default: true @@ -329,10 +333,11 @@ export default class MeasureComponent extends Vue { @PropSync("tabledata", { required: true, }) + public tableData!: any; + public measureData!: any; created() { - this.buildTable() } @@ -397,7 +402,7 @@ export default class MeasureComponent extends Vue { //排查任务 public showTaskModel(row, isReadonly) { - this.taskType = this.taskItemSelect() + this.taskType = this.taskItemSelect(); if (isReadonly) { this.taskIsReadonly = true this.taskUpdataParams = JSON.parse(JSON.stringify(row)) @@ -486,7 +491,16 @@ export default class MeasureComponent extends Vue { } public taskAdd() { - this.showSubUpdate = true + this.taskType = this.taskItemSelect() + this.taskUpdataParams = {} as any; + if (this.outermostData.majorSign && this.outermostData.majorSign.includes(0)) { + this.taskUpdataParams.insuranceDutyFlag = 0; + this.taskUpdataParams.taskType = 0 + this.taskUpdataParams.insuranceDutyFlagName = '否' + this.taskUpdataParams.taskTypeName = '日常任务' + } + this.taskUpdateForm(); + this.showSubUpdate = true; } public deleteTask(row) { @@ -512,7 +526,6 @@ export default class MeasureComponent extends Vue { //排查任务 -- 下拉选择 public taskSelectChange(data, item) { - if (data !== null && data !== undefined) { if (item && item.key === 'insuranceDutyFlag') { this.taskType = this.taskItemSelect() @@ -555,13 +568,13 @@ export default class MeasureComponent extends Vue { this.taskUpdataParams.taskItemName = map[data] } //开始执行时间 - if(item && item.key === 'executeStartTime'){ + if (item && item.key === 'executeStartTime') { const now = moment().format("YYYY-MM-DD HH:mm"); - if (now > data) { - this.$message.error("开始执行时间不能早于当前时间") - this.taskUpdataParams.executeStartTime = null; - return - } + if (now > data) { + this.$message.error("开始执行时间不能早于当前时间") + this.taskUpdataParams.executeStartTime = null; + return + } } this.taskUpdateForm() } diff --git a/src/components/notice.component.vue b/src/components/notice.component.vue new file mode 100644 index 0000000..80df9ab --- /dev/null +++ b/src/components/notice.component.vue @@ -0,0 +1,273 @@ + + + + + \ No newline at end of file diff --git a/src/mock/judgment.ts b/src/mock/judgment.ts new file mode 100644 index 0000000..ffeb791 --- /dev/null +++ b/src/mock/judgment.ts @@ -0,0 +1,91 @@ +export default [{ + index:0, + title:"生产装置的安全生产状态", + content:'1.生产装置的温度、压力、组分、液位、流量等主要工艺参数是否处于指标范围', + result:"处于指标范围", + measure:'无', +}, +{ + index:1, + title:"生产装置的安全生产状态", + content:'2.压力容器、压力管道等特种设备是否处于安全运行状态', + result:"处于安全运行状态", + measure:'无', +}, +{ + index:2, + title:"生产装置的安全生产状态", + content:'3.各类设备设施的静动密封是否完好无泄漏', + result:"完好无泄露", + measure:'无', +}, +{ + index:3, + title:"生产装置的安全生产状态", + content:'4.超限报警、紧急切断、联锁等各类安全设施配备是否完好投用，并可靠运行', + result:"完好投用，并可靠运行", + measure:'无', +}, +{ + index:4, + title:"危险化学品罐区、仓库等重大危险源的安全运行状态", + content:'5.储罐、管道、机泵、阀门及仪表系统是否完好无泄漏', + result:"完好无泄露", + measure:'无', +}, +{ + index:5, + title:"危险化学品罐区、仓库等重大危险源的安全运行状态", + content:'6.储罐的液位、温度、压力是否超限运行', + result:"否", + measure:'无', +}, +{ + index:6, + title:"危险化学品罐区、仓库等重大危险源的安全运行状态", + content:'7.内浮顶储罐运行中浮盘是否可能落底', + result:"否", + measure:'无', +}, +{ + index:7, + title:"危险化学品罐区、仓库等重大危险源的安全运行状态", + content:'8.油气储罐手动切水、切罐、装卸车时是否确保人员在岗', + result:"相关人员在岗在位", + measure:'无', +}, +{ + index:8, + title:"危险化学品罐区、仓库等重大危险源的安全运行状态", + content:'9.可燃及有毒气体报警和联锁是否处于可靠运行状态', + result:"处于可靠运行状态", + measure:'无', +}, +{ + index:9, + title:"危险化学品罐区、仓库等重大危险源的安全运行状态", + content:'10.仓库是否按照国家标准分区分类储存危险化学品，是否超量、超品种储存，相互禁配物质是否混放混存', + result:"不涉及", + measure:'无', +}, +{ + index:10, + title:"高危生产活动及作业的安全风险可控状态", + content:'11.装置开停车是否制定开停车方案，试生产是否制定试生产方案并经专家论证', + result:"不涉及", + measure:'无', +}, +{ + index:11, + title:"高危生产活动及作业的安全风险可控状态", + content:'12.各项特殊作业、检维修作业、承包商作业是否健全和完善相关管理制度，作业过程是否进行安全风险辨识，严格程序确认和作业许可审批，加强现场监督，危险化学品罐区动火作业是否做到升级管理等', + result:"不涉及", + measure:'无', +}, +{ + index:12, + title:"高危生产活动及作业的安全风险可控状态", + content:'13.各项变更的审批程序是否符合规定', + result:"不涉及", + measure:'无', +},] \ No newline at end of file diff --git a/src/mock/teamCommitmentLetter.ts b/src/mock/teamCommitmentLetter.ts new file mode 100644 index 0000000..7d1bc5c --- /dev/null +++ b/src/mock/teamCommitmentLetter.ts @@ -0,0 +1,544 @@ +export default { + state: { + description: "班组安全状态", + content: [ + { + name: "研判风险点 /处", + key: "department", + type: "number", + required: true, + width: "100%", + }, + { + name: "各风险点已落实管控措施", + key: "department", + type: "radio", + required: true, + width: "100%", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "作业基本情况", + key: "basicwork", + width:"100%", + children: [ + { + name: "已落实特殊作业的风险辨识、作业许可及管控措施", + key: "department", + type: "radio", + required: true, + width: "100%", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "特级动火作业 /处", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "一级动火作业 /处", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "二级动火作业 /处", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "受限空间作业 /处", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "高处作业 /处", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "起重吊装作业 /处", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "断路作业 /处", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "临电作业 /处", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "动土作业 /处", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "盲板抽堵作业 /处", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "变更作业 /处", + key: "department", + type: "number", + required: true, + width: "100%", + labelWidth:"120px" + }, + { + name: "是否已落实变更审批以及安全管理措施 /处", + key: "department", + type: "radio", + required: true, + width: "100%", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + ], + }, + { + name: "生产装置基本情况", + key: "basicproduce", + children: [ + { + name: "生产装置 /套", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "运行 /套", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "停产 /套", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "检修 /套", + key: "department", + type: "number", + required: true, + width: "50%", + labelWidth:"120px" + }, + { + name: "是否处于试生产阶段", + key: "department", + type: "radio", + required: false, + width: "50%", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "是否处于开停车阶段", + key: "department", + type: "radio", + required: false, + width: "50%", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "是否开展中（扩）试", + key: "department", + type: "radio", + required: false, + width: "100%", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "罐区、仓库等重大危险源是否处于安全状态", + key: "department", + type: "radio", + required: false, + width: "100%", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + ], + }, + { + name: "是否存在重大隐患", + key: "department", + type: "radio", + required: false, + width: "100%", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + ], + }, + situation: { + description: "风险研判情况", + content: [ + { + name: "生产装置的安全生产状态", + key: "safestatus", + children: [ + { + name: "1.生产装置的温度、压力、组分、液位、流量等主要工艺参数是否处于指标范围", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "2.压力容器、压力管道等特种设备是否处于安全运行状态", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "3.各类设备设施的静动密封是否完好无泄漏", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "4.超限报警、紧急切断、联锁等各类安全设施配备是否完好投用，并可靠运行", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + ], + }, + { + name: "危险化学品罐区、仓库等重大危险源的安全运行状态", + key: "dangersafestatus", + children: [ + { + name: "5.储罐、管道、机泵、阀门及仪表系统是否完好无泄漏", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "6.储罐的液位、温度、压力是否超限运行", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "7.内浮顶储罐运行中浮盘是否可能落底", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "8.油气储罐手动切水、切罐、装卸车时是否确保人员在岗", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "9.可燃及有毒气体报警和联锁是否处于可靠运行状态", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "10.仓库是否按照国家标准分区分类储存危险化学品，是否超量、超品种储存，相互禁配物质是否混放混存", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + ], + }, + { + name: "涉及罐区，仓库等重大危险源处于安全状态", + key: "dangersourcesafestatus", + children: [ + { + name: "11.装置开停车是否制定开停车方案，试生产是否制定试生产方案并经专家论证", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "12.各项特殊作业、检维修作业、承包商作业是否健全和完善相关管理制度，作业过程是否进行安全风险辨识，严格程序确认和作业许可审批，加强现场监督，危险化学品罐区动火作业是否做到升级管理等", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + { + name: "13.各项变更的审批程序是否符合规定", + key: "department", + type: "radio", + required: false, + width: "100%", + labelWidth:"600px", + datas: [ + { + name: "是", + value: 1, + }, + { + name: "否", + value: 0, + }, + ], + }, + ], + }, + ], + }, + promise:{ + description: "班组安全承诺", + key:'promise' + } +}; diff --git a/src/router/index.ts b/src/router/index.ts index 0b30b4f..5900e81 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -39,6 +39,15 @@ import IntegralEvent from '@/views/integral/event.component.vue' import IntegralMall from '@/views/integral/mall.component.vue' import IntegralExchange from '@/views/integral/exchange/exchangeFlow/exchange.component.vue' import IntegralExchangeRecord from '@/views/integral/exchange/exchangeRecord/exchangeRecord.component.vue' +import MajorHazard from '@/views/responsibility/majorHazard/majorHazard.component.vue' +import CheckTasks from '@/views/responsibility/checkTasks/checkTasks.component.vue' +import CheckResumption from '@/views/estimate/checkResumption.component.vue' +import HiddendangerResumption from '@/views/estimate/hiddendangerResumption.component.vue' +import PublicityResumption from '@/views/estimate/publicityResumption/publicityResumption.component.vue' +import BusinessInfo from '@/views/riskAssessment/businessInfo/businessInfo.component.vue' +import MaintenanceInfo from '@/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.vue' +import RiskJudgment from '@/views/riskAssessment/riskJudgment/riskJudgment.component.vue' +import SafetyNotice from '@/views/riskAssessment/safetyNotice/safetyNotice.component.vue' Vue.use(VueRouter) const routes: Array = [ @@ -234,10 +243,73 @@ const routes: Array = [ path:"exchange-record", component:IntegralExchangeRecord }, - - ] - }] + },{ + path:"responsibility", + name:"responsibility", + component:BlankComponent, + redirect:"responsibility/major-hazard", + children:[{ + name:"major-hazard", + path:"major-hazard", + component:MajorHazard + },{ + name:"check-tasks", + path:"check-tasks", + component:CheckTasks + },{ + path:"estimate", + name:"estimate", + component:BlankComponent, + redirect:"estimate/check-resumption", + children:[{ + name:"check-resumption", + path:"check-resumption", + component:CheckResumption + },{ + name:"hiddendanger-resumption", + path:"hiddendanger-resumption", + component:HiddendangerResumption + },{ + name:"publicity-resumption", + path:"publicity-resumption", + component:PublicityResumption + }, + ] + }, + ] + }, + { + path:"risk-assessment", + name:"risk-assessment", + component:BlankComponent, + redirect:"risk-assessment/business-info", + children:[{ + name:"business-info", + path:"business-info", + component:BusinessInfo + }, + { + name:"maintenance-info", + path:"maintenance-info", + component:MaintenanceInfo + }, + { + name:"risk-judgment", + path:"risk-judgment", + component:RiskJudgment + }, + { + name:"safety-otice", + path:"safety-notice", + component:SafetyNotice + }, + ] + } + + + + ] }, { path: '/index', diff --git a/src/service/businessInfo.service.ts b/src/service/businessInfo.service.ts new file mode 100644 index 0000000..81d4c0c --- /dev/null +++ b/src/service/businessInfo.service.ts @@ -0,0 +1,48 @@ +import BaseService from "hbt-common/service/base.service" +import type { AxiosResponse } from 'axios' +import { ActionResult } from "hbt-common/models/actionResult"; +export default class BusinessInfoService extends BaseService{ + constructor(){ + super() + } + // 查询列表 + public selectByPage(params: any):Promise>>{ + const url = this.prefix.prevention+'/company/list'; + return this.get(url,params,true) + } + // 批量删除 + public deleteByIds(params,showLoading?):Promise>>{ + const url = this.prefix.prevention+'/company'; + return this.deleteBatch(url,params,{},showLoading) + } + + // 新增或更新 + public addOrUpdate(params: any, add: boolean,showLoading?:boolean): Promise>>{ + + if(add){ + const url = this.prefix.prevention+'/company'; + return this.post(url,params,{},showLoading) + }else{ + const url = this.prefix.prevention+'/company'; + return this.put(url,params,{},showLoading) + } + } + + //查询详情 + public getListDetail(params:any):Promise>>{ + const url = this.prefix.prevention+'/company'; + return this.get(url,params) + } + + //获取所有企业 + public getTotalCompany(params:any):Promise>>{ + const url = this.prefix.prevention+'/company/company'; + return this.get(url,params) + } + + public getFileUrls(params):Promise>>{ + const url = this.prefix.file+'/getSysFiles'; + return this.get(url,params,false) + } + +} diff --git a/src/service/checkResumption.service.ts b/src/service/checkResumption.service.ts new file mode 100644 index 0000000..f235b3c --- /dev/null +++ b/src/service/checkResumption.service.ts @@ -0,0 +1,46 @@ +import BaseService from "hbt-common/service/base.service" +import type { AxiosResponse } from 'axios' +import { ActionResult } from "hbt-common/models/actionResult"; +export default class CheckResumptionService extends BaseService{ + constructor(){ + super() + } + public selectByPage(params: any):Promise>>{ + const url = this.prefix.prevention+'/worktask/list'; + return this.get(url,params) + } + + public selectById(id):Promise>>{ + const url = this.prefix.prevention+'/worktask?id='+id; + return this.get(url,null,true) + } + // 新增或更新 + public addOrUpdate(params: any, add: boolean,showLoading?:boolean): Promise>>{ + + if(add){ + const url = this.prefix.prevention+'/worktask'; + return this.post(url,params,{},showLoading) + }else{ + const url = this.prefix.prevention+'/worktask'; + return this.put(url,params,{},showLoading) + } + } + + public deleteByIds(params):Promise>>{ + const url = this.prefix.prevention +'/worktask'; + return this.deleteBatch(url,params,{},true) + } + + //报表 + public selectReportData(params: any):Promise>>{ + const url = this.prefix.prevention+'/worktask/report'; + return this.get(url,params) + } + + //周期 + public selectCycleData(params: any):Promise>>{ + const url = this.prefix.prevention+'/worktask/cycle'; + return this.get(url,params) + } + +} \ No newline at end of file diff --git a/src/service/checkTasks.service.ts b/src/service/checkTasks.service.ts new file mode 100644 index 0000000..67c2118 --- /dev/null +++ b/src/service/checkTasks.service.ts @@ -0,0 +1,68 @@ +import BaseService from "hbt-common/service/base.service" +import type { AxiosResponse } from 'axios' +import { ActionResult } from "hbt-common/models/actionResult"; +export default class checkTasksService extends BaseService{ + constructor(){ + super() + } + // 查询列表 + public selectByPage(params: any):Promise>>{ + const url = this.prefix.prevention+'/dutytask/list'; + return this.get(url,params,true) + } + // 批量删除 + public deleteByIds(params,showLoading?):Promise>>{ + const url = this.prefix.prevention+'/dutytask'; + return this.deleteBatch(url,params,{},showLoading) + } + + // 新增或更新 + public addOrUpdate(params: any, add: boolean,showLoading?:boolean): Promise>>{ + if(add){ + const url = this.prefix.prevention+'/dutytask'; + return this.post(url,params,{},showLoading) + }else{ + const url = this.prefix.prevention+'/dutytask'; + return this.put(url,params,{},showLoading) + } + } + + //获取重大危险源列表 + public selectMajorhazard(params: any,): Promise>>{ + const url = this.prefix.prevention+'/dutytask/majorhazard/list'; + return this.get(url,params,) + } + + //获取负责人排查任务清单 + public selectMajorhazardTaskList(params: any,): Promise>>{ + const url = this.prefix.prevention+'/dutytask/majorhazard/detail/list'; + return this.get(url,params,) + } + + //查询负责人清单列表 + public selectDutyDetail(params: any):Promise>>{ + const url = this.prefix.prevention+'/detail'; + return this.get(url,params,true) + } + + //获取负责人清单列表 + public selectDutyDetailList(params: any):Promise>>{ + const url = this.prefix.prevention+'/detail/list'; + return this.get(url,params,true) + } + //添加、修改负责人清单 + public addOrUpdateDutyDetail(params: any, add: boolean,showLoading?:boolean): Promise>>{ + if(add){ + const url = this.prefix.prevention+'/detail'; + return this.post(url,params,{},showLoading) + }else{ + const url = this.prefix.prevention+'/detail'; + return this.put(url,params,{},showLoading) + } + } + + public getFileUrls(params):Promise>>{ + const url = this.prefix.file+'/getSysFiles'; + return this.get(url,params,false) + } +} diff --git a/src/service/hiddendangerResumption.service.ts b/src/service/hiddendangerResumption.service.ts new file mode 100644 index 0000000..5ac71c2 --- /dev/null +++ b/src/service/hiddendangerResumption.service.ts @@ -0,0 +1,18 @@ +import BaseService from "hbt-common/service/base.service" +import type { AxiosResponse } from 'axios' +import { ActionResult } from "hbt-common/models/actionResult"; +export default class HiddendangerResumptionService extends BaseService{ + constructor(){ + super() + } + public selectByPage(params: any):Promise>>{ + const url = this.prefix.prevention+'/execute/list'; + return this.get(url,params) + } + + //周期 + public selectCycleData(params: any):Promise>>{ + const url = this.prefix.prevention+'/worktask/cycle'; + return this.get(url,params) + } +} \ No newline at end of file diff --git a/src/service/maintenanceInfo.service.ts b/src/service/maintenanceInfo.service.ts new file mode 100644 index 0000000..2173c2f --- /dev/null +++ b/src/service/maintenanceInfo.service.ts @@ -0,0 +1,58 @@ +import BaseService from "hbt-common/service/base.service" +import type { AxiosResponse } from 'axios' +import { ActionResult } from "hbt-common/models/actionResult"; +export default class MaintenanceInfoService extends BaseService{ + constructor(){ + super() + } + // 查询列表 + public selectByPage(params: any):Promise>>{ + const url = this.prefix.prevention+'/safety/workshop/list'; + return this.get(url,params,true) + } + // 获取详细信息 + public selectByDetail(params: any):Promise>>{ + const url = this.prefix.prevention+'/safety/workshop'; + return this.get(url,params,true) + } + // 批量删除 + public deleteByIds(params,showLoading?):Promise>>{ + const url = this.prefix.prevention+'/safety/workshop'; + return this.deleteBatch(url,params,{},showLoading) + } + + // 新增或更新 + public addOrUpdate(params: any, add: boolean,showLoading?:boolean): Promise>>{ + if(add){ + const url = this.prefix.prevention+'/safety/workshop'; + return this.post(url,params,{},showLoading) + }else{ + const url = this.prefix.prevention+'/safety/workshop'; + return this.put(url,params,{},showLoading) + } + } + + + public getFileUrls(params):Promise>>{ + const url = this.prefix.file+'/getSysFiles'; + return this.get(url,params,false) + } + + //获取企业 + public selectCompany(params: any):Promise>>{ + const url = this.prefix.prevention+'/company/company'; + return this.get(url,params,true) + } + + //获取风险点 + public selectRiskGroup(params: any):Promise>>{ + const url = this.prefix.prevention+'/safety/workshop/riskpoint'; + return this.get(url,params,true) + } + + //企业树 + public getCompanyTree():Promise>>{ + const url = this.prefix.prevention+'/company/tree'; + return this.get(url,null) + } +} \ No newline at end of file diff --git a/src/service/majorHazard.service.ts b/src/service/majorHazard.service.ts new file mode 100644 index 0000000..f964a36 --- /dev/null +++ b/src/service/majorHazard.service.ts @@ -0,0 +1,35 @@ +import BaseService from "hbt-common/service/base.service" +import type { AxiosResponse } from 'axios' +import { ActionResult } from "hbt-common/models/actionResult"; +export default class MajorHazardService extends BaseService{ + constructor(){ + super() + } + // 查询列表 + public selectByPage(params: any):Promise>>{ + const url = this.prefix.prevention+'/info/list'; + return this.get(url,params,true) + } + // 批量删除 + public deleteByIds(params,showLoading?):Promise>>{ + const url = this.prefix.prevention+'/info'; + return this.deleteBatch(url,params,{},showLoading) + } + + // 新增或更新 + public addOrUpdate(params: any, add: boolean,showLoading?:boolean): Promise>>{ + if(add){ + const url = this.prefix.prevention+'/info'; + return this.post(url,params,{},showLoading) + }else{ + const url = this.prefix.prevention+'/info'; + return this.put(url,params,{},showLoading) + } + } + + + public getFileUrls(params):Promise>>{ + const url = this.prefix.file+'/getSysFiles'; + return this.get(url,params,false) + } +} diff --git a/src/service/publicityResumption.service.ts b/src/service/publicityResumption.service.ts new file mode 100644 index 0000000..de8be3d --- /dev/null +++ b/src/service/publicityResumption.service.ts @@ -0,0 +1,12 @@ +import BaseService from "hbt-common/service/base.service" +import type { AxiosResponse } from 'axios' +import { ActionResult } from "hbt-common/models/actionResult"; +export default class PublicityResumptionService extends BaseService{ + constructor(){ + super() + } + public selectByPage(params: any):Promise>>{ + const url = this.prefix.prevention+'/worktask/report'; + return this.get(url,params) + } +} \ No newline at end of file diff --git a/src/service/workFlow.service.ts b/src/service/workFlow.service.ts index a99e3cb..eb6e588 100644 --- a/src/service/workFlow.service.ts +++ b/src/service/workFlow.service.ts @@ -16,11 +16,6 @@ export default class WorkFlowService extends BaseService{ const url = this.prefix.bpm+'/task/candidate/set'; return this.post(url,params,{},true) } - //设置候选人 - public setCandidate(params,showLoading?:boolean): Promise>>{ - const url = this.prefix.bpm+'/task/candidate/set'; - return this.post(url,params,{},true) - } //处理流程 public taskHandle(params,showLoading?:boolean): Promise>>{ const url = this.prefix.bpm+'/task/taskHandle'; diff --git a/src/store/index.ts b/src/store/index.ts index 57713f9..e2bbe9e 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -39,6 +39,12 @@ export default new Vuex.Store({ prevention_risk_source:[], prevention_risk_craft:[], prevention_risk_chemical:[], + prevention_enterprise_nature:[], + prevention_enterprise_size:[], + prevention_regulatory_category:[], + prevention_regulatory_subcategories:[], + prevention_registration_status:[], + prevention_safety_label:[], }, getters: { dept_map:(state)=>{ @@ -272,6 +278,49 @@ export default new Vuex.Store({ }) return map }, + + prevention_enterprise_nature_map:(state)=>{ + const map = {}; + state.prevention_enterprise_nature.forEach((item:any)=>{ + map[item.value] = item.name + }) + return map + }, + prevention_enterprise_size_map:(state)=>{ + const map = {}; + state.prevention_enterprise_size.forEach((item:any)=>{ + map[item.value] = item.name + }) + return map + }, + prevention_regulatory_category_map:(state)=>{ + const map = {}; + state.prevention_regulatory_category.forEach((item:any)=>{ + map[item.value] = item.name + }) + return map + }, + prevention_regulatory_subcategories_map:(state)=>{ + const map = {}; + state.prevention_regulatory_subcategories.forEach((item:any)=>{ + map[item.value] = item.name + }) + return map + }, + prevention_registration_status_map:(state)=>{ + const map = {}; + state.prevention_registration_status.forEach((item:any)=>{ + map[item.value] = item.name + }) + return map + }, + prevention_safety_label_map:(state)=>{ + const map = {}; + state.prevention_safety_label.forEach((item:any)=>{ + map[item.value] = item.name + }) + return map + }, }, mutations: { setAnalCntrol(state,data){ @@ -377,6 +426,25 @@ export default new Vuex.Store({ set_prevention_risk_chemical(state,data){ state.prevention_risk_chemical = data }, + + set_prevention_enterprise_nature(state,data){ + state.prevention_enterprise_nature = data + }, + set_prevention_enterprise_size(state,data){ + state.prevention_enterprise_size = data + }, + set_prevention_regulatory_category(state,data){ + state.prevention_regulatory_category = data + }, + set_prevention_regulatory_subcategories(state,data){ + state.prevention_regulatory_subcategories = data + }, + set_prevention_registration_status(state,data){ + state.prevention_registration_status = data + }, + set_prevention_safety_label(state,data){ + state.prevention_safety_label = data + }, }, actions: { }, diff --git a/src/views/blank.component.vue b/src/views/blank.component.vue index 1e51734..012f1d2 100644 --- a/src/views/blank.component.vue +++ b/src/views/blank.component.vue @@ -48,6 +48,13 @@ export default class BlankComponent extends Vue { this.systemService.getDictData("prevention_risk_source"), this.systemService.getDictData("prevention_risk_craft"), this.systemService.getDictData("prevention_risk_chemical"), + + this.systemService.getDictData("prevention_enterprise_nature"), + this.systemService.getDictData("prevention_enterprise_size"), + this.systemService.getDictData("prevention_regulatory_category"), + this.systemService.getDictData("prevention_regulatory_subcategories"), + this.systemService.getDictData("prevention_registration_status"), + this.systemService.getDictData("prevention_safety_label"), ]).then(((results: any) => { this.$store.commit("setDeptTreeList", results[0].data); @@ -264,6 +271,43 @@ export default class BlankComponent extends Vue { } })) + this.$store.commit("set_prevention_enterprise_nature", results[34].data.map(item => { + return { + name: item.dictLabel, + value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue, + } + })) + this.$store.commit("set_prevention_enterprise_size", results[35].data.map(item => { + return { + name: item.dictLabel, + value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue, + } + })) + this.$store.commit("set_prevention_regulatory_category", results[36].data.map(item => { + return { + name: item.dictLabel, + value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue, + } + })) + this.$store.commit("set_prevention_regulatory_subcategories", results[37].data.map(item => { + return { + name: item.dictLabel, + value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue, + } + })) + this.$store.commit("set_prevention_registration_status", results[38].data.map(item => { + return { + name: item.dictLabel, + value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue, + } + })) + this.$store.commit("set_prevention_safety_label", results[39].data.map(item => { + return { + name: item.dictLabel, + value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue, + } + })) + this.$store.commit("setDeptList", results[1].data.map((item) => { return { name: item.deptName, diff --git a/src/views/estimate/checkResumption.component.vue b/src/views/estimate/checkResumption.component.vue new file mode 100644 index 0000000..c890229 --- /dev/null +++ b/src/views/estimate/checkResumption.component.vue @@ -0,0 +1,428 @@ + + + + \ No newline at end of file diff --git a/src/views/estimate/estimate.component.html b/src/views/estimate/estimate.component.html new file mode 100644 index 0000000..2080a30 --- /dev/null +++ b/src/views/estimate/estimate.component.html @@ -0,0 +1,160 @@ +
+
+
+ +
+
+
+ + {{item.name}} + +
+ + + + + +
{{scope.$index+1}}
+ + + + + + + +
+ + +
{{scope.$index+1}}
+ + +
{{riskSourceMap[scope.row.majorHazardValue]}}
+ + + +
{{scope.row.totalCompleted}}
+ + +
{{scope.row.total}}
+ + +
{{scope.row.totalCompletionRate}}
+ + + + +
{{scope.row.mainCompleted ? scope.row.mainCompleted :'--'}} +
+ + +
{{scope.row.main ?scope.row.main:'--'}}
+ + +
{{scope.row.mainCompletionRate ? + scope.row.mainCompletionRate:'--'}} +
+ + + + +
{{scope.row.technologyCompleted ? + scope.row.technologyCompleted:'--'}}
+ + +
{{scope.row.technology ? scope.row.technology:'--'}}
+ + +
{{scope.row.technologyCompletionRate ? + scope.row.technologyCompletionRate :'--'}}
+ + + + +
{{scope.row.operateCompleted ? scope.row.operateCompleted:'--'}} +
+ + +
{{scope.row.operate ? scope.row.operate:'--'}}
+ + +
{{scope.row.operateCompletionRate ? + scope.row.operateCompletionRate:'--'}}
+ + + +
+
+ + +
{{scope.$index+1}}
+ + +
{{riskSourceMap[scope.row.majorHazardValue]}}
+ + + +
{{scope.row.totalCompleted}}
+ + +
{{scope.row.totalCompletionRate}}
+ + + + +
{{scope.row.mainCompleted? scope.row.mainCompleted : '--'}}
+ + +
{{scope.row.mainCompletionRate ? scope.row.mainCompletionRate:'--'}} +
+ + + + +
{{scope.row.technologyCompleted}}
+ + +
{{scope.row.technologyCompletionRate}}
+ + + + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompletionRate}}
+ + + + +
{{scope.row.dangerDiscovery}}
+ + +
{{scope.row.dangerRemoval}}
+ + + +
+
+
+
\ No newline at end of file diff --git a/src/views/estimate/hiddendangerResumption.component.vue b/src/views/estimate/hiddendangerResumption.component.vue new file mode 100644 index 0000000..969c613 --- /dev/null +++ b/src/views/estimate/hiddendangerResumption.component.vue @@ -0,0 +1,265 @@ + + + + \ No newline at end of file diff --git a/src/views/estimate/publicityResumption/publicityResumption.component.html b/src/views/estimate/publicityResumption/publicityResumption.component.html new file mode 100644 index 0000000..b640f1b --- /dev/null +++ b/src/views/estimate/publicityResumption/publicityResumption.component.html @@ -0,0 +1,61 @@ +
+
+
+ +
+
+ + +
{{scope.$index+1}}
+ + +
{{riskSourceMap[scope.row.majorHazardValue]}}
+ + + +
{{scope.row.totalCompleted? scope.row.totalCompleted :'--'}}
+ + +
{{scope.row.totalCompletionRate ? scope.row.totalCompletionRate :'--'}}
+ + + + +
{{scope.row.mainCompleted? scope.row.mainCompleted : '--'}}
+ + +
{{scope.row.mainCompletionRate ? scope.row.mainCompletionRate:'--'}} +
+ + + + +
{{scope.row.technologyCompleted? scope.row.technologyCompleted :'--'}}
+ + +
{{scope.row.technologyCompletionRate? scope.row.technologyCompletionRate :'--'}}
+ + + + +
{{scope.row.operateCompleted? scope.row.operateCompleted :'--'}}
+ + +
{{scope.row.operateCompletionRate? scope.row.operateCompletionRate :'--'}}
+ + + + +
{{scope.row.dangerDiscovery? scope.row.dangerDiscovery :'--'}}
+ + +
{{scope.row.dangerRemoval? scope.row.dangerRemoval :'--'}}
+ + + +
+
+
+ \ No newline at end of file diff --git a/src/views/estimate/publicityResumption/publicityResumption.component.vue b/src/views/estimate/publicityResumption/publicityResumption.component.vue new file mode 100644 index 0000000..2a6d2b4 --- /dev/null +++ b/src/views/estimate/publicityResumption/publicityResumption.component.vue @@ -0,0 +1,359 @@ + + + + \ No newline at end of file diff --git a/src/views/hiddenDanger/clap.component.vue b/src/views/hiddenDanger/clap.component.vue index f2cdd67..5730277 100644 --- a/src/views/hiddenDanger/clap.component.vue +++ b/src/views/hiddenDanger/clap.component.vue @@ -106,6 +106,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent public currentUrl: any; public showFile = false; + public riskSource = [] as any; public updateActions = [{ @@ -127,14 +128,6 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent public statusMap = ["未下发", "已下发"]; public reformModeMap = ["", "即查即改", "限期整改"] - - created() { - this.loadAreaData() - this.loadUnitData(); - } - - - // 加载区域列表 public loadAreaData() { this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => { @@ -396,6 +389,15 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent width: "calc(50% - 20px)", showError: false, datas: this.$store.state.prevention_occur_step, + }, { + name: "重大危险源名称", + key: "majorHazard", + format: "majorHazardName", + type: "select", + width: "calc(50% - 20px)", + require: true, + showError: false, + datas: this.riskSource }, { name: "违反规定条款", key: "violateTerm", @@ -411,6 +413,24 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent }] } + created() { + this.loadAreaData() + this.loadUnitData(); + //重大危险源 + this.initRiskSource() + } + + //重大危险源 + public initRiskSource() { + this.riskSource = [] as any; + this.riskSource = JSON.parse(JSON.stringify(this.$store.state.prevention_risk_source)); + this.riskSource.unshift({ + name: '不涉及', + value: 0, + }) + this.buildUpdateForm() + } + public buildTable() { this.tableColumn.push({ name: '整改单编号', width: "200px", key: "number" }); this.tableColumn.push({ name: '隐患描述', key: "description", width: "300px" }); @@ -502,6 +522,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent public showUpdateModel(row?, isRead?) { + this.initRiskSource() this.isReadonly = !!isRead; this.fileList = []; this.photoList = []; @@ -514,7 +535,6 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent inspectTime: moment().format("YYYY-MM-DD HH:mm") } if (!row) { - this.tableService.getNumber().then(res => { this.updateParams.number = res.data; this.center = [118.751353, 31.969568]; @@ -539,6 +559,9 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent areaName: (this.areaList.find((item: any) => item.value === res.data.areaId) as any).name, type: "随手拍", }, res.data) + 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.center = [res.data.locationLng, res.data.locationLat]; this.buildUpdateForm() @@ -645,6 +668,10 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent 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.tableService.addOrUpdate(this.updateParams, !this.updateParams.id).then(res => { this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功"); if (isSubmit) { diff --git a/src/views/hiddenDanger/common.component.html b/src/views/hiddenDanger/common.component.html index 3466cf5..672f1c9 100644 --- a/src/views/hiddenDanger/common.component.html +++ b/src/views/hiddenDanger/common.component.html @@ -17,7 +17,7 @@ @pageSizeChange="callback($event,'pageSize')" :footerActions="footerActions" :actions="tableActions"> + @selection-change="handleSelectionChange" style="width: 100%" @sort-change="sortChange($event)"> @@ -26,12 +26,12 @@ @@ -188,7 +188,7 @@ :visible.sync="showUpdate" width="980px" :before-close="handleClose" destroy-on-close>
隐患信息
diff --git a/src/views/hiddenDanger/files.component.vue b/src/views/hiddenDanger/files.component.vue index 5c08d1d..bd9ec65 100644 --- a/src/views/hiddenDanger/files.component.vue +++ b/src/views/hiddenDanger/files.component.vue @@ -90,6 +90,9 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent public marker: any = null; public map: any = null; public showMap = false; + + public riskSource = [] as any; + public executeResultList = [{ text: "完成", value: 1 @@ -108,7 +111,8 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent }]; created() { - + //重大危险源 + this.initRiskSource() } public getTableData() { @@ -384,7 +388,16 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent type: "textarea", width: "100%", showError: false, - }] + }, { + name: "重大危险源名称", + key: "majorHazard", + format: "majorHazardName", + type: "select", + width: "calc(50% - 20px)", + require: true, + showError: false, + datas: this.riskSource + },] this.updateOptions2 = [{ name: "隐患确认", @@ -652,8 +665,19 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent } + //重大危险源 + public initRiskSource() { + this.riskSource = [] as any; + this.riskSource = JSON.parse(JSON.stringify(this.$store.state.prevention_risk_source)); + this.riskSource.unshift({ + name: '不涉及', + value: 0, + }) + this.getTableCallback() + } public showUpdateModel(row) { + this.initRiskSource() Object.assign(this.updateParams, { verifyConfirmFlagName: this.isPassMap[row.verifyConfirmFlag], executeConfirmFlagName: this.isAcceptMap[row.executeConfirmFlag], @@ -669,6 +693,8 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent 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.getTableCallback() // 获取url diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue index 74c0866..8e123d3 100644 --- a/src/views/hiddenDanger/manager.component.vue +++ b/src/views/hiddenDanger/manager.component.vue @@ -41,6 +41,8 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent { @@ -669,8 +698,10 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent data.executor || "--" }); - this.tableColumn.push({ name: '最新提交时间', width: "180", key: "updateTime" }); + this.tableColumn.push({ name: '最新提交时间', width: "180", key: "updateTime", sortable: 'custom' }); this.tableColumn.push({ name: '隐患来源', width: "150", render: (data) => this.$store.getters.prevention_danger_resource_map[data.source] }); + this.tableColumn.push({ name: '上报人', width: "100", key: "reportUserName", render: (data) => data.reportUserName || "--" }); + this.tableColumn.push({ name: '上报时间', width: "120", key: "reportTime", render: (data) => data.reportTime || "--" }); this.tableColumn.push({ name: '隐患标题', width: "150", render: (data) => { if (this.params.type === 1 || this.params.type === 2) { @@ -697,24 +728,28 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent item.name).join(",") this.updateParams.verifyResourceId = this.photoList2.map(item => item.id).join(",") this.updateParams.verifyResourceName = this.photoList2.map(item => item.name).join(",") - + if (this.updateParams.majorHazard && this.updateParams.majorHazard !== 0) { + this.updateParams.majorHazard = this.updateParams.majorHazard.toString() + } this.tableService.addOrUpdate(this.updateParams, !this.updateParams.id).then(res => { this.$message.success(!this.updateParams.id ? "新增成功" : "编辑成功"); if (!preStatus) { @@ -1171,6 +1211,18 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent diff --git a/src/views/hiddenDanger/safe/action.component.vue b/src/views/hiddenDanger/safe/action.component.vue index 3c7a3f2..e2cd102 100644 --- a/src/views/hiddenDanger/safe/action.component.vue +++ b/src/views/hiddenDanger/safe/action.component.vue @@ -101,13 +101,16 @@ export default class RulesManagerComponent extends BaseRecordComponent { public levelMap = ["", "一般隐患", "重大隐患"] public reformModeMap = ["", "即查即改", "限期整改"] + public riskSource = [] as any; + public planTypeMap = { 1: "单次计划", 2: "长期计划" } created() { - // + //重大危险源 + this.initRiskSource() } public buildTable() { @@ -399,7 +402,27 @@ export default class RulesManagerComponent extends BaseRecordComponent { type: "textarea", width: "100%", showError: false, - }] + }, { + name: "重大危险源名称", + key: "majorHazard", + format: "majorHazardName", + type: "select", + width: "calc(50% - 20px)", + require: true, + showError: false, + datas: this.riskSource + },] + } + + //重大危险源 + public initRiskSource() { + this.riskSource = [] as any; + this.riskSource = JSON.parse(JSON.stringify(this.$store.state.prevention_risk_source)); + this.riskSource.unshift({ + name: '不涉及', + value: 0, + }) + this.getTableCallback() } //截止时间计算 @@ -506,6 +529,9 @@ export default class RulesManagerComponent extends BaseRecordComponent { 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.tableService.addOrUpdate(this.updateParams, !this.updateParams.id).then((res: any) => { this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功"); this.handleClose(); @@ -610,6 +636,7 @@ export default class RulesManagerComponent extends BaseRecordComponent { } public showUpdateModel(row?, isRead?) { + this.initRiskSource() this.isReadonly = !!isRead; this.fileList = []; this.photoList = []; @@ -644,6 +671,9 @@ export default class RulesManagerComponent extends BaseRecordComponent { 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] + // 获取url if (row.resourceId) { this.updateParams.photo = row.resourceId diff --git a/src/views/responsibility/checkTasks/checkTasks.component.html b/src/views/responsibility/checkTasks/checkTasks.component.html new file mode 100644 index 0000000..5c90a6c --- /dev/null +++ b/src/views/responsibility/checkTasks/checkTasks.component.html @@ -0,0 +1,191 @@ +
+
+
+ +
+
+ + + + + + + + + + + + + + + +
+
+ + + + + +
重大危险源主要负责人隐患排查任务清单
+ + +
{{scope.$index+1}}
+ + +
{{scope.row.taskChargeUserName}}
+ + +
{{'--'}}
+ + +
+ {{taskTypeMap[scope.row.type][scope.row.dutyContent]}} + + + + +
+ + +
{{scope.row.taskName}}
+ + +
{{scope.row.taskExecutePostName}}
+ + +
{{scope.row.taskReviewCycleValue}}
+ + +
{{unitMap[scope.row.taskReviewCycleUnit]}}
+ + + + +
重大危险源技术负责人隐患排查任务清单
+ + +
{{scope.$index+1}}
+ + +
{{scope.row.taskChargeUserName}}
+ + +
{{'--'}}
+ + +
+ {{taskTypeMap[scope.row.type][scope.row.dutyContent]}} + + + + +
+ + +
{{scope.row.taskName}}
+ + +
{{scope.row.taskExecutePostName}}
+ + +
{{scope.row.taskReviewCycleValue}}
+ + +
{{unitMap[scope.row.taskReviewCycleUnit]}}
+ + + + +
重大危险源操作负责人隐患排查任务清单
+ + +
{{scope.$index+1}}
+ + +
{{scope.row.taskChargeUserName}}
+ + +
{{'--'}}
+ + +
+ {{taskTypeMap[scope.row.type][scope.row.dutyContent]}} + + + + +
+ + +
{{scope.row.taskName}}
+ + +
{{scope.row.taskExecutePostName}}
+ + +
{{scope.row.taskReviewCycleValue}}
+ + +
{{unitMap[scope.row.taskReviewCycleUnit]}}
+ + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/src/views/responsibility/checkTasks/checkTasks.component.vue b/src/views/responsibility/checkTasks/checkTasks.component.vue new file mode 100644 index 0000000..b94f51c --- /dev/null +++ b/src/views/responsibility/checkTasks/checkTasks.component.vue @@ -0,0 +1,782 @@ + + + + \ No newline at end of file diff --git a/src/views/responsibility/majorHazard/majorHazard.component.html b/src/views/responsibility/majorHazard/majorHazard.component.html new file mode 100644 index 0000000..2531a65 --- /dev/null +++ b/src/views/responsibility/majorHazard/majorHazard.component.html @@ -0,0 +1,93 @@ +
+
+
+ +
+
+ + + + + + + + + + + + + + + +
+
+ + + + + +
重大危险源主要负责人安全职责
+ + + +
+ + +
+ +
重大危险源技术负责人安全职责
+ + +
+ + +
+ +
重大危险源操作负责人安全职责
+ + +
+ + +
+ + + + + + + + + + +
\ No newline at end of file diff --git a/src/views/responsibility/majorHazard/majorHazard.component.vue b/src/views/responsibility/majorHazard/majorHazard.component.vue new file mode 100644 index 0000000..f37069f --- /dev/null +++ b/src/views/responsibility/majorHazard/majorHazard.component.vue @@ -0,0 +1,705 @@ + + + + \ No newline at end of file diff --git a/src/views/risk/assessment/device/deviceAnal.component.vue b/src/views/risk/assessment/device/deviceAnal.component.vue index a7f98ce..0425e31 100644 --- a/src/views/risk/assessment/device/deviceAnal.component.vue +++ b/src/views/risk/assessment/device/deviceAnal.component.vue @@ -257,6 +257,7 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent labelWidth: "140px", require: true, showError: false, + disable: this.updateParams.id && this.updateParams.status !== 1, datas: [{ name: "不涉及", disable: false, @@ -858,6 +859,16 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent //保存 更新 public doSave(goOn?) { + let judgmentStatus = false as any; + this.updateParams.items.forEach((item) => { + if (!item.status) { + judgmentStatus = true + } + }) + if (judgmentStatus === true) { + this.$message.error("您有评价项未评价，请您先完成评价！"); + return + } // 如果是新增工作危害分析清单 //对数据进行处理\ if ((this.$refs.basicForm as any).vaildParams()) { @@ -866,6 +877,14 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent this.tableService.addOrUpdate(this.updateParams, !this.updateParams.id || this.updateParams.status === 1 ? true : false).then((res) => { this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功！"); this.showUpdate = !!goOn; + this.updateParams = { + majorSign: [], + items: [], + evaluateTime: moment().format('YYYY-MM-DD'), + evaluateUserId: this.account.userId, + evaluateUserName: this.account.nickName, + } as any; + this.buildUpdateForm(); this.getTableData(); }) } @@ -881,6 +900,14 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent this.tableService.addOrDraft(this.updateParams, !this.updateParams.id).then((res) => { this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功！"); this.showUpdate = false; + this.updateParams = { + majorSign: [], + items: [], + evaluateTime: moment().format('YYYY-MM-DD'), + evaluateUserId: this.account.userId, + evaluateUserName: this.account.nickName, + } as any; + this.buildUpdateForm(); this.getTableData(); }) } diff --git a/src/views/risk/assessment/work/workAnal.component.html b/src/views/risk/assessment/work/workAnal.component.html index 9874049..ed63005 100644 --- a/src/views/risk/assessment/work/workAnal.component.html +++ b/src/views/risk/assessment/work/workAnal.component.html @@ -129,24 +129,4 @@ 结束 - \ No newline at end of file diff --git a/src/views/risk/assessment/work/workAnal.component.vue b/src/views/risk/assessment/work/workAnal.component.vue index 50782b4..44d8e5a 100644 --- a/src/views/risk/assessment/work/workAnal.component.vue +++ b/src/views/risk/assessment/work/workAnal.component.vue @@ -162,6 +162,8 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { public riskLevelMap = {} as any; public buildUpdateForm() { + console.log(this.updateParams.id && this.updateParams.status !== 1,); + this.updateOptions = [{ name: "区域名称", key: "areaId", @@ -259,9 +261,11 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { width: "calc(100% - 20px)", require: true, showError: false, + disable: this.updateParams.id && this.updateParams.status !== 1, datas: [{ name: "不涉及", - value: 0 + value: 0, + }, { name: "重大危险源", disable: this.updateParams.majorSign && this.updateParams.majorSign.includes(0), @@ -848,8 +852,13 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { //获取区域固有风险等级 public getAreaRiskLevel(res: any) { - const areaAnalRiskLevel = this.areaList.filter((item) => item.value === res.data.areaId)[0]['analRiskLevel']; - this.updateParams.analRiskLevel = areaAnalRiskLevel; + if (this.areaList.length > 0) { + let tmpAnalRiskLevel = this.areaList.filter((item) => item.value === res.data.areaId); + if (tmpAnalRiskLevel.length > 0) { + const areaAnalRiskLevel = this.areaList.filter((item) => item.value === res.data.areaId)[0]['analRiskLevel']; + this.updateParams.analRiskLevel = areaAnalRiskLevel; + } + } } public handleClose() { @@ -866,14 +875,33 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { //保存 更新 public doSave(goOn?) { + let judgmentStatus = false as any; + this.updateParams.steps.forEach((item) => { + if (!item.status) { + judgmentStatus = true + } + }) + if (judgmentStatus === true) { + this.$message.error("您有评价项未评价，请您先完成评价！"); + return + } // 如果是新增工作危害分析清单 //对数据进行处理 if ((this.$refs.basicForm as any).vaildParams()) { if ((this.$refs.riskForm as any).vaildParams()) { this.saveTransformData(); + this.tableService.addOrUpdate(this.updateParams, !this.updateParams.id || this.updateParams.status === 1 ? true : false).then((res) => { this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功！"); this.showUpdate = !!goOn; + this.updateParams = { + majorSign: [], + steps: [], + evaluateTime: moment().format('YYYY-MM-DD'), + evaluateUserId: this.account.userId, + evaluateUserName: this.account.nickName, + } as any; + this.buildUpdateForm(); this.getTableData(); }) } @@ -889,6 +917,14 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { this.tableService.addOrDraft(this.updateParams, !this.updateParams.id).then((res) => { this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功！"); this.showUpdate = false; + this.updateParams = { + majorSign: [], + steps: [], + evaluateTime: moment().format('YYYY-MM-DD'), + evaluateUserId: this.account.userId, + evaluateUserName: this.account.nickName, + } as any; + this.buildUpdateForm(); this.getTableData(); }) } diff --git a/src/views/risk/duty/duty.component.vue b/src/views/risk/duty/duty.component.vue index a7cf2c2..0f800d0 100644 --- a/src/views/risk/duty/duty.component.vue +++ b/src/views/risk/duty/duty.component.vue @@ -83,7 +83,8 @@ export default class DutyManagerComponent extends BaseRecordComponent { public currentUrl = null; //排序属性转换 public sortAttribute = { - submitTime: "submit_time" + taskStartTime: "task_start_time", + taskEndTime: "task_end_time", } as any; public account = JSON.parse(localStorage.getItem("account") as any); @@ -266,7 +267,7 @@ export default class DutyManagerComponent extends BaseRecordComponent { this.tableColumn.push({ name: '排查时间', key: "endTime" }); this.tableColumn.push({ name: '责任人', key: "taskChargeUserName" }); this.tableColumn.push({ name: '开始时间', key: "taskStartTime", sortable: 'custom' }); - this.tableColumn.push({ name: '截止时间', key: "taskEndTime", }); + this.tableColumn.push({ name: '截止时间', key: "taskEndTime", sortable: 'custom' }); this.tableColumn.push({ name: '任务状态', width: "110px", key: "status", render: (data) => { if (data.status == 2) { diff --git a/src/views/risk/measuresReport/measuresReport.component.html b/src/views/risk/measuresReport/measuresReport.component.html index 285b34d..97f7ba0 100644 --- a/src/views/risk/measuresReport/measuresReport.component.html +++ b/src/views/risk/measuresReport/measuresReport.component.html @@ -12,7 +12,7 @@ @actionCallback="callback($event)" @pageNumberChange="callback($event,'pageNum')" @pageSizeChange="callback($event,'pageSize')" :footerActions="footerActions" :actions="tableActions"> + style="width: 100%" highlight-current-row @selection-change="handleSelectionChange"> @@ -22,12 +22,12 @@ @@ -44,7 +44,8 @@ - + 0) { this.filterStatusData = this.selectData[0]['status'] const tmpSelectData = this.selectData.filter((item) => item.status !== this.filterStatusData) @@ -416,6 +418,8 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent< } public handleSelectionChange(data) { + console.log('data',data); + this.selectData = data; } diff --git a/src/views/riskAssessment/businessInfo/businessInfo.component.html b/src/views/riskAssessment/businessInfo/businessInfo.component.html new file mode 100644 index 0000000..4ea9ac6 --- /dev/null +++ b/src/views/riskAssessment/businessInfo/businessInfo.component.html @@ -0,0 +1,67 @@ +
+
+
+ +
+
+ + + + + + + + + + + + + + +
+
+ + + + + + + + + +
+ 取消 + 确定 +
+ + + + + +
\ No newline at end of file diff --git a/src/views/riskAssessment/businessInfo/businessInfo.component.vue b/src/views/riskAssessment/businessInfo/businessInfo.component.vue new file mode 100644 index 0000000..b5c0214 --- /dev/null +++ b/src/views/riskAssessment/businessInfo/businessInfo.component.vue @@ -0,0 +1,932 @@ + + + + \ No newline at end of file diff --git a/src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.html b/src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.html new file mode 100644 index 0000000..432db88 --- /dev/null +++ b/src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.html @@ -0,0 +1,152 @@ +
+
+ +
+
+
+ +
+
+ + + + + + + + + + + + + + + +
+
+ + + + +
班组信息
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+
+ 已绑定 {{updateParams.teams[selected]['risks'].length}} 个风险点 +
+ + + + + {{item}} + +
+
+ + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.vue b/src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.vue new file mode 100644 index 0000000..71fa6d8 --- /dev/null +++ b/src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.vue @@ -0,0 +1,792 @@ + + + diff --git a/src/views/riskAssessment/riskJudgment/riskJudgment.component.html b/src/views/riskAssessment/riskJudgment/riskJudgment.component.html new file mode 100644 index 0000000..fb909fe --- /dev/null +++ b/src/views/riskAssessment/riskJudgment/riskJudgment.component.html @@ -0,0 +1,214 @@ +
+
+
+ +
+
+ +
+ + {{item.name}} + +
+ + + + + + + + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + + + + + + + + + + + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + + + + + + + + + + + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + + + + + + +
+
+ + + + +
{{subTableTitle}}
+ + + + +
+ 查看 + 研判 +
+ + + + + + + + + + + + + + +
+ {{scope.row.title}} +
+ + +
+ {{scope.row.content}} +
+ + + +
+ {{scope.row.result}} + + +
+ + +
+ {{scope.row.measure}} + + +
+ + + + + +
\ No newline at end of file diff --git a/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue b/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue new file mode 100644 index 0000000..082935e --- /dev/null +++ b/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue @@ -0,0 +1,457 @@ + + + diff --git a/src/views/riskAssessment/safetyNotice/safetyNotice.component.html b/src/views/riskAssessment/safetyNotice/safetyNotice.component.html new file mode 100644 index 0000000..7907b27 --- /dev/null +++ b/src/views/riskAssessment/safetyNotice/safetyNotice.component.html @@ -0,0 +1,127 @@ +
+
+
+ +
+
+
+ + {{item.name}} + +
+ + + + + + + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + + + + + + + + + + + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + + + + + + + + + + + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + +
{{scope.row.operateCompleted}}
+ + + + + + + + +
+
+ + + + + +
\ No newline at end of file diff --git a/src/views/riskAssessment/safetyNotice/safetyNotice.component.vue b/src/views/riskAssessment/safetyNotice/safetyNotice.component.vue new file mode 100644 index 0000000..785605d --- /dev/null +++ b/src/views/riskAssessment/safetyNotice/safetyNotice.component.vue @@ -0,0 +1,351 @@ + + + diff --git a/src/views/workprogress/trainRecords.component.vue b/src/views/workprogress/trainRecords.component.vue index ba74dfc..a1de905 100644 --- a/src/views/workprogress/trainRecords.component.vue +++ b/src/views/workprogress/trainRecords.component.vue @@ -282,6 +282,7 @@ export default class TrainRecords extends BaseRecordComponent { created() { + // }