Merge branch 'develop_wzl' into develop

src/views/Assignlicense.vue

@@ -258,7 +258,7 @@ export default {
         <el-form-item>
           <button
             type="button"
-            @click="$router.go(-1)"
+            @click="$router.push({ name: 'licenseManage' })"
             class="
               w-168px
               h-48px

src/views/Dashboard.vue

@@ -353,7 +353,7 @@ export default {
           <span class="text-16px font-bold text-[#232A40]">{{ overviewProduct.activatedDevices }}</span>
         </div>
       </div>
-      <!-- <div class="flex flex-wrap justify-between mt-24px">
+      <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-16px font-bold text-[#232A40]">{{ overviewProduct.validPeriod }}</span>
@@ -366,7 +366,7 @@ export default {
           <span class="text-14px font-bold text-[#505258]">Time Left (day)</span>
           <span class="text-16px font-bold text-[#232A40]">{{ overviewProduct.timeLeft }}</span>
         </div>
-      </div> -->
+      </div>
     </div>
 
     <h2>Chart Statistics</h2>

src/views/LicenseManage.vue

@@ -210,6 +210,7 @@ const searchInfo = (val) => {
               ml-12px
               rounded-4px
               text-[#fff]
+              hover:opacity-80
             "
           >
             Assign License
@@ -228,6 +229,7 @@ const searchInfo = (val) => {
               ml-12px
               rounded-4px
               text-[#fff]
+              hover:opacity-80
             "
           >
             Volume Cancel

src/views/ManageAdmin.vue

@@ -138,6 +138,7 @@ const handleCurrentChange = (val) => {
               ml-12px
               rounded-4px
               text-[#fff]
+              hover:opacity-80
             "
           >
             Add Admin

src/views/TeamManagement/ManageMember.vue

@@ -193,6 +193,7 @@ onMounted(() => {
               font-400
               text-[#fff]
               cursor-pointer
+              hover:opacity-80
             "
           >
             Add Member

src/views/TeamManagement/ManageTeam.vue

@@ -174,6 +174,7 @@ onMounted(() => {
               font-400
               text-[#fff]
               cursor-pointer
+              hover:opacity-80
             "
           >
             Create Team
@@ -341,6 +342,7 @@ onMounted(() => {
   color: #808185;
 }
 ::v-deep .el-dialog {
+  height: auto;
   border-radius: 8px;
   .el-dialog__header {
     display: none;

src/views/VolumeCancel.vue

@@ -13,6 +13,7 @@ export default {
     // 重置表单
     resetForm (formName) {
       this.file = {}
+      this.$router.push({ name: 'licenseManage' })
     },
     //提交表单
     submitFormVolume(){