diff --git a/src/api/caseManagement/index.js b/src/api/caseManagement/index.js index bf797b8..0842ee1 100644 --- a/src/api/caseManagement/index.js +++ b/src/api/caseManagement/index.js @@ -72,4 +72,21 @@ export function robotChat(data) { method: 'post', data }) +} +/** 批量恢复 */ +export function resetDataStatusByIds(data) { + return request({ + url: `/modelCase/resetDataStatusByIds`, + method: 'post', + data + }) +} + +/** 批量删除 */ +export function realDeleteByIds(data) { + return request({ + url: `/modelCase/realDeleteByIds`, + method: 'delete', + data + }) } \ No newline at end of file diff --git a/src/components/ConversationDialog/index.vue b/src/components/ConversationDialog/index.vue index df1c3b0..2388306 100644 --- a/src/components/ConversationDialog/index.vue +++ b/src/components/ConversationDialog/index.vue @@ -10,7 +10,6 @@ diff --git a/src/config/net.config.js b/src/config/net.config.js index 023ad03..f8258a8 100644 --- a/src/config/net.config.js +++ b/src/config/net.config.js @@ -5,7 +5,7 @@ const network = { // 默认的接口地址 如果是开发环境和生产环境走vab-mock-server,当然你也可以选择自己配置成需要的接口地址 baseURL: process.env.NODE_ENV === 'development' - ? 'http://192.168.10.27:8097/fu-hsi-server' + ? 'http://192.168.10.25:8097/fu-hsi-server' : '/fuHsiApi', // 配后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8 contentType: 'application/json;charset=UTF-8', diff --git a/src/layouts/components/TabsBar/index.vue b/src/layouts/components/TabsBar/index.vue index adc7a1d..6b77dbb 100644 --- a/src/layouts/components/TabsBar/index.vue +++ b/src/layouts/components/TabsBar/index.vue @@ -109,9 +109,9 @@ export default { if (Number(tab.index) === 0) { // 首页 this.$router.push({ - path: '/index', + path: '/case-management', query: {}, - fullPath: '/index' + fullPath: '/case-management' }) return } diff --git a/src/plugins/index.js b/src/plugins/index.js index 958bc1a..7f66492 100644 --- a/src/plugins/index.js +++ b/src/plugins/index.js @@ -12,7 +12,6 @@ import '@/utils/errorLog' import Auth from '@/directive/auth' import clickoutside from '@/directive/clickoutside' - // 注册全局逐渐 import Dw from './register' // 注册el组件消息提醒 @@ -21,3 +20,21 @@ Vue.use(ElMe) Vue.directive('auth', Auth) Vue.directive('clickoutside', clickoutside) Vue.use(Dw) +Vue.directive('debounce', { + // 当被绑定的元素插入到 DOM 中时…… + inserted: function(el, binding) { + // binding.value,使用自定义指令v-debounce时填写的参数 + // 解构赋值,定义了3个变量,将参数(数组)按顺序进行赋值 + const [fn, event = 'click', time = 300] = binding.value + let timer + el.addEventListener(event, () => { + // 默认监听的事件为click + // 判断计时器是否存在,存在则清除计时器。重新创建计时器,到时间后执行函数fn + if (timer) { + clearTimeout(timer) + } + timer = setTimeout(() => fn(), time) + }) + } +}) + diff --git a/src/router/index.js b/src/router/index.js index 978a1e2..c991cb6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -68,7 +68,14 @@ export const asyncRoutes = [ name: 'CaseManagement', permission: 'p_caseManagement', component: () => import('@/views/caseManagement/index.vue'), - meta: { title: '案件管理', affix: false } + meta: { title: '经侦案件', affix: false, subtitle: '模型可分析处理的活跃有效案件数据' } + }, + { + path: '/case-recovery', + name: 'CaseRecovery', + permission: 'p_caseRecovery', + component: () => import('@/views/caseManagement/caseRecovery/index.vue'), + meta: { title: '案件回收', affix: false, subtitle: '已删除案件数据的回收站' } } ] }, diff --git a/src/views/caseDetails/components/CaseEvidence.vue b/src/views/caseDetails/components/CaseEvidence.vue index 0bf8e17..495bd5c 100644 --- a/src/views/caseDetails/components/CaseEvidence.vue +++ b/src/views/caseDetails/components/CaseEvidence.vue @@ -63,7 +63,7 @@ export default { { title: '证据名称', field: 'evidenceName' }, { title: '证据类型', field: 'evidenceTypeDesc' }, // { title: '证件文件', field: 'confessionMaterial' }, - { title: '最新时间', field: 'createTime' }, + { title: '最新时间', field: 'updateTime' }, { title: '操作', slots: { default: 'opera' }, fixed: 'right', width: '100px' } ], data: [{}] diff --git a/src/views/caseDetails/components/CaseRecord.vue b/src/views/caseDetails/components/CaseRecord.vue index 396d800..f610ca6 100644 --- a/src/views/caseDetails/components/CaseRecord.vue +++ b/src/views/caseDetails/components/CaseRecord.vue @@ -14,7 +14,7 @@ 添加笔录 文档笔录 - 图像笔录 + 添加人员 @@ -38,7 +38,7 @@ /> - + @@ -95,7 +95,7 @@ export default { { title: '进度', field: 'percentage' }, { title: '供述开始时间', field: 'confessionStartTime' }, { title: '供述结束时间', field: 'confessionEndTime' }, - { title: '最新时间', field: 'createTime' }, + { title: '最新时间', field: 'updateTime' }, { title: '操作', slots: { default: 'opera' }, fixed: 'right', width: '200px' } ], data: [{ name: '裴金禄', '笔录序号': '1', roleName: '被害人', confessionMaterial: '3', questioner: '1', startTime: '2024/6/26', newDate: '2024/6/26', endTime: '2024/6/26' }] diff --git a/src/views/caseDetails/components/edit/EditEvidence.vue b/src/views/caseDetails/components/edit/EditEvidence.vue index 0eb26b8..cbd5a47 100644 --- a/src/views/caseDetails/components/edit/EditEvidence.vue +++ b/src/views/caseDetails/components/edit/EditEvidence.vue @@ -107,7 +107,8 @@ export default { data.fileList.forEach(e => { list.push(e.fileId) this.fileList.push({ - name: e.fileName + name: e.fileName, + fileId: e.fileId }) }) this.evidenceForm.fileIdList = list @@ -156,7 +157,7 @@ export default { handleRemove(file, uploadFiles) { const list = [] for (const item of uploadFiles) { - list.push(item.response.data) + list.push(item.fileId) } this.evidenceForm.fileIdList = list }, diff --git a/src/views/caseManagement/caseRecovery/index.vue b/src/views/caseManagement/caseRecovery/index.vue new file mode 100644 index 0000000..44b446b --- /dev/null +++ b/src/views/caseManagement/caseRecovery/index.vue @@ -0,0 +1,205 @@ + + + + + + diff --git a/src/views/caseManagement/components/EditCaseInfo.vue b/src/views/caseManagement/components/EditCaseInfo.vue index f9c03e9..0a004f1 100644 --- a/src/views/caseManagement/components/EditCaseInfo.vue +++ b/src/views/caseManagement/components/EditCaseInfo.vue @@ -48,6 +48,7 @@ diff --git a/src/views/caseManagement/index.vue b/src/views/caseManagement/index.vue index c575da7..4a36023 100644 --- a/src/views/caseManagement/index.vue +++ b/src/views/caseManagement/index.vue @@ -18,10 +18,10 @@ --> - +
- +
@@ -47,7 +47,7 @@ {{ `行为人:${item['caseActorName'] ? item['caseActorName'] : '-'}` }} - + @@ -219,7 +219,7 @@ export default { }, // 删除 handleDel(item) { - this.$baseConfirm('确定要删除吗?', null, async() => { + this.$baseConfirm('删除案件信息后,可通过‘案件管理-案件回收’功能恢复案件', null, async() => { const { code, msg } = await delCaseInfo(item['id']) code === 200 ? this.$baseMessage.success(msg, '删除成功!') : this.$baseMessage.error(msg, '删除失败!') this.fetchData() @@ -296,7 +296,9 @@ export default { height: calc(100% - 32px - 32px - 20px); flex-wrap: wrap; .list-span { - width: 100%; + width: 100%; + // display: flex; + // flex-wrap: wrap; } .list-item { background: #F2F5F9; diff --git a/src/views/ruleEngine/atomicIndex/components/EditAtomic.vue b/src/views/ruleEngine/atomicIndex/components/EditAtomic.vue index f9f8fb7..a365117 100644 --- a/src/views/ruleEngine/atomicIndex/components/EditAtomic.vue +++ b/src/views/ruleEngine/atomicIndex/components/EditAtomic.vue @@ -128,6 +128,7 @@ export default { name: '', remark: '' }, + id: '', rules: { indexSource: [{ required: true, message: '指标算法不能为空!', trigger: 'blur' }], caseType: [{ required: true, message: '案件类型不能为空!', trigger: 'blur' }], @@ -148,6 +149,7 @@ export default { show(data, isEdit) { this.isEdit = isEdit this.drawerOption.show = true + this.id = isEdit ? data.id : '' this.$nextTick(() => { const _this = this const formData = data ? JSON.parse(JSON.stringify(data)) : { indexSource: '1' } @@ -165,6 +167,9 @@ export default { handleSubmit() { this.$refs.form.validate(async valid => { if (valid) { + if (this.isEdit) { + this.ruleForm.id = this.id + } const { code, msg } = await addOrUpdAtomicIndex(this.ruleForm) code === 200 ? (this.isEdit ? this.$baseMessage.success(msg || '编辑成功!') : this.$baseMessage.success(msg || '新增成功!')) : (this.isEdit ? this.$baseMessage.error(msg || '新增失败!') : this.$baseMessage.error(msg || '新增失败!')) this.drawerOption.show = false diff --git a/src/views/system/accountManagement/components/AccountManagement.vue b/src/views/system/accountManagement/components/AccountManagement.vue index 5c083ee..20ba10b 100644 --- a/src/views/system/accountManagement/components/AccountManagement.vue +++ b/src/views/system/accountManagement/components/AccountManagement.vue @@ -81,7 +81,7 @@ export default { fetchData() { getUserList({ ...this.searchFormData, - pageNumber: this.queryForm.page, + pageNum: this.queryForm.page, pageSize: this.queryForm.size }).then(res => { this.gridOptions.data = res.data.records @@ -90,7 +90,7 @@ export default { }, queryRoleList() { getRoleList({ - pageNumber: 1, + pageNum : 1, pageSize: 999 }).then(res => { const list = [] diff --git a/src/views/system/accountManagement/components/AuthorityManagement.vue b/src/views/system/accountManagement/components/AuthorityManagement.vue index d92559b..432ed5a 100644 --- a/src/views/system/accountManagement/components/AuthorityManagement.vue +++ b/src/views/system/accountManagement/components/AuthorityManagement.vue @@ -70,7 +70,7 @@ export default { fetchData() { getRoleList({ roleName: this.searchFormData.roleName, - pageNumber: this.queryForm.page, + pageNum: this.queryForm.page, pageSize: this.queryForm.size }).then(res => { this.gridOptions.data = res.data.records diff --git a/src/views/system/accountManagement/components/EditAccount.vue b/src/views/system/accountManagement/components/EditAccount.vue index 89a84fd..fd9a72f 100644 --- a/src/views/system/accountManagement/components/EditAccount.vue +++ b/src/views/system/accountManagement/components/EditAccount.vue @@ -124,7 +124,7 @@ export default { // 查询角色 queryRole() { getRoleList({ - pageNumber: 1, + pageNum : 1, pageSize: 999999 }).then(res => { this.roleOptions = res.data.records