From 79c5faee02f09e33274e975f3923cb113583cb6a Mon Sep 17 00:00:00 2001 From: Zhufu <1176354795@qq.com> Date: Sun, 4 Aug 2024 17:21:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=B2=AE=E5=8C=96=E4=B8=93=E9=A2=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/degraining/index.ts | 44 ++- .../changearea/AuditProgress/index.vue | 262 ------------------ .../degraining/changearea/MapList/amend.vue | 6 +- .../degraining/changearea/MapList/index.vue | 11 +- .../demo/degraining/changearea/index.vue | 107 +------ .../MapList/SplitPolygonModal/index.vue | 4 +- src/views/demo/tiankongdi/util.ts | 2 +- 7 files changed, 41 insertions(+), 395 deletions(-) delete mode 100644 src/views/demo/degraining/changearea/AuditProgress/index.vue diff --git a/src/api/degraining/index.ts b/src/api/degraining/index.ts index d8072a75..2cd82455 100644 --- a/src/api/degraining/index.ts +++ b/src/api/degraining/index.ts @@ -1,23 +1,29 @@ import { defHttp } from '@/utils/http/axios'; enum Api { - // 非法采矿接收办理 - LoadCaiKuangTaskList = '/api/DroneCaseInfoSatellite/LoadCaiKuangTaskList', + // 非粮化 接收办理 和图斑调整 + LoadCaiKuangTaskList = '/api/DroneCaseInfoFLH/LoadFLHTaskList', // 添加收藏 - AddCaiKuangTaskFavorite = '/api/DroneCaseInfoSatellite/AddCaiKuangTaskFavorite', + AddCaiKuangTaskFavorite = '/api/DroneCaseInfoFLH/LoadFLHTaskList', // 取消收藏 - DeleteCaiKuangTaskCase = '/api/DroneCaseInfoSatellite/DeleteCaiKuangTaskCase', - // 非法采矿图斑列表 - LoadCaseInfoWpxfTuBanList = '/api/DroneCaseInfoSatellite/LoadCaseInfoWpxfTuBanList', - // 非法采矿填报审核第一层 - LoadReportCaseCount = '/api/DroneCaseInfoSatellite/LoadReportCaseCount', - // 非法采矿填报审核第二层 - LoadTaskDetailList = '/api/DroneCaseInfoSatellite/LoadTaskDetailList', - // 非法采矿整改审核第一层 - LoadReformCaseCount = '/api/DroneCaseInfoSatellite/LoadReformCaseCount', - // 非法采矿整改审核第二层 - LoadTaskIllegalDetailList = '/api/DroneCaseInfoSatellite/LoadTaskIllegalDetailList', + DeleteCaiKuangTaskCase = '/api/DroneCaseInfoFLH/DeleteFLHTaskCase', + // 非粮化 图斑列表 + LoadCaseInfoWpxfTuBanList = '/api/DroneCaseInfoFLH/LoadCaseInfoTuBanList', + // 非粮化 填报审核第一层 + LoadReportCaseCount = '/api/DroneCaseInfoFLH/LoadTaskCount', + // 非粮化 填报审核第二层 + LoadTaskDetailList = '/api/DroneCaseInfoFLH/LoadTaskDetailList', + // 非粮化 整改审核第一层 + LoadReformCaseCount = '/api/DroneCaseInfoFLH/LoadTaskCount', + // 非粮化 整改审核第二层 + LoadTaskIllegalDetailList = '/api/DroneCaseInfoFLH/LoadTaskIllegalDetailList', // 案件详情 - GetCaseInfoById = '/api/DroneCaseInfoSatellite/GetCaseInfoById', + GetCaseInfoById = '/api/DroneCaseInfoFLH/GetCaseInfoById', + // 非粮化 图斑调整 更新案件行政区划 + UpdateDroneCaseInfo = '/api/DroneCaseInfoFLH/UpdateDroneCaseInfo', + // 分割还原 + CaseRecover = '/api/DroneCaseInfoFLH/CaseRecover', + // 图斑分割 + CaseSplit = '/api/DroneCaseInfoFLH/CaseSplit', } export function LoadCaiKuangTaskList(params) { return defHttp.get({ url: Api.LoadCaiKuangTaskList, params }); @@ -48,4 +54,12 @@ export function LoadReformCaseCount(params) { } export function GetCaseInfoById(params?: { id: string }) { return defHttp.get({ url: Api.GetCaseInfoById, params }); +} +export const UpdateDroneCaseInfo = (params) => + defHttp.post({ url: Api.UpdateDroneCaseInfo, params }); +export function CaseRecover(params){ + return defHttp.post({ url: Api.CaseRecover, data: params }); +} +export function CaseSplit(params){ + return defHttp.post({ url: Api.CaseSplit, data: params }); } \ No newline at end of file diff --git a/src/views/demo/degraining/changearea/AuditProgress/index.vue b/src/views/demo/degraining/changearea/AuditProgress/index.vue deleted file mode 100644 index 0a2a66a7..00000000 --- a/src/views/demo/degraining/changearea/AuditProgress/index.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - - - diff --git a/src/views/demo/degraining/changearea/MapList/amend.vue b/src/views/demo/degraining/changearea/MapList/amend.vue index bfe6ea08..729769ea 100644 --- a/src/views/demo/degraining/changearea/MapList/amend.vue +++ b/src/views/demo/degraining/changearea/MapList/amend.vue @@ -100,7 +100,7 @@ import { ref, reactive, onMounted, defineProps, watch } from 'vue'; import { BasicModal, useModalInner } from '@/components/Modal'; import { useMessage } from '@/hooks/web/useMessage'; - import { updateDroneCaseInfo, getCaseInfoById } from '@/api/tiankongdi/index.ts'; + import { UpdateDroneCaseInfo, GetCaseInfoById } from '@/api/degraining/index.ts'; import { getChildrenTree } from '@/api/demo/system.ts'; const { createMessage } = useMessage(); defineOptions({ name: 'AccountModal' }); @@ -144,7 +144,7 @@ (newVal, oldVal) => {}, ); async function getDetail(id) { - const data = await getCaseInfoById({ + const data = await GetCaseInfoById({ id: id, }); formState.value = data; @@ -215,7 +215,7 @@ // communityname: formState.value.communityname, }; console.log(querys); - const data = await updateDroneCaseInfo(querys); + const data = await UpdateDroneCaseInfo(querys); console.log(data); if (data) { // closeModal(); diff --git a/src/views/demo/degraining/changearea/MapList/index.vue b/src/views/demo/degraining/changearea/MapList/index.vue index 8c1f393f..b212421b 100644 --- a/src/views/demo/degraining/changearea/MapList/index.vue +++ b/src/views/demo/degraining/changearea/MapList/index.vue @@ -297,7 +297,7 @@ import { ref, onMounted, defineEmits, computed, h } from 'vue'; import { SearchOutlined, DownOutlined, SendOutlined } from '@ant-design/icons-vue'; import Icon from '@/components/Icon/Icon.vue'; -import { getLoadDroneCaseInfoDetail, getCaseInfoById } from '@/api/tiankongdi/index'; +import { LoadCaiKuangTaskList, GetCaseInfoById, CaseRecover } from '@/api/degraining/index'; import { batchOptions, yearOptions, @@ -307,7 +307,6 @@ import Amend from './amend.vue'; import { Empty, message,Modal } from 'ant-design-vue'; import ShowInfoModal from '@/views/demo/degraining/curbspotcity/MapList/ShowInfoModal/index.vue'; import SplitPolygonModal from '@/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue'; -import {recoverCase} from '@/api/tiankongdi' import { flowStore } from '@/store/modules/flow'; import { getDetail } from '@/api/sys/WFSchemeInfo'; import { Audit } from '@/views/demo/workflow/task/process/page'; @@ -418,7 +417,7 @@ const mapListScreenChange = (value, type) => { }; const getInfoList = () => { emits('changeSpin', true); - getLoadDroneCaseInfoDetail(infoScreenData.value) + LoadCaiKuangTaskList(infoScreenData.value) .then((res) => { infoDataList.value = res.items; total.value = res.total; @@ -478,7 +477,7 @@ const handlerRevertPolygon = (item)=>{ ], "type": 0, }; - recoverCase(params).then(res=>{ + CaseRecover(params).then(res=>{ if(res){ message.info(res); getInfoList(); @@ -488,7 +487,7 @@ const handlerRevertPolygon = (item)=>{ }) } const handlerSplitPolygon = (item) => { - getCaseInfoById({id:item.processid}).then(res => { + GetCaseInfoById({id:item.processid}).then(res => { if(res){ showInfoData.value = res showInfoData.value['processid'] = item.processid; @@ -540,7 +539,7 @@ async function goAudit(record) { } const showInfo = (item) => { - getCaseInfoById({ id: item.processid }).then((res) => { + GetCaseInfoById({ id: item.processid }).then((res) => { showInfoData.value = res; showInfoOpen.value = true; }); diff --git a/src/views/demo/degraining/changearea/index.vue b/src/views/demo/degraining/changearea/index.vue index 45239205..98723819 100644 --- a/src/views/demo/degraining/changearea/index.vue +++ b/src/views/demo/degraining/changearea/index.vue @@ -2,43 +2,7 @@
- - - - (); const batch = ref(); - const dataList = ref([]); const infoDataList = ref([]); const infoScreenData = ref({ year: '', @@ -124,22 +80,6 @@ const municipalAreaOptions = ref([{ label: '全部', value: '' }]); const countiesAreaOptions = ref([{ label: '全部', value: '' }]); const cityType = ref(); - const auditProgressScreenChange = (value, type) => { - switch (type) { - case 'year': - year.value = value; - break; - case 'batch': - batch.value = value; - break; - } - let params = { - year: year.value, - }; - getLoadDroneCaseInfoCount(params).then((res) => { - dataList.value = res; - }); - }; const mapListScreenChange = (value, type) => { switch (type) { case 'year': @@ -181,29 +121,6 @@ break; } }; - const changeShowInfo = (value, item) => { - showInfo.value = value; - if (item) { - cityType.value = 0; - // cityType.value = item; - // infoScreenData.value.countyId = item.areaid; - - // municipalAreaOptions.value = [{ label: item.areaname, value: item.areaid }]; - // getChildrenTree({ parentId: item.areaid }).then((res) => { - // res.forEach((cityItem) => { - // countiesAreaOptions.value.push({ - // label: cityItem.name, - // value: cityItem.id, - // }); - // }); - // }); - - // console.log("countiesAreaOptions",municipalAreaOptions,countiesAreaOptions) - // debugger - } else { - cityType.value = 0; - } - }; const getParams = () => { let result = {}; @@ -249,32 +166,10 @@ onMounted(() => { mapboxgl.accessToken = MapboxConfig.ACCESS_TOKEN; // map = initMap(); - getLoadDroneCaseInfoCount() - .then((res) => { - dataList.value = res; - }) - .catch((err) => { - console.log(err); - }); - - changeShowInfo(true, null); }); onUnmounted(() => { map && map.remove(); }); - const initMap = () => { - return new mapboxgl.Map({ - container: 'showMap', - language: 'zh-cmn', - projection: 'equirectangular', // wgs84参考系 - style: MapboxDefaultStyle, - maxZoom: 22, - minZoom: 6, - zoom: 10, - // ...props.mapOptions, - center: [117.984425, 35.270654], - }); - }; const changeInfoPage = (page, limit) => { pageNo.value = page; diff --git a/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue index 228e7977..2af93a25 100644 --- a/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -457,7 +457,7 @@ import MapboxMap from '@/components/MapboxMaps/MapComponent.vue'; import { getConfig } from '@/api/sys/layerManagement'; import { getGeom } from '@/api/sys/layerManagement'; - import { splitCase } from '@/api/tiankongdi'; + import { CaseSplit } from '@/api/degraining/index'; import { useMessage } from '@/hooks/web/useMessage'; const { createMessage } = useMessage(); import Icon from '@/components/Icon/Icon.vue'; @@ -826,7 +826,7 @@ params.parts.push(polygon); }); - splitCase(params).then((res) => { + CaseSplit(params).then((res) => { if (res) { createMessage.success('操作成功！'); emits('closeModal'); diff --git a/src/views/demo/tiankongdi/util.ts b/src/views/demo/tiankongdi/util.ts index 930121d4..ef8d37cb 100644 --- a/src/views/demo/tiankongdi/util.ts +++ b/src/views/demo/tiankongdi/util.ts @@ -13,10 +13,10 @@ export const dataProcessing = (value) => { } }; export const dataProcessingCount = (value) => { - value = value.toString() if (!value) { return 0; } + value = value.toString() if (value.indexOf('.') == -1) { return value; } else {