From 3f0c6be278b031c159178adfb8dcf64f5c34b0ba Mon Sep 17 00:00:00 2001 From: qingzhengli <1204552371@qq.com> Date: Mon, 8 Apr 2024 14:50:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=20bug=20=E9=A2=91=E9=81=93=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=90=8E=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E6=B3=A8=E6=95=B0=E9=87=8F=E4=B8=8D=E5=AF=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/Home/components/RoadAndEvents/index.vue | 1 + .../pages/Home/components/RoadAndEvents/utils/map.js | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue index 259b629c..f062538e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue @@ -183,6 +183,7 @@ export default { beforeDestroy() { this.emitter.off("selectedCompleted", this.selectedCompletedHandle); Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]); + window.renderData = undefined; }, methods: { selectedCompletedHandle(item) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js index 619bf64a..8775cb68 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js @@ -39,7 +39,7 @@ export class MarkerCluster { markerCluster; infoWindow; - data = []; + data = []; //标注集合 constructor() {} @@ -115,7 +115,7 @@ export class MarkerCluster { window.totalPages = totalPages; let num = (page - 1) * pageSize; function renderData(page) { - if (page < 1 || page > totalPages) return; + if (!data || page < 1 || page > totalPages) return; window.page = page; const pageSize = window.pageSize; const dataContainer = document.getElementById("dataContainer"); @@ -127,7 +127,7 @@ export class MarkerCluster { const startIndex = (page - 1) * pageSize; const endIndex = startIndex + pageSize; let num = (page - 1) * pageSize; - if (!data || data.length === 0 || data.length === 1) { + if (data.length === 0 || data.length === 1) { return this.infoWindow.close(); } const { latitude: lat, longitude: lng } = data[0].extData; @@ -391,6 +391,9 @@ export class MarkerCluster { setData() { this.markerCluster.setData(this.data); } + clear() { + this.data = []; + } } export function getContent(data) { From 89651a665ccbcabb722a008b1ee04b8c64c2cd3e Mon Sep 17 00:00:00 2001 From: qingzhengli <1204552371@qq.com> Date: Mon, 8 Apr 2024 14:56:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat=20=E7=BC=BA=E5=A4=B1=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A1=A5=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/Home/components/RoadAndEvents/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue index f062538e..74a6d568 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue @@ -51,7 +51,7 @@ import Intermodulation from "./../Dialogs/Intermodulation/index.vue"; import GuardrailCollision from "./../Dialogs/GuardrailCollision/index.vue"; import FatigueWakesUp from "./../Dialogs/FatigueWakesUp/index.vue"; -import { addInGraphHandle } from "./utils/map" +import { addInGraphHandle, markerClusterIns } from "./utils/map" import { lngLatMap } from "./utils/buttonEvent"; export default { @@ -183,6 +183,7 @@ export default { beforeDestroy() { this.emitter.off("selectedCompleted", this.selectedCompletedHandle); Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]); + markerClusterIns.clear(); window.renderData = undefined; }, methods: { From f3d24af1a6d1f4425fcb07ede8070b3fd9a8e2ce Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Mon, 8 Apr 2024 16:07:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JiHeExpressway/common/PresetFormItems.js | 43 +++++------ .../pages/service/boardRecord/data.js | 63 ++++++++++++++++ .../pages/service/boardRecord/index.vue | 72 +++++++++++++++---- 3 files changed, 137 insertions(+), 41 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js index f906e716..0357a94f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js @@ -251,33 +251,22 @@ export const startEndStation = { }, }; -// export const direction = { -// label: "方向:", -// key: "direction", -// required: true, -// type: "select", -// options: { -// options: [ -// // { key: "济南方向", label: "济南方向" }, -// // { key: "菏泽方向", label: "菏泽方向" }, -// ], -// }, -// }; - -export const direction = { - label: "路段方向:", - key: "direction", - type: "CheckboxGroup", - isAlone: true, - default: [], - options: { - options: [ - { key: "1", label: "济南方向" }, - { key: "3", label: "菏泽方向" }, - { key: "2", label: "双向" }, - ], - }, -}; +export function directionCreater(type){ + return { + label: "路段方向:", + key: "direction", + type, //CheckboxGroup 或 RadioGroup + isAlone: true, + default: [], + options: { + options: [ + { key: "1", label: "菏泽方向" }, + { key: "2", label: "双向" }, + { key: "3", label: "济南方向" }, + ], + }, + }; +} export const problemDescription = { label: "问题描述:", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js new file mode 100644 index 00000000..b28328d2 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js @@ -0,0 +1,63 @@ +// import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js"; +import * as PresetFormItems from "@screen/common/PresetFormItems.js"; +// import { merge, cloneDeep } from "lodash"; + +export const searchFormList = [ + { + label: "时间范围:", + key: "daterange", + required: false, + type: "datePicker", + options: { + type: "daterange", + format: "yyyy-MM-dd HH:mm:ss", + valueFormat: "yyyy-MM-dd HH:mm:ss", + }, + }, + PresetFormItems.directionCreater("CheckboxGroup"), + { + label: "发布状态:", + key: "releaseStatus", + type: "checkboxGroup", + default: [], + options: { + options: [ + { + key: "1", + label: "成功", + }, + { + key: "0", + label: "失败", + }, + ], + }, + }, + + // { + // label: "内容:", + // key: "releaseContent", + // type: "input", + // default: "" + // }, + + // { + // ...PresetFormItems.station, + // label: "开始桩号:", + // required: false, + // }, + // merge(cloneDeep(PresetFormItems.station), { + // options: { + // options: [ + // { + // key: "endStakeMark[0]", + // }, + // { + // key: "endStakeMark[1]", + // }, + // ], + // }, + // label: "结束桩号:", + // required: false, + // }), +]; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue index bd10cfeb..5817c53e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue @@ -2,8 +2,7 @@
-
- + @@ -16,7 +15,14 @@ 新增 --> -
+ +
@@ -30,7 +36,7 @@ - - - + + + - +
@@ -48,7 +47,7 @@ export default { infinite: true, arrows: false, speed: 600, - slidesToShow: 3, + slidesToShow: 1, slidesToScroll: 1, autoplay: true, autoplaySpeed: 1800, @@ -77,37 +76,20 @@ export default { .vueSlickCarousel { flex: 1; overflow: hidden; - width: 100%; ::v-deep { .slick-list { height: 100%; - width: 100%; - - .slick-track { - width: 100% !important; - height: 100% !important; - - .slick-slide { - width: 100% !important; - - div { - width: 100%; - height: 100%; - } - } - + div { + height: 100%; } - - } } .item { img { height: 100%; - width: 100%; } } } From e1a88712bfe1143caa46fd796eddedc47b586c3e Mon Sep 17 00:00:00 2001 From: qingzhengli <1204552371@qq.com> Date: Mon, 8 Apr 2024 17:08:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat=20=E5=BC=B9=E7=AA=97=E8=92=99=E5=B1=82?= =?UTF-8?q?2100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue index 7a574411..6291baa9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -113,7 +113,7 @@ export default { height: 100%; background: rgba(0, 0, 0, 0.36); border-radius: 0px 0px 0px 0px; - z-index: 1100; + z-index: 2100; // display: flex; // align-items: center; // justify-content: center;