diff --git a/src/App.vue b/src/App.vue
index 012b0c1..89ca5b3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -43,6 +43,9 @@ ul,li{
     font-family: en;
     src: url("./assets/common/fonts/Roboto-Regular.ttf");
 }
+.el-table__fixed, .el-table__fixed-right{
+  background: #FFF;
+}
 .full{
   width: 100%;
 }
@@ -61,19 +64,19 @@ ul,li{
 
 //滚动条
 ::-webkit-scrollbar {
-  width:6px;
-  height: 6px;
+  width:12px;
+  height: 12px;
 }
 
 /*滑动轨道*/
 ::-webkit-scrollbar-track {
-  background: rgba(0, 0, 0, 0.06);
+  background: rgba(0, 0, 0, 0.05);
   border-radius: 12px;
 }
 
 /*滑块*/
 ::-webkit-scrollbar-thumb {
-  background: linear-gradient(90deg, #393a3a 0%, #2c2d2d 100%);;
+  background: linear-gradient(90deg, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.1) 100%);;
   border-radius: 12px;
 
 }
diff --git a/src/views/common.component.scss b/src/views/common.component.scss
index 998ed10..6d0365f 100644
--- a/src/views/common.component.scss
+++ b/src/views/common.component.scss
@@ -138,6 +138,15 @@
     margin-bottom: 20px;
 }
 
