From e7a7e876c6c75fb21960f336a8bd154a2e732c98 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 12 Jan 2024 09:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/icdConfig/colDialog.vue | 11 +++++++++--
 src/views/icdConfig/index.vue     | 20 +++++++++++++++-----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/views/icdConfig/colDialog.vue b/src/views/icdConfig/colDialog.vue
index 0c503355..4146d6f5 100644
--- a/src/views/icdConfig/colDialog.vue
+++ b/src/views/icdConfig/colDialog.vue
@@ -16,11 +16,16 @@
           style="width: 100%"
           height="calc(100% - 0px)"
         >
-          <el-table-column prop="doName" label="属性"> </el-table-column>
+          <el-table-column prop="doName" label="属性(备注)">
+            <template slot-scope="scope">
+              <span>{{ scope.row.doName }} ({{ scope.row.description }})</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="param" label="参数"> </el-table-column>
           <el-table-column prop="colName" label="字段名">
             <template slot-scope="scope">
               <el-select
+                filterable
                 v-show="scope.$index == cellIndex"
                 v-model="colName"
                 placeholder="请选择"
@@ -33,7 +38,9 @@
                   :value="item.name"
                 >
                   {{ item.name
-                  }}<span v-if="item.comment != ''">({{ item.comment }})</span>
+                  }}<span v-if="item.comment != '' && item.comment != null"
+                    >({{ item.comment }})</span
+                  >
                 </el-option>
               </el-select>
               <span v-show="scope.$index != cellIndex">{{
diff --git a/src/views/icdConfig/index.vue b/src/views/icdConfig/index.vue
index 75f72077..f7933bac 100644
--- a/src/views/icdConfig/index.vue
+++ b/src/views/icdConfig/index.vue
@@ -52,11 +52,16 @@
           <el-table-column prop="iedName" label="ied名称"> </el-table-column>
           <el-table-column prop="ldeviceInst" label="设备类型">
           </el-table-column>
-          <el-table-column prop="lnClass" label="ln类型"> </el-table-column>
+          <el-table-column prop="lnClass" label="ln类型(ln备注)">
+            <template slot-scope="scope">
+              <span>{{ scope.row.lnClass }} ({{ scope.row.lnDesc }})</span>
+            </template>
+          </el-table-column>
           <!-- <el-table-column prop="doName" label="doName"> </el-table-column> -->
           <el-table-column prop="tableName" label="表名">
             <template slot-scope="scope">
               <el-select
+                filterable
                 v-show="scope.$index == cellIndex"
                 v-model="tableName"
                 placeholder="请选择"
@@ -65,10 +70,15 @@
               >
                 <el-option
                   v-for="item in tableOptions"
-                  :key="item"
-                  :label="item"
-                  :value="item"
-                ></el-option>
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.name"
+                >
+                  {{ item.name }}
+                  <span v-if="item.comment != '' && item.comment != null"
+                    >({{ item.comment }})</span
+                  ></el-option
+                >
               </el-select>
               <span v-show="scope.$index != cellIndex">{{
                 scope.row.tableName