Merge branch 'develop' of http://git.kdan.cc:8865/Server_Service/pdf_tech_front_end into develop

src/assets/style/main.scss

@@ -1,6 +1,7 @@
 html {
   font-family: 'Helvetica';
   font-style: normal;
+  min-width: 1280px;
 }
 h1 {
   font-weight: 700;

src/views/Dashboard.vue

@@ -165,9 +165,18 @@ export default {
         },
         legend: {
           right: 0,
+          top: -30,
           itemWidth: 124,
           itemHeight: 0,
-          itemGap: 24
+          itemGap: 24,
+          textStyle: {
+            color: '#808185',
+            fontSize: 14,
+            lineHeight: 14,
+            padding: 7
+          },
+          formatter: '\n\n{name}',
+          align:'none'
         },
         grid: {
           left: '3%',

src/views/ManageAdmin.vue

@@ -16,19 +16,27 @@ const total = ref(0)
 const dialogVisible = ref(false)
 const cancelEmail = ref('')
 let click = true
+let memberRole = ''
 
 onMounted(() => {
   let pageText = document.getElementsByClassName('el-pagination__jump')[0]
   if (pageText) {
     pageText.childNodes[0].nodeValue = '跳至'
   }
+  get('/pdf-tech/vppMember/getMemberInfo').then((res)=>{
+    if(res.data.code === 200){
+      memberRole = res.data.result.role
+    }
+  })
   pagingQuery()
   getTeamList()
 })
 //打开对话框
 const handleClick = (val) => {
-  dialogVisible.value = true
-  cancelEmail.value = val.email
+  if( memberRole === '1'){
+    dialogVisible.value = true
+    cancelEmail.value = val.email
+  }
 }
 //获取分页数据
 const pagingQuery = () => {

src/views/MenageAdmin/addAdmin.vue

@@ -11,6 +11,7 @@ export default {
       },
       teamList: {},
       click: true,
+      memberRole: ''
       // dialogVisible: false,
     }
   },
@@ -23,8 +24,9 @@ export default {
     },
     //提交添加表单
     submitFormSingle(){
-      if(this.click){
+      if(this.click && this.memberRole === '1'){
         this.click = false
+        const regEmail = /^([A-Za-z0-9_\-.])+@([A-Za-z0-9_\-.])+\.([A-Za-z]{2,4})$/
         if (this.formData.AdminEmail.trim() === '' || this.formData.TeamAdmin.length === 0) {
           this.$message.error('Missing required information')
         } else {
@@ -44,6 +46,11 @@ export default {
                 message: 'Member has joined a non-default team',
                 type: "error",
               })
+            } else if(res.data.msg === "Invalid Email Addresses"){
+              this.$message({
+                message: 'Invalid Email Addresses',
+                type: "error",
+              })
             }
           })
         }
@@ -63,6 +70,11 @@ export default {
         }
       }
     )
+    get('/pdf-tech/vppMember/getMemberInfo').then((res)=>{
+      if(res.data.code === 200){
+        this.memberRole = res.data.result.role
+      }
+    })
   }
 }
 </script>

src/views/MenageAdmin/editAdmin.vue

@@ -11,7 +11,8 @@ export default {
       email: '',
       memberId: '',
       teamList: [],
-      click: true
+      click: true,
+      memberRole: ''
     }
   },
   created () {
@@ -29,11 +30,16 @@ export default {
         this.teamList = res.data.result.vppTeams
       }
     })
+    get('/pdf-tech/vppMember/getMemberInfo').then((res)=>{
+      if(res.data.code === 200){
+        this.memberRole = res.data.result.role
+      }
+    })
   },
   methods: {
     // 提交表单
     submitForm () {
-      if(this.click){
+      if(this.click && this.memberRole === '1'){
         this.click = false
         var urlencoded = new URLSearchParams()
         urlencoded.append("memberId", this.memberId)

src/views/Settings.vue

@@ -75,6 +75,20 @@ export default {
                 duration: 5000,
                 message: 'Old Password error'
               })
+            } else if (
+              res.data.code === 700 &&
+              res.data.msg === 'Different Password'
+            ) {
+              this.$message.error({
+                message: 'Different Password'
+              })
+            } else if (
+              res.data.code === 700 &&
+              res.data.msg === 'Password must between 6-24 characters'
+            ) {
+              this.$message.error({
+                message: 'Password must between 6-24 characters'
+              })
             } else if (
               res.data.code === 302 &&
               res.data.msg === 'Please Create your Account first'

src/views/TeamManagement/ManageMember.vue

@@ -268,12 +268,6 @@ onMounted(() => {
           min-width="150px"
         >
         </el-table-column>
-        <el-table-column
-          prop="uniqueSns"
-          label="Activated Device UUID"
-          min-width="178px"
-        >
-        </el-table-column>
         <el-table-column
           prop="id"
           class="hidden"

src/views/TeamManagement/ManageMember/AddManageMember.vue

@@ -25,13 +25,21 @@ export default {
     submitFormSingle(){
       if(this.click){
         this.click = false
+        const regEmail = /^([A-Za-z0-9_\-.])+@([A-Za-z0-9_\-.])+\.([A-Za-z]{2,4})$/
         if (this.formData.memberEmail.trim() === '' || this.formData.teamId.trim() === '') {
           this.$message.error({duration: 5000, message: 'Missing required information'})
           //限制点击
           setTimeout(() => {
             this.click = true
           }, 3000)
-        } else {
+        } else if(!regEmail.test(this.formData.memberEmail)){
+          this.$message.error('Incorrect email format')
+          //限制点击
+          setTimeout(() => {
+            this.click = true
+          }, 3000)
+        }
+        else {
           post('/pdf-tech/vppTeam/addTeamMember',this.formData).then((res)=>{
             //限制点击
             setTimeout(() => {
@@ -241,7 +249,7 @@ export default {
         </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">
+            <a href="/public/download/团队成员导入模板.xlsx" download="团队成员导入模板.xlsx">
               Download sample XLSX <img src="@/assets/images/downLoadBlue.svg" class="inline-block ">
             </a>
           </span>

src/views/VolumeCancel.vue

@@ -82,7 +82,7 @@ export default {
         </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">
+            <a href="/public/download/批量取消授权导入模板.xlsx" download="批量取消授权导入模板.xlsx">
               Download sample XLSX <img src="@/assets/images/downLoadBlue.svg" class="inline-block ">
             </a>
           </span>

utils/request.js

@@ -21,8 +21,11 @@ instance.interceptors.request.use(
      *  config.headers.token = token
      * }
      */
-    const token = cookies.get('accessToken')
-    config.headers.Authorization = 'Bearer ' + token
+    console.log(config)
+    if(!(config.url.indexOf("pdf-tech/vppMember/create") !== -1 || config.url.indexOf("/pdf-tech/login") !== -1)){
+      const token = cookies.get('accessToken')
+      config.headers.Authorization = 'Bearer ' + token
+    }
     return config;
   },
   (error) => {