From 81ce4e55ceed895cc486cabf88d5b189fdfaa295 Mon Sep 17 00:00:00 2001 From: kongyeqing <2697454777@qq.com> Date: Wed, 6 Sep 2023 18:01:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=B7=A5=E4=BD=9C=E5=8D=B1=E5=AE=B3?= =?UTF-8?q?=E5=88=86=E6=9E=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/4.png | Bin 0 -> 17968 bytes src/assets/images/{4.jpg => LS.jpg} | Bin src/components/analEvaluation.component.vue | 9 ++ src/components/measure.component.vue | 60 +++++++++---- src/views/risk/area/area.component.vue | 4 +- src/views/risk/areaUnit.component.html | 2 +- .../areaAnal/areaAnal.component.html | 42 +-------- .../device/deviceAnal.component.vue | 3 +- .../assessment/work/workAnal.component.vue | 8 +- src/views/threecards/riskCard.component.vue | 21 ++--- src/views/workprogress/common.component.html | 2 +- .../workprogress/trainRecords.component.vue | 84 +++++++++++++----- 12 files changed, 134 insertions(+), 101 deletions(-) create mode 100644 src/assets/images/4.png rename src/assets/images/{4.jpg => LS.jpg} (100%) diff --git a/src/assets/images/4.png b/src/assets/images/4.png new file mode 100644 index 0000000000000000000000000000000000000000..1bd32d90ace54dff7527c87335a432b3d8683fea GIT binary patch literal 17968 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 + :data.sync="taskUpdataParams" :actions="taskIsReadonly ? [] : taskActions" :full-btn="true" + btnPosition="center" @actionCallback="taskCallback" @change="taskSelectChange"> @@ -231,6 +231,7 @@ export default class MeasureComponent extends Vue { width: "calc(50% - 20px)", require: true, showError: false, + min: 1, // labelWidth:"130px" }, { key: "reviewCycleUnit", @@ -274,19 +275,26 @@ export default class MeasureComponent extends Vue { showError: false, },] } + public subActions = [] as any; + //排查任务按钮 + public taskActions = [] as any; + + public buildTaskAction(){ + this.taskActions= [{ + name: "取消", + value: "cancel" + }, { + name: "保存并继续添加", + value: "saveAndContinue", + type: "primary", + hide: this.taskUpdataParams.index + }, { + name: "保存", + value: "save", + type: "primary" + }]; + } - public subActions = [{ - name: "取消", - value: "cancel" - }, { - name: "保存并继续添加", - value: "saveAndContinue", - type: "primary" - }, { - name: "保存", - value: "save", - type: "primary" - }]; public tableActions = [{ name: "添加", value: "fourSubAdd", @@ -328,6 +336,7 @@ export default class MeasureComponent extends Vue { // } this.measuresUpdateForm() this.taskUpdateForm() + this.buildActions() } @PropSync("tabledata", { @@ -335,10 +344,27 @@ export default class MeasureComponent extends Vue { }) public measureData!: any; + public buildActions() { + this.subActions = [{ + name: "取消", + value: "cancel" + }, { + name: "保存并继续添加", + value: "saveAndContinue", + type: "primary", + hide: this.updataParams.index + }, { + name: "保存", + value: "save", + type: "primary" + }]; + } + created() { this.buildTable(); - console.log('measureData',this.measureData); - + console.log('measureData', this.measureData); + + } @@ -442,6 +468,7 @@ export default class MeasureComponent extends Vue { } this.showSubUpdate = true this.taskUpdateForm() + this.buildTaskAction() } //排查任务 --- 包保对应项 @@ -501,6 +528,7 @@ export default class MeasureComponent extends Vue { } this.taskUpdateForm(); this.showSubUpdate = true; + this.buildTaskAction() } public deleteTask(row) { diff --git a/src/views/risk/area/area.component.vue b/src/views/risk/area/area.component.vue index ed6321f..e6ba201 100644 --- a/src/views/risk/area/area.component.vue +++ b/src/views/risk/area/area.component.vue @@ -388,10 +388,9 @@ export default class AreaManagerComponent extends BaseRecordComponent { pageNum: 1, pageSize: 20, } as any; + this.getTableData() } - - public showUpdateModel(data?, isRead?) { if (!data) { this.currentId = -1; @@ -399,7 +398,6 @@ export default class AreaManagerComponent extends BaseRecordComponent { } else { this.currentId = data.id; this.updateParams = Object.assign({ bottomHeight: 0, topHeight: 0, geoJson: "[]", majorHazardFlagName: this.$store.getters.common_yes_no_map[data.majorHazardFlag], majorHazardLevelName: this.levelName(data.majorHazardLevel) }, data); - this.isReadonly = !!isRead; this.buildFormOptions(); this.showUpdate = true diff --git a/src/views/risk/areaUnit.component.html b/src/views/risk/areaUnit.component.html index cb7660c..afab524 100644 --- a/src/views/risk/areaUnit.component.html +++ b/src/views/risk/areaUnit.component.html @@ -2,7 +2,7 @@
+ :actions="formActions" :full-btn="false" @change="callback" btn-position="end">
- + @@ -104,44 +104,4 @@ - -
\ No newline at end of file diff --git a/src/views/risk/assessment/device/deviceAnal.component.vue b/src/views/risk/assessment/device/deviceAnal.component.vue index 97f4113..face15a 100644 --- a/src/views/risk/assessment/device/deviceAnal.component.vue +++ b/src/views/risk/assessment/device/deviceAnal.component.vue @@ -236,7 +236,8 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent width: "calc(50% - 20px)", require: true, showError: false, - format: "yyyy-MM-dd" + format: "yyyy-MM-dd", + disable: true, }, { name: "区域固有风险等级", key: "analRiskLevel", diff --git a/src/views/risk/assessment/work/workAnal.component.vue b/src/views/risk/assessment/work/workAnal.component.vue index 685d19d..9695d3c 100644 --- a/src/views/risk/assessment/work/workAnal.component.vue +++ b/src/views/risk/assessment/work/workAnal.component.vue @@ -131,7 +131,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { name: "单元名称", key: "unitName", type: "text", - },{ + }, { name: "作业活动", key: "jobInventoryName", type: "text", @@ -244,7 +244,8 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { width: "calc(50% - 20px)", require: true, showError: false, - format: "yyyy-MM-dd" + format: "yyyy-MM-dd", + disable:true, }, { name: "区域固有风险等级", key: "analRiskLevel", @@ -506,7 +507,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { 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", width: "200px" }); + this.subTableColumn.push({ name: '危害分析', key: "hazardAnalysis", width: "200px", showTip: true, }); this.subTableColumn.push({ name: '最严重后果', key: "seriousResult", width: "100px", render: (data) => { if (data.seriousResult) { @@ -651,6 +652,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { pageNum: 1, pageSize: 20, } as any; + this.getTableData() } // 分页数据 diff --git a/src/views/threecards/riskCard.component.vue b/src/views/threecards/riskCard.component.vue index 0f97a9c..891be6b 100644 --- a/src/views/threecards/riskCard.component.vue +++ b/src/views/threecards/riskCard.component.vue @@ -58,12 +58,12 @@ export default class RiskCard extends BaseRecordComponent { public showUpdate = false; public setpsOptions = [] as any; - + public showFileModal = false; public showFileList = [] as any; - public labelWidth='130px' + public labelWidth = '130px' public formActions = [{ name: "查询", @@ -138,7 +138,7 @@ export default class RiskCard extends BaseRecordComponent { width: "calc(50% - 20px)", showError: false, disable: true, - labelWidth:"130px" + labelWidth: "130px" }, { name: "区域名称", @@ -185,7 +185,7 @@ export default class RiskCard extends BaseRecordComponent { require: true, width: "100%", showError: false, - labelWidth:'130px' + labelWidth: '130px' }, { name: "风险等级", @@ -327,7 +327,7 @@ export default class RiskCard extends BaseRecordComponent { this.tableColumn.push({ name: '岗位名称', key: "postName", }); this.tableColumn.push({ name: '主要危险有害因素', key: "harmfulFactors", }); this.tableColumn.push({ - name: '风险等级', key: "riskLevel",width:"150px", render: (data) => { + name: '风险等级', key: "riskLevel", width: "150px", render: (data) => { if (data.riskLevel) { return "" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '') + "" } @@ -398,6 +398,7 @@ export default class RiskCard extends BaseRecordComponent { pageNum: 1, pageSize: 20, } as any; + this.getTableData() } public showUpdateModel(id) { @@ -498,13 +499,8 @@ export default class RiskCard extends BaseRecordComponent { }) } - public showModal(row, isReadonly) { - if (isReadonly) { - this.subIsReadonly = true - - } else { - this.subIsReadonly = false - } + public showModal(row, isReadonly = false) { + this.subIsReadonly = isReadonly this.tableService.getListDetail({ id: row.id }).then((res: any) => { if (res.code === 200) { @@ -512,6 +508,7 @@ export default class RiskCard extends BaseRecordComponent { riskLevelName: this.$store.getters.prevention_risk_level_map[res.data.riskLevel], safetySignName: res.data.safetySign.split(",").map(item => this.$store.getters.prevention_security_identifier_map[item]).join(",") }, res.data) + this.subUpdateParams.postCode = +res.data.postCode if (res.data.resourceId) { this.tableService.getFileUrls({ ids: res.data.resourceId.split(",") }).then((files: any) => { this.fileList = files.data.map(item => { diff --git a/src/views/workprogress/common.component.html b/src/views/workprogress/common.component.html index dbbcd46..3bd6f16 100644 --- a/src/views/workprogress/common.component.html +++ b/src/views/workprogress/common.component.html @@ -83,7 +83,7 @@ :title="subIsReadonly?'详情':subUpdateParams.index||subUpdateParams.id ?'编辑': '新增'" :visible.sync="subShowUpdate" width="952px"> diff --git a/src/views/workprogress/trainRecords.component.vue b/src/views/workprogress/trainRecords.component.vue index 2246f02..272362c 100644 --- a/src/views/workprogress/trainRecords.component.vue +++ b/src/views/workprogress/trainRecords.component.vue @@ -124,21 +124,9 @@ export default class TrainRecords extends BaseRecordComponent { value: "cancel" }]; + public updateActions = [] as any; - - - public updateActions = [{ - name: "取消", - value: "cancel" - }, { - name: "保存并继续添加", - value: "saveAndContinue", - type: "primary" - }, { - name: "保存", - value: "save", - type: "primary" - }]; + public subUpdateActions = [] as any; public updateOptions: FormOption[] = [] as any; public buildUpdateForm() { @@ -217,7 +205,19 @@ export default class TrainRecords extends BaseRecordComponent { showError: false, }, ] - + this.updateActions = [{ + name: "取消", + value: "cancel" + }, { + name: "保存并继续添加", + value: "saveAndContinue", + type: "primary", + hide: this.updateParams.id + }, { + name: "保存", + value: "save", + type: "primary" + }]; } public subUpdateOptions: FormOption[] = [] @@ -272,13 +272,29 @@ export default class TrainRecords extends BaseRecordComponent { }] }, { name: "得分", - type: "text", + type: "number", key: "score", require: true, width: "calc(50% - 20px)", + controls: false, showError: false, + max: 100, + min: 0, hide: !(this.subUpdateParams.examStatus === 1) },] + this.subUpdateActions = [{ + name: "取消", + value: "cancel" + }, { + name: "保存并继续添加", + value: "saveAndContinue", + type: "primary", + hide: this.subUpdateParams.index + }, { + name: "保存", + value: "save", + type: "primary" + }]; } @@ -288,7 +304,7 @@ export default class TrainRecords extends BaseRecordComponent { public buildTable() { - this.tableColumn.push({ name: '培训名称', key: "name"}); + this.tableColumn.push({ name: '培训名称', key: "name" }); this.tableColumn.push({ name: '培训类型', key: "type", render: (data) => { if (data.type === 1) { @@ -311,7 +327,7 @@ export default class TrainRecords extends BaseRecordComponent { } }); this.tableColumn.push({ - name: '培训层级', key: "level", render: (data) => { + name: '培训层级', key: "level", render: (data) => { if (data.level) { return this.$store.getters.prevention_training_level_map[data.level] } @@ -355,6 +371,28 @@ export default class TrainRecords extends BaseRecordComponent { } this.buildSubForm() } + //培训时长格式化 + this.durationChange(data, item); + //得分格式化 + this.scoreFormat(data, item); + } + /** + * 培训时长格式化，保留一位小数 + * @param data + * @param item + */ + public durationChange(data: any, item: any) { + if (item && item.key === 'duration') { + this.updateParams.duration = null; + this.$set(this.updateParams, item.key, +data.toFixed(1)) + } + } + + public scoreFormat(data: any, item: any) { + if (item && item.key === 'score') { + this.updateParams.score = null; + this.$set(this.subUpdateParams, item.key, +data.toFixed(2)) + } } public callback(data, type) { @@ -398,6 +436,7 @@ export default class TrainRecords extends BaseRecordComponent { pageNum: 1, pageSize: 20, } as any; + this.getTableData() } public showUpdateModel(id) { @@ -423,7 +462,7 @@ export default class TrainRecords extends BaseRecordComponent { this.toggleAll() } else { this.tableData.datas.forEach((item, index) => { - const find = this.selectData.find((data: any) => data.userId === item.userId); + const find = this.selectData.find((data: any) => data.id === item.id); if (!find) { (this.$refs.multipleTable as any).toggleRowSelection(item); } @@ -472,9 +511,9 @@ export default class TrainRecords extends BaseRecordComponent { public subCallback(data) { if (data.value === "add") { this.subIsReadonly = false - this.buildSubForm() this.subUpdateParams = {} as any; this.subShowUpdate = true + this.buildSubForm() } else if (data.value === "cancel") { this.showUpdate = false } else if (data && data.value.indexOf("save") >= 0) { @@ -531,11 +570,11 @@ export default class TrainRecords extends BaseRecordComponent { public showSubModal(row, isReadonly) { if (isReadonly) { this.subIsReadonly = true - this.subUpdateParams = row + this.subUpdateParams = JSON.parse(JSON.stringify(row)) this.subUpdateParams.examStatusName = row.examStatus === 1 ? '已参加' : '未参加' } else { this.subIsReadonly = false - this.subUpdateParams = row + this.subUpdateParams = JSON.parse(JSON.stringify(row)) } this.subShowUpdate = true this.buildSubForm() @@ -543,7 +582,6 @@ export default class TrainRecords extends BaseRecordComponent { //删除成员 public deleteSubData(indexs) { - this.$confirm('确认删除所选数据', '确认数据', { confirmButtonText: '确定', cancelButtonText: '取消',