diff --git a/src/service/jobHazard.service.ts b/src/service/jobHazard.service.ts
index 03a30fb..ebe242e 100644
--- a/src/service/jobHazard.service.ts
+++ b/src/service/jobHazard.service.ts
@@ -36,10 +36,6 @@ export default class JobHazardService extends BaseService<any>{
        // 存草稿
        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)
-        }
+        return this.post(url,params,{},showLoading)
     }
 }
\ No newline at end of file
diff --git a/src/views/risk/assessment/work/workAnal.component.html b/src/views/risk/assessment/work/workAnal.component.html
index 73bb38c..850c548 100644
--- a/src/views/risk/assessment/work/workAnal.component.html
+++ b/src/views/risk/assessment/work/workAnal.component.html
@@ -11,14 +11,19 @@
             <TableComponent :tableData="tableData" :tableColumn="tableColumn" @tabCallback="callback($event)"
                 @actionCallback="callback($event)" @pageNumberChange="callback($event)"
                 @pageSizeChange="callback($event)" :footerActions="footerActions" :actions="tableActions">
-
                 <el-table ref="multipleTable" :data="tableData.datas" height="100%" border row-key="checked"
                     @selection-change="handleSelectionChange" style="width: 100%">
                     <el-table-column type="selection" label="全选" width="40">
                     </el-table-column>
+                    <el-table-column label="序号" width="60">
+                        <template slot-scope="scope">
+                            {{scope.$index+1}}
+                        </template>
+                    </el-table-column>
                     <template v-for="item in tableColumn">
                         <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key">
-                            <div slot-scope="scope" v-html="item.render(scope.row)"></div>
+                            <div slot-scope="scope" v-html="item.render(scope.row)" @click="showPros($event,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>
@@ -46,13 +51,14 @@
                 :showFooter="false" style="margin-bottom: 20px;">
 
                 <el-table ref="multipleTable" :data="updateParams.steps" tooltip-effect="dark" height="250" border
-                    row-key="checked" @selection-change="handleSelectionChange" style="width: 100%">
+                    row-key="checked" @selection-change="handleSubSelectionChange" 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>
+                            <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">
@@ -63,8 +69,7 @@
                             <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>
+                            <el-button v-if="!isReadonly" type="text" @click="showSubModel(scope.row)">评价</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -77,135 +82,35 @@
 
     </el-dialog>
     <!-- 评估矩阵 -->
-    <el-dialog :close-on-click-modal="false" :visible.sync="showMatrixModal" :title="'区域风险等级判定准则'">
+    <el-dialog :close-on-click-modal="false" :visible.sync="showMatrixModal" width="500px" :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>
+        <AnalEvaluationComponent :isReadonly="analyIsReadonly" :data.sync="analysisUpdateParams"
+            :show.sync="showSubUpdate" @actionCallback="analyCallback" :tabledata.sync="updateParams"
+            :areaList="areaList" :type="'work'"></AnalEvaluationComponent>
     </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"
+    <!-- 检查项目 -->
+    <el-dialog :close-on-click-modal="false" title="检查项目" :show-close="false" :visible.sync="showProtable"
+        width="940px">
+        <FormComponent labelWidth="110px" labelAlign="right" :actions="proActions" @actionCallback="proCallback"
             :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">
+            <TableComponent :tableData="currentProTableData" :tableColumn="proTableColumn" :showFooter="false"
+                style="margin-bottom: 20px;">
+                <el-table ref="multipleTable" :data="currentProTableData.datas" tooltip-effect="dark" height="250"
+                    border style="width: 100%">
+                    <template v-for="item in proTableColumn">
                         <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>
