From 2adfe8bc7b08322598f5ad24086f795c7c156229 Mon Sep 17 00:00:00 2001
From: kongyeqing <2697454777@qq.com>
Date: Thu, 24 Oct 2024 15:57:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/analEvaluation.component.vue   | 64 +++++++++++--------
 .../assessment/work/workAnal.component.vue    |  4 +-
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/src/components/analEvaluation.component.vue b/src/components/analEvaluation.component.vue
index eec49b9..b2573fb 100644
--- a/src/components/analEvaluation.component.vue
+++ b/src/components/analEvaluation.component.vue
@@ -1,8 +1,9 @@
 <template>
     <div v-if="visible">
         <div class="sub-title">基本信息</div>
-        <FormComponent :options="subBasicOptions" labelWidth="110px" labelAlign="right" :data.sync="analysisUpdateParams"
-            @actionCallback="callback" :isReadonly="analyIsReadonly" @change="handleChange" ref="basicForm">
+        <FormComponent :options="subBasicOptions" labelWidth="110px" labelAlign="right"
+            :data.sync="analysisUpdateParams" @actionCallback="callback" :isReadonly="analyIsReadonly"
+            @change="handleChange" ref="basicForm">
         </FormComponent>
         <div class="sub-title">风险评估</div>
         <FormComponent :options="subRiskOptions" labelWidth="110px" labelAlign="right" :data.sync="analysisUpdateParams"
@@ -16,8 +17,9 @@
             <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" max-height="500"
-                    border row-key="checked" @selection-change="handleSelectionChange" style="width: 100%">
+                <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 v-if="!analyIsReadonly" type="selection" fixed label="全选" width="40">
                     </el-table-column>
                     <template v-for="item in triTableColumn">
@@ -25,8 +27,8 @@
                             :width="item.width" :key="item.key">
                             <div slot-scope="scope" v-html="item.render(scope.row)"></div>
                         </el-table-column>
-                        <el-table-column v-else :prop="item.key" :show-overflow-tooltip="item.showTip" :label="item.name"
-                            :width="item.width" :key="item.key">
+                        <el-table-column v-else :prop="item.key" :show-overflow-tooltip="item.showTip"
+                            :label="item.name" :width="item.width" :key="item.key">
                         </el-table-column>
                     </template>
                     <el-table-column label="操作" fixed="right" width="150">
@@ -34,24 +36,26 @@
                             <el-button type="text" @click="showMeasureModel(scope.row, true)">查看</el-button>
                             <el-button v-if="!analyIsReadonly" type="text"
                                 @click="showMeasureModel(scope.row)">编辑</el-button>
-                            <el-button v-if="!analyIsReadonly" type="text" @click="deleteMeasure(scope.row)">删除</el-button>
+                            <el-button v-if="!analyIsReadonly" type="text"
+                                @click="deleteMeasure(scope.row)">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
             </TableComponent>
         </FormComponent>
         <div class="sub-title">残余风险评估</div>
-        <FormComponent :options="subRemnantsOptions" labelWidth="110px" labelAlign="right" :data.sync="analysisUpdateParams"
-            @actionCallback="analyCallback" :actions="analyIsReadonly ? [] : measureActions" :full-btn="true"
-            btnPosition="center" @change="handleSubRiskChange" :isReadonly="analyIsReadonly" ref="remantRiskForm">
+        <FormComponent :options="subRemnantsOptions" labelWidth="110px" labelAlign="right"
+            :data.sync="analysisUpdateParams" @actionCallback="analyCallback"
+            :actions="analyIsReadonly ? [] : measureActions" :full-btn="true" btnPosition="center"
+            @change="handleSubRiskChange" :isReadonly="analyIsReadonly" ref="remantRiskForm">
         </FormComponent>
 
         <!-- 风险评估方法 -->
         <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"
-                :full-btn="true" btnPosition="center">
+                labelAlign="right" :data.sync="methodUpdateParams" @actionCallback="methodCallback"
+                :actions="triActions" :full-btn="true" btnPosition="center">
             </FormComponent>
             <div v-if="riskType === 'ls'" style="text-align: center;">
                 <img style="width:70%" src="../assets/images/3.png" alt="">
