diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue index 3ada8ecb..863021e4 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue @@ -6,7 +6,7 @@ {{ data.name }} {{ data.posts }} -
节点:{{ data.processName }}
+
节点:{{ data.processName }}
- + {{ formFileData.content }} - + @@ -371,6 +371,11 @@ export default { } } + .node { + color: #ffbf00; + font-size: 16px; + line-height: 19px; + } .desc { font-size: 16px; line-height: 19px; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue index 2ffd968f..9d3e73f5 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue @@ -326,7 +326,7 @@ export default { processName: this.processName, context: content, // file: this.imageUrl, - type: type ? type.join(",") : "text", + type: type && type.length > 0 ? type.join(",") : "text", source: 1, processType: this.processType, }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue index 0fba9ec8..d1e1fa6e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue @@ -171,14 +171,25 @@ export default { rows.forEach(item =>{ this.timeLine2List.push({ - time: moment(item.operationTime || new Date()).format( + id: item.processId, + time: item.operationTime + ? new Date(item.operationTime).toLocaleString() + : null, + name: item.operatorName, + desc: item.context, + source: item.source, + processId: item.processId, + processName: item.processName, + type: item.type, + processType: item.processType, + /*time: moment(item.operationTime || new Date()).format( "yyyy-MM-DD HH:mm:ss" ), name: item.operatorName, desc: item.context, source: item.source, posts: "", - direction: item.source == 1 ? "right" : "left", + direction: item.source == 1 ? "right" : "left",*/ }); }) @@ -275,7 +286,7 @@ export default { .catch((err) => { }); } - + // 2024-05-18 修改为二次确认,增加误报类型和误报原因 // if (this.formData.id) { // this.$confirm("确定误报吗?", "提示", {