diff --git a/.eslintrc.js b/.eslintrc.js
index 3937745..34bb583 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -7,6 +7,11 @@ module.exports = {
       'plugin:vue/essential',
       '@vue/airbnb',
     ],
+    plugins: [
+      'html',
+      'vue'
+    ],
+  
     rules: {
       "semi": "off", //去掉分号检查
       'linebreak-style':'off',
diff --git a/package.json b/package.json
index 77c8de4..bdc3747 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,11 @@
     "babel-eslint": "^10.0.1",
     "chai": "^4.1.2",
     "vuetify-loader": "1.2.1",
-    "eslint": "^5.8.0",
-    "eslint-plugin-vue": "^5.0.0-0",
+    "eslint": "5.14.1",
+    "eslint-plugin-vue": "5.2.2",
+    "eslint-friendly-formatter": "^4.0.1",
+    "eslint-loader": "2.1.2",
+    "eslint-plugin-html": "5.0.3",
     "lint-staged": "^7.2.2",
     "node-sass": "^4.9.2",
     "sass-loader": "^7.0.3",
diff --git a/src/views/404.vue b/src/views/404.vue
index 9601e63..f679931 100644
--- a/src/views/404.vue
+++ b/src/views/404.vue
@@ -1,4 +1,3 @@
-/* eslint-disable camelcase */
 <template>
   <div class="wscn-http404-container" />
 </template>
diff --git a/src/views/DouBan/book.vue b/src/views/DouBan/book.vue
index 510156f..0fc9ba0 100644
--- a/src/views/DouBan/book.vue
+++ b/src/views/DouBan/book.vue
@@ -35,7 +35,7 @@
 
       <el-table-column
         label="作者"
-        align="center">
+             align="center">
         <template slot-scope="scope">
           <el-tag
             type="danger"
diff --git a/src/views/SIX/Notice.vue b/src/views/SIX/Notice.vue
index 3a91972..a6005ba 100644
--- a/src/views/SIX/Notice.vue
+++ b/src/views/SIX/Notice.vue
@@ -1,11 +1,14 @@
 <template>
- <div>
-<crud-table tableName="six_notice" toolbarButton="add,clear,search" handleButton="edit,delete"></crud-table>
- </div>
+  <div>
+    <crud-table
+      tableName="six_notice"
+      toolbarButton="add,clear,search"
+      handleButton="edit,delete"
+    ></crud-table>
+  </div>
 </template>
 <script>
-
 export default {
   name: 'Notice',
-}
+};
 </script>
diff --git a/src/views/SIX/RewardOrPunish.vue b/src/views/SIX/RewardOrPunish.vue
index d577d21..0182013 100644
--- a/src/views/SIX/RewardOrPunish.vue
+++ b/src/views/SIX/RewardOrPunish.vue
@@ -1,11 +1,14 @@
 <template>
- <div>
-<crud-table tableName="six_rewardorpunish" toolbarButton="add,clear,search" handleButton="edit,delete"></crud-table>
- </div>
+  <div>
+    <crud-table
+      tableName="six_rewardorpunish"
+      toolbarButton="add,clear,search"
+      handleButton="edit,delete"
+    ></crud-table>
+  </div>
 </template>
 <script>
-
 export default {
   name: 'RewardOrPunish',
-}
+};
 </script>
diff --git a/src/views/SIX/Salary.vue b/src/views/SIX/Salary.vue
index a6f3b31..b317b96 100644
--- a/src/views/SIX/Salary.vue
+++ b/src/views/SIX/Salary.vue
@@ -1,11 +1,14 @@
 <template>
- <div>
-<crud-table tableName="six_salary" toolbarButton="add,clear,search" handleButton="edit,delete"></crud-table>
- </div>
+  <div>
+    <crud-table
+      tableName="six_salary"
+      toolbarButton="add,clear,search"
+      handleButton="edit,delete"
+    ></crud-table>
+  </div>
 </template>
 <script>
-
 export default {
   name: 'Salary',
-}
+};
 </script>
diff --git a/src/views/SIX/Staff.vue b/src/views/SIX/Staff.vue
index 4377275..aa86023 100644
--- a/src/views/SIX/Staff.vue
+++ b/src/views/SIX/Staff.vue
@@ -1,11 +1,14 @@
 <template>
- <div>
-<crud-table tableName="six_staff" toolbarButton="add,clear,search" handleButton="edit,delete"></crud-table>
- </div>
+  <div>
+    <crud-table
+      tableName="six_staff"
+      toolbarButton="add,clear,search"
+      handleButton="edit,delete"
+    ></crud-table>
+  </div>
 </template>
 <script>
-
 export default {
   name: 'Staff',
-}
+};
 </script>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e38df60..a5e0226 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -11,7 +11,7 @@
           <v-toolbar color="purple" dark>
             <v-toolbar-side-icon></v-toolbar-side-icon>
             <v-toolbar-title>系统公告</v-toolbar-title>
