From 1590e2acc6e6cb09a8118fc073d6d19d6c5096e9 Mon Sep 17 00:00:00 2001 From: SunTao <328867980@qq.com> Date: Mon, 18 Nov 2024 13:49:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=A4=A7=E5=B1=8F=E8=81=94?= =?UTF-8?q?=E8=B0=83=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=BE=85=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/xj/screen/disease-screen.js | 11 +- src/api/xj/screen/index.js | 10 +- .../disease-components/traffic-safety.vue | 272 +++++++++++++++++- .../disease-components/traffic-statistic.vue | 42 ++- src/views/big-screen/index.vue | 44 ++- .../overview-components/patrol-order.vue | 100 +++++-- .../overview-components/today-inspection.vue | 172 +++++++++-- 7 files changed, 564 insertions(+), 87 deletions(-) diff --git a/src/api/xj/screen/disease-screen.js b/src/api/xj/screen/disease-screen.js index 591cdc6..3ebc41a 100644 --- a/src/api/xj/screen/disease-screen.js +++ b/src/api/xj/screen/disease-screen.js @@ -35,7 +35,7 @@ export function roadToday(query) { }); } -// 今日巡查弹窗 +// 今日巡查病害弹窗 export function roadTodayDetail(query) { return request({ url: "/bigscreen/v2/getInspectionDetailInfo", @@ -90,6 +90,15 @@ export function getMileage(query) { }); } +// 获取巡查里程弹窗数据 +export function getMileageDetail(query) { + return request({ + url: "/bigscreen/v2/getTaskDetailInfo", + method: "get", + params: query, + }); +} + // 获取巡检车辆数据 export function getCarList(query) { return request({ diff --git a/src/api/xj/screen/index.js b/src/api/xj/screen/index.js index fd56277..92d6c3d 100644 --- a/src/api/xj/screen/index.js +++ b/src/api/xj/screen/index.js @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-24 15:03:28 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-15 16:13:41 + * @LastEditTime: 2024-11-18 10:09:30 * @FilePath: \znxjxt-ui\src\api\xj\screen\index.js * @Description: 大屏首页接口 */ @@ -113,3 +113,11 @@ export function getRoadListTypes() { method: "post", }); } + +// 获取病害类型筛选级联下拉 +export function getDefectTypes() { + return request({ + url: "/bigscreen/v2/getDefectTypesDrowDown", + method: "get", + }); +} diff --git a/src/views/big-screen/disease-components/traffic-safety.vue b/src/views/big-screen/disease-components/traffic-safety.vue index 092d33d..63c8039 100644 --- a/src/views/big-screen/disease-components/traffic-safety.vue +++ b/src/views/big-screen/disease-components/traffic-safety.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-21 09:59:32 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-13 13:39:33 + * @LastEditTime: 2024-11-18 13:37:03 * @FilePath: \znxjxt-ui\src\views\big-screen\traffic-components\traffic-safety.vue * @Description: 病害巡检大屏-今日巡查 --> @@ -10,10 +10,10 @@ @@ -42,8 +47,10 @@ import * as echarts from "echarts"; import { getDropList } from "@/api/xj/screen/disease-screen"; import { roadCurrent } from "@/api/xj/screen/traffic-screen"; +import fssmScroll from "@/components/scroll/fssm-scroll.vue"; export default { name: "TrafficStatistic", + components: { fssmScroll }, props: { select: { type: String, @@ -72,6 +79,15 @@ export default { "#AE74F3", "#4C21D5", "#6669DB", + "#18F7FF", + "#6FC36F", + "#4C83FF", + "#FFEA68", + "#FF8F5F", + "#FC5976", + "#AE74F3", + "#4C21D5", + "#6669DB", ], // echart图数据 echartList: [], @@ -140,7 +156,7 @@ export default { } }); }, - + /* 绘制echart图 */ drawChart() { if (this.echart) { @@ -278,9 +294,11 @@ export default { .statistic-lenged { width: 50%; height: 100%; + padding: 2rem 0; display: flex; flex-direction: column; justify-content: center; + overflow: hidden; z-index: 0; .lenged-item { diff --git a/src/views/big-screen/index.vue b/src/views/big-screen/index.vue index c422acb..3c7daf1 100644 --- a/src/views/big-screen/index.vue +++ b/src/views/big-screen/index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-17 11:34:00 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-15 17:40:06 + * @LastEditTime: 2024-11-18 11:18:49 * @FilePath: \znxjxt-ui\src\views\big-screen\index.vue * @Description: 大屏首页 --> @@ -110,25 +110,11 @@
病害类型筛选: - @@ -274,6 +260,7 @@ import { comppanyImg, getItemTypes, getRoadListTypes, + getDefectTypes, } from "@/api/xj/screen/index"; export default { name: "BigScreen", @@ -368,7 +355,6 @@ export default { // 图片背景下病害类型下拉选择绑定 mapCareSelect: "", // 图片背景下病害类型下拉选择数据 - dieaseTypeList: [], dieaseOptions: [ { value: "zhinan", @@ -703,21 +689,26 @@ export default { /* 获取图片背景左上角病害类型下拉 */ getDieaseTypeList() { - getItemTypes().then(({ code, data }) => { + getDefectTypes().then(({ code, data }) => { if (code === 200) { - this.dieaseTypeList = data; + this.dieaseOptions = data; } }); }, /* 获取图片背景下坐标数据 */ getMapCare(value) { - console.log(value,this.mapCareSelect, "获取图片背景下坐标数据"); - comppanyImg({ type: value }).then(({ code, data }) => { - if (code === 200) { - this.mapCareList = data; + const data = { + classType: value ? value[0] : "", + type: value ? (value.length > 1 ? value[1] : "") : "", + }; + comppanyImg(data).then( + ({ code, data }) => { + if (code === 200) { + this.mapCareList = data; + } } - }); + ); }, /* 点击病害日志详情打开弹窗进行地图打点 */ @@ -986,7 +977,10 @@ export default { /* 获取icon多选数据 */ getIconType() { this.mapLogeList = {}; - getItemTypes({ classType: this.bottomTipClick,type:this.elementDiv }).then(({ code, data }) => { + getItemTypes({ + classType: this.bottomTipClick, + type: this.elementDiv, + }).then(({ code, data }) => { if (code === 200) { this.iconTypeList = data; this.iconType = data.map((item) => { diff --git a/src/views/big-screen/overview-components/patrol-order.vue b/src/views/big-screen/overview-components/patrol-order.vue index be8f453..951884f 100644 --- a/src/views/big-screen/overview-components/patrol-order.vue +++ b/src/views/big-screen/overview-components/patrol-order.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-18 10:25:29 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-14 16:16:56 + * @LastEditTime: 2024-11-18 11:44:52 * @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\work-order.vue * @Description: 总览大屏-巡查里程 --> @@ -35,13 +35,15 @@
@@ -52,7 +54,7 @@