子设备名称 code 取值

ems-ui-cloud/src/views/adapter/dljk/index.vue

@@ -296,7 +296,7 @@
                                               {{ subProps.row.deviceCode }}
                                             </el-descriptions-item>
                                             <el-descriptions-item label="测点名称">
-                                              {{ getDeviceAttr(subProps.row.deviceCode, 'meterName', 'Base') || subProps.row.deviceCode }}
+                                              {{ getDeviceAttr(subProps.row.deviceCode, 'deviceName', 'Base') || subProps.row.deviceCode }}
                                             </el-descriptions-item>
                                             <el-descriptions-item label="站点名称">
                                               {{ getDeviceAttr(subProps.row.deviceCode, 'subName', 'Base') || '-' }}
@@ -391,14 +391,14 @@
                                 </div>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="meterName" label="测点名称" width="180">
+                            <el-table-column prop="deviceName" label="测点名称" width="180">
                               <template slot-scope="scope">
-                                {{ getDeviceAttr(scope.row.deviceCode, 'meterName', 'Base') || scope.row.deviceCode }}
+                                {{ getDeviceAttr(scope.row.deviceCode, 'deviceName', 'Base') || scope.row.deviceCode }}
                               </template>
                             </el-table-column>
-                            <el-table-column prop="meterCode" label="测点编号" width="120">
+                            <el-table-column prop="deviceCode" label="测点编号" width="120">
                               <template slot-scope="scope">
-                                {{ getDeviceAttr(scope.row.deviceCode, 'meterCode', 'Base') || scope.row.deviceCode }}
+                                {{ getDeviceAttr(scope.row.deviceCode, 'deviceCode', 'Base') || scope.row.deviceCode }}
                               </template>
                             </el-table-column>
                             <el-table-column label="监测状态" min-width="400">
@@ -514,12 +514,12 @@
                 </el-table-column>
                 <el-table-column label="测点名称" min-width="150">
                   <template slot-scope="scope">
-                    {{ getDeviceAttr(scope.row.deviceCode, 'meterName', 'Base') || scope.row.deviceName || '-' }}
+                    {{ getDeviceAttr(scope.row.deviceCode, 'deviceName', 'Base') || scope.row.deviceName || '-' }}
                   </template>
                 </el-table-column>
                 <el-table-column label="测点代码" width="150">
                   <template slot-scope="scope">
-                    {{ getDeviceAttr(scope.row.deviceCode, 'meterCode', 'Base') || scope.row.deviceCode }}
+                    {{ getDeviceAttr(scope.row.deviceCode, 'deviceCode', 'Base') || scope.row.deviceCode }}
                   </template>
                 </el-table-column>
                 <el-table-column label="设备状态" width="100" align="center">
@@ -1061,7 +1061,7 @@
                                             {{ subProps.row.deviceCode }}
                                           </el-descriptions-item>
                                           <el-descriptions-item label="测点名称">
-                                            {{ getDeviceAttr(subProps.row.deviceCode, 'meterName', 'Base') || subProps.row.deviceCode }}
+                                            {{ getDeviceAttr(subProps.row.deviceCode, 'deviceName', 'Base') || subProps.row.deviceCode }}
                                           </el-descriptions-item>
                                           <el-descriptions-item label="站点名称">
                                             {{ getDeviceAttr(subProps.row.deviceCode, 'subName', 'Base') || '-' }}
@@ -1463,14 +1463,14 @@
                               </div>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="meterName" label="测点名称" width="180">
+                          <el-table-column prop="deviceName" label="测点名称" width="180">
                             <template slot-scope="scope">
-                              {{ getDeviceAttr(scope.row.deviceCode, 'meterName', 'Base') || scope.row.deviceCode }}
+                              {{ getDeviceAttr(scope.row.deviceCode, 'deviceName', 'Base') || scope.row.deviceCode }}
                             </template>
                           </el-table-column>
-                          <el-table-column prop="meterCode" label="测点编号" width="120">
+                          <el-table-column prop="deviceCode" label="测点编号" width="120">
                             <template slot-scope="scope">
-                              {{ getDeviceAttr(scope.row.deviceCode, 'meterCode', 'Base') || scope.row.deviceCode }}
+                              {{ getDeviceAttr(scope.row.deviceCode, 'deviceCode', 'Base') || scope.row.deviceCode }}
                             </template>
                           </el-table-column>
                           <el-table-column label="监测状态" min-width="400">
@@ -1601,12 +1601,12 @@
               </el-table-column>
               <el-table-column label="测点名称" min-width="150">
                 <template slot-scope="scope">
-                  {{ getDeviceAttr(scope.row.deviceCode, 'meterName', 'Base') || scope.row.deviceName || '-' }}
+                  {{ getDeviceAttr(scope.row.deviceCode, 'deviceName', 'Base') || scope.row.deviceName || '-' }}
                 </template>
               </el-table-column>
               <el-table-column label="测点代码" width="150">
                 <template slot-scope="scope">
-                  {{ getDeviceAttr(scope.row.deviceCode, 'meterCode', 'Base') || scope.row.deviceCode }}
+                  {{ getDeviceAttr(scope.row.deviceCode, 'deviceCode', 'Base') || scope.row.deviceCode }}
                 </template>
               </el-table-column>
               <el-table-column label="监测状态" min-width="400">