diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
deleted file mode 100644
index 539979e..0000000
--- a/src/components/HelloWorld.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-    <p>
-      For a guide and recipes on how to configure / customize this project,<br />
-      check out the
-      <a href="https://cli.vuejs.org" target="_blank" rel="noopener"
-        >vue-cli documentation</a
-      >.
-    </p>
-    <h3>Installed CLI Plugins</h3>
-    <ul>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-babel"
-          target="_blank"
-          rel="noopener"
-          >babel</a
-        >
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-router"
-          target="_blank"
-          rel="noopener"
-          >router</a
-        >
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-vuex"
-          target="_blank"
-          rel="noopener"
-          >vuex</a
-        >
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint"
-          target="_blank"
-          rel="noopener"
-          >eslint</a
-        >
-      </li>
-    </ul>
-    <h3>Essential Links</h3>
-    <ul>
-      <li>
-        <a href="https://vuejs.org" target="_blank" rel="noopener">Core Docs</a>
-      </li>
-      <li>
-        <a href="https://forum.vuejs.org" target="_blank" rel="noopener"
-          >Forum</a
-        >
-      </li>
-      <li>
-        <a href="https://chat.vuejs.org" target="_blank" rel="noopener"
-          >Community Chat</a
-        >
-      </li>
-      <li>
-        <a href="https://twitter.com/vuejs" target="_blank" rel="noopener"
-          >Twitter</a
-        >
-      </li>
-      <li>
-        <a href="https://news.vuejs.org" target="_blank" rel="noopener">News</a>
-      </li>
-    </ul>
-    <h3>Ecosystem</h3>
-    <ul>
-      <li>
-        <a href="https://router.vuejs.org" target="_blank" rel="noopener"
-          >vue-router</a
-        >
-      </li>
-      <li>
-        <a href="https://vuex.vuejs.org" target="_blank" rel="noopener">vuex</a>
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-devtools#vue-devtools"
-          target="_blank"
-          rel="noopener"
-          >vue-devtools</a
-        >
-      </li>
-      <li>
-        <a href="https://vue-loader.vuejs.org" target="_blank" rel="noopener"
-          >vue-loader</a
-        >
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/awesome-vue"
-          target="_blank"
-          rel="noopener"
-          >awesome-vue</a
-        >
-      </li>
-    </ul>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "HelloWorld",
-  props: {
-    msg: String,
-  },
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped lang="scss">
-h3 {
-  margin: 40px 0 0;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: #42b983;
-}
-</style>
diff --git a/src/router/index.js b/src/router/index.js
index f7b52d0..7eccd3b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@ import Vue from "vue";
 import VueRouter from "vue-router";
 // import HomeView from "../views/HomeView.vue";
 