-            <v-spacer></v-spacer>
+             <v-spacer></v-spacer>
             <!-- <v-btn icon>
               <v-icon>calendar</v-icon>
             </v-btn>
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index d89ac7d..71ad744 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -1,92 +1,104 @@
 <template>
   <div
     id="dept"
-    class="widget-box">
-
-
-<el-row>
-  <el-col :span="8">
-<el-input
-  placeholder="输入关键字进行过滤"
-  v-model="filterText" style="width:80%;">
-</el-input>
-
-  <el-tree
-  class="filter-tree"
-            ref="depttree"
-            :data="deptList"
-            :props="defaultProps"
-            node-key="id"
-            highlight-current
-              :filter-node-method="filterNode"
-
-              :default-expanded-keys="['00000000-0000-0001-0000-000000000000']"
-            @node-click="deptTreeClick"
+    class="widget-box"
+  >
+
+    <el-row>
+      <el-col :span="8">
+        <el-input
+          placeholder="输入关键字进行过滤"
+          v-model="filterText"
+          style="width:80%;"
+        >
+        </el-input>
+
+        <el-tree
+          class="filter-tree"
+          ref="depttree"
+          :data="deptList"
+          :props="defaultProps"
+          node-key="id"
+          highlight-current
+          :filter-node-method="filterNode"
+          :default-expanded-keys="['00000000-0000-0001-0000-000000000000']"
+          @node-click="deptTreeClick"
+        />
+
+      </el-col>
+      <el-col :span="16">
+        <el-form
+          :model="temp"
+          class="small-space"
+          label-position="left"
+          label-width="70px"
+          v-if="temp"
+        >
+          <el-form-item label="部门名称">
+            <el-input
+              v-model="temp.deptname"
+              class="filter-item"
+              placeholder="请输入部门名称"
+            />
+          </el-form-item>
+          <el-form-item label="上级部门">
+            <el-select
+              v-model="temp.parentid"
+              placeholder="请选择"
+              filterable
+            >
+              <el-option
+                v-for="item in deptoptions"
+                :key="item.id"
+                :label="item.deptname"
+                :value="item.id"
+              />
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="排序码">
+            <el-input
+              v-model="temp.rank"
+              class="filter-item"
+              placeholder="请输入排序码"
+            />
+          </el-form-item>
+
+          <el-form-item label="分管单位">
+            <el-tree
+              ref="unittree"
+              :data="unitList"
+              :props="defaultProps"
+              show-checkbox
+              node-key="id"
+              highlight-current
+              check-strictly
+              class="tree"
             />
 
-  </el-col>
-    <el-col :span="16">
-         <el-form
-        :model="temp"
-        class="small-space"
-        label-position="left"
-        label-width="70px" v-if="temp">
-             <el-form-item label="部门名称">
-          <el-input
-            v-model="temp.deptname"
-            class="filter-item"
-            placeholder="请输入部门名称"/>
-        </el-form-item>
-  <el-form-item label="上级部门">
-          <el-select
-            v-model="temp.parentid"
-            placeholder="请选择"
-            filterable>
-            <el-option
-              v-for="item in deptoptions"
-              :key="item.id"
-
-              :label="item.deptname"
-              :value="item.id"/>
-          </el-select>
-
-        </el-form-item>
-
-        <el-form-item label="排序码">
-          <el-input
-            v-model="temp.rank"
-            class="filter-item"
-            placeholder="请输入排序码"/>
-        </el-form-item>
-
-    <el-form-item label="分管单位">
-          <el-tree
-            ref="unittree"
-            :data="unitList"
-            :props="defaultProps"
-            show-checkbox
-            node-key="id"
-            highlight-current
-            check-strictly class="tree"/>
-
-        </el-form-item>
-
-
-      </el-form>
-    <div
-        class="dialog-footer">
-         <el-button
-          type="success"
-          @click="clearObj">新 增</el-button>
-        <el-button
-          type="primary"
-          @click="save">保 存</el-button>
-        <el-button v-if="status==='update'" type="danger" @click="Delete">删 除</el-button>
-
-      </div>
-    </el-col>
-
-</el-row>
+          </el-form-item>
+
+        </el-form>
+        <div class="dialog-footer">
+          <el-button
+            type="success"
+            @click="clearObj"
+          >新 增</el-button>
+          <el-button
+            type="primary"
+            @click="save"
+          >保 存</el-button>
+          <el-button
+            v-if="status==='update'"
+            type="danger"
+            @click="Delete"
+          >删 除</el-button>
+
+        </div>
+      </el-col>
+
+    </el-row>
 
   </div>
 </template>
@@ -102,10 +114,7 @@ import {
   getObj,
 } from '@/api/system/dept';
 
