企业信息,人员信息等

.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
-#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
+#VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
+VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
 #VUE_APP_BACKEND_URL=http://kr6zr7.natappfree.cc/smart-community-server/

src/api/base/companyPosition.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/companyPosition/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/companyPosition/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/companyPosition/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/companyPosition/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/companyPosition/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/companyPosition/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/companyPosition/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  list,create,edit,add,update,remove,batchRemove,pageList
+}

src/api/base/deviceInfo.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/deviceInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/deviceInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/deviceInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/deviceInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/deviceInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/deviceInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/deviceInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  list,create,edit,add,update,remove,batchRemove,pageList
+}

src/api/base/personDeviceRelation.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/personDeviceRelation/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/personDeviceRelation/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/personDeviceRelation/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/personDeviceRelation/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/personDeviceRelation/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/personDeviceRelation/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/personDeviceRelation/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  list,create,edit,add,update,remove,batchRemove,pageList
+}

src/api/base/personInfo.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/personInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/personInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/personInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/personInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/personInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/personInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/personInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/routers/modules/base.js

@@ -174,6 +174,42 @@ var routers = [
                 meta: {
                         roles: ["admin"]
                 }
+        },
+        {
+                //企业管理
+                path: '/base/companyInfo/list',
+                name: 'base-companyInfo-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/companyInfo-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                //人员管理
+                path: '/base/personInfo/list',
+                name: 'base-personInfo-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/personInfo-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        },
+        {
+                //设备管理
+                path: '/base/deviceInfo/list',
+                name: 'base-deviceInfo-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/deviceInfo-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
         }
 ]
 

src/views/base/companyInfo-detail.vue

@@ -0,0 +1,170 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="公司名称" prop="name">
+          <el-input v-model="formModel.name" placeholder="请输入公司名称" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formModel.remark" placeholder="请输入备注" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="序号" prop="sortNo">
+          <el-input v-model="formModel.sortNo" placeholder="请输入序号" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="公司logo" prop="logo">
+          <el-upload
+            class="avatar-uploader"
+            action=""
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import companyInfoApi from "@/api/base/companyInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        name: [
+          { required: true, message: "公司名称不能为空", trigger: "blur" }
+        ]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      imageUrl: ""
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function() {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return companyInfoApi.add(self.formModel);
+            } else {
+              return companyInfoApi.update(self.formModel);
+            }
+          })().then(function(response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+    handleAvatarSuccess(res, file) {
+      this.imageUrl = URL.createObjectURL(file.raw);
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是 JPG 格式!");
+      }
+      if (!isLt2M) {
+        this.$message.error("上传头像图片大小不能超过 2MB!");
+      }
+      return isJPG && isLt2M;
+    }
+  },
+  mounted: function() {
+    var self = this;
+    (function() {
+      if (self.businessKey.length == 0) {
+        return companyInfoApi.create();
+      } else {
+        return companyInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch(error => {
+        self.$message.error(error + "");
+      });
+  }
+};
+</script>
+<style>
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+</style>

src/views/base/companyInfo-list.vue

@@ -0,0 +1,275 @@
+<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="/companyInfo">企业管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+      <el-form-item label="公司名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </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>
+    </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-circle-plus"
+        :disabled="multipleSelection.length==0"
+        @click="handleBatchDelete"
+      >删除选中项</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" width="55"></el-table-column>
+      <el-table-column prop="sortNo" sort-by="sort_no" label="序号" sortable="custom" width="80"></el-table-column>
+      <el-table-column prop="name" sort-by="name_" label="公司名称" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="logo" sort-by="logo_" label="公司logo" sortable="custom" width="180">
+        <template slot-scope="{row}">
+          <a :href="row.logo" target="_blank">
+            <el-avatar
+              size="small"
+              :src="row.logo+'?x-oss-process=image/resize,m_lfit,h_100,w_100'"
+              :key="row.id"
+            ></el-avatar>
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" sort-by="remark_" label="备注" sortable="custom" width="350"></el-table-column>
+      <el-table-column label="操作">
+        <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>
+        </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>
+    <companyInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></companyInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import companyInfoDetail from "./companyInfo-detail";
+import companyInfoApi from "@/api/base/companyInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        name: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  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("name", self.queryModel.name);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      companyInfoApi
+        .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();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          companyInfoApi.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);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        companyInfoApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "companyInfo-detail": companyInfoDetail
+  }
+};
+</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/companyPosition-detail.vue

