From 1e85f59865a3c2e01d26624e739e67f6d10e9f62 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 29 Sep 2020 09:20:43 +0800
Subject: [PATCH] update cnas file

---
 client/src/layout/components/Sidebar/index.vue |  2 +-
 client/src/router/index.js                     | 14 +++++++-------
 client/src/styles/variables.scss               |  2 +-
 client/src/views/dashboard/index.vue           |  2 +-
 server/apps/ability/views.py                   |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/src/layout/components/Sidebar/index.vue b/client/src/layout/components/Sidebar/index.vue
index fb014a2..c2aa72e 100644
--- a/client/src/layout/components/Sidebar/index.vue
+++ b/client/src/layout/components/Sidebar/index.vue
@@ -51,4 +51,4 @@ export default {
     }
   }
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 46f7875..1b8481d 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -52,6 +52,13 @@ export const constantRoutes = [
     component: () => import('@/views/404'),
     hidden: true
   },
+]
+
+/**
+ * asyncRoutes
+ * the routes that need to be dynamically loaded based on user perms
+ */
+export const asyncRoutes = [
   {
     path: '/qualification',
     component: Layout,
@@ -86,13 +93,6 @@ export const constantRoutes = [
     }
   ]
   },
-]
-
-/**
- * asyncRoutes
- * the routes that need to be dynamically loaded based on user perms
- */
-export const asyncRoutes = [
   {
     path: '/system',
     component: Layout,
diff --git a/client/src/styles/variables.scss b/client/src/styles/variables.scss
index be55772..027b130 100644
--- a/client/src/styles/variables.scss
+++ b/client/src/styles/variables.scss
@@ -9,7 +9,7 @@ $menuHover:#263445;
 $subMenuBg:#1f2d3d;
 $subMenuHover:#001528;
 
-$sideBarWidth: 210px;
+$sideBarWidth: 230px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/client/src/views/dashboard/index.vue b/client/src/views/dashboard/index.vue
index ba27b9b..990e16e 100644
--- a/client/src/views/dashboard/index.vue
+++ b/client/src/views/dashboard/index.vue
@@ -47,7 +47,7 @@
         </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/apps/ability/views.py b/server/apps/ability/views.py
index c616e51..a0174c9 100644
--- a/server/apps/ability/views.py
+++ b/server/apps/ability/views.py
@@ -238,7 +238,7 @@ def import_cnas(filename, path):
                 m = m - 1
         data['bzmc'] = sheet['l'+str(i)].value
         data['bzbh'] = sheet['n'+str(i)].value
-        data['bztk'] = sheet['q'+str(i)].value
+        data['bztk'] = sheet['p'+str(i)].value
         data['sszx'] = sszx
         # print(data)
         datalist.append(CNAS(**data))