-import {
-  GetUnitTree,
-} from '@/api/system/unit';
-
+import { GetUnitTree } from '@/api/system/unit';
 
 export default {
   name: 'Dept',
@@ -121,28 +130,27 @@ export default {
         children: 'children',
         label: 'nodeName',
       },
-    }
+    };
   },
 
   watch: {
     filterText(val) {
       this.$nextTick(() => {
         this.$refs.depttree.filter(val);
-      })
+      });
     },
   },
 
-
   created() {
     getObj().then((res) => {
-      this.temp = res.data
-    })
+      this.temp = res.data;
+    });
     DeptList().then((res) => {
       this.deptoptions = res.data.list;
-    })
+    });
 
-    this.fetchDept()
-    this.fetchUnit()
+    this.fetchDept();
+    this.fetchUnit();
   },
   methods: {
     filterNode(value, data) {
@@ -151,9 +159,9 @@ export default {
     },
     clearObj() {
       Object.keys(this.temp).forEach((key) => {
-        this.temp[key] = ''
-      })
-      this.status = 'create'
+        this.temp[key] = '';
+      });
+      this.status = 'create';
       this.$nextTick(() => {
         this.$refs.unittree.setCheckedKeys([]);
       });
@@ -170,8 +178,8 @@ export default {
       });
     },
     deptTreeClick(obj) {
-      this.status = 'update'
-      this.Edit(obj.id)
+      this.status = 'update';
+      this.Edit(obj.id);
     },
 
     Delete() {
@@ -179,12 +187,11 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      })
-        .then(() => {
-          DeleteDept(this.temp.id).then(() => {
-            this.fetchDept()
-          })
-        })
+      }).then(() => {
+        DeleteDept(this.temp.id).then(() => {
+          this.fetchDept();
+        });
+      });
     },
     Edit(id) {
       GetDeptDetail(id).then((response) => {
@@ -194,32 +201,31 @@ export default {
       });
     },
     save() {
-      const obj = {}
-      obj.obj = JSON.parse(JSON.stringify(this.temp))
-      obj.unitlist = this.$refs.unittree.getCheckedKeys()
+      const obj = {};
+      obj.obj = JSON.parse(JSON.stringify(this.temp));
+      obj.unitlist = this.$refs.unittree.getCheckedKeys();
 
       if (this.status === 'create') {
-        obj.obj.id = this.Guid()
+        obj.obj.id = this.Guid();
         AddDept(obj).then(() => {
           this.fetchDept();
-        })
+        });
       } else {
         UpdateDept(obj).then(() => {
           this.fetchDept();
-        })
+        });
       }
     },
   },
 };
-
 </script>
 
 <style scope>
