Преглед на файлове

feat():新加404页面,ui修复

liyangbin преди 2 години
родител
ревизия
57e2414ca2

+ 1 - 1
src/App.vue

@@ -16,7 +16,7 @@ export default {
 
 <template>
   <div id="app">
-    <el-container v-if="$route.fullPath.indexOf('/login') === -1 && $route.fullPath.indexOf('/Create') === -1 && $route.fullPath.indexOf('/forgotpassword') === -1 && $route.fullPath.indexOf('/noadmin') === -1">
+    <el-container v-if="$route.fullPath.indexOf('/login') === -1 && $route.fullPath.indexOf('/Create') === -1 && $route.fullPath.indexOf('/forgotpassword') === -1 && $route.fullPath.indexOf('/noadmin') === -1 && $route.fullPath.indexOf('/404') === -1">
       <el-aside width="260px" class="relative"><SideMenu ref="sideMenu" /></el-aside>
       <el-main><router-view :getInfo="getInfo" /></el-main>
     </el-container>

+ 9 - 0
src/assets/images/404.svg

@@ -0,0 +1,9 @@
+<svg width="366" height="156" viewBox="0 0 366 156" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M87.2073 130.178H99.5V104.845H87.2073V69.158H58.4512V104.845H29.2561L72.5 2.41016H43.7439L0.5 104.845V130.178H58.4512V154.41H87.2073V130.178Z" fill="#B8BCC0"/>
+<path d="M353.207 130.178H365.5V104.845H353.207V69.158H324.451V104.845H295.256L338.5 2.41016H309.744L266.5 104.845V130.178H324.451V154.41H353.207V130.178Z" fill="#B8BCC0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M183.5 0C158.647 0 138.5 20.1472 138.5 45V111C138.5 135.853 158.647 156 183.5 156C208.353 156 228.5 135.853 228.5 111V45C228.5 20.1472 208.353 0 183.5 0ZM183.5 28C174.663 28 167.5 35.1634 167.5 44V112C167.5 120.837 174.663 128 183.5 128C192.337 128 199.5 120.837 199.5 112V44C199.5 35.1634 192.337 28 183.5 28Z" fill="#B8BCC0"/>
+<path d="M198.5 112C198.5 120.284 191.784 127 183.5 127C175.216 127 168.5 120.284 168.5 112C168.5 103.716 175.216 97 183.5 97C191.784 97 198.5 103.716 198.5 112Z" stroke="#B8BCC0" stroke-width="2" stroke-linejoin="round"/>
+<path d="M189.1 107.2V108" stroke="#B1B5BA" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M177.9 107.2V108" stroke="#B1B5BA" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M189.1 118.6C189.1 118.6 187.5 115.4 183.5 115.4C179.5 115.4 177.9 118.6 177.9 118.6" stroke="#B1B5BA" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

+ 9 - 0
src/router/index.js

@@ -138,6 +138,15 @@ const router = new VueRouter({
       name: "support",
       component: () => import("../views/Support.vue"),
     },
+    {
+      path: "/404",
+      name: "404",
+      component: () => import("../views/404.vue"),
+    },
+    { // 当没有匹配到正确路由的时候,匹配login组件
+      path: '*',
+      redirect: "/404"
+    }
   ],
 })
 router.beforeEach((to, from, next) => {

+ 10 - 0
src/views/404.vue

@@ -0,0 +1,10 @@
+<template>
+  <div class="bg-[#E7EAEE] h-100vh flex items-center justify-center">
+    <div>
+      <img class="m-auto mb-54px" src="@/assets/images/404.svg" alt="">
+      <div class="text-[#232A40] text-24px leading-20px text-center">
+        你访问的页面没找到,请检查地址是否正确,或刷新页面
+      </div>
+    </div>
+  </div>
+</template>

+ 7 - 4
src/views/Dashboard.vue

@@ -132,10 +132,13 @@ export default {
     getTeamMemberData () {
       if (this.teamSelectLoading) return
       this.teamSelectLoading = true
-      get('/pdf-tech/vppDashboard/getTeamMemberData', {
-        teamId: this.teamSelect,
-        codeList: this.teamFilterProductSelect
-      }).then((res) => {
+      const arr = []
+      if(this.teamFilterProductSelect){
+        arr.push(this.teamFilterProductSelect)
+      }
+      //teamId: this.teamSelect,
+      // codeList: arr
+      get('/pdf-tech/vppDashboard/getTeamMemberData?teamId='+this.teamSelect+'&codeList='+arr).then((res) => {
         setTimeout(() => {
           this.teamSelectLoading = false
         }, 1000)

+ 2 - 0
src/views/MenageAdmin/addAdmin.vue

@@ -94,12 +94,14 @@ export default {
         <el-form-item prop="memberEmail" class="required">
           <span slot="label" class="label">
             Admin Email
+            <span class="text-[#FF5054]">*</span>
           </span>
           <el-input v-model="formData.AdminEmail" class="under-border" placeholder="Admin Email"></el-input>
         </el-form-item>
         <el-form-item prop="team">
           <span slot="label" class="label">
             Team Admin
+            <span class="text-[#FF5054]">*</span>
           </span>
           <el-select
             v-model="formData.TeamAdmin"

+ 15 - 2
src/views/TeamManagement/ManageMember/EditManageMember.vue

@@ -37,7 +37,20 @@ export default {
   methods: {
     // 提交表单
     submitForm () {
-      this.dialogVisible = true
+      if(this.click){
+        this.click = false
+        //限制点击
+        setTimeout(() => {
+          this.click = true
+        }, 1000)
+        get('/pdf-tech/vppRTeamMemberRole/getMemberTeam?memberId='+this.$route.query.Id).then((res)=>{
+          if(res.data.code === 200){
+            if(this.formData.memberTeam !== res.data.result){
+              this.dialogVisible = true
+            }
+          }
+        })
+      }
     },
     // 重置表单
     resetForm (formName) {
@@ -120,7 +133,7 @@ export default {
             <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>
-          <div class="w-152px h-40px border-1 border-[#1460F3] rounded-8px bg-[#1460F3] text-center text-16px text-[#fff] font-700 leading-40px"
+          <div class="w-152px h-40px border-1 border-[#1460F3] rounded-8px bg-[#1460F3] text-center text-16px text-[#fff] font-700 leading-40px cursor-pointer"
             @click="submitForm()">Save
           </div>
         </div>