From 69670fe155254406b615bce246f3565223273ad3 Mon Sep 17 00:00:00 2001
From: kongyeqing <2697454777@qq.com>
Date: Mon, 3 Jul 2023 16:31:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86bug=EF=BC=8C=E6=8E=92=E6=9F=A5=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=A1=A8=E6=A0=BC=E4=B8=8D=E6=98=BE=E7=A4=BA=20style?=
 =?UTF-8?q?=EF=BC=9A=E8=B0=83=E6=95=B4=E7=9A=84=E5=BC=B9=E6=A1=86=E7=9A=84?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=EF=BC=8C=E8=A1=A8=E6=A0=BC=E7=9A=84=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/analEvaluation.component.vue   | 19 +++++--
 src/components/measure.component.vue          | 15 ++++--
 src/service/duty.service.ts                   |  2 +-
 .../assessment/device/device.component.html   |  4 +-
 .../device/deviceAnal.component.html          |  6 +--
 .../device/deviceAnal.component.vue           | 42 +++++++++------
 .../assessment/work/workAnal.component.html   |  8 +--
 .../assessment/work/workAnal.component.vue    | 54 ++++++++++++-------
 src/views/risk/duty/duty.component.vue        |  4 +-
 src/views/risk/duty/dutyRecords.component.vue | 27 ++++++----
 .../risk/measures/measures.component.html     |  2 +-
 .../risk/measures/measures.component.vue      |  4 +-
 .../measuresReport.component.vue              | 52 +++++++++++++-----
 13 files changed, 159 insertions(+), 80 deletions(-)

diff --git a/src/components/analEvaluation.component.vue b/src/components/analEvaluation.component.vue
index 8e72272..635dfcf 100644
--- a/src/components/analEvaluation.component.vue
+++ b/src/components/analEvaluation.component.vue
@@ -14,7 +14,7 @@
             <TableComponent :tableData="analysisUpdateParams.measures" :tableColumn="triTableColumn"
                 @actionCallback="measureCallback($event)" :actions="analyIsReadonly ? [] : triTableActions"
                 actionPosition="flex-start" :showFooter="false" style="margin-bottom: 20px;">
-                <el-table ref="multipleTable" :data="analysisUpdateParams.measures" tooltip-effect="dark" height="500"
+                <el-table ref="multipleTable" :data="analysisUpdateParams.measures" tooltip-effect="dark" max-height="500"
                     border row-key="checked" @selection-change="handleSelectionChange" style="width: 100%">
                     <el-table-column type="selection" fixed label="全选" width="40">
                     </el-table-column>
@@ -45,7 +45,7 @@
         </FormComponent>
 
         <!-- 风险评估方法 -->
-        <el-dialog :close-on-click-modal="false" :show-close="false" :visible.sync="showRiskUpdate" width="800px"
+        <el-dialog :close-on-click-modal="false" :show-close="false" :visible.sync="showRiskUpdate" width="952px"
             :before-close="handleClose">
             <FormComponent :options="riskType === 'ls' ? riskLSUpdateOptions : riskLECUpdateOptions" labelWidth="110px"
                 labelAlign="right" :data.sync="methodUpdateParams" @actionCallback="methodCallback" :actions="triActions"
@@ -61,7 +61,7 @@
         </el-dialog>
         <!-- 风险评估取值 -->
         <div v-if="showRiskValueUpdate">
-            <el-dialog :close-on-click-modal="false" :title="riskTitle" :visible.sync="showRiskValueUpdate" width="750px"
+            <el-dialog :close-on-click-modal="false" :title="riskTitle" :visible.sync="showRiskValueUpdate" width="952px"
                 :before-close="handleClose" :show-close="false">
                 <TableComponent :tableData="riskTableData" :tableColumn="riskTableColumn" @tabCallback="popCallback($event)"
                     actionPosition="flex-start" :showFooter="false" style="margin-bottom: 20px;"
@@ -82,7 +82,7 @@
             </el-dialog>
         </div>
 
-        <el-dialog :close-on-click-modal="false" :title="'管控措施制定'" :visible.sync="subUpdate" width="750px"
+        <el-dialog :close-on-click-modal="false" :title="'管控措施制定'" :visible.sync="subUpdate" width="952px"
             :before-close="handleMeasureClose">
             <MeasureComponent @actionCallback="dataCallback" :data.sync="measuresData" :show.sync="subUpdate"
                 :tabledata.sync="analysisUpdateParams" :isReadonly="measureIsReadonly">
