Browse Source

更改白名单批量删除

张佳燕 1 year ago
parent
commit
1176fc50a7
78 changed files with 271 additions and 149 deletions
  1. BIN
      back.rar
  2. 3 3
      back/config.js
  3. 0 0
      back/index.html
  4. 0 0
      back/static/css/app.8d066170.css
  5. 0 0
      back/static/css/chunk-00902c39.a800a54b.css
  6. 0 0
      back/static/css/chunk-010fad77.614c8d60.css
  7. 0 0
      back/static/css/chunk-07fe47e8.bca70559.css
  8. 0 0
      back/static/css/chunk-0d68ec4f.11061096.css
  9. 0 0
      back/static/css/chunk-2299d864.c0420139.css
  10. 0 0
      back/static/css/chunk-2cd02024.1e10e410.css
  11. 0 0
      back/static/css/chunk-2d9413e7.4697da45.css
  12. 0 0
      back/static/css/chunk-32e32dfa.c5799130.css
  13. 0 0
      back/static/css/chunk-3735e5c7.8da8e86e.css
  14. 0 0
      back/static/css/chunk-38a37390.cc4d7af9.css
  15. 0 0
      back/static/css/chunk-3b300db0.b83a7f44.css
  16. 0 0
      back/static/css/chunk-473ad2a2.433e6336.css
  17. 0 0
      back/static/css/chunk-480d0d2b.936d4c0c.css
  18. 0 0
      back/static/css/chunk-607b3e95.5d567cbe.css
  19. 0 0
      back/static/css/chunk-621d513e.4ec6ad18.css
  20. 0 0
      back/static/css/chunk-703119ba.58adbbdb.css
  21. 0 0
      back/static/css/chunk-7963a9ce.6f26b073.css
  22. 0 0
      back/static/css/chunk-797d586c.d2af3da1.css
  23. 0 0
      back/static/css/chunk-79904490.3959cc81.css
  24. 0 0
      back/static/css/chunk-7a00fa90.09c4b1b3.css
  25. 0 0
      back/static/css/chunk-7e6371e6.ac4c097e.css
  26. 0 0
      back/static/css/chunk-834fea8c.b7a56fa3.css
  27. 0 0
      back/static/css/chunk-8ed07662.1992988e.css
  28. 0 0
      back/static/css/chunk-d7e42f8c.fc26c5a4.css
  29. 0 0
      back/static/css/chunk-deb5769c.9259567a.css
  30. 0 0
      back/static/css/chunk-f6e8a640.e7772256.css
  31. 0 0
      back/static/js/app.0e9c8635.js
  32. 0 0
      back/static/js/app.81a7f731.js
  33. 0 0
      back/static/js/chunk-00902c39.74b183d9.js
  34. 0 0
      back/static/js/chunk-010fad77.3189284d.js
  35. 0 0
      back/static/js/chunk-07fe47e8.d02da72d.js
  36. 0 0
      back/static/js/chunk-0d68ec4f.e22dd844.js
  37. 0 0
      back/static/js/chunk-0e225dec.f788b10c.js
  38. 0 0
      back/static/js/chunk-1e38beac.b7a687db.js
  39. 0 0
      back/static/js/chunk-2299d864.22f5b7c7.js
  40. 0 0
      back/static/js/chunk-253f0ad0.b6905310.js
  41. 0 0
      back/static/js/chunk-2cd02024.ba0bfd56.js
  42. 0 0
      back/static/js/chunk-2d9413e7.295a4f2d.js
  43. 0 0
      back/static/js/chunk-32e32dfa.3dba7dd4.js
  44. 0 0
      back/static/js/chunk-3735e5c7.a0680f99.js
  45. 0 0
      back/static/js/chunk-38a37390.d2d77798.js
  46. 0 0
      back/static/js/chunk-3b300db0.3be9fd28.js
  47. 0 0
      back/static/js/chunk-473ad2a2.c236e7cc.js
  48. 0 0
      back/static/js/chunk-480d0d2b.05380682.js
  49. 0 0
      back/static/js/chunk-5d6082e8.57091942.js
  50. 0 0
      back/static/js/chunk-607b3e95.abf78913.js
  51. 0 0
      back/static/js/chunk-621d513e.325efbfa.js
  52. 0 0
      back/static/js/chunk-703119ba.bc2765d8.js
  53. 0 0
      back/static/js/chunk-76cea4de.20e772e1.js
  54. 0 0
      back/static/js/chunk-7963a9ce.09defe1a.js
  55. 0 0
      back/static/js/chunk-797d586c.07290233.js
  56. 0 0
      back/static/js/chunk-79904490.b8aac456.js
  57. 0 0
      back/static/js/chunk-7a00fa90.09e4c2bf.js
  58. 0 0
      back/static/js/chunk-7e6371e6.3c76d0e6.js
  59. 0 0
      back/static/js/chunk-824862d0.bd30ac1f.js
  60. 0 0
      back/static/js/chunk-834fea8c.6e37c816.js
  61. 0 0
      back/static/js/chunk-8ed07662.fc60f5fd.js
  62. 0 0
      back/static/js/chunk-d7e42f8c.8ff77419.js
  63. 0 0
      back/static/js/chunk-deb5769c.439d9f18.js
  64. 0 0
      back/static/js/chunk-e0c6ba5e.94cf50cc.js
  65. 0 0
      back/static/js/chunk-f6e8a640.b235c6e5.js
  66. 1 0
      package.json
  67. 3 3
      public/config.js
  68. 3 3
      src/api/ordinary_user.js
  69. 26 26
      src/api/xiaosha.js
  70. 1 1
      src/layout/components/Sidebar/SidebarItem.vue
  71. 1 1
      src/router/index.js
  72. 1 1
      src/store/modules/user.js
  73. 12 12
      src/views/common_functions/components/Xiaosha_record.vue
  74. 7 7
      src/views/common_functions/components/area_setting.vue
  75. 4 4
      src/views/common_functions/components/user_setting.vue
  76. 1 1
      src/views/common_functions/xiaosha_area.vue
  77. 199 85
      src/views/user_manage/index.vue
  78. 9 2
      src/views/white_list/index.vue

