Browse Source

修改BUG

wangqin
王钦 9 months ago
parent
commit
4757314d00
  1. 2
      ruoyi-ui/package.json
  2. 2
      ruoyi-ui/src/utils/request.js
  3. 4
      ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue
  4. 27
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue
  5. 6
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue
  6. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/index.vue
  7. 13
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue
  8. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue
  9. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/index.vue
  10. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
  11. 16
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
  12. 13
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
  13. 6
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
  14. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue
  15. 7
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
  16. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue
  17. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/monthlyEquipment/index.vue
  18. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/onLineBarCharts/index.vue
  19. 32
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue
  20. 8
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/index.vue
  21. 74
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/xscroll.vue
  22. 12
      ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue
  23. 24
      ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js
  24. 36
      ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js
  25. 4
      ruoyi-ui/vue.config.js

2
ruoyi-ui/package.json

@ -6,7 +6,7 @@
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",
"build:prod": "vue-cli-service build",
"build": "vue-cli-service build",
"build:version": "./build/build.sh",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",

2
ruoyi-ui/src/utils/request.js

@ -64,7 +64,7 @@ service.interceptors.request.use(config => {
const s_url = sessionObj.url; // 请求地址
const s_data = sessionObj.data; // 请求数据
const s_time = sessionObj.time; // 请求时间
const interval = 1000; // 间隔时间(ms),小于此时间视为重复提交
const interval = 100; // 间隔时间(ms),小于此时间视为重复提交
if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
const message = '数据正在处理,请勿重复提交';
console.warn(`[${s_url}]: ` + message)

4
ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue

@ -52,8 +52,8 @@
>
详情
</div>
<Dialog style="" v-model="detailsDialog" width="1085px" top="60px">
<div v-if="data.processType == '4'" class="docx-wrapper">
<Dialog style="" v-model="detailsDialog" width="1085px" top="10px">
<div v-if="data.processType == '4'" class="docx-wrapper" style="height:800px;overflow-y: auto;overflow-x: hidden;">
<section
ref="initFile"
class="docx"

27
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue

@ -56,9 +56,9 @@
style="background-color: rgba(0, 179, 204, 0.3)"
@click.native="(modelVisible = false), (submitting = false)"
>
{{action===0?'取消':'关闭'}}
关闭
</Button>
<Button v-if="action===0" @click.native="handleSubmit" :loading="submitting"> 确定</Button>
<Button @click.native="handleSubmit" :loading="submitting"> 确定</Button>
</template>
</Dialog>
</template>
@ -69,6 +69,7 @@ import InputSearch from "@screen/components/InputSearch/index.vue";
import Table from "@screen/components/Table.vue";
import Button from "@screen/components/Buttons/Button.vue";
import { postUpdateSource } from "@/api/commandDispatch";
import request from "@/utils/request";
export default {
name: "StatsDetail",
components: {
@ -156,17 +157,29 @@ export default {
}
}
});
this.form.eventId = this.provideData.detail.id
this.form.remark = this.provideData.detail.remark
this.form.employees = newEmployees;
this.form.vehicle = newVehiclesMap;
if(newVehiclesMap.length === 0 && newEmployees.length === 0){
this.$message.warning('未选择人员或车辆')
return;
}
postUpdateSource(this.form).then((res) => {
this.$emit("handleRefresh",'reload');
});
if(this.action===0){
this.form.eventId = this.provideData.detail.id
this.form.remark = this.provideData.detail.remark
postUpdateSource(this.form).then((res) => {
this.$emit("handleRefresh",'reload');
});
} else {
this.form.dispatchId = this.action;
request({
url: "/business/warning/updateDispatchSource",
method: "post",
data:this.form,
}).then((res) => {
this.$emit("handleRefresh",'reload');
});;
}
},
},
};

6
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue

@ -171,6 +171,7 @@ export default {
stakeMark: this.provideDetail.stakeMark,
id: this.provideDetail.id,
}).then(async (res) => {
console.log(res,'$$$$$$$$$$$$$$$')
this.statsDialogAction = res.data.existence;
if(res.data.existence === 0){
const result = await request({
@ -208,7 +209,7 @@ export default {
}
return;
}
this.statsDialogAction = res.data.dispatchId;
res.data.listData?.forEach((element) => {
if (element.vehiclesMap.length > 0) {
element.vehiclesMap.forEach((item) => {
@ -265,8 +266,7 @@ export default {
url: `/system/dict/data/type/vehicle_type`,
method: "GET",
params: {},
})
.then(({ data, code }) => {
}).then(({ data, code }) => {
if (code != 200) return; //Message.error("");
this.vehicleTypeList = data;
this.getCommandDispatch();

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

@ -428,6 +428,7 @@ export default {
if (newValue) {
this.provideDetail = this.provideData.detail;
this.eventId = this.provideDetail.id;
this.activeName = 'first'
await this.initData();
this.getReportData();
this.getImportantFileStatus();
@ -702,6 +703,7 @@ export default {
this.$message.success('报送成功')
this.submitting = false;
this.modelVisible = false;
this.reload();
});
} else {
addEventImportantFile(data).then((res) => {
@ -709,6 +711,7 @@ export default {
this.$message.success('报送成功')
this.submitting = false;
this.modelVisible = false;
this.reload();
});
}

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

@ -66,8 +66,12 @@ export default {
mounted() { },
methods: {
async initData() {
this.infoData = { ...this.detailData };
let info = { ...this.detailData };
this.infoData = { ...this.provideData.detail };
let result = await request({
url: `/dc/system/event/eventSubclass/${this.infoData.id}`,
method: "GET",
})
let info = result.data;
if (typeof info.stakeMark == "string") {
let numbers = info.stakeMark.match(/\d+/g).map(String);
info.stakeMark = numbers;
@ -139,10 +143,7 @@ export default {
}
});
this.formConfigList = _confirgList;
const self = this;
setTimeout(() => {
self.fData = info;
}, 500);
this.fData = info;
},
onSubmit() {

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

@ -39,6 +39,7 @@ export default {
eventSubclass: String,
controlType: Number
},
inject: ["provideData","reload"],
data() {
return {
formConfigList: [],
@ -102,6 +103,7 @@ export default {
.then((result) => {
if (result.code != 200) return Message.error(result?.msg);
Message.success("提交成功");
this.reload();
this.modelVisible = false;
})
.catch(() => {

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

@ -48,7 +48,7 @@ export default {
ButtonGradient,
AddControlEventInfoDialog,
},
inject: ["provideData"],
inject: ["provideData","reload"],
data() {
return {
eventSubclass: "3-1",
@ -67,6 +67,7 @@ export default {
this.$parent.$refs['CrowdnessIndicatorRankings'][0].active = []
this.controlType = value;
this.addControlEventInfoDialogVisible = true;
this.reload();
},
closeDialog() {
this.addControlEventInfoDialogVisible = false;

4
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue

@ -81,7 +81,11 @@ export default {
let _id = this.detailId
if(eventId && eventId !== ''){
_id = eventId;
this.linkId = eventId;
} else if(this.linkId !== ''){
_id = this.linkId;
}
// -
request({
url: `/dc/system/event/eventSubclass/${_id}`,

16
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js

@ -30,20 +30,16 @@ export const searchFormList = [
label: "方向:",
key: "direction",
type: "RadioGroup",
default: "济南方向",
default: "1",
options: {
options: [
{
key: "济南方向",
label: "济南方向",
},
{
key: "菏泽方向",
key: "1",
label: "菏泽方向",
},
{
key: "双向",
label: "向",
key: "3",
label: "济南方向",
},
],
},
@ -55,8 +51,8 @@ export const searchFormList = [
type: "datePicker",
options: {
type: "daterange",
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
},
},
{

13
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue

@ -157,21 +157,22 @@ export default {
let dStakeMark = data.stakeMark;
let dendStakeMark = data.endStakeMark;
let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : "";
let stakeMark = dStakeMark[0] ? `K${dStakeMark[0].padStart(3,'0')}+${dStakeMark[1].padStart(3,'0')}` : "";
let endStakeMark = dendStakeMark[0]
? `K${dendStakeMark[0]}+${dendStakeMark[1]}`
? `K${dendStakeMark[0].padStart(3,'0')}+${dendStakeMark[1].padStart(3,'0')}`
: "";
this.searchData = {
...this.searchData,
eventState: data.eventState || 0,
eventType: data.eventType,
eventSources: data.eventSources,
startTime: daterange && daterange.length > 0 ? daterange[0] : "",
endTime: daterange && daterange.length > 0 ? daterange[1] : "",
eventSource: data.eventSource,
direction: data.direction,
startTime: daterange && daterange.length > 0 ? daterange[0]+' 00:00:00' : "",
endTime: daterange && daterange.length > 0 ? daterange[1]+ ' 23:59:59' : "",
stakeMark: stakeMark,
endStakeMark: endStakeMark,
};
console.log(this.searchData,'$$$$')
this.initData();
},
handleClose() {

6
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue

@ -380,11 +380,15 @@ export default {
data: reData,
}).then((result) => {
if (result.code != 200) return Message.error(result?.msg);
else Message.success("成功");
Message.success("成功,等待跳转调度页面。");
this.modelVisible = false;
this.$emit("queryData", true);
this.$root.$emit('refresh-event');
const self = this;
setTimeout(() => {
self.$router.push(`/control/event/commandDispatch?eventId=${self.formData.id}`);
}, 300);
});
} else {
let eventId = this.formData.id;

3
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue

@ -93,6 +93,7 @@ export default {
getTollStationAnalysis() {
return tollStationAnalysis().then((response) => {
this.tollBoothsData = response.data;
console.log(response.data)
this.maxRestrictionNum = Math.max.apply(
Math,
this.tollBoothsData.map((item) => {
@ -102,7 +103,7 @@ export default {
this.maxCloseNum = Math.max.apply(
Math,
this.tollBoothsData.map((item) => {
return item.trafficRestriction;
return item.trafficClose;
})
);
console.log("response", this.maxRestrictionNum, this.maxCloseNum);

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

@ -94,6 +94,7 @@ export default {
planId: 0,
submitting: false,
formData: {
planName: '',
eventType: 1,
triggerMechanism: "1-1",
},
@ -143,11 +144,7 @@ export default {
} else {
this.title = "新增预案";
this.dialogType = 1;
this.formData = {
eventType: 1,
triggerMechanism: "1-1",
};
console.log('defaultTableInfo', { ...defaultTableInfo })
this.formData.planName = ''
this.tableData = [{ ...defaultTableInfo }]
}
}

2
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue

@ -119,7 +119,7 @@ export default {
components: { draggable },
props: {
dataList: {
type: Array,
type: Object,
default: () => [],
},
},

2
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/monthlyEquipment/index.vue

@ -46,7 +46,7 @@ export default {
},
props: {
dataList: {
type: Array,
type: Object,
default: () => []
}
},

2
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/onLineBarCharts/index.vue

@ -25,7 +25,7 @@ export default {
},
props: {
dataList: {
type: Array,
type: Object,
default: () => [],
},
},

32
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue

@ -99,12 +99,17 @@ export default {
searchFormList,
startTime: "",
time: "",
startTime2: "",
time2: "",
total:0,
searchData: {
pageSize: 10,
pageNum: 1
},
order:'asc',
order:'asc'
};
},
destroyed() {
@ -141,7 +146,11 @@ export default {
this.initQueryTable();
},
initQueryChart() {
if(this.queryChart){
this.queryChart.dispose();
}
if(this.devices.length === 0){
this.setStatus("01", "empty");
return;
}
this.setStatus("01", "doing");
@ -151,6 +160,7 @@ export default {
type: this.devices.join(','),
}).then((res) => {
if (res.code == 200) {
const _chartsOption = _.cloneDeep(chartsOption)
this.setStatus("01", "finish");
let x = [];
let serie = [];
@ -172,11 +182,10 @@ export default {
serie.push(s);
}
chartsOption.xAxis.data = x;
chartsOption.series= serie;
_chartsOption.xAxis.data = x;
_chartsOption.series= serie;
this.queryChart = echarts.init(this.$refs["queryChart"]);
this.queryChart.setOption(chartsOption);
this.queryChart.setOption(_chartsOption);
}
});
@ -186,8 +195,8 @@ export default {
initQueryTable() {
this.loading = true;
getSystemStatusTabList({
startTime: this.startTime,
time: this.time,
startTime: this.startTime2,
time: this.time2,
type: this.devices.join(','),
pageNum: this.searchData.pageNum,
pageSize: this.searchData.pageSize,
@ -238,8 +247,8 @@ export default {
text: "文件正在下载...",
});
getSystemStatusExport({
startTime: this.startTime,
time: this.time,
startTime: this.startTime2,
time: this.time2,
type: this.devices.join(','),
})
.then((res) => {
@ -264,6 +273,11 @@ export default {
async mounted() {
this.startTime = moment().startOf("month").format("YYYY-MM-DD HH:mm:ss");
this.time = moment().format("YYYY-MM-DD HH:mm:ss");
this.startTime2 = moment().subtract(1, "hours").format("YYYY-MM-DD HH:mm:ss");
this.time2 = this.time;
this.initQueryChart();
this.initQueryTable();
},

8
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/index.vue

@ -250,6 +250,8 @@ export default {
},
listClick(e = 0) {
this.selIndex = e;
this.topo = [];
if (e === 0) {
(this.name = this.map.switchName),
(this.card = [
@ -281,8 +283,10 @@ export default {
});
topo.push(list2);
}
this.topo = topo;
this.card = cards;
setTimeout(() => {
this.topo = topo;
this.card = cards;
}, 200);
setTimeout(() => {
var scrollWrap = document.getElementsByClassName('cscorll');
scrollWrap.forEach(scrol => {

74
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/xscroll.vue

@ -1,74 +0,0 @@
<template>
<!-- v-size-ob 指令可以在 dom 元素改变大小时获取 dom 元素的尺寸并且返回尺寸 -->
<div v-size-ob="handleChange" class="container">
<div class="scroll">
<div class="content">
<slot></slot>
</div>
</div>
</div>
</template>
<script>
import { reactive } from 'vue';
const s = reactive({ //
w: 0,
h: 0,
});
function handleChange(size) { // v-size-ob container
s.w = size.width;
s.h = size.height;
}
const map = new WeakMap();
const ob = new ResizeObserver((entries) => {
for (const entry of entries) {
const handler = map.get(entry.target);
if (handler) {
const box = entry.borderBoxSize[0];
handler({
width: box.inlineSize,
height: box.blockSize,
});
}
}
});
export default {
name: 'smartAnalysis',
components: {
},
mounted(el, binding) {
ob.observe(el);
map.set(el, binding.value);
},
unmounted(el) {
ob.unobserve(el);
},
};
</script>
<style scoped>
/* 为每一个盒子加上边框方便查看效果 */
.container {
outline: 5px solid #f1ac6a;
height: calc(v-bind("s.h") * 1px);
position: absolute;
left: 100%;
transform-origin: 0 0;
transform: rotate(90deg);
}
.scroll {
outline: 5px solid #7985ec;
width: calc(v-bind("s.h") * 1px);
height: calc(v-bind("s.w") * 1px);
position: relative;
overflow: auto;
transform-origin: 0 0;
transform: translateY(calc(v-bind("s.h") * 1px)) rotate(-90deg);
}
.content {
outline: 5px solid #f1ac6a;
height: calc(v-bind("s.h") * 1px);
}
</style>

12
ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue

@ -50,18 +50,6 @@ export default {
channel:e.publishChannels.toString(),
state: e.eventState,
})
list.push({
source: "1",
onlyright:true,
time: e.createTime,
name: e.createBy,
descTitle: "事件详情",
desc: e.contentDetails,
facilityName: e.facilityName,
publisher:e.publisher,
channel:e.publishChannels.toString(),
state: e.eventState,
})
});
this.timeLine2List = list;

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

@ -40,6 +40,30 @@ export const source = {
key: 7,
label: "其他",
},
{
key: 8,
label: "雷达识别",
},
{
key: 9,
label: "锥桶",
},
{
key: 10,
label: "护栏碰撞",
},
{
key: 11,
label: "扫码报警",
},
{
key: 12,
label: "非机预警",
},
{
key: 13,
label: "气象检测器",
},
],
},
};

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

@ -723,6 +723,23 @@ export const configList = {
PresetFormItems.freeway,
PresetFormItems.direction,
// PresetFormItems.emptyLine,
{
label: "收费站:",
key: "dcEventTrafficControl.facilityId",
type: "select",
isAlone: true,
required: true,
options: {
options: [],
multiple: true,
},
visible: (data) => {
if (data?.eventSubclass == "3-2") {
return true;
}
return false;
},
},
{
label: "出入口:",
key: "dcEventTrafficControl.exitsInlets",
@ -749,23 +766,6 @@ export const configList = {
return false;
},
},
{
label: "收费站:",
key: "dcEventTrafficControl.facilityId",
type: "select",
isAlone: false,
required: true,
options: {
options: [],
multiple: true,
},
visible: (data) => {
if (data?.eventSubclass == "3-2") {
return true;
}
return false;
},
},
{
label: "立交桥:",
key: "dcEventTrafficControl.facilityId",
@ -852,7 +852,7 @@ export const configList = {
options: {
options: [
{
value: "1",
value: 1,
label: "临时关闭",
},
],

4
ruoyi-ui/vue.config.js

@ -37,12 +37,12 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://127.0.0.1:8080`,
// target: `http://10.168.66.196:8087`, //刘文阁
target: `http://10.168.66.196:8087`, //刘文阁
// target: `http://10.168.68.42:8087`, //王思祥
// target: `http://10.168.72.174:8087`, //赵祥龙
// target: `http://10.168.65.156:8097`, //孟凡峰
// target: `http://10.168.76.181:8089`, //王家宝
target: `http://10.168.77.128:8087`, //王兴琳
// target: `http://10.168.77.128:8087`, //王兴琳
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",

Loading…
Cancel
Save