+                            <div slot-scope="scope" v-html="item.render(scope.row)" @click="showPros($event,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="'管控措施制定'" :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 b8b0cd0..ce3fd49 100644
--- a/src/views/risk/assessment/work/workAnal.component.vue
+++ b/src/views/risk/assessment/work/workAnal.component.vue
@@ -9,45 +9,69 @@ 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 AnalEvaluationComponent from '@/components/analEvaluation.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';
+import moment from "moment"
+
 @Component({
     template,
     components: {
         FormComponent,
         TableComponent,
         DrawComponent,
+        AnalEvaluationComponent,
         UnitTreeComponent,
-        ButtonListComponent,
+        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 diviceService = new DiviceService();
+    public workService = new WorkService();
 
-    public params = {} as any;
+    public params = {
+        areaName: "",
+        unitName: "",
+    } as any;
 
+    public treeData = [] as any;
+
+    public areaList = [];
+    public unitList = [];
+    public jobList = [];
+    public isReadonly = false;
+    public isModifyonly = false;
     public subTableColumn = [] as any;
     public currentId = -1;
 
-    public currentStepTableData = {
+    public sourceMap = {} as any;
+    public craftMap = {} as any;
+    public chemicaltMap = {} as any
+    public majorsignMap = {} as any;
+
+    //检查项目
+    public showProtable = false;
+
+    public proTableColumn = [] as any;
+
+    public currentProTableData = {
         datas: []
     } as any;
-    public sourceMap = {} as any;
-    public majorsignMap = {} as any;
-    public safetySignMap = {} as any;
-    public seriousResultMap = {} as any;
-    public riskControlLevelMap = {} as any;
 
+    public proActions = [{
+        name: "取消",
+        value: "cancel"
+    }];
+
+    //数据字典
     public dictData = {
         source: [],
         craft: [],
@@ -60,50 +84,14 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         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 showMatrixModal = false;
+    //评价
+    public showSubUpdate = false;
+
     public analyIsReadonly = false;
+    //危害分析评价
     public analysisUpdateParams = {
         riskChoose: [],
         remainChoose: [],
@@ -111,29 +99,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         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;
-
+    } as any;
     public formActions = [{
         name: "查询",
         value: "search",
@@ -180,73 +146,39 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         value: "save",
         type: "primary"
     }];
-    public subTableActions: BtnOption[] = [];
-    public subActions = [{
-        name: "取消",
-        value: "cancel"
-    }, {
-        name: "保存并继续添加",
-        value: "saveAndContinue",
-        type: "primary"
-    }, {
-        name: "保存",
-        value: "save",
-        type: "primary"
-    }];
-    public triActions = [{
-        name: "取消",
-        value: "cancel"
-    }, {
-        name: "保存",
-        value: "save",
-        type: "primary"
-    }];
-    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",
+        key: "areaName",
         type: "text",
     }, {
         name: "单元名称",
-        key: "unitId",
+        key: "unitName",
         type: "text",
-    }, {
-        name: "作业活动",
-        key: "unitId",
-        type: "text",
-    }];
+    },];
 
-    public areaList = [];//区域
-    public unitList = [];//单元
-    public jobList = [];//作业活动清单
-    public taskType = [] as any;//排查任务类型
-    public taskItem = [] as any;//包报对应像
+    public showUpdate = false;
 
-    public isReadonly = false;
-    public isModifyonly = false;
+    public account = JSON.parse(localStorage.getItem("account") as any);
+
+    public updateParams = {
+        majorSign: [],
+        steps: [],
+        evaluateTime: moment().format('YYYY-MM-DD'),
+        evaluateUserId: this.account.userId,
+        evaluateUserName: this.account.nickName,
+    } as any;
+
+    public selectData = [];
+
+    public subSelectData = []
 
     public updateOptions: FormOption<BtnOption>[] = [];
-    public subUpdateOptions: FormOption<BtnOption>[] = [];
-    public subBasicRiskOptions: FormOption<BtnOption>[] = [];
-    @Watch("$store.state.deptList", { immediate: true, deep: true })
-    onChanges() {
-        this.loadAreaData()
-    }
 
+    public subBasicRiskOptions: FormOption<BtnOption>[] = [];
+
+    public subTableActions: BtnOption[] = [];
 
     public buildUpdateForm() {
-
         this.updateOptions = [{
             name: "区域名称",
             key: "areaId",
@@ -306,7 +238,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         }, {
             name: "评价人",
             key: "evaluateUserId",
-            format: "identifyUserName",
+            format: "evaluateUserName",
             require: true,
             width: "calc(50% - 20px)",
             type: "select",
@@ -328,23 +260,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
             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
-            }],
+            datas: this.$store.state.prevention_majorsign,
         }, {
             name: "重大危险源",
             key: "majorHazard",
@@ -359,6 +275,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         }, {
             name: "重点监管工艺",
             key: "regulatoryProcess",
+            format: "regulatoryProcessName",
             hide: !this.updateParams.majorSign.includes(2) || this.updateParams.majorSign.includes(0),
             type: "select",
             width: "calc(50% - 20px)",
@@ -368,6 +285,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         }, {
             name: "重点监管化学品",
             key: "regulatoryChemical",
+            format: "regulatoryChemicalName",
             hide: !this.updateParams.majorSign.includes(3) || this.updateParams.majorSign.includes(0),
             type: "select",
             width: "calc(50% - 20px)",
@@ -387,43 +305,6 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
             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",
@@ -445,459 +326,20 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         }]
     }
 
