添加设备展示

src/views/base/personInfo-list.vue

@@ -135,7 +135,8 @@
       </el-table-column>
       <el-table-column prop="name" label="姓名" width="80" fixed="left"></el-table-column>
       <el-table-column prop="phone" label="手机号" width="180"></el-table-column>
-      <el-table-column prop="idCard" label="身份证" width="200"></el-table-column>
+      <el-table-column prop="idCard" label="身份证" width="100" show-overflow-tooltip="false"></el-table-column>
+      <el-table-column prop="deviceName" label="绑定设备" width="200" show-overflow-tooltip="false"></el-table-column>
       <el-table-column prop="position1" :label="position1" width="250" v-if="position1Show"></el-table-column>
       <el-table-column prop="position2" :label="position2" width="250" v-if="position2Show"></el-table-column>
       <el-table-column prop="position3" :label="position3" width="250" v-if="position3Show"></el-table-column>
@@ -441,23 +442,23 @@ export default {
 
     companyPositionApi.detailForCompany().then(function(response) {
       var jsonData = response.data.data;
-      if (jsonData.position1Name != null) {
+      if (jsonData.position1Name != null && jsonData.position1Name != "") {
         self.position1 = jsonData.position1Name;
         self.position1Show = true;
       }
-      if (jsonData.position2Name != null) {
+      if (jsonData.position2Name != null && jsonData.position2Name != "") {
         self.position2 = jsonData.position2Name;
         self.position2Show = true;
       }
-      if (jsonData.position3Name != null) {
+      if (jsonData.position3Name != null && jsonData.position3Name != "") {
         self.position3 = jsonData.position3Name;
         self.position3Show = true;
       }
-      if (jsonData.position4Name != null) {
+      if (jsonData.position4Name != null && jsonData.position4Name != "") {
         self.position4 = jsonData.position4Name;
         self.position4Show = true;
       }
-      if (jsonData.position5Name != null) {
+      if (jsonData.position5Name != null && jsonData.position5Name != "") {
         //alert(jsonData.position5Name);
         self.position5 = jsonData.position5Name;
         self.position5Show = true;