diff --git a/src/api/demo/system.ts b/src/api/demo/system.ts index c3139301..60279a24 100644 --- a/src/api/demo/system.ts +++ b/src/api/demo/system.ts @@ -144,8 +144,12 @@ enum Api { UpdateCxjgData = '/api/DroneCaseInfoSingle/UpdateCxjgData', // 持续监管-审核 CheckCxjgPic = '/api/DroneCaseInfoSingle/CheckCxjgPic', + // 持续监管-详情 + GetCxjgCaseInfoById = '/api/DroneCaseInfoSingle/GetCxjgCaseInfoById', // 持续监管-迁入违法专题 - MoveInIllegalSubejct = '/api/DroneCaseInfoSingle/MoveInIllegalSubejct', + MoveInIllegalSubject = '/api/DroneCaseInfoSingle/MoveInIllegalSubject', + // 持续监管-导出 + ExportCaseInfoCxjgShapefile = '/api/DroneCaseInfoSingle/ExportCaseInfoCxjgShapefile', } export const getPositionsTree = (params?: AccountParams) => defHttp.get({ url: Api.PositionsTree, params }); @@ -548,6 +552,12 @@ export const UpdateCxjgData = (params) => // 持续监管-审核 export const CheckCxjgPic = (params) => defHttp.get({ url: Api.CheckCxjgPic, params }); +// 持续监管-详情 +export const GetCxjgCaseInfoById = (params) => + defHttp.get({ url: Api.GetCxjgCaseInfoById, params }); // 持续监管-迁入违法专题 -export const MoveInIllegalSubejct = (params) => - defHttp.post({ url: Api.MoveInIllegalSubejct, params }); \ No newline at end of file +export const MoveInIllegalSubject = (params) => + defHttp.post({ url: Api.MoveInIllegalSubject, params }); +// 持续监管-导出 +export const ExportCaseInfoCxjgShapefile = (params) => + defHttp.post({ url: Api.ExportCaseInfoCxjgShapefile, params }); \ No newline at end of file diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue index 8f80af2c..e871496e 100644 --- a/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue +++ b/src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue @@ -228,7 +228,11 @@ - 转入违法用地 + + 转入违法用地 + - - - - - + + + + + + + +
+ + 按顺序全选 + +
+
+ + + +
+ @@ -469,7 +509,7 @@ import { defineProps, ref, computed, onBeforeMount, watch } from 'vue'; import MapboxMap from '@/components/MapboxMaps/MapComponent.vue'; import { getConfig, getGeom } from '@/api/sys/layerManagement'; - import { MoveInIllegalSubejct } from '@/api/demo/system'; + import { MoveInIllegalSubject } from '@/api/demo/system'; import { getLoadCaseImgList } from '@/api/tiankongdi'; import { useMessage } from '@/hooks/web/useMessage'; import axios from 'axios'; @@ -491,11 +531,11 @@ const MapboxComponent = ref(); const mapConfig = ref({}); - const props = defineProps(['showInfoData','hiddenInfoMap']); + const props = defineProps(['showInfoData', 'hiddenInfoMap']); const activeKey = ref('1'); const geomsList = ref(); const imageList = ref([]); - console.log('props',props.showInfoData) + console.log('props', props.showInfoData); watch( () => props.showInfoData, () => { @@ -506,7 +546,10 @@ }, ); async function getCaseImgList() { - imageList.value = await getLoadCaseImgList({ caseid: props.showInfoData.id,category:'违法用地' }); + imageList.value = await getLoadCaseImgList({ + caseid: props.showInfoData.id, + category: '违法用地', + }); MapboxComponent.value.handlerLoadPictureAzimuth(imageList.value); // 匹配去除无效图片 @@ -544,18 +587,18 @@ if (e && !isInitImageLisener.value) { setTimeout(function () { const targetNode = document.getElementsByClassName('ant-image-preview-img'); - targetNode?.forEach((node,index)=>{ - let imageObserver = new MutationObserver((mutationsList)=>{ - for(const mutation of mutationsList){ - if (node.getAttribute(mutation.attributeName).match('http')){ + targetNode?.forEach((node, index) => { + let imageObserver = new MutationObserver((mutationsList) => { + for (const mutation of mutationsList) { + if (node.getAttribute(mutation.attributeName).match('http')) { handlerPreviewImage(0, node.getAttribute(mutation.attributeName)); } } - }) + }); const config = { attributes: true }; imageObserver.observe(node, config); isInitImageLisener.value = true; - }) + }); }, 250); } } @@ -691,22 +734,22 @@ import FilePreview from '@/components/Upload/src/components/FilePreview.vue'; const previewFileModalVisible = ref(false); - const previewFileUrl = ref(""); + const previewFileUrl = ref(''); - const hanlderPreViewFile = (url)=>{ + const hanlderPreViewFile = (url) => { previewFileUrl.value = `${VITE_GLOB_INFO_IMAGE_URL}/${url}`; previewFileModalVisible.value = true; - } + }; - const handlerDownloadFle = ()=>{ + const handlerDownloadFle = () => { window.open(previewFileUrl.value, 'mozillaTab'); - } + }; - const handleCancelPreviewFile = ()=>{ + const handleCancelPreviewFile = () => { previewFileModalVisible.value = false; - } + }; /////// - + const getContainer = () => { return document.getElementById('info-container'); }; @@ -734,12 +777,33 @@ // 是否是持续监察 const isKeepSupervision = window.location.href.includes('/tiankongdi/keepSupervision'); + // 图斑照片选择弹窗 + const moveInIllegalSubejctOpen = ref(false); + const moveList: any = ref([]); + function moveListAddOrRemove(value) { + if (moveList.value.includes(value)) { + moveList.value = moveList.value.filter((item) => item !== value); + } else { + moveList.value.push(value); + } + } + // 全选 + const moveListChecked = ref(false); + function moveListAllChoose(e) { + if (e.target.checked) { + moveList.value = props.showInfoData.casepic.split(','); + } else { + moveList.value = []; + } + } + // 转入违法用地 - const funMoveInIllegalSubejct = async () => { + const funMoveInIllegalSubject = async () => { let querys = { - caseId: props.showInfoData.id, + caseId: props.showInfoData.Id || props.showInfoData.id, + casepic: moveList.value.toString(), }; - await MoveInIllegalSubejct(querys).then((res) => { + await MoveInIllegalSubject(querys).then((res) => { if (res) { createMessage.success('转移成功！'); } @@ -817,4 +881,49 @@ overflow: auto; padding-right: 10px; } + + // 图斑照片选择 + .moveListAllChoose { + display: flex; + align-items: center; + justify-content: left; + margin-left: 30px; + height: 30px; + + // 页面不能被选中 + -webkit-user-select: none; /* Safari */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* IE/Edge */ + user-select: none; + } + + .moveModal { + position: relative; + margin-left: 24px; + margin-right: 24px; + width: 100%; + display: flex; + flex-wrap: wrap; + max-height: 600px; + overflow-y: auto; + + .moveList { + position: relative; + width: 120px; + height: 120px; + + .move { + position: absolute; + bottom: 5px; + right: 5px; + width: 20px; + height: 20px; + display: flex; + align-items: center; + justify-content: center; + background: red; + color: azure; + } + } + } diff --git a/src/views/demo/tiankongdi/keepSupervision/index.vue b/src/views/demo/tiankongdi/keepSupervision/index.vue index f8992c9f..c9a8157b 100644 --- a/src/views/demo/tiankongdi/keepSupervision/index.vue +++ b/src/views/demo/tiankongdi/keepSupervision/index.vue @@ -65,16 +65,6 @@ - -
- - 持续监管列表统计报表（execl） - - - 持续监管列表矢量数据（shp） - -
- import { ref, reactive, onMounted, watch } from 'vue'; import { BasicTable, useTable, TableAction } from '@/components/Table'; - import { LoadCaseInfoCxjgTuBanList, loadCaseInfoTuBanList } from '@/api/demo/system'; + import { + LoadCaseInfoCxjgTuBanList, + GetCxjgCaseInfoById, + ExportCaseInfoCxjgShapefile, + } from '@/api/demo/system'; import { PermissionBtn } from '@/components/PermissionBtn/index'; import { columns, searchFormSchema } from './keepSupervision.data'; import { getAppEnvConfig } from '@/utils/env'; @@ -176,7 +170,7 @@ }); const [registerTable, { setTableData, reload, clearSelectedRowKeys, setPagination, setLoading }] = useTable({ - title: '图斑列表', + title: '持续监管列表', dataSource: tableData.value, columns, rowKey: 'id', @@ -199,18 +193,13 @@ }); // 直接下载接口返回的二进制流 - function handleExport(exportType) { - console.log(searchParams); + function handleExport() { let params = { ...searchParams.value }; - let url = ''; - let fileName = ''; - if (exportType == 'excel') { - url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/ExportCaseInfoTuBanList'; - fileName = '图斑列表统计报表' + new Date().getTime() + '.xls'; - } else if (exportType == 'shp') { - url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/ExportCaseInfoShapefile'; - fileName = '图斑列表矢量数据' + new Date().getTime() + '.zip'; - } + delete params['page']; + delete params['limit']; + console.log(params); + let url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/ExportCaseInfoShapefile'; + let fileName = '图斑列表矢量数据' + new Date().getTime() + '.zip'; axios({ method: 'post', url: url, @@ -231,14 +220,13 @@ }); } - const open = ref(false); function onBtnClicked(domId) { switch (domId) { case 'btnUpload': uploadOpen.value = true; break; case 'btnExport': - open.value = true; + handleExport(); break; default: break; @@ -249,7 +237,7 @@ getDetailData(); } function getDetailData() { - getCaseInfoById({ id: showInfoId.value }).then((res) => { + GetCxjgCaseInfoById({ id: showInfoId.value }).then((res) => { showInfoData.value = res; showInfoOpen.value = true; }); diff --git a/src/views/demo/tiankongdi/keepSupervision/uploadModal.vue b/src/views/demo/tiankongdi/keepSupervision/uploadModal.vue index f55c45a8..df329806 100644 --- a/src/views/demo/tiankongdi/keepSupervision/uploadModal.vue +++ b/src/views/demo/tiankongdi/keepSupervision/uploadModal.vue @@ -71,14 +71,25 @@ 上传成功 上传失败 插入成功 - 插入失败 + 审核失败 -
+
+ + + + 审核图片 + + + 将上传成功的图片插入到数据库 @@ -93,6 +104,7 @@ import axios from 'axios'; import { UpdateCxjgData, CheckCxjgPic } from '@/api/demo/system'; import { uploadColumns } from './keepSupervision.data'; + import { message } from 'ant-design-vue'; const { VITE_GLOB_INFO_IMAGE_URL } = getAppEnvConfig(); @@ -179,14 +191,12 @@ ...fileList.value[index], status: 'updateSuccess', }; - return true; } else { // 审核失败 fileList.value[index] = { ...fileList.value[index], status: 'updateError', }; - return false; } } else { // 上传失败 @@ -194,7 +204,7 @@ ...fileList.value[index], status: 'updateError', }; - return false; + message.error('有未审核的图片，不允许上传'); } } catch (error) { console.error('上传或审核出错:', error); @@ -202,7 +212,28 @@ ...fileList.value[index], status: 'updateError', }; - return false; + } + } + + // 持续监管-图片审核 + async function funCheckCxjgPic() { + const list = fileList.value; + if (!list || list.length === 0) return; + for (let i = 0; i < list.length; i++) { + const item = list[i]; + if (item.status === 'updateError') { + // 等待上传完成并返回 true 后，再继续下一个循环 + let caseid = item.name.split('.').slice(0, -1).join('.'); + if (caseid.includes('_')) { + caseid = caseid.split('_').slice(0, 1).join('_'); + } + await CheckCxjgPic({ id: caseid }); + const index = fileList.value.findIndex((item) => item.uid === item.uid); + fileList.value[index] = { + ...fileList.value[index], + status: 'updateSuccess', + }; + } } } @@ -216,10 +247,11 @@ margin-left: 20px; margin-right: 20px; } - .update { + .updateDiv { position: absolute; bottom: 10px; right: 10px; + gap: 10px; } ::v-deep .ant-select-selection-item {