lisiyan 2 vuotta sitten
vanhempi
commit
1aa91215af

+ 4 - 4
src/components/sideMenu.vue

@@ -87,9 +87,9 @@ export default {
     },
     roles(){
       if (this.role?.indexOf("1") !== -1) {
-        return 'Super admin'
+        return 'Super Admin'
       } else if (this.role?.indexOf("2") !== -1){
-        return 'Team admin'
+        return 'Team Admin'
       } else {
         return 'Team member'
       }
@@ -113,7 +113,7 @@ export default {
         <div v-if="role?.indexOf('2') !== -1 || role?.indexOf('1') !== -1">
           <el-menu-item index="/dashboard">
             <Dashboard />
-            <span>Dashboard</span>
+            <span>Home</span>
           </el-menu-item>
           <el-menu-item index="/productManagement">
             <Product />
@@ -135,7 +135,7 @@ export default {
             </template>
             <el-menu-item index="/licenseManage">Manage License</el-menu-item>
             <el-menu-item index="/assignlicense">Assign License</el-menu-item>
-            <el-menu-item index="/volumecancel">Volume Cancel</el-menu-item> 
+            <el-menu-item index="/volumecancel">Batch Cancel</el-menu-item> 
           </el-submenu>
           <el-menu-item index="/device">
             <Device />

+ 6 - 6
src/views/Assignlicense.vue

@@ -135,19 +135,19 @@ export default {
         if (res.data.code === 200 && res.data.msg == ' Assign Success!') {
           this.$message({
             duration: 5000,
-            message: 'Assign Success',
+            message: 'Assign Successfully',
             type: 'success'
           })
           $this.$router.push({ name: 'licenseManage' })
         } else if(res.data.code === 700 && res.data.msg == 'Please add the user to a team which has remaining license first'){
           this.$message.error({
             duration: 5000,
-            message: 'Please add the user to a team which has remaining license first',
+            message: 'Please assign more license to the team',
           })
         } else if(res.data.code === 700 && res.data.msg == 'Please allocate more license to the team first'){
           this.$message.error({
             duration: 5000,
-            message: 'Please allocate more license to the team first',
+            message: 'Please assign more license to the team',
           })
         }
       })
@@ -207,7 +207,7 @@ export default {
           >
           <el-select
             v-model="signleAssign"
-            placeholder="Product Designer"
+            placeholder="Team Name"
             class="w-600px"
           >
             <el-option
@@ -226,7 +226,7 @@ export default {
           <el-select
             v-model="memberId"
             multiple
-            placeholder="Please select"
+            placeholder="Select Email"
             class="w-600px"
           >
             <el-option
@@ -245,7 +245,7 @@ export default {
           <el-select
             v-model="signleProduct"
             multiple
-            placeholder="Please select"
+            placeholder="Select Product"
             class="w-600px"
           >
             <el-option

+ 10 - 10
src/views/Create.vue

@@ -114,7 +114,7 @@ export default {
                 this.verificationCodeError = true
                 this.$message.error({
                   duration: 5000,
-                  message: 'False Code,please check again'
+                  message: 'Verification Code Error'
                 })
               } else if (
                 res.data.code === 700 &&
@@ -124,7 +124,7 @@ export default {
                 this.passwordConfirmError = true
                 this.$message.error({
                   duration: 5000,
-                  message: 'Password must between 6-24 characters'
+                  message: 'Password must be 6-24 characters'
                 })
               } else if (
                 res.data.code === 700 &&
@@ -134,7 +134,7 @@ export default {
                 this.passwordConfirmError = true
                 this.$message.error({
                   duration: 5000,
-                  message: 'Different Password'
+                  message: "Confirm password doesn't match password"
                 })
               } else if (
                 res.data.code === 700 &&
@@ -143,12 +143,12 @@ export default {
                 this.EmailCodeError = true
                 this.$message.error({
                   duration: 5000,
-                  message: 'Email has been created'
+                  message: 'Account already exist, log in or change email?'
                 })
               } else if (res.data.code === 200 && res.data.msg === '注册成功') {
                 this.$message({
                   duration: 5000,
-                  message: 'Create Success',
+                  message: 'Create Successfully',
                   type: 'success'
                 })
                 this.$router.push('/login')
@@ -161,7 +161,7 @@ export default {
         this.$message.error({
           duration: 5000,
           message:
-            'Please read and confirm POLICY OF PRIVACY and TERMS OF USE first'
+            'Please read and confirm PRIVACY POLICY and TERMS OF USE first'
         })
       }
     },
@@ -236,7 +236,7 @@ export default {
     </div>
     <div class="h-auto m-auto">
       <div class="w-404px h-auto rounded-8px p-24px bg-[#fff] loginBox">
-        <h1 class="text-24px font-bold my-24px">Create account</h1>
+        <h1 class="text-24px font-bold my-24px">Create Account</h1>
         <el-form
           :model="ruleForm"
           ref="ruleForm"
@@ -292,7 +292,7 @@ export default {
             <div class="flex items-center">
               <el-input
                 v-model.trim="ruleForm.userName"
-                placeholder="User name"
+                placeholder="User Name"
               >
               </el-input>
             </div>
@@ -323,7 +323,7 @@ export default {
             <div class="flex items-center">
               <el-input
                 v-model.trim="ruleForm.passwordConfirm"
-                placeholder="Password confirm"
+                placeholder="Confirm Password"
                 :type="passwordConfirmType ? '' : 'password'"
               >
               </el-input>
@@ -394,7 +394,7 @@ export default {
               <span
                 class="ml-8px text-12px leading-14px"
                 :class="checkBox ? 'text-[#FF5054]' : ''"
-                >Read and Agree to POLICY OF PRIVACY and TERMS OF USE</span
+                >Read and Agree to PRIVACY POLICY and TERMS OF USE</span
               >
             </div>
           </el-form-item>

+ 10 - 10
src/views/Dashboard.vue

@@ -301,7 +301,7 @@ export default {
 
 <template>
   <div>
-    <h1>Dashboard</h1>
+    <h1>Home</h1>
     <div class="flex justify-between mt-24px mb-32px">
       <div class="block flex items-center p-24px basis-full mr-24px">
         <img src="@/../static/images/dashboard/total_licenses.png" alt="total_licenses" class="w-48px h-48px mr-16px">
@@ -333,7 +333,7 @@ export default {
       </div>
     </div>
 
-    <h2>Data Filter</h2>
+    <h2>Filter</h2>
     <div class="block p-24px mt-12px mb-32px">
       <div class="flex">
         <select v-model="dataFilterProductSelect" name="dataFilterProduct" class="min-w-180px mr-16px" :class="{ '!text-[#232A40]': dataFilterProductSelect !== '' }">
@@ -352,34 +352,34 @@ export default {
           <span class="text-16px font-bold text-[#232A40]">{{ overviewProduct.availableLicenses }}</span>
         </div>
         <div class="h-56px flex-1 bg-[#F6F7F9] border-[#D9D9D9] border-1px rounded-4px py-18px pl-24px pr-40px flex justify-between items-center">
-          <span class="text-14px font-bold text-[#505258]">Actived Licenses</span>
+          <span class="text-14px font-bold text-[#505258]">Activated Licenses</span>
           <span class="text-16px font-bold text-[#232A40]">{{ overviewProduct.activatedDevices }}</span>
         </div>
       </div>
       <div class="flex flex-wrap justify-between mt-24px">
         <div class="h-56px flex-1 bg-[#F6F7F9] border-[#D9D9D9] border-1px rounded-4px py-18px pl-24px pr-40px flex justify-between items-center mr-24px">
-          <span class="text-14px font-bold text-[#505258]">Valid Period (months)</span>
+          <span class="text-14px font-bold text-[#505258]">Valid Period (month)</span>
           <span class="text-16px font-bold text-[#232A40]">{{ overviewProduct.validPeriod }}</span>
         </div>
         <div class="h-56px flex-1 bg-[#F6F7F9] border-[#D9D9D9] border-1px rounded-4px py-18px pl-24px pr-40px flex justify-between items-center mr-24px">
-          <span class="text-14px font-bold text-[#505258]">Expire date</span>
+          <span class="text-14px font-bold text-[#505258]">Expiration Date</span>
           <span class="text-16px font-bold text-[#232A40]">{{ overviewProduct.expireDate }}</span>
         </div>
         <div class="h-56px flex-1 bg-[#F6F7F9] border-[#D9D9D9] border-1px rounded-4px py-18px pl-24px pr-40px flex justify-between items-center">
-          <span class="text-14px font-bold text-[#505258]">Time Left (day)</span>
+          <span class="text-14px font-bold text-[#505258]">Days Left</span>
           <span class="text-16px font-bold text-[#232A40]">{{ overviewProduct.timeLeft }}</span>
         </div>
       </div>
     </div>
 
-    <h2>Chart Statistics</h2>
+    <h2>Statistics</h2>
     <div class="block p-24px mt-12px mb-32px">
       <div class="flex">
         <div class="flex justify-between">
           <select v-model="chartSelectValue" name="date" class="min-w-180px mr-16px" :class="{ '!text-[#232A40]': chartSelectValue !== '' }">
-            <option value="" selected disabled>Statistics Time</option>
+            <option value="" disabled>Statistics Time</option>
             <option value="1">Today</option>
-            <option value="2">Last 7 Days</option>
+            <option value="2" selected>Last 7 Days</option>
             <option value="3">Last 30 Days</option>
             <option value="4">This Month</option>
           </select>
@@ -411,7 +411,7 @@ export default {
           <img src="@/../static/images/dashboard/team_data_purple.png" class="w-96px h-96px absolute top-0 left-0">
           <p class="text-32px text-[#664FF5] leading-36px font-700">{{ teamData.assignedMember }}</p>
         </div>
-        <p class="text-16px leading-20px font-700 text-[#505258]">Assigned Member</p>
+        <p class="text-16px leading-20px font-700 text-[#505258]">Team Assigned Member</p>
       </div>
     </div>
 

+ 11 - 9
src/views/Device.vue

@@ -72,12 +72,14 @@ export default {
         for (let i = 0; i < data.length; i++) {
           if (data[i].status === 0) {
             data[i].status = 'Unactivated'
-          } else if (data[i].status === 2) {
+          } else if (data[i].status === 1) {
             data[i].status = 'Activated'
-          } else if (data[i].status === 3) {
+          } else if (data[i].status === 4) {
             data[i].status = 'Expired'
-          } else {
+          } else if (data[i].status === 5) {
             data[i].status = 'Canceled'
+          } else {
+            data[i].status = ''
           }
         }
         this.tableData = res.data.result.list
@@ -116,7 +118,7 @@ export default {
             this.dialogVisible = false
             this.$message({
               duration: 5000,
-              message: 'Canceled',
+              message: 'Canceled Successfully',
               type: 'success'
             })
           }
@@ -162,7 +164,7 @@ export default {
         a.style.display = 'none'
         a.href = url
         // 自定义文件名
-        a.setAttribute('download', `设备.xlsx`)
+        a.setAttribute('download', `Device Information.xlsx`)
         document.body.appendChild(a)
         // 下载文件
         a.click()
@@ -266,11 +268,11 @@ export default {
         <el-table-column prop="status" label="Status"> </el-table-column>
         <el-table-column prop="activeDate" label="Activated Date">
         </el-table-column>
-        <el-table-column prop="expireDate" label="Expire Data">
+        <el-table-column prop="expireDate" label="Expiration Data">
         </el-table-column>
         <el-table-column prop="canceledDate" label="Canceled Date">
         </el-table-column>
-        <el-table-column prop="operate" label="Operate" min-width="150">
+        <el-table-column prop="operate" label="Action " min-width="150">
           <template slot-scope="scope">
             <button
               v-show="scope.row.status === 'Ativated'"
@@ -289,7 +291,7 @@ export default {
             </button>
             <el-dialog :visible.sync="dialogVisible" width="376px" top="30vh" center :show-close="false">
               <Warning />
-              <span class="mt-16px">Sure unactive the device?</span>
+              <span class="mt-16px">Are you sure you want to remove the device?</span>
               <p class="leading-24px text-16px text-[#232A40] font-bold">
                 {{ cancelEmail }}
               </p>
@@ -320,7 +322,7 @@ export default {
         @current-change="handleCurrentChange"
         :current-page.sync="currentPage"
         :page-sizes="[5, 10, 20]"
-        :page-size="size"
+        :page-size="total"
         :background="true"
         layout="sizes, prev, pager, next, jumper"
         :total="tableData.length"

+ 6 - 6
src/views/LicenseManage.vue

@@ -119,7 +119,7 @@ const download = () => {
       a.style.display = 'none'
       a.href = url
       // 自定义文件名
-      a.setAttribute('download', `团队授权码.xlsx`)
+      a.setAttribute('download', `License Information.xlsx`)
       document.body.appendChild(a)
       // 下载文件
       a.click()
@@ -232,7 +232,7 @@ const searchInfo = (val) => {
               hover:opacity-80
             "
           >
-            Volume Cancel
+            Batch Cancel
           </router-link>
         </div>
       </div>
@@ -295,8 +295,8 @@ const searchInfo = (val) => {
         <el-table-column prop="validFlag" label="Status"> </el-table-column>
         <el-table-column prop="updatedAt" label="Operated Date">
         </el-table-column>
-        <el-table-column prop="endDate" label="Expire Data"> </el-table-column>
-        <el-table-column prop="operate" label="Operate" min-width="120">
+        <el-table-column prop="endDate" label="Expiration Data"> </el-table-column>
+        <el-table-column prop="operate" label="Action" min-width="120">
           <template slot-scope="scope">
             <button
               v-if="scope.row.validFlag === 'Assigned' || scope.row.validFlag === 'Actived'"
@@ -315,7 +315,7 @@ const searchInfo = (val) => {
             </button>
             <el-dialog :visible.sync="dialogVisible" width="376px" top="30vh" center :show-close="false">
               <Warning />
-              <p class="mt-16px">Sure cancel the license?</p>
+              <p class="mt-16px">Are you sre you want to cancel the license?</p>
               <p>
                 Product:<span class="text-16px font-bold">{{
                   cancelEmail
@@ -324,7 +324,7 @@ const searchInfo = (val) => {
               <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">No</el-button>
                 <el-button type="primary" @click="cancelAssign()">
-                  Yes
+                  Cancel
                 </el-button>
               </span>
             </el-dialog>

+ 4 - 4
src/views/ManageAdmin.vue

@@ -103,7 +103,7 @@ const deleteAdmin = (val) => {
   post('/pdf-tech/vppTeam/deleteAdmin',urlencoded).then((res) => {
     if(res.data.code === 200){
       proxy.$message({
-          message: 'Delete Success',
+          message: 'Delete Successfully',
           type: "success"
       })
       pagingQuery()
@@ -204,7 +204,7 @@ const handleCurrentChange = (val) => {
         <el-table-column prop="teamNames" label="Team"> </el-table-column>
         <el-table-column prop="memberRole" label="Role"> </el-table-column>
         <el-table-column prop="createdAt" label="Added date"> </el-table-column>
-        <el-table-column prop="operate" label="Operate">
+        <el-table-column prop="operate" label="Action">
           <template slot-scope="scope">
             <div class="flex flex-col" v-if="scope.row.memberRole !== 'Super admin'">
               <router-link
@@ -241,9 +241,9 @@ const handleCurrentChange = (val) => {
             </div>
             <el-dialog title="" :visible.sync="dialogVisible" width="376px" top="30vh" center :show-close="false">
               <Warning />
-              <p class="mt-16px">Sure Delete Team admin?</p>
+              <p class="mt-16px">Are you sure you want to delete team admin?</p>
               <p>
-                User Name:<span class="text-16px font-bold">{{
+                Team Admin Name: <span class="text-16px font-bold">{{
                   cancelEmail
                 }}</span>
               </p>

+ 6 - 6
src/views/MenageAdmin/addAdmin.vue

@@ -28,7 +28,7 @@ export default {
         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')
+          this.$message.error('Required Information Missing')
         } else {
           var urlencoded = new URLSearchParams()
           urlencoded.append("teamIds", this.formData.TeamAdmin)
@@ -37,7 +37,7 @@ export default {
             if(res.data.code === 200){
               this.$message({
                 duration: 5000,
-                message: 'Change Success',
+                message: 'Change Successfully',
                 type: "success",
               })
               this.$router.push("/manageAdmin")
@@ -100,12 +100,12 @@ export default {
         </el-form-item>
         <el-form-item prop="team">
           <span slot="label" class="label">
-            Team Admin
+            Team to manage
             <span class="text-[#FF5054]">*</span>
           </span>
           <el-select
             v-model="formData.TeamAdmin"
-            placeholder="Team Admin"
+            placeholder="Please choose a team"
             multiple
             class="w-[40%]"
           >
@@ -164,11 +164,11 @@ export default {
     >
       <Warning class="inline-block" />
       <div class="mt-16px text-16px leading-24px text-[#232A40]">
-        <p>Your admin account hasn't created.<br>Send invitation and add admin?</p>
+        <p>Your admin account hasn't been created. Invite to create an account and add admin?</p>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">Cancel</el-button>
-        <el-button type="primary" @click="sureSave">Yes</el-button>
+        <el-button type="primary" @click="sureSave">Invite</el-button>
       </span>
     </el-dialog> -->
   </div>

+ 4 - 5
src/views/MenageAdmin/editAdmin.vue

@@ -1,6 +1,5 @@
 <script>
 import { get, post } from '../../../utils/request'
-import qs from 'qs'
 
 export default {
   data () {
@@ -51,7 +50,7 @@ export default {
             if(res.data.code === 200){
                 this.$message({
                   duration: 5000,
-                  message: 'Change Success',
+                  message: 'Change Successfully',
                   type: "success",
                 })
                 this.$router.push("/manageAdmin")
@@ -79,7 +78,7 @@ export default {
 
 <template>
   <div>
-    <h1>Admin Edit</h1>
+    <h1>Edit Admin</h1>
     <div class="block mt-24px p-40px pr-50px">
       <el-form label-position="top" label-width="80px" :model="formData" ref="formData">
         <el-form-item>
@@ -91,14 +90,14 @@ export default {
         </el-form-item>
         <el-form-item>
           <template slot="label">
-            <span>Team Admin</span>
+            <span>Team to manage</span>
             <span class="text-[#FF5054]">*</span>
           </template>
             <el-select 
               v-model="formData.TeamAdmin" 
               filterable 
               multiple
-              placeholder="Product Designer" 
+              placeholder="Please choose a team" 
               style="width:600px;"
               >
               <el-option

+ 3 - 3
src/views/Noadmin.vue

@@ -23,12 +23,12 @@ export default {
       <img src="@/assets/images/sorry.png" alt="" />
       <h1 class="text-28px leading-40px mt-16px">Sorry!</h1>
       <div class="w-360px leading-20px text-13px mt-16px flex flex-col items-center">
-        <p>You don't have any admin permission.</p>
+        <p>You need access.</p>
         <p>Please change your account or contact your super admin.</p>
       </div>
       <div class="flex justify-between mt-16px text-14px">
-        <button class="h-32px w-180px bg-[#fff] rounded-4px" @click="Refresh">Refresh page</button>
-        <button type="button" class="h-32px w-180px ml-8px  rounded-4px bg-[#1460F3] text-[#fff]" @click="$router.push('/login')">Sign in another account</button>
+        <button class="h-32px w-180px bg-[#fff] rounded-4px" @click="Refresh">Reload Page</button>
+        <button type="button" class="h-32px w-180px ml-8px  rounded-4px bg-[#1460F3] text-[#fff]" @click="$router.push('/login')">Sign in with another account</button>
       </div>
     </div>
   </div>

+ 1 - 1
src/views/ProductManagement.vue

@@ -120,7 +120,7 @@ const handleCurrentChange = (value) => {
         <el-table-column prop="memberName" label="Plan"> </el-table-column>
         <el-table-column prop="quantity" label="Total amount">
         </el-table-column>
-        <el-table-column prop="price" label="Purchase Price"> </el-table-column>
+        <el-table-column prop="Price" label="Purchase Price"> </el-table-column>
         <el-table-column prop="createdAt" label="Purchase date">
         </el-table-column>
         <el-table-column prop="expirationAt" label="Expiration Date">

+ 9 - 9
src/views/Settings.vue

@@ -33,10 +33,10 @@ export default {
       },
       rulesPass: {
         oldPassword: [
-          { required: true, message: 'Old password is required', trigger: [''] }
+          { required: true, message: 'Please fill old password', trigger: [''] }
         ],
         newPassword: [
-          { required: true, message: 'New password is required', trigger: [''] }
+          { required: true, message: 'Please fill new password', trigger: [''] }
         ],
         confirmPassword: [
           {
@@ -64,7 +64,7 @@ export default {
             ) {
               this.$message({
                 duration: 5000,
-                message: 'Change Success',
+                message: 'Change Successfully',
                 type: 'success'
               })
               this.$router.push('/login')
@@ -74,21 +74,21 @@ export default {
             ) {
               this.$message.error({
                 duration: 5000,
-                message: 'Old Password error'
+                message: 'Old Password Incorrect'
               })
             } else if (
               res.data.code === 700 &&
               res.data.msg === 'Different Password'
             ) {
               this.$message.error({
-                message: 'Different Password'
+                message: "New password and confirm password don't match"
               })
             } 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'
+                message: 'The passwords must be 6-24 characters'
               })
             } else if (
               res.data.code === 302 &&
@@ -131,7 +131,7 @@ export default {
             ) {
               this.$message.error({
                 duration: 5000,
-                message: 'Please Check your password'
+                message: 'Old Password Incorrect'
               })
             } else if (
               res.data.code === 302 &&
@@ -227,9 +227,9 @@ export default {
             </el-input>
           </div>
         </el-form-item>
-        <el-form-item label="Area">
+        <el-form-item label="Country/Region">
           <select v-model="ruleForm.area" class="flex w-600px !h-40px" :class="{ '!text-[#232A40]': ruleForm.area !== '' }">
-            <option value="" selected>Choose your Area</option>
+            <option value="" selected>Choose your country/region</option>
             <option
               v-for="(item, index) in country"
               :key="index"

+ 1 - 1
src/views/Support.vue

@@ -31,7 +31,7 @@ import Email from '@/components/icon/email.vue'
         <div class="ml-32px mr-24px"><Email /></div>
         <div>
             <p class="text-16px font-bold leading-20px">Email</p>
-            <a href="https://www.pdfreaderpro.com" class="flex leading-20px mt-12px hover:text-[#1460F3] hover:underline">PDF Reader Pro</a>
+            <a href="mailto:support@pdfreaderpro.com?subject=Cooperate with PDF Reader Pro " class="flex leading-20px mt-12px hover:text-[#1460F3] hover:underline">PDF Reader Pro</a>
         </div>
       </div>
     </div>

+ 6 - 6
src/views/TeamManagement/ManageMember.vue

@@ -34,7 +34,7 @@ function deleteMember(){
     if(res.data.code === 200){
       dialogVisible.value = false
       proxy.$message({
-          message: 'Delete Success',
+          message: 'Delete Successfully',
           type: "success"
       })
       getManageMemberList()
@@ -127,7 +127,7 @@ function exportManageMemberList() {
         a.style.display = 'none'
         a.href = url
         // 自定义文件名
-        a.setAttribute('download', `团队成员.xlsx`)
+        a.setAttribute('download', `User Information.xlsx`)
          document.body.appendChild(a)
          // 下载文件
          a.click()
@@ -263,7 +263,7 @@ onMounted(() => {
       <el-table :data="tableData" style="width: 100%">
         <el-table-column prop="fullName" label="Member Name" min-width="100px">
         </el-table-column>
-        <el-table-column prop="email" label="Email" min-width="100px">
+        <el-table-column prop="email" label="Member Email" min-width="100px">
         </el-table-column>
         <el-table-column prop="teamName" label="Team" min-width="130px">
         </el-table-column>
@@ -278,11 +278,11 @@ onMounted(() => {
         <el-table-column
           prop="id"
           class="hidden"
-          label="Activated Device UUID"
+          label="UUID of Activated Device"
           min-width="178px"
         >
         </el-table-column>
-        <el-table-column label="Operate" min-width="100px">
+        <el-table-column label="Action" min-width="100px">
           <template slot-scope="scope">
             <div>
               <router-link
@@ -343,7 +343,7 @@ onMounted(() => {
     >
       <Warning class="inline-block" />
       <div class="mt-16px text-16px leading-24px text-[#232A40]">
-        <p>Sure Delete member?</p>
+        <p>Are you sure you want to delete this member?</p>
         <p>User Name: <span class="font-bold">{{ MemberName }}</span></p>
       </div>
       <span slot="footer" class="dialog-footer">

+ 4 - 4
src/views/TeamManagement/ManageMember/AddManageMember.vue

@@ -48,14 +48,14 @@ export default {
             if(res.data.code === 200){
               this.$message({
                 duration: 5000,
-                message: 'Add Success!',
+                message: 'Add Successfully!',
                 type: "success",
               })
               this.$router.push({name:'ManageMember'})
             } else if(res.data.msg === "Member has joined a non-default team"){
               this.$message({
                 duration: 5000,
-                message: 'Member has joined a non-default team',
+                message: 'Failed, The Member has joined another team.',
                 type: "error",
               })
             }
@@ -140,7 +140,7 @@ export default {
         "
         @click="active = 1"
         :class="active === 1 ? 'active' : ''"
-        >Volume Add</span
+        >Add in Bacth</span
       >
     </div>
     <div class="bg-[#fff] card">
@@ -232,7 +232,7 @@ export default {
             XLSX with users
             <br>
             <span class="text-[14px] leading-20px text-[#808185]">
-              Upload a XLSX file to add users.You can download the sample XLSX file for an example of the format.
+              Upload a XLSX file to add users.You can download the sample XLSX file for an example.
             </span>
           </span>
         </el-form-item>

+ 1 - 1
src/views/TeamManagement/ManageMember/EditManageMember.vue

@@ -149,7 +149,7 @@ export default {
     >
       <Warning class="inline-block" />
       <div class="mt-16px text-16px leading-24px text-[#232A40]">
-        <p>After moving the member,<br> you need to reassign their authorization.</p>
+        <p>After removing the member,<br> you need to re-authorize them.</p>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">Cancel</el-button>

+ 7 - 7
src/views/TeamManagement/ManageTeam.vue

@@ -83,7 +83,7 @@ function exportManageTeamList() {
         a.style.display = 'none'
         a.href = url
         // 自定义文件名
-        a.setAttribute('download', `团队.xlsx`)
+        a.setAttribute('download', `Team Information.xlsx`)
           document.body.appendChild(a)
           // 下载文件
           a.click()
@@ -102,7 +102,7 @@ function handleDelete() {
     if (res.data.code === 200) {
       proxy.$message({
         duration: 5000,
-        message: 'Delete Success',
+        message: 'Delete Successfully',
         type: 'success'
       })
       tableData.value.splice(deleteTeamIndex.value, 1)
@@ -131,14 +131,14 @@ onMounted(() => {
 
 <template>
   <div>
-    <h1>Manage Team</h1>
+    <h1>Team Management</h1>
     <div class="mt-36px mb-16px flex justify-between">
       <h2>Content</h2>
       <div class="flex">
         <el-tooltip
           class="item"
           effect="dark"
-          content="Download data"
+          content="Export Data"
           placement="bottom"
         >
           <div
@@ -227,9 +227,9 @@ onMounted(() => {
         </button>
       </div>
       <el-table :data="tableData" style="width: 100%">
-        <el-table-column prop="name" label="Team name" min-width="14%">
+        <el-table-column prop="name" label="Team Name" min-width="14%">
         </el-table-column>
-        <el-table-column prop="members" label="Members" min-width="11%">
+        <el-table-column prop="members" label="Team Members" min-width="11%">
         </el-table-column>
         <el-table-column
           prop="licenseAmount"
@@ -254,7 +254,7 @@ onMounted(() => {
           min-width="13.5%"
         >
         </el-table-column>
-        <el-table-column label="Operate" min-width="12%">
+        <el-table-column label="Actions" min-width="12%">
           <template slot-scope="scope">
             <div>
               <router-link :to="{ name: 'EditManageTeam', params: { flag: 'edit', teamInfo: scope.row } }">

+ 7 - 3
src/views/TeamManagement/ManageTeamOperate.vue

@@ -121,6 +121,8 @@ export default {
             type: 'success'
           })
           this.$router.push({name:'ManageTeam'})
+        } else if (res.data.code === 'Please allocate more license to the team') {
+          this.$message.error({duration: 5000, message:'Please assign more license to the team'})
         } else (
           this.$message.error({duration: 5000, message:res.data.msg})
         )
@@ -145,10 +147,12 @@ export default {
         if (res.data.code === 200) {
           this.$message({
             duration: 5000,
-            message: 'Change Success',
+            message: 'Modify Successfully',
             type: 'success'
           })
           this.$router.push({name:'ManageTeam'})
+        } else if (res.data.code === 'Insufficient quantity to allocate') {
+          this.$message.error({duration: 5000, message:'Insufficient License'})
         } else (
           this.$message.error(res.data.msg)
         )
@@ -219,7 +223,7 @@ export default {
 
 <template>
   <div>
-    <h1>Team {{ flag === 'create' ? 'Create' : 'Edit'}}</h1>
+    <h1>{{ flag === 'create' ? 'Create' : 'Edit'}}Team</h1>
     <div class="block mt-24px p-40px pr-50px">
       <el-form label-position="top" label-width="80px" :model="formData" ref="formData">
         <el-form-item>
@@ -262,7 +266,7 @@ export default {
               <option v-for="item in projectOptions" :key="item.value" :value="item.value">{{ item.label }}</option>
             </select>
           </el-form-item>
-          <el-form-item label="Team License Number" class="!mb-22px">
+          <el-form-item label="Amount of Team License" class="!mb-22px">
             <el-input :disabled="role.indexOf('1') === -1" v-model.number="item.licenseNumber"></el-input>
           </el-form-item>
         </div>

+ 5 - 5
src/views/VolumeCancel.vue

@@ -1,5 +1,5 @@
 <script>
-import { post, get } from '../../utils/request'
+import { post } from '../../utils/request'
 
 export default {
   data() {
@@ -29,7 +29,7 @@ export default {
         if(res.data.code === 200){
           this.$message({
             duration: 5000,
-            message: 'Assign Success!',
+            message: 'Cancel Successfully',
             type: "success",
           })
           $this.$router.push({ name: 'licenseManage' })
@@ -48,7 +48,7 @@ export default {
 
 <template>
   <div>
-    <h1 class="text-28px leading-40px mb-15px font-700">Volume Cancel </h1>
+    <h1 class="text-28px leading-40px mb-15px font-700">Batch Cancel</h1>
     
     <div class="bg-[#fff] card rounded-8px">
       <!-- 批量添加 -->
@@ -65,7 +65,7 @@ export default {
             </span>
             <br>
             <span class="text-[14px] leading-20px text-[#808185]">
-              Upload a XLSX file to add users.You can download the sample XLSX file for an example of the format.
+              Upload an XLSX file to cancel license.You can download the sample XLSX file for an example.
             </span>
           </span>
         </el-form-item>
@@ -104,7 +104,7 @@ export default {
               hover:opacity-80
             "
           >
-            Cancel
+            Back
           </button>
           <button
             type="button"

+ 5 - 5
src/views/forgotpassword.vue

@@ -50,7 +50,7 @@ export default {
               this.$message({
                 duration: 5000,
                 message:
-                  'Email sent successful, please confirm your new password in email',
+                  'Email was successfully sent, please confirm your new password in email',
                 type: 'success'
               })
               this.$router.push("/login")
@@ -74,7 +74,7 @@ export default {
 <template>
   <div class="bg w-full h-100vh flex justify-center items-center m-auto">
     <div class="w-404px h-auto rounded-8px p-24px bg-[#fff] loginBox">
-      <h1 class="text-24px font-bold mb-24px">Forgot your password</h1>
+      <h1 class="text-24px font-bold mb-24px">Forgot Password</h1>
       <el-form
         :model="ruleForm"
         ref="ruleForm"
@@ -88,7 +88,7 @@ export default {
             <el-input
               v-model.trim="ruleForm.email"
               clearable
-              placeholder="Email address"
+              placeholder="Email Address"
             >
             </el-input>
           </div>
@@ -98,7 +98,7 @@ export default {
             <el-input
               v-model.trim="ruleForm.confirmation"
               clearable
-              placeholder="Email address confirmation"
+              placeholder="Email Address Confirmation"
             >
             </el-input>
           </div>
@@ -116,7 +116,7 @@ export default {
               hover:opacity-80
             "
           >
-            Send email
+            Send Email
           </button>
         </el-form-item>
       </el-form>