diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 485bcb8..67076f2 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -60,6 +60,8 @@ export default { newPath = "/dike/safetyManage/declare"; } else if (path.includes("/dike/safetyManage/examine/")) { newPath = "/dike/safetyManage/examine"; + } else if (path.includes("/reservoir/engineeringCondition/resBaseInfo/")){ + newPath ="/reservoir/engineeringCondition/resBaseInfo" } // if set path, the sidebar will highlight the path you set if (meta.activeMenu) { diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue index 16190bc..f5cb0b1 100644 --- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue +++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue @@ -9,24 +9,24 @@ @click="handleAdd" >新增 - - 修改 - - - 删除 - + + + + + + + + + + + + + + + + + + -
- - - 对比修改记录 -
+ + + + + + +
- 执行/管理团队管理 + 工程单位管理
diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemFxzz.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemFxzz.vue index 7f95263..ed96652 100644 --- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemFxzz.vue +++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemFxzz.vue @@ -9,31 +9,31 @@ @click="handleAdd" >新增 - - 修改 - - - 删除 - + + + + + + + + + + + + + + + + + + - + 新增 - - 修改 - - - 删除 - + + + + + + + + + + + + + + + + + + - + + > + + - - + + + + + + + @@ -225,7 +258,7 @@ :contentStyle="{ minWidth: '350px' }" > - + {{ typeFormat(this.fzrInfo) }} @@ -297,6 +330,7 @@ export default { personResponsibleTypeOptions: [], // 类型字典 typeOptions: [], + typePersonOptions:[], // 查询参数 queryParams: { pageNum: 1, @@ -364,6 +398,9 @@ export default { this.getDicts("person_dept").then((response) => { this.typeOptions = response.data; }); + this.getDicts("type_person").then((response) => { + this.typePersonOptions = response.data; + }); }, methods: { viewInFo(row) { @@ -381,8 +418,9 @@ export default { this.loading = false; }); }, - // 责任人类型字典翻译 + // 防汛责任人类型字典翻译 personResponsibleTypeFormat(row, column) { + console.log(row,9999) return this.selectDictLabel( this.personResponsibleTypeOptions, row.personResponsibleType @@ -390,7 +428,10 @@ export default { }, // 责任人部门类型字典翻译 typeFormat(row, column) { - return this.selectDictLabel(this.typeOptions, row.type); + return this.selectDictLabel(this.typePersonOptions, row.type); + }, + typePersonFormat(row, column) { + return this.selectDictLabel(this.typeOptions, row.safetyType); }, // 取消按钮 cancel() { diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemMan.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemMan.vue index babbde5..42cc0c4 100644 --- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemMan.vue +++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemMan.vue @@ -10,24 +10,24 @@ @click="handleAdd" >新增 - - 修改 - - - 删除 - + + + + + + + + + + + + + + + + + + @@ -41,15 +41,15 @@ - + - + - + - + @@ -81,20 +81,20 @@ - - - + + + - - + + - - + + { this.form = response.data; this.open = true; - this.title = "修改管理团队管理"; + this.title = "修改工程单位管理"; }); }, /** 提交按钮 */ submitForm() { this.$refs["form"].validate(valid => { if (valid) { + this.form.dikeCode=this.dikeCode if (this.form.id != null) { updateManateam(this.form).then(response => { if (response.code === 200) { diff --git a/src/views/dike/engineeringCondition/identificationPlate/index.vue b/src/views/dike/engineeringCondition/identificationPlate/index.vue index be96f11..5c2794c 100644 --- a/src/views/dike/engineeringCondition/identificationPlate/index.vue +++ b/src/views/dike/engineeringCondition/identificationPlate/index.vue @@ -650,6 +650,7 @@ export default { }, handleClick() { this.search = ""; + this.rowIsEdit=false this.$refs.markForm.resetForm(); }, formatAdcd(row) { @@ -805,6 +806,7 @@ export default { }, // 取消按钮 cancel() { + this.rowIsEdit=false this.open = false; this.reset(); }, @@ -959,7 +961,7 @@ export default { this.reset(); this.isEdit = false; this.open = true; - this.title = "添加堤防标识标牌11111"; + this.title = "添加堤防标识标牌"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -1057,6 +1059,7 @@ export default { } } }); + this.rowIsEdit=false }, submitForm() { // console.log(1111111111, this.$refs.noticeForm0[0].$refs.form); diff --git a/src/views/dike/safetyManage/floodControlManagement/power.vue b/src/views/dike/safetyManage/floodControlManagement/power.vue index 8bde6c4..676a2ca 100644 --- a/src/views/dike/safetyManage/floodControlManagement/power.vue +++ b/src/views/dike/safetyManage/floodControlManagement/power.vue @@ -145,9 +145,9 @@ min-width="120" /> --> --> --> - + @@ -320,6 +320,24 @@ > + + + + + { this.typeOptions = response.data; }); + this.getDicts("type_person").then((response) => { + this.typePersonOptions = response.data; + }); this.getDicts("flood_person_type").then((response) => { this.personTpyeOptions = response.data; }); @@ -510,7 +532,7 @@ export default { }, // 类型字典翻译 typeFormat(row, column) { - return this.selectDictLabel(this.typeOptions, row.type); + return this.selectDictLabel(this.typePersonOptions, row.type); }, // 取消按钮 cancel() { diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue index f150221..0f714e8 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue @@ -278,7 +278,7 @@ export default { // 弹出层标题 title: "", // 是否显示弹出层 - open: false, + open: this.openL, // 审定部门级别字典 approvalDepartmentLevelOptions: [], // 安全类别字典 @@ -344,6 +344,14 @@ export default { this.securityCategoryOptions = response.data; }); }, + watch: { + open(newVal) { + if (!newVal) { + // 当 openL 变为 false 时，触发自定义事件通知父组件 + this.$emit('closeParentTabs'); + } + } + }, methods: { /** 查询堤防安全鉴定信息列表 */ getList() { @@ -502,8 +510,10 @@ export default { if (this.form.id != null) { updateAqjdxx(this.form).then((response) => { if (response.code === 200) { + console.log(this.openL,'111111') this.msgSuccess("修改成功"); this.open = false; + console.log(this.openL,'111111') this.getList(); } }); diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue b/src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue index b828876..5f0f55a 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue @@ -368,6 +368,7 @@ export default { this.msgSuccess("修改成功"); this.open = false; this.getList(); + this.cancel() } }); } else { @@ -377,6 +378,7 @@ export default { this.msgSuccess("新增成功"); this.open = false; this.getList(); + this.cancel() } }); } diff --git a/src/views/dike/safetyManage/safetyAppraisal/list.vue b/src/views/dike/safetyManage/safetyAppraisal/list.vue index 86cb915..2d81e2b 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/list.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/list.vue @@ -109,7 +109,12 @@ align="center" fixed /> - + @@ -237,6 +242,7 @@ @@ -425,6 +431,10 @@ export default { }); }, methods: { + closeTabs() { + // 当接收到子组件的关闭通知时，将 open 设置为 false + this.open = false; + }, pass() { this.form.status = "3"; updateSzrw(this.form).then((response) => { diff --git a/src/views/res/engineeringCondition/resBaseInfo/index.vue b/src/views/res/engineeringCondition/resBaseInfo/index.vue index faddea0..eb8bb3b 100644 --- a/src/views/res/engineeringCondition/resBaseInfo/index.vue +++ b/src/views/res/engineeringCondition/resBaseInfo/index.vue @@ -236,6 +236,12 @@ export default { name: "Base", data() { return { + routeList: [ + { + path: "/dike/engineeringCondition/dikeBaseInfo", + routeName: "堤防基本信息列表", + }, + ], // 遮罩层 loading: true, // 选中数组 diff --git a/src/views/res/safetyManage/floodControlManagement/power.vue b/src/views/res/safetyManage/floodControlManagement/power.vue index 975648a..e35ff98 100644 --- a/src/views/res/safetyManage/floodControlManagement/power.vue +++ b/src/views/res/safetyManage/floodControlManagement/power.vue @@ -145,9 +145,9 @@ min-width="120" /> --> -
- - - 对比修改记录 -
+ + + + + + + + + + + + > + + { this.typeOptions = response.data; }); + this.getDicts("type_person").then((response) => { + this.typePersonOptions = response.data; + }); }, methods: { viewInFo(row) { @@ -349,6 +365,7 @@ export default { getList() { this.loading = true; this.queryParams.data.wagaCode = this.wagaCode; + console.log(this.wagaCode,"codecodecode") listFzr(this.queryParams).then((response) => { this.fzrList = response.records; this.total = response.total; @@ -357,6 +374,7 @@ export default { }, // 责任人类型字典翻译 personResponsibleTypeFormat(row, column) { + console.log(row,9999) return this.selectDictLabel( this.personResponsibleTypeOptions, row.personResponsibleType @@ -364,7 +382,10 @@ export default { }, // 责任人部门类型字典翻译 typeFormat(row, column) { - return this.selectDictLabel(this.typeOptions, row.type); + return this.selectDictLabel(this.typePersonOptions, row.type); + }, + typePersonFormat(row, column) { + return this.selectDictLabel(this.typeOptions, row.safetyType); }, // 取消按钮 cancel() { diff --git a/src/views/sluice/safetyManage/floodControlManagement/power.vue b/src/views/sluice/safetyManage/floodControlManagement/power.vue index 1defb72..e58904b 100644 --- a/src/views/sluice/safetyManage/floodControlManagement/power.vue +++ b/src/views/sluice/safetyManage/floodControlManagement/power.vue @@ -145,9 +145,9 @@ min-width="120" /> --> --> - + @@ -314,6 +314,24 @@ > + + + + + { this.typeOptions = response.data; }); + this.getDicts("type_person").then((response) => { + this.typePersonOptions = response.data; + }); this.getDicts("flood_person_type").then((response) => { this.personTpyeOptions = response.data; @@ -504,7 +527,7 @@ export default { }, // 类型字典翻译 typeFormat(row, column) { - return this.selectDictLabel(this.typeOptions, row.type); + return this.selectDictLabel(this.typePersonOptions, row.type); }, // 取消按钮 cancel() { diff --git a/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue b/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue index 737c819..6358919 100644 --- a/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue +++ b/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue @@ -506,6 +506,7 @@ export default { this.msgSuccess("修改成功"); this.open = false; this.getList(); + this.cancel() } }); } else { @@ -515,6 +516,7 @@ export default { this.msgSuccess("新增成功"); this.open = false; this.getList(); + this.cancel() } }); } diff --git a/src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue b/src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue index 7fafd60..adc651a 100644 --- a/src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue +++ b/src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue @@ -369,6 +369,7 @@ export default { this.msgSuccess("修改成功"); this.open = false; this.getList(); + this.cancel() } }); } else { @@ -378,6 +379,7 @@ export default { this.msgSuccess("新增成功"); this.open = false; this.getList(); + this.cancel() } }); } diff --git a/src/views/sluice/safetyManage/safetyAppraisal/list.vue b/src/views/sluice/safetyManage/safetyAppraisal/list.vue index 03ae658..2b9ea51 100644 --- a/src/views/sluice/safetyManage/safetyAppraisal/list.vue +++ b/src/views/sluice/safetyManage/safetyAppraisal/list.vue @@ -109,7 +109,12 @@ align="center" fixed /> - +