Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0

src/views/dike/engineeringCondition/dikeBaseInfo/index.vue

@@ -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) {

src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue

@@ -121,11 +121,6 @@
         <template slot="label"> 堤防概况 </template>
         {{ this.form.sluiceOverview }}
       </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label"> 堤防概况 </template>
-        {{ this.form.sluiceOverview }}
-      </el-descriptions-item>
-
       <el-descriptions-item>
         <template slot="label"> 起点所在位置 </template>
         {{ this.form.startLoc }}
@@ -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);
     },
     // 取消按钮