-.tree{
-  max-height:400px;
+.tree {
+  max-height: 400px;
   overflow: auto;
 }
-.dialog-footer{
+.dialog-footer {
   text-align: center;
 }
 </style>
diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue
index a237990..4b3e843 100644
--- a/src/views/system/dict.vue
+++ b/src/views/system/dict.vue
@@ -1,79 +1,99 @@
 <template>
   <div
     id="dicttype"
-    class="widget-box">
-<el-row>
-  <el-col :span="8">
-     <el-tree
-            ref="dicttypetree"
-            :data="dicttypeList"
-            :props="defaultProps"
-            node-key="id"
-            highlight-current
-            :default-expanded-keys="['00000000-0000-0000-0000-000000000001']"
-            @node-click="treeClick"
-            >
-             <span class="custom-tree-node" slot-scope="{ node, data }">
-        <span>{{ node.label }}</span>
-        <span style="margin-left:8 px">
-          <el-button
-            type="text"
-            size="mini"
-               @click="() => append(data)">
-                  添加
-          </el-button>
-            <el-button
-            type="text"
-            size="mini"
-            @click="() => Edit(data.id)">
-            修改
-          </el-button>
-          <el-button
-            type="text"
-            size="mini"
-            @click="() => remove(data)">
-            删除
-          </el-button>
-        </span>
-      </span>
-            </el-tree>
-  </el-col>
-    <el-col :span="16">
-<crud-table tableName="dict" :asyncCondition="asyncCondition" class="no-boxshadow no-padding-top" toolbarButton="add,clear" handleButton="edit,delete"></crud-table>
-
-    </el-col>
-
-</el-row>
-
- <el-dialog
+    class="widget-box"
+  >
+    <el-row>
+      <el-col :span="8">
+        <el-tree
+          ref="dicttypetree"
+          :data="dicttypeList"
+          :props="defaultProps"
+          node-key="id"
+          highlight-current
+          :default-expanded-keys="['00000000-0000-0000-0000-000000000001']"
+          @node-click="treeClick"
+        >
+          <span
+            class="custom-tree-node"
+            slot-scope="{ node, data }"
+          >
+            <span>{{ node.label }}</span>
+            <span style="margin-left:8 px">
+              <el-button
+                type="text"
+                size="mini"
+                @click="() => append(data)"
+              >
+                添加
+              </el-button>
+              <el-button
+                type="text"
+                size="mini"
+                @click="() => Edit(data.id)"
+              >
+                修改
+              </el-button>
+              <el-button
+                type="text"
+                size="mini"
+                @click="() => remove(data)"
+              >
+                删除
+              </el-button>
+            </span>
+          </span>
+        </el-tree>
+      </el-col>
+      <el-col :span="16">
+        <crud-table
+          tableName="dict"
+          :asyncCondition="asyncCondition"
+          class="no-boxshadow no-padding-top"
+          toolbarButton="add,clear"
+          handleButton="edit,delete"
+        ></crud-table>
+
+      </el-col>
+
+    </el-row>
+
+    <el-dialog
       :title="textMap[dialogStatus]"
       :visible.sync="dialogFormVisible"
-      width="80%">
+      width="80%"
+    >
 
-   <el-form ref="form" :model="entity" label-width="80px">
-  <el-form-item label="类目名">
-    <el-input v-model="entity.name"></el-input>
-  </el-form-item>
+      <el-form
+        ref="form"
+        :model="entity"
+        label-width="80px"
+      >
+        <el-form-item label="类目名">
+          <el-input v-model="entity.name"></el-input>
+        </el-form-item>
 
-<el-form-item label="排序码">
-    <el-input-number v-model="entity.sort"></el-input-number>
-  </el-form-item>
+        <el-form-item label="排序码">
+          <el-input-number v-model="entity.sort"></el-input-number>
+        </el-form-item>
 
-
-</el-form>
+      </el-form>
 
       <div
         slot="footer"
-        class="dialog-footer">
+        class="dialog-footer"
+      >
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button
           v-if="dialogStatus=='create'"
           type="primary"
-          @click="save">新 增</el-button>
+          @click="save"
+        >新 增</el-button>
         <el-button
           v-else
           type="primary"
-          @click="save">修 改</el-button>
+          @click="save"
+        >修 改</el-button>
       </div>
     </el-dialog>
 
@@ -90,7 +110,6 @@ import {
   UpdateDictType,
 } from '@/api/system/dicttype';
 
-
 export default {
   name: 'Dict',
   data() {
@@ -118,7 +137,6 @@ export default {
         children: 'children',
         label: 'nodeName',
       },
-
     };
   },
 
@@ -129,7 +147,6 @@ export default {
     this.fetchDictType();
   },
   methods: {
-
     append(data) {
       this.dialogStatus = 'create';
       this.clearObj();
@@ -141,13 +158,12 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      })
-        .then(() => {
-          DeleteDictType(data.id).then(() => {
-            this.dialogFormVisible = false;
-            this.fetchDictType()
-          });
+      }).then(() => {
+        DeleteDictType(data.id).then(() => {
+          this.dialogFormVisible = false;
+          this.fetchDictType();
         });
+      });
     },
 
     clearObj() {
@@ -163,9 +179,9 @@ export default {
     },
 
     treeClick(data) {
-      console.log(data)
-      this.asyncCondition.searchKey = 'dictid'
-      this.asyncCondition.searchValue = data.id
+      console.log(data);
+      this.asyncCondition.searchKey = 'dictid';
+      this.asyncCondition.searchValue = data.id;
     },
     Edit(id) {
       GetDictTypeDetail(id).then((response) => {
@@ -189,15 +205,14 @@ export default {
     },
   },
 };
-
 </script>
 
 <style scope>
-.tree{
-  max-height:400px;
+.tree {
+  max-height: 400px;
   overflow: auto;
 }
-.dialog-footer{
+.dialog-footer {
   text-align: center;
 }
 </style>
diff --git a/src/views/system/formdesigner.vue b/src/views/system/formdesigner.vue
index 8f6c3bc..5e09653 100644
--- a/src/views/system/formdesigner.vue
+++ b/src/views/system/formdesigner.vue
@@ -2,7 +2,8 @@
   <div
     id="formdesigner"
     ref="container"
-  class="widget-box">
+    class="widget-box"
+  >
     <makingform ref="form" />
   </div>
 </template>
@@ -17,12 +18,9 @@ export default {
     makingform,
   },
   data() {
-    return {
-
-    }
+    return {};
   },
 };
 </script>
 <style scoped>
-
 </style>
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index 9a10441..6f83793 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -1,12 +1,14 @@
 <template>
   <div
     id="role"
-    class=" widget-box">
+    class=" widget-box"
+  >
     <el-button
       type="primary"
       size="small"
       style="margin:10px 0px"
-      @click="New()">新增</el-button>
+      @click="New()"
+    >新增</el-button>
 
     <el-table
       v-loading.body="listLoading"
@@ -14,11 +16,13 @@
       element-loading-text="拼命加载中"
       border
       fit
-      highlight-current-row >
+      highlight-current-row
+    >
       <el-table-column
         align="center"
         label="序号"
-        width="95">
+        width="95"
+      >
         <template slot-scope="scope">
           {{ scope.$index+1 }}
         </template>
@@ -37,17 +41,20 @@
       <el-table-column
         label="操作"
         align="center"
-        min-width="110px">
+        min-width="110px"
+      >
         <template slot-scope="scope">
           <el-button
             type="success"
             size="small"
-            @click="Edit(scope.row.id)">编辑</el-button>
+            @click="Edit(scope.row.id)"
+          >编辑</el-button>
 
           <el-button
             type="danger"
             size="small"
-            @click="Delete(scope.row.id)">删除</el-button>
+            @click="Delete(scope.row.id)"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -55,35 +62,39 @@
       :current-page="listQuery.pageNumber"
       :page-sizes="[10, 20, 30]"
       :page-size="listQuery.pageSize"
-
       :total="listQuery.totalCount"
       layout="total,sizes, prev, pager, next"
       style="margin-top:5px"
       @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"/>
+      @current-change="handleCurrentChange"
+    />
 
     <el-dialog
       :title="textMap[dialogStatus]"
       :visible.sync="dialogFormVisible"
       :modal-append-to-body="false"
-      width="50%">
+      width="50%"
+    >
       <el-form
         :model="temp"
         class="small-space"
         label-position="left"
-        label-width="70px">
+        label-width="70px"
+      >
 
         <el-form-item label="角色名">
           <el-input
             v-model="temp.rolename"
             class="filter-item"
-            placeholder="请输入角色名"/>
+            placeholder="请输入角色名"
+          />
         </el-form-item>
         <el-form-item label="排序码">
           <el-input
             v-model="temp.rank"
             class="filter-item"
-            placeholder="请输入排序码"/>
+            placeholder="请输入排序码"
+          />
         </el-form-item>
         <el-form-item label="菜单">
           <el-tree
@@ -95,23 +106,27 @@
             default-expand-all
             node-key="name"
             highlight-current
-            check-strictly/>
+            check-strictly
+          />
         </el-form-item>
 
       </el-form>
 
       <div
         slot="footer"
-        class="dialog-footer">
+        class="dialog-footer"
+      >
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button
           v-if="dialogStatus=='create'"
           type="primary"
-          @click="create">确 定</el-button>
+          @click="create"
+        >确 定</el-button>
         <el-button
           v-else
           type="primary"
-          @click="update">确 定</el-button>
+          @click="update"
+        >确 定</el-button>
       </div>
     </el-dialog>
 
@@ -125,10 +140,9 @@ import {
   GetRoleDetail,
   AddRole,
   UpdateRole,
-} from '@/api/system/role'
-
+} from '@/api/system/role';
 
-import { asyncRouterMap } from '@/router/index'
+import { asyncRouterMap } from '@/router/index';
 
 export default {
   name: 'Role',
@@ -160,59 +174,56 @@ export default {
         children: 'children',
         label: 'title',
       },
-    }
+    };
   },
 
   created() {
-    this.fetchData(this.listQuery)
-
-    console.log(asyncRouterMap)
+    this.fetchData(this.listQuery);
     const arr = asyncRouterMap.filter((item) => {
       if (item.children) {
-        const obj = item.children
+        const obj = item.children;
         obj.map((k) => {
-          k.title = k.meta.title
-        })
+          k.title = k.meta.title;
+        });
       }
 
-
-      if (item.hidden) { return false }
-      return true
-    })
-    this.menu = arr
+      if (item.hidden) {
+        return false;
+      }
+      return true;
+    });
+    this.menu = arr;
   },
   methods: {
     handleSizeChange(val) {
-      this.listQuery.pageSize = val
-      this.fetchData(this.listQuery)
+      this.listQuery.pageSize = val;
+      this.fetchData(this.listQuery);
     },
     handleCurrentChange(val) {
-      this.listQuery.pageNumber = val
-      this.fetchData(this.listQuery)
+      this.listQuery.pageNumber = val;
+      this.fetchData(this.listQuery);
     },
 
     fetchData(params) {
-      this.listLoading = true
+      this.listLoading = true;
       RoleList(params).then((response) => {
-        this.list = response.data.list
-        console.log(this.list)
-        this.listQuery.totalCount = parseInt(response.data.total, 10)
-        this.listLoading = false
-      })
+        this.list = response.data.list;
+        this.listQuery.totalCount = parseInt(response.data.total, 10);
+        this.listLoading = false;
+      });
     },
     New() {
-      this.temp.rolename = ''
-      this.temp.rank = ''
-      this.menulist = ''
-      this.temp.id = ''
-      this.dialogStatus = 'create'
-
-      this.dialogFormVisible = true
+      this.temp.rolename = '';
+      this.temp.rank = '';
+      this.menulist = '';
+      this.temp.id = '';
+      this.dialogStatus = 'create';
 
+      this.dialogFormVisible = true;
 
       this.$nextTick(() => {
-        this.$refs.tree.setCheckedKeys([])
-      })
+        this.$refs.tree.setCheckedKeys([]);
+      });
     },
     Delete(id) {
       this.$confirm('确认删除?', '提示', {
@@ -221,39 +232,39 @@ export default {
         type: 'warning',
       }).then(() => {
         DeleteRole(id).then(() => {
-          this.fetchData(this.listQuery)
-        })
-      })
+          this.fetchData(this.listQuery);
+        });
+      });
     },
     Edit(id) {
-      this.dialogStatus = 'update'
+      this.dialogStatus = 'update';
 
       GetRoleDetail(id).then((response) => {
-        this.dialogStatus = 'update'
-        this.temp = response.data
+        this.dialogStatus = 'update';
+        this.temp = response.data;
         this.$nextTick(() => {
-          this.$refs.tree.setCheckedKeys(this.temp.roleauthname.split(','))
-        })
-        this.dialogFormVisible = true
-      })
+          this.$refs.tree.setCheckedKeys(this.temp.roleauthname.split(','));
+        });
+        this.dialogFormVisible = true;
+      });
     },
 
     create() {
-      this.temp.roleauthname = this.$refs.tree.getCheckedKeys().join(',')
+      this.temp.roleauthname = this.$refs.tree.getCheckedKeys().join(',');
 
       AddRole(this.temp).then(() => {
-        this.dialogFormVisible = false
-        this.fetchData(this.listQuery)
-      })
+        this.dialogFormVisible = false;
+        this.fetchData(this.listQuery);
+      });
     },
     update() {
-      this.temp.roleauthname = this.$refs.tree.getCheckedKeys().join(',')
+      this.temp.roleauthname = this.$refs.tree.getCheckedKeys().join(',');
       UpdateRole(this.temp).then(() => {
-        this.dialogFormVisible = false
+        this.dialogFormVisible = false;
 
-        this.fetchData(this.listQuery)
-      })
+        this.fetchData(this.listQuery);
+      });
     },
   },