@@ -273,6 +273,7 @@ export default class AnalEvaluationComponent extends Vue {
                 multiple: true,
                 width: "calc(50% - 20px)",
                 datas: this.$store.state.prevention_serious_result,
+                filterable: true,
             },
             {
                 name: "危害分析",
@@ -290,6 +291,7 @@ export default class AnalEvaluationComponent extends Vue {
                 multiple: true,
                 width: "calc(50% - 20px)",
                 datas: this.$store.state.prevention_security_identifier,
+                filterable: true,
             },
             {
                 name: "设置复评时间",
@@ -360,6 +362,7 @@ export default class AnalEvaluationComponent extends Vue {
                 multiple: true,
                 width: "calc(50% - 20px)",
                 datas: this.$store.state.prevention_serious_result,
+                filterable: true,
             },
             {
                 name: "危害分析",
@@ -377,6 +380,7 @@ export default class AnalEvaluationComponent extends Vue {
                 multiple: true,
                 width: "calc(50% - 20px)",
                 datas: this.$store.state.prevention_security_identifier,
+                filterable: true,
             },
             {
                 name: "设置复评时间",
@@ -598,7 +602,7 @@ export default class AnalEvaluationComponent extends Vue {
     }
 
     public buildTable() {
-        this.triTableColumn.push({ name: '序号', key: "index" });
+        this.triTableColumn.push({ name: '序号', key: "index",width:"80px" });
         this.triTableColumn.push({
             name: '管控方法', key: "controlWayName", render: (data) => {
                 if (data.controlWay) {
@@ -838,6 +842,11 @@ export default class AnalEvaluationComponent extends Vue {
             this.measuresData.firstTypeName = this.$store.getters.prevention_measures_sort_map[row.firstType]
             const secondTypeItem = this.measuresSelectData[row.firstType]
             this.measuresData.secondTypeName = this.selectName(secondTypeItem, row.secondType)
+            this.measuresData = Object.assign({ tasks: [] }, row)
+            this.measuresData.tasks.forEach((item, index) => {
+                item.index = index + 1
+                return item
+            })
         } else if (!isReadonly) {
             this.measureIsReadonly = false
             this.measuresData = Object.assign({ tasks: [] }, row)
diff --git a/src/components/measure.component.vue b/src/components/measure.component.vue
index d89923d..8854b5a 100644
--- a/src/components/measure.component.vue
+++ b/src/components/measure.component.vue
@@ -8,7 +8,7 @@
             <TableComponent :tableData="updataParams.tasks" :tableColumn="tableColumn" @actionCallback="taskAdd($event)"
                 :actions="!isReadonly ? tableActions : []" actionPosition="flex-start" :showFooter="false"
                 style="margin-bottom: 20px;">
-                <el-table ref="multipleTable" :data="updataParams.tasks" tooltip-effect="dark" height="500" border
+                <el-table ref="multipleTable" :data="updataParams.tasks" tooltip-effect="dark" max-height="500px" border
                     row-key="checked" @selection-change="handleSelectionChange" style="width: 100%">
                     <template v-for="item in tableColumn">
                         <el-table-column v-if="item.render" :show-overflow-tooltip="item.showTip" :label="item.name"
@@ -31,7 +31,7 @@
             </TableComponent>
         </FormComponent>
 
-        <el-dialog :close-on-click-modal="false" :title="'新增'" :visible.sync="showSubUpdate" width="700px"
+        <el-dialog :close-on-click-modal="false" :title="'新增'" :visible.sync="showSubUpdate" width="952px"
             :before-close="handleCloseTask">
             <FormComponent :options="taskUpdateOptions" :isReadonly="taskIsReadonly" labelWidth="110px" labelAlign="right"
                 :data.sync="taskUpdataParams" :actions="subActions" :full-btn="true" btnPosition="center"
@@ -323,7 +323,7 @@ export default class MeasureComponent extends Vue {
 
     public buildTable() {
         // 排查任务制定
-        this.tableColumn.push({ name: '序号', key: "index" });
+        this.tableColumn.push({ name: '序号', key: "index" ,width:"80px"});
         this.tableColumn.push({ name: "任务名称", key: "name" })
         this.tableColumn.push({ name: "执行岗位", key: "executePostName" })
         this.tableColumn.push({ name: "执行人", key: "chargeUserName" })
@@ -385,6 +385,15 @@ export default class MeasureComponent extends Vue {
         if (isReadonly) {
             this.taskIsReadonly = true
             this.taskUpdataParams = JSON.parse(JSON.stringify(row))
+            if (row.insuranceDutyFlag === 0) {
+                this.taskUpdataParams.taskType = 0
+                this.taskUpdataParams.insuranceDutyFlagName = '否'
+                this.taskUpdataParams.taskTypeName = '日常任务'
+            } else if (row.insuranceDutyFlag === 1) {
+                this.taskType = this.taskType.filter(item => item.id !== 0)
+                this.taskUpdataParams.insuranceDutyFlagName = "是"
+                this.taskItem = this.tasksSelectData[this.taskUpdataParams.taskType]
+            }
             this.taskUpdataParams.taskTypeName = this.$store.getters.prevention_task_type_map[row.taskType]
             this.taskUpdataParams.reviewCycleValueName = this.$store.getters.prevention_cycle_unit_map[row.reviewCycleUnit]
             if (this.taskUpdataParams.taskType && this.taskUpdataParams.taskItem) {
diff --git a/src/service/duty.service.ts b/src/service/duty.service.ts
index a1834be..4197c8d 100644
--- a/src/service/duty.service.ts
+++ b/src/service/duty.service.ts
@@ -10,7 +10,7 @@ export default class DutyService extends BaseService<any>{
         return this.get(url,params,true)
     }
     public deleteByIds(params):Promise<AxiosResponse<ActionResult<any>>>{
-        const url = this.prefix.system+'/user/list';
+        const url = this.prefix.prevention+'/risk/task';
         return this.deleteBatch(url,params,{},true)
     }
 
diff --git a/src/views/risk/assessment/device/device.component.html b/src/views/risk/assessment/device/device.component.html
index 84cbc37..a5a6668 100644
--- a/src/views/risk/assessment/device/device.component.html
+++ b/src/views/risk/assessment/device/device.component.html
@@ -77,14 +77,14 @@
     </el-dialog>
 
     <el-dialog :close-on-click-modal="false" :title="proIsReadonly?'详情':updateProParams.index ?'编辑' :'新增'"
-        :visible.sync="showProject" width="700px" :before-close="handleProClose">
+        :visible.sync="showProject" width="952px" :before-close="handleProClose">
         <FormComponent :options="projectOptions" :isReadonly="proIsReadonly" labelWidth="110px" labelAlign="right"
             :data.sync="updateProParams" :actions="proIsReadonly ? [] :updateActions" @actionCallback="subCallback"
             :full-btn="true" btnPosition="center">
         </FormComponent>
     </el-dialog>
 
-    <el-dialog :close-on-click-modal="false" title="检查项目" :visible.sync="showProtable" width="800"
+    <el-dialog :close-on-click-modal="false" title="检查项目" :visible.sync="showProtable" width="952px"
         :before-close="handleClosePro">
         <TableComponent :tableData="currentProTableData" :tableColumn="subTableColumn" :showFooter="false"
             style="margin-bottom: 20px;">
diff --git a/src/views/risk/assessment/device/deviceAnal.component.html b/src/views/risk/assessment/device/deviceAnal.component.html
index a779cc0..38fc435 100644
--- a/src/views/risk/assessment/device/deviceAnal.component.html
+++ b/src/views/risk/assessment/device/deviceAnal.component.html
@@ -53,7 +53,7 @@
             <TableComponent :tableData="currentStepTableData" :tableColumn="subTableColumn"
                 @actionCallback="callback($event)" :actions="isReadonly? []:subTableActions" actionPosition="flex-start"
                 :showFooter="false" style="margin-bottom: 20px;">
-                <el-table ref="multipleTable" :data="updateParams.items" tooltip-effect="dark" height="500" border
+                <el-table ref="multipleTable" :data="updateParams.items" tooltip-effect="dark" max-height="500" border
                     row-key="checked" @selection-change="handleSubSelectionChange" style="width: 100%">
                     <el-table-column type="selection" fixed label="全选" width="40">
                     </el-table-column>
@@ -88,7 +88,7 @@
         <img style="width:90%" src="../../../../assets/images/5.png" alt="">
     </el-dialog>
     <!-- 评价 -->
-    <el-dialog :close-on-click-modal="false" :visible.sync="showSubUpdate" width="880px"
+    <el-dialog :close-on-click-modal="false" :visible.sync="showSubUpdate" width="952px"
         :before-close="handleAnalyClose">
         <AnalEvaluationComponent :isReadonly="analyIsReadonly" :data.sync="analysisUpdateParams"
             :show.sync="showSubUpdate" @actionCallback="analyCallback" :tabledata.sync="updateParams"
@@ -96,7 +96,7 @@
     </el-dialog>
     <!-- 检查项目 -->
     <el-dialog :close-on-click-modal="false" title="检查项目" :show-close="false" :visible.sync="showProtable"
-        width="880px">
+        width="952px">
         <FormComponent labelWidth="110px" labelAlign="right" :actions="proActions" @actionCallback="proCallback"
             :full-btn="true" btnPosition="center">
             <TableComponent :tableData="currentProTableData" :tableColumn="proTableColumn" :showFooter="false"
diff --git a/src/views/risk/assessment/device/deviceAnal.component.vue b/src/views/risk/assessment/device/deviceAnal.component.vue
index 5daa18a..2fda79e 100644
--- a/src/views/risk/assessment/device/deviceAnal.component.vue
+++ b/src/views/risk/assessment/device/deviceAnal.component.vue
@@ -264,7 +264,23 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
             type: "checkbox",
             width: "calc(100% - 20px)",
             require: true,
-            datas: this.$store.state.prevention_majorsign,
+            datas: [{
+                name: "不涉及",
+                disable: false,
+                value: 0
+            }, {
+                name: "重大危险源",
+                disable: this.updateParams.majorSign.length > 0 && this.updateParams.majorSign.includes(0),
+                value: 1
+            }, {
+                name: "重大监管化工工艺",
+                disable: this.updateParams.majorSign.length > 0 && this.updateParams.majorSign.includes(0),
+                value: 2
+            }, {
+                name: "重点监管危化品",
+                disable: this.updateParams.majorSign.length > 0 && this.updateParams.majorSign.includes(0),
+                value: 3
+            }],
         }, {
             name: "重大危险源",
             key: "majorHazard",
@@ -555,7 +571,7 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
         //检查项目、
         this.proTableColumn.push({ name: '序号', key: "index" });
         this.proTableColumn.push({ name: '检查项目', key: "itemName" });
-        this.proTableColumn.push({ name: '检查标准', key: "itemStandard", showTip: true, width: "200px" });
+        this.proTableColumn.push({ name: '检查标准', key: "itemStandard", showTip: true, width: "250px" });
         this.proTableColumn.push({ name: '风险源', key: "riskSource" });
         this.proTableColumn.push({
             name: '可能发生事故', key: "seriousResult", width: "150px", render: (data) => {
@@ -566,15 +582,14 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
         });
         this.proTableColumn.push({
             name: '风险等级', key: "riskLevel", render: (data) => {
-                if (data.riskLevel) {
-                    return this.$store.getters.prevention_risk_level_map[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 this.$store.getters.prevention_risk_level_map[data.remainLevel]
+                    return "<span class='color_" + data.remainLevel + "'>" + (data.remainLevel ? (this.$store.getters.prevention_risk_level_map[data.remainLevel]) : '') + "</span>"
+
                 }
             }
         });
@@ -712,22 +727,20 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
                 return item
             })
             this.updateParams.itemNum = diviceData.items.length;
-            this.buildUpdateForm()
         }
         //是否为两大一重
         if (item && item.key === 'majorSign') {
             if (!data) {
                 data = []
             }
-            if (data.includes(0)) {
-                if (data.length.length > 0) {
-                    data.splice(0, data.length)
-                }
-
+            if (data.length > 0 && data.includes(0)) {
+                data = []
+                this.updateParams.majorSign = []
                 data.push(0)
+                this.updateParams.majorSign.push(0)
             }
-            this.buildUpdateForm()
         }
+        this.buildUpdateForm()
     }
     //加载设备设施清单列表
     public loadJobData(unitId) {
@@ -906,7 +919,6 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
                     typeName: this.$store.getters.prevention_device_type_map[row.deviceType]
                 }, row)
                 this.analysisUpdateParams = { ...this.analysisUpdateParams, ...JSON.parse(JSON.stringify(row)) };
-                console.log('this.analysisUpdateParams', this.analysisUpdateParams);
                 this.analysisUpdateParams.measures.forEach((item, index) => {
                     item.index = index + 1
                     return item
diff --git a/src/views/risk/assessment/work/workAnal.component.html b/src/views/risk/assessment/work/workAnal.component.html
index ca897a0..b85c4e9 100644
--- a/src/views/risk/assessment/work/workAnal.component.html
+++ b/src/views/risk/assessment/work/workAnal.component.html
@@ -54,7 +54,7 @@
                 @actionCallback="callback($event)" :actions="isReadonly? []:subTableActions" actionPosition="flex-start"
                 :showFooter="false" style="margin-bottom: 20px;">
 
-                <el-table ref="multipleTable" :data="updateParams.steps" tooltip-effect="dark" height="500" border
+                <el-table ref="multipleTable" :data="updateParams.steps" tooltip-effect="dark" max-height="500" border
                     row-key="checked" @selection-change="handleSubSelectionChange" style="width: 100%">
                     <el-table-column type="selection" fixed label="全选" width="40">
                     </el-table-column>
@@ -71,7 +71,7 @@
                     <el-table-column label="操作" fixed="right" width="150">
                         <template slot-scope="scope">
                             <el-button v-if="isReadonly || isModifyonly" type="text"
-                                @click="showSubModel(scope.row,isReadonly)">查看</el-button>
+                                @click="showSubModel(scope.row,true)">查看</el-button>
                             <el-button v-if="isModifyonly" type="text" @click="showSubModel(scope.row)">修改</el-button>
                             <el-button v-if="!isReadonly  && !isModifyonly" type="text" @click="showSubModel(scope.row)">评价</el-button>
                         </template>
@@ -90,7 +90,7 @@
         <img style="width:90%" src="../../../../assets/images/5.png" alt="">
     </el-dialog>
     <!-- 危害分析评价 -->
-    <el-dialog :close-on-click-modal="false" :visible.sync="showSubUpdate" width="880px"
+    <el-dialog :close-on-click-modal="false" :visible.sync="showSubUpdate" width="952px"
         :before-close="handleAnalyClose">
         <AnalEvaluationComponent :isReadonly="analyIsReadonly" :data.sync="analysisUpdateParams"
             :show.sync="showSubUpdate" @actionCallback="analyCallback" :tabledata.sync="updateParams"
@@ -103,7 +103,7 @@
             :full-btn="true" btnPosition="center">
             <TableComponent :tableData="currentProTableData" :tableColumn="proTableColumn" :showFooter="false"
                 style="margin-bottom: 20px;">
-                <el-table ref="multipleTable" :data="currentProTableData.datas" tooltip-effect="dark" height="250"
+                <el-table ref="multipleTable" :data="currentProTableData.datas" tooltip-effect="dark" max-height="500"
                     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">
diff --git a/src/views/risk/assessment/work/workAnal.component.vue b/src/views/risk/assessment/work/workAnal.component.vue
index b781c82..32a0e10 100644
--- a/src/views/risk/assessment/work/workAnal.component.vue
+++ b/src/views/risk/assessment/work/workAnal.component.vue
@@ -262,11 +262,27 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
             type: "checkbox",
             width: "calc(100% - 20px)",
             require: true,
-            datas: this.$store.state.prevention_majorsign,
+            datas: [{
+                name: "不涉及",
+                disable: false,
+                value: 0
+            }, {
+                name: "重大危险源",
+                disable: this.updateParams.majorSign.includes(0),
+                value: 1
+            }, {
+                name: "重大监管化工工艺",
+                disable: this.updateParams.majorSign.includes(0),
+                value: 2
+            }, {
+                name: "重点监管危化品",
+                disable: this.updateParams.majorSign.includes(0),
+                value: 3
+            }],
         }, {
             name: "重大危险源",
             key: "majorHazard",
-            hide: !this.updateParams.majorSign || this.updateParams.majorSign.length === 0 || !this.updateParams.majorSign.includes(1) || this.updateParams.majorSign.includes(0),
+            hide: !this.updateParams.majorSign || this.updateParams.majorSign.length === 0 || (!this.updateParams.majorSign.includes(1) || this.updateParams.majorSign.includes(0)),
             type: "select",
             format: "majorHazardName",
             width: "calc(50% - 20px)",
@@ -490,9 +506,9 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
 
 
         //分析评价
-        this.subTableColumn.push({ name: '序号', key: "index" });
+        this.subTableColumn.push({ name: '序号', key: "index", width: "50px" });
         this.subTableColumn.push({
-            name: '状态', key: "status", render: (data) => {
+            name: '状态', key: "status", width: "80px", render: (data) => {
                 if (data.status && data.status !== 1) {
                     let tmpstatus: any = data.status
                     if (data.status === 2) {
@@ -507,24 +523,24 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         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: "hazardAnalysis", width: "200px" });
         this.subTableColumn.push({
-            name: '最严重后果', key: "seriousResult", width: "200px", render: (data) => {
+            name: '最严重后果', key: "seriousResult", width: "100px", 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) => {
+            name: '风险等级', key: "riskLevel", width: "100px", 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: "riskChoose", width: "100px", });
         this.subTableColumn.push({
-            name: '残余风险等级', key: "remainLevel", width: "200px", render: (data) => {
+            name: '残余风险等级', key: "remainLevel", width: "130px", render: (data) => {
                 if (data.remainLevel) {
                     return this.$store.getters.prevention_risk_level_map[data.remainLevel]
                 }
@@ -545,11 +561,11 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         });
 
         //作业步骤
-        this.proTableColumn.push({ name: '序号', key: "index" });
+        this.proTableColumn.push({ name: '序号', key: "index", width: "80px" });
         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: "riskSource", width: "100px", });
         this.proTableColumn.push({
             name: '可能发生事故', key: "seriousResult", width: "150px", render: (data) => {
                 if (data.seriousResult) {
@@ -565,7 +581,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
             }
         });
         this.proTableColumn.push({
-            name: '残余风险等级', key: "remainLevel", width: "150px", render: (data) => {
+            name: '残余风险等级', key: "remainLevel", width: "120px", render: (data) => {
                 if (data.remainLevel) {
                     return "<span class='color_" + data.remainLevel + "'>" + (data.remainLevel ? (this.$store.getters.prevention_risk_level_map[data.remainLevel]) : '') + "</span>"
                 }
@@ -702,8 +718,6 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
             this.updateParams.steps.forEach((item, i) => {
                 item.index = i + 1
             })
-
-            this.buildUpdateForm()
         }
         //是否为两大一重
         if (item && item.key === 'majorSign') {
@@ -711,18 +725,18 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
                 data = []
             }
             if (data.includes(0)) {
-                if (data.length.length > 0) {
-                    data.splice(0, data.length)
-                }
-
+                data = []
+                this.updateParams.majorSign = []
                 data.push(0)
+                this.updateParams.majorSign.push(0)
             }
-            this.buildUpdateForm()
+
         }
+        this.buildUpdateForm()
     }
     //加载作业清单列表
     public loadJobData(id?) {
-        this.tableService.selectWorkByUnit({ unitId: id }).then((res: any) => {
+        this.tableService.selectWorkByUnit({ unitId: id, id: this.updateParams.id ? this.updateParams.id : null }).then((res: any) => {
             this.jobList = res.data.map(item => {
                 return {
                     name: item.name,
diff --git a/src/views/risk/duty/duty.component.vue b/src/views/risk/duty/duty.component.vue
index f03edff..5bdf13e 100644
--- a/src/views/risk/duty/duty.component.vue
+++ b/src/views/risk/duty/duty.component.vue
@@ -251,9 +251,9 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
                 if (data.status == 2) {
                     return "<span class='noDraw'>待排查</span>"
                 } else if (data.status == 1) {
-                    return "<span>已排查</span>"
+                    return "<span class='color_1'>已排查</span>"
                 } else if (data.status == 3) {
-                    return "<span class='noDraw'>超期未排查</span>"
+                    return "<span class='color_3'>超期未排查</span>"
                 }
             },
             filters: this.$store.state.prevention_task_status.map(item => {
diff --git a/src/views/risk/duty/dutyRecords.component.vue b/src/views/risk/duty/dutyRecords.component.vue
index b600cd2..62b2220 100644
--- a/src/views/risk/duty/dutyRecords.component.vue
+++ b/src/views/risk/duty/dutyRecords.component.vue
@@ -98,26 +98,25 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
             type: "text",
             labelWidth: 'auto',
             require: true,
-            with: "100%"
+            width: "calc(50% - 20px)"
         }, {
             name: "隐患排查任务",
             key: "taskName",
             type: "text",
             require: true,
-            with: "calc(50% - 20px)"
+            width: "calc(50% - 20px)"
         }, {
             name: "排查结果",
             key: "result",
             format: "resultName",
             type: "radio",
             require: true,
-            with: "calc(50% - 20px)"
+            width: "calc(50% - 20px)"
         }, {
             name: "是否为隐患",
             key: "dangerFlag",
             format: "dangerFlagName",
             type: "radio",
-            labelWidth: 'auto',
             require: true,
             width: "calc(50% - 20px)",
         }, {
@@ -150,6 +149,7 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
         {
             name: " 排查人",
             key: "checkUserId",
+            format: 'checkUserName',
             type: "text",
             width: "calc(50% - 20px)",
             require: true,
@@ -167,7 +167,7 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
             ref: "file",
             format: "resourceIdName",
             type: "upload",
-            width: "calc(50% - 20px)",
+            width: "100%",
             showError: false,
             onSucess: this.onSuccess2,
             onMove: this.onRemove2,
@@ -200,16 +200,22 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
     public buildTable() {
         this.tableColumn.push({ name: '隐患排查任务', key: "taskName", with: "250px" });
         this.tableColumn.push({
-            name: '排查结果', width: "110px", key: "result", render: (data) => {
+            name: '排查结果', key: "result", render: (data) => {
                 if (data.status == 0) {
                     return "<span class='noDraw'>异常</span>"
                 } else if (data.status == 1) {
-                    return "<span>正常</span>"
+                    return "<span class='color_1'>正常</span>"
                 }
             }
         });
         this.tableColumn.push({ name: '问题描述', key: "description" });
-        this.tableColumn.push({ name: '排查人', key: "checkUserId" });
+        this.tableColumn.push({
+            name: '排查人', key: "checkUserId", render: (data) => {
+                if (data.checkUserId) {
+                    return this.$store.getters.user_map[data.checkUserId]
+                }
+            }
+        });
         this.tableColumn.push({ name: '排查时间', key: "checkTime" });
         this.tableColumn.push({
             name: '是否为隐患', key: "dangerFlag", render: (data) => {
@@ -343,10 +349,11 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
             insuranceDutyFlagName: row.insuranceDutyFlag === 0 ? '否' : '是',
             resultName: row.result === 1 ? '正常' : '异常',
             dangerFlagName: row.dangerFlag === 0 ? '否' : '是',
-            taskTypeName: this.$store.getters.prevention_hazard_category_map[row.dangerType]
+            taskTypeName: this.$store.getters.prevention_hazard_category_map[row.dangerType],
+            checkUserName: this.$store.getters.user_map[row.checkUserId]
         }, row)
         this.showUpdate = true
-        this.updateParams.resourceId= null
+        this.updateParams.resourceId = null
         this.subUpdateForm()
     }
 }
diff --git a/src/views/risk/measures/measures.component.html b/src/views/risk/measures/measures.component.html
index bf72b4f..7fd6265 100644
--- a/src/views/risk/measures/measures.component.html
+++ b/src/views/risk/measures/measures.component.html
@@ -46,7 +46,7 @@
 
     <!-- 管控措施详情 -->
     <el-dialog :close-on-click-modal="false" title="管控措施" :show-close="false" :visible.sync="showProtable"
-        width="940px">
+        width="952px">
         <TableComponent :tableData="currentProTableData" :tableColumn="proTableColumn" :showFooter="false"
             style="margin-bottom: 20px;">
             <el-table ref="multipleTable" :data="currentProTableData.datas" tooltip-effect="dark" height="250" border
diff --git a/src/views/risk/measures/measures.component.vue b/src/views/risk/measures/measures.component.vue
index 4521aa6..a2eeae0 100644
--- a/src/views/risk/measures/measures.component.vue
+++ b/src/views/risk/measures/measures.component.vue
@@ -133,7 +133,7 @@ export default class MeasuresManagerComponent extends BaseRecordComponent<any> {
 
 
         //管控措施详情
-        this.proTableColumn.push({ name: '序号', key: "index" });
+        this.proTableColumn.push({ name: '序号', key: "index",width:"80px" });
         this.proTableColumn.push({
             name: '措施类型一', key: "firstTypeName", render: (data) => {
                 if (data.firstType) {
@@ -151,7 +151,7 @@ export default class MeasuresManagerComponent extends BaseRecordComponent<any> {
             }
         });
         this.proTableColumn.push({ name: '措施类型三', key: "thirdType" });
-        this.proTableColumn.push({ name: '管控措施', key: "description" });
+        this.proTableColumn.push({ name: '管控措施', key: "description" ,width:"300px"});
     }
 
     public callback(data) {
diff --git a/src/views/risk/measuresReport/measuresReport.component.vue b/src/views/risk/measuresReport/measuresReport.component.vue
index 9a3cdd2..710484e 100644
--- a/src/views/risk/measuresReport/measuresReport.component.vue
+++ b/src/views/risk/measuresReport/measuresReport.component.vue
@@ -57,10 +57,10 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
     }];
 
     public filters = [{
-        text: "已发布",
+        text: "未发布",
         value: 0
     }, {
-        text: "未发布",
+        text: "已发布",
         value: 1
     }]
 
@@ -133,7 +133,7 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
                 if (data.status == 0) {
                     return "<span class='noDraw'>未发布</span>"
                 } else if (data.status == 1) {
-                    return "<span>已发布</span>"
+                    return "<span class='color_1' >已发布</span>"
                 }
             },
             filters: this.filters.map(item => {
@@ -246,14 +246,36 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
         });
 
         //查看执行记录
-        this.proTableColumn.push({ name: '序号', key: "index" });
-        this.proTableColumn.push({ name: '排查时间', key: "taskChargeUserName" });
-        this.proTableColumn.push({ name: '排查人', key: "taskChargeUserName" });
-        this.proTableColumn.push({ name: '排查内容', key: "taskChargeUserName" });
-        this.proTableColumn.push({ name: '排查结果', key: "taskChargeUserName" });
-        this.proTableColumn.push({ name: '是否为隐患', key: "taskChargeUserName" });
-        this.proTableColumn.push({ name: '隐患描述', key: "taskChargeUserName" });
-        this.proTableColumn.push({ name: '隐患归属人', key: "taskChargeUserName" });
+        this.proTableColumn.push({ name: '序号', key: "index", width: "80px" });
+        this.proTableColumn.push({ name: '排查时间', key: "checkTime", width: "150px" });
+        this.proTableColumn.push({
+            name: '排查人', key: "checkUserId", render: (data) => {
+                if (data.checkUserId) {
+                    return this.$store.getters.user_map[data.checkUserId]
+                }
+            }
+        });
+        this.proTableColumn.push({ name: '排查内容', key: "taskName" });
+        this.proTableColumn.push({
+            name: '排查结果', key: "result", render: (data) => {
+                if (data.status == 0) {
+                    return "<span class='noDraw'>异常</span>"
+                } else if (data.status == 1) {
+                    return "<span>正常</span>"
+                }
+            }
+        });
+        this.proTableColumn.push({
+            name: '是否为隐患', key: "dangerFlag", render: (data) => {
+                if (data.status == 1) {
+                    return "<span class='noDraw'>是</span>"
+                } else if (data.status == 0) {
+                    return "<span>否</span>"
+                }
+            }
+        });
+        this.proTableColumn.push({ name: '隐患描述', key: "description" });
+        this.proTableColumn.push({ name: '隐患归属人', key: "ownerName" });
     }
 
     // 加载区域列表
@@ -389,14 +411,20 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
     //查看执行记录
     public showSubModal(id) {
         this.showProtable = true
+        this.currentProTableData.datas = [] as any;
         this.tableService.selectById({ controlId: id }).then((res: any) => {
             this.currentProTableData.datas = res.data.datas
+            this.currentProTableData.datas.forEach((item, index) => {
+                item.index = index + 1
+                return item
+            })
         })
     }
 
     //执行记录--关闭
     public subCallback() {
-        this.showProtable = false
+        this.showProtable = false;
+        this.currentProTableData.datas = [] as any;
     }
 
 }