From 5d31b52e679fab6dd34ca519ddfbd7151958b319 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 25 Mar 2024 22:39:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.js | 9 +++++++++
src/views/monitor/logininfor/index.vue | 2 ++
src/views/monitor/online/index.vue | 2 ++
src/views/monitor/operlog/index.vue | 2 ++
src/views/rapid/gen/index.vue | 2 ++
src/views/system/config/index.vue | 7 ++-----
src/views/system/dept/index.vue | 8 ++++++--
src/views/system/menu/index.vue | 14 ++++++++++----
src/views/system/notice/inform/index.vue | 4 +++-
src/views/system/notice/publish/index.vue | 4 +++-
src/views/system/post/index.vue | 16 ++++++++++------
src/views/system/role/index.vue | 2 ++
src/views/tool/interface-switch/index.vue | 3 ++-
src/views/workflow/about/index.vue | 5 +++--
src/views/workflow/approve/index.vue | 5 +++--
src/views/workflow/initiated/index.vue | 4 +++-
src/views/workflow/listen/index.vue | 4 +++-
src/views/workflow/process/ProcessEdit.vue | 2 +-
src/views/workflow/process/ProcessTree.vue | 8 ++++----
src/views/workflow/process/index.vue | 4 +++-
.../workflow/process/nodes/ConcurrentNode.vue | 18 +++++++++---------
.../workflow/process/nodes/ConditionNode.vue | 13 +++++--------
src/views/workflow/task/index.vue | 11 +++++++++--
23 files changed, 98 insertions(+), 51 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index a816fda..9c643ac 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -70,6 +70,15 @@ const router = createRouter({
breadcrumb: true
}
},
+ {
+ path: '/workflow/process',
+ name: 'process',
+ component: () => import('@/views/workflow/process/index.vue'),
+ meta: {
+ title: '流程管理',
+ breadcrumb: true
+ }
+ },
{
path: '/workflow/process/edit',
name: 'processAdd',
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index db53e3a..414ea2b 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -148,6 +148,8 @@ const getList = async () => {
list.value = res.data.rows
total.value = res.data.total
loading.value = false
+ }else {
+ ElMessage.error(res.msg);
}
})
}
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index f696c3f..8facdbf 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -78,6 +78,8 @@ const getList = async () => {
list.value = res.data.rows
total.value = res.data.total
loading.value = false
+ }else {
+ ElMessage.error(res.msg);
}
})
}
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 89a1a92..a117696 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -247,6 +247,8 @@ const getList = async () => {
list.value = res.data.rows;
total.value = res.data.total;
loading.value = false;
+ }else {
+ ElMessage.error(res.msg);
}
});
};
diff --git a/src/views/rapid/gen/index.vue b/src/views/rapid/gen/index.vue
index a3b4cf0..d9bce77 100644
--- a/src/views/rapid/gen/index.vue
+++ b/src/views/rapid/gen/index.vue
@@ -271,6 +271,8 @@ const getList = async () => {
list.value = res.data.rows
total.value = res.data.total
loading.value = false
+ }else {
+ ElMessage.error(res.msg);
}
})
}
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 643cdbf..0b311d8 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -18,7 +18,7 @@
- 搜索
+ 搜索
重置
@@ -160,10 +160,7 @@ const formRules = ref({
{required: true, message: "系统内置不能为空", trigger: "change"},
],
})
-//搜索功能
-const handleSearch = () => {
- getList()
-}
+
//重置搜索
const handleReset = () => {
queryForm.value.resetFields()
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 912478c..e00ad03 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -182,8 +182,12 @@ const getEditOption = (deptId) => {
const getList = async () => {
loading.value = true
getDeptList(queryParams).then(res => {
- list.value = res.data
- loading.value = false
+ if (res.code === 1000) {
+ list.value = res.data
+ loading.value = false
+ } else {
+ ElMessage.error(res.msg);
+ }
})
}
const getDetail = (deptId) => {
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index f59efb9..b1ee86f 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -44,8 +44,10 @@
- 新增
-
+ 新增
+
+
+
修改
分配角色
@@ -230,8 +232,12 @@ const getSelectIcon = (val) => {
const getList = async () => {
loading.value = true
getMenuList(queryParams).then(res => {
- list.value = res.data
- loading.value = false
+ if (res.code === 1000) {
+ list.value = res.data
+ loading.value = false
+ } else {
+ ElMessage.error(res.msg);
+ }
})
}
diff --git a/src/views/system/notice/inform/index.vue b/src/views/system/notice/inform/index.vue
index 01fed25..d403663 100644
--- a/src/views/system/notice/inform/index.vue
+++ b/src/views/system/notice/inform/index.vue
@@ -100,7 +100,9 @@ const getList = async () => {
} else {
ElMessage.error(res.msg);
}
- });
+ }).catch(err => {
+ loading.value = false;
+ })
};
//查看详情
const handleViewDetails = (noticeId) => {
diff --git a/src/views/system/notice/publish/index.vue b/src/views/system/notice/publish/index.vue
index 6ddb9c6..7f3a637 100644
--- a/src/views/system/notice/publish/index.vue
+++ b/src/views/system/notice/publish/index.vue
@@ -332,7 +332,9 @@ const getList = async () => {
} else {
ElMessage.error(res.msg);
}
- });
+ }).catch(err => {
+ loading.value = false;
+ })
};
//查看公告详情
const handleViewDetails = async (row) => {
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 7a61e50..096a330 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -141,12 +141,16 @@ const getList = async () => {
...queryParams,
...pageInfo
}).then(res => {
- res.data.rows = res.data.rows.sort((a, b) => {
- return a.postSort - b.postSort
- })
- total.value = res.data.total;
- list.value = res.data.rows
- loading.value = false
+ if (res.code === 1000) {
+ res.data.rows = res.data.rows.sort((a, b) => {
+ return a.postSort - b.postSort
+ })
+ total.value = res.data.total;
+ list.value = res.data.rows
+ loading.value = false
+ } else {
+ ElMessage.error(res.msg);
+ }
})
}
const handleReset = (instance) => {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index b0488cd..e4a7d01 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -284,6 +284,8 @@ const getList = async () => {
list.value = res.data.rows
total.value = res.data.total
loading.value = false
+ }else {
+ ElMessage.error(res.msg);
}
})
};
diff --git a/src/views/tool/interface-switch/index.vue b/src/views/tool/interface-switch/index.vue
index 076abac..a7de731 100644
--- a/src/views/tool/interface-switch/index.vue
+++ b/src/views/tool/interface-switch/index.vue
@@ -113,11 +113,12 @@ const getList = () => {
}
loading.value = true
getMappingList(params).then(res => {
- // console.log('res',res)
if (res.code === 1000) {
loading.value = false
list.value = res.data.rows
total.value = res.data.total
+ }else {
+ ElMessage.error(res.msg);
}
})
};
diff --git a/src/views/workflow/about/index.vue b/src/views/workflow/about/index.vue
index 0aad3e5..c415c85 100644
--- a/src/views/workflow/about/index.vue
+++ b/src/views/workflow/about/index.vue
@@ -118,11 +118,12 @@ const getList = async () => {
if (res.code === 1000) {
list.value = res.data.rows
total.value = res.data.total
- loading.value = false
} else {
ElMessage.error(res.msg)
}
-
+ loading.value = false
+ }).catch(err => {
+ loading.value = false;
})
}
diff --git a/src/views/workflow/approve/index.vue b/src/views/workflow/approve/index.vue
index 436752d..0562011 100644
--- a/src/views/workflow/approve/index.vue
+++ b/src/views/workflow/approve/index.vue
@@ -140,11 +140,12 @@ const getList = async () => {
if (res.code === 1000) {
list.value = res.data.rows
total.value = res.data.total
- loading.value = false
} else {
ElMessage.error(res.msg)
}
-
+ loading.value = false
+ }).catch(err => {
+ loading.value = false;
})
}
//切换每页显示条数
diff --git a/src/views/workflow/initiated/index.vue b/src/views/workflow/initiated/index.vue
index 171ede8..0d5086f 100644
--- a/src/views/workflow/initiated/index.vue
+++ b/src/views/workflow/initiated/index.vue
@@ -120,10 +120,12 @@ const getList = async () => {
if (res.code === 1000) {
list.value = res.data.rows
total.value = res.data.total
- loading.value = false
} else {
ElMessage.error(res.msg)
}
+ loading.value = false
+ }).catch(err => {
+ loading.value = false;
})
}
diff --git a/src/views/workflow/listen/index.vue b/src/views/workflow/listen/index.vue
index 24be07c..0c3b274 100644
--- a/src/views/workflow/listen/index.vue
+++ b/src/views/workflow/listen/index.vue
@@ -204,10 +204,12 @@ const getList = async () => {
if (res.code === 1000) {
list.value = res.data.rows
total.value = res.data.total
- loading.value = false
} else {
ElMessage.error(res.msg)
}
+ loading.value = false
+ }).catch(err => {
+ loading.value = false;
})
}
diff --git a/src/views/workflow/process/ProcessEdit.vue b/src/views/workflow/process/ProcessEdit.vue
index 926db0c..5850c1b 100644
--- a/src/views/workflow/process/ProcessEdit.vue
+++ b/src/views/workflow/process/ProcessEdit.vue
@@ -290,7 +290,7 @@ const doPublish = () => {
addProcessDefinition(template).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
- // this.$router.push("/formsPanel")
+ router.push("/workflow/process")
} else {
ElMessage.error(res.msg)
}
diff --git a/src/views/workflow/process/ProcessTree.vue b/src/views/workflow/process/ProcessTree.vue
index ad86d7f..211a157 100644
--- a/src/views/workflow/process/ProcessTree.vue
+++ b/src/views/workflow/process/ProcessTree.vue
@@ -322,7 +322,7 @@ const insertNode = debounce((type, parentNode) => {
break;
}
init()
-}, 1000)
+}, 100)
/**
* 更新父id
* @param newId
@@ -688,8 +688,8 @@ defineExpose({
display: flex;
justify-content: center;
position: relative;
- /*border-top: 2px solid #cccccc;
- border-bottom: 2px solid #cccccc;*/
+ //border-top: 2px solid #cccccc;
+ //border-bottom: 2px solid #cccccc;
}
.branch-node-item {
@@ -700,7 +700,7 @@ defineExpose({
align-items: center;
border-top: 2px solid #000000;
border-bottom: 2px solid #000000;
-//border-radius: 40px;
+
&:before {
content: "";
position: absolute;
diff --git a/src/views/workflow/process/index.vue b/src/views/workflow/process/index.vue
index aa0971f..e2101e1 100644
--- a/src/views/workflow/process/index.vue
+++ b/src/views/workflow/process/index.vue
@@ -161,10 +161,12 @@ const getList = async () => {
if (res.code === 1000) {
list.value = res.data.rows
total.value = res.data.total
- loading.value = false
} else {
ElMessage.error(res.msg)
}
+ loading.value = false
+ }).catch(err => {
+ loading.value = false;
})
}
diff --git a/src/views/workflow/process/nodes/ConcurrentNode.vue b/src/views/workflow/process/nodes/ConcurrentNode.vue
index ccec08f..a769572 100644
--- a/src/views/workflow/process/nodes/ConcurrentNode.vue
+++ b/src/views/workflow/process/nodes/ConcurrentNode.vue
@@ -149,18 +149,18 @@ const designStart = () => {
display: inline-block;
.node-body-main-header {
- padding: 10px 0px 5px;
- font-size: xx-small;
+ padding: 10px 0 5px;
position: relative;
-
+ font-size: 14px;
+ display: flex;
+ align-items: center;
.title {
- color: #718dff;
-
+ color: #2E7CF0;
+ height: auto;
+ display: flex;
+ align-items: center;
.name {
- display: inline-block;
- height: 14px;
- width: 130px;
- margin-left: 2px;
+ height: auto;
}
}
diff --git a/src/views/workflow/process/nodes/ConditionNode.vue b/src/views/workflow/process/nodes/ConditionNode.vue
index ae88d2e..47c8f04 100644
--- a/src/views/workflow/process/nodes/ConditionNode.vue
+++ b/src/views/workflow/process/nodes/ConditionNode.vue
@@ -248,9 +248,9 @@ defineExpose({
display: inline-block;
.node-body-main-header {
- padding: 10px 0px 5px;
+ padding: 10px 0 5px;
position: relative;
- font-size: 14px !important;
+ font-size: 14px;
display: flex;
align-items: center;
@@ -260,13 +260,10 @@ defineExpose({
height: auto;
display: flex;
align-items: center;
+ .name {
+ height: auto;
+ }
}
-
- .name {
- color: #2E7CF0;
- height: auto;
- }
-
.level {
position: absolute;
right: 15px;
diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue
index d55d671..58f11c4 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/index.vue
@@ -56,6 +56,7 @@ import {useProcessStore} from '@/stores/processStore.js'
import Paging from "@/components/pagination/index.vue";
import {useCacheStore} from '@/stores/cache.js'
import PointTag from "@/components/PointTag.vue";
+import {ElMessage} from "element-plus";
const processStore = useProcessStore()
const dictStore = useCacheStore()
@@ -100,9 +101,15 @@ const getList = async () => {
}
loading.value = true
getTaskList(params).then(res => {
- list.value = res.data.rows
- total.value = res.data.total
+ if (res.code === 1000) {
+ list.value = res.data.rows
+ total.value = res.data.total
+ } else {
+ ElMessage.error(res.msg)
+ }
loading.value = false
+ }).catch(err => {
+ loading.value = false;
})
}