From 8920b4e3d43f304e4bfef3599f837c24ea1fb884 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Thu, 27 Mar 2025 11:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E7=AB=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../options/dikeCrossSectionTrait.vue | 336 +++++++++--------- .../components/listBaseInfo.vue | 6 +- .../components/listBaseInfo_em.vue | 4 +- .../safetyManage/safetyAppraisal/list.vue | 9 +- .../sluiceBaseInfo/options/accidentRecord.vue | 23 -- .../options/engineeringStructure.vue | 55 +-- .../components/listBaseInfo.vue | 4 +- .../safetyManage/safetyAppraisal/list.vue | 6 +- vue.config.js | 2 +- 9 files changed, 194 insertions(+), 251 deletions(-) diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue index f5cb0b1..2835874 100644 --- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue +++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue @@ -212,174 +212,174 @@ prop="intrCh" min-width="120" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - {{ wagaName }} @@ -49,12 +32,6 @@ {{ dnstgrFormat(this.form) }} - - - - - - {{ this.form.note }} diff --git a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue index fcf4bfc..f1d8b70 100644 --- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue +++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue @@ -78,22 +78,12 @@ {{ this.form.hsgram }} - - - - - - - - + {{ this.form.gttpel }} - - - - + {{ endsstFormat(this.form) }} @@ -102,46 +92,7 @@ {{ gtstFormat(this.form) }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {{ this.form.note }} diff --git a/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue b/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue index 6358919..8b050c4 100644 --- a/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue +++ b/src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue @@ -258,7 +258,7 @@ import { getFileStream } from "@/api/system/upload"; export default { name: "Aqjdxx", - props: ["wagaName", "szrwId"], + props: ["wagaName", "szrwId","wagaCode"], data() { return { // 遮罩层 @@ -500,6 +500,7 @@ export default { this.form.safetyEvaluationReport = JSON.stringify(this.fileList1); this.form.safetyAppraisalReport = JSON.stringify(this.fileList2); this.form.safetyAppraisalOpinion = JSON.stringify(this.fileList3); + console.log(this.wagaCode,'waaaaaa') if (this.form.id != null) { updateAqjdxx(this.form).then((response) => { if (response.code === 200) { @@ -511,6 +512,7 @@ export default { }); } else { this.form.szrwId = this.szrwId; + this.form.remark=this.wagaCode; addAqjdxx(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("新增成功"); diff --git a/src/views/sluice/safetyManage/safetyAppraisal/list.vue b/src/views/sluice/safetyManage/safetyAppraisal/list.vue index 9f0d199..77397bc 100644 --- a/src/views/sluice/safetyManage/safetyAppraisal/list.vue +++ b/src/views/sluice/safetyManage/safetyAppraisal/list.vue @@ -257,6 +257,7 @@ @@ -383,6 +384,7 @@ export default { multiple: true, // 显示搜索条件 showSearch: true, + wagaName:'', // 总条数 total: 0, // 水闸鉴定任务关联表格数据 @@ -429,6 +431,7 @@ export default { szrwId: "", visible: false, remark: "", + wagaCode:"", }; }, created() { @@ -449,7 +452,7 @@ export default { handleDetial(row){ this.openDetial = true; this.szrwId = row.id; - this.wagaName = row.wageName; + this.wagaName = row.wagaName; this.detailDsable = true; }, @@ -563,6 +566,7 @@ export default { this.form = row; this.szrwId = row.id; this.wagaName = row.wagaName; + this.wagaCode=row.wagaCode; this.open = true; this.title = "填报安全鉴定信息"; // getSzrw(id).then((response) => { diff --git a/vue.config.js b/vue.config.js index d012c6b..d294962 100644 --- a/vue.config.js +++ b/vue.config.js @@ -81,7 +81,7 @@ module.exports = { }, [process.env.VUE_APP_BASE_API]: { // target: "http://shuili.product.dev.com:30115/", - target: "http://192.168.2.107:18082/", + target: "http://127.0.0.1:18082/", // target: 'http://172.16.32.62:18888/', // target: "http://172.16.34.27:18082", changeOrigin: true,