@@ -0,0 +1,160 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+    <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+		<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>
+		<el-form-item label="位置1名称" prop="position1Name">
+	    <el-input v-model="formModel.position1Name" placeholder="请输入位置1名称" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="位置2名称" prop="position2Name">
+	    <el-input v-model="formModel.position2Name" placeholder="请输入位置2名称" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="位置3名称" prop="position3Name">
+	    <el-input v-model="formModel.position3Name" placeholder="请输入位置3名称" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="位置4名称" prop="position4Name">
+	    <el-input v-model="formModel.position4Name" placeholder="请输入位置4名称" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="位置5名称" prop="position5Name">
+	    <el-input v-model="formModel.position5Name" placeholder="请输入位置5名称" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="创建人" prop="createBy">
+	    <el-input v-model="formModel.createBy" placeholder="请输入创建人" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="创建时间" prop="createTime">
+	    <el-input v-model="formModel.createTime" placeholder="请输入创建时间" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="更新人" prop="updateBy">
+	    <el-input v-model="formModel.updateBy" placeholder="请输入更新人" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="更新时间" prop="updateTime">
+	    <el-input v-model="formModel.updateTime" placeholder="请输入更新时间" style="width:300px"></el-input>
+	</el-form-item>
+	    </el-form>
+  </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import companyPositionApi from "@/api/base/companyPosition";
+
+export default {
+  props: ["businessKey","title"],
+  data() {
+    return {
+      ruleValidate: {
+                    id: [
+                { required: true, message: '不能为空', trigger: 'blur' }
+            ],                    companyId: [
+                { required: true, message: '企业编号不能为空', trigger: 'blur' }
+            ],                    position1Name: [
+                { required: true, message: '位置1名称不能为空', trigger: 'blur' }
+            ],                    position2Name: [
+                { required: true, message: '位置2名称不能为空', trigger: 'blur' }
+            ],                    position3Name: [
+                { required: true, message: '位置3名称不能为空', trigger: 'blur' }
+            ],                    position4Name: [
+                { required: true, message: '位置4名称不能为空', trigger: 'blur' }
+            ],                    position5Name: [
+                { required: true, message: '位置5名称不能为空', trigger: 'blur' }
+            ],                    createBy: [
+                { required: true, message: '创建人不能为空', trigger: 'blur' }
+            ],                    createTime: [
+                { required: true, message: '创建时间不能为空', trigger: 'blur' }
+            ],                    updateBy: [
+                { required: true, message: '更新人不能为空', trigger: 'blur' }
+            ],                    updateTime: [
+                { required: true, message: '更新时间不能为空', trigger: 'blur' }
+            ]              },
+      showDialog: true,
+      loading: false,
+      submitting: false
+    };
+  },
+  methods: {
+    closeDialog() {
+	this.$emit("close",false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function(){
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return companyPositionApi.add(self.formModel);
+            }
+            else{
+              return companyPositionApi.update(self.formModel);
+            }
+          })().then(function(response) {
+              var jsonData = response.data;
+
+              if (jsonData.result) {
+                self.$message({
+                  message: "保存成功!",
+                  type: "success"
+                });
+
+                self.$emit("close",true);
+              } else {
+                self.$message({
+                  message: jsonData.message + "",
+                  type: "warning"
+                });
+
+                self.$emit("close",false);
+              }
+            });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+
+    (function(){
+      if(self.businessKey.length==0){
+        return companyPositionApi.create()
+      }
+      else{
+        return companyPositionApi.edit(self.menuId)
+      }
+    })().then(response => {
+      var jsonData = response.data;
+      self.loading = false;
+
+      if (jsonData.result) {
+        self.formModel = jsonData.data;
+      } else {
+        self.$message.error(jsonData.message + "");
+      }
+    }).catch(error => {
+      self.$message.error(error + "");
+    });
+  }
+};
+</script>

