From fb146e0eace30274fecd4de0fd3cfe1aa456cf27 Mon Sep 17 00:00:00 2001
From: kongyeqing <2697454777@qq.com>
Date: Wed, 20 Sep 2023 09:47:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/draw.component.vue             |  5 +-
 src/components/map.component.vue              | 39 +++++++--------
 src/components/measure.component.vue          | 19 ++++++--
 src/views/hiddenDanger/clap.component.vue     |  8 ++--
 src/views/hiddenDanger/files.component.vue    |  2 +-
 src/views/hiddenDanger/manager.component.vue  | 14 +++---
 .../hiddenDanger/rules/rules.component.html   |  2 +-
 .../rules/rulesManager.component.vue          |  8 +++-
 .../hiddenDanger/safe/plan.component.vue      | 23 +++++----
 .../exchangeFlow/exchange.component.vue       |  4 +-
 .../exchangeRecord.component.vue              |  4 +-
 src/views/integral/mall.component.vue         | 11 +++--
 .../rewardsRecord.component.html              |  2 +-
 .../rewardsRecord/rewardsRecord.component.vue | 22 +++++----
 src/views/risk/area/area.component.vue        |  4 ++
 .../areaAnal/areaAnal.component.vue           | 32 ++++++++-----
 .../risk/assessment/work/work.component.vue   |  4 +-
 .../risk/identify/identify.component.vue      | 30 ++++++++++--
 src/views/risk/unit/unit.component.vue        | 25 ++++++----
 .../managementSystem.component.vue            | 48 +++++++++++--------
 .../workprogress/programme.component.vue      | 47 ++++++++++--------
 .../workprogress/trainRecords.component.vue   |  9 ++--
 22 files changed, 225 insertions(+), 137 deletions(-)

diff --git a/src/components/draw.component.vue b/src/components/draw.component.vue
index bcdbecd..cce8908 100644
--- a/src/components/draw.component.vue
+++ b/src/components/draw.component.vue
@@ -449,8 +449,9 @@ export default class DrawComponent extends Vue {
         this.map.remove();
         this.map = null;
     }
-    destoryed(){
-        this.removeMap()
+    destroyed(){
+        // console.log(123)
+        // this.removeMap()
     }
 }
 </script>
