From 7b8e6e7235e24be12a1d90a3315a8e440e014d8e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 28 Sep 2020 16:13:06 +0800
Subject: [PATCH] router name

---
 client/src/router/index.js           | 26 +++++++++++++-------------
 client/src/views/dashboard/index.vue | 21 +++++++++++++++++----
 server/server/urls.py                |  2 +-
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/client/src/router/index.js b/client/src/router/index.js
index c0ffb58..46f7875 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -52,6 +52,17 @@ export const constantRoutes = [
     component: () => import('@/views/404'),
     hidden: true
   },
+  {
+    path: '/qualification',
+    component: Layout,
+    redirect: '/qualification',
+    children: [{
+      path: '',
+      name: 'Qualification',
+      component: () => import('@/views/ability/qualification'),
+      meta: { title: '检验检测资质', icon: 'table', perms: ['qualification_view'] }
+    }]
+  },
   {
     path: '/cma',
     component: Layout,
@@ -60,7 +71,7 @@ export const constantRoutes = [
       path: '',
       name: 'CMA',
       component: () => import('@/views/ability/cma'),
-      meta: { title: '检测能力(总部)', icon: 'table' }
+      meta: { title: '检测能力(总部CMA+CNAS)', icon: 'table', perms: ['cma_view'] }
     }]
   },
   {
@@ -71,21 +82,10 @@ export const constantRoutes = [
       path: '',
       name: 'CMA2',
       component: () => import('@/views/ability/cma2'),
-      meta: { title: '检测能力(分子公司)', icon: 'table' }
+      meta: { title: '检测能力(分子公司CMA)', icon: 'table', perms: ['cma2_view'] }
     }
   ]
   },
-  {
-    path: '/qualification',
-    component: Layout,
-    redirect: '/qualification',
-    children: [{
-      path: '',
-      name: 'Qualification',
-      component: () => import('@/views/ability/qualification'),
-      meta: { title: '资质查询', icon: 'table' }
-    }]
-  },
 ]
 
 /**
diff --git a/client/src/views/dashboard/index.vue b/client/src/views/dashboard/index.vue
index b362bf1..ba27b9b 100644
--- a/client/src/views/dashboard/index.vue
+++ b/client/src/views/dashboard/index.vue
@@ -1,6 +1,19 @@
 <template>
   <div class="dashboard-container">
       <el-row :gutter="40" class="panel-group">
+        <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="toPath('/qualification')">
+        <div class="card-panel-icon-wrapper icon-money">
+          <svg-icon icon-class="table" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            检验检测资质
+          </div>
+          <!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
+        </div>
+      </div>
+    </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="toPath('/cma')">
         <div class="card-panel-icon-wrapper icon-people">
@@ -8,7 +21,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            检测能力(总部)
+            检测能力(总部CMA+CNAS)
           </div>
           <!-- <count-to :start-val="0" v-bind:end-val="ret.consumer1_count" :duration="1600" class="card-panel-num"  /> -->
         </div>
@@ -21,20 +34,20 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            检测能力(分子公司)
+            检测能力(分子公司CMA)
           </div>
           <!-- <count-to :start-val="0" v-bind:end-val="ret.consumer2_count" :duration="1600" class="card-panel-num" /> -->
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="toPath('/qualification')">
+      <div class="card-panel" >
         <div class="card-panel-icon-wrapper icon-money">
           <svg-icon icon-class="table" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            资质查询
+            检验能力(总部+分子公司)-建设中
           </div>
           <!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
         </div>
diff --git a/server/server/urls.py b/server/server/urls.py
index 99cee93..ec709c4 100644
--- a/server/server/urls.py
+++ b/server/server/urls.py
@@ -30,7 +30,7 @@ from django.conf.urls import url
 
 urlpatterns = [
     path('', TemplateView.as_view(template_name="index.html")),
-    path('admin/', admin.site.urls),
+    path('api/admin/', admin.site.urls),
     path('api/token/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
     path('api/token2/', Login2View.as_view(), name='token_obtain_2'),
     path('api/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),