单位管理

src/api/base/companyDeviceRelation.js

@@ -0,0 +1,66 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/personDeviceRelation/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/personDeviceRelation/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/personDeviceRelation/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/personDeviceRelation/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/personDeviceRelation/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/personDeviceRelation/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/personDeviceRelation/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function isUnbindDeviceList(formData) {
+  return request.post(constant.serverUrl + "/personDeviceRelation/isUnbindDeviceList", formData);
+}
+
+function batchBindDevice(formData) {
+  //多设备绑定人
+  return request.post(constant.serverUrl + "/personDeviceRelation/batchBindDevice", formData);
+}
+
+function batchBindPerson(formData){
+  //多人员绑定设备
+  return request.post(constant.serverUrl + "/personDeviceRelation/batchBindPerson", formData);
+}
+
+function unbindDevice(formData) {
+  return request.post(constant.serverUrl + "/personDeviceRelation/unbindDevice", formData);
+}
+
+
+
+export default {
+  create, edit, add, update, remove, batchRemove, pageList, isUnbindDeviceList, batchBindDevice, unbindDevice,batchBindPerson
+}

src/api/base/companyInfo.js

@@ -1,50 +1,70 @@
 import request from '@/utils/request'
 import constant from '@/constant'
 
-function list(){
+function list() {
   return request.post(constant.serverUrl + "/base/companyInfo/list");
 }
 
-function pageList(formData){
+function pageList(formData) {
   return request.post(constant.serverUrl + "/base/companyInfo/pageList", formData);
 }
 
-function create(){
+function create() {
   return request.get(constant.serverUrl + "/base/companyInfo/create");
 }
 
-function edit(id){
+function edit(id) {
   return request.get(constant.serverUrl + "/base/companyInfo/edit/" + id);
 }
 
-function add(formModel){
-  return request.post(constant.serverUrl + "/base/companyInfo/add", formModel,{
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/companyInfo/add", formModel, {
     headers: {
       "Content-Type": "application/json"
     }
   });
 }
 
-function update(formModel){  
-  return request.post(constant.serverUrl + "/base/companyInfo/update", formModel,{
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/companyInfo/update", formModel, {
     headers: {
       "Content-Type": "application/json"
     }
   });
 }
 
-function remove(id){
+function remove(id) {
   return request.post(constant.serverUrl + "/base/companyInfo/delete/" + id);
 }
 
-function batchRemove(idList){
-  return request.post(constant.serverUrl + "/base/companyInfo/batchDelete",idList,{
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/companyInfo/batchDelete", idList, {
     headers: {
       "Content-Type": "application/json"
     }
   });
 }
 
+function queryBindDeviceList(formData) {
+  var objData = {};
+  formData.forEach((value, key) => objData[key] = value);
+  return request.get(constant.serverUrl + "/base/companyInfo/queryBindDeviceList", {
+    params: objData,
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function bindDevice(formData) {
+  return request.post(constant.serverUrl + "/base/companyInfo/bindDevice", formData);
+}
+
+function unbindDevice(formData) {
+  return request.post(constant.serverUrl + "/base/companyInfo/unbindDevice", formData);
+}
+
 export default {
-  list,create,edit,add,update,remove,batchRemove,pageList
+  list, create, edit, add, update, remove, batchRemove, pageList, queryBindDeviceList,
+  bindDevice, unbindDevice
 }

src/routers/modules/base.js

@@ -176,7 +176,7 @@ var routers = [
                 }
         },
         {
-                //企业管理
+                //单位管理
                 path: '/base/companyInfo/list',
                 name: 'base-companyInfo-list',
                 // route level code-splitting
@@ -222,7 +222,19 @@ var routers = [
                 meta: {
                         roles: ["admin"]
                 }
-        }
+        },
+        {
+                //考勤记录
+                path: '/base/personAttendance/list',
+                name: 'base-personAttendance-list',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/personAttendance-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
 ]
 
 export default routers;

src/views/base/companyDeviceRelation-list.vue

@@ -0,0 +1,283 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    title="查看设备"
+    :modal-append-to-body="false"
+    :modal="true"
+    style="text-align:left;"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    width="60%"
+  >
+    <div>
+      <!--
+      要resetFields起作用，必须配置:model和prop
+      -->
+      <el-divider></el-divider>
+      <el-row class="button-group">
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-circle-plus"
+          :disabled="multipleSelection.length==0"
+          @click="handleBatchBound"
+        >批量绑定</el-button>
+      </el-row>
+      <el-table
+        :data="tableData"
+        style="min-height:400px;"
+        v-loading="loading"
+        stripe
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" :selectable="disableSelect" width="55"></el-table-column>
+        <el-table-column prop="device.deviceNo" label="设备编号" width="220"></el-table-column>
+        <el-table-column prop="device.aliasName" label="设备名称" width="180"></el-table-column>
+        <el-table-column prop="device.typeN" label="类型" width="120"></el-table-column>
+        <el-table-column prop="bound" label="绑定状态" width="120">
+          <template slot-scope="{row}">{{row.bound ? "已绑定" : "未绑定"}}</template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="{row}">
+            <span v-if="!row.bound">
+              <el-button size="mini" type="success" @click="handleBound(row)">绑定设备</el-button>
+            </span>
+            <span v-if="row.bound">
+              <el-button size="mini" type="danger" @click="handleUnBound(row)">解除绑定</el-button>
+            </span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page.sync="pageIndex"
+        :total="totalElements"
+        :page-sizes="pageSizeList"
+        @current-change="changePage"
+        @size-change="pageSizeChange"
+        layout="total, sizes, prev, pager, next, jumper"
+      ></el-pagination>
+      <personDeviceRelation-detail
+        v-if="showModal"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></personDeviceRelation-detail>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import PersonDeviceRelationDetail from "./personDeviceRelation-detail";
+import personDeviceRelationApi from "@/api/base/personDeviceRelation";
+import companyInfoApi from "@/api/base/companyInfo";
+
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  props: ["companyId"],
+  data() {
+    var self = this;
+
+    return {
+      formModel: {},
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      showDialog: true
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    disableSelect(row, rowIndex) {
+      //多选按钮是否禁用
+      if (row.isBindPerson) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("companyId", self.companyId);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      companyInfoApi
+        .queryBindDeviceList(formData)
+        .then(function(response) {
+          self.loading = false;
+
+          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 + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleBatchBound() {
+      //批量绑定
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.device.id;
+      });
+      if (confirm("是否绑定？")) {
+        self.loading = true;
+        var formData = new FormData();
+        formData.append("companyId", self.companyId);
+        formData.append("deviceIds", idList);
+        return companyInfoApi.bindDevice(formData).then(function(response) {
+          self.loading = false;
+
+          var jsonData = response.data;
+          self.changePage(self.pageIndex);
+          if (jsonData.result) {
+            self.$message({
+              message: "绑定成功!",
+              type: "success"
+            });
+          } else {
+            self.$message({
+              message: jsonData.message + "",
+              type: "warning"
+            });
+          }
+        });
+      }
+    },
+    handleBound(record) {
+      //绑定设备
+      var self = this;
+      if (confirm("是否绑定？")) {
+        self.loading = true;
+        var formData = new FormData();
+        formData.append("companyId", self.companyId);
+        formData.append("deviceIds", record.device.id);
+        return companyInfoApi.bindDevice(formData).then(function(response) {
+          self.loading = false;
+
+          var jsonData = response.data;
+          self.changePage(self.pageIndex);
+          if (jsonData.result) {
+            self.$message({
+              message: "绑定成功!",
+              type: "success"
+            });
+          } else {
+            self.$message({
+              message: jsonData.message + "",
+              type: "warning"
+            });
+          }
+        });
+      }
+    },
+    handleUnBound(record) {
+      //取消绑定
+      var self = this;
+      self.loading = true;
+
+      var formData = new FormData();
+      formData.append("companyId", self.companyId);
+      formData.append("deviceIds", record.device.id);
+      return companyInfoApi.unbindDevice(formData).then(function(response) {
+        self.loading = false;
+        var jsonData = response.data;
+        self.changePage(self.pageIndex);
+        if (jsonData.result) {
+          self.$message({
+            message: "绑定成功!",
+            type: "success"
+          });
+        } else {
+          self.$message({
+            message: jsonData.message + "",
+            type: "warning"
+          });
+        }
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "personDeviceRelation-detail": PersonDeviceRelationDetail
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/companyInfo-detail.vue

@@ -92,7 +92,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="公司logo" prop="logo">
+            <el-form-item label="单位logo" prop="logo">
               <el-upload
                 class="avatar-uploader"
                 name="photoFile"
@@ -123,12 +123,12 @@ import companyInfoApi from "@/api/base/companyInfo";
 import { getToken } from "@/utils/auth"; // get token from cookie
 
 export default {
-  props: ["businessKey", "title", "companyResult"],
+  props: ["businessKey", "title"],
   data() {
     return {
       formModel: {},
       ruleValidate: {
-        name: [{ required: true, message: "公司名称不能为空", trigger: "blur" }]
+        name: [{ required: true, message: "单位名称不能为空", trigger: "blur" }]
       },
       showDialog: true,
       loading: false,
@@ -141,9 +141,19 @@ export default {
       fileUrl: "",
       headers: {
         Authorization: getToken()
-      }
+      },
+      companyResult: ""
     };
   },
+  created() {
+    var self = this;
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
   methods: {
     closeDialog() {
       this.$emit("close", false);

src/views/base/companyInfo-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/companyInfo">企业管理</a>
+        <a href="/companyInfo">单位管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -14,7 +14,7 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="公司名称" prop="name">
+      <el-form-item label="单位名称" prop="name">
         <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
       </el-form-item>
       <el-form-item>
@@ -56,7 +56,7 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="sortNo" label="序号" width="80"></el-table-column>
-      <!-- <el-table-column prop="logo" label="公司logo" width="120">
+      <!-- <el-table-column prop="logo" label="单位logo" width="120">
         <template slot-scope="{row}">
           <a :href="row.logo" target="_blank">
             <el-avatar
@@ -68,17 +68,22 @@
         </template>
       </el-table-column>-->
       <el-table-column prop="parentName" label="园区" width="230"></el-table-column>
-      <el-table-column prop="name" label="公司名称" width="230"></el-table-column>
+      <el-table-column prop="name" label="单位名称" width="230"></el-table-column>
       <!-- <el-table-column prop="position1Name" label="一级位置" width="180"></el-table-column>
       <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="remark" sort-by="remark_" label="备注"></el-table-column>
-      <el-table-column label="操作" width="150" fixed="right">
+      <el-table-column label="操作" width="250" fixed="right">
         <template slot-scope="{row}">
-          <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-row>
+            <el-col>
+              <el-link type="primary" :underline="false" @click="handleEdit(row)">编辑</el-link>-
+              <el-link type="danger" :underline="false" @click="handleDelete(row)">删除</el-link>-
+              <el-link type="primary" :underline="false" @click="bindDevice(row)">绑定设备</el-link>
+            </el-col>
+          </el-row>
         </template>
       </el-table-column>
     </el-table>
@@ -93,16 +98,22 @@
     <companyInfo-detail
       v-if="showModal"
       :businessKey="businessKey"
-      :companyResult="companyResult"
       :title="modalTitle"
       @close="onDetailModalClose"
     ></companyInfo-detail>
+    <companyDeviceRelation-list
+      v-if="showDeviceModal"
+      :companyId="companyId"
+      @close="onDetailModalClose"
+    ></companyDeviceRelation-list>
   </div>
 </template>
 <script>
 import Constant from "@/constant";
 import companyInfoDetail from "./companyInfo-detail";
+import companyDeviceRelationList from "./companyDeviceRelation-list";
 import companyInfoApi from "@/api/base/companyInfo";
+
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -127,7 +138,8 @@ export default {
       modalTitle: "",
       businessKey: "",
       tableHeight: "",
-      companyResult: ""
+      showDeviceModal:false,
+      companyId:""
     };
   },
   created() {
@@ -251,24 +263,24 @@ export default {
     onDetailModalClose(refreshed) {
       //保存成功后回调
       this.showModal = false;
+      this.showDeviceModal = false;
 
       if (refreshed) {
         this.changePage(this.pageIndex);
       }
+    },
+    bindDevice(record) {
+      //绑定设备
+      this.companyId = record.id;
+      this.showDeviceModal = true;
     }
   },
   mounted: function() {
-    var self = this;
     this.changePage(1);
-    companyInfoApi.list().then(function(response) {
-      var jsonData = response.data;
-      if (jsonData.result) {
-        self.companyResult = jsonData.data;
-      }
-    });
   },
   components: {
-    "companyInfo-detail": companyInfoDetail
+    "companyInfo-detail": companyInfoDetail,
+    "companyDeviceRelation-list":companyDeviceRelationList
   }
 };
 </script>

src/views/base/companyPosition-detail.vue

@@ -18,8 +18,8 @@
         <el-form-item label prop="id">
           <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
         </el-form-item>
-        <el-form-item label="企业编号" prop="companyId">
-          <el-input v-model="formModel.companyId" placeholder="请输入企业编号" style="width:300px"></el-input>
+        <el-form-item label="单位编号" prop="companyId">
+          <el-input v-model="formModel.companyId" placeholder="请输入单位编号" style="width:300px"></el-input>
         </el-form-item>
         <el-form-item label="位置1名称" prop="position1Name">
           <el-input v-model="formModel.position1Name" placeholder="请输入位置1名称" style="width:300px"></el-input>
@@ -67,7 +67,7 @@ export default {
       ruleValidate: {
         id: [{ required: true, message: "不能为空", trigger: "blur" }],
         companyId: [
-          { required: true, message: "企业编号不能为空", trigger: "blur" }
+          { required: true, message: "单位编号不能为空", trigger: "blur" }
         ],
         position1Name: [
           { required: true, message: "位置1名称不能为空", trigger: "blur" }

src/views/base/companyPosition-list.vue

@@ -17,7 +17,7 @@
       <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-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">
@@ -88,7 +88,7 @@
       <el-table-column
         prop="companyId"
         sort-by="company_id"
-        label="企业编号"
+        label="单位编号"
         sortable="custom"
         width="180"
       ></el-table-column>

src/views/base/deviceInfo-detail.vue

@@ -17,7 +17,7 @@
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="企业" prop="companyId">
+            <el-form-item label="单位" prop="companyId">
               <el-select
                 v-model="formModel.companyId"
                 filterable

src/views/base/deviceInfo-list.vue

@@ -14,7 +14,7 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="所属企业" prop="companyId">
+      <el-form-item label="所属单位" prop="companyId">
         <el-select
           v-model="queryModel.companyId"
           size="mini"
@@ -74,7 +74,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="companyName" label="企业" width="280"></el-table-column>
+      <el-table-column prop="companyName" label="单位" width="280"></el-table-column>
       <el-table-column prop="deviceNo" label="设备编号" width="200" fixed="left"></el-table-column>
       <el-table-column prop="aliasName" label="设备别名" width="150"></el-table-column>
       <el-table-column prop="isOnlineN" label="运行状态" width="150"></el-table-column>

src/views/base/employeeInfo-list.vue

@@ -14,7 +14,7 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="公司" prop="companyId">
+      <el-form-item label="单位" prop="companyId">
         <el-select size="mini" v-model="queryModel.companyId" filterable placeholder="请选择">
           <el-option
             v-for="company in companyList"
@@ -84,7 +84,7 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="id" label="编号" width="80"></el-table-column>
-      <el-table-column prop="companyName" label="所属公司" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="companyName" label="所属单位" sortable="custom" width="180"></el-table-column>
       <el-table-column prop="name" sort-by="name_" label="姓名" width="100"></el-table-column>
       <el-table-column prop="photo" label="照片" width="100">
         <template slot-scope="{row}">

src/views/base/personAttendance-list.vue

@@ -0,0 +1,269 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">系统管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/personDeviceLog">考勤记录</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+      <div>
+        <el-form-item label="统计区间" prop="timeRanges">
+          <el-date-picker
+            v-model="queryModel.timeRanges"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            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>
+          <el-button
+            type="primary"
+            size="mini"
+            icon="ios-search"
+            @click="changePage(1)"
+            :loading="loading"
+          >查询</el-button>&nbsp;
+          <el-button
+            type="info"
+            size="mini"
+            style="margin-left: 8px"
+            @click="handleReset('queryForm')"
+          >重置</el-button>&nbsp;
+        </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-download"
+        :loading="downloadLoading"
+        @click="downloadXls"
+      >导出数据</el-button>
+    </el-row>
+    
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import personDeviceLogApi from "@/api/base/personDeviceLog";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyId: "",
+        deviceNo: "",
+        aliasName: "",
+        personName: "",
+        matchStatus: "",
+        timeRanges: "",
+        faceImage: "",
+        position: "",
+        temperatureBegin: "",
+        temperatureEnd: "",
+        temperatureRanges: "",
+        matchMsg:""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      downloadLoading: false,
+      tableHeight: "",
+      timeRangesDefaultTime:[]
+    };
+  },
+  created() {
+    var self = this;
+    this.tableHeight = window.innerHeight - 320;
+    this.getCurrentMonthFirst();
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("faceImage", self.queryModel.faceImage);
+      formData.append("timeRanges", self.queryModel.timeRanges);
+      formData.append("matchStatus", self.queryModel.matchStatus);
+      formData.append("personName", self.queryModel.personName);
+      formData.append("deviceNo", self.queryModel.deviceNo);
+      formData.append("aliasName", self.queryModel.aliasName);
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("position", self.queryModel.position);
+      formData.append("matchMsg", self.queryModel.matchMsg);
+
+      // formData.append(
+      //   "temperatureRanges",
+      //   self.queryModel.temperatureBegin + "," + self.queryModel.temperatureEnd
+      // );
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      personDeviceLogApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
+
+          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 + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+      this.queryModel.timeRanges = "";
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    downloadXls() {
+      //导出
+      var self = this;
+      self.downloadLoading = true;
+      var formData = new FormData();
+
+      formData.append("faceImage", self.queryModel.faceImage);
+      formData.append("timeRanges", self.queryModel.timeRanges);
+      formData.append("matchStatus", self.queryModel.matchStatus);
+      formData.append("personName", self.queryModel.personName);
+      formData.append("deviceNo", self.queryModel.deviceNo);
+      formData.append("aliasName", self.queryModel.aliasName);
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("position", self.queryModel.position);
+
+      personDeviceLogApi.exportXls(formData).then(function(response) {
+        var jsonData = response.data;
+        self.downloadLoading = false;
+        if (jsonData.result) {
+          if (jsonData.data != null) {
+            //下载有错误信息提示的报表
+            self.$message({
+              showClose: true,
+              dangerouslyUseHTMLString: true,
+              message: `<a href="${jsonData.data}" target="_blank">点击下载报表</a>&nbsp;`,
+              duration: 30000
+            });
+          }
+        }
+      });
+    },
+    //初始化日期
+    getCurrentMonthFirst() {
+      var self = this;
+      var date = new Date();
+      date.setDate(1);
+      var month = parseInt(date.getMonth() + 1);
+      var day = date.getDate();
+      if (month < 10) month = "0" + month;
+      if (day < 10) day = "0" + day;
+      var startTime = date.getFullYear() + "-" + month + "-" + day + " 00:00:00";
+
+      var lastDate = new Date();
+      lastDate.setMonth(date.getMonth() + 1);
+      //设置当前月份+1
+      lastDate.setDate(0);
+      //获取上个月最后一天=本月最后一天
+      var lastDay = lastDate.getDate();
+      var endTime = date.getFullYear() + "-" + month + "-" + lastDay + " 23:59:59";
+
+      self.queryModel.timeRanges = [startTime, endTime];
+    }
+  },
+  mounted: function() {
+    //this.changePage(1);
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/personInfo-detail.vue

@@ -17,7 +17,7 @@
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="企业" prop="companyId">
+            <el-form-item label="单位" prop="companyId">
               <el-select
                 v-model="formModel.companyId"
                 filterable
@@ -57,6 +57,7 @@
               <el-select
                 v-model="formModel.popedom"
                 filterable
+                multiple
                 placeholder="请选择"
                 style="width:280px"
               >
@@ -170,9 +171,7 @@ export default {
     return {
       formModel: {},
       ruleValidate: {
-        companyId: [
-          { required: true, message: "请选择企业", trigger: "blur" }
-        ],
+        companyId: [{ required: true, message: "请选择单位", trigger: "blur" }],
         name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
         phone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
         // idCard: [
@@ -221,7 +220,9 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-
+            var popedom = self.formModel.popedom.join(",");
+            self.formModel.popedom = popedom;
+            console.log(popedom);
             if (id == null || id.length == 0) {
               return personInfoApi.add(self.formModel);
             } else {
@@ -290,7 +291,10 @@ export default {
           }
 
           if (self.businessKey.length == 0) {
-            self.formModel.popedom = "1";
+            self.formModel.popedom = ["1"];
+          } else {
+            var popedom = self.formModel.popedom;
+            self.formModel.popedom = popedom.split(",");
           }
         } else {
           self.$message.error(jsonData.message + "");

src/views/base/personInfo-list.vue

@@ -41,7 +41,7 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="企业" prop="companyId">
+        <el-form-item label="单位" prop="companyId">
           <el-select
             v-model="queryModel.companyId"
             size="mini"
@@ -159,7 +159,7 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column prop="companyName" label="企业" width="250"></el-table-column>
+      <el-table-column prop="companyName" label="单位" width="250"></el-table-column>
       <el-table-column prop="phone" label="手机号" width="180"></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>
@@ -174,11 +174,13 @@
       <el-table-column prop="faceBound" label="是否同步人脸信息" width="180">
         <template slot-scope="{row}">{{row.faceBound ? "是" : "否"}}</template>
       </el-table-column>
-      <el-table-column prop="popedom" label="用户身份" width="180">
+      <el-table-column prop="popedom" label="用户身份" width="200">
         <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>
+          <el-row>
+            <el-col :span="10" v-if="row.popedom.indexOf('1')!= -1">个人用户</el-col>
+            <el-col :span="10" v-if="row.popedom.indexOf('2')!= -1">单位管理员</el-col>
+            <el-col :span="10" v-if="row.popedom.indexOf('3')!= -1">监管人员</el-col>
+          </el-row>
         </template>
       </el-table-column>
       <el-table-column label="人脸授权">
@@ -300,7 +302,7 @@
             target="_blank"
           >点击下载模板</el-link>
         </el-form-item>
-        <el-form-item label="企业">
+        <el-form-item label="单位">
           <el-select
             v-model="uploadCompanyId"
             filterable
@@ -399,7 +401,7 @@ export default {
         phone: "",
         idCard: "",
         faceBound: "",
-        isUploadPhoto:""
+        isUploadPhoto: ""
       },
       loading: false,
       tableData: [],
@@ -488,7 +490,6 @@ export default {
         self.position4Show = true;
       }
       if (jsonData.position5Name != null && jsonData.position5Name != "") {
-        //alert(jsonData.position5Name);
         self.position5 = jsonData.position5Name;
         self.position5Show = true;
       }
@@ -652,7 +653,7 @@ export default {
       if (self.uploadCompanyId == null || self.uploadCompanyId == "") {
         self.$message({
           type: "warning",
-          message: "请选择企业"
+          message: "请选择单位"
         });
         self.xlsLoading = false;
         return false;

src/views/sys/user-detail.vue

@@ -28,7 +28,7 @@
             style="width:300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="所属企业" prop="companyId">
+        <el-form-item label="所属单位" prop="companyId">
           <el-select v-model="formModel.companyId" filterable placeholder="请选择" style="width:300px">
             <el-option
               v-for="company in companyResult"
@@ -82,7 +82,7 @@ export default {
           { required: true, message: "真实名称不能为空", trigger: "blur" }
         ],
         companyId: [
-          { required: true, message: "企业不能为空", trigger: "blur" }
+          { required: true, message: "单位不能为空", trigger: "blur" }
         ],
         password: [
           { required: true, message: "密码不能为空", trigger: "blur" }

src/views/sys/user-list.vue

@@ -20,7 +20,7 @@
       <el-form-item label="真实名称" prop="realName">
         <el-input type="text" size="mini" v-model="queryModel.realName"></el-input>
       </el-form-item>
-      <el-form-item label="所属企业" prop="companyId">
+      <el-form-item label="所属单位" prop="companyId">
         <el-select
           v-model="queryModel.companyId"
           size="mini"
@@ -91,7 +91,7 @@
       <el-table-column
         prop="companyName"
         sort-by="company_name"
-        label="所属企业"
+        label="所属单位"
         sortable="custom"
         width="180"
       ></el-table-column>