guangyin
/
hbt-prevention-ui
forked from xxhjsb/hbt-prevention-ui
1
0
Fork 0
Code Pull Requests Activity

feat:时间问题修复

feature1.3
kongyeqing 2024-10-24 15:57:42 +08:00
parent 77fd930c99
commit 2adfe8bc7b
2 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/components/analEvaluation.component.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<div v-if="visible"> <div v-if="visible">
<div class="sub-title">基本信息</div> <div class="sub-title">基本信息</div>
<FormComponent :options="subBasicOptions" labelWidth="110px" labelAlign="right" :data.sync="analysisUpdateParams" <FormComponent :options="subBasicOptions" labelWidth="110px" labelAlign="right"
@actionCallback="callback" :isReadonly="analyIsReadonly" @change="handleChange" ref="basicForm"> :data.sync="analysisUpdateParams" @actionCallback="callback" :isReadonly="analyIsReadonly"
@change="handleChange" ref="basicForm">
</FormComponent> </FormComponent>
<div class="sub-title">风险评估</div> <div class="sub-title">风险评估</div>
<FormComponent :options="subRiskOptions" labelWidth="110px" labelAlign="right" :data.sync="analysisUpdateParams" <FormComponent :options="subRiskOptions" labelWidth="110px" labelAlign="right" :data.sync="analysisUpdateParams"
@ -16,8 +17,9 @@
<TableComponent :tableData="analysisUpdateParams.measures" :tableColumn="triTableColumn" <TableComponent :tableData="analysisUpdateParams.measures" :tableColumn="triTableColumn"
@actionCallback="measureCallback($event)" :actions="analyIsReadonly ? [] : triTableActions" @actionCallback="measureCallback($event)" :actions="analyIsReadonly ? [] : triTableActions"
actionPosition="flex-start" :showFooter="false" style="margin-bottom: 20px;"> actionPosition="flex-start" :showFooter="false" style="margin-bottom: 20px;">
<el-table ref="multipleTable" :data="analysisUpdateParams.measures" tooltip-effect="dark" max-height="500" <el-table ref="multipleTable" :data="analysisUpdateParams.measures" tooltip-effect="dark"
border row-key="checked" @selection-change="handleSelectionChange" style="width: 100%"> 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 v-if="!analyIsReadonly" type="selection" fixed label="全选" width="40">
</el-table-column> </el-table-column>
<template v-for="item in triTableColumn"> <template v-for="item in triTableColumn">
@ -25,8 +27,8 @@
:width="item.width" :key="item.key"> :width="item.width" :key="item.key">
<div slot-scope="scope" v-html="item.render(scope.row)"></div> <div slot-scope="scope" v-html="item.render(scope.row)"></div>
</el-table-column> </el-table-column>
<el-table-column v-else :prop="item.key" :show-overflow-tooltip="item.showTip" :label="item.name" <el-table-column v-else :prop="item.key" :show-overflow-tooltip="item.showTip"
:width="item.width" :key="item.key"> :label="item.name" :width="item.width" :key="item.key">
</el-table-column> </el-table-column>
</template> </template>
<el-table-column label="操作" fixed="right" width="150"> <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 type="text" @click="showMeasureModel(scope.row, true)">查看</el-button>
<el-button v-if="!analyIsReadonly" type="text" <el-button v-if="!analyIsReadonly" type="text"
@click="showMeasureModel(scope.row)">编辑</el-button> @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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</TableComponent> </TableComponent>
</FormComponent> </FormComponent>
<div class="sub-title">残余风险评估</div> <div class="sub-title">残余风险评估</div>
<FormComponent :options="subRemnantsOptions" labelWidth="110px" labelAlign="right" :data.sync="analysisUpdateParams" <FormComponent :options="subRemnantsOptions" labelWidth="110px" labelAlign="right"
@actionCallback="analyCallback" :actions="analyIsReadonly ? [] : measureActions" :full-btn="true" :data.sync="analysisUpdateParams" @actionCallback="analyCallback"
btnPosition="center" @change="handleSubRiskChange" :isReadonly="analyIsReadonly" ref="remantRiskForm"> :actions="analyIsReadonly ? [] : measureActions" :full-btn="true" btnPosition="center"
@change="handleSubRiskChange" :isReadonly="analyIsReadonly" ref="remantRiskForm">
</FormComponent> </FormComponent>
<!-- 风险评估方法 --> <!-- 风险评估方法 -->
<el-dialog :close-on-click-modal="false" :show-close="false" :visible.sync="showRiskUpdate" width="952px" <el-dialog :close-on-click-modal="false" :show-close="false" :visible.sync="showRiskUpdate" width="952px"
:before-close="handleClose"> :before-close="handleClose">
<FormComponent :options="riskType === 'ls' ? riskLSUpdateOptions : riskLECUpdateOptions" labelWidth="110px" <FormComponent :options="riskType === 'ls' ? riskLSUpdateOptions : riskLECUpdateOptions" labelWidth="110px"
labelAlign="right" :data.sync="methodUpdateParams" @actionCallback="methodCallback" :actions="triActions" labelAlign="right" :data.sync="methodUpdateParams" @actionCallback="methodCallback"
:full-btn="true" btnPosition="center"> :actions="triActions" :full-btn="true" btnPosition="center">
</FormComponent> </FormComponent>
<div v-if="riskType === 'ls'" style="text-align: center;"> <div v-if="riskType === 'ls'" style="text-align: center;">
<img style="width:70%" src="../assets/images/3.png" alt=""> <img style="width:70%" src="../assets/images/3.png" alt="">
@ -63,23 +67,26 @@
</el-dialog> </el-dialog>
<!-- 风险评估取值 --> <!-- 风险评估取值 -->
<div v-if="showRiskValueUpdate"> <div v-if="showRiskValueUpdate">
<el-dialog :close-on-click-modal="false" :title="riskTitle" :visible.sync="showRiskValueUpdate" width="952px" <el-dialog :close-on-click-modal="false" :title="riskTitle" :visible.sync="showRiskValueUpdate"
:before-close="handleClose" :show-close="false"> width="952px" :before-close="handleClose" :show-close="false">
<TableComponent :tableData="riskTableData" :tableColumn="riskTableColumn" @tabCallback="popCallback($event)" <TableComponent :tableData="riskTableData" :tableColumn="riskTableColumn"
actionPosition="flex-start" :showFooter="false" style="margin-bottom: 20px;" @tabCallback="popCallback($event)" actionPosition="flex-start" :showFooter="false"
:data.sync="methodUpdateParams"> style="margin-bottom: 20px;" :data.sync="methodUpdateParams">
<el-table ref="singleTable" :data="riskTableData" tooltip-effect="dark" border row-key="checked" <el-table ref="singleTable" :data="riskTableData" tooltip-effect="dark" border row-key="checked"
@current-change="handleCurrentChange" style="width: 100%" highlight-current-row> @current-change="handleCurrentChange" style="width: 100%" highlight-current-row>
<template v-for="item in riskTableColumn"> <template v-for="item in riskTableColumn">
<el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key"> <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>
<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> </el-table-column>
</template> </template>
</el-table> </el-table>
</TableComponent> </TableComponent>
<ButtonListComponent :actions="triActions" @callback="popCallback" btn-position="center" :full-btn="true"> <ButtonListComponent :actions="triActions" @callback="popCallback" btn-position="center"
:full-btn="true">
</ButtonListComponent> </ButtonListComponent>
</el-dialog> </el-dialog>
</div> </div>
@ -186,10 +193,10 @@ export default class AnalEvaluationComponent extends Vue {
public measuresSelectData = {} as any; public measuresSelectData = {} as any;
@Prop() @Prop()
public isReadonly: boolean; isReadonly: boolean;
@Prop() @Prop()
public type: any; type: any;
@Watch("isReadonly", { immediate: true, deep: true }) @Watch("isReadonly", { immediate: true, deep: true })
onCountValueChange() { onCountValueChange() {
@ -199,7 +206,7 @@ export default class AnalEvaluationComponent extends Vue {
@PropSync("data", { @PropSync("data", {
required: true, required: true,
}) })
public analysisUpdateParams!: any; analysisUpdateParams!: any;
@Watch("analysisUpdateParams", { immediate: true }) @Watch("analysisUpdateParams", { immediate: true })
onChangeData(newValue, oldVale) { onChangeData(newValue, oldVale) {
if (!oldVale || (newValue.id !== oldVale.id)) { if (!oldVale || (newValue.id !== oldVale.id)) {
@ -211,18 +218,18 @@ export default class AnalEvaluationComponent extends Vue {
required: true, required: true,
default: true default: true
}) })
public visible: boolean; visible: boolean;
@PropSync("tabledata", { @PropSync("tabledata", {
required: true, required: true,
}) })
public updateParams: any; updateParams: any;
@Prop() @Prop()
public areaList: any; areaList: any;
@Prop() @Prop()
//评估方法 //评估方法
public checkRiskType: any; checkRiskType: any;
//基本信息 //基本信息
public subBasicOptions: FormOption<BtnOption>[] = []; public subBasicOptions: FormOption<BtnOption>[] = [];
@ -322,6 +329,7 @@ export default class AnalEvaluationComponent extends Vue {
require: true, require: true,
showError: false, showError: false,
format: "yyyy-MM-dd", format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
pickerOptions: { pickerOptions: {
disabledDate(time) { disabledDate(time) {
return time.getTime() < moment(new Date()).add(1, 'month').subtract(1, 'day').toDate().getTime(); return time.getTime() < moment(new Date()).add(1, 'month').subtract(1, 'day').toDate().getTime();

4
src/views/risk/assessment/work/workAnal.component.vue
View File

@ -978,13 +978,13 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
this.analyIsReadonly = true; this.analyIsReadonly = true;
//select 翻译 //select 翻译
this.analysisTransformParam(row); this.analysisTransformParam(row);
this.analysisUpdateParams = Object.assign(this.analysisUpdateParams, row); this.analysisUpdateParams = Object.assign({},this.analysisUpdateParams, row);
//管控措施 //管控措施
this.initAnalysisMeasure(); this.initAnalysisMeasure();
} else { } else {
this.analyIsReadonly = false this.analyIsReadonly = false
// 暂存数据 用于取消修改 // 暂存数据 用于取消修改
this.analysisUpdateParams = Object.assign(this.analysisUpdateParams, row); this.analysisUpdateParams = Object.assign({},this.analysisUpdateParams, row);
//编辑 参数处理 //编辑 参数处理
this.updateAnalysisParam(row); this.updateAnalysisParam(row);
//管控措施 //管控措施