diff --git a/src/api/RegistVisitApi/RegistVisitApi.js b/src/api/RegistVisitApi/RegistVisitApi.js index c7756af..3a97e89 100644 --- a/src/api/RegistVisitApi/RegistVisitApi.js +++ b/src/api/RegistVisitApi/RegistVisitApi.js @@ -1,51 +1,87 @@ import request from '@/utils/request' -import { parseStrEmpty } from "@/utils/ruoyi"; -// 查询 列表 -export function BAApplyList(data,query) { - return request({ - url: '/bussiness/Apply/list', - method: 'post', - params: query, - data: data, - isEncrypt: false - }) -} -// 查询详情 -export function getBAApplyInfo(query) { - return request({ - url: '/bussiness/Apply/info?id=' + query, - method: 'get', - // params: query - }) +// 获取列表数据 +export const getVisitList = (data, params) => { + return request({ + url: '/visiting/visit/list', + method: 'post', + params, + data, + isEncrypt: false + }) } -// 新增 - -export function createBAApply(data) { - return request({ - url: '/bussiness/Apply/add', - method: 'post', - data: data, - isEncrypt: false - }) +// 新增访问记录 +export const addVisit = (data) => { + return request({ + url: '/visiting/visit/add', + method: 'post', + data, + isEncrypt: false + }) } -// 修改 -export function editBAApply(data) { - return request({ - url: '/bussiness/Apply/edit', - method: 'post', - data: data, - isEncrypt: false - }) +// 获取访问详情 +export const getVisitInfo = (id) => { + return request({ + method: 'get', + url: '/visiting/visit/info', + params: { + id: id + } + }) } -// 删除 -export function deleteBAApply(id) { - return request({ - url: '/bussiness/Apply/remove?ids=' + id, - method: 'post', - isEncrypt: false - }) +// 更新访问内容 +export const updateVisit = (data) => { + return request({ + method: 'post', + url: '/visiting/visit/edit', + data: data, + isEncrypt: false + }) } + +// 取消访问记录 +export const deleteVisit = (id) => { + return request({ + method: 'post', + url: '/visiting/visit/remove', + params: { + ids: id + } + }) +} + +// 获取来访登记列表 +export const getRegisterList = () => { + return request({ + url: '/visiting/visit/list_register_visitors', + method: 'get', + params: { + // since: dayjs().format('YYYY-MM-DD') + since: '2024-12-24' + }, + isEncrypt: false + }) +} + +// 获取历史上访列表 +export const getHistoryList = (code) => { + return request({ + method: 'get', + url: '/visiting/visit/list_visitor_history', + params: { + id_card: code + }, + isEncrypt: false + }) +} + +// 导出访问记录 +export const exportVisit = () => { + return request({ + method: 'post', + url: '/visiting/visit/export' + }) +} \ No newline at end of file diff --git a/src/api/system/menu.js b/src/api/system/menu.js index f6415c6..5a75539 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -38,7 +38,8 @@ export function addMenu(data) { return request({ url: '/system/menu', method: 'post', - data: data + data: data, + isEncrypt:false }) } diff --git a/src/components/DividerHeader/DividerHeader.vue b/src/components/DividerHeader/DividerHeader.vue index 93f7dc0..ad92c27 100644 --- a/src/components/DividerHeader/DividerHeader.vue +++ b/src/components/DividerHeader/DividerHeader.vue @@ -7,6 +7,9 @@ diff --git a/src/views/PoliceWork/RegistVisit/index.vue b/src/views/PoliceWork/RegistVisit/index.vue deleted file mode 100644 index 1cbc8b2..0000000 --- a/src/views/PoliceWork/RegistVisit/index.vue +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/views/PoliceWork/RegistVisit/components/AddEditRegistVisit.vue b/src/views/PoliceWork/RegisterVisit/components/AddEditRegistVisit.vue similarity index 100% rename from src/views/PoliceWork/RegistVisit/components/AddEditRegistVisit.vue rename to src/views/PoliceWork/RegisterVisit/components/AddEditRegistVisit.vue diff --git a/src/views/PoliceWork/RegistVisit/components/AddEditRegistVisitTable.vue b/src/views/PoliceWork/RegisterVisit/components/AddEditRegistVisitTable.vue similarity index 100% rename from src/views/PoliceWork/RegistVisit/components/AddEditRegistVisitTable.vue rename to src/views/PoliceWork/RegisterVisit/components/AddEditRegistVisitTable.vue diff --git a/src/views/PoliceWork/RegisterVisit/components/AddEditRegisterVisit.vue b/src/views/PoliceWork/RegisterVisit/components/AddEditRegisterVisit.vue new file mode 100644 index 0000000..89b10ad --- /dev/null +++ b/src/views/PoliceWork/RegisterVisit/components/AddEditRegisterVisit.vue @@ -0,0 +1,384 @@ + + + + + \ No newline at end of file diff --git a/src/views/PoliceWork/RegisterVisit/components/VisitHistory.vue b/src/views/PoliceWork/RegisterVisit/components/VisitHistory.vue new file mode 100644 index 0000000..93e2d43 --- /dev/null +++ b/src/views/PoliceWork/RegisterVisit/components/VisitHistory.vue @@ -0,0 +1,63 @@ + + + + + \ No newline at end of file diff --git a/src/views/PoliceWork/RegistVisit/components/VisitingHistoryInfo.vue b/src/views/PoliceWork/RegisterVisit/components/VisitingHistoryInfo.vue similarity index 100% rename from src/views/PoliceWork/RegistVisit/components/VisitingHistoryInfo.vue rename to src/views/PoliceWork/RegisterVisit/components/VisitingHistoryInfo.vue diff --git a/src/views/PoliceWork/RegistVisit/components/collapseTbale.vue b/src/views/PoliceWork/RegisterVisit/components/collapseTbale.vue similarity index 100% rename from src/views/PoliceWork/RegistVisit/components/collapseTbale.vue rename to src/views/PoliceWork/RegisterVisit/components/collapseTbale.vue diff --git a/src/views/PoliceWork/RegistVisit/components/upload.vue b/src/views/PoliceWork/RegisterVisit/components/upload.vue similarity index 65% rename from src/views/PoliceWork/RegistVisit/components/upload.vue rename to src/views/PoliceWork/RegisterVisit/components/upload.vue index 5636ca8..57e0580 100644 --- a/src/views/PoliceWork/RegistVisit/components/upload.vue +++ b/src/views/PoliceWork/RegisterVisit/components/upload.vue @@ -1,6 +1,7 @@ diff --git a/src/views/PoliceWork/RegisterVisit/index.vue b/src/views/PoliceWork/RegisterVisit/index.vue new file mode 100644 index 0000000..617e847 --- /dev/null +++ b/src/views/PoliceWork/RegisterVisit/index.vue @@ -0,0 +1,164 @@ + + + + + + \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index dd0caa9..6e637ef 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,16 +1,9 @@ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 2bed5e9..24c83b6 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -31,9 +31,9 @@ - + - + - - + + @@ -92,7 +92,7 @@ 重置 - + - + - @@ -197,11 +197,13 @@ - + - + @@ -227,18 +229,18 @@ - + - - + + @@ -248,8 +250,8 @@ - - + + @@ -277,7 +279,7 @@ /> - + - + @@ -299,37 +301,37 @@ - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -346,17 +348,18 @@ - - - - - - - 提示： - 法警归属部门必须选法警部，辅警归属部门必须选辅警部，法警负责人角色必须选法警(辅警)负责人，分管领导角色必须选单位领导 - - - + + + + + + + 提示： + 法警归属部门必须选法警部，辅警归属部门必须选辅警部，法警负责人角色必须选法警(辅警)负责人，分管领导角色必须选单位领导 + + + - + - - - - \ No newline at end of file +getDeptTree(); +getDeptList(); +getList(); + + + \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index 160588d..9cf8f06 100644 --- a/vite.config.js +++ b/vite.config.js @@ -45,7 +45,7 @@ export default defineConfig(({mode, command}) => { '/dev-api': { // target: 'http://192.168.3.10:18066', //耗子本地 - target: 'http://106.15.139.36:18066', //36 VPN 转发到 3 上 + target: 'http://106.15.139.36:18067', //36 VPN 转发到 3 上 changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, ''),