+.sub-table-title {
+    width: 100%;
+    padding: 16px 0;
+    color: #606266;
+    font-size: 16px;
+    font-weight: 700;
+    // margin-bottom: 20px;
+}
+
 .sub-btn-box {
     width: 100%;
     display: flex;
diff --git a/src/views/hiddenDanger/clap.component.vue b/src/views/hiddenDanger/clap.component.vue
index f3746b3..73ca5de 100644
--- a/src/views/hiddenDanger/clap.component.vue
+++ b/src/views/hiddenDanger/clap.component.vue
@@ -672,7 +672,10 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent<any>
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll(){
         if(!this.selectData.length){
diff --git a/src/views/hiddenDanger/files.component.vue b/src/views/hiddenDanger/files.component.vue
index 0cd38e7..9d532e6 100644
--- a/src/views/hiddenDanger/files.component.vue
+++ b/src/views/hiddenDanger/files.component.vue
@@ -741,7 +741,10 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.filter(item=>item.status===5).forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll(){
         if(!this.selectData.length){
diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue
index 9118780..e4ec076 100644
--- a/src/views/hiddenDanger/manager.component.vue
+++ b/src/views/hiddenDanger/manager.component.vue
@@ -1147,7 +1147,10 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll(){
         if(!this.selectData.length){
diff --git a/src/views/hiddenDanger/rules/rules.component.vue b/src/views/hiddenDanger/rules/rules.component.vue
index 0c3e610..8a07cf3 100644
--- a/src/views/hiddenDanger/rules/rules.component.vue
+++ b/src/views/hiddenDanger/rules/rules.component.vue
@@ -233,7 +233,10 @@ export default class RulesComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll(){
         if(!this.selectData.length){
diff --git a/src/views/hiddenDanger/rules/rulesManager.component.vue b/src/views/hiddenDanger/rules/rulesManager.component.vue
index 77917da..7de17f7 100644
--- a/src/views/hiddenDanger/rules/rulesManager.component.vue
+++ b/src/views/hiddenDanger/rules/rulesManager.component.vue
@@ -498,6 +498,10 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
             this.getTableData();
             this.showUpdate = !!goOn;
             this.updateParams = {areas:[],depts:[],units:[],types:[],targets:[],number:null} as any;
+        }).catch(()=>{
+            this.updateParams.depts = this.updateParams.depts.map(item=>item.id)
+
+            this.updateParams.targets = this.updateParams.targets.map(item=>item.id)
         })
     }
 
@@ -516,7 +520,10 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll(){
         if(!this.selectData.length){
diff --git a/src/views/hiddenDanger/safe/action.component.vue b/src/views/hiddenDanger/safe/action.component.vue
index 25c1908..f322f52 100644
--- a/src/views/hiddenDanger/safe/action.component.vue
+++ b/src/views/hiddenDanger/safe/action.component.vue
@@ -645,7 +645,10 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
     }
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll(){
         if(!this.selectData.length){
diff --git a/src/views/hiddenDanger/safe/plan.component.vue b/src/views/hiddenDanger/safe/plan.component.vue
index c3634f1..715a4f0 100644
--- a/src/views/hiddenDanger/safe/plan.component.vue
+++ b/src/views/hiddenDanger/safe/plan.component.vue
@@ -614,7 +614,10 @@ export default class PlanComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll(){
         if(!this.selectData.length){
diff --git a/src/views/risk/area/area.component.vue b/src/views/risk/area/area.component.vue
index e3c5021..a8a31e6 100644
--- a/src/views/risk/area/area.component.vue
+++ b/src/views/risk/area/area.component.vue
@@ -408,7 +408,10 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll(){
         if(!this.selectData.length){
diff --git a/src/views/risk/assessment/device/device.component.vue b/src/views/risk/assessment/device/device.component.vue
index 43b9cd1..96f055b 100644
--- a/src/views/risk/assessment/device/device.component.vue
+++ b/src/views/risk/assessment/device/device.component.vue
@@ -458,7 +458,10 @@ export default class DeviceManagerComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll() {
         if (!this.selectData.length) {
diff --git a/src/views/risk/assessment/device/deviceAnal.component.vue b/src/views/risk/assessment/device/deviceAnal.component.vue
index cd12424..b5b7a06 100644
--- a/src/views/risk/assessment/device/deviceAnal.component.vue
+++ b/src/views/risk/assessment/device/deviceAnal.component.vue
@@ -890,7 +890,10 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
         })
     }
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll() {
         if (!this.selectData.length) {
diff --git a/src/views/risk/assessment/work/work.component.html b/src/views/risk/assessment/work/work.component.html
index 549b357..3211dec 100644
--- a/src/views/risk/assessment/work/work.component.html
+++ b/src/views/risk/assessment/work/work.component.html
@@ -44,7 +44,7 @@
         </div>
     </div>
 
-    <el-dialog :close-on-click-modal="false" :title="!updateParams.id'新增':isReadonly?'详情':'编辑'"
+    <el-dialog :close-on-click-modal="false" :title="!updateParams.id?'新增':isReadonly?'详情':'编辑'"
         :visible.sync="showUpdate" width="952px" :before-close="handleClose">
         <FormComponent :options="updateOptions" :isReadonly="isReadonly" @change="changes" labelWidth="110px"
             labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="updateActions"
diff --git a/src/views/risk/assessment/work/work.component.vue b/src/views/risk/assessment/work/work.component.vue
index 2088aa3..2ca4a17 100644
--- a/src/views/risk/assessment/work/work.component.vue
+++ b/src/views/risk/assessment/work/work.component.vue
@@ -324,6 +324,8 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
     }
 
     public buildTable() {
+        console.log(template);
+        
         this.tableColumn.push({ name: '区域名称', key: "areaName", width: "200px" });
         this.tableColumn.push({ name: '风险分析单元', key: "unitName", width: "200px" });
         this.tableColumn.push({ name: '作业活动', key: "name", showTip: true });
@@ -547,7 +549,10 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll() {
         if (!this.selectData.length) {
diff --git a/src/views/risk/assessment/work/workAnal.component.vue b/src/views/risk/assessment/work/workAnal.component.vue
index 9062884..1f1ff68 100644
--- a/src/views/risk/assessment/work/workAnal.component.vue
+++ b/src/views/risk/assessment/work/workAnal.component.vue
@@ -869,7 +869,10 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         })
     }
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll() {
         if (!this.selectData.length) {
diff --git a/src/views/risk/duty/duty.component.vue b/src/views/risk/duty/duty.component.vue
index 0d55d07..66316ab 100644
--- a/src/views/risk/duty/duty.component.vue
+++ b/src/views/risk/duty/duty.component.vue
@@ -359,7 +359,10 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll() {
         if (!this.selectData.length) {
diff --git a/src/views/risk/duty/dutyRecords.component.vue b/src/views/risk/duty/dutyRecords.component.vue
index 0aa30b3..54a78de 100644
--- a/src/views/risk/duty/dutyRecords.component.vue
+++ b/src/views/risk/duty/dutyRecords.component.vue
@@ -239,6 +239,8 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
         // 查询
         if (data.value === "search") {
             this.getTableData()
+            console.log('this.tableData',this.tableData);
+            
             // 重置
         } else if (data.value === "reset") {
             this.reset()
@@ -262,7 +264,7 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
     // 分页数据
     public getTableData() {
         this.tableService.selectByPage2(this.params).then(res => {
-            this.tableData = res.data as any;
+            this.tableData.datas = res.data as any;
         })
     }
 
@@ -276,7 +278,10 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll() {
         if (!this.selectData.length) {
diff --git a/src/views/risk/identify/identify.component.vue b/src/views/risk/identify/identify.component.vue
index 1ad054a..04dc1b1 100644
--- a/src/views/risk/identify/identify.component.vue
+++ b/src/views/risk/identify/identify.component.vue
@@ -460,7 +460,10 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll() {
         if (!this.selectData.length) {
diff --git a/src/views/risk/measures/measures.component.vue b/src/views/risk/measures/measures.component.vue
index e52c994..ad13c41 100644
--- a/src/views/risk/measures/measures.component.vue
+++ b/src/views/risk/measures/measures.component.vue
@@ -200,7 +200,10 @@ export default class MeasuresManagerComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll() {
         if (!this.selectData.length) {
diff --git a/src/views/risk/measuresReport/measuresReport.component.vue b/src/views/risk/measuresReport/measuresReport.component.vue
index a5fc043..a4602c3 100644
--- a/src/views/risk/measuresReport/measuresReport.component.vue
+++ b/src/views/risk/measuresReport/measuresReport.component.vue
@@ -375,7 +375,10 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll() {
         if (!this.selectData.length) {
@@ -424,7 +427,7 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
         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 = res.data
             this.currentProTableData.datas.forEach((item, index) => {
                 item.index = index + 1
                 return item
diff --git a/src/views/risk/unit/unit.component.vue b/src/views/risk/unit/unit.component.vue
index 16604b3..ac21d49 100644
--- a/src/views/risk/unit/unit.component.vue
+++ b/src/views/risk/unit/unit.component.vue
@@ -503,7 +503,10 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        (this.$refs.multipleTable as any).toggleAllSelection();
+        
+        this.tableData.datas.forEach((item,index)=>{
+            (this.$refs.multipleTable as any).toggleRowSelection(item);
+        })
     }
     public selectAll(){
         if(!this.selectData.length){