111

src/utils/chenApi.js

@@ -37,8 +37,8 @@ export function delCarBase(data) {
 export function addCarWhite(data) {
   return axios({
     url: 'video/car/addCarWhiteList',
-    method: 'get',
-    params: data
+    method: 'post',
+    data: data
   })
 }
 
@@ -46,7 +46,16 @@ export function addCarWhite(data) {
 export function addCarBlack(data) {
   return axios({
     url: 'video/car/addCarBlackList',
-    method: 'get',
+    method: 'post',
+    data: data
+  })
+}
+
+/** 添加 白黑 名单 **/
+export function addWandB(data) {
+  return axios({
+    url: '/video/car/ShowUnSendCar',
+    method: 'post',
     params: data
   })
 }

src/views/BioSafety/CarAdmin.vue

@@ -40,10 +40,12 @@
           <el-button size="mini" @click="btnSelected = 6" type="warning">查看黑名单</el-button>
         </template>
         <template v-if="btnSelected === 5">
+          <el-button size="mini" type="success" @click="addWhite(1)">添加白名单</el-button>
           <el-button size="mini" @click="btnSelected = 1" type="primary">查看车辆档案</el-button>
           <el-button size="mini" @click="btnSelected = 6" type="warning">查看黑名单</el-button>
         </template>
         <template v-if="btnSelected === 6">
+          <el-button size="mini" type="success" @click="addWhite(2)">添加黑名单</el-button>
           <el-button size="mini" @click="btnSelected = 1" type="primary">查看车辆档案</el-button>
           <el-button size="mini" @click="btnSelected = 5" type="success">查看白名单</el-button>
         </template>
@@ -72,13 +74,16 @@
       </template>
       <!--  车辆档案操作    -->
       <template #handle="scope">
-        <el-button size="mini" type="success" @click="onJoin(scope.row, 1)">加入白名单</el-button>
-        <el-button size="mini" type="warning" @click="onJoin(scope.row, 2)">加入黑名单</el-button>
+<!--        <el-button size="mini" type="success" @click="onJoin(scope.row, 1)">加入白名单</el-button>-->
+<!--        <el-button size="mini" type="warning" @click="onJoin(scope.row, 2)">加入黑名单</el-button>-->
         <el-button size="mini" type="danger" @click="onJoin(scope.row, 3)">删除</el-button>
       </template>
       <template v-slot:carNum="slotProps">
         {{ slotProps.row.carNum ? slotProps.row.carNum : "未识别" }}
       </template>
+      <template #carHandle="scope">
+        <el-button v-if="scope.row.carNum" size="mini" @click="addBase(scope.row.carNum)">添加到车辆档案</el-button>
+      </template>
       <template v-slot:originalPicPath="slotProps">
         <img
           :src="slotProps.row.originalPicPath"
@@ -169,6 +174,18 @@
         </el-button>
       </span>
     </el-dialog>
+    <el-dialog :title="showType ? '添加黑名单' : '添加白名单' " :visible.sync="isWhite" width="50%">
+      <new-table :title="''"
+        :listData="abList"
+                 :tableItems="abItems"
+                 :shows="abShows" @selectionChange="selectionChange"></new-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="isWhite = false">取 消</el-button>
+        <el-button type="primary" @click="clickCar">
+          确 定
+        </el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -189,7 +206,7 @@ import {
   getCarWashVideo,
   getCarDrying,
   getCarDryingTemp,
-  getCarList, addCarWhite, addCarBlack, showCarWhite, addCarBase, showCarBlack, delCarWhite, delCarBlack, delCarBase
+  getCarList, addCarWhite, addCarBlack, showCarWhite, addCarBase, showCarBlack, delCarWhite, delCarBlack, delCarBase, addWandB
 } from "../../utils/chenApi";
 import { timeDate } from "../../utils/index";
 import { mapState } from "vuex";
@@ -244,6 +261,28 @@ export default {
         carNum: [{ required: true, message: '请输入车牌号', trigger: 'blur' }]
       },
       showType: false,
+      isWhite: false,
+      // 白黑名单
+      abList: [],
+      abItems: [
+        {
+          prop: 'carId',
+          label: '车辆编号',
+          minWidth: '120',
+          slotName: 'carId'
+        },
+        {
+          prop: 'carNum',
+          label: '车牌号',
+          minWidth: '120',
+          slotName: 'carNum'
+        },
+      ],
+      abShows: {
+        showIndex: false,
+        showSelect: true
+      },
+      selectList: [],
     };
   },
   watch: {
@@ -407,7 +446,7 @@ export default {
             this.$message.success('加入白名单成功');
             this.getCarList();
           } else {
-            this.$message.error('加入白名单失败');
+            this.$message.error(res.errMsg);
           }
         })
       } else if(num === 2) {
@@ -416,7 +455,7 @@ export default {
             this.$message.success('加入黑名单成功');
             this.getCarList();
           } else {
-            this.$message.error('加入黑名单失败');
+            this.$message.error(res.errMsg);
           }
         })
       } else if(num === 3) {
@@ -429,7 +468,7 @@ export default {
             this.$message.success('删除成功');
             this.getCarList()
           } else {
-            this.$message.error('删除失败')
+            this.$message.error(res.errMsg);
           }
         })
       }