src/views/base/companyPosition-list.vue

@@ -0,0 +1,317 @@
+<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="/companyPosition">companyPosition管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要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>
+        <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>
+    </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-circle-plus"
+        :disabled="multipleSelection.length==0"
+        @click="handleBatchDelete"
+      >删除选中项</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" 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 label="操作">
+        <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>
+        </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>
+	<companyPosition-detail
+	v-if="showModal"
+	:businessKey="businessKey"
+	:title="modalTitle"
+	@close="onDetailModalClose"
+	></companyPosition-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CompanyPositionDetail from "./companyPosition-detail";
+import companyPositionApi from "@/api/base/companyPosition";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+	  queryModel:{
+				"id":""
+		,				"companyId":""
+		,				"position1Name":""
+		,				"position2Name":""
+		,				"position3Name":""
+		,				"position4Name":""
+		,				"position5Name":""
+		,				"createBy":""
+		,				"createTime":""
+		,				"updateBy":""
+		,				"updateTime":""
+					  },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],      
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  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("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);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      companyPositionApi.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();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      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);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        companyPositionApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if(refreshed){
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "companyPosition-detail": CompanyPositionDetail
+  }
+};
+</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/deviceInfo-detail.vue

@@ -0,0 +1,197 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="ID" prop="id">
+          <el-input v-model="formModel.id" placeholder="请输入ID" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="表头" prop="header">
+          <el-input v-model="formModel.header" placeholder="请输入表头" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="设备编号" prop="deviceNo">
+          <el-input v-model="formModel.deviceNo" placeholder="请输入设备编号" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="设备别名" prop="aliasName">
+          <el-input v-model="formModel.aliasName" placeholder="请输入设备别名" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="单元楼栋" prop="address">
+          <el-input v-model="formModel.address" placeholder="请输入单元楼栋" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="运行状态（是否在线）" prop="isOnline">
+          <el-input v-model="formModel.isOnline" placeholder="请输入运行状态（是否在线）" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="开锁密码" prop="unlockPassword">
+          <el-input v-model="formModel.unlockPassword" placeholder="请输入开锁密码" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="二维码地址" prop="codeAddress">
+          <el-input v-model="formModel.codeAddress" placeholder="请输入二维码地址" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="ip地址" prop="ipAddress">
+          <el-input v-model="formModel.ipAddress" placeholder="请输入ip地址" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="端口" prop="port">
+          <el-input v-model="formModel.port" placeholder="请输入端口" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-input v-model="formModel.type" placeholder="请输入类型" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="delFlag">
+          <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="创建人" prop="createBy">
+          <el-input v-model="formModel.createBy" placeholder="请输入创建人" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-input v-model="formModel.createTime" placeholder="请输入创建时间" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="更新人" prop="updateBy">
+          <el-input v-model="formModel.updateBy" placeholder="请输入更新人" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updateTime">
+          <el-input v-model="formModel.updateTime" placeholder="请输入更新时间" style="width:300px"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import deviceInfoApi from "@/api/base/deviceInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      ruleValidate: {
+        id: [{ required: true, message: "ID不能为空", trigger: "blur" }],
+        header: [{ required: true, message: "表头不能为空", trigger: "blur" }],
+        deviceNo: [
+          { required: true, message: "设备编号不能为空", trigger: "blur" }
+        ],
+        aliasName: [
+          { required: true, message: "设备别名不能为空", trigger: "blur" }
+        ],
+        address: [
+          { required: true, message: "单元楼栋不能为空", trigger: "blur" }
+        ],
+        isOnline: [
+          {
+            required: true,
+            message: "运行状态（是否在线）不能为空",
+            trigger: "blur"
+          }
+        ],
+        unlockPassword: [
+          { required: true, message: "开锁密码不能为空", trigger: "blur" }
+        ],
+        codeAddress: [
+          { required: true, message: "二维码地址不能为空", trigger: "blur" }
+        ],
+        ipAddress: [
+          { required: true, message: "ip地址不能为空", trigger: "blur" }
+        ],
+        port: [{ required: true, message: "端口不能为空", trigger: "blur" }],
+        type: [{ required: true, message: "类型不能为空", trigger: "blur" }],
+        delFlag: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" }
+        ],
+        createBy: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        updateBy: [
+          { required: true, message: "更新人不能为空", trigger: "blur" }
+        ],
+        updateTime: [
+          { required: true, message: "更新时间不能为空", trigger: "blur" }
+        ]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function() {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return deviceInfoApi.add(self.formModel);
+            } else {
+              return deviceInfoApi.update(self.formModel);
+            }
+          })().then(function(response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+
+    (function() {
+      if (self.businessKey.length == 0) {
+        return deviceInfoApi.create();
+      } else {
+        return deviceInfoApi.edit(self.menuId);
+      }
+    })()
+      .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch(error => {
+        self.$message.error(error + "");
+      });
+  }
+};
+</script>

