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 c711951c..f8a8db3b 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
@@ -3,7 +3,7 @@
-
+
@@ -29,6 +29,8 @@ import { WarningTypeList, WarningSubclassList } from "@screen/utils/enum.js"
import { dialogDelayVisible } from "./../mixin"
import { LaneOccupancyList } from "@screen/utils/enum.js"
+let vehicleTypeList = [];
+
// 感知事件
export default {
name: 'PerceiveEvent',
@@ -95,6 +97,15 @@ export default {
options: []
},
},
+
+ {
+ label: "车辆类型:",
+ key: "vehicleType",
+ type: "select",
+ options: {
+ options: vehicleTypeList
+ },
+ },
{
label: "事件描述:",
key: "remark",
@@ -129,17 +140,40 @@ export default {
},
async created() {
this.getDetails();
+ this.getVehicleTypeList();
},
methods: {
- getDetails() {
+ getVehicleTypeList() {
+ if (vehicleTypeList.length) return;
+
request({
- url: `/dc/system/event/${this.dialogData.id}`,
+ url: `/system/dict/data/type/${'sys_vehicle_type'}`,
method: "GET",
params: {}
})
.then(({ data, code }) => {
if (code != 200) return Message.error("详情获取失败");
+ vehicleTypeList = this.formList[5].options.options = data.map(item => ({
+ key: item.dictValue,
+ label: item.dictLabel
+ }))
+ })
+ .catch((err) => {
+
+ });
+ },
+ getDetails() {
+ request({
+ url: `/perceivedEvents/warning/getWarningById`,
+ method: "POST",
+ data: {
+ id: this.dialogData.id
+ }
+ })
+ .then(({ data, code }) => {
+ if (code != 200) return Message.error("详情获取失败");
+
// data = {
// "searchValue": null,
// "createBy": null,
@@ -194,6 +228,7 @@ export default {
warningType: this.data.warningType,
warningSubclass: this.data.warningSubclass,
remark: this.data.remark,
+ vehicleType: this.data.vehicleType,
lane: this.data.lane
})
@@ -204,6 +239,7 @@ export default {
id: this.dialogData.id,
warningType: this.data.warningType,
warningSubclass: this.data.warningSubclass,
+ vehicleType: this.data.vehicleType,
remark: this.data.remark,
lane: this.data.lane
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
index 4fd93435..82789dda 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
+++ b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
@@ -5,6 +5,16 @@
margin-right: 9px;
}
}
+body {
+ div.el-scrollbar__wrap {
+ /* 滚动条整体部分 */
+ &::-webkit-scrollbar {
+ width: 0 !important;
+ height: 0 !important;
+ padding: 0;
+ }
+ }
+}
div.el-popper {
background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
color: #fff;
@@ -348,7 +358,7 @@ body {
}
div.el-textarea {
textarea.el-textarea__inner {
- background: #0D5F79;
+ background: #0d5f79;
border-radius: 5px;
border: 1px solid rgba(98, 224, 254, 0.6);
}