-import login from "@/views/login.vue"
+import login from "@/views/login/Login.vue"
 Vue.use(VueRouter);
 const routes = [
   {
@@ -10,196 +10,154 @@ const routes = [
     name: "login",
     component: login,
   },
-  {
-    path: "/about",
-    name: "about",
-
-    component: () =>
-      import("../views/AboutView.vue"),
-  },
   {
     path: "/login",
     name: "login",
 
     component: () =>
-      import("../views/login.vue"),
+      import("../views/login/Login.vue"),
   },
   {
-    path: "/hoem",
-    name: "hoem",
-
+    path: "/home",
+    name: "home",
     component: () =>
-      import(/* webpackChunkName: "about" */ "../views/hoem.vue"),
+      import(/* webpackChunkName: "about" */ "../views/Home.vue"),
     children: [
       {
-        path: "/my",
-        name: "my",
-        component: () => import('../views/my.vue')
+        path: "/role",
+        component: () => import('../views/user-list/Role.vue')
       },
       {
-        path: '/userlist',
-        name: 'userlist',
-        component: () => import('../views/userlist.vue')
+        path: '/user-list',
+        component: () => import('../views/user-list/UserList.vue')
       },
       {
-        path: '/organization',
-        name: 'organization',
-        component: () => import('../views/organization.vue')
+        path: '/organization-units',
+        component: () => import('../views/user-list/OrganizationUnits.vue')
       },
       {
-        path: '/dailyrecord',
-        name: 'dailyrecord',
-        component: () => import('../views/dailyrecord.vue')
+        path: '/audit-log',
+        component: () => import('../views/user-list/AuditLog.vue')
       },
       {
-        path: '/departmentset',
-        name: 'departmentset',
-        component: () => import('../views/departmentset.vue')
+        path: '/guide-type',
+        component: () => import('../views/basic-dictionary/GuideType.vue')
       },
       {
-        path: '/medicalexaminatitype',
-        name: 'medicalexaminatitype',
-        component: () => import('../components/medicalexaminatitype.vue')
+        path: '/medical-report-type',
+        component: () => import('../views/basic-dictionary/MedicalReportType.vue')
       },
       {
-        path: '/gender',
-        name: 'gender',
-        component: () => import('../components/gender.vue')
+        path: '/sex',
+        component: () => import('../views/basic-dictionary/Sex.vue')
       },
       {
-        path: '/maritalstatus',
-        name: 'maritalstatus',
-        component: () => import('../components/maritalstatus.vue')
+        path: '/marital-status',
+        component: () => import('../views/basic-dictionary/MaritalStatus.vue')
       },
       {
         path: '/nation',
-        name: 'nation',
-        component: () => import('../components/nation.vue')
-      },
+        component: () => import('../views/basic-dictionary/Nation.vue')
+      }, 
       {
-        path: '/nativeplace',
-        name: 'nativeplace',
-        component: () => import('../components/nativeplace.vue')
+        path: '/birth-place',
+        component: () => import('../views/basic-dictionary/BirthPlace.vue')
       },
       {
-        path: '/resultstatus',
-        name: 'resultstatus',
-        component: () => import('../components/resultstatus.vue')
+        path: '/result-status',
+        component: () => import('../views/basic-dictionary/ResultStatus.vue')
       },
       {
-        path: '/examinationcategory',
-        name: 'examinationcategory',
-        component: () => import('../components/examinationcategory.vue')
+        path: '/medical-type',
+        component: () => import('../views/basic-dictionary/MedicalType.vue')
       },
       {
-        path: '/personnelcategory',
-        name: 'personnelcategory',
-        component: () => import('../components/personnelcategory.vue')
+        path: '/personnel-type',
+        component: () => import('../views/basic-dictionary/PersonnelType.vue')
       },
       {
-        path: '/instrument',
-        name: 'instrument',
-        component: () => import('../components/instrument.vue')
+        path: '/device-type',
+        component: () => import('../views/basic-dictionary/DeviceType.vue')
       },
       {
-        path: '/specimentype',
-        name: 'specimentype',
-        component: () => import('../components/specimentype.vue')
+        path: '/sample-type',
+        component: () => import('../views/basic-dictionary/SampleType.vue')
       },
       {
         path: '/unit',
-        name: 'unit',
-        component: () => import('../components/unit.vue')
+        component: () => import('../views/basic-dictionary/Unit.vue')
       },
       {
-        path: '/diagnosticsuffix',
-        name: 'diagnosticsuffix',
-        component: () => import('../components/diagnosticsuffix.vue')
+        path: '/diagnosis-postfix',
+        component: () => import('../views/basic-dictionary/DiagnosisPostfix.vue')
       },
       {
-        path: '/physicalcategory',
-        name: 'physicalcategory',
-        component: () => import('../components/physicalcategory.vue')
+        path: '/medical-conclusion-type',
+        component: () => import('../views/basic-dictionary/MedicalConclusionType.vue')
       },
       {
-        path: '/medicalexamination',
-        name: 'medicalexamination',
-        component: () => import('../components/medicalexamination.vue')
+        path: '/medical-conclusion',
+        component: () => import('../views/basic-dictionary/MedicalConclusion.vue')
       },
       {
-        path: '/sepecimencontainer',
-        name: 'sepecimencontainer',
-        component: () => import('../components/sepecimencontainer.vue')
+        path: '/sample-container',
+        component: () => import('../views/basic-dictionary/SampleContainer.vue')
       },
       {
-        path: '/commoncharacter',
-        name: 'commoncharacter',
-        component: () => import('../components/commoncharacter.vue')
+        path: '/common-char-type',
+        component: () => import('../views/basic-dictionary/CommonCharType.vue')
       },
       {
-        path: '/commoncused',
-        name: 'commoncused',
-        component: () => import('../components/commoncused.vue')
+        path: '/common-char',
+        component: () => import('../views/basic-dictionary/CommonChar.vue')
       },
       {
-        path: '/customeersevice',
-        name: 'customeersevice',
-        component: () => import('../components/customeersevice.vue')
+        path: '/customer-org-type',
+        component: () => import('../views/basic-dictionary/CustomerOrgType.vue')
       },
       {
-        path: '/projectresults',
-        name: 'projectresults',
-        component: () => import('../components/projectresults.vue')
+        path: '/item-default-result',
+        component: () => import('../views/basic-dictionary/ItemDefaultResult.vue')
       },
       {
-        path: '/diagnosticleve',
-        name: 'diagnosticleve',
-        component: () => import('../components/diagnosticleve.vue')
+        path: '/diagnosis-level',
+        component: () => import('../views/basic-dictionary/DiagnosisLevel.vue')
       },
       {
-        path: '/invoicecategory',
-        name: 'invoicecategory',
-        component: () => import('../views/feesettings/invoicecategory.vue')
+        path: '/invoice-item-type', 
+        component: () => import('../views/fee-settings/InvoiceItemType.vue')
       },
       {
-        path: '/paymentmethod',
-        name: 'paymentmethod',
-        component: () => import('../views/feesettings/paymentmethod.vue')
+        path: '/pay-mode',
+        component: () => import('../views/fee-settings/PayMode.vue')
       },
       {
-        path: '/itemtype',
-        name: 'itemtype',
-        component: () => import('../views/feesettings/itemtype.vue')
+        path: '/item-type',
+        component: () => import('../views/common-settings/ItemType.vue')
       },
       {
-        path: '/barcodegroupping',
-        name: 'barcodegroupping',
-        component: () => import('../views/feesettings/barcodegroupping.vue')
+        path: '/sample-group',
+        component: () => import('../views/common-settings/SampleGroup.vue')
       },
       {
-        path: '/groupsandproject',
-        name: 'groupsandproject',
-        component: () => import('../views/feesettings/groupsandproject.vue')
+        path: '/asbitem',
+        component: () => import('../views/fee-settings/Asbitem.vue')
       },
       {
-        path: '/projectitem',
-        name: 'projectitem',
-        component: () => import('../views/feesettings/projectitem.vue')
+        path: '/item',
+        component: () => import('../views/fee-settings/Item.vue')
       },
       {
-        path: '/referencerange',
-        name: 'referencerange',
-        component: () => import('../views/feesettings/referencerange.vue')
+        path: '/reference-range',
+        component: () => import('../views/fee-settings/ReferenceRange.vue')
       },
       {
         path: '/diagnosis',
-        name: 'diagnosis',
-        component: () => import('../views/diagnosis.vue')
+        component: () => import('../views/fee-settings/Diagnosis.vue')
       },
       {
-        path: '/projectresulttemplate',
-        name: 'projectresulttemplate',
-        component: () => import('../views/feesettings/projectresulttemplate.vue')
+        path: '/item-result-template',
+        component: () => import('../views/fee-settings/ItemResultTemplate.vue')
       },
     ]
   },
diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue
deleted file mode 100644
index 4d62e7a..0000000
--- a/src/views/AboutView.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <div class="about">
-    <h1>This is an about page222</h1>
-      <el-button type="success">成功按钮</el-button>
-  <el-button type="info">信息按钮</el-button>
-  </div>
-</template>
diff --git a/src/views/Home.vue b/src/views/Home.vue
new file mode 100644
index 0000000..31d61b6
--- /dev/null
+++ b/src/views/Home.vue
@@ -0,0 +1,192 @@
+<template>
+  <div>
+    <el-container>
+      <el-header style="background-color: #ccc; line-height: 50px">
+        <div class="navs">
+          <div class="maintitle">神豚医疗信息系统</div>
+
+          <div class="btn">
+            当前用户{{ user }}
+            <el-dropdown>
+              <span class="el-dropdown-link">
+                操作<i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
+                <el-dropdown-item>修改密码</el-dropdown-item>
+                <el-dropdown-item>螺蛳粉</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+        </div>
+      </el-header>
+
+      <el-container>
+        <el-aside :width="isCollapse ? '64px' : '200px'">
+          <el-menu style="height: 100%" default-active="2" class="el-menu-vertical-demo" background-color="#545c64" router
+            active-text-color="#fff" :unique-opened="true" text-color="#000" @select="aa" :collapse="isCollapse"
+            :collapse-transition="false">
+            <div class="collapseandunfoled" @click="isCollapse = !isCollapse">
+              | | |
+            </div>
+            <el-submenu index="1">
+              <template slot="title">
+                <i class="el-icon-document"></i>
+                <span>用户权限管理</span>
+              </template>
+              <el-menu-item index="role"> <i class="el-icon-menu"></i> <span slot="title">角色管理</span>
+              </el-menu-item>
+              <el-menu-item index="user-list"> <i class="el-icon-menu"></i> <span slot="title">用户管理</span>
+              </el-menu-item>
+              <el-menu-item index="organization-units"><i class="el-icon-menu"></i><span slot="title">组织架构</span>
+              </el-menu-item>
+              <el-menu-item index="audit-log"> <i class="el-icon-menu"></i> <span slot="title">安全日志</span>
+              </el-menu-item>
+            </el-submenu>
+            <el-submenu index="2">
+              <template slot="title">
+                <i class="el-icon-s-tools"></i>
+                <span>基础字典</span>
+              </template>
+              <el-menu-item index="guide-type"><i class="el-icon-menu"></i>导引类别</el-menu-item>
+              <el-menu-item index="medical-report-type"><i class="el-icon-menu"></i>体检报告类别</el-menu-item>
+              <el-menu-item index="sex"><i class="el-icon-menu"></i>性别</el-menu-item>
+              <el-menu-item index="marital-status"><i class="el-icon-menu"></i>婚姻状况</el-menu-item>
+              <el-menu-item index="nation"><i class="el-icon-menu"></i>民族</el-menu-item>
+              <el-menu-item index="birth-place"><i class="el-icon-menu"></i>籍贯</el-menu-item>
+              <el-menu-item index="result-status"><i class="el-icon-menu"></i>结果状态</el-menu-item>
+              <el-menu-item index="medical-type"><i class="el-icon-menu"></i>体检类别</el-menu-item>
+              <el-menu-item index="personnel-type"><i class="el-icon-menu"></i>人员类别</el-menu-item>
+              <el-menu-item index="device-type"><i class="el-icon-menu"></i>仪器类别</el-menu-item>
+              <el-menu-item index="sample-type"><i class="el-icon-menu"></i>标本类型</el-menu-item>
+              <el-menu-item index="unit"><i class="el-icon-menu"></i>单位</el-menu-item>
+              <el-menu-item index="diagnosis-postfix"><i class="el-icon-menu"></i>诊断后缀</el-menu-item>
+              <el-menu-item index="medical-conclusion-type"><i class="el-icon-menu"></i>体检结论类别</el-menu-item>
+              <el-menu-item index="medical-conclusion"><i class="el-icon-menu"></i>体检结论</el-menu-item>
+              <el-menu-item index="sample-container"><i class="el-icon-menu"></i>标本容器</el-menu-item>
+              <el-menu-item index="common-char-type"><i class="el-icon-menu"></i>常用字符类别</el-menu-item>
+              <el-menu-item index="common-char"><i class="el-icon-menu"></i>常用字符</el-menu-item>
+              <el-menu-item index="customer-org-type"><i class="el-icon-menu"></i>客户单位类别</el-menu-item>
+              <el-menu-item index="item-default-result"><i class="el-icon-menu"></i>项目默认结果</el-menu-item>
+              <el-menu-item index="diagnosis-level"><i class="el-icon-menu"></i>诊断级别</el-menu-item>
+            </el-submenu>
+
+            <el-submenu index="3">
+              <template slot="title">
+                <i class="el-icon-s-tools"></i>
+                <span>收费设置</span>
+              </template>
+              <el-menu-item index="invoice-item-type"><i class="el-icon-menu"></i>发票项目类别</el-menu-item>
+              <el-menu-item index="pay-mode"><i class="el-icon-menu"></i>支付方式</el-menu-item>
+            </el-submenu>
+
+            <el-submenu index="4">
+              <template slot="title">
+                <i class="el-icon-s-tools"></i>
+                <span>常用设置</span>
+              </template>
+              <el-menu-item index="item-type"><i class="el-icon-menu"></i>项目类别</el-menu-item>
+              <el-menu-item index="sample-group"><i class="el-icon-menu"></i>条码分组</el-menu-item>
+              <el-menu-item index="asbitem"><i class="el-icon-menu"></i>组和项目</el-menu-item>
+              <el-menu-item index="item"><i class="el-icon-menu"></i>项目</el-menu-item>
+              <el-menu-item index="reference-range"><i class="el-icon-menu"></i>参考范围</el-menu-item>
+              <el-menu-item index="diagnosis"><i class="el-icon-menu"></i>诊断</el-menu-item>
+              <el-menu-item index="item-result-template"><i class="el-icon-menu"></i>项目结果模板</el-menu-item>
+            </el-submenu>
+
+          </el-menu>
+        </el-aside>
+        <el-main>
+          <!-- Main -->
+          <!-- <el-card>
+            <el-button type="primary" @click="btn">主要按钮</el-button>
+          </el-card> -->
+          <router-view></router-view>
+        </el-main>
+      </el-container>
+    </el-container>
+  </div>
+</template>
+<script>
+import router from "@/router";
+
+export default {
+  data() {
+    return {
+      index: 1,
+      isCollapse: false,
+      user: "",
+    };
+  },
+  created() {
+    this.user = localStorage.getItem("user");
+  },
+  methods: {
+    logout() {
+      localStorage.removeItem("tokentype");
+      localStorage.removeItem("token");
+      this.$router.push({ path: "/login" });
+    },
+    aa(aa) {
+      console.log(aa);
+    },
+  },
+  components: { router },
+};
+</script>
+<style scoped>
+.el-menu {
+  border-right: none;
+}
+
+.expandend {
+  text-align: center;
+  margin-right: 5%;
+}
+
+.navs {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.maintitle {
+  font-size: 20px;
+  font-weight: 700;
+}
+
+.el-header {
+  height: 70px;
+}
+
+.el-aside {
+  /* height: calc(100vh, -70px); */
+  height: calc(100vh - 0px);
+  /* height: 100%; */
+  height: 91.5vh;
+  /* height: 100%; */
+  /* height: calc(100vh, -0px); */
+}
+
+.el-main {
+  height: calc(100vh, -70px);
+}
+
+.el-menu-vertical-demo .el-menu {
+  /* min-height: 100vh; */
+  height: calc(100vh, -70px);
+}
+
+.btn {
+  margin-right: 5%;
+}
+
+.collapseandunfoled {
+  text-align: center;
+  line-height: 40px;
+  display: block;
+  font-size: 18px;
+  font-weight: 700;
+  color: #fff;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
deleted file mode 100644
index c14ef46..0000000
--- a/src/views/HomeView.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-
-  <div class="home">
-    222
-    <img alt="Vue logo" src="../assets/logo.png" />
-    <!-- <HelloWorld msg="Welcome to Your Vue.js App" /> -->
-    1
-  </div>
-</template>
-
-<script>
-// @ is an alias to /src
-// import HelloWorld from "@/components/HelloWorld.vue";
-
-export default {
-  name: "HomeView",
-  // components: {
-  //   HelloWorld,
-  // },
-};
-</script>
diff --git a/src/components/nativeplace.vue b/src/views/basic-dictionary/BirthPlace.vue
similarity index 99%
rename from src/components/nativeplace.vue
rename to src/views/basic-dictionary/BirthPlace.vue
index 8d6b5e7..638d8c4 100644
--- a/src/components/nativeplace.vue
+++ b/src/views/basic-dictionary/BirthPlace.vue
@@ -188,7 +188,7 @@ import {
   placeoriginthetop,
   hometowndrag,
   placedeletion,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/commoncused.vue b/src/views/basic-dictionary/CommonChar.vue
similarity index 99%
rename from src/components/commoncused.vue
rename to src/views/basic-dictionary/CommonChar.vue
index 087e938..dee17c5 100644
--- a/src/components/commoncused.vue
+++ b/src/views/basic-dictionary/CommonChar.vue
@@ -187,7 +187,7 @@ import {
   usedtopping,
   sortcommonwords,
   commondelt,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/commoncharacter.vue b/src/views/basic-dictionary/CommonCharType.vue
similarity index 99%
rename from src/components/commoncharacter.vue
rename to src/views/basic-dictionary/CommonCharType.vue
index ea8c55c..8228adb 100644
--- a/src/components/commoncharacter.vue
+++ b/src/views/basic-dictionary/CommonCharType.vue
@@ -153,7 +153,7 @@ import {
   detcategory,
   categorytopbotmm,
   charactersorting,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/customeersevice.vue b/src/views/basic-dictionary/CustomerOrgType.vue
similarity index 99%
rename from src/components/customeersevice.vue
rename to src/views/basic-dictionary/CustomerOrgType.vue
index fe2f723..cbfe004 100644
--- a/src/components/customeersevice.vue
+++ b/src/views/basic-dictionary/CustomerOrgType.vue
@@ -176,7 +176,7 @@ import {
   customerdelat,
   customertopbottom,
   unitsorting,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/instrument.vue b/src/views/basic-dictionary/DeviceType.vue
similarity index 99%
rename from src/components/instrument.vue
rename to src/views/basic-dictionary/DeviceType.vue
index 82ed27f..ce7fabf 100644
--- a/src/components/instrument.vue
+++ b/src/views/basic-dictionary/DeviceType.vue
@@ -202,7 +202,7 @@ import {
   deleteinstrument,
   instrumentsetlow,
   instrumentdrag,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/diagnosticleve.vue b/src/views/basic-dictionary/DiagnosisLevel.vue
similarity index 99%
rename from src/components/diagnosticleve.vue
rename to src/views/basic-dictionary/DiagnosisLevel.vue
index 411be92..33efd51 100644
--- a/src/components/diagnosticleve.vue
+++ b/src/views/basic-dictionary/DiagnosisLevel.vue
@@ -176,7 +176,7 @@ import {
   diagnosisdeleteid,
   diagnosistombotmm,
   diagnosisdegdog,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/diagnosticsuffix.vue b/src/views/basic-dictionary/DiagnosisPostfix.vue
similarity index 99%
rename from src/components/diagnosticsuffix.vue
rename to src/views/basic-dictionary/DiagnosisPostfix.vue
index 56aa8d4..2e372b8 100644
--- a/src/components/diagnosticsuffix.vue
+++ b/src/views/basic-dictionary/DiagnosisPostfix.vue
@@ -174,7 +174,7 @@ import {
   removesuffix,
   suffixatthetop,
   dragsuffix,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/views/departmentset.vue b/src/views/basic-dictionary/GuideType.vue
similarity index 99%
rename from src/views/departmentset.vue
rename to src/views/basic-dictionary/GuideType.vue
index 4cbb766..41a9e30 100644
--- a/src/views/departmentset.vue
+++ b/src/views/basic-dictionary/GuideType.vue
@@ -333,7 +333,7 @@ import {
   guideid,
   topandbottom,
   adjacentsorting,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 // import loginVue from "./login.vue";
 export default {
   data() {
diff --git a/src/components/projectresults.vue b/src/views/basic-dictionary/ItemDefaultResult.vue
similarity index 99%
rename from src/components/projectresults.vue
rename to src/views/basic-dictionary/ItemDefaultResult.vue
index c4f044f..3aeb153 100644
--- a/src/components/projectresults.vue
+++ b/src/views/basic-dictionary/ItemDefaultResult.vue
@@ -167,7 +167,7 @@ import {
   deletepojectresult,
   projecrselttopbottom,
   projectrultsdeg,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/maritalstatus.vue b/src/views/basic-dictionary/MaritalStatus.vue
similarity index 99%
rename from src/components/maritalstatus.vue
rename to src/views/basic-dictionary/MaritalStatus.vue
index d82597d..0460062 100644
--- a/src/components/maritalstatus.vue
+++ b/src/views/basic-dictionary/MaritalStatus.vue
@@ -94,7 +94,7 @@ import {
   modificationstatus,
   topbottom,
   conditiondrag,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/medicalexamination.vue b/src/views/basic-dictionary/MedicalConclusion.vue
similarity index 99%
rename from src/components/medicalexamination.vue
rename to src/views/basic-dictionary/MedicalConclusion.vue
index 15a92a1..dddd164 100644
--- a/src/components/medicalexamination.vue
+++ b/src/views/basic-dictionary/MedicalConclusion.vue
@@ -215,7 +215,7 @@ import {
   diagnosticediting,
   xiugaijielun,
   conclusionacquisition,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/physicalcategory.vue b/src/views/basic-dictionary/MedicalConclusionType.vue
similarity index 99%
rename from src/components/physicalcategory.vue
rename to src/views/basic-dictionary/MedicalConclusionType.vue
index d1dc3c3..8964a7e 100644
--- a/src/components/physicalcategory.vue
+++ b/src/views/basic-dictionary/MedicalConclusionType.vue
@@ -162,7 +162,7 @@ import {
   conclusiontop,
   sortConclusion,
   tijianleibiexiugai
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/medicalexaminatitype.vue b/src/views/basic-dictionary/MedicalReportType.vue
similarity index 99%
rename from src/components/medicalexaminatitype.vue
rename to src/views/basic-dictionary/MedicalReportType.vue
index 81469e6..f3ed259 100644
--- a/src/components/medicalexaminatitype.vue
+++ b/src/views/basic-dictionary/MedicalReportType.vue
@@ -227,7 +227,7 @@ import {
   reportupdates,
   bottomtotop,
   dragreport,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/examinationcategory.vue b/src/views/basic-dictionary/MedicalType.vue
similarity index 99%
rename from src/components/examinationcategory.vue
rename to src/views/basic-dictionary/MedicalType.vue
index 8cbfb6f..d6b6387 100644
--- a/src/components/examinationcategory.vue
+++ b/src/views/basic-dictionary/MedicalType.vue
@@ -168,7 +168,7 @@ import {
   deletecol,
   medicaltopbottom,
   examinationdragging,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/nation.vue b/src/views/basic-dictionary/Nation.vue
similarity index 99%
rename from src/components/nation.vue
rename to src/views/basic-dictionary/Nation.vue
index 574a583..061fefc 100644
--- a/src/components/nation.vue
+++ b/src/views/basic-dictionary/Nation.vue
@@ -189,7 +189,7 @@ import {
   opBottomtheFamousclan,
   ethnicdrag,
   deleteEthnic,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/personnelcategory.vue b/src/views/basic-dictionary/PersonnelType.vue
similarity index 99%
rename from src/components/personnelcategory.vue
rename to src/views/basic-dictionary/PersonnelType.vue
index c66e5ab..0523c82 100644
--- a/src/components/personnelcategory.vue
+++ b/src/views/basic-dictionary/PersonnelType.vue
@@ -168,7 +168,7 @@ import {
   deletePersonnel,
   personnelatthetop,
   personnelsorting,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/resultstatus.vue b/src/views/basic-dictionary/ResultStatus.vue
similarity index 99%
rename from src/components/resultstatus.vue
rename to src/views/basic-dictionary/ResultStatus.vue
index dbaeab8..ca1fd37 100644
--- a/src/components/resultstatus.vue
+++ b/src/views/basic-dictionary/ResultStatus.vue
@@ -175,7 +175,7 @@ import {
   deletedstate,
   stateBottomTop,
   sortstatus,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/sepecimencontainer.vue b/src/views/basic-dictionary/SampleContainer.vue
similarity index 99%
rename from src/components/sepecimencontainer.vue
rename to src/views/basic-dictionary/SampleContainer.vue
index 67784e4..51e88a2 100644
--- a/src/components/sepecimencontainer.vue
+++ b/src/views/basic-dictionary/SampleContainer.vue
@@ -179,7 +179,7 @@ import {
   detecontainer,
   specimentopbottom,
   specimensort,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/specimentype.vue b/src/views/basic-dictionary/SampleType.vue
similarity index 99%
rename from src/components/specimentype.vue
rename to src/views/basic-dictionary/SampleType.vue
index 28f9d08..cb2bf92 100644
--- a/src/components/specimentype.vue
+++ b/src/views/basic-dictionary/SampleType.vue
@@ -160,7 +160,7 @@ import {
   deletespecimen,
   placementlow,
   sampledragging,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/gender.vue b/src/views/basic-dictionary/Sex.vue
similarity index 99%
rename from src/components/gender.vue
rename to src/views/basic-dictionary/Sex.vue
index 159fb26..33e33f6 100644
--- a/src/components/gender.vue
+++ b/src/views/basic-dictionary/Sex.vue
@@ -95,7 +95,7 @@ import {
   modifygender,
   genderbottomtotop,
   modifydraganddrop,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/components/unit.vue b/src/views/basic-dictionary/Unit.vue
similarity index 99%
rename from src/components/unit.vue
rename to src/views/basic-dictionary/Unit.vue
index 3a40beb..ddaaff0 100644
--- a/src/components/unit.vue
+++ b/src/views/basic-dictionary/Unit.vue
@@ -189,7 +189,7 @@ import {
   deleteunit,
   unittop,
   unitdrag,
-} from "../request/systemapi";
+} from "../../request/systemapi";
 export default {
   data() {
     return {
diff --git a/src/views/feesettings/itemtype.vue b/src/views/common-settings/ItemType.vue
similarity index 100%
rename from src/views/feesettings/itemtype.vue
rename to src/views/common-settings/ItemType.vue
diff --git a/src/views/feesettings/barcodegroupping.vue b/src/views/common-settings/SampleGroup.vue
similarity index 100%
rename from src/views/feesettings/barcodegroupping.vue
rename to src/views/common-settings/SampleGroup.vue
diff --git a/src/views/feesettings/groupsandproject.vue b/src/views/fee-settings/Asbitem.vue
similarity index 100%
rename from src/views/feesettings/groupsandproject.vue
rename to src/views/fee-settings/Asbitem.vue
diff --git a/src/views/diagnosis.vue b/src/views/fee-settings/Diagnosis.vue
similarity index 100%
rename from src/views/diagnosis.vue
rename to src/views/fee-settings/Diagnosis.vue
diff --git a/src/views/feesettings/invoicecategory.vue b/src/views/fee-settings/InvoiceItemType.vue
similarity index 100%
rename from src/views/feesettings/invoicecategory.vue
rename to src/views/fee-settings/InvoiceItemType.vue
diff --git a/src/views/feesettings/projectitem.vue b/src/views/fee-settings/Item.vue
similarity index 100%
rename from src/views/feesettings/projectitem.vue
rename to src/views/fee-settings/Item.vue
diff --git a/src/views/feesettings/projectresulttemplate.vue b/src/views/fee-settings/ItemResultTemplate.vue
similarity index 100%
rename from src/views/feesettings/projectresulttemplate.vue
rename to src/views/fee-settings/ItemResultTemplate.vue
diff --git a/src/views/feesettings/paymentmethod.vue b/src/views/fee-settings/PayMode.vue
similarity index 100%
rename from src/views/feesettings/paymentmethod.vue
rename to src/views/fee-settings/PayMode.vue
diff --git a/src/views/feesettings/referencerange.vue b/src/views/fee-settings/ReferenceRange.vue
similarity index 100%
rename from src/views/feesettings/referencerange.vue
rename to src/views/fee-settings/ReferenceRange.vue
diff --git a/src/views/hoem.vue b/src/views/hoem.vue
deleted file mode 100644
index ec8f75a..0000000
--- a/src/views/hoem.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<template>
-  <div>
-    <el-container>
-      <el-header style="background-color: #ccc; line-height: 50px">
-        <div class="navs">
-          <div class="maintitle">神豚医疗信息系统</div>
-
-          <div class="btn">
-            当前用户{{ user }}
-            <el-dropdown>
-              <span class="el-dropdown-link">
-                操作<i class="el-icon-arrow-down el-icon--right"></i>
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="logout"
-                  >退出登录</el-dropdown-item
-                >
-                <el-dropdown-item>修改密码</el-dropdown-item>
-                <el-dropdown-item>螺蛳粉</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </div>
-        </div>
-      </el-header>
-
-      <el-container>
-        <el-aside :width="isCollapse ? '64px' : '200px'">
-          <el-menu
-            style="height: 100%"
-            default-active="2"
-            class="el-menu-vertical-demo"
-            background-color="#545c64"
-            router
-            active-text-color="#fff"
-            :unique-opened="true"
-            text-color="#000"
-            @select="aa"
-            :collapse="isCollapse"
-            :collapse-transition="false"
-          >
-            <div class="collapseandunfoled" @click="isCollapse = !isCollapse">
-              | | |
-            </div>
-            <el-submenu index="1">
-              <template slot="title">
-                <i class="el-icon-document"></i>
-                <span>用户权限管理</span>
-              </template>
-              <el-menu-item index="my">
-                <i class="el-icon-menu"></i>
-                <span slot="title">角色管理</span>
-              </el-menu-item>
-              <el-menu-item index="userlist">
-                <i class="el-icon-menu"></i>
-                <span slot="title">用户管理</span>
-              </el-menu-item>
-              <el-menu-item index="organization">
-                <i class="el-icon-menu"></i>
-                <span slot="title">组织架构</span>
-              </el-menu-item>
-              <el-menu-item index="dailyrecord">
-                <i class="el-icon-menu"></i>
-                <span slot="title">安全日志</span>
-              </el-menu-item>
-            </el-submenu>
-            <el-submenu index="2">
-              <template slot="title">
-                <i class="el-icon-s-tools"></i>
-                <span>系统设置</span>
-              </template>
-              <!-- <el-submenu index="1-4"> -->
-              <!-- <template slot="title">
-                  <i class="el-icon-menu"></i
-                  ><span>基础资料设置</span></template
-                > -->
-              <el-menu-item index="departmentset"
-                ><i class="el-icon-menu"></i>导引类别</el-menu-item
-              >
-              <el-menu-item index="medicalexaminatitype"
-                ><i class="el-icon-menu"></i>体检报告类别</el-menu-item
-              >
-              <el-menu-item index="gender"
-                ><i class="el-icon-menu"></i>性别</el-menu-item
-              >
-              <el-menu-item index="maritalstatus"
-                ><i class="el-icon-menu"></i>婚姻状况</el-menu-item
-              >
-              <el-menu-item index="nation"
-                ><i class="el-icon-menu"></i>民族</el-menu-item
-              >
-              <el-menu-item index="nativeplace"
-                ><i class="el-icon-menu"></i>籍贯</el-menu-item
-              >
-              <el-menu-item index="resultstatus"
-                ><i class="el-icon-menu"></i>结果状态</el-menu-item
-              >
-              <el-menu-item index="examinationcategory"
-                ><i class="el-icon-menu"></i>体检类别</el-menu-item
-              >
-              <el-menu-item index="personnelcategory"
-                ><i class="el-icon-menu"></i>人员类别</el-menu-item
-              >
-              <el-menu-item index="instrument"
-                ><i class="el-icon-menu"></i>仪器类别</el-menu-item
-              >
-              <!-- </el-submenu> -->
-              <!-- <el-menu-item index="departmentset">
-                <i class="el-icon-menu"></i>
-                <span slot="title">科室设置</span>
-              </el-menu-item> -->
-            </el-submenu>
-            <el-submenu index="3">
-              <template slot="title">
-                <i class="el-icon-s-tools"></i>
-                <span>基础字典</span>
-              </template>
-              <el-menu-item index="specimentype"
-                ><i class="el-icon-menu"></i>标本类型</el-menu-item
-              >
-              <el-menu-item index="unit"
-                ><i class="el-icon-menu"></i>单位</el-menu-item
-              >
-              <el-menu-item index="diagnosticsuffix"
-                ><i class="el-icon-menu"></i>诊断后缀</el-menu-item
-              >
-              <el-menu-item index="physicalcategory"
-                ><i class="el-icon-menu"></i>体检结论类别</el-menu-item
-              >
-              <el-menu-item index="medicalexamination"
-                ><i class="el-icon-menu"></i>体检结论</el-menu-item
-              >
-              <el-menu-item index="sepecimencontainer"
-                ><i class="el-icon-menu"></i>标本容器</el-menu-item
-              >
-              <el-menu-item index="commoncharacter"
-                ><i class="el-icon-menu"></i>常用字符类别</el-menu-item
-              >
-              <el-menu-item index="commoncused"
-                ><i class="el-icon-menu"></i>常用字</el-menu-item
-              >
-              <el-menu-item index="customeersevice"
-                ><i class="el-icon-menu"></i>客户单位类别</el-menu-item
-              >
-              <el-menu-item index="projectresults"
-                ><i class="el-icon-menu"></i>项目默认结果</el-menu-item
-              >
-              <el-menu-item index="diagnosticleve"
-                ><i class="el-icon-menu"></i>诊断级别</el-menu-item
-              >
-            </el-submenu>
-            <!-- <el-submenu index="2">
-              <template slot="title">
-                <i class="el-icon-location"></i>
-                <span>用户角色</span>
-              </template>
-              <el-menu-item index="userlist">
-                <i class="el-icon-menu"></i>
-                <span slot="title">用户列表</span>
-              </el-menu-item>
-            </el-submenu> -->
-            <el-submenu index="4">
-              <template slot="title">
-                <i class="el-icon-s-tools"></i>
-                <span>收费设置</span>
-              </template>
-              <el-menu-item index="invoicecategory"
-                ><i class="el-icon-menu"></i>发票项目类别</el-menu-item
-              >
-              <el-menu-item index="paymentmethod"
-                ><i class="el-icon-menu"></i>支付方式</el-menu-item
-              >
-              <el-menu-item index="itemtype"
-                ><i class="el-icon-menu"></i>项目类别</el-menu-item
-              >
-              <el-menu-item index="barcodegroupping"
-                ><i class="el-icon-menu"></i>条码分组</el-menu-item
-              >
-              <el-menu-item index="groupsandproject"
-                ><i class="el-icon-menu"></i>组和项目</el-menu-item
-              >
-              <el-menu-item index="projectitem"
-                ><i class="el-icon-menu"></i>项目</el-menu-item
-              >
-              <el-menu-item index="referencerange"
-                ><i class="el-icon-menu"></i>参考范围</el-menu-item
-              >
-              <el-menu-item index="diagnosis"
-                ><i class="el-icon-menu"></i>诊断</el-menu-item
-              >
-               <el-menu-item index="projectresulttemplate"
-                ><i class="el-icon-menu"></i>项目结果模板</el-menu-item
-              >
-            </el-submenu>
-          </el-menu>
-        </el-aside>
-        <el-main>
-          <!-- Main -->
-          <!-- <el-card>
-            <el-button type="primary" @click="btn">主要按钮</el-button>
-          </el-card> -->
-          <router-view></router-view>
-        </el-main>
-      </el-container>
-    </el-container>
-  </div>
-</template>
-<script>
-import router from "@/router";
-
-export default {
-  data() {
-    return {
-      index: 1,
-      isCollapse: false,
-      user: "",
-    };
-  },
-  created() {
-    this.user = localStorage.getItem("user");
-  },
-  methods: {
-    logout() {
-      localStorage.removeItem("tokentype");
-      localStorage.removeItem("token");
-      this.$router.push({ path: "/login" });
-    },
-    aa(aa) {
-      console.log(aa);
-    },
-  },
-  components: { router },
-};
-</script>
-<style scoped>
-.el-menu {
-  border-right: none;
-}
-.expandend {
-  text-align: center;
-  margin-right: 5%;
-}
-.navs {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.maintitle {
-  font-size: 20px;
-  font-weight: 700;
-}
-.el-header {
-  height: 70px;
-}
-.el-aside {
-  /* height: calc(100vh, -70px); */
-  height: calc(100vh - 0px);
-  /* height: 100%; */
-  height: 91.5vh;
-  /* height: 100%; */
-  /* height: calc(100vh, -0px); */
-}
-.el-main {
-  height: calc(100vh, -70px);
-}
-.el-menu-vertical-demo .el-menu {
-  /* min-height: 100vh; */
-  height: calc(100vh, -70px);
-}
-.btn {
-  margin-right: 5%;
-}
-.collapseandunfoled {
-  text-align: center;
-  line-height: 40px;
-  display: block;
-  font-size: 18px;
-  font-weight: 700;
-  color: #fff;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/login.vue b/src/views/login/Login.vue
similarity index 98%
rename from src/views/login.vue
rename to src/views/login/Login.vue
index 45ed5ed..0630fad 100644
--- a/src/views/login.vue
+++ b/src/views/login/Login.vue
@@ -99,7 +99,7 @@ export default {
               window.localStorage.setItem('user',this.form.Username)
               console.log(res);
               this.$message.success("登录成功");
-              this.$router.push({ path: "hoem" });
+              this.$router.push({ path: "home" });
             });
         }
       });
diff --git a/src/views/dailyrecord.vue b/src/views/user-list/AuditLog.vue
similarity index 100%
rename from src/views/dailyrecord.vue
rename to src/views/user-list/AuditLog.vue
diff --git a/src/views/organization.vue b/src/views/user-list/OrganizationUnits.vue
similarity index 99%
rename from src/views/organization.vue
rename to src/views/user-list/OrganizationUnits.vue
index 6bd0b7f..aa907fa 100644
--- a/src/views/organization.vue
+++ b/src/views/user-list/OrganizationUnits.vue
@@ -58,7 +58,7 @@ import {
   organizationcaeatre,
   deleteschema,
   modifyedit,
-} from "../request/ruquset";
+} from "../../request/ruquset";
 export default {
   data() {
     return {
diff --git a/src/views/my.vue b/src/views/user-list/Role.vue
similarity index 100%
rename from src/views/my.vue
rename to src/views/user-list/Role.vue
diff --git a/src/views/userlist.vue b/src/views/user-list/UserList.vue
similarity index 99%
rename from src/views/userlist.vue
rename to src/views/user-list/UserList.vue
index dde0e48..05a2c1a 100644
--- a/src/views/userlist.vue
+++ b/src/views/user-list/UserList.vue
@@ -390,7 +390,7 @@ import {
   reverseselection,
   usersinits,
   selectbinding,
-} from "../request/ruquset";
+} from "../../request/ruquset";
 let validatePassword = (rule, value, callback) => {
   var reg1 =
     /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*.])[\da-zA-Z~!@#$%^&*.]{6,}$/; //密码必须是8位以上、必须含有字母、数字、特殊符号