src/views/base/deviceInfo-list.vue

@@ -0,0 +1,403 @@
+<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="/deviceInfo">deviceInfo管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+      <el-form-item label="设备编号" prop="deviceNo">
+        <el-input type="text" size="mini" v-model="queryModel.deviceNo"></el-input>
+      </el-form-item>
+      <el-form-item label="设备别名" prop="aliasName">
+        <el-input type="text" size="mini" v-model="queryModel.aliasName"></el-input>
+      </el-form-item>
+      <el-form-item label="单元楼栋" prop="address">
+        <el-input type="text" size="mini" v-model="queryModel.address"></el-input>
+      </el-form-item>
+      <el-form-item label="运行状态（是否在线）" prop="isOnline">
+        <el-input type="text" size="mini" v-model="queryModel.isOnline"></el-input>
+      </el-form-item>
+      <el-form-item label="开锁密码" prop="unlockPassword">
+        <el-input type="text" size="mini" v-model="queryModel.unlockPassword"></el-input>
+      </el-form-item>
+      <el-form-item label="二维码地址" prop="codeAddress">
+        <el-input type="text" size="mini" v-model="queryModel.codeAddress"></el-input>
+      </el-form-item>
+      <el-form-item label="ip地址" prop="ipAddress">
+        <el-input type="text" size="mini" v-model="queryModel.ipAddress"></el-input>
+      </el-form-item>
+      <el-form-item label="端口" prop="port">
+        <el-input type="text" size="mini" v-model="queryModel.port"></el-input>
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-input type="text" size="mini" v-model="queryModel.type"></el-input>
+      </el-form-item>
+      <el-form-item label="是否删除" prop="delFlag">
+        <el-input type="text" size="mini" v-model="queryModel.delFlag"></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"
+          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>
+    </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-circle-plus"
+        :disabled="multipleSelection.length==0"
+        @click="handleBatchDelete"
+      >删除选中项</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" width="55"></el-table-column>
+      <el-table-column prop="id" sort-by="id_" label="ID" sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="deviceNo"
+        sort-by="device_no"
+        label="设备编号"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="aliasName"
+        sort-by="alias_name"
+        label="设备别名"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="address" sort-by="address_" label="单元楼栋" sortable="custom" width="180"></el-table-column>
+      <el-table-column
+        prop="isOnline"
+        sort-by="is_online"
+        label="运行状态（是否在线）"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="unlockPassword"
+        sort-by="unlock_password"
+        label="开锁密码"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="codeAddress"
+        sort-by="code_address"
+        label="二维码地址"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="ipAddress"
+        sort-by="ip_address"
+        label="ip地址"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="port" sort-by="port_" label="端口" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="type" sort-by="type_" label="类型" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="delFlag" sort-by="del_flag" label="是否删除" 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>
+          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        </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>
+    <deviceInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></deviceInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import DeviceInfoDetail from "./deviceInfo-detail";
+import deviceInfoApi from "@/api/base/deviceInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        deviceNo: "",
+        aliasName: "",
+        address: "",
+        isOnline: "",
+        unlockPassword: "",
+        codeAddress: "",
+        ipAddress: "",
+        port: "",
+        type: "",
+        delFlag: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  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("id", self.queryModel.id);
+      formData.append("deviceNo", self.queryModel.deviceNo);
+      formData.append("aliasName", self.queryModel.aliasName);
+      formData.append("address", self.queryModel.address);
+      formData.append("isOnline", self.queryModel.isOnline);
+      formData.append("unlockPassword", self.queryModel.unlockPassword);
+      formData.append("codeAddress", self.queryModel.codeAddress);
+      formData.append("ipAddress", self.queryModel.ipAddress);
+      formData.append("port", self.queryModel.port);
+      formData.append("type", self.queryModel.type);
+      formData.append("delFlag", self.queryModel.delFlag);
+      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);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      deviceInfoApi
+        .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();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          deviceInfoApi.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);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        deviceInfoApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+  components: {
+    "deviceInfo-detail": DeviceInfoDetail
+  }
+};
+</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/personDeviceRelation-detail.vue