diff --git a/src/components/map.component.vue b/src/components/map.component.vue
index 61194fd..7e8caad 100644
--- a/src/components/map.component.vue
+++ b/src/components/map.component.vue
@@ -7,33 +7,33 @@ import mapboxgl from "mapbox-gl";
 import "mapbox-gl/dist/mapbox-gl.css"
 @Component
 export default class MapComponent extends Vue {
-    public map:any
+    public map: any
 
     @Prop({
-        required:false,
-        default:"map"
+        required: false,
+        default: "map"
     })
-    id:string;
+    id: string;
 
-    @PropSync("position",{
-        required:false,
-        default:()=>{
-            return [119.592977,34.523847]
+    @PropSync("position", {
+        required: false,
+        default: () => {
+            return [119.592977, 34.523847]
         }
     })
-    center:number[]
+    center: number[]
     @Prop({
-        required:false,
-        default:12
+        required: false,
+        default: 12
     })
-    zoom:number;
+    zoom: number;
 
     @Emit("onLoad")
-    onLoad(map){
+    onLoad(map) {
 
     }
 
-    public initMap(){
+    public initMap() {
         mapboxgl.accessToken = "pk.eyJ1IjoiaGJ0a2owMjUiLCJhIjoiY2xtYWFobzgxMHBtbDNkbnpwNXJjZW1xNCJ9.lTnRVhs5R5BJ7lswSDufYQ";
         this.map = new mapboxgl.Map({
             // accessToken :"pk.eyJ1IjoiMTgzODI0ZHl0IiwiYSI6ImNqbHExNDVjZzI0ZmUza2wxMDhocnlyem4ifQ.FZoJzmqTtli8hAvvAc1OPA",
@@ -42,21 +42,22 @@ export default class MapComponent extends Vue {
             center: this.center,
             zoom: 16,
         });
-        this.map.on("load",()=>{
+        this.map.on("load", () => {
             this.map.resize()
             this.onLoad(this.map)
         })
     }
-    mounted(){
+    mounted() {
         this.initMap()
     }
-    beforeDestory(){
-
+    beforeDestroy() {
+        // this.map.remove();
+        // this.map = null;
     }
 }
 </script>
 <style lang="scss" scoped>
-.map{
+.map {
     width: 100%;
     height: 100%;
 }
diff --git a/src/components/measure.component.vue b/src/components/measure.component.vue
index 250c959..8d5bd46 100644
--- a/src/components/measure.component.vue
+++ b/src/components/measure.component.vue
@@ -143,7 +143,10 @@ export default class MeasureComponent extends Vue {
     public taskUpdateOptions: FormOption<BtnOption>[] = [];
 
     //排查任务
-    public taskUpdataParams = {} as any;
+    public taskUpdataParams = {
+        startTime: null,
+        endTime: null
+    } as any;
 
     //排查任务类型
     public taskType = [] as any;
@@ -227,7 +230,7 @@ export default class MeasureComponent extends Vue {
             datas: this.$store.state.userList,
             showError: false,
         }, {
-            name: "排查周期 每隔",
+            name: "排查周期 每",
             key: "reviewCycleValue",
             type: "number",
             width: "calc(50% - 20px)",
@@ -496,7 +499,10 @@ export default class MeasureComponent extends Vue {
         this.showSubUpdate = false;
         this.taskIsReadonly = false;
         this.taskCurrentId = -1;
-        this.taskUpdataParams = {} as any;
+        this.taskUpdataParams = {
+            startTime: null,
+            endTime: null
+        };
     }
 
     public taskCallback(data) {
@@ -529,7 +535,10 @@ export default class MeasureComponent extends Vue {
 
     public taskAdd() {
         this.taskType = this.taskItemSelect()
-        this.taskUpdataParams = {} as any;
+        this.taskUpdataParams = {
+            startTime: null,
+            endTime: null
+        };
         if (this.outermostData.majorSign && this.outermostData.majorSign.includes(0)) {
             this.taskUpdataParams.insuranceDutyFlag = 0;
             this.taskUpdataParams.taskType = 0
@@ -621,7 +630,7 @@ export default class MeasureComponent extends Vue {
             }
             //开始时间
             if (item && item.key === 'startTime') {
-                if (data > this.taskUpdataParams.endTime) {
+                if (this.taskUpdataParams.endTime && data > this.taskUpdataParams.endTime) {
                     this.$message.warning("结束时间不能早于开始时间！")
                     this.taskUpdataParams.endTime = null;
                     return
diff --git a/src/views/hiddenDanger/clap.component.vue b/src/views/hiddenDanger/clap.component.vue
index 249880e..9973e29 100644
--- a/src/views/hiddenDanger/clap.component.vue
+++ b/src/views/hiddenDanger/clap.component.vue
@@ -343,7 +343,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent<any>
             key: "photo",
             ref: "photo",
             type: "upload",
-            width: "calc(50% - 20px)",
+            width: "100%",
             require: true,
             onSucess: this.onSuccess,
             onMove: this.onRemove,
@@ -359,7 +359,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent<any>
             key: "file",
             ref: "file",
             type: "upload",
-            width: "calc(50% - 20px)",
+            width: "100%",
             showError: false,
             onSucess: this.onSuccess2,
             onMove: this.onRemove2,
@@ -442,7 +442,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent<any>
     }
 
     public buildTable() {
-        this.tableColumn.push({ name: '整改单编号', width: "200px", key: "number" });
+        this.tableColumn.push({ name: '整改单编号', width: "220px", key: "number" });
         this.tableColumn.push({ name: '隐患描述', key: "description", width: "300px" });
         this.tableColumn.push({ name: '整改部门', width: "100px", key: "reformDeptName" });
         this.tableColumn.push({
@@ -618,7 +618,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent<any>
                                 id: item.id
                             }
                         })
-                        this.updateParams.photo = this.photoList.length || null;
+                        this.updateParams.photo = this.isReadonly ? null : (this.photoList.length || null);
                         this.buildUpdateForm()
                     })
                 }
diff --git a/src/views/hiddenDanger/files.component.vue b/src/views/hiddenDanger/files.component.vue
index 8636684..11120cb 100644
--- a/src/views/hiddenDanger/files.component.vue
+++ b/src/views/hiddenDanger/files.component.vue
@@ -462,7 +462,7 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
             hide: this.updateParams.reformConfirmFlag === 0,
             showError: false,
             rules: [
-                { pattern: /^[1-9]\d{0,7}(\.\d{1,3})?$/, message: '不超过八位的整数', },
+                { pattern: /^[1-9]\d{0,7}(\.\d{1,2})?$/, message: '不超过八位的整数，保留两位小数', },
             ],
             unit: {
                 name: "元",
diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue
index 2fea19a..eb085ac 100644
--- a/src/views/hiddenDanger/manager.component.vue
+++ b/src/views/hiddenDanger/manager.component.vue
@@ -514,7 +514,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
                 hide: this.updateParams.reformConfirmFlag === 0,
                 showError: false,
                 rules: [
-                    { pattern: /^[1-9]\d{0,7}(\.\d{1,3})?$/, message: '不超过八位的整数', },
+                    { pattern: /^[1-9]\d{0,7}(\.\d{1,2})?$/, message: '不超过八位的整数，保留两位小数', },
                 ],
                 unit: {
                     name: "元",
@@ -775,12 +775,12 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
             this.getTableCallback()
             return
         }
-        if (item && item.key === 'executeMoney') {
-            this.updateParams.executeMoney = null;
-            setTimeout(() => {
-                this.updateParams.executeMoney = +data.toFixed(2)
-            }, 0)
-        }
+        // if (item && item.key === 'executeMoney') {
+        //     this.updateParams.executeMoney = null;
+        //     setTimeout(() => {
+        //         this.updateParams.executeMoney = +data.toFixed(2)
+        //     }, 0)
+        // }
         if (item && item.key === "reformDeadline") {
             const now = moment().format("YYYY-MM-DD HH");
             if (now > data) {
diff --git a/src/views/hiddenDanger/rules/rules.component.html b/src/views/hiddenDanger/rules/rules.component.html
index 5c2e0fb..6e0f91e 100644
--- a/src/views/hiddenDanger/rules/rules.component.html
+++ b/src/views/hiddenDanger/rules/rules.component.html
@@ -82,7 +82,7 @@
     <el-dialog v-if="isManager" :close-on-click-modal="false" :title="!subUpdateParams.id?'新增':subIsReadonly?'详情':'编辑'"
         :visible.sync="showSubUpdate" :before-close="handleClose" destroy-on-close>
         <FormComponent :options="subUpdateOptions" :isReadonly="subIsReadonly" labelWidth="110px" labelAlign="right"
-            :data.sync="subUpdateParams" @actionCallback="subCallback" :actions="subUpdateActions" :full-btn="true"
+            :data.sync="subUpdateParams" @actionCallback="subCallback" :actions="checkUpdateActions" :full-btn="true"
             @change="subChange" btn-position="center">
         </FormComponent>
     </el-dialog>
diff --git a/src/views/hiddenDanger/rules/rulesManager.component.vue b/src/views/hiddenDanger/rules/rulesManager.component.vue
index 028c6f8..a8f0867 100644
--- a/src/views/hiddenDanger/rules/rulesManager.component.vue
+++ b/src/views/hiddenDanger/rules/rulesManager.component.vue
@@ -95,7 +95,10 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
 
     public showUpdate = false;
     public currentId = -1;
-    public updateParams = {} as any;
+    public updateParams = {
+        units: [],
+        tableItems: []
+    } as any;
     public subUpdateParams = {} as any;
     public updateOptions: FormOption<BtnOption>[] = [];
     public updateTableData = { datas: [] };
@@ -488,6 +491,7 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
         this.isReadonly = !!isRead;
         this.clearSelect()
         if (!row) {
+            this.updateParams = { units: [], tableItems: [] } as any
             this.currentId = -1;
             this.getNumber();
             this.buildUpdateForm();
@@ -583,7 +587,7 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
             item.index = i + 1
         })
         this.subUpdateParams = {} as any;
-        this.showSubUpdate = false;
+        this.showSubUpdate = !!goOn;
     }
 
     public doSubDelete(indexs) {
diff --git a/src/views/hiddenDanger/safe/plan.component.vue b/src/views/hiddenDanger/safe/plan.component.vue
index 81998b0..d860e5b 100644
--- a/src/views/hiddenDanger/safe/plan.component.vue
+++ b/src/views/hiddenDanger/safe/plan.component.vue
@@ -114,16 +114,17 @@ export default class PlanComponent extends BaseRecordComponent<any> {
     public updateActions = [{
         name: "取消",
         value: "cancel"
-    }, {
-        name: "保存",
-        value: "save",
-        type: "primary"
-    }, {
+    },
+    {
         name: "保存并继续添加",
         hide: false,
         value: "saveAndContinue",
         type: "primary"
-    }];
+    }, {
+        name: "保存",
+        value: "save",
+        type: "primary"
+    },];
 
     public selectData = [];
 
@@ -205,7 +206,7 @@ export default class PlanComponent extends BaseRecordComponent<any> {
             showError: false,
             datas: this.$store.state.prevention_danger_check_type
         }, {
-            name: "巡检周期 每隔",
+            name: "巡检周期 每",
             key: "inspectCycleValue",
             type: "number",
             hide: this.updateParams.planType === 1,
@@ -460,6 +461,10 @@ export default class PlanComponent extends BaseRecordComponent<any> {
             this.buildUpdateForm();
         }
         if (item && item.key === "areaIds") {
+            if (!data) {
+                this.unitList = []
+                return
+            }
             this.loadUnitData(data)
         }
         if (item && item.key === "chargeUserId") {
@@ -577,7 +582,7 @@ export default class PlanComponent extends BaseRecordComponent<any> {
 
     // 打开增改查弹窗
     public async showUpdateModel(row?, isRead?) {
-        this.updateActions[2].hide = false;
+        this.updateActions[1].hide = false;
         this.isReadonly = !!isRead;
         if (row) {
             if (isRead) {
@@ -683,7 +688,7 @@ export default class PlanComponent extends BaseRecordComponent<any> {
             //单元是否删除
             let isDeleteUnit = this.judgeDeleteUnitMethod(JSON.parse(JSON.stringify(row)));
             if (!isDeleteUnit) {
-                this.updateActions[2].hide = true;
+                this.updateActions[1].hide = true;
                 this.currentPlan = row;
                 this.showSend = true;
                 this.tableTabs = [];
diff --git a/src/views/integral/exchange/exchangeFlow/exchange.component.vue b/src/views/integral/exchange/exchangeFlow/exchange.component.vue
index f71a3ef..370f414 100644
--- a/src/views/integral/exchange/exchangeFlow/exchange.component.vue
+++ b/src/views/integral/exchange/exchangeFlow/exchange.component.vue
@@ -397,7 +397,9 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
                 }
             }
         });
-        this.tableColumn.push({ name: '发起时间', key: "applyTime", });
+        this.tableColumn.push({ name: '发起时间', key: "applyTime",render:(data)=>{
+            return moment(data.applyTime).format('YYYY-MM-DD HH:mm')
+        } });
         this.tableColumn.push({
             name: '兑换清单', key: "goodsNumber", render: (data) => {
                 return `<span class="link goodsNumber">${data.goodsNumber}</span>`
diff --git a/src/views/integral/exchange/exchangeRecord/exchangeRecord.component.vue b/src/views/integral/exchange/exchangeRecord/exchangeRecord.component.vue
index 98f690c..1aaaaf4 100644
--- a/src/views/integral/exchange/exchangeRecord/exchangeRecord.component.vue
+++ b/src/views/integral/exchange/exchangeRecord/exchangeRecord.component.vue
@@ -112,7 +112,7 @@ export default class IntegralExchangeRecord extends BaseRecordComponent<any> {
         type: "primary"
     }];
 
-    
+
     public tableActionWidth = "150";
 
     public updateOptions: FormOption<BtnOption>[] = [] as any;
@@ -287,7 +287,7 @@ export default class IntegralExchangeRecord extends BaseRecordComponent<any> {
 
     public callback(data, type) {
         if (type) {
-             if (type === 'pageSize' || type === 'pageNum') {
+            if (type === 'pageSize' || type === 'pageNum') {
                 this.params[type] = data;
             }
             this.getTableData();
diff --git a/src/views/integral/mall.component.vue b/src/views/integral/mall.component.vue
index ad9684e..fb8d5e4 100644
--- a/src/views/integral/mall.component.vue
+++ b/src/views/integral/mall.component.vue
@@ -105,7 +105,7 @@ export default class IntegralMall extends BaseRecordComponent<any> {
             key: "number",
             require: true,
             width: "calc(50% - 20px)",
-            showError:false,
+            showError: false,
         },
         {
             name: " 商品名称",
@@ -113,7 +113,7 @@ export default class IntegralMall extends BaseRecordComponent<any> {
             key: "name",
             require: true,
             width: "calc(50% - 20px)",
-            showError:false,
+            showError: false,
         },
         {
             name: "库存数量",
@@ -121,11 +121,10 @@ export default class IntegralMall extends BaseRecordComponent<any> {
             key: "stockNumber",
             require: true,
             width: "calc(50% - 20px)",
-            showError:false,
+            showError: false,
             rules: [
                 { pattern: /^\d{1,5}$/, message: '在1~99999范围内', }
             ],
-            // max: 99999,
             min: 1
         },
         {
@@ -143,6 +142,10 @@ export default class IntegralMall extends BaseRecordComponent<any> {
             require: true,
             width: "calc(50% - 20px)",
             showError: false,
+            rules: [
+                { pattern: /^\d{1,8}$/, message: '在1~99999999范围内', }
+            ],
+            min: 1,
         },
         {
             name: "状态",
diff --git a/src/views/reward/rewardsRecord/rewardsRecord.component.html b/src/views/reward/rewardsRecord/rewardsRecord.component.html
index 2d19c8b..f3ba4a6 100644
--- a/src/views/reward/rewardsRecord/rewardsRecord.component.html
+++ b/src/views/reward/rewardsRecord/rewardsRecord.component.html
@@ -83,7 +83,7 @@
         width="952px" destroy-on-close>
         <FormComponent :options="subUpdateOptions" labelWidth="110px" labelAlign="right" :data.sync="subUpdateParams"
             @actionCallback="triCallback" :isReadonly="subIsReadonly" :actions="subUpdateActions" :full-btn="true"  @change="changes"
-            btnPosition="center">
+            btnPosition="center" ref="recordForm">
         </FormComponent>
     </el-dialog>
 </div>
\ No newline at end of file
diff --git a/src/views/reward/rewardsRecord/rewardsRecord.component.vue b/src/views/reward/rewardsRecord/rewardsRecord.component.vue
index cf310ef..54f7668 100644
--- a/src/views/reward/rewardsRecord/rewardsRecord.component.vue
+++ b/src/views/reward/rewardsRecord/rewardsRecord.component.vue
@@ -221,8 +221,8 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
             showError: false,
             hide: !(this.subUpdateParams.type && this.subUpdateParams.type !== 1),
             rules: [
-                { pattern: /^[1-9]\d{0,7}(\.\d{1,3})?$/, message: '不超过八位的整数', },
-            ]
+                { pattern: /^[1-9]\d{0,7}(\.\d{1,2})?$/, message: '不超过八位的整数，保留两位小数', },
+            ],
         }, {
             name: "奖惩事由",
             type: "textarea",
@@ -297,12 +297,12 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
                 option.hide = false
             }
         }
-        if (item && item.key === 'money') {
-            this.subUpdateParams.money = null;
-            setTimeout(() => {
-                this.subUpdateParams.money = +data.toFixed(2)
-            }, 0)
-        }
+        // if (item && item.key === 'money') {
+        //     this.subUpdateParams.money = null;
+        //     setTimeout(() => {
+        //         this.subUpdateParams.money = +data.toFixed(2)
+        //     }, 0)
+        // }
     }
 
     public buildTable() {
@@ -340,7 +340,7 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
 
     public callback(data, type) {
         if (type) {
-             if (type === 'pageSize' || type === 'pageNum') {
+            if (type === 'pageSize' || type === 'pageNum') {
                 this.params[type] = data;
             }
             this.getTableData();
@@ -499,7 +499,9 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
         if (data.value === "cancel") {
             this.subShowUpdate = false;
         } else if (data && data.value.indexOf("save") >= 0) {
-            this.doSubSave(data.value !== "save")
+            if ((this.$refs.recordForm as any).vaildParams()) {
+                this.doSubSave(data.value !== "save")
+            }
         }
     }
     /**
diff --git a/src/views/risk/area/area.component.vue b/src/views/risk/area/area.component.vue
index 2a2f8d9..b5c68ad 100644
--- a/src/views/risk/area/area.component.vue
+++ b/src/views/risk/area/area.component.vue
@@ -362,6 +362,10 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
         if (item && item.key === "majorHazardFlag") {
             this.updateOptions[5].hide = !data;
             this.updateOptions[6].hide = !data;
+          if(!data){
+            this.updateParams.majorHazardName = '';
+            this.updateParams.majorHazardLevel = '';
+          }
         }
     }
 
diff --git a/src/views/risk/assessment/areaAnal/areaAnal.component.vue b/src/views/risk/assessment/areaAnal/areaAnal.component.vue
index df28866..13d3691 100644
--- a/src/views/risk/assessment/areaAnal/areaAnal.component.vue
+++ b/src/views/risk/assessment/areaAnal/areaAnal.component.vue
@@ -113,7 +113,7 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
 
     public callback(data, type?) {
         if (type) {
-             if (type === 'pageSize' || type === 'pageNum') {
+            if (type === 'pageSize' || type === 'pageNum') {
                 this.params[type] = data;
             }
             this.getTableData();
@@ -241,20 +241,26 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
         let len: number = 0;
         let tmpRiskDatas = []
         if (this.popTitle === 'L') {
-            tmpRiskDatas = this.riskLDatas
+            tmpRiskDatas = this.riskLDatas;
+            tmpRiskDatas.forEach((item: any) => {
+                if (item.value && typeof (item.value) === 'number') {
+                    len = len + 1
+                    value = value + item.value
+                }
+            })
+            tmpRiskDatas.forEach((item: any) => {
+                item.result = Math.ceil(value / len).toString()
+            })
         }
         if (this.popTitle === 'S') {
-            tmpRiskDatas = this.riskSDatas
+            tmpRiskDatas = this.riskSDatas;
+            let maxdata = Math.max.apply(Math, tmpRiskDatas.map((item: any) => {
+                return item.value && typeof (item.value) === 'number' ? item.value : 0
+            }))
+            tmpRiskDatas.forEach((item: any) => {
+                item.result = maxdata.toString()
+            })
         }
-        tmpRiskDatas.forEach((item: any) => {
-            if (item.value && typeof (item.value) === 'number') {
-                len = len + 1
-                value = value + item.value
-            }
-        })
-        tmpRiskDatas.forEach((item: any) => {
-            item.result = Math.round(value / len).toString()
-        })
     }
 
     public startEdit(row) {
@@ -338,7 +344,7 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
 
     //单选
     public selectRadioData(data) {
-       // console.log('data', data);
+        // console.log('data', data);
     }
 
     //点击L 步骤
diff --git a/src/views/risk/assessment/work/work.component.vue b/src/views/risk/assessment/work/work.component.vue
index 51cdb07..71c9499 100644
--- a/src/views/risk/assessment/work/work.component.vue
+++ b/src/views/risk/assessment/work/work.component.vue
@@ -156,6 +156,7 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
 
     public subUpdateOptions: FormOption<BtnOption>[] = [];
     @Watch("$store.state.deptList", { immediate: true, deep: true })
+    @Watch("$store.state.userList", { immediate: true, deep: true })
     onChanges() {
         this.loadAreaData()
     }
@@ -618,6 +619,7 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
                 } else {
                     this.updateParams.safetyFactor = this.updateParams.safetyFactor.split(",").map(item => +item);
                     this.updateParams.safetyFactorName = this.updateParams.safetyFactor.map(item => this.$store.getters.prevention_safe_reason_map[item]).join(",")
+                    this.updateParams.identifyUserName = this.$store.getters.user_map[this.updateParams.identifyUserId];
                 }
                 this.updateActionsForm()
             })
@@ -672,7 +674,7 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
     public addWorkSteps() {
         this.showSubUpdateModel();
     }
-    
+
     //删除
     public deleteData(ids: any) {
         if (!ids.length) {
diff --git a/src/views/risk/identify/identify.component.vue b/src/views/risk/identify/identify.component.vue
index 4ed55f5..268187d 100644
--- a/src/views/risk/identify/identify.component.vue
+++ b/src/views/risk/identify/identify.component.vue
@@ -117,7 +117,7 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
             require: true,
             multiple: true,
             width: "calc(50% - 20px)",
-            clearable:true,
+            clearable: true,
             datas: this.$store.state.prevention_serious_result,
         },
         {
@@ -135,7 +135,7 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
             require: true,
             multiple: true,
             width: "calc(50% - 20px)",
-            clearable:true,
+            clearable: true,
             datas: this.$store.state.prevention_security_identifier,
         },
         {
@@ -154,6 +154,7 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
                 name: "LS法：",
                 key: "riskLSValue",
                 type: "text",
+                hide: !this.subUpdateParams.riskLsValue
                 // width: "20px",
             }, {
                 name: "L值：",
@@ -161,18 +162,21 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
                 type: "text",
                 width: "10%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.riskLsValue
             }, {
                 name: "S值：",
                 key: "lssvalue",
                 type: "text",
                 width: "10%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.riskLsValue
             }, {
                 name: "R值：",
                 key: "lsrvalue",
                 type: "text",
                 width: "20%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.riskLsValue
             }, {
                 name: "风险等级：",
                 key: "lsgrade",
@@ -180,10 +184,12 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
                 type: "text",
                 width: "20%",
                 labelWidth: "60px",
+                hide: !this.subUpdateParams.riskLsValue
             }, {
                 name: "LEC法：",
                 key: "riskLECValue",
                 type: "text",
+                hide: !this.subUpdateParams.riskLecValue
                 // labelWidth: "30px",
             }, {
                 name: "L值：",
@@ -191,24 +197,28 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
                 type: "text",
                 width: "10%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.riskLecValue
             }, {
                 name: "E值：",
                 key: "lecevalue",
                 type: "text",
                 width: "10%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.riskLecValue
             }, {
                 name: "C值：",
                 key: "leccvalue",
                 type: "text",
                 width: "10%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.riskLecValue
             }, {
                 name: "D值：",
                 key: "lecdvalue",
                 type: "text",
                 width: "15%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.riskLecValue
             }, {
                 name: "风险等级：",
                 key: "lecgrade",
@@ -216,6 +226,7 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
                 type: "text",
                 width: "20%",
                 labelWidth: "60px",
+                hide: !this.subUpdateParams.riskLecValue
             }, {
                 name: "风险等级",
                 key: "riskLevel",
@@ -236,6 +247,7 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
                 name: "LS法：",
                 key: "remainLSValue",
                 type: "text",
+                hide: !this.subUpdateParams.remainLsValue
                 // width: "30px",
             }, {
                 name: "L值：",
@@ -243,18 +255,21 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
                 type: "text",
                 width: "10%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.remainLsValue
             }, {
                 name: "S值：",
                 key: "lssvalue",
                 type: "text",
                 width: "10%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.remainLsValue
             }, {
                 name: "R值：",
                 key: "lsrvalue",
                 type: "text",
                 width: "20%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.remainLsValue
             }, {
                 name: "风险等级：",
                 key: "lsgrade",
@@ -262,10 +277,12 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
                 type: "text",
                 width: "20%",
                 labelWidth: "60px",
+                hide: !this.subUpdateParams.remainLsValue
             }, {
                 name: "LEC法：",
                 key: "remainLECValue",
                 type: "text",
+                hide: !this.subUpdateParams.remainLecValue
                 // width: "30px",
             }, {
                 name: "L值：",
@@ -273,24 +290,28 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
                 type: "text",
                 width: "10%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.remainLecValue
             }, {
                 name: "E值：",
                 key: "lecevalue",
                 type: "text",
                 width: "10%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.remainLecValue
             }, {
                 name: "C值：",
                 key: "leccvalue",
                 type: "text",
                 width: "10%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.remainLecValue
             }, {
                 name: "D值：",
                 key: "lecdvalue",
                 type: "text",
                 width: "15%",
                 labelWidth: "40px",
+                hide: !this.subUpdateParams.remainLecValue
             }, {
                 name: "风险等级：",
                 key: "lecgrade",
@@ -298,6 +319,7 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
                 type: "text",
                 width: "20%",
                 labelWidth: "60px",
+                hide: !this.subUpdateParams.remainLecValue
             }, {
                 name: "风险等级",
                 key: "remainLevel",
@@ -360,7 +382,7 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
 
     public callback(data, type) {
         if (type) {
-             if (type === 'pageSize' || type === 'pageNum') {
+            if (type === 'pageSize' || type === 'pageNum') {
                 this.params[type] = data;
             }
             this.getTableData();
@@ -449,7 +471,7 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
             }
         }
         this.riskUpdateParams = { ...this.riskUpdateParams, ...tmpRiskLecValue };
-        this.riskUpdateParams.lecgradeName = this.$store.getters.prevention_risk_level_map[this.riskUpdateParams.lsgrade];
+        this.riskUpdateParams.lecgradeName = this.$store.getters.prevention_risk_level_map[this.riskUpdateParams.lecgrade];
     }
 
     //处理 残余风险评估LS
diff --git a/src/views/risk/unit/unit.component.vue b/src/views/risk/unit/unit.component.vue
index b87f5a3..9de7736 100644
--- a/src/views/risk/unit/unit.component.vue
+++ b/src/views/risk/unit/unit.component.vue
@@ -123,10 +123,10 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
         this.getAreaList();
     }
 
-    public getTableData(){
-        this.tableService.selectByPageList(this.params,true).then((res:any)=>{
+    public getTableData() {
+        this.tableService.selectByPageList(this.params, true).then((res: any) => {
             this.tableData = res.data
-            if(this.getTableCallback){
+            if (this.getTableCallback) {
                 this.getTableCallback(res.data)
             }
         })
@@ -224,7 +224,7 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
 
     public buildFormOptions() {
         this.updateOptions = [{
-            name: "选择区域",
+            name: "区域名称",
             key: "areaId",
             placeholder: "请选择区域名称",
             width: "calc(50% - 20px)",
@@ -361,7 +361,8 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
 
 
     public buildTable() {
-        this.tableColumn.push({ name: '风险分析单元', key: "name" });
+        this.tableColumn.push({ name: '区域名称', key: "areaName" });
+        this.tableColumn.push({ name: '单元名称', key: "name" });
         this.tableColumn.push({ name: '责任部门', key: "chargeDeptName" });
         this.tableColumn.push({ name: '责任人', key: "chargeUserName" });
         this.tableColumn.push({
@@ -394,7 +395,7 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
         });
         this.repairTableColumn.push({ name: "序号", key: "index" });
         this.repairTableColumn.push({ name: "停用开始时间", key: "startTime" });
-        this.repairTableColumn.push({ name: "停用开始时间", key: "endTime" });
+        this.repairTableColumn.push({ name: "停用结束时间", key: "endTime" });
         this.repairTableColumn.push({ name: "原因", key: "reason" });
         this.repairTableColumn.push({ name: "登记人", key: "registerUserName" });
         this.repairTableColumn.push({ name: "登记时间", key: "registerTime" });
@@ -441,8 +442,6 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
     }
 
     public change(data, item) {
-        console.log('data');
-        
         // 新增编辑选择部门
         if (item && item.key === "chargeDeptId") {
             this.updateParams.chargeDeptName = this.$store.getters.dept_map[data];
@@ -471,6 +470,14 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
                 this.turnOffParams.endTime = null
             }
         }
+        //单元名称
+        if (item && item.key === 'name') {
+            if (this.updateParams.geoJson !== '[]') {
+                let tmpGeoJson = JSON.parse(this.updateParams.geoJson);
+                tmpGeoJson[0]['properties']['name'] = this.updateParams.name;
+                this.$set(this.updateParams, 'geoJson', JSON.stringify(tmpGeoJson))
+            }
+        }
     }
     public callback(data, type) {
         if (type) {
@@ -578,7 +585,7 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
     public handleSelectionChange(data) {
         this.selectData = data;
     }
-    
+
     //删除
     public deleteData(ids: any) {
         if (!ids.length) {
diff --git a/src/views/workprogress/managementSystem.component.vue b/src/views/workprogress/managementSystem.component.vue
index a62effc..b129955 100644
--- a/src/views/workprogress/managementSystem.component.vue
+++ b/src/views/workprogress/managementSystem.component.vue
@@ -1,6 +1,6 @@
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
+import { Component, Watch } from 'vue-property-decorator';
 import template from './common.component.html'
 import BaseRecordComponent from "hbt-common/components/common/baseRecord.component.vue";
 import FormComponent from "hbt-common/components/common/form.component.vue";
@@ -95,23 +95,27 @@ export default class ManagementSystem extends BaseRecordComponent<any> {
         value: "reverse"
     }];
 
-    public formOptions: FormOption<BtnOption>[] = [{
-        name: "制度名称",
-        key: "name",
-        type: "text",
-    }, {
-        name: "适用部门",
-        key: "suitDeptId",
-        type: "treeSelect",
-        datas: this.$store.state.deptTreeList,
-        expandLevel: Infinity,
-        width: "280px"
-    }, {
-        name: "发布时间",
-        key: "publishTime",
-        type: "date",
-        format: "yyyy-MM-dd"
-    }];
+    public formOptions: FormOption<BtnOption>[] = [] as any;
+
+    public buildFormOptions() {
+        this.formOptions = [{
+            name: "制度名称",
+            key: "name",
+            type: "text",
+        }, {
+            name: "适用部门",
+            key: "suitDeptId",
+            type: "treeSelect",
+            datas: this.$store.state.deptTreeList,
+            expandLevel: Infinity,
+            width: "280px"
+        }, {
+            name: "发布时间",
+            key: "publishTime",
+            type: "date",
+            format: "yyyy-MM-dd"
+        }];
+    }
 
     public subActions = [{
         name: "取消",
@@ -257,7 +261,13 @@ export default class ManagementSystem extends BaseRecordComponent<any> {
 
     created() {
         //
+        this.buildFormOptions();
     }
+    @Watch("$store.state.deptTreeList", { immediate: true, deep: true })
+    onChanges() {
+        this.buildFormOptions();
+    }
+
 
 
     public buildTable() {
@@ -283,7 +293,7 @@ export default class ManagementSystem extends BaseRecordComponent<any> {
             }
         });
         this.tableColumn.push({ name: '编制人', key: "compileUserName" });
-        this.tableColumn.push({ name: '编制时间', key: "compileTime",width:"110px" });
+        this.tableColumn.push({ name: '编制时间', key: "compileTime", width: "110px" });
     }
 
     public callback(data, type) {
diff --git a/src/views/workprogress/programme.component.vue b/src/views/workprogress/programme.component.vue
index 0253439..ff0851f 100644
--- a/src/views/workprogress/programme.component.vue
+++ b/src/views/workprogress/programme.component.vue
@@ -1,7 +1,7 @@
 
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
+import { Component, Watch } from 'vue-property-decorator';
 import template from './common.component.html'
 import BaseRecordComponent from "hbt-common/components/common/baseRecord.component.vue";
 import FormComponent from "hbt-common/components/common/form.component.vue";
@@ -99,23 +99,27 @@ export default class Programme extends BaseRecordComponent<any> {
         value: "reverse"
     }];
 
-    public formOptions: FormOption<BtnOption>[] = [{
-        name: "方案名称",
-        key: "name",
-        type: "text",
-    }, {
-        name: "适用部门",
-        key: "suitDeptId",
-        type: "treeSelect",
-        datas: this.$store.state.deptTreeList,
-        expandLevel: Infinity,
-        width: "280px"
-    }, {
-        name: "适用年度",
-        key: "suitYear",
-        type: "select",
-        datas: this.suitList,
-    }];
+    public formOptions: FormOption<BtnOption>[] = [] as any;
+
+    public buildFormOptions() {
+        this.formOptions = [{
+            name: "方案名称",
+            key: "name",
+            type: "text",
+        }, {
+            name: "适用部门",
+            key: "suitDeptId",
+            type: "treeSelect",
+            expandLevel: Infinity,
+            datas: this.$store.state.deptTreeList,
+            width: "280px"
+        }, {
+            name: "适用年度",
+            key: "suitYear",
+            type: "select",
+            datas: this.suitList,
+        }];
+    }
 
     public subActions = [{
         name: "取消",
@@ -260,10 +264,13 @@ export default class Programme extends BaseRecordComponent<any> {
         }];
     }
 
-
-
     created() {
         this.getSuitListData();
+        this.buildFormOptions();
+    }
+    @Watch("$store.state.deptTreeList", { immediate: true, deep: true })
+    onChanges() {
+        this.buildFormOptions();
     }
 
     //获取适用年度
diff --git a/src/views/workprogress/trainRecords.component.vue b/src/views/workprogress/trainRecords.component.vue
index 8e9dc2d..d776a7a 100644
--- a/src/views/workprogress/trainRecords.component.vue
+++ b/src/views/workprogress/trainRecords.component.vue
@@ -175,6 +175,9 @@ export default class TrainRecords extends BaseRecordComponent<any> {
             require: true,
             width: "calc(50% - 20px)",
             showError: false,
+            rules: [
+                { pattern: /^(([1-9]?\d(\.\d{1,1})?)|99|99.0)$/, message: '支持输入两位整数，保留一位小数', }
+            ],
         },
         {
             name: "培训时间",
@@ -375,9 +378,9 @@ export default class TrainRecords extends BaseRecordComponent<any> {
             this.buildSubForm()
         }
         //培训时长格式化
-        this.durationChange(data, item);
-        //得分格式化
-        this.scoreFormat(data, item);
+        // this.durationChange(data, item);
+        // //得分格式化
+        // this.scoreFormat(data, item);
     }
     /**
      * 培训时长格式化，保留一位小数