Merge branch 'develop_lyb' into develop

# Conflicts:
#	src/views/TeamManagement/ManageMember.vue
#	src/views/TeamManagement/ManageTeam.vue

src/views/Create.vue

@@ -86,6 +86,8 @@ export default {
         this.loading = true
         this.$refs['ruleForm'].validate((valid) => {
           if (valid) {
+            let teamIds = this.$route.query.teamIds.split(',')
+            console.log(teamIds)
             post('http://81.68.234.235:8032/pdf-tech/vppMember/create', {
               email: this.ruleForm.email,
               verifyCode: this.ruleForm.verificationCode,
@@ -95,7 +97,7 @@ export default {
               industry: this.ruleForm.industry,
               company: this.ruleForm.company,
               code: this.$route.query.code,
-              teamIds: this.$route.query.teamIds
+              teamIds: teamIds
             }).then((res) => {
               this.loading = false
               if (

src/views/Device.vue

@@ -2,7 +2,7 @@
 import Download from '@/components/icon/download.vue'
 import Warning from '@/components/icon/warning.vue'
 import Search from '@/components/icon/search.vue'
-import { get, post } from '../../utils/request'
+import { get, post, downLoad } from '../../utils/request'
 
 export default {
   components: {
@@ -117,6 +117,23 @@ export default {
     },
     searchInfo() {
       this.pagingQuery()
+    },
+    // 下载设备文件
+    downLoad(){
+      var urlencoded = new URLSearchParams()
+      urlencoded.append("queryString", this.queryString)
+      urlencoded.append("productId", this.productId)
+      urlencoded.append("teamId", this.teamId)
+      urlencoded.append("status", this.status)
+      downLoad("http://81.68.234.235:8032/pdf-tech/vppDevice/download", urlencoded).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) // 释放内存
+  })
     }
   }
 }
@@ -146,9 +163,12 @@ export default {
             rounded-4px
             min-w-28px min-h-28px
             bg-[#fff]
+            cursor-pointer
           "
-          ><Download
-        /></span>
+          @click="downLoad"
+          >
+          <Download/>
+        </span>
       </div>
       <div class="flex bg-[#fff] pt-32px px-24px rounded-t-8px w-full">
         <select v-model="productId" class="w-140px">
@@ -168,7 +188,7 @@ export default {
           <option value="4" selected>Expired</option>
         </select>
         <select v-model="teamId" class="w-140px ml-16px">
-          <option value="" selected disabled>Team</option>
+          <option value="" selected >Team</option>
           <option v-for="item in teamList" :key="item.value" :value="item.id">
             {{ item.name }}
           </option>

src/views/Login.vue

@@ -81,6 +81,9 @@ export default {
                       this.$router.push('/noadmin')
                     }
                   })
+                  post("http://81.68.234.235:8032/pdf-tech/vppTeam/enterTeam").then((res)=>{
+                    console.log(res)
+                  })
                 })
               } else if (
                 res.data.code === 306 &&

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/ManageMember.vue

@@ -25,11 +25,14 @@ const handleClick = (val) => {
   memberId.value = val.id
 }
 //确认删除
-function deleteMember() {
-  post('http://81.68.234.235:8032/pdf-tech/vppTeam/deleteMember', {
-    memberId: memberId.value
-  }).then((res) => {
-    console.log(res)
+function deleteMember(){
+  var urlencoded = new URLSearchParams()
+  urlencoded.append("memberId", memberId.value)
+  post("http://81.68.234.235:8032/pdf-tech/vppTeam/deleteMember",urlencoded).then((res)=>{
+    if(res.data.code === 200){
+      dialogVisible.value = false
+      getManageMemberList()
+    }
   })
 }
 
@@ -97,16 +100,19 @@ function getManageMemberList() {
 }
 // 团队成员列表导出
 function exportManageMemberList() {
-  downLoad(
-    'http://81.68.234.235:8032/pdf-tech/vppRTeamMemberRole/download'
-  ).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) // 释放内存
+  downLoad("http://81.68.234.235:8032/pdf-tech/vppRTeamMemberRole/download").then((res)=>{
+      let url = window.URL.createObjectURL(new Blob([res.data], { type: '.xlsx' }))
+      let a= document.createElement('a')
+      a.style.display = 'none'
+      a.href = url
+      // 自定义文件名
+      a.setAttribute('download', `团队成员.xlsx`)
+       document.body.appendChild(a)
+       // 下载文件
+       a.click()
+       // 释放内存
+       url = window.URL.revokeObjectURL(url)
+       document.body.removeChild(a) 
   })
 }
 //筛选
@@ -316,13 +322,11 @@ onMounted(() => {
       <Warning class="inline-block" />
       <div class="mt-16px text-16px leading-24px text-[#232A40]">
         <p>Sure Delete member?</p>
-        <p>
-          Team Name: <span class="font-bold">{{ MemberName }}</span>
-        </p>
+        <p>User Name: <span class="font-bold">{{ MemberName }}</span></p>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">No</el-button>
-        <el-button type="primary" @click="deleteMember">Yes</el-button>
+        <el-button @click="dialogVisible = false">Cancel</el-button>
+        <el-button type="primary" @click="deleteMember">Delete</el-button>
       </span>
     </el-dialog>
     <el-pagination

src/views/TeamManagement/ManageMember/AddManageMember.vue

@@ -26,9 +26,9 @@ export default {
         this.$message.error('Missing required information')
       } else {
         post('http://81.68.234.235:8032/pdf-tech/vppTeam/addTeamMember',this.formData).then((res)=>{
-          if(res.data.msg === 'Add Success！'){
+          if(res.data.code === 200){
             this.$message({
-              message: 'Change Success',
+              message: 'Add Success!',
               type: "success",
             })
           } else if(res.data.msg === "Member has joined a non-default team"){
@@ -46,9 +46,9 @@ export default {
       const formData = new FormData()
       formData.append("file",this.file)
       post('http://81.68.234.235:8032/pdf-tech/vppTeam/addTeamMemberBatch', formData).then((res) => {
-        if(res.data.msg === "Add Success！"){
+        if(res.data.code === 200){
           this.$message({
-            message: 'Change Success',
+            message: 'Add Success!',
             type: "success",
           })
         }
@@ -200,10 +200,10 @@ export default {
       >
         <el-form-item>
           <span slot="label" class="label">
-            CSV with users
+            XLSX with users
             <br>
             <span class="text-[14px] leading-20px text-[#808185]">
-              Upload a CSV file to add users.You can download the sample CSV file for an example of the format.
+              Upload a XLSX file to add users.You can download the sample XLSX file for an example of the format.
             </span>
           </span>
         </el-form-item>
@@ -217,13 +217,13 @@ export default {
             :limit="1"
             accept=".xlsx"
             ref="upload">
-            <div class="el-upload__text">Drag or drop CSV file here or <em>browse</em></div>
+            <div class="el-upload__text">Drag or drop XLSX file here or <em>browse</em></div>
           </el-upload>
         </el-form-item>
         <el-form-item>
           <span slot="label" class="label leading-20px text-[#1460F3] hover:opacity-70 cursor-pointer">
             <a href="/download/团队成员导入模板.xlsx" download="团队成员导入模板.xlsx">
-              Download sample CSV <img src="@/assets/images/downLoadBlue.svg" class="inline-block ">
+              Download sample XLSX <img src="@/assets/images/downLoadBlue.svg" class="inline-block ">
             </a>
           </span>
         </el-form-item>

src/views/TeamManagement/ManageMember/EditManageMember.vue

@@ -49,14 +49,20 @@ export default {
     },
     //确定编辑
     sureSave(){
-      post('http://81.68.234.235:8032/pdf-tech/vppTeam/editTeamMember', { memberId: this.$route.query.Id, teamId: this.formData.memberTeam, name: this.formData.memberName }).then((res)=>{
-        console.log(res)
+      var urlencoded = new URLSearchParams()
+      urlencoded.append("memberId", this.$route.query.Id)
+      urlencoded.append("teamId", this.formData.memberTeam)
+      urlencoded.append("name", this.formData.memberName)
+      post('http://81.68.234.235:8032/pdf-tech/vppTeam/editTeamMember',urlencoded).then((res)=>{
+        if(res.data.code === 200){
+          this.dialogVisible = false
+          this.$message({
+            message: 'Change Success!',
+            type: "success",
+          })
+        }
       })
-      this.dialogVisible = false
-      // this.$message({
-      //   message: 'Change Success',
-      //   type: "success",
-      // })
+      
       // this.$router.push("/manage-member")
     }
   },
@@ -131,7 +137,7 @@ export default {
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">Cancel</el-button>
-        <el-button type="primary" @click="sureSave">Save</el-button>
+        <el-button type="primary" @click="sureSave">OK</el-button>
       </span>
     </el-dialog>
   </div>

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([])
@@ -60,12 +60,26 @@ const getTeamList = () => {
 }
 // 团队管理列表导出
 function exportManageTeamList() {
-  get('http://81.68.234.235:8032/pdf-tech/vppTeam/exportManageTeamList', {
-    teamId: teamId.value,
-    keyword: queryString.value
-  }).then((res) => {
-    console.log(res)
-  })
+  let teamIds = teamId.value
+  let searchs = search.value
+  downLoad('http://81.68.234.235:8032/pdf-tech/vppTeam/exportManageTeamList?teamId='+
+          teamFilterSelect.value +
+          '&' +
+          'keyword=' +
+          searchs).then((res) => {
+            let url = window.URL.createObjectURL(new Blob([res.data], { type: '.xlsx' }))
+            let a= document.createElement('a')
+            a.style.display = 'none'
+            a.href = url
+            // 自定义文件名
+            a.setAttribute('download', `团队.xlsx`)
+             document.body.appendChild(a)
+             // 下载文件
+             a.click()
+             // 释放内存
+             url = window.URL.revokeObjectURL(url)
+             document.body.removeChild(a) 
+          })
 }
 // 删除
 function handleDelete() {
@@ -218,38 +232,8 @@ onMounted(() => {
         <el-table-column label="Operate" min-width="10%">
           <template slot-scope="scope">
             <div>
-<<<<<<< HEAD
-              <router-link
-                :to="{
-                  name: 'EditManageTeam',
-                  params: {
-                    flag: 'edit',
-                    teamId: scope.row.id,
-                    teamName: scope.row.name,
-                    teamDescription: scope.row.description,
-                    licenseAmount: scope.row.licenseAmount,
-                  },
-                }"
-              >
-                <div
-                  class="
-                    w-61px
-                    h-20px
-                    border-1 border-[#1460F3]
-                    rounded-4px
-                    text-center text-14px
-                    leading-20px
-                    text-[#1460F3]
-                    cursor-pointer
-                    mb-8px
-                  "
-                >
-                  Edit
-                </div>
-=======
               <router-link :to="{ name: 'EditManageTeam', params: { flag: 'edit', teamInfo: scope.row } }">
                 <div class="w-61px h-20px border-1 border-[#1460F3] rounded-4px text-center text-14px leading-20px text-[#1460F3] cursor-pointer mb-8px">Edit</div>
->>>>>>> develop_wzl
               </router-link>
               <div
                 class="

src/views/VolumeCancel.vue

@@ -32,14 +32,9 @@ export default {
     upLoadChange(file){
       this.file = file
       this.fileList.push(file)
-      console.log("上传的单个文件",this.file)
       return false
     }
   },
-  mounted() {},
-  watch: {
-    
-  }
 }
 </script>
 
@@ -58,11 +53,11 @@ export default {
         <el-form-item>
           <span slot="label" class="label">
             <span class="text-[24px] leading-32px">
-              CSV with users
+              XLSX with users
             </span>
             <br>
             <span class="text-[14px] leading-20px text-[#808185]">
-              Upload a CSV file to add users.You can download the sample CSV file for an example of the format.
+              Upload a XLSX file to add users.You can download the sample XLSX file for an example of the format.
             </span>
           </span>
         </el-form-item>
@@ -76,13 +71,13 @@ export default {
             :limit="1"
             accept=".xlsx"
             ref="upload">
-            <div class="el-upload__text">Drag or drop CSV file here or <em>browse</em></div>
+            <div class="el-upload__text">Drag or drop XLSX file here or <em>browse</em></div>
           </el-upload>
         </el-form-item>
         <el-form-item>
           <span slot="label" class="label leading-20px text-[#1460F3] hover:opacity-70 cursor-pointer">
             <a href="/download/批量取消授权导入模板.xlsx" download="批量取消授权导入模板.xlsx">
-              Download sample CSV <img src="@/assets/images/downLoadBlue.svg" class="inline-block ">
+              Download sample XLSX <img src="@/assets/images/downLoadBlue.svg" class="inline-block ">
             </a>
           </span>
         </el-form-item>

utils/request.js

@@ -83,7 +83,7 @@ export function downLoad(url, params = {}) {
     method: 'get',
     url,
     params,
-    responseType: 'blob',
+    responseType:"arraybuffer"
   });
 }