@@ -63,23 +67,26 @@
         </el-dialog>
         <!-- 风险评估取值 -->
         <div v-if="showRiskValueUpdate">
-            <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;"
-                    :data.sync="methodUpdateParams">
+            <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;" :data.sync="methodUpdateParams">
                     <el-table ref="singleTable" :data="riskTableData" tooltip-effect="dark" border row-key="checked"
                         @current-change="handleCurrentChange" style="width: 100%" highlight-current-row>
                         <template v-for="item in riskTableColumn">
                             <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key">
-                                <div slot-scope="scope" style="pointer-events: none;" v-html="item.render(scope.row)"></div>
+                                <div slot-scope="scope" style="pointer-events: none;" v-html="item.render(scope.row)">
+                                </div>
                             </el-table-column>
-                            <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key">
+                            <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width"
+                                :key="item.key">
                             </el-table-column>
                         </template>
                     </el-table>
                 </TableComponent>
-                <ButtonListComponent :actions="triActions" @callback="popCallback" btn-position="center" :full-btn="true">
+                <ButtonListComponent :actions="triActions" @callback="popCallback" btn-position="center"
+                    :full-btn="true">
                 </ButtonListComponent>
             </el-dialog>
         </div>
@@ -186,10 +193,10 @@ export default class AnalEvaluationComponent extends Vue {
     public measuresSelectData = {} as any;
 
     @Prop()
-    public isReadonly: boolean;
+    isReadonly: boolean;
 
     @Prop()
-    public type: any;
+    type: any;
 
     @Watch("isReadonly", { immediate: true, deep: true })
     onCountValueChange() {
@@ -199,7 +206,7 @@ export default class AnalEvaluationComponent extends Vue {
     @PropSync("data", {
         required: true,
     })
-    public analysisUpdateParams!: any;
+    analysisUpdateParams!: any;
     @Watch("analysisUpdateParams", { immediate: true })
     onChangeData(newValue, oldVale) {
         if (!oldVale || (newValue.id !== oldVale.id)) {
@@ -211,18 +218,18 @@ export default class AnalEvaluationComponent extends Vue {
         required: true,
         default: true
     })
-    public visible: boolean;
+    visible: boolean;
     @PropSync("tabledata", {
         required: true,
     })
-    public updateParams: any;
+    updateParams: any;
 
     @Prop()
-    public areaList: any;
+    areaList: any;
 
     @Prop()
     //评估方法
-    public checkRiskType: any;
+    checkRiskType: any;
 
     //基本信息
     public subBasicOptions: FormOption<BtnOption>[] = [];
@@ -322,6 +329,7 @@ export default class AnalEvaluationComponent extends Vue {
                 require: true,
                 showError: false,
                 format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd",
                 pickerOptions: {
                     disabledDate(time) {
                         return time.getTime() < moment(new Date()).add(1, 'month').subtract(1, 'day').toDate().getTime();
@@ -1256,7 +1264,7 @@ export default class AnalEvaluationComponent extends Vue {
 }
 
 </script>
-<style lang="scss" scoped  src="../views/common.component.scss"></style>
+<style lang="scss" scoped src="../views/common.component.scss"></style>
 <style lang="scss" scoped>
 ::v-deep {
     .el-table__body {
diff --git a/src/views/risk/assessment/work/workAnal.component.vue b/src/views/risk/assessment/work/workAnal.component.vue
index 0fd2c4a..b80b103 100644
--- a/src/views/risk/assessment/work/workAnal.component.vue
+++ b/src/views/risk/assessment/work/workAnal.component.vue
@@ -978,13 +978,13 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
                 this.analyIsReadonly = true;
                 //select 翻译
                 this.analysisTransformParam(row);
-                this.analysisUpdateParams = Object.assign(this.analysisUpdateParams, row);
+                this.analysisUpdateParams = Object.assign({},this.analysisUpdateParams, row);
                 //管控措施
                 this.initAnalysisMeasure();
             } else {
                 this.analyIsReadonly = false
                 // 暂存数据 用于取消修改
-                this.analysisUpdateParams = Object.assign(this.analysisUpdateParams, row);
+                this.analysisUpdateParams = Object.assign({},this.analysisUpdateParams, row);
                 //编辑 参数处理
                 this.updateAnalysisParam(row);
                 //管控措施