BIN
back.rar


+ 3 - 3
back/config.js

@@ -1,6 +1,6 @@
 window.g = {
-  // ApiUrl: 'https://face.ldxk.edu.cn:8901/ywjl-fyzd', //计量
-  ApiUrl: 'https://noise.hz-hanghui.com:8088/yx-fyzd', //浙江
-  // ApiUrl: 'http://192.168.11.17:9111/yx-fyzd', //浙江本地
+  ApiUrl: 'https://face.ldxk.edu.cn:8901/ywjl-fyzd', //计量
+  // ApiUrl: 'https://noise.hz-hanghui.com:8088/yx-fyzd', //浙江
+  // ApiUrl: 'http://192.168.11.17:9100/yx-fyzd', //浙江本地
 
 }

File diff suppressed because it is too large
+ 0 - 0
back/index.html


+ 0 - 0
back/static/css/app.d1d927e4.css → back/static/css/app.8d066170.css


+ 0 - 0
back/static/css/chunk-00902c39.a07033b5.css → back/static/css/chunk-00902c39.a800a54b.css


File diff suppressed because it is too large
+ 0 - 0
back/static/css/chunk-010fad77.614c8d60.css


+ 0 - 0
back/static/css/chunk-07fe47e8.6e678773.css → back/static/css/chunk-07fe47e8.bca70559.css


+ 0 - 0
back/static/css/chunk-0d68ec4f.cb08e9f3.css → back/static/css/chunk-0d68ec4f.11061096.css


+ 0 - 0
back/static/css/chunk-2299d864.7583fbb8.css → back/static/css/chunk-2299d864.c0420139.css


+ 0 - 0
back/static/css/chunk-2cd02024.f7ea88c5.css → back/static/css/chunk-2cd02024.1e10e410.css


+ 0 - 0
back/static/css/chunk-2d9413e7.81ebe437.css → back/static/css/chunk-2d9413e7.4697da45.css


File diff suppressed because it is too large
+ 0 - 0
back/static/css/chunk-32e32dfa.c5799130.css


+ 0 - 0
back/static/css/chunk-3735e5c7.3a590af9.css → back/static/css/chunk-3735e5c7.8da8e86e.css


+ 0 - 0
back/static/css/chunk-38a37390.9caaa4aa.css → back/static/css/chunk-38a37390.cc4d7af9.css


File diff suppressed because it is too large
+ 0 - 0
back/static/css/chunk-3b300db0.b83a7f44.css


+ 0 - 0
back/static/css/chunk-473ad2a2.ecd5089b.css → back/static/css/chunk-473ad2a2.433e6336.css


+ 0 - 0
back/static/css/chunk-480d0d2b.376f75f4.css → back/static/css/chunk-480d0d2b.936d4c0c.css


+ 0 - 0
back/static/css/chunk-607b3e95.3c308660.css → back/static/css/chunk-607b3e95.5d567cbe.css


+ 0 - 0
back/static/css/chunk-621d513e.487d4463.css → back/static/css/chunk-621d513e.4ec6ad18.css


+ 0 - 0
back/static/css/chunk-703119ba.6d0c226a.css → back/static/css/chunk-703119ba.58adbbdb.css


File diff suppressed because it is too large
+ 0 - 0
back/static/css/chunk-7963a9ce.6f26b073.css


+ 0 - 0
back/static/css/chunk-797d586c.ff0b4703.css → back/static/css/chunk-797d586c.d2af3da1.css


+ 0 - 0
back/static/css/chunk-79904490.0ba3322e.css → back/static/css/chunk-79904490.3959cc81.css


+ 0 - 0
back/static/css/chunk-7a00fa90.e5c3495d.css → back/static/css/chunk-7a00fa90.09c4b1b3.css


+ 0 - 0
back/static/css/chunk-7e6371e6.83a4f6b2.css → back/static/css/chunk-7e6371e6.ac4c097e.css


+ 0 - 0
back/static/css/chunk-834fea8c.d4ab5603.css → back/static/css/chunk-834fea8c.b7a56fa3.css


+ 0 - 0
back/static/css/chunk-8ed07662.f71d1842.css → back/static/css/chunk-8ed07662.1992988e.css


+ 0 - 0
back/static/css/chunk-d7e42f8c.2744dd55.css → back/static/css/chunk-d7e42f8c.fc26c5a4.css


+ 0 - 0
back/static/css/chunk-024f0d8c.f6f84417.css → back/static/css/chunk-deb5769c.9259567a.css


+ 0 - 0
back/static/css/chunk-f6e8a640.b02ca5d6.css → back/static/css/chunk-f6e8a640.e7772256.css


File diff suppressed because it is too large
+ 0 - 0
back/static/js/app.0e9c8635.js


File diff suppressed because it is too large
+ 0 - 0
back/static/js/app.81a7f731.js


+ 0 - 0
back/static/js/chunk-00902c39.cd5f88a4.js → back/static/js/chunk-00902c39.74b183d9.js


File diff suppressed because it is too large
+ 0 - 0
back/static/js/chunk-010fad77.3189284d.js


+ 0 - 0
back/static/js/chunk-07fe47e8.6a17e868.js → back/static/js/chunk-07fe47e8.d02da72d.js


