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

src/views/base/companyInfo-list.vue

@@ -40,7 +40,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>
@@ -50,6 +50,7 @@
       style="min-height:400px;"
       v-loading="loading"
       stripe
+      :height="tableHeight"
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
@@ -71,7 +72,7 @@
       <el-table-column prop="position2Name" label="二级位置" width="180"></el-table-column>
       <el-table-column prop="position3Name" label="三级位置" width="180"></el-table-column>
       <el-table-column prop="position4Name" label="四级位置" width="180"></el-table-column>
-      <el-table-column prop="position5Name" label="五级位置" width="180"></el-table-column> -->
+      <el-table-column prop="position5Name" label="五级位置" width="180"></el-table-column>-->
       <el-table-column prop="remark" sort-by="remark_" label="备注"></el-table-column>
       <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="{row}">
@@ -122,9 +123,13 @@ export default {
       multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      businessKey: "",
+      tableHeight:""
     };
   },
+  created() {
+    this.tableHeight = window.innerHeight - 280;
+  },
   methods: {
     changePage(pageIndex) {
       var self = this;

src/views/base/companyPosition-list.vue

@@ -14,39 +14,39 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-<el-form-item label="" prop="id">
-    <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
-</el-form-item>
-<el-form-item label="企业编号" prop="companyId">
-    <el-input type="text" size="mini" v-model="queryModel.companyId"></el-input>
-</el-form-item>
-<el-form-item label="位置1名称" prop="position1Name">
-    <el-input type="text" size="mini" v-model="queryModel.position1Name"></el-input>
-</el-form-item>
-<el-form-item label="位置2名称" prop="position2Name">
-    <el-input type="text" size="mini" v-model="queryModel.position2Name"></el-input>
-</el-form-item>
-<el-form-item label="位置3名称" prop="position3Name">
-    <el-input type="text" size="mini" v-model="queryModel.position3Name"></el-input>
-</el-form-item>
-<el-form-item label="位置4名称" prop="position4Name">
-    <el-input type="text" size="mini" v-model="queryModel.position4Name"></el-input>
-</el-form-item>
-<el-form-item label="位置5名称" prop="position5Name">
-    <el-input type="text" size="mini" v-model="queryModel.position5Name"></el-input>
-</el-form-item>
-<el-form-item label="创建人" prop="createBy">
-    <el-input type="text" size="mini" v-model="queryModel.createBy"></el-input>
-</el-form-item>
-<el-form-item label="创建时间" prop="createTime">
-    <el-input type="text" size="mini" v-model="queryModel.createTime"></el-input>
-</el-form-item>
-<el-form-item label="更新人" prop="updateBy">
-    <el-input type="text" size="mini" v-model="queryModel.updateBy"></el-input>
-</el-form-item>
-<el-form-item label="更新时间" prop="updateTime">
-    <el-input type="text" size="mini" v-model="queryModel.updateTime"></el-input>
-</el-form-item>
+      <el-form-item label prop="id">
+        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
+      </el-form-item>
+      <el-form-item label="企业编号" prop="companyId">
+        <el-input type="text" size="mini" v-model="queryModel.companyId"></el-input>
+      </el-form-item>
+      <el-form-item label="位置1名称" prop="position1Name">
+        <el-input type="text" size="mini" v-model="queryModel.position1Name"></el-input>
+      </el-form-item>
+      <el-form-item label="位置2名称" prop="position2Name">
+        <el-input type="text" size="mini" v-model="queryModel.position2Name"></el-input>
+      </el-form-item>
+      <el-form-item label="位置3名称" prop="position3Name">
+        <el-input type="text" size="mini" v-model="queryModel.position3Name"></el-input>
+      </el-form-item>
+      <el-form-item label="位置4名称" prop="position4Name">
+        <el-input type="text" size="mini" v-model="queryModel.position4Name"></el-input>
+      </el-form-item>
+      <el-form-item label="位置5名称" prop="position5Name">
+        <el-input type="text" size="mini" v-model="queryModel.position5Name"></el-input>
+      </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+        <el-input type="text" size="mini" v-model="queryModel.createBy"></el-input>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-input type="text" size="mini" v-model="queryModel.createTime"></el-input>
+      </el-form-item>
+      <el-form-item label="更新人" prop="updateBy">
+        <el-input type="text" size="mini" v-model="queryModel.updateBy"></el-input>
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-input type="text" size="mini" v-model="queryModel.updateTime"></el-input>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -70,7 +70,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>
@@ -84,17 +84,77 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-		<el-table-column prop="id" sort-by="id_" label="" sortable="custom" width="180"></el-table-column>
-		<el-table-column prop="companyId" sort-by="company_id" label="企业编号" sortable="custom" width="180"></el-table-column>
-		<el-table-column prop="position1Name" sort-by="position1_name" label="位置1名称" sortable="custom" width="180"></el-table-column>
-		<el-table-column prop="position2Name" sort-by="position2_name" label="位置2名称" sortable="custom" width="180"></el-table-column>
-		<el-table-column prop="position3Name" sort-by="position3_name" label="位置3名称" sortable="custom" width="180"></el-table-column>
-		<el-table-column prop="position4Name" sort-by="position4_name" label="位置4名称" sortable="custom" width="180"></el-table-column>
-		<el-table-column prop="position5Name" sort-by="position5_name" label="位置5名称" sortable="custom" width="180"></el-table-column>
-		<el-table-column prop="createBy" sort-by="create_by" label="创建人" sortable="custom" width="180"></el-table-column>
-		<el-table-column prop="createTime" sort-by="create_time" label="创建时间" sortable="custom" width="180"></el-table-column>
-		<el-table-column prop="updateBy" sort-by="update_by" label="更新人" sortable="custom" width="180"></el-table-column>
-		<el-table-column prop="updateTime" sort-by="update_time" label="更新时间" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="id" sort-by="id_" label sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="companyId"
+        sort-by="company_id"
+        label="企业编号"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="position1Name"
+        sort-by="position1_name"
+        label="位置1名称"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="position2Name"
+        sort-by="position2_name"
+        label="位置2名称"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="position3Name"
+        sort-by="position3_name"
+        label="位置3名称"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="position4Name"
+        sort-by="position4_name"
+        label="位置4名称"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="position5Name"
+        sort-by="position5_name"
+        label="位置5名称"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createBy"
+        sort-by="create_by"
+        label="创建人"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        sort-by="create_time"
+        label="创建时间"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateBy"
+        sort-by="update_by"
+        label="更新人"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        sort-by="update_time"
+        label="更新时间"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
@@ -110,12 +170,12 @@
       @size-change="pageSizeChange"
       layout="total, sizes, prev, pager, next, jumper"
     ></el-pagination>
-	<companyPosition-detail
-	v-if="showModal"
-	:businessKey="businessKey"
-	:title="modalTitle"
-	@close="onDetailModalClose"
-	></companyPosition-detail>
+    <companyPosition-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></companyPosition-detail>
   </div>
 </template>
 <script>
@@ -130,19 +190,19 @@ export default {
     var self = this;
 
     return {
-	  queryModel:{
-				"id":""
-		,				"companyId":""
-		,				"position1Name":""
-		,				"position2Name":""
-		,				"position3Name":""
-		,				"position4Name":""
-		,				"position5Name":""
-		,				"createBy":""
-		,				"createTime":""
-		,				"updateBy":""
-		,				"updateTime":""
-					  },
+      queryModel: {
+        id: "",
+        companyId: "",
+        position1Name: "",
+        position2Name: "",
+        position3Name: "",
+        position4Name: "",
+        position5Name: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: ""
+      },
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -152,7 +212,7 @@ export default {
       field: "",
       direction: "",
       pageSizeList: [10, 20, 30],
-      multipleSelection: [],      
+      multipleSelection: [],
       showModal: false,
       modalTitle: "",
       businessKey: ""
@@ -162,7 +222,7 @@ export default {
     changePage(pageIndex) {
       var self = this;
 
-	  self.loading = true;
+      self.loading = true;
 
       self.pageIndex = pageIndex;
       var formData = new FormData();
@@ -170,17 +230,17 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-formData.append("id",self.queryModel.id);
-formData.append("companyId",self.queryModel.companyId);
-formData.append("position1Name",self.queryModel.position1Name);
-formData.append("position2Name",self.queryModel.position2Name);
-formData.append("position3Name",self.queryModel.position3Name);
-formData.append("position4Name",self.queryModel.position4Name);
-formData.append("position5Name",self.queryModel.position5Name);
-formData.append("createBy",self.queryModel.createBy);
-formData.append("createTime",self.queryModel.createTime);
-formData.append("updateBy",self.queryModel.updateBy);
-formData.append("updateTime",self.queryModel.updateTime);
+      formData.append("id", self.queryModel.id);
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("position1Name", self.queryModel.position1Name);
+      formData.append("position2Name", self.queryModel.position2Name);
+      formData.append("position3Name", self.queryModel.position3Name);
+      formData.append("position4Name", self.queryModel.position4Name);
+      formData.append("position5Name", self.queryModel.position5Name);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+      formData.append("updateTime", self.queryModel.updateTime);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -190,18 +250,21 @@ formData.append("updateTime",self.queryModel.updateTime);
         formData.append("direction", this.direction);
       }
 
-      companyPositionApi.pageList(formData).then(function(response) {
-        self.loading = false;
+      companyPositionApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
 
-        var jsonData = response.data.data;
+          var jsonData = response.data.data;
 
-        self.tableData = jsonData.data;
-        self.totalPages = jsonData.totalPages;
-        self.totalElements = jsonData.recordsTotal;
-      }).catch((error)=>{
-        self.loading = false;
-        // self.$message.error(error + "");
-      });
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
     },
     pageSizeChange(pageSize) {
       this.pageSize = pageSize;
@@ -231,26 +294,28 @@ formData.append("updateTime",self.queryModel.updateTime);
     handleDelete(record) {
       var self = this;
 
-      self.$confirm("是否确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        companyPositionApi.remove(record.id).then(function(response) {
-          var jsonData = response.data;
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          companyPositionApi.remove(record.id).then(function(response) {
+            var jsonData = response.data;
 
-          if (jsonData.result) {
-            // var index = self.tableData.indexOf(record);
-            // self.tableData.splice(index, 1);
-            self.changePage(self.pageIndex);
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          }
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
         });
-      });
     },
     handleBatchDelete() {
       var self = this;
@@ -282,7 +347,7 @@ formData.append("updateTime",self.queryModel.updateTime);
       //保存成功后回调
       this.showModal = false;
 
-      if(refreshed){
+      if (refreshed) {
         this.changePage(this.pageIndex);
       }
     }

src/views/base/deviceInfo-list.vue

@@ -59,7 +59,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>
@@ -69,6 +69,7 @@
       style="min-height:400px;"
       v-loading="loading"
       stripe
+      :height="tableHeight"
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
@@ -144,10 +145,13 @@ export default {
       modalTitle: "",
       businessKey: "",
       typeData: [],
-      companyResult: ""
+      companyResult: "",
+      tableHeight:""
     };
   },
   created() {
+    this.tableHeight = window.innerHeight - 280;
+
     var formData = new FormData();
     formData.append("catalogName", "设备类型");
     return dataDictionaryApi.findByCatalogName(formData).then(response => {

src/views/base/electricClientInfo-list.vue

@@ -43,7 +43,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>

src/views/base/electricMeterInfo-list.vue

@@ -55,7 +55,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>

src/views/base/employeeInfo-list.vue

@@ -61,7 +61,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="downConfirm"
       >打包下载员工资料</el-button>

src/views/base/ownerInfo-list.vue

@@ -66,8 +66,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
-        
+        icon="el-icon-remove"
         @click="handleBatchDelete"
         disabled
       >删除选中项</el-button>

src/views/base/personDeviceLog-list.vue

@@ -18,16 +18,23 @@
         <el-form-item label="记录时间" prop="timeRanges">
           <el-date-picker
             v-model="queryModel.timeRanges"
-            type="daterange"
+            type="datetimerange"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
-            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="timeRangesDefaultTime"
             size="mini"
           ></el-date-picker>
+          <!-- <el-date-picker
+            v-model="queryModel.timeRanges"
+            type="datetimerange"
+            align="right"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['12:00:00', '08:00:00']"
+          ></el-date-picker> -->
         </el-form-item>
-
         <el-form-item label="人员姓名" prop="personName">
           <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
         </el-form-item>
@@ -72,7 +79,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-download"
         :loading="downloadLoading"
         @click="downloadXls"
       >导出数据</el-button>
@@ -82,6 +89,7 @@
       style="min-height:400px;"
       v-loading="loading"
       stripe
+      :height="tableHeight"
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
@@ -161,11 +169,14 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
-      downloadLoading:false
+      downloadLoading: false,
+      tableHeight: "",
+      timeRangesDefaultTime:[]
     };
   },
   created() {
     var self = this;
+    this.tableHeight = window.innerHeight - 320;
     this.getCurrentMonthFirst();
   },
   methods: {
@@ -189,10 +200,10 @@ export default {
       formData.append("companyId", self.queryModel.companyId);
       formData.append("position", self.queryModel.position);
 
-      formData.append(
-        "temperatureRanges",
-        self.queryModel.temperatureBegin + "," + self.queryModel.temperatureEnd
-      );
+      // formData.append(
+      //   "temperatureRanges",
+      //   self.queryModel.temperatureBegin + "," + self.queryModel.temperatureEnd
+      // );
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -282,8 +293,7 @@ export default {
       var day = date.getDate();
       if (month < 10) month = "0" + month;
       if (day < 10) day = "0" + day;
-      var startTime = date.getFullYear() + "-" + month + "-" + day;
-      
+      var startTime = date.getFullYear() + "-" + month + "-" + day + " 00:00:00";
 
       var lastDate = new Date();
       lastDate.setMonth(date.getMonth() + 1);
@@ -291,7 +301,7 @@ export default {
       lastDate.setDate(0);
       //获取上个月最后一天=本月最后一天
       var lastDay = lastDate.getDate();
-      var endTime = date.getFullYear()+ "-" + month + "-" + lastDay;
+      var endTime = date.getFullYear() + "-" + month + "-" + lastDay + " 00:00:00";
 
       self.queryModel.timeRanges = [startTime, endTime];
     }

src/views/base/personDeviceRelation-BoundList.vue

@@ -19,7 +19,7 @@
           type="primary"
           size="small"
           plain
-          icon="el-icon-circle-plus"
+          icon="el-icon-remove"
           @click="handleRemoveAll"
         >解绑所有设备</el-button>
       </el-row>

src/views/base/personInfo-list.vue

@@ -57,16 +57,28 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否同步" prop="companyId">
+          <el-select
+            v-model="queryModel.faceBound"
+            size="mini"
+            filterable
+            placeholder="请选择"
+            style="width:120px"
+          >
+            <el-option value="1" label="已同步"></el-option>
+            <el-option value="0" label="未同步"></el-option>
+          </el-select>
+        </el-form-item>
       </div>
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
-      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-remove" @click="handleAdd">新增</el-button>
       <el-button
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>
@@ -74,14 +86,14 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-upload2"
         @click="batchImportVisible = true"
       >导入</el-button>
       <el-button
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-download"
         :loading="xlsLoading"
         @click="downloadAll"
       >导出数据</el-button>
@@ -89,7 +101,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-refresh"
         :disabled="multipleSelection.length==0"
         @click="dataSync"
       >数据同步</el-button>
@@ -97,7 +109,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-refresh"
         :disabled="multipleSelection.length==0"
         @click="handleBatchEnabledFace"
       >人脸授权</el-button>
@@ -105,7 +117,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-refresh"
         :disabled="multipleSelection.length==0"
         @click="batchBoundDevice = true"
       >绑定设备</el-button>
@@ -115,12 +127,12 @@
       style="min-height:400px;"
       v-loading="loading"
       stripe
-      height="100%"
+      :height="tableHeight"
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="id" label="序号" width="80" fixed="left"></el-table-column>
+      <el-table-column prop="id" label="序号" width="80" fixed="left" :key="Math.random()"></el-table-column>
       <el-table-column prop="companyName" label="企业" width="250"></el-table-column>
       <el-table-column prop="faceImageUrl" label="人员照片" width="80" fixed="left">
         <template slot-scope="{row}">
@@ -135,7 +147,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="150" 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>
@@ -149,16 +162,10 @@
       </el-table-column>
       <el-table-column prop="popedom" label="用户身份" width="180">
         <template slot-scope="{row}">
-          <span v-if="row.popedom=='1'">
-          个人用户
-          </span>
-          <span v-if="row.popedom=='2'">
-            企业管理员
-          </span>
-          <span v-if="row.popedom=='3'">
-            监管人员
-          </span>
-          </template>
+          <span v-if="row.popedom=='1'">个人用户</span>
+          <span v-if="row.popedom=='2'">企业管理员</span>
+          <span v-if="row.popedom=='3'">监管人员</span>
+        </template>
       </el-table-column>
       <el-table-column label="人脸授权">
         <template slot-scope="{row}">
@@ -209,7 +216,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="300">
+      <el-table-column label="操作" width="300" fixed="right">
         <template slot-scope="{row}">
           <el-row>
             <el-col>
@@ -217,7 +224,12 @@
               <el-link type="danger" :underline="false" @click="handleDelete(row)">删除</el-link>-
               <el-link type="primary" :underline="false" @click="bindDevice(row)">绑定设备</el-link>-
               <span v-if="row.faceBound">
-                <el-link type="primary" :underline="false" :disabled="true" @click="uploadData(row)">上传数据</el-link>-
+                <el-link
+                  type="primary"
+                  :underline="false"
+                  :disabled="true"
+                  @click="uploadData(row)"
+                >上传数据</el-link>-
               </span>
               <span v-if="!row.faceBound">
                 <el-link type="primary" :underline="false" @click="uploadData(row)">上传数据</el-link>-
@@ -371,7 +383,8 @@ export default {
         companyId: "",
         name: "",
         phone: "",
-        idCard: ""
+        idCard: "",
+        faceBound:""
       },
       loading: false,
       tableData: [],
@@ -381,7 +394,7 @@ export default {
       totalElements: 0,
       field: "",
       direction: "",
-      pageSizeList: [30, 50, 100],
+      pageSizeList: [30, 100, 500],
       multipleSelection: [],
       showModal: false,
       modalTitle: "",
@@ -416,31 +429,51 @@ export default {
       batchBoundDevice: false,
       deviceResult: "",
       boundDeviceId: "",
-      xlsLoading: false
+      xlsLoading: false,
+      tableHeight: ""
     };
   },
   created() {
     var self = this;
+    this.tableHeight = window.innerHeight - 320;
+
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+
+    deviceInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.deviceResult = jsonData.data;
+        }
+      }
+    });
 
     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;
@@ -463,6 +496,8 @@ export default {
       formData.append("name", self.queryModel.name);
       formData.append("phone", self.queryModel.phone);
       formData.append("idCard", self.queryModel.idCard);
+      formData.append("faceBound", self.queryModel.faceBound);
+      
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -490,11 +525,10 @@ export default {
     },
     pageSizeChange(pageSize) {
       this.pageSize = pageSize;
+      this.changePage(this.pageIndex);
     },
     sortChange(data) {
       this.field = data.column.field;
-      this.direction = data.order;
-
       this.changePage(this.pageIndex);
     },
     handleSelectionChange(val) {
@@ -853,20 +887,7 @@ export default {
   async mounted() {
     var self = this;
     this.changePage(1);
-
-    companyInfoApi.list().then(function(response) {
-      var jsonData = response.data;
-      if (jsonData.result) {
-        self.companyResult = jsonData.data;
-      }
-    });
-
-    deviceInfoApi.list().then(function(response) {
-      var jsonData = response.data;
-      if (jsonData.result) {
-        self.deviceResult = jsonData.data;
-      }
-    });
+    //self.tableHeight = window.innerHeight - self.$refs.queryForm.$el.offsetTop - 100;
   },
   components: {
     "personInfo-detail": PersonInfoDetail,

src/views/base/roomInfo-list.vue

@@ -22,7 +22,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button> -->

src/views/base/terminalInfo-list.vue

@@ -40,7 +40,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>

src/views/sys/dataDictionary-list.vue

@@ -57,7 +57,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>

src/views/sys/menu-list.vue

@@ -63,7 +63,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>

src/views/sys/permission-list.vue

@@ -47,7 +47,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>

src/views/sys/role-list.vue

@@ -43,7 +43,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>

src/views/sys/user-list.vue

@@ -59,7 +59,7 @@
         type="primary"
         size="small"
         plain
-        icon="el-icon-circle-plus"
+        icon="el-icon-remove"
         :disabled="multipleSelection.length==0"
         @click="handleBatchDelete"
       >删除选中项</el-button>