Browse Source

Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

wangqin
qingzhengli 7 months ago
parent
commit
76f98da50c
  1. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
  2. 2566
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data.js
  3. 200
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue
  4. 7
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue
  5. 18
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js

2
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue

@ -1,4 +1,5 @@
<template>
<div>
<Card class="DisposalProcess" title="处置过程">
<template #title-suffix>
<ButtonGradient class="title-button" @click="handleEventRelieve">
@ -80,6 +81,7 @@
:data="dispatchList"
@update:value="handleClose"
/>
</div>
</template>
<script>

2566
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data.js

File diff suppressed because it is too large

200
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue

@ -1,11 +1,11 @@
<template>
<Dialog v-model="modelVisible" title="修改事件信息" width="550px">
<Dialog v-model="modelVisible" title="修改事件信息" width="1100px" top="10%">
<div class="EditEventInformationDialog">
<Form class="form" :formList="formConfigList" labelWidth="120px" />
<Form class="form" :formList="formConfigList" v-model="fData" labelWidth="120px" />
<div class="footer">
<Button>保存</Button>
<Button style="background: #c9c9c9">关闭</Button>
<Button @click.native="onSubmit">保存</Button>
<Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
</div>
</div>
</Dialog>
@ -15,8 +15,106 @@
import Dialog from "@screen/components/Dialog/index";
import Form from "@screen/components/FormConfig";
import Button from "@screen/components/Buttons/Button.vue";
import request from "@/utils/request";
import { tabConfigList } from "./data.js";
import { formConfigList } from "./data.js";
const eventInfo = {
id: "60f022d95a7c4b6cada2d780246543d8",
deptId: null,
deptName: null,
stakeMark: "k103+900",
endStakeMark: null,
direction: "菏泽方向",
userId: 1,
startTime: null,
endTime: null,
estimatedEndTime: "2024-02-22 10:44:27",
eventLevel: 1,
eventType: 1,
stringEventType: "交通事故",
eventSubclass: "其他事故",
eventCause: "其他事故",
description: "其他事故",
eventState: 0,
eventSource: null,
stringEventSource: "96659",
eventNature: null,
eventSourceTips: null,
inTunnel: null,
roadId: null,
occurrenceTime: "2024-02-22 10:44:18",
isPerceived: 0,
lang: "2,3",
roadName: "济菏高速",
organizationName: "研发部门",
processConfigList: [
{
"id": 8,
"eventType": 1,
"nodeNode": "1",
"processNode": "接警记录",
"commonPhrases": ""
},
],
eventTitle: "发生其他事故事故",
dimension: null,
longitude: null,
dcEventMap: null,
dcEventAbnormalWeather: null,
dcEventAccident: {
searchValue: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null,
params: {},
id: "60f022d95a7c4b6cada2d780246543d8",
reporterName: "王兴琳",
reporterPhoneNumber: "19806119906",
locationType: 1,
trafficJam: 100,
weatherCondition: 1,
impactLevel: 2,
isReverseCargo: 1,
isMaintenance: 1,
policeContact: "96659",
towingServiceContact: "19806119906",
congestionAhead: 0,
atIntersection: 0,
onCurve: 1,
spillageItem: "抛洒物",
vehicleOwnerPhone: "19806119906",
smallCar: 10,
trucks: 0,
buses: 0,
tankers: 0,
minorInjuries: 1,
seriousInjuries: null,
fatalities: null,
isPrivate: null,
facilityId: null,
rampId: null,
location: null,
dcEvent: null
},
dcEventConstruction: null,
dcEventServiceArea: null,
dcEventTrafficCongestion: null,
dcEventVehicleAccident: null,
dcEventTrafficControl: null,
nickName: "管理员",
stringEventState: "待确认",
commonPhrases: null,
nodeNode: null,
eventName: "交通事故",
processNode: null,
updateTime: null,
createTime: "2024-02-22 10:49:34",
remark: null,
subclass: "1-5",
linkId: null
};
export default {
name: "EditEventInformationDialog",
@ -34,19 +132,107 @@ export default {
},
data() {
return {
formConfigList,
formConfigList: {},
// tabConfigList,
fData: {},
eventId: '1a91d65cc31f4a9d90122888edb31043',
roads: [],
direction: [],
lwss: []
};
},
computed: {
modelVisible: {
get() {
if (this.visible) {
this.initData()
}
return this.visible;
},
set(val) {
console.log('val', val)
this.$emit("close", val);
},
},
},
mounted() {
},
methods: {
initData() {
let configList = tabConfigList.find(item => item.label == '交通事故')
this.formConfigList = configList.formConfig.list
let info = eventInfo;
if (info.stakeMark instanceof Array) {
let numbers = info.stakeMark.match(/\d+/g).map(Number);
info.stakeMark = numbers;
}
this.fData = info;
// Promise.all([
// //
// request({
// url: `/business/road/query`,
// method: "get",
// })
// .then((result) => {
// if (result.code != 200) return Message.error(result?.msg);
// result.data.forEach((it) => {
// this.roads.push({ key: it.id, label: it.roadName });
// });
// })
// .catch((err) => {
// Message.error("4", err);
// }),
// //
// request({
// url: `/system/dict/data/type/iot_event_direction`,
// method: "get",
// })
// .then((result) => {
// if (result.code != 200) return Message.error(result?.msg);
// result.data.forEach((it) => {
// this.direction.push({ key: it.dictValue, label: it.dictLabel });
// });
// })
// .catch((err) => {
// Message.error("5", err);
// }),
// // 1 2 3 4 5 6
// request({
// url: `/business/facility/query`,
// method: "get",
// })
// .then((result) => {
// if (result.code != 200) return Message.error(result?.msg);
// result.data.forEach((it) =>
// this.lwss.push({
// key: it.id,
// label: it.facilityName,
// type: it.facilityType,
// })
// );
// })
// .catch((err) => {
// console.log("err", err);
// Message.error("6", err);
// }),
// ]);
// request({
// url: `/dc/system/event/eventSubclass/1/60f022d95a7c4b6cada2d780246543d8`,//
// method: "get",
// }).then(async (result) => {
// if (result.code != 200) return Message.error(result?.msg);
// // this.formData = result.data;
// })
},
onSubmit() {
this.modelVisible = false;
}
}
};
</script>
@ -54,7 +240,7 @@ export default {
.EditEventInformationDialog {
gap: 9px;
width: 1050px;
height: 810px;
height: 850px;
display: flex;
flex-direction: column;

7
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue

@ -22,7 +22,7 @@
<div class="tag" >{{ detailData.eventLevel?`${detailData.eventCause+['','一','二','三','四','五'][detailData.eventLevel]}级事件` : '暂无事件等级' }}</div>
</div>
<EditEventInformationDialog v-model="editEventInformationDialogVisible" />
<EditEventInformationDialog v-model="editEventInformationDialogVisible" @close="closeDialog"/>
</Card>
</template>
@ -80,6 +80,11 @@ export default {
],
editEventInformationDialogVisible: false
}
},
methods: {
closeDialog(){
this.editEventInformationDialogVisible = false;
}
}
}
</script>

18
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js

@ -731,10 +731,10 @@ export const locationMode = {
default: "1",
options: {
options: [
{ key: "1", label: "高速主线" },
{ key: "2", label: "服务区" },
{ key: "3", label: "立交桥" },
{ key: "4", label: "收费站" },
{ key: 1, label: "高速主线" },
{ key: 2, label: "服务区" },
{ key: 3, label: "立交桥" },
{ key: 4, label: "收费站" },
],
},
ons: {
@ -907,11 +907,11 @@ export const effect = {
type: "select",
options: {
options: [
{ key: "1", label: "无" },
{ key: "2", label: "危化品泄漏" },
{ key: "3", label: "整车自燃" },
{ key: "4", label: "车辆复燃" },
{ key: "5", label: "散装人工倒货" },
{ key: 1, label: "无" },
{ key: 2, label: "危化品泄漏" },
{ key: 3, label: "整车自燃" },
{ key: 4, label: "车辆复燃" },
{ key: 5, label: "散装人工倒货" },
],
},
};

Loading…
Cancel
Save