+ 0 - 0
back/static/js/chunk-0d68ec4f.a685e3e4.js → back/static/js/chunk-0d68ec4f.e22dd844.js


File diff suppressed because it is too large
+ 0 - 0
back/static/js/chunk-0e225dec.f788b10c.js


+ 0 - 0
back/static/js/chunk-1e38beac.2ed429e1.js → back/static/js/chunk-1e38beac.b7a687db.js


+ 0 - 0
back/static/js/chunk-2299d864.78161977.js → back/static/js/chunk-2299d864.22f5b7c7.js


+ 0 - 0
back/static/js/chunk-253f0ad0.2b4e03d1.js → back/static/js/chunk-253f0ad0.b6905310.js


+ 0 - 0
back/static/js/chunk-2cd02024.567961a8.js → back/static/js/chunk-2cd02024.ba0bfd56.js


+ 0 - 0
back/static/js/chunk-2d9413e7.b3548780.js → back/static/js/chunk-2d9413e7.295a4f2d.js


File diff suppressed because it is too large
+ 0 - 0
back/static/js/chunk-32e32dfa.3dba7dd4.js


+ 0 - 0
back/static/js/chunk-3735e5c7.14ab55f5.js → back/static/js/chunk-3735e5c7.a0680f99.js


+ 0 - 0
back/static/js/chunk-38a37390.e895923e.js → back/static/js/chunk-38a37390.d2d77798.js


File diff suppressed because it is too large
+ 0 - 0
back/static/js/chunk-3b300db0.3be9fd28.js


+ 0 - 0
back/static/js/chunk-473ad2a2.99024862.js → back/static/js/chunk-473ad2a2.c236e7cc.js


+ 0 - 0
back/static/js/chunk-480d0d2b.a1cec381.js → back/static/js/chunk-480d0d2b.05380682.js


File diff suppressed because it is too large
+ 0 - 0
back/static/js/chunk-5d6082e8.57091942.js


+ 0 - 0
back/static/js/chunk-607b3e95.2fae3842.js → back/static/js/chunk-607b3e95.abf78913.js


+ 0 - 0
back/static/js/chunk-621d513e.d3d34f5b.js → back/static/js/chunk-621d513e.325efbfa.js


+ 0 - 0
back/static/js/chunk-703119ba.ca59c4f6.js → back/static/js/chunk-703119ba.bc2765d8.js


+ 0 - 0
back/static/js/chunk-76cea4de.f79c8c33.js → back/static/js/chunk-76cea4de.20e772e1.js


File diff suppressed because it is too large
+ 0 - 0
back/static/js/chunk-7963a9ce.09defe1a.js


+ 0 - 0
back/static/js/chunk-797d586c.0508a5a6.js → back/static/js/chunk-797d586c.07290233.js


+ 0 - 0
back/static/js/chunk-79904490.a7ecce90.js → back/static/js/chunk-79904490.b8aac456.js


+ 0 - 0
back/static/js/chunk-7a00fa90.07a112f2.js → back/static/js/chunk-7a00fa90.09e4c2bf.js


+ 0 - 0
back/static/js/chunk-7e6371e6.209e3893.js → back/static/js/chunk-7e6371e6.3c76d0e6.js


+ 0 - 0
back/static/js/chunk-824862d0.354dde29.js → back/static/js/chunk-824862d0.bd30ac1f.js


+ 0 - 0
back/static/js/chunk-834fea8c.b68cb7a2.js → back/static/js/chunk-834fea8c.6e37c816.js


+ 0 - 0
back/static/js/chunk-8ed07662.83899df7.js → back/static/js/chunk-8ed07662.fc60f5fd.js


+ 0 - 0
back/static/js/chunk-d7e42f8c.ba512a79.js → back/static/js/chunk-d7e42f8c.8ff77419.js


File diff suppressed because it is too large
+ 0 - 0
back/static/js/chunk-deb5769c.439d9f18.js


+ 0 - 0
back/static/js/chunk-e0c6ba5e.fdd47df4.js → back/static/js/chunk-e0c6ba5e.94cf50cc.js


+ 0 - 0
back/static/js/chunk-f6e8a640.a72e6139.js → back/static/js/chunk-f6e8a640.b235c6e5.js


+ 1 - 0
package.json

@@ -18,6 +18,7 @@
     "core-js": "3.6.5",
     "echarts": "^5.2.2",
     "element-ui": "^2.15.6",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",

+ 3 - 3
public/config.js

@@ -1,6 +1,6 @@
 window.g = {
-  // ApiUrl: 'https://face.ldxk.edu.cn:8901/ywjl-fyzd', //计量
-  ApiUrl: 'https://noise.hz-hanghui.com:8088/yx-fyzd', //浙江
-  // ApiUrl: 'http://192.168.11.17:9111/yx-fyzd', //浙江本地
+  ApiUrl: 'https://face.ldxk.edu.cn:8901/ywjl-fyzd', //计量
+  // ApiUrl: 'https://noise.hz-hanghui.com:8088/yx-fyzd', //浙江
+  // ApiUrl: 'http://192.168.11.17:9100/yx-fyzd', //浙江本地
 
 }

+ 3 - 3
src/api/ordinary_user.js

@@ -32,11 +32,11 @@ export function delete_user(id) {
 }
 
 // 删除所有人员