-    //基本信息
-    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)"
-        },
-        ];
+    @Watch("$store.state.deptList", { immediate: true, deep: true })
+    onChanges() {
+        this.loadAreaData()
     }
-
-    //风险评估
-    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,
-        }];
+    @Watch("updateParams", { immediate: true, deep: true })
+    onCountValueChange() {
+        this.buildUpdateForm()
     }
 
-    //残余风险评估
-    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,
-        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%",
-        }, {
-
-            name: "措施描述",
-            key: "description",
-            type: "text",
-            require: true,
-            width: "100%"
-        }];
-    }
-
-    //排查任务制定
-    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;
@@ -907,83 +349,29 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
                 }
             })
             this.dictData.craft = results[1].data.map((item) => {
+                this.craftMap[item.dictValue] = item.dictLabel;
                 return {
                     name: item.dictLabel,
                     value: isNaN(+item.dictValue) ? item.dictValue : +item.dictValue
                 }
             })
             this.dictData.chemical = results[2].data.map((item) => {
+                this.chemicaltMap[item.dictValue] = item.dictLabel;
                 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.unitList = [];
+        this.jobList = [];
         this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => {
             this.areaList = res.data.datas.map(item => {
                 return {
@@ -1008,9 +396,252 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
                     userName: item.chargeUserName,
                 }
             });
-            this.buildUpdateForm();
+            this.buildUpdateForm()
         })
     }