-}
+};
 </script>
diff --git a/src/views/system/unit.vue b/src/views/system/unit.vue
index 36797cd..8de9254 100644
--- a/src/views/system/unit.vue
+++ b/src/views/system/unit.vue
@@ -1,80 +1,89 @@
 <template>
   <div
     id="unit"
-    class="widget-box">
-
-
-<el-row>
-  <el-col :span="8">
-
-    <el-input
-  placeholder="输入关键字进行过滤"
-  v-model="filterText" style="width:80%;">
-</el-input>
-
-
-     <el-tree
-            ref="unittree"
-            :data="unitList"
-            :props="defaultProps"
-            node-key="id"
-            highlight-current
-              :default-expanded-keys="['00000000-0000-0001-0000-000000000000']"
-            @node-click="unitTreeClick"
-                          :filter-node-method="filterNode"
-
+    class="widget-box"
+  >
+
+    <el-row>
+      <el-col :span="8">
+
+        <el-input
+          placeholder="输入关键字进行过滤"
+          v-model="filterText"
+          style="width:80%;"
+        >
+        </el-input>
+
+        <el-tree
+          ref="unittree"
+          :data="unitList"
+          :props="defaultProps"
+          node-key="id"
+          highlight-current
+          :default-expanded-keys="['00000000-0000-0001-0000-000000000000']"
+          @node-click="unitTreeClick"
+          :filter-node-method="filterNode"
+        />
+      </el-col>
+      <el-col :span="16">
+        <el-form
+          :model="temp"
+          class="small-space"
+          label-position="left"
+          label-width="70px"
+          v-if="temp"
+        >
+          <el-form-item label="单位名称">
+            <el-input
+              v-model="temp.unitname"
+              class="filter-item"
+              placeholder="请输入单位名称"
+            />
+          </el-form-item>
+          <el-form-item label="上级单位">
+            <el-select
+              v-model="temp.parentid"
+              placeholder="请选择"
+              filterable
+            >
+              <el-option
+                v-for="item in unitoptions"
+                :key="item.id"
+                :label="item.unitname"
+                :value="item.id"
+              />
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="排序码">
+            <el-input
+              v-model="temp.rank"
+              class="filter-item"
+              placeholder="请输入排序码"
             />