@@ -0,0 +1,145 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+    <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+		<el-form-item label="ID" prop="id">
+	    <el-input v-model="formModel.id" placeholder="请输入ID" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="设备ID" prop="deviceId">
+	    <el-input v-model="formModel.deviceId" placeholder="请输入设备ID" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="人员ID" prop="personId">
+	    <el-input v-model="formModel.personId" placeholder="请输入人员ID" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="是否删除" prop="delFlag">
+	    <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="创建人" prop="createBy">
+	    <el-input v-model="formModel.createBy" placeholder="请输入创建人" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="创建时间" prop="createTime">
+	    <el-input v-model="formModel.createTime" placeholder="请输入创建时间" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="更新人" prop="updateBy">
+	    <el-input v-model="formModel.updateBy" placeholder="请输入更新人" style="width:300px"></el-input>
+	</el-form-item>
+		<el-form-item label="更新时间" prop="updateTime">
+	    <el-input v-model="formModel.updateTime" placeholder="请输入更新时间" style="width:300px"></el-input>
+	</el-form-item>
+	    </el-form>
+  </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import personDeviceRelationApi from "@/api/base/personDeviceRelation";
+
+export default {
+  props: ["businessKey","title"],
+  data() {
+    return {
+      ruleValidate: {
+                    id: [
+                { required: true, message: 'ID不能为空', trigger: 'blur' }
+            ],                    deviceId: [
+                { required: true, message: '设备ID不能为空', trigger: 'blur' }
+            ],                    personId: [
+                { required: true, message: '人员ID不能为空', trigger: 'blur' }
+            ],                    delFlag: [
+                { required: true, message: '是否删除不能为空', trigger: 'blur' }
+            ],                    createBy: [
+                { required: true, message: '创建人不能为空', trigger: 'blur' }
+            ],                    createTime: [
+                { required: true, message: '创建时间不能为空', trigger: 'blur' }
+            ],                    updateBy: [
+                { required: true, message: '更新人不能为空', trigger: 'blur' }
+            ],                    updateTime: [
+                { required: true, message: '更新时间不能为空', trigger: 'blur' }
+            ]              },
+      showDialog: true,
+      loading: false,
+      submitting: false
+    };
+  },
+  methods: {
+    closeDialog() {
+	this.$emit("close",false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function(){
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return personDeviceRelationApi.add(self.formModel);
+            }
+            else{
+              return personDeviceRelationApi.update(self.formModel);
+            }
+          })().then(function(response) {
+              var jsonData = response.data;
+
+              if (jsonData.result) {
+                self.$message({
+                  message: "保存成功!",
+                  type: "success"
+                });
+
+                self.$emit("close",true);
+              } else {
+                self.$message({
+                  message: jsonData.message + "",
+                  type: "warning"
+                });
+
+                self.$emit("close",false);
+              }
+            });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+
+    (function(){
+      if(self.businessKey.length==0){
+        return personDeviceRelationApi.create()
+      }
+      else{
+        return personDeviceRelationApi.edit(self.menuId)
+      }
+    })().then(response => {
+      var jsonData = response.data;
+      self.loading = false;
+
+      if (jsonData.result) {
+        self.formModel = jsonData.data;
+      } else {
+        self.$message.error(jsonData.message + "");
+      }
+    }).catch(error => {
+      self.$message.error(error + "");
+    });
+  }
+};
+</script>

