From 47dd8dffb648460aa95baf5727d422615b8c9dec Mon Sep 17 00:00:00 2001 From: zhangyanli Date: Mon, 26 Feb 2024 11:17:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=EF=BC=9A14263=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safety_environmental/add.vue | 8 +++++++- .../safety_environmental/components/defense.vue | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/views/safety_environmental_management/safety_environmental/add.vue b/src/views/safety_environmental_management/safety_environmental/add.vue index 472aea6..b152647 100644 --- a/src/views/safety_environmental_management/safety_environmental/add.vue +++ b/src/views/safety_environmental_management/safety_environmental/add.vue @@ -216,7 +216,7 @@ type="primary" text link - @click="data.form.hiddenList.splice($index, 1)" + @click="fnDelHidden($index)" > 删除 @@ -315,6 +315,7 @@ const data = reactive({ situationList: [], hiddenList: [], }, + oldhiddens: [], inspectedSiteUserList: [], addHiddenDialog: { visible: false, @@ -395,6 +396,10 @@ const fnAddHidden = () => { data.addHiddenDialog.hazardDiscovererList.unshift({ NAME, USER_ID }); } }; +const fnDelHidden = (index) => { + data.oldhiddens.push(data.form.hiddenList[index].HIDDEN_ID); + data.form.hiddenList.splice(index, 1); +}; const fnAddHiddenSubmit = (item) => { data.form.hiddenList.push(item); }; @@ -427,6 +432,7 @@ const fnSubmit = debounce( INSPECTORJSON: JSON.stringify(inspectorList), SITUATIONJSON: JSON.stringify(data.form.situationList), HIDDENJSON: JSON.stringify(data.form.hiddenList), + delHiddens: data.oldhiddens.join(","), CONFIRM_MESSAGE_TIME: dayjs().format("YYYY-MM-DD HH:mm"), }); hiddenList = resData.pd.hiddenList; diff --git a/src/views/safety_environmental_management/safety_environmental/components/defense.vue b/src/views/safety_environmental_management/safety_environmental/components/defense.vue index 81b61b4..82d2078 100644 --- a/src/views/safety_environmental_management/safety_environmental/components/defense.vue +++ b/src/views/safety_environmental_management/safety_environmental/components/defense.vue @@ -22,7 +22,11 @@ - + 下载 From 2f7623585f5ebbb11a40f7ded2ffe2ef4acf2b8e Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Mon, 26 Feb 2024 11:27:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=81=9A=E9=9B=86=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E8=81=9A=E9=9B=86=E6=A6=82=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/aggregation_management.js | 10 + src/request/map_settings.js | 3 +- .../gathering_alarm_records/index.vue | 63 +++ .../gathering_overview/index.vue | 452 ++++++++++++++++++ .../map_settings/path_planning/index.vue | 5 +- 5 files changed, 530 insertions(+), 3 deletions(-) create mode 100644 src/request/aggregation_management.js create mode 100644 src/views/aggregation_management/gathering_alarm_records/index.vue create mode 100644 src/views/aggregation_management/gathering_overview/index.vue diff --git a/src/request/aggregation_management.js b/src/request/aggregation_management.js new file mode 100644 index 0000000..c6d5611 --- /dev/null +++ b/src/request/aggregation_management.js @@ -0,0 +1,10 @@ +import { post } from "@/request/axios.js"; + +export const getGatheringAlarmRecordsList = (params) => + post("/positAlarm/getAlarmRecordList", params); // 聚集告警记录列表 +export const getAggregationAlarmTrend = (params) => + post("/positAlarm/aggregateAlarmTrends", params); // 聚集报警趋势 +export const getAggregatedDataStatistics = (params) => + post("/positAlarm/aggregateDataStatistics", params); // 聚集区域统计 +export const getAggregationAreaStatistics = (params) => + post("/positAlarm/aggregateDataStatisticsByGroup", params); // 聚集数据统计 diff --git a/src/request/map_settings.js b/src/request/map_settings.js index 7349c7a..eb33b12 100644 --- a/src/request/map_settings.js +++ b/src/request/map_settings.js @@ -25,8 +25,7 @@ export const setAssignmentTicketAreaSettingsDelete = (params) => post("/positAlarm/otherRegion/regionDelete", params); // 作业票区域设置删除 export const setPosition = (params) => post("/positAlarm/otherRegion/redrawTheArea", params); // 区域选点 -// TODO 接口不对 export const getPathPlanningList = (params) => - post("/positAlarm/coordinateLine/addCoordinateLine", params); // 路径规划列表 + post("/positAlarm/coordinateLine/tree", params); // 路径规划列表 export const setPathPlanningDelete = (params) => post("/positAlarm/coordinateLine/batchDelete", params); // 路径规划删除 diff --git a/src/views/aggregation_management/gathering_alarm_records/index.vue b/src/views/aggregation_management/gathering_alarm_records/index.vue new file mode 100644 index 0000000..e8a1061 --- /dev/null +++ b/src/views/aggregation_management/gathering_alarm_records/index.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/views/aggregation_management/gathering_overview/index.vue b/src/views/aggregation_management/gathering_overview/index.vue new file mode 100644 index 0000000..693862c --- /dev/null +++ b/src/views/aggregation_management/gathering_overview/index.vue @@ -0,0 +1,452 @@ + + + + + diff --git a/src/views/map_settings/path_planning/index.vue b/src/views/map_settings/path_planning/index.vue index bf4c839..fa4bfe4 100644 --- a/src/views/map_settings/path_planning/index.vue +++ b/src/views/map_settings/path_planning/index.vue @@ -86,7 +86,10 @@ import { reactive } from "vue"; import Add from "./components/add.vue"; const { list, searchForm, tableRef, pagination, fnGetData, fnResetPagination } = - useListData(getPathPlanningList); + useListData(getPathPlanningList, { + defaultSearchForm: { str: "" }, + key: "rows", + }); const data = reactive({ addDialogVisible: false, });