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 }}
-
-
-
-
-
-
-
-
+
闸门顶高程(m)
{{ 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,