xiao547607 5 gadi atpakaļ
vecāks
revīzija
4b0fb63c77

+ 7 - 1
src/api/base/personDeviceRelation.js

@@ -55,6 +55,11 @@ function batchBindPerson(formData){
   return request.post(constant.serverUrl + "/personDeviceRelation/batchBindPerson", formData);
 }
 
+function batchUnBindPerson(formData){
+  //多人员绑定设备
+  return request.post(constant.serverUrl + "/personDeviceRelation/batchUnBindPerson", formData);
+}
+
 function unbindDevice(formData) {
   return request.post(constant.serverUrl + "/personDeviceRelation/unbindDevice", formData);
 }
@@ -62,5 +67,6 @@ function unbindDevice(formData) {
 
 
 export default {
-  create, edit, add, update, remove, batchRemove, pageList, isUnbindDeviceList, batchBindDevice, unbindDevice,batchBindPerson
+  create, edit, add, update, remove, batchRemove, pageList, 
+  isUnbindDeviceList, batchBindDevice, unbindDevice,batchBindPerson,batchUnBindPerson
 }

+ 2 - 2
src/views/base/personDeviceRelation-BoundList.vue

@@ -149,7 +149,7 @@ export default {
     },
     handleDelete(record) {
       var self = this;
-      if(confirm("是否绑定?")){
+      if(confirm("是否解除绑定?")){
         self.loading = true;
 
         personDeviceRelationApi.remove(record.id).then(function(response) {
@@ -178,7 +178,7 @@ export default {
       //   distinguishCancelAndClose: true
       // })
       //   .then(() => {
-        if(confirm("是否绑定?")){
+        if(confirm("是否解除绑定?")){
           self.loading = true;
           var formData = new FormData();
           formData.append("personId", self.personId);

+ 75 - 5
src/views/base/personInfo-list.vue

@@ -55,8 +55,7 @@
               :label="company.name"
               :value="company.code"
             ></el-option>
-          </el-select>
-          &nbsp;
+          </el-select>&nbsp;
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
         </el-form-item>
         <el-form-item label="是否上传照片" prop="companyId">
@@ -137,6 +136,14 @@
         :disabled="multipleSelection.length==0"
         @click="batchBoundDevice = true"
       >绑定设备</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-refresh"
+        :disabled="multipleSelection.length==0"
+        @click="batchUnBoundDevice = true"
+      >解绑设备</el-button>
     </el-row>
     <el-table
       :data="tableData"
@@ -360,7 +367,7 @@
     >
       <el-form label-width="150px" v-loading="boundDeviceDisabled">
         <el-form-item label="设备">
-          <el-select v-model="boundDeviceId" filterable :disabled="boundDeviceDisabled" placeholder="请选择">
+          <el-select v-model="boundDeviceId" filterable placeholder="请选择">
             <el-option
               v-for="devices in deviceResult"
               :key="devices.id"
@@ -376,6 +383,32 @@
       </div>
     </el-dialog>
     <!-- 批量绑定设备end -->
+    <!-- 批量解绑设备 -->
+    <el-dialog
+      title="解绑设备"
+      :visible.sync="batchUnBoundDevice"
+      :modal-append-to-body="false"
+      style="text-align: left;"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="150px" v-loading="boundDeviceDisabled">
+        <el-form-item label="设备">
+          <el-select v-model="boundUnDeviceId" filterable placeholder="请选择">
+            <el-option
+              v-for="devices in deviceResult"
+              :key="devices.id"
+              :label="devices.aliasName"
+              :value="devices.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeBatchUnBoundDevice">关 闭</el-button>
+        <el-button type="primary" @click="handleBatchUnBoundDevice">确 定</el-button>
+      </div>
+    </el-dialog>
+    <!-- 批量解绑设备end -->
   </div>
 </template>
 <script>
@@ -448,11 +481,13 @@ export default {
       showBoundModal: false,
       personId: "",
       batchBoundDevice: false,
+      batchUnBoundDevice: false,
       deviceResult: "",
       boundDeviceId: "",
+      boundUnDeviceId: "",
       xlsLoading: false,
       tableHeight: "",
-      boundDeviceDisabled:false
+      boundDeviceDisabled: false
     };
   },
   created() {
@@ -922,17 +957,52 @@ export default {
             self.$message({
               showClose: true,
               dangerouslyUseHTMLString: true,
-              message:`有部分人员绑定失败,<a href="${jsonData.message}" target="_blank">点击下载错误信息报表</a>&nbsp;`,
+              message: `有部分人员绑定失败,<a href="${jsonData.message}" target="_blank">点击下载错误信息报表</a>&nbsp;`,
               duration: 30000
             });
           }
         });
     },
+    handleBatchUnBoundDevice() {
+      //批量人脸
+      var self = this;
+      //self.loading = true;
+      self.boundDeviceDisabled = true;
+
+      var idList = this.multipleSelection.map(record => {
+        return record.id;
+      });
+      var formData = new FormData();
+
+      formData.append("persons", idList);
+      formData.append("deviceId", self.boundUnDeviceId);
+      personDeviceRelationApi
+        .batchUnBindPerson(formData)
+        .then(function(response) {
+          var jsonData = response.data;
+          //self.loading = false;
+          self.boundDeviceDisabled = false;
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+            self.batchBoundDevice = false;
+            self.boundDeviceId = "";
+            self.$message({
+              type: "success",
+              message: "解除绑定成功!"
+            });
+          }
+        });
+    },
     closeBatchBoundDevice() {
       var self = this;
       self.batchBoundDevice = false;
       self.boundDeviceId = "";
     },
+    closeBatchUnBoundDevice() {
+      var self = this;
+      self.batchUnBoundDevice = false;
+      self.boundUnDeviceId = "";
+    },
     handleBatchEnabledFace() {
       //批量人脸授权
       var self = this;