基础信息管理功能

src/api/base/fileUpload.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function uploadPicture(formData){
+  return request.post(constant.serverUrl + "uploadPicture",formData);
+}
+
+export default {
+  uploadPicture
+}

src/api/base/personDeviceLog.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/personDeviceLog/pageList", formData);
+}
+
+export default {
+  pageList
+}

src/api/base/personDeviceRelation.js

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

src/api/base/personInfo.js

@@ -42,10 +42,10 @@ function batchRemove(idList) {
   });
 }
 
-function exportXls() {
+function exportXls(exportXls) {
   //导出xls
-  //return request.post(constant.serverUrl + "/base/personInfo/exportXls");
-  window.open(constant.serverUrl + "/base/personInfo/exportXls?token=" + getToken());
+  return request.post(constant.serverUrl + "/base/personInfo/exportXls",exportXls);
+  //window.open(constant.serverUrl + "/base/personInfo/exportXls?token=" + getToken());
 }
 
 function enabledFace(formData) {

src/api/sys/dataDictionary-test.js

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

src/api/sys/dataDictionary.js

@@ -49,6 +49,10 @@ function queryChildren(formData) {
   return request.post(constant.serverUrl + "/sys/dataDictionary/queryChildren", formData);
 }
 
+function findByCatalogName(formData){
+  return request.post(constant.serverUrl + "/sys/dataDictionary/findByCatalogName", formData);
+}
+
 export default {
-  pageList, create, edit, add, update, remove, batchRemove,query,queryChildren
+  pageList, create, edit, add, update, remove, batchRemove,query,queryChildren,findByCatalogName
 }

src/routers/modules/base.js

@@ -210,6 +210,18 @@ var routers = [
                 meta: {
                         roles: ["admin"]
                 }
+        },
+        {
+                //台账信息
+                path: '/base/personDeviceLog/list',
+                name: 'base-personDeviceLog-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/personDeviceLog-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
         }
 ]
 

src/views/base/companyInfo-detail.vue

@@ -14,42 +14,65 @@
   >
     <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="position1">
-          <el-input v-model="formModel.position1" placeholder="请输入一级位置" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="二级位置" prop="position2">
-          <el-input v-model="formModel.position2" placeholder="请输入二级位置" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="三级位置" prop="position3">
-          <el-input v-model="formModel.position3" placeholder="请输入三级位置" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="四级位置" prop="position4">
-          <el-input v-model="formModel.position4" placeholder="请输入四级位置" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="五级位置" prop="position5">
-          <el-input v-model="formModel.position5" 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-row>
+          <el-col :span="12">
+            <el-form-item label="公司名称" prop="name">
+              <el-input v-model="formModel.name" placeholder="请输入公司名称" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="序号" prop="sortNo">
+              <el-input v-model="formModel.sortNo" placeholder="请输入序号" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="formModel.remark" :rows="2" placeholder="请输入备注"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="一级位置" prop="position1Name">
+              <el-input v-model="formModel.position1Name" placeholder="请输入一级位置" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="二级位置" prop="position2Name">
+              <el-input v-model="formModel.position2Name" placeholder="请输入二级位置" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="三级位置" prop="position3Name">
+              <el-input v-model="formModel.position3Name" placeholder="请输入三级位置" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="四级位置" prop="position4Name">
+              <el-input v-model="formModel.position4Name" placeholder="请输入四级位置" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="五级位置" prop="position5Name">
+              <el-input v-model="formModel.position5Name" placeholder="请输入五级位置" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="公司logo" prop="logo">
+              <el-upload
+                class="avatar-uploader"
+                name="photoFile"
+                :action="uploadUrl"
+                :show-file-list="false"
+                :headers="headers"
+                :data="uploadData"
+                :on-success="handleAvatarSuccess"
+                :before-upload="beforeAvatarUpload"
+              >
+                <img v-if="fileUrl" :src="fileUrl" class="avatar" />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -61,6 +84,7 @@
 <script>
 import Constant from "@/constant";
 import companyInfoApi from "@/api/base/companyInfo";
+import { getToken } from "@/utils/auth"; // get token from cookie
 
 export default {
   props: ["businessKey", "title"],
@@ -73,7 +97,15 @@ export default {
       showDialog: true,
       loading: false,
       submitting: false,
-      imageUrl: ""
+      //上传地址
+      uploadUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "companyInfo"
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken()
+      }
     };
   },
   methods: {
@@ -87,7 +119,6 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-
             if (id == null || id.length == 0) {
               return companyInfoApi.add(self.formModel);
             } else {
@@ -116,7 +147,10 @@ export default {
       });
     },
     handleAvatarSuccess(res, file) {
-      this.imageUrl = URL.createObjectURL(file.raw);
+      var self = this;
+      self.formModel.logo = res.data;
+      self.fileUrl =
+        res.data + "?x-oss-process=image/resize,m_lfit,h_400,w_400";
     },
     beforeAvatarUpload(file) {
       const isJPG = file.type === "image/jpeg";
@@ -146,6 +180,11 @@ export default {
 
         if (jsonData.result) {
           self.formModel = jsonData.data;
+          let logo = self.formModel.logo;
+          if (logo != null) {
+            self.fileUrl =
+              logo + "?x-oss-process=image/resize,m_lfit,h_400,w_400";
+          }
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/base/companyInfo-list.vue

@@ -55,13 +55,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="name" label="公司名称" width="180"></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="logo" sort-by="logo_" label="公司logo" width="180">
+      <el-table-column prop="logo" label="公司logo" width="=80">
         <template slot-scope="{row}">
           <a :href="row.logo" target="_blank">
             <el-avatar
@@ -72,6 +66,12 @@
           </a>
         </template>
       </el-table-column>
+      <el-table-column prop="name" label="公司名称" width="180"></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="备注" width="350"></el-table-column>
       <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="{row}">
@@ -106,7 +106,6 @@ import "nprogress/nprogress.css"; // progress bar style
 export default {
   data() {
     var self = this;
-
     return {
       queryModel: {
         name: ""

src/views/base/deviceInfo-detail.vue

@@ -14,54 +14,62 @@
   >
     <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-row>
+          <el-col :span="12">
+            <el-form-item label="设备编号" prop="deviceNo">
+              <el-input v-model="formModel.deviceNo" placeholder="请输入设备编号" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备别名" prop="aliasName">
+              <el-input v-model="formModel.aliasName" placeholder="请输入设备别名" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="运行状态" prop="isOnline">
+              <el-select v-model="formModel.isOnline" filterable style="width:200px">
+                <el-option :key="true" label="在线" :value="true"></el-option>
+                <el-option :key="false" label="离线" :value="false"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开锁密码" prop="unlockPassword">
+              <el-input
+                v-model="formModel.unlockPassword"
+                placeholder="请输入开锁密码"
+                style="width:200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="二维码地址" prop="codeAddress">
+              <el-input v-model="formModel.codeAddress" placeholder="请输入二维码地址" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="ip地址" prop="ipAddress">
+              <el-input v-model="formModel.ipAddress" placeholder="请输入ip地址" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="端口" prop="port">
+              <el-input v-model="formModel.port" placeholder="请输入端口" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="类型" prop="type">
+              <el-select v-model="formModel.type" filterable placeholder="请选择" style="width:200px">
+                <el-option
+                  v-for="result in typeData"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -75,25 +83,18 @@ import Constant from "@/constant";
 import deviceInfoApi from "@/api/base/deviceInfo";
 
 export default {
-  props: ["businessKey", "title"],
+  props: ["businessKey", "title", "typeData"],
   data() {
     return {
+      formModel: {},
       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: "运行状态（是否在线）不能为空",
+            message: "运行状态不能为空",
             trigger: "blur"
           }
         ],
@@ -107,22 +108,7 @@ export default {
           { 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" }
-        ]
+        type: [{ required: true, message: "类型不能为空", trigger: "blur" }]
       },
       showDialog: true,
       loading: false,
@@ -171,12 +157,11 @@ export default {
   },
   mounted: function() {
     var self = this;
-
     (function() {
       if (self.businessKey.length == 0) {
         return deviceInfoApi.create();
       } else {
-        return deviceInfoApi.edit(self.menuId);
+        return deviceInfoApi.edit(self.businessKey);
       }
     })()
       .then(response => {

src/views/base/deviceInfo-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/deviceInfo">deviceInfo管理</a>
+        <a href="/deviceInfo">设备管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -20,27 +20,6 @@
       <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>
         <el-button
           type="primary"
@@ -78,84 +57,20 @@
       @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="操作">
+      <el-table-column prop="deviceNo" label="设备编号" width="250"></el-table-column>
+      <el-table-column prop="aliasName" label="设备别名" width="180"></el-table-column>
+      <el-table-column prop="isOnlineN" label="运行状态" width="180"></el-table-column>
+      <el-table-column prop="unlockPassword" label="开锁密码" width="180"></el-table-column>
+      <el-table-column prop="codeAddress" label="二维码地址" width="180"></el-table-column>
+      <el-table-column prop="ipAddress" label="ip地址" width="180"></el-table-column>
+      <el-table-column prop="port" label="端口" width="180"></el-table-column>
+      <el-table-column prop="typeN" label="类型" 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="primary" @click="handleRestart(row)">重启</el-button>
+          <el-button size="mini" type="primary" @click="handleClear(row)">清除人脸数据</el-button>
+          <el-button size="mini" type="primary" @click="handleQRcode(row)">二维码地址</el-button>
           <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
@@ -172,6 +87,7 @@
       v-if="showModal"
       :businessKey="businessKey"
       :title="modalTitle"
+      :typeData="typeData"
       @close="onDetailModalClose"
     ></deviceInfo-detail>
   </div>
@@ -180,6 +96,7 @@
 import Constant from "@/constant";
 import DeviceInfoDetail from "./deviceInfo-detail";
 import deviceInfoApi from "@/api/base/deviceInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -189,21 +106,8 @@ export default {
 
     return {
       queryModel: {
-        id: "",
         deviceNo: "",
-        aliasName: "",
-        address: "",
-        isOnline: "",
-        unlockPassword: "",
-        codeAddress: "",
-        ipAddress: "",
-        port: "",
-        type: "",
-        delFlag: "",
-        createBy: "",
-        createTime: "",
-        updateBy: "",
-        updateTime: ""
+        aliasName: ""
       },
       loading: false,
       tableData: [],
@@ -217,9 +121,18 @@ export default {
       multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      businessKey: "",
+      typeData: []
     };
   },
+  created() {
+    var formData = new FormData();
+    formData.append("catalogName", "设备类型");
+    return dataDictionaryApi.findByCatalogName(formData).then(response => {
+      var jsonData = response.data;
+      this.typeData = jsonData.data;
+    });
+  },
   methods: {
     changePage(pageIndex) {
       var self = this;
@@ -232,21 +145,8 @@ export default {
       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);
@@ -356,6 +256,15 @@ export default {
       if (refreshed) {
         this.changePage(this.pageIndex);
       }
+    },
+    handleRestart(record) {
+      //重启
+    },
+    handleClear(record) {
+      //清楚人脸数据
+    },
+    handleQRcode(record) {
+      //二维码地址
     }
   },
   mounted: function() {

src/views/base/personDeviceLog-list.vue

@@ -0,0 +1,230 @@
+<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">
+      <el-form-item label="检测时间" prop="beginTime">
+        <el-date-picker
+          v-model="queryModel.timeRanges"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          size="mini" 
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="人员姓名" prop="personName">
+        <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
+      </el-form-item>
+      <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>
+        <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-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column prop="recordTime" label="记录时间" width="180"></el-table-column>
+      <el-table-column prop="faceImage" width="80">
+        <template slot-scope="{row}">
+          <a :href="row.faceImage" target="_blank">
+            <el-avatar
+              size="small"
+              :src="row.faceImage+'?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="person" label="人员姓名" width="120">
+        <template slot-scope="{row}">{{row.person == null ? "匿名用户" : row.person.name}}</template>
+      </el-table-column>
+      <el-table-column prop="temperature" label="测温度数" width="120"></el-table-column>
+      <!-- <el-table-column prop="matchStatus" label="匹配状态" width="180"></el-table-column> -->
+      <el-table-column prop="matchMsg" label="开门类型" width="150"></el-table-column>
+      <!-- <el-table-column prop="matchFaceId" label="匹配的人脸id" width="180"></el-table-column> -->
+      <el-table-column prop="position1" label="一级位置" width="150"></el-table-column>
+      <el-table-column prop="position2" label="二级位置" width="150"></el-table-column>
+      <el-table-column prop="position3" label="三级位置" width="150"></el-table-column>
+      <el-table-column prop="position4" label="四级位置" width="150"></el-table-column>
+      <el-table-column prop="position5" label="五级位置" width="150"></el-table-column>
+      <el-table-column prop="deviceNo" label="设备编号" width="220"></el-table-column>
+      <el-table-column prop="device" label="设备别称" width="220">
+        <template slot-scope="{row}">{{row.device == null ? "" : row.device.aliasName}}</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>
+  </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:""
+      },
+      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("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);
+
+      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();
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  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/personDeviceRelation-BoundList.vue

@@ -0,0 +1,254 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    title="查看绑定设备"
+    :modal-append-to-body="false"
+    :modal="false"
+    style="text-align:left;"
+    @close="closeDialog"
+    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"
+          @click="handleRemoveAll"
+        >解绑所有设备</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="deviceInfo.aliasName" label="设备名称" width="180"></el-table-column>
+        <el-table-column prop="personInfo.name" label="人员名称" width="180"></el-table-column>
+        <el-table-column prop="createTime" label="绑定时间" width="180"></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="{row}">
+            <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>
+  </el-dialog>
+</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 {
+  props: ["personId"],
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        deviceId: "",
+        personId: ""
+      },
+      loading: false,
+      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);
+    },
+    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("deviceId", self.queryModel.deviceId);
+      formData.append("personId", self.personId);
+
+      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();
+    },
+    handleDelete(record) {
+      var self = this;
+      self.loading = true;
+      this.$confirm("是否绑定？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          personDeviceRelationApi.remove(record.id).then(function(response) {
+            var jsonData = response.data;
+            self.loading = false;
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "解绑成功!"
+              });
+            }
+          });
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    handleRemoveAll() {
+      var self = this;
+      self.loading = true;
+
+      this.$confirm("是否绑定？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          var formData = new FormData();
+          formData.append("personId", self.personId);
+
+          personDeviceRelationApi
+            .unbindDevice(formData)
+            .then(function(response) {
+              var jsonData = response.data;
+              self.loading = false;
+              if (jsonData.result) {
+                self.changePage(self.pageIndex);
+
+                self.$message({
+                  type: "success",
+                  message: "解绑成功!"
+                });
+              } else {
+                self.$message({
+                  type: "error",
+                  message: jsonData.message
+                });
+              }
+            });
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    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/personDeviceRelation-detail.vue

@@ -13,34 +13,34 @@
     @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-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>
@@ -51,27 +51,33 @@ import Constant from "@/constant";
 import personDeviceRelationApi from "@/api/base/personDeviceRelation";
 
 export default {
-  props: ["businessKey","title"],
+  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' }
-            ]              },
+        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
@@ -79,41 +85,40 @@ export default {
   },
   methods: {
     closeDialog() {
-	this.$emit("close",false);
+      this.$emit("close", false);
     },
     handleSubmit() {
       var self = this;
 
       this.$refs["form"].validate(valid => {
         if (valid) {
-          (function(){
+          (function() {
             var id = self.formModel.id;
 
             if (id == null || id.length == 0) {
               return personDeviceRelationApi.add(self.formModel);
-            }
-            else{
+            } else {
               return personDeviceRelationApi.update(self.formModel);
             }
           })().then(function(response) {
-              var jsonData = response.data;
+            var jsonData = response.data;
 
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success"
-                });
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
 
-                self.$emit("close",true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning"
-                });
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
 
-                self.$emit("close",false);
-              }
-            });
+              self.$emit("close", false);
+            }
+          });
         }
       });
     }
@@ -121,25 +126,26 @@ export default {
   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;
+    (function() {
+      if (self.businessKey.length == 0) {
+        return personDeviceRelationApi.create();
       } else {
-        self.$message.error(jsonData.message + "");
+        return personDeviceRelationApi.edit(self.menuId);
       }
-    }).catch(error => {
-      self.$message.error(error + "");
-    });
+    })()
+      .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

@@ -1,110 +1,67 @@
 <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>
-    <!--
+  <el-dialog
+    :visible.sync="showDialog"
+    title="查看设备"
+    :modal-append-to-body="false"
+    :modal="false"
+    style="text-align:left;"
+    @close="closeDialog"
+    width="60%"
+  >
+    <div>
+      <!--
       要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-divider></el-divider>
+      <el-row class="button-group">
         <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>
+          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="deviceNo" label="设备编号" width="180"></el-table-column>
+        <el-table-column prop="aliasName" label="设备名称" width="180"></el-table-column>
+        <el-table-column prop="typeN" label="类型" width="120"></el-table-column>
+        <el-table-column prop="isBindPerson" label="绑定状态" width="120">
+          <template slot-scope="{row}">{{row.isBindPerson ? "已绑定" : "未绑定"}}</template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="{row}">
+            <span v-if="!row.isBindPerson">
+              <el-button size="mini" type="success" @click="handleBound(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";
@@ -114,20 +71,16 @@ import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
+  props: ["personId"],
   data() {
     var self = this;
 
     return {
-	  queryModel:{
-				"id":""
-		,				"deviceId":""
-		,				"personId":""
-		,				"delFlag":""
-		,				"createBy":""
-		,				"createTime":""
-		,				"updateBy":""
-		,				"updateTime":""
-					  },
+      formModel: {},
+      queryModel: {
+        deviceId: "",
+        personId: ""
+      },
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -137,17 +90,28 @@ export default {
       field: "",
       direction: "",
       pageSizeList: [10, 20, 30],
-      multipleSelection: [],      
+      multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      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.loading = true;
 
       self.pageIndex = pageIndex;
       var formData = new FormData();
@@ -155,14 +119,7 @@ export default {
       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);
+      formData.append("personId", self.personId);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -172,18 +129,20 @@ formData.append("updateTime",self.queryModel.updateTime);
         formData.append("direction", this.direction);
       }
 
-      personDeviceRelationApi.pageList(formData).then(function(response) {
-        self.loading = false;
+      personDeviceRelationApi
+        .isUnbindDeviceList(formData)
+        .then(function(response) {
+          self.loading = false;
+          var jsonData = response.data.data;
 
-        var jsonData = response.data.data;
-
-        self.tableData = jsonData.data;
-        self.totalPages = jsonData.totalPages;
-        self.totalElements = jsonData.recordsTotal;
-      }).catch((error)=>{
-        self.loading = false;
-        // self.$message.error(error + "");
-      });
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
     },
     pageSizeChange(pageSize) {
       this.pageSize = pageSize;
@@ -200,71 +159,89 @@ formData.append("updateTime",self.queryModel.updateTime);
     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) {
+    handleBound(record) {
       var self = this;
-
-      self.$confirm("是否确认删除?", "提示", {
+      self.loading = true;
+      this.$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);
+        type: "warning",
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          self.formModel.personId = self.personId;
+          self.formModel.deviceId = record.id;
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
+          return personDeviceRelationApi
+            .add(self.formModel)
+            .then(function(response) {
+              var jsonData = response.data;
+              self.changePage(self.pageIndex);
+              if (jsonData.result) {
+                self.$message({
+                  message: "绑定成功!",
+                  type: "success"
+                });
+              } else {
+                self.$message({
+                  message: jsonData.message + "",
+                  type: "warning"
+                });
+              }
             });
-          }
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
         });
-      });
     },
-    handleBatchDelete() {
+    handleBatchBound() {
       var self = this;
-
+      self.loading = true;
       var idList = this.multipleSelection.map(record => {
         return record.id;
       });
 
-      this.$confirm("是否确认删除选中项？", "提示", {
+      this.$confirm("是否绑定选中项？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        personDeviceRelationApi.batchRemove(idList).then(function(response) {
-          var jsonData = response.data;
+        type: "warning",
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          var formData = new FormData();
 
-          if (jsonData.result) {
-            self.changePage(self.pageIndex);
+          formData.append("personId", self.personId);
+          formData.append("devices", idList);
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
+          personDeviceRelationApi
+            .batchBindDevice(formData)
+            .then(function(response) {
+              var jsonData = response.data;
+              self.changePage(self.pageIndex);
+              if (jsonData.result) {
+                self.$message({
+                  type: "success",
+                  message: "绑定成功!"
+                });
+              } else {
+                self.$message({
+                  type: "error",
+                  message: jsonData.message
+                });
+              }
             });
-          }
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
         });
-      });
     },
     onDetailModalClose(refreshed) {
       //保存成功后回调
       this.showModal = false;
 
-      if(refreshed){
+      if (refreshed) {
         this.changePage(this.pageIndex);
       }
     }

src/views/base/personInfo-detail.vue

@@ -33,11 +33,42 @@
         <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="照片" prop="faceImageUrl">
+          <el-upload
+            class="avatar-uploader"
+            name="photoFile"
+            :action="uploadUrl"
+            :show-file-list="false"
+            :headers="headers"
+            :data="uploadData"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img v-if="fileUrl" :src="fileUrl" class="avatar" />
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </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-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-item :label="companyPosition1" prop="position1">
+          <el-input v-model="formModel.position1" placeholder="请输入一级位置" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item :label="companyPosition2" prop="position2">
+          <el-input v-model="formModel.position2" placeholder="请输入二级位置" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item :label="companyPosition3" prop="position3">
+          <el-input v-model="formModel.position3" placeholder="请输入三级位置" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item :label="companyPosition4" prop="position4">
+          <el-input v-model="formModel.position4" placeholder="请输入四级位置" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item :label="companyPosition5" prop="position5">
+          <el-input v-model="formModel.position5" placeholder="请输入五级位置" style="width:300px"></el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -50,9 +81,19 @@
 <script>
 import Constant from "@/constant";
 import personInfoApi from "@/api/base/personInfo";
+import { getToken } from "@/utils/auth"; // get token from cookie
 
 export default {
-  props: ["businessKey", "title", "companyResult"],
+  props: [
+    "businessKey",
+    "title",
+    "companyResult",
+    "companyPosition1",
+    "companyPosition2",
+    "companyPosition3",
+    "companyPosition4",
+    "companyPosition5"
+  ],
   data() {
     let checkIdCard = (rule, value, callback) => {
       var identNumber = value;
@@ -84,7 +125,16 @@ export default {
       showDialog: true,
       loading: false,
       submitting: false,
-      checkList:[],
+      checkList: [],
+      //上传地址
+      uploadUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "personInfo"
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken()
+      }
     };
   },
   methods: {
@@ -98,7 +148,6 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-            console.log(self.checkList);
 
             if (id == null || id.length == 0) {
               return personInfoApi.add(self.formModel);
@@ -126,11 +175,28 @@ export default {
           });
         }
       });
+    },
+    handleAvatarSuccess(res, file) {
+      var self = this;
+      self.formModel.faceImageUrl = res.data;
+      self.fileUrl =
+        res.data + "?x-oss-process=image/resize,m_lfit,h_400,w_400";
+    },
+    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 personInfoApi.create();
@@ -144,6 +210,11 @@ export default {
 
         if (jsonData.result) {
           self.formModel = jsonData.data;
+          let faceImageUrl = self.formModel.faceImageUrl;
+          if (faceImageUrl != null) {
+            self.fileUrl =
+              faceImageUrl + "?x-oss-process=image/resize,m_lfit,h_400,w_400";
+          }
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/base/personInfo-list.vue

@@ -91,10 +91,23 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="companyName" label="企业" width="180"></el-table-column>
+      <el-table-column prop="faceImageUrl" label="人员照片" width="80">
+        <template slot-scope="{row}">
+          <a :href="row.faceImageUrl" target="_blank">
+            <el-avatar
+              size="small"
+              :src="row.faceImageUrl+'?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="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 prop="openId" label="是否绑定公众号" width="180">
+        <template slot-scope="{row}">{{row.openId == null ? "否" : "是"}}</template>
+      </el-table-column>
       <el-table-column label="人脸授权">
         <template slot-scope="{row}">
           <el-switch
@@ -155,7 +168,7 @@
           <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>
+          <el-button size="mini" type="info" @click="showBound(row)">已绑定设备</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -172,8 +185,23 @@
       :businessKey="businessKey"
       :title="modalTitle"
       :companyResult="companyResult"
+      :companyPosition1="position1"
+      :companyPosition2="position2"
+      :companyPosition3="position3"
+      :companyPosition4="position4"
+      :companyPosition5="position5"
       @close="onDetailModalClose"
     ></personInfo-detail>
+    <personDeviceRelation-list
+      v-if="showDeviceModal"
+      :personId="personId"
+      @close="onDetailModalClose"
+    ></personDeviceRelation-list>
+    <personDeviceRelation-BoundList
+      v-if="showBoundModal"
+      :personId="personId"
+      @close="onDetailModalClose"
+    ></personDeviceRelation-BoundList>
     <!--批量导入S-->
     <el-dialog
       title="批量导入人员"
@@ -184,7 +212,7 @@
       <el-form label-width="150px">
         <el-form-item label="模板下载">
           <el-link
-            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/picc/template/企业人员名单导入模板.xls"
+            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/smart/companyInfo/2020/3/16170226996.xls"
             type="primary"
             target="_blank"
           >点击下载模板</el-link>
@@ -236,6 +264,9 @@
 <script>
 import Constant from "@/constant";
 import PersonInfoDetail from "./personInfo-detail";
+import PersonDeviceRelationList from "./personDeviceRelation-list";
+import PersonDeviceRelationBoundList from "./personDeviceRelation-BoundList";
+
 import personInfoApi from "@/api/base/personInfo";
 import companyInfoApi from "@/api/base/companyInfo";
 import companyPositionApi from "@/api/base/companyPosition";
@@ -285,7 +316,10 @@ export default {
       position2: "",
       position3: "",
       position4: "",
-      position5: ""
+      position5: "",
+      showDeviceModal: false,
+      showBoundModal: false,
+      personId: ""
     };
   },
   created() {
@@ -421,6 +455,8 @@ export default {
     onDetailModalClose(refreshed) {
       //保存成功后回调
       this.showModal = false;
+      this.showDeviceModal = false;
+      this.showBoundModal = false;
 
       if (refreshed) {
         this.changePage(this.pageIndex);
@@ -432,12 +468,17 @@ export default {
     },
     bindDevice(record) {
       //绑定设备
+      this.personId = record.id;
+      this.showDeviceModal = true;
     },
     uploadData(record) {
       //上传数据
     },
-    showBind(record) {
+    showBound(record) {
       //展示绑定设备
+      //人员信息ID
+      this.personId = record.id;
+      this.showBoundModal = true;
     },
     //批量导入-上传成功
     handleBatchImportSuccess(response, file, fileList) {
@@ -491,7 +532,31 @@ export default {
       );
     },
     downloadAll() {
-      personInfoApi.exportXls();
+      //导出
+      var formData = new FormData();
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("name", self.queryModel.name);
+      formData.append("phone", self.queryModel.phone);
+      formData.append("idCard", self.queryModel.idCard);
+
+      personInfoApi.exportXls(formData).then(function(response) {
+        var jsonData = response.data;
+        if (jsonData.result) {
+          console.log(jsonData);
+          if (jsonData.data != null) {
+            //下载有错误信息提示的报表
+            //window.open(response.data);
+            this.$message({
+              showClose: true,
+              dangerouslyUseHTMLString: true,
+              message:
+                response.message +
+                `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+              duration: 30000
+            });
+          }
+        }
+      });
     },
     enabledTo(id, type, value) {
       var self = this;
@@ -532,7 +597,9 @@ export default {
     });
   },
   components: {
-    "personInfo-detail": PersonInfoDetail
+    "personInfo-detail": PersonInfoDetail,
+    "personDeviceRelation-list": PersonDeviceRelationList,
+    "personDeviceRelation-BoundList": PersonDeviceRelationBoundList
   }
 };
 </script>