优化配置中心

src/icons/svg/member.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" width="12.612" height="13.924" viewBox="0 0 12.612 13.924">
+  <g id="成员" transform="translate(-216.813 -186.112)">
+    <path id="路径_13035" data-name="路径 13035" d="M218.956,290.772h-1.9a.247.247,0,1,1,0-.493h1.9a.247.247,0,1,1,0,.493Zm0,3.408h-1.9a.247.247,0,0,1,0-.493h1.9a.247.247,0,1,1,0,.493Zm0,3.408h-1.9a.247.247,0,1,1,0-.493h1.9a.247.247,0,1,1,0,.493Zm4.981-3.9a2.194,2.194,0,1,1,2.192-2.194A2.194,2.194,0,0,1,223.937,293.686Zm0-3.893a1.693,1.693,0,1,1,0,.012Z" transform="translate(0 -100.981)" fill="#444"/>
+    <path id="路径_13036" data-name="路径 13036" d="M369.859,491.45a.246.246,0,0,1-.246-.247,3.526,3.526,0,1,0-7.049,0,.247.247,0,1,1-.493,0,4.019,4.019,0,1,1,8.036,0A.247.247,0,0,1,369.859,491.45Z" transform="translate(-142.153 -294.543)" fill="#444"/>
+    <path id="路径_13037" data-name="路径 13037" d="M269.462,200.035H259.22a.74.74,0,0,1-.74-.74V186.851a.74.74,0,0,1,.74-.74h10.242a.74.74,0,0,1,.74.74V199.3A.74.74,0,0,1,269.462,200.035ZM259.22,186.6a.247.247,0,0,0-.247.247V199.3a.247.247,0,0,0,.247.247h10.242a.246.246,0,0,0,.247-.247V186.851a.247.247,0,0,0-.247-.247Z" transform="translate(-40.777 0)" fill="#444"/>
+  </g>
+</svg>

src/icons/svg/team.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" width="11.879" height="12.695" viewBox="0 0 11.879 12.695">
+  <g id="组_2647" data-name="组 2647" transform="translate(5310.744 -5223.186)">
+    <g id="成员" transform="translate(-5310.744 5223.186)">
+      <path id="路径_13035" data-name="路径 13035" d="M450.669,295.783a3.243,3.243,0,1,1,3.239-3.243A3.243,3.243,0,0,1,450.669,295.783Zm0-5.754a2.5,2.5,0,1,1,0,.018Z" transform="translate(-444.728 -289.297)" fill="#444"/>
+      <path id="路径_13036" data-name="路径 13036" d="M373.582,493.535a.364.364,0,0,1-.364-.364,5.211,5.211,0,1,0-10.418,0,.364.364,0,0,1-.729,0,5.939,5.939,0,1,1,11.875,0A.364.364,0,0,1,373.582,493.535Z" transform="translate(-362.069 -480.84)" fill="#444"/>
+    </g>
+  </g>
+</svg>

src/views/ToConfigure/components/memberConfiguration.vue

@@ -1,10 +1,10 @@
 <template>
   <el-container>
     <el-main class="member_main">
-      <div class="member_title">成员</div>
-      <div class="member_all" :class="{'color-blue': isActive === 'all'}" @click="memberAll('all')">全部成员</div>
-      <div class="member_all member_margin" :class="{'color-blue': isActive === 'not'}" @click="memberAll('not')">未加入团队的成员</div>
-      <div class="member_title">团队</div>
+      <div class="member_title"><svg-icon icon-class="team" /> 成员</div>
+      <div class="member_team member_hover" :class="{'color-blue': isActive === 'all'}" @click="memberAll('all')">全部成员</div>
+      <div class="member_team member_hover member_margin" :class="{'color-blue': isActive === 'not'}" @click="memberAll('not')">未加入团队的成员</div>
+      <div class="member_title"><svg-icon icon-class="member" /> 团队</div>
       <div style="max-height: calc(100vh - 408px); overflow-y: auto;">
         <div class="member_team">我的团队</div>
         <div v-for="item in memberList[0]" :key="'my' + item.code">