-export function deleteAll() {
+export function deleteAll(data) {
   return request({
     url: '/admin/userWhitelis/deleteAll',
-    method: 'get',
-    params: {}
+    method: 'post',
+    data
   })
 }
 

+ 26 - 26
src/api/xiaosha.js

@@ -5,7 +5,7 @@ export function updateProblemReport(data) {
   return request({
     url: '/problemReport/updateProblemReport',
     method: 'post',
-    data,
+    data
   })
 }
 // 查询问题上报详情
@@ -13,7 +13,7 @@ export function getProblemReportDetailById(data) {
   return request({
     url: '/problemReport/getProblemReportDetailById',
     method: 'post',
-    data,
+    data
   })
 }
 // 问题上报列表分页
@@ -21,7 +21,7 @@ export function getProblemReportPage(data) {
   return request({
     url: '/problemReport/getProblemReportPage',
     method: 'post',
-    data,
+    data
   })
 }
 // 问题上报数据报表
@@ -29,67 +29,67 @@ export function getProblemReportData(data) {
   return request({
     url: 'problemReport/getProblemReportData',
     method: 'post',
-    data,
+    data
   })
 }
-// ---------------------消杀------------------------
-// 消杀区域-列表分页
+// ---------------------巡查------------------------
+// 巡查区域-列表分页
 export function disinfectAreaList(data) {
   return request({
     url: '/admin/disinfectArea/getPageList',
     method: 'post',
-    data,
+    data
   })
 }
-// 消杀区域-新增-修改
+// 巡查区域-新增-修改
 export function disinfectAreaEdit(data) {
   return request({
     url: '/admin/disinfectArea/edit',
     method: 'post',
-    data,
+    data
   })
 }
-// 消杀区域-删除
+// 巡查区域-删除
 export function disinfectAreDelete(params) {
   return request({
     url: '/admin/disinfectArea/delete',
     method: 'get',
-    params,
+    params
   })
 }
-// 消杀区域-列表
+// 巡查区域-列表
 export function disinfectAreaGetList(params) {
   return request({
     url: '/admin/disinfectArea/getList',
     method: 'get',
-    params,
+    params
   })
 }
-// 消杀人员-列表分页
+// 巡查人员-列表分页
 export function disinfectUserList(data) {
   return request({
     url: '/admin/disinfectUser/getPageList',
     method: 'post',
-    data,
+    data
   })
 }
-// 消杀人员-新增-修改
+// 巡查人员-新增-修改
 export function disinfectUserEdit(data) {
   return request({
     url: '/admin/disinfectUser/edit',
     method: 'post',
-    data,
+    data
   })
 }
-// 消杀人员-删除
+// 巡查人员-删除
 export function disinfectUserDel(disinfectUserId) {
   return request({
     url: '/admin/disinfectUser/delete',
     method: 'get',
-    params:{disinfectUserId},
+    params: { disinfectUserId }
   })
 }
-// 消杀人员的批量导入
+// 巡查人员的批量导入
 export function excelInput(data) {
   return request({
     url: '/admin/disinfectUser/excelInput',
@@ -98,12 +98,12 @@ export function excelInput(data) {
   })
 }
 
-// 消杀记录-列表分页
+// 巡查记录-列表分页
 export function disinfectRecordList(data) {
   return request({
     url: '/admin/disinfectRecord/getPageList',
     method: 'post',
-    data,
+    data
   })
 }
 // 导出本月通行记录
@@ -111,7 +111,7 @@ export function monthRecords(data) {
   return request({
     url: '/faceLogExport/monthRecords/doc',
     method: 'post',
-    data,
+    data
   })
 }
 // 导出当天通行记录
@@ -120,9 +120,9 @@ export function todayRecords(data) {
     url: '/faceLogExport/todayRecords/doc',
     method: 'post',
     headers: {
-      "Content-Type": "application/json",
+      'Content-Type': 'application/json'
     },
-    data,
+    data
   })
 }
 // 导出本周通行记录
@@ -130,6 +130,6 @@ export function weekedRecords(data) {
   return request({
     url: '/faceLogExport/weekedRecords/doc',
     method: 'post',
-    data,
+    data
   })
 }

+ 1 - 1
src/layout/components/Sidebar/SidebarItem.vue

@@ -179,7 +179,7 @@ export default {
         item.children[0].hidden = true;
         return true;
       } else if (
-        // 隐藏通用功能-区域消杀
+        // 隐藏通用功能-区域巡查
         this.disinfectFlag === 0 &&
         item.children &&
         item.children[1] &&

+ 1 - 1
src/router/index.js

@@ -326,7 +326,7 @@ export const constantRoutes = [
         path: 'xiaosha_area',
         name: 'xiaosha_area',
         component: () => import('@/views/common_functions/xiaosha_area'),
-        meta: { title: '区域消杀', role: [5], icon: 'el-icon-house' }
+        meta: { title: '区域巡查', role: [5], icon: 'el-icon-house' }
       }
     ]
   },

+ 1 - 1
src/store/modules/user.js

