From ddbad5a92fd4ae9d88f94dc1adacbf36d310d736 Mon Sep 17 00:00:00 2001 From: zzq <15064940501@163.com> Date: Sat, 11 May 2024 16:00:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/caseauditing/model/index.ts | 3 ++ .../demo/caseauditing/module/HandleCase.vue | 35 ++++++++++++++++--- .../demo/caseauditing/module/index.data.ts | 10 ++++-- src/views/demo/caseauditing/module/index.vue | 21 ++++++----- .../summaryverification/module/mapDetail.vue | 1 - 5 files changed, 55 insertions(+), 15 deletions(-) diff --git a/src/api/caseauditing/model/index.ts b/src/api/caseauditing/model/index.ts index a95ece7..88e6b27 100644 --- a/src/api/caseauditing/model/index.ts +++ b/src/api/caseauditing/model/index.ts @@ -24,6 +24,9 @@ export interface DemoOptionsItem { total: any; user: any; pics: any; + video_list?: any; + pic_info_list?: any; + remove_video_list?: any; } export interface OrgItemList { diff --git a/src/views/demo/caseauditing/module/HandleCase.vue b/src/views/demo/caseauditing/module/HandleCase.vue index 2997c19..8bfa026 100644 --- a/src/views/demo/caseauditing/module/HandleCase.vue +++ b/src/views/demo/caseauditing/module/HandleCase.vue @@ -50,7 +50,7 @@ 您的浏览器不支持Video标签。 - + @@ -294,7 +294,29 @@ - + +
+ +
+ + + +
@@ -533,11 +555,16 @@ if (res.boundary_pic_list.length > 0) { boundaryImageList.value = handleImageArray(res.boundary_pic_list); } - console.log('rrrr', res); - if (res.video_list) { + if (res.video_list.length > 0) { res.video_list.forEach((item) => { videoList.value.push('http://60.213.14.14:6070/' + item); }); + } else { + if (res.remove_video_list.length > 0) { + res.remove_video_list.forEach((item) => { + videoList.value.push('http://60.213.14.14:6070/' + item); + }); + } } }); } diff --git a/src/views/demo/caseauditing/module/index.data.ts b/src/views/demo/caseauditing/module/index.data.ts index f584a0e..700bf0d 100644 --- a/src/views/demo/caseauditing/module/index.data.ts +++ b/src/views/demo/caseauditing/module/index.data.ts @@ -107,14 +107,20 @@ export const formSchema: FormSchema[] = [ }, { field: 'identification_user', - label: '上报人:', + label: '判读人:', component: 'Input', dynamicDisabled: true, }, { field: 'identification_time', - label: '上报时间:', + label: '判读时间:', component: 'Input', dynamicDisabled: true, }, + { + field: 'remark', + label: '备注', + component: 'InputTextArea', + dynamicDisabled: true, + }, ]; diff --git a/src/views/demo/caseauditing/module/index.vue b/src/views/demo/caseauditing/module/index.vue index 9b73bab..597a109 100644 --- a/src/views/demo/caseauditing/module/index.vue +++ b/src/views/demo/caseauditing/module/index.vue @@ -212,7 +212,7 @@ delCaseCollection, getCollectionCaseList, getUserInfoData, - getCaseDataDetail, + getCaseDealDetail, getCaseList, caseAudiSteps, caseBackSteps, @@ -376,23 +376,28 @@ setFieldsValue(formData); }, 100); const param = { - id: record.id, + caseid: record.id, }; - getCaseDataDetail(param).then((res) => { + getCaseDealDetail(param).then((res) => { fileList.value = []; videoList.value = []; - if (res.pics) { - res.pics.forEach((item) => { + if (res.pic_info_list.length > 0) { + res.pic_info_list.forEach((item) => { fileList.value.push({ - url: 'http://60.213.14.14:6070/' + item.path, - id: item.id, + url: 'http://60.213.14.14:6070/' + item.filePath, }); }); } - if (res.video_list) { + if (res.video_list.length > 0) { res.video_list.forEach((item) => { videoList.value.push('http://60.213.14.14:6070/' + item); }); + } else { + if (res.remove_video_list.length > 0) { + res.remove_video_list.forEach((item) => { + videoList.value.push('http://60.213.14.14:6070/' + item); + }); + } } }); } diff --git a/src/views/demo/summaryverification/module/mapDetail.vue b/src/views/demo/summaryverification/module/mapDetail.vue index 92ae8da..55dc724 100644 --- a/src/views/demo/summaryverification/module/mapDetail.vue +++ b/src/views/demo/summaryverification/module/mapDetail.vue @@ -91,7 +91,6 @@ // 获取GeoJSON图层 async function loadCaseGeoJson() { const data = await getDroneGeoJson({ id: props.ruleForm.id }); - console.log(data); geojson.value = data; if (geojson.value.features.length == 0) { detailMap.value.addLayer({