From 15129079d438cfc6997d24a3be0d67514258a6e8 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期五, 08 三月 2024 22:49:47 +0800
Subject: [PATCH] remove 删除无用代码
---
src/components/BpmnView/index.vue | 4 --
src/components/Process/approvalRecord.vue | 89 +-------------------------------------------
2 files changed, 3 insertions(+), 90 deletions(-)
diff --git a/src/components/BpmnView/index.vue b/src/components/BpmnView/index.vue
index 75a89cd..d0e6826 100644
--- a/src/components/BpmnView/index.vue
+++ b/src/components/BpmnView/index.vue
@@ -38,7 +38,6 @@
import ZoomScrollModule from 'diagram-js/lib/navigation/zoomscroll';
import { ModuleDeclaration } from 'didi';
import { Canvas, ModdleElement } from 'bpmn';
-import defaultXML from '@/components/BpmnDesign/assets/defaultXML';
import EventBus from 'diagram-js/lib/core/EventBus';
import Overlays from 'diagram-js/lib/features/overlays/Overlays';
import processApi from '@/api/workflow/processInstance/index';
@@ -146,10 +145,8 @@
//閫掑綊涓婅壊
const bpmnNodeList = (flowElements, canvas) => {
flowElements.forEach((n) => {
- console.log(n);
if (n.$type === 'bpmn:UserTask') {
const completeTask = taskList.value.find((m) => m.key === n.id);
- console.log(completeTask);
if (completeTask) {
canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo');
n.outgoing?.forEach((nn) => {
@@ -212,7 +209,6 @@
if (completeTask) {
canvas.addMarker(nn.id, 'highlight');
canvas.addMarker(n.id, 'highlight');
- // return;
}
});
}
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index 88dccf2..04694d1 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -3,50 +3,11 @@
<el-dialog v-model="visible" draggable title="瀹℃壒璁板綍" :width="props.width" :height="props.height" :close-on-click-modal="false">
<el-tabs v-model="tabActiveName" class="demo-tabs">
<el-tab-pane label="娴佺▼鍥�" name="bpmn">
- <!-- <div v-loading="loading">-->
- <!-- <div style="width: 100%; height: 300px; overflow: auto; position: relative">-->
- <!-- <div-->
- <!-- v-for="(graphic, index) in graphicInfoVos"-->
- <!-- :key="index"-->
- <!-- :style="{-->
- <!-- position: 'absolute',-->
- <!-- left: `${graphic.x}px`,-->
- <!-- top: `${graphic.y}px`,-->
- <!-- width: `${graphic.width}px`,-->
- <!-- height: `${graphic.height}px`,-->
- <!-- cursor: 'pointer',-->
- <!-- zIndex: 99-->
- <!-- }"-->
- <!-- @mouseover="handleMouseOver(graphic)"-->
- <!-- @mouseleave="handleMouseLeave()"-->
- <!-- ></div>-->
- <!-- <!– 寮瑰嚭鐨� div 鍏冪礌 –>-->
- <!-- <div-->
- <!-- v-show="popupVisible"-->
- <!-- class="triangle"-->
- <!-- :style="{-->
- <!-- position: 'absolute',-->
- <!-- left: `${graphicX}px`,-->
- <!-- top: `${graphicY}px`,-->
- <!-- backgroundColor: '#fff',-->
- <!-- padding: '10px',-->
- <!-- zIndex: 100-->
- <!-- }"-->
- <!-- >-->
- <!-- <p>瀹℃壒浜哄憳: {{ nodeInfo.nickName }}</p>-->
- <!-- <p>鑺傜偣鐘舵�侊細{{ nodeInfo.status }}</p>-->
- <!-- <p>寮�濮嬫椂闂达細{{ nodeInfo.startTime }}</p>-->
- <!-- <p>缁撴潫鏃堕棿锛歿{ nodeInfo.endTime }}</p>-->
- <!-- <p>瀹℃壒鑰楁椂锛歿{ nodeInfo.runDuration }}</p>-->
- <!-- </div>-->
- <!-- <el-image :src="src" />-->
- <!-- </div>-->
- <!-- </div>-->
<BpmnView ref="bpmnViewRef"></BpmnView>
</el-tab-pane>
<el-tab-pane label="瀹℃壒淇℃伅" name="info">
<div>
- <el-table :data="historyList" style="width: 100%" border fit max-height="570">
+ <el-table :data="historyList" style="width: 100%" border fit>
<el-table-column type="index" label="搴忓彿" align="center" width="50"></el-table-column>
<el-table-column prop="name" label="浠诲姟鍚嶇О" sortable align="center"></el-table-column>
<el-table-column prop="nickName" label="鍔炵悊浜�" sortable align="center"></el-table-column>
@@ -88,14 +49,6 @@
import processApi from '@/api/workflow/processInstance';
import { propTypes } from '@/utils/propTypes';
-type NodeInfo = {
- nickName?: string;
- status?: string;
- startTime?: string;
- endTime?: string;
- runDuration?: string;
-};
-
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const props = defineProps({
@@ -103,16 +56,9 @@
height: propTypes.string.def('100%')
});
const loading = ref(false);
-const src = ref('');
const visible = ref(false);
const historyList = ref<Array<any>>([]);
const deleteReason = ref<string>('');
-const graphicInfoVos = ref<Array<any>>([]);
-const nodeListInfo = ref<Array<any>>([]);
-const popupVisible = ref(false);
-const nodeInfo = ref<NodeInfo>({});
-const graphicX = ref<number | string>(0);
-const graphicY = ref<number | string>(0);
const tabActiveName = ref('bpmn');
const bpmnViewRef = ref<BpmnView>();
@@ -122,43 +68,14 @@
visible.value = true;
loading.value = true;
historyList.value = [];
- graphicInfoVos.value = [];
- processApi.getHistoryImage(instanceId).then((res) => {
- src.value = 'data:image/png;base64,' + res.data;
- });
processApi.getHistoryRecord(instanceId).then((resp) => {
historyList.value = resp.data.historyRecordList;
- graphicInfoVos.value = resp.data.graphicInfoVos;
- nodeListInfo.value = resp.data.nodeListInfo;
deleteReason.value = resp.data.deleteReason;
loading.value = false;
});
await nextTick(() => {
bpmnViewRef.value.init(instanceId);
});
-};
-//鎮诞浜嬩欢
-const handleMouseOver = async (graphic: any) => {
- graphicX.value = graphic.x + graphic.width + 10;
- graphicY.value = graphic.y - graphic.height + -10;
- nodeInfo.value = {};
- if (nodeListInfo.value && nodeListInfo.value.length > 0) {
- let info = nodeListInfo.value.find((e: any) => e.taskDefinitionKey == graphic.nodeId);
- if (info) {
- nodeInfo.value = {
- nickName: info.nickName,
- status: info.status,
- startTime: info.startTime,
- endTime: info.endTime,
- runDuration: info.runDuration
- };
- popupVisible.value = true;
- }
- }
-};
-//鍏抽棴
-const handleMouseLeave = async () => {
- popupVisible.value = false;
};
/** 涓嬭浇鎸夐挳鎿嶄綔 */
@@ -189,8 +106,8 @@
.container {
:deep(.el-dialog .el-dialog__body) {
- max-height: calc(100vh - 300px) !important;
- min-height: calc(100vh - 300px) !important;
+ max-height: calc(100vh - 170px) !important;
+ min-height: calc(100vh - 170px) !important;
}
}
</style>
--
Gitblit v1.9.3