-  </el-col>
-    <el-col :span="16">
-         <el-form
-        :model="temp"
-        class="small-space"
-        label-position="left"
-        label-width="70px" v-if="temp">
-             <el-form-item label="单位名称">
-          <el-input
-            v-model="temp.unitname"
-            class="filter-item"
-            placeholder="请输入单位名称"/>
-        </el-form-item>
-  <el-form-item label="上级单位">
-          <el-select
-            v-model="temp.parentid"
-            placeholder="请选择"
-            filterable>
-            <el-option
-              v-for="item in unitoptions"
-              :key="item.id"
-
-              :label="item.unitname"
-              :value="item.id"/>
-          </el-select>
-
-        </el-form-item>
-
-        <el-form-item label="排序码">
-          <el-input
-            v-model="temp.rank"
-            class="filter-item"
-            placeholder="请输入排序码"/>
-        </el-form-item>
-
-
-      </el-form>
-    <div
-        class="dialog-footer">
-         <el-button
-          type="success"
-          @click="clearObj">新 增</el-button>
-        <el-button
-          type="primary"
-          @click="save">保 存</el-button>
-        <el-button v-if="status==='update'" type="danger" @click="Delete">删 除</el-button>
-
-      </div>
-    </el-col>
-
-</el-row>
+          </el-form-item>
+
+        </el-form>
+        <div class="dialog-footer">
+          <el-button
+            type="success"
+            @click="clearObj"
+          >新 增</el-button>
+          <el-button
+            type="primary"
+            @click="save"
+          >保 存</el-button>
+          <el-button
+            v-if="status==='update'"
+            type="danger"
+            @click="Delete"
+          >删 除</el-button>
+
+        </div>
+      </el-col>
+
+    </el-row>
 
   </div>
 </template>
