diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
index 8bbe323c..cee3f96d 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/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;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
index 2a6194a2..92887ceb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
@@ -5,7 +5,7 @@
-
+
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..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,8 @@ export default {
beforeDestroy() {
this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
+ markerClusterIns.clear();
+ 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) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
index d99ae97e..8aff60c9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
@@ -2,12 +2,11 @@

-
+
-
+
@@ -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%;
}
}
}
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 @@
@@ -41,9 +47,9 @@
-
-
-
+
+
+