From 1b7a1eaf53aafb83bf125ec5340243fa01a50eb6 Mon Sep 17 00:00:00 2001 From: kongyeqing <2697454777@qq.com> Date: Wed, 13 Sep 2023 18:03:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E5=A4=8D=E9=9A=90=E6=82=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/measure.component.vue | 2 +- src/views/common.component.scss | 356 +++++++++--------- .../estimate/checkResumption.component.vue | 2 + .../hiddendangerResumption.component.vue | 4 +- .../publicityResumption.component.vue | 4 +- src/views/hiddenDanger/clap.component.vue | 16 +- src/views/hiddenDanger/common.component.html | 5 +- src/views/hiddenDanger/files.component.vue | 4 +- src/views/hiddenDanger/manager.component.vue | 6 +- .../hiddenDanger/rules/rules.component.vue | 4 +- .../rules/rulesManager.component.vue | 4 +- .../hiddenDanger/safe/action.component.vue | 6 +- .../hiddenDanger/safe/plan.component.vue | 4 +- src/views/integral/center.component.vue | 4 +- src/views/integral/event.component.vue | 4 +- .../exchangeFlow/exchange.component.vue | 4 +- .../exchangeRecord.component.vue | 4 +- src/views/integral/mall.component.vue | 7 +- src/views/integral/rule.component.vue | 4 +- .../checkTasks/checkTasks.component.vue | 7 +- .../majorHazard/majorHazard.component.vue | 7 +- .../rewardsRecord/rewardsRecord.component.vue | 4 +- .../selfAssessment.component.vue | 7 +- src/views/risk/area/area.component.vue | 8 +- .../areaAnal/areaAnal.component.vue | 4 +- .../assessment/device/device.component.vue | 4 +- .../device/deviceAnal.component.vue | 8 +- .../risk/assessment/work/work.component.vue | 10 +- .../assessment/work/workAnal.component.vue | 14 +- src/views/risk/duty/duty.component.vue | 7 +- src/views/risk/duty/dutyRecords.component.vue | 4 +- .../risk/identify/identify.component.vue | 4 +- .../risk/measures/measures.component.vue | 4 +- .../measuresReport.component.vue | 4 +- src/views/risk/unit/unit.component.vue | 22 +- .../businessInfo/businessInfo.component.vue | 8 +- .../maintenanceInfo.component.vue | 4 +- .../riskJudgment/riskJudgment.component.vue | 4 +- .../safetyNotice/safetyNotice.component.vue | 4 +- .../threecards/emergencyCard.component.vue | 9 +- src/views/threecards/riskCard.component.vue | 6 +- src/views/threecards/safeCard.component.vue | 6 +- src/views/workprogress/leader.component.vue | 14 +- .../managementSystem.component.vue | 28 +- .../workprogress/programme.component.vue | 25 +- .../workprogress/trainRecords.component.vue | 4 +- 46 files changed, 416 insertions(+), 258 deletions(-) diff --git a/src/components/measure.component.vue b/src/components/measure.component.vue index e6b9a1e..d67fa82 100644 --- a/src/components/measure.component.vue +++ b/src/components/measure.component.vue @@ -601,7 +601,7 @@ export default class MeasureComponent extends Vue { } //开始执行时间 if (item && item.key === 'executeStartTime') { - const now = moment().format("YYYY-MM-DD HH:mm"); + const now = moment().format("YYYY-MM-DD HH:mm:ss"); if (now > data) { this.$message.warning("开始执行时间不能早于当前时间") this.taskUpdataParams.executeStartTime = null; diff --git a/src/views/common.component.scss b/src/views/common.component.scss index a1d2ca5..39b6de2 100644 --- a/src/views/common.component.scss +++ b/src/views/common.component.scss @@ -1,201 +1,211 @@ ::v-deep { - .color_0 { - color: #F56C6C - } - .color_1 { - color: #68C23A - } + .color_0 { + color: #f56c6c; + } + .color_1 { + color: #68c23a; + } - .color_2 { - color: #409EFF - } + .color_2 { + color: #409eff; + } - .color_3 { - color: #E6A23C - } + .color_3 { + color: #e6a23c; + } - .color_4 { - color: #F56C6C - } + .color_4 { + color: #f56c6c; + } - .color_5{ - color: rgba(0,0,0,0.5) - } + .color_5 { + color: rgba(0, 0, 0, 0.5); + } - .color_level_1{ + .color_level_1 { + color: #fff; + background-color: #116ff5; + padding: 5px 21px; + font-size: 12px; + border-radius: 4px; + } + + .color_level_2 { + color: #fff; + background-color: #ffc019; + padding: 5px 15px; + font-size: 12px; + border-radius: 4px; + } + + .color_level_3 { + color: #fff; + background-color: #ff7802; + padding: 5px 15px; + font-size: 12px; + border-radius: 4px; + } + + .color_level_4 { + color: #fff; + background-color: #e31c21; + padding: 5px 15px; + font-size: 12px; + border-radius: 4px; + } + + .noDraw { + color: #f56c6c; + } + + .link { + color: #409eff; + cursor: pointer; + pointer-events: auto; + + &:hover { + text-decoration: underline; + } + } + .el-dialog__header { + padding: 20px 0 20px 0px; + border-bottom: 1px solid #eee; + margin: 0 40px; + } + .el-dialog__body { + padding: 30px 40px; + } + .el-dialog__wrapper, + .v-modal { + z-index: 99 !important; + } + + .el-tree-node__content { + height: 39px; + } + + .el-tree-node__content:hover, + .el-upload-list__item:hover { + background: #e4e8f1; + } + + .el-tree--highlight-current + .el-tree-node.is-current + > .el-tree-node__content { + background: #409eff; + border-radius: 4px; + color: #fff; + } + + .td-content { + &.active { + &::before { + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + content: ""; + background: #68c23a; + z-index: 1; + } + + span { + position: relative; + z-index: 9; color: #fff; - background-color:#116FF5; - padding: 5px 21px; - font-size: 12px; - border-radius: 4px; - } - - .color_level_2{ - color: #fff; - background-color:#FFC019; - padding: 5px 15px; - font-size: 12px; - border-radius: 4px; - } - - .color_level_3{ - color: #fff; - background-color:#FF7802; - padding: 5px 15px; - font-size: 12px; - border-radius: 4px; - } - - .color_level_4{ - color: #fff; - background-color:#E31C21; - padding: 5px 15px; - font-size: 12px; - border-radius: 4px; - } - - - .noDraw { - color: #F56C6C; - } - - .link { - color: #409eff; - cursor: pointer; - pointer-events: auto; - - &:hover { - text-decoration: underline; - } - } - .el-dialog__wrapper,.v-modal{ - z-index: 99 !important; - } - - .el-tree-node__content { - height: 39px; - } - - .el-tree-node__content:hover, - .el-upload-list__item:hover { - background: #E4E8F1; - } - - .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content { - background: #409EFF; - border-radius: 4px; - color: #FFF; - } - - .td-content { - &.active { - &::before { - position: absolute; - left: 0; - top: 0; - right: 0; - bottom: 0; - content: ""; - background: #68C23A; - z-index: 1; - } - - span { - position: relative; - z-index: 9; - color: #FFF; - } - } + } } + } } .common-box { - width: 100%; + width: 100%; + height: 100%; + padding: 8px; + font-size: 14px; + position: relative; + + .model-box { + position: fixed; + inset: 40px 40px 40px 240px; + z-index: 999; + + .mask { + position: fixed; + inset: 0; + background: rgba($color: #000000, $alpha: 0.6); + z-index: 10; + } + } + + .common-tree-box { + width: 200px; + padding: 20px 10px; + margin-right: 8px; height: 100%; - padding: 8px; - font-size: 14px; - position: relative; + overflow: hidden; + overflow-y: auto; + background: #fff; + border-radius: 4px; + border: 1px solid #eeeeee; + } - .model-box { - position: fixed; - inset: 40px 40px 40px 240px; - z-index: 999; + .common-content-box { + width: 1px; + height: 100%; - .mask { - position: fixed; - inset: 0; - background: rgba($color: #000000, $alpha: 0.6); - z-index: 10; - } + .search-box { + padding: 20px 20px 0; + background: #ffffff; + border-radius: 4px; + border: 1px solid #eeeeee; } - .common-tree-box { - width: 200px; - padding: 20px 10px; - margin-right: 8px; - height: 100%; - overflow: hidden; - overflow-y: auto; - background: #FFF; - border-radius: 4px; - border: 1px solid #EEEEEE; - } - - .common-content-box { - width: 1px; - height: 100%; - - .search-box { - padding: 20px 20px 0; - background: #FFFFFF; - border-radius: 4px; - border: 1px solid #EEEEEE; - } - - .table-box { - width: 100%; - height: 1px; - margin-top: 8px; - background: #FFFFFF; - display: flex; - flex-direction: column; - border-radius: 4px; - border: 1px solid #EEEEEE; - padding: 24px 24px 0; - } + .table-box { + width: 100%; + height: 1px; + margin-top: 8px; + background: #ffffff; + display: flex; + flex-direction: column; + border-radius: 4px; + border: 1px solid #eeeeee; + padding: 24px 24px 0; } + } } .sub-title { - width: 100%; - padding: 16px 0; - border-bottom: 1px solid #EEEEEE; - color: #606266; - font-size: 16px; - margin-bottom: 20px; + width: 100%; + padding: 16px 0; + border-bottom: 1px solid #eeeeee; + color: #606266; + font-size: 16px; + margin-bottom: 20px; } .sub-table-title { - width: 100%; - padding: 16px 0; - color: #606266; - font-size: 16px; - font-weight: 700; - // margin-bottom: 20px; + width: 100%; + padding: 16px 0; + color: #606266; + font-size: 16px; + font-weight: 700; + // margin-bottom: 20px; } .sub-btn-box { - width: 100%; - display: flex; - justify-content: center; - padding: 20px 0; + width: 100%; + display: flex; + justify-content: center; + padding: 20px 0; } -.tips{ - color: #F56C6C; - margin-left: -43px; - margin-bottom: 20px; - margin-top: -10px; - font-size: 20px; - scale:0.5; -} \ No newline at end of file +.tips { + color: #f56c6c; + margin-left: -43px; + margin-bottom: 20px; + margin-top: -10px; + font-size: 20px; + scale: 0.5; +} diff --git a/src/views/estimate/checkResumption.component.vue b/src/views/estimate/checkResumption.component.vue index b728c04..1567e2d 100644 --- a/src/views/estimate/checkResumption.component.vue +++ b/src/views/estimate/checkResumption.component.vue @@ -214,7 +214,9 @@ export default class checkResumption extends BaseRecordComponent { public callback(data, type) { if (type) { if (this.type === 1) { + if (type === 'pageSize' || type === 'pageNum') { this.params[type] = data; + } this.getTableData() } else { this.getReportTableData() diff --git a/src/views/estimate/hiddendangerResumption.component.vue b/src/views/estimate/hiddendangerResumption.component.vue index 969c613..8ef7b13 100644 --- a/src/views/estimate/hiddendangerResumption.component.vue +++ b/src/views/estimate/hiddendangerResumption.component.vue @@ -176,7 +176,9 @@ export default class HiddendangerResumption extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/estimate/publicityResumption/publicityResumption.component.vue b/src/views/estimate/publicityResumption/publicityResumption.component.vue index a28f50e..99583fd 100644 --- a/src/views/estimate/publicityResumption/publicityResumption.component.vue +++ b/src/views/estimate/publicityResumption/publicityResumption.component.vue @@ -160,7 +160,9 @@ export default class PublicityResumption extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/hiddenDanger/clap.component.vue b/src/views/hiddenDanger/clap.component.vue index 6bc7e9d..d09444e 100644 --- a/src/views/hiddenDanger/clap.component.vue +++ b/src/views/hiddenDanger/clap.component.vue @@ -484,7 +484,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent this.updateParams.verifyUserName = this.$store.getters.user_map[data] } if (item && item.key === 'reformDeadline') { - const now = moment().format("YYYY-MM-DD HH"); + const now = moment().format("YYYY-MM-DD HH:mm"); if (now > data) { this.$message.error("要求整改日期不能早于当前时间") this.updateParams.reformDeadline = null; @@ -496,7 +496,9 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent public callback(data, type?) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -573,8 +575,8 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent areaName: (this.areaList.find((item: any) => item.value === res.data.areaId) as any).name, type: "随手拍", }, res.data) - this.updateParams.majorHazard = +this.updateParams.majorHazard - this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] + this.updateParams.majorHazard = this.updateParams.majorHazard ? +this.updateParams.majorHazard : 0 + this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] // 地图定位 this.center = [res.data.locationLng, res.data.locationLat]; this.buildUpdateForm() @@ -683,6 +685,12 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent this.updateParams.resourceName = this.photoList.map(item => item.name).join(",") this.updateParams.resourceOtherId = this.fileList.map(item => item.id).join(",") this.updateParams.resourceOtherName = this.fileList.map(item => item.name).join(",") + for (const attribute in this.updateParams) { + if (this.updateParams[attribute] === undefined) { + this.updateParams[attribute] = null + } + } + this.tableService.addOrUpdate(JSON.parse(JSON.stringify(this.updateParams)), !this.updateParams.id).then(res => { this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功"); if (isSubmit) { diff --git a/src/views/hiddenDanger/common.component.html b/src/views/hiddenDanger/common.component.html index 4590782..77249fb 100644 --- a/src/views/hiddenDanger/common.component.html +++ b/src/views/hiddenDanger/common.component.html @@ -42,7 +42,8 @@ @click="showUpdateModel(scope.row,true)">查看 修改 - 删除 + 删除
隐患信息
diff --git a/src/views/hiddenDanger/files.component.vue b/src/views/hiddenDanger/files.component.vue index 0d70496..89d0bf5 100644 --- a/src/views/hiddenDanger/files.component.vue +++ b/src/views/hiddenDanger/files.component.vue @@ -630,7 +630,9 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent public callback(data, type?) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue index 421e0bb..b74aeac 100644 --- a/src/views/hiddenDanger/manager.component.vue +++ b/src/views/hiddenDanger/manager.component.vue @@ -875,7 +875,9 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent { public callback(data, type?) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/hiddenDanger/rules/rulesManager.component.vue b/src/views/hiddenDanger/rules/rulesManager.component.vue index a8413f2..d8998e3 100644 --- a/src/views/hiddenDanger/rules/rulesManager.component.vue +++ b/src/views/hiddenDanger/rules/rulesManager.component.vue @@ -355,7 +355,9 @@ export default class RulesManagerComponent extends BaseRecordComponent { public callback(data, type?) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/hiddenDanger/safe/action.component.vue b/src/views/hiddenDanger/safe/action.component.vue index 6350258..9894d16 100644 --- a/src/views/hiddenDanger/safe/action.component.vue +++ b/src/views/hiddenDanger/safe/action.component.vue @@ -485,7 +485,9 @@ export default class RulesManagerComponent extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData() return } @@ -679,7 +681,7 @@ export default class RulesManagerComponent extends BaseRecordComponent { professionClassifyName: this.$store.getters.prevention_major_type_map[row.professionClassify], reformModeName: this.reformModeMap[row.reformMode], }, row) - this.updateParams.majorHazard = +this.updateParams.majorHazard; + this.updateParams.majorHazard = this.updateParams.majorHazard ? +this.updateParams.majorHazard : 0 this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] // 获取url diff --git a/src/views/hiddenDanger/safe/plan.component.vue b/src/views/hiddenDanger/safe/plan.component.vue index be9ae04..77564c0 100644 --- a/src/views/hiddenDanger/safe/plan.component.vue +++ b/src/views/hiddenDanger/safe/plan.component.vue @@ -469,7 +469,9 @@ export default class PlanComponent extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/integral/center.component.vue b/src/views/integral/center.component.vue index 7b49e49..e62f34b 100644 --- a/src/views/integral/center.component.vue +++ b/src/views/integral/center.component.vue @@ -119,7 +119,9 @@ export default class IntegralCenter extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/integral/event.component.vue b/src/views/integral/event.component.vue index f8dd58d..677b2a2 100644 --- a/src/views/integral/event.component.vue +++ b/src/views/integral/event.component.vue @@ -131,7 +131,9 @@ export default class IntegralEvent extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/integral/exchange/exchangeFlow/exchange.component.vue b/src/views/integral/exchange/exchangeFlow/exchange.component.vue index b6cf426..04ba39d 100644 --- a/src/views/integral/exchange/exchangeFlow/exchange.component.vue +++ b/src/views/integral/exchange/exchangeFlow/exchange.component.vue @@ -410,7 +410,9 @@ export default class IntegralExchange extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/integral/exchange/exchangeRecord/exchangeRecord.component.vue b/src/views/integral/exchange/exchangeRecord/exchangeRecord.component.vue index 9c63fa6..98f690c 100644 --- a/src/views/integral/exchange/exchangeRecord/exchangeRecord.component.vue +++ b/src/views/integral/exchange/exchangeRecord/exchangeRecord.component.vue @@ -287,7 +287,9 @@ export default class IntegralExchangeRecord extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/integral/mall.component.vue b/src/views/integral/mall.component.vue index 34b2538..9b95a07 100644 --- a/src/views/integral/mall.component.vue +++ b/src/views/integral/mall.component.vue @@ -222,7 +222,9 @@ export default class IntegralMall extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -338,6 +340,9 @@ export default class IntegralMall extends BaseRecordComponent { }) this.updateParams.resourceId = resourceId.join(",") this.updateParams.resourceName = resourceName.join(",") + } else { + this.updateParams.resourceId = '' + this.updateParams.resourceName = '' } this.tableService.addOrUpdate(this.updateParams, this.updateParams.id ? false : true).then((res) => { this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功！"); diff --git a/src/views/integral/rule.component.vue b/src/views/integral/rule.component.vue index 50e7ce5..8a3c75a 100644 --- a/src/views/integral/rule.component.vue +++ b/src/views/integral/rule.component.vue @@ -209,7 +209,9 @@ export default class IntegralRule extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/responsibility/checkTasks/checkTasks.component.vue b/src/views/responsibility/checkTasks/checkTasks.component.vue index c04cae2..b6039ad 100644 --- a/src/views/responsibility/checkTasks/checkTasks.component.vue +++ b/src/views/responsibility/checkTasks/checkTasks.component.vue @@ -345,7 +345,9 @@ export default class MajorHazard extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -483,6 +485,9 @@ export default class MajorHazard extends BaseRecordComponent { }); this.updateParams.resourceId = resourceId.join(","); this.updateParams.resourceName = resourceName.join(","); + } else { + this.updateParams.resourceId = '' + this.updateParams.resourceName = '' } this.updateParams.companyName = this.companyListMap[this.updateParams.companyId] this.updateParams.techUserName = this.$store.getters.user_map[this.updateParams.techUserId]; diff --git a/src/views/responsibility/majorHazard/majorHazard.component.vue b/src/views/responsibility/majorHazard/majorHazard.component.vue index d2665d5..c2449e6 100644 --- a/src/views/responsibility/majorHazard/majorHazard.component.vue +++ b/src/views/responsibility/majorHazard/majorHazard.component.vue @@ -311,7 +311,9 @@ export default class MajorHazard extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -429,6 +431,9 @@ export default class MajorHazard extends BaseRecordComponent { }); this.updateParams.resourceId = resourceId.join(","); this.updateParams.resourceName = resourceName.join(","); + } else { + this.updateParams.resourceId = '' + this.updateParams.resourceName = '' } this.updateParams.companyName = this.companyListMap[this.updateParams.companyId] this.updateParams.techUserName = this.$store.getters.user_map[this.updateParams.techUserId]; diff --git a/src/views/reward/rewardsRecord/rewardsRecord.component.vue b/src/views/reward/rewardsRecord/rewardsRecord.component.vue index 0c134d8..cf310ef 100644 --- a/src/views/reward/rewardsRecord/rewardsRecord.component.vue +++ b/src/views/reward/rewardsRecord/rewardsRecord.component.vue @@ -340,7 +340,9 @@ export default class RewardsRecord extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/reward/selfAssessment/selfAssessment.component.vue b/src/views/reward/selfAssessment/selfAssessment.component.vue index e712b83..6083697 100644 --- a/src/views/reward/selfAssessment/selfAssessment.component.vue +++ b/src/views/reward/selfAssessment/selfAssessment.component.vue @@ -229,7 +229,9 @@ export default class SelfAssessment extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -423,6 +425,9 @@ export default class SelfAssessment extends BaseRecordComponent { }); this.updateParams.resourceId = resourceId.join(","); this.updateParams.resourceName = resourceName.join(","); + } else { + this.updateParams.resourceId = '' + this.updateParams.resourceName = '' } let tmpContent = {} as any; tmpContent.content = this.estimateStandard; diff --git a/src/views/risk/area/area.component.vue b/src/views/risk/area/area.component.vue index e6ba201..787ff25 100644 --- a/src/views/risk/area/area.component.vue +++ b/src/views/risk/area/area.component.vue @@ -111,7 +111,7 @@ export default class AreaManagerComponent extends BaseRecordComponent { created() { -// + // } public buildFormOptions() { @@ -345,7 +345,9 @@ export default class AreaManagerComponent extends BaseRecordComponent { public callback(data, type?) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -431,7 +433,7 @@ export default class AreaManagerComponent extends BaseRecordComponent { (this.$refs.multipleTable as any).toggleRowSelection(item); }) } - + public selectAll() { if (!this.selectData.length) { this.toggleAll() diff --git a/src/views/risk/assessment/areaAnal/areaAnal.component.vue b/src/views/risk/assessment/areaAnal/areaAnal.component.vue index 1dcb7eb..01e31d7 100644 --- a/src/views/risk/assessment/areaAnal/areaAnal.component.vue +++ b/src/views/risk/assessment/areaAnal/areaAnal.component.vue @@ -113,7 +113,9 @@ export default class AreaAnalComponent extends BaseRecordComponent { public callback(data, type?) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/risk/assessment/device/device.component.vue b/src/views/risk/assessment/device/device.component.vue index bd3eca2..edf89a1 100644 --- a/src/views/risk/assessment/device/device.component.vue +++ b/src/views/risk/assessment/device/device.component.vue @@ -386,7 +386,9 @@ export default class DeviceManagerComponent extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/risk/assessment/device/deviceAnal.component.vue b/src/views/risk/assessment/device/deviceAnal.component.vue index face15a..84f4502 100644 --- a/src/views/risk/assessment/device/deviceAnal.component.vue +++ b/src/views/risk/assessment/device/deviceAnal.component.vue @@ -250,7 +250,7 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent labelWidth: '140px', datas: this.$store.state.prevention_risk_level }, { - name: "是否为两大一重", + name: "是否为两重一大", key: "majorSign", format: "majorSignName", type: "checkbox", @@ -566,7 +566,9 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -678,7 +680,7 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent //设备 this.initDeviceParamMethod(diviceData); } - //是否为两大一重 + //是否为两重一大 //多选 选中不涉及时，其他三项不可选中 if (item && item.key === 'majorSign') { if (!data) { diff --git a/src/views/risk/assessment/work/work.component.vue b/src/views/risk/assessment/work/work.component.vue index 4a5188c..f5e4995 100644 --- a/src/views/risk/assessment/work/work.component.vue +++ b/src/views/risk/assessment/work/work.component.vue @@ -438,7 +438,9 @@ export default class WorkManagerComponent extends BaseRecordComponent { */ public callback(data: any, type?) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -687,6 +689,8 @@ export default class WorkManagerComponent extends BaseRecordComponent { opacity: 0.3; } + .end-step {} + .description { @@ -736,6 +740,10 @@ export default class WorkManagerComponent extends BaseRecordComponent { border-radius: 50%; margin-left: 2px; margin-bottom: 6px; + + .el-step__icon-inner { + display: none; + } } } diff --git a/src/views/risk/assessment/work/workAnal.component.vue b/src/views/risk/assessment/work/workAnal.component.vue index fe8ef89..658ff46 100644 --- a/src/views/risk/assessment/work/workAnal.component.vue +++ b/src/views/risk/assessment/work/workAnal.component.vue @@ -243,7 +243,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { require: true, showError: false, format: "yyyy-MM-dd", - disable:true, + disable: true, }, { name: "区域固有风险等级", key: "analRiskLevel", @@ -256,7 +256,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { disable: true, datas: this.$store.state.prevention_risk_level }, { - name: "是否为两大一重", + name: "是否为两重一大", key: "majorSign", format: "majorSignName", type: "checkbox", @@ -574,7 +574,9 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -692,7 +694,7 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { //作业活动 this.initJobParamMethod(jobData) } - //是否为两大一重 + //是否为两重一大 //多选 选中不涉及时，其他三项不可选中 if (item && item.key === 'majorSign') { if (!data) { @@ -1154,6 +1156,10 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent { border-radius: 50%; margin-left: 2px; margin-bottom: 6px; + + .el-step__icon-inner { + display: none; + } } } diff --git a/src/views/risk/duty/duty.component.vue b/src/views/risk/duty/duty.component.vue index 0f800d0..0fdc11e 100644 --- a/src/views/risk/duty/duty.component.vue +++ b/src/views/risk/duty/duty.component.vue @@ -329,7 +329,9 @@ export default class DutyManagerComponent extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -374,6 +376,9 @@ export default class DutyManagerComponent extends BaseRecordComponent { return item.id }) this.updateParams.resourceId = resourceId.join(",") + } else { + this.updateParams.resourceId = '' + this.updateParams.resourceName = '' } this.$store.state.userList.map((item) => { diff --git a/src/views/risk/duty/dutyRecords.component.vue b/src/views/risk/duty/dutyRecords.component.vue index 1a3adff..174e74b 100644 --- a/src/views/risk/duty/dutyRecords.component.vue +++ b/src/views/risk/duty/dutyRecords.component.vue @@ -247,7 +247,9 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/risk/measures/measures.component.vue b/src/views/risk/measures/measures.component.vue index 544b7fd..9c349d4 100644 --- a/src/views/risk/measures/measures.component.vue +++ b/src/views/risk/measures/measures.component.vue @@ -156,7 +156,9 @@ export default class MeasuresManagerComponent extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/risk/measuresReport/measuresReport.component.vue b/src/views/risk/measuresReport/measuresReport.component.vue index c4d01ca..d7d5c28 100644 --- a/src/views/risk/measuresReport/measuresReport.component.vue +++ b/src/views/risk/measuresReport/measuresReport.component.vue @@ -325,7 +325,9 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent< public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/risk/unit/unit.component.vue b/src/views/risk/unit/unit.component.vue index 00d95f1..647d696 100644 --- a/src/views/risk/unit/unit.component.vue +++ b/src/views/risk/unit/unit.component.vue @@ -223,14 +223,14 @@ export default class UnitManagerComponent extends BaseRecordComponent { type: "select", require: true, datas: this.areaList, - showError:false, + showError: false, }, { name: "区域编号", key: "areaNo", type: "text", disable: true, width: "calc(50% - 20px)", - showError:false, + showError: false, }, { name: "单元编号", key: "number", @@ -238,14 +238,14 @@ export default class UnitManagerComponent extends BaseRecordComponent { disable: true, width: "calc(50% - 20px)", require: true, - showError:false, + showError: false, }, { name: "单元名称", key: "name", type: "text", width: "calc(50% - 20px)", require: true, - showError:false, + showError: false, }, { name: "责任部门", key: "chargeDeptId", @@ -264,7 +264,7 @@ export default class UnitManagerComponent extends BaseRecordComponent { width: "calc(50% - 20px)", require: true, datas: this.$store.state.userList, - showError:false, + showError: false, }, { type: "btn", name: "单元绘制", @@ -295,7 +295,7 @@ export default class UnitManagerComponent extends BaseRecordComponent { type: "select", disable: this.currentId != -1, require: true, - showError:false, + showError: false, datas: [{ name: "启用", value: 1, @@ -380,9 +380,9 @@ export default class UnitManagerComponent extends BaseRecordComponent { } - public getAreaList(){ - this.areaService.selectByPage({pageSize:1000}).then((res:any)=>{ - this.areaList = res.data.datas.map(item=>{ + public getAreaList() { + this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => { + this.areaList = res.data.datas.map(item => { this.areaNoMap[item.id] = item.number; return { name: item.name, @@ -436,7 +436,9 @@ export default class UnitManagerComponent extends BaseRecordComponent { } public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/riskAssessment/businessInfo/businessInfo.component.vue b/src/views/riskAssessment/businessInfo/businessInfo.component.vue index b5c0214..8cdd429 100644 --- a/src/views/riskAssessment/businessInfo/businessInfo.component.vue +++ b/src/views/riskAssessment/businessInfo/businessInfo.component.vue @@ -376,7 +376,7 @@ export default class BusinessInfo extends BaseRecordComponent { datas: this.$store.state.prevention_safety_label, }, { - name: "两大一重情况", + name: "两重一大情况", key: "majorSign", format: "majorSignName", type: "checkbox", @@ -488,7 +488,9 @@ export default class BusinessInfo extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -836,7 +838,7 @@ export default class BusinessInfo extends BaseRecordComponent { } public changes(data, item) { - //是否为两大一重 + //是否为两重一大 //多选 选中不涉及时，其他三项不可选中 if (item && item.key === 'majorSign') { if (!data) { diff --git a/src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.vue b/src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.vue index 924e4d8..f4f1400 100644 --- a/src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.vue +++ b/src/views/riskAssessment/maintenanceInfo/maintenanceInfo.component.vue @@ -356,7 +356,9 @@ export default class MaintenanceInfo extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue b/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue index b7917fb..64d115f 100644 --- a/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue +++ b/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue @@ -442,7 +442,9 @@ export default class RiskJudgment extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/riskAssessment/safetyNotice/safetyNotice.component.vue b/src/views/riskAssessment/safetyNotice/safetyNotice.component.vue index 463f739..bb03476 100644 --- a/src/views/riskAssessment/safetyNotice/safetyNotice.component.vue +++ b/src/views/riskAssessment/safetyNotice/safetyNotice.component.vue @@ -301,7 +301,9 @@ export default class SafetyNotice extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } diff --git a/src/views/threecards/emergencyCard.component.vue b/src/views/threecards/emergencyCard.component.vue index 64aa3bd..89ae2fc 100644 --- a/src/views/threecards/emergencyCard.component.vue +++ b/src/views/threecards/emergencyCard.component.vue @@ -354,7 +354,9 @@ export default class EmergencyCard extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -467,7 +469,7 @@ export default class EmergencyCard extends BaseRecordComponent { } public onRemove(file, fileList) { - this.fileList.splice(this.fileList.findIndex(item => item.id === file.response.data.id), 1) + this.fileList.splice(this.fileList.findIndex(item => item.id === file.id), 1) } public onPreview(file) { @@ -536,6 +538,9 @@ export default class EmergencyCard extends BaseRecordComponent { }) this.updateParams.resourceId = resourceId.join(",") this.updateParams.resourceName = resourceName.join(",") + } else { + this.updateParams.resourceId = '' + this.updateParams.resourceName = '' } this.setpsOptions.forEach((item, index) => { diff --git a/src/views/threecards/riskCard.component.vue b/src/views/threecards/riskCard.component.vue index f0ebf78..025bf66 100644 --- a/src/views/threecards/riskCard.component.vue +++ b/src/views/threecards/riskCard.component.vue @@ -350,7 +350,9 @@ export default class RiskCard extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -456,7 +458,7 @@ export default class RiskCard extends BaseRecordComponent { } public onRemove(file, fileList) { - this.fileList.splice(this.fileList.findIndex(item => item.id === file.response.data.id), 1) + this.fileList.splice(this.fileList.findIndex(item => item.id === file.id), 1) } public onPreview(file) { diff --git a/src/views/threecards/safeCard.component.vue b/src/views/threecards/safeCard.component.vue index 7ac439e..b24ffb2 100644 --- a/src/views/threecards/safeCard.component.vue +++ b/src/views/threecards/safeCard.component.vue @@ -279,7 +279,9 @@ export default class SafeCard extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -385,7 +387,7 @@ export default class SafeCard extends BaseRecordComponent { } public onRemove(file, fileList) { - this.fileList.splice(this.fileList.findIndex(item => item.id === file.response.data.id), 1) + this.fileList.splice(this.fileList.findIndex(item => item.id === file.id), 1) } public onPreview(file) { diff --git a/src/views/workprogress/leader.component.vue b/src/views/workprogress/leader.component.vue index 89167f2..a71a2dd 100644 --- a/src/views/workprogress/leader.component.vue +++ b/src/views/workprogress/leader.component.vue @@ -329,7 +329,9 @@ export default class LeadershipStructure extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -392,12 +394,14 @@ export default class LeadershipStructure extends BaseRecordComponent { let resourceId = this.fileList.map((item) => { return item.id }) - let resourceName = this.fileList.map((item) => { return item.name }) this.updateParams.resourceId = resourceId.join(",") this.updateParams.resourceName = resourceName.join(",") + } else { + this.updateParams.resourceId = '' + this.updateParams.resourceName = '' } // 新增 this.updateParams.chargeUserName = this.$store.getters.user_map[this.updateParams.chargeUserId]; @@ -435,7 +439,7 @@ export default class LeadershipStructure extends BaseRecordComponent { (this.$refs.multipleTable as any).toggleRowSelection(item); }) } - + public selectAll() { if (!this.selectData.length) { this.toggleAll() @@ -687,8 +691,8 @@ export default class LeadershipStructure extends BaseRecordComponent { }); } /** - * 清除附件数据 - */ + * 清除附件数据 + */ public clearFileListMethod() { this.fileList = []; const option = this.updateOptions.find(item => item.key === "resourceId") as any; diff --git a/src/views/workprogress/managementSystem.component.vue b/src/views/workprogress/managementSystem.component.vue index a96c728..ac65171 100644 --- a/src/views/workprogress/managementSystem.component.vue +++ b/src/views/workprogress/managementSystem.component.vue @@ -278,7 +278,7 @@ export default class ManagementSystem extends BaseRecordComponent { if (data.status === 1) { return `${'在用'}` } else if (data.status === 0) { - return `${'废弃'}` + return `${'废除'}` } } }); @@ -288,7 +288,9 @@ export default class ManagementSystem extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -348,6 +350,8 @@ export default class ManagementSystem extends BaseRecordComponent { public handleClose() { this.subShowUpdate = false; + //清除附件缓存数据 + this.clearFileListMethod(); } @@ -393,7 +397,7 @@ export default class ManagementSystem extends BaseRecordComponent { } public onRemove(file, fileList) { - this.fileList.splice(this.fileList.findIndex(item => item.id === file.response.data.id), 1) + this.fileList.splice(this.fileList.findIndex(item => item.id === file.id), 1) } public onPreview(file) { @@ -415,7 +419,9 @@ export default class ManagementSystem extends BaseRecordComponent { public triCallback(data) { if (data.value === "cancel") { - this.subShowUpdate = false + this.subShowUpdate = false; + //清除附件缓存数据 + this.clearFileListMethod(); } else if (data && data.value.indexOf("save") >= 0) { this.doSave(data.value !== "save") } @@ -441,7 +447,8 @@ export default class ManagementSystem extends BaseRecordComponent { this.subUpdateParams = {} as any this.subShowUpdate = !!goOn; this.getTableData(); - + //清除附件缓存数据 + this.clearFileListMethod(); if (goOn === true) { this.getNumber() } @@ -461,7 +468,7 @@ export default class ManagementSystem extends BaseRecordComponent { if (res.code === 200) { this.subUpdateParams = res.data if (isReadonly) { - this.subUpdateParams.statusName = res.data.status == 1 ? '在用' : '废弃' + this.subUpdateParams.statusName = res.data.status == 1 ? '在用' : '废除' } if (res.data.resourceId) { this.tableService.getFileUrls({ ids: res.data.resourceId.split(",") }).then((files: any) => { @@ -543,7 +550,14 @@ export default class ManagementSystem extends BaseRecordComponent { window.URL.revokeObjectURL(href); // 释放掉blob对象 }); } - + /** + * 清除附件数据 + */ + public clearFileListMethod() { + this.fileList = []; + const option = this.subUpdateOptions.find(item => item.key === "resourceId") as any; + option.fileList = []; + } } diff --git a/src/views/workprogress/programme.component.vue b/src/views/workprogress/programme.component.vue index 3fd632f..8042d84 100644 --- a/src/views/workprogress/programme.component.vue +++ b/src/views/workprogress/programme.component.vue @@ -305,7 +305,9 @@ export default class Programme extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return } @@ -357,6 +359,7 @@ export default class Programme extends BaseRecordComponent { pageNum: 1, pageSize: 20, } as any; + this.getTableData() } public showUpdateModel(id) { @@ -365,6 +368,8 @@ export default class Programme extends BaseRecordComponent { public handleClose() { this.subShowUpdate = false; + //清除附件缓存数据 + this.clearFileListMethod(); } @@ -410,7 +415,7 @@ export default class Programme extends BaseRecordComponent { } public onRemove(file, fileList) { - this.fileList.splice(this.fileList.findIndex(item => item.id === file.response.data.id), 1) + this.fileList.splice(this.fileList.findIndex(item => item.id === file.id), 1) } public onPreview(file) { @@ -432,7 +437,9 @@ export default class Programme extends BaseRecordComponent { public triCallback(data) { if (data.value === "cancel") { - this.subShowUpdate = false + this.subShowUpdate = false; + //清除附件缓存数据 + this.clearFileListMethod(); } else if (data && data.value.indexOf("save") >= 0) { this.doSave(data.value !== "save") } @@ -458,7 +465,8 @@ export default class Programme extends BaseRecordComponent { this.subUpdateParams = {} as any this.subShowUpdate = !!goOn; this.getTableData(); - + //清除附件缓存数据 + this.clearFileListMethod(); if (goOn === true) { this.getNumber() } @@ -559,7 +567,14 @@ export default class Programme extends BaseRecordComponent { window.URL.revokeObjectURL(href); // 释放掉blob对象 }); } - + /** + * 清除附件数据 + */ + public clearFileListMethod() { + this.fileList = []; + const option = this.subUpdateOptions.find(item => item.key === "resourceId") as any; + option.fileList = []; + } } diff --git a/src/views/workprogress/trainRecords.component.vue b/src/views/workprogress/trainRecords.component.vue index 4afde66..96cc7c1 100644 --- a/src/views/workprogress/trainRecords.component.vue +++ b/src/views/workprogress/trainRecords.component.vue @@ -401,7 +401,9 @@ export default class TrainRecords extends BaseRecordComponent { public callback(data, type) { if (type) { - this.params[type] = data; + if (type === 'pageSize' || type === 'pageNum') { + this.params[type] = data; + } this.getTableData(); return }