Merge remote-tracking branch 'origin/develop_wzl' into develop_lyb

test（合并代码）
# Conflicts:
#	src/components/sideMenu.vue

src/views/MenageAdmin/addAdmin.vue

@@ -25,11 +25,11 @@ export default {
       if (this.formData.AdminEmail.trim() === '' || this.formData.TeamAdmin.length === 0) {
         this.$message.error('Missing required information')
       } else {
-        post('http://81.68.234.235:8032/pdf-tech/vppTeam/sendEmailForAddTeamAdmin',{
-          teamIds: this.formData.TeamAdmin,
-          account: this.formData.AdminEmail
-        }).then((res)=>{
-          if(res.data.msg === 'Add Success！'){
+        var urlencoded = new URLSearchParams()
+        urlencoded.append("teamIds", this.formData.TeamAdmin)
+        urlencoded.append("account", this.formData.AdminEmail)
+        post('http://81.68.234.235:8032/pdf-tech/vppTeam/sendEmailForAddTeamAdmin', urlencoded).then((res)=>{
+          if(res.data.code === 200){
             this.$message({
               message: 'Change Success',
               type: "success",

src/views/MenageAdmin/editAdmin.vue

@@ -32,15 +32,19 @@ export default {
   methods: {
     // 提交表单
     submitForm () {
-      const data = {
-        memberId: this.memberId,
-        teamIds: this.formData.TeamAdmin
-      }
+      var urlencoded = new URLSearchParams()
+      urlencoded.append("memberId", this.memberId)
+      urlencoded.append("teamIds", this.formData.TeamAdmin)
       if (this.formData.TeamAdmin.length === 0) {
         this.$message.error('Please choose a team')
       } else {
-      post('http://81.68.234.235:8032/pdf-tech/vppTeam/editTeamAdmin',data).then(()=>{
-      
+      post( 'http://81.68.234.235:8032/pdf-tech/vppTeam/editTeamAdmin',urlencoded ).then((res)=>{
+        if(res.data.msg === 'Change Success！'){
+            this.$message({
+              message: 'Change Success',
+              type: "success",
+            })
+          }
       })
     }
     },
@@ -90,7 +94,7 @@ export default {
             </el-select>
         </el-form-item>  
         <div class="mt-32px flex">
-          <router-link :to="{ name: 'ManageMember' }">
+          <router-link :to="{ name: 'manageAdmin' }">
             <div class="w-152px h-40px border-1 border-[#1460F3] rounded-8px text-center text-16px text-[#1460F3] font-700 leading-40px mr-16px"
               @click="resetForm('formData')">Cancel</div>
           </router-link>

src/views/TeamManagement/ManageTeam.vue

@@ -2,7 +2,7 @@
 import { onMounted, ref, getCurrentInstance } from "vue"
 import Search from '@/components/icon/search.vue'
 import Warning from '@/components/icon/warning.vue'
-import { get, _delete } from '../../../utils/request'
+import { get, _delete, downLoad} from '../../../utils/request'
 
 const { proxy } = getCurrentInstance()
 const tableData = ref([])
@@ -52,12 +52,21 @@ function getManageTeamList() {
 }
 // 团队管理列表导出
 function exportManageTeamList() {
-  get('http://81.68.234.235:8032/pdf-tech/vppTeam/exportManageTeamList', {
-    teamId: teamId.value,
-    keyword: search.value
-  }).then((res) => {
-    console.log(res)
-  })
+  let teamIds = teamId.value||null
+  let searchs = search.value||null
+  get('http://81.68.234.235:8032/pdf-tech/vppTeam/exportManageTeamList?teamId='+
+          teamIds +
+          '&' +
+          'keyword=' +
+          searchs).then((res) => {
+            const link = document.createElement("a")  //创建a标签
+            let blob = new Blob([res], { type: "application/vnd.ms-excel" }) // response就是接口返回的文件流
+            let objectUrl = URL.createObjectURL(blob)
+            link.href = objectUrl
+            link.download = "团队" // 自定义文件名
+            link.click() // 下载文件
+            URL.revokeObjectURL(objectUrl) // 释放内存
+          })
 }
 // 删除
 function handleDelete() {