Browse Source

修改禅道BUG

wangqin
王钦 6 months ago
parent
commit
50b7445e03
  1. 2
      ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
  2. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
  3. 1
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue
  4. 68
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/index.vue
  5. 11
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
  6. 19
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue
  7. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue
  8. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
  9. 12
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
  10. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
  11. 17
      ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue
  12. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/charts.js
  13. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue
  14. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/PresetFormItems.js
  15. 8
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/index.vue
  16. 2
      ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
  17. 50
      ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js
  18. 18
      ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js

2
ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js

@ -776,7 +776,7 @@ export const trafficAccidentType = {
},
{
value: "4",
label: "自",
label: "自",
},
{
value: "5",

3
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue

@ -72,7 +72,6 @@
</el-option>
</el-select>
</el-row>
<el-row>
<el-col :span="3">
<p>执行:</p>
@ -130,7 +129,7 @@
</el-col> -->
</el-row>
<el-row v-if="(tableInfo.deviceType == 2 || tableInfo.deviceType == 5) && tableInfo.executeConfig && tableInfo.executeConfig.contentList">
<el-row v-if="(tableInfo.deviceType == 2 || tableInfo.deviceType == 5) && tableInfo.executeConfig && tableInfo.executeConfig.contentList && tableInfo.executeConfig.contentList.length > 0">
<el-col :span="24">
<div class="keep-ratio" origin="top" v-for="(itm,idx) of tableInfo.executeConfig.contentList">
<div class="contentLabel" >{{ itm.deviceName }}</div>

1
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue

@ -65,6 +65,7 @@ export default {
watch: {
"provideData.detail"(newValue, oldValue) {
if(this.subclass !== newValue.subclass){
this.subclass = newValue.subclass;
this.initData(newValue)
}

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

@ -1,5 +1,5 @@
<template>
<Dialog v-model="modelVisible" title="事件上报" width="1485px" top="55px">
<Dialog v-model="modelVisible" title="事件上报" top="55px">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="事件" name="first">
<div class="EventDetail">
@ -62,7 +62,7 @@
<Button v-if="type == 0" style="background: #39d5bf" @click.native="handleInitData(1)">重新生成</Button>
<Button style="background: #3de8ff" @click.native="handlePreview">预览</Button>
<Button v-if="type == 0" style="background: #ffdb82" @click.native="onFileSubmit">保存</Button>
<Button v-if="type == 0" @click.native="onSubmitUpload">保存并上报</Button>
<Button v-if="type == 0" :loading="submitting" @click.native="onSubmitUpload">保存并上报</Button>
<Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
</div>
</el-tab-pane>
@ -125,7 +125,7 @@
" style="background: #ffdb82" @click.native="onFileSubmit">保存</Button>
<Button v-if="(type == 1 && formFileData.status == 0) ||
(newType == 1 && formFileData.status == 0)
" @click.native="onSubmitUpload">保存并上报</Button>
" @click.native="onSubmitUpload" :loading="submitting">保存并上报</Button>
<Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
</div>
</el-tab-pane>
@ -175,7 +175,7 @@
<Button v-if="type != 3" style="background: #39d5bf" @click.native="handleInitData(3)">重新生成</Button>
<Button style="background: #3de8ff" @click.native="handlePreview">预览</Button>
<Button v-if="type != 3" style="background: #ffdb82" @click.native="onFileSubmit">保存</Button>
<Button v-if="type != 3" @click.native="onSubmitUpload">保存并上报</Button>
<Button v-if="type != 3" @click.native="onSubmitUpload" :loading="submitting">保存并上报</Button>
<Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
</div>
</el-tab-pane>
@ -358,6 +358,7 @@ import {
editEventImportantFile,
importantFileStatus,
} from "@/api/commandDispatch";
import { Message } from "element-ui";
import { delay, exportFile, confirm } from "@screen/utils/common";
var moment = require("moment");
export default {
@ -380,13 +381,14 @@ export default {
},
eventId: String,
},
inject: ["provideData"],
inject: ["provideData", "reload"],
data() {
return {
provideDetail: {},
type: 0,
newType: 0,
showDocx: false,
submitting: false,
fData: {},
formConfigList: [],
reportList,
@ -422,8 +424,8 @@ export default {
};
},
watch: {
async modelVisible(newValue, oldValue){
if(newValue){
async modelVisible(newValue, oldValue) {
if (newValue) {
this.provideDetail = this.provideData.detail;
this.eventId = this.provideDetail.id;
await this.initData();
@ -571,15 +573,39 @@ export default {
},
//
onSubmit() {
this.$refs.FormConfigRef.validate().then((formData) => { });
this.$refs.FormConfigRef.validate().then((form) => {
//
let eventType = this.provideDetail.eventType;
form.eventType = eventType;
let f = formatEvent(form, eventType);
//
request({
url: `/dc/system/event`,
method: "put",
data: {
...f,
id: this.provideDetail.id,
eventState: this.provideDetail.eventState,
stakeMark: f.stakeMark || '',
},
}).then((resconfig) => {
if (resconfig.code != 200) return Message.error(resconfig?.msg);
//
this.$refs.FormReportRef.validate().then((formData) => {
formData.eventId = this.eventId;
editEventImportant(formData).then((result) => {
if (result.code != 200) return Message.error(result?.msg);
// this.$message.success("");
Message.success("提交成功");
this.modelVisible = false;
this.reload();
});
});
})
});
},
//
getImportantFileStatus() {
@ -594,7 +620,6 @@ export default {
deventImportantFileList(this.eventId, type).then((res) => {
if (res.length > 0) {
this.formFileData = res[0];
console.log(789, res);
if (type == "1" || type == "2") {
this.renewedList = res;
}
@ -666,15 +691,27 @@ export default {
//
onSubmitUpload() {
this.submitting = true;
let data = {
...this.formFileData,
status: 1,
};
if (this.formFileData && this.formFileData.id) {
editEventImportantFile(data).then((res) => { });
editEventImportantFile(data).then((res) => {
if (res.code != 200) return Message.error(res?.msg);
this.$message.success('报送成功')
this.submitting = false;
this.modelVisible = false;
});
} else {
addEventImportantFile(data).then((res) => { });
addEventImportantFile(data).then((res) => {
if (res.code != 200) return Message.error(res?.msg);
this.$message.success('报送成功')
this.submitting = false;
this.modelVisible = false;
});
}
this.getImportantFileStatus();
if (this.activeName == "second") {
this.getEventImportantFileList(1);
@ -697,11 +734,16 @@ export default {
width: 100%;
height: 665px;
overflow-y: auto;
overflow-x: hidden;
flex-direction: column;
.title {
margin: 10px 0;
}
.form{
overflow-y: auto;
overflow-x: hidden;
}
}
.file {
@ -857,9 +899,11 @@ export default {
}
}
}
.linespace{
.linespace {
height: 46px;
}
.footer {
// display: flex;
// max-width: 40%;

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

@ -97,8 +97,9 @@
:on-success="handleUploadSuccess"
:on-error="handleUploadError"
accept=".jpg,.jpeg,.png,.mp4"
:before-upload="beforeUpload"
>
<div class="input">{{ imageName }}</div>
<div class="input" style="width:300px;text-align: left;">{{ imageName }}</div>
</el-upload>
<ElSelect
:disabled="detailData.eventState == 2"
@ -309,7 +310,14 @@ export default {
});
});
},
beforeUpload(file) {
const isLt2M = file.size / 1024 / 1024 < 20;
if (!isLt2M) {
this.$message.error('上传图片大小不能超过 20MB');
}
return isLt2M;
},
//
handleUploadSuccess(res, file) {
this.$message.success("上传成功");
@ -409,6 +417,7 @@ export default {
},
handleClose() {
this.dialogProcessVisible = false;
this.getImportantStatus();
},
handleUpdate(val) {
this.dialogType = val;

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

@ -79,13 +79,18 @@ export default {
for(let i in info){
if(typeof info[i] === 'object' && info[i]){
for(let j in info[i]){
if(j === 'rampId' && info[i][j] !== null){
if(j === 'rampId'){
if(info[i][j] !== null && info[i][j] !== '' && info[i][j] !== 'NaN'){
let aryZd = info[i][j].split(',');
let numZd = []
aryZd.forEach(e => {
numZd.push(parseInt(e))
});
info[i][j] = numZd
} else {
info[i][j] = ''
}
}
}
}
@ -132,11 +137,13 @@ export default {
if (it.label==='停车区:' && it.type==='select' ) { //
it.options.options = this.lwss.filter((x) => x.type == 7);
}
});
this.formConfigList = _confirgList;
this.fData = info;
const self = this;
setTimeout(() => {
self.fData = info;
}, 500);
},
onSubmit() {
this.$refs.FormConfigRef.validate().then((formData) => {
@ -145,8 +152,8 @@ export default {
let eventType = this.infoData.eventType;
formData.eventType = eventType;
let f = formatEvent(formData);
console.log(f,'-------')
let f = formatEvent(formData, eventType);
request({
url: `/dc/system/event`,
method: "put",

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

@ -85,7 +85,7 @@ export default {
onSubmit() {
this.$refs.FormConfigRef.validate().then((formData) => {
this.submitting = true;
let f = formatEvent(formData)
let f = formatEvent(formData, 3)
f.id = this.eventId;
f.eventState = 1;
request({

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

@ -722,7 +722,7 @@ export const trafficAccidentType = {
},
{
value: "1-4",
label: "自",
label: "自",
},
{
value: "1-5",

12
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue

@ -108,7 +108,7 @@ export default {
this.index = index;
let formConfig = configList[this.tabConfigList[index].label];
if(this.activeName === '服务异常'){
if(this.activeName === '服务异常'){
formConfig.forEach((it) => {
if (it.key == "dcEventServiceArea.facilityId") {
it.options.options = this.lwss.filter((x) => x.type == 6);
@ -121,7 +121,9 @@ export default {
// return
this.$refs.FormConfigRef.validate().then((formData) => {
this.submitting = true;
let f = formatEvent(formData)
const eventType = Number(this.index) + 1;
let f = formatEvent(formData, eventType)
if(f.startTime){
f.occurrenceTime = f.startTime;
@ -133,7 +135,7 @@ export default {
method: "post",
data: {
...f,
eventType: Number(this.index) + 1,
eventType: eventType,
eventState: 0,
stakeMark: f.stakeMark || ''
},
@ -177,12 +179,14 @@ export default {
.fader {
height: 500px;
overflow-y: auto;
overflow-x: none;
overflow-x: hidden;
padding-bottom: 20px;
}
.form {
flex: 1;
overflow-y: auto;
overflow-x: hidden;
}
.footer {

2
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue

@ -115,7 +115,7 @@ export default {
},
{
value: "1-4",
label: "自",
label: "自",
},
{
value: "1-5",

17
ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue

@ -220,7 +220,7 @@ export default {
dataGreen: { title: "使用率", value: 56.35, unit: "%" }
}
];
this.manage = [
const _manage = [
{ title: "ETC门架", value: 25800 },
{ title: "雷达", value: 25800 },
{ title: "一类交调站", value: 25800 },
@ -247,7 +247,7 @@ export default {
{ title: '', value: '' },
];
const warningNumber = await request({ url: 'business/warning/countNumber', method: 'get'});
const warningNumber = await request({ url: 'business/warning/countNumber?warningSource=6', method: 'get'});
if (warningNumber.code != 200) return;
_dataShare[7].value = warningNumber.data;
@ -259,20 +259,21 @@ export default {
if (odsEnpNumber.code != 200) return;
_dataShare[4].value = odsEnpNumber.data;
const odsEtcNumber = await request({ url: 'business/odsTollEtctuData/countNumber', method: 'get'});
if (odsEtcNumber.code != 200) return;
_dataShare[8].value = odsEtcNumber.data;
const odsViuNumber = await request({ url: 'business/odsTollViuData/countNumber', method: 'get'});
if (odsViuNumber.code != 200) return;
_dataShare[3].value = odsViuNumber.data;
//
const odsEtcNumber = await request({ url: 'business/odsTollEtctuData/countNumber', method: 'get'});
if (odsEtcNumber.code != 200) return;
_manage[0].value = odsEtcNumber.data;
const basicNumber = await request({ url: 'business/moduleCall/basicDataNumber', method: 'get'});
if (basicNumber.code != 200) return;
_dataShare[6].value = basicNumber.data;
_manage[5].value = basicNumber.data;
this.manage = _manage;
this.dataShare = _dataShare;
//

2
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/charts.js

@ -31,7 +31,7 @@ var options = {
},
grid: {
top: "25%", //上边距
right: "1%", //右边距
right: "1.5%", //右边距
left: "1%", //左边距
bottom: "10%", //下边距
containLabel: true,

2
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue

@ -109,7 +109,7 @@
fit="fit"></el-image>
<template v-else>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__text" style="color:#ececec;">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip" slot="tip">只能上传jpg/png文件且不超过500kb</div>
</template>
</el-upload>

2
ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/PresetFormItems.js

@ -698,7 +698,7 @@ export const trafficAccidentType = {
},
{
value: "1-4",
label: "自",
label: "自",
},
{
value: "1-5",

8
ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/index.vue

@ -244,9 +244,17 @@ export default {
display: flex;
flex-direction: column;
.fader {
height: 500px;
overflow-y: auto;
overflow-x: hidden;
}
.form {
flex: 1;
overflow-y: auto;
overflow-x: hidden;
}
.footer {

2
ruoyi-ui/src/views/JiHeExpressway/utils/enum.js

@ -306,7 +306,7 @@ export const eventSubClassMap = {
},
{
value: "1-4",
label: "自",
label: "自",
},
{
value: "1-5",

50
ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js

@ -1000,7 +1000,7 @@ export const constructionMeasurement = {
type: "RadioGroup",
isAlone: true,
required: true,
default: "0",
default: 0,
options: {
activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
options: [
@ -1226,3 +1226,51 @@ export const congestionCause = {
return true;
},
};
export const locationSelect = [
{
value: "1",
label: "入口车道",
},
{
value: "2",
label: "入口匝道",
},
{
value: "3",
label: "入口",
},
{
value: "4",
label: "入口内广场",
},
{
value: "5",
label: "出口车道",
},
{
value: "6",
label: "出口匝道",
},
{
value: "7",
label: "外广场",
},
{
value: "8",
label: "出口",
},
{
value: "9",
label: "(站外)入口匝道",
},
{
value: "10",
label: "(站外)出口匝道",
},
{
value: "11",
label: "出口内广场",
},
];

18
ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js

@ -94,7 +94,6 @@ export const configList = {
console.log("zd", zd);
formList.forEach((it) => {
if (it.key == "dcEventAccident.rampId") {
console.log("it", it);
it.options.options = zd;
}
});
@ -295,7 +294,6 @@ export const configList = {
console.log("zd", zd);
formList.forEach((it) => {
if (it.key == "dcEventVehicleAccident.rampId") {
// console.log("it", it);
it.options.options = zd;
}
});
@ -1393,10 +1391,8 @@ export const configList = {
result.rows.forEach((it) =>
zd.push({ key: it.id, label: it.rampName })
);
console.log("zd", zd);
formList.forEach((it) => {
if (it.key == "dcEventTrafficCongestion.rampId") {
console.log("it", it);
it.options.options = zd;
}
});
@ -1904,10 +1900,8 @@ export const configList = {
result.rows.forEach((it) =>
zd.push({ key: it.id, label: it.rampName })
);
// console.log("zd", zd);
formList.forEach((it) => {
if (it.key == "dcEventConstruction.rampId") {
// console.log("it", it);
it.options.options = zd;
}
});
@ -2348,7 +2342,7 @@ export const configList = {
],
}
export const formatEvent = (f) => {
export const formatEvent = (f, eventType = 3) => {
const formData = _.cloneDeep(f);
if (formData.lang && formData.lang instanceof Array) {
formData.lang = formData.lang.join(",");
@ -2360,14 +2354,14 @@ export const formatEvent = (f) => {
}
if (formData.endStakeMark && formData.endStakeMark[0] != null) {
let endStakeMark = formData.endStakeMark;
let strMark = endStakeMark && endStakeMark.length > 0 ? "K" + endStakeMark[0].padStart(3,'0') + "+" + endStakeMark[1].padStart(3,'0') : "";
if (this.index == 3) {
let strMark = endStakeMark && endStakeMark.length > 0 ? "K" + endStakeMark[0].toString().padStart(3,'0') + "+" + endStakeMark[1].toString().padStart(3,'0') : "";
if (eventType == 4) {
formData.dcEventTrafficCongestion.endStakeMark = strMark;
}
if (this.index == 6) {
if (eventType == 7) {
formData.dcEventConstruction.endStakeMark = strMark;
}
if (this.index == 9) {
if (eventType == 10) {
formData.dcEventAbnormalWeather.endStakeMark = strMark;
}
formData.endStakeMark = "";
@ -2376,7 +2370,7 @@ export const formatEvent = (f) => {
}
if(formData.stakeMark){
if(formData.stakeMark.length > 0 && formData.stakeMark[0] != null){
formData.stakeMark = ("K" + formData.stakeMark[0].padStart(3,'0') + "+" + formData.stakeMark[1].padStart(3,'0'))
formData.stakeMark = ("K" + formData.stakeMark[0].toString().padStart(3,'0') + "+" + formData.stakeMark[1].toString().padStart(3,'0'))
}else{
delete formData.stakeMark
}

Loading…
Cancel
Save