@@ -124,24 +124,31 @@ export default {
   font-size: 14px;
   font-family: PingFangSC-Regular;
   line-height: 24px;
-  color: #333333;
+  color: #444;
+  margin-left: 20px;
+}
+.member_hover {
+  cursor: pointer;
+  color: #409EFF;
 }
 .member_all:hover {
   cursor: pointer;
   color: #409EFF;
 }
 .member_team {
+  font-weight: 600;
   font-size: 14px;
   font-family: PingFangSC-Regular;
   line-height: 24px;
-  color: #999999;
+  color: #333;
+  margin-left: 20px;
 }
 .member_margin {
   margin-bottom: 32px;
 }
 .member_main {
-  min-height: calc(100vh - 203px);
-  padding: 20px 0 20px 30px;
+  min-height: calc(100vh - 265px);
+  padding: 20px 0 20px 10px;
 }
 .member_footer {
   text-align: center;

src/views/ToConfigure/components/modifyNotice.vue

@@ -85,7 +85,7 @@
             <el-option v-for="key in noticeGroupList" :key="'email-type'+key.label" :label="key.label" :value="key.value" />
           </el-select>
           <el-select v-show="item.type===1" v-model="item.teams" placeholder="请选择" size="small" :multiple="true" :disabled="disabled">
-            <el-option v-for="key in teamList" :key="'email-team'+key.teamId" :label="key.teamName" :value="key.teamId" />
+            <el-option v-for="key in teamList" :key="'email-team'+key.code" :label="key.name" :value="key.code" />
           </el-select>
           <search-people v-show="item.type===2" :value.sync="item.customStaffs" :clearable="false" :multiple="true" :disabled="disabled" />
           <i v-if="index!==0 && !disabled" class="el-icon-remove-outline" @click="removeMembers(EmailList,index)" />
@@ -98,7 +98,7 @@
             <el-option v-for="key in noticeGroupList" :key="'DChart-type'+key.label" :label="key.label" :value="key.value" />
           </el-select>
           <el-select v-show="item.type===1" v-model="item.teams" placeholder="请选择" size="small" :multiple="true" :disabled="disabled">
-            <el-option v-for="key in teamList" :key="'DChart-team'+key.teamId" :label="key.teamName" :value="key.teamId" />
+            <el-option v-for="key in teamList" :key="'DChart-team'+key.code" :label="key.name" :value="key.code" />
           </el-select>
           <search-people v-show="item.type===2" :value.sync="item.customStaffs" :clearable="false" :multiple="true" :disabled="disabled" />
           <i v-if="index!==0 && !disabled" class="el-icon-remove-outline" @click="removeMembers(DChartList,index)" />
@@ -171,9 +171,10 @@ import {
   addBizNoticeSetting,
   updateBizNoticeSetting
 } from '@/api/configure'
+import { teamQueryTeamListBelowBiz } from '@/api/toConfigure.js'
 import { settingQueryBizRqmtOrntList } from '@/api/requirement.js'
 import { settingQueryBizModuleList } from '@/api/defectManage'
-import { queryTeamInfoList } from '@/api/workSchedule'
+// import { queryTeamInfoList } from '@/api/workSchedule'
 import { showAppClientEnum } from '@/api/version.js'
 import normalDialog from '@/components/dialog/normalDialog'
 import searchPeople from '@/components/select/searchPeople'
@@ -439,11 +440,16 @@ export default {
         this.statusList = res.data.taskStatus || []
       }
     },
+
     async queryTeamInfoList() { // 获取用户团队列表
-      const res = await queryTeamInfoList({ curIndex: 1, pageSize: 9999 })
-      if (res.code === 200 && res.data) {
-        this.teamList = res.data.list
+      const res = await teamQueryTeamListBelowBiz(this.bizId)
+      if (res.code === 200) {
+        this.teamList = res.data
       }
+      // const res = await queryTeamInfoList({ curIndex: 1, pageSize: 9999 })
+      // if (res.code === 200 && res.data) {
+      //   this.teamList = res.data.list
+      // }
     },
     init() {
       if (this.type === 'require') {

src/views/ToConfigure/index.vue

@@ -98,7 +98,7 @@ export default {
     background: #FFF;
     padding: 0px;
     border-radius: 4px;
-    min-height: calc(100vh - 143px);
+    min-height: calc(100vh - 206px);
   }
   .configure_title {
     width: 100vw;