@@ -439,6 +478,68 @@ export default {
       this.isFile = true;
       this.showType = false;
     },
+
+    // 添加白名单
+    addWhite(num) {
+      this.isWhite = true;
+      let params = {
+        pageNum: 1,
+        pageSize: 200
+      }
+      if(num === 1) {
+        params.draw = 4;
+        this.showType = false;
+      } else {
+        this.showType = true;
+        params.draw = 5;
+      }
+      addWandB(params).then(res => {
+        if(res.code == 200) {
+          const result = JSON.parse(res.result);
+          this.abList = result.data.pageData;
+        } else {
+          this.$message.error(res.errMsg);
+        }
+      })
+    },
+    clickCar() {
+      if(this.selectList.length > 0) {
+        let params = {};
+        let arr = [];
+        this.selectList.forEach(item => {
+          arr.push(item.carId)
+        })
+        params.carIdList = arr;
+        if(this.showType) {
+          // 黑名单
+          addCarBlack(params).then(res => {
+            if(res.code == 200) {
+              this.$message.success('添加成功!');
+              this.ShowCarBlack();
+            } else {
+              this.$message.error(res.errMsg)
+            }
+            this.isWhite = false;
+          })
+        } else {
+          addCarWhite(params).then(res => {
+            if(res.code == 200) {
+              this.$message.success('添加成功!');
+              this.ShowCarWhite();
+            } else {
+              this.$message.error(res.errMsg)
+            }
+            this.isWhite = false;
+          })
+        }
+      } else {
+        this.$message.error('请选择要添加的车辆！');
+      }
+    },
+    // 选择
+    selectionChange(item) {
+      this.selectList = item;
+    },
     // 档案编辑
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -456,7 +557,7 @@ export default {
                 this.$message.success('添加成功');
                 this.getCarList();
               } else {
-                this.$message.error('添加失败');
+                this.$message.error(res.errMsg);
               }
             })
           }
@@ -486,7 +587,6 @@ export default {
           const result = JSON.parse(res.result);
           this.total = parseInt(result.data.totalRows);
           this.listData = result.data.pageData;
-          console.log(this.listData);
         }
       })
     },
@@ -501,6 +601,8 @@ export default {
           const result = JSON.parse(res.result);
           this.total = parseInt(result.data.totalRows);
           this.listData = result.data.pageData;
+        } else {
+          this.$message.error(res.errMsg);
         }
       })
     },
@@ -512,17 +614,37 @@ export default {
       if(num === 1) {
         delCarWhite(params).then(res => {
           if(res.code == 200) {
+            this.$message.success('移出白名单成功！');
             this.ShowCarWhite();
+          } else {
+            this.$message.error(res.errMsg)
           }
         })
       } else {
         delCarBlack(params).then(res => {
           if(res.code == 200) {
+            this.$message.success('移出黑名单成功！');
             this.ShowCarBlack();
+          } else {
+            this.$message.error(res.errMsg)
           }
         })
       }
     },
+
+    // 车辆通行添加到车辆档案
+    addBase(id) {
+      let params = {
+        carNum: id
+      }
+      addCarBase(params).then(res => {
+        if(res.code == 200) {
+          this.$message.success('添加成功！');
+        } else {
+          this.$message.error(res.errMsg);
+        }
+      })
+    },
     // 车辆洗消
     carWash() {
       if (!this.params.time) {

src/views/BioSafety/carAdmin/table.config.js

@@ -78,6 +78,11 @@ const tableItems2 = [
     minWidth: '150',
     slotName: 'parkingLot'
   },
+  {
+    label: '操作',
+    minWidth: '120',
+    slotName: 'carHandle'
+  }
 ]
 
 const tableItems3 = [