From 39135ebc1ba7403719234706eae6bd8af73578cd Mon Sep 17 00:00:00 2001 From: kongyeqing <2697454777@qq.com> Date: Fri, 9 Jun 2023 18:01:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8D=B1=E5=AE=B3=E5=88=86=E6=9E=90=E8=AF=84=E4=BB=B7=E8=A1=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assessment/work/workAnal.component.html | 42 +++++- .../assessment/work/workAnal.component.vue | 140 +++++++++++++++++- 2 files changed, 179 insertions(+), 3 deletions(-) diff --git a/src/views/risk/assessment/work/workAnal.component.html b/src/views/risk/assessment/work/workAnal.component.html index 332ccd5..16ea030 100644 --- a/src/views/risk/assessment/work/workAnal.component.html +++ b/src/views/risk/assessment/work/workAnal.component.html @@ -1,6 +1,7 @@
- +
@@ -38,8 +39,45 @@
+ +
工作危害分析法
+ + + + + + + + + + + + + + + + + + +
\ 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 22569b6..cdad16e 100644 --- a/src/views/risk/assessment/work/workAnal.component.vue +++ b/src/views/risk/assessment/work/workAnal.component.vue @@ -22,6 +22,8 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { public params = {} as any; + public subTableColumn = [] as any; + public treeData = [{ label: '一级 1', children: [{ @@ -88,6 +90,18 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { name:"反向选择", value:"reverse" }]; + public updateActions = [{ + name: "取消", + value: "cancel" + }, { + name: "保存并继续添加", + value: "saveAndContinue", + type: "primary" + }, { + name: "保存", + value: "save", + type: "primary" + }]; public formOptions:FormOption[] = [{ name:"区域名称", key:"areaId", @@ -101,13 +115,109 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { key:"unitId", type:"text", }]; + public updateOptions:FormOption[]=[{ + name:"区域名称", + key:"areaId", + type:"select", + require:true, + width: "calc(50% - 20px)", + },{ + name:"单元名称", + key:"unitId", + type:"select", + require:true, + width: "calc(50% - 20px)", + },{ + name:"责任部门", + key:"depName", + type:"select", + require:true, + width: "calc(50% - 20px)", + },{ + name:"责任人", + key:"person", + type:"text", + require:true, + width: "calc(50% - 20px)", + },{ + name:"作业名称", + key:"jobName", + type:"select", + require:true, + width: "calc(50% - 20px)", + },{ + name:"作业地点", + key:"jobAdress", + type:"text", + require:true, + width: "calc(50% - 20px)", + },{ + name:"涉及岗位", + key: "job", + type: "select", + width: "calc(100% - 20px)", + require: true, + },{ + name:"评价人", + key:"evaluator", + require:true, + width:"calc(50% - 20px)", + type:"select", + },{ + name:"评价时间", + key: "time", + type: "date", + subType: "date", + width: "calc(50% - 20px)", + require: true, + format: "yyyy-MM-dd" + },{ + name:"是否为两大一重", + key: "time", + type: "radio", + width: "calc(100% - 20px)", + require: true, + datas:[{ + name:"不涉及", + value:0 + },{ + name:"重大危险源", + value:1 + },{ + name:"重大监管化工工艺", + value:2 + },{ + name:"重点监管危化品", + value:3 + }] + },{ + name:"重大危险源", + key:"isDangrous", + type:"select", + width:"calc(50% - 20px)", + require:true, + + },{ + name:"重点监管工艺", + key: "technology", + type: "select", + width: "calc(50% - 20px)", + require: true, + },{ + name:"重点监管化学品", + key: "chemical", + type: "select", + width: "calc(50% - 20px)", + require: true, + }]; public showUpdate = false; + public showSubUpdate = false; public updateParams = {} as any; public selectData = []; created(){ - + console.log() } // 树点击 public handleNodeClick(data){ @@ -137,9 +247,25 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { return "已绘制" } }}); + + + this.subTableColumn.push({ name: '序号', key: "person" }); + this.subTableColumn.push({ name: '步骤名称', key: "person" }); + this.subTableColumn.push({ name: '作业步骤描述', key: "person", showTip: true, width:"200px"}); + this.subTableColumn.push({ name: '作业地点', key: "location" }); + this.subTableColumn.push({ name: '风险源', key: "chargeUserName" }); + this.subTableColumn.push({ name: '危害分析', key: "person" }); + this.subTableColumn.push({ name: '最严重后果', key: "person", width:"200px" }); + this.subTableColumn.push({ name: '风险等级', key: "person" }); + this.subTableColumn.push({ name: '评估方法', key: "person" }); + this.subTableColumn.push({ name: '残余风险等级', key: "person", width:"200px" }); + this.subTableColumn.push({ name: '评估方法', key: "person" }); + this.subTableColumn.push({ name: '管控措施', key: "person" }); } public callback(data){ + console.log('data',data); + // 查询 if(data.value==="search"){ this.getTableData() @@ -154,6 +280,16 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { this.selectAll() }else if(data.value === "delete"){ this.deleteData(this.selectData.map((item:any)=>item.id)) + }else if(data.value === "add"){ + this.showUpdate = true + }else if (data.value === "subAdd") { + this.showSubUpdate = true + } else if (data.value === "cancel") { + if (this.showSubUpdate === true) { + this.showSubUpdate = false + } else { + this.showUpdate = false + } } } // 重置数据 @@ -194,6 +330,8 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { public handleSelectionChange(data){ this.selectData = data; } + + }