diff --git a/.env.development b/.env.development
index 0759ac2..c401818 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ VUE_APP_TITLE = 汉邦唐全真数字服务平台
 # 网关地址
 VUE_APP_GATEWAY_URL="/dev-api"
 # 服务地址
-VUE_APP_BASE_API_URL="http://192.168.1.19:8081/"
+VUE_APP_BASE_API_URL="http://192.168.2.187:8081/"
 # 服务前-- 请严格遵守格式  不允许换行
-VUE_APP_SERVICE_PREFIX= '{"system":"/system","file":"/file-zy","prevention":"/prevention-yx"}'
+VUE_APP_SERVICE_PREFIX= '{"system":"/system","file":"/file-zy","prevention":"/prevention-zy"}'
 # 是否显示全部菜单
 VUE_APP_ALL_MENU = false
 # 微前端地址
diff --git a/.env.test b/.env.test
index 0acfcd2..326c03e 100644
--- a/.env.test
+++ b/.env.test
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 汉邦唐全真数字服务平台
 # 网关地址
 VUE_APP_GATEWAY_URL="/prod-api"
 # 服务地址
-VUE_APP_BASE_API_URL="http://192.168.2.3:8081"
+VUE_APP_BASE_API_URL="http://192.168.2.187:8080"
 # 服务前-- 请严格遵守格式  不允许换行
 VUE_APP_SERVICE_PREFIX= '{"knowledge":"/knowledge","system":"/system"}'
 # 是否显示全部菜单
diff --git a/src/assets/images/2.png b/src/assets/images/2.png
new file mode 100644
index 0000000..d9ffbf0
Binary files /dev/null and b/src/assets/images/2.png differ
diff --git a/src/assets/images/3.png b/src/assets/images/3.png
new file mode 100644
index 0000000..5aa1558
Binary files /dev/null and b/src/assets/images/3.png differ
diff --git a/src/assets/images/5.png b/src/assets/images/5.png
new file mode 100644
index 0000000..dcfb3d1
Binary files /dev/null and b/src/assets/images/5.png differ
diff --git a/src/assets/images/6.png b/src/assets/images/6.png
new file mode 100644
index 0000000..2220032
Binary files /dev/null and b/src/assets/images/6.png differ
diff --git a/src/mock/lecRisk.ts b/src/mock/lecRisk.ts
new file mode 100644
index 0000000..a3f2661
--- /dev/null
+++ b/src/mock/lecRisk.ts
@@ -0,0 +1,184 @@
+const L_LECCOLUMN:any=[
+    {
+        key:"grade",
+        name:"分值",
+        width:"80px",
+    },
+    {
+        key:"name",
+        name:"事故、事件或偏差发生的可能性",
+       
+    },
+];
+
+const L_LECVALUE:any=[
+    {
+        index:1,
+        grade:10,
+        name:"完全可以预料",
+    },
+    {
+        index:2,
+        grade:6,
+        name:"相当可能；或危害的发生不能被发现（没有监测系统）；或在现场没有采取防范、监测、保护、控制措施；或在正常情况下经常发生此类事故、事件或偏差",
+    },
+    {
+        index:3,
+        grade:3,
+        name:"可能，但不经常；或危害的发生不容易被发现；现场没有检测系统或保护措施（如没有保护装置、没有个人防护用品等），也未作过任何监测；或未严格按操作规程执行；或在现场有控制措施，但未有效执行或控制措施不当；或危害在预期情况下发生",
+    },
+    {
+        index:4,
+        grade:1,
+        name:"可能性小，完全意外；或危害的发生容易被发现；现场有监测系统或曾经作过监测；或过去曾经发生类似事故、事件或偏差；或在异常情况下发生过类似事故、事件或偏差",
+    },
+    {
+        index:5,
+        grade:0.5,
+        name:"很不可能，可以设想；危害一旦发生能及时发现，并能定期进行监测",
+    },
+    {
+        index:6,
+        grade:0.2,
+        name:"极不可能；有充分、有效的防范、控制、监测、保护措施；或员工安全卫生意识相当高，严格执行操作规程"
+    },
+    {
+        index:7,
+        grade:0.1,
+        name:"实际不可能"
+    }
+];
+
+const E_COLUMN:any=[
+    {
+        key:"grade",
+        name:"分值",
+        width:"80px",
+    },
+    {
+        key:"name",
+        name:"频繁程度",
+    },
+];
+
+const E_VALUE:any=[
+    {
+        index:1,
+        grade:10,
+        name:"连续暴露"
+    },
+    {
+        index:2,
+        grade:6,
+        name:"每天工作时间内暴露"
+    },
+    {
+        index:3,
+        grade:3,
+        name:"每周一次或偶然暴露"
+    },
+    {
+        index:4,
+        grade:2,
+        name:"每月一次暴露"
+    },
+    {
+        index:5,
+        grade:1,
+        name:"每年几次暴露"
+    },
+    {
+        index:6,
+        grade:0.5,
+        name:"非常罕见地暴露"
+    },
+
+];
+
+const C_COLUMN:any=[
+    {
+        key:"grade",
+        name:"分值",
+        width:"80px",
+    },
+    {
+        key:"condition",
+        name:"法律、法规及其他要求",
+    },
+    {
+        key:"person",
+        name:"人员伤亡",
+    },
+    {
+        key:"losses",
+        name:"直接经济损失（万元）",
+    },
+    {
+        key:"stopwork",
+        name:"停工",
+    },
+    {
+        key:"business",
+        name:"公司形象",
+    },
+];
+
+const C_VALUE:any=[
+    {
+        index:1,
+        grade:100,
+        condition:"严重违反法律法规和标准",
+        person:"10人以上死亡，或50人以上重伤",
+        losses:"5000以上",
+        stopwork:"公司停产",
+        business:"重大国际、国内影响",
+    },
+    {
+        index:2,
+        grade:40,
+        condition:"违反法律法规和标准",
+        person:"3人以上10人以下死亡，或10人以上50人以下重伤",
+        losses:"1000以上",
+        stopwork:"装置停工",
+        business:"行业内、省内影响",
+    },
+    {
+        index:3,
+        grade:15,
+        condition:"潜在违反法规和标准",
+        person:"3人以下死亡，或10人以下重伤",
+        losses:"100以上",
+        stopwork:"部分装置停工",
+        business:"地区影响",
+    },
+    {
+        index:4,
+        grade:7,
+        condition:"不符合上级或行业的安全方针、制度、规定等",
+        person:"丧失劳动力、截肢、骨折、听力丧失、慢性病",
+        losses:"10万以上",
+        stopwork:"部分设备停工",
+        business:"公司及周边范围",
+        
+    },
+    {
+        index:5,
+        grade:2,
+        condition:"不符合公司的安全操作程序、规定",
+        person:"轻微受伤、间歇不舒服",
+        losses:"1万以上",
+        stopwork:"1套设备停工",
+        business:"引人关注，不利于基本的安全卫生要求",
+    },
+    {
+        index:6,
+        grade:1,
+        condition:"完全符合",
+        person:"无伤亡",
+        losses:"1万以下",
+        stopwork:"没有停工",
+        business:"形象没有受损",
+    },
+];
+
+export { L_LECCOLUMN,L_LECVALUE,E_COLUMN,E_VALUE,C_COLUMN,C_VALUE }
\ No newline at end of file
diff --git a/src/mock/lsRisk.ts b/src/mock/lsRisk.ts
new file mode 100644
index 0000000..521f173
--- /dev/null
+++ b/src/mock/lsRisk.ts
@@ -0,0 +1,131 @@
+const L_COLUMN:any=[
+    // {
+    //     key:"index",
+    //     name:"序号",
+    //     width:"80px",
+    // },
+    {
+        key:"grade",
+        name:"等级",
+        width:"80px",
+    },
+    {
+        key:"name",
+        name:"标准",
+       
+    },
+]
+
+const L_VALUE:any=[
+    {
+        index:1,
+        grade:5,
+        name:"在现场没有采取防范、监测、保护、控制措施，或危害的发生不能被发现（没有监测系统），或在正常情况下经常发生此类事故或事件。",
+    },
+    {
+        index:2,
+        grade:4,
+        name:"危害的发生不容易被发现，现场没有检测系统，也未发生过任何监测，或在现场有控制措施，但未有效执行或控制措施不当，或危害发生或预期情况下发生。",
+    },
+    {
+        index:3,
+        grade:3,
+        name:"没有保护措施（如没有保护装置、没有个人防护用品等），或未严格按操作程序执行，或危害的发生容易被发现（现场有监测系统），或曾经作过监测，或过去曾经发生类似事故或事件。",
+    },
+    {
+        index:4,
+        grade:2,
+        name:"危害一旦发生能及时发现，并定期进行监测，或现场有防范控制措施，并能有效执行，或过去偶尔发生事故或事件。",
+    },
+    {
+        index:5,
+        grade:1,
+        name:"有充分、有效的防范、控制、监测、保护措施，或员工安全卫生意识相当高，严格执行操作规程。极不可能发生事故或事件。",
+    },
+
+];
+
+const S_COLUMN:any=[
+    // {
+    //     key:"index",
+    //     name:"序号",
+    //     width:"80px",
+    // },
+    {
+        key:"grade",
+        name:"等级",
+        width:"80px",
+    },
+    {
+        key:"condition",
+        name:"法律、法规及其他要求",
+    },
+    {
+        key:"person",
+        name:"人员",
+    },
+    {
+        key:"losses",
+        name:"直接经济损失",
+    },
+    {
+        key:"stopwork",
+        name:"停工",
+    },
+    {
+        key:"business",
+        name:"企业形象",
+    },
+    
+]
+
+const S_VALUE:any=[
+    {
+        index:1,
+        grade:5,
+        condition:"违反法律、法规和标准",
+        person:"死亡",
+        losses:"100万元以上",
+        stopwork:"部分装置（>2 套）或设备",
+        business:"重大国际影响",
+    },
+    {
+        index:2,
+        grade:4,
+        condition:"潜在违反法规和标准",
+        person:"丧失劳动能力",
+        losses:"50万元以上",
+        stopwork:"2套装置停工、或设备停工",
+        business:"行业内、省内影响",
+    },
+    {
+        index:3,
+        grade:3,
+        condition:"不符合上级公司或行业的安全方针、制度、规定等",
+        person:"截肢、骨折、听力丧失、慢性病",
+        losses:"1万元以上",
+        stopwork:"1 套装置停工或设备",
+        business:"地区影响",
+    },
+    {
+        index:4,
+        grade:2,
+        condition:"不符合企业的安全操作程序、规定",
+        person:"轻微受伤、间歇不舒服",
+        losses:"1万元以下",
+        stopwork:"受影响不大，几乎不停工",
+        business:"公司及周边范围",
+        
+    },
+    {
+        index:5,
+        grade:1,
+        condition:"完全符合",
+        person:"无伤亡",
+        losses:"无损失",
+        stopwork:"没有停工",
+        business:"形象没有受损",
+    },
+];
+
+export { L_COLUMN,L_VALUE,S_COLUMN,S_VALUE }
\ No newline at end of file
diff --git a/src/service/jobHazard.service.ts b/src/service/jobHazard.service.ts
index 6d2362d..03a30fb 100644
--- a/src/service/jobHazard.service.ts
+++ b/src/service/jobHazard.service.ts
@@ -6,11 +6,40 @@ export default class JobHazardService extends BaseService<any>{
         super()
     }
     public selectByPage(params: any):Promise<AxiosResponse<ActionResult<any>>>{
-        const url = this.prefix.system+'/user/list';
+        const url = this.prefix.prevention+'/job/anal/getList';
         return this.get(url,params,true)
     }
     public deleteByIds(params):Promise<AxiosResponse<ActionResult<any>>>{
-        const url = this.prefix.system+'/user/list';
+        
+        const url = this.prefix.prevention+'/job/anal/delete';
         return this.deleteBatch(url,params,{},true)
     }