@@ -90,7 +99,6 @@ import {
   getObj,
 } from '@/api/system/unit';
 
-
 export default {
   name: 'Unit',
   data() {
@@ -105,28 +113,27 @@ export default {
         children: 'children',
         label: 'nodeName',
       },
-    }
+    };
   },
 
   created() {
     getObj().then((res) => {
-      this.temp = res.data
-    })
+      this.temp = res.data;
+    });
     UnitList().then((res) => {
       this.unitoptions = res.data.list;
-    })
-    this.fetchUnit()
+    });
+    this.fetchUnit();
   },
 
   watch: {
     filterText(val) {
       this.$nextTick(() => {
         this.$refs.unittree.filter(val);
-      })
+      });
     },
   },
 
-
   methods: {
     filterNode(value, data) {
       if (!value) return true;
@@ -134,9 +141,9 @@ export default {
     },
     clearObj() {
       Object.keys(this.temp).forEach((key) => {
-        this.temp[key] = ''
-      })
-      this.status = 'create'
+        this.temp[key] = '';
+      });
+      this.status = 'create';
     },
     fetchUnit() {
       GetUnitTree().then((response) => {
@@ -144,8 +151,8 @@ export default {
       });
     },
     unitTreeClick(obj) {
-      this.status = 'update'
-      this.Edit(obj.id)
+      this.status = 'update';
+      this.Edit(obj.id);
     },
 
     Delete() {
@@ -153,12 +160,11 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      })
-        .then(() => {
-          DeleteUnit(this.temp.id).then(() => {
-            this.fetchUnit()
-          })
-        })
+      }).then(() => {
+        DeleteUnit(this.temp.id).then(() => {
+          this.fetchUnit();
+        });
+      });
     },
     Edit(id) {
       GetUnitDetail(id).then((response) => {
@@ -169,24 +175,23 @@ export default {
       if (this.status === 'create') {
         AddUnit(this.temp).then(() => {
           this.fetchUnit();
-        })
+        });
       } else {
         UpdateUnit(this.temp).then(() => {
           this.fetchUnit();
-        })
+        });
       }
     },
   },
 };
-
 </script>
 
 <style scope>
-.tree{
-  max-height:400px;
+.tree {
+  max-height: 400px;
   overflow: auto;
 }
-.dialog-footer{
+.dialog-footer {
   text-align: center;
 }
 </style>
diff --git a/src/views/system/users.vue b/src/views/system/users.vue
index 3b7afad..48ec117 100644
--- a/src/views/system/users.vue
+++ b/src/views/system/users.vue
@@ -1,14 +1,15 @@
 <template>
   <div
     id="users"
-    class=" widget-box">
+    class=" widget-box"
+  >
 
     <el-button
       type="primary"
       size="small"
       style="margin:10px 0px"
-      @click="New()">新增</el-button>
-
+      @click="New()"
+    >新增</el-button>
 
     <el-table
       v-loading.body="listLoading"
@@ -16,11 +17,13 @@
       element-loading-text="拼命加载中"
       border
       fit
-      highlight-current-row>
+      highlight-current-row
+    >
       <el-table-column
         align="center"
         label="ID"
-        width="95">
+        width="95"
+      >
         <template slot-scope="scope">
           {{ scope.$index+1 }}
         </template>
@@ -32,28 +35,32 @@
       </el-table-column>
       <el-table-column
         label="用户名"
-        align="center">
+        align="center"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.UserName }}</span>
         </template>
       </el-table-column>
       <el-table-column
         label="密码"
