diff --git a/src/api/caseDetails/index.js b/src/api/caseDetails/index.js index e961a25..138cd16 100644 --- a/src/api/caseDetails/index.js +++ b/src/api/caseDetails/index.js @@ -176,3 +176,11 @@ export function redoExtract(data) { data }) } +/** 批量删除证据 */ +export function batchDeleteEvidence(data) { + return request({ + url: `/caseEvidence/batchDeleteEvidence`, + method: 'delete', + data + }) +} \ No newline at end of file diff --git a/src/config/net.config.js b/src/config/net.config.js index b717749..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.138: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/router/index.js b/src/router/index.js index 75e2f3a..418d709 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -217,7 +217,7 @@ export const asyncRoutes = [ meta: { title: '上传图像证据', affix: true } }, { - path: '/edit-evidence/:id', + path: '/edit-evidence/:id/:evidenceId', name: 'EditEvidence', permission: 'p_caseDetails', component: () => import('@/views/caseDetails/components/EditEvidence/index.vue'), diff --git a/src/views/caseDetails/components/AddEvidence/MoveFolder.vue b/src/views/caseDetails/components/AddEvidence/MoveFolder.vue index 1fc17a3..28bb249 100644 --- a/src/views/caseDetails/components/AddEvidence/MoveFolder.vue +++ b/src/views/caseDetails/components/AddEvidence/MoveFolder.vue @@ -12,10 +12,12 @@ placeholder="搜索名称" /> @@ -47,11 +49,20 @@ export default { } }, + watch: { + filterText(val) { + this.$refs.tree.filter(val) + } + }, mounted() { }, methods: { // 显示弹窗 + filterNode(value, data) { + if (!value) return true + return data.directoryName.indexOf(value) !== -1 + }, show() { this.dialogOptions.show = true this.getTreeList() diff --git a/src/views/caseDetails/components/AddEvidence/components/DelFolder.vue b/src/views/caseDetails/components/AddEvidence/components/DelFolder.vue new file mode 100644 index 0000000..d48bcea --- /dev/null +++ b/src/views/caseDetails/components/AddEvidence/components/DelFolder.vue @@ -0,0 +1,124 @@ + + + + + + diff --git a/src/views/caseDetails/components/AddEvidence/components/EvidenceConfirm.vue b/src/views/caseDetails/components/AddEvidence/components/EvidenceConfirm.vue index b411deb..9cf6f81 100644 --- a/src/views/caseDetails/components/AddEvidence/components/EvidenceConfirm.vue +++ b/src/views/caseDetails/components/AddEvidence/components/EvidenceConfirm.vue @@ -68,8 +68,15 @@ - - + + + + + + + + + @@ -100,8 +107,15 @@ - - + + + + + + + + + @@ -132,7 +146,7 @@
-
确认并提交
+
确认并提交
保存
重置
@@ -163,7 +177,7 @@ export default { label: 'directoryName' }, rules: { - title: [{ required: true, message: '证据名称不能为空!', trigger: 'blur' }] + evidenceName: [{ required: true, message: '证据名称不能为空!', trigger: 'blur' }] }, treeData: [], flag: true, @@ -171,7 +185,8 @@ export default { selectInfo: { evidenceInfo: { property: [], - title: '' + title: '', + evidenceName:'' }, ocrText: '' } @@ -204,7 +219,7 @@ export default { if (res.code === 200) { this.treeData = res.data this.$nextTick(() => { - this.handleNodeClick(res.data[0]) + this.initializateSelection() }) } }) @@ -229,6 +244,11 @@ export default { } return null }, + // 初始化选择 + initializateSelection() { + const nodeItem = this.getFileList(this.treeData) + this.handleNodeClick(nodeItem) + }, // 获取有文件的list getFileList(nodes) { for (const node of nodes) { @@ -247,16 +267,16 @@ export default { // this.selectId = data.id this.navList = [] this.navList = this.getParentNames(data, this.treeData) - const nodeItem = this.getFileList(this.treeData) - if (nodeItem.evidenceInfo) { + + if (data.evidenceInfo) { this.level = '3' - this.evidenceInfo = nodeItem.evidenceInfo + this.evidenceInfo = data.evidenceInfo } else { this.level = '2' } - this.selectList = nodeItem.fileInfoList + this.selectList = data.fileInfoList this.selectInfo = this.selectList[0] - this.selectId = nodeItem.id + this.selectId = data.id this.navList.push(data.directoryName) this.$refs.tree.setCurrentKey(this.selectId) }, @@ -264,9 +284,9 @@ export default { for (const item of nodes) { if (item.fileInfoList.length > 0) { for (let i = 0; i < item.fileInfoList.length; i++) { - if (!item.fileInfoList[i].evidenceInfo.title) { + if (!item.fileInfoList[i].evidenceInfo.evidenceName) { this.handleNodeClick(item) - this.selectItem(item.fileInfoList[i]) + this.selectItem(i) this.flag = false break } @@ -279,34 +299,40 @@ export default { handleAdd() { this.$refs.add.show() }, + submit() { + caseEvidenceVerify({ + batchNo: this.$route.query.recordId, + caseId: this.$route.params.id, + evidenceDirectoryList: this.treeData + }).then(res => { + if (res.code === 200) { + this.$baseMessage.success(res.msg || '保存成功!') + this.$store.dispatch( + 'tabsBar/delRoute', + this.$route + ) + this.$router.push({ path: `/case-details/${this.$route.params.id}/${this.$route.query.caseName}`, query: { isEdit: 1,currentKey: '1-2', caseNo: this.$route.query.caseNo }}) + } + }) + }, save() { - this.checkEvidence(this.treeData) - if (this.flag) { - caseEvidenceVerify({ - batchNo: this.$route.query.recordId, - caseId: this.$route.params.id, - evidenceDirectoryList: this.treeData - }).then(res => { - if (res.code === 200) { - this.$baseMessage.success(res.msg || '保存成功!') - this.$store.dispatch( - 'tabsBar/delRoute', - this.$route - ) - this.$router.push({ path: `/case-details/${this.$route.params.id}/${this.$route.query.caseName}`, query: { isEdit: 1, caseNo: this.$route.query.caseNo }}) - } - }) + if (this.level === '2') { + this.checkEvidence(this.treeData) + if (this.flag) { + this.submit() + } else { + this.$baseMessage.error('证据不能为空!') + } } else { - this.$baseMessage.error('证据不能为空!') + if (this.evidenceInfo.evidenceName) { + this.submit() + } else { + this.$baseMessage.error('证据不能为空!') + } } }, handleDragEnd() { this.findNodeById(this.treeData, this.selectId) - }, - submit() { - console.log('2323', this.selectList) - this.save() - this.$emit('submit') } } } @@ -427,7 +453,8 @@ export default { border-radius: 8px 8px 8px 8px; margin-left: 24px; overflow-y: auto; - // height: calc(100vh - 350px); + height: calc(100vh - 460px); + overflow: auto; padding: 0 24px; margin-bottom: 72px; .expand { diff --git a/src/views/caseDetails/components/AddEvidence/components/EvidenceExtract.vue b/src/views/caseDetails/components/AddEvidence/components/EvidenceExtract.vue index 1aa3161..d3e17ab 100644 --- a/src/views/caseDetails/components/AddEvidence/components/EvidenceExtract.vue +++ b/src/views/caseDetails/components/AddEvidence/components/EvidenceExtract.vue @@ -8,7 +8,7 @@