src/views/base/personDeviceRelation-list.vue

@@ -0,0 +1,299 @@
+<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="/personDeviceRelation">personDeviceRelation管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+<el-form-item label="ID" prop="id">
+    <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
+</el-form-item>
+<el-form-item label="设备ID" prop="deviceId">
+    <el-input type="text" size="mini" v-model="queryModel.deviceId"></el-input>
+</el-form-item>
+<el-form-item label="人员ID" prop="personId">
+    <el-input type="text" size="mini" v-model="queryModel.personId"></el-input>
+</el-form-item>
+<el-form-item label="是否删除" prop="delFlag">
+    <el-input type="text" size="mini" v-model="queryModel.delFlag"></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"
+          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>
+    </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-circle-plus"
+        :disabled="multipleSelection.length==0"
+        @click="handleBatchDelete"
+      >删除选中项</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" width="55"></el-table-column>
+		<el-table-column prop="id" sort-by="id_" label="ID" sortable="custom" width="180"></el-table-column>
+		<el-table-column prop="deviceId" sort-by="device_id" label="设备ID" sortable="custom" width="180"></el-table-column>
+		<el-table-column prop="personId" sort-by="person_id" label="人员ID" sortable="custom" width="180"></el-table-column>
+		<el-table-column prop="delFlag" sort-by="del_flag" label="是否删除" 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>
+          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        </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>
+</template>
+<script>
+import Constant from "@/constant";
+import PersonDeviceRelationDetail from "./personDeviceRelation-detail";
+import personDeviceRelationApi from "@/api/base/personDeviceRelation";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+	  queryModel:{
+				"id":""
+		,				"deviceId":""
+		,				"personId":""
+		,				"delFlag":""
+		,				"createBy":""
+		,				"createTime":""
+		,				"updateBy":""
+		,				"updateTime":""
+					  },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],      
+      showModal: false,
+      modalTitle: "",
+      businessKey: ""
+    };
+  },
+  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("id",self.queryModel.id);
+formData.append("deviceId",self.queryModel.deviceId);
+formData.append("personId",self.queryModel.personId);
+formData.append("delFlag",self.queryModel.delFlag);
+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);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      personDeviceRelationApi.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();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self.$confirm("是否确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        personDeviceRelationApi.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);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        personDeviceRelationApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    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/personInfo-detail.vue

@@ -0,0 +1,156 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="企业编号" prop="companyId">
+          <el-select v-model="formModel.companyId" filterable placeholder="请选择" style="width:300px">
+            <el-option
+              v-for="company in companyResult"
+              :key="company.id"
+              :label="company.name"
+              :value="company.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="formModel.name" placeholder="请输入姓名" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="formModel.phone" placeholder="请输入手机号" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="身份证" prop="idCard">
+          <el-input v-model="formModel.idCard" placeholder="请输入身份证" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="开放权限">
+            <el-checkbox v-model="formModel.faceEnabled">人脸识别</el-checkbox>
+            <el-checkbox v-model="formModel.cardEnabled">门禁卡</el-checkbox>
+            <el-checkbox v-model="formModel.appEnabled">手机开锁</el-checkbox>
+            <el-checkbox v-model="formModel.guestEnabled">访客权限</el-checkbox>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import personInfoApi from "@/api/base/personInfo";
+
+export default {
+  props: ["businessKey", "title", "companyResult"],
+  data() {
+    let checkIdCard = (rule, value, callback) => {
+      var identNumber = value;
+      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identNumber)) {
+        return callback(new Error("格式错误"));
+      } else if (!/(^\d{15}$)|(^\d{17}([0-9]|X)$)/.test(identNumber)) {
+        //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X。
+        return callback(new Error("格式错误"));
+      } else {
+        return callback();
+      }
+    };
+    return {
+      formModel: {},
+      ruleValidate: {
+        companyId: [
+          { required: true, message: "企业不能为空", trigger: "blur" }
+        ],
+        name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
+        phone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
+        idCard: [
+          { required: true, message: "身份证不能为空", trigger: "blur" },
+          {
+            validator: checkIdCard,
+            trigger: "blur"
+          }
+        ]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      checkList:[],
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function() {
+            var id = self.formModel.id;
+            console.log(self.checkList);
+
+            if (id == null || id.length == 0) {
+              return personInfoApi.add(self.formModel);
+            } else {
+              return personInfoApi.update(self.formModel);
+            }
+          })().then(function(response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    }
+  },
+  mounted: function() {
+    var self = this;
+
+    (function() {
+      if (self.businessKey.length == 0) {
+        return personInfoApi.create();
+      } else {
+        return personInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch(error => {
+        self.$message.error(error + "");
+      });
+  }
+};
+</script>

src/views/base/personInfo-list.vue

@@ -0,0 +1,352 @@
+<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="/personInfo">人员管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+      <el-form-item label="所属企业" prop="companyId">
+        <el-select
+          v-model="queryModel.companyId"
+          size="mini"
+          filterable
+          placeholder="请选择"
+          style="width:300px"
+        >
+          <el-option
+            v-for="company in companyResult"
+            :key="company.id"
+            :label="company.name"
+            :value="company.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item label="手机号" prop="phone">
+        <el-input type="text" size="mini" v-model="queryModel.phone"></el-input>
+      </el-form-item>
+      <el-form-item label="身份证" prop="idCard">
+        <el-input type="text" size="mini" v-model="queryModel.idCard"></el-input>
+      </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>
+    </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-circle-plus"
+        :disabled="multipleSelection.length==0"
+        @click="handleBatchDelete"
+      >删除选中项</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-circle-plus">导入</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" width="55"></el-table-column>
+      <el-table-column prop="companyId" label="企业编号" width="180"></el-table-column>
+      <el-table-column prop="name" label="姓名" width="150"></el-table-column>
+      <el-table-column prop="idCard" label="身份证" width="200"></el-table-column>
+      <el-table-column prop="phone" label="手机号" width="180"></el-table-column>
+      <el-table-column prop="openId" label="是否绑定公众号" width="180"></el-table-column>
+      <el-table-column label="人脸授权">
+        <template slot-scope="{row}">
+          <el-switch v-model="row.faceEnabled" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="刷卡授权">
+        <template slot-scope="{row}">
+          <el-switch v-model="row.cardEnabled" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="手机授权">
+        <template slot-scope="{row}">
+          <el-switch v-model="row.appEnabled" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="密码">
+        <template slot-scope="{row}">
+          <el-switch v-model="row.passwordEnabled" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="访客授权">
+        <template slot-scope="{row}">
+          <el-switch v-model="row.guestEnabled" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column prop="position1" label="位置1" width="180"></el-table-column>
+      <el-table-column prop="position2" label="位置2" width="180"></el-table-column>
+      <el-table-column prop="position3" label="位置3" width="180"></el-table-column>
+      <el-table-column prop="position4" label="位置4" width="180"></el-table-column>
+      <el-table-column prop="position5" label="位置5" width="180"></el-table-column>
+      <el-table-column label="操作" width="450" 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-button size="mini" type="success" @click="bindDevice(row)">绑定设备</el-button>
+          <el-button size="mini" type="success" @click="uploadData(row)">上传数据</el-button>
+          <el-button size="mini" type="info" @click="showBind(row)">已绑定设备</el-button>
+        </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>
+    <personInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      :companyResult="companyResult"
+      @close="onDetailModalClose"
+    ></personInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import PersonInfoDetail from "./personInfo-detail";
+import personInfoApi from "@/api/base/personInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyId: "",
+        name: "",
+        phone: "",
+        idCard: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyResult: ""
+    };
+  },
+  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("companyId", self.queryModel.companyId);
+      formData.append("name", self.queryModel.name);
+      formData.append("phone", self.queryModel.phone);
+      formData.append("idCard", self.queryModel.idCard);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      personInfoApi
+        .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();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          personInfoApi.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);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        personInfoApi.batchRemove(idList).then(function(response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    bindDevice(record){
+      //绑定设备
+
+    },
+    uploadData(record){
+      //上传数据
+
+    },
+    showBind(record){
+      //展示绑定设备
+
+    }
+
+  },
+  async mounted() {
+    var self = this;
+    this.changePage(1);
+
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
+  components: {
+    "personInfo-detail": PersonInfoDetail
+  }
+};
+</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/sys/user-detail.vue

@@ -27,9 +27,24 @@
             style="width:300px"
           ></el-input>
         </el-form-item>
+        <el-form-item label="所属企业" prop="companyId">
+          <el-select v-model="formModel.companyId" filterable placeholder="请选择" style="width:300px">
+            <el-option
+              v-for="company in companyResult"
+              :key="company.id"
+              :label="company.name"
+              :value="company.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="分配角色" prop="roles">
-          <el-select v-model="formModel.roles" 
-              filterable multiple placeholder="请选择" style="width:300px">
+          <el-select
+            v-model="formModel.roles"
+            filterable
+            multiple
+            placeholder="请选择"
+            style="width:300px"
+          >
             <el-option
               v-for="role in roleList"
               :key="role.id"
@@ -54,7 +69,7 @@ import userApi from "@/api/sys/user";
 import roleApi from "@/api/sys/role";
 
 export default {
-  props: ["businessKey", "title"],
+  props: ["businessKey", "title", "companyResult"],
   data() {
     return {
       showPwd: true,
@@ -65,6 +80,9 @@ export default {
         realName: [
           { required: true, message: "真实名称不能为空", trigger: "blur" }
         ],
+        companyId: [
+          { required: true, message: "企业不能为空", trigger: "blur" }
+        ],
         password: [
           { required: true, message: "密码不能为空", trigger: "blur" }
         ],
@@ -105,14 +123,14 @@ export default {
                 type: "success"
               });
 
-              this.$emit("close", true);
+              self.$emit("close",true);
             } else {
               self.$message({
                 message: jsonData.message + "",
                 type: "warning"
               });
 
-              this.$emit("close", false);
+              self.$emit("close", false);
             }
           });
         }

src/views/sys/user-list.vue

@@ -20,6 +20,22 @@
       <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-select
+          v-model="queryModel.companyId"
+          size="mini"
+          filterable
+          placeholder="请选择"
+          style="width:300px"
+        >
+          <el-option
+            v-for="company in companyResult"
+            :key="company.id"
+            :label="company.name"
+            :value="company.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -72,6 +88,13 @@
         sortable="custom"
         width="180"
       ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        sort-by="company_name"
+        label="所属企业"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
       <el-table-column
         prop="createTime"
         sort-by="create_time"
@@ -105,6 +128,7 @@
       v-if="showModal"
       ref="userDetail"
       :businessKey="businessKey"
+      :companyResult="companyResult"
       :title="modalTitle"
       @close="onDetailModalClose"
     ></user-detail>
@@ -114,6 +138,7 @@
 import Constant from "@/constant";
 import UserDetail from "./user-detail";
 import userApi from "@/api/sys/user";
+import companyInfoApi from "@/api/base/companyInfo";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -124,7 +149,8 @@ export default {
     return {
       queryModel: {
         userName: "",
-        realName: ""
+        realName: "",
+        companyId:""
       },
       loading: false,
       tableData: [],
@@ -138,7 +164,8 @@ export default {
       multipleSelection: [],
       modalTitle: "",      
       businessKey: "",
-      showModal: false
+      showModal: false,
+      companyResult:""
     };
   },
   methods: {
@@ -155,6 +182,7 @@ export default {
 
       formData.append("userName", self.queryModel.userName);
       formData.append("realName", self.queryModel.realName);
+      formData.append("companyId", self.queryModel.companyId);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -276,7 +304,15 @@ export default {
     }
   },
   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: {
     "user-detail": UserDetail