diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue index 42cc42a..b75f94d 100644 --- a/src/components/map/components/database.vue +++ b/src/components/map/components/database.vue @@ -14,21 +14,22 @@ }), }, }) -const baseUrl = import.meta.env.VITE_APP_API_BASEURL -const showBig = ref(false) -const show = () => { - showBig.value = !showBig.value -} -const position = ref('') -watch(() => $props.info, (newVal) => { - showBig.value = false -}, { deep: true, immediate: true }) +// const baseUrl = import.meta.env.VITE_APP_API_BASEURL +// const showBig = ref(false) +// const show = () => { +// showBig.value = !showBig.value +// } +// const position = ref('') +// watch(() => $props.info, (newVal) => { +// showBig.value = false +// }, { deep: true, immediate: true }) @@ -161,7 +162,8 @@ // } .value1 { - width: 300px; + // width: 300px; + width: 480px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue index 42cc42a..b75f94d 100644 --- a/src/components/map/components/database.vue +++ b/src/components/map/components/database.vue @@ -14,21 +14,22 @@ }), }, }) -const baseUrl = import.meta.env.VITE_APP_API_BASEURL -const showBig = ref(false) -const show = () => { - showBig.value = !showBig.value -} -const position = ref('') -watch(() => $props.info, (newVal) => { - showBig.value = false -}, { deep: true, immediate: true }) +// const baseUrl = import.meta.env.VITE_APP_API_BASEURL +// const showBig = ref(false) +// const show = () => { +// showBig.value = !showBig.value +// } +// const position = ref('') +// watch(() => $props.info, (newVal) => { +// showBig.value = false +// }, { deep: true, immediate: true }) @@ -161,7 +162,8 @@ // } .value1 { - width: 300px; + // width: 300px; + width: 480px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 46514ba..7c5d30c 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -82,9 +82,13 @@ height: 280px !important; } +// .database { +// width: 840px !important; +// height: 270px !important; +// } .database { - width: 840px !important; - height: 270px !important; + width: 600px !important; + height: 200px !important; } .container { diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue index 42cc42a..b75f94d 100644 --- a/src/components/map/components/database.vue +++ b/src/components/map/components/database.vue @@ -14,21 +14,22 @@ }), }, }) -const baseUrl = import.meta.env.VITE_APP_API_BASEURL -const showBig = ref(false) -const show = () => { - showBig.value = !showBig.value -} -const position = ref('') -watch(() => $props.info, (newVal) => { - showBig.value = false -}, { deep: true, immediate: true }) +// const baseUrl = import.meta.env.VITE_APP_API_BASEURL +// const showBig = ref(false) +// const show = () => { +// showBig.value = !showBig.value +// } +// const position = ref('') +// watch(() => $props.info, (newVal) => { +// showBig.value = false +// }, { deep: true, immediate: true }) @@ -161,7 +162,8 @@ // } .value1 { - width: 300px; + // width: 300px; + width: 480px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 46514ba..7c5d30c 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -82,9 +82,13 @@ height: 280px !important; } +// .database { +// width: 840px !important; +// height: 270px !important; +// } .database { - width: 840px !important; - height: 270px !important; + width: 600px !important; + height: 200px !important; } .container { diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue index 7a98a09..4d109f9 100644 --- a/src/layouts/components/SubSidebar/index.vue +++ b/src/layouts/components/SubSidebar/index.vue @@ -62,6 +62,7 @@ background: url("../../../assets/images/login-image/menu.png") no-repeat center; box-shadow: 10px 0 10px -10px var(--g-box-shadow-color); transition: background-color 0.3s, var(--el-transition-box-shadow), left 0.3s, width 0.3s; + background-size: 100% 100%; &.is-collapse { width: 55px; diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue index 42cc42a..b75f94d 100644 --- a/src/components/map/components/database.vue +++ b/src/components/map/components/database.vue @@ -14,21 +14,22 @@ }), }, }) -const baseUrl = import.meta.env.VITE_APP_API_BASEURL -const showBig = ref(false) -const show = () => { - showBig.value = !showBig.value -} -const position = ref('') -watch(() => $props.info, (newVal) => { - showBig.value = false -}, { deep: true, immediate: true }) +// const baseUrl = import.meta.env.VITE_APP_API_BASEURL +// const showBig = ref(false) +// const show = () => { +// showBig.value = !showBig.value +// } +// const position = ref('') +// watch(() => $props.info, (newVal) => { +// showBig.value = false +// }, { deep: true, immediate: true }) @@ -161,7 +162,8 @@ // } .value1 { - width: 300px; + // width: 300px; + width: 480px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 46514ba..7c5d30c 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -82,9 +82,13 @@ height: 280px !important; } +// .database { +// width: 840px !important; +// height: 270px !important; +// } .database { - width: 840px !important; - height: 270px !important; + width: 600px !important; + height: 200px !important; } .container { diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue index 7a98a09..4d109f9 100644 --- a/src/layouts/components/SubSidebar/index.vue +++ b/src/layouts/components/SubSidebar/index.vue @@ -62,6 +62,7 @@ background: url("../../../assets/images/login-image/menu.png") no-repeat center; box-shadow: 10px 0 10px -10px var(--g-box-shadow-color); transition: background-color 0.3s, var(--el-transition-box-shadow), left 0.3s, width 0.3s; + background-size: 100% 100%; &.is-collapse { width: 55px; diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 2d35733..7b61291 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -1,7 +1,7 @@ @@ -190,7 +261,7 @@ 第三方施工智能识别分析
- + 周 @@ -204,7 +275,7 @@
- +
@@ -214,7 +285,7 @@ 风险耦合分析
- + 周 @@ -228,7 +299,7 @@
- +
diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue index 42cc42a..b75f94d 100644 --- a/src/components/map/components/database.vue +++ b/src/components/map/components/database.vue @@ -14,21 +14,22 @@ }), }, }) -const baseUrl = import.meta.env.VITE_APP_API_BASEURL -const showBig = ref(false) -const show = () => { - showBig.value = !showBig.value -} -const position = ref('') -watch(() => $props.info, (newVal) => { - showBig.value = false -}, { deep: true, immediate: true }) +// const baseUrl = import.meta.env.VITE_APP_API_BASEURL +// const showBig = ref(false) +// const show = () => { +// showBig.value = !showBig.value +// } +// const position = ref('') +// watch(() => $props.info, (newVal) => { +// showBig.value = false +// }, { deep: true, immediate: true }) @@ -161,7 +162,8 @@ // } .value1 { - width: 300px; + // width: 300px; + width: 480px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 46514ba..7c5d30c 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -82,9 +82,13 @@ height: 280px !important; } +// .database { +// width: 840px !important; +// height: 270px !important; +// } .database { - width: 840px !important; - height: 270px !important; + width: 600px !important; + height: 200px !important; } .container { diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue index 7a98a09..4d109f9 100644 --- a/src/layouts/components/SubSidebar/index.vue +++ b/src/layouts/components/SubSidebar/index.vue @@ -62,6 +62,7 @@ background: url("../../../assets/images/login-image/menu.png") no-repeat center; box-shadow: 10px 0 10px -10px var(--g-box-shadow-color); transition: background-color 0.3s, var(--el-transition-box-shadow), left 0.3s, width 0.3s; + background-size: 100% 100%; &.is-collapse { width: 55px; diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 2d35733..7b61291 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -1,7 +1,7 @@ @@ -190,7 +261,7 @@ 第三方施工智能识别分析
- + 周 @@ -204,7 +275,7 @@
- +
@@ -214,7 +285,7 @@ 风险耦合分析
- + 周 @@ -228,7 +299,7 @@
- +
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 30436a4..b84f0bd 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -396,9 +396,9 @@ endDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 报警结束时间 }).then((res) => { console.log(res.data, '占压') - const data = res.data.rows.map((item: any) => { + const data = res.data.map((item: any) => { let icon = '' - switch (item.hiddenDangerLevel) { + switch (item.overLevel) { case '较小隐患': icon = database1 break @@ -415,16 +415,15 @@ lng: item.longitude, icon, dialog: 'database', - position: item.location, + position: item.overPlace, } }) let Filter = [] - console.log(cselect.value, 'cselect.value') if (cselect.value.length === 3) { Filter = data } else { - Filter = data.filter(item => cselect.value.includes(item.hiddenDangerLevel)) + Filter = data.filter(item => cselect.value.includes(item.overLevel)) } console.log(Filter, 'FilterFilter') if (!Filter.length) { diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue index 42cc42a..b75f94d 100644 --- a/src/components/map/components/database.vue +++ b/src/components/map/components/database.vue @@ -14,21 +14,22 @@ }), }, }) -const baseUrl = import.meta.env.VITE_APP_API_BASEURL -const showBig = ref(false) -const show = () => { - showBig.value = !showBig.value -} -const position = ref('') -watch(() => $props.info, (newVal) => { - showBig.value = false -}, { deep: true, immediate: true }) +// const baseUrl = import.meta.env.VITE_APP_API_BASEURL +// const showBig = ref(false) +// const show = () => { +// showBig.value = !showBig.value +// } +// const position = ref('') +// watch(() => $props.info, (newVal) => { +// showBig.value = false +// }, { deep: true, immediate: true }) @@ -161,7 +162,8 @@ // } .value1 { - width: 300px; + // width: 300px; + width: 480px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 46514ba..7c5d30c 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -82,9 +82,13 @@ height: 280px !important; } +// .database { +// width: 840px !important; +// height: 270px !important; +// } .database { - width: 840px !important; - height: 270px !important; + width: 600px !important; + height: 200px !important; } .container { diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue index 7a98a09..4d109f9 100644 --- a/src/layouts/components/SubSidebar/index.vue +++ b/src/layouts/components/SubSidebar/index.vue @@ -62,6 +62,7 @@ background: url("../../../assets/images/login-image/menu.png") no-repeat center; box-shadow: 10px 0 10px -10px var(--g-box-shadow-color); transition: background-color 0.3s, var(--el-transition-box-shadow), left 0.3s, width 0.3s; + background-size: 100% 100%; &.is-collapse { width: 55px; diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 2d35733..7b61291 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -1,7 +1,7 @@ @@ -190,7 +261,7 @@ 第三方施工智能识别分析
- + 周 @@ -204,7 +275,7 @@
- +
@@ -214,7 +285,7 @@ 风险耦合分析
- + 周 @@ -228,7 +299,7 @@
- +
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 30436a4..b84f0bd 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -396,9 +396,9 @@ endDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 报警结束时间 }).then((res) => { console.log(res.data, '占压') - const data = res.data.rows.map((item: any) => { + const data = res.data.map((item: any) => { let icon = '' - switch (item.hiddenDangerLevel) { + switch (item.overLevel) { case '较小隐患': icon = database1 break @@ -415,16 +415,15 @@ lng: item.longitude, icon, dialog: 'database', - position: item.location, + position: item.overPlace, } }) let Filter = [] - console.log(cselect.value, 'cselect.value') if (cselect.value.length === 3) { Filter = data } else { - Filter = data.filter(item => cselect.value.includes(item.hiddenDangerLevel)) + Filter = data.filter(item => cselect.value.includes(item.overLevel)) } console.log(Filter, 'FilterFilter') if (!Filter.length) { diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue index 2bbb818..dc491dc 100644 --- a/src/views/main/analyse/index.vue +++ b/src/views/main/analyse/index.vue @@ -131,9 +131,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteAnalyse({ ids: checkoutList.value }).then((res) => { - ElMessage.success('操作成功') - fetchData(true) // 获取数据 + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then((res) => { + batchDeleteAnalyse({ ids: checkoutList.value }).then((res) => { + ElMessage.success('操作成功') + fetchData(true) // 获取数据 + }) }) } // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue index 42cc42a..b75f94d 100644 --- a/src/components/map/components/database.vue +++ b/src/components/map/components/database.vue @@ -14,21 +14,22 @@ }), }, }) -const baseUrl = import.meta.env.VITE_APP_API_BASEURL -const showBig = ref(false) -const show = () => { - showBig.value = !showBig.value -} -const position = ref('') -watch(() => $props.info, (newVal) => { - showBig.value = false -}, { deep: true, immediate: true }) +// const baseUrl = import.meta.env.VITE_APP_API_BASEURL +// const showBig = ref(false) +// const show = () => { +// showBig.value = !showBig.value +// } +// const position = ref('') +// watch(() => $props.info, (newVal) => { +// showBig.value = false +// }, { deep: true, immediate: true }) @@ -161,7 +162,8 @@ // } .value1 { - width: 300px; + // width: 300px; + width: 480px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 46514ba..7c5d30c 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -82,9 +82,13 @@ height: 280px !important; } +// .database { +// width: 840px !important; +// height: 270px !important; +// } .database { - width: 840px !important; - height: 270px !important; + width: 600px !important; + height: 200px !important; } .container { diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue index 7a98a09..4d109f9 100644 --- a/src/layouts/components/SubSidebar/index.vue +++ b/src/layouts/components/SubSidebar/index.vue @@ -62,6 +62,7 @@ background: url("../../../assets/images/login-image/menu.png") no-repeat center; box-shadow: 10px 0 10px -10px var(--g-box-shadow-color); transition: background-color 0.3s, var(--el-transition-box-shadow), left 0.3s, width 0.3s; + background-size: 100% 100%; &.is-collapse { width: 55px; diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 2d35733..7b61291 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -1,7 +1,7 @@ @@ -190,7 +261,7 @@ 第三方施工智能识别分析
- + 周 @@ -204,7 +275,7 @@
- +
@@ -214,7 +285,7 @@ 风险耦合分析
- + 周 @@ -228,7 +299,7 @@
- +
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 30436a4..b84f0bd 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -396,9 +396,9 @@ endDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 报警结束时间 }).then((res) => { console.log(res.data, '占压') - const data = res.data.rows.map((item: any) => { + const data = res.data.map((item: any) => { let icon = '' - switch (item.hiddenDangerLevel) { + switch (item.overLevel) { case '较小隐患': icon = database1 break @@ -415,16 +415,15 @@ lng: item.longitude, icon, dialog: 'database', - position: item.location, + position: item.overPlace, } }) let Filter = [] - console.log(cselect.value, 'cselect.value') if (cselect.value.length === 3) { Filter = data } else { - Filter = data.filter(item => cselect.value.includes(item.hiddenDangerLevel)) + Filter = data.filter(item => cselect.value.includes(item.overLevel)) } console.log(Filter, 'FilterFilter') if (!Filter.length) { diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue index 2bbb818..dc491dc 100644 --- a/src/views/main/analyse/index.vue +++ b/src/views/main/analyse/index.vue @@ -131,9 +131,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteAnalyse({ ids: checkoutList.value }).then((res) => { - ElMessage.success('操作成功') - fetchData(true) // 获取数据 + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then((res) => { + batchDeleteAnalyse({ ids: checkoutList.value }).then((res) => { + ElMessage.success('操作成功') + fetchData(true) // 获取数据 + }) }) } // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue index 231b94c..05863d8 100644 --- a/src/views/main/database/index.vue +++ b/src/views/main/database/index.vue @@ -148,9 +148,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteOver({ ids: checkoutList.value }).then((res) => { - ElMessage.success('操作成功') - fetchData(true) + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then(() => { + batchDeleteOver({ ids: checkoutList.value }).then((res) => { + ElMessage.success('操作成功') + fetchData(true) + }) }) } // 模板下载 diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue index 42cc42a..b75f94d 100644 --- a/src/components/map/components/database.vue +++ b/src/components/map/components/database.vue @@ -14,21 +14,22 @@ }), }, }) -const baseUrl = import.meta.env.VITE_APP_API_BASEURL -const showBig = ref(false) -const show = () => { - showBig.value = !showBig.value -} -const position = ref('') -watch(() => $props.info, (newVal) => { - showBig.value = false -}, { deep: true, immediate: true }) +// const baseUrl = import.meta.env.VITE_APP_API_BASEURL +// const showBig = ref(false) +// const show = () => { +// showBig.value = !showBig.value +// } +// const position = ref('') +// watch(() => $props.info, (newVal) => { +// showBig.value = false +// }, { deep: true, immediate: true }) @@ -161,7 +162,8 @@ // } .value1 { - width: 300px; + // width: 300px; + width: 480px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 46514ba..7c5d30c 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -82,9 +82,13 @@ height: 280px !important; } +// .database { +// width: 840px !important; +// height: 270px !important; +// } .database { - width: 840px !important; - height: 270px !important; + width: 600px !important; + height: 200px !important; } .container { diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue index 7a98a09..4d109f9 100644 --- a/src/layouts/components/SubSidebar/index.vue +++ b/src/layouts/components/SubSidebar/index.vue @@ -62,6 +62,7 @@ background: url("../../../assets/images/login-image/menu.png") no-repeat center; box-shadow: 10px 0 10px -10px var(--g-box-shadow-color); transition: background-color 0.3s, var(--el-transition-box-shadow), left 0.3s, width 0.3s; + background-size: 100% 100%; &.is-collapse { width: 55px; diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 2d35733..7b61291 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -1,7 +1,7 @@ @@ -190,7 +261,7 @@ 第三方施工智能识别分析
- + 周 @@ -204,7 +275,7 @@
- +
@@ -214,7 +285,7 @@ 风险耦合分析
- + 周 @@ -228,7 +299,7 @@
- +
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 30436a4..b84f0bd 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -396,9 +396,9 @@ endDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 报警结束时间 }).then((res) => { console.log(res.data, '占压') - const data = res.data.rows.map((item: any) => { + const data = res.data.map((item: any) => { let icon = '' - switch (item.hiddenDangerLevel) { + switch (item.overLevel) { case '较小隐患': icon = database1 break @@ -415,16 +415,15 @@ lng: item.longitude, icon, dialog: 'database', - position: item.location, + position: item.overPlace, } }) let Filter = [] - console.log(cselect.value, 'cselect.value') if (cselect.value.length === 3) { Filter = data } else { - Filter = data.filter(item => cselect.value.includes(item.hiddenDangerLevel)) + Filter = data.filter(item => cselect.value.includes(item.overLevel)) } console.log(Filter, 'FilterFilter') if (!Filter.length) { diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue index 2bbb818..dc491dc 100644 --- a/src/views/main/analyse/index.vue +++ b/src/views/main/analyse/index.vue @@ -131,9 +131,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteAnalyse({ ids: checkoutList.value }).then((res) => { - ElMessage.success('操作成功') - fetchData(true) // 获取数据 + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then((res) => { + batchDeleteAnalyse({ ids: checkoutList.value }).then((res) => { + ElMessage.success('操作成功') + fetchData(true) // 获取数据 + }) }) } // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue index 231b94c..05863d8 100644 --- a/src/views/main/database/index.vue +++ b/src/views/main/database/index.vue @@ -148,9 +148,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteOver({ ids: checkoutList.value }).then((res) => { - ElMessage.success('操作成功') - fetchData(true) + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then(() => { + batchDeleteOver({ ids: checkoutList.value }).then((res) => { + ElMessage.success('操作成功') + fetchData(true) + }) }) } // 模板下载 diff --git a/src/views/main/recognition/detail.vue b/src/views/main/recognition/detail.vue index fec1b65..4d2b070 100644 --- a/src/views/main/recognition/detail.vue +++ b/src/views/main/recognition/detail.vue @@ -43,11 +43,11 @@ const initDialog = (row: any) => { dialogFormVisible.value = true areaForm.value = row - // getIdentifyDetail({ id: row.id }).then((res) => { - // console.log(res.data, '识别详情') - // areaForm.value = res.data - // // position.value = `${res.data.alarmLongitude},${res.data.alarmLatitude}` - // }) + getIdentifyDetail({ id: row.id }).then((res) => { + console.log(res.data, '识别详情') + areaForm.value = res.data + // position.value = `${res.data.alarmLongitude},${res.data.alarmLatitude}` + }) } defineExpose({ initDialog, diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue index 42cc42a..b75f94d 100644 --- a/src/components/map/components/database.vue +++ b/src/components/map/components/database.vue @@ -14,21 +14,22 @@ }), }, }) -const baseUrl = import.meta.env.VITE_APP_API_BASEURL -const showBig = ref(false) -const show = () => { - showBig.value = !showBig.value -} -const position = ref('') -watch(() => $props.info, (newVal) => { - showBig.value = false -}, { deep: true, immediate: true }) +// const baseUrl = import.meta.env.VITE_APP_API_BASEURL +// const showBig = ref(false) +// const show = () => { +// showBig.value = !showBig.value +// } +// const position = ref('') +// watch(() => $props.info, (newVal) => { +// showBig.value = false +// }, { deep: true, immediate: true }) @@ -161,7 +162,8 @@ // } .value1 { - width: 300px; + // width: 300px; + width: 480px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 46514ba..7c5d30c 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -82,9 +82,13 @@ height: 280px !important; } +// .database { +// width: 840px !important; +// height: 270px !important; +// } .database { - width: 840px !important; - height: 270px !important; + width: 600px !important; + height: 200px !important; } .container { diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue index 7a98a09..4d109f9 100644 --- a/src/layouts/components/SubSidebar/index.vue +++ b/src/layouts/components/SubSidebar/index.vue @@ -62,6 +62,7 @@ background: url("../../../assets/images/login-image/menu.png") no-repeat center; box-shadow: 10px 0 10px -10px var(--g-box-shadow-color); transition: background-color 0.3s, var(--el-transition-box-shadow), left 0.3s, width 0.3s; + background-size: 100% 100%; &.is-collapse { width: 55px; diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 2d35733..7b61291 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -1,7 +1,7 @@ @@ -190,7 +261,7 @@ 第三方施工智能识别分析
- + 周 @@ -204,7 +275,7 @@
- +
@@ -214,7 +285,7 @@ 风险耦合分析
- + 周 @@ -228,7 +299,7 @@
- +
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 30436a4..b84f0bd 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -396,9 +396,9 @@ endDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 报警结束时间 }).then((res) => { console.log(res.data, '占压') - const data = res.data.rows.map((item: any) => { + const data = res.data.map((item: any) => { let icon = '' - switch (item.hiddenDangerLevel) { + switch (item.overLevel) { case '较小隐患': icon = database1 break @@ -415,16 +415,15 @@ lng: item.longitude, icon, dialog: 'database', - position: item.location, + position: item.overPlace, } }) let Filter = [] - console.log(cselect.value, 'cselect.value') if (cselect.value.length === 3) { Filter = data } else { - Filter = data.filter(item => cselect.value.includes(item.hiddenDangerLevel)) + Filter = data.filter(item => cselect.value.includes(item.overLevel)) } console.log(Filter, 'FilterFilter') if (!Filter.length) { diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue index 2bbb818..dc491dc 100644 --- a/src/views/main/analyse/index.vue +++ b/src/views/main/analyse/index.vue @@ -131,9 +131,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteAnalyse({ ids: checkoutList.value }).then((res) => { - ElMessage.success('操作成功') - fetchData(true) // 获取数据 + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then((res) => { + batchDeleteAnalyse({ ids: checkoutList.value }).then((res) => { + ElMessage.success('操作成功') + fetchData(true) // 获取数据 + }) }) } // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue index 231b94c..05863d8 100644 --- a/src/views/main/database/index.vue +++ b/src/views/main/database/index.vue @@ -148,9 +148,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteOver({ ids: checkoutList.value }).then((res) => { - ElMessage.success('操作成功') - fetchData(true) + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then(() => { + batchDeleteOver({ ids: checkoutList.value }).then((res) => { + ElMessage.success('操作成功') + fetchData(true) + }) }) } // 模板下载 diff --git a/src/views/main/recognition/detail.vue b/src/views/main/recognition/detail.vue index fec1b65..4d2b070 100644 --- a/src/views/main/recognition/detail.vue +++ b/src/views/main/recognition/detail.vue @@ -43,11 +43,11 @@ const initDialog = (row: any) => { dialogFormVisible.value = true areaForm.value = row - // getIdentifyDetail({ id: row.id }).then((res) => { - // console.log(res.data, '识别详情') - // areaForm.value = res.data - // // position.value = `${res.data.alarmLongitude},${res.data.alarmLatitude}` - // }) + getIdentifyDetail({ id: row.id }).then((res) => { + console.log(res.data, '识别详情') + areaForm.value = res.data + // position.value = `${res.data.alarmLongitude},${res.data.alarmLatitude}` + }) } defineExpose({ initDialog, diff --git a/src/views/main/recognition/index.vue b/src/views/main/recognition/index.vue index 72b163b..094e95a 100644 --- a/src/views/main/recognition/index.vue +++ b/src/views/main/recognition/index.vue @@ -129,9 +129,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteIdentify({ ids: checkoutList.value }).then((res) => { - ElMessage.warning('操作成功') - fetchData(true) // 获取数据 + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then(() => { + batchDeleteIdentify({ ids: checkoutList.value }).then((res) => { + ElMessage.warning('操作成功') + fetchData(true) // 获取数据 + }) }) } diff --git a/index.html b/index.html index c801c4c..52b9ccd 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + <%= title %> diff --git a/public/favicon-beiran.ico b/public/favicon-beiran.ico new file mode 100644 index 0000000..4d57411 --- /dev/null +++ b/public/favicon-beiran.ico Binary files differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index b225e2c..0000000 --- a/public/favicon.ico +++ /dev/null Binary files differ diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 024a447..fb105a3 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -43,7 +43,7 @@ // 占压数据分析 export function getDatabase(params: any) { return request({ - url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + url: '/system/busPipeOverstock/riskResult?offset=1&limit=20', method: 'post', data: params, }) @@ -80,3 +80,19 @@ data: params, }) } +// 统计面板-第三方智能识别 +export function getDashboardRecognition(params: any) { + return request({ + url: '/system/busOverView/recognitionTime', + method: 'post', + data: params, + }) +} +// 统计面板-风险耦合 +export function getDashboardAnalyse(params: any) { + return request({ + url: '/system/busOverView/couplingTime', + method: 'post', + data: params, + }) +} diff --git a/src/assets/images/login-image/menu.png b/src/assets/images/login-image/menu.png index a5e02b4..707a699 100644 --- a/src/assets/images/login-image/menu.png +++ b/src/assets/images/login-image/menu.png Binary files differ diff --git a/src/assets/images/login-image/menu1.png b/src/assets/images/login-image/menu1.png new file mode 100644 index 0000000..a5e02b4 --- /dev/null +++ b/src/assets/images/login-image/menu1.png Binary files differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a9fcd54..db3e54d 100644 --- a/src/assets/images/logo.png +++ b/src/assets/images/logo.png Binary files differ diff --git "a/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" new file mode 100644 index 0000000..707a699 --- /dev/null +++ "b/src/assets/images/\347\202\271\344\275\215\345\233\276\346\240\207/\345\234\260\345\233\276\350\217\234\345\215\225/\345\276\256\344\277\241\345\233\276\347\211\207_20231103153946.png" Binary files differ diff --git "a/src/assets/\345\214\227\347\207\203logo.png" "b/src/assets/\345\214\227\347\207\203logo.png" new file mode 100644 index 0000000..db3e54d --- /dev/null +++ "b/src/assets/\345\214\227\347\207\203logo.png" Binary files differ diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue index 42cc42a..b75f94d 100644 --- a/src/components/map/components/database.vue +++ b/src/components/map/components/database.vue @@ -14,21 +14,22 @@ }), }, }) -const baseUrl = import.meta.env.VITE_APP_API_BASEURL -const showBig = ref(false) -const show = () => { - showBig.value = !showBig.value -} -const position = ref('') -watch(() => $props.info, (newVal) => { - showBig.value = false -}, { deep: true, immediate: true }) +// const baseUrl = import.meta.env.VITE_APP_API_BASEURL +// const showBig = ref(false) +// const show = () => { +// showBig.value = !showBig.value +// } +// const position = ref('') +// watch(() => $props.info, (newVal) => { +// showBig.value = false +// }, { deep: true, immediate: true }) @@ -161,7 +162,8 @@ // } .value1 { - width: 300px; + // width: 300px; + width: 480px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 46514ba..7c5d30c 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -82,9 +82,13 @@ height: 280px !important; } +// .database { +// width: 840px !important; +// height: 270px !important; +// } .database { - width: 840px !important; - height: 270px !important; + width: 600px !important; + height: 200px !important; } .container { diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue index 7a98a09..4d109f9 100644 --- a/src/layouts/components/SubSidebar/index.vue +++ b/src/layouts/components/SubSidebar/index.vue @@ -62,6 +62,7 @@ background: url("../../../assets/images/login-image/menu.png") no-repeat center; box-shadow: 10px 0 10px -10px var(--g-box-shadow-color); transition: background-color 0.3s, var(--el-transition-box-shadow), left 0.3s, width 0.3s; + background-size: 100% 100%; &.is-collapse { width: 55px; diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 2d35733..7b61291 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -1,7 +1,7 @@ @@ -190,7 +261,7 @@ 第三方施工智能识别分析
- + 周 @@ -204,7 +275,7 @@
- +
@@ -214,7 +285,7 @@ 风险耦合分析
- + 周 @@ -228,7 +299,7 @@
- +
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 30436a4..b84f0bd 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -396,9 +396,9 @@ endDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 报警结束时间 }).then((res) => { console.log(res.data, '占压') - const data = res.data.rows.map((item: any) => { + const data = res.data.map((item: any) => { let icon = '' - switch (item.hiddenDangerLevel) { + switch (item.overLevel) { case '较小隐患': icon = database1 break @@ -415,16 +415,15 @@ lng: item.longitude, icon, dialog: 'database', - position: item.location, + position: item.overPlace, } }) let Filter = [] - console.log(cselect.value, 'cselect.value') if (cselect.value.length === 3) { Filter = data } else { - Filter = data.filter(item => cselect.value.includes(item.hiddenDangerLevel)) + Filter = data.filter(item => cselect.value.includes(item.overLevel)) } console.log(Filter, 'FilterFilter') if (!Filter.length) { diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue index 2bbb818..dc491dc 100644 --- a/src/views/main/analyse/index.vue +++ b/src/views/main/analyse/index.vue @@ -131,9 +131,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteAnalyse({ ids: checkoutList.value }).then((res) => { - ElMessage.success('操作成功') - fetchData(true) // 获取数据 + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then((res) => { + batchDeleteAnalyse({ ids: checkoutList.value }).then((res) => { + ElMessage.success('操作成功') + fetchData(true) // 获取数据 + }) }) } // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue index 231b94c..05863d8 100644 --- a/src/views/main/database/index.vue +++ b/src/views/main/database/index.vue @@ -148,9 +148,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteOver({ ids: checkoutList.value }).then((res) => { - ElMessage.success('操作成功') - fetchData(true) + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then(() => { + batchDeleteOver({ ids: checkoutList.value }).then((res) => { + ElMessage.success('操作成功') + fetchData(true) + }) }) } // 模板下载 diff --git a/src/views/main/recognition/detail.vue b/src/views/main/recognition/detail.vue index fec1b65..4d2b070 100644 --- a/src/views/main/recognition/detail.vue +++ b/src/views/main/recognition/detail.vue @@ -43,11 +43,11 @@ const initDialog = (row: any) => { dialogFormVisible.value = true areaForm.value = row - // getIdentifyDetail({ id: row.id }).then((res) => { - // console.log(res.data, '识别详情') - // areaForm.value = res.data - // // position.value = `${res.data.alarmLongitude},${res.data.alarmLatitude}` - // }) + getIdentifyDetail({ id: row.id }).then((res) => { + console.log(res.data, '识别详情') + areaForm.value = res.data + // position.value = `${res.data.alarmLongitude},${res.data.alarmLatitude}` + }) } defineExpose({ initDialog, diff --git a/src/views/main/recognition/index.vue b/src/views/main/recognition/index.vue index 72b163b..094e95a 100644 --- a/src/views/main/recognition/index.vue +++ b/src/views/main/recognition/index.vue @@ -129,9 +129,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteIdentify({ ids: checkoutList.value }).then((res) => { - ElMessage.warning('操作成功') - fetchData(true) // 获取数据 + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then(() => { + batchDeleteIdentify({ ids: checkoutList.value }).then((res) => { + ElMessage.warning('操作成功') + fetchData(true) // 获取数据 + }) }) } diff --git a/src/views/main/undergroundCavity/index.vue b/src/views/main/undergroundCavity/index.vue index e724683..9b0aa16 100644 --- a/src/views/main/undergroundCavity/index.vue +++ b/src/views/main/undergroundCavity/index.vue @@ -117,9 +117,19 @@ ElMessage.warning('请选择需要删除的数据') return } - batchDeleteHole({ ids: checkoutList.value }).then((res) => { - ElMessage.success('操作成功') - fetchData(true) + ElMessageBox.confirm( + '确认删除所选数据吗？', + '提示', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }, + ).then((res) => { + batchDeleteHole({ ids: checkoutList.value }).then((res) => { + ElMessage.success('操作成功') + fetchData(true) + }) }) } // 模板下载