diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 1bc0346..ef6f6ad 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -3,7 +3,7 @@ // 燃气报警列表 export function getGasList(params: any) { return request({ - url: '/alarm/listPage', + url: '/alarm/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -19,7 +19,7 @@ // 巡检任务列表 export function getTaskList(params: any) { return request({ - url: '/system/busPatrolTask/listPage', + url: '/system/busPatrolTask/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -27,7 +27,23 @@ // 巡检轨迹 export function getTaskDetail(params: any) { return request({ - url: '/system/busPatrolTrack/listPage', + url: '/system/busPatrolTrack/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 第三方智能识别 +export function getRecognition(params: any) { + return request({ + url: '/system/analysisRecognition/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 风险耦合分析列表 +export function getAnalyse(params: any) { + return request({ + url: '/system/analysisCoupling/listPage?offset=1&limit=20', method: 'post', data: params, }) diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 1bc0346..ef6f6ad 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -3,7 +3,7 @@ // 燃气报警列表 export function getGasList(params: any) { return request({ - url: '/alarm/listPage', + url: '/alarm/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -19,7 +19,7 @@ // 巡检任务列表 export function getTaskList(params: any) { return request({ - url: '/system/busPatrolTask/listPage', + url: '/system/busPatrolTask/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -27,7 +27,23 @@ // 巡检轨迹 export function getTaskDetail(params: any) { return request({ - url: '/system/busPatrolTrack/listPage', + url: '/system/busPatrolTrack/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 第三方智能识别 +export function getRecognition(params: any) { + return request({ + url: '/system/analysisRecognition/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 风险耦合分析列表 +export function getAnalyse(params: any) { + return request({ + url: '/system/analysisCoupling/listPage?offset=1&limit=20', method: 'post', data: params, }) diff --git a/src/components.d.ts b/src/components.d.ts index 481c1e9..b324544 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -10,6 +10,7 @@ AddNode: typeof import('./components/workFlow/addNode.vue')['default'] AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default'] + Analyse: typeof import('./components/map/components/analyse.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] @@ -55,6 +56,7 @@ PieChart: typeof import('./components/Echart/PieChart.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] QrDialog: typeof import('./components/QrDialog/index.vue')['default'] + Recognition: typeof import('./components/map/components/recognition.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] ScanSampleDialog: typeof import('./components/ScanSampleDialog/index.vue')['default'] diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 1bc0346..ef6f6ad 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -3,7 +3,7 @@ // 燃气报警列表 export function getGasList(params: any) { return request({ - url: '/alarm/listPage', + url: '/alarm/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -19,7 +19,7 @@ // 巡检任务列表 export function getTaskList(params: any) { return request({ - url: '/system/busPatrolTask/listPage', + url: '/system/busPatrolTask/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -27,7 +27,23 @@ // 巡检轨迹 export function getTaskDetail(params: any) { return request({ - url: '/system/busPatrolTrack/listPage', + url: '/system/busPatrolTrack/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 第三方智能识别 +export function getRecognition(params: any) { + return request({ + url: '/system/analysisRecognition/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 风险耦合分析列表 +export function getAnalyse(params: any) { + return request({ + url: '/system/analysisCoupling/listPage?offset=1&limit=20', method: 'post', data: params, }) diff --git a/src/components.d.ts b/src/components.d.ts index 481c1e9..b324544 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -10,6 +10,7 @@ AddNode: typeof import('./components/workFlow/addNode.vue')['default'] AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default'] + Analyse: typeof import('./components/map/components/analyse.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] @@ -55,6 +56,7 @@ PieChart: typeof import('./components/Echart/PieChart.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] QrDialog: typeof import('./components/QrDialog/index.vue')['default'] + Recognition: typeof import('./components/map/components/recognition.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] ScanSampleDialog: typeof import('./components/ScanSampleDialog/index.vue')['default'] diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue new file mode 100644 index 0000000..1efb87a --- /dev/null +++ b/src/components/map/components/analyse.vue @@ -0,0 +1,119 @@ + + + + + + diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 1bc0346..ef6f6ad 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -3,7 +3,7 @@ // 燃气报警列表 export function getGasList(params: any) { return request({ - url: '/alarm/listPage', + url: '/alarm/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -19,7 +19,7 @@ // 巡检任务列表 export function getTaskList(params: any) { return request({ - url: '/system/busPatrolTask/listPage', + url: '/system/busPatrolTask/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -27,7 +27,23 @@ // 巡检轨迹 export function getTaskDetail(params: any) { return request({ - url: '/system/busPatrolTrack/listPage', + url: '/system/busPatrolTrack/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 第三方智能识别 +export function getRecognition(params: any) { + return request({ + url: '/system/analysisRecognition/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 风险耦合分析列表 +export function getAnalyse(params: any) { + return request({ + url: '/system/analysisCoupling/listPage?offset=1&limit=20', method: 'post', data: params, }) diff --git a/src/components.d.ts b/src/components.d.ts index 481c1e9..b324544 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -10,6 +10,7 @@ AddNode: typeof import('./components/workFlow/addNode.vue')['default'] AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default'] + Analyse: typeof import('./components/map/components/analyse.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] @@ -55,6 +56,7 @@ PieChart: typeof import('./components/Echart/PieChart.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] QrDialog: typeof import('./components/QrDialog/index.vue')['default'] + Recognition: typeof import('./components/map/components/recognition.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] ScanSampleDialog: typeof import('./components/ScanSampleDialog/index.vue')['default'] diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue new file mode 100644 index 0000000..1efb87a --- /dev/null +++ b/src/components/map/components/analyse.vue @@ -0,0 +1,119 @@ + + + + + + diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue new file mode 100644 index 0000000..bf7bda6 --- /dev/null +++ b/src/components/map/components/recognition.vue @@ -0,0 +1,197 @@ + + + + + + diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 1bc0346..ef6f6ad 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -3,7 +3,7 @@ // 燃气报警列表 export function getGasList(params: any) { return request({ - url: '/alarm/listPage', + url: '/alarm/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -19,7 +19,7 @@ // 巡检任务列表 export function getTaskList(params: any) { return request({ - url: '/system/busPatrolTask/listPage', + url: '/system/busPatrolTask/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -27,7 +27,23 @@ // 巡检轨迹 export function getTaskDetail(params: any) { return request({ - url: '/system/busPatrolTrack/listPage', + url: '/system/busPatrolTrack/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 第三方智能识别 +export function getRecognition(params: any) { + return request({ + url: '/system/analysisRecognition/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 风险耦合分析列表 +export function getAnalyse(params: any) { + return request({ + url: '/system/analysisCoupling/listPage?offset=1&limit=20', method: 'post', data: params, }) diff --git a/src/components.d.ts b/src/components.d.ts index 481c1e9..b324544 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -10,6 +10,7 @@ AddNode: typeof import('./components/workFlow/addNode.vue')['default'] AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default'] + Analyse: typeof import('./components/map/components/analyse.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] @@ -55,6 +56,7 @@ PieChart: typeof import('./components/Echart/PieChart.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] QrDialog: typeof import('./components/QrDialog/index.vue')['default'] + Recognition: typeof import('./components/map/components/recognition.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] ScanSampleDialog: typeof import('./components/ScanSampleDialog/index.vue')['default'] diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue new file mode 100644 index 0000000..1efb87a --- /dev/null +++ b/src/components/map/components/analyse.vue @@ -0,0 +1,119 @@ + + + + + + diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue new file mode 100644 index 0000000..bf7bda6 --- /dev/null +++ b/src/components/map/components/recognition.vue @@ -0,0 +1,197 @@ + + + + + + diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index d349809..36f021e 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -7,6 +7,8 @@ import gas from './components/gas.vue' import car from './components/car.vue' import taskDetail from './components/taskDetail.vue' +import analyse from './components/analyse.vue' +import recognition from './components/recognition.vue' const overlay = ref() const infoWindow = ref() // 节点信息 @@ -43,6 +45,8 @@ + + @@ -66,6 +70,16 @@ height: 200px !important; } +.analyse { + width: 350px !important; + height: 140px !important; +} + +.recognition { + width: 350px !important; + height: 280px !important; +} + .container { color: #fff; width: 470px; diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 1bc0346..ef6f6ad 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -3,7 +3,7 @@ // 燃气报警列表 export function getGasList(params: any) { return request({ - url: '/alarm/listPage', + url: '/alarm/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -19,7 +19,7 @@ // 巡检任务列表 export function getTaskList(params: any) { return request({ - url: '/system/busPatrolTask/listPage', + url: '/system/busPatrolTask/listPage?offset=1&limit=20', method: 'post', data: params, }) @@ -27,7 +27,23 @@ // 巡检轨迹 export function getTaskDetail(params: any) { return request({ - url: '/system/busPatrolTrack/listPage', + url: '/system/busPatrolTrack/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 第三方智能识别 +export function getRecognition(params: any) { + return request({ + url: '/system/analysisRecognition/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} +// 风险耦合分析列表 +export function getAnalyse(params: any) { + return request({ + url: '/system/analysisCoupling/listPage?offset=1&limit=20', method: 'post', data: params, }) diff --git a/src/components.d.ts b/src/components.d.ts index 481c1e9..b324544 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -10,6 +10,7 @@ AddNode: typeof import('./components/workFlow/addNode.vue')['default'] AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default'] + Analyse: typeof import('./components/map/components/analyse.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] @@ -55,6 +56,7 @@ PieChart: typeof import('./components/Echart/PieChart.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] QrDialog: typeof import('./components/QrDialog/index.vue')['default'] + Recognition: typeof import('./components/map/components/recognition.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] ScanSampleDialog: typeof import('./components/ScanSampleDialog/index.vue')['default'] diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue new file mode 100644 index 0000000..1efb87a --- /dev/null +++ b/src/components/map/components/analyse.vue @@ -0,0 +1,119 @@ + + + + + + diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue new file mode 100644 index 0000000..bf7bda6 --- /dev/null +++ b/src/components/map/components/recognition.vue @@ -0,0 +1,197 @@ + + + + + + diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index d349809..36f021e 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -7,6 +7,8 @@ import gas from './components/gas.vue' import car from './components/car.vue' import taskDetail from './components/taskDetail.vue' +import analyse from './components/analyse.vue' +import recognition from './components/recognition.vue' const overlay = ref() const infoWindow = ref() // 节点信息 @@ -43,6 +45,8 @@ + + @@ -66,6 +70,16 @@ height: 200px !important; } +.analyse { + width: 350px !important; + height: 140px !important; +} + +.recognition { + width: 350px !important; + height: 280px !important; +} + .container { color: #fff; width: 470px; diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 77248f0..d73b679 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -2,6 +2,7 @@