From 8dd7788edbdf71843c8609c24ba2d7c0c1bb6f11 Mon Sep 17 00:00:00 2001 From: helloxujingliang <3225043@qq.com> Date: Mon, 9 Sep 2024 17:04:30 +0800 Subject: [PATCH 1/4] pnpm install jszip; pnpm install shp.js --- src/components/MapboxMaps/MapComponent.vue | 24 +++--- src/components/MapboxMaps/lib/splitpolygon.ts | 75 ++++++------------- src/components/MapboxMaps/src/MP.ts | 10 +-- 3 files changed, 36 insertions(+), 73 deletions(-) diff --git a/src/components/MapboxMaps/MapComponent.vue b/src/components/MapboxMaps/MapComponent.vue index 7f68fa76..bbd1803b 100644 --- a/src/components/MapboxMaps/MapComponent.vue +++ b/src/components/MapboxMaps/MapComponent.vue @@ -321,7 +321,6 @@ import shp from 'shpjs' fillStyle: { 'fill-color': '#ff0000', 'fill-opacity': 0.1 }, } ) - }, }); }); @@ -775,14 +774,10 @@ import shp from 'shpjs' // 分割图斑 const splitFeature = (line) => { - let splitLineString = { - type: 'Feature', - properties: {}, - geometry: { - coordinates: line, - type: 'LineString', - }, - }; + let turfSplitLine = turf.lineString(line); + + let splitLineString = turf.cleanCoords(turfSplitLine); + let splitPolygon = currentGeoJson.value; try { // let features = polygonCut(splitPolygon,splitLineString,0.1,"meters"); @@ -804,7 +799,6 @@ import shp from 'shpjs' splitAfterFeatures.features = tempFeatures; - console.log("tempFeatures",tempFeatures) // 分割数据返回父组件中 emit('handlerSplitPolygon', tempFeatures); @@ -812,7 +806,6 @@ import shp from 'shpjs' // handlerDetails(splitAfterFeatures); handlerUnDraw(); } catch (e) { - console.log("error error",e); createMessage.warning('分割线起点、终点需要在图斑外，多个图斑时需要点击选择需要分割的图斑！'); handlerUnDraw(); } @@ -1263,20 +1256,23 @@ import shp from 'shpjs' } } - let singleFeature = { type: 'Feature', properties: {}, geometry: { - coordinates: coordinates, + coordinates:[], type: 'Polygon', }, }; + if(coordinates){ + let turfPolygon = turf.polygon(coordinates); + singleFeature = turf.cleanCoords(turfPolygon); + } + // 处理清除数据重复的点数据 // 需要将传入的geojson处理成单面才能在分割工具中使用 currentGeoJson.value = singleFeature; - } if (map.getSource(source)) { diff --git a/src/components/MapboxMaps/lib/splitpolygon.ts b/src/components/MapboxMaps/lib/splitpolygon.ts index b514794e..2b0503c1 100644 --- a/src/components/MapboxMaps/lib/splitpolygon.ts +++ b/src/components/MapboxMaps/lib/splitpolygon.ts @@ -7,77 +7,63 @@ import { generateUUID } from '../src/tool'; * return 返回切割的面数据 */ export function splitPolygonByLine(line, outerPolygon) { - console.log("绘制的分割线数据",line); + console.log("************** 分割开始 start **************") + console.log("第1步：传入的分割线数据",line); + console.log("第2步：传入的分割面数据",outerPolygon) // 处理被分割的面数据坐标小数点保留多少位 let truncatedSplitter = turf.truncate(turf.lineString(outerPolygon.geometry.coordinates[0]), { precision: 7, }); - console.log("分割面转换为线数据",truncatedSplitter); - + console.log("第3步：分割面转换为线数据",truncatedSplitter); //求交点 let intersectCollection = turf.lineIntersect(line, truncatedSplitter); - console.log("与分割面的交点",intersectCollection); + console.log("第4步：与分割面的交点",intersectCollection); // printLngLat(intersectCollection.geometry.coordinates); - // 交点小于2个 返回null if (intersectCollection.features.length < 2) { return null; } - //将点合并成MultiPoint let intersectCombined = turf.combine(intersectCollection).features[0]; - console.log("分割后所有点数据",intersectCombined) + console.log("第5步：分割后所有点数据",intersectCombined) //分别获取切割线 let outerPieceCollection = turf.lineSplit(line, intersectCombined); let splitterPieceCollection = turf.lineSplit(truncatedSplitter, intersectCombined); - console.log("切割线被分割后所有线段",outerPieceCollection); + console.log("第6步：切割线被分割后所有线段",outerPieceCollection); - console.log("切割面被分割后所有线段",splitterPieceCollection); + console.log("第7步：切割面被分割后所有线段",splitterPieceCollection); //将所有的线段放到一起 let pieceCollection = turf.featureCollection( outerPieceCollection.features.concat(splitterPieceCollection.features), ); - - - console.log("所有分割线段",pieceCollection); - + console.log("第8步：所有分割线段",pieceCollection); //使用turf将闭合线组成多边形 let polygonCollection = turf.polygonize(pieceCollection); - console.log("分割线合并面数据",polygonCollection) + console.log("第9步：分割线合并面数据",polygonCollection) //对多边形进行判断，切割外的多边形丢弃 let innerPolygons = polygonCollection.features.filter((polygon) => { // 获取多边形质心 多边形不规则时有问题 - // let center = turf.centroid(polygon); + // let newcenter = turf.centroid(polygon); + let randomCenterPoint = getRandomPointInPolygon(polygon); // 获取多边形表面一点 let newcenter = turf.pointOnFeature(polygon); - - // 判断点是否在被分割图斑内 // 图斑中心点 - let centerPoint = turf.point(newcenter.geometry.coordinates); - - // 图斑面 - let outPolygon = turf.polygon(outerPolygon.geometry.coordinates) - // return turf.booleanPointInPolygon(centerPoint, outPolygon); - - // let innerPoint = getRandomPointInPolygon(outPolygon); - - // 获取多边形边界 - // let bbox = turf.bbox(outPolygon); // 获取多边形的边界框 - - // return turf.booleanPointInPolygon(randomPoint.features[0], outPolygon); - + let centerPoint = turf.point(randomCenterPoint.geometry.coordinates); + console.log('第10步：封闭图形中心点数据',randomCenterPoint,centerPoint) return turf.booleanWithin(centerPoint, outerPolygon); }); + + console.log("第11步：返回最终处理后的数据",innerPolygons) // let innerPolygons = polygonCollection.features; //处理镂空数据（多处镂空数据会导致计算错误，因为polygonize方法无法正常的返回数据） @@ -97,31 +83,12 @@ export function splitPolygonByLine(line, outerPolygon) { }); } + // 每个图斑配置UUID innerPolygons.forEach((item, index) => { innerPolygons[index].properties.id = generateUUID(); - // console.log("innerPolygons_length",innerPolygons[index].geometry.coordinates[0].length); - // console.log("innerPolygons_array",innerPolygons[index].geometry.coordinates[0]) - // console.log("innerPolygons_length",innerPolygons[index].geometry.coordinates[0].length); - // console.log("innerPolygons_string",JSON.stringify(innerPolygons[index].geometry.coordinates[0])); }); - - // let arr = JSON.parse(JSON.stringify(innerPolygons)) - - // arr.forEach((item, index) => { - // arr[index].properties.id = generateUUID(); - - // if((arr[index].geometry.coordinates[0][0][0] == arr[index].geometry.coordinates[0][arr[index].geometry.coordinates[0].length-1][0]) && arr[index].geometry.coordinates[0][0][1] == arr[index].geometry.coordinates[0][arr[index].geometry.coordinates[0].length-1][1]){ - - // }else{ - // arr[index].geometry.coordinates[0].push(arr[index].geometry.coordinates[0][0]) - // console.log("coordinates789",arr); - - // } - // }); - - + console.log("************** 分割结束 end **************") return innerPolygons; - } function getRandomPointInPolygon(polygon) { @@ -130,12 +97,12 @@ function getRandomPointInPolygon(polygon) { do { point = turf.randomPoint(1, {bbox: bbox}).features[0]; // 从边界框中生成一个随机点 - } while (!turf.booleanPointInPolygon(point, polygon)); // 检查点是否在多边形内部 - + } while (!turf.booleanWithin(point, polygon)); // 检查点是否在多边形内部 + // 直到找到在内部的点再返回数据 return point; } - +// 单个面数据分割 export function splitPolygonByFill(drawPolygon, outerPolygon) { console.log("drawPolygon",drawPolygon); diff --git a/src/components/MapboxMaps/src/MP.ts b/src/components/MapboxMaps/src/MP.ts index dccf2b1e..152e2db0 100644 --- a/src/components/MapboxMaps/src/MP.ts +++ b/src/components/MapboxMaps/src/MP.ts @@ -182,7 +182,6 @@ class BaseMP { featureCollection.features.push(polygonFeature); break; } - return featureCollection; } } @@ -305,6 +304,7 @@ export class MP extends BaseMP { } const startPoint = this.drawLocal[this.drawLocal.length - 1]; const endPoint = this.getDrawEndPoint(); + // 添加动态线 const lastGSL = this._generateGeoJSON([startPoint, endPoint], 'LineString'); this.crossesLine(this.drawLocal, [startPoint, endPoint]); @@ -387,7 +387,9 @@ export class MP extends BaseMP { clearTimeout(this.clickTimeout); // 清除超时变量 this.clickCount = 0; // 计数器清零 // 在这里编写双击事件的操作 - console.log('在这里编写双击事件的操作'); + + // 鼠标双击事件 + if (this.drawModel === this.drawModelChoose.LineString) { _this.drawLocal.push(e.lngLat); _this._currentDrawSource(); @@ -452,7 +454,6 @@ export class MP extends BaseMP { return false; } }; - // 判断是否相交 true 相交 false 不相交 crossesLine = (line1, line2) => { let _this = this; @@ -497,14 +498,13 @@ export class MP extends BaseMP { this.deleteDraw(); //禁用鼠标双击放大事件 this.map.doubleClickZoom.disable(); - this._changeMouseCursor('crosshair'); this.map.on('click', this.clickHandler); this.map.on('contextmenu', this.contextmenuHandler); this.map.on('mousemove', this.mousemoveHandler); }; draw = (shape) => { - if (this.drawModelChoose[shape]) { + if(this.drawModelChoose[shape]) { this.drawModel = this.drawModelChoose[shape]; this.drawStart(); } else { From ec9686791c9ae6c10048e310e40910b7a599ae79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com> Date: Mon, 9 Sep 2024 17:33:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=91=E6=9F=A5=E8=AF=A2=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E7=BB=93=E6=9E=9C=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CloudQueryModal/BasicQuery/index.vue | 430 ++++++++++-------- src/components/CloudQueryContent/index.vue | 92 ++-- .../test/components/ShowTableList/index.vue | 53 ++- 3 files changed, 331 insertions(+), 244 deletions(-) diff --git a/src/components/CloudQueryContent/CloudQueryModal/BasicQuery/index.vue b/src/components/CloudQueryContent/CloudQueryModal/BasicQuery/index.vue index be1a1adc..0b9c6b49 100644 --- a/src/components/CloudQueryContent/CloudQueryModal/BasicQuery/index.vue +++ b/src/components/CloudQueryContent/CloudQueryModal/BasicQuery/index.vue @@ -2,7 +2,9 @@
- 叠加到地图 + + 叠加到地图 +
专题图 @@ -11,210 +13,282 @@
-
- + - + :title="'土地利用现状查询结果'" + /> - + :title="'土地规划查询结果'" + /> diff --git a/src/components/CloudQueryContent/index.vue b/src/components/CloudQueryContent/index.vue index 4ffc4ed4..c1cff6fe 100644 --- a/src/components/CloudQueryContent/index.vue +++ b/src/components/CloudQueryContent/index.vue @@ -11,61 +11,65 @@
- +
- +
diff --git a/src/views/dashboard/test/components/ShowTableList/index.vue b/src/views/dashboard/test/components/ShowTableList/index.vue index 37752a78..458db56e 100644 --- a/src/views/dashboard/test/components/ShowTableList/index.vue +++ b/src/views/dashboard/test/components/ShowTableList/index.vue @@ -1,43 +1,52 @@ From 7a4d5685586c9ddd1b7ba46f1b86db269026144f Mon Sep 17 00:00:00 2001 From: Zhufu <1176354795@qq.com> Date: Tue, 10 Sep 2024 08:17:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E7=BB=84=E5=88=87=E6=8D=A2=E6=97=B6=EF=BC=8C=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E4=B8=8D=E6=98=AF=E8=AF=A5=E5=8D=A1=E7=89=87=E9=87=8C?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=20[=E9=99=84=E4=BB=B6=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/subTable.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/subTable.ts b/src/store/modules/subTable.ts index 084b7f45..1469208b 100644 --- a/src/store/modules/subTable.ts +++ b/src/store/modules/subTable.ts @@ -49,7 +49,7 @@ export const subTableStore = defineStore({ }, clearGroupDataKeyList(keyList){ keyList.forEach(key => { - delete this.groupData[key] + this.groupData[key] = "" }) } }, From 7ae8a8274dad7fae802a28cc371580884b4f6ce2 Mon Sep 17 00:00:00 2001 From: Zhufu <1176354795@qq.com> Date: Tue, 10 Sep 2024 10:27:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/keyproblem/keyissuesI/index.ts | 171 ++++++++++++++++++ src/api/keyproblem/keyissuesII/index.ts | 171 ++++++++++++++++++ .../auditinfo/AuditProgress/index.vue | 2 +- .../keyissuesI/auditinfo/MapList/index.vue | 23 +-- .../keyproblem/keyissuesI/auditinfo/index.vue | 2 +- .../keyissuesI/changearea/MapList/amend.vue | 2 +- .../keyissuesI/changearea/MapList/index.vue | 4 +- .../keyissuesI/changearea/index.vue | 2 +- .../MapList/ShowInfoModal/index.vue | 2 +- .../MapList/SplitPolygonModal/index.vue | 4 +- .../keyissuesI/curbspotcity/MapList/index.vue | 2 +- .../keyissuesI/curbspotcity/index.vue | 2 +- .../illegaltreatment/AuditProgress/index.vue | 2 +- .../illegaltreatment/MapList/index.vue | 23 +-- .../keyissuesI/illegaltreatment/index-old.vue | 4 +- .../keyissuesI/illegaltreatment/index.vue | 2 +- .../keyissuesI/patchsummary/index.vue | 7 +- .../auditinfo/AuditProgress/index.vue | 2 +- .../keyissuesII/auditinfo/MapList/index.vue | 23 +-- .../keyissuesII/auditinfo/index.vue | 2 +- .../keyissuesII/changearea/MapList/amend.vue | 2 +- .../keyissuesII/changearea/MapList/index.vue | 4 +- .../keyissuesII/changearea/index.vue | 2 +- .../MapList/ShowInfoModal/index.vue | 2 +- .../MapList/SplitPolygonModal/index.vue | 4 +- .../curbspotcity/MapList/index.vue | 2 +- .../keyissuesII/curbspotcity/index.vue | 2 +- .../illegaltreatment/AuditProgress/index.vue | 2 +- .../illegaltreatment/MapList/index.vue | 23 +-- .../illegaltreatment/index-old.vue | 4 +- .../keyissuesII/illegaltreatment/index.vue | 2 +- .../keyissuesII/patchsummary/index.vue | 7 +- 32 files changed, 382 insertions(+), 126 deletions(-) create mode 100644 src/api/keyproblem/keyissuesI/index.ts create mode 100644 src/api/keyproblem/keyissuesII/index.ts diff --git a/src/api/keyproblem/keyissuesI/index.ts b/src/api/keyproblem/keyissuesI/index.ts new file mode 100644 index 00000000..c36b0d7d --- /dev/null +++ b/src/api/keyproblem/keyissuesI/index.ts @@ -0,0 +1,171 @@ +// WFProcess 流程模版基本信息 +import { defHttp } from '@/utils/http/axios'; + +enum Api { + // 获取待办任务统计数据 + LoadTaskCount = '/api/DroneCaseInfoZdwt1/LoadTaskCount', + // 获取图斑信息统计数据 + LoadDroneCaseInfoCount = '/api/DroneCaseInfoZdwt1/LoadDroneCaseInfoCount', + // 分页获取图斑信息列表 + LoadDroneCaseInfoDetail = '/api/DroneCaseInfoZdwt1/LoadTasklList', + // 分页获取任务信息列表 + LoadTaskDetailList = '/api/DroneCaseInfoZdwt1/LoadTaskDetailList', + // 收藏图斑 + AddCaseFavorite = '/api/DroneCaseInfoZdwt1/AddCaseFavorite', + // // 获取收藏图斑列表 + // FavoriteCaseList = '/api/DroneCaseinfo/FavoriteCaseList', + DeleteFavoriteCase = '/api/DroneCaseInfoZdwt1/DeleteFavoriteCase', + // 获取图斑详情 + GetCaseInfoById = '/api/DroneCaseInfoZdwt1/GetCaseInfoById', + // 更新图斑行政区划 + UpdateDroneCaseInfo = '/api/DroneCaseInfoZdwt1/UpdateDroneCaseInfo', + // // 督办流程 + // Supervise = '/api/WFProcess/Supervise', + // 获取部门父级 + LoadParents = '/api/Orgs/LoadParents', + // 审核列表收藏 + AddtaskFavorite = '/api/DroneCaseInfoZdwt1/AddtaskFavorite', + // 审核列表删除收藏 + DeleteTaskCase = '/api/DroneCaseInfoZdwt1/DeleteTaskCase', + // 获取当前账号可以看见的乡镇 + loadStreet = '/api/DroneCaseInfoZdwt1/loadStreet', + // 违法处理，待办任务列表 + LoadTaskIllegalDetailList = '/api/DroneCaseInfoZdwt1/LoadTaskIllegalDetailList', + // 分割图斑 + SplitCase = '/api/DroneCaseInfoZdwt1/CaseSplit', + // 恢复还原 + RecoverCase = '/api/DroneCaseInfoZdwt1/CaseRecover', + // 获取图斑中心点 + GetPolygonCenter = '/api/DroneCaseInfoZdwt1/GetCenterPoints', + // 获取用户访问机构权限 + // GetUserOrgs = '/api/Check/GetOrgs', + // // 大屏下发图斑统计 + // IssuedStatitical = "/api/DroneScreenDisplay/CaseOffenceXiaFa", + // // 大屏核实新增统计 + // VerifyStatitical = "/api/DroneScreenDisplay/CaseOffenceCheckAdd", + // // 大屏整改剩余统计 + // RectificationStatitical = "/api/DroneScreenDisplay/CaseOffenceModifyRemain", + // 获取案件图片坐标、方位角信息 + LoadCaseImgList = "/api/DroneCaseInfoZdwt1/LoadCaseImgList", + // 图斑列表 + LoadCaseInfoTuBanList = '/api/DroneCaseInfoZdwt1/LoadCaseInfoTuBanList', + CaseOffence = '/api/DroneCaseInfoZdwt1/CaseOffence', + LoadCaseInfoListOffence = '/api/DroneCaseInfoZdwt1/LoadCaseInfoListOffence', +} + +/** + * @description: getCaseFlowLog + */ +export function getLoadTaskCount(params?) { + return defHttp.get({ url: Api.LoadTaskCount, params }); +} +export function getLoadStreet() { + return defHttp.get({ url: Api.loadStreet }); +} + +/** + * @description: getCaseFlowLog + */ +export function getLoadDroneCaseInfoCount(params) { + return defHttp.get({ url: Api.LoadDroneCaseInfoCount, params }); +} + +/** + * @description: getCaseFlowLog + */ +export function getLoadDroneCaseInfoDetail(params) { + return defHttp.get({ url: Api.LoadDroneCaseInfoDetail, params }); +} +/** + * @description: getCaseFlowLog + */ +export function getLoadTaskDetailList(params) { + return defHttp.get({ url: Api.LoadTaskDetailList, params }); +} + +export function addCaseFavorite(params) { + return defHttp.post({ url: Api.AddCaseFavorite, params }); +} +export function addTaskFavorite(params?: { taskId: string; favoriteUserId: string }) { + return defHttp.post({ url: Api.AddtaskFavorite, params }); +} +export function deleteFavoriteCase(params: string) { + return defHttp.post({ url: Api.DeleteFavoriteCase, data: params }); +} +export function deleteTaskCase(params: string) { + return defHttp.post({ url: Api.DeleteTaskCase, data: params }); +} + +// export function getFavoriteCaseList(params?: { uid: string }) { +// return defHttp.get({ url: Api.FavoriteCaseList, 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 const updateSupervise = (params: { id: string; supervise: number }) => +// defHttp.post({ url: `${Api.Supervise}?id=${params.id}&supervise=${params.supervise}`, params }); + +export const getLoadParents = (params: { childId: Number }) => + defHttp.get({ url: `${Api.LoadParents}?childId=${params.childId}` }); + +export function getLoadTaskIllegalDetailList(params) { + return defHttp.get({ url: Api.LoadTaskIllegalDetailList, params }); +} + +export function splitCase(params){ + return defHttp.post({ url: Api.SplitCase, data: params }); +} + +export function recoverCase(params){ + return defHttp.post({ url: Api.RecoverCase, data: params }); +} + +export function getPolygonCenter(params){ + return defHttp.get({ url: Api.GetPolygonCenter, params }); +} + +// export function getUserOrgs(params){ +// return defHttp.get({ url: Api.GetUserOrgs, params }); +// } + + +// export function getIssuedStatitical(params) { +// return defHttp.get({ +// url: Api.IssuedStatitical, +// params, +// }); +// } + +// export function getVerifyStatitical(params) { +// return defHttp.get({ +// url: Api.VerifyStatitical, +// params, +// }); +// } + +// export function getRectificationStatitical(params) { +// return defHttp.get({ +// url: Api.RectificationStatitical, +// params, +// }); +// } + +export function getLoadCaseImgList(params){ + return defHttp.get({ + url: Api.LoadCaseImgList, + params, + }); +} +export function loadCaseInfoTuBanList(params) { + return defHttp.get({ + url: Api.LoadCaseInfoTuBanList, + params, + }); +} +export const getCaseOffence = (params) => + defHttp.get({ url: Api.CaseOffence, params }); +export const getLoadCaseInfoListOffence = (params) => + defHttp.get({ url: Api.LoadCaseInfoListOffence, params }); \ No newline at end of file diff --git a/src/api/keyproblem/keyissuesII/index.ts b/src/api/keyproblem/keyissuesII/index.ts new file mode 100644 index 00000000..c13751d1 --- /dev/null +++ b/src/api/keyproblem/keyissuesII/index.ts @@ -0,0 +1,171 @@ +// WFProcess 流程模版基本信息 +import { defHttp } from '@/utils/http/axios'; + +enum Api { + // 获取待办任务统计数据 + LoadTaskCount = '/api/DroneCaseInfoZdwt2/LoadTaskCount', + // 获取图斑信息统计数据 + LoadDroneCaseInfoCount = '/api/DroneCaseInfoZdwt2/LoadDroneCaseInfoCount', + // 分页获取图斑信息列表 + LoadDroneCaseInfoDetail = '/api/DroneCaseInfoZdwt2/LoadTasklList', + // 分页获取任务信息列表 + LoadTaskDetailList = '/api/DroneCaseInfoZdwt2/LoadTaskDetailList', + // 收藏图斑 + AddCaseFavorite = '/api/DroneCaseInfoZdwt2/AddCaseFavorite', + // // 获取收藏图斑列表 + // FavoriteCaseList = '/api/DroneCaseinfo/FavoriteCaseList', + DeleteFavoriteCase = '/api/DroneCaseInfoZdwt2/DeleteFavoriteCase', + // 获取图斑详情 + GetCaseInfoById = '/api/DroneCaseInfoZdwt2/GetCaseInfoById', + // 更新图斑行政区划 + UpdateDroneCaseInfo = '/api/DroneCaseInfoZdwt2/UpdateDroneCaseInfo', + // // 督办流程 + // Supervise = '/api/WFProcess/Supervise', + // 获取部门父级 + LoadParents = '/api/Orgs/LoadParents', + // 审核列表收藏 + AddtaskFavorite = '/api/DroneCaseInfoZdwt2/AddtaskFavorite', + // 审核列表删除收藏 + DeleteTaskCase = '/api/DroneCaseInfoZdwt2/DeleteTaskCase', + // 获取当前账号可以看见的乡镇 + loadStreet = '/api/DroneCaseInfoZdwt2/loadStreet', + // 违法处理，待办任务列表 + LoadTaskIllegalDetailList = '/api/DroneCaseInfoZdwt2/LoadTaskIllegalDetailList', + // 分割图斑 + SplitCase = '/api/DroneCaseInfoZdwt2/CaseSplit', + // 恢复还原 + RecoverCase = '/api/DroneCaseInfoZdwt2/CaseRecover', + // 获取图斑中心点 + GetPolygonCenter = '/api/DroneCaseInfoZdwt2/GetCenterPoints', + // 获取用户访问机构权限 + // GetUserOrgs = '/api/Check/GetOrgs', + // // 大屏下发图斑统计 + // IssuedStatitical = "/api/DroneScreenDisplay/CaseOffenceXiaFa", + // // 大屏核实新增统计 + // VerifyStatitical = "/api/DroneScreenDisplay/CaseOffenceCheckAdd", + // // 大屏整改剩余统计 + // RectificationStatitical = "/api/DroneScreenDisplay/CaseOffenceModifyRemain", + // 获取案件图片坐标、方位角信息 + LoadCaseImgList = "/api/DroneCaseInfoZdwt2/LoadCaseImgList", + // 图斑列表 + LoadCaseInfoTuBanList = '/api/DroneCaseInfoZdwt2/LoadCaseInfoTuBanList', + CaseOffence = '/api/DroneCaseInfoZdwt2/CaseOffence', + LoadCaseInfoListOffence = '/api/DroneCaseInfoZdwt2/LoadCaseInfoListOffence', +} + +/** + * @description: getCaseFlowLog + */ +export function getLoadTaskCount(params?) { + return defHttp.get({ url: Api.LoadTaskCount, params }); +} +export function getLoadStreet() { + return defHttp.get({ url: Api.loadStreet }); +} + +/** + * @description: getCaseFlowLog + */ +export function getLoadDroneCaseInfoCount(params) { + return defHttp.get({ url: Api.LoadDroneCaseInfoCount, params }); +} + +/** + * @description: getCaseFlowLog + */ +export function getLoadDroneCaseInfoDetail(params) { + return defHttp.get({ url: Api.LoadDroneCaseInfoDetail, params }); +} +/** + * @description: getCaseFlowLog + */ +export function getLoadTaskDetailList(params) { + return defHttp.get({ url: Api.LoadTaskDetailList, params }); +} + +export function addCaseFavorite(params) { + return defHttp.post({ url: Api.AddCaseFavorite, params }); +} +export function addTaskFavorite(params?: { taskId: string; favoriteUserId: string }) { + return defHttp.post({ url: Api.AddtaskFavorite, params }); +} +export function deleteFavoriteCase(params: string) { + return defHttp.post({ url: Api.DeleteFavoriteCase, data: params }); +} +export function deleteTaskCase(params: string) { + return defHttp.post({ url: Api.DeleteTaskCase, data: params }); +} + +// export function getFavoriteCaseList(params?: { uid: string }) { +// return defHttp.get({ url: Api.FavoriteCaseList, 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 const updateSupervise = (params: { id: string; supervise: number }) => +// defHttp.post({ url: `${Api.Supervise}?id=${params.id}&supervise=${params.supervise}`, params }); + +export const getLoadParents = (params: { childId: Number }) => + defHttp.get({ url: `${Api.LoadParents}?childId=${params.childId}` }); + +export function getLoadTaskIllegalDetailList(params) { + return defHttp.get({ url: Api.LoadTaskIllegalDetailList, params }); +} + +export function splitCase(params){ + return defHttp.post({ url: Api.SplitCase, data: params }); +} + +export function recoverCase(params){ + return defHttp.post({ url: Api.RecoverCase, data: params }); +} + +export function getPolygonCenter(params){ + return defHttp.get({ url: Api.GetPolygonCenter, params }); +} + +// export function getUserOrgs(params){ +// return defHttp.get({ url: Api.GetUserOrgs, params }); +// } + + +// export function getIssuedStatitical(params) { +// return defHttp.get({ +// url: Api.IssuedStatitical, +// params, +// }); +// } + +// export function getVerifyStatitical(params) { +// return defHttp.get({ +// url: Api.VerifyStatitical, +// params, +// }); +// } + +// export function getRectificationStatitical(params) { +// return defHttp.get({ +// url: Api.RectificationStatitical, +// params, +// }); +// } + +export function getLoadCaseImgList(params){ + return defHttp.get({ + url: Api.LoadCaseImgList, + params, + }); +} +export function loadCaseInfoTuBanList(params) { + return defHttp.get({ + url: Api.LoadCaseInfoTuBanList, + params, + }); +} +export const getCaseOffence = (params) => + defHttp.get({ url: Api.CaseOffence, params }); +export const getLoadCaseInfoListOffence = (params) => + defHttp.get({ url: Api.LoadCaseInfoListOffence, params }); \ No newline at end of file diff --git a/src/views/demo/keyproblem/keyissuesI/auditinfo/AuditProgress/index.vue b/src/views/demo/keyproblem/keyissuesI/auditinfo/AuditProgress/index.vue index 86dc2cae..4b7e899f 100644 --- a/src/views/demo/keyproblem/keyissuesI/auditinfo/AuditProgress/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/auditinfo/AuditProgress/index.vue @@ -193,7 +193,7 @@ import { Empty, message } from 'ant-design-vue'; import { patchSourceOptions } from '@/utils/global'; import { SearchOutlined} from '@ant-design/icons-vue' - import { getLoadTaskDetailList, deleteTaskCase, addTaskFavorite} from '@/api/tiankongdi/index'; + import { getLoadTaskDetailList, deleteTaskCase, addTaskFavorite} from '@/api/keyproblem/keyissuesI/index'; import {showDrawBack, drawBackSpan} from '@/views/demo/util' import { getDetail } from '@/api/sys/WFSchemeInfo'; import { flowStore } from '@/store/modules/flow'; diff --git a/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue b/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue index 4b7541da..ed0fceac 100644 --- a/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue @@ -207,7 +207,7 @@ import { onMounted, ref, defineEmits, computed, h, watch } from 'vue'; import { StarOutlined,StarFilled } from '@ant-design/icons-vue'; import Icon from '@/components/Icon/Icon.vue'; - import { getLoadTaskDetailList, updateSupervise, addTaskFavorite, deleteTaskCase } from '@/api/tiankongdi/index'; + import { getLoadTaskDetailList, addTaskFavorite, deleteTaskCase } from '@/api/keyproblem/keyissuesI/index'; import { flowStore } from '@/store/modules/flow'; import { getDetail } from '@/api/sys/WFSchemeInfo'; import { Audit } from '@/views/demo/workflow/task/process/page'; @@ -322,27 +322,6 @@ onMounted(() => { getTaskList(); }); - const changeSupervise = (item) => { - if(item.cancelsupervise === 0 && item.issupervise === 1){ - message.error('取消改督办权限不足') - return - } - let params = { - id: item.processid, - supervise: 1, - } - if(item.issupervise === 1){ - params.supervise = 0 - } - updateSupervise(params).then(res => { - if(params.supervise === 1){ - message.success('成功发起督办') - }else{ - message.success('取消督办成功') - } - getTaskList(); - }) - } const prevData = async () => { if(prevShowDataId.value === 0){ if(params.value.page === 1 || total.value == 0){ diff --git a/src/views/demo/keyproblem/keyissuesI/auditinfo/index.vue b/src/views/demo/keyproblem/keyissuesI/auditinfo/index.vue index 5e077cc9..4090bf41 100644 --- a/src/views/demo/keyproblem/keyissuesI/auditinfo/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/auditinfo/index.vue @@ -49,7 +49,7 @@ import { MapboxConfig, MapboxDefaultStyle } from '@/components/MapboxMaps/src/config.ts'; import AuditProgress from './AuditProgress/index.vue'; import MapList from './MapList/index.vue'; - import { getLoadTaskCount } from '@/api/tiankongdi/index'; + import { getLoadTaskCount } from '@/api/keyproblem/keyissuesI/index'; import { getGeom, getConfig } from '@/api/sys/layerManagement'; import { getDetail } from '@/api/sys/WFSchemeInfo'; import { useMessage } from '@/hooks/web/useMessage'; diff --git a/src/views/demo/keyproblem/keyissuesI/changearea/MapList/amend.vue b/src/views/demo/keyproblem/keyissuesI/changearea/MapList/amend.vue index 4c740142..6afab4e6 100644 --- a/src/views/demo/keyproblem/keyissuesI/changearea/MapList/amend.vue +++ b/src/views/demo/keyproblem/keyissuesI/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/keyproblem/keyissuesI/index.ts'; import { getChildrenTree } from '@/api/demo/system.ts'; const { createMessage } = useMessage(); defineOptions({ name: 'AccountModal' }); diff --git a/src/views/demo/keyproblem/keyissuesI/changearea/MapList/index.vue b/src/views/demo/keyproblem/keyissuesI/changearea/MapList/index.vue index 66355aa3..bcdfc0c6 100644 --- a/src/views/demo/keyproblem/keyissuesI/changearea/MapList/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/changearea/MapList/index.vue @@ -322,7 +322,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, getLoadStreet } from '@/api/tiankongdi/index'; +import { getLoadDroneCaseInfoDetail, getCaseInfoById, getLoadStreet } from '@/api/keyproblem/keyissuesI/index'; import { batchOptions, yearOptions, @@ -332,7 +332,7 @@ import Amend from './amend.vue'; import { Empty, message,Modal } from 'ant-design-vue'; import ShowInfoModal from '@/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue'; import SplitPolygonModal from '@/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue'; -import {recoverCase} from '@/api/tiankongdi' +import {recoverCase} from '@/api/keyproblem/keyissuesI' import { flowStore } from '@/store/modules/flow'; import { getDetail } from '@/api/sys/WFSchemeInfo'; import { Audit } from '@/views/demo/workflow/task/process/page'; diff --git a/src/views/demo/keyproblem/keyissuesI/changearea/index.vue b/src/views/demo/keyproblem/keyissuesI/changearea/index.vue index 45239205..4d862862 100644 --- a/src/views/demo/keyproblem/keyissuesI/changearea/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/changearea/index.vue @@ -75,7 +75,7 @@ import { MapboxConfig, MapboxDefaultStyle } from '@/components/MapboxMaps/src/config.ts'; import AuditProgress from './AuditProgress/index.vue'; import MapList from './MapList/index.vue'; - import { getLoadDroneCaseInfoCount, getLoadDroneCaseInfoDetail } from '@/api/tiankongdi/index.ts'; + import { getLoadDroneCaseInfoCount, getLoadDroneCaseInfoDetail } from '@/api/keyproblem/keyissuesI/index.ts'; import { batchOptions, yearOptions } from '@/utils/global'; import { getChildrenTree } from '@/api/demo/system'; import { getGeom, getConfig } from '@/api/sys/layerManagement'; diff --git a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/ShowInfoModal/index.vue b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/ShowInfoModal/index.vue index c4085a2c..92929226 100644 --- a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/ShowInfoModal/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/ShowInfoModal/index.vue @@ -397,7 +397,7 @@ import MapboxMap from '@/components/MapboxMaps/MapComponent.vue'; import { getConfig } from '@/api/sys/layerManagement'; import { getGeom } from '@/api/sys/layerManagement'; - import {getLoadCaseImgList} from '@/api/tiankongdi' + import {getLoadCaseImgList} from '@/api/keyproblem/keyissuesI' import { useMessage } from '@/hooks/web/useMessage'; import axios from 'axios'; const { createMessage } = useMessage(); diff --git a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/SplitPolygonModal/index.vue index 3c968e6b..73be14dc 100644 --- a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -489,7 +489,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 { splitCase } from '@/api/keyproblem/keyissuesI'; import { useMessage } from '@/hooks/web/useMessage'; const { createMessage } = useMessage(); import Icon from '@/components/Icon/Icon.vue'; @@ -506,7 +506,7 @@ resultOptions, qitaUseTOOptions, } from '@/utils/global'; - import { getLoadDroneCaseInfoDetail } from '@/api/tiankongdi/index.ts'; + import { getLoadDroneCaseInfoDetail } from '@/api/keyproblem/keyissuesI/index.ts'; import ShowInfoModal from '@/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue'; import { dataProcessing ,dataProcessingCount} from '@/views/demo/tiankongdi/util.ts'; import { itemProps } from '@/components/Menu/src/props'; diff --git a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/index.vue b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/index.vue index 7ddfb719..53e6e23b 100644 --- a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/index.vue @@ -291,7 +291,7 @@ import { ref, onMounted, defineEmits, defineProps, computed, h, watch } from "vue" import { StarOutlined, StarFilled, SearchOutlined, RollbackOutlined } from '@ant-design/icons-vue'; import Icon from '@/components/Icon/Icon.vue'; -import { addCaseFavorite,addTaskFavorite,getCaseInfoById, deleteFavoriteCase,deleteTaskCase,getLoadStreet, getLoadDroneCaseInfoDetail } from '@/api/tiankongdi/index.ts'; +import { addCaseFavorite,addTaskFavorite,getCaseInfoById, deleteFavoriteCase,deleteTaskCase,getLoadStreet, getLoadDroneCaseInfoDetail } from '@/api/keyproblem/keyissuesI/index.ts'; import { batchOptions, yearOptions, diff --git a/src/views/demo/keyproblem/keyissuesI/curbspotcity/index.vue b/src/views/demo/keyproblem/keyissuesI/curbspotcity/index.vue index dad9fd49..0c6724a0 100644 --- a/src/views/demo/keyproblem/keyissuesI/curbspotcity/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/curbspotcity/index.vue @@ -55,7 +55,7 @@ getLoadDroneCaseInfoCount, getLoadDroneCaseInfoDetail, getLoadParents, - } from '@/api/tiankongdi/index.ts'; + } from '@/api/keyproblem/keyissuesI/index.ts'; import { batchOptions, yearOptions } from '@/views/utils/global'; import { getChildrenTree } from '@/api/demo/system'; import { getGeom, getConfig } from '@/api/sys/layerManagement'; diff --git a/src/views/demo/keyproblem/keyissuesI/illegaltreatment/AuditProgress/index.vue b/src/views/demo/keyproblem/keyissuesI/illegaltreatment/AuditProgress/index.vue index e4604b55..2067a2ee 100644 --- a/src/views/demo/keyproblem/keyissuesI/illegaltreatment/AuditProgress/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/illegaltreatment/AuditProgress/index.vue @@ -242,7 +242,7 @@ import { Empty, message } from 'ant-design-vue'; import { patchSourceOptions } from '@/utils/global'; import { SearchOutlined} from '@ant-design/icons-vue' - import { getLoadTaskDetailList, deleteTaskCase, addTaskFavorite, getLoadTaskIllegalDetailList} from '@/api/tiankongdi/index'; + import { getLoadTaskDetailList, deleteTaskCase, addTaskFavorite, getLoadTaskIllegalDetailList} from '@/api/keyproblem/keyissuesI/index'; import {showDrawBack, drawBackSpan} from '@/views/demo/util' import { getDetail } from '@/api/sys/WFSchemeInfo'; import { flowStore } from '@/store/modules/flow'; diff --git a/src/views/demo/keyproblem/keyissuesI/illegaltreatment/MapList/index.vue b/src/views/demo/keyproblem/keyissuesI/illegaltreatment/MapList/index.vue index 7da88631..14e66b4e 100644 --- a/src/views/demo/keyproblem/keyissuesI/illegaltreatment/MapList/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/illegaltreatment/MapList/index.vue @@ -208,7 +208,7 @@ import { onMounted, ref, defineEmits, computed, h, watch } from 'vue'; import { StarOutlined,StarFilled } from '@ant-design/icons-vue'; import Icon from '@/components/Icon/Icon.vue'; - import { getLoadTaskIllegalDetailList, updateSupervise, addTaskFavorite, deleteTaskCase } from '@/api/tiankongdi/index'; + import { getLoadTaskIllegalDetailList, addTaskFavorite, deleteTaskCase } from '@/api/keyproblem/keyissuesI/index'; import { flowStore } from '@/store/modules/flow'; import { getDetail } from '@/api/sys/WFSchemeInfo'; import { Audit } from '@/views/demo/workflow/task/process/page'; @@ -322,27 +322,6 @@ onMounted(() => { getTaskList(); }); - const changeSupervise = (item) => { - if(item.cancelsupervise === 0 && item.issupervise === 1){ - message.error('取消改督办权限不足') - return - } - let params = { - id: item.processid, - supervise: 1, - } - if(item.issupervise === 1){ - params.supervise = 0 - } - updateSupervise(params).then(res => { - if(params.supervise === 1){ - message.success('成功发起督办') - }else{ - message.success('取消督办成功') - } - getTaskList(); - }) - } const prevData = async () => { if(prevShowDataId.value === 0){ if(params.value.page === 1 || total.value == 0){ diff --git a/src/views/demo/keyproblem/keyissuesI/illegaltreatment/index-old.vue b/src/views/demo/keyproblem/keyissuesI/illegaltreatment/index-old.vue index f8cd3094..8576781a 100644 --- a/src/views/demo/keyproblem/keyissuesI/illegaltreatment/index-old.vue +++ b/src/views/demo/keyproblem/keyissuesI/illegaltreatment/index-old.vue @@ -35,7 +35,7 @@ import { getAppEnvConfig } from '@/utils/env'; import axios from 'axios'; import ShowInfoModal from '@/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue'; - import { getCaseInfoById } from '@/api/tiankongdi/index'; + import { getCaseInfoById } from '@/api/keyproblem/keyissuesI/index'; import { useMessage } from '@/hooks/web/useMessage'; import { cloneDeep } from 'lodash-es'; @@ -154,7 +154,7 @@ params.countyid = searchInfo?.countyid; axios({ method: 'post', - url: VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/ExportCaseInfoIllegalList', + url: VITE_GLOB_API_URL + '/api/DroneCaseInfoZdwt1/ExportCaseInfoIllegalList', params: params, headers: { 'X-Token': localStorage.getItem('X-Token'), diff --git a/src/views/demo/keyproblem/keyissuesI/illegaltreatment/index.vue b/src/views/demo/keyproblem/keyissuesI/illegaltreatment/index.vue index f2b306f9..02ff37ea 100644 --- a/src/views/demo/keyproblem/keyissuesI/illegaltreatment/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/illegaltreatment/index.vue @@ -49,7 +49,7 @@ import { MapboxConfig, MapboxDefaultStyle } from '@/components/MapboxMaps/src/config.ts'; import AuditProgress from './AuditProgress/index.vue'; import MapList from './MapList/index.vue'; - import { getLoadTaskCount } from '@/api/tiankongdi/index'; + import { getLoadTaskCount } from '@/api/keyproblem/keyissuesI/index'; import { getGeom,getConfig } from '@/api/sys/layerManagement'; import { getDetail } from '@/api/sys/WFSchemeInfo'; import { useMessage } from '@/hooks/web/useMessage'; diff --git a/src/views/demo/keyproblem/keyissuesI/patchsummary/index.vue b/src/views/demo/keyproblem/keyissuesI/patchsummary/index.vue index 8e980d1e..b6d9eb12 100644 --- a/src/views/demo/keyproblem/keyissuesI/patchsummary/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/patchsummary/index.vue @@ -94,13 +94,12 @@