@@ -30,7 +30,7 @@ const getDefaultState = () => {
     threeCodeList: null,//三码
     cardPhysics: null,//卡号
     problemReportFlag: null,//是否开启问题上报
-    disinfectFlag: null,//是否开启区域消杀
+    disinfectFlag: null,//是否开启区域巡查
     isOpenExam: false,//是否开启考试
     openInOutStatistics: false // 是否启用进出人员数据统计
     // 背景图片、标题等

+ 12 - 12
src/views/common_functions/components/Xiaosha_record.vue

@@ -20,7 +20,7 @@
       filterable
       clearable
       v-model="page.data.disinfectAreaId"
-      placeholder="请选择消杀区域"
+      placeholder="请选择巡查区域"
       class="margin-left input"
     >
       <el-option
@@ -33,7 +33,7 @@
     </el-select>
     <el-input
       v-model="page.data.disinfectAreaAddress"
-      placeholder="请输入消杀区域详址"
+      placeholder="请输入巡查区域详址"
       class="margin-left input"
     ></el-input>
     <el-select
@@ -54,7 +54,7 @@
     <el-date-picker
       v-model="page.data.startTime"
       type="datetime"
-      placeholder="选择消杀开始时间"
+      placeholder="选择巡查开始时间"
       value-format="yyyy-MM-dd HH:mm:ss"
       class="margin-left"
     >
@@ -62,7 +62,7 @@
     <el-date-picker
       v-model="page.data.endTime"
       type="datetime"
-      placeholder="选择消杀结束时间"
+      placeholder="选择巡查结束时间"
       value-format="yyyy-MM-dd HH:mm:ss"
       class="margin-left"
     >
@@ -92,27 +92,27 @@
           {{ indexMethod(scope.$index) }}
         </template>
       </el-table-column>
-      <el-table-column label="消杀人员姓名" align="center">
+      <el-table-column label="巡查人员姓名" align="center">
         <template slot-scope="scope">
           {{ scope.row.name | matchNull }}
         </template>
       </el-table-column>
-      <el-table-column label="消杀人员身份证" align="center">
+      <el-table-column label="巡查人员身份证" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.idNumber | matchNull }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="消杀人员手机号" align="center">
+      <el-table-column label="巡查人员手机号" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.phone | matchNull }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="消杀区域" align="center">
+      <el-table-column label="巡查区域" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.disinfectAreaName | matchNull }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="消杀区域详址" align="center">
+      <el-table-column label="巡查区域详址" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.disinfectAreaAddress | matchNull }}</span>
         </template>
@@ -123,7 +123,7 @@
           <el-tag v-else type="warning" effect="plain">未完成 </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="消杀时间" align="center">
+      <el-table-column label="巡查时间" align="center">
         <template slot-scope="scope">
           {{ scope.row.disinfectTime }}
         </template>
@@ -187,7 +187,7 @@ export default {
         pageSize: 10,
       },
       total: 0,
-      xiaosha_area: [], //消杀区域
+      xiaosha_area: [], //巡查区域
       // 状态
       status_list: [
         // { id: 104, name: "处理中" },
@@ -214,7 +214,7 @@ export default {
         this.listLoading = false;
       });
     },
-    // 消杀区域
+    // 巡查区域
     disinfectAreaGetList(){
       disinfectAreaGetList().then(res=>{
         this.xiaosha_area=res.data

+ 7 - 7
src/views/common_functions/components/area_setting.vue

@@ -12,7 +12,7 @@
       filterable
       clearable
       v-model="page.data.disinfectAreaId"
-      placeholder="请选择消杀区域"
+      placeholder="请选择巡查区域"
       class="margin-left input"
     >
       <el-option
@@ -62,9 +62,9 @@
             </el-image>
           </div>
           <div class="today">
-            <span>每天{{ item.todayTotalDisinfectNum }}次消杀</span><br />
+            <span>每天{{ item.todayTotalDisinfectNum }}次巡查</span><br />
             <span
-              >今日消杀
+              >今日巡查
               <i
                 :class="
                   item.disinfectAreaTimeType == 1
@@ -182,7 +182,7 @@
         <div>
           <div class="title">
             <div class="line"></div>
-            <span>消杀时段配置(每天)</span>
+            <span>巡查时段配置(每天)</span>
           </div>
           <div class="flex">
             <div
@@ -265,7 +265,7 @@ export default {
       },
       total: 0,
       dialogVisible: false,
-      xiaosha_area: [], //消杀区域
+      xiaosha_area: [], //巡查区域
       // 对话框标题
       dialogTitle: {
         add: "添加区域",
@@ -322,7 +322,7 @@ export default {
         this.listLoading = false;
       });
     },
-    // 消杀区域
+    // 巡查区域
     disinfectAreaGetList() {
       disinfectAreaGetList().then((res) => {
         this.xiaosha_area = res.data;
@@ -378,7 +378,7 @@ export default {
               });
             });
           } else {
-            this.$message.error("消杀时段不能为空");
+            this.$message.error("巡查时段不能为空");
           }
         }
       });

+ 4 - 4
src/views/common_functions/components/user_setting.vue

@@ -117,7 +117,7 @@ w
             v-for="(item, index) in scope.row.disinfectAuthList"
             :key="index"
           >
-            <el-tag v-if="item == 1" effect="plain">消杀 </el-tag>
+            <el-tag v-if="item == 1" effect="plain">巡查 </el-tag>
             <el-tag v-if="item == 2" effect="plain">检查 </el-tag>
           </span>
         </template>
