From d10486efc3bc030b26cbd772d4ef3474d5e01faa Mon Sep 17 00:00:00 2001
From: liulijun <liulijun4959@163.com>
Date: Mon, 15 May 2023 16:51:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/lang/en_US.js |  20 ++++
 src/locales/lang/zh_CN.js |  22 +++++
 src/router/index.js       |   7 ++
 src/views/Home.vue        |   5 +
 src/views/Members.vue     | 188 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 242 insertions(+)
 create mode 100644 src/views/Members.vue

diff --git a/src/locales/lang/en_US.js b/src/locales/lang/en_US.js
index aa55963c..aea78623 100644
--- a/src/locales/lang/en_US.js
+++ b/src/locales/lang/en_US.js
@@ -441,8 +441,27 @@ const homeTS = {
     setting: 'Project Related Settings',
     mange: 'Module Manage',
     update: 'Version Manage',
+    member: 'Project Member',
   },
 };
+
+// 项目成员
+const proMemberTS = {
+  dialogVisible: {
+    addMember: 'Add Member',
+    inputParam: 'Input User Name',
+  },
+  pageData: {
+    memberId: 'Member ID',
+    memberName: 'Member Name',
+    memberRole: 'Member Role',
+    memberNoNull: 'User cannot be empty',
+    delMessage: 'Are you sure to delete the project member?',
+    createBy: 'Created By',
+    members: 'Member',
+  },
+};
+
 const jobsTS = {
   dialogVisible: {
     message: 'Timed job message',
@@ -1036,6 +1055,7 @@ export default {
     elements,
     globalParamsTs,
     homeTS,
+    proMemberTS,
     jobsTS,
     loginTS,
     modulesTS,
diff --git a/src/locales/lang/zh_CN.js b/src/locales/lang/zh_CN.js
index 143bb91c..e177257a 100644
--- a/src/locales/lang/zh_CN.js
+++ b/src/locales/lang/zh_CN.js
@@ -346,6 +346,7 @@ const routes = {
   globalParameter: '全局参数',
   moduleManage: '模块管理',
   versionIteration: '版本迭代',
+  membersProject: '项目成员',
   timedTask: '定时任务',
   projectSetting: '项目设置',
   projectPage: '项目首页',
@@ -429,8 +430,28 @@ const homeTS = {
     setting: '项目相关设置',
     mange: '模块管理',
     update: '版本迭代',
+    member: '项目成员',
   },
 };
+
+// 项目成员
+const proMemberTS = {
+  dialogVisible: {
+    addMember: '添加成员',
+    inputParam: '输入用户名',
+  },
+  pageData: {
+    memberId: '成员ID',
+    memberName: '用户名',
+    memberRole: '成员角色',
+    memberNoNull: '用户不能为空',
+    delMessage: '确认删除项目成员吗？',
+    createBy: '创建人',
+    members: '普通成员',
+  },
+};
+
+
 const jobsTS = {
   dialogVisible: {
     message: '定时任务信息',
@@ -1011,6 +1032,7 @@ export default {
     elements,
     globalParamsTs,
     homeTS,
+    proMemberTS,
     jobsTS,
     loginTS,
     modulesTS,
diff --git a/src/router/index.js b/src/router/index.js
index f4b797c2..b806e229 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -141,6 +141,13 @@ const getRoutes = () => [
         component: () => import('../views/Jobs.vue'),
         meta: { title: $tc('routes.timedTask') },
       },
+//llj：项目成员功能
+      {
+        path: 'Members',
+        name: 'Members',
+        component: () => import('../views/Members.vue'),
+        meta: { title: $tc('routes.membersProject') },
+      },
       {
         path: 'ProjectOption',
         name: 'ProjectOption',
diff --git a/src/views/Home.vue b/src/views/Home.vue
index d7286b42..952a4397 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -154,6 +154,11 @@ onMounted(() => {
           >
             <i class="el-icon-coin"></i>{{ $t('homeTS.projectSetting.update') }}
           </el-menu-item>
+
+          <el-menu-item :index="'/Home/'+ route.params.projectId + '/Members'">
+            <i class="el-icon-user"></i>{{ $t('homeTS.projectSetting.member') }}
+          </el-menu-item>
+
           <el-menu-item
             :index="'/Home/' + route.params.projectId + '/ProjectOption'"
           >
diff --git a/src/views/Members.vue b/src/views/Members.vue
new file mode 100644
index 00000000..b4c8f405
--- /dev/null
+++ b/src/views/Members.vue
@@ -0,0 +1,188 @@
+<script setup>
+import { onMounted, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import axios from '@/http/axios';
+import { ElMessage } from 'element-plus';
+import Pageable from '@/components/Pageable.vue';
+import { useI18n } from 'vue-i18n';
+
+const { t: $t } = useI18n();
+
+const route = useRoute();
+const pageData = ref({});
+const pageSize = ref(10);
+const pageCurrNum = ref(1);
+const dialogVisible = ref(false);
+const memberDialogVisible = ref(false);
+
+const memberParams = ref({
+  userName: '',
+});
+
+
+// 添加成员
+const openAddMember = (row) => {
+  memberParams.value = {
+    projectId: parseInt(route.params.projectId),
+    userName: row.userName,
+    memberRole: 0,
+  };
+  memberDialogVisible.value = true;
+};
+
+const addMemberForm = ref(null);
+const addMemberFunction = () => {
+  addMemberForm.value.validate(async (valid) => {
+    if (valid) {
+      await axios
+        .post('/controller/projects/addMember', memberParams.value)
+        .then((resp) => {
+          if (resp.code === 2000) {
+            memberDialogVisible.value = false;
+            ElMessage.success({
+              message: resp.message,
+            });
+            getMemberList(1);
+          }
+        });
+    }
+  });
+};
+
+
+// 查询项目成员
+const getMemberList = (pageNum, pSize) => {
+  pageSize.value = pSize || pageSize.value;
+  pageCurrNum.value = pageNum || pageCurrNum.value;
+  axios
+    .get('/controller/projects/listMembers', {
+      params: {
+        projectId: route.params.projectId,
+        page: pageCurrNum.value,
+        pageSize: pageSize.value,
+      },
+    })
+    .then((resp) => {
+      pageData.value = resp.data;
+    });
+};
+
+// 删除项目成员
+const deleteProjectUsers = (id) => {
+  axios
+    .delete('/controller/projects/deleteMember', {
+      params: {
+        id: id,
+      },
+    })
+    .then((resp) => {
+      if (resp.code === 2000) {
+          ElMessage.success({
+            message: resp.message,
+          });
+          dialogVisible.value = false;
+          getMemberList();
+        }
+    });
+};
+
+onMounted(() => {
+  getMemberList();
+});
+</script>
+
+<template>
+  <el-dialog
+    v-model="memberDialogVisible"
+    :title="$t('proMemberTS.dialogVisible.addMember')"
+    width="600px"
+  >
+    <el-form
+      ref="addMemberForm"
+      :model="memberParams"
+      size="small"
+      class="demo-table-expand"
+     
+      label-position="left"
+    >
+      <el-form-item
+        prop="userName"
+        :label="$t('proMemberTS.pageData.memberName')"
+        :rules="{
+          required: true,
+          message: $t('proMemberTS.pageData.memberNoNull'),
+          trigger: 'blur',
+        }"
+      >
+        <el-input
+          v-model="memberParams.userName"
+          :placeholder="$t('proMemberTS.dialogVisible.inputParam')"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+
+    <div style="text-align: center">
+      <el-button size="small" type="primary" @click="addMemberFunction">{{
+        $t('modulesTS.sure')
+      }}</el-button>
+    </div>
+  </el-dialog>
+
+  <el-button size="mini" round type="primary" @click="openAddMember">{{
+    $t('proMemberTS.dialogVisible.addMember')
+  }}
+  </el-button>
+
+  <el-table :data="pageData['content']" style="width: 100%; margin-top: 20px" border >
+    <el-table-column
+      :label="$t('proMemberTS.pageData.memberId')"
+      width="90"
+      align="center"
+      prop="id"
+    >
+     </el-table-column>
+    <el-table-column
+      :label="$t('proMemberTS.pageData.memberName')"
+      align="center"
+      prop="userName"
+    ></el-table-column>
+
+    <el-table-column
+      :label="$t('proMemberTS.pageData.memberRole')"
+      align="center"
+      prop="memberRole"
+    >
+    <template #default="scope">
+      <span v-if = "scope.row.memberRole == 1" >{{$t('proMemberTS.pageData.createBy')}}</span>
+      <span v-if = "scope.row.memberRole == 0" >{{$t('proMemberTS.pageData.members')}}</span>
+    </template> 
+  </el-table-column>
+
+    <el-table-column fixed="right" :label="$t('common.operate')" align="center">
+      <template #default="scope">
+        <el-popconfirm v-if = "scope.row.memberRole == 0"
+          style="margin-left: 10px"
+          :confirm-button-text="$t('form.confirm')"
+          :cancel-button-text="$t('form.cancel')"
+          icon="el-icon-warning"
+          icon-color="red"
+          :title="$t('proMemberTS.pageData.delMessage')"
+          @confirm="deleteProjectUsers(scope.row.id)"
+        >
+          <template #reference>
+            <el-button type="danger" size="mini">
+              {{ $t('common.delete') }}
+            </el-button>
+          </template>
+        </el-popconfirm>
+      </template>
+    </el-table-column>
+  </el-table>
+  <pageable
+    :is-page-set="true"
+    :total="pageData['totalElements']"
+    :current-page="pageData['number'] + 1"
+    :page-size="pageData['size']"
+    @change="getMemberList"
+  ></pageable>
+</template>

From bd9df0961ad9dd6a3d2a19ccd2ed16d9582686e5 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun4959@163.com>
Date: Mon, 15 May 2023 19:12:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index ca31cb92..ed2cb687 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -106,8 +106,16 @@ const flush = () => {
   dialogVisible.value = false;
   getProjectList();
 };
+
+// const getProjectList = () => {
+//   axios.get('/controller/projects/list').then((resp) => {
+//     projectData.value = resp.data;
+//     store.commit('saveProjectList', projectData.value);
+//   });
+// };
+// 修改为：按用户查找所有项目
 const getProjectList = () => {
-  axios.get('/controller/projects/list').then((resp) => {
+  axios.get('/controller/users/listProjects').then((resp) => {
     projectData.value = resp.data;
     store.commit('saveProjectList', projectData.value);
   });

From 182766c21bc023533ebbddd39004d19e8f81833d Mon Sep 17 00:00:00 2001
From: liulijun <liulijun4959@163.com>
Date: Mon, 15 May 2023 20:24:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectUpdate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ProjectUpdate.vue b/src/components/ProjectUpdate.vue
index e44852d3..50c53798 100644
--- a/src/components/ProjectUpdate.vue
+++ b/src/components/ProjectUpdate.vue
@@ -207,7 +207,7 @@ onMounted(() => {
       >{{ $t('form.save') }}
     </el-button>
     <el-button
-      v-if="isUpdate"
+      v-if="isUpdate && project.createBy===store.state.userInfo.id"
       type="danger"
       size="medium"
       icon="el-icon-delete"