diff --git a/src/api/system/config.js b/src/api/system/config.js
index 196a3ab..53e826b 100644
--- a/src/api/system/config.js
+++ b/src/api/system/config.js
@@ -18,6 +18,13 @@ export const getConfigDetails = (configId) => {
method: 'get'
})
}
+// 获取参数配置表详情
+export const getConfigByKey = (configKey) => {
+ return request({
+ url: '/admin/config/key/' + configKey,
+ method: 'get'
+ })
+}
// 新增参数配置表
export const addConfig = (data) => {
diff --git a/src/api/workflow/process-definition.js b/src/api/workflow/process-definition.js
index 97a8924..eb802fe 100644
--- a/src/api/workflow/process-definition.js
+++ b/src/api/workflow/process-definition.js
@@ -68,4 +68,11 @@ export function getTypeOption() {
})
}
+export function getFromPerm(processKey) {
+ return request({
+ url: "/workflow/process/definition/from/perm/"+processKey,
+ method: "get",
+ })
+}
+
diff --git a/src/layout/navbar/index.vue b/src/layout/navbar/index.vue
index 182ec0b..1a51abe 100644
--- a/src/layout/navbar/index.vue
+++ b/src/layout/navbar/index.vue
@@ -3,12 +3,12 @@
-
+
-
-
- 欢迎回来,{{userInfo.userName}}
-
+
+
+ 欢迎回来,{{ userInfo.userName }}
+
- 个人中心
@@ -25,8 +25,6 @@ import {useRouter} from 'vue-router';
import Breadcrumb from './Breadcrumb.vue';
import Hamburger from './Hamburger.vue';
import {useAuthStore} from '@/stores/userstore.js'
-import BellSocket from "./BellSocket.vue";
-import {getUserInfo} from "../../api/login";
import {usePermisstionStroe} from '@/stores/permisstion'
const authStore = useAuthStore()
@@ -41,10 +39,8 @@ onMounted(() => {
onBeforeUnmount(() => {
document.removeEventListener('click', nullBlockClick)
})
-const setUserInfo = () => {
- getUserInfo().then(res=>{
- userInfo.value = res.data.user
- })
+const setUserInfo = () => {
+ userInfo.value = authStore.userinfo
}
const nullBlockClick = () => {
visitedP.value = false
@@ -74,22 +70,26 @@ const handleLogout = () => {
align-items: center;
background-color: #fff;
border-radius: 10px;
+
.right-bar {
margin-left: auto;
display: flex;
justify-content: flex-start;
align-items: center;
- .user-box{
+ .user-box {
cursor: pointer;
margin-left: 10px;
position: relative;
- >div:first-child{
- display:flex;
+
+ > div:first-child {
+ display: flex;
align-items: center;
- >span{
+
+ > span {
margin-left: 5px;
}
+
img {
width: 40px;
height: 40px;
diff --git a/src/views/auth/index.vue b/src/views/auth/index.vue
index 45e19cc..7adfb49 100644
--- a/src/views/auth/index.vue
+++ b/src/views/auth/index.vue
@@ -217,4 +217,4 @@ body,div {
}
}
-
\ No newline at end of file
+
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 0d2df9c..4637c2e 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -2,14 +2,14 @@
-
+
-
+
-
+
-
diff --git a/src/views/workflow/process/ProcessEdit.vue b/src/views/workflow/process/ProcessEdit.vue
index 7973461..452d34a 100644
--- a/src/views/workflow/process/ProcessEdit.vue
+++ b/src/views/workflow/process/ProcessEdit.vue
@@ -16,6 +16,7 @@
+
@@ -54,7 +55,6 @@