+    // 树点击
+    public handleNodeClick(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: "areaName", width: "150px" });
+        this.tableColumn.push({ name: '风险分析单元', key: "unitName", width: "150px" });
+        this.tableColumn.push({ name: '作业活动', key: "jobInventoryName", });
+        this.tableColumn.push({
+            name: '作业步骤', key: "stepNum", render: (data) => {
+                return "<span class='link'>" + (data.stepNum ? data.stepNum : 0) + "</span>"
+            }
+        });
+        this.tableColumn.push({ name: '责任部门', key: "chargeDeptName" });
+        this.tableColumn.push({ name: '责任人', key: "chargeUserName" });
+        this.tableColumn.push({
+            name: '风险等级', key: "riskLevel", render: (data) => {
+                return "<span class='color_" + data.riskLevel + "'>" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '') + "</span>"
+            }
+        });
+        this.tableColumn.push({
+            name: '残余风险等级', key: "remainRiskLevel", width: "150px", render: (data) => {
+                return "<span class='color_" + data.remainRiskLevel + "'>" + (data.remainRiskLevel ? (this.$store.getters.prevention_risk_level_map[data.remainRiskLevel]) : '') + "</span>"
+            }
+        });
+        this.tableColumn.push({
+            name: '状态', key: "status", render: (data) => {
+                if (data.status) {
+                    return "<span class='color_" + data.status + "'>" + (data.status ? (this.$store.getters.prevention_evaluate_status_map[data.status]) : '') + "</span>"
+                }
+            }
+        });
+
+
+        //分析评价
+        this.subTableColumn.push({ name: '序号', key: "index" });
+        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: "riskSource" });
+        this.subTableColumn.push({ name: '危害分析', key: "hazardAnalysis" });
+        this.subTableColumn.push({
+            name: '最严重后果', key: "seriousResult", width: "200px", render: (data) => {
+                if (data.seriousResult) {
+                    return data.seriousResult.split(";").map(item => this.$store.getters.prevention_serious_result_map[item]).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.remainRiskLevel]
+                }
+            }
+        });
+        this.subTableColumn.push({ name: '评估方法', key: "remainChoose", });
+        this.subTableColumn.push({
+            name: '管控措施', key: "measuresNum", render: (data) => {
+                if (data.measuresNum) {
+                    return data.measuresNum
+                } else {
+                    if (data.measures && data.measures.length) {
+                        return data.measures.length
+                    }
+
+                }
+            }
+        });
+
+        //作业步骤
+        this.proTableColumn.push({ name: '序号', key: "index" });
+        this.proTableColumn.push({ name: '步骤名称', key: "name" });
+        this.proTableColumn.push({ name: '作业步骤描述', key: "description", showTip: true, width: "200px" });
+        this.proTableColumn.push({ name: '作业地点', key: "location" });
+        this.proTableColumn.push({ name: '风险源', key: "riskSource" });
+        this.proTableColumn.push({
+            name: '可能发生事故', key: "seriousResult", width: "150px", render: (data) => {
+                if (data.seriousResult) {
+                    return data.seriousResult.split(";").map(item => this.$store.getters.prevention_serious_result_map[item]).join(";")
+                }
+            }
+        });
+        this.proTableColumn.push({
+            name: '风险等级', key: "riskLevel", render: (data) => {
+                if (data.riskLevel) {
+                    return "<span class='color_" + data.riskLevel + "'>" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '') + "</span>"
+                }
+            }
+        });
+        this.proTableColumn.push({
+            name: '残余风险等级', key: "remainLevel", width: "150px", render: (data) => {
+                if (data.remainLevel) {
+                    return "<span class='color_" + data.remainLevel + "'>" + (data.remainLevel ? (this.$store.getters.prevention_risk_level_map[data.remainLevel]) : '') + "</span>"
+                }
+            }
+        });
+    }
+
+    public callback(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.isReadonly = false;
+            this.showUpdate = true
+            this.updateParams = {
+                majorSign: [],
+                items: [],
+                evaluateTime: moment().format('YYYY-MM-DD'),
+                evaluateUserId: this.account.userId,
+                evaluateUserName: this.account.nickName,
+            } as any
+        } else if (data.value === "cancel") {
+            this.handleClose()
+        } else if (data.value === "estimateMatrix") {
+            this.showMatrixModal = true
+        } else if (data && data.value.indexOf("save") >= 0) {
+            this.doSave(data.value !== "save")
+            this.isReadonly = false;
+        } else if (data && data.value === 'addDraft') {
+            this.doSaveDraft()
+            this.isReadonly = false;
+        } else if (data && data.value === "subDelete") {
+            if (this.subSelectData.length > 0) {
+                if (!this.updateParams.deleteIds) {
+                    this.updateParams.deleteIds = []
+                }
+                this.subSelectData.map((itemData: any) => {
+                    this.updateParams.deleteIds.push(itemData.id)
+                    this.updateParams.steps.splice(this.updateParams.steps.findIndex(item => item.index === itemData.index), 1)
+                })
+                this.updateParams.steps.forEach((item, index) => {
+                    item.index = index + 1
+                    return item
+                })
+                this.updateParams.stepNum = this.updateParams.steps.length
+            }
+        }
+    }
+    // 重置数据
+    public reset() {
+        this.params = {
+            pageNum: 1,
+            pageSize: 20,
+        } as any;
+    }
+
+    public changes(data, item) {
+        // 区域
+        if (item && item.key === "areaId") {
+            this.jobList = [];
+            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.updateParams.analRiskLevel = areaData.analRiskLevel
+            this.updateParams.chargeDeptName = null;
+            this.updateParams.chargeUserId = null;
+            this.updateParams.chargeUserName = null;
+            this.updateParams.chargeDeptId = null;
+
+            this.updateParams.type = null;
+            this.updateParams.postName = null;
+            this.updateParams.postCode = null;
+            this.updateParams.jobInventoryName = null;
+            this.updateParams.jobInventoryId = null;
+            this.updateParams.name = null;
+            this.updateParams.steps = [];
+            this.updateParams.stepNum = 0;
+            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.updateParams.type = null;
+            this.updateParams.postName = null;
+            this.updateParams.postCode = null;
+            this.updateParams.jobInventoryName = null;
+            this.updateParams.jobInventoryId = null;
+            this.updateParams.name = null;
+            this.updateParams.steps = [];
+            this.updateParams.stepNum = 0;
+            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.updateParams.steps = jobData.steps;
+            this.updateParams.jobInventoryName = jobData.name;
+            this.updateParams.stepNum = jobData.steps.length;
+            this.updateParams.steps.forEach((item, i) => {
+                item.index = i + 1
+            })
+
+            this.buildUpdateForm()
+        }
+        //是否为两大一重
+        if (item && item.key === 'majorSign') {
+            if (data.includes(0)) {
+                data.splice(0, data.length)
+                data.push(0)
+            }
+            this.buildUpdateForm()
+        }
+    }
     //加载作业清单列表
     public loadJobData(id?) {
         this.workService.selectByPage({ pageSize: 1000, unitId: id }).then((res: any) => {
@@ -1028,262 +659,25 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
             this.buildUpdateForm()
         })
     }
