From 04384f6dc679a7b216ef1912c61baa27f4cb0665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Thu, 29 Aug 2024 22:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yanzhu/system/domain/SysUserRole.java    | 12 ++++++++++++
 .../src/components/Process/panel/commonPanel.vue | 16 ++++++++--------
 .../src/views/manage/proProjectInfo/index.vue    |  2 +-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserRole.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserRole.java
index cedad492..add16627 100644
--- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserRole.java
+++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserRole.java
@@ -16,6 +16,9 @@ public class SysUserRole
     /** 角色ID */
     private Long roleId;
 
+    /** 角色ID */
+    private Long projectId;
+
     public Long getUserId()
     {
         return userId;
@@ -36,11 +39,20 @@ public class SysUserRole
         this.roleId = roleId;
     }
 
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("userId", getUserId())
             .append("roleId", getRoleId())
+            .append("projectId", getProjectId())
             .toString();
     }
 }
diff --git a/yanzhu-ui-vue3/src/components/Process/panel/commonPanel.vue b/yanzhu-ui-vue3/src/components/Process/panel/commonPanel.vue
index fe828f60..3b100c01 100644
--- a/yanzhu-ui-vue3/src/components/Process/panel/commonPanel.vue
+++ b/yanzhu-ui-vue3/src/components/Process/panel/commonPanel.vue
@@ -50,8 +50,8 @@
 <script setup name="CommonPanel">
 import {StrUtil} from '@/utils/StrUtil'
 import useModelerStore from '@/store/modules/modeler'
-import { listDept } from "@/api/system/dept";
-import { listProjectInfo } from "@/api/manage/projectInfo";
+// import { listDept } from "@/api/system/dept";
+// import { listProjectInfo } from "@/api/manage/projectInfo";
 const modelerStore = useModelerStore()
 
 const { proxy } = getCurrentInstance();
@@ -109,11 +109,11 @@ function updateElementTask(key) {
 }
 
 /** 初始化数据 */
-function initDepts(){
-  listDept({}).then(response => {
-    deptOptions.value = response.rows;
-  });
-}
+// function initDepts(){
+//   listDept({}).then(response => {
+//     deptOptions.value = response.rows;
+//   });
+// }
 
-initDepts();
+//initDepts();
 </script>
diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
index 4b8b1ea3..83be78ac 100644
--- a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
@@ -199,7 +199,7 @@
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="项目类型" prop="projectType">
-                  <el-select v-model="form.projectType" placeholder="请选择项目类型">
+                  <el-select v-model="form.projectType" placeholder="请选择项目类型" style="width:100%">
                     <el-option
                       v-for="dict in pro_project_type"
                       :key="dict.value"