+
+    public selectById(id):Promise<AxiosResponse<ActionResult<any>>>{
+        const url = this.prefix.prevention+'/job/anal/detail?id='+id;
+        return this.get(url,null,true)
+    }
+
+    
+    // 新增或更新
+    public addOrUpdate(params: any, add: boolean,showLoading?:boolean): Promise<AxiosResponse<ActionResult<any>>>{
+        
+        if(add){
+            const url = this.prefix.prevention+'/job/anal/add';
+            return this.post(url,params,{},showLoading)
+        }else{
+            const url = this.prefix.prevention+'/job/anal/update';
+            return this.put(url,params,{},showLoading)
+        }
+    }
+
+       // 存草稿
+       public addOrDraft(params: any, add: boolean,showLoading?:boolean): Promise<AxiosResponse<ActionResult<any>>>{
+        const url = this.prefix.prevention+'/job/anal/addDraft';
+        if(add){
+            return this.post(url,params,{},showLoading)
+        }else{
+            return this.put(url,params,{},showLoading)
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/views/blank.component.vue b/src/views/blank.component.vue
index e748eaa..25cb86c 100644
--- a/src/views/blank.component.vue
+++ b/src/views/blank.component.vue
@@ -5,79 +5,79 @@
 import AreaService from '@/service/area.service';
 import UnitService from '@/service/unit.service';
 import SystemService from 'hbt-common/service/system.service';
-import { Component,Vue } from 'vue-property-decorator';
+import { Component, Vue } from 'vue-property-decorator';
 @Component
 export default class BlankComponent extends Vue {
 
     public systemService = new SystemService();
     public areaService = new AreaService();
     public unitService = new UnitService();
-    created(){
+    created() {
         Promise.all([
             this.systemService.getDeptTree(),
             this.systemService.getDeptList(),
-            this.systemService.getUserList({pageSize:0}),
-            this.systemService.getPostList({pageSize:1000}),
+            this.systemService.getUserList({ pageSize: 0 }),
+            this.systemService.getPostList({ pageSize: 1000 }),
             this.systemService.getDictData("common_yes_no"),
             this.systemService.getDictData("prevention_dangrous_level"),
             this.systemService.getDictData("prevention_risk_level"),
             this.systemService.getDictData("prevention_safe_reason"),
             this.systemService.getDictData("prevention_dangrous_type")
-        ]).then(((results:any)=>{
-            this.$store.commit("setDeptTreeList",results[0].data);
-            this.$store.commit("setUserList",results[2].data.datas.map((item)=>{
+        ]).then(((results: any) => {
+            this.$store.commit("setDeptTreeList", results[0].data);
+            this.$store.commit("setUserList", results[2].data.datas.map((item) => {
                 return {
-                    name:item.nickName,
-                    value:item.userId
+                    name: item.nickName,
+                    value: item.userId
                 }
             }))
 
 
-            this.$store.commit("setPostList",results[3].rows.map((item)=>{
+            this.$store.commit("setPostList", results[3].rows.map((item) => {
                 return {
-                    name:item.postName,
-                    value:item.postId
+                    name: item.postName,
+                    value: item.postId
                 }
             }))
 
 
-            this.$store.commit("set_common_yes_no",results[4].data.map(item=>{
+            this.$store.commit("set_common_yes_no", results[4].data.map(item => {
                 return {
-                    name:item.dictLabel,
-                    value:isNaN(+item.dictValue)?item.dictValue:+item.dictValue
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
                 }
             }))
-            this.$store.commit("set_prevention_dangrous_level",results[5].data.map(item=>{
+            this.$store.commit("set_prevention_dangrous_level", results[5].data.map(item => {
                 return {
-                    name:item.dictLabel,
-                    value:isNaN(+item.dictValue)?item.dictValue:+item.dictValue
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
                 }
             }))
-            this.$store.commit("set_prevention_risk_level",results[6].data.map(item=>{
+            this.$store.commit("set_prevention_risk_level", results[6].data.map(item => {
                 return {
-                    name:item.dictLabel,
-                    value:isNaN(+item.dictValue)?item.dictValue:+item.dictValue
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
                 }
             }))
-            this.$store.commit("set_prevention_safe_reason",results[7].data.map(item=>{
+            this.$store.commit("set_prevention_safe_reason", results[7].data.map(item => {
                 return {
-                    name:item.dictLabel,
-                    value:isNaN(+item.dictValue)?item.dictValue:+item.dictValue
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
                 }
             }))
-            this.$store.commit("set_prevention_dangrous_type",results[8].data.map(item=>{
+            this.$store.commit("set_prevention_dangrous_type", results[8].data.map(item => {
                 return {
-                    name:item.dictLabel,
-                    value:isNaN(+item.dictValue)?item.dictValue:+item.dictValue
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
                 }
             }))
 
 
 
-            this.$store.commit("setDeptList",results[1].data.map((item)=>{
+            this.$store.commit("setDeptList", results[1].data.map((item) => {
                 return {
-                    name:item.deptName,
-                    value:item.deptId
+                    name: item.deptName,
+                    value: item.deptId
                 }
             }))
 
diff --git a/src/views/home/home.component.vue b/src/views/home/home.component.vue
index 9e11808..0a17617 100644
--- a/src/views/home/home.component.vue
+++ b/src/views/home/home.component.vue
@@ -27,18 +27,11 @@ export default class HomeComponent extends Vue {
   // 柱图
   public barChart:any
   
-  // or
-  B = 2;
-  // or  仅内部可用
-  private C = 3;
-  // or  可被继承类调用
-  protected D = 4;
   // 组件渲染完成
   mounted(){
     window.addEventListener("resize",this.resize)
   }
   beforeDestory(){
-    console.log(123)
     window.removeEventListener("resize",this.resize)
   }
 
diff --git a/src/views/risk/assessment/device/device.component.vue b/src/views/risk/assessment/device/device.component.vue
index 945584d..8fe673a 100644
--- a/src/views/risk/assessment/device/device.component.vue
+++ b/src/views/risk/assessment/device/device.component.vue
@@ -11,7 +11,7 @@ import DrawComponent from '@/components/draw.component.vue';
 import DeviceService from '@/service/device.service';
 @Component({
     template,
-    components:{
+    components: {
         FormComponent,
         TableComponent,
         DrawComponent,
@@ -25,141 +25,210 @@ export default class DeviceManagerComponent extends BaseRecordComponent<any> {
     public treeData = [{
         label: '一级 1',
         children: [{
-        label: '二级 1-1',
-        children: [{
-            label: '三级 1-1-1'
-        }]
+            label: '二级 1-1',
+            children: [{
+                label: '三级 1-1-1'
+            }]
         }]
     }, {
         label: '一级 2',
         children: [{
-        label: '二级 2-1',
-        children: [{
-            label: '三级 2-1-1'
-        }]
+            label: '二级 2-1',
+            children: [{
+                label: '三级 2-1-1'
+            }]
         }, {
-        label: '二级 2-2',
-        children: [{
-            label: '三级 2-2-1'
-        }]
+            label: '二级 2-2',
+            children: [{
+                label: '三级 2-2-1'
+            }]
         }]
     }, {
         label: '一级 3',
         children: [{
-        label: '二级 3-1',
-        children: [{
-            label: '三级 3-1-1'
-        }]
+            label: '二级 3-1',
+            children: [{
+                label: '三级 3-1-1'
+            }]
         }, {
-        label: '二级 3-2',
-        children: [{
-            label: '三级 3-2-1'
-        }]
+            label: '二级 3-2',
+            children: [{
+                label: '三级 3-2-1'
+            }]
         }]
     }]
 
     public formActions = [{
-        name:"查询",
-        value:"search",
-        icon:"el-icon-search",
-        type:"primary"
-    },{
-        name:"清空",
-        icon:"el-icon-tickets",
-        value:"reset"
+        name: "查询",
+        value: "search",
+        icon: "el-icon-search",
+        type: "primary"
+    }, {
+        name: "清空",
+        icon: "el-icon-tickets",
+        value: "reset"
     }];
     public tableActions = [{
-        name:"添加",
-        value:"add",
-        icon:"el-icon-plus",
-        type:"primary"
-    },{
-        name:"批量删除",
-        value:"delete",
-        plain:true,
-        icon:"el-icon-delete",
-        type:"danger"
+        name: "添加",
+        value: "add",
+        icon: "el-icon-plus",
+        type: "primary"
+    }, {
+        name: "批量删除",
+        value: "delete",
+        plain: true,
+        icon: "el-icon-delete",
+        type: "danger"
     }];
     public footerActions = [{
-        name:"选择全部",
-        value:"selectAll",
-        type:"primary"
-    },{
-        name:"反向选择",
-        value:"reverse"
+        name: "选择全部",
+        value: "selectAll",
+        type: "primary"
+    }, {
+        name: "反向选择",
+        value: "reverse"
     }];
-    public formOptions:FormOption<BtnOption>[] = [{
-        name:"区域名称",
-        key:"areaId",
-        type:"text",
-    },{
-        name:"单元名称",
-        key:"unitId",
-        type:"text",
+    public formOptions: FormOption<BtnOption>[] = [{
+        name: "区域名称",
+        key: "areaId",
+        type: "text",
+    }, {
+        name: "单元名称",
+        key: "unitId",
+        type: "text",
+    }];
+
+    public updateOptions: FormOption<BtnOption>[] = [{
+        name: "选择区域",
+        key: "areaId",
+        type: "select",
+        require: true,
+        width: "calc(50% - 20px)",
+    }, {
+        name: "选择单元",
+        key: "unitId",
+        type: "select",
+        require: true,
+        width: "calc(50% - 20px)",
+    }, {
+        name: "责任部门",
+        key: "deptId",
+        type: "select",
+        require: true,
+        width: "calc(50% - 20px)",
+        datas: [{
+            name: "部门1",
+            value: 0
+        }, {
+            name: "部门2",
+            value: 1
+        }]
+
+    }, {
+        name: "责任人",
+        key: "person",
+        type: "select",
+        require: true,
+        width: "calc(50% - 20px)",
+        datas: [{
+            name: "人员1",
+            value: 0
+        }, {
+            name: "人员2",
+            value: 1
+        }]
+    }, {
+        name: "设备名称",
+        key: "devicename",
+        type: "text",
+        require: true,
+        width: "calc(50% - 20px)",
+    }, {
+        name: "设备类型",
+        key: "devicetype",
+        type: "select",
+        require: true,
+        width: "calc(50% - 20px)",
+    }, {
+        name: "涉及岗位",
+        key: "job",
+        require: true,
+        type: "select",
+        width: "calc(50% - 20px)",
+    }, {
+        name: "安全因素",
+        key: "safeKey",
+        require: true,
+        type: "select",
+        width: "calc(50% - 20px)",
     }];
 
     public showUpdate = false;
-    public updateParams = {}  as any;
+    public updateParams = {} as any;
     public selectData = [];
 
-    created(){
+    created() {
 
     }
     // 树点击
-    public handleNodeClick(data){
+    public handleNodeClick(data) {
         console.log(data)
     }
 
-    public buildTable(){
-        this.tableColumn.push({name:'序号',key:"index"});
-        this.tableColumn.push({name:'区域名称',key:"deptName",width:"200px"});
-        this.tableColumn.push({name:'风险分析单元',key:"deptName",width:"200px"});
-        this.tableColumn.push({name:'设备名称',key:"person"});
-        this.tableColumn.push({name:'设备类别',key:"person"});
-        this.tableColumn.push({name:'检查项目',key:"status",render:(data)=>{
-            if(data.status==0){
-                return "<span class='noDraw'>未绘制</span>"
-            }else{
-                return "<span>已绘制</span>"
+    public buildTable() {
+        this.tableColumn.push({ name: '序号', key: "index" });
+        this.tableColumn.push({ name: '区域名称', key: "deptName", width: "200px" });
+        this.tableColumn.push({ name: '风险分析单元', key: "deptName", width: "200px" });
+        this.tableColumn.push({ name: '设备名称', key: "person" });
+        this.tableColumn.push({ name: '设备类别', key: "person" });
+        this.tableColumn.push({
+            name: '检查项目', key: "status", render: (data) => {
+                if (data.status == 0) {
+                    return "<span class='noDraw'>未绘制</span>"
+                } else {
+                    return "<span>已绘制</span>"
+                }
             }
-        }});
-        this.tableColumn.push({name:'责任人',key:"person"});
-        this.tableColumn.push({name:'责任部门',key:"person"});
-        this.tableColumn.push({name:'涉及岗位',key:"person"});
+        });
+        this.tableColumn.push({ name: '责任人', key: "person" });
+        this.tableColumn.push({ name: '责任部门', key: "person" });
+        this.tableColumn.push({ name: '涉及岗位', key: "person" });
     }
 
-    public callback(data){
+    public callback(data) {
         // 查询
-        if(data.value==="search"){
+        if (data.value === "search") {
             this.getTableData()
-        // 重置
-        }else if(data.value === "reset"){
+            // 重置
+        } else if (data.value === "reset") {
             this.reset()
-        // 反选
-        }else if(data.value === "reverse"){
+            // 反选
+        } else if (data.value === "reverse") {
             this.toggleAll()
-        // 全选
-        }else if(data.value === "selectAll"){
+            // 全选
+        } else if (data.value === "selectAll") {
             this.selectAll()
-        }else if(data.value === "delete"){
-            this.deleteData(this.selectData.map((item:any)=>item.id))
+        } else if (data.value === "delete") {
+            this.deleteData(this.selectData.map((item: any) => item.id))
+        } else if (data.value === "add") {
+            this.showUpdate = true
         }
     }
     // 重置数据
-    public reset(){
+    public reset() {
         this.params = {
-            pageNum:1,
-            pageSize:20,
+            pageNum: 1,
+            pageSize: 20,
         } as any;
     }
 
 
 
-    public showUpdateModel(id){
+    public showUpdateModel(id) {
         this.showUpdate = true
     }
 
-    public handleClose(){
+    public handleClose() {
         this.showUpdate = false;
     }
 
@@ -167,20 +236,20 @@ export default class DeviceManagerComponent extends BaseRecordComponent<any> {
     public toggleAll() {
         (this.$refs.multipleTable as any).toggleAllSelection();
     }
-    public selectAll(){
-        if(!this.selectData.length){
+    public selectAll() {
+        if (!this.selectData.length) {
             this.toggleAll()
-        }else{
-            this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
-                if(!find){
+        } else {
+            this.tableData.datas.forEach((item, index) => {
+                const find = this.selectData.find((data: any) => data.userId === item.userId);
+                if (!find) {
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }
             })
         }
     }
 
-    public handleSelectionChange(data){
+    public handleSelectionChange(data) {
         this.selectData = data;
     }
 }
diff --git a/src/views/risk/assessment/device/deviceAnal.component.html b/src/views/risk/assessment/device/deviceAnal.component.html
index 332ccd5..85e8fb9 100644
--- a/src/views/risk/assessment/device/deviceAnal.component.html
+++ b/src/views/risk/assessment/device/deviceAnal.component.html
@@ -37,6 +37,42 @@
         </div>
     </div>
 
+    <el-dialog :close-on-click-modal="false" :title="currentId>0?'详情':currentId===-1?'新增':'编辑'"
+        :visible.sync="showUpdate" width="952px" :before-close="handleClose">
+        <FormComponent :options="updateOptions" labelWidth="110px" labelAlign="right" :data.sync="updateParams"
+            @actionCallback="callback" :actions="updateActions" :full-btn="true" btnPosition="center">
+            <div class="sub-title">作业步骤</div>
+
+            <TableComponent :tableData="tableData" :tableColumn="subTableColumn" @actionCallback="callback($event)"
+                :actions="subTableActions" actionPosition="flex-start" :showFooter="false" style="margin-bottom: 20px;">
+
+                <el-table ref="multipleTable" :data="tableData.datas" tooltip-effect="dark" height="250" border
+                    row-key="checked" @selection-change="handleSelectionChange" style="width: 100%">
+                    <el-table-column type="selection" label="全选" width="40">
+                    </el-table-column>
+                    <template v-for="item in subTableColumn">
+                        <el-table-column v-if="item.render" :show-overflow-tooltip="item.showTip" :label="item.name"
+                            :width="item.width" :key="item.key">
+                            <div slot-scope="scope" v-html="item.render(scope.row)"></div>
+                        </el-table-column>
+                        <el-table-column v-else :prop="item.key" :show-overflow-tooltip="item.showTip"
+                            :label="item.name" :width="item.width" :key="item.key">
+                        </el-table-column>
+                    </template>
+                    <el-table-column label="操作" width="100">
+                        <template slot-scope="scope">
+                            <el-button type="text" @click="showUpdateModel(scope.row.userId)">修改</el-button>
+                            <el-button type="text" @click="deleteData([scope.row])">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+            </TableComponent>
+        </FormComponent>
+
+        
+    </el-dialog>
+
     <el-dialog :close-on-click-modal="false" :title="currentId>0?'详情':currentId===-1?'新增':'编辑'"
         :visible.sync="showUpdate" width="952px" :before-close="handleClose">
         <FormComponent :options="updateOptions" :isReadonly="true" labelWidth="110px" labelAlign="right"
diff --git a/src/views/risk/assessment/device/deviceAnal.component.vue b/src/views/risk/assessment/device/deviceAnal.component.vue
index fb27342..531c31a 100644
--- a/src/views/risk/assessment/device/deviceAnal.component.vue
+++ b/src/views/risk/assessment/device/deviceAnal.component.vue
@@ -118,7 +118,7 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
     }
     // 树点击
     public handleNodeClick(data){
-        console.log(data)
+        console.log('data',data)
     }
 
     public buildTable(){
diff --git a/src/views/risk/assessment/work/workAnal.component.html b/src/views/risk/assessment/work/workAnal.component.html
index f62a86e..73bb38c 100644
--- a/src/views/risk/assessment/work/workAnal.component.html
+++ b/src/views/risk/assessment/work/workAnal.component.html
@@ -5,7 +5,7 @@
     <div class="common-content-box dis-flex flex-col flex-1">
         <div class="search-box">
             <FormComponent :options="formOptions" :data.sync="params" @actionCallback="callback" :actions="formActions"
-                :full-btn="false" @change="callback" btn-position="end"></FormComponent>
+                :full-btn="false" @change="changes" btn-position="end"></FormComponent>
         </div>
         <div class="table-box flex-1">
             <TableComponent :tableData="tableData" :tableColumn="tableColumn" @tabCallback="callback($event)"
@@ -25,9 +25,9 @@
                     </template>
                     <el-table-column label="操作" width="150">
                         <template slot-scope="scope">
-                            <el-button type="text" @click="showUpdateModel(scope.row.userId)">查看</el-button>
-                            <el-button type="text" @click="showUpdateModel(scope.row.userId)">修改</el-button>
-                            <el-button type="text" @click="deleteData([scope.row])">删除</el-button>
+                            <el-button type="text" @click="showUpdateModel(scope.row,true)">查看</el-button>
+                            <el-button type="text" @click="showUpdateModel(scope.row,false,true)">修改</el-button>
+                            <el-button type="text" @click="deleteData([scope.row.id])">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -36,16 +36,16 @@
         </div>
     </div>
 
-    <el-dialog :close-on-click-modal="false" :title="currentId>0?'详情':currentId===-1?'新增':'编辑'"
+    <el-dialog :close-on-click-modal="false" :title="!updateParams.id?'新增':isReadonly?'详情':'编辑'"
         :visible.sync="showUpdate" width="952px" :before-close="handleClose">
         <FormComponent :options="updateOptions" labelWidth="110px" labelAlign="right" :data.sync="updateParams"
-            @actionCallback="callback" :actions="updateActions" :full-btn="true" btnPosition="center">
+            :isReadonly="isReadonly" @actionCallback="callback" @change="changes">
             <div class="sub-title">工作危害分析法</div>
+            <TableComponent :tableData="currentStepTableData" :tableColumn="subTableColumn"
+                @actionCallback="callback($event)" :actions="isReadonly? []:subTableActions" actionPosition="flex-start"
+                :showFooter="false" style="margin-bottom: 20px;">
 
-            <TableComponent :tableData="tableData" :tableColumn="subTableColumn" @actionCallback="callback($event)"
-                :actions="subTableActions" actionPosition="flex-start" :showFooter="false" style="margin-bottom: 20px;">
-
-                <el-table ref="multipleTable" :data="tableData.datas" tooltip-effect="dark" height="250" border
+                <el-table ref="multipleTable" :data="updateParams.steps" tooltip-effect="dark" height="250" border
                     row-key="checked" @selection-change="handleSelectionChange" style="width: 100%">
                     <el-table-column type="selection" label="全选" width="40">
                     </el-table-column>
@@ -60,22 +60,152 @@
                     </template>
                     <el-table-column label="操作" width="150">
                         <template slot-scope="scope">
-                            <el-button type="text" @click="">查看</el-button>
-                            <el-button type="text" @click="">修改</el-button>
-                            <el-button type="text" @click="">评价</el-button>
+                            <el-button v-if="isReadonly" type="text"
+                                @click="showSubModel(scope.row,isReadonly)">查看</el-button>
+                            <el-button v-if="isModifyonly" type="text" @click="showSubModel(scope.row)">修改</el-button>
+                            <el-button v-if="!isReadonly && !isModifyonly" type="text"
+                                @click="showSubModel(scope.row)">评价</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </TableComponent>
+        </FormComponent>
+        <FormComponent :options="subBasicRiskOptions" labelWidth="110px" labelAlign="right" :data.sync="updateParams"
+            :isReadonly="isReadonly" @actionCallback="callback" @change="changes"
+            :actions="isReadonly? []:updateActions" :full-btn="true" btnPosition="center">
+        </FormComponent>
+
+    </el-dialog>
+    <!-- 评估矩阵 -->
+    <el-dialog :close-on-click-modal="false" :visible.sync="showMatrixModal" :title="'区域风险等级判定准则'">
+        <img style="width:100%" src="../../../../assets/images/5.png" alt="">
+    </el-dialog>
+    <!-- 危害分析评价 -->
+    <el-dialog :close-on-click-modal="false" :visible.sync="showSubUpdate" width="880px"
+        :before-close="handleAnalyClose">
+        <div class="sub-title">基本信息</div>
+        <FormComponent :options="subBasicOptions" labelWidth="110px" labelAlign="right"
+            :data.sync="analysisUpdateParams" @actionCallback="callback" :isReadonly="analyIsReadonly">
+        </FormComponent>
+        <div class="sub-title">风险评估</div>
+        <FormComponent :options="subRiskOptions" labelWidth="110px" labelAlign="right" :data.sync="analysisUpdateParams"
+            @actionCallback="callback" @change="handleRiskChange" :isReadonly="analyIsReadonly">
+        </FormComponent>
+        <div class="sub-title">管控措施</div>
+        <FormComponent labelWidth="110px" labelAlign="right" :data.sync="analysisUpdateParams"
+            @actionCallback="measureCallback" :isReadonly="analyIsReadonly">
+            <TableComponent :tableData="currentMeasureData.datas" :tableColumn="triTableColumn"
+                @actionCallback="measureCallback($event)" :actions="analyIsReadonly ? []:triTableActions"
+                actionPosition="flex-start" :showFooter="false" style="margin-bottom: 20px;">
+                <el-table ref="multipleTable" :data="currentMeasureData.datas" tooltip-effect="dark" height="250" border
+                    row-key="checked" @selection-change="handleSelectionChange" style="width: 100%">
+                    <el-table-column type="selection" label="全选" width="40">
+                    </el-table-column>
+                    <template v-for="item in triTableColumn">
+                        <el-table-column v-if="item.render" :show-overflow-tooltip="item.showTip" :label="item.name"
+                            :width="item.width" :key="item.key">
+                            <div slot-scope="scope" v-html="item.render(scope.row)"></div>
+                        </el-table-column>
+                        <el-table-column v-else :prop="item.key" :show-overflow-tooltip="item.showTip"
+                            :label="item.name" :width="item.width" :key="item.key">
+                        </el-table-column>
+                    </template>
+                    <el-table-column label="操作" width="150">
+                        <template slot-scope="scope">
+                            <el-button type="text" @click="showMeasureModel(scope.row,true)">查看</el-button>
+                            <el-button type="text" @click="showMeasureModel(scope.row)">编辑</el-button>
+                            <el-button type="text" @click="deleteMeasure(scope.row)">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
 
             </TableComponent>
         </FormComponent>
-
-
+        <div class="sub-title">残余风险评估</div>
+        <FormComponent :options="subRemnantsOptions" labelWidth="110px" labelAlign="right"
+            :data.sync="analysisUpdateParams" @actionCallback="analyCallback" :actions="analyIsReadonly ? []:triActions"
+            :full-btn="true" btnPosition="center" @change="handleSubRiskChange" :isReadonly="analyIsReadonly">
+        </FormComponent>
     </el-dialog>
+    <!-- 风险评估方法 -->
+    <el-dialog :close-on-click-modal="false" :visible.sync="showRiskUpdate" width="800px" :before-close="handleClose">
+        <FormComponent :options="riskType === 'ls'? riskLSUpdateOptions:riskLECUpdateOptions " labelWidth="110px"
+            labelAlign="right" :data.sync="methodUpdateParams" @actionCallback="methodCallback" :actions="triActions"
+            :full-btn="true" btnPosition="center">
+        </FormComponent>
+        <div v-if="riskType === 'ls'">
+            <img style="width:90%" src="../../../../assets/images/3.png" alt="">
+            <img style="width:80%" src="../../../../assets/images/2.png" alt="">
+        </div>
+        <div v-if="riskType === 'lec'">
+            <img style="width:100%" src="../../../../assets/images/6.png" alt="">
+        </div>
+    </el-dialog>
+    <!-- 风险评估取值 -->
+    <div v-if="showRiskValueUpdate">
+        <el-dialog :close-on-click-modal="false" :title="riskTitle" :visible.sync="showRiskValueUpdate" width="750px"
+            :before-close="handleClose" :show-close="false">
+            <TableComponent :tableData="riskTableData" :tableColumn="riskTableColumn" @tabCallback="popCallback($event)"
+                actionPosition="flex-start" :showFooter="false" style="margin-bottom: 20px;"
+                :data.sync="methodUpdateParams">
+                <el-table ref="singleTable" :data="riskTableData" tooltip-effect="dark" border row-key="checked"
+                    highlight-current-row @current-change="handleCurrentChange" style="width: 100%">
+                    <template v-for="item in riskTableColumn">
+                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key">
+                            <div slot-scope="scope" style="pointer-events: none;" @click="addVal($event,scope.row)"
+                                v-html="item.render(scope.row)"></div>
+                        </el-table-column>
+                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key">
+                        </el-table-column>
+                    </template>
+                </el-table>
+            </TableComponent>
+            <ButtonListComponent :actions="triActions" @callback="popCallback" btn-position="center" :full-btn="true">
+            </ButtonListComponent>
+        </el-dialog>
+    </div>
 
-    <!-- <el-dialog :close-on-click-modal="false" :title="currentId>0?'详情':currentId===-1?'新增':'编辑'"
-        :visible.sync="showUpdate" width="952px" :before-close="handleClose">
-        <FormComponent :options="updateOptions" :isReadonly="true" labelWidth="110px" labelAlign="right"
-            :data.sync="updateParams"></FormComponent>
-    </el-dialog> -->
+    <!--管控措施-->
+    <el-dialog :close-on-click-modal="false" :title="'管控措施制定'" :visible.sync="showTriUpdate" width="750px"
+        :before-close="handleMeasureClose">
+        <FormComponent :options="triUpdateOptions" labelWidth="110px" labelAlign="right"
+            :data.sync="measureUpdataParams" :isReadonly="measureIsReadonly" :actions="subActions"
+            @actionCallback="measureCallback($event)" :full-btn="true" btnPosition="center" @change="measureChange">
+            <div class="sub-title">排查任务制定</div>
+            <TableComponent :tableData="currentTaskData.datas" :tableColumn="taskTableColumn"
+                @actionCallback="measureCallback($event)" :actions="!measureIsReadonly?fourTableActions:[]"
+                actionPosition="flex-start" :showFooter="false" style="margin-bottom: 20px;">
+                <el-table ref="multipleTable" :data="currentTaskData.datas" tooltip-effect="dark" height="250" border
+                    row-key="checked" @selection-change="handleSelectionChange" style="width: 100%">
+                    <template v-for="item in taskTableColumn">
+                        <el-table-column v-if="item.render" :show-overflow-tooltip="item.showTip" :label="item.name"
+                            :width="item.width" :key="item.key">
+                            <div slot-scope="scope" v-html="item.render(scope.row)"></div>
+                        </el-table-column>
+                        <el-table-column v-else :prop="item.key" :show-overflow-tooltip="item.showTip"
+                            :label="item.name" :width="item.width" :key="item.key">
+                        </el-table-column>
+                    </template>
+                    <el-table-column label="操作" width="150">
+                        <template slot-scope="scope">
+                            <el-button type="text" @click="showTaskModel(scope.row,true)">查看</el-button>
+                            <el-button :v-if="!measureIsReadonly" type="text"
+                                @click="showTaskModel(scope.row)">编辑</el-button>
+                            <el-button :v-if="!measureIsReadonly" type="text"
+                                @click="deleteTask(scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+            </TableComponent>
+        </FormComponent>
+    </el-dialog>
+    <!-- 排查任务 -->
+    <el-dialog :close-on-click-modal="false" :title="taskCurrentId === -1 ? '新增':taskIsReadonly?'详情':'编辑'"
+        :visible.sync="showFourUpdate" width="700px" :before-close="handleCloseTask">
+        <FormComponent :options="taskUpdateOptions" :isReadonly="taskIsReadonly" labelWidth="110px" labelAlign="right"
+            :data.sync="taskUpdataParams" :actions="subActions" :full-btn="true" btnPosition="center"
+            @actionCallback="taskCallback" @change="taskSelectChange">
+        </FormComponent>
+    </el-dialog>
 </div>
\ 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 0b251e4..b8b0cd0 100644
--- a/src/views/risk/assessment/work/workAnal.component.vue
+++ b/src/views/risk/assessment/work/workAnal.component.vue
@@ -1,6 +1,6 @@
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
+import { Component, Watch } from 'vue-property-decorator';
 import template from "./workAnal.component.html"
 import BaseRecordComponent from "hbt-common/components/common/baseRecord.component.vue"
 import FormComponent from "hbt-common/components/common/form.component.vue"
@@ -9,56 +9,181 @@ import FormOption from "hbt-common/models/formOptions"
 import BtnOption from "hbt-common/models/btnOptions"
 import DrawComponent from '@/components/draw.component.vue';
 import UnitTreeComponent from '@/components/tree.component.vue';
+import WorkService from '@/service/work.service';
+import UnitService from '@/service/unit.service';
+import AreaService from '@/service/area.service';
+import SystemService from "hbt-common/service/system.service"
 import JobHazardService from '@/service/jobHazard.service';
+import ButtonListComponent from "hbt-common/components/common/buttonList.component.vue";
+import { L_COLUMN, L_VALUE, S_COLUMN, S_VALUE } from '@/mock/lsRisk';
+import { L_LECCOLUMN, L_LECVALUE, E_COLUMN, E_VALUE, C_COLUMN, C_VALUE } from '@/mock/lecRisk';
 @Component({
     template,
-    components:{
+    components: {
         FormComponent,
         TableComponent,
         DrawComponent,
-        UnitTreeComponent
+        UnitTreeComponent,
+        ButtonListComponent,
     },
 })
 export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
     public tableService = new JobHazardService();
+    public unitService = new UnitService();
+    public areaService = new AreaService();
+    public workService = new WorkService();
+    public systemService = new SystemService();
 
     public params = {} as any;
 
     public subTableColumn = [] as any;
+    public currentId = -1;
+
+    public currentStepTableData = {
+        datas: []
+    } as any;
+    public sourceMap = {} as any;
+    public majorsignMap = {} as any;
+    public safetySignMap = {} as any;
+    public seriousResultMap = {} as any;
+    public riskControlLevelMap = {} as any;
+
+    public dictData = {
+        source: [],
+        craft: [],
+        chemical: [],
+        mainPerson: [],
+        craftPerson: [],
+        operatePerson: [],
+        measuresSort: [],
+        riskControlLevel: [],
+        seriousResult: [],
+        identifier: [],
+        majorsign: [],
+    } as any;//数据字典
+
+    public showUpdate = false;
+    public showMatrixModal = false;
+    public showSubUpdate = false;
+    public showTriUpdate = false;
+    public showFourUpdate = false;
+    public showRiskUpdate = false;//风险评估方法
+    public checkRiskType = {
+        risk: [],
+        remain: [],
+        type: null,
+    } as any;//评估方法
+    public riskType = 'ls';
+    public showRiskValueUpdate = false;
+    public showRiskValueModal: any = 'lslvalue';
+    public riskTitle: any = '选择L值';
+    public riskTableData = [] as any;
+    public riskTableColumn = [] as any
+
+    public taskTableColumn = [] as any;
+
+
+    public selectData = [];
+    public currentRow = {} as any;
+
+
+    public currentAnalysData = {
+        datas: []
+    } as any;//分析评价row
+    public currentMeasureData = {
+        datas: [],
+        deleteIds: [],
+    } as any;//实施措施
+    public measureIsReadonly = false;
+    public currentTaskData = { datas: [], deleteIds: [] } as any;//任务排查
+    public taskIsReadonly = false;//任务
+
+
+    public updateParams = {
+        majorSign: [],
+        steps: [],
+    } as any;
+    public analyIsReadonly = false;
+    public analysisUpdateParams = {
+        riskChoose: [],
+        remainChoose: [],
+        remainLevel: null,
+        riskLevel: null,
+        datas: []
+
+    } as any;//危害分析评价
+
+    public methodUpdateParams = {
+        lslvalue: null,
+        lssvalue: null,
+        lsgrade: null,
+        leclvalue: null,
+        lecevalue: null,
+        leccvalue: null,
+        lecgrade: null,
+
+    } as any;//评估方法
+    //管控措施
+    public measureUpdataParams = {} as any;
+    public measureCurrentId = -1;
+    //排查任务
+    public taskUpdataParams = {} as any;
+    public taskCurrentId = -1;
+
+    public riskParams = {} as any;
+
+    public triTableColumn = [] as any;
 
     public formActions = [{
-        name:"查询",
-        value:"search",
-        icon:"el-icon-search",
-        type:"primary"
-    },{
-        name:"清空",
-        icon:"el-icon-tickets",
-        value:"reset"
+        name: "查询",
+        value: "search",
+        icon: "el-icon-search",
+        type: "primary"
+    }, {
+        name: "清空",
+        icon: "el-icon-tickets",
+        value: "reset"
     }];
     public tableActions = [{
-        name:"添加",
-        value:"add",
-        icon:"el-icon-plus",
-        type:"primary"
-    },{
-        name:"批量删除",
-        value:"delete",
-        plain:true,
-        icon:"el-icon-delete",
-        type:"danger"
+        name: "添加",
+        value: "add",
+        icon: "el-icon-plus",
+        type: "primary"
+    }, {
+        name: "批量删除",
+        value: "delete",
+        plain: true,
+        icon: "el-icon-delete",
+        type: "danger"
     }];
     public footerActions = [{
-        name:"选择全部",
-        value:"selectAll",
-        type:"primary"
-    },{
-        name:"反向选择",
-        value:"reverse"
+        name: "选择全部",
+        value: "selectAll",
+        type: "primary"
+    }, {
+        name: "反向选择",
+        value: "reverse"
     }];
     public updateActions = [{
         name: "取消",
         value: "cancel"
+    }, {
+        name: '存草稿',
+        value: 'addDraft',
+        type: "primay"
+    }, {
+        name: "保存并继续添加",
+        value: "saveAndContinue",
+        type: "primary"
+    }, {
+        name: "保存",
+        value: "save",
+        type: "primary"
+    }];
+    public subTableActions: BtnOption[] = [];
+    public subActions = [{
+        name: "取消",
+        value: "cancel"
     }, {
         name: "保存并继续添加",
         value: "saveAndContinue",
@@ -68,236 +193,1706 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         value: "save",
         type: "primary"
     }];
-    public formOptions:FormOption<BtnOption>[] = [{
-        name:"区域名称",
-        key:"areaId",
-        type:"text",
-    },{
-        name:"单元名称",
-        key:"unitId",
-        type:"text",
-    },{
-        name:"作业活动",
-        key:"unitId",
-        type:"text",
+    public triActions = [{
+        name: "取消",
+        value: "cancel"
+    }, {
+        name: "保存",
+        value: "save",
+        type: "primary"
     }];
-    public updateOptions:FormOption<BtnOption>[]=[{
-        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
+    public triTableActions = [{
+        name: "添加",
+        value: "triSubAdd",
+        icon: "el-icon-plus",
+        type: "primary"
+    }];
+    public fourTableActions = [{
+        name: "添加",
+        value: "fourSubAdd",
+        icon: "el-icon-plus",
+        type: "primary"
+    }];
+    public formOptions: FormOption<BtnOption>[] = [{
+        name: "区域名称",
+        key: "areaId",
+        type: "text",
+    }, {
+        name: "单元名称",
+        key: "unitId",
+        type: "text",
+    }, {
+        name: "作业活动",
+        key: "unitId",
+        type: "text",
+    }];
+
+    public areaList = [];//区域
+    public unitList = [];//单元
+    public jobList = [];//作业活动清单
+    public taskType = [] as any;//排查任务类型
+    public taskItem = [] as any;//包报对应像
+
+    public isReadonly = false;
+    public isModifyonly = false;
+
+    public updateOptions: FormOption<BtnOption>[] = [];
+    public subUpdateOptions: FormOption<BtnOption>[] = [];
+    public subBasicRiskOptions: FormOption<BtnOption>[] = [];
+    @Watch("$store.state.deptList", { immediate: true, deep: true })
+    onChanges() {
+        this.loadAreaData()
+    }
+
+
+    public buildUpdateForm() {
+
+        this.updateOptions = [{
+            name: "区域名称",
+            key: "areaId",
+            format: "areaName",
+            type: "select",
+            require: true,
+            width: "calc(50% - 20px)",
+            showError: false,
+            datas: this.areaList
+        }, {
+            name: "单元名称",
+            key: "unitId",
+            format: "unitName",
+            type: "select",
+            require: true,
+            width: "calc(50% - 20px)",
+            showError: false,
+            datas: this.unitList
+        }, {
+            name: "责任部门",
+            key: "chargeDeptName",
+            type: "text",
+            require: true,
+            width: "calc(50% - 20px)",
+            disable: true,
+        }, {
+            name: "责任人",
+            key: "chargeUserName",
+            type: "text",
+            require: true,
+            width: "calc(50% - 20px)",
+            showError: false,
+            disable: true,
+        }, {
+            name: "作业名称",
+            key: "jobInventoryId",
+            format: 'jobInventoryName',
+            type: "select",
+            require: true,
+            width: "calc(50% - 20px)",
+            showError: false,
+            datas: this.jobList,
+        }, {
+            name: "作业地点",
+            key: "location",
+            type: "text",
+            require: true,
+            width: "calc(50% - 20px)",
+            disable: true,
+        }, {
+            name: "涉及岗位",
+            key: "postName",
+            type: "text",
+            width: "calc(100% - 20px)",
+            require: true,
+            disable: true,
+        }, {
+            name: "评价人",
+            key: "evaluateUserId",
+            format: "identifyUserName",
+            require: true,
+            width: "calc(50% - 20px)",
+            type: "select",
+            showError: false,
+            datas: this.$store.state.userList
+        }, {
+            name: "评价时间",
+            key: "evaluateTime",
+            type: "date",
+            subType: "date",
+            width: "calc(50% - 20px)",
+            require: true,
+            showError: false,
+            format: "yyyy-MM-dd"
+        }, {
+            name: "是否为两大一重",
+            key: "majorSign",
+            format: "majorSignName",
+            type: "checkbox",
+            width: "calc(100% - 20px)",
+            require: true,
+            datas: [{
+                name: "不涉及",
+                disable: false,
+                value: 0
+            }, {
+                name: "重大危险源",
+                disable: this.updateParams.majorSign.includes(0),
+                value: 1
+            }, {
+                name: "重大监管化工工艺",
+                disable: this.updateParams.majorSign.includes(0),
+                value: 2
+            }, {
+                name: "重点监管危化品",
+                disable: this.updateParams.majorSign.includes(0),
+                value: 3
+            }],
+        }, {
+            name: "重大危险源",
+            key: "majorHazard",
+            hide: !this.updateParams.majorSign.includes(1) || this.updateParams.majorSign.includes(0),
+            type: "select",
+            format: "majorHazardName",
+            width: "calc(50% - 20px)",
+            require: true,
+            multiple: true,
+            datas: this.dictData.source
+
+        }, {
+            name: "重点监管工艺",
+            key: "regulatoryProcess",
+            hide: !this.updateParams.majorSign.includes(2) || this.updateParams.majorSign.includes(0),
+            type: "select",
+            width: "calc(50% - 20px)",
+            require: true,
+            multiple: true,
+            datas: this.dictData.craft,
+        }, {
+            name: "重点监管化学品",
+            key: "regulatoryChemical",
+            hide: !this.updateParams.majorSign.includes(3) || this.updateParams.majorSign.includes(0),
+            type: "select",
+            width: "calc(50% - 20px)",
+            require: true,
+            multiple: true,
+            datas: this.dictData.chemical,
+        }];
+
+        this.subTableActions = [{
+            name: "批量删除",
+            value: "subDelete",
+            plain: true,
+            icon: "el-icon-delete",
+            type: "danger"
+        }, {
+            name: "评估矩阵",
+            value: "estimateMatrix",
+            type: "primary"
+        }];
+        this.subUpdateOptions = [{
+            name: "区域名称",
+            key: "areaId",
+            type: "select",
+            require: true,
+            width: "calc(50% - 20px)",
+        }, {
+            name: "作业步骤描述",
+            key: "description",
+            type: "textarea",
+            width: "100%",
+            require: true,
+            showError: false,
+        }, {
+            name: "作业地点",
+            key: "location",
+            type: "text",
+            width: "100%",
+            require: true,
+            showError: false,
+        }, {
+            name: "责任人",
+            key: "chargeUserId",
+            type: "select",
+            width: "100%",
+            require: true,
+            showError: false,
+            datas: this.$store.state.userList
+        }, {
+            name: "作业人",
+            key: "workerId",
+            type: "select",
+            width: "100%",
+            require: true,
+            showError: false,
+            datas: this.$store.state.userList
+        }];
+        this.subBasicRiskOptions = [{
+            name: "风险等级",
+            key: "riskLevel",
+            format: 'riskLevelName',
+            type: "select",
+            require: true,
+            width: "calc(50% - 20px)",
+            disable: true,
+            datas: this.$store.state.prevention_risk_level
+        }, {
+            name: "残余风险等级",
+            key: "remainRiskLevel",
+            format: "remainRiskLevelName",
+            type: "select",
+            require: true,
+            width: "calc(50% - 20px)",
+            disable: true,
+            datas: this.$store.state.prevention_risk_level
         }]
-    },{
-        name:"重大危险源",
-        key:"isDangrous",
-        type:"select",
-        width:"calc(50% - 20px)",
-        require:true,
-       
-    },{
-        name:"重点监管工艺",
-        key: "technology",
-        type: "select",
-        width: "calc(50% - 20px)",
+    }
+
+    //基本信息
+    public subBasicOptions: FormOption<BtnOption>[] = [];
+    public subBasicForm() {
+        this.subBasicOptions = [{
+            name: "步骤名称",
+            key: "name",
+            type: "text",
+            require: true,
+            width: "calc(50% - 20px)",
+            disable: true,
+        }, {
+            name: "作业地点",
+            key: "location",
+            type: "text",
+            require: true,
+            width: "calc(50% - 20px)",
+            disable: true,
+        },
+        {
+            name: "责任人",
+            key: "chargeUserName",
+            type: "text",
+            require: true,
+            width: "calc(50% - 20px)",
+            disable: true,
+        },
+        {
+            name: "作业人",
+            key: "workerName",
+            type: "text",
+            require: true,
+            width: "calc(50% - 20px)",
+            disable: true,
+        },
+        {
+            name: "作业步骤描述",
+            key: "description",
+            type: "text",
+            require: true,
+            width: "calc(100% - 20px)",
+            disable: true,
+        },
+        {
+            name: "危害分析",
+            key: "hazardAnalysis",
+            type: "text",
+            require: true,
+            width: "calc(100% - 20px)"
+        },
+        {
+            name: "风险源",
+            key: "riskSource",
+            type: "text",
+            require: true,
+            width: "calc(50% - 20px)"
+        },
+        {
+            name: "最严重后果",
+            key: "seriousResult",
+            format: "seriousResultName",
+            type: "select",
+            require: true,
+            multiple: true,
+            width: "calc(50% - 20px)",
+            datas: this.dictData.seriousResult
+        },
+        {
+            name: "安全警示标识",
+            key: "safetySign",
+            format: "safetySignName",
+            type: "select",
+            require: true,
+            multiple: true,
+            width: "calc(50% - 20px)",
+            datas: this.dictData.identifier
+        },
+        {
+            name: "设置复评时间",
+            key: "reviewStartTime",
+            type: "date",
+            subType: "date",
+            width: "calc(50% - 20px)",
+            require: true,
+            showError: false,
+            format: "yyyy-MM-dd"
+        },
+        {
+            name: "设置复评周期(月)",
+            key: "reviewCycleUnit",
+            type: "text",
+            require: true,
+            width: "calc(50% - 20px)"
+        },
+        ];
+    }
+
+    //风险评估
+    public subRiskOptions: FormOption<BtnOption>[] = [];
+    public riskUpdateForm() {
+        this.subRiskOptions = [{
+            name: "选择评估方法",
+            key: "riskChoose",
+            type: "checkbox",
+            width: "calc(50% - 20px)",
+            require: true,
+            datas: [{
+                name: "LS法",
+                value: 'LS',
+                disable: false,
+            }, {
+                name: "LEC法",
+                value: 'LEC',
+                disable: false,
+            }]
+        }, {
+            name: "风险等级",
+            key: "riskLevel",
+            format: "riskLevelName",
+            type: "select",
+            require: true,
+            width: "calc(50% - 20px)",
+            disable: true,
+            datas: this.$store.state.prevention_risk_level
+        }, {
+            name: "管控层级",
+            key: "riskControlLevel",
+            format: "riskControlLevelName",
+            type: "select",
+            require: true,
+            width: "calc(50% - 20px)",
+            datas: this.dictData.riskControlLevel,
+        }];
+    }
+
+    //残余风险评估
+    public subRemnantsOptions: FormOption<BtnOption>[] = [];
+    public remainUpdateForm() {
+        this.subRemnantsOptions = [{
+            name: "选择评估方法",
+            key: "remainChoose",
+            type: "checkbox",
+            width: "calc(50% - 20px)",
+            require: true,
+            datas: [{
+                name: "LS法",
+                value: 'LS'
+            }, {
+                name: "LEC法",
+                value: 'LEC'
+            }]
+        }, {
+            name: "风险等级",
+            key: "remainLevel",
+            format: "remainLevelName",
+            type: "select",
+            require: true,
+            width: "calc(50% - 20px)",
+            disable: true,
+            datas: this.$store.state.prevention_risk_level
+        }];
+    }
+
+    //LS
+    public riskLSUpdateOptions: FormOption<BtnOption>[] = [{
+        name: "L取值",
+        key: "lslvalue",
+        type: "text",
         require: true,
-    },{
-        name:"重点监管化学品",
-        key: "chemical",
-        type: "select",
         width: "calc(50% - 20px)",
+        disable: true,
+        unit: {
+            type: "btn",
+            name: "选择",
+            value: "lslvalue",
+            btnType: "primary",
+            width: "100%",
+        },
+    }, {
+        name: "S取值",
+        key: "lssvalue",
+        type: "text",
         require: true,
+        width: "calc(50% - 20px)",
+        disable: true,
+        unit: {
+            type: "btn",
+            name: "选择",
+            value: "lssvalue",
+            btnType: "primary",
+            width: "100%",
+        },
+    }, {
+        name: "R值",
+        key: "lsrvalue",
+        type: "text",
+        require: true,
+        width: "calc(50% - 20px)",
+        disable: true,
+    }, {
+        name: "风险等级",
+        key: "lsgrade",
+        type: "select",
+        require: true,
+        width: "calc(50% - 20px)",
+        disable: true,
+        datas: this.$store.state.prevention_risk_level
+    },];
+    //LEC
+    public riskLECUpdateOptions: FormOption<BtnOption>[] = [{
+        name: "L取值",
+        key: "leclvalue",
+        type: "text",
+        require: true,
+        width: "calc(50% - 20px)",
+        disable: true,
+        unit: {
+            type: "btn",
+            name: "选择",
+            value: "leclvalue",
+            btnType: "primary",
+            width: "100%",
+        },
+    }, {
+        name: "E取值",
+        key: "lecevalue",
+        type: "text",
+        require: true,
+        width: "calc(50% - 20px)",
+        disable: true,
+        unit: {
+            type: "btn",
+            name: "选择",
+            value: "lecevalue",
+            btnType: "primary",
+            width: "100%",
+        },
+    }, {
+        name: "C取值",
+        key: "leccvalue",
+        type: "text",
+        require: true,
+        width: "calc(50% - 20px)",
+        disable: true,
+        unit: {
+            type: "btn",
+            name: "选择",
+            value: "leccvalue",
+            btnType: "primary",
+            width: "100%",
+        },
+    }, {
+        name: "D值",
+        key: "lecdvalue",
+        type: "text",
+        require: true,
+        width: "calc(50% - 20px)",
+        disable: true,
+    }, {
+        name: "风险等级",
+        key: "lecgrade",
+        type: "select",
+        require: true,
+        width: "calc(50% - 20px)",
+        disable: true,
+        datas: this.$store.state.prevention_risk_level
+    },];
+    //管控措施
+    public measuresSelectData = {} as any;
+    public secondTypeItem = [];
+    public triUpdateOptions: FormOption<BtnOption>[] = [];
+    public controlWayData = [{
+        name: "自动化监控",
+        value: 1
+    }, {
+        name: "隐患排查",
+        value: 2
     }];
+    public measuresUpdateForm() {
+        this.triUpdateOptions = [{
+            name: "管控方式",
+            key: "controlWay",
+            format: "controlWayName",
+            type: "select",
+            width: "100%",
+            require: true,
+            datas: this.controlWayData
+        }, {
+            name: "管控措施分类",
+            key: "firstType",
+            format: "firstTypeName",
+            type: "treeSelect",
+            require: true,
+            expandLevel: Infinity,
+            showError: false,
+            width: "40%",
+            datas: this.dictData.measuresSort
+        }, {
+            key: "secondType",
+            type: "treeSelect",
+            format: "secondTypeName",
+            require: true,
+            expandLevel: Infinity,
+            showError: false,
+            width: "25%",
+            datas: this.secondTypeItem
+        }, {
+            key: "thirdType",
+            type: "text",
+            require: true,
+            width: "25%",
+        }, {
 
-    public showUpdate = false;
-    public showSubUpdate = false;
-    public updateParams = {}  as any;
-    public selectData = [];
+            name: "措施描述",
+            key: "description",
+            type: "text",
+            require: true,
+            width: "100%"
+        }];
+    }
 
-    created(){
-        console.log()
+    //排查任务制定
+    public taskUpdateOptions: FormOption<BtnOption>[] = [];
+    public reviewCycleUnit = [{
+        name: '年',
+        value: 1,
+
+    }, {
+        name: '半年',
+        value: 2,
+
+    }, {
+        name: '季',
+        value: 3,
+
+    }, {
+        name: '月',
+        value: 4,
+
+    }, {
+        name: '周',
+        value: 5,
+
+    }, {
+        name: '日',
+        value: 6,
+
+    }, {
+        name: '小时',
+        value: 7,
+
+    },] as any;
+    public taskUpdateForm() {
+        this.taskUpdateOptions = [{
+            name: "是否为重大危险源包保责任履职",
+            key: "insuranceDutyFlag",
+            format: "insuranceDutyFlagName",
+            type: "radio",
+            width: "100%",
+            labelWidth: 'auto',
+            require: true,
+            datas: [
+                {
+                    name: "否",
+                    value: 0
+                },
+                {
+                    name: "是",
+                    value: 1
+                }
+            ]
+        }, {
+            name: "任务类型",
+            key: "taskType",
+            format: "taskTypeName",
+            type: "select",
+            width: "calc(50% - 20px)",
+            require: true,
+            datas: this.taskType,
+            disable: !(this.taskUpdataParams.insuranceDutyFlag === 1),
+        }, {
+            name: "包保任务对应项",
+            key: "taskItem",
+            format: "taskItemName",
+            type: "select",
+            width: "calc(50% - 20px)",
+            require: true,
+            hide: !(this.taskUpdataParams.insuranceDutyFlag === 1),
+            datas: this.taskItem
+        }, {
+            name: "隐患排查任务",
+            key: "name",
+            type: "text",
+            width: "100%",
+            require: true,
+        }, {
+            name: "执行岗位",
+            key: "executePostCode",
+            format: "executePostName",
+            type: "select",
+            width: "calc(50% - 20px)",
+            require: true,
+            datas: this.$store.state.postList
+        },
+        {
+            name: "责任人",
+            key: "chargeUserId",
+            format: "chargeUserName",
+            type: "select",
+            width: "calc(50% - 20px)",
+            require: true,
+            datas: this.$store.state.userList,
+        }, {
+            name: "排查周期",
+            key: "reviewCycleValue",
+            type: "text",
+            width: "calc(50% - 20px)",
+            require: true,
+        }, {
+            key: "reviewCycleUnit",
+            type: "select",
+            require: true,
+            datas: this.reviewCycleUnit,
+        }, {
+            name: "工作开始时间",
+            key: "startTime",
+            type: "time",
+            width: "calc(50% - 20px)",
+            require: true,
+            hide: !(this.taskUpdataParams.reviewCycleUnit === 7),
+        }, {
+            name: "工作结束时间",
+            key: "endTime",
+            type: "time",
+            width: "calc(50% - 20px)",
+            require: true,
+            hide: !(this.taskUpdataParams.reviewCycleUnit === 7),
+        }]
+    }
+
+
+    created() {
+        Promise.all([
+            this.systemService.getDictData("prevention_risk_source"),
+            this.systemService.getDictData("prevention_risk_craft"),
+            this.systemService.getDictData("prevention_risk_chemical"),
+            this.systemService.getDictData("prevention_task_main_person"),
+            this.systemService.getDictData("prevention_task_craft_person"),
+            this.systemService.getDictData("prevention_task_operate_person"),
+            this.systemService.getDictData("prevention_measures_sort"),
+            this.systemService.getDictData("prevention_control_level"),
+            this.systemService.getDictData("prevention_serious_result"),
+            this.systemService.getDictData("prevention_security_identifier"),
+            this.systemService.getDictData("prevention_majorsign"),
+        ]).then(((results: any) => {
+            this.dictData.source = results[0].data.map((item) => {
+                this.sourceMap[item.dictValue] = item.dictLabel;
+                return {
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
+                }
+            })
+            this.dictData.craft = results[1].data.map((item) => {
+                return {
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
+                }
+            })
+            this.dictData.chemical = results[2].data.map((item) => {
+                return {
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
+                }
+            })
+            this.dictData.mainPerson = results[3].data.map((item) => {
+                return {
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
+                }
+            })
+            this.dictData.craftPerson = results[4].data.map((item) => {
+                return {
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
+                }
+            })
+            this.dictData.operatePerson = results[5].data.map((item) => {
+                return {
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
+                }
+            })
+            this.dictData.measuresSort = results[6].data.map((item) => {
+                this.measuresSelectData[item.dictValue] = this.treeSelectData(item.children)
+                return {
+                    label: item.dictLabel,
+                    id: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue,
+                }
+            })
+            this.dictData.riskControlLevel = results[7].data.map((item) => {
+                this.riskControlLevelMap[item.dictValue] = item.dictLabel;
+                return {
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
+                }
+            })
+            this.dictData.seriousResult = results[8].data.map((item) => {
+                this.seriousResultMap[item.dictValue] = item.dictLabel;
+                return {
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
+                }
+            })
+            this.dictData.identifier = results[9].data.map((item) => {
+                this.safetySignMap[item.dictValue] = item.dictLabel;
+                return {
+                    name: item.dictLabel,
+                    value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
+                }
+            })
+
+            this.buildUpdateForm()
+            this.riskUpdateForm()
+            this.remainUpdateForm()
+            this.measuresUpdateForm()
+            this.subBasicForm()
+        }));
+
+    }
+    public treeSelectData(data) {
+        return data.map((item) => {
+            return {
+                label: item.dictLabel,
+                id: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue,
+            }
+        })
+
+    }
+    // 加载区域列表
+    public loadAreaData() {
+        this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => {
+            this.areaList = res.data.datas.map(item => {
+                return {
+                    name: item.name,
+                    value: item.id,
+                    analRiskLevel: item.analRiskLevel ? item.analRiskLevel : 0,
+                }
+            });
+            this.buildUpdateForm()
+        })
+    }
+    // 加载单元列表
+    public loadUnitData(id?) {
+        this.unitService.selectByPage({ pageSize: 1000, areaId: id }, false).then((res: any) => {
+            this.unitList = res.data.datas.map(item => {
+                return {
+                    name: item.name,
+                    value: item.id,
+                    deptId: item.chargeDeptId,
+                    userId: item.chargeUserId,
+                    deptName: item.chargeDeptName,
+                    userName: item.chargeUserName,
+                }
+            });
+            this.buildUpdateForm();
+        })
+    }
+    //加载作业清单列表
+    public loadJobData(id?) {
+        this.workService.selectByPage({ pageSize: 1000, unitId: id }).then((res: any) => {
+            this.jobList = res.data.datas.map(item => {
+                return {
+                    name: item.name,
+                    value: item.id,
+                    location: item.location,
+                    postCode: item.postCode,
+                    postName: item.postName,
+                    steps: item.steps,
+                    stepNum: item.stepNum
+                }
+            });
+            this.buildUpdateForm()
+        })
     }
     // 树点击
-    public handleNodeClick(data){
+    public handleNodeClick(data) {
         console.log(data)
+        this.params.unitName="";
+        this.params.areaName="";
+        if(data.areaId){
+            this.params.unitName = data.name
+        }else{
+            this.params.areaName = data.name
+        }
+        this.getTableData()
     }
 
-    public buildTable(){
-        this.tableColumn.push({name:'序号',key:"index"});
-        this.tableColumn.push({name:'区域名称',key:"deptName",width:"200px"});
-        this.tableColumn.push({name:'风险分析单元',key:"deptName",width:"200px"});
-        this.tableColumn.push({name:'作业活动',key:"person"});
-        this.tableColumn.push({name:'作业步骤',key:"person"});
-        this.tableColumn.push({name:'责任部门',key:"person"});
-        this.tableColumn.push({name:'责任人',key:"person"});
-        this.tableColumn.push({name:'作业地点',key:"person"});
-        this.tableColumn.push({name:'风险等级',key:"status",render:(data)=>{
-            if(data.status==0){
-                return "<span class='noDraw'>未绘制</span>"
-            }else{
-                return "<span>已绘制</span>"
-            }
-        }});
-        this.tableColumn.push({name:'残余风险等级',key:"status",render:(data)=>{
-            if(data.status==0){
-                return "<span class='noDraw'>未绘制</span>"
-            }else{
-                return "<span>已绘制</span>"
-            }
-        }});
+    public buildTable() {
+        this.tableColumn.push({ name: '区域名称', key: "areaName", width: "200px" });
+        this.tableColumn.push({ name: '风险分析单元', key: "unitName", width: "200px" });
+        this.tableColumn.push({
+            name: '作业活动', key: "jobInventoryName", render: (data) => {
+                console.log('data', data);
 
-        
-        this.subTableColumn.push({ name: '序号', key: "person" });
-        this.subTableColumn.push({ name: '步骤名称', key: "person" });
-        this.subTableColumn.push({ name: '作业步骤描述', key: "person", showTip: true, width:"200px"});
+                if (data.status === 0) {
+                    return data.jobInventoryName + '（存草稿）'
+                } else {
+                    return data.jobInventoryName
+                }
+            }
+        });
+        this.tableColumn.push({ name: '作业步骤', key: "stepNum" });
+        this.tableColumn.push({ name: '责任部门', key: "chargeDeptName" });
+        this.tableColumn.push({ name: '责任人', key: "chargeUserName" });
+        this.tableColumn.push({ name: '作业地点', key: "location" });
+        this.tableColumn.push({
+            name: '风险等级', key: "riskLevel", render: (data) => {
+                if (data.riskLevel) {
+                    return this.$store.getters.prevention_risk_level_map[data.riskLevel]
+                }
+            }
+        });
+        this.tableColumn.push({
+            name: '残余风险等级', key: "remainRiskLevel", render: (data) => {
+                if (data.riskLevel) {
+                    return this.$store.getters.prevention_risk_level_map[data.remainRiskLevel]
+                }
+            }
+        });
+
+
+        this.subTableColumn.push({ name: '步骤名称', key: "name" });
+        this.subTableColumn.push({ name: '作业步骤描述', key: "description", 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" });
+        this.subTableColumn.push({ name: '风险源', key: "riskSource" });
+        this.subTableColumn.push({ name: '危害分析', key: "hazardAnalysis" });
+        this.subTableColumn.push({
+            name: '最严重后果', key: "seriousResult", width: "200px", render: (data) => {
+                if (data.seriousResult) {
+                    const map = {};
+                    this.dictData.seriousResult.forEach((item: any) => {
+                        map[item.value] = item.name
+                    })
+                    let seriousData = this.stringChangeArray(data.seriousResult).map((item) => {
+                        return map[item]
+                    })
+                    return seriousData.join(" ; ")
+                }
+            }
+        });
+        this.subTableColumn.push({
+            name: '风险等级', key: "riskLevel", render: (data) => {
+                if (data.riskLevel) {
+                    return this.$store.getters.prevention_risk_level_map[data.riskLevel]
+                }
+            }
+        });
+        this.subTableColumn.push({ name: '评估方法', key: "riskChoose", });
+        this.subTableColumn.push({
+            name: '残余风险等级', key: "remainLevel", width: "200px", render: (data) => {
+                if (data.remainLevel) {
+                    return this.$store.getters.prevention_risk_level_map[data.remainLevel]
+                }
+            }
+        });
+        this.subTableColumn.push({ name: '评估方法', key: "remainChoose", });
+        this.subTableColumn.push({
+            name: '管控措施', key: "measuresNum", render: (data) => {
+                if (data.measuresNum) {
+                    return data.measuresNum
+                }
+            }
+        });
+
+        this.triTableColumn.push({ name: '序号', key: "index" });
+        this.triTableColumn.push({ name: '管控方法', key: "controlWayName" });
+        this.triTableColumn.push({ name: '措施类型一', key: "firstTypeName" });
+        this.triTableColumn.push({ name: '措施类型二', key: "secondTypeName" });
+        this.triTableColumn.push({ name: '措施类型三', key: "thirdType" });
+        this.triTableColumn.push({ name: '管控措施', key: "description" });
+        this.triTableColumn.push({ name: '排查任务', key: "tasksNum", });
+        // 排查任务制定
+        this.taskTableColumn.push({ name: '序号', key: "index" });
+        this.taskTableColumn.push({ name: "任务名称", key: "name" })
+        this.taskTableColumn.push({ name: "执行岗位", key: "executePostName" })
+        this.taskTableColumn.push({ name: "执行人", key: "chargeUserName" })
+        this.taskTableColumn.push({ name: "执行周期", key: "reviewCycleValue" })
+        this.taskTableColumn.push({
+            name: "单位", key: "reviewCycleUnit", render: (data) => {
+                const map = {};
+                this.reviewCycleUnit.forEach((item: any) => {
+                    map[item.value] = item.name
+                })
+                return map[data.reviewCycleUnit]
+            }
+        })
     }
 
-    public callback(data){
-        console.log('data',data);
-        
-        // 查询
-        if(data.value==="search"){
-            this.getTableData()
-        // 重置
-        }else if(data.value === "reset"){
-            this.reset()
-        // 反选
-        }else if(data.value === "reverse"){
-            this.toggleAll()
-        // 全选
-        }else if(data.value === "selectAll"){
-            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
+
+    public changes(data, item) {
+        // 辨识人
+        if (item && item.key === "identifyUserId") {
+            this.updateParams.identifyUserName = this.$store.getters.user_map[data];
+        }
+        // 区域
+        if (item && item.key === "areaId") {
+            if (this.updateParams.unitId) {
+                this.updateParams.unitId = null;
             }
+            const areaData = this.areaList.find((itm: any) => itm.value === data) as any;
+            this.updateParams.analRiskLevel = areaData.analRiskLevel
+            this.loadUnitData(data)
+        }
+        //单元
+        if (item && item.key === 'unitId') {
+            const unitData = this.unitList.find((itm: any) => itm.value === data) as any;
+            this.updateParams.chargeDeptName = unitData.deptName;
+            this.updateParams.chargeUserId = unitData.userId;
+            this.updateParams.chargeUserName = unitData.userName;
+            this.updateParams.chargeDeptId = unitData.deptId;
+            this.loadJobData(data)
+        }
+        //作业清单
+        if (item && item.key === 'jobInventoryId') {
+            const jobData = this.jobList.find((itm: any) => itm.value === data) as any;
+            this.updateParams.location = jobData.location;
+            this.updateParams.postCode = jobData.postCode;
+            this.updateParams.postName = jobData.postName;
+            this.currentStepTableData.datas = jobData.steps
+            this.updateParams.steps = jobData.steps;
+            this.updateParams.jobInventoryName = jobData.name;
+            this.updateParams.stepNum = jobData.steps.length;
+            console.log(this.updateParams);
+
+        }
+
+        //是否为两大一重
+        if (item && item.key === 'majorSign') {
+            if (data.includes(0)) {
+                data.splice(0, data.length)
+                data.push(0)
+            }
+            this.buildUpdateForm()
         }
     }
-    // 重置数据
-    public reset(){
-        this.params = {
-            pageNum:1,
-            pageSize:20,
+
+    public callback(data) {
+        console.log('data', data);
+        // 查询
+        if (data.value === "search") {
+            this.getTableData()
+            // 重置
+        } else if (data.value === "reset") {
+            this.reset()
+            // 反选
+        } else if (data.value === "reverse") {
+            this.toggleAll()
+            // 全选
+        } else if (data.value === "selectAll") {
+            this.selectAll()
+        } else if (data.value === "delete") {
+            this.deleteData(this.selectData.map((item: any) => item.id))
+        } else if (data.value === "add") {
+            this.updateParams = {
+                majorSign: [],
+                steps: [],
+            } as any;
+            this.isReadonly = false;
+            this.showUpdate = true;
+        } else if (data && data.value.indexOf("save") >= 0) {
+            this.doSave(data.value !== "save")
+            this.isModifyonly = false;
+        } else if (data && data.value === 'addDraft') {
+            this.doSaveDraft()
+            this.isModifyonly = false;
+        } else if (data.value === "subAdd") {
+            this.showSubUpdate = true
+        } else if (data.value === "cancel") {
+            this.showUpdate = false;
+            this.isModifyonly = false;
+        } else if (data.value === "estimateMatrix") {
+            this.showMatrixModal = true
+        }
+    }
+
+    //分析法 
+    public analyCallback(data) {
+        if (data.value === "cancel") {
+            this.showSubUpdate = false;
+            this.analysisUpdateParams = {
+                riskChoose: [],
+                remainChoose: [],
+            } as any;
+        } else if (data.value === "save") {
+            this.analysisUpdateParams.measures = this.currentMeasureData.datas
+            this.analysisUpdateParams.measuresNum = this.currentMeasureData.datas.length
+            this.analysisUpdateParams.seriousResult = this.analysisUpdateParams.seriousResult.join(";")
+            this.analysisUpdateParams.safetySign = this.analysisUpdateParams.safetySign.join(";")
+            this.analysisUpdateParams.riskChoose = this.analysisUpdateParams.riskChoose.join(";")
+            this.analysisUpdateParams.remainChoose = this.analysisUpdateParams.remainChoose.join(";")
+            this.updateParams.steps.splice(this.updateParams.steps.findIndex(item => item.id === this.analysisUpdateParams.id), 1, this.analysisUpdateParams)
+       
+            const riskLevel = this.updateParams.steps.map((item) => item.riskLevel ? item.riskLevel : 0);
+            const maxRiskLevel = Math.max(...riskLevel);
+            const remainRiskLevel = this.updateParams.steps.map((item) => item.remainLevel ? item.remainLevel : 0);
+            const maxRemainRiskLevel = Math.max(...remainRiskLevel);
+            // const areaList = this.areaList
+            if (!this.updateParams.analRiskLevel) {
+                const areaData = this.areaList.find((itm: any) => itm.value === this.updateParams.areaId) as any;
+                this.updateParams.analRiskLevel = areaData.analRiskLevel
+            }
+            this.updateParams.riskLevel = maxRiskLevel > this.updateParams.analRiskLevel ? maxRiskLevel : this.updateParams.analRiskLevel
+            this.updateParams.remainRiskLevel = maxRemainRiskLevel
+            this.buildUpdateForm()
+            // this.analysisUpdateParams.steps
+            // this.doAnalySave()
+            this.showSubUpdate = false;
+        }
+    }
+
+
+
+    //保存
+    public doAnalySave() {
+        this.currentAnalysData.measures = this.currentMeasureData.datas
+        this.analysisUpdateParams.datas.splice(this.analysisUpdateParams.datas.findIndex(item => item.index === this.currentAnalysData.index), 1, this.currentAnalysData)
+        this.analysisUpdateParams.datas.forEach((item, i) => {
+            item.index = i + 1
+        })
+        this.showSubUpdate = false;
+        this.analysisUpdateParams = {
+            remainLevel: null,
+            riskLevel: null,
+            datas: []
         } as any;
     }
 
-
-
-    public showUpdateModel(id){
-        this.showUpdate = true
+    public showUpdateModel(row, isReadonly, isModifyonly) {
+        this.updateParams = { number: null, tableItems: [] } as any;
+        this.isReadonly = !!isReadonly;
+        if (!row) {
+            this.currentId = -1;
+            this.showUpdate = true;
+        } else {
+            this.currentId = row.id;
+            this.tableService.selectById(this.currentId).then((res: any) => {
+                if (isReadonly) {
+                    this.updateParams = Object.assign({
+                        majorHazardName: res.data.majorHazard.split(";").map(item => this.sourceMap[item]).join(";"),
+                        majorSignName: res.data.majorSign.split(";").map(item => this.majorsignMap[item]).join(";"),
+                        riskLevelName: this.$store.getters.prevention_risk_level_map[res.data.riskLevel],
+                        remainRiskLevelName: this.$store.getters.prevention_risk_level_map[res.data.remainRiskLevel]
+                    }, res.data)
+                } else if (isModifyonly) {
+                    this.updateParams = res.data;
+                    this.updateParams.majorSign = this.stringChangeArray(res.data.majorSign)
+                    this.updateParams.majorHazard = this.stringChangeArray(res.data.majorHazard)
+                    this.isModifyonly = true;
+                } else {
+                    this.updateParams = res.data;
+                    this.loadUnitData(res.data.areas)
+                }
+                // this.updateParams.tableItems.forEach((item,i)=>{
+                //     item.index = i+1
+                // })
+                this.buildUpdateForm()
+                this.showUpdate = true;
+            })
+        }
     }
 
-    public handleClose(){
+    //工作分析评价
+    public showSubModel(row, isReadonly) {
+        this.analysisUpdateParams = {
+            riskChoose: [],
+            remainChoose: [],
+        } as any;
+        if (row) {
+            if (isReadonly) {
+                this.analysisUpdateParams = Object.assign({
+                    seriousResultName: row.seriousResult.split(";").map(item => this.seriousResultMap[item]).join(";"),
+                    safetySignName: row.safetySign.split(";").map(item => this.safetySignMap[item]).join(";"),
+                    riskLevelName: this.$store.getters.prevention_risk_level_map[row.riskLevel],
+                    remainLevelName: this.$store.getters.prevention_risk_level_map[row.remainLevel],
+                    riskControlLevelName: this.riskControlLevelMap[row.riskControlLevel],
+                }, row)
+                this.analysisUpdateParams = { ...this.analysisUpdateParams, ...JSON.parse(JSON.stringify(row)) };
+                this.analyIsReadonly = true;
+            } else {
+                this.analyIsReadonly = false
+                // 暂存数据 用于取消修改
+                this.currentAnalysData = row;
+                this.analysisUpdateParams = { ...this.analysisUpdateParams, ...JSON.parse(JSON.stringify(row)) };
+                this.analysisUpdateParams.seriousResult = this.stringChangeArray(row.seriousResult)
+                this.analysisUpdateParams.safetySign = this.stringChangeArray(row.safetySign)
+                this.analysisUpdateParams.riskChoose = row.riskChoose.split(";")
+                this.analysisUpdateParams.remainChoose = row.remainChoose.split(";")
+            }
+        }
+        this.showSubUpdate = true
+    }
+    //评价
+    public handleAnalyClose() {
+        this.showSubUpdate = false;
+        this.analyIsReadonly = true;
+    }
+    //管理措施
+    public handleClose() {
         this.showUpdate = false;
+        this.isReadonly = false;
+        this.isModifyonly = false;
     }
 
 
     public toggleAll() {
         (this.$refs.multipleTable as any).toggleAllSelection();
     }
-    public selectAll(){
-        if(!this.selectData.length){
+    public selectAll() {
+        if (!this.selectData.length) {
             this.toggleAll()
-        }else{
-            this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
-                if(!find){
+        } else {
+            this.tableData.datas.forEach((item, index) => {
+                const find = this.selectData.find((data: any) => data.userId === item.userId);
+                if (!find) {
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }
             })
         }
     }
 
-    public handleSelectionChange(data){
+    public handleSelectionChange(data) {
         this.selectData = data;
     }
 
-    
+
+    //风险评估
+    public handleRiskChange(data) {
+        const datalen = data.length
+        const risklen = this.checkRiskType.risk.length
+        if (datalen > risklen) {
+            this.showRiskUpdate = true
+            let filterdata = data.filter(subItem => !this.checkRiskType.risk.includes(subItem))
+            if (filterdata.includes('LS')) {
+                this.riskType = 'ls'
+                if (this.analysisUpdateParams.riskLsValue) {
+                    this.methodUpdateParams = JSON.parse(this.analysisUpdateParams.riskLsValue)
+                }
+
+            } else if (filterdata.includes('LEC')) {
+                this.riskType = 'lec'
+                if (this.analysisUpdateParams.riskLecValue) {
+                    this.methodUpdateParams = JSON.parse(this.analysisUpdateParams.riskLecValue)
+                }
+            }
+        }
+        this.checkRiskType.risk = data
+        this.checkRiskType.type = 'risk'
+        this.analysisUpdateParams.riskLevel = null
+        this.compareRiskLevel()
+    }
+
+    //残余风险评估
+    public handleSubRiskChange(data) {
+        const datalen = data.length
+        const risklen = this.checkRiskType.remain.length
+        if (datalen > risklen) {
+            this.showRiskUpdate = true
+            let filterdata = data.filter(subItem => !this.checkRiskType.remain.includes(subItem))
+            if (filterdata.includes('LS')) {
+                this.riskType = 'ls'
+                if (this.analysisUpdateParams.remainLsValue) {
+                    this.methodUpdateParams = JSON.parse(this.analysisUpdateParams.remainLsValue)
+                }
+            } else if (filterdata.includes('LEC')) {
+                this.riskType = 'lec'
+                if (this.analysisUpdateParams.remainLecValue) {
+                    this.methodUpdateParams = JSON.parse(this.analysisUpdateParams.remainLecValue)
+                }
+            }
+        }
+        this.checkRiskType.remain = data
+        this.checkRiskType.type = 'subRisk'
+        this.analysisUpdateParams.remainLevel = null
+        this.compareRiskLevel()
+    }
+    //评估方法 -- btn
+    public methodCallback(data, item) {
+        if (data.value === "cancel") {
+            this.methodUpdateParams = {
+                lslvalue: null,
+                lssvalue: null,
+                lsgrade: null,
+                leclvalue: null,
+                lecevalue: null,
+                leccvalue: null,
+                lecgrade: null,
+
+            } as any;//评估方法
+            this.showRiskUpdate = false
+        } else if (data.value === 'lslvalue') {
+            this.showRiskValueModal = 'lslvalue'
+            this.showRiskValueUpdate = true
+            this.riskTitle = '选择L值'
+            this.riskTableData = L_VALUE
+            this.riskTableColumn = L_COLUMN
+        } else if (data.value === 'lssvalue') {
+            this.showRiskValueModal = 'lssvalue'
+            this.showRiskValueUpdate = true
+            this.riskTitle = '选择S值'
+            this.riskTableData = S_VALUE
+            this.riskTableColumn = S_COLUMN
+        } else if (data.value === 'leclvalue') {
+            this.showRiskValueModal = 'leclvalue'
+            this.showRiskValueUpdate = true
+            this.riskTitle = '选择L值'
+            this.riskTableData = L_LECVALUE
+            this.riskTableColumn = L_LECCOLUMN
+        } else if (data.value === 'lecevalue') {
+            this.showRiskValueModal = 'lecevalue'
+            this.showRiskValueUpdate = true
+            this.riskTitle = '选择E值'
+            this.riskTableData = E_VALUE
+            this.riskTableColumn = E_COLUMN
+        } else if (data.value === 'leccvalue') {
+            this.showRiskValueModal = 'leccvalue'
+            this.showRiskValueUpdate = true
+            this.riskTitle = '选择C值'
+            this.riskTableData = C_VALUE
+            this.riskTableColumn = C_COLUMN
+        } else if (data.value === 'save') {
+            //风险评估
+            if (this.checkRiskType.type === 'risk') {
+                if (this.showRiskValueModal.indexOf('ls') !== -1) {
+                    const riskLsValue = JSON.parse(JSON.stringify(this.methodUpdateParams))
+                    this.analysisUpdateParams.riskLsValue = JSON.stringify(riskLsValue)
+                } else if (this.showRiskValueModal.indexOf('lec') !== -1) {
+                    const riskLecValue = JSON.parse(JSON.stringify(this.methodUpdateParams))
+                    this.analysisUpdateParams.riskLecValue = JSON.stringify(riskLecValue)
+                }
+            } else if (this.checkRiskType.type === 'subRisk') {//残余风险评估
+                if (this.showRiskValueModal.indexOf('ls') !== -1) {
+                    const riskLsValue = JSON.parse(JSON.stringify(this.methodUpdateParams))
+                    this.analysisUpdateParams.remainLsValue = JSON.stringify(riskLsValue)
+                } else if (this.showRiskValueModal.indexOf('lec') !== -1) {
+                    const riskLecValue = JSON.parse(JSON.stringify(this.methodUpdateParams))
+                    this.analysisUpdateParams.remainLecValue = JSON.stringify(riskLecValue)
+                }
+            }
+            this.methodUpdateParams = {
+                lslvalue: null,
+                lssvalue: null,
+                lsgrade: null,
+                leclvalue: null,
+                lecevalue: null,
+                leccvalue: null,
+                lecgrade: null,
+
+            } as any;
+            this.showRiskUpdate = false
+        }
+
+    }
+    //评估方法 -- 风险等级确定
+    public compareRiskLevel() {
+        const riskChoose = this.analysisUpdateParams.riskChoose
+        const remainChoose = this.analysisUpdateParams.remainChoose
+        if (riskChoose.includes('LS')) {
+            this.analysisUpdateParams.riskLevel = this.analysisUpdateParams.riskLevel > this.analysisUpdateParams.riskLsLevel ? this.analysisUpdateParams.riskLevel : this.analysisUpdateParams.riskLsLevel
+        }
+        if (riskChoose.includes('LEC')) {
+            this.analysisUpdateParams.riskLevel = this.analysisUpdateParams.riskLevel > this.analysisUpdateParams.riskLecLevel ? this.analysisUpdateParams.riskLevel : this.analysisUpdateParams.riskLecLevel
+        }
+        if (remainChoose.includes('LS')) {
+            this.analysisUpdateParams.remainLevel = this.analysisUpdateParams.remainLevel > this.analysisUpdateParams.remainLsLevel ? this.analysisUpdateParams.remainLevel : this.analysisUpdateParams.remainLsLevel
+        }
+        if (remainChoose.includes('LEC')) {
+            this.analysisUpdateParams.remainLevel = this.analysisUpdateParams.remainLevel > this.analysisUpdateParams.remainLecLevel ? this.analysisUpdateParams.remainLevel : this.analysisUpdateParams.remainLecLevel
+        }
+        this.riskUpdateForm()
+        this.remainUpdateForm()
+    }
+
+    //保存 更新
+    public doSave(goOn?) {
+        // 如果是新增工作危害分析清单
+        this.updateParams.majorSign = this.arrayChangeString(this.updateParams.majorSign)
+        this.updateParams.regulatoryProcess = this.arrayChangeString(this.updateParams.regulatoryProcess)
+        this.updateParams.regulatoryChemical = this.arrayChangeString(this.updateParams.regulatoryChemical)
+        this.updateParams.majorHazard = this.arrayChangeString(this.updateParams.majorHazard)
+
+        this.tableService.addOrUpdate(this.updateParams, !this.updateParams.id ? true : false).then((res) => {
+            this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功！");
+            this.showUpdate = !!goOn;
+            this.getTableData();
+        })
+    }
+    //存草稿
+    public doSaveDraft() {
+        // 如果是新增工作危害分析清单
+        this.updateParams.majorSign = this.arrayChangeString(this.updateParams.majorSign)
+        this.updateParams.regulatoryProcess = this.arrayChangeString(this.updateParams.regulatoryProcess)
+        this.updateParams.regulatoryChemical = this.arrayChangeString(this.updateParams.regulatoryChemical)
+        this.updateParams.majorHazard = this.arrayChangeString(this.updateParams.majorHazard)
+        this.tableService.addOrDraft(this.updateParams, this.currentId === -1).then((res) => {
+            this.$message.success(this.currentId === -1 ? "新增成功！" : "编辑成功！");
+            this.showUpdate = false;
+            this.getTableData();
+        })
+    }
+
+
+    //数组转字符串
+    public arrayChangeString(data) {
+        if (data && data.length > 0) {
+            return data.join(";")
+        } else {
+            return null
+        }
+    }
+
+    //字符串转数组
+    public stringChangeArray(data) {
+        if (data) {
+            return data.split(";").map((item) => parseInt(item))
+        }
+    }
+
+    // 重置数据
+    public reset() {
+        this.params = {
+            pageNum: 1,
+            pageSize: 20,
+        } as any;
+    }
+
+
+    public popCallback(data) {
+
+        if (data.value === 'cancel') {
+            this.showRiskValueUpdate = false
+        } else if (data.value === 'save') {
+            //LS 计算
+            if (this.showRiskValueModal.indexOf('ls') !== -1) {
+                if (this.showRiskValueModal === 'lslvalue') {
+                    this.methodUpdateParams.lslvalue = this.currentRow.grade
+                } else if (this.showRiskValueModal === 'lssvalue') {
+                    this.methodUpdateParams.lssvalue = this.currentRow.grade
+                }
+                let lsdata = this.countLS(this.methodUpdateParams.lslvalue, this.methodUpdateParams.lssvalue)
+                this.methodUpdateParams.lsrvalue = lsdata.rvalue
+                this.methodUpdateParams.lsgrade = lsdata.lsgrade
+
+                //LS--JSON格式存储
+                const riskLsValue = JSON.parse(JSON.stringify(this.methodUpdateParams))
+                if (this.checkRiskType.type === 'risk') {
+                    this.analysisUpdateParams.riskLsLevel = riskLsValue.lsgrade
+                    this.analysisUpdateParams.riskLsValue = JSON.stringify(riskLsValue)
+                } else if (this.checkRiskType.type === 'subRisk') {
+                    this.analysisUpdateParams.remainLsLevel = riskLsValue.lsgrade
+                    this.analysisUpdateParams.remainLsValue = JSON.stringify(riskLsValue)
+                }
+
+            } else if (this.showRiskValueModal.indexOf('lec') !== -1) {
+                //LEC 计算
+                if (this.showRiskValueModal === 'leclvalue') {
+                    this.methodUpdateParams.leclvalue = this.currentRow.grade
+                } else if (this.showRiskValueModal === 'lecevalue') {
+                    this.methodUpdateParams.lecevalue = this.currentRow.grade
+                } else if (this.showRiskValueModal === 'leccvalue') {
+                    this.methodUpdateParams.leccvalue = this.currentRow.grade
+                }
+                let lecdata = this.contLEC(this.methodUpdateParams.leclvalue, this.methodUpdateParams.lecevalue, this.methodUpdateParams.leccvalue)
+                this.methodUpdateParams.lecdvalue = lecdata.dvalue
+                this.methodUpdateParams.lecgrade = lecdata.lecgrade
+
+                //LEC--JSON格式存储
+                const riskLecValue = JSON.parse(JSON.stringify(this.methodUpdateParams))
+                if (this.checkRiskType.type === 'risk') {
+                    this.analysisUpdateParams.riskLecLevel = riskLecValue.lecgrade
+                    this.analysisUpdateParams.riskLecValue = JSON.stringify(riskLecValue)
+
+                } else if (this.checkRiskType.type === 'subRisk') {
+                    this.analysisUpdateParams.remainLecLevel = riskLecValue.lecgrade
+                    this.analysisUpdateParams.remainLecValue = JSON.stringify(riskLecValue)
+                }
+            }
+            this.compareRiskLevel()
+            this.showRiskValueUpdate = false
+        }
+    }
+    // 单选评估值
+    public handleCurrentChange(data) {
+        this.currentRow = data;
+    }
+
+    //LS 计算R值，风险等级
+    public countLS(lvalue, svalue) {
+        let lsdata = {} as any;
+        if (lvalue && svalue) {
+            lsdata.rvalue = lvalue * svalue
+            if (lsdata.rvalue < 9) {
+                lsdata.lsgrade = 1
+            } else if (lsdata.rvalue < 13) {
+                lsdata.lsgrade = 2
+            } else if (lsdata.rvalue < 17) {
+                lsdata.lsgrade = 3
+            } else if (lsdata.rvalue < 26) {
+                lsdata.lsgrade = 4
+            }
+        }
+        return lsdata
+    }
+    //LEC 计算D值，风险等级
+    public contLEC(lvalue, evalue, cvalue) {
+        let lecdata = {} as any;
+        if (lvalue && evalue && cvalue) {
+            lecdata.dvalue = lvalue * evalue * cvalue
+            if (lecdata.dvalue < 71) {
+                lecdata.lecgrade = 1
+            } else if (lecdata.dvalue < 160) {
+                lecdata.lecgrade = 2
+            } else if (lecdata.dvalue < 320) {
+                lecdata.lecgrade = 3
+            } else if (lecdata.dvalue > 319) {
+                lecdata.lecgrade = 4
+            }
+        }
+        return lecdata
+    }
+    //管控措施
+    public measureCallback(data) {
+        if (data && data.value === "triSubAdd") {
+            this.showTriUpdate = true;
+        }
+        if (data && data.value === 'cancel') {
+            this.showTriUpdate = false;
+            this.measureUpdataParams = {} as any;
+        } else if (data.value === "fourSubAdd") {
+            this.taskUpdateForm();
+            this.showFourUpdate = true;
+        } else if (data && data.value.indexOf("save") >= 0) {
+            this.doMeasureSave(data.value !== "save")
+        }
+        this.measureIsReadonly = false
+    }
+
+    public measureChange(data, item) {
+        //措施类型
+        if (item && item.key === 'controlWay') {
+            this.measureUpdataParams.controlWayName = this.selectName(this.controlWayData, data)
+        }
+        //措施一
+        if (item && item.key === "firstType") {
+            this.measureUpdataParams.firstTypeName = this.selectName(this.dictData.measuresSort, data)
+            this.secondTypeItem = this.measuresSelectData[data]
+        }
+        //措施二
+        if (item && item.key === 'secondType') {
+            this.measureUpdataParams.secondTypeName = this.selectName(this.secondTypeItem, data)
+        }
+        this.measuresUpdateForm()
+    }
+
+    public selectName(selectGroup, data) {
+
+        if (selectGroup && selectGroup.length > 0) {
+            const map = {};
+            selectGroup.forEach((item: any) => {
+                if (item.value) {
+                    map[item.value] = item.name
+                } else if (item.id) {
+                    map[item.id] = item.label
+                }
+
+            })
+            return map[data]
+        }
+    }
+
+    public showMeasureModel(row, isReadonly) {
+        if (isReadonly) {
+            this.measureIsReadonly = true
+            this.measureUpdataParams = row
+            this.measureCurrentId = 0
+            this.currentTaskData.datas = row.tasks
+        } else if (!isReadonly) {
+            this.measureIsReadonly = false
+            this.measureUpdataParams = row
+            this.currentTaskData.datas = row.tasks
+            this.measureCurrentId = 0
+        }
+        this.showTriUpdate = true
+    }
+    // 管控措施保存
+    public doMeasureSave(goOn) {
+        if (!this.measureUpdataParams.index) {
+            this.measureUpdataParams.index = this.currentMeasureData.datas.length + 1;
+            this.measureUpdataParams.tasks = this.currentTaskData.datas
+            this.measureUpdataParams.tasksNum = this.currentTaskData.datas.length
+            this.currentMeasureData.datas.push(this.measureUpdataParams);
+        } else {
+            this.measureUpdataParams.tasks = this.currentTaskData.datas
+            this.measureUpdataParams.tasksNum = this.currentTaskData.datas.length
+            this.currentMeasureData.datas.splice(this.currentMeasureData.datas.findIndex(item => item.index === this.measureUpdataParams.index), 1, this.measureUpdataParams)
+        }
+
+        this.currentMeasureData.datas.forEach((item, i) => {
+            item.index = i + 1
+        })
+        this.currentTaskData = { datas: [], deleteIds: [] } as any;
+        this.measureUpdataParams = {} as any;
+        this.showTriUpdate = !!goOn
+    }
+
+    public handleMeasureClose() {
+        this.showTriUpdate = false;
+        this.measureIsReadonly = false;
+        this.measureUpdataParams = {} as any;
+    }
+
+    public deleteMeasure(row) {
+        this.currentMeasureData.datas.splice(this.currentMeasureData.datas.findIndex(item => item.index === this.measureUpdataParams.index), 1)
+        if (row.id) {
+            this.currentMeasureData.deleteIds.push(row.id)
+        }
+        this.currentMeasureData.datas.forEach((item, i) => {
+            item.index = i + 1
+        })
+    }
+
+    //排查任务
+    public showTaskModel(row, isReadonly) {
+        if (isReadonly) {
+            this.taskIsReadonly = true
+            this.taskUpdataParams = row
+            this.taskCurrentId = 0
+        } else if (!isReadonly) {
+            this.taskIsReadonly = false
+            this.taskUpdataParams = row
+            this.taskCurrentId = 0
+        }
+        this.showFourUpdate = true
+    }
+
+    public taskCallback(data) {
+        this.taskCurrentId = -1
+        if (data && data.value === 'cancel') {
+            this.showFourUpdate = false
+        } else if (data && data.value.indexOf("save") >= 0) {
+            this.doTaskSave(data.value !== "save")
+        }
+    }
+
+    //排查任务 -- 下拉选择
+    public taskSelectChange(data, item) {
+        if (item && item.key === 'insuranceDutyFlag') {
+            if (data === 0) {
+                this.taskType = [{
+                    name: "日常任务",
+                    value: 0,
+                }]
+                this.taskUpdataParams.taskType = 0
+                this.taskUpdataParams.insuranceDutyFlagName = '否'
+                this.taskUpdataParams.taskTypeName = '日常任务'
+            } else if (data === 1) {
+                this.taskType = [{
+                    name: "主要负责人任务",
+                    value: 1
+                }, {
+                    name: "技术负责人任务",
+                    value: 2
+                }, {
+                    name: "操作负责人任务",
+                    value: 3
+                }]
+                this.taskUpdataParams.taskType = null
+                this.taskUpdataParams.insuranceDutyFlagName = "是"
+            }
+
+        }
+
+        if (item && item.key === "taskType") {
+            if (data === 1) {
+                this.taskItem = this.dictData.mainPerson
+            } else if (data === 2) {
+                this.taskItem = this.dictData.craftPerson
+            } else if (data === 3) {
+                this.taskItem = this.dictData.operatePerson
+            }
+        }
+        // 岗位
+        if (item && item.key === "executePostCode") {
+            this.taskUpdataParams.executePostName = this.$store.getters.post_map[data];
+        }
+        // 执行人
+        if (item && item.key === "chargeUserId") {
+            this.taskUpdataParams.chargeUserName = this.$store.getters.user_map[data];
+        }
+        //任务类型
+        if (item && item.key === 'taskType') {
+            const map = {};
+            this.taskType.forEach((item: any) => {
+                map[item.value] = item.name
+            })
+            this.taskUpdataParams.taskTypeName = map[data]
+        }
+        //任务类型
+        if (item && item.key === 'taskItem') {
+            const map = {};
+            this.taskItem.forEach((item: any) => {
+                map[item.value] = item.name
+            })
+            this.taskUpdataParams.taskItemName = map[data]
+        }
+        this.taskUpdateForm()
+    }
+
+    public handleCloseTask(goOn?) {
+        this.showFourUpdate = false;
+        this.taskIsReadonly = false;
+        this.taskCurrentId = -1;
+        this.taskUpdataParams = {} as any;
+    }
+    //保存
+    public doTaskSave(goOn?) {
+        if (!this.taskUpdataParams.index) {
+            this.taskUpdataParams.index = this.currentTaskData.datas.length + 1;
+            this.currentTaskData.datas.push(this.taskUpdataParams);
+        } else {
+            this.currentTaskData.datas.splice(this.currentTaskData.datas.findIndex(item => item.index === this.taskUpdataParams.index), 1, this.taskUpdataParams)
+        }
+
+        this.currentTaskData.datas.forEach((item, i) => {
+            item.index = i + 1
+        })
+        this.taskUpdataParams = {} as any;
+        this.showFourUpdate = !!goOn
+    }
+    //删除任务
+    public deleteTask(row) {
+        this.currentTaskData.datas.splice(this.currentTaskData.datas.findIndex(item => item.index === this.taskUpdataParams.index), 1)
+        if (row.id) {
+            this.currentTaskData.deleteIds.push(row.id)
+        }
+        this.currentTaskData.datas.forEach((item, i) => {
+            item.index = i + 1
+        })
+    }
+
 }
 </script>
 <style lang="scss" scoped src="../../../common.component.scss"></style>