-    // 树点击
-    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: "areaName", width: "200px" });
-        this.tableColumn.push({ name: '风险分析单元', key: "unitName", width: "200px" });
-        this.tableColumn.push({
-            name: '作业活动', key: "jobInventoryName", render: (data) => {
-                console.log('data', data);
-
-                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: "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 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 showPros(el, data) {
+        const isTarget = el.target.classList.contains("link");
+        if (isTarget) {
+            this.showProtable = true;
+            this.currentProTableData.datas = data.steps.map((item, index) => {
+                item.index = index + 1;
+                return item
+            })
         }
     }
 
-    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 proCallback() {
+        this.showProtable = false;
     }
-
-    //分析法 
-    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(row, isReadonly, isModifyonly) {
-        this.updateParams = { number: null, tableItems: [] } as any;
-        this.isReadonly = !!isReadonly;
+        this.updateParams = { majorSign: [], steps: [], } as any;
         if (!row) {
             this.currentId = -1;
             this.showUpdate = true;
@@ -1292,72 +686,76 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
             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(";"),
+                        majorHazardName: !res.data.majorHazard ? null : res.data.majorHazard.split(";").map(item => this.sourceMap[item]).join(";"),
+                        regulatoryProcessName: !res.data.regulatoryProcess ? null : res.data.regulatoryProcess.split(";").map(item => this.craftMap[item]).join(";"),
+                        regulatoryChemicalName: !res.data.regulatoryChemical ? null : res.data.regulatoryChemical.split(";").map(item => this.chemicaltMap[item]).join(";"),
+                        majorSignName: !res.data.majorSign ? null : res.data.majorSign.split(";").map(item => this.$store.getters.prevention_majorsign_map[item]).join(";"),
                         riskLevelName: this.$store.getters.prevention_risk_level_map[res.data.riskLevel],
-                        remainRiskLevelName: this.$store.getters.prevention_risk_level_map[res.data.remainRiskLevel]
+                        remainRiskLevelName: this.$store.getters.prevention_risk_level_map[res.data.remainRiskLevel],
+                        typeName: this.$store.getters.prevention_device_type_map[res.data.type]
                     }, res.data)
-                } else if (isModifyonly) {
+                    this.updateParams.majorSign = this.stringChangeArray(res.data.majorSign)
+                    this.updateParams.majorHazard = this.stringChangeArray(res.data.majorHazard)
+                    this.updateParams.regulatoryProcess = this.stringChangeArray(res.data.regulatoryProcess)
+                    this.updateParams.regulatoryChemical = this.stringChangeArray(res.data.regulatoryChemical)
+                    this.updateParams.steps = this.updateParams.steps.map((item, index) => {
+                        item.index = index + 1;
+                        return item
+                    })
+                    this.isReadonly = true
+                } else {
+                    this.isReadonly = false
+                    this.isModifyonly = true
                     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.updateParams.regulatoryProcess = this.stringChangeArray(res.data.regulatoryProcess)
+                    this.updateParams.regulatoryChemical = this.stringChangeArray(res.data.regulatoryChemical)
                     this.loadUnitData(res.data.areas)
+                    this.loadJobData(res.data.unitId)
+                    this.updateParams.steps.forEach((item, i) => {
+                        item.index = i + 1
+                    })
                 }
-                // this.updateParams.tableItems.forEach((item,i)=>{
-                //     item.index = i+1
-                // })
+
                 this.buildUpdateForm()
                 this.showUpdate = true;
             })
         }
     }
 