-        align="center">
+        align="center"
+      >
         <template slot-scope="scope">
           {{ scope.row.Password }}
         </template>
       </el-table-column>
       <el-table-column
         label="角色"
-        align="center">
+        align="center"
+      >
         <template slot-scope="scope">
           {{ scope.row.RoleName }}
         </template>
       </el-table-column>
       <el-table-column
         label="部门"
-        align="center">
+        align="center"
+      >
         <template slot-scope="scope">
           {{ scope.row.DeptName }}
         </template>
@@ -62,17 +69,20 @@
       <el-table-column
         label="操作"
         align="center"
-        min-width="110px">
+        min-width="110px"
+      >
         <template slot-scope="scope">
           <el-button
             type="success"
             size="small"
-            @click="Edit(scope.row.ID)">编辑</el-button>
+            @click="Edit(scope.row.ID)"
+          >编辑</el-button>
 
           <el-button
             type="danger"
             size="small"
-            @click="Delete(scope.row.ID)">删除</el-button>
+            @click="Delete(scope.row.ID)"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -80,62 +90,68 @@
       :current-page="listQuery.pageNumber"
       :page-sizes="[10, 20, 30]"
       :page-size="listQuery.pageSize"
-
       :total="listQuery.totalCount"
       layout="total,sizes, prev, pager, next"
       style="margin-top:5px"
       @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"/>
+      @current-change="handleCurrentChange"
+    />
 
     <el-dialog
       :title="textMap[dialogStatus]"
       :visible.sync="dialogFormVisible"
       :modal-append-to-body="false"
-      width="50%">
+      width="50%"
+    >
       <el-form
         :model="temp"
         class="small-space"
         label-position="left"
-        label-width="70px">
-
+        label-width="70px"
+      >
 
         <el-form-item label="昵称">
           <el-input
             v-model="temp.realname"
             class="filter-item"
-            placeholder="请输入昵称"/>
+            placeholder="请输入昵称"
+          />
         </el-form-item>
         <el-form-item label="用户名">
           <el-input
             v-model="temp.username"
             class="filter-item"
-            placeholder="请输入用户名"/>
+            placeholder="请输入用户名"
+          />
         </el-form-item>
         <el-form-item label="密码">
           <el-input
             v-model="temp.password"
             class="filter-item"
             type="password"
-            placeholder="请输入密码"/>
+            placeholder="请输入密码"
+          />
         </el-form-item>
         <el-form-item label="排序码">
           <el-input
             v-model="temp.rank"
             class="filter-item"
-            placeholder="请输入排序码"/>
+            placeholder="请输入排序码"
+          />
         </el-form-item>
 
         <el-form-item label="部门">
           <el-select
             v-model="temp.deptid"
             placeholder="请选择"
-            filterable>
+            filterable
+          >
             <el-option
               v-for="item in deptoptions"
               :key="item.id"
-
               :label="item.deptname"
-              :value="item.id"/>
+              :value="item.id"
+            />
           </el-select>
 
         </el-form-item>
@@ -143,28 +159,33 @@
         <el-form-item label="角色">
           <el-select
             v-model="temp.roleid"
-            placeholder="请选择">
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in roleoptions"
               :key="item.id"
               :label="item.rolename"
-              :value="item.id"/>
+              :value="item.id"
+            />
           </el-select>
 
         </el-form-item>
       </el-form>
       <div
         slot="footer"
-        class="dialog-footer">
+        class="dialog-footer"
+      >
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button
           v-if="dialogStatus=='create'"
           type="primary"
-          @click="create">确 定</el-button>
+          @click="create"
+        >确 定</el-button>
         <el-button
           v-else
           type="primary"
-          @click="update">确 定</el-button>
+          @click="update"
+        >确 定</el-button>
       </div>
     </el-dialog>
 
@@ -182,7 +203,6 @@ import {
 import { DeptList } from '@/api/system/dept';
 import { RoleList } from '@/api/system/role';
 
-
 export default {
   name: 'Users',
 
@@ -223,7 +243,6 @@ export default {
     };
   },
 
-
   created() {
     this.fetchData(this.listQuery);
 
@@ -260,10 +279,10 @@ export default {
         realname: '',
         roleid: '',
         deptid: '',
-      }
-      this.dialogFormVisible = true
+      };
+      this.dialogFormVisible = true;
 
-      this.dialogStatus = 'create'
+      this.dialogStatus = 'create';
     },
     Delete(ID) {
       this.$confirm('确认删除?', '提示', {