@@ -312,10 +312,10 @@ export default {
       total: 0,
       xiaosha_area: [], //区域
       permissions_list: [
-        //消杀权限
+        //巡查权限
         {
           id: 1,
-          name: "消杀",
+          name: "巡查",
         },
         {
           id: 2,
@@ -373,7 +373,7 @@ export default {
         this.listLoading = false;
       });
     },
-    // 消杀区域
+    // 巡查区域
     disinfectAreaGetList() {
       disinfectAreaGetList().then((res) => {
         this.xiaosha_area = res.data;

+ 1 - 1
src/views/common_functions/xiaosha_area.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="消杀记录" name="Xiaosha" >
+      <el-tab-pane label="巡查记录" name="Xiaosha" >
         <XiaoshaRecord v-if="tabRefresh.Xiaosha"/>
       </el-tab-pane>
       <el-tab-pane label="区域设置" name="areaSetting" >

+ 199 - 85
src/views/user_manage/index.vue

@@ -756,6 +756,27 @@
             <div class="line"></div>
             <span>功能配置</span>
           </div>
+          <div class="flex">
+            <el-form-item
+              label="进出记录保留时间"
+              prop="faceLogHoldDays"
+              class="form-item-style item-margin-bottom"
+            >
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :manual="false"
+                content="单位:天"
+                placement="bottom"
+              >
+                <el-input-number
+                  v-model="user_form.faceLogHoldDays"
+                  size="mini"
+                  :min="1"
+                />
+              </el-tooltip>
+            </el-form-item>
+          </div>
           <div class="flex">
             <el-form-item
               label="卡号认证"
@@ -768,14 +789,23 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item
-              label="是否开启布控"
-              prop="isControlEarlyWarning"
+              label="身份证认证"
               class="form-item-style item-margin-bottom"
+              prop="isPush"
+              v-if="user_form.type === 5"
             >
-              <el-radio-group v-model="user_form.isControlEarlyWarning">
-                <el-radio :label="2">否</el-radio>
-                <el-radio :label="1">是</el-radio>
-              </el-radio-group>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :manual="false"
+                content="若开启现场刷身份证,人员若在员工白名单中存在,且未认证,则状态改为已认证,并抓拍现场照片补全信息"
+                placement="bottom"
+              >
+                <el-radio-group v-model="user_form.isPush">
+                  <el-radio :label="0">停用</el-radio>
+                  <el-radio :label="1">开启</el-radio>
+                </el-radio-group>
+              </el-tooltip>
             </el-form-item>
           </div>
           <div class="flex" v-if="user_form.placeType != 1">
@@ -809,25 +839,17 @@
               </el-checkbox-group>
             </el-form-item>
             <el-form-item
-              label="身份证认证"
+              label="二维码类型"
+              prop="codeType"
               class="form-item-style item-margin-bottom"
-              prop="isPush"
-              v-if="user_form.type === 5"
             >
-              <el-tooltip
-                class="item"
-                effect="dark"
-                :manual="false"
-                content="若开启现场刷身份证,人员若在员工白名单中存在,且未认证,则状态改为已认证,并抓拍现场照片补全信息"
-                placement="bottom"
-              >
-                <el-radio-group v-model="user_form.isPush">
-                  <el-radio :label="0">停用</el-radio>
-                  <el-radio :label="1">开启</el-radio>
-                </el-radio-group>
-              </el-tooltip>
+              <el-checkbox-group v-model="user_form.codeType" :min="1">
+                <el-checkbox label="0">通用码</el-checkbox>
+                <el-checkbox label="1">员工码</el-checkbox>
+              </el-checkbox-group>
             </el-form-item>
           </div>
+
           <div v-if="user_form.type === 5">
             <div class="flex" v-if="user_form.placeType === 0">
               <el-form-item
@@ -841,7 +863,7 @@
                 </el-radio-group>
               </el-form-item>
               <el-form-item
-                label="是否开启区域消杀"
+                label="是否开启区域巡查"
                 class="form-item-style item-margin-bottom"
                 prop="disinfectFlag"
               >
@@ -875,99 +897,133 @@
             </div>
             <div class="flex">
               <el-form-item
-                label="是否零点清除"
-                class="form-item-style item-margin-bottom special"
-                prop="isOpenVisitorClear"
-              >
-                <el-radio-group v-model="user_form.isOpenVisitorClear">
-                  <el-radio :label="false">否</el-radio>
-                  <el-radio :label="true">是</el-radio>
-                </el-radio-group>
-              </el-form-item>
-              <el-form-item
-                label="二维码类型"
-                prop="codeType"
+                label="是否输入手机号"
                 class="form-item-style item-margin-bottom"
-                v-if="user_form.placeType != 1"
+                prop="mobileAutoInputFlag"
               >
-                <el-checkbox-group v-model="user_form.codeType" :min="1">
-                  <el-checkbox label="0">通用码</el-checkbox>
-                  <el-checkbox label="1">员工码</el-checkbox>
-                </el-checkbox-group>
+                <el-radio-group v-model="user_form.mobileAutoInputFlag">
+                  <el-radio :label="2">否</el-radio>
+                  <el-radio :label="1">是</el-radio>
+                </el-radio-group>
               </el-form-item>
-            </div>
-            <div class="flex">
               <el-form-item
-                label="进出人员数据统计"
-                prop="openInOutStatistics"
+                label="是否开启考试"
                 class="form-item-style item-margin-bottom"
+                prop="isOpenExam"
               >
-                <el-radio-group v-model="user_form.openInOutStatistics">
-                  <el-radio :label="false">停用</el-radio>
-                  <el-radio :label="true">启用</el-radio>
+                <el-radio-group v-model="user_form.isOpenExam">
+                  <el-radio :label="false"></el-radio>
+                  <el-radio :label="true"></el-radio>
                 </el-radio-group>
               </el-form-item>
             </div>
             <div class="flex">
               <el-form-item
-                label="是否输入手机号"
-                class="form-item-style special item-margin-bottom"
-                prop="mobileAutoInputFlag"
+                v-if="user_form.placeType != 1"
+                label="是否开启布控"
+                prop="isControlEarlyWarning"
+                class="form-item-style item-margin-bottom"
               >
-                <el-radio-group v-model="user_form.mobileAutoInputFlag">
+                <el-radio-group v-model="user_form.isControlEarlyWarning">
                   <el-radio :label="2">否</el-radio>
                   <el-radio :label="1">是</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item
-                label="是否开启考试"
-                class="form-item-style special item-margin-bottom"
-                prop="isOpenExam"
+                label="是否零点清除"
+                class="form-item-style item-margin-bottom"
+                prop="isOpenVisitorClear"
               >
-                <el-radio-group v-model="user_form.isOpenExam">
+                <el-radio-group v-model="user_form.isOpenVisitorClear">
                   <el-radio :label="false">否</el-radio>
                   <el-radio :label="true">是</el-radio>
                 </el-radio-group>
               </el-form-item>
             </div>
-            <el-form-item
-              v-if="dialogType != 'add'"
-              label="屏保图片配置"
-              prop="screenShowPhotos"
-              class="form-item-style item-margin-bottom special"
-            >
-              <el-upload
-                class="upload-demo"
-                :multiple="false"
-                :action="doUpload"
-                :file-list="user_form.screenShowPhotos"
-                list-type="picture"
-                :http-request="doUploadAvatar"
-                :before-upload="beforeAvatarUpload"
-                accept="image/png,image/gif,image/jpg,image/jpeg"
+            <div class="flex">
+              <el-form-item
+                label="进出人员数据统计"
+                prop="openInOutStatistics"
+                class="form-item-style item-margin-bottom"
               >
-                <img
-                  src="../../assets/default-img.png"
-                  alt=""
-                  v-if="user_form.screenShowPhotos.length < 1"
-                  class="upload-img"
-                />
+                <el-radio-group v-model="user_form.openInOutStatistics">
+                  <el-radio :label="false">停用</el-radio>
+                  <el-radio :label="true">启用</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item
+                label="屏保图片配置"
+                prop="screenShowPhotos"
+                class="item-margin-bottom special form-item-style"
+                v-if="dialogType != 'add'"
+              >
+                <el-upload
+                  class="upload-demo"
+                  :multiple="false"
+                  :action="doUpload"
+                  :file-list="user_form.screenShowPhotos"
+                  list-type="picture"
+                  :http-request="doUploadAvatar"
+                  :before-upload="beforeAvatarUpload"
+                  accept="image/png,image/gif,image/jpg,image/jpeg"
+                >
+                  <img
+                    src="../../assets/default-img.png"
+                    alt=""
+                    v-if="user_form.screenShowPhotos.length < 1"
+                    class="upload-img"
+                  />
 
-                <div v-else class="upload-img">
-                  <img :src="user_form.screenShowPhotos[0].url" alt="" />
-                  <span @click.stop="handleRemove" class="del-img">x</span>
-                </div>
-              </el-upload>
-            </el-form-item>
+                  <div v-else class="upload-img">
+                    <img :src="user_form.screenShowPhotos[0].url" alt="" />
+                    <span @click.stop="handleRemove('')" class="del-img"
+                      >x</span
+                    >
+                  </div>
+                </el-upload>
+              </el-form-item>
+            </div>
             <div class="custom-css" v-if="user_form.placeType != 1">
               <el-form-item
                 label="打卡方式"
-                class="form-item-style item-margin-bottom special"
+                class="form-item-style item-margin-bottom"
                 prop="clockWayType"
               >
                 <el-radio-group v-model="user_form.clockWayType">
                   <el-radio label="0">关闭</el-radio>
-                  <el-radio label="1">通用</el-radio>
+                  <el-radio
+                    label="1"
+                    :style="{
+                      marginRight:
+                        user_form.clockWayType === '1' &&
+                        !!user_form.clockWayAdminAuthVO
+                          ? '10px'
+                          : '30px',
+                    }">
+                    通用
+                  </el-radio>
+                  <span
+                    v-if="
+                      user_form.clockWayType === '1' &&
+                      !!user_form.clockWayAdminAuthVO
+                    "
+                    style="margin-right: 30px"
+                  >
+                    <el-button
+                      class="el-icon-download form-item-style"
+                      type="text"
+                      @click="getAppKeyAndAppSecret2(true, user_form)"
+                    >
+                      密钥
+                    </el-button>
+                    <el-button
+                      class="el-icon-download form-item-style"
+                      type="text"
+                      @click="getAppKeyAndAppSecret2(false)"
+                    >
+                      文档
+                    </el-button>
+                  </span>
                   <el-radio label="2">钉钉</el-radio>
                 </el-radio-group>
               </el-form-item>
@@ -1314,6 +1370,7 @@ import Pagination from "@/components/Pagination";
 import { checkRole } from "@/utils/checkRole";
 import { uploadAdminInfoExcel, pictureLocal } from "@/api/ordinary_user";
 import { batchDownload } from "@/utils/batchDownload";
+import { saveAs } from "file-saver"; //字符串保存成 TXT 文件保存到电脑
 
 // secondary package based on el-pagination
 
@@ -1441,7 +1498,8 @@ export default {
         password: null,
         whiteVisitorType: ["1", "2"],
         isControlEarlyWarning: 2,
-        openInOutStatistics: false,
+        openInOutStatistics: false, // 是否开启 进出人员数据统计
+        faceLogHoldDays: 60, // 进出记录保留时间
         noHideCloumn: ["1", "2", "3"],
         isPush: 0,
         addCustomList: [], //自定义字段
@@ -1466,7 +1524,7 @@ export default {
         notAllowAgeEnd: 0, //不可预约年龄段-结束年龄
         notAllowAgeStart: 0, //不可预约年龄段-开始年龄
         screenShowPhotos: [],
-        disinfectFlag: 0, //是否开启区域消杀
+        disinfectFlag: 0, //是否开启区域巡查
         problemReportFlag: 0, //是否开启问题上报
         isNeedRealAuthentication: true, //是否需要实名认证
         wxLoginType: 1, //微信小程序登录方式
@@ -1543,6 +1601,13 @@ export default {
             trigger: "change",
           },
         ],
+        faceLogHoldDays: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "change",
+          },
+        ],
         tagId: [
           { required: false, message: "请选择账号类别", trigger: "change" },
         ],
@@ -1696,6 +1761,13 @@ export default {
         isNeedRealAuthentication: [
           { required: true, message: "请选择", trigger: "blur" },
         ],
+        mobileAutoInputFlag: [
+          { required: true, message: "请选择", trigger: "blur" },
+        ],
+        isOpenExam: [{ required: true, message: "请选择", trigger: "blur" }],
+        isOpenVisitorClear: [
+          { required: true, message: "请选择", trigger: "blur" },
+        ],
         topTitle: [
           {
             required: true,
@@ -2125,6 +2197,10 @@ export default {
             name: "是否开启进出记录统计(true开启 false不开启)",
             value: "openInOutStatistics",
           },
+          {
+            name: "进出记录保留时间(单位/天)",
+            value: "faceLogHoldDays",
+          },
           { name: "二维码类型(0通用码 1员工码)", value: "codeType" },
           {
             name: "员工有效期(单位/天)",
@@ -2207,6 +2283,16 @@ export default {
         this.placeAreaCode_list = res.data;
       });
     },
+    getAppKeyAndAppSecret2(boole, row = {}) {
+      if (boole) {
+        let str = `privateKey: ${row.clockWayAdminAuthVO.privateKey}`;
+        let strData = new Blob([str], { type: "text/plain;charset=utf-8" });
+        saveAs(strData, boole ? "密钥.txt" : "文档.txt");
+      } else {
+        window.location.href =
+          "https://tx.hz-hanghui.com:8088/yx-fyzd/static/浙江通用打卡进出记录推送文档国密SM4ECB模式加密.zip";
+      }
+    },
     // 返回列表序号
     indexMethod(index) {
       return (this.page.pageNum - 1) * this.page.pageSize + index + 1;
@@ -2218,18 +2304,22 @@ export default {
 .table {
   margin-top: 15px;
 }
+
 .flex {
   width: 100%;
   display: flex;
   justify-content: flex-start;
   // align-items: center;
 }
+
 .margin-left {
   margin: 10px 0 0 10px;
 }
+
 .input {
   width: 150px;
 }
+
 /*批量导入按钮*/
 .file {
   margin: 10px 0 0 10px;
@@ -2244,6 +2334,7 @@ export default {
   text-decoration: none;
   text-indent: 0;
 }
+
 .file input {
   position: absolute;
   font-size: 14px;
@@ -2254,40 +2345,50 @@ export default {
   opacity: 0;
   cursor: pointer;
 }
+
 .file:hover {
   background: #aadffd;
   border-color: #78c3f3;
   color: #004974;
   text-decoration: none;
 }
+
 .custom-css {
   border: 1px solid #d6eaff;
   padding: 10px;
   border-radius: 10px;
   margin-bottom: 10px;
 }
+
 .custom-css-item {
   border-bottom: 2px dashed #e7ebf4;
   padding: 20px 5px 45px 20px;
 }
+
 .custom-css-item:last-child {
   border-bottom: none;
 }
+
 .height {
   height: 190px;
 }
+
 .float {
   float: right;
 }
+
 .margin-right {
   margin-right: 8px !important;
 }
+
 .margin-left-hs {
   margin-left: 30px;
 }
+
 .title {
   margin-top: 25px;
   margin-bottom: 5px;
+
   .line {
     width: 4px;
     height: 14px;
@@ -2296,6 +2397,7 @@ export default {
     display: inline-block;
     margin-right: 8px;
   }
+
   span {
     font-weight: 700;
     font-size: 17px;
@@ -2306,12 +2408,15 @@ export default {
 .item-margin-bottom {
   margin-bottom: 0px !important;
 }
+
 ::v-deep.el-form-item {
   margin-bottom: 15px;
 }
+
 ::v-deep.el-dialog__body {
   padding: 0 20px;
 }
+
 .margin0 {
   margin-bottom: 0px;
 }
@@ -2319,21 +2424,26 @@ export default {
 .address-width {
   width: 33.3%;
 }
+
 .avatar {
   /* width: 100px; */
   height: 100px;
 }
+
 ::v-deep.upload-demo {
   display: flex;
+
   .el-upload-list {
     display: none !important;
   }
 }
+
 .upload-img {
   width: 100px;
   height: 100px;
   position: relative;
   margin-bottom: 20px;
+
   img {
     width: 100%;
     height: 100%;
@@ -2341,18 +2451,21 @@ export default {
     // border-radius: 12px;
   }
 }
+
 .upload-img1 {
   width: 253px;
   height: 91px;
   border: 1px solid #d6eaff;
   box-sizing: border-box;
 }
+
 .upload-img2 {
   width: 356px;
   height: 91px;
   border: 1px solid #99d3f5;
   box-sizing: border-box;
 }
+
 .del-img {
   display: inline-block;
   width: 20px;
@@ -2373,6 +2486,7 @@ export default {
     padding-left: 10px;
   }
 }
+
 .el-dialog__body {
   padding: 0 20px 10px;
 }

+ 9 - 2
src/views/white_list/index.vue

@@ -276,7 +276,13 @@
         >导出记录</el-button
       >
     </el-tooltip>
-    <el-button
+    <el-tooltip
+      class="item"
+      effect="dark"
+      content="单次最多删除1万条"
+      placement="top-start"
+    >
+      <el-button
       type="danger"
       plain
       icon="el-icon-delete"
@@ -285,6 +291,7 @@
       v-if="checkRole([5]) && placeType != 2"
       >删除所有人员</el-button
     >
+    </el-tooltip>
     <a v-if="checkRole([5])" href="javascript:;" class="file"
       >批量编辑<input
         type="file"
@@ -1611,7 +1618,7 @@ export default {
               message: "密码正确,正在删除全部人员...",
             });
             this.downloadLoading = true;
-            deleteAll().then((res) => {
+            deleteAll(this.page.data).then((res) => {
               this.fetchData();
               this.$message({
                 type: "success",

Some files were not shown because too many files changed in this diff