-    //工作分析评价
-    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 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.updateParams.safetyFactor = this.arrayChangeString(this.updateParams.safetyFactor)
+        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.updateParams.safetyFactor = this.arrayChangeString(this.updateParams.safetyFactor)
+        this.tableService.addOrDraft(this.updateParams, !this.updateParams.id).then((res) => {
+            this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功！");
+            this.showUpdate = false;
+            this.getTableData();
+        })
+    }
     public toggleAll() {
         (this.$refs.multipleTable as any).toggleAllSelection();
     }
@@ -1377,188 +775,50 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
     public handleSelectionChange(data) {
         this.selectData = data;
     }
+    public handleSubSelectionChange(data) {
+        this.subSelectData = data
+    }
 
+    //分析评价
+    public showSubModel(row, isReadonly) {
+        this.analysisUpdateParams = {
+            riskChoose: [],
+            remainChoose: [],
+        } as any;
+        if (row) {
+            if (isReadonly) {
+                this.analyIsReadonly = true;
+                this.analysisUpdateParams = Object.assign({
+                    seriousResultName: row.seriousResult.split(";").map(item => this.$store.getters.prevention_serious_result_map[item]).join(";"),
+                    safetySignName: row.safetySign.split(";").map(item => this.$store.getters.prevention_security_identifier_map[item]).join(";"),
+                    riskLevelName: this.$store.getters.prevention_risk_level_map[row.riskLevel],
+                    remainLevelName: this.$store.getters.prevention_risk_level_map[row.remainLevel],
+                    riskControlLevelName: this.$store.getters.prevention_control_level_map[row.riskControlLevel],
+                }, row)
+                this.analysisUpdateParams = { ...this.analysisUpdateParams, ...JSON.parse(JSON.stringify(row)) };
 
-    //风险评估
-    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)
-                }
+            } else {
+                this.analyIsReadonly = false
+                // 暂存数据 用于取消修改
+                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 ? row.riskChoose.split(";") : []
+                this.analysisUpdateParams.remainChoose = row.remainChoose ? row.remainChoose.split(";") : []
+                this.analysisUpdateParams.chargeUserName = this.updateParams.chargeUserName
             }
         }
-        this.checkRiskType.risk = data
-        this.checkRiskType.type = 'risk'
-        this.analysisUpdateParams.riskLevel = null
-        this.compareRiskLevel()
+        this.showSubUpdate = true
     }
 
-    //残余风险评估
-    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(";")
+            if (data instanceof Array) {
+                return data.join(";")
+            } else {
+                return data
+            }
         } else {
             return null
         }
@@ -1570,329 +830,6 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
             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>