diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/index.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/index.vue
index 3ec4a63..9e124f3 100644
--- a/src/views/dike/engineeringCondition/dikeBaseInfo/index.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/index.vue
@@ -6,7 +6,7 @@
v-for="(item, index) in routeList"
:key="item + index"
:to="{ path: item.path }"
- >{{ item.routeName }}{{ item.routeName }}
搜索 -->
重置重置
@@ -154,7 +154,7 @@
icon="el-icon-view"
@click="handleUpdate(scope.row)"
v-hasPermi="['yg:dikeInfo:view']"
- >查看状况查看状况
@@ -446,7 +446,16 @@ export default {
},
// 堤防型式字典翻译
dikePattFormat(row, column) {
- return this.selectDictLabel(this.dikePattOptions, row.dikePatt);
+ // 将 row.dikePatt 按逗号分割成数组
+ let dikePattArray = row.dikePatt.split(',');
+
+ // 遍历数组，逐个元素查找字典的标签
+ let formattedLabels = dikePattArray.map(code => {
+ return this.selectDictLabel(this.dikePattOptions, code);
+ });
+
+ // 将结果用逗号拼接
+ return formattedLabels.join(', ');
},
// 堤防类型字典翻译
dikeTypeFormat(row, column) {
@@ -454,7 +463,7 @@ export default {
},
// 堤防级别字典翻译
engGradFormat(row, column) {
- return this.selectDictLabel(this.engGradOptions, row.engGrad);
+ return this.selectDictLabel(this.engGradOptions, row.dikeGrad);
},
// 主要建筑物级别字典翻译
mainBuildGradFormat(row, column) {
diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue
index 28c3046..6928929 100644
--- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue
@@ -19,14 +19,14 @@
堤防代码
{{ this.form.dikeCode }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
堤防型式
{{ dikePattFormat(this.form) }}
@@ -47,19 +47,19 @@
终点纬度
{{ this.form.dikeEndLat }}
-
-
-
-
+
+
+
+
堤防类型
{{ dikeTypeFormat(this.form) }}
-
-
-
-
+
+
+
+
堤防级别
{{ engGradFormat(this.form) }}
@@ -72,60 +72,55 @@
管理单位
{{ this.form.mnun }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
堤防概况
{{ this.form.sluiceOverview }}
-
- 堤防概况
- {{ this.form.sluiceOverview }}
-
-
起点所在位置
{{ this.form.startLoc }}
@@ -138,26 +133,26 @@
堤防长度
{{ this.form.dikeLen }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
工程任务
{{ engTaskFormat(this.form) }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
规划防洪潮标准
{{ this.form.dikePlnStda }}
@@ -175,10 +170,10 @@
不达标长度
{{ this.form.dikeNotStdaLen }}
-
-
-
-
+
+
+
+
高程系统
{{ elevSysFormat(this.form) }}
@@ -199,14 +194,14 @@
防浪墙顶最高高程
{{ this.form.dikeWawaMaxElev }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
堤顶最低高程
{{ this.form.dikeElevMin }}
@@ -215,22 +210,22 @@
堤顶最高高程
{{ this.form.dikeElevMax }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
穿堤水闸数
{{ this.form.sluicesAmount }}
@@ -501,7 +496,16 @@ export default {
},
// 堤防型式字典翻译
dikePattFormat(row, column) {
- return this.selectDictLabel(this.dikePattOptions, row.dikePatt);
+ // 将 row.dikePatt 按逗号分割成数组
+ let dikePattArray = row.dikePatt.split(',');
+
+ // 遍历数组，逐个元素查找字典的标签
+ let formattedLabels = dikePattArray.map(code => {
+ return this.selectDictLabel(this.dikePattOptions, code);
+ });
+
+ // 将结果用逗号拼接
+ return formattedLabels.join(', ');
},
// 堤防类型字典翻译
dikeTypeFormat(row, column) {
@@ -509,7 +513,7 @@ export default {
},
// 堤防级别字典翻译
engGradFormat(row, column) {
- return this.selectDictLabel(this.engGradOptions, row.engGrad);
+ return this.selectDictLabel(this.engGradOptions, row.dikeGrad);
},
// 主要建筑物级别字典翻译
mainBuildGradFormat(row, column) {
@@ -532,6 +536,9 @@ export default {
},
// 高程系统字典翻译
elevSysFormat(row, column) {
+ if (row.elevSys.length < 2) {
+ row.elevSys = "0" + row.elevSys
+ }
return this.selectDictLabel(this.elevSysOptions, row.elevSys);
},
// 取消按钮