Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	src/views/ProjectInfo.vue

src/components/CreatePersonDialog.vue

@@ -5,7 +5,6 @@
       title="添加成员"
       :before-close="handleClose"
       v-model="dialogFormVisible"
-
       width="500px"
   >
     <el-form :model="form" :rules="rules" ref="form">

src/components/echartsPie.vue

@@ -87,7 +87,8 @@ export default {
         option.legend = {
           type: 'scroll',
           orient: 'vertical',
-          right: 10,
+          // right: 10,
+          left:350,
           top: 20,
           bottom: 20,
         }

src/views/ProjectGroup.vue

@@ -70,6 +70,7 @@
         <p style="'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;color: #606266;margin: 15px 0 30px 0;flex-shrink: 0;">
           团队工作情况统计</p>
         <div style="flex: 1;background-color: white; border-radius: 10px;">
+          <EchartsPie id="pie_team" ref="pie_team" :isLegend="true" :dataList="teamList"/>
           <!--          <EchartsPie id="pie_team" :isRadius="true" />-->
         </div>
       </div>
@@ -129,6 +130,7 @@ export default {
     return {
       // 岗位列表
       stationList: [],
+      teamList: [],
       total: 20,
       currentPage: 1,
       pageSize: 10,
@@ -193,6 +195,34 @@ export default {
             console.log(error);
           });
     },
+    getTeamList() {
+      let projectId = this.$route.params.projectId;
+      request({
+        url: `project/${projectId}/task/stats/group`,
+        method: "get",
+      })
+          .then((response) => {
+            if (response.data.code === 200) {
+              console.log(response.data.data);
+              let data = response.data.data;
+              let array = [];
+              for (let key in data) {
+                array.push({ value: data[key], name: key });
+              }
+              
+              this.teamList = array;
+              this.$nextTick(() => {
+                this.$refs.pie_team.updateEcharts();
+
+                
+              });
+              console.log(array);
+            }
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
+    },
     onCreatePerson() {
       this.dialogFormVisible = true;
     },
@@ -246,6 +276,7 @@ export default {
       };
       this.getTableData(data);
       this.getStationList();
+      this.getTeamList();
       this.$emit('groupChanged')
     },
     getTableData(param) {
@@ -290,6 +321,7 @@ export default {
   },
   mounted() {
     this.getStationList();
+    this.getTeamList();
     const param = {
       pageCurrent: this.currentPage,
       pageSize: this.pageSize,