diff --git a/public/statistical/charts_button.png b/public/statistical/charts_button.png new file mode 100644 index 00000000..82194c32 Binary files /dev/null and b/public/statistical/charts_button.png differ diff --git a/public/statistical/item_label.png b/public/statistical/item_label.png new file mode 100644 index 00000000..20566671 Binary files /dev/null and b/public/statistical/item_label.png differ diff --git a/public/statistical/item_title.png b/public/statistical/item_title.png new file mode 100644 index 00000000..63aef23c Binary files /dev/null and b/public/statistical/item_title.png differ diff --git a/public/statistical/left_direction_left.png b/public/statistical/left_direction_left1.png similarity index 100% rename from public/statistical/left_direction_left.png rename to public/statistical/left_direction_left1.png diff --git a/public/statistical/left_direction_left2.png b/public/statistical/left_direction_left2.png new file mode 100644 index 00000000..757bff51 Binary files /dev/null and b/public/statistical/left_direction_left2.png differ diff --git a/public/statistical/left_direction_right1.png b/public/statistical/left_direction_right1.png new file mode 100644 index 00000000..92f7a9a1 Binary files /dev/null and b/public/statistical/left_direction_right1.png differ diff --git a/public/statistical/left_direction_right.png b/public/statistical/left_direction_right2.png similarity index 100% rename from public/statistical/left_direction_right.png rename to public/statistical/left_direction_right2.png diff --git a/public/statistical/page_turning.png b/public/statistical/page_turning.png new file mode 100644 index 00000000..626dad5f Binary files /dev/null and b/public/statistical/page_turning.png differ diff --git a/public/statistical/right_decoration.png b/public/statistical/right_decoration.png new file mode 100644 index 00000000..73fb3a47 Binary files /dev/null and b/public/statistical/right_decoration.png differ diff --git a/public/statistical/select_center_bg.png b/public/statistical/select_center_bg.png new file mode 100644 index 00000000..d0c3e3e0 Binary files /dev/null and b/public/statistical/select_center_bg.png differ diff --git a/public/statistical/select_left_bg.png b/public/statistical/select_left_bg.png new file mode 100644 index 00000000..8f6665c7 Binary files /dev/null and b/public/statistical/select_left_bg.png differ diff --git a/public/statistical/select_right_bg.png b/public/statistical/select_right_bg.png new file mode 100644 index 00000000..0585c4fb Binary files /dev/null and b/public/statistical/select_right_bg.png differ diff --git a/public/statistical/selected_charts_button.png b/public/statistical/selected_charts_button.png new file mode 100644 index 00000000..ff954615 Binary files /dev/null and b/public/statistical/selected_charts_button.png differ diff --git a/public/statistical/sub_title.png b/public/statistical/sub_title.png new file mode 100644 index 00000000..1ee233b9 Binary files /dev/null and b/public/statistical/sub_title.png differ diff --git a/src/api/statistical/index.ts b/src/api/statistical/index.ts new file mode 100644 index 00000000..5cde02eb --- /dev/null +++ b/src/api/statistical/index.ts @@ -0,0 +1,20 @@ +import { defHttp } from '@/utils/http/axios'; +enum Api { + GetTrendData = '/api/DroneScreenDisplay/GetTrendData', + GetTuBanSummary = '/api/DroneScreenDisplay/GetTuBanSummary', + GetTotalAndAreaByType = '/api/DroneScreenDisplay/GetTotalAndAreaByType', + GetTotalAndArea = '/api/DroneScreenDisplay/GetTotalAndArea' +} +export function GetTrendData(params:{countyid:string;type:string;datatype:number;begindate?:string;enddate?:string;}) { + // datatype 0按天统计,1按月统计 + return defHttp.get({ url: Api.GetTrendData, params }); +} +export function GetTuBanSummary(params:{countyid:string;type:string;}) { + return defHttp.get({ url: Api.GetTuBanSummary, params }); +} +export function GetTotalAndAreaByType(params:{countyid:string;type:string;}) { + return defHttp.get({ url: Api.GetTotalAndAreaByType, params }); +} +export function GetTotalAndArea(params:{countyid:string;type:string;}) { + return defHttp.get({ url: Api.GetTotalAndArea, params }); +} \ No newline at end of file diff --git a/src/views/demo/caseoffence/RecordList.vue b/src/views/demo/caseoffence/RecordList.vue index 91099f7b..26ed531c 100644 --- a/src/views/demo/caseoffence/RecordList.vue +++ b/src/views/demo/caseoffence/RecordList.vue @@ -40,6 +40,7 @@ import { BasicModal, useModal } from '@/components/Modal'; import { getCaseInfoList } from '@/api/monitor/index'; import { getLoadCaseInfoListOffence } from '@/api/demo/system'; + import { dataProcessingCount } from '@/views/demo/tiankongdi/util.ts'; const [registerModal, { openModal, setModalProps }] = useModal(); @@ -165,6 +166,10 @@ function handleGetList() { getLoadCaseInfoListOffence(props.currentListQuery).then((res) => { + res.items.forEach((item) => { + item.area = dataProcessingCount(item.area); + item.gengdi_area = dataProcessingCount(item.gengdi_area); + }); columns.data = res.items; total.value = res.total; }); diff --git a/src/views/demo/caseoffence/index.vue b/src/views/demo/caseoffence/index.vue index 65fe7c35..52ce4547 100644 --- a/src/views/demo/caseoffence/index.vue +++ b/src/views/demo/caseoffence/index.vue @@ -130,7 +130,7 @@ {{ record.zghsywfgdgdmj }} - diff --git a/src/views/demo/statistical/patchsummary/index.vue b/src/views/demo/statistical/patchsummary/index.vue index fe8261a3..7aa60fee 100644 --- a/src/views/demo/statistical/patchsummary/index.vue +++ b/src/views/demo/statistical/patchsummary/index.vue @@ -67,7 +67,7 @@ import axios from 'axios'; import ShowInfoModal from '@/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue'; import { getCaseInfoById } from '@/api/tiankongdi/index'; - import { dataProcessingCount } from '@/views/demo/tiankongdi/util.ts'; + import { dataProcessingCount } from '@/views/demo/tiankongdi/util'; import { BasicForm, useForm } from '@/components/Form'; import { PageWrapper } from '@/components/Page'; diff --git a/src/views/demo/tiankongdi/mapaggregation/index.vue b/src/views/demo/tiankongdi/mapaggregation/index.vue new file mode 100644 index 00000000..5ea45646 --- /dev/null +++ b/src/views/demo/tiankongdi/mapaggregation/index.vue @@ -0,0 +1,6 @@ + + diff --git a/src/views/sys/exception/Exception.vue b/src/views/sys/exception/Exception.vue index 88575424..e6b5663d 100644 --- a/src/views/sys/exception/Exception.vue +++ b/src/views/sys/exception/Exception.vue @@ -1,13 +1,13 @@ \ No newline at end of file + diff --git a/src/views/sys/exception/dataScreen/DataStatistics/index.vue b/src/views/sys/exception/dataScreen/DataStatistics/index.vue new file mode 100644 index 00000000..b4ab8d09 --- /dev/null +++ b/src/views/sys/exception/dataScreen/DataStatistics/index.vue @@ -0,0 +1,205 @@ + + + + + diff --git a/src/views/sys/exception/dataScreen/PatchSummary/index.vue b/src/views/sys/exception/dataScreen/PatchSummary/index.vue new file mode 100644 index 00000000..7e5794d2 --- /dev/null +++ b/src/views/sys/exception/dataScreen/PatchSummary/index.vue @@ -0,0 +1,556 @@ + + + + + diff --git a/src/views/sys/exception/dataScreen/TitleSelect/index.vue b/src/views/sys/exception/dataScreen/TitleSelect/index.vue new file mode 100644 index 00000000..6a25a870 --- /dev/null +++ b/src/views/sys/exception/dataScreen/TitleSelect/index.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/sys/exception/dataScreen/TopSelect/index.vue b/src/views/sys/exception/dataScreen/TopSelect/index.vue new file mode 100644 index 00000000..72d10d89 --- /dev/null +++ b/src/views/sys/exception/dataScreen/TopSelect/index.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/sys/exception/dataScreen/TrendStatistics/index.vue b/src/views/sys/exception/dataScreen/TrendStatistics/index.vue new file mode 100644 index 00000000..9e85e263 --- /dev/null +++ b/src/views/sys/exception/dataScreen/TrendStatistics/index.vue @@ -0,0 +1,321 @@ + + + + + diff --git a/src/views/sys/exception/dataScreen/index.vue b/src/views/sys/exception/dataScreen/index.vue new file mode 100644 index 00000000..9bdd248b --- /dev/null +++ b/src/views/sys/exception/dataScreen/index.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/views/sys/exception/mapComponent/left_county.vue b/src/views/sys/exception/mapComponent/left_county.vue index 90cba612..d1b41abb 100644 --- a/src/views/sys/exception/mapComponent/left_county.vue +++ b/src/views/sys/exception/mapComponent/left_county.vue @@ -3,25 +3,26 @@
-
-
+
+
{{ item.name }}
- +
@@ -65,17 +73,16 @@ const scrollToElement = async (type) => { if (countyList.value) { if (type == 'left') { - countyList.value.scrollLeft = countyList.value.scrollLeft - 107; + countyList.value.scrollLeft = countyList.value.scrollLeft - 110; } if (type == 'right') { - countyList.value.scrollLeft = countyList.value.scrollLeft + 107; + countyList.value.scrollLeft = countyList.value.scrollLeft + 110; } } }; // 选择区县 function clickCounty(record) { - list.value.forEach((item) => { if (item.cascadeId == record.cascadeId) { item.isClick = true; @@ -105,8 +112,7 @@ diff --git a/src/views/sys/exception/mapComponent/left_statisticalType.vue b/src/views/sys/exception/mapComponent/left_statisticalType.vue index c23f622b..3ade67b3 100644 --- a/src/views/sys/exception/mapComponent/left_statisticalType.vue +++ b/src/views/sys/exception/mapComponent/left_statisticalType.vue @@ -4,32 +4,34 @@ src="/statistical/left_statistical.png" :style="{ position: 'relative', + height: '100px', + width: '200px', }" />
- - + + 违法 - - + + 补办手续 - - + + 合法 - - + + 拆除复耕 - - + + 其他 @@ -38,34 +40,39 @@