diff --git a/backend/app/crud/study.py b/backend/app/crud/study.py index f3e4a130..b85c7537 100644 --- a/backend/app/crud/study.py +++ b/backend/app/crud/study.py @@ -1,7 +1,7 @@ import uuid from typing import Sequence -from sqlalchemy import select, update +from sqlalchemy import select, update as sa_update from sqlalchemy.ext.asyncio import AsyncSession from app.models.study import Study @@ -38,7 +38,7 @@ async def update(db: AsyncSession, study: Study, study_in: StudyUpdate) -> Study update_data = study_in.model_dump(exclude_unset=True) if update_data: await db.execute( - update(Study) + sa_update(Study) .where(Study.id == study.id) .values(**update_data) ) diff --git a/frontend/src/views/admin/ProjectMembers.vue b/frontend/src/views/admin/ProjectMembers.vue index c12d452f..e80f535f 100644 --- a/frontend/src/views/admin/ProjectMembers.vue +++ b/frontend/src/views/admin/ProjectMembers.vue @@ -3,14 +3,15 @@
-

项目成员配置

+

项目成员配置(角色仅在当前项目内生效)

项目:{{ project.code }} - {{ project.name }}
+
同一账号在不同项目可拥有不同角色,角色授权仅在本页进行
新增成员
- + @@ -33,6 +34,9 @@ > + + + @@ -64,6 +68,9 @@ + + + diff --git a/frontend/src/views/admin/Projects.vue b/frontend/src/views/admin/Projects.vue index a6507a05..88d1a48c 100644 --- a/frontend/src/views/admin/Projects.vue +++ b/frontend/src/views/admin/Projects.vue @@ -2,7 +2,10 @@
-

项目管理

+
+

项目治理

+

项目是独立业务实体,账号加入项目后才成为项目成员(角色在成员配置中设置)

+
新建项目
@@ -18,7 +21,7 @@ @@ -110,4 +113,8 @@ onMounted(() => { justify-content: space-between; margin-bottom: 12px; } +.sub { + color: #666; + margin-top: 4px; +} diff --git a/frontend/src/views/admin/UserForm.vue b/frontend/src/views/admin/UserForm.vue index 169ffcab..eeda2332 100644 --- a/frontend/src/views/admin/UserForm.vue +++ b/frontend/src/views/admin/UserForm.vue @@ -4,15 +4,6 @@ - - - - - - - - - @@ -52,14 +43,12 @@ const formRef = ref(); const submitting = ref(false); const form = reactive({ username: "", - role: "PM", password: "", is_active: true, }); const rules = reactive({ username: [{ required: true, message: "请输入用户名", trigger: "blur" }], - role: [{ required: true, message: "请选择角色", trigger: "change" }], password: [ { validator: (_rule, value, callback) => { @@ -76,7 +65,6 @@ const rules = reactive({ const resetForm = () => { form.username = ""; - form.role = "PM"; form.password = ""; form.is_active = true; }; @@ -88,7 +76,6 @@ watch( resetForm(); if (props.user) { form.username = props.user.username; - form.role = props.user.role; form.is_active = props.user.is_active; } } @@ -102,7 +89,6 @@ const onSubmit = async () => { try { if (props.user) { await updateUser(props.user.id, { - role: form.role, is_active: form.is_active, password: form.password || undefined, }); @@ -110,7 +96,7 @@ const onSubmit = async () => { } else { await createUser({ username: form.username, - role: form.role, + role: "PV", password: form.password, }); ElMessage.success("用户已创建"); diff --git a/frontend/src/views/admin/Users.vue b/frontend/src/views/admin/Users.vue index f1f4ac0b..2e55ba0c 100644 --- a/frontend/src/views/admin/Users.vue +++ b/frontend/src/views/admin/Users.vue @@ -2,17 +2,14 @@
-

用户账号管理

+
+

账号治理(系统登录账号)

+

账号用于登录系统,本身不具备项目或角色权限

+
新建用户
- - -