update

ems-ui-cloud/src/views/basecfg/boundaryRel/index.vue

@@ -84,8 +84,8 @@
           <!-- 水表和电表的已绑定和未绑定表格 -->
           <SubTitle title="已绑定列表" />
             <el-table  v-loading="loading"  :data="Bound" style="width: 100%">
-              <el-table-column label="边界对象" align="left" prop="boundaryObj" />
-              <el-table-column label="计量编号" align="left" prop="meterDevice" />
+              <el-table-column label="表计编号" align="left" prop="meterDevice" />
+              <el-table-column label="表计名称" align="left" prop="meterDeviceName" />
               <el-table-column label="边界类型" align="left" prop="objType">
                 <template slot-scope="scope">
                   {{ getObjTypeLabel(scope.row.objType) }}
@@ -99,8 +99,8 @@
             </el-table>
           <SubTitle title="未绑定列表" />
             <el-table  v-loading="loading"  :data="Unbound" style="width: 100%">
-              <el-table-column label="设备编号" align="left" prop="deviceCode" />
-              <el-table-column label="设备名称" align="left" prop="deviceName" width="200px"/>
+              <el-table-column label="表计编号" align="left" prop="deviceCode" />
+              <el-table-column label="表计名称" align="left" prop="deviceName" width="200px"/>
               <el-table-column label="安装位置" align="left" prop="deviceLocation" width="200px"/>
               <el-table-column label="计量标签" align="center" prop="objTag">
                 <template slot-scope="scope">
@@ -257,7 +257,7 @@ export default {
     }
   },
   mounted() {
-    this.getList(); 
+    this.getList();
   },
   created() {
     this.getEmsTag('Area');

ems-ui-cloud/src/views/devmgr/meterData/index.vue

@@ -56,7 +56,7 @@
 
         <el-table v-if="activeTab === 'first'" v-loading="loading" :data="elecMeterHList">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column label="表计名称" align="left" prop="deviceName" width="200px"/>
+          <el-table-column label="表计名称" align="left" prop="deviceName" width="250px"/>
           <el-table-column label="表计编号" align="left" prop="deviceCode"/>
           <el-table-column label="抄表时间" align="center" prop="recordTime" width="180">
             <template slot-scope="scope">
@@ -76,7 +76,7 @@
 
         <el-table v-if="activeTab === 'second'" v-loading="loading" :data="waterMeterHList">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column label="表计名称" align="left" prop="deviceName" width="200"/>
+          <el-table-column label="表计名称" align="left" prop="deviceName" width="250"/>
           <el-table-column label="表计编号" align="left" prop="deviceCode"/>
           <el-table-column label="抄表时间" align="center" prop="recordTime" width="180">
             <template slot-scope="scope">