diff --git a/src/api/bootstraps/index.ts b/src/api/bootstraps/index.ts index 43849848..e10a6f42 100644 --- a/src/api/bootstraps/index.ts +++ b/src/api/bootstraps/index.ts @@ -1,6 +1,13 @@ // WFProcess 流程模版基本信息 import { defHttp } from '@/utils/http/axios'; -import { taskCountParams, caseInfoParams, countModel, taskInfoParams, addCaseFavoriteParams } from './model/index'; +import { + taskCountParams, + caseInfoParams, + countModel, + taskInfoParams, + addCaseFavoriteParams, + updateCaseInfoParams, +} from './model/index'; enum Api { // 获取待办任务统计数据 @@ -12,10 +19,14 @@ enum Api { // 分页获取任务信息列表 LoadTaskDetailList = '/api/DroneCaseInfoSingle/LoadTaskDetailList', // 收藏案件 - AddCaseFavorite = '/api/DroneCaseinfo/AddCaseFavorite', + AddCaseFavorite = '/api/DroneCaseInfoSingle/AddCaseFavorite', // 获取收藏案件列表 FavoriteCaseList = '/api/DroneCaseinfo/FavoriteCaseList', - DeleteFavoriteCase = '/api/DroneCaseinfo/DeleteFavoriteCase', + DeleteFavoriteCase = '/api/DroneCaseInfoSingle/DeleteFavoriteCase', + // 获取案件详情 + GetCaseInfoById = '/api/DroneCaseInfoSingle/GetCaseInfoById', + // 更新案件行政区划 + UpdateDroneCaseInfo = '/api/DroneCaseInfoSingle/UpdateDroneCaseInfo', } /** @@ -48,10 +59,15 @@ export function getLoadTaskDetailList(params?: taskInfoParams) { export function addCaseFavorite(params?: addCaseFavoriteParams) { return defHttp.post({ url: Api.AddCaseFavorite, params }); } -export function deleteFavoriteCase(params: string){ - return defHttp.post({ url: Api.DeleteFavoriteCase, data:params }); +export function deleteFavoriteCase(params: string) { + return defHttp.post({ url: Api.DeleteFavoriteCase, data: params }); } -export function getFavoriteCaseList(params?: {uid:string}) { +export function getFavoriteCaseList(params?: { uid: string }) { return defHttp.get({ url: Api.FavoriteCaseList, params }); -} \ No newline at end of file +} +export function getCaseInfoById(params?: { id: string }) { + return defHttp.get({ url: Api.GetCaseInfoById, params }); +} +export const updateDroneCaseInfo = (params: updateCaseInfoParams) => + defHttp.post({ url: Api.UpdateDroneCaseInfo, params }); diff --git a/src/api/bootstraps/model/index.ts b/src/api/bootstraps/model/index.ts index 32a358c2..ec41f91b 100644 --- a/src/api/bootstraps/model/index.ts +++ b/src/api/bootstraps/model/index.ts @@ -13,9 +13,9 @@ export interface taskInfoParams { } export interface addCaseFavoriteParams { - id: string, - caseNo: string, - favoriteUserId: string, + id: string; + caseNo: string; + favoriteUserId: string; } export interface caseInfoParams { @@ -42,3 +42,13 @@ export interface countItem { count: number; } export type countModel = countItem[]; + +export interface updateCaseInfoParams { + id?: string; + countyid?: string; + countyname?: string; + streetid?: string; + streetname?: string; + communityid?: string; + communityname?: string; +} diff --git a/src/layouts/default/header/components/user-dropdown/index.vue b/src/layouts/default/header/components/user-dropdown/index.vue index bf21a2bc..45212f02 100644 --- a/src/layouts/default/header/components/user-dropdown/index.vue +++ b/src/layouts/default/header/components/user-dropdown/index.vue @@ -33,7 +33,7 @@ diff --git a/src/locales/lang/en/layout.json b/src/locales/lang/en/layout.json index df2edf7a..b9acaa17 100644 --- a/src/locales/lang/en/layout.json +++ b/src/locales/lang/en/layout.json @@ -6,7 +6,7 @@ "header": { "dropdownChangeApi": "Change Api", "dropdownItemDoc": "Document", - "dropdownItemLoginOut": "Log Out", + "dropdownItemLoginOut": "Switched Systems", "tooltipErrorLog": "Error log", "tooltipLock": "Lock screen", "tooltipNotify": "Notification", diff --git a/src/locales/lang/zh-CN/layout.json b/src/locales/lang/zh-CN/layout.json index d0673813..4b04339c 100644 --- a/src/locales/lang/zh-CN/layout.json +++ b/src/locales/lang/zh-CN/layout.json @@ -6,7 +6,7 @@ "header": { "dropdownChangeApi": "切换API", "dropdownItemDoc": "文档", - "dropdownItemLoginOut": "退出系统", + "dropdownItemLoginOut": "切换系统", "tooltipErrorLog": "错误日志", "tooltipLock": "锁定屏幕", "tooltipNotify": "消息通知", diff --git a/src/views/demo/bootstraps/auditinfo/MapList/index.vue b/src/views/demo/bootstraps/auditinfo/MapList/index.vue index f37dbfb7..835c19cd 100644 --- a/src/views/demo/bootstraps/auditinfo/MapList/index.vue +++ b/src/views/demo/bootstraps/auditinfo/MapList/index.vue @@ -32,7 +32,7 @@
- 查询 + 查询
- 查询 + 查询
@@ -167,36 +167,34 @@ {{ item.address }}
- {{ - item.case_description - }} + {{ item.case_name }}
总
- {{ item.area }} +
{{ item.area }}
耕
- {{ item.gengdi_area }} +
{{ item.gengdi_area }}
-
+
农
- {{ item.nongyongdi_area }} +
{{ item.yongjiujibennongtian_area }}
-
重
- {{ item.zhongdianquyu_area }} +
重
+
{{ item.zhongdianquyu_area }}
-
规
- {{ item.guotukongjianguihua_area }} +
规
+
{{ item.guotukongjianguihua_area }}
-
生
- {{ item.shengtaibaohuhongxian_area }} +
生
+
{{ item.shengtaibaohuhongxian_area }}
@@ -204,16 +202,13 @@ - -
- @@ -415,9 +410,10 @@ padding: 10px; background: @component-background; margin-top: 10px; + height: 60vh; .data-list-item { display: flex; - height: 60px; + height: 90px; align-items: center; border-bottom: 1px solid #cdcccc; .select-mark { @@ -438,6 +434,8 @@ align-items: center; // justify-content: center; height: 22px; + font-weight: 500; + font-size: 15px; } .item-info-layout { padding-left: 15px; @@ -445,6 +443,12 @@ flex: 1; justify-content: space-between; } + .item-info-address { + // width: 120px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } .item-info-batch { overflow: hidden; text-overflow: ellipsis; @@ -457,11 +461,14 @@ .item-data-item { display: flex; align-items: center; + border-radius: 6px 6px 0px 6px; + border: 1px solid #dddddd; + margin-right: 10px; .item-mark-div { width: 20px; height: 20px; color: #fff; - border-radius: 6px; + border-radius: 4px 4px 0px 4px; display: flex; align-items: center; justify-content: center; @@ -475,30 +482,29 @@ } .adjust-mark { background: #c06b1a; - width: 40px; } .farmland-mark { background: #7d2bb1; } - .guihua-mark { - background: #c06b1a; + .focus-area { + background: rgb(225 91 91); } - .shengtai-mark { - background: #09b66d; + .padding-mark { + background: #36afa4; + } + .area-data { + width: 55px; } } } } .button-div { - height: 30px; - width: 30px; + flex: 1; + width: 100%; + height: 100%; display: flex; justify-content: space-evenly; font-size: 20px; - border: 1px solid #d9d9d9; - border-radius: 50%; - margin-left: 10px; - cursor: pointer; .collect-button:hover { color: rgb(255, 205, 42); } @@ -506,7 +512,6 @@ } } .pagination-div { - height: 30px; display: flex; align-items: center; background: @component-background; diff --git a/src/views/demo/bootstraps/changearea/index.vue b/src/views/demo/bootstraps/changearea/index.vue index 49486974..8f802889 100644 --- a/src/views/demo/bootstraps/changearea/index.vue +++ b/src/views/demo/bootstraps/changearea/index.vue @@ -147,7 +147,6 @@ infoScreenData.value.countyId = item.areaid; municipalAreaOptions.value = [{ label: item.areaname, value: item.areaid }]; getChildrenTree({ parentId: item.areaid }).then((res) => { - console.log(res); res.forEach((cityItem) => { countiesAreaOptions.value.push({ label: cityItem.name, @@ -159,7 +158,6 @@ } else { cityType.value = null; } - console.log(item); }; const getParams = () => { let result = {}; @@ -229,7 +227,10 @@ center: [117.984425, 35.270654], }); }; - const getInfoList = () => { + const getInfoList = (val) => { + if (val) { + pageNo.value = 1; + } getLoadDroneCaseInfoDetail(getParams()).then((res) => { total.value = res.total; infoDataList.value = res.items; @@ -247,7 +248,6 @@ }; function changeTask(val) { - console.log(val); let getGeomPrams = { TableName: 'drone_shp_data ', FieldName: 'gid', diff --git a/src/views/demo/bootstraps/curbspotcity/MapList/ShowInfoModal/index.vue b/src/views/demo/bootstraps/curbspotcity/MapList/ShowInfoModal/index.vue index ea1fe720..2ec5a8ed 100644 --- a/src/views/demo/bootstraps/curbspotcity/MapList/ShowInfoModal/index.vue +++ b/src/views/demo/bootstraps/curbspotcity/MapList/ShowInfoModal/index.vue @@ -11,6 +11,7 @@ {{ case_no }} {{ case_name }} {{ case_description }} + {{ geomid }} {{ address }} {{ area? area: '-' }} 亩 {{ gengdi_area? gengdi_area: '-' }} 亩 @@ -36,6 +37,7 @@ const { gengdi_area, guotukongjianguihua_area, id, + geomid, nongyongdi_area, shengtaibaohuhongxian_area, yongjiujibennongtian_area, diff --git a/src/views/demo/bootstraps/curbspotcity/MapList/index.vue b/src/views/demo/bootstraps/curbspotcity/MapList/index.vue index 9d9b3ef4..91b2d14d 100644 --- a/src/views/demo/bootstraps/curbspotcity/MapList/index.vue +++ b/src/views/demo/bootstraps/curbspotcity/MapList/index.vue @@ -1,5 +1,12 @@