From d083b10403968b394a0a2076a3cab72efa5810ea Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 02 九月 2024 17:17:21 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
static/js/menu.js | 2 +-
src/components/view/person-manage.vue | 2 +-
src/assets/api/controller.js | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 9f38e24..6a1a026 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -40,7 +40,8 @@
}
const user = {
- selectUserList: "/user/selectUserList", //鑾峰彇鐢ㄦ埛鍒楄〃
+ selectUserList: "/user/selectUserList", //鑾峰彇鐢ㄦ埛鍒楄〃 (鐢ㄤ簬鐝,宸ユ椂)
+ selectUserList2: "/user/selectUserList2", //鑾峰彇鐢ㄦ埛鍒楄〃 (鐢ㄤ簬鐢ㄦ埛绠＄悊椤甸潰)
selectPersonnelOverview: "/user/selectPersonnelOverview", // 璧勬簮瑕佹眰-浜哄憳鎬昏
selectRoleList: "/role/selectRoleList", //鑾峰彇瑙掕壊鍒楄〃
updateUser: "/user/updateUser", //淇敼鐢ㄦ埛淇℃伅
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 78392f4..8d26d89 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -178,7 +178,7 @@
</div>
</div>
<div class="table">
- <ValueTable ref="ValueTable" :url="$api.user.selectUserList" :upUrl="$api.user.updateUser"
+ <ValueTable ref="ValueTable" :url="$api.user.selectUserList2" :upUrl="$api.user.updateUser"
:componentData="componentData" :key="upIndex" />
</div>
</div>
diff --git a/static/js/menu.js b/static/js/menu.js
index 7fd2309..118ab1b 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -186,7 +186,7 @@
v: "鐢ㄦ埛绠＄悊",
i: "el-icon-s-tools",
u: "person-manage",
- p: "selectUserList"
+ p: "selectUserList2"
}, {
v: "瀹㈡埛绠＄悊",
i: "el-icon-s-tools",
--
Gitblit v1.9.3