Merge branch 'master' of http://223.75.76.159:9090/xiao547607/smart-community-server-portal

src/views/base/personDeviceLog-list.vue

@@ -136,6 +136,7 @@
           </a>
         </template>
       </el-table-column>
+      <el-table-column prop="personId" label="人员编号" width="80"></el-table-column>
       <el-table-column prop="person" label="人员姓名" width="120">
         <template slot-scope="{row}">
           <span v-if="row.personName == '' || row.personName == null">

src/views/layout/index.vue

@@ -10,7 +10,7 @@
         <a href="#" @click="openChangePwDialog()" style="margin-right:10px;">修改密码</a>
         <a href="#" @click="logout()">退出</a>
       </div>
-      <div style="position:absolute;bottom:0px;left:205px;right:185px;">
+      <div style="position:absolute;bottom:0px;left:255px;right:185px;">
         <tags-view />
       </div>
     </el-header>