Merge branch 'develop_lsy' into develop

# Conflicts:
#	src/views/Dashboard.vue
#	src/views/Device.vue
#	src/views/Settings.vue
#	src/views/TeamManagement/ManageTeamOperate.vue
#	src/views/VolumeCancel.vue

src/views/Dashboard.vue

@@ -73,7 +73,7 @@ export default {
     getOverviewProduct () {
       if (this.dataFilterSelectLoading) return
       this.dataFilterSelectLoading = true
-      get('http://81.68.234.235:8032/pdf-tech/vppDashboard/getOverviewProduct', {
+      get('/pdf-tech/vppDashboard/getOverviewProduct', {
         codeList: this.dataFilterProductSelect
       }).then((res) => {
         setTimeout(() => {
@@ -99,7 +99,7 @@ export default {
       } else {
         type = 2
       }
-      get('http://81.68.234.235:8032/pdf-tech/vppDashboard/getChartStatistics/' + type).then((res) => {
+      get('/pdf-tech/vppDashboard/getChartStatistics/' + type).then((res) => {
         setTimeout(() => {
           this.chartSelectLoading = false
         }, 1000)
@@ -132,7 +132,7 @@ export default {
     getTeamMemberData () {
       if (this.teamSelectLoading) return
       this.teamSelectLoading = true
-      get('http://81.68.234.235:8032/pdf-tech/vppDashboard/getTeamMemberData', {
+      get('/pdf-tech/vppDashboard/getTeamMemberData', {
         teamId: this.teamSelect,
         codeList: this.teamFilterProductSelect
       }).then((res) => {

src/views/Device.vue

@@ -134,7 +134,7 @@ export default {
       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)=>{
+      downLoad("/pdf-tech/vppDevice/download", urlencoded).then((res)=>{
         setTimeout(() => {
           this.downloadLoading = false
         }, 2000)

src/views/MenageAdmin/addAdmin.vue

@@ -31,7 +31,7 @@ export default {
           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)=>{
+          post('/pdf-tech/vppTeam/sendEmailForAddTeamAdmin', urlencoded).then((res)=>{
             if(res.data.code === 200){
               this.$message({
                 message: 'Change Success',

src/views/MenageAdmin/editAdmin.vue

@@ -41,7 +41,7 @@ export default {
         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',urlencoded ).then((res)=>{
+          post( '/pdf-tech/vppTeam/editTeamAdmin',urlencoded ).then((res)=>{
             if(res.data.code === 200){
                 this.$message({
                   message: 'Change Success',

src/views/Settings.vue

@@ -87,7 +87,7 @@ export default {
         if (valid) {
           if (this.generalLoading) return
           this.generalLoading = true
-          put('http://81.68.234.235:8032/pdf-tech/vppSet/setGeneral', {
+          put('/pdf-tech/vppSet/setGeneral', {
             userName: this.ruleForm.userName,
             area: this.ruleForm.area
           }).then((res) => {

src/views/TeamManagement/ManageMember.vue

@@ -112,7 +112,7 @@ function exportManageMemberList() {
   urlencoded.append("status", status.value)
   if(click){
     click = false
-    downLoad("http://81.68.234.235:8032/pdf-tech/vppRTeamMemberRole/download", urlencoded).then((res)=>{
+    downLoad("/pdf-tech/vppRTeamMemberRole/download", urlencoded).then((res)=>{
         //限制点击
         setTimeout(() => {
           click = true

src/views/TeamManagement/ManageMember/AddManageMember.vue

@@ -32,7 +32,7 @@ export default {
             this.click = true
           }, 3000)
         } else {
-          post('http://81.68.234.235:8032/pdf-tech/vppTeam/addTeamMember',this.formData).then((res)=>{
+          post('/pdf-tech/vppTeam/addTeamMember',this.formData).then((res)=>{
             //限制点击
             setTimeout(() => {
               this.click = true
@@ -59,7 +59,7 @@ export default {
         this.$refs.upload.submit()
         const formData = new FormData()
         formData.append("file",this.file)
-        post('http://81.68.234.235:8032/pdf-tech/vppTeam/addTeamMemberBatch', formData).then((res) => {
+        post('/pdf-tech/vppTeam/addTeamMemberBatch', formData).then((res) => {
           //限制点击
           setTimeout(() => {
             this.click = true

src/views/TeamManagement/ManageMember/EditManageMember.vue

@@ -55,7 +55,7 @@ export default {
       urlencoded.append("name", this.formData.memberName)
       if(this.click){
         this.click = false
-        post('http://81.68.234.235:8032/pdf-tech/vppTeam/editTeamMember',urlencoded).then((res)=>{
+        post('/pdf-tech/vppTeam/editTeamMember',urlencoded).then((res)=>{
           //限制点击
           setTimeout(() => {
             this.click = true

src/views/TeamManagement/ManageTeam.vue

@@ -68,7 +68,7 @@ const getTeamList = () => {
 function exportManageTeamList() {
   if(click){
     click = false
-    downLoad('http://81.68.234.235:8032/pdf-tech/vppTeam/exportManageTeamList?teamId='+
+    downLoad('/pdf-tech/vppTeam/exportManageTeamList?teamId='+
             teamId.value +
             '&' +
             'keyword=' +

src/views/TeamManagement/ManageTeamOperate.vue

@@ -102,7 +102,7 @@ export default {
           item.licenseNumber = 0
         }
       })
-      postWithHeader('http://81.68.234.235:8032/pdf-tech/vppTeam/createTeam', JSON.stringify(this.formData)).then((res) => {
+      postWithHeader('/pdf-tech/vppTeam/createTeam', JSON.stringify(this.formData)).then((res) => {
         //限制点击
         setTimeout(() => {
           this.click = true
@@ -125,7 +125,7 @@ export default {
           item.licenseNumber = 0
         }
       })
-      putWithHeader('http://81.68.234.235:8032/pdf-tech/vppTeam/editTeam', JSON.stringify(this.formData)).then((res) => {
+      putWithHeader('/pdf-tech/vppTeam/editTeam', JSON.stringify(this.formData)).then((res) => {
         //限制点击
         setTimeout(() => {
           this.click = true

src/views/VolumeCancel.vue

@@ -21,7 +21,7 @@ export default {
       this.$refs.upload.submit()
       const formData = new FormData()
       formData.append("file",this.file)
-      post('http://81.68.234.235:8032/pdf-tech/vppLicenseCode/cancelLicenceAssignBatch', formData).then((res) => {
+      post('/pdf-tech/vppLicenseCode/cancelLicenceAssignBatch', formData).then((res) => {
         setTimeout(() => {
           this.loading = false
         }, 1000)