From f84ce5767570a5bad83f2729a95277ac5ce847b5 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 03 一月 2025 13:38:10 +0800
Subject: [PATCH] 赋码
---
src/views/projectEngineering/projectLibrary/index.vue | 2
src/views/flowable/task/myProcess/detail/index.vue | 3 +
src/components/Process/panel/taskListener.vue | 2
src/components/Process/style/flow-viewer.scss | 62 +++++++++++++++++++++++++------
src/components/Process/viewer/index.vue | 5 ++
5 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/src/components/Process/panel/taskListener.vue b/src/components/Process/panel/taskListener.vue
index ca9bdb8..bdc3aa0 100644
--- a/src/components/Process/panel/taskListener.vue
+++ b/src/components/Process/panel/taskListener.vue
@@ -417,7 +417,7 @@
async saveListenerConfig() {
let validateStatus = await this.$refs["listenerFormRef"].validate();
if (!validateStatus) return; // 楠岃瘉涓嶉�氳繃鐩存帴杩斿洖
- const listenerObject = createListenerObject(this.modelerStore.moddle, this.listenerForm, false, "flowable");
+ const listenerObject = createListenerObject(this.modelerStore.moddle, this.listenerForm, true, "flowable");
if (this.editingListenerIndex === -1) {
this.bpmnElementListeners.push(listenerObject);
this.elementListenersList.push(this.listenerForm);
diff --git a/src/components/Process/style/flow-viewer.scss b/src/components/Process/style/flow-viewer.scss
index 051c33e..032ce1c 100644
--- a/src/components/Process/style/flow-viewer.scss
+++ b/src/components/Process/style/flow-viewer.scss
@@ -118,20 +118,28 @@
stroke: #56bb56 !important;
}
- .highlight-todo.djs-connection > .djs-visual > path {
- stroke: #eab24a !important;
- stroke-dasharray: 4px !important;
+
+ .highlight-todo.djs-shape .djs-visual > :nth-child(1) {
+ fill: #559db0 !important;
+ stroke: #559db0 !important;
fill-opacity: 0.2 !important;
}
- .highlight-todo.djs-shape .djs-visual > :nth-child(1) {
- stroke-dasharray: 5, 5;
- stroke-dashoffset: 500;
- stroke: #eab24a !important;
- fill: rgba(252, 211, 127, 0.2) !important;
+ .highlight-todo.djs-shape .djs-visual > :nth-child(2) {
+ fill: #559db0 !important;
}
- // 娴佺▼绾�
+ .highlight-todo.djs-shape .djs-visual > path {
+ fill: #559db0 !important;
+ fill-opacity: 0.2 !important;
+ stroke: #559db0 !important;
+ }
+
+ .highlight-todo.djs-connection > .djs-visual > path {
+ stroke: #559db0 !important;
+ }
+
+ // 宸茶秴鏃舵祦绋嬬嚎
.highlight-overtime.djs-shape .djs-visual > :nth-child(1) {
fill: #ff5353 !important;
stroke: #ff5353 !important;
@@ -150,6 +158,27 @@
.highlight-overtime.djs-connection > .djs-visual > path {
stroke: #ff5353 !important;
+ }
+
+ // 鍗冲皢瓒呮椂娴佺▼绾�
+ .highlight-willOvertime.djs-shape .djs-visual > :nth-child(1) {
+ fill: #eab24a !important;
+ stroke: #eab24a !important;
+ fill-opacity: 0.2 !important;
+ }
+
+ .highlight-willOvertime.djs-shape .djs-visual > :nth-child(2) {
+ fill: #eab24a !important;
+ }
+
+ .highlight-willOvertimeovertime.djs-shape .djs-visual > path {
+ fill: #eab24a !important;
+ fill-opacity: 0.2 !important;
+ stroke: #eab24a !important;
+ }
+
+ .highlight-willOvertime.djs-connection > .djs-visual > path {
+ stroke: #eab24a !important;
}
@@ -184,12 +213,21 @@
margin-right: 8px;
}
- .processing {
+ .willOvertime {
background-color: #fcf5ea;
padding: 4px;
border: 1px solid #fce9c7;
border-radius: 3px;
- color: #eab24a;
+ color: #de9603;
+ margin-right: 8px;
+ }
+
+ .processing {
+ background-color: #d8f1fc;
+ padding: 4px;
+ border: 1px solid #b6e1f5;
+ border-radius: 3px;
+ color: #559db0;
margin-right: 8px;
}
@@ -205,7 +243,7 @@
.overtime {
padding: 4px;
background: #ffd1d1;
- border: 1px solid rgba(255, 0, 0, 0.1);
+ border: 1px solid rgba(246, 181, 181, 0.1);
border-radius: 3px;
color: #ff5353;
margin-right: 5px;
diff --git a/src/components/Process/viewer/index.vue b/src/components/Process/viewer/index.vue
index d57153e..d9daa7a 100644
--- a/src/components/Process/viewer/index.vue
+++ b/src/components/Process/viewer/index.vue
@@ -7,6 +7,7 @@
<div class="finish">宸插姙鐞�</div>
<div class="processing">澶勭悊涓�</div>
<div class="todo">鏈繘琛�</div>
+ <div class="willOvertime">鍗冲皢瓒呮椂</div>
<div class="overtime">宸茶秴鏃�</div>
</div>
<!-- 娴佺▼鍥炬樉绀� -->
@@ -110,8 +111,10 @@
if (n.$type === 'bpmn:UserTask') {
if (completeTask) {
canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
- if(completeTask.overtime){
+ if(completeTask.overtime && completeTask.overtime==='red'){
canvas.addMarker(n.id, 'highlight-overtime')
+ }else if(completeTask.overtime && completeTask.overtime==='yellow'){
+ canvas.addMarker(n.id, 'highlight-willOvertime')
}
n.outgoing?.forEach(nn => {
const targetTask = nodeData.find(m => m.key === nn.targetRef.id)
diff --git a/src/views/flowable/task/myProcess/detail/index.vue b/src/views/flowable/task/myProcess/detail/index.vue
index 363169a..f1d763c 100644
--- a/src/views/flowable/task/myProcess/detail/index.vue
+++ b/src/views/flowable/task/myProcess/detail/index.vue
@@ -29,7 +29,8 @@
>
<p style="font-weight: 700">{{item.taskName}}
<span v-if="item.comment && item.comment.type === '3'" style="color: red">(鎵ц浜嗛┏鍥�)</span>
- <span v-if="item.overtime" style="color: red">(宸茶秴鏃�)</span>
+ <span v-if="item.overtime && item.overtime==='red'" style="color: red">(宸茶秴鏃�)</span>
+ <span v-if="item.overtime && item.overtime==='yellow'" style="color: orange">(鍗冲皢瓒呮椂)</span>
</p>
<el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border>
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index c4c907e..07fd71e 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -198,7 +198,7 @@
@selection-change="handleSelectionChange"
height="100%"
sortable="custom"
- :show-overflow-tooltip="true">
+ >
<el-table-column type="selection" width="55" align="center"/>
<!-- 鍔ㄦ�佸垪 -->
<el-table-column
--
Gitblit v1.8.0