From fc4730662706fbdc37f5be69ba2e088ae016e8e1 Mon Sep 17 00:00:00 2001
From: zhanghouying <zhy6599@163.com>
Date: Fri, 1 Nov 2019 14:54:04 +0800
Subject: [PATCH 01/64] =?UTF-8?q?=E4=B8=B0=E5=AF=8C=E9=A6=96=E9=A1=B5Echar?=
 =?UTF-8?q?ts=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/views/dashboard/Category.vue              | 438 ++++++++++++++++++
 src/views/dashboard/Funnel.vue                | 120 +++++
 src/views/dashboard/Gauge.vue                 |  74 +++
 src/views/dashboard/Graph.vue                 | 101 ++++
 src/views/dashboard/HeatMap.vue               | 105 +++++
 src/views/dashboard/Line3D.vue                |  96 ++++
 src/views/dashboard/Point.vue                 | 149 ++++++
 .../{RaddarChart.vue => RadarChart.vue}       |   0
 src/views/dashboard/Rich.vue                  | 149 ++++++
 src/views/dashboard/Sankey.vue                | 100 ++++
 src/views/dashboard/Scatter.vue               | 143 ++++++
 src/views/dashboard/Sunburst.vue              | 107 +++++
 src/views/dashboard/ThemeRiver.vue            | 148 ++++++
 src/views/home.vue                            | 104 ++++-
 15 files changed, 1828 insertions(+), 7 deletions(-)
 create mode 100644 src/views/dashboard/Category.vue
 create mode 100644 src/views/dashboard/Funnel.vue
 create mode 100644 src/views/dashboard/Gauge.vue
 create mode 100644 src/views/dashboard/Graph.vue
 create mode 100644 src/views/dashboard/HeatMap.vue
 create mode 100644 src/views/dashboard/Line3D.vue
 create mode 100644 src/views/dashboard/Point.vue
 rename src/views/dashboard/{RaddarChart.vue => RadarChart.vue} (100%)
 create mode 100644 src/views/dashboard/Rich.vue
 create mode 100644 src/views/dashboard/Sankey.vue
 create mode 100644 src/views/dashboard/Scatter.vue
 create mode 100644 src/views/dashboard/Sunburst.vue
 create mode 100644 src/views/dashboard/ThemeRiver.vue

diff --git a/package.json b/package.json
index 4c6f09f..82a1928 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "codemirror": "^5.38.0",
     "connect": "3.6.6",
     "echarts": "^4.1.0",
+    "echarts-gl": "^1.1.1",
     "element-ui": "^2.12.0",
     "file-saver": "1.3.8",
     "js-cookie": "2.2.0",
diff --git a/src/views/dashboard/Category.vue b/src/views/dashboard/Category.vue
new file mode 100644
index 0000000..767b981
--- /dev/null
+++ b/src/views/dashboard/Category.vue
@@ -0,0 +1,438 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '500px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      const dataMap = {}
+
+      function dataFormatter(obj) {
+        const pList = ['北京', '天津', '河北', '山西', '内蒙古', '辽宁', '吉林', '黑龙江', '上海', '江苏', '浙江', '安徽', '福建', '江西', '山东', '河南', '湖北', '湖南', '广东', '广西', '海南', '重庆', '四川', '贵州', '云南', '西藏', '陕西', '甘肃', '青海', '宁夏', '新疆']
+        let temp
+        for (let year = 2002; year <= 2011; year++) {
+          let max = 0
+          let sum = 0
+          temp = obj[year]
+          for (let i = 0, l = temp.length; i < l; i++) {
+            max = Math.max(max, temp[i])
+            sum += temp[i]
+            obj[year][i] = {
+              name: pList[i],
+              value: temp[i]
+            }
+          }
+          obj[year + 'max'] = Math.floor(max / 100) * 100
+          obj[year + 'sum'] = sum
+        }
+        return obj
+      }
+
+      dataMap.dataGDP = dataFormatter({
+        2011: [16251.93, 11307.28, 24515.76, 11237.55, 14359.88, 22226.7, 10568.83, 12582, 19195.69, 49110.27, 32318.85, 15300.65, 17560.18, 11702.82, 45361.85, 26931.03, 19632.26, 19669.56, 53210.28, 11720.87, 2522.66, 10011.37, 21026.68, 5701.84, 8893.12, 605.83, 12512.3, 5020.37, 1670.44, 2102.21, 6610.05],
+        2010: [14113.58, 9224.46, 20394.26, 9200.86, 11672, 18457.27, 8667.58, 10368.6, 17165.98, 41425.48, 27722.31, 12359.33, 14737.12, 9451.26, 39169.92, 23092.36, 15967.61, 16037.96, 46013.06, 9569.85, 2064.5, 7925.58, 17185.48, 4602.16, 7224.18, 507.46, 10123.48, 4120.75, 1350.43, 1689.65, 5437.47],
+        2009: [12153.03, 7521.85, 17235.48, 7358.31, 9740.25, 15212.49, 7278.75, 8587, 15046.45, 34457.3, 22990.35, 10062.82, 12236.53, 7655.18, 33896.65, 19480.46, 12961.1, 13059.69, 39482.56, 7759.16, 1654.21, 6530.01, 14151.28, 3912.68, 6169.75, 441.36, 8169.8, 3387.56, 1081.27, 1353.31, 4277.05],
+        2008: [11115, 6719.01, 16011.97, 7315.4, 8496.2, 13668.58, 6426.1, 8314.37, 14069.87, 30981.98, 21462.69, 8851.66, 10823.01, 6971.05, 30933.28, 18018.53, 11328.92, 11555, 36796.71, 7021, 1503.06, 5793.66, 12601.23, 3561.56, 5692.12, 394.85, 7314.58, 3166.82, 1018.62, 1203.92, 4183.21],
+        2007: [9846.81, 5252.76, 13607.32, 6024.45, 6423.18, 11164.3, 5284.69, 7104, 12494.01, 26018.48, 18753.73, 7360.92, 9248.53, 5800.25, 25776.91, 15012.46, 9333.4, 9439.6, 31777.01, 5823.41, 1254.17, 4676.13, 10562.39, 2884.11, 4772.52, 341.43, 5757.29, 2703.98, 797.35, 919.11, 3523.16],
+        2006: [8117.78, 4462.74, 11467.6, 4878.61, 4944.25, 9304.52, 4275.12, 6211.8, 10572.24, 21742.05, 15718.47, 6112.5, 7583.85, 4820.53, 21900.19, 12362.79, 7617.47, 7688.67, 26587.76, 4746.16, 1065.67, 3907.23, 8690.24, 2338.98, 3988.14, 290.76, 4743.61, 2277.35, 648.5, 725.9, 3045.26],
+        2005: [6969.52, 3905.64, 10012.11, 4230.53, 3905.03, 8047.26, 3620.27, 5513.7, 9247.66, 18598.69, 13417.68, 5350.17, 6554.69, 4056.76, 18366.87, 10587.42, 6590.19, 6596.1, 22557.37, 3984.1, 918.75, 3467.72, 7385.1, 2005.42, 3462.73, 248.8, 3933.72, 1933.98, 543.32, 612.61, 2604.19],
+        2004: [6033.21, 3110.97, 8477.63, 3571.37, 3041.07, 6672, 3122.01, 4750.6, 8072.83, 15003.6, 11648.7, 4759.3, 5763.35, 3456.7, 15021.84, 8553.79, 5633.24, 5641.94, 18864.62, 3433.5, 819.66, 3034.58, 6379.63, 1677.8, 3081.91, 220.34, 3175.58, 1688.49, 466.1, 537.11, 2209.09],
+        2003: [5007.21, 2578.03, 6921.29, 2855.23, 2388.38, 6002.54, 2662.08, 4057.4, 6694.23, 12442.87, 9705.02, 3923.11, 4983.67, 2807.41, 12078.15, 6867.7, 4757.45, 4659.99, 15844.64, 2821.11, 713.96, 2555.72, 5333.09, 1426.34, 2556.02, 185.09, 2587.72, 1399.83, 390.2, 445.36, 1886.35],
+        2002: [4315, 2150.76, 6018.28, 2324.8, 1940.94, 5458.22, 2348.54, 3637.2, 5741.03, 10606.85, 8003.67, 3519.72, 4467.55, 2450.48, 10275.5, 6035.48, 4212.82, 4151.54, 13502.42, 2523.73, 642.73, 2232.86, 4725.01, 1243.43, 2312.82, 162.04, 2253.39, 1232.03, 340.65, 377.16, 1612.6]
+      })
+
+      dataMap.dataPI = dataFormatter({
+        2011: [136.27, 159.72, 2905.73, 641.42, 1306.3, 1915.57, 1277.44, 1701.5, 124.94, 3064.78, 1583.04, 2015.31, 1612.24, 1391.07, 3973.85, 3512.24, 2569.3, 2768.03, 2665.2, 2047.23, 659.23, 844.52, 2983.51, 726.22, 1411.01, 74.47, 1220.9, 678.75, 155.08, 184.14, 1139.03],
+        2010: [124.36, 145.58, 2562.81, 554.48, 1095.28, 1631.08, 1050.15, 1302.9, 114.15, 2540.1, 1360.56, 1729.02, 1363.67, 1206.98, 3588.28, 3258.09, 2147, 2325.5, 2286.98, 1675.06, 539.83, 685.38, 2482.89, 625.03, 1108.38, 68.72, 988.45, 599.28, 134.92, 159.29, 1078.63],
+        2009: [118.29, 128.85, 2207.34, 477.59, 929.6, 1414.9, 980.57, 1154.33, 113.82, 2261.86, 1163.08, 1495.45, 1182.74, 1098.66, 3226.64, 2769.05, 1795.9, 1969.69, 2010.27, 1458.49, 462.19, 606.8, 2240.61, 550.27, 1067.6, 63.88, 789.64, 497.05, 107.4, 127.25, 759.74],
+        2008: [112.83, 122.58, 2034.59, 313.58, 907.95, 1302.02, 916.72, 1088.94, 111.8, 2100.11, 1095.96, 1418.09, 1158.17, 1060.38, 3002.65, 2658.78, 1780, 1892.4, 1973.05, 1453.75, 436.04, 575.4, 2216.15, 539.19, 1020.56, 60.62, 753.72, 462.27, 105.57, 118.94, 691.07],
+        2007: [101.26, 110.19, 1804.72, 311.97, 762.1, 1133.42, 783.8, 915.38, 101.84, 1816.31, 986.02, 1200.18, 1002.11, 905.77, 2509.14, 2217.66, 1378, 1626.48, 1695.57, 1241.35, 361.07, 482.39, 2032, 446.38, 837.35, 54.89, 592.63, 387.55, 83.41, 97.89, 628.72],
+        2006: [88.8, 103.35, 1461.81, 276.77, 634.94, 939.43, 672.76, 750.14, 93.81, 1545.05, 925.1, 1011.03, 865.98, 786.14, 2138.9, 1916.74, 1140.41, 1272.2, 1532.17, 1032.47, 323.48, 386.38, 1595.48, 382.06, 724.4, 50.9, 484.81, 334, 67.55, 79.54, 527.8],
+        2005: [88.68, 112.38, 1400, 262.42, 589.56, 882.41, 625.61, 684.6, 90.26, 1461.51, 892.83, 966.5, 827.36, 727.37, 1963.51, 1892.01, 1082.13, 1100.65, 1428.27, 912.5, 300.75, 463.4, 1481.14, 368.94, 661.69, 48.04, 435.77, 308.06, 65.34, 72.07, 509.99],
+        2004: [87.36, 105.28, 1370.43, 276.3, 522.8, 798.43, 568.69, 605.79, 83.45, 1367.58, 814.1, 950.5, 786.84, 664.5, 1778.45, 1649.29, 1020.09, 1022.45, 1248.59, 817.88, 278.76, 428.05, 1379.93, 334.5, 607.75, 44.3, 387.88, 286.78, 60.7, 65.33, 461.26],
+        2003: [84.11, 89.91, 1064.05, 215.19, 420.1, 615.8, 488.23, 504.8, 81.02, 1162.45, 717.85, 749.4, 692.94, 560, 1480.67, 1198.7, 798.35, 886.47, 1072.91, 658.78, 244.29, 339.06, 1128.61, 298.69, 494.6, 40.7, 302.66, 237.91, 48.47, 55.63, 412.9],
+        2002: [82.44, 84.21, 956.84, 197.8, 374.69, 590.2, 446.17, 474.2, 79.68, 1110.44, 685.2, 783.66, 664.78, 535.98, 1390, 1288.36, 707, 847.25, 1015.08, 601.99, 222.89, 317.87, 1047.95, 281.1, 463.44, 39.75, 282.21, 215.51, 47.31, 52.95, 305]
+      })
+
+      dataMap.dataSI = dataFormatter({
+        2011: [3752.48, 5928.32, 13126.86, 6635.26, 8037.69, 12152.15, 5611.48, 5962.41, 7927.89, 25203.28, 16555.58, 8309.38, 9069.2, 6390.55, 24017.11, 15427.08, 9815.94, 9361.99, 26447.38, 5675.32, 714.5, 5543.04, 11029.13, 2194.33, 3780.32, 208.79, 6935.59, 2377.83, 975.18, 1056.15, 3225.9],
+        2010: [3388.38, 4840.23, 10707.68, 5234, 6367.69, 9976.82, 4506.31, 5025.15, 7218.32, 21753.93, 14297.93, 6436.62, 7522.83, 5122.88, 21238.49, 13226.38, 7767.24, 7343.19, 23014.53, 4511.68, 571, 4359.12, 8672.18, 1800.06, 3223.49, 163.92, 5446.1, 1984.97, 744.63, 827.91, 2592.15],
+        2009: [2855.55, 3987.84, 8959.83, 3993.8, 5114, 7906.34, 3541.92, 4060.72, 6001.78, 18566.37, 11908.49, 4905.22, 6005.3, 3919.45, 18901.83, 11010.5, 6038.08, 5687.19, 19419.7, 3381.54, 443.43, 3448.77, 6711.87, 1476.62, 2582.53, 136.63, 4236.42, 1527.24, 575.33, 662.32, 1929.59],
+        2008: [2626.41, 3709.78, 8701.34, 4242.36, 4376.19, 7158.84, 3097.12, 4319.75, 6085.84, 16993.34, 11567.42, 4198.93, 5318.44, 3554.81, 17571.98, 10259.99, 5082.07, 5028.93, 18502.2, 3037.74, 423.55, 3057.78, 5823.39, 1370.03, 2452.75, 115.56, 3861.12, 1470.34, 557.12, 609.98, 2070.76],
+        2007: [2509.4, 2892.53, 7201.88, 3454.49, 3193.67, 5544.14, 2475.45, 3695.58, 5571.06, 14471.26, 10154.25, 3370.96, 4476.42, 2975.53, 14647.53, 8282.83, 4143.06, 3977.72, 16004.61, 2425.29, 364.26, 2368.53, 4648.79, 1124.79, 2038.39, 98.48, 2986.46, 1279.32, 419.03, 455.04, 1647.55],
+        2006: [2191.43, 2457.08, 6110.43, 2755.66, 2374.96, 4566.83, 1915.29, 3365.31, 4969.95, 12282.89, 8511.51, 2711.18, 3695.04, 2419.74, 12574.03, 6724.61, 3365.08, 3187.05, 13469.77, 1878.56, 308.62, 1871.65, 3775.14, 967.54, 1705.83, 80.1, 2452.44, 1043.19, 331.91, 351.58, 1459.3],
+        2005: [2026.51, 2135.07, 5271.57, 2357.04, 1773.21, 3869.4, 1580.83, 2971.68, 4381.2, 10524.96, 7164.75, 2245.9, 3175.92, 1917.47, 10478.62, 5514.14, 2852.12, 2612.57, 11356.6, 1510.68, 240.83, 1564, 3067.23, 821.16, 1426.42, 63.52, 1951.36, 838.56, 264.61, 281.05, 1164.79],
+        2004: [1853.58, 1685.93, 4301.73, 1919.4, 1248.27, 3061.62, 1329.68, 2487.04, 3892.12, 8437.99, 6250.38, 1844.9, 2770.49, 1566.4, 8478.69, 4182.1, 2320.6, 2190.54, 9280.73, 1253.7, 205.6, 1376.91, 2489.4, 681.5, 1281.63, 52.74, 1553.1, 713.3, 211.7, 244.05, 914.47],
+        2003: [1487.15, 1337.31, 3417.56, 1463.38, 967.49, 2898.89, 1098.37, 2084.7, 3209.02, 6787.11, 5096.38, 1535.29, 2340.82, 1204.33, 6485.05, 3310.14, 1956.02, 1777.74, 7592.78, 984.08, 175.82, 1135.31, 2014.8, 569.37, 1047.66, 47.64, 1221.17, 572.02, 171.92, 194.27, 719.54],
+        2002: [1249.99, 1069.08, 2911.69, 1134.31, 754.78, 2609.85, 943.49, 1843.6, 2622.45, 5604.49, 4090.48, 1337.04, 2036.97, 941.77, 5184.98, 2768.75, 1709.89, 1523.5, 6143.4, 846.89, 148.88, 958.87, 1733.38, 481.96, 934.88, 32.72, 1007.56, 501.69, 144.51, 153.06, 603.15]
+      })
+
+      dataMap.dataTI = dataFormatter({
+        2011: [12363.18, 5219.24, 8483.17, 3960.87, 5015.89, 8158.98, 3679.91, 4918.09, 11142.86, 20842.21, 14180.23, 4975.96, 6878.74, 3921.2, 17370.89, 7991.72, 7247.02, 7539.54, 24097.7, 3998.33, 1148.93, 3623.81, 7014.04, 2781.29, 3701.79, 322.57, 4355.81, 1963.79, 540.18, 861.92, 2245.12],
+        2010: [10600.84, 4238.65, 7123.77, 3412.38, 4209.03, 6849.37, 3111.12, 4040.55, 9833.51, 17131.45, 12063.82, 4193.69, 5850.62, 3121.4, 14343.14, 6607.89, 6053.37, 6369.27, 20711.55, 3383.11, 953.67, 2881.08, 6030.41, 2177.07, 2892.31, 274.82, 3688.93, 1536.5, 470.88, 702.45, 1766.69],
+        2009: [9179.19, 3405.16, 6068.31, 2886.92, 3696.65, 5891.25, 2756.26, 3371.95, 8930.85, 13629.07, 9918.78, 3662.15, 5048.49, 2637.07, 11768.18, 5700.91, 5127.12, 5402.81, 18052.59, 2919.13, 748.59, 2474.44, 5198.8, 1885.79, 2519.62, 240.85, 3143.74, 1363.27, 398.54, 563.74, 1587.72],
+        2008: [8375.76, 2886.65, 5276.04, 2759.46, 3212.06, 5207.72, 2412.26, 2905.68, 7872.23, 11888.53, 8799.31, 3234.64, 4346.4, 2355.86, 10358.64, 5099.76, 4466.85, 4633.67, 16321.46, 2529.51, 643.47, 2160.48, 4561.69, 1652.34, 2218.81, 218.67, 2699.74, 1234.21, 355.93, 475, 1421.38],
+        2007: [7236.15, 2250.04, 4600.72, 2257.99, 2467.41, 4486.74, 2025.44, 2493.04, 6821.11, 9730.91, 7613.46, 2789.78, 3770, 1918.95, 8620.24, 4511.97, 3812.34, 3835.4, 14076.83, 2156.76, 528.84, 1825.21, 3881.6, 1312.94, 1896.78, 188.06, 2178.2, 1037.11, 294.91, 366.18, 1246.89],
+        2006: [5837.55, 1902.31, 3895.36, 1846.18, 1934.35, 3798.26, 1687.07, 2096.35, 5508.48, 7914.11, 6281.86, 2390.29, 3022.83, 1614.65, 7187.26, 3721.44, 3111.98, 3229.42, 11585.82, 1835.12, 433.57, 1649.2, 3319.62, 989.38, 1557.91, 159.76, 1806.36, 900.16, 249.04, 294.78, 1058.16],
+        2005: [4854.33, 1658.19, 3340.54, 1611.07, 1542.26, 3295.45, 1413.83, 1857.42, 4776.2, 6612.22, 5360.1, 2137.77, 2551.41, 1411.92, 5924.74, 3181.27, 2655.94, 2882.88, 9772.5, 1560.92, 377.17, 1440.32, 2836.73, 815.32, 1374.62, 137.24, 1546.59, 787.36, 213.37, 259.49, 929.41],
+        2004: [4092.27, 1319.76, 2805.47, 1375.67, 1270, 2811.95, 1223.64, 1657.77, 4097.26, 5198.03, 4584.22, 1963.9, 2206.02, 1225.8, 4764.7, 2722.4, 2292.55, 2428.95, 8335.3, 1361.92, 335.3, 1229.62, 2510.3, 661.8, 1192.53, 123.3, 1234.6, 688.41, 193.7, 227.73, 833.36],
+        2003: [3435.95, 1150.81, 2439.68, 1176.65, 1000.79, 2487.85, 1075.48, 1467.9, 3404.19, 4493.31, 3890.79, 1638.42, 1949.91, 1043.08, 4112.43, 2358.86, 2003.08, 1995.78, 7178.94, 1178.25, 293.85, 1081.35, 2189.68, 558.28, 1013.76, 96.76, 1063.89, 589.91, 169.81, 195.46, 753.91],
+        2002: [2982.57, 997.47, 2149.75, 992.69, 811.47, 2258.17, 958.88, 1319.4, 3038.9, 3891.92, 3227.99, 1399.02, 1765.8, 972.73, 3700.52, 1978.37, 1795.93, 1780.79, 6343.94, 1074.85, 270.96, 956.12, 1943.68, 480.37, 914.5, 89.56, 963.62, 514.83, 148.83, 171.14, 704.5]
+      })
+
+      dataMap.dataEstate = dataFormatter({
+        2011: [1074.93, 411.46, 918.02, 224.91, 384.76, 876.12, 238.61, 492.1, 1019.68, 2747.89, 1677.13, 634.92, 911.16, 402.51, 1838.14, 987, 634.67, 518.04, 3321.31, 465.68, 208.71, 396.28, 620.62, 160.3, 222.31, 17.44, 398.03, 134.25, 29.05, 79.01, 176.22],
+        2010: [1006.52, 377.59, 697.79, 192, 309.25, 733.37, 212.32, 391.89, 1002.5, 2600.95, 1618.17, 532.17, 679.03, 340.56, 1622.15, 773.23, 564.41, 464.21, 2813.95, 405.79, 188.33, 266.38, 558.56, 139.64, 223.45, 14.54, 315.95, 110.02, 25.41, 60.53, 143.44],
+        2009: [1062.47, 308.73, 612.4, 173.31, 286.65, 605.27, 200.14, 301.18, 1237.56, 2025.39, 1316.84, 497.94, 656.61, 305.9, 1329.59, 622.98, 546.11, 400.11, 2470.63, 348.98, 121.76, 229.09, 548.14, 136.15, 205.14, 13.28, 239.92, 101.37, 23.05, 47.56, 115.23],
+        2008: [844.59, 227.88, 513.81, 166.04, 273.3, 500.81, 182.7, 244.47, 939.34, 1626.13, 1052.03, 431.27, 506.98, 281.96, 1104.95, 512.42, 526.88, 340.07, 2057.45, 282.96, 95.6, 191.21, 453.63, 104.81, 195.48, 15.08, 193.27, 93.8, 19.96, 38.85, 89.79],
+        2007: [821.5, 183.44, 467.97, 134.12, 191.01, 410.43, 153.03, 225.81, 958.06, 1365.71, 981.42, 366.57, 511.5, 225.96, 953.69, 447.44, 409.65, 301.8, 2029.77, 239.45, 67.19, 196.06, 376.84, 93.19, 193.59, 13.24, 153.98, 83.52, 16.98, 29.49, 91.28],
+        2006: [658.3, 156.64, 397.14, 117.01, 136.5, 318.54, 131.01, 194.7, 773.61, 1017.91, 794.41, 281.98, 435.22, 184.67, 786.51, 348.7, 294.73, 254.81, 1722.07, 192.2, 44.45, 158.2, 336.2, 80.24, 165.92, 11.92, 125.2, 73.21, 15.17, 25.53, 68.9],
+        2005: [493.73, 122.67, 330.87, 106, 98.75, 256.77, 112.29, 163.34, 715.97, 799.73, 688.86, 231.66, 331.8, 171.88, 664.9, 298.19, 217.17, 215.63, 1430.37, 165.05, 38.2, 143.88, 286.23, 76.38, 148.69, 10.02, 108.62, 63.78, 14.1, 22.97, 55.79],
+        2004: [436.11, 106.14, 231.08, 95.1, 73.81, 203.1, 97.93, 137.74, 666.3, 534.17, 587.83, 188.28, 248.44, 167.2, 473.27, 236.44, 204.8, 191.5, 1103.75, 122.52, 30.64, 129.12, 264.3, 68.3, 116.54, 5.8, 95.9, 56.84, 13, 20.78, 53.55],
+        2003: [341.88, 92.31, 185.19, 78.73, 61.05, 188.49, 91.99, 127.2, 487.82, 447.47, 473.16, 162.63, 215.84, 138.02, 418.21, 217.58, 176.8, 186.49, 955.66, 100.93, 25.14, 113.69, 231.72, 59.86, 103.79, 4.35, 83.9, 48.09, 11.41, 16.85, 47.84],
+        2002: [298.02, 73.04, 140.89, 65.83, 51.48, 130.94, 76.11, 118.7, 384.86, 371.09, 360.63, 139.18, 188.09, 125.27, 371.13, 199.31, 145.17, 165.29, 808.16, 82.83, 21.45, 90.48, 210.82, 53.49, 95.68, 3.42, 77.68, 41.52, 9.74, 13.46, 43.04]
+      })
+
+      dataMap.dataFinancial = dataFormatter({
+        2011: [2215.41, 756.5, 746.01, 519.32, 447.46, 755.57, 207.65, 370.78, 2277.4, 2600.11, 2730.29, 503.85, 862.41, 357.44, 1640.41, 868.2, 674.57, 501.09, 2916.13, 445.37, 105.24, 704.66, 868.15, 297.27, 456.23, 31.7, 432.11, 145.05, 62.56, 134.18, 288.77],
+        2010: [1863.61, 572.99, 615.42, 448.3, 346.44, 639.27, 190.12, 304.59, 1950.96, 2105.92, 2326.58, 396.17, 767.58, 241.49, 1361.45, 697.68, 561.27, 463.16, 2658.76, 384.53, 78.12, 496.56, 654.7, 231.51, 375.08, 27.08, 384.75, 100.54, 54.53, 97.87, 225.2],
+        2009: [1603.63, 461.2, 525.67, 361.64, 291.1, 560.2, 180.83, 227.54, 1804.28, 1596.98, 1899.33, 359.6, 612.2, 165.1, 1044.9, 499.92, 479.11, 402.57, 2283.29, 336.82, 65.73, 389.97, 524.63, 194.44, 351.74, 23.17, 336.21, 88.27, 45.63, 75.54, 198.87],
+        2008: [1519.19, 368.1, 420.74, 290.91, 219.09, 455.07, 147.24, 177.43, 1414.21, 1298.48, 1653.45, 313.81, 497.65, 130.57, 880.28, 413.83, 393.05, 334.32, 1972.4, 249.01, 47.33, 303.01, 411.14, 151.55, 277.66, 22.42, 287.16, 72.49, 36.54, 64.8, 171.97],
+        2007: [1302.77, 288.17, 347.65, 218.73, 148.3, 386.34, 126.03, 155.48, 1209.08, 1054.25, 1251.43, 223.85, 385.84, 101.34, 734.9, 302.31, 337.27, 260.14, 1705.08, 190.73, 34.43, 247.46, 359.11, 122.25, 168.55, 11.51, 231.03, 61.6, 27.67, 51.05, 149.22],
+        2006: [982.37, 186.87, 284.04, 169.63, 108.21, 303.41, 100.75, 74.17, 825.2, 653.25, 906.37, 166.01, 243.9, 79.75, 524.94, 219.72, 174.99, 204.72, 899.91, 129.14, 16.37, 213.7, 299.5, 89.43, 143.62, 6.44, 152.25, 50.51, 23.69, 36.99, 99.25],
+        2005: [840.2, 147.4, 213.47, 135.07, 72.52, 232.85, 83.63, 35.03, 675.12, 492.4, 686.32, 127.05, 186.12, 69.55, 448.36, 181.74, 127.32, 162.37, 661.81, 91.93, 13.16, 185.18, 262.26, 73.67, 130.5, 7.57, 127.58, 44.73, 20.36, 32.25, 80.34],
+        2004: [713.79, 136.97, 209.1, 110.29, 55.89, 188.04, 77.17, 32.2, 612.45, 440.5, 523.49, 94.1, 171, 65.1, 343.37, 170.82, 118.85, 118.64, 602.68, 74, 11.56, 162.38, 236.5, 60.3, 118.4, 5.4, 90.1, 42.99, 19, 27.92, 70.3],
+        2003: [635.56, 112.79, 199.87, 118.48, 55.89, 145.38, 73.15, 32.2, 517.97, 392.11, 451.54, 87.45, 150.09, 64.31, 329.71, 165.11, 107.31, 99.35, 534.28, 61.59, 10.68, 147.04, 206.24, 48.01, 105.48, 4.74, 77.87, 42.31, 17.98, 24.8, 64.92],
+        2002: [561.91, 76.86, 179.6, 124.1, 48.39, 137.18, 75.45, 31.6, 485.25, 368.86, 347.53, 81.85, 138.28, 76.51, 310.07, 158.77, 96.95, 92.43, 454.65, 35.86, 10.08, 134.52, 183.13, 41.45, 102.39, 2.81, 67.3, 42.08, 16.75, 21.45, 52.18]
+      })
+
+      this.chart.setOption({
+        baseOption: {
+          timeline: {
+            axisType: 'category',
+            autoPlay: true,
+            playInterval: 1000,
+            data: [
+              '2002-01-01', '2003-01-01', '2004-01-01',
+              {
+                value: '2005-01-01',
+                tooltip: {
+                  formatter: '{b} GDP达到一个高度'
+                },
+                symbol: 'diamond',
+                symbolSize: 16
+              },
+              '2006-01-01', '2007-01-01', '2008-01-01', '2009-01-01', '2010-01-01',
+              {
+                value: '2011-01-01',
+                tooltip: {
+                  formatter: function(params) {
+                    return params.name + 'GDP达到又一个高度'
+                  }
+                },
+                symbol: 'diamond',
+                symbolSize: 18
+              }
+            ],
+            label: {
+              formatter: function(s) {
+                return (new Date(s)).getFullYear()
+              }
+            }
+          },
+          title: {
+            subtext: '数据来自国家统计局'
+          },
+          tooltip: {},
+          legend: {
+            x: 'right',
+            data: ['第一产业', '第二产业', '第三产业', 'GDP', '金融', '房地产'],
+            selected: {
+              'GDP': false, '金融': false, '房地产': false
+            }
+          },
+          calculable: true,
+          grid: {
+            top: 80,
+            bottom: 100,
+            tooltip: {
+              trigger: 'axis',
+              axisPointer: {
+                type: 'shadow',
+                label: {
+                  show: true,
+                  formatter: function(params) {
+                    return params.value.replace('\n', '')
+                  }
+                }
+              }
+            }
+          },
+          xAxis: [
+            {
+              'type': 'category',
+              'axisLabel': {
+                'interval': 0,
+                rotate: 45
+              },
+              'data': [
+                '北京', '\n天津', '河北', '\n山西', '内蒙古', '\n辽宁', '吉林', '\n黑龙江',
+                '上海', '\n江苏', '浙江', '\n安徽', '福建', '\n江西', '山东', '\n河南',
+                '湖北', '\n湖南', '广东', '\n广西', '海南', '\n重庆', '四川', '\n贵州',
+                '云南', '\n西藏', '陕西', '\n甘肃', '青海', '\n宁夏', '新疆'
+              ],
+              splitLine: { show: false }
+            }
+          ],
+          yAxis: [
+            {
+              type: 'value',
+              name: 'GDP（亿元）'
+            }
+          ],
+          series: [
+            { name: 'GDP', type: 'bar' },
+            { name: '金融', type: 'bar' },
+            { name: '房地产', type: 'bar' },
+            { name: '第一产业', type: 'bar' },
+            { name: '第二产业', type: 'bar' },
+            { name: '第三产业', type: 'bar' },
+            {
+              name: 'GDP占比',
+              type: 'pie',
+              center: ['75%', '35%'],
+              radius: '28%',
+              z: 100
+            }
+          ]
+        },
+        options: [
+          {
+            title: { text: '2002全国宏观经济指标' },
+            series: [
+              { data: dataMap.dataGDP['2002'] },
+              { data: dataMap.dataFinancial['2002'] },
+              { data: dataMap.dataEstate['2002'] },
+              { data: dataMap.dataPI['2002'] },
+              { data: dataMap.dataSI['2002'] },
+              { data: dataMap.dataTI['2002'] },
+              {
+                data: [
+                  { name: '第一产业', value: dataMap.dataPI['2002sum'] },
+                  { name: '第二产业', value: dataMap.dataSI['2002sum'] },
+                  { name: '第三产业', value: dataMap.dataTI['2002sum'] }
+                ]
+              }
+            ]
+          },
+          {
+            title: { text: '2003全国宏观经济指标' },
+            series: [
+              { data: dataMap.dataGDP['2003'] },
+              { data: dataMap.dataFinancial['2003'] },
+              { data: dataMap.dataEstate['2003'] },
+              { data: dataMap.dataPI['2003'] },
+              { data: dataMap.dataSI['2003'] },
+              { data: dataMap.dataTI['2003'] },
+              {
+                data: [
+                  { name: '第一产业', value: dataMap.dataPI['2003sum'] },
+                  { name: '第二产业', value: dataMap.dataSI['2003sum'] },
+                  { name: '第三产业', value: dataMap.dataTI['2003sum'] }
+                ]
+              }
+            ]
+          },
+          {
+            title: { text: '2004全国宏观经济指标' },
+            series: [
+              { data: dataMap.dataGDP['2004'] },
+              { data: dataMap.dataFinancial['2004'] },
+              { data: dataMap.dataEstate['2004'] },
+              { data: dataMap.dataPI['2004'] },
+              { data: dataMap.dataSI['2004'] },
+              { data: dataMap.dataTI['2004'] },
+              {
+                data: [
+                  { name: '第一产业', value: dataMap.dataPI['2004sum'] },
+                  { name: '第二产业', value: dataMap.dataSI['2004sum'] },
+                  { name: '第三产业', value: dataMap.dataTI['2004sum'] }
+                ]
+              }
+            ]
+          },
+          {
+            title: { text: '2005全国宏观经济指标' },
+            series: [
+              { data: dataMap.dataGDP['2005'] },
+              { data: dataMap.dataFinancial['2005'] },
+              { data: dataMap.dataEstate['2005'] },
+              { data: dataMap.dataPI['2005'] },
+              { data: dataMap.dataSI['2005'] },
+              { data: dataMap.dataTI['2005'] },
+              {
+                data: [
+                  { name: '第一产业', value: dataMap.dataPI['2005sum'] },
+                  { name: '第二产业', value: dataMap.dataSI['2005sum'] },
+                  { name: '第三产业', value: dataMap.dataTI['2005sum'] }
+                ]
+              }
+            ]
+          },
+          {
+            title: { text: '2006全国宏观经济指标' },
+            series: [
+              { data: dataMap.dataGDP['2006'] },
+              { data: dataMap.dataFinancial['2006'] },
+              { data: dataMap.dataEstate['2006'] },
+              { data: dataMap.dataPI['2006'] },
+              { data: dataMap.dataSI['2006'] },
+              { data: dataMap.dataTI['2006'] },
+              {
+                data: [
+                  { name: '第一产业', value: dataMap.dataPI['2006sum'] },
+                  { name: '第二产业', value: dataMap.dataSI['2006sum'] },
+                  { name: '第三产业', value: dataMap.dataTI['2006sum'] }
+                ]
+              }
+            ]
+          },
+          {
+            title: { text: '2007全国宏观经济指标' },
+            series: [
+              { data: dataMap.dataGDP['2007'] },
+              { data: dataMap.dataFinancial['2007'] },
+              { data: dataMap.dataEstate['2007'] },
+              { data: dataMap.dataPI['2007'] },
+              { data: dataMap.dataSI['2007'] },
+              { data: dataMap.dataTI['2007'] },
+              {
+                data: [
+                  { name: '第一产业', value: dataMap.dataPI['2007sum'] },
+                  { name: '第二产业', value: dataMap.dataSI['2007sum'] },
+                  { name: '第三产业', value: dataMap.dataTI['2007sum'] }
+                ]
+              }
+            ]
+          },
+          {
+            title: { text: '2008全国宏观经济指标' },
+            series: [
+              { data: dataMap.dataGDP['2008'] },
+              { data: dataMap.dataFinancial['2008'] },
+              { data: dataMap.dataEstate['2008'] },
+              { data: dataMap.dataPI['2008'] },
+              { data: dataMap.dataSI['2008'] },
+              { data: dataMap.dataTI['2008'] },
+              {
+                data: [
+                  { name: '第一产业', value: dataMap.dataPI['2008sum'] },
+                  { name: '第二产业', value: dataMap.dataSI['2008sum'] },
+                  { name: '第三产业', value: dataMap.dataTI['2008sum'] }
+                ]
+              }
+            ]
+          },
+          {
+            title: { text: '2009全国宏观经济指标' },
+            series: [
+              { data: dataMap.dataGDP['2009'] },
+              { data: dataMap.dataFinancial['2009'] },
+              { data: dataMap.dataEstate['2009'] },
+              { data: dataMap.dataPI['2009'] },
+              { data: dataMap.dataSI['2009'] },
+              { data: dataMap.dataTI['2009'] },
+              {
+                data: [
+                  { name: '第一产业', value: dataMap.dataPI['2009sum'] },
+                  { name: '第二产业', value: dataMap.dataSI['2009sum'] },
+                  { name: '第三产业', value: dataMap.dataTI['2009sum'] }
+                ]
+              }
+            ]
+          },
+          {
+            title: { text: '2010全国宏观经济指标' },
+            series: [
+              { data: dataMap.dataGDP['2010'] },
+              { data: dataMap.dataFinancial['2010'] },
+              { data: dataMap.dataEstate['2010'] },
+              { data: dataMap.dataPI['2010'] },
+              { data: dataMap.dataSI['2010'] },
+              { data: dataMap.dataTI['2010'] },
+              {
+                data: [
+                  { name: '第一产业', value: dataMap.dataPI['2010sum'] },
+                  { name: '第二产业', value: dataMap.dataSI['2010sum'] },
+                  { name: '第三产业', value: dataMap.dataTI['2010sum'] }
+                ]
+              }
+            ]
+          },
+          {
+            title: { text: '2011全国宏观经济指标' },
+            series: [
+              { data: dataMap.dataGDP['2011'] },
+              { data: dataMap.dataFinancial['2011'] },
+              { data: dataMap.dataEstate['2011'] },
+              { data: dataMap.dataPI['2011'] },
+              { data: dataMap.dataSI['2011'] },
+              { data: dataMap.dataTI['2011'] },
+              {
+                data: [
+                  { name: '第一产业', value: dataMap.dataPI['2011sum'] },
+                  { name: '第二产业', value: dataMap.dataSI['2011sum'] },
+                  { name: '第三产业', value: dataMap.dataTI['2011sum'] }
+                ]
+              }
+            ]
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/Funnel.vue b/src/views/dashboard/Funnel.vue
new file mode 100644
index 0000000..f8c7de3
--- /dev/null
+++ b/src/views/dashboard/Funnel.vue
@@ -0,0 +1,120 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        title: {
+          text: '漏斗图',
+          subtext: '纯属虚构'
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c}%'
+        },
+        toolbox: {
+          feature: {
+            dataView: { readOnly: false },
+            restore: {},
+            saveAsImage: {}
+          }
+        },
+        legend: {
+          data: ['展现', '点击', '访问', '咨询', '订单']
+        },
+        calculable: true,
+        series: [
+          {
+            name: '漏斗图',
+            type: 'funnel',
+            left: '10%',
+            top: 60,
+            bottom: 60,
+            width: '80%',
+            // height: {totalHeight} - y - y2,
+            min: 0,
+            max: 100,
+            minSize: '0%',
+            maxSize: '100%',
+            sort: 'descending',
+            gap: 2,
+            label: {
+              show: true,
+              position: 'inside'
+            },
+            labelLine: {
+              length: 10,
+              lineStyle: {
+                width: 1,
+                type: 'solid'
+              }
+            },
+            itemStyle: {
+              borderColor: '#fff',
+              borderWidth: 1
+            },
+            emphasis: {
+              label: {
+                fontSize: 20
+              }
+            },
+            data: [
+              { value: 60, name: '访问' },
+              { value: 40, name: '咨询' },
+              { value: 20, name: '订单' },
+              { value: 80, name: '点击' },
+              { value: 100, name: '展现' }
+            ]
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/Gauge.vue b/src/views/dashboard/Gauge.vue
new file mode 100644
index 0000000..b5030ce
--- /dev/null
+++ b/src/views/dashboard/Gauge.vue
@@ -0,0 +1,74 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          formatter: '{a} <br/>{b} : {c}%'
+        },
+        toolbox: {
+          feature: {
+            restore: {},
+            saveAsImage: {}
+          }
+        },
+        series: [
+          {
+            name: '业务指标',
+            type: 'gauge',
+            detail: { formatter: '{value}%' },
+            data: [{ value: 50, name: '完成率' }]
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/Graph.vue b/src/views/dashboard/Graph.vue
new file mode 100644
index 0000000..72397ee
--- /dev/null
+++ b/src/views/dashboard/Graph.vue
@@ -0,0 +1,101 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      const axisData = ['周一', '周二', '周三', '很长很长的周四', '周五', '周六', '周日']
+      const data = axisData.map(function(item, i) {
+        return Math.round(Math.random() * 1000 * (i + 1))
+      })
+      const links = data.map(function(item, i) {
+        return {
+          source: i,
+          target: i + 1
+        }
+      })
+      links.pop()
+      this.chart.setOption({
+        title: {
+          text: '笛卡尔坐标系上的 Graph'
+        },
+        tooltip: {},
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: axisData
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            type: 'graph',
+            layout: 'none',
+            coordinateSystem: 'cartesian2d',
+            symbolSize: 40,
+            label: {
+              normal: {
+                show: true
+              }
+            },
+            edgeSymbol: ['circle', 'arrow'],
+            edgeSymbolSize: [4, 10],
+            data: data,
+            links: links,
+            lineStyle: {
+              normal: {
+                color: '#2f4554'
+              }
+            }
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/HeatMap.vue b/src/views/dashboard/HeatMap.vue
new file mode 100644
index 0000000..c1a6db6
--- /dev/null
+++ b/src/views/dashboard/HeatMap.vue
@@ -0,0 +1,105 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          position: 'top'
+        },
+        animation: false,
+        grid: {
+          height: '50%',
+          y: '10%'
+        },
+        xAxis: {
+          type: 'category',
+          data: ['12a', '1a', '2a', '3a', '4a', '5a', '6a', '7a', '8a', '9a', '10a', '11a', '12p', '1p', '2p', '3p', '4p', '5p', '6p', '7p', '8p', '9p', '10p', '11p'],
+          splitArea: {
+            show: true
+          }
+        },
+        yAxis: {
+          type: 'category',
+          data: ['Saturday', 'Friday', 'Thursday', 'Wednesday', 'Tuesday', 'Monday', 'Sunday'],
+          splitArea: {
+            show: true
+          }
+        },
+        visualMap: {
+          min: 0,
+          max: 10,
+          calculable: true,
+          orient: 'horizontal',
+          left: 'center',
+          bottom: '15%'
+        },
+        series: [{
+          name: 'Punch Card',
+          type: 'heatmap',
+          data: [[0, 0, 5], [0, 1, 1], [0, 2, 0], [0, 3, 0], [0, 4, 0], [0, 5, 0], [0, 6, 0], [0, 7, 0], [0, 8, 0], [0, 9, 0], [0, 10, 0], [0, 11, 2], [0, 12, 4], [0, 13, 1], [0, 14, 1], [0, 15, 3], [0, 16, 4], [0, 17, 6], [0, 18, 4], [0, 19, 4], [0, 20, 3], [0, 21, 3], [0, 22, 2], [0, 23, 5], [1, 0, 7], [1, 1, 0], [1, 2, 0], [1, 3, 0], [1, 4, 0], [1, 5, 0], [1, 6, 0], [1, 7, 0], [1, 8, 0], [1, 9, 0], [1, 10, 5], [1, 11, 2], [1, 12, 2], [1, 13, 6], [1, 14, 9], [1, 15, 11], [1, 16, 6], [1, 17, 7], [1, 18, 8], [1, 19, 12], [1, 20, 5], [1, 21, 5], [1, 22, 7], [1, 23, 2], [2, 0, 1], [2, 1, 1], [2, 2, 0], [2, 3, 0], [2, 4, 0], [2, 5, 0], [2, 6, 0], [2, 7, 0], [2, 8, 0], [2, 9, 0], [2, 10, 3], [2, 11, 2], [2, 12, 1], [2, 13, 9], [2, 14, 8], [2, 15, 10], [2, 16, 6], [2, 17, 5], [2, 18, 5], [2, 19, 5], [2, 20, 7], [2, 21, 4], [2, 22, 2], [2, 23, 4], [3, 0, 7], [3, 1, 3], [3, 2, 0], [3, 3, 0], [3, 4, 0], [3, 5, 0], [3, 6, 0], [3, 7, 0], [3, 8, 1], [3, 9, 0], [3, 10, 5], [3, 11, 4], [3, 12, 7], [3, 13, 14], [3, 14, 13], [3, 15, 12], [3, 16, 9], [3, 17, 5], [3, 18, 5], [3, 19, 10], [3, 20, 6], [3, 21, 4], [3, 22, 4], [3, 23, 1], [4, 0, 1], [4, 1, 3], [4, 2, 0], [4, 3, 0], [4, 4, 0], [4, 5, 1], [4, 6, 0], [4, 7, 0], [4, 8, 0], [4, 9, 2], [4, 10, 4], [4, 11, 4], [4, 12, 2], [4, 13, 4], [4, 14, 4], [4, 15, 14], [4, 16, 12], [4, 17, 1], [4, 18, 8], [4, 19, 5], [4, 20, 3], [4, 21, 7], [4, 22, 3], [4, 23, 0], [5, 0, 2], [5, 1, 1], [5, 2, 0], [5, 3, 3], [5, 4, 0], [5, 5, 0], [5, 6, 0], [5, 7, 0], [5, 8, 2], [5, 9, 0], [5, 10, 4], [5, 11, 1], [5, 12, 5], [5, 13, 10], [5, 14, 5], [5, 15, 7], [5, 16, 11], [5, 17, 6], [5, 18, 0], [5, 19, 5], [5, 20, 3], [5, 21, 4], [5, 22, 2], [5, 23, 0], [6, 0, 1], [6, 1, 0], [6, 2, 0], [6, 3, 0], [6, 4, 0], [6, 5, 0], [6, 6, 0], [6, 7, 0], [6, 8, 0], [6, 9, 0], [6, 10, 1], [6, 11, 0], [6, 12, 2], [6, 13, 1], [6, 14, 3], [6, 15, 4], [6, 16, 0], [6, 17, 0], [6, 18, 0], [6, 19, 0], [6, 20, 1], [6, 21, 2], [6, 22, 2], [6, 23, 6]].map(function(item) {
+            return [item[1], item[0], item[2] || '-']
+          }),
+          label: {
+            normal: {
+              show: true
+            }
+          },
+          itemStyle: {
+            emphasis: {
+              shadowBlur: 10,
+              shadowColor: 'rgba(0, 0, 0, 0.5)'
+            }
+          }
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/Line3D.vue b/src/views/dashboard/Line3D.vue
new file mode 100644
index 0000000..3277f92
--- /dev/null
+++ b/src/views/dashboard/Line3D.vue
@@ -0,0 +1,96 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+import 'echarts-gl'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      const data = []
+      for (let t = 0; t < 25; t += 0.001) {
+        const x = (1 + 0.25 * Math.cos(75 * t)) * Math.cos(t)
+        const y = (1 + 0.25 * Math.cos(75 * t)) * Math.sin(t)
+        const z = t + 2.0 * Math.sin(75 * t)
+        data.push([x, y, z])
+      }
+      this.chart.setOption({
+        tooltip: {},
+        backgroundColor: '#fff',
+        visualMap: {
+          show: false,
+          dimension: 2,
+          min: 0,
+          max: 30,
+          inRange: {
+            color: ['#313695', '#4575b4', '#74add1', '#abd9e9', '#e0f3f8', '#ffffbf', '#fee090', '#fdae61', '#f46d43', '#d73027', '#a50026']
+          }
+        },
+        xAxis3D: {
+          type: 'value'
+        },
+        yAxis3D: {
+          type: 'value'
+        },
+        zAxis3D: {
+          type: 'value'
+        },
+        grid3D: {
+          viewControl: {
+            projection: 'orthographic'
+          }
+        },
+        series: [{
+          type: 'line3D',
+          data: data,
+          lineStyle: {
+            width: 4
+          }
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/Point.vue b/src/views/dashboard/Point.vue
new file mode 100644
index 0000000..a0e292d
--- /dev/null
+++ b/src/views/dashboard/Point.vue
@@ -0,0 +1,149 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        title: {
+          text: 'Graph 简单示例'
+        },
+        tooltip: {},
+        animationDurationUpdate: 1500,
+        animationEasingUpdate: 'quinticInOut',
+        series: [
+          {
+            type: 'graph',
+            layout: 'none',
+            symbolSize: 50,
+            roam: true,
+            label: {
+              normal: {
+                show: true
+              }
+            },
+            edgeSymbol: ['circle', 'arrow'],
+            edgeSymbolSize: [4, 10],
+            edgeLabel: {
+              normal: {
+                textStyle: {
+                  fontSize: 20
+                }
+              }
+            },
+            data: [{
+              name: '节点1',
+              x: 100,
+              y: 300
+            }, {
+              name: '节点2',
+              x: 1000,
+              y: 300
+            }, {
+              name: '节点3',
+              x: 550,
+              y: 100
+            }, {
+              name: '节点4',
+              x: 550,
+              y: 500
+            }],
+            // links: [],
+            links: [{
+              source: 0,
+              target: 1,
+              symbolSize: [5, 20],
+              label: {
+                normal: {
+                  show: true
+                }
+              },
+              lineStyle: {
+                normal: {
+                  width: 5,
+                  curveness: 0.2
+                }
+              }
+            }, {
+              source: '节点2',
+              target: '节点1',
+              label: {
+                normal: {
+                  show: true
+                }
+              },
+              lineStyle: {
+                normal: { curveness: 0.2 }
+              }
+            }, {
+              source: '节点1',
+              target: '节点3'
+            }, {
+              source: '节点2',
+              target: '节点3'
+            }, {
+              source: '节点2',
+              target: '节点4'
+            }, {
+              source: '节点1',
+              target: '节点4'
+            }],
+            lineStyle: {
+              normal: {
+                opacity: 0.9,
+                width: 2,
+                curveness: 0
+              }
+            }
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/RaddarChart.vue b/src/views/dashboard/RadarChart.vue
similarity index 100%
rename from src/views/dashboard/RaddarChart.vue
rename to src/views/dashboard/RadarChart.vue
diff --git a/src/views/dashboard/Rich.vue b/src/views/dashboard/Rich.vue
new file mode 100644
index 0000000..f7c87e4
--- /dev/null
+++ b/src/views/dashboard/Rich.vue
@@ -0,0 +1,149 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '500px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b}: {c} ({d}%)'
+        },
+        legend: {
+          orient: 'vertical',
+          x: 'left',
+          data: ['直达', '营销广告', '搜索引擎', '邮件营销', '联盟广告', '视频广告', '百度', '谷歌', '必应', '其他']
+        },
+        series: [
+          {
+            name: '访问来源',
+            type: 'pie',
+            selectedMode: 'single',
+            radius: [0, '30%'],
+
+            label: {
+              normal: {
+                position: 'inner'
+              }
+            },
+            labelLine: {
+              normal: {
+                show: false
+              }
+            },
+            data: [
+              { value: 335, name: '直达', selected: true },
+              { value: 679, name: '营销广告' },
+              { value: 1548, name: '搜索引擎' }
+            ]
+          },
+          {
+            name: '访问来源',
+            type: 'pie',
+            radius: ['40%', '55%'],
+            label: {
+              normal: {
+                formatter: '{a|{a}}{abg|}\n{hr|}\n  {b|{b}：}{c}  {per|{d}%}  ',
+                backgroundColor: '#eee',
+                borderColor: '#aaa',
+                borderWidth: 1,
+                borderRadius: 4,
+                shadowBlur: 3,
+                shadowOffsetX: 2,
+                shadowOffsetY: 2,
+                shadowColor: '#999',
+                padding: [0, 7],
+                rich: {
+                  a: {
+                    color: '#999',
+                    lineHeight: 22,
+                    align: 'center'
+                  },
+                  abg: {
+                    backgroundColor: '#333',
+                    width: '100%',
+                    align: 'right',
+                    height: 22,
+                    borderRadius: [4, 4, 0, 0]
+                  },
+                  hr: {
+                    borderColor: '#aaa',
+                    width: '100%',
+                    borderWidth: 0.5,
+                    height: 0
+                  },
+                  b: {
+                    fontSize: 16,
+                    lineHeight: 33
+                  },
+                  per: {
+                    color: '#eee',
+                    backgroundColor: '#334455',
+                    padding: [2, 4],
+                    borderRadius: 2
+                  }
+                }
+              }
+            },
+            data: [
+              { value: 335, name: '直达' },
+              { value: 310, name: '邮件营销' },
+              { value: 234, name: '联盟广告' },
+              { value: 135, name: '视频广告' },
+              { value: 1048, name: '百度' },
+              { value: 251, name: '谷歌' },
+              { value: 147, name: '必应' },
+              { value: 102, name: '其他' }
+            ]
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/Sankey.vue b/src/views/dashboard/Sankey.vue
new file mode 100644
index 0000000..208c4b7
--- /dev/null
+++ b/src/views/dashboard/Sankey.vue
@@ -0,0 +1,100 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        series: {
+          type: 'sankey',
+          layout: 'none',
+          focusNodeAdjacency: 'allEdges',
+          data: [{
+            name: 'a'
+          }, {
+            name: 'b'
+          }, {
+            name: 'a1'
+          }, {
+            name: 'a2'
+          }, {
+            name: 'b1'
+          }, {
+            name: 'c'
+          }],
+          links: [{
+            source: 'a',
+            target: 'a1',
+            value: 5
+          }, {
+            source: 'a',
+            target: 'a2',
+            value: 3
+          }, {
+            source: 'b',
+            target: 'b1',
+            value: 8
+          }, {
+            source: 'a',
+            target: 'b1',
+            value: 3
+          }, {
+            source: 'b1',
+            target: 'a1',
+            value: 1
+          }, {
+            source: 'b1',
+            target: 'c',
+            value: 2
+          }]
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/Scatter.vue b/src/views/dashboard/Scatter.vue
new file mode 100644
index 0000000..b91112e
--- /dev/null
+++ b/src/views/dashboard/Scatter.vue
@@ -0,0 +1,143 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      const data = [
+        [[28604, 77, 17096869, 'Australia', 1990], [31163, 77.4, 27662440, 'Canada', 1990], [1516, 68, 1154605773, 'China', 1990], [13670, 74.7, 10582082, 'Cuba', 1990], [28599, 75, 4986705, 'Finland', 1990], [29476, 77.1, 56943299, 'France', 1990], [31476, 75.4, 78958237, 'Germany', 1990], [28666, 78.1, 254830, 'Iceland', 1990], [1777, 57.7, 870601776, 'India', 1990], [29550, 79.1, 122249285, 'Japan', 1990], [2076, 67.9, 20194354, 'North Korea', 1990], [12087, 72, 42972254, 'South Korea', 1990], [24021, 75.4, 3397534, 'New Zealand', 1990], [43296, 76.8, 4240375, 'Norway', 1990], [10088, 70.8, 38195258, 'Poland', 1990], [19349, 69.6, 147568552, 'Russia', 1990], [10670, 67.3, 53994605, 'Turkey', 1990], [26424, 75.7, 57110117, 'United Kingdom', 1990], [37062, 75.4, 252847810, 'United States', 1990]],
+        [[44056, 81.8, 23968973, 'Australia', 2015], [43294, 81.7, 35939927, 'Canada', 2015], [13334, 76.9, 1376048943, 'China', 2015], [21291, 78.5, 11389562, 'Cuba', 2015], [38923, 80.8, 5503457, 'Finland', 2015], [37599, 81.9, 64395345, 'France', 2015], [44053, 81.1, 80688545, 'Germany', 2015], [42182, 82.8, 329425, 'Iceland', 2015], [5903, 66.8, 1311050527, 'India', 2015], [36162, 83.5, 126573481, 'Japan', 2015], [1390, 71.4, 25155317, 'North Korea', 2015], [34644, 80.7, 50293439, 'South Korea', 2015], [34186, 80.6, 4528526, 'New Zealand', 2015], [64304, 81.6, 5210967, 'Norway', 2015], [24787, 77.3, 38611794, 'Poland', 2015], [23038, 73.13, 143456918, 'Russia', 2015], [19360, 76.5, 78665830, 'Turkey', 2015], [38225, 81.4, 64715810, 'United Kingdom', 2015], [53354, 79.1, 321773631, 'United States', 2015]]
+      ]
+      this.chart.setOption({
+        title: {
+          text: '1990 与 2015 年各国家人均寿命与 GDP'
+        },
+        legend: {
+          right: 10,
+          data: ['1990', '2015']
+        },
+        xAxis: {
+          splitLine: {
+            lineStyle: {
+              type: 'dashed'
+            }
+          }
+        },
+        yAxis: {
+          splitLine: {
+            lineStyle: {
+              type: 'dashed'
+            }
+          },
+          scale: true
+        },
+        series: [{
+          name: '1990',
+          data: data[0],
+          type: 'scatter',
+          symbolSize: function(data) {
+            return Math.sqrt(data[2]) / 5e2
+          },
+          label: {
+            emphasis: {
+              show: true,
+              formatter: function(param) {
+                return param.data[3]
+              },
+              position: 'top'
+            }
+          },
+          itemStyle: {
+            normal: {
+              shadowBlur: 10,
+              shadowColor: 'rgba(120, 36, 50, 0.5)',
+              shadowOffsetY: 5,
+              color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [{
+                offset: 0,
+                color: 'rgb(251, 118, 123)'
+              }, {
+                offset: 1,
+                color: 'rgb(204, 46, 72)'
+              }])
+            }
+          }
+        }, {
+          name: '2015',
+          data: data[1],
+          type: 'scatter',
+          symbolSize: function(data) {
+            return Math.sqrt(data[2]) / 5e2
+          },
+          label: {
+            emphasis: {
+              show: true,
+              formatter: function(param) {
+                return param.data[3]
+              },
+              position: 'top'
+            }
+          },
+          itemStyle: {
+            normal: {
+              shadowBlur: 10,
+              shadowColor: 'rgba(25, 100, 150, 0.5)',
+              shadowOffsetY: 5,
+              color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [{
+                offset: 0,
+                color: 'rgb(129, 227, 238)'
+              }, {
+                offset: 1,
+                color: 'rgb(25, 183, 207)'
+              }])
+            }
+          }
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/Sunburst.vue b/src/views/dashboard/Sunburst.vue
new file mode 100644
index 0000000..a61aa51
--- /dev/null
+++ b/src/views/dashboard/Sunburst.vue
@@ -0,0 +1,107 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      const data = [{
+        name: 'Grandpa',
+        children: [{
+          name: 'Uncle Leo',
+          value: 15,
+          children: [{
+            name: 'Cousin Jack',
+            value: 2
+          }, {
+            name: 'Cousin Mary',
+            value: 5,
+            children: [{
+              name: 'Jackson',
+              value: 2
+            }]
+          }, {
+            name: 'Cousin Ben',
+            value: 4
+          }]
+        }, {
+          name: 'Father',
+          value: 10,
+          children: [{
+            name: 'Me',
+            value: 5
+          }, {
+            name: 'Brother Peter',
+            value: 1
+          }]
+        }]
+      }, {
+        name: 'Nancy',
+        children: [{
+          name: 'Uncle Nike',
+          children: [{
+            name: 'Cousin Betty',
+            value: 1
+          }, {
+            name: 'Cousin Jenny',
+            value: 2
+          }]
+        }]
+      }]
+      this.chart.setOption({
+        series: {
+          type: 'sunburst',
+          data: data,
+          radius: [0, '90%'],
+          label: {
+            rotate: 'radial'
+          }
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/ThemeRiver.vue b/src/views/dashboard/ThemeRiver.vue
new file mode 100644
index 0000000..73147d7
--- /dev/null
+++ b/src/views/dashboard/ThemeRiver.vue
@@ -0,0 +1,148 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '500px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'line',
+            lineStyle: {
+              color: 'rgba(0,0,0,0.2)',
+              width: 1,
+              type: 'solid'
+            }
+          }
+        },
+
+        legend: {
+          data: ['DQ', 'TY', 'SS', 'QG', 'SY', 'DD']
+        },
+
+        singleAxis: {
+          top: 50,
+          bottom: 50,
+          axisTick: {},
+          axisLabel: {},
+          type: 'time',
+          axisPointer: {
+            animation: true,
+            label: {
+              show: true
+            }
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              type: 'dashed',
+              opacity: 0.2
+            }
+          }
+        },
+
+        series: [
+          {
+            type: 'themeRiver',
+            itemStyle: {
+              emphasis: {
+                shadowBlur: 20,
+                shadowColor: 'rgba(0, 0, 0, 0.8)'
+              }
+            },
+            data: [['2015/11/08', 10, 'DQ'], ['2015/11/09', 15, 'DQ'], ['2015/11/10', 35, 'DQ'],
+              ['2015/11/11', 38, 'DQ'], ['2015/11/12', 22, 'DQ'], ['2015/11/13', 16, 'DQ'],
+              ['2015/11/14', 7, 'DQ'], ['2015/11/15', 2, 'DQ'], ['2015/11/16', 17, 'DQ'],
+              ['2015/11/17', 33, 'DQ'], ['2015/11/18', 40, 'DQ'], ['2015/11/19', 32, 'DQ'],
+              ['2015/11/20', 26, 'DQ'], ['2015/11/21', 35, 'DQ'], ['2015/11/22', 40, 'DQ'],
+              ['2015/11/23', 32, 'DQ'], ['2015/11/24', 26, 'DQ'], ['2015/11/25', 22, 'DQ'],
+              ['2015/11/26', 16, 'DQ'], ['2015/11/27', 22, 'DQ'], ['2015/11/28', 10, 'DQ'],
+              ['2015/11/08', 35, 'TY'], ['2015/11/09', 36, 'TY'], ['2015/11/10', 37, 'TY'],
+              ['2015/11/11', 22, 'TY'], ['2015/11/12', 24, 'TY'], ['2015/11/13', 26, 'TY'],
+              ['2015/11/14', 34, 'TY'], ['2015/11/15', 21, 'TY'], ['2015/11/16', 18, 'TY'],
+              ['2015/11/17', 45, 'TY'], ['2015/11/18', 32, 'TY'], ['2015/11/19', 35, 'TY'],
+              ['2015/11/20', 30, 'TY'], ['2015/11/21', 28, 'TY'], ['2015/11/22', 27, 'TY'],
+              ['2015/11/23', 26, 'TY'], ['2015/11/24', 15, 'TY'], ['2015/11/25', 30, 'TY'],
+              ['2015/11/26', 35, 'TY'], ['2015/11/27', 42, 'TY'], ['2015/11/28', 42, 'TY'],
+              ['2015/11/08', 21, 'SS'], ['2015/11/09', 25, 'SS'], ['2015/11/10', 27, 'SS'],
+              ['2015/11/11', 23, 'SS'], ['2015/11/12', 24, 'SS'], ['2015/11/13', 21, 'SS'],
+              ['2015/11/14', 35, 'SS'], ['2015/11/15', 39, 'SS'], ['2015/11/16', 40, 'SS'],
+              ['2015/11/17', 36, 'SS'], ['2015/11/18', 33, 'SS'], ['2015/11/19', 43, 'SS'],
+              ['2015/11/20', 40, 'SS'], ['2015/11/21', 34, 'SS'], ['2015/11/22', 28, 'SS'],
+              ['2015/11/23', 26, 'SS'], ['2015/11/24', 37, 'SS'], ['2015/11/25', 41, 'SS'],
+              ['2015/11/26', 46, 'SS'], ['2015/11/27', 47, 'SS'], ['2015/11/28', 41, 'SS'],
+              ['2015/11/08', 10, 'QG'], ['2015/11/09', 15, 'QG'], ['2015/11/10', 35, 'QG'],
+              ['2015/11/11', 38, 'QG'], ['2015/11/12', 22, 'QG'], ['2015/11/13', 16, 'QG'],
+              ['2015/11/14', 7, 'QG'], ['2015/11/15', 2, 'QG'], ['2015/11/16', 17, 'QG'],
+              ['2015/11/17', 33, 'QG'], ['2015/11/18', 40, 'QG'], ['2015/11/19', 32, 'QG'],
+              ['2015/11/20', 26, 'QG'], ['2015/11/21', 35, 'QG'], ['2015/11/22', 40, 'QG'],
+              ['2015/11/23', 32, 'QG'], ['2015/11/24', 26, 'QG'], ['2015/11/25', 22, 'QG'],
+              ['2015/11/26', 16, 'QG'], ['2015/11/27', 22, 'QG'], ['2015/11/28', 10, 'QG'],
+              ['2015/11/08', 10, 'SY'], ['2015/11/09', 15, 'SY'], ['2015/11/10', 35, 'SY'],
+              ['2015/11/11', 38, 'SY'], ['2015/11/12', 22, 'SY'], ['2015/11/13', 16, 'SY'],
+              ['2015/11/14', 7, 'SY'], ['2015/11/15', 2, 'SY'], ['2015/11/16', 17, 'SY'],
+              ['2015/11/17', 33, 'SY'], ['2015/11/18', 40, 'SY'], ['2015/11/19', 32, 'SY'],
+              ['2015/11/20', 26, 'SY'], ['2015/11/21', 35, 'SY'], ['2015/11/22', 4, 'SY'],
+              ['2015/11/23', 32, 'SY'], ['2015/11/24', 26, 'SY'], ['2015/11/25', 22, 'SY'],
+              ['2015/11/26', 16, 'SY'], ['2015/11/27', 22, 'SY'], ['2015/11/28', 10, 'SY'],
+              ['2015/11/08', 10, 'DD'], ['2015/11/09', 15, 'DD'], ['2015/11/10', 35, 'DD'],
+              ['2015/11/11', 38, 'DD'], ['2015/11/12', 22, 'DD'], ['2015/11/13', 16, 'DD'],
+              ['2015/11/14', 7, 'DD'], ['2015/11/15', 2, 'DD'], ['2015/11/16', 17, 'DD'],
+              ['2015/11/17', 33, 'DD'], ['2015/11/18', 4, 'DD'], ['2015/11/19', 32, 'DD'],
+              ['2015/11/20', 26, 'DD'], ['2015/11/21', 35, 'DD'], ['2015/11/22', 40, 'DD'],
+              ['2015/11/23', 32, 'DD'], ['2015/11/24', 26, 'DD'], ['2015/11/25', 22, 'DD'],
+              ['2015/11/26', 16, 'DD'], ['2015/11/27', 22, 'DD'], ['2015/11/28', 10, 'DD']]
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/home.vue b/src/views/home.vue
index bf2cad1..d7e04b3 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -2,15 +2,13 @@
   <div class="dashboard-container">
     <div class="dashboard-editor-container">
       <panel-group/>
-
       <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
         <line-chart/>
       </el-row>
-
       <el-row :gutter="32">
         <el-col :xs="24" :sm="24" :lg="8">
           <div class="chart-wrapper">
-            <raddar-chart/>
+            <radar-chart/>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8">
@@ -24,6 +22,72 @@
           </div>
         </el-col>
       </el-row>
+      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+        <heat-map/>
+      </el-row>
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <funnel/>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <sunburst/>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <gauge/>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="12">
+        <el-col :span="12">
+          <div class="chart-wrapper">
+            <rich/>
+          </div>
+        </el-col>
+        <el-col :span="12">
+          <div class="chart-wrapper">
+            <theme-river/>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <graph/>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <sankey/>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <line3-d/>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="12">
+        <el-col :span="12">
+          <div class="chart-wrapper">
+            <scatter/>
+          </div>
+        </el-col>
+        <el-col :span="12">
+          <div class="chart-wrapper">
+            <point/>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+        <div class="chart-wrapper">
+          <category/>
+        </div>
+      </el-row>
     </div>
   </div>
 </template>
@@ -32,24 +96,50 @@
 import { mapGetters } from 'vuex'
 import PanelGroup from './dashboard/PanelGroup'
 import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
+import RadarChart from './dashboard/RadarChart'
 import PieChart from './dashboard/PieChart'
 import BarChart from './dashboard/BarChart'
 import { count } from '@/api/visits'
+import HeatMap from './dashboard/HeatMap'
+import Funnel from './dashboard/Funnel'
+import Gauge from './dashboard/Gauge'
+import Rich from './dashboard/Rich'
+import ThemeRiver from './dashboard/ThemeRiver'
+import Sunburst from './dashboard/Sunburst'
+import Graph from './dashboard/Graph'
+import Sankey from './dashboard/Sankey'
+import Scatter from './dashboard/Scatter'
+import Line3D from './dashboard/Line3D'
+import Category from './dashboard/Category'
+import Point from './dashboard/Point'
 
 /**
  * 记录访问，只有页面刷新或者第一次加载才会记录
  */
-count().then(res => {})
+count().then(res => {
+})
 
 export default {
   name: 'Dashboard',
   components: {
+    Point,
+    Category,
+    Graph,
+    HeatMap,
     PanelGroup,
     LineChart,
-    RaddarChart,
+    RadarChart,
     PieChart,
-    BarChart },
+    Funnel,
+    Sunburst,
+    Gauge,
+    Rich,
+    ThemeRiver,
+    Sankey,
+    Line3D,
+    Scatter,
+    BarChart
+  },
   computed: {
     ...mapGetters([
       'roles'

From a3c32d4f83ab7cb586973263b5e17ba0a78ca82d Mon Sep 17 00:00:00 2001
From: zhanghouying <zhy6599@163.com>
Date: Tue, 5 Nov 2019 13:49:01 +0800
Subject: [PATCH 02/64] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/server/form.vue  | 131 +++++++++++++++++++
 src/views/monitor/server/index.vue | 201 +++++++++++++++++++++++++++++
 2 files changed, 332 insertions(+)
 create mode 100644 src/views/monitor/server/form.vue
 create mode 100644 src/views/monitor/server/index.vue

diff --git a/src/views/monitor/server/form.vue b/src/views/monitor/server/form.vue
new file mode 100644
index 0000000..191b6ba
--- /dev/null
+++ b/src/views/monitor/server/form.vue
@@ -0,0 +1,131 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="名称" >
+        <el-input v-model="form.name" style="width: 370px;"/>
+      </el-form-item>
+      <el-form-item label="IP地址" >
+        <el-input v-model="form.ip" style="width: 370px;"/>
+      </el-form-item>
+      <el-form-item label="访问端口" >
+        <el-input-number v-model="form.port"/>
+      </el-form-item>
+      <el-form-item label="排序" >
+        <el-input-number v-model="form.sort"/>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/server'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        name: '',
+        ip: '',
+        port: '8777',
+        state: '',
+        cpuRate: '',
+        cpuCore: '',
+        memTotal: '',
+        memUsed: '',
+        diskTotal: '',
+        diskUsed: '',
+        swapTotal: '',
+        swapUsed: '',
+        sort: '999'
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        ip: [
+          { required: true, message: '请输入IP', trigger: 'blur' }
+        ],
+        port: [
+          { required: true, message: '请输入访问端口', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        name: '',
+        ip: '',
+        port: '',
+        state: '',
+        cpuRate: '',
+        cpuCore: '',
+        memTotal: '',
+        memUsed: '',
+        diskTotal: '',
+        diskUsed: '',
+        swapTotal: '',
+        swapUsed: '',
+        sort: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
new file mode 100644
index 0000000..e7c19f2
--- /dev/null
+++ b/src/views/monitor/server/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','server:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add">新增
+        </el-button>
+      </div>
+      <!-- 刷新 -->
+      <div style="display: inline-block;">
+        <el-button
+          size="mini"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-refresh"
+          @click="refresh">刷新</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="name" label="名称"/>
+      <el-table-column prop="ip" label="IP地址"/>
+      <el-table-column prop="port" label="访问端口"/>
+      <el-table-column label="状态">
+        <template slot-scope="scope">
+          <el-tag
+            :type="scope.row.state === '1' ? 'success' : 'info'"
+            disable-transitions>
+            <i v-if="scope.row.state === '1'" class="el-icon-success"/>
+            <i v-if="scope.row.state === '0'" class="el-icon-error"/>
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column :formatter="percentNumber" prop="cpuRate" label="CPU使用率"/>
+      <el-table-column prop="cpuCore" label="CPU内核数"/>
+      <el-table-column :formatter="formatMem" label="物理内存"/>
+      <el-table-column :formatter="formatDisk" label="磁盘使用情况"/>
+      <el-table-column :formatter="formatSwap" label="交换空间"/>
+      <el-table-column v-if="checkPermission(['admin','server:edit','server:del'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','server:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-popover
+            v-permission="['admin','server:del']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180">
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"/>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del } from '@/api/server'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'name', display_name: '名称' },
+        { key: 'ip', display_name: 'IP地址' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/server'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) {
+        this.params[type] = value
+      }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        name: data.name,
+        ip: data.ip,
+        port: data.port,
+        state: data.state,
+        cpuRate: data.cpuRate,
+        cpuCore: data.cpuCore,
+        memTotal: data.memTotal,
+        memUsed: data.memUsed,
+        diskTotal: data.diskTotal,
+        diskUsed: data.diskUsed,
+        swapTotal: data.swapTotal,
+        swapUsed: data.swapUsed,
+        sort: data.sort
+      }
+      _this.dialog = true
+    },
+    refresh() {
+      this.init()
+    },
+    percentNumber(row, column) {
+      let num = row.cpuRate
+      if (!num) {
+        return '-'
+      }
+      num = num * 100 + ''
+      if (num.length > 5) {
+        num = num.substring(0, 5)
+      }
+      return num + '%'
+    },
+    convertToGb(num) {
+      if (!num) {
+        return '-'
+      }
+      num = num + ''
+      if (num.length > 5) {
+        num = num.substring(0, 5)
+      }
+      return num + 'GB'
+    },
+    formatMem(row, column) {
+      return this.convertToGb(row.memUsed) + ' / ' + this.convertToGb(row.memTotal)
+    },
+    formatDisk(row, column) {
+      return this.convertToGb(row.diskUsed) + ' / ' + this.convertToGb(row.diskTotal)
+    },
+    formatSwap(row, column) {
+      return this.convertToGb(row.swapUsed) + ' / ' + this.convertToGb(row.swapTotal)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

From f82afb0929b91d7d6eea8ee717f91d98cfae704a Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Thu, 7 Nov 2019 11:12:21 +0800
Subject: [PATCH 03/64] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/center.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index 5f69ea3..4bb0c9c 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -143,7 +143,7 @@ export default {
     },
     refresh() {
       this.ico = 'el-icon-loading'
-      this.$refs.log.init()
+      this.init()
       setTimeout(() => {
         this.ico = 'el-icon-refresh'
       }, 300)

From a7b2209950508383b3f40e49f24407ce31fe0a70 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Thu, 7 Nov 2019 13:14:48 +0800
Subject: [PATCH 04/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E5=85=A5server.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/server.js                  |  24 ++++++
 src/views/home.vue                 | 132 ++++++++++++++---------------
 src/views/monitor/server/index.vue |   1 +
 3 files changed, 91 insertions(+), 66 deletions(-)
 create mode 100644 src/api/server.js

diff --git a/src/api/server.js b/src/api/server.js
new file mode 100644
index 0000000..e68a22c
--- /dev/null
+++ b/src/api/server.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/server',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/server/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/server',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/views/home.vue b/src/views/home.vue
index d7e04b3..7e55a6b 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -5,32 +5,32 @@
       <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
         <line-chart/>
       </el-row>
+      <!--      <el-row :gutter="32">-->
+      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
+      <!--          <div class="chart-wrapper">-->
+      <!--            <radar-chart/>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
+      <!--          <div class="chart-wrapper">-->
+      <!--            <pie-chart/>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
+      <!--          <div class="chart-wrapper">-->
+      <!--            <bar-chart/>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">-->
+      <!--        <heat-map/>-->
+      <!--      </el-row>-->
       <el-row :gutter="32">
         <el-col :xs="24" :sm="24" :lg="8">
           <div class="chart-wrapper">
             <radar-chart/>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <pie-chart/>
-          </div>
-        </el-col>
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <bar-chart/>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-        <heat-map/>
-      </el-row>
-      <el-row :gutter="32">
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <funnel/>
-          </div>
-        </el-col>
         <el-col :xs="24" :sm="24" :lg="8">
           <div class="chart-wrapper">
             <sunburst/>
@@ -42,52 +42,52 @@
           </div>
         </el-col>
       </el-row>
-      <el-row :gutter="12">
-        <el-col :span="12">
-          <div class="chart-wrapper">
-            <rich/>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="chart-wrapper">
-            <theme-river/>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="32">
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <graph/>
-          </div>
-        </el-col>
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <sankey/>
-          </div>
-        </el-col>
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <line3-d/>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="12">
-        <el-col :span="12">
-          <div class="chart-wrapper">
-            <scatter/>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="chart-wrapper">
-            <point/>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-        <div class="chart-wrapper">
-          <category/>
-        </div>
-      </el-row>
+      <!--      <el-row :gutter="12">-->
+      <!--        <el-col :span="12">-->
+      <!--          <div class="chart-wrapper">-->
+      <!--            <rich/>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="12">-->
+      <!--          <div class="chart-wrapper">-->
+      <!--            <theme-river/>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-row :gutter="32">-->
+      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
+      <!--          <div class="chart-wrapper">-->
+      <!--            <graph/>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
+      <!--          <div class="chart-wrapper">-->
+      <!--            <sankey/>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
+      <!--          <div class="chart-wrapper">-->
+      <!--            <line3-d/>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-row :gutter="12">-->
+      <!--        <el-col :span="12">-->
+      <!--          <div class="chart-wrapper">-->
+      <!--            <scatter/>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="12">-->
+      <!--          <div class="chart-wrapper">-->
+      <!--            <point/>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">-->
+      <!--        <div class="chart-wrapper">-->
+      <!--          <category/>-->
+      <!--        </div>-->
+      <!--      </el-row>-->
     </div>
   </div>
 </template>
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index e7c19f2..0bf6400 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -86,6 +86,7 @@ import initData from '@/mixins/initData'
 import { del } from '@/api/server'
 import eForm from './form'
 export default {
+  name: 'ServerMonitor',
   components: { eForm },
   mixins: [initData],
   data() {

From 752d9c84785aee3dcf8ed602ff736acb5b4899b5 Mon Sep 17 00:00:00 2001
From: zhanghouying <zhy6599@163.com>
Date: Fri, 8 Nov 2019 15:59:48 +0800
Subject: [PATCH 05/64] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E9=A1=B5=E9=9D=A2=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/server/index.vue | 98 ++++++++++++++++++++++--------
 1 file changed, 74 insertions(+), 24 deletions(-)

diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 0bf6400..ffd4d1c 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -26,17 +26,15 @@
           class="filter-item"
           type="warning"
           icon="el-icon-refresh"
-          @click="refresh">刷新</el-button>
+          @click="refresh">刷新
+        </el-button>
       </div>
     </div>
     <!--表单组件-->
     <eForm ref="form" :is-add="isAdd"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column prop="name" label="名称"/>
-      <el-table-column prop="ip" label="IP地址"/>
-      <el-table-column prop="port" label="访问端口"/>
-      <el-table-column label="状态">
+      <el-table-column label="状态" width="50px">
         <template slot-scope="scope">
           <el-tag
             :type="scope.row.state === '1' ? 'success' : 'info'"
@@ -46,11 +44,47 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column :formatter="percentNumber" prop="cpuRate" label="CPU使用率"/>
-      <el-table-column prop="cpuCore" label="CPU内核数"/>
-      <el-table-column :formatter="formatMem" label="物理内存"/>
-      <el-table-column :formatter="formatDisk" label="磁盘使用情况"/>
-      <el-table-column :formatter="formatSwap" label="交换空间"/>
+      <el-table-column prop="name" label="名称"/>
+      <el-table-column prop="ip" label="IP地址"/>
+      <el-table-column prop="port" label="访问端口" width="80px" align="center"/>
+      <el-table-column :formatter="formatCpuRate" prop="cpuRate" label="CPU使用率" width="100px" align="center"/>
+      <el-table-column prop="cpuCore" label="CPU内核数" width="100px" align="center"/>
+      <el-table-column label="物理内存" align="center">
+        <template slot-scope="scope">
+          <el-row>
+            <el-col :span="24">{{ formatMem(scope.row) }}</el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-progress :percentage="percentNumber(scope.row.memUsed,scope.row.memTotal)" :status="percentStatus(scope.row.memUsed,scope.row.memTotal)" :show-text="false"/>
+            </el-col>
+          </el-row>
+        </template>
+      </el-table-column>
+      <el-table-column :formatter="formatDisk" label="磁盘使用情况" align="center">
+        <template slot-scope="scope">
+          <el-row>
+            <el-col :span="24">{{ formatDisk(scope.row) }}</el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-progress :percentage="percentNumber(scope.row.diskUsed,scope.row.diskTotal)" :status="percentStatus(scope.row.diskUsed,scope.row.diskTotal)" :show-text="false"/>
+            </el-col>
+          </el-row>
+        </template>
+      </el-table-column>
+      <el-table-column label="交换空间" align="center">
+        <template slot-scope="scope">
+          <el-row>
+            <el-col :span="24">{{ formatSwap(scope.row) }}</el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-progress :percentage="percentNumber(scope.row.swapUsed,scope.row.swapTotal)" :status="percentStatus(scope.row.swapUsed,scope.row.swapTotal)" :show-text="false"/>
+            </el-col>
+          </el-row>
+        </template>
+      </el-table-column>
       <el-table-column v-if="checkPermission(['admin','server:edit','server:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <el-button v-permission="['admin','server:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
@@ -107,7 +141,7 @@ export default {
     checkPermission,
     beforeInit() {
       this.url = 'api/server'
-      const sort = 'id,desc'
+      const sort = 'sort,asc'
       this.params = { page: this.page, size: this.size, sort: sort }
       const query = this.query
       const type = query.type
@@ -163,26 +197,40 @@ export default {
     refresh() {
       this.init()
     },
-    percentNumber(row, column) {
-      let num = row.cpuRate
-      if (!num) {
-        return '-'
+    formatCpuRate(row, column) {
+      const value = row.cpuRate
+      if (!value) {
+        return 0
       }
-      num = num * 100 + ''
-      if (num.length > 5) {
-        num = num.substring(0, 5)
+      return (Math.floor(value * 10000) / 100) + '%'
+    },
+    percentNumber(value, total) {
+      if (!value || !total) {
+        return 0
+      }
+      return value / total * 100
+    },
+    percentStatus(value, total) {
+      const percent = this.percentNumber(value, total)
+      if (percent < 60) {
+        return 'success'
+      } else if (percent < 90) {
+        return 'warning'
+      } else {
+        return 'exception'
       }
-      return num + '%'
     },
     convertToGb(num) {
       if (!num) {
         return '-'
       }
-      num = num + ''
-      if (num.length > 5) {
-        num = num.substring(0, 5)
+      let unit = 'G'
+      if (num > 1024) {
+        num = num / 1024
+        unit = 'T'
       }
-      return num + 'GB'
+      num = Math.floor(num * 100) / 100
+      return num + unit
     },
     formatMem(row, column) {
       return this.convertToGb(row.memUsed) + ' / ' + this.convertToGb(row.memTotal)
@@ -198,5 +246,7 @@ export default {
 </script>
 
 <style scoped>
-
+  .el-col {
+    text-align: center;
+  }
 </style>

From 8c4c28084006224dffbe435727ffbf5e1d65b111 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Fri, 8 Nov 2019 21:17:06 +0800
Subject: [PATCH 06/64] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E9=A2=84=E8=A7=88=E5=85=B3=E9=97=AD=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=A2=AB=20header=E9=81=AE=E6=8C=A1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/sidebar.scss                 | 4 ++--
 src/views/tools/storage/local/index.vue | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 30fc5d7..6457bce 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -3,13 +3,13 @@
   .main-container {
     min-height: 100%;
     transition: margin-left .28s;
-    margin-left: 195px;
+    margin-left: 193px;
     position: relative;
   }
   // 侧边栏
   .sidebar-container {
     transition: width 0.28s;
-    width: 195px !important;
+    width: 193px !important;
     height: 100%;
     position: fixed;
     font-size: 0px;
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index 534f864..1c1f296 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -252,4 +252,7 @@ export default {
   /deep/ .el-image__error, .el-image__placeholder{
     background: none;
   }
+  /deep/ .el-image-viewer__wrapper{
+    top: 55px;
+  }
 </style>

From 8e60664eabcfb2b7e03ee117c813cfdca133499a Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Wed, 13 Nov 2019 10:35:24 +0800
Subject: [PATCH 07/64] update

---
 src/router/routers.js             |  16 ++-
 src/views/generator/config.vue    | 155 ++++++++++++++++++++++++++++++
 src/views/generator/generator.vue |   3 +-
 src/views/generator/index.vue     |   8 +-
 4 files changed, 178 insertions(+), 4 deletions(-)
 create mode 100644 src/views/generator/config.vue

diff --git a/src/router/routers.js b/src/router/routers.js
index 492de7e..14bc988 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -69,7 +69,21 @@ export const constantRouterMap = [
         path: 'center',
         component: () => import('@/views/system/user/center'),
         name: '个人中心',
-        meta: { title: '个人中心', icon: 'user' }
+        meta: { title: '个人中心' }
+      }
+    ]
+  },
+  {
+    path: '/generator',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'config/:tableName',
+        component: () => import('@/views/generator/config'),
+        name: 'GeneratorIndex',
+        meta: { title: '生成配置' }
       }
     ]
   }
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
new file mode 100644
index 0000000..1ad3fc1
--- /dev/null
+++ b/src/views/generator/config.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-tabs v-model="activeName" style="padding-left: 5px;">
+    <el-tab-pane label="基本配置" name="first">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="90px">
+        <el-form-item label="模块名称" prop="moduleName">
+          <el-input v-model="form.moduleName"/>
+        </el-form-item>
+        <el-form-item label="至于包下" prop="pack">
+          <el-input v-model="form.pack"/>
+        </el-form-item>
+        <el-form-item label="前端路径" prop="path">
+          <el-input v-model="form.path"/>
+        </el-form-item>
+        <el-form-item label="作者名称" prop="author">
+          <el-input v-model="form.author"/>
+        </el-form-item>
+        <el-form-item label="去表前缀" prop="prefix">
+          <el-input v-model="form.prefix" placeholder="默认不去除表前缀"/>
+        </el-form-item>
+        <!--        <el-form-item label="Api路径">-->
+        <!--          <el-input v-model="form.apiPath"/>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="是否覆盖" prop="cover">
+          <el-radio-group v-model="form.cover" size="mini">
+            <el-radio-button label="true">是</el-radio-button>
+            <el-radio-button label="false">否</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+    </el-tab-pane>
+    <el-tab-pane label="字段配置" name="second">
+      <el-form size="small" label-width="90px">
+        <el-table v-loading="loading" :data="data" size="small" style="width: 100%;margin-bottom: 15px">
+          <el-table-column label="序号" width="80" align="center">
+            <template slot-scope="scope">
+              <div>{{ scope.$index + 1 }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="columnName" label="字段名称"/>
+          <el-table-column prop="columnType" label="字段类型"/>
+          <el-table-column prop="columnComment" label="字段标题">
+            <template slot-scope="scope">
+              <el-input v-model="data[scope.$index].columnComment" class="edit-input"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="查询方式">
+            <template slot-scope="scope">
+              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable placeholder="请选择">
+                <el-option
+                  label="模糊查询"
+                  value="1"/>
+                <el-option
+                  label="精确查询"
+                  value="2"/>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="columnShow" label="列表显示">
+            <template slot-scope="scope">
+              <el-tooltip :content="scope.row.columnShow === 'true' ?'显示':'不显示'" placement="top">
+                <el-switch
+                  v-model="data[scope.$index].columnShow"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  active-value="true"
+                  inactive-value="false"/>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+import initData from '@/mixins/initData'
+import { update, get } from '@/api/genConfig'
+export default {
+  name: 'GeneratorConfig',
+  components: {},
+  mixins: [initData],
+  data() {
+    return {
+      activeName: 'second', tableName: '',
+      form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
+      rules: {
+        author: [
+          { required: true, message: '作者不能为空', trigger: 'blur' }
+        ],
+        pack: [
+          { required: true, message: '包路径不能为空', trigger: 'blur' }
+        ],
+        moduleName: [
+          { required: true, message: '包路径不能为空', trigger: 'blur' }
+        ],
+        path: [
+          { required: true, message: '前端代码生成路径不能为空', trigger: 'blur' }
+        ],
+        cover: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+    this.tableName = this.$route.params.tableName
+    this.$nextTick(() => {
+      this.init()
+      get().then(data => {
+        this.form = data
+        this.form.cover = this.form.cover.toString()
+      })
+    })
+  },
+  methods: {
+    beforeInit() {
+      this.url = 'api/generator/columns'
+      const tableName = this.tableName
+      this.params = { tableName }
+      return true
+    },
+    cancel() {
+      this.$refs['form'].resetFields()
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          update(this.form).then(res => {
+          }).catch(err => {
+            this.cancel()
+            console.log(err.response.data.message)
+          })
+        } else {
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+  .edit-input {
+    .el-input__inner {
+      border: none;
+    }
+  }
+</style>
+
+<style scoped>
+  /deep/ .input-with-select .el-input-group__prepend {
+    background-color: #fff;
+  }
+</style>
diff --git a/src/views/generator/generator.vue b/src/views/generator/generator.vue
index 550800b..d1cd7ef 100644
--- a/src/views/generator/generator.vue
+++ b/src/views/generator/generator.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="primary" size="mini" @click="toGen">生成代码</el-button>
+    <el-button type="primary" icon="el-icon-position" size="mini" @click="toGen"/>
     <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" title="代码生成配置" append-to-body width="880px">
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="90px">
         <el-form-item label="模块名称" prop="moduleName">
@@ -114,7 +114,6 @@ export default {
   methods: {
     toGen() {
       this.dialog = true
-      this.time = 130
       this.$nextTick(() => {
         this.init()
         get().then(data => {
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index fd6eb43..b9ab0c7 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -23,7 +23,13 @@
       </el-table-column>
       <el-table-column label="操作" width="140px" align="center" fixed="right">
         <template slot-scope="scope">
-          <Generator :name="scope.row.tableName"/>
+          <el-button size="mini" style="margin-right: 2px" type="text">预览</el-button>
+          <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text">
+            <router-link :to="'/generator/config/' + scope.row.tableName">
+              编辑
+            </router-link>
+          </el-button>
+          <el-button type="text" style="margin-left: -1px" size="mini">生成</el-button>
         </template>
       </el-table-column>
     </el-table>

From ece50a3e5481622826fcc951e0e9eee686792e9b Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 17 Nov 2019 14:36:16 +0800
Subject: [PATCH 08/64] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/generator/config.vue          | 61 +++++++++++++++++++------
 src/views/monitor/log/search.vue        |  1 +
 src/views/system/dept/index.vue         |  1 +
 src/views/system/job/index.vue          |  1 +
 src/views/system/menu/index.vue         |  1 +
 src/views/system/role/index.vue         |  1 +
 src/views/system/timing/index.vue       |  1 +
 src/views/system/timing/log.vue         |  1 +
 src/views/system/user/index.vue         |  1 +
 src/views/tools/picture/index.vue       |  1 +
 src/views/tools/storage/local/index.vue |  1 +
 src/views/tools/storage/qiniu/index.vue |  1 +
 12 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 1ad3fc1..609e689 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -30,7 +30,7 @@
     </el-tab-pane>
     <el-tab-pane label="字段配置" name="second">
       <el-form size="small" label-width="90px">
-        <el-table v-loading="loading" :data="data" size="small" style="width: 100%;margin-bottom: 15px">
+        <el-table v-loading="loading" :data="data" :height="tableHeight" size="small" style="width: 100%;margin-bottom: 15px">
           <el-table-column label="序号" width="80" align="center">
             <template slot-scope="scope">
               <div>{{ scope.$index + 1 }}</div>
@@ -38,14 +38,44 @@
           </el-table-column>
           <el-table-column prop="columnName" label="字段名称"/>
           <el-table-column prop="columnType" label="字段类型"/>
-          <el-table-column prop="columnComment" label="字段标题">
+          <el-table-column prop="columnComment" label="字段描述">
             <template slot-scope="scope">
-              <el-input v-model="data[scope.$index].columnComment" class="edit-input"/>
+              <el-input v-model="data[scope.$index].columnComment" size="mini" class="edit-input"/>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="columnShow" label="必填">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="data[scope.$index].columnShow"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+                active-value="true"
+                inactive-value="false"/>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="columnShow" label="表单">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="data[scope.$index].columnShow"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+                active-value="true"
+                inactive-value="false"/>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="columnShow" label="列表">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="data[scope.$index].columnShow"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+                active-value="true"
+                inactive-value="false"/>
             </template>
           </el-table-column>
           <el-table-column label="查询方式">
             <template slot-scope="scope">
-              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable placeholder="请选择">
+              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable size="mini" placeholder="请选择">
                 <el-option
                   label="模糊查询"
                   value="1"/>
@@ -55,16 +85,16 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="columnShow" label="列表显示">
+          <el-table-column label="关联字典">
             <template slot-scope="scope">
-              <el-tooltip :content="scope.row.columnShow === 'true' ?'显示':'不显示'" placement="top">
-                <el-switch
-                  v-model="data[scope.$index].columnShow"
-                  active-color="#13ce66"
-                  inactive-color="#ff4949"
-                  active-value="true"
-                  inactive-value="false"/>
-              </el-tooltip>
+              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable size="mini" placeholder="请选择">
+                <el-option
+                  label="模糊查询"
+                  value="1"/>
+                <el-option
+                  label="精确查询"
+                  value="2"/>
+              </el-select>
             </template>
           </el-table-column>
         </el-table>
@@ -82,7 +112,7 @@ export default {
   mixins: [initData],
   data() {
     return {
-      activeName: 'second', tableName: '',
+      activeName: 'second', tableName: '', tableHeight: 550,
       form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
       rules: {
         author: [
@@ -104,6 +134,7 @@ export default {
     }
   },
   created() {
+    this.tableHeight = document.documentElement.clientHeight - 260
     this.tableName = this.$route.params.tableName
     this.$nextTick(() => {
       this.init()
@@ -143,7 +174,7 @@ export default {
 <style rel="stylesheet/scss" lang="scss">
   .edit-input {
     .el-input__inner {
-      border: none;
+      border: 1px solid #e5e6e7;
     }
   }
 </style>
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index a9fdc66..3646c2e 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -3,6 +3,7 @@
     <el-input v-model="query.value" clearable placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
     <el-date-picker
       v-model="query.date"
+      :default-time="['00:00:00','23:59:59']"
       type="daterange"
       range-separator=":"
       class="el-range-editor--small filter-item"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index cc46af4..c37e964 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.value" clearable placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index eab2207..fb835f7 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.value" clearable placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index ec39db6..d08db1b 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.value" clearable placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index dde5d10..09c49b9 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -8,6 +8,7 @@
       <el-input v-model="query.value" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index 0e416aa..e3d5ad8 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
index 11abaa5..56a50f2 100644
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -5,6 +5,7 @@
       <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 69df4c1..aac73fa 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -18,6 +18,7 @@
           <el-input v-model="query.blurry" clearable placeholder="输入名称或者邮箱搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
           <el-date-picker
             v-model="query.date"
+            :default-time="['00:00:00','23:59:59']"
             type="daterange"
             range-separator=":"
             class="el-range-editor--small filter-item"
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index c7a1d8b..bbd2631 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.filename" clearable placeholder="输入文件名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index 1c1f296..8d65a08 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.value" clearable placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/tools/storage/qiniu/index.vue b/src/views/tools/storage/qiniu/index.vue
index b4e6c59..a32d39f 100644
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -8,6 +8,7 @@
       <el-input v-model="query.value" clearable placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"

From a4d74a3a6f51c9e712b34eb9e7d8f2a7b5d76864 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 17 Nov 2019 22:39:44 +0800
Subject: [PATCH 09/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=99=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dict.js                   |   7 +
 src/api/genConfig.js              |   4 +-
 src/api/generator.js              |  17 ++
 src/router/routers.js             |  28 +--
 src/views/generator/config.vue    | 300 +++++++++++++++++++-----------
 src/views/generator/generator.vue | 181 ------------------
 src/views/generator/index.vue     |   4 +-
 7 files changed, 230 insertions(+), 311 deletions(-)
 delete mode 100644 src/views/generator/generator.vue

diff --git a/src/api/dict.js b/src/api/dict.js
index e318b3b..a5a8f72 100644
--- a/src/api/dict.js
+++ b/src/api/dict.js
@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+export function getDicts() {
+  return request({
+    url: 'api/dict/all',
+    method: 'get'
+  })
+}
+
 export function add(data) {
   return request({
     url: 'api/dict',
diff --git a/src/api/genConfig.js b/src/api/genConfig.js
index 5535d37..e15b200 100644
--- a/src/api/genConfig.js
+++ b/src/api/genConfig.js
@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export function get() {
+export function get(tableName) {
   return request({
-    url: 'api/genConfig',
+    url: 'api/genConfig/' + tableName,
     method: 'get'
   })
 }
diff --git a/src/api/generator.js b/src/api/generator.js
index c9302d6..a25aec5 100644
--- a/src/api/generator.js
+++ b/src/api/generator.js
@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// export function getAllTable() {
+//   return request({
+//     url: 'api/generator?tableName=' + tableName,
+//     data,
+//     method: 'post'
+//   })
+// }
+
 export function generator(data, tableName) {
   return request({
     url: 'api/generator?tableName=' + tableName,
@@ -7,3 +15,12 @@ export function generator(data, tableName) {
     method: 'post'
   })
 }
+
+export function save(data) {
+  return request({
+    url: 'api/generator',
+    data,
+    method: 'put'
+  })
+}
+
diff --git a/src/router/routers.js b/src/router/routers.js
index 14bc988..40048f0 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -72,21 +72,21 @@ export const constantRouterMap = [
         meta: { title: '个人中心' }
       }
     ]
-  },
-  {
-    path: '/generator',
-    component: Layout,
-    hidden: true,
-    redirect: 'noredirect',
-    children: [
-      {
-        path: 'config/:tableName',
-        component: () => import('@/views/generator/config'),
-        name: 'GeneratorIndex',
-        meta: { title: '生成配置' }
-      }
-    ]
   }
+  // {
+  //   path: '/generator',
+  //   component: Layout,
+  //   hidden: true,
+  //   redirect: 'noredirect',
+  //   children: [
+  //     {
+  //       path: 'config/:tableName',
+  //       component: () => import('@/views/generator/config'),
+  //       name: 'GeneratorIndex',
+  //       meta: { title: '生成配置' }
+  //     }
+  //   ]
+  // }
   // { path: '*', redirect: '/404', hidden: true }
 ]
 
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 609e689..dcecb73 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -1,119 +1,176 @@
 <template>
-  <el-tabs v-model="activeName" style="padding-left: 5px;">
-    <el-tab-pane label="基本配置" name="first">
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="90px">
-        <el-form-item label="模块名称" prop="moduleName">
-          <el-input v-model="form.moduleName"/>
-        </el-form-item>
-        <el-form-item label="至于包下" prop="pack">
-          <el-input v-model="form.pack"/>
-        </el-form-item>
-        <el-form-item label="前端路径" prop="path">
-          <el-input v-model="form.path"/>
-        </el-form-item>
-        <el-form-item label="作者名称" prop="author">
-          <el-input v-model="form.author"/>
-        </el-form-item>
-        <el-form-item label="去表前缀" prop="prefix">
-          <el-input v-model="form.prefix" placeholder="默认不去除表前缀"/>
-        </el-form-item>
-        <!--        <el-form-item label="Api路径">-->
-        <!--          <el-input v-model="form.apiPath"/>-->
-        <!--        </el-form-item>-->
-        <el-form-item label="是否覆盖" prop="cover">
-          <el-radio-group v-model="form.cover" size="mini">
-            <el-radio-button label="true">是</el-radio-button>
-            <el-radio-button label="false">否</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-    </el-tab-pane>
-    <el-tab-pane label="字段配置" name="second">
-      <el-form size="small" label-width="90px">
-        <el-table v-loading="loading" :data="data" :height="tableHeight" size="small" style="width: 100%;margin-bottom: 15px">
-          <el-table-column label="序号" width="80" align="center">
-            <template slot-scope="scope">
-              <div>{{ scope.$index + 1 }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="columnName" label="字段名称"/>
-          <el-table-column prop="columnType" label="字段类型"/>
-          <el-table-column prop="columnComment" label="字段描述">
-            <template slot-scope="scope">
-              <el-input v-model="data[scope.$index].columnComment" size="mini" class="edit-input"/>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="columnShow" label="必填">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="data[scope.$index].columnShow"
-                active-color="#409EFF"
-                inactive-color="#F56C6C"
-                active-value="true"
-                inactive-value="false"/>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="columnShow" label="表单">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="data[scope.$index].columnShow"
-                active-color="#409EFF"
-                inactive-color="#F56C6C"
-                active-value="true"
-                inactive-value="false"/>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="columnShow" label="列表">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="data[scope.$index].columnShow"
-                active-color="#409EFF"
-                inactive-color="#F56C6C"
-                active-value="true"
-                inactive-value="false"/>
-            </template>
-          </el-table-column>
-          <el-table-column label="查询方式">
-            <template slot-scope="scope">
-              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable size="mini" placeholder="请选择">
-                <el-option
-                  label="模糊查询"
-                  value="1"/>
-                <el-option
-                  label="精确查询"
-                  value="2"/>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="关联字典">
-            <template slot-scope="scope">
-              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable size="mini" placeholder="请选择">
-                <el-option
-                  label="模糊查询"
-                  value="1"/>
-                <el-option
-                  label="精确查询"
-                  value="2"/>
-              </el-select>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-    </el-tab-pane>
-  </el-tabs>
+  <div class="app-container">
+    <el-row :gutter="15">
+      <!--角色管理-->
+      <el-col style="margin-bottom: 10px">
+        <el-card class="box-card" shadow="never">
+          <div slot="header" class="clearfix">
+            <span class="role-span">字段配置</span>
+            <el-button
+              :loading="columnLoading"
+              icon="el-icon-check"
+              size="mini"
+              style="float: right; padding: 6px 9px"
+              type="primary"
+              @click="saveColumnConfig">保存</el-button>
+          </div>
+          <el-form size="small" label-width="90px">
+            <el-table v-loading="loading" :data="data" :max-height="tableHeight" size="small" style="width: 100%;margin-bottom: 15px">
+              <el-table-column prop="tableName" label="表名"/>
+              <el-table-column prop="columnName" label="字段名称"/>
+              <el-table-column prop="columnType" label="字段类型"/>
+              <el-table-column prop="remark" label="字段描述">
+                <template slot-scope="scope">
+                  <el-input v-model="data[scope.$index].remark" size="mini" class="edit-input"/>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="必填">
+                <template slot-scope="scope">
+                  <el-checkbox v-model="data[scope.$index].notNull"/>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="列表">
+                <template slot-scope="scope">
+                  <el-checkbox v-model="data[scope.$index].listShow"/>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="表单">
+                <template slot-scope="scope">
+                  <el-checkbox v-model="data[scope.$index].formShow"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="表单类型">
+                <template slot-scope="scope">
+                  <el-select v-model="data[scope.$index].formType" filterable class="edit-input" clearable size="mini" placeholder="请选择">
+                    <el-option
+                      label="文本框"
+                      value="Input"/>
+                    <el-option
+                      label="文本域"
+                      value="Textarea"/>
+                    <el-option
+                      label="单选框"
+                      value="Radio"/>
+                    <el-option
+                      label="下拉框"
+                      value="Select"/>
+                    <el-option
+                      label="复选框"
+                      value="Checkbox"/>
+                    <el-option
+                      label="日期框"
+                      value="Date"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="查询方式">
+                <template slot-scope="scope">
+                  <el-select v-model="data[scope.$index].queryType" filterable class="edit-input" clearable size="mini" placeholder="请选择">
+                    <el-option
+                      label="="
+                      value="="/>
+                    <el-option
+                      label="!="
+                      value="!="/>
+                    <el-option
+                      label=">="
+                      value=">="/>
+                    <el-option
+                      label="<="
+                      value="<="/>
+                    <el-option
+                      label="Like"
+                      value="Like"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="关联字典">
+                <template slot-scope="scope">
+                  <el-select v-model="data[scope.$index].dictName" filterable class="edit-input" clearable size="mini" placeholder="请选择">
+                    <el-option v-for="item in dicts" :key="item.id" :label="item.remark === '' ? item.name : item.remark" :value="item.name"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="实体关联">
+                <template slot-scope="scope">
+                  <el-select v-model="data[scope.$index].joinName" filterable class="edit-input" clearable size="mini" placeholder="请选择">
+                    <el-option
+                      label="模糊查询"
+                      value="1"/>
+                    <el-option
+                      label="精确查询"
+                      value="2"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form>
+        </el-card>
+      </el-col>
+      <el-col>
+        <el-card class="box-card" shadow="never">
+          <div slot="header" class="clearfix">
+            <span class="role-span">生成配置</span>
+            <el-button
+              :loading="configLoading"
+              icon="el-icon-check"
+              size="mini"
+              style="float: right; padding: 6px 9px"
+              type="primary"
+              @click="doSubmit">保存</el-button>
+          </div>
+          <el-form ref="form" :model="form" :rules="rules" size="small" label-width="78px">
+            <el-form-item label="作者名称" prop="author">
+              <el-input v-model="form.author" style="width: 40%"/>
+              <span style="color: #C0C0C0;margin-left: 10px;">类上面的作者名称</span>
+            </el-form-item>
+            <el-form-item label="模块名称" prop="moduleName">
+              <el-input v-model="form.moduleName" style="width: 40%"/>
+              <span style="color: #C0C0C0;margin-left: 10px;">模块的名称，请选择项目中已存在的模块</span>
+            </el-form-item>
+            <el-form-item label="至于包下" prop="pack">
+              <el-input v-model="form.pack" style="width: 40%"/>
+              <span style="color: #C0C0C0;margin-left: 10px;">项目包的名称，生成的代码放到哪个包里面</span>
+            </el-form-item>
+            <el-form-item label="前端路径" prop="path">
+              <el-input v-model="form.path" style="width: 40%"/>
+              <span style="color: #C0C0C0;margin-left: 10px;">输入views文件夹下的目录，不存在即创建</span>
+            </el-form-item>
+            <el-form-item label="去表前缀" prop="prefix">
+              <el-input v-model="form.prefix" placeholder="默认不去除表前缀" style="width: 40%"/>
+              <span style="color: #C0C0C0;margin-left: 10px;">默认不去除表前缀，可自定义</span>
+            </el-form-item>
+            <!--            <el-form-item label="Api路径">-->
+            <!--              <el-input v-model="form.apiPath"/>-->
+            <!--              <span style="color: #C0C0C0;margin-left: 10px;">Sender mailbox</span>-->
+            <!--            </el-form-item>-->
+            <el-form-item label="是否覆盖" prop="cover">
+              <el-radio-group v-model="form.cover" size="mini" style="width: 40%">
+                <el-radio-button label="true">是</el-radio-button>
+                <el-radio-button label="false">否</el-radio-button>
+              </el-radio-group>
+              <span style="color: #C0C0C0;margin-left: 10px;">危险选型，请考虑后选择</span>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
 import initData from '@/mixins/initData'
 import { update, get } from '@/api/genConfig'
+import { save } from '@/api/generator'
+import { getDicts } from '@/api/dict'
 export default {
   name: 'GeneratorConfig',
   components: {},
   mixins: [initData],
   data() {
     return {
-      activeName: 'second', tableName: '', tableHeight: 550,
-      form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
+      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [],
+      form: { id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
       rules: {
         author: [
           { required: true, message: '作者不能为空', trigger: 'blur' }
@@ -134,14 +191,17 @@ export default {
     }
   },
   created() {
-    this.tableHeight = document.documentElement.clientHeight - 260
+    this.tableHeight = document.documentElement.clientHeight - 385
     this.tableName = this.$route.params.tableName
     this.$nextTick(() => {
       this.init()
-      get().then(data => {
+      get(this.tableName).then(data => {
         this.form = data
         this.form.cover = this.form.cover.toString()
       })
+      getDicts().then(data => {
+        this.dicts = data
+      })
     })
   },
   methods: {
@@ -151,19 +211,37 @@ export default {
       this.params = { tableName }
       return true
     },
-    cancel() {
-      this.$refs['form'].resetFields()
+    saveColumnConfig() {
+      this.columnLoading = true
+      save(this.data).then(res => {
+        this.$notify({
+          title: '保存成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.columnLoading = false
+      }).catch(err => {
+        this.columnLoading = false
+        console.log(err.response.data.message)
+      })
     },
     doSubmit() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          this.configLoading = true
           update(this.form).then(res => {
+            this.$notify({
+              title: '保存成功',
+              type: 'success',
+              duration: 2500
+            })
+            this.form = res
+            this.form.cover = this.form.cover.toString()
+            this.configLoading = false
           }).catch(err => {
-            this.cancel()
+            this.configLoading = false
             console.log(err.response.data.message)
           })
-        } else {
-          return false
         }
       })
     }
diff --git a/src/views/generator/generator.vue b/src/views/generator/generator.vue
deleted file mode 100644
index d1cd7ef..0000000
--- a/src/views/generator/generator.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
-  <div>
-    <el-button type="primary" icon="el-icon-position" size="mini" @click="toGen"/>
-    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" title="代码生成配置" append-to-body width="880px">
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="90px">
-        <el-form-item label="模块名称" prop="moduleName">
-          <el-input v-model="form.moduleName"/>
-        </el-form-item>
-        <el-form-item label="至于包下" prop="pack">
-          <el-input v-model="form.pack"/>
-        </el-form-item>
-        <el-form-item label="前端路径" prop="path">
-          <el-input v-model="form.path"/>
-        </el-form-item>
-        <el-table v-loading="loading" :data="data" size="small" style="width: 100%;margin-bottom: 15px">
-          <el-table-column label="序号" width="80" align="center">
-            <template slot-scope="scope">
-              <div>{{ scope.$index + 1 }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="columnName" label="字段名称"/>
-          <el-table-column prop="columnType" label="字段类型"/>
-          <el-table-column prop="columnComment" label="字段标题">
-            <template slot-scope="scope">
-              <el-input v-model="data[scope.$index].columnComment" class="edit-input"/>
-            </template>
-          </el-table-column>
-          <el-table-column label="查询方式">
-            <template slot-scope="scope">
-              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable placeholder="请选择">
-                <el-option
-                  label="模糊查询"
-                  value="1"/>
-                <el-option
-                  label="精确查询"
-                  value="2"/>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="columnShow" label="列表显示">
-            <template slot-scope="scope">
-              <el-tooltip :content="scope.row.columnShow === 'true' ?'显示':'不显示'" placement="top">
-                <el-switch
-                  v-model="data[scope.$index].columnShow"
-                  active-color="#13ce66"
-                  inactive-color="#ff4949"
-                  active-value="true"
-                  inactive-value="false"/>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-form-item label="作者名称" prop="author">
-          <el-input v-model="form.author"/>
-        </el-form-item>
-        <el-form-item label="去表前缀" prop="prefix">
-          <el-input v-model="form.prefix" placeholder="默认不去除表前缀"/>
-        </el-form-item>
-        <!--    可自定义显示配置    -->
-        <!--        <el-form-item label="Api路径">-->
-        <!--          <el-input v-model="form.apiPath"/>-->
-        <!--        </el-form-item>-->
-        <el-form-item label="是否覆盖" prop="cover">
-          <el-radio-group v-model="form.cover" size="mini">
-            <el-radio-button label="true">是</el-radio-button>
-            <el-radio-button label="false">否</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="genLoading" type="primary" @click="doSubmit">生成</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import initData from '@/mixins/initData'
-import { update, get } from '@/api/genConfig'
-import { generator } from '@/api/generator'
-export default {
-  name: 'Generator',
-  mixins: [initData],
-  props: {
-    name: {
-      type: String,
-      required: true
-    }
-  },
-  data() {
-    return {
-      genLoading: false, dialog: false, columnQuery: '',
-      form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
-      rules: {
-        author: [
-          { required: true, message: '作者不能为空', trigger: 'blur' }
-        ],
-        pack: [
-          { required: true, message: '包路径不能为空', trigger: 'blur' }
-        ],
-        moduleName: [
-          { required: true, message: '包路径不能为空', trigger: 'blur' }
-        ],
-        path: [
-          { required: true, message: '前端代码生成路径不能为空', trigger: 'blur' }
-        ],
-        cover: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    toGen() {
-      this.dialog = true
-      this.$nextTick(() => {
-        this.init()
-        get().then(data => {
-          this.form = data
-          this.form.cover = this.form.cover.toString()
-        })
-      })
-    },
-    beforeInit() {
-      this.url = 'api/generator/columns'
-      const tableName = this.name
-      this.params = { tableName }
-      return true
-    },
-    cancel() {
-      this.dialog = false
-      this.genLoading = false
-      this.$refs['form'].resetFields()
-      this.form = { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' }
-    },
-    doSubmit() {
-      this.genLoading = true
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          update(this.form).then(res => {
-            generator(this.data, this.name).then(res => {
-              this.$notify({
-                title: '生成成功',
-                type: 'success',
-                duration: 2500
-              })
-              this.cancel()
-            }).catch(err => {
-              this.cancel()
-              console.log(err.response.data.message)
-            })
-          }).catch(err => {
-            this.cancel()
-            console.log(err.response.data.message)
-          })
-        } else {
-          return false
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  .edit-input {
-    .el-input__inner {
-      border: none;
-    }
-  }
-</style>
-
-<style scoped>
-  /deep/ .el-dialog__body{
-    padding-bottom: 5px;
-  }
-  /deep/ .input-with-select .el-input-group__prepend {
-    background-color: #fff;
-  }
-</style>
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index b9ab0c7..d691302 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -25,7 +25,7 @@
         <template slot-scope="scope">
           <el-button size="mini" style="margin-right: 2px" type="text">预览</el-button>
           <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text">
-            <router-link :to="'/generator/config/' + scope.row.tableName">
+            <router-link :to="'/sys-tools/generator/config/' + scope.row.tableName">
               编辑
             </router-link>
           </el-button>
@@ -47,10 +47,8 @@
 <script>
 import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
-import Generator from './generator'
 export default {
   name: 'GeneratorIndex',
-  components: { Generator },
   mixins: [initData],
   data() {
     return {

From b313fe34dd4cce54e55aeba8efa6f693aad14669 Mon Sep 17 00:00:00 2001
From: zhanghouying <zhy6599@163.com>
Date: Tue, 19 Nov 2019 11:42:54 +0800
Subject: [PATCH 10/64] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=90=E7=BB=B4?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/dev.env.js                     |   1 +
 config/prod.env.js                    |   1 +
 src/api/app.js                        |  32 +++
 src/api/database.js                   |  24 ++
 src/api/deploy.js                     |  74 ++++++
 src/api/deployHistory.js              |  40 ++++
 src/api/serverAccount.js              |  32 +++
 src/api/serverDeploy.js               |  24 ++
 src/store/getters.js                  |   1 +
 src/store/modules/api.js              |   2 +
 src/utils/validate.js                 |  76 +++++++
 src/views/mnt/account/form.vue        | 108 +++++++++
 src/views/mnt/account/index.vue       | 176 +++++++++++++++
 src/views/mnt/app/form.vue            | 180 +++++++++++++++
 src/views/mnt/app/index.vue           | 214 ++++++++++++++++++
 src/views/mnt/database/form.vue       | 134 +++++++++++
 src/views/mnt/database/index.vue      | 179 +++++++++++++++
 src/views/mnt/deploy/deploy.vue       | 217 ++++++++++++++++++
 src/views/mnt/deploy/form.vue         | 132 +++++++++++
 src/views/mnt/deploy/index.vue        | 313 ++++++++++++++++++++++++++
 src/views/mnt/deploy/sysRestore.vue   | 152 +++++++++++++
 src/views/mnt/deployHistory/form.vue  | 133 +++++++++++
 src/views/mnt/deployHistory/index.vue | 163 ++++++++++++++
 src/views/mnt/serverDeploy/form.vue   | 137 +++++++++++
 src/views/mnt/serverDeploy/index.vue  | 183 +++++++++++++++
 25 files changed, 2728 insertions(+)
 create mode 100644 src/api/app.js
 create mode 100644 src/api/database.js
 create mode 100644 src/api/deploy.js
 create mode 100644 src/api/deployHistory.js
 create mode 100644 src/api/serverAccount.js
 create mode 100644 src/api/serverDeploy.js
 create mode 100644 src/views/mnt/account/form.vue
 create mode 100644 src/views/mnt/account/index.vue
 create mode 100644 src/views/mnt/app/form.vue
 create mode 100644 src/views/mnt/app/index.vue
 create mode 100644 src/views/mnt/database/form.vue
 create mode 100644 src/views/mnt/database/index.vue
 create mode 100644 src/views/mnt/deploy/deploy.vue
 create mode 100644 src/views/mnt/deploy/form.vue
 create mode 100644 src/views/mnt/deploy/index.vue
 create mode 100644 src/views/mnt/deploy/sysRestore.vue
 create mode 100644 src/views/mnt/deployHistory/form.vue
 create mode 100644 src/views/mnt/deployHistory/index.vue
 create mode 100644 src/views/mnt/serverDeploy/form.vue
 create mode 100644 src/views/mnt/serverDeploy/index.vue

diff --git a/config/dev.env.js b/config/dev.env.js
index 0115503..05700f8 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -4,6 +4,7 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
+  WS_API: '"ws://localhost:8000"',
   BASE_API: '"http://localhost:8000"'
   // BASE_API: '"https://api.auauz.net"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 73e8fe1..292b615 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
+  WS_API: '"ws://api.auauz.net"',
   BASE_API: '"https://api.auauz.net"'
 }
diff --git a/src/api/app.js b/src/api/app.js
new file mode 100644
index 0000000..8762fc1
--- /dev/null
+++ b/src/api/app.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function queryApps(data) {
+  return request({
+    url: 'api/app',
+    method: 'get',
+    data
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/app',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/app/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/app',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/database.js b/src/api/database.js
new file mode 100644
index 0000000..f26f48d
--- /dev/null
+++ b/src/api/database.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/database',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/database/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/database',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/deploy.js b/src/api/deploy.js
new file mode 100644
index 0000000..da3f139
--- /dev/null
+++ b/src/api/deploy.js
@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/deploy',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/deploy/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/deploy',
+    method: 'put',
+    data
+  })
+}
+
+export function getApps() {
+  return request({
+    url: 'api/app',
+    method: 'get'
+  })
+}
+
+export function getServers() {
+  return request({
+    url: 'api/serverDeploy',
+    method: 'get'
+  })
+}
+
+/**
+ * 启动服务
+ * @param data 选中行
+ */
+export function startServer(data) {
+  return request({
+    url: 'api/deploy/startServer',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 停止服务
+ * @param data  选中行
+ */
+export function stopServer(data) {
+  return request({
+    url: 'api/deploy/stopServer',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 停止服务
+ * @param data  选中行
+ */
+export function serverStatus(data) {
+  return request({
+    url: 'api/deploy/serverStatus',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/deployHistory.js b/src/api/deployHistory.js
new file mode 100644
index 0000000..a19512f
--- /dev/null
+++ b/src/api/deployHistory.js
@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+/**
+ * 部署管理
+ * @param data
+ */
+export function add(data) {
+  return request({
+    url: 'api/deployHistory',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/deployHistory/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/deployHistory',
+    method: 'put',
+    data
+  })
+}
+
+/**
+ * 版本回退
+ * @param data 选中行
+ */
+export function reducte(data) {
+  return request({
+    url: 'api/deploy/serverReduction',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/serverAccount.js b/src/api/serverAccount.js
new file mode 100644
index 0000000..0408d67
--- /dev/null
+++ b/src/api/serverAccount.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function queryServerAccount(data) {
+  return request({
+    url: 'api/serverAccount',
+    method: 'get',
+    data
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/serverAccount',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/serverAccount/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/serverAccount',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/serverDeploy.js b/src/api/serverDeploy.js
new file mode 100644
index 0000000..0110ddc
--- /dev/null
+++ b/src/api/serverDeploy.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/serverDeploy',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/serverDeploy/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/serverDeploy',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/store/getters.js b/src/store/getters.js
index 6273784..acb3ebd 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,4 +1,5 @@
 const getters = {
+  deployUploadApi: state => state.api.deployUploadApi,
   sidebar: state => state.app.sidebar,
   device: state => state.app.device,
   token: state => state.user.token,
diff --git a/src/store/modules/api.js b/src/store/modules/api.js
index dbda078..9b302c1 100644
--- a/src/store/modules/api.js
+++ b/src/store/modules/api.js
@@ -1,6 +1,8 @@
 const baseUrl = process.env.BASE_API
 const api = {
   state: {
+    // 部署包上传
+    deployUploadApi: baseUrl + '/api/deploy/upload',
     // 实时控制台
     socketApi: baseUrl + '/websocket?token=kl',
     // 图片上传
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 7ec38b4..092e27c 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -35,3 +35,79 @@ export function validatEmail(str) {
   const reg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
   return reg.test(str)
 }
+
+/**
+ * 是否合法IP地址
+ * @param rule
+ * @param value
+ * @param callback
+ */
+export function validateIP(rule, value, callback) {
+  if (value === '' || value === undefined || value == null) {
+    callback()
+  } else {
+    const reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+    if ((!reg.test(value)) && value !== '') {
+      callback(new Error('请输入正确的IP地址'))
+    } else {
+      callback()
+    }
+  }
+}
+
+/* 是否手机号码或者固话*/
+export function validatePhoneTwo(rule, value, callback) {
+  const reg = /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/
+  if (value === '' || value === undefined || value == null) {
+    callback()
+  } else {
+    if ((!reg.test(value)) && value !== '') {
+      callback(new Error('请输入正确的电话号码或者固话号码'))
+    } else {
+      callback()
+    }
+  }
+}
+
+/* 是否固话*/
+export function validateTelephone(rule, value, callback) {
+  const reg = /0\d{2}-\d{7,8}/
+  if (value === '' || value === undefined || value == null) {
+    callback()
+  } else {
+    if ((!reg.test(value)) && value !== '') {
+      callback(new Error('请输入正确的固话（格式：区号+号码,如010-1234567）'))
+    } else {
+      callback()
+    }
+  }
+}
+
+/* 是否手机号码*/
+export function validatePhone(rule, value, callback) {
+  const reg = /^[1][3,4,5,7,8][0-9]{9}$/
+  if (value === '' || value === undefined || value == null) {
+    callback()
+  } else {
+    if ((!reg.test(value)) && value !== '') {
+      callback(new Error('请输入正确的电话号码'))
+    } else {
+      callback()
+    }
+  }
+}
+
+/* 是否身份证号码*/
+export function validateIdNo(rule, value, callback) {
+  const reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+  if (value === '' || value === undefined || value == null) {
+    callback()
+  } else {
+    if ((!reg.test(value)) && value !== '') {
+      callback(new Error('请输入正确的身份证号码'))
+    } else {
+      callback()
+    }
+  }
+}
+
diff --git a/src/views/mnt/account/form.vue b/src/views/mnt/account/form.vue
new file mode 100644
index 0000000..fda8b91
--- /dev/null
+++ b/src/views/mnt/account/form.vue
@@ -0,0 +1,108 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="dialog"
+    :title="isAdd ? '新增' : '编辑'"
+    width="500px"
+  >
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="名称">
+        <el-input v-model="form.name" style="width: 370px" />
+      </el-form-item>
+      <el-form-item label="账号">
+        <el-input v-model="form.account" style="width: 370px" />
+      </el-form-item>
+      <el-form-item label="密码">
+        <el-input v-model="form.password" type="password" style="width: 370px" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/serverAccount'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      dialog: false,
+      form: {
+        id: '',
+        name: '',
+        account: '',
+        password: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '添加成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    doEdit() {
+      edit(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '修改成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        name: '',
+        account: '',
+        password: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/account/index.vue b/src/views/mnt/account/index.vue
new file mode 100644
index 0000000..e19c700
--- /dev/null
+++ b/src/views/mnt/account/index.vue
@@ -0,0 +1,176 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input
+        v-model="query.value"
+        clearable
+        placeholder="输入搜索内容"
+        style="width: 200px"
+        class="filter-item"
+        @keyup.enter.native="toQuery"
+      />
+      <el-select
+        v-model="query.type"
+        clearable
+        placeholder="类型"
+        class="filter-item"
+        style="width: 130px"
+      >
+        <el-option
+          v-for="item in queryTypeOptions"
+          :key="item.key"
+          :label="item.display_name"
+          :value="item.key"
+        />
+      </el-select>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="toQuery"
+      >搜索</el-button>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px">
+        <el-button
+          v-permission="['admin','serverAccount:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
+      <el-table-column prop="name" label="名称" />
+      <el-table-column prop="account" label="账号" />
+      <el-table-column
+        v-if="checkPermission(['admin','serverAccount:edit','serverAccount:del'])"
+        label="操作"
+        width="150px"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','serverAccount:edit']"
+            size="mini"
+            type="primary"
+            icon="el-icon-edit"
+            @click="edit(scope.row)"
+          />
+          <el-popover
+            v-permission="['admin','serverAccount:del']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button
+                :loading="delLoading"
+                type="primary"
+                size="mini"
+                @click="subDelete(scope.row.id)"
+              >确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del } from '@/api/serverAccount'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'name', display_name: '名称' },
+        { key: 'account', display_name: '账号' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/serverAccount'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) {
+        this.params[type] = value
+      }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id)
+        .then(res => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          this.dleChangePage()
+          this.init()
+          this.$notify({
+            title: '删除成功',
+            type: 'success',
+            duration: 2500
+          })
+        })
+        .catch(err => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          console.log(err.response.data.message)
+        })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        name: data.name,
+        account: data.account,
+        password: data.password
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/app/form.vue b/src/views/mnt/app/form.vue
new file mode 100644
index 0000000..efadb42
--- /dev/null
+++ b/src/views/mnt/app/form.vue
@@ -0,0 +1,180 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="dialog"
+    :title="isAdd ? '新增' : '编辑'"
+    width="800px"
+  >
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="应用名称" prop="name">
+        <el-input v-model="form.name" style="width: 670px" placeholder="部署后的文件或者目录名称，用于备份" />
+      </el-form-item>
+      <el-form-item label="应用端口" prop="port">
+        <el-input-number v-model="form.port" placeholder="例如：8080" />
+      </el-form-item>
+      <el-form-item label="上传目录" prop="uploadPath">
+        <el-input
+          v-model="form.uploadPath"
+          style="width: 670px"
+          placeholder="例如: /opt/upload"
+        />
+      </el-form-item>
+      <el-form-item label="部署目录" prop="deployPath">
+        <el-input
+          v-model="form.deployPath"
+          style="width: 670px"
+          placeholder="例如: /opt/app"
+        />
+      </el-form-item>
+      <el-form-item label="备份目录" prop="backupPath">
+        <el-input
+          v-model="form.backupPath"
+          style="width: 670px"
+          placeholder="例如: /opt/backup"
+        />
+      </el-form-item>
+      <el-form-item label="启动脚本" prop="startScript">
+        <el-input
+          v-model="form.startScript"
+          :rows="2"
+          type="textarea"
+          autosize
+          style="width: 670px"
+          placeholder=""
+        />
+      </el-form-item>
+      <el-form-item label="部署脚本" prop="deployScript">
+        <el-input
+          v-model="form.deployScript"
+          :rows="2"
+          type="textarea"
+          autosize
+          style="width: 670px"
+          placeholder=""
+        />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/app'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      dialog: false,
+      form: {
+        id: '',
+        name: '',
+        port: 8080,
+        uploadPath: '/opt/upload',
+        deployPath: '/opt/app',
+        backupPath: '/opt/backup',
+        startScript: '',
+        deployScript: ''
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入应用名称', trigger: 'change' }
+        ],
+        uploadPath: [
+          { required: true, message: '请输入上传目录', trigger: 'change' }
+        ],
+        deployPath: [
+          { required: true, message: '请输入部署目录', trigger: 'change' }
+        ],
+        backupPath: [
+          { required: true, message: '请输入备份目录', trigger: 'change' }
+        ],
+        startScript: [
+          { required: true, message: '请输入启动脚本', trigger: 'change' }
+        ],
+        deployScript: [
+          { required: true, message: '请输入部署脚本', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.isAdd) {
+            this.doAdd()
+          } else this.doEdit()
+        } else {
+          this.$message.error('请将表单中的信息补充完整！')
+        }
+      })
+    },
+    doAdd() {
+      add(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '添加成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    doEdit() {
+      edit(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '修改成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        name: '',
+        port: 8080,
+        uploadPath: '/opt/upload',
+        deployPath: '/opt/app',
+        backupPath: '/opt/backup',
+        startScript: '',
+        deployScript: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
new file mode 100644
index 0000000..b8632cf
--- /dev/null
+++ b/src/views/mnt/app/index.vue
@@ -0,0 +1,214 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input
+        v-model="query.value"
+        clearable
+        placeholder="输入搜索内容"
+        style="width: 200px"
+        class="filter-item"
+        @keyup.enter.native="toQuery"
+      />
+      <el-select
+        v-model="query.type"
+        clearable
+        placeholder="类型"
+        class="filter-item"
+        style="width: 130px"
+      >
+        <el-option
+          v-for="item in queryTypeOptions"
+          :key="item.key"
+          :label="item.display_name"
+          :value="item.key"
+        />
+      </el-select>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="toQuery"
+      >搜索</el-button>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px">
+        <el-button
+          v-permission="['admin','app:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+        <el-button
+          v-permission="['admin','app:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="copy"
+        >复制新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table
+      v-loading="loading"
+      :data="data"
+      highlight-current-row
+      size="small"
+      style="width: 100%"
+      @current-change="handleCurrentChange"
+    >
+      <el-table-column prop="name" label="应用名称" />
+      <el-table-column prop="port" label="端口号" />
+      <el-table-column prop="deployPath" label="部署目录" />
+      <el-table-column
+        v-if="checkPermission(['admin','app:edit','app:del'])"
+        label="操作"
+        width="150px"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','app:edit']"
+            size="mini"
+            type="primary"
+            icon="el-icon-edit"
+            @click="edit(scope.row)"
+          />
+          <el-popover
+            v-permission="['admin','app:del']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button
+                :loading="delLoading"
+                type="primary"
+                size="mini"
+                @click="subDelete(scope.row.id)"
+              >确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del } from '@/api/app'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [{ key: 'name', display_name: '应用名称' }],
+      currentRow: {}
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/app'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) {
+        this.params[type] = value
+      }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id)
+        .then(res => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          this.dleChangePage()
+          this.init()
+          this.$notify({
+            title: '删除成功',
+            type: 'success',
+            duration: 2500
+          })
+        })
+        .catch(err => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          console.log(err.response.data.message)
+        })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+      const _this = this.$refs.form
+      _this.form = {
+        id: '',
+        name: '',
+        port: 8080,
+        uploadPath: '/opt/upload',
+        deployPath: '/opt/app',
+        backupPath: '/opt/backup',
+        startScript: '',
+        deployScript: ''
+      }
+    },
+    copy() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+      const _this = this.$refs.form
+      _this.form = this.currentRow
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        name: data.name,
+        port: data.port,
+        uploadPath: data.uploadPath,
+        deployPath: data.deployPath,
+        backupPath: data.backupPath,
+        startScript: data.startScript,
+        deployScript: data.deployScript
+      }
+      _this.dialog = true
+    },
+    handleCurrentChange(row) {
+      this.currentRow = row
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/database/form.vue b/src/views/mnt/database/form.vue
new file mode 100644
index 0000000..db00ee0
--- /dev/null
+++ b/src/views/mnt/database/form.vue
@@ -0,0 +1,134 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="dialog"
+    :title="isAdd ? '新增' : '编辑'"
+    width="600px"
+  >
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
+      <el-form-item label="数据库名称" prop="name">
+        <el-input v-model="form.name" style="width: 370px" />
+      </el-form-item>
+      <el-form-item label="jdbcUrl" prop="jdbcUrl">
+        <el-input v-model="form.jdbcUrl" style="width: 370px" />
+      </el-form-item>
+      <el-form-item label="用户名" prop="userName">
+        <el-input v-model="form.userName" style="width: 370px" />
+      </el-form-item>
+      <el-form-item label="数据库密码" prop="pwd">
+        <el-input v-model="form.pwd" type="password" style="width: 370px" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/database'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      dialog: false,
+      form: {
+        id: '',
+        name: '',
+        jdbcUrl: '',
+        userName: '',
+        pwd: ''
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入数据库名称', trigger: 'change' }
+        ],
+        jdbcUrl: [
+          { required: true, message: '请输入数据库连接地址', trigger: 'change' }
+        ],
+        userName: [
+          { required: true, message: '请输入用户名', trigger: 'change' }
+        ],
+        pwd: [
+          { required: true, message: '请输入数据库密码', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.isAdd) {
+            this.doAdd()
+          } else {
+            this.doEdit()
+          }
+        } else {
+          this.$message.error('请将表单中的信息补充完整！')
+        }
+      })
+    },
+    doAdd() {
+      add(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '添加成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    doEdit() {
+      edit(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '修改成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        name: '',
+        jdbcUrl: '',
+        userName: '',
+        pwd: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
new file mode 100644
index 0000000..fdf09c8
--- /dev/null
+++ b/src/views/mnt/database/index.vue
@@ -0,0 +1,179 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input
+        v-model="query.value"
+        clearable
+        placeholder="输入搜索内容"
+        style="width: 200px"
+        class="filter-item"
+        @keyup.enter.native="toQuery"
+      />
+      <el-select
+        v-model="query.type"
+        clearable
+        placeholder="类型"
+        class="filter-item"
+        style="width: 130px"
+      >
+        <el-option
+          v-for="item in queryTypeOptions"
+          :key="item.key"
+          :label="item.display_name"
+          :value="item.key"
+        />
+      </el-select>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="toQuery"
+      >搜索</el-button>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px">
+        <el-button
+          v-permission="['admin','database:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
+      <!--<el-table-column prop="id" label="id" />-->
+      <el-table-column prop="name" label="数据库名称" />
+      <el-table-column prop="jdbcUrl" label="数据库连接地址" />
+      <el-table-column prop="userName" label="用户名" />
+      <el-table-column
+        v-if="checkPermission(['admin','database:edit','database:del'])"
+        label="操作"
+        width="150px"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','database:edit']"
+            size="mini"
+            type="primary"
+            icon="el-icon-edit"
+            @click="edit(scope.row)"
+          />
+          <el-popover
+            v-permission="['admin','database:del']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button
+                :loading="delLoading"
+                type="primary"
+                size="mini"
+                @click="subDelete(scope.row.id)"
+              >确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del } from '@/api/database'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'name', display_name: '数据库名称' },
+        { key: 'jdbcUrl', display_name: '数据库连接地址' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/database'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) {
+        this.params[type] = value
+      }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id)
+        .then(res => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          this.dleChangePage()
+          this.init()
+          this.$notify({
+            title: '删除成功',
+            type: 'success',
+            duration: 2500
+          })
+        })
+        .catch(err => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          console.log(err.response.data.message)
+        })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        name: data.name,
+        jdbcUrl: data.jdbcUrl,
+        userName: data.userName,
+        pwd: data.pwd
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/deploy/deploy.vue b/src/views/mnt/deploy/deploy.vue
new file mode 100644
index 0000000..615c113
--- /dev/null
+++ b/src/views/mnt/deploy/deploy.vue
@@ -0,0 +1,217 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="dialog"
+    title="应用部署"
+    width="400px"
+  >
+    <el-form ref="form" :model="form" :rules="rules" size="small">
+      <el-upload
+        :action="deployUploadApi"
+        :data="deployInfo"
+        :headers="headers"
+        :on-success="handleSuccess"
+        :on-error="handleError"
+        class="upload-demo"
+        drag
+      >
+        <i class="el-icon-upload" />
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div slot="tip" class="el-upload__tip">多个应用上传文件名称为all.zip,数据库更新脚本扩展名为.sql,上传成功后系统自动部署系统。</div>
+      </el-upload>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="cancel">关闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit, getApps, getServers } from '@/api/deploy'
+import { mapGetters } from 'vuex'
+import { getToken } from '@/utils/auth'
+
+export default {
+  props: {},
+  data() {
+    return {
+      loading: false,
+      dialog: false,
+      apps: [],
+      servers: [],
+      headers: {
+        Authorization: 'Bearer ' + getToken()
+      },
+      deployInfo: {},
+      form: {
+        id: '',
+        appId: '',
+        ip: '',
+        selectIp: []
+      },
+      rules: {}
+    }
+  },
+  computed: {
+    ...mapGetters(['deployUploadApi'])
+  },
+  created() {
+    this.initWebSocket()
+  },
+  destroyed: function() {
+    this.webSocketClose()
+  },
+  mounted() {
+    this.initSelect()
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else {
+        this.doEdit()
+      }
+    },
+    joinIp() {
+      this.form.ip = ''
+      this.form.selectIp.forEach(ip => {
+        if (this.form.ip !== '') {
+          this.form.ip += ','
+        }
+        this.form.ip += ip
+      })
+    },
+    doAdd() {
+      this.joinIp()
+      add(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '添加成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    doEdit() {
+      this.joinIp()
+      edit(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '修改成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        appId: '',
+        ip: '',
+        selectIp: []
+      }
+    },
+    initSelect() {
+      getApps().then(res => {
+        this.apps = res.content
+      })
+      getServers().then(res => {
+        this.servers = res.content
+      })
+    },
+    handleSuccess(response, file, fileList) {
+      const uid = file.uid
+      const id = response.id
+      console.log(uid, id)
+    },
+    // 监听上传失败
+    handleError(e, file, fileList) {
+      const msg = JSON.parse(e.message)
+      this.$notify({
+        title: msg.message,
+        type: 'error',
+        duration: 2500
+      })
+    },
+    initWebSocket() {
+      const wsUri = process.env.WS_API + '/webSocket/deploy'
+      this.websock = new WebSocket(wsUri)
+      this.websock.onopen = this.webSocketOnOpen
+      this.websock.onerror = this.webSocketOnError
+      this.websock.onmessage = this.webSocketOnMessage
+      this.websock.onclose = this.webSocketClose
+    },
+    webSocketOnOpen() {
+      this.$notify({
+        title: 'WebSocket连接成功',
+        type: 'success',
+        duration: 2500
+      })
+    },
+    webSocketOnError(e) {
+      this.$notify({
+        title: 'WebSocket连接发生错误',
+        type: 'error',
+        duration: 0
+      })
+    },
+    webSocketOnMessage(e) {
+      const data = JSON.parse(e.data)
+      if (data.msgType === 'INFO') {
+        this.$notify({
+          title: '',
+          message: data.msg,
+          type: 'success',
+          dangerouslyUseHTMLString: true,
+          duration: 5500
+        })
+      } else if (data.msgType === 'ERROR') {
+        this.$notify({
+          title: '',
+          message: data.msg,
+          dangerouslyUseHTMLString: true,
+          type: 'error',
+          duration: 0
+        })
+      }
+    },
+    webSocketSend(agentData) {
+      this.websock.send(agentData)
+    },
+    webSocketClose(e) {
+      this.$notify({
+        title: 'WebSocket已经关闭',
+        type: 'info',
+        duration: 1000
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/deploy/form.vue b/src/views/mnt/deploy/form.vue
new file mode 100644
index 0000000..2a70411
--- /dev/null
+++ b/src/views/mnt/deploy/form.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="dialog"
+    :title="isAdd ? '新增' : '编辑'"
+    width="500px"
+  >
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="应用编号">
+        <el-select v-model="form.appId" placeholder="请选择" style="width: 370px">
+          <el-option v-for="item in apps" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="IP列表">
+        <el-select v-model="form.selectIp" multiple placeholder="请选择" style="width: 370px">
+          <el-option v-for="item in servers" :key="item.id" :label="item.id" :value="item.id" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { add, edit, getApps, getServers } from '@/api/deploy'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      dialog: false,
+      apps: [],
+      servers: [],
+      form: {
+        id: '',
+        appId: '',
+        ip: '',
+        selectIp: []
+      },
+      rules: {}
+    }
+  },
+  mounted() {
+    this.initSelect()
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    joinIp() {
+      this.form.ip = ''
+      this.form.selectIp.forEach(ip => {
+        if (this.form.ip !== '') {
+          this.form.ip += ','
+        }
+        this.form.ip += ip
+      })
+    },
+    doAdd() {
+      this.joinIp()
+      add(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '添加成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    doEdit() {
+      this.joinIp()
+      edit(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '修改成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        appId: '',
+        ip: '',
+        selectIp: []
+      }
+    },
+    initSelect() {
+      getApps().then(res => {
+        this.apps = res.content
+      })
+      getServers().then(res => {
+        this.servers = res.content
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
new file mode 100644
index 0000000..8857ff8
--- /dev/null
+++ b/src/views/mnt/deploy/index.vue
@@ -0,0 +1,313 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input
+        v-model="query.value"
+        clearable
+        placeholder="输入搜索内容"
+        style="width: 200px"
+        class="filter-item"
+        @keyup.enter.native="toQuery"
+      />
+      <el-select
+        v-model="query.type"
+        clearable
+        placeholder="类型"
+        class="filter-item"
+        style="width: 130px"
+      >
+        <el-option
+          v-for="item in queryTypeOptions"
+          :key="item.key"
+          :label="item.display_name"
+          :value="item.key"
+        />
+      </el-select>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="toQuery"
+      >搜索
+      </el-button>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px">
+        <el-button
+          v-permission="['admin','deploy:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增
+        </el-button>
+        <el-button
+          v-permission="['admin','deploy:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-upload"
+          @click="sysRestore"
+        >系统还原
+        </el-button>
+        <el-button
+          v-permission="['admin','deploy:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-upload"
+          @click="serverStatus"
+        >状态查询
+        </el-button>
+        <el-button
+          v-permission="['admin','deploy:add']"
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-upload"
+          @click="startServer"
+        >启动
+        </el-button>
+        <el-button
+          v-permission="['admin','deploy:add']"
+          class="filter-item"
+          size="mini"
+          type="danger"
+          icon="el-icon-upload"
+          @click="stopServer"
+        >停止
+        </el-button>
+        <el-button
+          v-permission="['admin','deploy:add']"
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-upload"
+          @click="deploy"
+        >一键部署
+        </el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
+    <!--    系统还原组件-->
+    <fForm ref="sysRestore" :app-name="appName" :key="times"/>
+    <dForm ref="deploy"/>
+    <!--表格渲染-->
+    <el-table
+      v-loading="loading"
+      :data="data"
+      highlight-current-row
+      stripe
+      size="small"
+      style="width: 100%"
+      @current-change="handleCurrentChange"
+    >
+      <el-table-column :formatter="formatterAppId" prop="appId" label="应用名称"/>
+      <el-table-column prop="ip" label="服务器列表"/>
+      <el-table-column
+        v-if="checkPermission(['admin','deploy:edit','deploy:del'])"
+        label="操作"
+        width="150px"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','deploy:edit']"
+            size="mini"
+            type="primary"
+            icon="el-icon-edit"
+            @click="edit(scope.row)"
+          />
+          <el-popover
+            v-permission="['admin','deploy:del']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right;margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button
+                :loading="delLoading"
+                type="primary"
+                size="mini"
+                @click="subDelete(scope.row.id)"
+              >确定
+              </el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del, stopServer, serverStatus, startServer } from '@/api/deploy'
+import { queryApps } from '@/api/app'
+import eForm from './form'
+import dForm from './deploy'
+import fForm from './sysRestore'
+export default {
+  components: { eForm, dForm, fForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [{ key: 'ip', display_name: '服务器列表' }],
+      appList: [],
+      appMap: {},
+      currentRow: {},
+      selectIndex: '',
+      appName: '111',
+      urlHistory: '',
+      times: 0,
+      appId: '',
+      deployId: ''
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    async beforeInit() {
+      this.url = 'api/deploy'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      await queryApps({}).then(res => {
+        this.appList = res.content
+        this.appList.forEach(({ id, name }) => {
+          this.appMap[id] = name
+        })
+      })
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) {
+        this.params[type] = value
+      }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id)
+        .then(res => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          this.dleChangePage()
+          this.init()
+          this.$notify({
+            title: '删除成功',
+            type: 'success',
+            duration: 2500
+          })
+        })
+        .catch(err => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          console.log(err.response.data.message)
+        })
+    },
+    deploy() {
+      if (this.selectIndex === '') {
+        this.$message.error('请先选择服务')
+      } else {
+        this.$refs.deploy.dialog = true
+        debugger
+        this.$refs.deploy.deployInfo = this.currentRow
+      }
+    },
+    sysRestore() {
+      if (this.selectIndex === '') {
+        this.$message.error('请先选择服务')
+      } else {
+        this.$refs.form.$emit('open')
+        this.$refs.sysRestore.dialog = true
+      }
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        appId: data.appId,
+        ip: data.ip
+      }
+      _this.dialog = true
+    },
+    formatterAppId(row, column) {
+      return this.appMap[row.appId]
+    },
+    handleCurrentChange(row) {
+      this.currentRow = row
+      this.selectIndex = !row ? null : row.id
+      this.appName = !row ? null : this.appMap[row.appId]
+      this.times = this.times + !row ? 0 : 1
+      this.appId = !row ? null : row.appId
+      this.deployId = !row ? null : row.id
+    },
+    startServer() {
+      if (this.selectIndex === '') {
+        this.$message.error('请先选择服务')
+      } else {
+        startServer(JSON.stringify(this.currentRow))
+          .then(res => {
+          })
+          .catch(err => {
+            console.log('error:' + err.response.data.message)
+          })
+      }
+    },
+    stopServer() {
+      if (this.selectIndex === '') {
+        this.$message.error('请先选择服务')
+      } else {
+        stopServer(JSON.stringify(this.currentRow))
+          .then(res => {
+          })
+          .catch(err => {
+            console.log('error:' + err.response.data.message)
+          })
+      }
+    },
+    serverStatus() {
+      if (this.selectIndex === '') {
+        this.$message.error('请先选择服务')
+      } else {
+        serverStatus(JSON.stringify(this.currentRow))
+          .then(res => {
+          })
+          .catch(err => {
+            console.log('error:' + err.response.data.message)
+          })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/deploy/sysRestore.vue b/src/views/mnt/deploy/sysRestore.vue
new file mode 100644
index 0000000..fcd6b4f
--- /dev/null
+++ b/src/views/mnt/deploy/sysRestore.vue
@@ -0,0 +1,152 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="dialog"
+    title="系统还原"
+    width="800px"
+  >
+    <!--工具栏-->
+    <div class="head-container">
+      <el-input
+        v-model="query.value"
+        clearable
+        placeholder="输入部署时间"
+        style="width: 200px"
+        class="filter-item"
+        @keyup.enter.native="toQuery"
+      />
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="toQuery"
+      >搜索
+      </el-button>
+    </div>
+    <el-form size="small" label-width="80px">
+      <!--表格渲染-->
+      <el-table
+        v-loading="loading"
+        :data="data"
+        size="small"
+        style="width: 100%"
+        @row-click="showRow"
+      >
+        <el-table-column width="30px">
+          <template slot-scope="scope">
+            <el-radio v-model="radio" :label="scope.$index"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="appName" label="应用名称"/>
+        <el-table-column prop="ip" label="部署IP"/>
+        <el-table-column prop="deployDate" label="部署时间"/>
+        <el-table-column prop="deployUser" label="部署人员"/>
+      </el-table>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
+        :loading="loading"
+        type="primary"
+        @click="doSubmit"
+      >确认
+      </el-button>
+    </div>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </el-dialog>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { reducte } from '@/api/deployHistory'
+export default {
+  mixins: [initData],
+  props: {
+    appName: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      dialog: false,
+      history: [],
+      radio: '',
+      appNames: '',
+      selectIndex: ''
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/deployHistory'
+      this.deployId = this.$parent.deployId
+      debugger
+      if (this.deployId === '') {
+        return false
+      }
+      const sort = 'deployDate,desc'
+      this.params = {
+        page: this.page,
+        size: this.size,
+        sort: sort,
+        deployId: this.$parent.deployId
+      }
+      const query = this.query
+      const type = 'deployDate'
+      const value = query.value
+      this.params[type] = value
+      return true
+    },
+    formatterAppId(row, column) {
+      return this.appNames
+    },
+    showRow(row) {
+      this.radio = this.data.indexOf(row)
+      this.selectIndex = row.id
+    },
+    cancel() {
+      this.dialog = false
+      this.loading = false
+    },
+    doSubmit() {
+      if (this.selectIndex === '') {
+        this.$message.error('请选择要还原的备份')
+      } else {
+        reducte(JSON.stringify(this.data[this.radio]))
+          .then(res => {
+            this.dialog = false
+            this.loading = false
+            this.appNames = ''
+            this.$parent.init()
+          })
+          .catch(err => {
+            this.loading = false
+            console.log('error:' + err.response.data.message)
+          })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/deployHistory/form.vue b/src/views/mnt/deployHistory/form.vue
new file mode 100644
index 0000000..99118d3
--- /dev/null
+++ b/src/views/mnt/deployHistory/form.vue
@@ -0,0 +1,133 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="dialog"
+    :title="isAdd ? '新增' : '编辑'"
+    width="500px"
+  >
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="应用名称" prop="appName">
+        <el-input v-model="form.appName" style="width: 370px" />
+      </el-form-item>
+      <el-form-item label="部署IP" prop="ip">
+        <el-input v-model="form.ip" style="width: 370px" />
+      </el-form-item>
+      <el-form-item label="部署时间" prop="deployDate">
+        <el-input v-model="form.deployDate" style="width: 370px" />
+      </el-form-item>
+      <el-form-item label="部署人员" prop="deployUser">
+        <el-input v-model="form.deployUser" style="width: 370px" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/deployHistory'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      dialog: false,
+      form: {
+        id: '',
+        appName: '',
+        ip: '',
+        deployDate: '',
+        deployUser: ''
+      },
+      rules: {
+        id: [{ required: true, message: '请输入编号', trigger: 'change' }],
+        appName: [
+          { required: true, message: '请输入应用名称', trigger: 'change' }
+        ],
+        ip: [{ required: true, message: '请输入部署IP', trigger: 'change' }],
+        deployDate: [
+          { required: true, message: '请输入部署时间', trigger: 'change' }
+        ],
+        deployUser: [
+          { required: true, message: '请输入部署人员', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.isAdd) {
+            this.doAdd()
+          } else {
+            this.doEdit()
+          }
+        } else {
+          this.$message.error('请将表单中的信息补充完整！')
+        }
+      })
+    },
+    doAdd() {
+      add(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '添加成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    doEdit() {
+      edit(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '修改成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        appName: '',
+        ip: '',
+        deployDate: '',
+        deployUser: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue
new file mode 100644
index 0000000..99771ce
--- /dev/null
+++ b/src/views/mnt/deployHistory/index.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input
+        v-model="query.value"
+        clearable
+        placeholder="输入搜索内容"
+        style="width: 200px"
+        class="filter-item"
+        @keyup.enter.native="toQuery"
+      />
+      <el-select
+        v-model="query.type"
+        clearable
+        placeholder="类型"
+        class="filter-item"
+        style="width: 130px"
+      >
+        <el-option
+          v-for="item in queryTypeOptions"
+          :key="item.key"
+          :label="item.display_name"
+          :value="item.key"
+        />
+      </el-select>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="toQuery"
+      >搜索</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
+      <el-table-column prop="appName" label="应用名称" />
+      <el-table-column prop="ip" label="部署IP" />
+      <el-table-column prop="deployDate" label="部署时间" />
+      <el-table-column prop="deployUser" label="部署人员" />
+      <el-table-column
+        v-if="checkPermission(['admin','deployHistory:del'])"
+        label="操作"
+        width="150px"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <el-popover
+            v-permission="['admin','deployHistory:del']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button
+                :loading="delLoading"
+                type="primary"
+                size="mini"
+                @click="subDelete(scope.row.id)"
+              >确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del } from '@/api/deployHistory'
+import eForm from './form'
+
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'appName', display_name: '应用名称' },
+        { key: 'ip', display_name: '部署IP' },
+        { key: 'deployUser', display_name: '部署人员' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/deployHistory'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) {
+        this.params[type] = value
+      }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id)
+        .then(res => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          this.dleChangePage()
+          this.init()
+          this.$notify({
+            title: '删除成功',
+            type: 'success',
+            duration: 2500
+          })
+        })
+        .catch(err => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          console.log(err.response.data.message)
+        })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        appName: data.appName,
+        ip: data.ip,
+        deployDate: data.deployDate,
+        deployUser: data.deployUser
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/serverDeploy/form.vue b/src/views/mnt/serverDeploy/form.vue
new file mode 100644
index 0000000..3baf118
--- /dev/null
+++ b/src/views/mnt/serverDeploy/form.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="dialog"
+    :title="isAdd ? '新增' : '编辑'"
+    width="500px"
+  >
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="服务器IP" prop="id">
+        <el-input v-model="form.id" :disabled="!isAdd" style="width: 370px" />
+      </el-form-item>
+      <el-form-item label="服务器账号" prop="accountId">
+        <el-select
+          v-model="form.accountId"
+          clearable
+          placeholder="选择对应账号"
+          class="filter-item"
+          style="width: 370px"
+        >
+          <el-option
+            v-for="item in accountList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/serverDeploy'
+import { validateIP } from '@/utils/validate'
+
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    },
+    accountList: {
+      type: Array,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      dialog: false,
+      form: {
+        id: '',
+        accountId: ''
+      },
+      rules: {
+        id: [
+          { required: true, message: '请输入IP', trigger: 'change' },
+          { validator: validateIP, trigger: 'change' }
+        ],
+        accountId: [
+          { required: true, message: '请选择账号', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  mounted() {},
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.isAdd) {
+            this.doAdd()
+          } else {
+            this.doEdit()
+          }
+        } else {
+          this.$message.error('请将表单中的信息补充完整！')
+        }
+      })
+    },
+    doAdd() {
+      add(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '添加成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    doEdit() {
+      edit(this.form)
+        .then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '修改成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        })
+        .catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        accountId: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/serverDeploy/index.vue b/src/views/mnt/serverDeploy/index.vue
new file mode 100644
index 0000000..de00d4d
--- /dev/null
+++ b/src/views/mnt/serverDeploy/index.vue
@@ -0,0 +1,183 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input
+        v-model="query.value"
+        clearable
+        placeholder="输入搜索内容"
+        style="width: 200px"
+        class="filter-item"
+        @keyup.enter.native="toQuery"
+      />
+      <el-select
+        v-model="query.type"
+        clearable
+        placeholder="类型"
+        class="filter-item"
+        style="width: 130px"
+      >
+        <el-option
+          v-for="item in queryTypeOptions"
+          :key="item.key"
+          :label="item.display_name"
+          :value="item.key"
+        />
+      </el-select>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="toQuery"
+      >搜索</el-button>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px">
+        <el-button
+          v-permission="['admin','serverDeploy:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" :account-list="accountList" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
+      <el-table-column prop="id" label="服务器IP" />
+      <el-table-column :formatter="accountTranslate" prop="accountId" label="服务器账号" />
+      <el-table-column
+        v-if="checkPermission(['admin','serverDeploy:edit','serverDeploy:del'])"
+        label="操作"
+        width="150px"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','serverDeploy:edit']"
+            size="mini"
+            type="primary"
+            icon="el-icon-edit"
+            @click="edit(scope.row)"
+          />
+          <el-popover
+            v-permission="['admin','serverDeploy:del']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button
+                :loading="delLoading"
+                type="primary"
+                size="mini"
+                @click="subDelete(scope.row.id)"
+              >确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del } from '@/api/serverDeploy'
+import { queryServerAccount } from '@/api/serverAccount'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [{ key: 'id', display_name: '服务器IP' }],
+      accountList: [],
+      accountMap: {}
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    async beforeInit() {
+      this.url = 'api/serverDeploy'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      await queryServerAccount({}).then(res => {
+        this.accountList = res.content
+        this.accountList.forEach(({ id, name }) => {
+          this.accountMap[id] = name
+        })
+      })
+      if (type && value) {
+        this.params[type] = value
+      }
+      return true
+    },
+    accountTranslate(row, column) {
+      return this.accountMap[row.accountId]
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id)
+        .then(res => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          this.dleChangePage()
+          this.init()
+          this.$notify({
+            title: '删除成功',
+            type: 'success',
+            duration: 2500
+          })
+        })
+        .catch(err => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          console.log(err.response.data.message)
+        })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        accountId: data.accountId
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

From 91c444379d3eca6aeaedc7ccdae8f6b06b26ff95 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 19 Nov 2019 13:08:04 +0800
Subject: [PATCH 11/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=99=A8=E4=BC=98=E5=8C=96=E5=AE=8C=E6=88=90=EF=BC=8C=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=EF=BC=9A=E9=A2=84=E8=A7=88=EF=BC=8C=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=EF=BC=8C=E5=85=B3=E8=81=94=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/generator.js           | 20 ++++++--------
 src/views/generator/config.vue | 50 ++++++++++++++++++++++------------
 src/views/generator/index.vue  | 22 +++++++--------
 3 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/src/api/generator.js b/src/api/generator.js
index a25aec5..194f629 100644
--- a/src/api/generator.js
+++ b/src/api/generator.js
@@ -1,17 +1,15 @@
 import request from '@/utils/request'
 
-// export function getAllTable() {
-//   return request({
-//     url: 'api/generator?tableName=' + tableName,
-//     data,
-//     method: 'post'
-//   })
-// }
-
-export function generator(data, tableName) {
+export function getAllTable() {
   return request({
-    url: 'api/generator?tableName=' + tableName,
-    data,
+    url: 'api/generator/tables/all',
+    method: 'get'
+  })
+}
+
+export function generator(tableName, type) {
+  return request({
+    url: 'api/generator/' + tableName + '/' + type,
     method: 'post'
   })
 }
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index dcecb73..ef9ab09 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -5,7 +5,7 @@
       <el-col style="margin-bottom: 10px">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
-            <span class="role-span">字段配置</span>
+            <span class="role-span">字段配置：{{ tableName }}</span>
             <el-button
               :loading="columnLoading"
               icon="el-icon-check"
@@ -16,7 +16,6 @@
           </div>
           <el-form size="small" label-width="90px">
             <el-table v-loading="loading" :data="data" :max-height="tableHeight" size="small" style="width: 100%;margin-bottom: 15px">
-              <el-table-column prop="tableName" label="表名"/>
               <el-table-column prop="columnName" label="字段名称"/>
               <el-table-column prop="columnType" label="字段类型"/>
               <el-table-column prop="remark" label="字段描述">
@@ -24,17 +23,17 @@
                   <el-input v-model="data[scope.$index].remark" size="mini" class="edit-input"/>
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="必填">
+              <el-table-column align="center" label="必填" width="70px">
                 <template slot-scope="scope">
                   <el-checkbox v-model="data[scope.$index].notNull"/>
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="列表">
+              <el-table-column align="center" label="列表" width="70px">
                 <template slot-scope="scope">
                   <el-checkbox v-model="data[scope.$index].listShow"/>
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="表单">
+              <el-table-column align="center" label="表单" width="70px">
                 <template slot-scope="scope">
                   <el-checkbox v-model="data[scope.$index].formShow"/>
                 </template>
@@ -54,9 +53,6 @@
                     <el-option
                       label="下拉框"
                       value="Select"/>
-                    <el-option
-                      label="复选框"
-                      value="Checkbox"/>
                     <el-option
                       label="日期框"
                       value="Date"/>
@@ -81,6 +77,21 @@
                     <el-option
                       label="Like"
                       value="Like"/>
+                    <el-option
+                      label="DateRange"
+                      value="DateRange"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="日期注解">
+                <template slot-scope="scope">
+                  <el-select v-model="data[scope.$index].dateAnnotation" filterable class="edit-input" clearable size="mini" placeholder="请选择">
+                    <el-option
+                      label="自动创建时间"
+                      value="CreationTimestamp"/>
+                    <el-option
+                      label="自动更新时间"
+                      value="UpdateTimestamp"/>
                   </el-select>
                 </template>
               </el-table-column>
@@ -93,13 +104,8 @@
               </el-table-column>
               <el-table-column label="实体关联">
                 <template slot-scope="scope">
-                  <el-select v-model="data[scope.$index].joinName" filterable class="edit-input" clearable size="mini" placeholder="请选择">
-                    <el-option
-                      label="模糊查询"
-                      value="1"/>
-                    <el-option
-                      label="精确查询"
-                      value="2"/>
+                  <el-select v-model="data[scope.$index].joinName" filterable class="edit-input" clearable size="mini" placeholder="请选择" @change="toConfig">
+                    <el-option v-for="item in tables" :key="item[0]" :label="item[0]" :value="item[0]"/>
                   </el-select>
                 </template>
               </el-table-column>
@@ -149,7 +155,7 @@
                 <el-radio-button label="true">是</el-radio-button>
                 <el-radio-button label="false">否</el-radio-button>
               </el-radio-group>
-              <span style="color: #C0C0C0;margin-left: 10px;">危险选型，请考虑后选择</span>
+              <span style="color: #C0C0C0;margin-left: 10px;">谨防误操作，请慎重选择</span>
             </el-form-item>
           </el-form>
         </el-card>
@@ -161,7 +167,7 @@
 <script>
 import initData from '@/mixins/initData'
 import { update, get } from '@/api/genConfig'
-import { save } from '@/api/generator'
+import { save, getAllTable } from '@/api/generator'
 import { getDicts } from '@/api/dict'
 export default {
   name: 'GeneratorConfig',
@@ -169,7 +175,7 @@ export default {
   mixins: [initData],
   data() {
     return {
-      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [],
+      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [], tables: [],
       form: { id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
       rules: {
         author: [
@@ -202,6 +208,9 @@ export default {
       getDicts().then(data => {
         this.dicts = data
       })
+      getAllTable().then(data => {
+        this.tables = data
+      })
     })
   },
   methods: {
@@ -244,6 +253,11 @@ export default {
           })
         }
       })
+    },
+    toConfig(tableName) {
+      if (tableName) {
+        this.$router.push('/sys-tools/generator/config/' + tableName)
+      }
     }
   }
 }
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index d691302..84240a6 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -29,7 +29,7 @@
               编辑
             </router-link>
           </el-button>
-          <el-button type="text" style="margin-left: -1px" size="mini">生成</el-button>
+          <el-button type="text" style="margin-left: -1px" size="mini" @click="toGen(scope.row.tableName)">生成</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -47,6 +47,7 @@
 <script>
 import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
+import { generator } from '@/api/generator'
 export default {
   name: 'GeneratorIndex',
   mixins: [initData],
@@ -91,17 +92,14 @@ export default {
       if (name) { this.params['name'] = name }
       return true
     },
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          this.doUpdate()
-        } else {
-          return false
-        }
+    toGen(tableName) {
+      // 生成代码
+      generator(tableName, 0).then(data => {
+        this.$notify({
+          title: '生成成功',
+          type: 'success',
+          duration: 2500
+        })
       })
     }
   }

From 2e7cce299caa429191f597c81703aae0f1e1464d Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Wed, 20 Nov 2019 15:15:41 +0800
Subject: [PATCH 12/64] update

---
 src/views/generator/config.vue | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index ef9ab09..3ff6ba6 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -102,13 +102,6 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column label="实体关联">
-                <template slot-scope="scope">
-                  <el-select v-model="data[scope.$index].joinName" filterable class="edit-input" clearable size="mini" placeholder="请选择" @change="toConfig">
-                    <el-option v-for="item in tables" :key="item[0]" :label="item[0]" :value="item[0]"/>
-                  </el-select>
-                </template>
-              </el-table-column>
             </el-table>
           </el-form>
         </el-card>
@@ -167,7 +160,7 @@
 <script>
 import initData from '@/mixins/initData'
 import { update, get } from '@/api/genConfig'
-import { save, getAllTable } from '@/api/generator'
+import { save } from '@/api/generator'
 import { getDicts } from '@/api/dict'
 export default {
   name: 'GeneratorConfig',
@@ -175,7 +168,7 @@ export default {
   mixins: [initData],
   data() {
     return {
-      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [], tables: [],
+      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [],
       form: { id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
       rules: {
         author: [
@@ -208,9 +201,6 @@ export default {
       getDicts().then(data => {
         this.dicts = data
       })
-      getAllTable().then(data => {
-        this.tables = data
-      })
     })
   },
   methods: {
@@ -253,11 +243,6 @@ export default {
           })
         }
       })
-    },
-    toConfig(tableName) {
-      if (tableName) {
-        this.$router.push('/sys-tools/generator/config/' + tableName)
-      }
     }
   }
 }

From e096447c2ec941563ae78cc114c60e915f4e635f Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Wed, 20 Nov 2019 21:12:47 +0800
Subject: [PATCH 13/64] =?UTF-8?q?vue=20cli3=20=E6=94=B9=E9=80=A0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .babelrc                                      |  17 -
 .editorconfig                                 |   2 +-
 .env.development                              |   7 +
 .env.production                               |   4 +
 .eslintignore                                 |   3 +-
 .eslintrc.js                                  |   8 +-
 .gitignore                                    |  11 +-
 .postcssrc.js                                 |  10 -
 .travis.yml                                   |   2 +-
 LICENSE                                       | 204 +-----------
 babel.config.js                               |   5 +
 build/build.js                                |  67 ----
 build/check-versions.js                       |  62 ----
 build/index.js                                |  27 ++
 build/utils.js                                | 108 -------
 build/vue-loader.conf.js                      |   5 -
 build/webpack.base.conf.js                    | 122 -------
 build/webpack.dev.conf.js                     |  98 ------
 build/webpack.prod.conf.js                    | 188 -----------
 config/dev.env.js                             |   9 -
 config/index.js                               | 106 ------
 config/prod.env.js                            |   5 -
 index.html                                    |  22 --
 jest.config.js                                |  24 ++
 package.json                                  | 148 ++++-----
 plopfile.js                                   |   7 +
 postcss.config.js                             |   5 +
 favicon.ico => public/favicon.ico             | Bin
 public/index.html                             |  15 +
 src/App.vue                                   |   2 +-
 src/assets/404_images/404.png                 | Bin 63580 -> 98071 bytes
 src/assets/404_images/404_cloud.png           | Bin 3054 -> 4766 bytes
 src/{ => assets}/icons/index.js               |   4 +-
 src/assets/icons/svg/404.svg                  |   1 +
 src/{ => assets}/icons/svg/Steve-Jobs.svg     |   0
 src/{ => assets}/icons/svg/add.svg            |   0
 src/{ => assets}/icons/svg/alipay.svg         |   0
 src/{ => assets}/icons/svg/anq.svg            |   0
 src/assets/icons/svg/bug.svg                  |   1 +
 src/{ => assets}/icons/svg/chain.svg          |   0
 src/assets/icons/svg/chart.svg                |   1 +
 src/assets/icons/svg/clipboard.svg            |   1 +
 src/{ => assets}/icons/svg/codeConsole.svg    |   0
 src/assets/icons/svg/component.svg            |   1 +
 src/assets/icons/svg/dashboard.svg            |   1 +
 src/{ => assets}/icons/svg/date.svg           |   0
 src/{ => assets}/icons/svg/dept.svg           |   0
 src/{ => assets}/icons/svg/dev.svg            |   0
 src/{ => assets}/icons/svg/develop.svg        |   0
 src/{ => assets}/icons/svg/dictionary.svg     |   0
 src/assets/icons/svg/documentation.svg        |   1 +
 src/assets/icons/svg/drag.svg                 |   1 +
 src/assets/icons/svg/edit.svg                 |   1 +
 src/assets/icons/svg/education.svg            |   1 +
 src/{ => assets}/icons/svg/email.svg          |   0
 src/{ => assets}/icons/svg/error.svg          |   0
 src/assets/icons/svg/example.svg              |   1 +
 src/assets/icons/svg/excel.svg                |   1 +
 src/assets/icons/svg/exit-fullscreen.svg      |   1 +
 src/assets/icons/svg/eye-open.svg             |   1 +
 src/assets/icons/svg/eye.svg                  |   1 +
 src/assets/icons/svg/form.svg                 |   1 +
 src/assets/icons/svg/fullscreen.svg           |   1 +
 src/{ => assets}/icons/svg/fwb.svg            |   0
 src/{ => assets}/icons/svg/github.svg         |   0
 src/{ => assets}/icons/svg/gonggao.svg        |   0
 src/assets/icons/svg/guide.svg                |   1 +
 src/{ => assets}/icons/svg/icon.svg           |   0
 src/{ => assets}/icons/svg/image.svg          |   0
 src/{ => assets}/icons/svg/index.svg          |   0
 src/assets/icons/svg/international.svg        |   1 +
 src/{ => assets}/icons/svg/ipvisits.svg       |   0
 src/{ => assets}/icons/svg/java.svg           |   0
 src/assets/icons/svg/language.svg             |   1 +
 src/assets/icons/svg/link.svg                 |   1 +
 src/assets/icons/svg/list.svg                 |   1 +
 src/{ => assets}/icons/svg/lock.svg           |   0
 src/{ => assets}/icons/svg/log.svg            |   0
 src/{ => assets}/icons/svg/markdown.svg       |   0
 src/{ => assets}/icons/svg/menu.svg           |   0
 src/assets/icons/svg/message.svg              |   1 +
 src/assets/icons/svg/money.svg                |   1 +
 src/{ => assets}/icons/svg/monitor.svg        |   0
 src/assets/icons/svg/nested.svg               |   1 +
 src/{ => assets}/icons/svg/password.svg       |   0
 src/assets/icons/svg/pdf.svg                  |   1 +
 src/assets/icons/svg/people.svg               |   1 +
 src/{ => assets}/icons/svg/peoples.svg        |   0
 src/{ => assets}/icons/svg/permission.svg     |   0
 src/{ => assets}/icons/svg/phone.svg          |   0
 src/{ => assets}/icons/svg/qiniu.svg          |   0
 src/assets/icons/svg/qq.svg                   |   1 +
 src/{ => assets}/icons/svg/redis.svg          |   0
 src/{ => assets}/icons/svg/role.svg           |   0
 src/{ => assets}/icons/svg/run.svg            |   0
 src/{ => assets}/icons/svg/running.svg        |   0
 src/{ => assets}/icons/svg/search.svg         |   0
 src/assets/icons/svg/shopping.svg             |   1 +
 src/assets/icons/svg/size.svg                 |   1 +
 src/assets/icons/svg/skill.svg                |   1 +
 src/{ => assets}/icons/svg/sqlMonitor.svg     |   0
 src/assets/icons/svg/star.svg                 |   1 +
 src/{ => assets}/icons/svg/swagger.svg        |   0
 src/{ => assets}/icons/svg/sys-tools.svg      |   0
 src/{ => assets}/icons/svg/system.svg         |   0
 src/assets/icons/svg/tab.svg                  |   1 +
 src/assets/icons/svg/table.svg                |   1 +
 src/assets/icons/svg/theme.svg                |   1 +
 src/{ => assets}/icons/svg/timing.svg         |   0
 src/{ => assets}/icons/svg/tools.svg          |   0
 src/assets/icons/svg/tree-table.svg           |   1 +
 src/assets/icons/svg/tree.svg                 |   1 +
 src/{ => assets}/icons/svg/unlock.svg         |   0
 src/{ => assets}/icons/svg/user.svg           |   0
 src/{ => assets}/icons/svg/user1.svg          |   0
 src/{ => assets}/icons/svg/validCode.svg      |   0
 src/{ => assets}/icons/svg/visits.svg         |   0
 src/{ => assets}/icons/svg/web.svg            |   0
 src/assets/icons/svg/wechat.svg               |   1 +
 src/{ => assets}/icons/svg/weixin.svg         |   0
 src/assets/icons/svg/zip.svg                  |   1 +
 src/{ => assets}/icons/svg/zujian.svg         |   0
 src/{ => assets}/icons/svgo.yml               |   0
 src/assets/{avatar => images}/avatar.png      | Bin
 src/assets/{logo => images}/logo.png          | Bin
 src/assets/styles/btn.scss                    |  99 ++++++
 src/assets/styles/eladmin.scss                |  96 ++++++
 src/assets/styles/element-ui.scss             |  79 +++++
 .../styles/element-variables.scss             |   2 +-
 src/assets/styles/index.scss                  | 182 +++++++++++
 src/assets/styles/mixin.scss                  |  66 ++++
 src/{ => assets}/styles/sidebar.scss          | 160 ++++++---
 src/{ => assets}/styles/transition.scss       |  10 +-
 src/{ => assets}/styles/variables.scss        |  16 +-
 src/components/Breadcrumb/index.vue           |  49 +--
 .../Echarts}/BarChart.vue                     |   2 +-
 .../Echarts}/Category.vue                     |   2 +-
 .../Echarts}/Funnel.vue                       |   2 +-
 .../Echarts}/Gauge.vue                        |   2 +-
 .../Echarts}/Graph.vue                        |   2 +-
 .../Echarts}/HeatMap.vue                      |   2 +-
 .../Echarts}/Line3D.vue                       |   2 +-
 .../Echarts}/PieChart.vue                     |   2 +-
 .../Echarts}/Point.vue                        |   2 +-
 .../Echarts}/RadarChart.vue                   |   2 +-
 .../dashboard => components/Echarts}/Rich.vue |   2 +-
 .../Echarts}/Sankey.vue                       |   2 +-
 .../Echarts}/Scatter.vue                      |   2 +-
 .../Echarts}/Sunburst.vue                     |   2 +-
 .../Echarts}/ThemeRiver.vue                   |   2 +-
 src/components/Github/index.vue               |   2 +-
 src/components/Hamburger/index.vue            |  29 +-
 src/components/HeaderSearch/index.vue         | 180 +++++++++++
 src/components/IconSelect/index.vue           |   2 +-
 src/components/IconSelect/requireIcons.js     |   2 +-
 src/components/Iframe/index.vue               |   2 +-
 src/components/Pagination/index.vue           | 101 ++++++
 src/components/PanThumb/index.vue             |   2 +-
 src/components/RightPanel/index.vue           | 132 ++++----
 src/components/Screenfull/index.vue           |  58 ++--
 src/components/SizeSelect/index.vue           |  57 ++++
 src/components/SvgIcon/index.vue              |  23 +-
 src/components/TextHoverEffect/Mallki.vue     | 113 -------
 src/components/ThemePicker/index.vue          | 175 ++++++++++
 src/components/YamlEdit/index.vue             |   2 +-
 src/layout/components/AppMain.vue             |  47 +--
 src/layout/components/Navbar.vue              | 174 +++++-----
 src/layout/components/Settings/index.vue      |  58 ++--
 src/layout/components/Sidebar/FixiOSBug.js    |  10 +-
 src/layout/components/Sidebar/Link.vue        |  11 +-
 src/layout/components/Sidebar/Logo.vue        |  84 +++--
 src/layout/components/Sidebar/SidebarItem.vue |  54 ++--
 src/layout/components/Sidebar/index.vue       |  57 +++-
 .../components/TagsView/ScrollPane.vue}       |  35 +-
 .../{TagsView.vue => TagsView/index.vue}      |  67 ++--
 src/layout/components/index.js                |   6 +-
 src/layout/{Layout.vue => index.vue}          |  19 +-
 src/layout/mixin/ResizeHandler.js             |  30 +-
 src/main.js                                   |  32 +-
 src/router/index.js                           |   8 +-
 src/router/routers.js                         |  38 +--
 src/{config/index.js => settings.js}          |  43 +--
 src/store/getters.js                          |   1 +
 src/store/index.js                            |  28 +-
 src/store/modules/api.js                      |   2 +-
 src/store/modules/app.js                      |  81 +++--
 src/store/modules/permission.js               |   2 +-
 src/store/modules/settings.js                 |  60 ++--
 src/store/modules/tagsView.js                 | 303 +++++++++---------
 src/styles/description.scss                   |  17 -
 src/styles/element-ui.scss                    |  29 --
 src/styles/index.scss                         | 173 ----------
 src/styles/mixin.scss                         |  27 --
 src/utils/auth.js                             |   2 +-
 src/utils/clipboard.js                        |   4 +-
 src/utils/export2Excel.js                     | 206 ------------
 src/utils/export2Zip.js                       |  24 --
 src/utils/get-page-title.js                   |  10 +
 src/utils/index.js                            | 295 ++++++++++++++---
 src/utils/open-window.js                      |  25 ++
 src/utils/permission.js                       |   3 +-
 src/utils/request.js                          |   4 +-
 src/utils/scroll-to.js                        |  58 ++++
 src/utils/validate.js                         |  84 ++++-
 src/views/components/Echarts.vue              | 151 +++++++++
 src/views/components/Editor.vue               |   4 +-
 src/views/components/IconSelect.vue           |  70 ----
 src/views/components/MarkDown.vue             |   2 +-
 src/views/components/YamlEdit.vue             |   2 +-
 src/views/components/icons/element-icons.js   |  74 +++++
 src/views/components/icons/index.vue          |  91 ++++++
 src/views/components/icons/svg-icons.js       |  10 +
 src/views/dashboard/LineChart.vue             |   2 +-
 src/views/dashboard/PanelGroup.vue            |   8 +-
 src/views/features/401.vue                    |  28 +-
 src/views/features/404.vue                    |   3 -
 src/views/features/redirect.vue               |   2 +-
 src/views/generator/config.vue                |  69 ++--
 src/views/generator/index.vue                 |  13 +-
 src/views/home.vue                            | 102 +++---
 src/views/login.vue                           |  18 +-
 src/views/monitor/log/errorLog.vue            |  15 +-
 src/views/monitor/log/index.vue               |  15 +-
 src/views/monitor/log/search.vue              |  12 +-
 src/views/monitor/online/index.vue            |  23 +-
 src/views/monitor/redis/index.vue             |  17 +-
 src/views/monitor/server/form.vue             |  16 +-
 src/views/monitor/server/index.vue            |  49 +--
 src/views/monitor/sql/index.vue               |   2 +-
 src/views/nested/menu1/index.vue              |   2 +-
 src/views/nested/menu1/menu1-1/index.vue      |   4 +-
 src/views/nested/menu1/menu1-2/index.vue      |   2 +-
 src/views/nested/menu2/index.vue              |   2 +-
 src/views/system/dept/form.vue                |   2 +-
 src/views/system/dept/index.vue               |  35 +-
 src/views/system/dict/form.vue                |   4 +-
 src/views/system/dict/index.vue               |  31 +-
 src/views/system/dictDetail/form.vue          |   6 +-
 src/views/system/dictDetail/index.vue         |  26 +-
 src/views/system/job/form.vue                 |   4 +-
 src/views/system/job/index.vue                |  38 ++-
 src/views/system/menu/form.vue                |  19 +-
 src/views/system/menu/index.vue               |  34 +-
 src/views/system/role/form.vue                |  11 +-
 src/views/system/role/index.vue               |  45 +--
 src/views/system/timing/index.vue             |  54 ++--
 src/views/system/timing/log.vue               |  31 +-
 src/views/system/user/center.vue              |  22 +-
 src/views/system/user/center/updateEmail.vue  |   6 +-
 src/views/system/user/center/updatePass.vue   |   6 +-
 src/views/system/user/form.vue                |  10 +-
 src/views/system/user/index.vue               |  46 +--
 src/views/tools/aliPay/config.vue             |  12 +-
 src/views/tools/aliPay/index.vue              |   5 +-
 src/views/tools/aliPay/toPay.vue              |   6 +-
 src/views/tools/email/config.vue              |  10 +-
 src/views/tools/email/index.vue               |   5 +-
 src/views/tools/email/send.vue                |  11 +-
 src/views/tools/picture/index.vue             |  45 +--
 src/views/tools/storage/index.vue             |   5 +-
 src/views/tools/storage/local/form.vue        |   9 +-
 src/views/tools/storage/local/index.vue       |  58 ++--
 src/views/tools/storage/qiniu/form.vue        |  13 +-
 src/views/tools/storage/qiniu/index.vue       |  43 +--
 src/views/tools/swagger/index.vue             |   2 +-
 static/.gitkeep                               |   0
 vue.config.js                                 | 130 ++++++++
 267 files changed, 3678 insertions(+), 3130 deletions(-)
 delete mode 100644 .babelrc
 create mode 100644 .env.development
 create mode 100644 .env.production
 delete mode 100644 .postcssrc.js
 create mode 100644 babel.config.js
 delete mode 100644 build/build.js
 delete mode 100644 build/check-versions.js
 create mode 100644 build/index.js
 delete mode 100644 build/utils.js
 delete mode 100644 build/vue-loader.conf.js
 delete mode 100644 build/webpack.base.conf.js
 delete mode 100644 build/webpack.dev.conf.js
 delete mode 100644 build/webpack.prod.conf.js
 delete mode 100644 config/dev.env.js
 delete mode 100644 config/index.js
 delete mode 100644 config/prod.env.js
 delete mode 100644 index.html
 create mode 100644 jest.config.js
 create mode 100644 plopfile.js
 create mode 100644 postcss.config.js
 rename favicon.ico => public/favicon.ico (100%)
 create mode 100644 public/index.html
 rename src/{ => assets}/icons/index.js (79%)
 create mode 100644 src/assets/icons/svg/404.svg
 rename src/{ => assets}/icons/svg/Steve-Jobs.svg (100%)
 rename src/{ => assets}/icons/svg/add.svg (100%)
 rename src/{ => assets}/icons/svg/alipay.svg (100%)
 rename src/{ => assets}/icons/svg/anq.svg (100%)
 create mode 100644 src/assets/icons/svg/bug.svg
 rename src/{ => assets}/icons/svg/chain.svg (100%)
 create mode 100644 src/assets/icons/svg/chart.svg
 create mode 100644 src/assets/icons/svg/clipboard.svg
 rename src/{ => assets}/icons/svg/codeConsole.svg (100%)
 create mode 100644 src/assets/icons/svg/component.svg
 create mode 100644 src/assets/icons/svg/dashboard.svg
 rename src/{ => assets}/icons/svg/date.svg (100%)
 rename src/{ => assets}/icons/svg/dept.svg (100%)
 rename src/{ => assets}/icons/svg/dev.svg (100%)
 rename src/{ => assets}/icons/svg/develop.svg (100%)
 rename src/{ => assets}/icons/svg/dictionary.svg (100%)
 create mode 100644 src/assets/icons/svg/documentation.svg
 create mode 100644 src/assets/icons/svg/drag.svg
 create mode 100644 src/assets/icons/svg/edit.svg
 create mode 100644 src/assets/icons/svg/education.svg
 rename src/{ => assets}/icons/svg/email.svg (100%)
 rename src/{ => assets}/icons/svg/error.svg (100%)
 create mode 100644 src/assets/icons/svg/example.svg
 create mode 100644 src/assets/icons/svg/excel.svg
 create mode 100644 src/assets/icons/svg/exit-fullscreen.svg
 create mode 100644 src/assets/icons/svg/eye-open.svg
 create mode 100644 src/assets/icons/svg/eye.svg
 create mode 100644 src/assets/icons/svg/form.svg
 create mode 100644 src/assets/icons/svg/fullscreen.svg
 rename src/{ => assets}/icons/svg/fwb.svg (100%)
 rename src/{ => assets}/icons/svg/github.svg (100%)
 rename src/{ => assets}/icons/svg/gonggao.svg (100%)
 create mode 100644 src/assets/icons/svg/guide.svg
 rename src/{ => assets}/icons/svg/icon.svg (100%)
 rename src/{ => assets}/icons/svg/image.svg (100%)
 rename src/{ => assets}/icons/svg/index.svg (100%)
 create mode 100644 src/assets/icons/svg/international.svg
 rename src/{ => assets}/icons/svg/ipvisits.svg (100%)
 rename src/{ => assets}/icons/svg/java.svg (100%)
 create mode 100644 src/assets/icons/svg/language.svg
 create mode 100644 src/assets/icons/svg/link.svg
 create mode 100644 src/assets/icons/svg/list.svg
 rename src/{ => assets}/icons/svg/lock.svg (100%)
 rename src/{ => assets}/icons/svg/log.svg (100%)
 rename src/{ => assets}/icons/svg/markdown.svg (100%)
 rename src/{ => assets}/icons/svg/menu.svg (100%)
 create mode 100644 src/assets/icons/svg/message.svg
 create mode 100644 src/assets/icons/svg/money.svg
 rename src/{ => assets}/icons/svg/monitor.svg (100%)
 create mode 100644 src/assets/icons/svg/nested.svg
 rename src/{ => assets}/icons/svg/password.svg (100%)
 create mode 100644 src/assets/icons/svg/pdf.svg
 create mode 100644 src/assets/icons/svg/people.svg
 rename src/{ => assets}/icons/svg/peoples.svg (100%)
 rename src/{ => assets}/icons/svg/permission.svg (100%)
 rename src/{ => assets}/icons/svg/phone.svg (100%)
 rename src/{ => assets}/icons/svg/qiniu.svg (100%)
 create mode 100644 src/assets/icons/svg/qq.svg
 rename src/{ => assets}/icons/svg/redis.svg (100%)
 rename src/{ => assets}/icons/svg/role.svg (100%)
 rename src/{ => assets}/icons/svg/run.svg (100%)
 rename src/{ => assets}/icons/svg/running.svg (100%)
 rename src/{ => assets}/icons/svg/search.svg (100%)
 create mode 100644 src/assets/icons/svg/shopping.svg
 create mode 100644 src/assets/icons/svg/size.svg
 create mode 100644 src/assets/icons/svg/skill.svg
 rename src/{ => assets}/icons/svg/sqlMonitor.svg (100%)
 create mode 100644 src/assets/icons/svg/star.svg
 rename src/{ => assets}/icons/svg/swagger.svg (100%)
 rename src/{ => assets}/icons/svg/sys-tools.svg (100%)
 rename src/{ => assets}/icons/svg/system.svg (100%)
 create mode 100644 src/assets/icons/svg/tab.svg
 create mode 100644 src/assets/icons/svg/table.svg
 create mode 100644 src/assets/icons/svg/theme.svg
 rename src/{ => assets}/icons/svg/timing.svg (100%)
 rename src/{ => assets}/icons/svg/tools.svg (100%)
 create mode 100644 src/assets/icons/svg/tree-table.svg
 create mode 100644 src/assets/icons/svg/tree.svg
 rename src/{ => assets}/icons/svg/unlock.svg (100%)
 rename src/{ => assets}/icons/svg/user.svg (100%)
 rename src/{ => assets}/icons/svg/user1.svg (100%)
 rename src/{ => assets}/icons/svg/validCode.svg (100%)
 rename src/{ => assets}/icons/svg/visits.svg (100%)
 rename src/{ => assets}/icons/svg/web.svg (100%)
 create mode 100644 src/assets/icons/svg/wechat.svg
 rename src/{ => assets}/icons/svg/weixin.svg (100%)
 create mode 100644 src/assets/icons/svg/zip.svg
 rename src/{ => assets}/icons/svg/zujian.svg (100%)
 rename src/{ => assets}/icons/svgo.yml (100%)
 rename src/assets/{avatar => images}/avatar.png (100%)
 rename src/assets/{logo => images}/logo.png (100%)
 create mode 100644 src/assets/styles/btn.scss
 create mode 100644 src/assets/styles/eladmin.scss
 create mode 100644 src/assets/styles/element-ui.scss
 rename src/{ => assets}/styles/element-variables.scss (90%)
 create mode 100644 src/assets/styles/index.scss
 create mode 100644 src/assets/styles/mixin.scss
 rename src/{ => assets}/styles/sidebar.scss (50%)
 rename src/{ => assets}/styles/transition.scss (87%)
 rename src/{ => assets}/styles/variables.scss (75%)
 rename src/{views/dashboard => components/Echarts}/BarChart.vue (97%)
 rename src/{views/dashboard => components/Echarts}/Category.vue (99%)
 rename src/{views/dashboard => components/Echarts}/Funnel.vue (97%)
 rename src/{views/dashboard => components/Echarts}/Gauge.vue (95%)
 rename src/{views/dashboard => components/Echarts}/Graph.vue (96%)
 rename src/{views/dashboard => components/Echarts}/HeatMap.vue (98%)
 rename src/{views/dashboard => components/Echarts}/Line3D.vue (96%)
 rename src/{views/dashboard => components/Echarts}/PieChart.vue (96%)
 rename src/{views/dashboard => components/Echarts}/Point.vue (97%)
 rename src/{views/dashboard => components/Echarts}/RadarChart.vue (97%)
 rename src/{views/dashboard => components/Echarts}/Rich.vue (98%)
 rename src/{views/dashboard => components/Echarts}/Sankey.vue (96%)
 rename src/{views/dashboard => components/Echarts}/Scatter.vue (98%)
 rename src/{views/dashboard => components/Echarts}/Sunburst.vue (96%)
 rename src/{views/dashboard => components/Echarts}/ThemeRiver.vue (98%)
 create mode 100644 src/components/HeaderSearch/index.vue
 create mode 100644 src/components/Pagination/index.vue
 create mode 100644 src/components/SizeSelect/index.vue
 delete mode 100644 src/components/TextHoverEffect/Mallki.vue
 create mode 100644 src/components/ThemePicker/index.vue
 rename src/{components/ScrollPane/index.vue => layout/components/TagsView/ScrollPane.vue} (73%)
 rename src/layout/components/{TagsView.vue => TagsView/index.vue} (81%)
 rename src/layout/{Layout.vue => index.vue} (85%)
 rename src/{config/index.js => settings.js} (81%)
 delete mode 100644 src/styles/description.scss
 delete mode 100644 src/styles/element-ui.scss
 delete mode 100644 src/styles/index.scss
 delete mode 100644 src/styles/mixin.scss
 delete mode 100644 src/utils/export2Excel.js
 delete mode 100644 src/utils/export2Zip.js
 create mode 100644 src/utils/get-page-title.js
 create mode 100644 src/utils/open-window.js
 create mode 100644 src/utils/scroll-to.js
 create mode 100644 src/views/components/Echarts.vue
 delete mode 100644 src/views/components/IconSelect.vue
 create mode 100644 src/views/components/icons/element-icons.js
 create mode 100644 src/views/components/icons/index.vue
 create mode 100644 src/views/components/icons/svg-icons.js
 delete mode 100644 static/.gitkeep
 create mode 100644 vue.config.js

diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 26c173e..0000000
--- a/.babelrc
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "presets": [
-    ["env", {
-      "modules": false,
-      "targets": {
-        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
-      }
-    }],
-    "stage-2"
-  ],
-  "plugins":["transform-vue-jsx", "transform-runtime"],
-  "env": {
-    "development":{
-      "plugins": ["dynamic-import-node"]
-    }
-  }
-}
diff --git a/.editorconfig b/.editorconfig
index ea6e20f..3454886 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,4 @@
-# http://editorconfig.org
+# https://editorconfig.org
 root = true
 
 [*]
diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..660b9bb
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,7 @@
+ENV = 'development'
+
+# 接口地址
+VUE_APP_BASE_API  = 'http://localhost:8000'
+
+# 是否启用 babel-plugin-dynamic-import-node插件
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..bc12c75
--- /dev/null
+++ b/.env.production
@@ -0,0 +1,4 @@
+ENV = 'production'
+
+# 接口地址
+VUE_APP_BASE_API  = 'https://api.auauz.net'
diff --git a/.eslintignore b/.eslintignore
index e3a4037..e6529fc 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,4 @@
 build/*.js
-config/*.js
 src/assets
+public
+dist
diff --git a/.eslintrc.js b/.eslintrc.js
index 0e5c28a..c977505 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -21,7 +21,10 @@ module.exports = {
         "allowFirstLine": false
       }
     }],
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline":"off",
     "vue/name-property-casing": ["error", "PascalCase"],
+    "vue/no-v-html": "off",
     'accessor-pairs': 2,
     'arrow-spacing': [2, {
       'before': true,
@@ -44,7 +47,7 @@ module.exports = {
     'curly': [2, 'multi-line'],
     'dot-location': [2, 'property'],
     'eol-last': 2,
-    'eqeqeq': [2, 'allow-null'],
+    'eqeqeq': ["error", "always", {"null": "ignore"}],
     'generator-star-spacing': [2, {
       'before': true,
       'after': true
@@ -73,7 +76,7 @@ module.exports = {
     'no-class-assign': 2,
     'no-cond-assign': 2,
     'no-const-assign': 2,
-    'no-control-regex': 2,
+    'no-control-regex': 0,
     'no-delete-var': 2,
     'no-dupe-args': 2,
     'no-dupe-class-members': 2,
@@ -193,4 +196,3 @@ module.exports = {
     'array-bracket-spacing': [2, 'never']
   }
 }
-
diff --git a/.gitignore b/.gitignore
index 571f0a6..78a752d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,11 @@ dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-package-lock.json
-yarn.lock
+**/*.log
+
+tests/**/coverage/
+tests/e2e/reports
+selenium-debug.log
 
 # Editor directories and files
 .idea
@@ -14,3 +17,7 @@ yarn.lock
 *.ntvs*
 *.njsproj
 *.sln
+*.local
+
+package-lock.json
+yarn.lock
diff --git a/.postcssrc.js b/.postcssrc.js
deleted file mode 100644
index eee3e92..0000000
--- a/.postcssrc.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// https://github.com/michael-ciniawsky/postcss-load-config
-
-module.exports = {
-  "plugins": {
-    "postcss-import": {},
-    "postcss-url": {},
-    // to edit target browsers: use "browserslist" field in package.json
-    "autoprefixer": {}
-  }
-}
diff --git a/.travis.yml b/.travis.yml
index 16574d9..f4be7a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: node_js
-node_js: stable
+node_js: 10
 script: npm run test
 notifications:
   email: false
diff --git a/LICENSE b/LICENSE
index 91e3c25..6151575 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,191 +1,21 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
+MIT License
 
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Copyright (c) 2017-present PanJiaChen
 
-1. Definitions.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "{}" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright 2018 Elune
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/babel.config.js b/babel.config.js
new file mode 100644
index 0000000..ba17966
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/app'
+  ]
+}
diff --git a/build/build.js b/build/build.js
deleted file mode 100644
index 34c71a5..0000000
--- a/build/build.js
+++ /dev/null
@@ -1,67 +0,0 @@
-'use strict'
-require('./check-versions')()
-
-const ora = require('ora')
-const rm = require('rimraf')
-const path = require('path')
-const chalk = require('chalk')
-const webpack = require('webpack')
-const config = require('../config')
-const webpackConfig = require('./webpack.prod.conf')
-var connect = require('connect')
-var serveStatic = require('serve-static')
-
-const spinner = ora(
-  'building for ' + process.env.env_config + ' environment...'
-)
-spinner.start()
-
-rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
-  if (err) throw err
-  webpack(webpackConfig, (err, stats) => {
-    spinner.stop()
-    if (err) throw err
-    process.stdout.write(
-      stats.toString({
-        colors: true,
-        modules: false,
-        children: false,
-        chunks: false,
-        chunkModules: false
-      }) + '\n\n'
-    )
-
-    if (stats.hasErrors()) {
-      console.log(chalk.red(' Build failed with errors.\n'))
-      process.exit(1)
-    }
-
-    console.log(chalk.cyan(' Build complete.\n'))
-    console.log(
-      chalk.yellow(
-        ' Tip: built files are meant to be served over an HTTP server.\n' +
-          " Opening index.html over file:// won't work.\n"
-      )
-    )
-
-    if (process.env.npm_config_preview) {
-      const port = 9526
-      const host = 'http://localhost:' + port
-      const basePath = config.build.assetsPublicPath
-      const app = connect()
-
-      app.use(
-        basePath,
-        serveStatic('./dist', {
-          index: ['index.html', '/']
-        })
-      )
-
-      app.listen(port, function() {
-        console.log(
-          chalk.green(`> Listening at  http://localhost:${port}${basePath}`)
-        )
-      })
-    }
-  })
-})
diff --git a/build/check-versions.js b/build/check-versions.js
deleted file mode 100644
index c29c7e7..0000000
--- a/build/check-versions.js
+++ /dev/null
@@ -1,62 +0,0 @@
-'use strict'
-const chalk = require('chalk')
-const semver = require('semver')
-const packageConfig = require('../package.json')
-const shell = require('shelljs')
-
-function exec(cmd) {
-  return require('child_process')
-    .execSync(cmd)
-    .toString()
-    .trim()
-}
-
-const versionRequirements = [
-  {
-    name: 'node',
-    currentVersion: semver.clean(process.version),
-    versionRequirement: packageConfig.engines.node
-  }
-]
-
-if (shell.which('npm')) {
-  versionRequirements.push({
-    name: 'npm',
-    currentVersion: exec('npm --version'),
-    versionRequirement: packageConfig.engines.npm
-  })
-}
-
-module.exports = function() {
-  const warnings = []
-
-  for (let i = 0; i < versionRequirements.length; i++) {
-    const mod = versionRequirements[i]
-
-    if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
-      warnings.push(
-        mod.name +
-          ': ' +
-          chalk.red(mod.currentVersion) +
-          ' should be ' +
-          chalk.green(mod.versionRequirement)
-      )
-    }
-  }
-
-  if (warnings.length) {
-    console.log('')
-    console.log(
-      chalk.yellow(
-        'To use this template, you must update following to modules:'
-      )
-    )
-
-    for (let i = 0; i < warnings.length; i++) {
-      const warning = warnings[i]
-      console.log('  ' + warning)
-    }
-
-    process.exit(1)
-  }
-}
diff --git a/build/index.js b/build/index.js
new file mode 100644
index 0000000..244ff4a
--- /dev/null
+++ b/build/index.js
@@ -0,0 +1,27 @@
+const { run } = require('runjs')
+const chalk = require('chalk')
+const config = require('../vue.config.js')
+const rawArgv = process.argv.slice(2)
+const args = rawArgv.join(' ')
+
+if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
+  const report = rawArgv.includes('--report')
+
+  run(`vue-cli-service build ${args}`)
+
+  const publicPath = config.publicPath
+
+  var connect = require('connect')
+  var serveStatic = require('serve-static')
+  const app = connect()
+
+  app.use(
+    publicPath,
+    serveStatic('./dist', {
+      index: ['index.html', '/']
+    })
+  )
+
+} else {
+  run(`vue-cli-service build ${args}`)
+}
diff --git a/build/utils.js b/build/utils.js
deleted file mode 100644
index c96d093..0000000
--- a/build/utils.js
+++ /dev/null
@@ -1,108 +0,0 @@
-'use strict'
-const path = require('path')
-const config = require('../config')
-const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const packageConfig = require('../package.json')
-
-exports.assetsPath = function(_path) {
-  const assetsSubDirectory =
-    process.env.NODE_ENV === 'production'
-      ? config.build.assetsSubDirectory
-      : config.dev.assetsSubDirectory
-
-  return path.posix.join(assetsSubDirectory, _path)
-}
-
-exports.cssLoaders = function(options) {
-  options = options || {}
-
-  const cssLoader = {
-    loader: 'css-loader',
-    options: {
-      sourceMap: options.sourceMap
-    }
-  }
-
-  const postcssLoader = {
-    loader: 'postcss-loader',
-    options: {
-      sourceMap: options.sourceMap
-    }
-  }
-
-  // generate loader string to be used with extract text plugin
-  function generateLoaders(loader, loaderOptions) {
-    const loaders = []
-
-    // Extract CSS when that option is specified
-    // (which is the case during production build)
-    if (options.extract) {
-      loaders.push(MiniCssExtractPlugin.loader)
-    } else {
-      loaders.push('vue-style-loader')
-    }
-
-    loaders.push(cssLoader)
-
-    if (options.usePostCSS) {
-      loaders.push(postcssLoader)
-    }
-
-    if (loader) {
-      loaders.push({
-        loader: loader + '-loader',
-        options: Object.assign({}, loaderOptions, {
-          sourceMap: options.sourceMap
-        })
-      })
-    }
-
-    return loaders
-  }
-  // https://vue-loader.vuejs.org/en/configurations/extract-css.html
-  return {
-    css: generateLoaders(),
-    postcss: generateLoaders(),
-    less: generateLoaders('less'),
-    sass: generateLoaders('sass', {
-      indentedSyntax: true
-    }),
-    scss: generateLoaders('sass'),
-    stylus: generateLoaders('stylus'),
-    styl: generateLoaders('stylus')
-  }
-}
-
-// Generate loaders for standalone style files (outside of .vue)
-exports.styleLoaders = function(options) {
-  const output = []
-  const loaders = exports.cssLoaders(options)
-
-  for (const extension in loaders) {
-    const loader = loaders[extension]
-    output.push({
-      test: new RegExp('\\.' + extension + '$'),
-      use: loader
-    })
-  }
-
-  return output
-}
-
-exports.createNotifierCallback = () => {
-  const notifier = require('node-notifier')
-
-  return (severity, errors) => {
-    if (severity !== 'error') return
-
-    const error = errors[0]
-    const filename = error.file && error.file.split('!').pop()
-
-    notifier.notify({
-      title: packageConfig.name,
-      message: severity + ': ' + error.name,
-      subtitle: filename || '',
-      icon: path.join(__dirname, 'logo.png')
-    })
-  }
-}
diff --git a/build/vue-loader.conf.js b/build/vue-loader.conf.js
deleted file mode 100644
index 5496c93..0000000
--- a/build/vue-loader.conf.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict'
-
-module.exports = {
-  //You can set the vue-loader configuration by yourself.
-}
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
deleted file mode 100644
index 7e8c4fc..0000000
--- a/build/webpack.base.conf.js
+++ /dev/null
@@ -1,122 +0,0 @@
-'use strict'
-const path = require('path')
-const utils = require('./utils')
-const config = require('../config')
-const { VueLoaderPlugin } = require('vue-loader')
-
-const os = require('os');
-const HappyPack  = require('happypack');
-const happThreadPool = HappyPack.ThreadPool({size: os.cpus().length});
-
-function resolve(dir) {
-  return path.join(__dirname, '..', dir)
-}
-
-const createLintingRule = () => ({
-  test: /\.(js|vue)$/,
-  loader: 'eslint-loader',
-  enforce: 'pre',
-  include: [resolve('src'), resolve('test')],
-  options: {
-    formatter: require('eslint-friendly-formatter'),
-    emitWarning: !config.dev.showEslintErrorsInOverlay
-  }
-})
-
-module.exports = {
-  cache: true,
-  context: path.resolve(__dirname, '../'),
-  entry:["babel-polyfill","./src/main.js"],
-  output: {
-    path: config.build.assetsRoot,
-    filename: '[name].js',
-    publicPath:
-      process.env.NODE_ENV === 'production'
-        ? config.build.assetsPublicPath
-        : config.dev.assetsPublicPath
-  },
-  resolve: {
-    modules: [path.resolve(__dirname, '../node_modules')],
-    extensions: ['.js', '.vue', '.json'],
-    alias: {
-      '@': resolve('src'),
-      api: path.resolve(__dirname, '../src/api')
-    }
-  },
-  module: {
-    rules: [
-      ...(config.dev.useEslint ? [createLintingRule()] : []),
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader',
-        options: {
-          loaders: {
-            js: 'happypack/loader?id=js' // 将loader换成happypack
-          }
-        }
-      },
-      {
-        test: /\.js$/,
-        loader: ['happypack/loader?id=js'], // 将loader换成happypack
-        include: [
-          resolve('src')
-        ], // src是项目开发的目录
-        exclude: [path.resolve('../node_modules')] // 不需要编译node_modules下的js
-      },
-      {
-        test: /\.svg$/,
-        loader: 'svg-sprite-loader',
-        include: [resolve('src/icons')],
-        options: {
-          symbolId: 'icon-[name]'
-        }
-      },
-      {
-        test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-        loader: 'url-loader',
-        exclude: [resolve('src/icons')],
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('img/[name].[hash:7].[ext]')
-        }
-      },
-      {
-        test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('media/[name].[hash:7].[ext]')
-        }
-      },
-      {
-        test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
-        }
-      }
-    ]
-  },
-  plugins: [
-    new VueLoaderPlugin(),
-    new HappyPack({
-      id: 'js',
-      cache: true,
-      loaders: ['babel-loader?cacheDirectory=true'],
-      threadPool: happThreadPool
-    })
-  ],
-  node: {
-    // prevent webpack from injecting useless setImmediate polyfill because Vue
-    // source contains it (although only uses it if it's native).
-    setImmediate: false,
-    // prevent webpack from injecting mocks to Node native modules
-    // that does not make sense for the client
-    dgram: 'empty',
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty',
-    child_process: 'empty'
-  }
-}
diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js
deleted file mode 100644
index 26a5584..0000000
--- a/build/webpack.dev.conf.js
+++ /dev/null
@@ -1,98 +0,0 @@
-'use strict'
-const path = require('path')
-const utils = require('./utils')
-const webpack = require('webpack')
-const config = require('../config')
-const merge = require('webpack-merge')
-const baseWebpackConfig = require('./webpack.base.conf')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
-const portfinder = require('portfinder')
-
-function resolve(dir) {
-  return path.join(__dirname, '..', dir)
-}
-
-const HOST = process.env.HOST
-const PORT = process.env.PORT && Number(process.env.PORT)
-
-const devWebpackConfig = merge(baseWebpackConfig, {
-  mode: 'development',
-  module: {
-    rules: utils.styleLoaders({
-      sourceMap: config.dev.cssSourceMap,
-      usePostCSS: true
-    })
-  },
-  // cheap-module-eval-source-map is faster for development
-  devtool: config.dev.devtool,
-
-  // these devServer options should be customized in /config/index.js
-  devServer: {
-    clientLogLevel: 'warning',
-    historyApiFallback: true,
-    hot: true,
-    compress: true,
-    host: HOST || config.dev.host,
-    port: PORT || config.dev.port,
-    open: config.dev.autoOpenBrowser,
-    overlay: config.dev.errorOverlay
-      ? { warnings: false, errors: true }
-      : false,
-    publicPath: config.dev.assetsPublicPath,
-    proxy: config.dev.proxyTable,
-    quiet: true, // necessary for FriendlyErrorsPlugin
-    watchOptions: {
-      poll: config.dev.poll
-    }
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': require('../config/dev.env')
-    }),
-    new webpack.HotModuleReplacementPlugin(),
-    // https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: 'index.html',
-      template: 'index.html',
-      inject: true,
-      favicon: resolve('favicon.ico'),
-      title: 'vue-element-admin',
-      templateParameters: {
-        BASE_URL: config.dev.assetsPublicPath + config.dev.assetsSubDirectory,
-      },
-    }),
-  ]
-})
-
-module.exports = new Promise((resolve, reject) => {
-  portfinder.basePort = process.env.PORT || config.dev.port
-  portfinder.getPort((err, port) => {
-    if (err) {
-      reject(err)
-    } else {
-      // publish the new Port, necessary for e2e tests
-      process.env.PORT = port
-      // add port to devServer config
-      devWebpackConfig.devServer.port = port
-
-      // Add FriendlyErrorsPlugin
-      devWebpackConfig.plugins.push(
-        new FriendlyErrorsPlugin({
-          compilationSuccessInfo: {
-            messages: [
-              `Your application is running here: http://${
-                devWebpackConfig.devServer.host
-              }:${port}`
-            ]
-          },
-          onErrors: config.dev.notifyOnErrors
-            ? utils.createNotifierCallback()
-            : undefined
-        })
-      )
-
-      resolve(devWebpackConfig)
-    }
-  })
-})
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
deleted file mode 100644
index 946a134..0000000
--- a/build/webpack.prod.conf.js
+++ /dev/null
@@ -1,188 +0,0 @@
-'use strict'
-const path = require('path')
-const utils = require('./utils')
-const webpack = require('webpack')
-const config = require('../config')
-const merge = require('webpack-merge')
-const baseWebpackConfig = require('./webpack.base.conf')
-const CopyWebpackPlugin = require('copy-webpack-plugin')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin')
-const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin')
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
-
-function resolve(dir) {
-  return path.join(__dirname, '..', dir)
-}
-
-const env = require('../config/' + process.env.env_config + '.env')
-
-// For NamedChunksPlugin
-const seen = new Set()
-const nameLength = 4
-
-const webpackConfig = merge(baseWebpackConfig, {
-  mode: 'production',
-  module: {
-    rules: utils.styleLoaders({
-      sourceMap: config.build.productionSourceMap,
-      extract: true,
-      usePostCSS: true
-    })
-  },
-  devtool: config.build.productionSourceMap ? config.build.devtool : false,
-  output: {
-    path: config.build.assetsRoot,
-    filename: utils.assetsPath('js/[name].[chunkhash:8].js'),
-    chunkFilename: utils.assetsPath('js/[name].[chunkhash:8].js')
-  },
-  plugins: [
-    // http://vuejs.github.io/vue-loader/en/workflow/production.html
-    new webpack.DefinePlugin({
-      'process.env': env
-    }),
-    // extract css into its own file
-    new MiniCssExtractPlugin({
-      filename: utils.assetsPath('css/[name].[contenthash:8].css'),
-      chunkFilename: utils.assetsPath('css/[name].[contenthash:8].css')
-    }),
-    // generate dist index.html with correct asset hash for caching.
-    // you can customize output by editing /index.html
-    // see https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: config.build.index,
-      template: 'index.html',
-      inject: true,
-      favicon: resolve('favicon.ico'),
-      title: 'vue-element-admin',
-      templateParameters: {
-        BASE_URL: config.build.assetsPublicPath + config.build.assetsSubDirectory,
-      },
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeAttributeQuotes: true
-        // more options:
-        // https://github.com/kangax/html-minifier#options-quick-reference
-      }
-      // default sort mode uses toposort which cannot handle cyclic deps
-      // in certain cases, and in webpack 4, chunk order in HTML doesn't
-      // matter anyway
-    }),
-    new ScriptExtHtmlWebpackPlugin({
-      //`runtime` must same as runtimeChunk name. default is `runtime`
-      inline: /runtime\..*\.js$/
-    }),
-    // keep chunk.id stable when chunk has no name
-    new webpack.NamedChunksPlugin(chunk => {
-      if (chunk.name) {
-        return chunk.name
-      }
-      const modules = Array.from(chunk.modulesIterable)
-      if (modules.length > 1) {
-        const hash = require('hash-sum')
-        const joinedHash = hash(modules.map(m => m.id).join('_'))
-        let len = nameLength
-        while (seen.has(joinedHash.substr(0, len))) len++
-        seen.add(joinedHash.substr(0, len))
-        return `chunk-${joinedHash.substr(0, len)}`
-      } else {
-        return modules[0].id
-      }
-    }),
-    // keep module.id stable when vender modules does not change
-    new webpack.HashedModuleIdsPlugin(),
-    // copy custom static assets
-    new CopyWebpackPlugin([
-      {
-        from: path.resolve(__dirname, '../static'),
-        to: config.build.assetsSubDirectory,
-        ignore: ['.*']
-      }
-    ])
-  ],
-  optimization: {
-    splitChunks: {
-      chunks: 'all',
-      cacheGroups: {
-        libs: {
-          name: 'chunk-libs',
-          test: /[\\/]node_modules[\\/]/,
-          priority: 10,
-          chunks: 'initial' // 只打包初始时依赖的第三方
-        },
-        elementUI: {
-          name: 'chunk-elementUI', // 单独将 elementUI 拆包
-          priority: 20, // 权重要大于 libs 和 app 不然会被打包进 libs 或者 app
-          test: /[\\/]node_modules[\\/]element-ui[\\/]/
-        },
-        commons: {
-          name: 'chunk-commons',
-          test: resolve('src/components'), // 可自定义拓展你的规则
-          minChunks: 3, // 最小公用次数
-          priority: 5,
-          reuseExistingChunk: true
-        }
-      }
-    },
-    runtimeChunk: 'single',
-    minimizer: [
-      new UglifyJsPlugin({
-        uglifyOptions: {
-          mangle: {
-            safari10: true
-          }
-        },
-        sourceMap: config.build.productionSourceMap,
-        cache: true,
-        parallel: true
-      }),
-      // Compress extracted CSS. We are using this plugin so that possible
-      // duplicated CSS from different components can be deduped.
-      new OptimizeCSSAssetsPlugin()
-    ]
-  }
-})
-
-if (config.build.productionGzip) {
-  const CompressionWebpackPlugin = require('compression-webpack-plugin')
-
-  webpackConfig.plugins.push(
-    new CompressionWebpackPlugin({
-      asset: '[path].gz[query]',
-      algorithm: 'gzip',
-      test: new RegExp(
-        '\\.(' + config.build.productionGzipExtensions.join('|') + ')$'
-      ),
-      threshold: 10240,
-      minRatio: 0.8
-    })
-  )
-}
-
-if (config.build.generateAnalyzerReport || config.build.bundleAnalyzerReport) {
-  const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
-    .BundleAnalyzerPlugin
-
-  if (config.build.bundleAnalyzerReport) {
-    webpackConfig.plugins.push(
-      new BundleAnalyzerPlugin({
-        analyzerPort: 8080,
-        generateStatsFile: false
-      })
-    )
-  }
-
-  if (config.build.generateAnalyzerReport) {
-    webpackConfig.plugins.push(
-      new BundleAnalyzerPlugin({
-        analyzerMode: 'static',
-        reportFilename: 'bundle-report.html',
-        openAnalyzer: false
-      })
-    )
-  }
-}
-
-module.exports = webpackConfig
diff --git a/config/dev.env.js b/config/dev.env.js
deleted file mode 100644
index 0115503..0000000
--- a/config/dev.env.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict'
-const merge = require('webpack-merge')
-const prodEnv = require('./prod.env')
-
-module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8000"'
-  // BASE_API: '"https://api.auauz.net"'
-})
diff --git a/config/index.js b/config/index.js
deleted file mode 100644
index 48350f5..0000000
--- a/config/index.js
+++ /dev/null
@@ -1,106 +0,0 @@
-'use strict'
-// Template version: 1.2.6
-const devEnv = require('./dev.env')
-// 获取接口地址
-const base_url = devEnv.BASE_API.replace(/"/g,'')
-const path = require('path')
-module.exports = {
-  dev: {
-    // Paths
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-    // 配置代理
-    proxyTable: {
-      '/auth': {
-        // 测试环境
-        target: base_url,
-        secure: true,
-        changeOrigin: true,
-        pathRewrite: {
-          '^/auth': 'auth'
-        }
-      },
-      '/api': {
-        // 测试环境
-        target: base_url,
-        secure: true,
-        changeOrigin: true,
-        pathRewrite: {
-          '^/api': 'api'
-        }
-      }
-    },
-
-    // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
-    port: 8013, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: true,
-    errorOverlay: true,
-    notifyOnErrors: false,
-    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
-
-    // Use Eslint Loader?
-    // If true, your code will be linted during bundling and
-    // linting errors and warnings will be shown in the console.
-    useEslint: true,
-    // If true, eslint errors and warnings will also be shown in the error overlay
-    // in the browser.
-    showEslintErrorsInOverlay: false,
-
-    /**
-     * Source Maps
-     */
-
-    // https://webpack.js.org/configuration/devtool/#development
-    devtool: 'cheap-source-map',
-
-    // CSS Sourcemaps off by default because relative paths are "buggy"
-    // with this option, according to the CSS-Loader README
-    // (https://github.com/webpack/css-loader#sourcemaps)
-    // In our experience, they generally work as expected,
-    // just be aware of this issue when enabling this option.
-    cssSourceMap: false
-  },
-
-  build: {
-    // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
-
-    // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
-
-    /**
-     * You can set by youself according to actual condition
-     * You will need to set this if you plan to deploy your site under a sub path,
-     * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
-     * then assetsPublicPath should be set to "/bar/".
-     * In most cases please use '/' !!!
-     */
-    assetsPublicPath: '/',
-
-    /**
-     * Source Maps
-     */
-
-    productionSourceMap: false,
-    // https://webpack.js.org/configuration/devtool/#production
-    devtool: 'source-map',
-
-    // Gzip off by default as many popular static hosts such as
-    // Surge or Netlify already gzip all static assets for you.
-    // Before setting to `true`, make sure to:
-    // npm install --save-dev compression-webpack-plugin
-    productionGzip: false,
-    productionGzipExtensions: ['js', 'css'],
-
-    // Run the build command with an extra argument to
-    // View the bundle analyzer report after build finishes:
-    // `npm run build --report`
-    // Set to `true` or `false` to always turn it on or off
-    bundleAnalyzerReport: process.env.npm_config_report || false,
-
-    // `npm run build:prod --generate_report`
-    generateAnalyzerReport: process.env.npm_config_generate_report || false
-  }
-}
diff --git a/config/prod.env.js b/config/prod.env.js
deleted file mode 100644
index 73e8fe1..0000000
--- a/config/prod.env.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict'
-module.exports = {
-  NODE_ENV: '"production"',
-  BASE_API: '"https://api.auauz.net"'
-}
diff --git a/index.html b/index.html
deleted file mode 100644
index c6b6210..0000000
--- a/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <style>
-      .sampleContainer{position:fixed;top:50%;left:50%;-webkit-transform:translateX(-50%) translateY(-50%);width:75px;height:100px}.loader{position:relative;width:44px;height:8px;margin:12px auto}.dot{display:inline-block;width:8px;height:8px;border-radius:4px;background:#ccc;position:absolute}.dot_1{animation:animateDot1 1.5s linear infinite;left:12px;background:#e579b8}.dot_2{animation:animateDot2 1.5s linear infinite;animation-delay:.5s;left:24px}.dot_3{animation:animateDot3 1.5s linear infinite;left:12px}.dot_4{animation:animateDot4 1.5s linear infinite;animation-delay:.5s;left:24px}@keyframes animateDot1{0%{transform:rotate(0) translateX(-12px)}25%{transform:rotate(180deg) translateX(-12px)}75%{transform:rotate(180deg) translateX(-12px)}100%{transform:rotate(360deg) translateX(-12px)}}@keyframes animateDot2{0%{transform:rotate(0) translateX(-12px)}25%{transform:rotate(-180deg) translateX(-12px)}75%{transform:rotate(-180deg) translateX(-12px)}100%{transform:rotate(-360deg) translateX(-12px)}}@keyframes animateDot3{0%{transform:rotate(0) translateX(12px)}25%{transform:rotate(180deg) translateX(12px)}75%{transform:rotate(180deg) translateX(12px)}100%{transform:rotate(360deg) translateX(12px)}}@keyframes animateDot4{0%{transform:rotate(0) translateX(12px)}25%{transform:rotate(-180deg) translateX(12px)}75%{transform:rotate(-180deg) translateX(12px)}100%{transform:rotate(-360deg) translateX(12px)}}
-    </style>
-  </head>
-  <body>
-    <div id="app">
-      <div class="sampleContainer">
-        <div class="loader">
-          <span class="dot dot_1"></span>
-          <span class="dot dot_2"></span>
-          <span class="dot dot_3"></span>
-          <span class="dot dot_4"></span>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/jest.config.js b/jest.config.js
new file mode 100644
index 0000000..143cdc8
--- /dev/null
+++ b/jest.config.js
@@ -0,0 +1,24 @@
+module.exports = {
+  moduleFileExtensions: ['js', 'jsx', 'json', 'vue'],
+  transform: {
+    '^.+\\.vue$': 'vue-jest',
+    '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$':
+      'jest-transform-stub',
+    '^.+\\.jsx?$': 'babel-jest'
+  },
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/src/$1'
+  },
+  snapshotSerializers: ['jest-serializer-vue'],
+  testMatch: [
+    '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
+  ],
+  collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'],
+  coverageDirectory: '<rootDir>/tests/unit/coverage',
+  // 'collectCoverage': true,
+  'coverageReporters': [
+    'lcov',
+    'text-summary'
+  ],
+  testURL: 'http://localhost/'
+}
diff --git a/package.json b/package.json
index 39b17ac..b21afa6 100644
--- a/package.json
+++ b/package.json
@@ -1,107 +1,95 @@
 {
   "name": "eladmin-web",
   "version": "2.3.0",
+  "description": "EL-ADMIN 前端源码",
+  "author": "Zheng Jie",
   "license": "Apache-2.0",
-  "description": "eladmin 前端代码",
-  "author": "jie <elunez@qq.com>",
   "scripts": {
-    "dev": "cross-env BABEL_ENV=development webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
-    "build": "cross-env NODE_ENV=production env_config=prod node build/build.js",
+    "dev": "vue-cli-service serve",
+    "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
-    "test": "npm run lint",
-    "precommit": "lint-staged",
-    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
+    "test:unit": "jest --clearCache && vue-cli-service test:unit",
+    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
+    "new": "plop"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/elunez/eladmin-qd"
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
   },
   "dependencies": {
-    "@riophae/vue-treeselect": "0.0.38",
-    "axios": "^0.19.0",
-    "clipboard": "1.7.1",
-    "codemirror": "^5.38.0",
-    "connect": "3.6.6",
-    "echarts": "^4.1.0",
-    "echarts-gl": "^1.1.1",
-    "element-ui": "^2.12.0",
-    "file-saver": "1.3.8",
+    "clipboard": "2.0.4",
+    "@riophae/vue-treeselect": "0.1.0",
+    "vue-cropper": "0.4.9",
+    "axios": "0.18.1",
+    "echarts": "4.2.1",
+    "fuse.js": "3.4.4",
     "js-cookie": "2.2.0",
-    "jsencrypt": "^3.0.0-rc.1",
-    "jszip": "3.1.5",
-    "mavon-editor": "^2.7.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
-    "screenfull": "3.3.3",
-    "vue": "2.5.17",
+    "screenfull": "4.2.0",
+    "vue": "2.6.10",
     "vue-count-to": "1.0.13",
-    "vue-router": "3.1.3",
-    "vuex": "3.0.1",
+    "vue-router": "3.0.2",
+    "vue-splitpane": "1.0.4",
+    "vuex": "3.1.0",
+    "codemirror": "^5.38.0",
+    "connect": "3.6.6",
+    "echarts-gl": "^1.1.1",
+    "element-ui": "^2.12.0",
+    "file-saver": "1.3.8",
+    "jsencrypt": "^3.0.0-rc.1",
+    "jszip": "3.1.5",
+    "mavon-editor": "^2.7.0",
     "wangeditor": ">=3.0.0",
     "xlsx": "^0.11.16"
   },
   "devDependencies": {
-    "autoprefixer": "8.5.0",
-    "babel-core": "6.26.3",
-    "babel-eslint": "8.2.6",
-    "babel-helper-vue-jsx-merge-props": "2.0.3",
-    "babel-loader": "7.1.5",
-    "babel-plugin-dynamic-import-node": "2.0.0",
-    "babel-plugin-syntax-jsx": "6.18.0",
-    "babel-plugin-transform-runtime": "6.23.0",
-    "babel-plugin-transform-vue-jsx": "3.7.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "1.7.0",
-    "babel-preset-stage-2": "6.24.1",
-    "chalk": "2.4.1",
-    "copy-webpack-plugin": "4.5.2",
-    "cross-env": "5.2.0",
-    "css-loader": "1.0.0",
-    "eslint": "4.19.1",
-    "eslint-friendly-formatter": "4.0.1",
-    "eslint-loader": "2.0.0",
-    "eslint-plugin-vue": "4.7.1",
-    "eventsource-polyfill": "0.9.6",
-    "file-loader": "1.1.11",
-    "friendly-errors-webpack-plugin": "1.7.0",
-    "happypack": "^5.0.1",
-    "html-webpack-plugin": "^3.0.0",
-    "mini-css-extract-plugin": "0.4.1",
-    "node-notifier": "5.2.1",
-    "node-sass": "^4.7.2",
-    "optimize-css-assets-webpack-plugin": "5.0.0",
-    "ora": "3.0.0",
-    "portfinder": "1.0.16",
-    "postcss-import": "12.0.0",
-    "postcss-loader": "2.1.6",
-    "postcss-url": "7.3.2",
-    "rimraf": "2.6.2",
-    "sass-loader": "7.0.3",
-    "script-ext-html-webpack-plugin": "2.0.1",
+    "@babel/core": "7.0.0",
+    "@babel/register": "7.0.0",
+    "@vue/cli-plugin-babel": "3.5.3",
+    "@vue/cli-plugin-eslint": "3.5.1",
+    "@vue/cli-plugin-unit-jest": "3.5.3",
+    "@vue/cli-service": "3.5.3",
+    "@vue/test-utils": "1.0.0-beta.29",
+    "autoprefixer": "^9.5.1",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "10.0.1",
+    "babel-jest": "23.6.0",
+    "chalk": "2.4.2",
+    "chokidar": "2.1.5",
+    "connect": "3.6.6",
+    "eslint": "5.15.3",
+    "eslint-plugin-vue": "5.2.2",
+    "html-webpack-plugin": "3.2.0",
+    "husky": "1.3.1",
+    "lint-staged": "8.1.5",
+    "node-sass": "^4.9.0",
+    "plop": "2.3.0",
+    "runjs": "^4.3.2",
+    "sass-loader": "^7.1.0",
+    "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",
-    "semver": "5.5.0",
-    "shelljs": "^0.8.3",
-    "svg-sprite-loader": "3.8.0",
-    "svgo": "1.2.2",
-    "uglifyjs-webpack-plugin": "1.2.7",
-    "url-loader": "1.0.1",
-    "vue-loader": "15.3.0",
-    "vue-style-loader": "4.1.2",
-    "vue-template-compiler": "2.5.17",
-    "webpack": "^4.41.2",
-    "webpack-bundle-analyzer": "^3.6.0",
-    "webpack-cli": "^3.3.9",
-    "webpack-dev-server": "^3.9.0",
-    "webpack-merge": "^4.2.2"
+    "serve-static": "^1.13.2",
+    "svg-sprite-loader": "4.1.3",
+    "svgo": "1.2.0",
+    "vue-template-compiler": "2.6.10"
   },
   "engines": {
-    "node": ">= 6.0.0",
+    "node": ">=8.9",
     "npm": ">= 3.0.0"
   },
   "browserslist": [
     "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
+    "last 2 versions"
   ]
 }
diff --git a/plopfile.js b/plopfile.js
new file mode 100644
index 0000000..9f3147e
--- /dev/null
+++ b/plopfile.js
@@ -0,0 +1,7 @@
+const viewGenerator = require('./plop-templates/view/prompt')
+const componentGenerator = require('./plop-templates/component/prompt')
+
+module.exports = function(plop) {
+  plop.setGenerator('view', viewGenerator)
+  plop.setGenerator('component', componentGenerator)
+}
diff --git a/postcss.config.js b/postcss.config.js
new file mode 100644
index 0000000..961986e
--- /dev/null
+++ b/postcss.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: {
+    autoprefixer: {}
+  }
+}
diff --git a/favicon.ico b/public/favicon.ico
similarity index 100%
rename from favicon.ico
rename to public/favicon.ico
diff --git a/public/index.html b/public/index.html
new file mode 100644
index 0000000..e918500
--- /dev/null
+++ b/public/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <title><%= webpackConfig.name %></title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
+</html>
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <router-view/>
+    <router-view />
   </div>
 </template>
 
diff --git a/src/assets/404_images/404.png b/src/assets/404_images/404.png
index 9ec0e39bbab507d41cd977b3338c6190c817e4ab..3d8e2305cc973ad2121403aee4bf08728f76c461 100644
GIT binary patch
literal 98071
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

literal 63580
zcmY&g2{_c<_aFO~k~Ja99z`ORWkQQx$X<rAmSspH%ZMmT5h{DKC2iA?C}zesBq3!P
zVTOca?2Kg$|2vl6-~V}^r}wG8?mhS1b3W&DKKI_@E}CB8=G@N-fk3zo^v_yAAWRep
zgi(>575s_q7nKt5KV}ad6CDTyoy4`~%mRKd;i7M00)d3cKp?lHA&^z@N4Nh#Ac4vd
z$hZ>(aylIX5%SCaWUdMRf)#Fb;Vfi>{@*i9aVq!{VsKXHQt(eQCMek9Uf?>3+;!sW
z4;h~yg&ICTk$pFw<J?cAkO>*~PwxG~ED<G5t9>lyh_er?rIc=Y5>ng@_&IhPNck(V
z^Y$|}5JUTymYOg^m6ec_HGvG(xnrl2QuY0qqYljuof^}^&1*#S=&~Q&`sLwjVMlbq
zetR@!c6ZoQaqgYJDBSOg+?Ct=E&jNO3D16eNYVEPGUQ&Ty2pFcXOh<B_U?Sg>Y~TC
z{ytBjLM?r;n?3wvrl)spfr!IQ8JqEPICA0NG}6D2eCq`r(IyXM3f(0Z&UJa}zC^Q3
ztAF@a%BC^1XDya@XGE@Dx06nMfV&lNP!*C_<XfUU&hs50ev21}D*g&u>5$nmel!kD
zL1X1R>Z9!JM~uO~|1B$GOz8EjlU~Z22?}HRH#H~WTO!U^)!9XlOE=-r!iZO89?KqY
z&)Q?{K|=vyZvVc!TIntOwsJ1q6#;!$s0*vkB1N6O!!fP);a45o=^6E~qJLlVUan-?
z^LpTr^Q0ih1dQqEPlo<#p~|Ia=(D)m=-TsqCr)JgT^in}U2l`P<LQn#%!h6tmNukF
z<!Ja|o6H>pB-bzQBf(W2(evu>2bES1?>HcjU}h<cW4Qc@uX0gu5bIw5V6tz&eaE{z
zv6funy5g0W|MQ`F6OJ=`<EUT#fx)RecT?AF?{I)`{o80_%ll!@J09hy%8yqbsS)nG
ztw3V(?L$;1hpT2f`6v$&S^3td8AP=4HrYFN;*s&E%{d0Et}6K<%7&z%KM7GiBKCgW
zdiQ39!WKEUqvj&HczhHAR>M{KGo2yK(_3fhu62JG;qEkI@2mmx#Lj47EkZRFOv{gt
zF)i0Ukg5Ju8~sDvx87zYLubdCaHti8WIb3NbbDe65~L=4U47#-E8kQlDSBFy7-=?h
zJZ5JwJl4CJA<TxX;tqj<t$c7K*iDbi)Q8+)vuvmL-*6@nQcT|n1RJ`0KN#y`0SE3Q
zj(ej@X!#^GVdpDg|H<N@C%iR5_ZTivM2y*0GiScD@*zLwF-3f7m;29gC5+3CY)5+;
z`sWV%!4eKOQTq0qR0g_mVar*T_d)Cb8?S|B26LEg=1PS~<;1gt(xjemQLQ3B{k|7m
zS>}cI{r6ol`=G`ZjzMZGQtvt0=z&Z+81I&g$U0Zeg_Yh5JKw=!M{iGC4Mt7YJP_Zf
zdb^$3tbn6kJ=1S(SZrAmDf2%Oz*iIW*q>>+l>5j@0wGF7{l*}vw^ep0N6@+X$d%K6
zv%3eMU}`X}cQuR0t|<>?G@cM$x~PEt+-~vTO0P47IYb7K7~T$W_q%oaVma9M8&~@3
ziC{SfCD&d{{~J-svKYg08Oyc2s0~(7(7}A+4u_d~`n%O+-!%s4ot+4Qo1v8~W#t&c
z)WabC;olxgQZpI_!wBD^y!LC%Y%KR0Z!eWU)cPX?`=%zt5JH+{+tt@vp`JN&)<wZu
zn;6+XUzWAK`Er!kD&^~HgTE$gT0<kLncVWLf6w!2696DR@L85cKIhwB3I3_ob9$cL
z5~*}o_wz{AsaiR*kK|P6LdT@yH_KYc(f>YGI|m`TX@FRv-al2Ed(FF+3POG5j@UBW
z`Vook6~}9N#Y3?3BsE`1?sW^q`;O>)0JLQHBrIQ9fAil*uUzS|iDm1*S@SL>*IU)u
zrhp?&vojtwkJ#DNi)1^u@xq?l2_Kl$Ct0SnJPC!gyhcGy07p$A)Z6C}yZ)t@om<=A
z9NG!LR%(qH+b)rsG*4A$>Rs#03uoBY??!~~3<+;PY*~DmA*^ERIQf*8YNqlx&$`A3
zZ%%&l-<3N=lG*l29--_x=U|`9AOtJeAYu|+3@}IB8xNaB2>v%=(RoS*#KW8Et@3q9
zZhz~vm$%OF-J6OL?(DgvB-Q^$`ocVO<pt}En#fIcXtz_{heqq{&<HkcBQEe?h<H4H
z5$F(EMq+%66tDb27zp#a!?EP+iQgmsZpd=YLI1z4k2}2*IQTuM2Bod)3xVC?NM_|D
zdV1E{?GbB)%^;-yvrc+^`AyBOX-LmB!_+kuKXn|-0QZr~Dl|8Vbm&*=nuy{5j0wU1
zcnrak$m;KZ-vg^HM+<mp_TNR#Ar$@_?+5eDzz^>~18Z&EGW{Kd_-PPsW-|z-|Gtp^
zwBmtbxxA?DcMr|99K|i;-TN)dQe5*sbeQD&FWB&h&2eF3m9A`lE%$1|kK8@b2krb8
z-#3M*-<V?2Zo~Edi=qT8ncLH!25PRbaSyaEfgrcgQ!qtVa!1tRM*iocOV=T!k*Zw>
zYCNJkJ#|A1I4Vx0&p;h+C(R<XwvB_g!~c#q*hF%HI6^}DT?T!TdR$=u4xRNxOhevt
z!G765{>Q+*H9?~eHCEFM72?Wa>Lhxt_V%uiU|5#J9r~ADicj8l<91)JW~y{k@<XB9
z|K8ef5{v{E23IphG@y3>XJOGRu(ttS5UdPS5;^Okk80jWG>bYBQ5OMOX2;q8&xioR
z-m6Ep++@HJJ^o<AR6o>o5u!Xq`ur{z#6o}D?EcTj?`$&|8Mc{$83sSIGIZ4nw~VN#
zH-1s%=ZwkC`E5kur)IL>A8vATgg$kMJYK;-&owM*a3G9Nlv_p<QyZ-&k~qk<_VQn(
z+O%RTqq$q{ZkV_y>l^78O50}JX$DE%u_XO&@*pxT1Mf|<OnIGH_>6pB8yyb9$-RJM
zqYkCKvsO$k2s+*as%{5Qmg>7pJ(5%~@QW@D#zF6h+?*difkQF)we{7MS4C><*@w+S
zAUtbRAH1<$31-u7N1famgvQ&+fiet!t;LmaJfV|c1uD={7(Laz>nZs&oaVKb-sX|B
zD&yB{dg}HxR!}bi`Kcp%&wdAgD^L>RVBtGaO=WqqBCApQC(tAL?ZwfS<YvQtdtA{N
z^*ahdvo2aFhA<T4815DGjF@VedW82KjwH3rnfXn$Q#-U}$wl(mrzTovH0eNF&1mzX
zoE%t2Zv4eV33`0Onw^<=4u_S~Up*isI!7Qf`5s^YjC`5LQU#dF9QToBR-DQ<;gh2r
zf1L_Td-qqLm5HdRk{~xfqVFMnf4MC9M+zQ4ZP7Ni#HL<zt}il+!nkxo<nn@p^7n7?
z7fx&=CbH<CIprF?2>sv^jRfc1W3E`y6sdzeE%||}33o>o&Bj{;)Hkv#BE5)gQ=Tdx
zeygWHq$BDbjx=pLqQ2UOtwLY?dWN3x{nfJ1`)x;y4?Rv+9&G*<N7*$J7Rk8mJK#YM
z2>C)-zv#ksz*~8U(4;YAhZK<9@&_Cy1do_!<7M>cz`kIHsowF+Kg|N&*Wwg}h*H5m
z99wW?X$uvqMDFnmN*%gD;d^j|fX)*TQaeybnp4=nm5CrE-)IL3MxNySBAz<<z?~=7
z?Rm8U;t@J5R3hg2Iy+Htn1AM+!r;PTjzP<pxQ=Kls2qP9kA>ZZ4Q=gg9--&#K#!t;
zL3qjB`LdY{$77|-9!d?zB2P=!jvD{^>?vCH##xgnTIi?bOs6%GS=ta#IF@~puREfH
zPNe(Q-g&dEfGq#FsPd&h7w#PA3-wvazpf7DhyA>b(LcoHd?-<}U^bhu5t1h2<!EaD
zKCO~oBdwX1Up~tsdFsMkxb~}OzWbGNFf0>B+cC}NoL1kd&=RG$YoC#aFu^I)oJ9e;
zC?Tp<)*V|a=g3d}z%L>-MH-Q?a9aU}u#QH->MlZjz(4i@M-WcCWHEcVYBykmT}eW%
z5}CH?$uwi@x`(oMQj7Lz*h=-DSFro$FSrlX1PvS*e0#_0T^1sW;8_<gVn17d<dAkV
z>i$mja+~-0%quMx0jk5^cwE0-4+7JC9D{!<C%+hihLtxbsi9^TaylkX0{Vxb*u?z4
zu-`b?<qn4ji4=*NeYIUm_^Hw*3O5aAnuHw5i;`4qtZ0ppnVZLvMXV?56_?pk3$VP$
z?bLVUG0Gz!zl=BZ+~y*&_^v@Ji$5Mtp|k>w2-V|4&VUrJMP=@oCRAkKB;+t|#5S{%
zFC5Kh=UTk4H%*Ge1>5;Z7iLPf(Vni)OiSS(y*5dw%pqKrFAW)&_uKPaQynS?)pPbX
zM?@Ry*}u^Wr+n>0N|dxpb9I!ToHIOLnrm$ICs4{=YH_3i+4UUKjZG<%>p7FN#_HFc
zIL<z3sk?ky#H6weEkGLJ3d@F>Zvkc=p}pl+6*70W0b7}s8>5k}vlJZGXt8b3xKKX-
zuszpcA7?f-k+-Jjl0b^Mx3aTQ0Y|Y`@V<yf)Y~0<6kZnZ5rK_&W$to!mtM4tqkS0*
z2iuS6>+uDQCvEy=3Pk(kZuR%SK5$PiQv?TH)~*?CMGzkO^K^Jtbh95Vp7zqDwrJ1Y
zP^-G*7o<+sU2m%`nB;8>Nq}Q{7{Y|Ax%vU}x7WV>GfEXP4*r-YAPeok3mvj?+yZks
ziuA-JaXfi7hKE{I?Gv$P&0%&!f2Of8W$5+^RCHP^@7s_h3oOsrLR%PD<+#=$g~{sR
zibVm(B)7~OXgM~V)pNJ%QoL5TZ?a!+ThU2`hb9{KksdaMLX*Q--&fHWeoCE`{C>ZE
z^_C0o%|)Zi`P<Q{js@xMp%BspD9T5~8JDbTKO<eZszIsEtBqbvx;bRD_Hv8J>gU9V
zx7Y?6(4yjK^V+X}iaJIgMMqOj=EmzUgWB=lOh5SbmAYQh-rNm?cpE@Z25NFltiHD*
zbS6OK^qr8n!8&7(e7x1%7Vd6XPo#CpE^^6J6mplGTU+8-sKM&0M*FzhO#T=hG~i_o
z<8|CCb$MR9DC{8PvS}z^rMJ+`M7R|%pbem-G!e1)uiI=D@Y^G@;@3efTh-*J{z_hh
zbbp=qp;l!{?OGXw{b?CWFbIw~Q+GwQ7xwI#-r!nLqzDDFqzZD#L&U_B=u~F{8ftNf
zb{%SPD=0c|6QF@FP8T6-@$0w5t#SJ@(voH;snQFfLS}zj9+1ULTNuK}s!il!4<T5e
zn#X{8*tDP0@^ImLIzWgDd~j&}A*^*PO7U3EiB5HCf*wD$<icF4KtxzXxlL3T=DjW~
zQ71S0O@6f3sZyN8VoOhCLJ)*ruzlVFI&SR3l?kdOjcIaOeTO07v4+>O%0r5f=&dwq
zyDqiSsKxu$)P*x#e$AgFlvTR_hm^C{1&Yw%+*auZ{wlsdX?7xWrjJ|Zb*~>YY|tiT
zE9TJZPFG3`R@?fH#1L8}S2~2ljZwE?b;-@+dsi(ARd{#zNo(HHue&vU@r#hV#rfTX
zRe`Xs>>n+v>F-b-(O!VxDXqOU+e`#G3Tw%og03Tr3G$RzCsy8#j{HURO^c=Q7(>wf
z55F*Wy;)YNM{=O-q%Pwev^y>w%O#y2vI6^XTLhrJwyj##3Lj7kuIq7GYdO_T&sRY<
z%TFFbNr&bRTQs7<<1t}<+NzT1p7oU|4v7?IUSSCbrYGXDE$y?!JG`I+EDEC&9!5I7
z58hMxCWLXBF6a1o<E@q|hI3cMA~)0HB3a0dWV8E50fFj%<rU2Et08$&z>slP^<kSe
z?sst+?`c_S&2Zbg6%Z*8?Kk%Obx_7R2E9BP_M7bUQXQH-&xc%pFMw;B=Glr9I1aKH
ze8ESbW)Vw!*@}F9OWG1mn5bIm0ITk7{JgGzrcOkQ*OySAOpDnyST#zckEVLC>s!>o
z1DVU{JQmVm5ZCs0jNPh|-ofV2)v@76lE`d)yxO8E-@Yjhxh9g8Y$2o~jaRa_%{Ycc
zu6p7nL0kBD{>ri_E_6Hf!&w&3n@s{^wjgZY;<_Uq>*)$*Xt?I-ifcJIlp)D`G&oHc
zdyye*48wI9R~*l{Y^)FHw<91PzTQowd5wS2`t0b>qqRZ>g!X#`)KAfxpGSIG_^1|=
z)aL!dz2aPk!DScfOvFFm+QUD;a&&OPr$(UaHtCWXM0~&TK0rnCSospetC?~~f&{mh
zr)17{{+iKvn#E?h0O*`>h_cEl8+msB=g!+B_fmN&+(v|NhlU=h%Z+fE%gTekIvmpP
zpf$Ge3ow(8Z&3*%dxj7zSMF|aWQBg^V*St5)gnRaV`<+$rMm>72jt>wF0Rnj$4)m5
zgDJ6^S9IlJ=>Z`g3JhUEqA&7&kzA{wjNs7R&=7jh7bLc6nne&C=lhB|Aps7ZhHuad
zHoNnrLa#I*H6Nnw=86+!T$a)0{a`2EUz#RK<+3WSX1H9+x7-D~p;jxt8X*uD1Kcu~
zXXt$^DRMI(^smIy3MR|t7tix-7TZ;P<-rDQ=VxT~-Sd<^_w@;cLqnIqj(S2!fnEGH
zvbmjQzRJ$^=lQHPo$8C1#o{*C*qKepox2-7D}hHI#3Q?8pxuWnCLc&qR(+9*EQO_A
z;x%c_hCEkzpH4jTYu?Sd5_O-9U@(o~s|*vG$qKiUUZE3~@;sI?AJ1CYTovDDPL*(=
zBU&x0ED-$Yv<q|fcLk~W$u!r=`{X`7UgFf_8HFvgVx}4Combywt9-;&)gdgk@11u-
ztl3<Zz}6_I(YV1Y9K?Ni<go_i2&f0QPT2{-Vf+AX$UV9cn5y*9;0sV4cuhl7b+O7B
zVl{RM1{>U-e#dhRppjz-=rPL5*M`M0!G?p5Zta5r92Zgfp@`@S$6dFCi0^WLwK^<p
z458=JrH#)>>l8gn^+1ElM_?1IWo?`xxfY}6`KCb6D!wVBX$Wtch9~;bX>YmG;$1%K
zSa@(t%Il1zH>XQ;UnD1oU$CvK3g<=A@}h_7pc}YmJ=h=g8-lIMd}%nR2jsgCc>*3M
zZvIkOdwYI!C(-H+w=_D=p<$fph$031GVzIvjImwcJ|pK}M6)?aXSXHOShxl?CQSxQ
zuhgKHtRDXc3h-NCRzFY*CqaKaeSH%t_^Ibm_v|P1#ubF9?0DqU^ORIIl~P2YQE;9^
z-H3+#Z!Y1QpxUY$ZgI%crH)e=RzAiDGTuI_L+`o8mMxJ@oAejp;Tm>gg13>8KlCP9
zsG`n5BAHc1O}TU$gcMPBNS!K`J##oFEN{E9cMN2ikq@jyvs55Fn<^?G;=@5_HeDT0
ztL_ohd8v?BND#T<3bhiEq|Ux){*fMiuTLr){XiG{j3G?pwu3hF)T^V-OKRye*Ig7$
zf$p5PGVpLSG~v*((;GQIp@<7;RNZEl`~<W$CE775I_)d(Tf#YE*dGYiD~Ksb?Db1b
zSV?VkBG4W&c>){ax0B|oB)4`7*=_Yey;GjDs9q|LiUh=2F!+iw$UXkqm?MLo^v2rS
z83N;~=9Z}jGT18H?%|}BoRn<?d<K>yFQw({qft}a`5;guWMIf6!%J{8aauI;|FU$b
zJC5Epa`nF}{sj1_$;15)-+q3Jf~kEN#%+`MJVF|Keu~pg3$i@LO1m^yb^S9|;gQam
zE#rmr!}Nhh03EGP$-kjw4k2Z9?cZh}K!BRfvkprpo!i7qIZE(1sjfFX7Gy8g+h)SO
z>V^>5c}CWOlBjk`E3yrSry<j(^wFgB+eH+U&@{xC$VJbrlw2S!xZUAU2l_jdAuO6?
zwK>?hF*#!8Q*;LekNg0Spi&RShYJMG7syLIw#!VW*&0USpDM0uTHukuG;17B-er*&
z|H*+imR&hN0(_N+K0Y{NyQHtaew*aHHR>5MOvNbhNO+k5wGGX@dzXw~JDVdII*BYR
zc-57}*Zj;#7?W#Aw(;e3YBl08EH`IbCPI$(vGm)AGlT(YQx(7n_n!B|B*K>ZTB3u7
zPWx~?mBS;STadJpqq~j_4PK0g!xSW`aWTTZ?S?h))YV4DQXR=QKD(V-Tly=2QcCiw
zS=kb~v~2^cR#G3xtbv^KQWvciS{_KF?`<J#1G4?ur6st!C0dAlb>Wlr!Y3UxYBrhn
zTl4~D_$r51YV%cS@d8|_C7j)>!jFW##<*Si!}e7AM09~NAYwuwdDfM4zgf0H%5D<G
z5?wS7xu*yz11FslyoXQLL5Y0KC-hv1Nj-Du2pg%DAEuh{cDCU@()QAp4;B;54Fd##
z-u?axpgyRN<7XrC(JW@b2`@Jfemu5@WkgS32U<HH_3bQk$mL$fl43&7^k<~8aBq@S
zY5Fdy4t3%Bp*-cEY`P~^`5T|f#<kh~R(r%peVoN;JFl`d`3jRr;>>;n#5y~-v4#C6
z`f8c)g7g&LVsT;{U#Gusf(I)<^}&%xtA87a-ex1`r{yV%J`XB~|CC?&=9QEms>(PY
z%wJFBzl-^6$8yY6nxdf2@{aOYmF45zagantL0=fcmdY;;_^x{va3mo-@k$2-XRFrU
zn$Q8Rv;mG=SL3Kh#?vmrl}w)-acbe83dAz;VWn1ObU*H2kUBPQCNxlz`-;v2>g<UX
zs8$HpCUTz0@V1Ys-x7pI^LajsYNj8aNoGwFcV|<2R*WRz2qq;;vXmT`*_47M{?I2M
z`tytp(9;33V;~_whzTrBP5`+u{z?tvrQ+@B#sT5%vLpU`a0y!j<P&nKiOfNd;4njS
zRb%SAPlZ>Dp2FMbnj*1re#r!foOvb695y_K@$x-D6oA&O<_Fl(wA3u-9_FN*(Skfu
zX!D4`?kt+5b*4l~nqoQm!;)-QbnUb75#G=iSGW$~(4+L+&Rgids=h(4h<rt&YcY4f
zk$M=jv1;)M=%3mO@r8@z&HNFxB%=nvlB^Oh-fYx0Lwl5{jhgVsVQ#^lK>-Arh~dfq
zQ|brw0%^KlP^mh$Fy+hG?aet-_!Pd$l1o2>&@({inxS!C75Ct<_FVPI8_9&A2Y4al
zO_wYh9s6=bA;J_Ki}ZuDqMI#sm~R#v6MM=|jy9i(?6llA#GEX0i|D)FK$Lby9f^WX
zU$-PrREC+CTqK8=X$0ED5n8B}l1#qN;?q+1SxZkUXX9h0EeHxgqydN;#DMEn->`_7
z486KGXbwyMH>v^IEX1VlVG<lF4o3tU{Mm2jRH0^!_Q;D+N#UdFAg-Cy{pDmr?#o4+
z=uX%Q#=U1g0wk^M&voR_gKac^%9r*`Mj>A|-!-QxKrazSgH?NO85x3bq9?U$asx6z
zs0gXuK>YRfnWb>~b3z%Tzf*%iOI$cE)W5-zSh2@tQlU#eTO?E3n7Qn;J68-=boP>9
zJy!8Vpu4|l3?|>cLg3`Yn_i%z_Uw8camvE_k33~FKN6%U9=Id50zeS3BIBFuj(Npv
zDe$n7v96|Ms{5^R-=mw10w^(7=1aD9#9GBe&5EPCK!Fly`xWlM>fu}P&c<FA(8LO3
zpd~jka6ltYoP6`oH#+2?Ub)2pzEBSLP=DDc@OI7y1{=9lKI(y{U-98;<UZ0To4SWe
z2@AWb=F1K$7_c{#o>Wb)H3^lQ2;dwH6{)<b?$@JZH;!1BxFcY;>>;(tA4;#o4_O4M
zuSjV;u_8uft-TyinwhinUJv0N2a1)XT|-|x_qPND1;W<%eN*2Hkb|S+sqGEW(VvPf
zXYH$iRan(&VC<NO?exE|afP3PH!FHS-F3jL9c=aM;SUgxYWX4Ro=^|P|CvjVuW_Qg
z@A7q<fd1TL?+HsM%l;@zy5tOVsB+7^bIwhIx7R(CjMp*a9pE#Ppa6iP!5erif=7;W
zSlh6ceEroNcFIDSgW|-BSakK9o8YI|1<q6$mZgNmZwmLH8RKafwg<9{Z~acls-71N
zrD<b6d}`!-_en}r)X<!4$KDWm%#88QQ`e)m{%E`-79kE(*&FszgUig-pYFNT$Aby(
z9h#YVK!~QcU37Ral@In<*|TQ;rgiJ?(qnk+f;Pr}G)^jHfH!2|8KG=07aFO`s-WKh
z5-V+K@<)P9#28L8@5fUe&By1|fRb=1PEoOK*Zw`%U30e*5$=SJc>5#RVw&BZE4tBh
zGu#g-i6do<pL2d%1z2TId=brHbG;dmZmxr`!`+750t0MVpXxvVvmU0FqHnZs(PJk5
zRKjqD#rSpvvhJlGC#4Lk4&Kseajkm?hYEjrB33XZ`ati7Yy8a_I$|$sq&bq^KEep$
zR6fVYgK>uJvXOokQR<m7>h>Zjxow7i7fP4?loRHO&k5V9{^TOLVoBI+T$VB8P~Nde
z1h(TvMM%ZO0~h`_tl0~MUQoW%?8J)vvikbkx5p~c^t_K_NyWZ_TPKHv8_b+7o9Wh<
zg{4RZOA2RG1@ZsEP{c@RqXt4K)`-WjFh=AGS)+;X-RTxm1<DF7KKuN!_%*3-6Z-JF
z+(`Aq=EUL>XS1Km^aOI!F&)gAyUUC)J}gOzNkQG58~*EU6(6pe5u?1f=^R2<p0d4Z
zcmXQKf0%=ij(b0|&yHO6_&4>s1#Ax-rPSie>w;C)+{;nRe2(}Bj=L5BO8D1lEY0gl
zhJN^>5mq+4E$36Ur-Q4Gtc2WFdh=7GK2<e?{Yo(Sb0Ep)F~KVp)WDIqOj63f4C)2i
z4xMRMFC?J)`D<PZ70k<o(y>4sb(Y+sk7f9=P?i$C7cpdrKi7B2w!9hlLWpg9*ucXS
z+3Lf2q}yYY&r`%C<1yMRPvOw;z$97aK~rbNhv$@!nv=PuD03XuE5g#GUZ_op(ow|M
zlPN&0d}k_%+I8jqk*LR6YqsSeBT*Ltf!qWmE;$NL3tr<Jeo42-w)$EF_R^dd9ywZ$
zk&PLyFkGH==FsxxSWiETR=-VX(LG%ePBprz&n`U%BbSdj=r-?ZRB@9{xI|a(aD)HZ
zsz~whP90<yG0SJ|w=9kpnM|a4gTex{Cokq^J!l1D%}9+}JnefdCX7+(zFI&fBEs*6
za}lyc3Iu>L>vQD5d$5J6;s66JcPs@Zbb8-Rb&f`6YmAvWdBTQV9yol!j_1l=Nk`uo
zKEMR|+g(bHhf}IWD2i`8m7dTA64uMjS7G89LQg&RAGG7w<F8zQ_P9f;7{Q822Yg<d
z^7B*hz38P?Y2)Z?7v>%urPu0f-6=hPZSB!Y(ktlS{Zh~;Uv(AzqXJ~$O4EI8qqJX;
ztx8dth{tw;J;@#--zO@A+Ga!MvNj+-n#q)N{%kXl0^_Df4Ud;Q8WGX1GpvunuAvn*
zlXvBpJqkle-DyK-;IxYx9G_5?cOqUT2#uS+eN6g=hl&BZm|zn&FqBcx``T(B)`lC7
zn(Ax+U2a=p71io>8Ql{!SDd=`TFSXID|2ze5=h&=b1tn$$KtowT6i4|9kN<6sp$CK
zxcAG~W$xo(66h5l&*X2X<ZEqMQea26OHC#awt#r_aP@kMc!xex<w#yn@{2!<8Gu~+
zylo8+-G<CVakL-z9>|^MRirS3p+HO8;>gijz}wHtO?o9m2ecNhze=#Q`8_Yq$y`l~
z(v|fiX1%Re<Pl}e&%TOc!WLbMBIIIC>Ixa!`%IRPmxa_D)7NRAHuY!*iDRyctXq0%
zLbfsWCm{oZ7L73WM9&ZKlH53uGryb0h3fcstRXk7zj1WAIng@I0alFcnE2|$>o}dP
zOorJvqfVoh$`BEaCpe}6<39mcB2^@rZ&8xZUmMm-a~d@f>f>3MPI@NHUqQw5Q$J4i
zA<DWFJC&Z(XF~nSme}6n-FWP+uUiTI(&^q~aFe2#poAfKElsvZ*yu_CwttDvh#p-*
zJlk5}MKbzkLUiAf$Z_GY7g2l`bc^xClW^R43=cRhz_aO<OD`rUQOf;EJ1}<!PFK+}
z2ZrM?>WA~Z6ivY#mgHBq^nnNGCjFyRfr0UuYJ_;v&KwC7&3cXG?xiXV0h}`(h2<%Y
zd#T+WH(CvVrUpLEE!_EZK5#s1+)l~G03)kXq5joHn;s!>1Tz}v7E~xxgp>!hW3zMo
zH~2_MSyTGJs<y{<Q$%`_u`3-c<1q{kjyK%oDD#T+42j*UPrB$dpyzO4(`Orq!kK+p
zBX{ojSNABH19QOXjv)0ett0a>UH7_%L71U8X>NuG8hY~DS6@uvb>D&2DoQc>$NA0m
z0=caR%Tx1E$p{TQvw0lQr6j$LREvixxb<)87Es}@U;jRsn<6rI`#hGTn?>VIpr!ht
zGoOSM#L~W)AYTup<ZZ3IGmC)gJ6t<{BA;NyGZ}XZV~(8)U*SGV&owmcG#dJM1R_&!
z7f(AB7p^whw_V6a4ankN>h2ZDerSa+ElU?EwY}##1YG~)7q?2(QwTOc{w0NGEKMG<
zZ@xMQdbCz^Z*E`K@1U~H9Y@CD*B5N=%rr`Y2@=A~`*#xH>m35l{g`_N)?&zVVnr_o
z;koHvfQPgyO!KFQA(He18iv>5(t2ACD{({PJgbhi_kp93PmKx@0sY#%O@9%F|E8&{
z&}Eka)9}*wUA*Dv5xcF7)qfLDi`)xxgiWjD6y_ANvdDII%V)n5XpwoB2J|uJc;X-G
zPANP!<E>6q&hHF8#Cy8waD+>kpG0D+W9mOQt7+5)N-qMkbc>{|vu&F+B+OfpJ!vl<
zOHu>=%AtOjCTY?Y3Vtf6tdbN}Jn_sXntQ<vwmp0;#))xE#C&`p`6EUiiBpdZbdcT*
zNn8UwqKT+KU=XfGm#B4sL~XP^%}q$y!F~7oV&S9-{kFd*vw_oTW)WLqpCCzjrOx(k
ztnDJ1TMjgoE9mhU_U+{T$szO2^K3~_^eE--vWfF}XzP~K{2SJ5M{TbdhL>-}3{u{7
zdm?zrMwJtzykvZMyKDY0_4<1khAU?V6t`jqj)tz|A&rc7@tE2zm9skg`Bt!9Dj^__
z=XaVhs|17`U+d5N{T^{(YhUXUXaV<z0~HqM4^o7bQs~r&LGQn4h|(8rxi7aES;_32
zKj#}x)fX+s$^XkA%MZ*$iH7`CPRF#ij*|_|s#63J2i5K5h~7?)F2>tQEWCeI@(D>R
zKLW=6v^rIe*A{GI0+#{>5gYgE$*Lh9>!lcZpm<GfsO=n(p#c}5!LzrL*n*px_hetJ
z#dMN^ve~7hizZC|*$bIxx02G9+<r?k`iyQqq1}R9C7bf@lk~{+$7qKjB`iT{@n2zO
zg)GyYL`{L;iY$t|#i;J<?vJ*xGMg|xW!8=9Y(G!#>Ihw&uIQ4^^V0n2Idtp%&wn{_
z`wZjKKJ)Q#bB-%6kBw;5?*EtHZqw0wO-mi1mgt^D;?gIEgyW!g;!W`C-~Y`YQnE4O
z#ApC==b46Du`exf+Rc4&G<nN}`-F<b=kklk`9o=cFv=PBDFHzv*EUNfUEGUhz^|)G
z8e(J*<pu1v*!Xnn)P#D{R-CNk*Pkp&@~;ZVhX3uLHlz%om7popO_^zyTkMgifX8&0
z3aSYk;c|0)(fW+1s1P=_Xw&tqJfR&KdEd+=Dd!5764(A<IvN~z|8VHvfew9PNSNxw
z8fP%GLUzs%_Vs{!hxtx#CIS=(k07nfxgqzXdy<G*la?q6VI6V+l>(^SW{3ae(M3^@
zedP{_z)Qq82$96$1@(U^grmej?uOZY2@|IO@KR-|^o8lgK(tN+y@@H<idIDd2vTWZ
zQ{mnsq{^cV%Zl~dCtutWH=Wg<OMrF=7JN?IOSLFiI<6HF)I?0*)D7^xJKOb0;$e;X
z`N{5t)VTN}?A8B|5(Y|a%EAENvI*_(3y!!u5yiEesssI`e5WLhWU>Rpr$rwO|4m%T
zCT;`9%3f;PC*DWP@(tJ??gh~CW!L@*AKH!Gizg;^DMjy4>`)1wG^eNO;T1%<S&guv
zWKJ>!(%~xTeu1@Jv~BRd`c~S(6KH=?tV0hB=;JwNA6mrruV_dn&~&GFkpAUaa?{%J
zw1;izljk+%!Bqj{b0-vPh1;AqoLGaV+6NnKwnoxTpjCBCv0$S#D3&?6SFC8*=YM-B
z5Q|Zg$qNk&8G2_bGq}4L+y#0O9eg+eX|^B5C4Bkg@q|E!tx>|_X)%Zx9^-coP$Bxp
z*rWoLirkdRLfG-@rAUIAw8Vgm|NRw<SedePGZi}ya1-KQ<B#C#BM-QU&0DZ~DxS8U
z$3KG6MJuU?z)aw{i#q_$b0-0#bU5!-!`rL5#~A>@^o|)=G5oahRR785*4oHXddTdS
z{R-fC_x$uL6S5F|hl0TU(Bgh$W?C6d!|5}{5B1&9{0$b*Hse?zp0+nM^OqyA4$Sv}
zPJu!9wAnu_N>F@9xP5U791*Ha1}X0z(fJfV^-IG#1+&+XstDB9f~Bs*;GC81-RR?8
z+ww{tyNuuaV^iJ5W8p#cQVjUiTLOwGdL~yx?`m!gJ#4V{c)*Hzc78zlyBrqOSAn)V
zu{Md6&quHJZ2erjBU#)#(VXBRPbm||C@FH_LZJ3)bPF$RTUdUSvO0IR)bFkexXuIa
zMr~0aCp2sc4snT8j0t}NhsAY*BmpAQV7^cCOWsXroVSSDhDI|u3Wu29<uS<NA?QZ$
z%7MA<rsP}=(c;%iQ3MB3;TwlhW}uy+m+YK>jYeTS9xLaqloA63dWokx?hKz+wh(0$
z9x?Ys;_}|OQtUIhlFqwgPRHD9{Pc<%TkcT0-IIn0QNanI9Fv*U9fD>~(-xE;7ozsW
zL`SmNzYIZ7`+q4|TJ0&e2g<q(6zF-|l;<M3<uP;6NiL6*cg`r%w?AwPPmZIZV-I-N
z{F~odAkebkCXC^l56{;)MYLtaV*Y%77Vvtx{O^9VUr!EmwJTr|x&N4Ku@XX+)S6UW
zW+hJ{zMxkG5o<DO+HC&^N$tIINaFDNjlfupQIwr}2<nNGSwYVctFDh#*VX#|C5Tu&
z2Aef)@o6P5n6+2F?XR!_S&xGrCU^O%Ekq9Co1I$e55H+Su4SLEZWN*(uo290!51v$
zxcD!eEVa7Tgbhn~e7M6kb6ZYnaU}Y&67^Y|-*43?u=US7-aA(<N@Bkc_!cB!PG&SF
zs}w9*+YBw39@(nyPw_itA{q|+04^W2`3b)DW6e7&*ipDON-+;Li<Gp_dYs9><hSFe
zWIS>F$u}P}(^Da+jZjC0?RGSNo4_2FPOs_Ur+#;#b{(bcIWRL+-9r!in7sh-kG&==
zRi(J)rUFLPlyPosd7)sbT#<g$01b5RZCb)hK&vBLt;s$IY6Oy%N6qqlq~g^-MFr2?
z-qYi=G!!jFAMRrU4MQ!st9?+tD?lZakdRsg%L0fD2Ad0~*1TVu+zxSY?@frh7y9rk
z|2>Age0GF>4$*zFgDW?oQ~ksEkEos`!t{F!@|e*!x%RR}SDa3<lBQ=2DiEF9{6D@a
zgOkP>G&?eK=2E3Nh@Px<uA&;Dy1|vr_q<4pL(4*5mSmPt&Nl_Z@ifgi+OW^DdP9ul
zqYTO^VLNb+fkClt6O+b&rmgZ)ouLo)3*g`FfEc%5tias+6mN}K73Snv`M3}`-8re4
zxQnihwWktt7p_B6oeOSGNXJsncE!_-&reUBBaehr`M2B#Hjhd-u;2Vl-5Rfv+p*s!
za99L$k~-CYvdZywXx^s=YyjXm9@u#xU5le5N{;&yd});t?(H41aOjT?YRF!CqS;>G
zK|NhGN*FCZ$ADH9WQkB@YH=0q`+Bgyyy>3$*G56=RGif7(*}U|Tp^o<s<9)CRSG-7
zEr(A{!yp^z-jk*Gy!G2Tn=#1Q&~5(ol@U27d1d;0`y*rPD2)^l4qTK=&26%H<P>}(
zQSB-)2%IzxkGXbgfIa?RK3cSIJ19i+<&fXKPr$mMCq;`iZSE2FtlswIG%{6Ts*l6m
z%*9?ZCy&WcguJ;9rYpNw5XDo!ok|!xi$-C;PwiARenr8SBo>`N$Fo}Baqj}goFU8B
zpRtZQ7+Wl*7l%RS0s&wHjzcKB5qvSNkF&c1@(DIB>5l6=F%W2GX4c-rqC@aKk(DQi
zCoYd97|fh4WtT2}SXfj}_0vpnMto6*!>-Xs0wkq1@tt!Kk*~RJ^^`gJRUk<_nyxO<
zDT+lC!TSSA=-jMhS#S1tLoGaZzY*|93^el`{q|z+W2yVp5v@^%ienAfer?deBk}9+
zw0uBtn##yg0uRxHeA_dNY`2qQ^Mf;cy>I@B0XmY%NSxu!Srzssp|@G$ChpE1{cNyn
z=v-gAO%ZU?G57wxYt2s2^Xbl+vR^Wc--M5ctF>_ST9O32&qy>FBy=RHc_0iNq+N2K
zN>MW4m0`l`Rz8A5$tGr1W+<gsMs@d?uEvM6@RB(_xDQi!nM0%CuzPTvdjN#A1-6CV
zX!|!2GV#CWqa^fy7=RUaSFP9uAF?}}(#y#>2d)P{5-cv_ry|=Gi-;NLdTbf{LM`~I
zcAPWM`YH!jk43maUpyo9)SO(Gfj-d!au2;b*7t#z^=eDU{|bzfi1s+Nz)xM}8VtBs
zHq%t9Z?+c&4845tRzD_tpH%|T#8o~X_vEMc#`%reibhs~4v~eI9-aaTG-W(?9FJTn
zxEZ!_P<AW8%46i>p+d}g5hrv}-Gei>viOR1#%0aqO+l(8OdXo>#3{fu;`G;LdR-EV
z2i5x~9Qy0HZw2ym>Py@4r2CB>DxkOSxlPy@bl&PPuU+`F(cygpXA}1=t94YzoIi<6
z#!vNJMO)R1IY(-(>Ze9`ne(7weB}^zD}VVOA3rrCA$%!Vv^M%!)gspRgnEp5a_1iW
zY`g@$<JsgCM(y9eeG@us-tT!L>xTe)_*s5@*1fxTwP_mQsT__^e^Bnr5if#9!0hpt
z1bW>TRmkCb_rnmK`*%WPN`2~<MwY@U!2h+VKZ5hJK(N54x2jp;X@(hdbN=?d%(Yhx
z(j0lB(?UW+arv|$3$k6g1Vzwe<%dU<7Cs;dbP3LfA}@YV9|#GO(vU47{Ya~s1s!Vm
zn^>A8d6U5wa-wY&Nqo#h`Y|p`lUiC@8?cfHlw|CNe@t1&nalZu7UWkK$q7q;%NhK}
zF+ijE>PTvKYJ4}a`n0(ryJ7wAz}y&+5XH7mR?c1E$D=Y@M{N%Chuo83_h4N9d}9N8
zXT1}bxO%+(q;4+<%s54^ia&HX0TVqn>ndDg#@}C6OfcJ6wI_2#bN_skyUTr4YO$~3
z>{K9#DE-6QL0dV<egDCO@J8<w8(+LnG#%de(JZrdl<Iw=Z`x*VW72OhKr(Wni!YMw
zY<9`eB21ogo-g#35!MW*vgUJ$<CVi<9*KC`0t%(z{na;IPF^QH-JxRr*CY@Z>gP8v
zoCpem4d-KaF04CBs}f8YnI4^QKfbRf{zC`3=C(Q$?7k$GpIRgkY95e_?bHrOnU23X
z$|1hHP@ZC0{T!26=zL-3LipcP2DJHmDJ&?ae-4QeTtxs&!v#3QLB3v4>dc+26AN|%
z&->^nMH%(NH+~)mClHU|@wEKzhe501tBfT<Uvk2qR%NX&E}kvB`)Kvd<;+>(MvJa(
zrG#qFPrbL*KOEb4B5M+WWbkF4Xm1wXX#i2zA>y#l(1OF1pZ4ISN{p&P(0Evz4&{O}
zEz423E=x+UXM;IF`(Wac3x};QP6i2AI6(gxw3aw*Tr`@UFh!#tCt?z|Sc(f|a5zfh
z^0gCLGy!sl2bid|qGBmYaJbzbT;L1rsIv1uR_wgr1b*mY9*~TME|ZNWf20|H83XgC
z?k@0Oh67nIv>-qO(WA=KWPmc@r|uV^PW$t3UYb3Bh9|n9)jhxr1RnLQ`PwLa{g%fe
z3d_J+noH%aG;vgx<RAa%gjPUOs|acR#X&~OW>UABkaywG-v+`T97tovZ3bk-#=9GD
z8SzgGmN!!_pb;Qrjs!cx=Fo!SGvcSB<$!i;a*uB^xEv{E?K9^*GVho@pSi~@Q&*Y0
zX=qn~I&i~BLRw$(w7*+Ni2>dA61u*Sc&0ynZ1VEZ$DE2#lzQawm+IZX`oEx!pqGSF
ze%m+QB))UA2S)e@yo<Dfiz3uiRTusit<KvVqIgy4+fof#>Ak|-EyUYy%phJYl#$>Y
zmrqK4Zfi;QSR7L<H$(Wlf0-IME`WPaNLu~QI@xXXjxctUI5ocXWkUj-R4a&uPHpC>
z>t2SLz2^L8pcW=_Hci2fWwpYtjE|Y42@2(_F@BN#ugb@7DIM({t$&`#v-^SUV4@$O
z_fQ&G3gvHk=#nvB=?G<D*gu*V>_^|7fQfG0&z$TzdV+mP+?LoAqI<p9VP(Djj(Ok2
zdC$#ioWFH6K!95AAoUt~%-UkAynNkFY5x)nx>)J1`DQd(#%-o>uLcE-uSDTv0P36`
z2ghjKmre0t3<t!69=x3P7G!f7BM{RzU)|?NIb(?O>~$Fs?Q4Z&s^Z`zU;q_HRDUxF
zeoauzs;(TpBL3mVUFWC9bwVy+cTkBvEji2IgUAV0%ly=}CcXEvJf{209H1%*?e!Lm
zH>e9J`f0%CS-*<3o}ON=AoI}qvR=`WGk+|jBvg0r+7(8OZTG=8AVJo7IU2MezPn2-
z{XFgRN+?N{&EHA+Zk$Bb3Q%S9pYy@qo52nVfRK=*BwlQMXdxbJ^k@I8%i|9Bew`fQ
zj@xXR=+b}T^|R)eCE4pP##~*}2nh+n`u-jRwkq8lcSBzb@a(>h>h{mVR4!^kiM)s2
zowj73$#w*n6Tk5XkrzwAGT?M>uq%}4`z<HavI1FOo53OlZZYYRaV?j^=x5YlWvyQ=
z!kBdk4nqWt6+hnP<<PCRDuTjw+-i&`{yK_#uxgN73E3y8+sEGiw`*7|H2knO9{Zk9
zC26N;h*5u%liE2wku)4_1NuZj&o<%tYa)?IgsNn<CILt?X3-T_&T6$`Ts~W_Nn+U>
zs&;9*C}Vn{z0fqIIiU*5?qp-e&!kywGYnk6^jDrzgeQ&~?gx1{LC?F0a@pg<J&~JH
zx>Z0&A-9u2<uv;0UWSWGroNVoH(Oj<iYWQ{bV)ZJBl^;&mq;^aTz(tYcTZ?fjK8ZU
zLlC%ASRT-XJxTYtBN<~3A}EKRaec(p^sb3BXpg4NTMU7T06Mv%oJ#zX)^E$jZ&<%+
z56{DE<ATJqgFg0jUquD`Z>&QoKl6dLdUW@ewCw%5@4bVP&U@KWDN5SpXA5#KX!z(m
z=NbZtC5a<y=4Om8^e}rJN7wo>TYfYNJh^_N2<~;+UHoX{HNfTAU-{!+&!>8x@wIG6
zwc=lv<YJUl9Y6#bMgV6^79Q8T0m@^oPg8uiR_}hd)twq{&Oa@{e9$hkvx!+}xqQHP
z!}~~>qM#YM3qx(l|BSJJmAmw-zeh7TUplsX=p?vUZZRuQ`C%jH{1vn6q^r9WJYo^y
zDV118`eH$z_~5d2%<x$ivizdgTf5%-goXn7J3`>xtXKKMF*|R-*{3YIN`s(Ra%h>r
zg)H>73*Q(YR`zxx#v**jCJ!Lqkk#lK-X@P_i_KpaE9(t=p_>PVqiwM^3F2u*JexUw
zOFF?Si)pj3$KL(4xSk%}hW=87b(2e6L>ci@Lj<X8A6-C>74D9kTxqsptV&$XLo_9=
zv;6vLHYaIuAArY833er`;3Ohod><j&_OHZqi+Dq=rfhKg@;1envXW^3szuscu)kFv
z5ubj6;Au~!-(au^T)wHek%(xTbDyTTeeOyeF(pw()FEEb#-wl4Yi$Gq!2<vX>Z^Oe
zYsNgYxco|gPtQMG<?H_ThUoU`fu=20%D8Hg^>K)q>i_bbfuJoeHhzBG=JnE~?USPq
zSL=QbheoW7O{};`vDeK;N!+(Sc@tLv3Y+-&h>IID8ul8{96*5u8;CCkLSDImlO2(p
z9-|AVFK#C2=1GRdp5-91MJ-aI+joA8J;3UjNn48G?WE4WrsCq_F(|W+=gW(Ks2~Wg
zV#2@PKSU|*_Yhnl(hsX(lW;`mK*$BT<A9IJ$c(OmaX0y*zSZq37sA^r!dGrP{$iRI
z<C;zskp7Kav09u%3yX@bmG*ig?Kca(I6w2yHFN$6m4X_5I1Zf9m80}+X}al~@FX<w
zTK!suW0a@aR|B$Ah`JF7d<FRQCebhPS<`qzdXcsiJm36T^b^nD#QD9!(@h~ClUQzw
zE!vc?9ou_uHr2gs<**KqE+DMkfN$OO^P6c|T)X9V5^b|I1zuGFYx${%_tlCo6^}_R
zwu>9KwfsxfW14vbE!aN;Xw4S_OEcJVFp09wUrNAG->pYjFI?H(qIHib3BqB~Dk$N{
zk9qO6uPSc|uR@oArT~s+sGo#F3y5#_$VlBtvN^iwQ}3U>{+zCAj5VzHX$FBu?1fKe
zr)@hfN{}^@&OfKEF{0bSDrWEC6py9gens!+Ta5tdHf<G*^)=?lr!EUyiEY-Getx?C
zH(^h%XBDd#r#v6+d=v4`ZQT({$40;#V)JIFPLIDLinaW*w@W&3GEaZJi*std#BoY&
z9fMoe<z}aeb4JZP>-9FZ`IeWIkRO}{a$6Bv@Y0CfMYsN*mnjfng>NL{kBzs~2+@!8
zs4w@|FEvTsXww<bV*PdUuNu92^aO70^))MUh0?|w>rPq~GTOL_#SO3BbyKif<B8DC
z$qJ>2eEVGJZTd8M66{2J#V@l}jHqod92cOj5yRg<Z$Q@MG-h4V@t)v>r%B&`Qp>(7
zYH+f?S9&j1+am?clk4Am`EhPV*{M|UoO32ot;HOuXPZmCmODdj!436cH7$A4gZ#qn
zN^BH9Z3NR+G@6%)@d%r~`3hS_1!f%{1<|T$;7sVChxueIMl&<F0ld#rlcubOG>O&`
zvFxXt_`ukM2?kt;DR1iiy*=ZdFNo8HfQ-koDLIQ?(m(mqcRf!wHu{$GSPI;ix?$$-
zzr^sb7^%e~sHN(hRf|oB0{%o@#cK!rVO%C@oL5?6Jl(c__Axt+4${^!Vj&e0>|;#e
z-$c0ce2l^r95Vfo+3ZqXD2;bYQ=)Yum|XWcd_M>uFKhB*x!$fkH|2P358f%yo5Tj9
zDt}Ys^OMMxYmBd8@xx*YAp4+YrKWA<>MK3AqLM`Zx;RC5LzN@WhaT2ebt|?7r^4F<
zf;MZVm8l<fZbM!h5j4K5(D7~b--TZin8_A|@?5}&UT>UI{4Y$Dgp|U=)%PGPom^di
z?^*6Wt_48~)w~hrD9Kmv7UmG+<2^9_&~K{myug~Gwa@OZ7=qWtn<)vRU_Qa!z_}(>
zN8)I!JsD67Pffs%9e&x;EU@&z$>?-dK7OY>k-0i~7tqZE4w72ijr#x(?lElIBsztS
z0B*203L}vN&<u3vD}kR?FE367DJHOe5T93Pee^YnGs^Ed&={-<MI->n(77^qcX2O>
z2V;8n->ix4=T9W{^nP4QP8Ts8Xp112Gza#7X<q(|lAUpN;Jw#qG4q6d@JBr6s$60t
z6GwKXw7J9rs1LNSMo~^m18;<6e!XL}&@U{rmE$#3-w^X+^{CbXsk&Ke_FWkd5(~VK
z?R)BZ%BLHi>kCEw`G5(cmM-02xO_ygWr<nm<mJ3?eSr0!g1WdXE?!{x^Rz`|;>_i`
zr#c)<ss_s=6RaFvq4MSxaMYV&N5etNp44ERQq0~68ClAaJN~Mo`oES{bT<|3_l;{Y
zC`%w4)IXKdo!up6PzO(GH3XLd|73n0#6I6V?*xo$pD9-RS08pQ*1A!zD&mA!N&CPD
z#Nk_gNDM>tx)NYo7J1+9oi(qv=Es}O9d|#UYq`Pf)D(t8n|er#W;~kdJjgMIE9)Gf
z{#}~#x&qptW)1)T3TPzX2PuyQDjgF`4nG9)@6m|<P%)0m`oE`=ezwbYNa3+R@kkar
z3D!R{)c0}iEGAagq5ZWjd8Cg5{qf+pQV?s<0opyI*)`GKO=F;9Jdj|Y<&1XZWgfCK
z=ii9Vl|RnAs>Bp5ddB@2(Kd-$sv0~rtUtifbR@3d<9UA-N*$f+LkDHcu2}ULjtEY0
zd-J?h2E%p>+8}YL+n*vErtxG^=*9%pR!z1f4bhi-<whT|Dq!VDf?|gF-gEw#Uhe~_
znXoGf66_oJ_7vgp*HETGR>)9MNUE5j{<5FGu3lNRCDFG3BBo2}?A9r|W*Stcmakdj
z(Ps$-gH7f@Cu{Qe5M%LNH*x|C?b|cT2rU(pW^$i=rb&UFOM=6<;_{b|=<pZ|Bo3Ix
z=2sr5xv(s(Lfc~oS>vrqPbT_-i%y@!c%Pm+G*lNP^jC^#<p28T@9opyi?z|rW~xjP
zK;}B1zey<Q8k6Z4P`FNk0-S2UvOA*E-LVh=iLUGEctl@lg;K?t%T-RH;}{GE1`69P
z9iBqYXl>^cS<`+eMRSKen(h~_vq5&}ai+5y5ZoX8fmhqzK352#OW<uJ{T2#8mBsYS
z5_mp+p8kA#XNmgZ!zA=tW1TOJv#_r{2a1N?ILLbhUolDRv+36)wYzzHlaEJ9&_y3f
zuuz<Hx&20bt^n9Y9NUb{%SZYab&-2HL>#2DDWi4d0dRqC>u@UJ64uuGKyQ-L)Mvot
zSMf;U&7djg`-veZV8vRP?1vJ`4(ccil=X7G+Nb2Tk+{K7g>_%-(*(KrCXOg&5WqnR
z`OA99^I!G<Y_QibLB7A(Tbjb$Aw9HW%8^D+A4?5Z0tfB%EasK^8+u51IX{C%ycYnA
zZW9ue4NzY{ZPnL4P+vdMs#*3@Z(L~ZqlAvGiUQh<<BIZoR;Lw$l3*8t07MpfF0g9G
zP|0})qSoeW3+~18`qD1e&CV;AMofL6->U+5Q|gk#&CX7ZUP$e|g$p%9qhhuiPJMyl
zfxu21jK&judA^vIUtN@b_|yklZEC`WxgbT2qPpF*-1OGbViujx))I@tIy?tJPr7F%
zLs_x}#^%HxsK52niT)M{{YHgBV_IyhITO)G4h-#zn%z}uNB@H{I>CH+Scp2=65$|0
z*ebT5U}fkD9eO`D79+XRm-bPwDlOdqd4z9PD@9(1=j~qRgO`Q~G-|%wIv<qDU20*2
z>lurbdMRo6$&7AAbPG_~=%H~9b>?!EgK)3ebD*bTZj!~F>CKA%V_sy$ih5XIn#cPn
zF=!>Swg^l1p^7Oy&1uf<gQH)oX0<X2aMEt$;dae75$AO`dLSPzjubZvB)_Yd*?vm2
z={eLWr@SO}N}si(;p+tocz>1`eRg|2A$1kuy&^FKt1ii>Zq(+-hL`kF=JeO+#2-=T
z?ca1q>}4Lh!@2aQ9uT<@`l7INKR9VZkbX7^1D{;6+4s@i{v3NM3{FlQ**sE%O^zhE
z4RLyae`Vld2HcgT4;MF$+T!L9Lk?C>yg>XdI!z24&o=<CLDzMeiB$CZhj672;+7I5
zx&YPcKJW6F+`$zk0V;Mj9=>9U9S0N2LN4#B(L0x`ks?()`gkVAuFh(Di#*!z>kT@m
z0<sE}4<M@WQN^|EHU-2k!W$Ag3}yX-X?nxezsM2egE)-!nI8B^wzg6|XI|a!eS+;U
z`Fj?q8-lP&VFQ{HWWl^iXgA_M*lQ5R-#=qD4zbOg<F%9e&WnFqLf3>o|M~@f{z6EG
z>HF*tgS@$7NQU0oiibJ<YKuM~EK>E}nB^+4>%wAm5kkyE{1EY>S6XkrZTuf^ZypWx
z`~QtA6>YRADMK3)HSe_8O-gA)mXd80N)eJ}Fq<N4jigexsU%5ELlR?VWNAW-vdn}b
z>tM!=bq2HDm-pv$-{<?!@BGgF$M1Je*O@vqr+Lk_JeSAw@qAo5(dc$wy&?-hdEoyh
z{92>!cZ#c3wW}_;XYCvld>Ke43l64=Ko~Q<$2C=HLK>;2Mpb;-;{Vt<G<b@TSiZ-<
zZ?&#Z%n;wIQ+m)K9(n*Okl3l5!3p|a2Evpn9@eTqBtr^pr`@xwEjRGM_C_q6vlB&5
zUXsg{JL3e>%Kv<G(Fd#XiCxE8|D3tL_ri+b%<GT(pOoKUGDaYE%I)ta4y-_zTl|T-
zk=lCx7twwDop)?XjVHfC)j`|7%28d-YUIbTRy{n)MkNW&D68xi<f}XyQvPgayrTeH
zN+9qF3v2B3W~mB)mE?jy9Q*e>m%O+F`uN_XVem8m<X8%=mMa^^6QlkMv-sS~D<0(9
zft-y49qq(^Dv9vHj8>djU2gs+ZT9R!Cb}n)`}gpVu5$M9^-%vQYS3i)G+%jcM3!9>
z^o|_B?_F?A$Ue}vntYXb<@roU_T^F7s=w}Xw)>a99EKqBHSAus<$R0Vx;meFmgsv4
z&lE<=*@X(c-3lJY9>T8aMtXhy`{?TWL~_i(Cd;*QuBioDwS%f&&>0eXAARU;>{<tt
zC#p|gv!|(n6kRA=-fs9hjG2}udBel@EYsa`;vN5+*t=*w=wHRlgDh+1T^NO*ao2$l
z0KMIEnruDOqIS)-$KSdxIf0oyg69o;2W}O-$~7KJ|J1y{{|kDPZPX(#y1^G_%F26A
zH!#K66<%uUYIaw>9YGETVh#PTJrgG5A-xk#+GW4hrFU!^qD?Diq<&)u#nq0H#;QS0
zut0IMSk@a^_D&?L67#oVH>>p<X6Qy+`=Yuj1j*5&R$nW7)LW2CCZjIpZ&}2yoV0kB
z0d^uD2G|Yxk6*s4f7x<wL)LUbEhqf^mGWocapIWD5%(^7^;25%es4OB)~(X|ey7EM
z8E#++_n7G|>Z6F`{_C|4sBmi2kDrU$r6u{HPB~I;jW44Xsug0jq3jX2BQ>(O?{@UP
zACr=H<?Wf~fo%hxjGYgfyl&rPn)bOVycQ{ffT;~+aI$$nTfJHAn!mT?T*g67*b4>&
z?KaP=eg5(I<*#XT_9i5KDRN5Zf|h};o?MYx^x@rDh^zkIv-e@ozr7}|;IUK<s+cm(
zC102DYxM+NaH<bCysSvyT2Q3N>rAO~Xnmdj#A1PJ3ez92R-I@N_P8CX#6u$OrToo7
zY%3US<)q)A6_U4OKi?FC^W;lzbiV8QTBaWDCTI2j*OIRjCxSZ7@_S6NB<ttqXP*#f
zYUH(7`;t!)eGhzOrp(`qh#I4=(r()nN7k*nh8uWTq+Y*Nzq;`VD=HDK;nnfYwvP#B
zLRpJVJGJB=J6QTCd1@!4L*2J-3UX^G4O8Q+YF;39C)L5he4bVFQNSj1|Cav11>W1+
za31Y&d-)S;>BpXU;do#-|H|_<L9h|c1;6Jiiz&;E)>p5Xd%3izo<#o33%gU{%wz1E
z$Cr9#L2}cdP5_-#VEakn)j_Qy9biUPn_mSSxn~MfBrahwu@~YI413Qx-j%J4b9ZN}
z6YE)vM2648Hl(>`g6eo0by<ACbc7_eDRm>p!^Fw16o!YOPGe9eCKHCjpZ(|0HK9cd
zlM~`pTVA@R+~h{ehm{U854r628^HEpr1hBAY}fW**X4frXw81ry1j94&+NTe(0##m
zDTN{xe>i<JxU8*r?Pq$8nw$K8ib;-1l9pjR|6wMTWBnu4{UXX2p5_PDLO(8P7znEF
z6b+FVZdcy4g0+zj$wX0_k7e1*mN~pve!^EQ;l=#0r6}mCUBp~zO}W4a+p_ZgZH7g!
zJL=y+)dh8FX2oEHMOL*aaordB(R_=gvl*f)s^GTK4S`EL8NQmXo_c4&7Rah;YwgN<
z`uNyarh=E6;^yhTinet-1v2ZUs-%}w4Ie6t14jGd<%fedob%^C51G0j(N5oyNq@I<
zCGs(`M++e&PfW{l*6ePJd?cnC3-?nE6Tx&fHCC#WG*Y2EpG(XgSzm+!p1fqP^iTT2
zc;kvq5tl@(%w9xqvl*Ot7`s(&^?%NS>5?(qxy`V6<HF!3rH5xCzS`7O1c6mO{8$_t
z>*IRg=P|wC>2%F2Q<urw&u!~|5kYVPpgMqEQoa9h{_Ei_ZzXOGI{A(b_lb3T780hq
z%XA?}zklpbKYyY^^~qjc>ehQIrR?GQvY>PJ&e-Ukr{Zqx732kWi-5>lDk1O|5&C`w
zs(){|)?udBvOy=%rB#pdBYHkWFD__51?Td{!G&+JvGbeGQudy`6W=zvT@Q}@H<(e>
zJ$Z*=-}gI(NK?)+*z>Zp?_K)a+fxJ~EY&nVKYXrKW3xg0!JNfDe~QaO|F=trr6F}n
zSyzrc(PUBv_E8$!642LlJlAOd+H`(!;$!T=NfnKH$_b(@;8Bv~vG0^{j2#oY73lPx
z+H&Dc!d@+(t^J!}IgM}Vsrz;~+*(KUjnDutPJW=9hzh!=NR_3zoJEhcKKL<fp74>R
z=0fBBuE7l5^{MMl9b>&X|J(CLrQAIs_M>Kl=JA;>`bDm<Hc&dy8k(`bH4c99^D>Wh
z*Ulr<seg9R8VH?n%=k?X9T+(1kDA%N5WE^NXbK)4p?eDVGUatcZG&x}{2P(HUDuo4
zgn7%qqvLApc6<sxf9^}pGQMDVF;#4;D|nVjF3wE3x#r9bxkRZA5&tgyO3eny>IB@1
z*aoBU+3&&F5Op^BQnQzG-G^BP4;5tRiO^~JDgA*E_w%c1rJtCa9oPJ){-P@%oihIg
z3VXBVZz~V)T-MGG?8bh*3>73YbMUAKUNHKTw5Oy6HCK!JB_^fw%pG;QdeUHqN3go^
z?py*{s^F2j_wf%WS|5N|{CDX+eGGcKHro1x{4rUHoN0W4HcGYJnQ_lBD^Blm4Pb5T
zc@4PV|GV}r|39J#n*{W`LDYOWq^PgF?+nrNN<(5^w9|9IzLLy>Tzt=9aFupluqZw_
zYteNs0o@QtxhGQs0))wG6n65B{xx}rhHxj<QwCbEZkv#Q?LKEbxJ~fWcKlHr(RaTE
zSk9A)l9J;4ff5Bh|C8e#JIU|nDm_HkYXQYNE$hyvGoLbnHN404KmX$4AemyMaXWGF
z4FaHSbFfi^uD*Nq8<B|)P5YTNK7L*8jg&XOyYCnG{}VM~e_>VIwz>RYoO74+z|ZRc
zlPJ06mP;Kb*#g(M_C7F^GPl;|UgA=S;CGID7^13@O<fC2af+_s{2pWOh$B}|x9yBN
z9fBKN6b@Vwo|{XMI4!80fA*fb%?o-#8xVAAH#a-nc2U$>W@i*bN&E-&>5gV9?t0$n
zrN1+o9BF0`WWNRl7d_MJe=&W6-8=OwJ9&pqW#vVEq7IxA>OTJrIM_c|%LH2tK_V^`
zzxnbOu1jWGhs(H4Vfq4s+Nrzk<RSe7pm3Kwo|P~dwhK3sIu5iyHXlev2Y4N-lm3WU
z{;uEXLT#|RhF$fD?YE6BJL_yQ9*kIM>SiPm8UuoX$L@Y{@GLSF7;+W=2$FHlqEoaH
z`TK(pByYS!(ngs*drb@{RCV~~`%Dh@LYdB*8z6mtygAhMwUdV^jzEgjU=IKaf)0Ll
z>-$W3XEN8&S-N5IY95AW5sNG3@bU-cES6slJMtjGUijqFx7Td;$#?e?0rv?lNsZis
zEQ>>TKn16Ep^{shJ=YNpyVHz`jLvxUwIj->e(}%NsOAqbJU+oUZ40&fWw^1%YUcxc
z?DiU~H-7a}Q7M<%_i4|~Zm7vI@KDeri7n0J*p>#$XoTfP$-h5CJ9(x;ek<EURNt^R
z^FWK|k(U#)KiZYj6+quq={d-}uF){G5}mase?*J}UvK+%(XA^bW^cP%EI&->@3ryW
zea%EZ@p;>ZAd8h#G5I?&lj#XZi>z<U5)*hZjZ`#e!ykltjb^dsO}<~O#g)X?9Q+=T
zAu3X2jw^a)tCs^jURLb=w>$C($~5IZf@VN&)#I$v%PBfpAhU=LKdvD^^7U?51A4z6
z(D~ccp(O}<c@k8Zw_1(++jE<;+cWtc&+0cI3lCp%;3C{=BXaek4J(&Nl<Gw*2V6@?
zTm7|0Eh#AbDeU=!fZY$T1+5{s_?!YunL7`bvdiff9l^Pt>TEjyVU&Z#3$Q_(vguq^
zNV(=`Bf9BMBTScmrF7zI`rvsWriAzcN-E`ERB_3PDG%Iay#K}^*OZ8vf|8qtx=+x5
zt*n%@5=JS5TN>cWcWg_p|55@#w|*C2vP~+)-NQ0cR2ty+p^liu#*KfFTzq?KD^|YR
zzsqp0W2e9|Y=)ElaIXUK)RW}CX8a>&kZP@wfrjTl1%NLHjdTdoI5EHVBv-^5yHyYO
z<hz{&Z_=*pY@Q@<hx+b(unaNm;MoijfgQP$T;*>%@0uF4f6Cv{TpC?J6`EGRz`5}&
zQh;e1N>Ns9!LnF~rKc#}TCtB!c77J-V~1E2{Tp)q@cAy{g;}22B7WRzRJNizM$TXn
zJlsCPaOJ`#>p9i3Ou()0Yg4@!X+V7C;2GrQc`TviK2;%kmtYU&=f`@u8-I=EXC>=H
zf6wl!PL*VQ%xSRdNS1sw6?Df)Y>XqJ8ujU<sRao#;MR5Qmz1Cqqa3rHw$cv`14c8^
zH)X$i57J<K^8wlNzLlF#oOuLHrx*G_QdJPmpn-(`^A%LFvMCU~PH%nzzF2-K4&^M1
zZ6X&C!ij8Savo>IPDjvPdGe;l!-HR29l7kSHRap9U>jd#GX4GC5OSoChi-Gude_mP
zN?di5&F#}6qMCz9`1hu>QE8+4qg{0NpmGw9mbrp$qfp<_mZ9IW<p4S-=!gr8N<(}H
z3tvBv(Dxi>5ql_;HDq<(1g*Mk(Dx4S%1aO?_6~Lv#h-#`B{87Vfe?LxV!KJ+3tK_4
zjlK}BkNgP$!Bu^@Er|JY!q-3L-V2u~*-g-OT%+-IeJ#T}i-?a`#+FiP>4Y9dvnO&E
zE9&)>%I=${NV}Jul-AdoQCRF(LE7B(;<EW|(T>Y5v<%sxk6izF@yh~lWG1V(CUho$
zlL!&JK?yoJy2O(+*bjD#$HrT|b<#)0aydcD-gC)^0N)_4shmbEIJ~m-a8oKe2_2Rw
z5nQEqp`lx+rnBcIm3`F76g+Aux<0seS@O&f`psaxLR61uU&rvgdfx%CDrKQOQ{JNZ
z$G7$LhmfyF4@vtked3e14I-hn^A!JoD)~_ld9p31m3nafF~X~(e^;$5GkbXNIqgvE
z;<`mQ!(8g%GwyNDVg3c4v1FSJsYg-kn#!dL`Njfhmw=LOFu}r&komche4cw5>MJQz
zb1pJ<F;_0(8L#Vm+g*p?qVPkT)xu}kg_%GVudn<x;NR+h0DbMgsrIiqBS14r<h52u
z&}B0CXq$%L*@3@j;&cJMX#Xg)iOu_bEpj}8OerkJwX;om8K1>k$STe^`K^qjHg9I$
z%8xW?a<_P3yL-$8YLv}DpGJO{VvS$vAG52+GVQNTfDATs5gTOf*v9y5;CWG#hso4j
zFkUSI8md<<Osg6mq5=yqlNQ#d{sXsTp~%c2j?(K}8?8ZO@63#FXVn?l4}VRM2w=8X
z6YB1W;#XI7XMVSO{KSrEcryZ?Xucp>`8!)R0BwlIzBCu*VZ;`{Fxa&E$c|;-f={H~
zl<_PI2MJ%gZ{r6{kDgF;u>#Zx>B$YTl4onkI~DibD2?=}z+yS^B&yqGt`IZ1!Sh}c
z0N>@zl2;1aLN9OazxXD6^Y=*Gpl}wdh)LZO+iJ1h%>Zb7?4W{jQ}TYnVr7)CIy5Zr
zYFG#q?-leGA`&a23hG2P)n>l%&tZ`8To~nS=xx6eqaDf#f+pch2uHAXb6?=52~W;w
zwa&aPkWC-iSlF=$s*q-Siuavfx6=UT4<Os|jUS(*k#_ra1n<bm;vv05daq^6qfO=Z
zZgmrvJTd!CQPJs)u%#QZP?xxfx!7OV?eq)4iazqJ@ws~z7!~&I<U!(>y{<F^#l1_M
zCFsOHOo3A5wN{Ucz^DZ!<Q8*G8zy+V7c8Wf0y3*mIRO_mF|l1XLq-ZQS$v>p@3WOT
zA)qI{i75SZ8|T!O2iRQKOaF*FUW#R4lZh6mbLWwr(_3BwgS@Hwlw8&6RBF8$@y6%B
z#Hfjp__XR5u$Y*bR4vsgaA2GWde^ssRa`u9sD}(o6fU;CSm!tm0@h@SP$L{vokE0T
z55#9km>%-eBYZ|;NV9qG0E!n~AIZS{3brq;Ur1Jd&>-sy3YO^t<)G}HyJA%u`>g@#
zCFoctZRDSD>=l)Ie#?lge4&<=lD<VGK}s_TKidgv(H(ND3Qvid%>+rHg`7{xrZ)xp
zDB?Qx*GJ;ey0aBeK)Bx@8?O^^20UF?y4Tl!@(TDChf(2@OaQDKNA~Z`ofn;d%iyGO
zFD>iDm2(_<9QITieL{5tp}s*I%G5EzeChL&31d8P&}H+AeY%@Yj4N4gpd3&<(XD=e
z%KiS%tV<1cHkm?RuS>W}-)B)1Dy;FGL@4+9QtrIg;jlZl&{{dlZ`e@khV$3^onx_e
z=_l}}XNiQi?Nis+LBSTAoG{86Khyu%JZ7i0033{7qH@>gH-!)vhIVUu<taQTdS>c_
z7#7kxFmIDKYUWG5K21}op9=aSh^72MJdS;wv4q<|0W7K)vSIP*PQ^#^^744XEWK6S
zpOa(YJs&LnT=uqACLhi4J2l%L64mc&k)J+dOn$kVdW2sC&RV$5iqcC<24c8l+xE;S
z^H+DuBc6go2;C)6uGnAY&DVcv;2B{@5wjvKDB?k7S9Lp$4LaBkpWv)Ndu=tAo{TNe
z+Jmh|yoi1Lq0X;NnzK_8vF85c7qv`DIN1Ke5J~B0E(@Z|BKCO?>s{J8>$z%jXY_>w
zDZvb}F<FH^)_m+K@%X$%ceZk$pv<8-!Knj8|6x$tou-@>y`SG6;<7=N0zSbc=~*Bc
zZ+BQjdn}>ra@y7$)b#8hTuIw(vlVzKE7}-%O_B@@!7^_5_OVSbo=C7Cp7egRFDKww
zW;U1|cyj&p;KKY2U|7R=Hv{h7>g#oYh&)jB7&bx<rBodzS2L#_R)(^LZb*kJ?%h^x
zXx&fua`@BFKR~QqnyH1s_n<k9k;nf&)sw1H32}){<Bl*2nONa2=lX*Au9@I2`;Z9&
z$Fx1qwrOhWnK@iz1`!AhgyyYH5QgRkZ99v7CKzVdpft)keJ}(Se@@ZG0Mt6}0xF!j
z!fR!49#{T@6`m@(%)x$;N%zE?w1!X0xmxtZjF3scru%br#wGFp$l0#En*Y5+YD~U*
zLb~g821{&=&9O>znSY~pA@28!b=UW`t|H)mS=l6!zu02U;}qPU0EL))hNl|{1bdY4
zss6~k<%8!YvJJ;7f7z_0rljCGgPHm*Hvh)&TiG)T`Ymi_*DSiBOBVeo7?96jj~#Q#
zaz2`f+pO&B-pBc5EPGcGIlh?=VtD6BDbjL7Z%$0B?<srK2P#!|en#R8$b*HmGOR~-
zwo$v^3C=yVVLP#1bLH_@?`*KPgv(m6nvkfO69y-Pk41&q?)8TQRe~D5L*g4j%lWhK
z4r#m{D)si%7d-G7MA2OE8Uz`7Sc<TqOw;saXvehC$4yJ-<NEXh2-E*)Hw}f@Ja6z-
z78v2}3;zs6EnZETq1;Fw{C%U)KOnhdVd8mC1GOix6rFS$py=B`nX~owu|8m0+Cm;L
z$^-gspXxY$pJL7RVJY>Ly}M`p2^n9`;uY>vYct!}9JD$#Zh{n4ZbG61#xK|psO306
zO(LZK93W4kgf23Flo(~vOLW<|XrpidOj|-)1&-`M2h)|*V~Q!fT-q@g3Wn3tNbZ>P
zDXpJ!3Q6JEIubbdJK^j`0i2F4f2l+1`t@sS_4c*9eD)iQ0XdRVcl(%VWan%yFfgAK
zVJN22112^f2QQ_{P3jvxFo&^F!&&h6ar7~*!_js0tx4$hPJ}{Az4V&nlTDsY5Rrl}
zKB>=X07sHmWp<%^3Fng;+SM~tAy`z}zLWvOM4XL6UBi8QaaF4+{uYSu)m5_TpJ%^f
zx^IV>qgw|eDqV{6Gm47ym0UgSzRVioZ;pjo{QA8oy<r^lv3?xY-p;8iE2Bl)W;RP4
z9jPK%#z!7Ze)7=v^}Ck%bFeKdUL%y)94}Cr^egX%k+xw$JA?SU3idgn^Ij`<Sv5p%
zlhdb_Cb^df*|Y6|m^hH~qn~v~>(~(U>q1nhb^9pcn(o*Z8*Hsdci6}vn?JR*JGGO|
zl03h9!wR0h^M;O)1SRcy9?0auf~}XhMa4Rq$m|qD;g9Pjm70fLvQu7uY@xY+Y_WDL
z;#s?jdQv{mR%&oZLs(3|u<T#G9FuoN^f{ZhS2Im=7U#Nmz5Ncl5@fp-Yk0<r<^XR7
zlr^bWDt1Hg*PnPDk0uyU?>Z}|x@^*cyj6KF3;sC{0p!{uz3w%G2QO=X4?77Sobd@*
zs48#Ib5>1=H$qibFnf?aI5obHvVTsY?rfwwmA3Hli+|tSGwAav=ToC-ZH?Qcjt4F?
z(iDntI?ApPyAQ0z5e@d>J2-pLwZOTlofE}e8a`nbAI0o=SEPsX7eS@Q?efSS-BIR@
zFM=rBK>keeO<u5=ii3+ZCF9O2m=hmzzJ2=!U3-5rcBkSWV@0$tXiX8O->j*28=)U@
zs&$}lua<k}KXz7+C3ZE>SG8^YBmdIm3u-|hK0*0jc2RH@G(9HfGdV4+TeZFI8-vl#
zE)ZQhB5N)E%hXf|vTCG<rCsJv(5w&Q*_#TAeU$`Xp9Yf8^EwN2=ly8C<54Afj0LL@
zg8tk>F*>ye_WNBUn!tH|EYCF{M`6o1?5i@y+;KNN2UB6T!*sDn7(PoPjE;ujnSOKP
z$%}aQ4%VJ~uvfYp9agSezaH(XQt!XgQnA@`lm!fVsgt+4Qv6_uqj<sMqvdOvM)c+J
z&){;5Cq1m9v5+X;g^c6mD9q^(6J-zm4j`;R>3#rkb*PSKm*UAOiI(l>XXB^&&{E$P
zn)Bj3YCoo8vI@1IqHSh3#x!J`2<{d@M9($YoBe2%`f<$X4lv5>G-`t;LSPPGy!+Tu
zugd6i$B}r>y)PDYNdP+MQ2_d2*|E=a6~{gcD-1t(_dJ?7hN!)k$;RO<81?bDiwC=I
z^Y{p*uhiZ{e??|CNgHB7?92cK^ds>^(dT_hJ3x;H<<nF8NtJqR#z4Fhz2otcvvw|M
zxwN%9y=cNVXz%L1<MUZLi!oWQ9!>AxP1BAqoe>)4D$N463BI4`fk-+4{ZOfNR1+qo
z8S0t}rXeC!MDH>QhHT3VDVR_C%c-52&R!Jb(1rT*DL;l$bw1BXf`IMBpouVZ=7%%n
zh73Nld@l0Xm+reK2$xUBH?vv;LkvIv=@Ev_lKAHBe6sK&RhWar2nou{^DU-F{<?&{
z?GsT)epUA+9Axl+mngcJZIlLCZcu6oPQl~@erB9y4*ig$*f^+Y*=w0Ww8FBt1q~gr
zmhAWapg(h2-P4e$xvpkA-{BN+aZUO=rAJ!eYLx90Oy^@so*!!6x6NKI-r+$x*-WEL
zrz#GKvwE8D<CR<65L^#xz?V^nsb{}=Ot9Uw3ug{FrtF?W^Q_zLQDJn7jcF2|(}jF$
zk3!RW$(GMVN{`wRvq(N?RM?An--iscrV8PwCi%wgd<y#_mCdV_&mldnoVi04zB?)5
zl`3`jz&P8dQJf!-Wl+<tx)(DaM~$^&J8mBf+PcCrBc@dds?Lrvl2-#gy0)xrc>M{P
ziyUK_qGRHpX2SPWNy1%Q0vsTxXIr%Y{*Vq_Vp~1&qJQ`mf+$rL^`OIc!8R3ZszSAj
zL}3GsG`eJJynwVxG*^K`!+9PLa_2Jw$rzQsc1~v~mz7d>g_ZK<N_NWDhXaMIs7%hc
z%Wf1m!etDtHw^2B_xDEPktd7SkOaaoW{<FdwTO!3UFLkU*(gG>f+MO!XsH<bg!L+P
zIYeX9z1#S&`NWTC4zpICCp%&nL9ImG9Buo2<iw4G33x!vHU#vCQT130pJSN>P#jJ>
zjl=-cZTx@<Ev#X1y#I|j7CYI!;YHxih;xS2gVus?sgnAAzf#{YOSk3ZKOEpgQ+wf|
z_iZ*_oQSBf7|u??iw4*7n5tPMy{AZ*@!?{0X}x_Y4UXltw7X>`5yB^I7XDV%Oje1F
zr1A@L=JfA44E?*nLbwVnBiXQz$OlW7o`!VchTY{;L`!R>l&RNO=KNMV8O_F>l;m_@
zs(}6GS4^CtvcI%g@(D-7>iaF}P*Vl6b(j)K+HA62a@f93=T>m+%~1|V<ZrnF_tSDz
z3;3b#B?Gx*&KR&P2UNUd<(ISpCv3y}iZG4p_(h}q^q=j*ADFB?q8T`v2g-~`30_qC
z*4o8%AnuiJZj#71JJK|1W=Ya4-sog=A6ekWtx!6m2@6W;Bm5yc55qO;p=I8Lwe+?g
zBJBOU0sj`(7@rBwVAqk{`64nfib%Y*S}nAP801(v7k``gT>!VCQTmYht}^~8qObcG
zpHl7tKCr!>5z0+@4?$K0ni`Cfib7gNJMu6r<I(5-)kuGKw6JrJe6J@&ZBqKd{|E9s
z<FU-^+K~tpBf-~27|oX@o-Bqfn+)ErQD6!v4DWU-@{G?&EI~YuKaI^9o?gDf@-b*>
z%Krd>El9P-{sS)^mivdkHGTRN@A=M_v{05q{`BJLXaj)TXLbwXPY*<V)VjafQ|anN
z^0JS;RX}P=Y;Ows?-GOPclN@7{)me~o(I;O+`|gDz(_Ulr0ay<PmHWef1a+2XzO(v
zydXd0KyeL@Y|G6=W~CIG3c5lNMbizWH;#x2v_|tbj4jV_<n+{9`PuF5a%81U5d~)<
zBty{S7&4nDzzEIbSDi~jziwAv910d&@`Hw^#qVDE!~T-X{P*e1B{7jfW9rkrJ?30$
zLC6ne2>X@rU9ly7{m8DqNRK`Dj<QZl`N?~FvD|S4>K1^YyEF^Vg5Qr{d;cH%*X>LE
zSBEk)XMk<MPjhuX93Q2w`s>mjH2B1c*__fIVF<gF&qA%94q^YmTt7MjKmzjj<(pRZ
z=w4WL7--0xOp=&-sem3+uZiS)_g%|?;wG3K%>0kN6iF+$g>`i7d&62p_1crYpYMZ%
z&mMdR5k2XTENN%+nX2Jj<^86D@%5sZ%d|AV{geWR$DLY=6Acc-d2Yx_PZvFcoExUI
zD%LEYeQGN~LqGtZLmIY6Rh;87^&G%S>cF9GdCvmL`a-E&`?$t*Uytz++2z?H&ysJ$
zs+H~_DVQ6ED@O%#w+mQTH3S|(8q*#O^8wNqWE~=0_*kZzEl=TxDo09R`=Z3jSKfs5
z#Qx0ZQXDPgEe<Ny1T9eoKimwJfc7k(CbRq-^0Er59AI#){;>b0zajOxBeV9barD7G
z9emCXaQVtZe}kua%pFy$&<^*k+#qKkF8-eUUUL565|y%N%JS=((U7?lR~!EAvJ_9+
z(>^*(m9ZJ0a|gOS8Hg9>v%?1m^^jGS-hDo)e5U3Gof(I|LDZLq0hDbYF+C6TZ&34g
z8rhAt3r#c)=ZrKNy+r(3;KDb0PIR#yr$o~Q^S}k?W+iwU#bJTTPcch^Iv3!`;WX*v
z5^sFkA_lkyG&nw_t18r`jRGcMgl9?BpNr|uoOS3s%57*MNB%%~2p{vicpLl5Y7+R{
zukF24W;9NAP@lth9@bb)ylyrRlX!olLZ(GvD)t;X?G*viIO3Kwl0wkch;<2|mo2ef
z@*`}aY8OXgtN)&mgYVbvKO^Ll7Kl$#Hpf4-F$^10CAv+U0e$<DwxG+vuI|t%D6?er
z1xhc}VH~Yj<lkQZJUuG!GWFB!zq?7w-$;8{Gjnbw<yqH`px<G+nQJhbnlJ{<&}C@S
ztjrBqoTmJN<j4x=aL(GAnY;Nsm2Y%BDMYV7l4tFvQV~>UqIs)qM8MVDA4Y>eM*@w2
zTu+NgMxfq>I({o|K##Qu%rS_G;+sR#Gah1nsu9+Kdp$|s1SjB>B%GFA{G#lW)B7my
zQn%UM`E#uIml>b<aqcwufk!=hURWD2VcW0OA<F(4Aa$8>N$1qpyX)ds6|0;Urzd%T
zo9iV0O^N;W7aNwcLfSPlC$)Hh-xk0|iS*x6&Toj76%I7SYF^kSK&V|9cb4Dw3iG7?
z%?QYEhBbZKImTpH44MtPfXBBW1H$&R#D}okdvAsVffT!-b<Px1ax36BjpV6{hEuwx
zV&Wl=N$5mLV5Gad=J-1i+L0SSGquG6zQE6HPeTBZAmkiF>SBC6$f1phuxPs-Y@WTA
zUfQ_ih{*@dpy^3{dy>f|zMgyM0?5Vj7smgPEEw{4BXTOe31n}6*NbifAKaruk7v*6
z_D7;Ca1vI$f*B(0hXd9*-lo*Ik6$4<LxnOx#|+mz19-T77&!M*0X<~^p&S)7?sR&J
z6o)np1qZTyE!p)$dz0*GUa!H{uZ?EvU~oxbfSm>=PYFrbU@dV@$dxu707D;)sPFex
zT~Ei*+)gjo)33dUEnl}NI}zHCxb?#4*Vx2_q){bz%yn!IxbvBd!<L&t`e;x;V@BV3
z0&p#g+Aowmy&3d@F>Xx00>QVn<(&VBAi|D32d#P0OwRciXRfxU)x3wrwCa-<^6DsP
zBb-Rt>W;YSp37NDm#VxGuReNL-G7>+ud$yN%ttlo_pYTQ@N?AfOEzuBRG@IcHXtI0
z*OPs4OW$~7A{wN;Z^PC5obK>iig*k?R@8NR?>LA*5A+g)_%mh~BX|e<{^JJM1ThQq
zd3U`CSrvMtU8;Elpa)~WXl?-_vP@Bbl@F<RHW2{ZxL@E$vncllM(>%uxcC}<eFcd7
z7?>Z3BG*WwvU`ArlDk$DnZG~S=uY15*`=w|i#jbyPhOhBK`@1b((?!QNY97J)TcbX
z)TTUlD=oB?;S@SuY4R|Y?-H5cjuc5`JWJ}*rQ`AsKp<iA1=w3ljC;SKg<iAz0+RRh
zE2A=v>O!Y;UPIAeGA2g!*t6rrOz7D%^ugfD@e&<f!O?vJKac6liusi7)j{34qgiLZ
z9gYd4z`36Mq=76(OzGArbP)<O2Bcb$&J9lDcbgE*Irg7+-VDa0i*#&R&VOU4<g`;D
zqsj*uvqi|oP>Z(TgNp&B9hX9B(pOzY{AQg&e>>K#O;efy9b9Jm<3)vTk-PF||C*Vu
zMYA2xj)>j&V;W3BimbYKkPY%QlF99J?B3^nrSv5;3WwCE7f!ZkfAPojJ4I{XQf{hv
zLcVEEdFbueLU84sRUZu~H|5UXWx#oz$+^8v_4fSX`@hS|A1*?h&Pra$HgR6ayf{}T
z2XcsiPnmE2wifwatUC8_C6uc+<8f1MZPqV;Wyu@5hBW7TyO7@bYZSj8By$;;&y9E=
zkw|aVN!PbuG<gf!8KTw@Wi%~7I$svC;dsWHvmfrcD&JhIHN<u%fc#YXN_%?!%ZxN8
z|5I!*gR;#Qo9z|kL}aWL93a(35TN%qVpqL>>vWl$x#<0Mm^_*FzykI}^PgBIA)+0}
zHy_$>nnYkJF!0`OeODRb*$eXv$f_tBoO}(hDr#US1^!9yk|Woc3Mvkv3ONlU@a6*3
z?4CjhQUXCb{sBf6_zNV!*83qyV<WpZBDCr{;o)GqX(YleA2bhti#*xoB(AX+^EQIy
z9?68J46y5ZLryZTQrv(aspvHuAla%nAh@Jq9Qia?z5;>_puwF?1Qn^`jd^ac5o(>u
z)~cn!G#N>+$NVHb<=6Bk{#{816RMv}SsSHupDnaqK`+NCv~YGPXLXzMV0peZLPw6(
zXg69gX}Bso6)Hc!H{jXN8%HG7Dh_ziFM@@8(-A@t*OHR;XYniVK%zHXN_7eWj+#UU
zC*LPKr>(8nr~L!7yJyTeQ36WlifO^%50{tR-~W8u!APCBqbkVSf5F3}(QKttp#1PH
zfA2)HU`3AKqrd5H%V)Ibj4Ob&Y2h3zzDJA4OyBftI(t-d3c&;u9D(A+k$2BkxCzef
z$MA---;=!wp`77E;{0|;M1`EW1V=9R#&bH|vMY+og7$0xF#qB*k)OXs?pX8I0tWK8
zPQ+{lKY;#dfOP&G8N5yMXal$D%nZ2+79pZN8Kwg3RaNDo>s1~N^t}(CXa-BLvBDeL
zsKYP5B#nH8QGu!E7;-P^QN3Y2>V<7{o;TE#;eKj!p6||)yUJ8)VpaBA%<hP5^eg}9
z2wV#o?G>F<)fMQ$dm)S5e@7{D;&tgNb-;6=-KR0X$H>}%%dZSD5Yr%#`4tDAKOMj7
zmcQ*=pGyqv$ERma8?IQrmhFpnl)G?o?OBi?`7dO_t877^?6`7pT-D1+aE)0RuI|&=
zoppv3&DzyK=i|{*Z7B?~%{f51h19CrQ{H!b9g)#Uj^f$w5WK@Ba7c~gXCf(s?h#)e
zrQo{<*S4^9J&=-pn2?k%BEmf66YZHPLMI)VS%4^>C(I<?xK6d`D}z1}S$Boz&M!GF
zfVBX}oS8)EEn(yj=<Qh$-m>d$fFR2cZt<je_gxENT^jEJr{A-k$aplU`EL$!oYw_P
zf>nlFvZ{6net^BYUz)(Lbf;M$c(w<VOFZ%2M39gmfjJf4G!cC0(aT;u|1qiE?O7uT
z;8g_=7Y=eE>*1}Yt`5BG#PWFhSgAq_uQZ;{TY3e%m*uaV)d9vW@bAwyu`Qp#7|ot6
z-Vu8G@;YX&%y|5Q*oGc4nv4|kBt{coDD}OEPAQ0<yG9kuS?pFkQT21i{PP)XT&~=U
z0_<Cj_wgZ7zn*5nE~WrOv9PNpVkc=QC>yjSZu^pWsHYSfcNh-BbQi8_;bk?e|0Zsu
z&ueGSaTEE_;5S81hEbrd7-B*BO#^Xb(*yQWmgYDGj;cHGF{*ETn{@`t1-joN8~0(x
zaAeNC&K?}ve!n#Ci$(fn-V6k3vmYbv$p*Qs_JC?ETNmuj7~rA4ctiP2U~qZ&4~dI+
z$quk8oy42+c_5_$b_Rs*;3FWy2)axXR63!WzHZ7g%-K;-Wg5H*=f<e&hP`$L@x*(+
zxYr(UmK3C%RoIB`i}<Ua=Z_5suUrgr^kXlv+T|E>^g_jQ-!ARtzD(^C`Q2a$ZDMUX
znTpxR{!ue2!Wx8*N3*CO`Zmt@f6`kFx@`TIaQgIe(1>_GEFPcs67gxXV<?yYA&>0`
zfX>jQvKWRcaBS<V13zdK`1(nDT=(jx6fwLFsTtUW!)i~qx^w5|EV1iSUV44yvbJ?r
z0gV`IqUX$s>J46mM#-G%{bLhjWe$lGm5#R~?K{HWFU(hf>gXS0I+%>w8KqGnC+sf%
ze7*AuPtBZkemfh%b-Vs8J#Fe}!F(QX34P)jy39aCZy?A=%<}G@^#PR-Q8)`D>Axq2
zAdhZ=!JYu?itqz*tpj0<soF@^K2ETT$T3SI7)Khu0X8OwwATHAGqBXb?brtfNrX@?
zx!zQ;a#_?j@jl88TCc%4srt<rv->Gnxa>Ax<*c?K<t7I(!yQ4&+1E?sTe!{VC2Gg4
zM`xGCU*<{j=j`HaC-CdCf5VE!AqElCugvG0EPZ{*0X4E2OOgy3)AEDLL{Aacuba0>
z+1_Zs=PnKN;fQ$9f2<<u&3ut=j{o5D)e?rBS<K??(TxTZyzm2v8E@T%c(pk}x+n6~
z>+NtiJC)>vf-b)ukNO|%In+~P8n?OpA{S^ksZLWQw?TrmC){0v!@hTqulQ%Q$lb6K
z6`zrUmkfq@&l^{yuY_s7%IAYNlkVHU@&@$sSVU**sSZ;RAOYv@EaaAzbIXu|3^{WE
zE*NbAMv=iM^8t?6i^K5ANq^a3D!mBZMA*mm^tK=90x(y(^NUWXFcr^dBFjj1m}*x3
z7&E!TUR(qA>5F4#gq_Fvck|q^FR%At3oaUL@dP16Jq7V50wk(Q_&$O%`}EYM3VxYF
zOUWO3-!Apnhu4@0(iQ^Ic>UQV&^Krn*{ZgXr$7H~E=KToahdNV&@maRvq#L&_c#0{
zN?KaWt*iR6C68#*p7C&i?54Cn0n#d}qQQ3&l=Ppatym3EH5hO*I&q`5nJ^a;b+#hc
zBZWQtp+D&a=f`hwF?pr7S48)wTC{?fk!U@TodKGKkA{FCM+yeD$(g)kTO-R^b$U<#
zV(^s1?@CXdVwAW?laN!XNA$#VnC#)+OGZhAu}+Tllnpu1hSn>&lH73sU)hHHe}dmi
zygk4A;&;^3bq0`Orh*)ja(9yTREQUBlym@=#BWF$&@<$c;)ep!aIOS6tcaPxd9Bk^
z&nhW@apV$jLU$?E1QrLjHD~h_Ql&!m$l&}q4$W)#2&BR-!Wf4~NEdm`raat0`nuK~
zAbVibCQpJ8BF|RyVjcXMsEVmzce&|?vh?@6P@Y0oYFhjDa4TE&J1gwe?^@Yz`**~r
zXx@!Y(VY6;`Ork(`cb4;-*{;}wLjci*4|&u-Y4!jAkb-NhLAt>gp^&;r@qj6E!!Kt
zc3H%GzgU2K5Mn~2h$iOw>CcAbEOKr9)VH7Cb^>(12JMW~>GJyOg<R+F`G(1O!_+L7
z+p_>Jo$=1O^Y_EyyY_{0atPnER+df(`BM<&gi$2Ms^_Jqq3X0ZTXg=1o~Gx*{|h#F
z)R4QjcIF71H@z$>=MhAb^JoIiTR)zIMh3k!6`V7`yzU|KE!z3^F*A+vY+$2-VU;iG
z@#iu7?(R)b;DZ>KfhReJbDQ^2I6rGC9FjGPF=9Q1X6yq%DGiemg18?}$6Vlb`U3!F
z?_gnnB(TQa5r54%U-?z2JMb$!W=dhhJgD7l%1PfrQ_eaBtf~#9o^b|U><xP#%6V2S
zi7H!_W$D6$eA^rk*?5Y3y};Rz^<J+k@W)2Dp^=(JVBHprz&i$2;mpl$#sdlZJHiyC
zAw7`A$~LuylBJIBM;TsJmB{7FHXBvugJyQl70S&zHYvXBBl4n*^PPhL+_cd1AP*Bj
z(tZ-B0@B`x^^<p<*Ol`UuSqWdtEzN@+YQ8FQ=)$2ymOw`!}T({QiB8jF96BUzz8E}
zJVfFO5>W3s2F~{T9tiR}9pD1yh<xDf<Jntq1AXs$OTg|UozEWt^V{UWhZ-UBv#Rt)
zJAnx~-N+&eZ`t;)ELMpxE12(X>aa(7fD90a{&ZEP&%hN$gKvJ7Zyc$^XZkx#4f~+V
z-1v&wfgwYt0+R~ZsqQim=5@z#0)R!h<~#Iu8FKR9;a(1Zh6I*jmvaQ`F__ZUXK9Or
zr``L@_7qQUFN@3W?>JYqJv0_`?1-B5+me5?^&JRWgy5k6W*P4Sb`k-hr4BTEmFGtk
zV~rGE%ar6cZ+ZB*eg{XX<BlN=p3f3L{2ZFLeQW#_;M1@K+j=Jwubp&U#}3S8I+K`9
zcd19bWVt%p!9UZK+!t`zD^yMqWDBG33KUTeux%=h9r&lvkb5+rmw{YUPdNpE-|>PQ
z$%UW137bVrHN0^gS<vHAh?*`QZTA3x@8LLnn&{DzHI*aB-S<Ha$B|9q`g%bbqV@O~
zM6|p>bC!kiX-y|x!vo|vbb@pQ!7b~L1n^zv-NE_B^`iTZ2v?%!FCLSfX8{6S^&k2D
z$^ajTCp*vHbeQTWMoW7<CcVnM`wnmY$@;`sTMK_5JL2)m<~t*$U-(d=Wz0Tp>QaHT
z<5ZaUe3!l0tAG*9F36n^2O>wU8t$;G$^d(PW^%21qnYKis0we*EBUF5C0?+Rb%gC9
zahGw%C-tneUwb|@IZ53%7mGQ>U87+-um<h>Q*|Nz8VD}FpL`8nKEHQ;7Pwr7UPk)q
zbK>iX*D|CW!J$mi<qeKt(&?eV5=Xf;JA<1m{T*sYY%lE<1ck5sWuW2_3OE(_zHQ6#
zOYR@fKBO)*0HSyG7z=(k-HF=~2o4;cb3_%Frpk*}jjOt~@>vR=PSZ0LXw}a66o8Ws
z<uWy$!nqwg1WR?)4kwf&f%G>H4KP29I(4TR6e`?d`m_-sVOv&=>SiyBOp<D5rVY8u
zb0q%33U9(0vV|F8vL`zuiBCOsV4{N5(z6~3P>kI|zunR^1tEyL`zbCJ*9pq>w%$*w
z){=CNso?n`nbz}-GOd9#!4Yt<*~cc$uB*eKa{wJXW@eX)v>pxZw)*>US^Sd(!ZT#R
zZpvW?CJ}M^t^+h>FnyG1T0>Jdz7GZ{RONXSCc2tVXo5>}C@1u+&3}3Bo13w>n`P(n
zM(OPtcdW4{ykx0QtD2EtkJ_T_G=zfvA{y{qyJAuSQmu1y1SnPObTC8KKaDINaakit
zmot;wX;Zel?g~qMr81m8_JA{=)q8^aB_?O~W4)A|^N&(W{d4#6xv-o1an6-q^UVr}
z#CP@TDH(MbO3mzz{Q_7Ns^mC#F8|N${}+%f9){3iI2FvtFPb+3LftlL|Np^b_idrN
zfgq+Ht~2LnKmmCibnY(WUtr8Y{jsUw0h?F6!J6!>0w_`=wk#JAIWB@&u3UP*_t)PA
za&8_d3qp{j{Q{E$y4Ii_J_+{16p@}DbyN+@+}JR|0BQXM0Lr;r3N(L)alKDLMA!1X
zVdII?6R9FRryf%Sk&Gpn&bDnF#t%|PQ)uX4nkfr!XgDxz7vInxk_Kgl+aF5P&7X?n
zgM+yA_&BjA6I@mN-IfTwx}*`~XvRR?*!SO*drQ)WK?JIBuGoY=W&<n1zhI|IrjCby
z2V#~R?%y)<GkOg*ETPtJuazix8_5nNp)a+Y0dwvIfI>zRx}dt;0Xb+>85rvLjXyZZ
zUYyrXR?o=~=Y;h~E;ykML4}QhXiKp5+Ov1hFN7chwan;}o5{O{MVHxoiaL98Bqu>s
z-E<eEB8b^09e!89gT#4A7uaoXp4)QL?dtiTh5@*)Hpxoe(ZJv_h3vGckR``TF}M%a
z8Q`3r3PEtg8s>)u+$}`vX(Z1UNrMAZ63$&a1P8(PYC7OKXgWDe0nBe<vMP&-&oo6C
zY8d4^1J&zyEFwL-Y6f4tqaJn%J8o<9T{HA_XE*m7YRPZ2NrJ|G(yJJ%^y^0Fh>5F-
z!Qw-9`Z@yd9A+cf_NpfvjigraaqO{voHTT4O}?5gZnlv`^c-lCyoE;ne4!V`eF2Sn
z$l9@x>R_D`wZ}T8qPDM`lq=({(Uu0bLnMa@43S9A;&d85n@J!%W8VTj@z;|cSI6gX
zT<U{cS-m1G@$tCT`dft^fs`m)s3W*uZ01l2Of3V>Ee}&55@72>fF4bS-}a>bm$+@k
zf7EKdivS|R>!xnIa)-zW=UgH}iG2rBk~t??q12!x$sG$y%@Q{$Eo!=WsZcT21=CX)
zwed3%wD^LeSAIx;<mE`J1%t?Vz#ev(Li!M$1>EGflp@C5<Fn>S20QAw65SCPd{E%t
z5h9u+ul#pfEws!C07j;YK*h6I$z_~B{^^#0D>5(F91{+k2&Qw$`9ly82NpWuHS75r
zv%PO~syLv=b8$mXzTy(Hth#p~Wo5B}vI2;tmOGD_3bq4#`N<hXR*Ca|5%5U>Hr<Da
zW;&LfzO=`p8Ar}YAmmh){yFI@=#uySqkY167M#+y4jegPcW9K%XSAKNT6PP-FqX{~
zB+F);B-&A_#gQb)dkffkg$@K3KnOU_KsfB~PZ0FD18*2UaT2B(7LPeLj+0(!Bgz`S
z+C5(kM$FQ@i${r31)3qJFg`+U+!y2?>uz#tF1PoG{pQ{uNvnf=>SJ|EP&J!fc<bt=
zjIk7P;o-;gnY)~a?A#BE4@Rc|1v7W<O3V2%6))_ZiUW1|al^8N$6eg{PA@~46OAQy
z|2m-W>1^ke;Q(0CaX<p>a@h&b539^oM6T=GGQqVkqm^@APAIa^R{jGviN5Fw&e_Zq
z0GwmC<^v-RKo5|nhYi;OCP<WnDK2Qg5rTbL$N_b>65pUO3$K!`fHfhE)YxZ+07-7S
zE^G1R14C|yBf^;I+|sipbRyYdDj>)7nFKH|B(JQMT0tfORQ8T;@dVu~-h>KofTuXy
zv4&4CC2gln1r)Fp?$J3TJsx%#0Ou6Z5fdP*@Qa3HR6Ow@pB*2@Nxp{D;I`jE%*1YC
z4TCp#Q?$2urX>(ow}zY^I)rLIAQBgtmfhF+A)0H%k@cX0nBvK<Zw)oYWDE_gkSdpH
z>I3eCoeJ|nhN<*DgOUuV_T=F-94iHpM7xi7R&CPDx>tACcPDXa;w^ZI`XMU@U`|aC
zTUqtS3uu3XEU}LDPN{SMKT>A@9l)5h9(Uye>M7KJI1+Fd`&D4oM#ZtMvK`SZr=2I5
zQ$>PQ$(a%hK=2HQc-w(nX`K~;WV5Ry5K>Kmo&t^T|B%P(q&Gdv;WqU_`-9^>usJpp
z7JNn?*?;rje-Q+bDH*vO0d#@!Oe^+bg;VUq2h5B6j=6c9LU5G<U8)ylKmj14_D0#S
z%gs3S>H_R1GGOSCw9N=b^iun?we-A!^eS)Yd9<YghT_eyEUX3DQow?_2*3(1;~-kC
zSOZXWl3*c_Og%oHe0nM@asKXp%-^MwU)ZmG(mVb8DDSf>H(Qezz?m$TXaSnWhjxGK
zsbsKpL%;xo3T_I(w;*j?raw4X`MkynrvF=M`Y|mv?D3Fs+q4Aiz~ev~#wm62TSIm5
zqK_C=Zt=zMXIkNj0z@2U*Lm`$9QNa3Ob<koNbx3&b!i?RN!B?0POZKix!L;BI7x7h
zhUwYtGBR10ZoGWzI_|hQK216=)18wqckjc`##3QqDcHW@WGsV+ljiF@6)TXS(z1(+
zp6c=zj*c~+)?QdXK!XoFYQ=7;KK!0~T6LFI+tm7*EO@g-PUmQ|@*TmS-7CF?3afS>
z)dj-2;{}88_ZN8Jx=U~Tou^z-pMIH)pq^*_{{Wz4(*Ojz6-i(35d&}o#wT{vOak8|
zcrS?Yz|`2((-GWLk{mQx5)gBN$g2S-iI{>Q=X$b#m%$tllzGGcJ_ddZ)Ybu{KUvj-
zBkvb>6{7(t1U^#YPrbapWk>J>#zWl#kZF@Ml3?#NY0lwX>!&zLf~iw0xL#nuZY!6m
z1I*E8>p#F8=`2s&vbnbon4`C^yb0&f_n4$wnc-N9?CNh#>9@BqspKqHEDFbpk>S{R
zWbs8Y>7b{W6b=UXyXj^Mv)n`4ZpeCF$DomkuyT2P(ODu8ei+)my}r-j0aLa*nlAqp
zay-lLq+&t(k~1RoRxVVeqQRmlDOpXOc9ug%)sAK*Fg^qNf8njYuzv_%*!IDC@A(G^
z?)k)<3%0Y;H>O-bLN&8M)WTC2dk!GAw!je6w(Y${=gPThKrjRxBVbm*`DYO6VVt5C
zcLp3eZre)~-VEoOcm1tezjDcafVY;&cwYdB!_vxwgST15V_kaRBBu`^B{<1O&`AZ@
zCT^9hl1@(rIgtc6meAoIqN??f6>1pI7zMybe`GDZY}!;X2(p!_zj@E?W!FEn7kY^9
zgHJq1e_JmCFzCmX9>|4u52|_SW&Vr1P2k+)75C}z#aeu(@+|=eU{=FU;vb7u?Fx44
zpFqTRY8+G!21D|Bp{9bEwEi;iV-DqS&(b+h&Pvd144Zh?T7?HyuGjcSUr)j=ot~a?
zfGV&drXy*jxoHe~c3U$BeXZQ$@sBVrBxk-P*v_h8QkiDnuW7qj3(61s=hCE;LJ#S@
z(Eas1VqzLb9b8vW2~d73Wo4g1u{I~8>-mIxE0*e2Pq%LpbsEqQEd!-|4Zn4}d`#3n
z4u?d&_Cbfwls*yHt_Rx3C%uUoOC1pt{BAof0nN<V#eoabkpO0<$?jtQ{=z-O3%HQ}
zKgTREfhkK#bm+uf?tHU3AWhEw{HEay@O<~m5Cq_Z9w4{qWB|v3Vo=WTG;g&%8YrKu
z)bJ~dyt{<TQ=*#Sz#%*w>dQBe)Io3o!i-wLq2rswoI$n%_Pad|ZioZ*dr@KWvI>7F
zo;1_zbZ0t{xd%iT1@ny%Ae8u^is|WXFW`WnF9V0Bzn9$&Fre%gp39eRD%?Fc-atYz
zdecD#<-b_|@L#jJAyx!$$O8c2(KpnoPWz>=4&R-A6-Db+bMa)BIS2k>)28em*Hb2Y
zJc|82qo|m<7sYO#p}dwoDT8bQ2mK5GQ1k|-W^X;s`sTi0`gXU_yZA@S_q)rY?ix@k
zJqgOKdRs+V?Xu$&UESy@{#S895Uyeqmc4{kO?>CS-g;6nehN67(%kkC?!<(RgR|nU
zXFskM;oFkm4Nc8Ob)P?XeXrFMmx$b3%$Qs2BGX300I3jMrd8CD$v!C1)6ioT(I2p%
zF*o;l4p_Mr1kOqgkRvEmUJ5;bARXk~05ZxSXaa1jb{zVk6+OeQE@;B>{>)Q*@oxx{
zAzxGh&}k>}dO-Lr>H+wEhLc!aVQRd^)20rpNOv>=RjH-5rh%ga%oJ;-_q@kRsas`O
z!Mv6&t6*6aIIzhzGwn_&Pf#2G7(OvqFh6+iPH%+8mcAwIf2LsG55#l}R^pkZGSu3@
zKL9TQ#Gb$<zg>vnK0AbZ)Wd#D@k~o1biQ(Y9yI~dnSB^4psucNX$$8va9_Rr+i@V5
zwd*5lhQ+R_nbAf~8&Ra~*#>chv-NgEZ{Z-`ke}5y1J(oJT5YO}U!FXbF_wIJU^!NR
z7=IA80r?+UqPGropn91QcS7+cX<g^MG5L-IW$)vH!P(T0E9%-dEuUKF-hbq~Sa+7R
z`IFJoB%fN-mYK`coT(dn>P0XoU;e*krGhP>y@lEi5iQYbwf!mHo}ax58%5!nq}Mj(
z-hIX01en=lsyE@?0NZ+c*j{XF69Km!KME0@s9>xZeWplHvz|Jt!#@oWt&R}Hy~1J8
zw*tj25-tKv14k~8piy=nx5F;24X9ur`~=EZ$3U=q>^Na5c<Lqc|0nc+l+F8o=^Jz%
z-BHMiKMEG^F8JCeq+lF^Y&Mc+IOy=(LlB^@01BU~6ATXcMmclmK>89Z0XJYOpEwNS
z*EQBVOK#VwEqYoTEzp5`fG)u!;h}#w19mt@C~kL+z%A*1H=5HDSLeLbiTw#J!`MQv
z(Acwn1x-K!sO5tbH-Eengc;|<UaXDjZ4Aq8LV%jeAK3q5?#-j2e#5_UOOcRNvW22j
zgf`iYq_l|2GTCNCQj}4avCRyLN}&y9mt>0}Tb7w2NfD#aSZ5H%G7QGdn2q1<^Lx&D
z&hPx5Kc7Fo=QQW!s5AHbeqYyhzpmHyx~|*Y01!zL&WjA;a4slH)pqW7*TP>LQ~`Jn
z4iYm!gKP+4VG$j$1|I+mdxB`s>^DNQfXv&*jG)g0Rb|N*G*G!{vOtBUWpL3nVK}wk
z3w|^nYu5@22#$4XZ`zguo5Ru)ac`Ad^=w*epWkU=0PUGBI8RcYzY9{g9<W~m-{MS*
z(2NHohVxdzDA;x&a%Vp{jvlp1*TBqnosu=iA=(}Ikx}HFKc&#N#cCDa@F9F&=tglt
z7J9dIPma9qK!w_C>qX2lkb--j4{QUJ_HS@dsk7tzL1ocP6ZN^f1USXUG2AA)<h{*q
z)-}X#Ss4aWZ<KkYDl-y`&uT?`cz6WYQKui&ttP(N{@LSpPyZQx(7^Mui0+Tp58)hU
zRV#mlUZh>h{Gx3TuSdtoXL+SxbYahZ11u8nA3*B|KoA5;)NsRAU_v9|f<r)mS31+*
zpypRmKWUEyIWxE}D$uOow*xuX*AD6}3y8VEdw1!8T$W_h0`pcmR*_i$HgX{QhU?NH
zv@IBBR6A+CWX8D)I6f5n#c(O{8E!qLOc(*!DA3n%jU+!@0YFD^1PclneW2q*siTwB
z*$;2+fo~+v^&Ru14p1))MEU}H?ttjZcLw;5WBeDl+RWcHc)_)R(eBJjRcqPE<mmk!
z&0!bYV1PE+v1A<&ikrdnlINBlgGiKQ8ix&;(_As2CEo{agnd`}_w8=JGutk(LmpaU
z-axL{sWee<)4<4=0!Kz*Ol10^3znp;$KE4ALnvW8EO%qm;o{U4&x=B8W|V$+G&t54
zh5$`c?++ADxR4A}i2A~>q;yG61w(LPA~^}mU)qeMfl{?xJMIV|Ztw%+hk#%Tg7lfy
zv2BGmu+o%Sv14I?dH?^ZeQSTIL>y2gTv-@Fs?D+so5Lns7;i=!-!C=_J1^)XX$YfN
zm%gz9(4HfX95!K1$x?!+Zcvyb8hAgjH+a7{{wTZ`q_fWCbb}A%AaV|*(UPy0`W8)r
zYuqyp$O;}t!psfzG6-G>Ac(6h8Vjqt&u>x`eVyCWdzBA#nA||*#h=Y#FJFu8Io+9s
zDs#<l@PbTi!P@)x1CD#bfxigmaX}|1VJTd<|Kv?h3)T)r$j2BDr1kp9j19l@rXjx#
z+(Ysz#1@EC1lGbCA|88$GHiVYs0s<^I18_~f4&K-)Q|%CqMpF;zV1mdKWqVygMr$V
z=Yw;eSh>sdKfau5#`Ws3+{8hRueOa&qV<<N0L7uy!41~n&H~^#?Uz7oS^+LM7B*<Y
z`cFy>NZ+wURQjJ%h{FOXD)~@;gF<M}{D#~Z*fYW&F+jCm8p#L$6A20wY#_(Bw<XI3
z&4GxZF}cvsJE=(*fyTFhJeWQS4h3D1_qLf|KN^ov)B%WFqFeim7X{Qu^DneQN}%cS
z8{B=*hw)Tkhv47Hl+_Nz%vGDPxQnLXILdd$J|9m7SG}RyVA4d!BeXd!aV@l0ZjGGN
zvyMIUdWj$fNK4n6yBvkffF{oD#R_$oqF$dgH;1u|K3+SFf42XT!o%TvOsn}2#@rHM
zErU2_FYA!NiTm8!a93apOiv8$<TZHc|5dT^)>li(%B)!hbOeEybw)HF7|#cEH<I`A
zG<+cr1$LyTn*L|Ff)qy$mf<1V6aIm!o}}%_omR9}gI9Jcun2O%-t0IC4QIKB1^b<M
zVZ+z~C)fN89N$1>f^5P290|?ck%o*ur3i<_QBDA!%=+?oXg)x{q=d1JTrwZFGphj5
z0|g6W^UX}(fGpPVNR&qCLoH@r8NaCE@b^V1zyNK#iqz7j0Pik^is+SJqi(Q}$vqF$
za)ZIes@br!mg|>==&9ivCk+j+>oT+HJ0$kS%?}<t@u00Cg*a1@P6%>e^OcRTehZpk
zkD8VC+ts?lL8r?F16$Y^QJBK=M>z*`w7D7<$jPLLuk+0@ZTNC8%oR}EK=i9s8D{|l
zyo_6TsLaYYW^wQHA1*dF4kKt+w1B4HaeGcd&@6rK&{kpxr5pm<D;g#efeeVd*!UGh
zGA;c2?&>P)f^ne1MpYwzxa8@oMt;}G&!W{^lPMdZC87nkhY2sE_q%@Qr(Oq=(I*<M
zz)wwB`5+eD=Qs8OH5xdq&Mv6r_5i*FwKKP;N;rJ;)75r>RYPI>HJP&jpC#fnGE9&K
zprRcz@12`esv3MQQT4$lg8oezLCXv6WzAEg_EmoI0=GwNB|=%kS8Bw2hlZXVH=uF+
zUu?gozd@PT5NBF@9*7A$XXs+8pP&rEl}HaLYq3SG=!4g=03&9>dlKXQFz%Eay1|19
zNm$wvDB8Y0i}%7<Wc<2>N&+2;&lpC)1yZ=<4*Zmdqo(=xl)1>^-hYv95pC#$MXPC6
zk=1_LfP?KQ7za{^ga_*AF@+5&iJN`?I0%4;kTizZ>SG>LC4ya=DY^hqr$12a%0*=M
zf|4W`H0||vxJPtcAJyszumB(=tD(Vi4-<AZw9WjjNw81fhj9Q(^hdao;np!!c4ErK
zR&d<R7x&M7Fi(9BL20ddEDXEDX8UgP6${4g;*ylhA46qA)jPy#(d&BxH?RNoml4Pc
zCH?^eBQ8%vWJW`TmS)JkTOM9n=16bbwydJIPyhV6R}Ib8#;nYj6T7(QKi4#HiljtW
zcfYzR21YDO_t>|t6}H{dW95rbF3u<XfBQ^<j&`tgg9o)=YHb|WZeVT(uh||61PMUm
zp1f$v&eMq>u64;ws&Wa8V96xcd+Bum6&U5WUUs8jt=z$J<ZbJvWPj9+P?)(Kp(Taj
z^}m(Mlx(~2#QA>hpR4U#@EK3Apf(Q}$pimVhbp1p)|BS!OhA~@SA-8$=)H(wCgK1~
zw3vvxa-o&@pGxI{C&qtacqDW*12&=(ksbn+Ps?4HdjDPP4uT>RP)F!ibVk_w4|I%$
zZGM3H`a<Ku*YXpMzM;qYn15wI48#RX1cgP8xlH08D4`$RPH;jBR0D(p_6f0{*SpOG
z4Nwit&AX5xk9u>u?etmh&)&anZ%0o0)um^j2LmfCZKA=@_d_;_z>5C$>8C%PpZ-tL
zFoWcr+6qhN0wFUyhkcMa;l3gKeh9pAy6;*(ey=R%NI-I!VU7_}{>yRTBIi+SaX6){
zf(zdO)%;MNWxI>kpN$303K1+S>kfdZR*}q!%uZF~N|LH!2f&JX(1rf&vJl!m;MF|M
zGX<>6t9Ctr5%BFAk@gLtiDx_rAQx(IE3ZQN4T5bHNK%+5Tv5dQvdPDOy_8<8h(~&-
za_a4qE-a2wrY*iw<3n65UiIuTjY*)w^EH5^yu!RaP23nX8O&o5so-Yok#LYk!;U{=
ze`SpL2(U{_49+TGX-_}1SI#N`0pwC^ZT$mJif6D{kxCm7#5Dw#@R%2CVFQ)5#%jl$
zpCM^OJX4unSq&ZFZ*TksxnIEvQq+*qukEw2wVrjhX!R5^vmK2>gW{@&`1BoMu^W67
zHXa8~^Wh3$qZ?x9yw#1Er4j*e1{tS?UEo5QCIJrgxS&K*5A4)J5Aq)<H)aB9kz0e8
zp5{Nm&IAHc1o)-wMk09OTk5(IZA+FREnd}xCMCd}VRb`ROuoWJ7VoD8s5}L8FnpA(
zrU}wH`L7Igqb+i13<f7M(#QI|ii98tN%Bjm2klO8NIMjotSj`ONwtpxT1|vMVe(n6
z=uXM#3}A;#zzzk;^wr1d7l&_<vVH6uh`iuC^ubM`=IDhay)RyRw!0I?OES3!e{+7F
z{>`zulmwCzC+Kg$qx;t44YHqO&4Pg?V5%HJPq*c)+Fg2}S$CNP(Ql4%*Wu41Xix;^
z)o~5};(7K4xSlOPoEhPYCW6BUmJ$w<nzF9|gqNZ4u5`T@-1k6TppMUoSNn2KLBh@b
zWIV*pFkVlqVBy<U#9AT>?}xbn$U!Y8C~%JhBEBxwgb8Tdf6<i@Z6`s)(V{63_|Ai>
zg+}Q3ixXgq;msAo-MnamqM`&}*zh8lAnaQqz8EazN?rcmIv<jXLccu!h)&y5WS@&|
zYnTJ-*?`ZWq}m#4o8*ZtA=O*<2OWBHSw+~idsmZmgNPxcdXQWT$Nhw87Xd2KkKN3q
z_OBT9SG)Ucv_yeK6C9+#{Fdw9yRzPc>=OhZe<=#+n5}~XrdX2=q+6ho$^ld#=KHA=
zFq3!ybzs}NKoTd37|{N=I%!KD`CIe^bvl6j;*=aAU>706O0|uy%A$P8YIxoHf07<Q
z1HudYC7@QkO7MXLffGP(d$ORPy&y0k%>XKopn0N$HmM?8YLCI_mLtkaNs)m~s_SVR
z`jq(;PsAaxA8kUaLNBuBlvAHRefpWG_s(WHQ)Qo{RY>$B^xy}U(woSlZCx{G|JxI}
z2zRp^TSsfmgx$XAME!#o>(s&7mL6a#JK=w~Mc??ZExJyb6%Pi_4QLmw*1bl)XC>nP
zl%}>VW?uumy2#3k39CL40C7a{R6T3Z9=V)|v#tb6VKM5xLoYT0QJE{{Hx*xNW)M%;
zJ<J5ZriWZ6!6dp~BL=|fmvkH8WyMAEAN?yQ<1u-I)dpY_tN|i1RM#BWUT-`H6l;=1
zWma)AAWNYBfWg<R2GVx>eAxUTD4J>4(j@)+Qw@WCbfyPEGR6gh;JX{Ki8kg4WY=u&
zMiE}BVZBOpb<^dPU*~8<mz%lkQc-@wo2YXM9gB+r1Inyd-;fcHu1wbrm0pDDWcNrO
z@MT~88fkOi>KYSF+X$~Qi{i012TV2y^FNE7W07zQg@s-OxcvVp0WkgnNXsMk>9I)H
z-w3#XPyYz?C9?##^yk=i+@B)CH_$yCzN|~BW`lBaQVQtwq-kmt4D89xX4ySjLpG^!
zxvN0X3p(um4mj>(37Kyl-6h0OwMSGATr@W*>1#&@J#u*3tz4StHrFsRU~B}MFMqt2
zv^uCUc|vjaGSHlMHw*a>%QX#PNvZv*ga4zsyF5H2!rD}mowzw^CR1uHwNG|k`}ZW*
zeeiIRONDs3hy}?KcUAUm#YCX8g2HHnq2-|!Mvt`Z-w=Z@s$BqdTEva;9};2?d&hgt
zG;qN5oGkny*xUTxxw#AWLbY^>(eYXl!?DT1-4Xv&rM4i}rd*|LHp|2B<Q^31XuZE~
z(C{6H(T!i-fBDT3a2M<QP?pG60YM}bak@d~oy`FC)TvY7k^aC<<Uc8AwD(T^K%aYM
zw>i$QF&$olg&#P7efFhb;2DY+AT{)8G2;>5!HlG8(SjE$LmNcBuI-)Ln0pj>quaI4
zKZvu@0nclreqRiHpeKnow*W*aQcyGS9;l8lf-W|o;{;q?BF;D-yD;E~81Q4$0J{g+
z@B3PS55rO-D7iowt0Evr$Tb6^c=8*p)(dkT;DMLCYak~)w*(klkRofbW0nokx*P2v
z@__w`Em}=Eb}tlmI*L4bv3Biv$CveMr(ehGwQDf_?!I254;^e-znw0%eheHhzE^3&
zk)Q@Aw7bz@M^amdxxwR>W~AREh4a&1`U>M8RR*v>h0K45xRv}j6yyCl(OuM)mdvv%
z13<|@rzef)YvhKda<4H10)-3+nn^S@=$X9L<u&A(QBBc@V1ljNM$Hsv77X>=5E~FX
za3uk|;60__EJ_a_0fZi}Vt0wFdGJOzRRi-BDW<e0vKCg#2R!0h%{l>RBJ+A)ckZm7
z@Fs`RsOhnAhizKcI8~+*47(F*x5>z@`&q#DD^|PCZVpl3w^w5OmK&f9;-k55yXB7K
z?{3n64VbiKg|ojzAlVCLs>Su;3uUuqVb}fo%F%v&GURV@MM-^0TX7i|o#kU@Vt?4Z
zA%es$V+(NfyR@k>XZCZ{q!G_k8+}I|{dx8|YTPw1aL#q<Su^?=v-+Ag`h9OaeW5)2
z`h#L-zDG7bByyj#ZyWY^JRO#e?f0T*RbY*M)(5UB<9p)aX0jOL7x)L^2RKBs1y@fq
z^)+Tf@;kZe#YJ4&%&S53e$i05D6HrYI;r#V`$NHmnwwyr-U)TF@G`HV&L+~-+{z#-
zYCHrJr{BZD`-hYh6t3L=nmUkb0iWZJZI+-IYK*-mo?jhpnZH`0htSlkeqw!Te#$<-
zhLNQ-mW-vW&1tjxp`RK`q}aBF$YPc#{zttTt8Z>W%;&FNtDeJrM@T<(8&TU8302BT
z{StQ5{61sxE<a!_L$GL*X~tT($!`x(TmRe2vAPie6MzQJ(Z=8w#_o&&cum{dV8yr<
zKj=;pidk>MelD1}I2-u7qljqt=|h=r^>{(qgA!(bJg#A(OC^OZgU{jHVl24si1UKh
zI-|zt7hY|<R=!Sh-?E~&Ibe%LBmrT#<EhmMR_FE4#l+`@PaX0CMFby3hX)tgq;q$+
zyAGB0`27=(A6gjgf1M)ej1e?hswRcL`54P}(cwLg*zd;t^ax`Z9;L;ypQN^Qh=B3f
zY?p@qXL7gkXcCNKAMzc)eIe6{@8Ux%iK8aZSI_~atOp((*M<)dg>h7Qk|*+uQFlh%
zClz`7YF#iDWYq|EhTuo!jS=@gMc(XKSaRtqT$}b;uX?=A5A5EM7yS`8sI}e%Iq813
z8gFQd$d61yaktVR%px?QuMp{OHi8u7VHP*9>DfD_qP!ThsC8+NGG_zDv4AfNq=Sz}
z-4$fD8}D++nz1Ja=NoPHh{54=Xku)g@;(B(Tur*raE3S@y<1|1Sw@#W|AqDDQIc5&
zM29yd!OAyd{Z6wVEJ1!E4GndX=;XO)4Kzs;T8Gn!v<*~@$5>E|U~|W!^qib4uv=N8
zJ-<!1`p`N^BkloC<WkpQ1Jm?Fel2=&y!2<KtI47(c>80Dl#v_o+bwEYNtA&5xhzFq
z{1w7mF1O#a_)80TIP5212&@KN=N(G^_JI4WH6#-G7}Z+bU|9~gfty#T;}D*Q*C3iH
zI|!%14{<Xu6lmI_0ySZU+pNp2?d=ywu$`Yn*=Kvfm7Wba?MByaPyIWPCR$a9T81(1
z(@;XQFP^s@VO_G~E6$U=q@|kvqbeu|8$1$x`l|u);+Jtn2@Eg5FROxH;;V@@6@?j1
zl$z!&GaESJz+pSb!fXrm<}0upmv{SYYy?m6(nQjJN!({#&V=UYNGlmy(gv^ntDsY3
z!O;aNU!sshb(%%&aW*i;R<*2+NAg|uiTw?^8@4c6-|*Fezfv7r5;>At@TJ8Z)w$|9
zF8TUWQPSlj`ILFr<n<=P5#0T~3Xz*%?>*K}l378B1blMz-#<mA`k~#yi1@}1b>l;F
z<Zaj~q~-a$?BMYD+w|ZkuIML^OUwSas?i#51%?JVm<QzIx%G(aU&mk)*%7v1trM%e
z6nV=`zsb_^$#s1FS2w?EWjFyxlJDwgb27|WIC8+@UOQ_{FZCJO)x82~Dc}~ZQnkgX
zb;;a!(<(9GHMg_-4UWqZ?y946ec?b^;0ivb@`Ru7p1=p<;4Vn2oATvWf?;+58^D-F
zYifx$YiZ6@aw*t;Nptr#XvFSU>xLB>;ndX!d?Y`5l^7g6cEASJJJY=8B`wCy77maU
z!X^8wek>>ePs(608Y|U}pUA<S7(-}k_>D|hO($vQ&c~j7%Y;vVv^Vp{l1;PHe(hPc
zfYZ5aVG^XwSBp!UnE~YI9&o==*V4d$D965OeEfPMmNGNPi|kr#w5-MhN!T4NeC@7<
zkxHgq3nRW{VK@pbT^{+E+Dbr@rP=cQ-$Qz<&!{v+Np%}pf(>@<Wth+8$fDb%760Y3
zQ)I0R+{hGrQVw&otf~!tcONss^Aeh)$m9IE$sbpYKptOPeXx8YtM%LC@6Zpm;m}uv
zW4L1e$td|_W3n-V-N03$LSK}khQsgSLPoHD-rljuYgXc>TPB898(AsHGS_*ND7)GW
z>{Z!&YdLZI2rC{w?j87@v<NCAG}PwK&=ojp#BBeVtNRXf=JQ7~W}hL=`0pJ50{6!7
zLf1Y_Z8IkTk50!T*Vop*wl|o=S75ci>l!{$urHrH)o?yd@(m@1rbK!MR?lf8T*(1`
z%%quY=0ni!mFfKEuYBYaE<IsnT#BfjQK3iiQfsIS#iKutKS$jOC4Vw8MbuocSpPe1
zInI^U?1e*)LqodI=1a^9jzfhfJ)<%S;~jaJbAjl&Eco}V2*MJZgeywKq90yJy#2UY
zwdsJ6xzyhNVgqr@C-rcs;hw3HomZ6|8E2KVNmFlF?cJn>xs?aTIq7Z%(A9wuRa*ZO
zt%IJ5JJ;UEF|@U^(z`}q9;@@RTtjK>NL;zN%4h6YoB55)jEAcnCuK|OIcArvtH25A
zSiQ^&I{R$LW2$3mLkSQ)C&|SK!Z5V1<q&>zd@yq9D<{0xg`QQ(wnnI}U?E-*)ATR-
z4@TUJz*V?Tb9zn-<$9m$wZ$Tko$hD*&?64~x^D(;DSt?bx*yEVYu>C~B6^Oq4^m$f
zx;NMS**PCxF1~n5=wB)N%!{8lXVLCYtsWw6tnL+$5d9c#$f7jLLd)*Td-%gQpyqS>
zk{yRdv-Cmv+sM=?dFDwDrY%eYZlp8T{d$M_V)w%3R(eUrV_dkIYc6-#UVk1JDPjsI
zFi22Z1v`#ZJua`sM3JY>1mHt0@IuP0dd;!=+49BA6Zt^PTC&i7a2!Lo98lyb<*xl5
z8|c?*@or(n-P&o;(6b22q<#y)wNb4%`IfEdAoGyUMK@aZIjTKf!QEy(WIb}ir`aj|
z{fG?f_3PJadXg&y>CxDj<r~=-^TA`qzhCr!QYiZN(-am$8u>^d&70q?h_n|81h<s4
zQxZb|ezUP@;Y^xlv3&xn5?oj5imw7%j3lznVZH+t+w%3{rEgZ=$zg&4x{FDFM@d(t
zU;&3O2LyZzeiyBUT{h%R*HO!X*0tgL<LF5vMn~;yX3MmO<+WIS5j62R045x0&&KeL
za)bv-s5?q)K6+gT%!BTmFQvSE_YE6{tH}1;p)uIzAu~!99+n=p=tHT$JU@cH<mgD|
zY!6mQ@8ib@j?BAB__J?3%M74->fH=h*1n?xUPc*bPuB9S#irZon+38GwJR4^zcO~1
zuUZ6MYF<n8c`xrb?}!~H;PE>~D*a_l-~?r?-a<L@4C;O=&P0yzWx2~0-$pL|YjSTD
zas(L8w(b&hFE~)pI?V}wd-mZY`!WN+n_mq9A9F)Gh_h{F1Ved(=S^J}K9@70mT>v;
z`rMYqYaeyr9~9$VIkd7Tihr6fBqJ6ROwjE)8TR<hH(zrr;3MQ~2flPdE2??rt+uOX
z!*jE1cWqim<KyM|12shp7~b6-k5!-P@1YSwO;7!?*Qb?stHazKb*tW_YIP<14XtuB
zad^*>OxJ3xf2-PCT?d*Md&RCTer_S7#CIeU5<=y?o0bt9W-#-M1@!?K-W5mfwQd_)
zjbz|c&sKb-)>`-7@u{(Q-$>R|JJi&&o)P>4%-1l|I<2tvNxgqN4jy^GTaxwj=5iDI
zx}L7?-*n|B6Ge3wcqf9v7?g%S97#cyB$ROGBTe)8{hLcTCWQ-ryG6hoxH3aqJ6*J(
zHgn-0_r!(B0_|u!)4|Yk!c=I`hrdQkSxVZ2zK(ejvl%C-bG1C~9|wMT3!|9b54CGW
zYO%T;3;X3CPjfEqT+;hhAHx_1P)v^ZlGFdPxo$Nzj_SE?cs!L4KNI+qqL6V3AAceK
zNi&+r5v--bdxnSi(62vHD!fHqVX5M4?#p3u1=v72*9#45#4A-@0weOX$CkFi@V3#5
zbD1OS{um`nkSJ<w(6?L<j&t(!jOf#<xpt+r_zHt*f<a|Rd?ych!IiQ|t|&Ynm~O#%
zgD?S{`$gB_#$K3aiPf%~k(d?MY0UUk^Sl1OGl5G4m9zxGh4q^&snn?{*!NzmZyuCg
z_V)JrgpZSx-sH^f_jXL1++Q6$*B6=47x_cwXk#fq^jrg!;rxqYX4HA^%JHKMPHZ-h
zww4+53MCkL<E}bgyOSnax>~LED>;Td>zFqOE#z=Z3Bar10IWCZNq3i&^|vjkE;?Rr
zMPipvuwtF~UsZYgF#MsI$_l$}UFRqfWMz)vDuz!L0`X17P>9@{*bE~v6Q;x#bsrTr
zTTqHxNT)o@(<rhnL&jsF=QM+Eo~*3T{$b?9*4wlkdgI`;ysVMZh4tI#zv`IHweW2p
zqV5y84n+qV>)jijZqFBOEsGR%!Qt0~q5mRL6`t^|?22|L{%2oQnD$yz5KUSB)<3m|
zqspKU6*F5a*4RusE-kCVw^%n8vKE@2SD*#fxs6~Ct0plLV{WHMXT>!9r8HKiQ55IN
z^J^B?Q^q({@q+7?i(&^YMa)2?)lY5~b(LCSOJDj@jr?ap7;)lfDfJAIN<9KaZ-+&M
zG2bBZXet(DS@4R5vg5-hx#XfjnN@Y$R<d$k9z_{nLs8@Xh%#9I+Z@}UUZ0Wz>)K@1
z3yWTp6DkwiD{p>t@K}FA&rCi1_5KTum3zgwAo<8Njx2q-SP&H2fwn~!kIZv*JZd?j
znahb%P7HQYeYXBFdD5|64oiHo*Bk`>()h=+@0NnU+N|F%mvfxS$6@BpxWBqA&&_FA
zN;Qf7CbL5CQAB|pVfi_V60}l-#;jBdPAm}?maHkJC+k>}*3t4OnA@unIfPA3kA*jt
zK(2r_wRu+5!|lzpsqUMCSEMIko5E|jf6>^XFs`wvXM(t~i!!#yOP_GKPvAJvbo2V?
z%!SR5Yqw9=g4nfCk@Pp?59oxzk;x%=G#dsV_6FH0Jv$LyKv8ap^f<^}VBlBjL7k6a
zZEw!>I_Ittg`Sgmqqo~U2sJfMY`^1DF-Xa87DOiss-Tvm%j_)s^jA?P)EGdy1|szK
z0mU0P4!*x}BxgKJa>h)WMKMxNl34|fAjKt}jye;4XUOfMzD3tMN%U!^{a6IA@g-s<
z?996HQ594K`{p!B{9)*3d+DoGF)l@9@#`%$C14h*DJi~aGvGdrmvR!NR!VmtH8$Jx
zR>h%{=-b6@vh8Edt!yIA%*QtRd+jUpI+C*+8+c-1<GbmX$A@jUq5|)fQnFoU7;WL)
z_J_Ay@ywz>x-1v_kq%Pr5>uIgM`|s{z~B>UX!r`9i>iRku=6S1eSORw2Nl)1$Amy7
z(O*a!^{d9KJp0|dA`a8W&Q9Z{%|4x<KW+tfpOj8%ZIJcMp)OWWRSccvdo#PXtpux0
z2mLTMb7ItT_Ws!9^vc-u^i|neNs?L2jJpgA!}i!jF_ml48R=r;vJ@7~vzstd2NqXv
ze>F6Jxg|66c_!A}fDCm^SSYy-!G3Zg86(M0v2^yiL=e}pwCqHDEk=uvVJBImQ+~!i
z@!iaY3a=_f>8Pk9+C1Qh$AVwKj*LIu5B}`<>9B--U37BS0Z~WC8wz4a$S=2xnmxuI
z<KKgHGm^T$tNyQbDzDbnM(O`-3eB{Df2sGWY}id(pCxa>ueu%XCN(4mX|AMqwK9ka
zXS0ft+ahBaW3~-p%qw3`VNh7Ta0K09m5YY2{zH-bO}M6Gl+YWd%dc&;t*V@JFo&bg
z2zd^1j@}`iU{!w=@V{C*mm|NTn8`LDU)X%ySLcY@cTyqlXTvsMjzu=2C8~R-r%vYD
zYR9o|x?z7c&lqQm_Ne_$40SkmtgilkjviqFw|D+f|9Y#ttQ+U1ltFfh>_o@fK<S7C
z<6~Lq+SI~_uvIq^V&b{1GIL27>Q<xEGcGr9@*ay@)SrpMPs>N3e#@|J<MifP*5v-p
z<;hu3YWB=hL_I<@)wF=I2{(N{@}XzP-@leyHbG_Gr29Vog~oA%W-cZR(q6r|c<IV<
z=ZR&llb3xYA;-E6{EU&}P$Ac2e6ZZh{XNDxX?oAQ*2otokA$8{5a)jFGf5qCD#uVW
zW%+XzTkxn`m0GA_^GMw+2#|iuWM9e&Ff&k!sE<70YS&lAUY1y_cKIziKP%2*3dlcn
z04DSa$BnU>p)CZ^nJXaLXjoPCSgb!5;v)aW<h#cR>Xi=+#eJLshIszcpL#9S;r`Uk
z{5KA=3zEW+$u+Hxt;YxUI5;*PmFho5_rJ4Vc#c|jwZxn_^b``-xeX(=!Yddd%>)mA
zmpWTLiqsrIu<H@$2LaF09U}`$om2PN2HBUMq<0;#3d_-RBPO2BDyojb)p|C;f=0qt
zW`q63#{h8sA;8&>A(*`P+0%?x@_@c7hwe`9w>uWS{kOju7cLxd*8t*Se4w9HJT18o
zfa#YPFFDHbW@m9bC!RH%>+Ex1b<`4QUHEL@N1V*Pb9bzu>(l6Gk^bSu+Ej{U?Bm0G
z&ionHRp|`6rC0^*A%y4LHFs*ti<>ASa4KP~vu^H!8_Kr43{20;Gw?T-CsKf9-Zz$O
zsf{kZ7(%Q!qg6i)5?l<egj438@ykgd>|=~sGAR2o$b9CLwLd?$z}kCHTSdrC!^KCp
z2%%~rw~h7tu?>e$*%TIUJ^Qn)<c|roUSU>Jj#o9YiC?uJIDTsYynfe@2V(D@+xL-z
zY8HE7A^BAp-a?8CYh<g3=3~ML7v_<Jm=`w=%fpdoR95~Oq}}l{x{CQD2*L6m8x#+=
zEhSUE42P>v=Ro8^Adr|_tovicO(>(D^Rk21R;6l@ll>^|Bpfq5GjI;%_Rd&3GZrz&
zIJ=G`Dx)!2gJs?sa{rug<C6<9Pgok=ggs4;LLYG4rW@s0xfge*>!aOtWt^RSooF3c
z%R;+`XmfYj1@H5pMJ{yh!Xzh4JqYVl`PH@?Jvg+r?9W(Vq_bgPr!B16kq_HG<oEJc
z4n)Cbs3^#1C^VCNn(KT@$3y=fEgaYYieWSy<c}(Z49m5=T<9EHKp4y0BW7*yq;KZ7
z$D<A(f<jvWq_d|NRjB)`!7!L?gYYw0y~sl3@nw0@o|hCFqYeJ^=4q?WEi0))t4E`n
zV3@_D{RUSApO4&5OLWsss@hN5!p!$Y)qiq<-~VaLguRmcaq(m5;f3VRsTa`9=E#rU
z$7nrS4gr;)rsSak?{*X9XHj}byK9?8eGOH#!*I9~PU#n0VomfDPfyQagb0em9DQP6
zO<1}sVi4SV{}M9t^;VRW0egQ{di}U>UNl~TrkB#y4|V9my%aCeo-hkO*hTN0YeBMY
zVzG0~I54a;p)nt$%k8knk=1<C_P%%8!bFH3t%0jqNU?@Ow<6NETb?<UuH)B+y;_v|
z=2|OY9AZ7-Cq{iTv|s<U{CV?5$K<|8C*CIM@T-R8hC}=*Bg<QLO9G(*$(W6Whv^eU
z|IX+)q-Fm|d+Rd910h&!_XER7U06i0dtb00a+u#$7rGXJ{4?lVs8=-(t;Mk&s+&k9
z<<M=#Lu-Hr85`oE#)vGAr`j~*>{<@u<YFLPO!r1OSSm>OHjmZ`*0y_=Q)XU=DaYNg
zaLha%*?JVNx-faI6@R@t^-?rU_fdGO1hdO=jbwE5xbw}xun9-u%RM&~4wi7M{Qlo1
zcXgN9O4smr<_Ds)O>Sh8(IHbmieqQWYY@@sBRQTyXJZYH995B<cK<Q{yJFYEbP{&R
z8h#y)v`7Bww*{7?sS84~e0@am!-l{$+=I;FbGbM!6ZQI~IQL^7Wnt-@E<H1zkBM2E
zMr0~EhwAr;$X18vtm_Fah;_etMLXAQu9|eh)L&zIu0Ao6toRKI0<$A6S!sSXHXe6P
zcGk~rV9)0|)6WALz$Z^m8-tab4B}AioLbI~`BQnFwSK!y0$CpVw`?nq$&XMhF!#^4
z-aOw5axKgE%V|k|3NAm#W+Wt#()$A#b)h57-~?Fh%E6U9jiR4_dO5d?+|k9orzrLs
zjj6RgqzDw&-~lp8kDm-fOsGXPzN`)5Jw$|u_%C?dY_SS@AtKNgj+C~*zf+r5-pmUy
zeC}qR)L3l!#4^7>>c-ph&~1$szJ=bWdrnR)haI{Y;?Bdl$xUm=pl+dZkl1Tqh#ILK
z8tH-P&dKGjP3X%pH$E5JnRtCpBb0TfLaz4y&2|p)abO_pmFyKxrR?CEi*rp6{&o2E
z?OVMC9Cg{c`X=da2<_eBR^vaoP7BKG<8-x)n;UQy*6o_zq`}SbPfd2o*-3hmtM;)`
zYHKj8UWg;zVFFRFnFpA{q)KokZVSr6NNk+krHlK>SIUXhmx0(wSm_rB$6e66nfh%l
zH>WA($H%jX#L49Z=v-yp=M?_6LckAyzLMRMybd!W6c<Nr7peDeI_Zr5FhBF?h8s^&
z>dCf?`h<DX%)J|3aW{mUd&!sUvB<E8TDRU0evC$&=iU)KtNY!v=Ekam#PqC5sp1da
zGwP-2zkOwEd(iGpZ98-!21_s?OY_<6&=$%J^W0h~Q7sHgw^^x;&~$>e?6R<$-?ed;
ze@r&7`nO~VNJmmEH$VS?PgJ_{_7YK4=OrCMaj|d3AM9McvX&y3G_qeo%wgY)&Z$%W
z&3X<q&j`k)tFc$IbtIV_@FdtZfqg8);+&z3*H#}UC&F^5c&he3&tG$X;Gl0+8U+B)
z*<S<YclRDq<{h8Gt9N6I7h?^u-Fo{^x=Bq$78F#DS#BT}B^&)+(*%PTT@d{=LkhId
z79J*s_x+Kn$Ik;)o;J!pH;Ki0kC@AZ2@vk?m-MLa5ZP+KoOMwlR4G4N=TX%ALsxdS
zN<1u%cPp!R$)=p_me;LbEs2_4L*>@PzdY*B&>~#jBFI$Hm83Ep`y{xN(RimOJ%>4i
z;(o-+_K)N2Gq<~(QAiO;jQPE~G|JR`!~7SY^xK*nsGTfy&Bza~IU=tMzwUvLwxCNF
zl@tixy>p4i2jE8S7e~l9M=UU|h(D2ct<s9jO(?bK{t-4Xc_K4RLyfkPsTij6!#04F
z@&0ZwGdoY*=yuvi33pQN9ha6q?jX2o^}yCtC%)glleb-p+7W37KW+P@WkO|uFeC>S
zT8&>6`Y!O{L^2(nDnN}%l1|{gIQxYl{#BZjro1w6=d^3tR4wOdnU3AmRMNI;9x>8c
z+^)fF*wt2nXFh}0#fRl&C-}A3)zPLEF}9RLz4B!~2X{GS*Ans#yv>dtIUC;i)VjlU
zHuGZS#79;5M7%0|dSrxLy?$&|8lQq>S@k}RUMmpZBb-y~<v4KivO?V0rqc%dotz$C
zA{5Ix@;XJ)`#hZ7Tqdz;FokiFQEpF-aHZiBJ0K6&v-wV((jxYyevQOWi7HfYU-Wy#
zTlRpXX2Qo%KHUZ1OE^j;oK}^kgsjN}#y=p8`QGMAcr#jS|Is0f9QgU$Q=`|q0^74+
zDoLzNl3FzK87#Kc!Q>wD#7}ehsx=P(gB1QzeSH|BB7mdTR<YZpHo==4!qjJ1EY^1j
zK}BB}&z>2sx#6-q2q5R-_6C<NNweQ?z)Gc7iX-}@*e-_y%4D*_E86Lg>~?<iZvITG
zF+BqdZBl>KbK&Yp9Q?#^s@bEW$n|RJ7F=Oy(j`pkoN*BHlI4uBB*M3(<hoI&Ur)Q@
zrzu2eN^0T!+8)zU2qQv;)&_O_Wu<Il4XM$ZvgK52yGnz_$7o!e`uV%J1tbCMJydDI
z_|?(Y#u!cY;`a)xXPi9_BSt@Ydu@#xsIa4TXz|iM%9rqzYyTmxRmd|zSt1I4e<r`=
z_@lvlOti^P_Spf}!_H!+@8N!EZ1`nuL2;=hE18aE9L?XpEM1GDXyMy3uMg;L3NO1n
zbY1h)U*G8?*zb=ay@%Oi;&dN0_Mss3ipRk}*K@KHpR5iHWKe(E{3ZM6Ku)CZ#7Wi-
zowHn(AXn^^y=S>Q)VfvtVbq)7zf02%W%hQ;1SzL@8;ucFc0ggrb~B5a?~mV%Ki3lJ
zSg7Z~D8XJ+2o_mCE%RZLUKyahH1}~FDt+uzXyNBOK2}AZ@Fl!bzQ07v(Hn1XEnz#<
zK2`;GW96soPTlkCi_C9vWd+vvwEsdpvyD(MY)<SFni0yO8qfK_<}y6!5?gJom6V?w
z$djyyp8hMpY;*~)wNUKHwUwsERXK9ePFZ~=nm)f%%)l?@{n$g_(G2NNOWQs+envE(
z?DSN?M&Qw}bDSH}+_=?2iuzv*uYNLw!dr#W{?mF@Y_-DnLX#(Ua*k~p?MY{DCsd6=
z%?%IBuw&WfizHA8!(sYJr%`%HjqbpEE?#~75Ljt-Ukb{ce}`cMp@{m?ZZskHu!a>C
zsF*0*h${Q((L2@IoRO`pJYivYOw7{m9ZGS~2lfR%pMPg=;#O9^<KQ<h*^+a?2EW|D
zSfMjqu0svZ(9cLg#nkHe$x**rq4U%|;?r{R=O$s;PlLdF9AoQf$4@o>3Wn~>P_4R%
z8M_e=Q;52Liek}ww;7AZRJZTu2lsLR)bYN0_e!z5B7ExUnKN0xA?HtH3`ERGAN9}G
zW{9h0x&Tr@ihWP<*1y1`)~W#_g4MjEdghzv`zN<sLxf$QF8bg%qo<G>{SjxhraTj>
zN9^Kyn+{`cg=j{v{jzad$RxUpW@T%t58f&#1u$#O4L40#cHpHygqGNAJg;~3={cFJ
z{C%o))g`!)lB0s@@j#Txtllc>YlNMxcX(HG=?vfH)O5OS?IR~d%4tU*tJ22@&xKLX
zOp3lpps1CE9;Ad}GsO4D$~`V!&2o;|1&pI~Nn9)Q+6I@gc+B^NW%M!b(Yy2$<tU;B
zBtpZ%0EBu!?<aJ7N&YYT{(ieShhN{7O1g>P^k;_M{8v_N{th=Ag;)CM@)mzc!P*)g
zsJ~aa;t&}quN54dBG6U7KG_!Lm0NYis7(JT)^r#V^c|lYk8_rzb#})16&br1+d!eK
zu0<E`CF2V8)pB~@xq7^*9ZOGm%>5JLNs5GLl$;RV*j-jPC||KZWEOLrGo$hDig=$J
z36QO;i7k5?m1qA!oi=g5dWWn2ORxS(<f9+)=Qr`5I{psG$+o-wz3Cd7Rt3qUeYlA6
z*EJZfeZg}lC+w7+7jYhqXjsct-~MCH(5wHgP!2-_Rha`XrYXlc-<8EGFC@%fWSo=Z
z4W1cOl4LSlP_2`yXUf~P`Z}cqv8N+#&%#R}wK?Mg?aWfFK-CeiRy`&E279<_WL>3G
zsv_2c;@fwl>~e|yKp@ml<(n_s$;ap15E@aI*xb0fchqE?A7A0yQ$5Q)W)3HMpXFso
zk%QkNTw*|gtFuLDH=|AW9#!sBQhHwdqWh?l1J#yS*$j-ktnO~8$5nwQITk#@t#as+
zT10q{X3iHKp6IC;6K$N`U+>&MpY8bRNUAvJyUS8%d;p=^0+C{gbJpy2b&L*)DOn7j
zM^5Qo9yXYBnCtvLv{=fdTjQ|F(OG^yHSPl@drPVxNUhBCP=!_=&rP=sA&2iYKms*-
zt@TQjrzKNa-;zDxU4JoC$cRjsMl<<eS(#tZ(JVc6^#Y&cJ57|Ir|uLy<7hPRg*BT5
zsJ|b<_Cp$yl8s$|ADyV7iLc(rCv@K$@a_}nND+q~DC2i}c4)JLOPI0os2E|wK<TWL
zb2s+w+42FNm!s2Mr)RCDW0RhFQ#qS6XS~|b2dwp+H*s*NT~*Y~5#2I#^t;+)GtQ%-
z5R80p8>IRU06WI0D6*|$!{P~ob2&TqY>OPX?rjR)`By?#*3YN&GT%FL5c`l1A{7x6
znFg}I$&NH$dPvN46)ju;?(-NOo=Mqx`GPu9;onrda04X}!>*QMU5hARd~wc&h~%wE
z4v%!c6~BDidj7EzPi2}B&Xd0RZ?H;GL_5}Pf2@bd{;Guf(hE8lpSf;b*^^UifWiBH
z3>@~>hA@~91-)tU95L+`Nr_I?ZG}4v`0u`LBmO43U*CbCs({s~zTRYhP~v%qNQgaR
zV)OC%I7$BwbcPzWL6KFe1M)6$e&<)5d)Rk;YY9^thwye>W#*Fa-VVrOV4g*zp{}gh
z%5(8Lyav|+zp7^s8QTX9O~1=~Bo5O*VHswkf?u_{sttEtbF)NOSZhA`m%-tE&1lcd
zEqDJ#tG?bB%y|Q;EN?-rEH^#m8U>(KWPh(+iz59Ld3-aPx<A_HwRZ5`0ZL0bLASij
z1P*U-LHt$8sLcd9_i*j<*43};P94SiCyB*@d=L82562BT%()x(UL9-o?PPyPhT^n|
z#SPR*Z;$_wKxUsRueV0jOniENofwG=4v+PK$nJW3FF;;kX&D3gnBUcP%M3*Gzcr!)
zw=SCN56HCicy(jLL3Q8bLVAuT8(sedq<&H#6fsynUF%H|wfNV@S%~{P>$JA)ixR}+
z+%f9>-C{E;z3dL%F1hlwzj2g!A8dNC_eq~()1hzRV&>X<TWopSi)ef&0TM}UUfvTp
zxM0?{*Ve7_p9N7k{4zh%a&l|u<cH{Y=l@ZssXNoigg44&^TeAqs6=x1X}aawLmwkH
zBvkXVRqy-bN@#bdCAkY8HoMEyhCgQmYGL{y_wL^BNeo;uE%oCvNhJfS*?%eok7t%J
zUBd}!rUp$l=@G2@Nf%Zy^<b)22}e1z$2*5EHB~G=^`sKt#WI%`{F2^oa=U>lgmXfb
z`)FWYfB5b`{`KJ-gO}~^&QI7_oe=vPAFV%NvA5JK@-icH*@qMol!!j4tm<-YJsSDT
z%1Zo+RHM_5)wf3iEO)#}ANid9`{;WmL%*TxQ`Vd{N4EAuLCxUer5<qI=z~AU`v!sb
zqvNYYW!lds7lGiaVL^ulWgjN4LsmgUrirD399$r-Zy#T>n-9+cONu%3mX%?!pL-7K
zkOBWOM*DS&^_w{LjpMzfQijz~Hy#ygw2}=?-M=X6eD=#`{|RViKA2>XG%qM|GJsVh
zh(|HqCDoa|pRr0^$HaUy#jjSSVuTcq9?Xg|<9q?`ylZ?_KVtW^kp<l%^5BQm9p4#Q
zQQId)Sv5NriK{23;lIovN?(;j4Q#A><90>ElN}?ScYNtr*WuyPo}!hXEaye8i(-QF
zF{tXS-1h^0gSOZy>Tn7Qt#-}ixP17H1ak-928dwZ?9Rsi#=M@%Q)E2X%!xA?ybn>j
za_r07GbEduTZQzjj;?K31<dybnELx|`-HJCH?5uB9qO{<MH+f1cI>_H2BdtNJ>MzA
z?KSS>hubHclzGDg$&xi6dZO3sY>zbU3HeKEM(+8}F=1ED1HW^DJ5^e1I>q|r0ZCka
z`J0xyfltcQfq!B-e4l1!u$5J&WYaV6Xb5x@Ua#c3ANO)&ynd}WM(XYW!he+N+I_9P
zKnuwgGVcqhSAMch>SgTxiYk1UlF8Qld`X@X*e`6g!fq!Yb?#xiEB&t0%vS9~za%?m
z-QD2UR#tOAL=dm^BQH1|+b{X{vi|_ldsBGq3GZwjo|W!vP{&R|bxy<_@*NYRM&y3k
zutCxJmD;_Ds=h9TV3$7H#~l90sfc<}t1>OBWqSI4h<c&mAl>chlfsw2YbA1W>-!~5
z4@-P-$??YY-W!0AqJ*y&RX*(F{}D33VJKt%ByCN||K9sA_-*)qN5#-WOZ{?}r9p@!
zxy>{Vn5gcOG?7^GIvqSv`4JU`EV8ny8UgpRIFG7)Zkm4;Zy{Mldpw*XcqZgP*4>`$
z$dJ~Y2np{%XX)^IpFh6$PT~1W@n>^$M~E8RiIKSnL_lcKFS5c8_1N#b7vK{On=mVx
zg?_;&K6w(7ynnIdRh-@rEirH5yq`L}uv%{dNh~zrMPXwa!gzjG1rkNPH$W9KA3V{@
z47PKq9)bV8mWw}Wk;LM=em(bK-$&fh-P^g_h8ENqaf{CydHdDh<I1K87q2eKUKqXa
zeD-s!3yT`&dfLIMvo@nSFca2EyxqlXN<j@)XP35`U(b_CtsVjQ^z<y$np-60`LUK=
z)z#ArOi%0Av}oac)Nk|c$ai+gUOi#CcHnc<kax7}0l5yH?$2snv(v|qJQw=GfW;I#
zbds)jK0cDc*;L;u99fkRfA@jx)cHH8OnuhTZzr-5GaF$nLR*9Oaw+HS;FuBjk>(*?
zaS};Z_G-x$$HuFF7LA-+qmJYlaKvCBUP<gUJGFg$-dg;P&0Wne56lLqKs_-N7{q|#
z#=>7@#R6DJD=NsS;T09+X4b2Y_j`-0_Xb9h7kX?yt!i-JsW?qvwzG&#nwxv_q_D4q
zgLMev<Ms#GILRWS(^roHBTlT{Kd(4lr+P2l@qBt;<b}<<5@ccvzn?j}&M5z$R6S7@
zv8{UubLxfk{sgMo>6epSV|De}Z!gx>FN_jzMr*ukvIIt8-R{B)Y;?SXwIDKYH`sSV
zjT^lo1tu+9IP-t%dV37^vKQMtwvqo;ji@2UYIt6$&0hlae#OG3eGn5uII|Z&(x~5K
zJYzRj`NU0YQS3sC<L7vovxQ%H2R;s6>kVmjO=U^0xFyw8`r?mfrZ8<wr&4QajNB_e
zR~NWKA6il^jhCGYts&&kxiAxy=%?#Nik&Hc_p0*tgVXF)hQHnAvO6vRxm(qJ{q=&I
z(rT|9P1Q@DR5xAb7y6Dq_x9R-<Zrcm4mG?g^S2H)`h0;Cqf)5_Mde55oxyYLGCeS>
z*Cy!e=jUR%ZP-Uf0#gs)a>kvvm#D(_;zxE4GT>uExJ=B{x2gBspA|Vrk^Ld-hyHu7
z1+jd2Z->USyA6*>{;Ia<K%XqhyJT=os)lAz?b|3Hoi+D6WGyG(9zf_$XSMSxD^y$0
z3WeGHmQ-~lQQQ@KZGAX3bG^c4_ux}K<1w?7GyFVxe3x*zNobtntLOGvIcXCcujIY^
z3vu*m+12MC-n;JJez|NyGQan8_9)7Zw>iAbddR%tN+)TkBrUrSocPJdNba(<6Ua4s
ziqR!Ff3D43!enQl)(X*`x`|hPzyE>4`0oyIpNR5@Mx&E>Eq+5ee&P5A^pL&U>APn4
zL&^M5$*PR=*$<mtSOtu(Hz>$k4r_mRt&7~-x!*O{JCUHa@gK5oJ6EvtjEuvkh{*;F
zd3cuJ18vEef2dR1oPh?Wx=-^5Haueoqbaky0U>Oo;uIvtt<wPLY;)Svv+(Od^WVAk
z5)#-kcV+O!Ui;S1D$1o^6ftNQIib`08M0|_hwBH{)(xAG?Bk1mw$*F1uq)$BlAxO+
zI6t!W^?D%@^YzWhaAN63j_0*}he|z?9)KRaOO@Ggvh#5$e=9I-8c|cZ{o0?<=AGNM
zHeQ#kzO(9T*xAvG7e+rF$*HmESc^K^eNXg0`BXK0!#Gr&7$d>qiV4wKE>PCXGjh!^
z<H*CkkJqauO4*M+&PD>8xLtsVGNR1$_vmahoM+-F!RveVJ#5T3&-XIR9TlShf=B?*
zc=}_K&o5oOEAIa})ce1mrU;gQ7fGMv#c#^x?%ooKuAu=zXc$f)hP`h#__vtjva^IE
zwc?PpEFiea(-`daGdsm5zzYkbS9Vdd`3F6Qx{SD9si#fQ(jK$rj+@7i6<8uRpA!=L
zK4HHn2RfIVa4X5~Q~cEpAfRq+u}c(lL}GZa<SIBAASr$KZ4K@VTf{}<PdI%z{MA{u
z4Tz%^c~?61f}jDmB7LaQ5AAc7xS-W*H|cBXIGJTT)b7Eexo2mVS5yns5jLhXWnUUZ
zLUbjr$DNQ^@AodBd|{spLB;fBLAXyC!RP(9C&7OThv)m}{<!M^nU~n=S1>nskhCb-
z*rKkk?)z%bV&LZ{%>&UruPpFC9o;Yg4j|tfpuatnRQ%g08l88gsKT3&D{j%?-0723
z5GU&K!_}mJebg+%c%G~fwmn35bCa$Z$Fc-xL~`^kkcki$3TNvi%W<E{7|DpkR+T=j
z?peXpOVbl6xuPrITm}tiB%Yl7?{!xz3hAYuY_xN_pZ&?Rbh8M>hTNps@%>~}P1$_S
zxZ>O`cg4<ks>F~*K-syv7eKE&|FE!2_=6&nq*(1pN}YJ_+V-l~lt*%`I?D9dqM8Dy
zjJ;^CYgbHJIkwjp5;(}QvsMk#TKSh`f~nDk7vgqfW5lN~gatP3+!gp=JnG%IOBCS*
zro8Tc>l>XS2zBnj|M{zf4GAP(uXXFdFVJENz87-_r11!a={rM{BWospV!*&%k&u1}
zN3oxC(&JsXI6az0OZ9jrMZ5de=*;>r5R?Mf$Yy5{ZjnDESXpfu#b~z9TrpSK{cn2!
zZ(TKwm4UphJo;bU*p{*xrYGs9E1B_T(*qDU=Dc-yFB6N}Lqhf8yKQgx*@*R=BOsRj
z^|Pb1LbQ<l!L<Kn^J`(q7(rfYi<5d(*5lCe9^13-+nVD$lh<&2#O_Lhh#34(5UXZH
zVV_~wQJ1j~$q^>sexH#Rtly;yho>a0cv?mPuT%Q(HC&aAO7%Y32>lz7^g+E}BpUJe
z-T=EMq64krIAH5L0F|aHh~E3N`D<-d$f3Y>$X{tz9nZY6ax9b>srr!~_O?gQ!jyHP
z;Gt^TCZXFPjM+3BSS>Y1hQ*F3m`rVAv<hoZL)eq|1c=)`!r@L1$B3aKzHk3KZEo9t
zPJ{qz#C^xx7n^AZYiXJQ&zu%|py}vsf=kN|bY&@eJ`Kr^oEw@G=QTje=TR%)7X{^K
z@9c{wuZyyOfu{3hbS~*#s7#ZS+%(lcL~G>?TYla7MnKjKq)zZy^4=*6Jq_CLr;f)e
z{xO43GmZaqz*!5$Q6KN<GoPCRUs=?gbzu<)EDA>ujXFaEJG1)?y&)w=^v$lsry;rj
z&OGgvX8sww^s?@sUajhf?6p0gx_1dFJKg?lc!>Dc7<T`bYCznC^Hsu5GPNtYYwVKW
z0><O(N>+b>Axr~mBGrB3$S1A_R}nzZ{|wHmL8K{3TZyc5=gTE0S-<EegH(fnzn_n7
zZo13<f9ksOa45UDJ$AAsjinL>sgNaP$-ZQZWF2Ieoyb<Qj4iwHBClQ931dsPDUnbJ
zG4`d9CHrI@-<d)0_x<s?=DPghd1jvHoZq?6z5Je$<~HvBRgdQqiVRO>?Jiol*;u!l
zmycnNL@#Hvwh+!#YROCPdU7Y;N&k!i2#|4PmZ+si)l&6A2YNIS$^Xw~noCE7Tkjik
zq`b%9q_4<y5N$cJv8pih`vl2P;|dNoq64RHxmL1M%qj4lkZ=EUbgawx$0v~c4U;d^
zO6Lr!mmRMdV<Il(#mH1zRHV50t6R+vH@G4)XyjKVsMbFg5GbJ3c$2@rH72dr8IsI7
ztY3nR1|=CjdOq#P(2ESrk(c!Ua=CO^@-5NUeetTEs_V&kh8d1|K)S=MI%S1KQK+)@
z|ERFNdVy50z$Tz<Wz+%wrJM=HO*Q|XjBYSLv%zx~x7`=g`gsIT`(y>z_bwgmatQTm
z`qR%Wun(t-Et{MhsWJ<KrUhrH%dgfCJ{hOa3M=ab@IDj4lW`=?63BOc!M3@H`#m<B
zx>v_@R0jI(#<GXsxS{OWSDc<uthR#qo8Y9_qk>Y{7@^+yZewhf^7HEDv|4(Xn-`2R
zn@(tMBkn&RZEsOyc72cDco|CjTDk3H)O$4Nj<~cvB<LdEdiLwRl{EGG+lxOE)dQUw
zjaRmR8)s+ie9H{k3l^5`LB^Ye|Kk1>^Z~!nVGeL+>K68r9VF)?ZJ>xRZRogkVIhGY
zcXT)J7CdO0C0ncK+rNamlc8C^?<z`-K{rg8Ne<Ia%!cg!V*Fm$%y0H6XmLbrtN#{C
zlLRshMx&Jii->|in)Z{WC^yNR0yCMDWBRS+M4CaNmy7@kF9+^)Uzxz)=-dt?e2Q6B
z)*c`nWibL6kSie<pMvkD0MDw3$h;C?B{Ieo&AycQkv566ujm<De<QK7a!dTkwvjth
zZj#9#MS*FaPoJ9jBQ?Kj+mPNObEIG^gdG-SO4L%gjV<z{#FR<MYU!^`N9aw@;;T$z
z4brGfw?nBkwU3OfVJKX@@xwD+&`AR#Ad&NLdF8*faIsAak0_#@!bAAypLZ2-ds~O+
zm08E0fHvkJ#&syq*4#`W{n&F>2!tu~(-_p7wgI?#XYbI;U6QPJMKtSy=ismC=eN#`
z#R8)lM;)|zy6kp5;jJmwP=zlp=oI2_KuXh!+4cb-;it6i4>a$Ru375Yeden0-t^tB
z*3xoG%Sh@&GdqakGJj^(kgtm;Hnkzm6qLCn%Ojqhebz-|`@l?UYlDP#z$rW2a14yj
zlZx4=EO+J=5|x+`H~`A{`h_q6S+aL@x1IDixuExepr)C6<;5O$^s4f>jIsTD6$iu6
ziYf}(9);Ci7n_BEX~(Zwtnv2qSyE5MKU!rusb#z75j_1|ik7;3o&b+fxv`{EK<G$X
zBSyKP2;2aI@|ex&MVguZNAKa?1;N(?7Q@1V{jd|XgXCS$%?k)Cl=9Dy0IV3%$qK~`
z=moNy-@x1w>8|U9G^IcE<sPc0!+!v*7|>Ncc&i99QVx!CN=o*-sN$(6V)jzA>nUL0
zUB(#kz&M(OWsa0vmzJw!o|&y6JaSY~wb@de;y^b9Wt<V4UyOS|dN@WGZk1A_TQRvx
z@H9Vk7!Zt~AsfK`y+~_!l##UuYH$DpIp9`myTgh2#D(yntXVGiP`lU5XKVKCnC45d
zT<T<5brBopnJkxLo-|o_e0d|(?>B)v<=&JOA9OBFSXRp{@jtQ+%UyYXz}Q9TnnL1|
zq{~~U(uIY$hLHtMP~^N{&IX?H<L_kWSeRg=j|x+0%+Bn7uN$K2oS@I6$?OoW?w@o(
z-)k`=+B#;}550!HvW{yu_c{`l#z~!(s7KX7sGMkw$%~eabII)?O~`n`zAP_d=30*P
ztFsG;_NMrRn)1x~S+F|ccchzdT)p@z4)wLbf@*To-TBYHl&scEOfEm?Q?GZ;F1%M`
zk1MC|3Z&7fZ~adKN)X6lz}=tg5k07l`58+A6=fUqd`eac<N?}Ui|k;yd#i|#bYDG3
zy24+m*=r`MH#Q*WC()rPO>dRcRdtHl*W7Hn$CK!w*%465xh4vq3g@gC26*0urg22q
zO>3mckb~ztsI~@fWb6=mJBts``)}3pF%LZMc}9RvjA0?Tr}c~iJuI{#ADX`;pg~{T
zw8H8jnJn1zB*?)Iu)}u3nX|{hZRf2**urW5R!zT;hjIZpBq=uun?Bg1wLCOLCLa`}
z^f4_&VAQZ5J&kEFXjZJAW9Z%;nTV}k?GTuw%Fezh)|It^uyZ(3B`;Cs^SN)4RI2gp
zHs?FgR6_N<?!{+v9DAu*@@-spur?yT&)oHVjz6`qjld_VbXox!dB++Wam8SR58kRY
zh=O;u-!BNEy%_i%^yw2x)s%DxvyP9fHKt7l9aNdQq~0q}Zz73@%E(uee^|c?n`Zl1
z+2x3>L;oI)kL2aJmKX1(;5VIc^URNELawyXgfFnfE?8O*J9rh$<(z@a_h<jo9A*rI
zrbaB--j=gCnYs6ryD8SEB2uI&lK1Q*W6URrUB)@(Xum?7L%78NE=F*-*4ydYaMbh>
z#QigaUBeN~66;^8+)CaCBX7&qtkC)xFSWfAc_bPzWAvIa?8S@wDr)wxt&4QadakxP
zG|iZ%nlPlMUtHXL@<VsNv*h}Q{9rPDDxy+Wa|REpxuQA6KCfVF%&JOtyxAh+KX?FH
zT-T(ylHAlV_>A=F;!Dk!8qd0%cl4buL$am(ZFC5m_7<QjR5Fp~KG2drf$zETNOM*N
zPP$-WjBe$M>1E$D5xRsC9%mvvI;ppRSypJJ)J%7!$`_Uw4>wFp|NAvIj%-8yn6?bG
zLmKaYUz3BkfjKb*rbFC2zJ1D!^ZI8756a&3Cx%vq#UU~!LYXg(-!C+1K1yjDS_FIW
zYL4mRJ8H)+f8r19U?}p;S-p$5H7nvcF0aA*{Uj4|ls@*We(cxGYkp^Brd?UyAC~oH
z{)N7~+^U0@hX+>=e!Es=Vc6jRT=-V^+*@sim-acyhuV<bejF_?2BK`Bs5+vcPL%p+
zrzVfgu9bG#IJ@U^3&Zp;g3=Iuy6BLz(IFKV+=Bh|YNQjwIg-`bk~P?p)nJ)w5`%kB
zop&Oab(b8gr+Ic8g;+bceD!r>@XR!P;gjwZbtEb&LDm4=tt|j~(~IGrMj|q+`oOm@
z>Mt6f9KT;NbS3kK-o9<m@{{bL%pKuw^bPVH7?-+Xl(O3U=3FCI9@2d~A%q?B?6NxF
zPJ{=D&a0;wN7kxRHyEDrF!j(pA*^S@Z(nrUcOm{@fR8n3AE3gcV0JfIJeyzE$4Z#|
z{#;V$)hx}zdw8Ij|K~<8t0b}2g1@ZwcW>qe2~H(BF*=2-44y%Lxur&{`ioYd6)TOv
zbD-sVmEJ~c>cN}2_BIc1zf7IO*AZ+)ts@}baw?7sanTy_i(z>1ayQ;Z^SIw7t<Bvz
zwpkaGRo?QawSu>#bc}yhwQxx50j*@^upwEjJzHWId!{A>NT<~Nlxj@Xpk#A;&!39V
z>Mr%CYIN5ni_0+Fb3O*AT$ay7Eo_t~>=fzAB#Hn~tC$he7P+5DbED-Hoj(e(vp!jx
z%fWVJvAZpjw-?-I+PrJ=)QzSj{wzR=^^dk*<!VPiT3U@3#=ZDsEdK47dkg?%rs(xe
z;qp>Tv-A)%=yF~(Y>uOIcRl;xV|EK0@r3xxe_NA=xA`F>AN3n!NZP^7iRZ&|i87aT
z5MLAyUuCsN7tp?Hz81ZAW!$mYCr|U4Gvml_{$RItcG<4qBSR037yv4!YriP$58}5u
zU)r9xzMf?A2nUKmizz9ADVsV`z$gnBrQGGePt^!Kc2gi8y}Fu#ge|o(v(bP_7)FO;
z-yuw!mx#!zr1d#^4X~aITi)K^y#nS&EBX;qhZ4@CVZ{_z(N1o5ro2fs8l+X3EWjzk
znFFxgj838>C5E>q3}V+P3-7w3hk93Qm+vs8h8tyht;cWYV3X_E{r5zD^4m*_HwOb&
z4i4QXTSrU2$@oD_^EUU71X_`aH*=hN3}r=*!8F|HOrU`^5P16Q9Pl=yDq{?kAP#T4
zC9g*miu}}?G^AVXkMm>b&%_q9nLQ{gr`p3#CmPdiM^x2uoHdb!WyouOX|4TZBNIxO
z9DVcap7_b763Gg#J&%kmS0|(|`-Ut}V<LTFn+|iJMq3$(IsfrKqE05uDyE-v3_bWJ
zA}xsgY2G5Vcl$tnbB+Itm6r|OV;*&KWqHlso_QYb)m1`q*SP5N$c*xGW9TH_m;vTQ
z<fXNMj+3~}1k}*u$S?xnNOs#P4czV=XI0$lUIF2mZcOLFk9_F9_9Q1V&ed56JF<I6
zpsG3${Zpy?hU9yH>5Ax3ln_G@kD(DY+xaLquoLKP3TQm`y+f^0>Z9QBN3*BzF`nSj
z)tra$8wfYv0cjde3<K8n#J00JOEAhVfGeoVki68~vfY4tK+E~;j(XxcJ$G|G05$L*
z6dxut2vju&)+gmzR+v$}F?SOQ%o~Ix4+R-glv#3BhnaJR+`Aq5Pr9;b)~N8ps3@|F
zVs^mr-Vbj;5}fpWS!Kj=MOB#hS;AjSe_anBoTZH+S>25>&xes()h!|U?AP+>$jfnS
z#L9DYZK&?Y^RLeW)Za@VexQB{H!UpvPG(TCpud#zJ;>0M5_Z;9fvqvjTr6Zzg$W1#
zmUJOA+KLHouc7Fog^SATOX1g)>$nTwxF6rQ=WE`zr>ax4c!4(hBl)l~*Fu(Qp%!u0
zim?xi<fT*-jZ(QC3x=`XHh)QfC1o$x`P#5;7FJ$xxQ8rxNN*{nvv?a(p;KuVBbL*A
zcDXfz2^Jv+UY13~L47-&K5RGfX%1k7Hz52v#1mW;W7mod?ZFqhD4Bn7MrV<l-}Isr
zc~#6mR_xzVw&*LknD%k2;};*v{()82b^WDz{p85Oy*A4le<+Vjjr3U>@uWRFVn^*;
z1D~wOKUsxenI&(t+^}X77iItsm8lt{05&9Gj~=HDMiV>^-jvRCC7{|E?9jBfp6UH}
zO&~9<#$XN)^<;uo#NOtK9*`V$?1>%}S8cb69)!~`8@#dzxn8_2*xGWTNvt;g?n!<0
zG1vrVCE+tK<#Qd?z@r3VNkEKtRH1k^z1f&RuWe@I1w`L`l)|P1sqY`BL$$(tm9*?k
z6iLO~I99^MpwO3EX=4+Ayv>Ar5d^Xt5M$-(cA8&X)&pM1jRv!Q6g@HONcwbp_$T?F
zak8TiRAAA7Ip+QS20T=HZJ58Dq|!vcj5cKG`pB9AY<giwZ4Y+5kI=2;q{mLi<0CCz
zN<%={;{K^wwq<S#$Ha=S|9E#V>)Et&_ios<@yph&nMUKX@{tFuCN~^g%{-saiBJ2B
zob!5P$T?5VN%~2DBk1HJG4X_rn%e8y@F`UwBON*z?~NxPJ{GO$WKyo~nqM&pi$s_{
z+1NCEyF=KxS+&O3{h>}^9_*{jZ^{e5GY0#uJ2gpNjDD(|Qgxy}@S$}Q$pky)*o`7`
zoYSj|v;M+TK<*}KTM&GY_3&0HW+JYLnLmH-;h6cV?$V)4o4?l+y2pr4(SwbgC!zK`
zQI6Ajl~8m8<<e5@Nfq~9?y%dDv7sIUQI;|ARu^lRX$d<7a_O8oz!#@mI&K000M`~(
zRG$j!=&9QqOFL5wZ$G7r&7(mr)wRhOUM~J<65X_u`=%i$*|9&7E(G-;7?bZ4SO7g6
z%tPU|clte5m`SF6sJe2@V{)GGK%IBgbFzO^w}&YkxNm3<4aJas<VGD67{xEswaYCJ
z7~Yma^Ow5_O}#s@=OIyUF?MNCztOPk#NUw7DzLDm8uLo(Nmi4z=C|n&PWI|t(bsl6
zBC4(P)=(m3AR4So!*+YL46Uq%F2_h}ba9WbzR)p4QyjR)IVBPq+mb?jIf?jNSue6&
zf^VNdSva>HF8Ynq?QqLbcH#8U9FRqy^GV}<q<GHI36bn)X8H-<+Rh2ApGDif3QG?l
z1ENpHpfCuwHpxkC@cH_lH9j0%$9qN)NGd#*yo21=33l~ln+X>so09n~fz{Ms59fU0
z;Lc^HBW!Yy+5;`B&$L?DZ+At%pf%T*@kFo#F>Tio;HKPWY>j9|qD%nG(gGr%9-`4M
z?O-7K!c6r-!D-}$Gp<CCsPe0XM>mQVl1a93Rv}2exRm7_7(b_@WiFrRIk`1O-!rHZ
z8*0{n^lo#Os0i05l=I*vI@>FD7R4uDFj{ZyIZhA#LcYuY74S-iomgIhet`AZ#@L%-
zF>bZXIwd!qIp;0+&>&5!$3>*z$0&$%P5mz;<nA)U^hd`J$Vb1hPTwXT{DGhG8po8=
z!N3p(8gyR38tJbGmck~$o44Yumvp4o7mlB0@#}ii^T%uqCSk{Zln{-Oi6?e>L6Q%u
zHeezHxk_Lz;PTBB1c@5Y6<JS~wzly-y#oXI)EU*OYP<p{5F(U%7Xi|WewQj|>y&fA
zXOt~Gy*p<Ll$Pp+3I39|TKaU(?j5&48;oc&v${QZs&ulT?`=6xPe5uwXnpbI?fc{?
zc2lmBPViEg@Kb7lv<xf%-5$+q)g>)*y#%e3SYr9NCT5FJ{GEg;U4+~=1bqY9{4c(e
zZ=Ip{b3zvwX;Ai|!zX?orwr`|H7zq)5P<o>2hfKcSSz>s+CXIz^g=-M1;69lLePAH
zHne=b;<M*4A~t&(4B(<5h7GgVpi5P$ZHNmI0Z`kF*AYFG`dIRggey%9S=;TCi>6zV
z1(^|i>ILswBgl-@aE*aXexr%KD@v>Xik_}N#Re*r*3}CW9C+Iml;-3=BGEVn6WvOd
zWusskzGQowAm>=`(Sa5yU@)9+#HfCGzWrBDXc?cSrQAsL3Ps^5h8;&I38+st2zp#}
z!ndC=ikx&LqL`ceo<xWF__6pUJ{`o7ItIciXe6qE6Cue3EdivCk?FB9W}Z3EIM{;y
zHvRVoDLIRi4TerTDiOb1NvKZc@|xcgU*Na(^k8OChS)_9?~gsE4NrRQ)=q!^%;^BI
z$ik<#6HqN3ggq*R^<bn{!CTKpkNfhZ-URT__APewH__tXq8}iHG@1Z!PIZb#RVh0Z
z<nm0d-f_jFk3m~N_{o|NA2HGVwAyi@nX`n+1yEbgiiE*Fo0m)vyRfxGLwWO7_=Vxs
z*zBVBEdBHx8ZZS}P$+8>NoE4E&|R8ccV&eZfj%oDL1oOBn|_8uUt>rH#ZIrfFOI+`
zm3K`OKINs_<_?%0pAzcT1u-l1OPjEAPD)=VOFfO#5uqDQ8eAVmhB;b8gOP!QXZZHt
z^&|NuM0y<oq;TZA&d)ELF4DqR)`3~tx(BZ~*WPkw3j>jSOc+PlmzFjF<?05M>vV;N
zdl94Jj(wy=Vg}s8yS-Yyygw>9@ag8mEbc<m(>D#rDC)Pms$G!gFJZC+p?GBWD2PC1
zr8*GO<!Ee?i1R<EV_-LV6}5DpC4ise_H~L5Tt5l$xkC`Yg9nhVMk?LyTaT^eEKc?+
zP~+5rAX9ZsB#G@H+yvbWGV%B<U_3W<!tn0J2btL_rxi(8lO7#5`9j!)t7IXOq#M9r
z`9nO3u?tQ1yXG1Lcr*N%lY?3#k|Q<cS=y0=w{hT1%H%^Qc$dGm3{jK73e?Q-IC%m!
z36rRRG;)^Alp#^mpla%%h|f(f=sG7Hj=%wqNIo!|r*JSkHXp#@4$P6L^6MuE9Gy?<
z2XzD<He29<OX=&lYY)r03&Z}7>_{eYqw=v`kRV$OR))Az>k|vmARSWo??TnTD;b8+
z*;AZSWT8N*3thjFMAFPb*^OgV$6SCh@PYS0Q|N+*?&>;mDCj%EqX=M+@Tt3hVfZ<&
z_rWE9DA;~>*-%ym7nbY)9f(?zslkLW+K%g&|Iy>b&9C|Gs|;SC<Bs|7A(}wNeP!CA
zSDhk-o4->n+Z%};8X~Frv*DeH2mNq~Owb#HL_rf!%y3!PU*;#41h|%MU{SrEK14?D
zTSM3N&tU%EPj$_UfC$T}FA1n^WMG~B`^?ko2=~&|TUUlpO<E%ok%6`I|LZRp(m;cU
zClXD`$sqXH)CM?6x8m5*qKKDSt}2A|k`(`a&VV&&);K{vwhJI?3^e>ZS-A{EQw8U#
zSL21p_)5Y{DgQgm!(1L4WzEvU4?>_)%VGL^tjAQt!TU(&&x&Hj*EtC?2n53Ap=9V`
zZQ)@fVdZWEenEr;1jYFT1;9&JKuAJFTtZlkM?gSAK)}f^OZWer;OuH`|M1EGe*%jL
S_X0QpqN=2+_(tA5=zjp)(cIYp

diff --git a/src/assets/404_images/404_cloud.png b/src/assets/404_images/404_cloud.png
index 9ccec138d9a658be2df5b82c8d10e142030d66eb..c6281d09013e0a2c5f8e699a0a6038d9480291e5 100644
GIT binary patch
literal 4766
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

literal 3054
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

diff --git a/src/icons/index.js b/src/assets/icons/index.js
similarity index 79%
rename from src/icons/index.js
rename to src/assets/icons/index.js
index d9fe4d8..2c6b309 100644
--- a/src/icons/index.js
+++ b/src/assets/icons/index.js
@@ -1,9 +1,9 @@
 import Vue from 'vue'
-import SvgIcon from '@/components/SvgIcon' // svg组件
+import SvgIcon from '@/components/SvgIcon'// svg component
 
 // register globally
 Vue.component('svg-icon', SvgIcon)
 
-const requireAll = requireContext => requireContext.keys().map(requireContext)
 const req = require.context('./svg', false, /\.svg$/)
+const requireAll = requireContext => requireContext.keys().map(requireContext)
 requireAll(req)
diff --git a/src/assets/icons/svg/404.svg b/src/assets/icons/svg/404.svg
new file mode 100644
index 0000000..6df5019
--- /dev/null
+++ b/src/assets/icons/svg/404.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M121.718 73.272v9.953c3.957-7.584 6.199-16.05 6.199-24.995C127.917 26.079 99.273 0 63.958 0 28.644 0 0 26.079 0 58.23c0 .403.028.806.028 1.21l22.97-25.953h13.34l-19.76 27.187h6.42V53.77l13.728-19.477v49.361H22.998V73.272H2.158c5.951 20.284 23.608 36.208 45.998 41.399-1.44 3.3-5.618 11.263-12.565 12.674-8.607 1.764 23.358.428 46.163-13.178 17.519-4.611 31.938-15.849 39.77-30.513h-13.506V73.272H85.02V59.464l22.998-25.977h13.008l-19.429 27.187h6.421v-7.433l13.727-19.402v39.433h-.027zm-78.24 2.822a10.516 10.516 0 0 1-.996-4.535V44.548c0-1.613.332-3.124.996-4.535a11.66 11.66 0 0 1 2.713-3.68c1.134-1.032 2.49-1.864 4.04-2.468 1.55-.605 3.21-.908 4.982-.908h11.292c1.77 0 3.431.303 4.981.908 1.522.604 2.85 1.41 3.986 2.418l-12.26 16.303v-2.898a1.96 1.96 0 0 0-.665-1.512c-.443-.403-.996-.604-1.66-.604-.665 0-1.218.201-1.661.604a1.96 1.96 0 0 0-.664 1.512v9.071L44.364 77.606a10.556 10.556 0 0 1-.886-1.512zm35.73-4.535c0 1.613-.332 3.124-.997 4.535a11.66 11.66 0 0 1-2.712 3.68c-1.134 1.032-2.49 1.864-4.04 2.469-1.55.604-3.21.907-4.982.907H55.185c-1.77 0-3.431-.303-4.981-.907-1.55-.605-2.906-1.437-4.041-2.47a12.49 12.49 0 0 1-1.384-1.512l13.727-18.217v6.375c0 .605.222 1.109.665 1.512.442.403.996.604 1.66.604.664 0 1.218-.201 1.66-.604a1.96 1.96 0 0 0 .665-1.512V53.87L75.97 36.838c.913.932 1.66 1.99 2.214 3.175.664 1.41.996 2.922.996 4.535v27.011h.028z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/Steve-Jobs.svg b/src/assets/icons/svg/Steve-Jobs.svg
similarity index 100%
rename from src/icons/svg/Steve-Jobs.svg
rename to src/assets/icons/svg/Steve-Jobs.svg
diff --git a/src/icons/svg/add.svg b/src/assets/icons/svg/add.svg
similarity index 100%
rename from src/icons/svg/add.svg
rename to src/assets/icons/svg/add.svg
diff --git a/src/icons/svg/alipay.svg b/src/assets/icons/svg/alipay.svg
similarity index 100%
rename from src/icons/svg/alipay.svg
rename to src/assets/icons/svg/alipay.svg
diff --git a/src/icons/svg/anq.svg b/src/assets/icons/svg/anq.svg
similarity index 100%
rename from src/icons/svg/anq.svg
rename to src/assets/icons/svg/anq.svg
diff --git a/src/assets/icons/svg/bug.svg b/src/assets/icons/svg/bug.svg
new file mode 100644
index 0000000..05a150d
--- /dev/null
+++ b/src/assets/icons/svg/bug.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M127.88 73.143c0 1.412-.506 2.635-1.518 3.669-1.011 1.033-2.209 1.55-3.592 1.55h-17.887c0 9.296-1.783 17.178-5.35 23.645l16.609 17.044c1.011 1.034 1.517 2.257 1.517 3.67 0 1.412-.506 2.635-1.517 3.668-.958 1.033-2.155 1.55-3.593 1.55-1.438 0-2.635-.517-3.593-1.55l-15.811-16.063a15.49 15.49 0 0 1-1.196 1.06c-.532.434-1.65 1.208-3.353 2.322a50.104 50.104 0 0 1-5.192 2.974c-1.758.87-3.94 1.658-6.546 2.364-2.607.706-5.189 1.06-7.748 1.06V47.044H58.89v73.062c-2.716 0-5.417-.367-8.106-1.102-2.688-.734-5.003-1.631-6.945-2.692a66.769 66.769 0 0 1-5.268-3.179c-1.571-1.057-2.73-1.94-3.476-2.65L33.9 109.34l-14.611 16.877c-1.066 1.14-2.344 1.711-3.833 1.711-1.277 0-2.422-.434-3.434-1.304-1.012-.978-1.557-2.187-1.635-3.627-.079-1.44.333-2.705 1.236-3.794l16.129-18.51c-3.087-6.197-4.63-13.644-4.63-22.342H5.235c-1.383 0-2.58-.517-3.592-1.55S.125 74.545.125 73.132c0-1.412.506-2.635 1.518-3.668 1.012-1.034 2.21-1.55 3.592-1.55h17.887V43.939L9.308 29.833c-1.012-1.033-1.517-2.256-1.517-3.669 0-1.412.505-2.635 1.517-3.668 1.012-1.034 2.21-1.55 3.593-1.55s2.58.516 3.593 1.55l13.813 14.106h67.396l13.814-14.106c1.012-1.034 2.21-1.55 3.592-1.55 1.384 0 2.581.516 3.593 1.55 1.012 1.033 1.518 2.256 1.518 3.668 0 1.413-.506 2.636-1.518 3.67l-13.814 14.105v23.975h17.887c1.383 0 2.58.516 3.593 1.55 1.011 1.033 1.517 2.256 1.517 3.668l-.005.01zM89.552 26.175H38.448c0-7.23 2.489-13.386 7.466-18.469C50.892 2.623 56.92.082 64 .082c7.08 0 13.108 2.541 18.086 7.624 4.977 5.083 7.466 11.24 7.466 18.469z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/chain.svg b/src/assets/icons/svg/chain.svg
similarity index 100%
rename from src/icons/svg/chain.svg
rename to src/assets/icons/svg/chain.svg
diff --git a/src/assets/icons/svg/chart.svg b/src/assets/icons/svg/chart.svg
new file mode 100644
index 0000000..27728fb
--- /dev/null
+++ b/src/assets/icons/svg/chart.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 54.857h36.571V128H0V54.857zM91.429 27.43H128V128H91.429V27.429zM45.714 0h36.572v128H45.714V0z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/clipboard.svg b/src/assets/icons/svg/clipboard.svg
new file mode 100644
index 0000000..90923ff
--- /dev/null
+++ b/src/assets/icons/svg/clipboard.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.857 118.857h64V73.143H89.143c-1.902 0-3.52-.668-4.855-2.002-1.335-1.335-2.002-2.954-2.002-4.855V36.57H54.857v82.286zM73.143 16v-4.571a2.2 2.2 0 0 0-.677-1.61 2.198 2.198 0 0 0-1.609-.676H20.571c-.621 0-1.158.225-1.609.676a2.198 2.198 0 0 0-.676 1.61V16a2.2 2.2 0 0 0 .676 1.61c.451.45.988.676 1.61.676h50.285c.622 0 1.158-.226 1.61-.677.45-.45.676-.987.676-1.609zm18.286 48h21.357L91.43 42.642V64zM128 73.143v48c0 1.902-.667 3.52-2.002 4.855-1.335 1.335-2.953 2.002-4.855 2.002H52.57c-1.901 0-3.52-.667-4.854-2.002-1.335-1.335-2.003-2.953-2.003-4.855v-11.429H6.857c-1.902 0-3.52-.667-4.855-2.002C.667 106.377 0 104.759 0 102.857v-96c0-1.902.667-3.52 2.002-4.855C3.337.667 4.955 0 6.857 0h77.714c1.902 0 3.52.667 4.855 2.002 1.335 1.335 2.003 2.953 2.003 4.855V30.29c1 .622 1.856 1.29 2.569 2.003l29.147 29.147c1.335 1.335 2.478 3.145 3.429 5.43.95 2.287 1.426 4.383 1.426 6.291v-.018z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/codeConsole.svg b/src/assets/icons/svg/codeConsole.svg
similarity index 100%
rename from src/icons/svg/codeConsole.svg
rename to src/assets/icons/svg/codeConsole.svg
diff --git a/src/assets/icons/svg/component.svg b/src/assets/icons/svg/component.svg
new file mode 100644
index 0000000..207ada3
--- /dev/null
+++ b/src/assets/icons/svg/component.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h54.857v54.857H0V0zm0 73.143h54.857V128H0V73.143zm73.143 0H128V128H73.143V73.143zm27.428-18.286C115.72 54.857 128 42.577 128 27.43 128 12.28 115.72 0 100.571 0 85.423 0 73.143 12.28 73.143 27.429c0 15.148 12.28 27.428 27.428 27.428z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/dashboard.svg b/src/assets/icons/svg/dashboard.svg
new file mode 100644
index 0000000..5317d37
--- /dev/null
+++ b/src/assets/icons/svg/dashboard.svg
@@ -0,0 +1 @@
+<svg width="128" height="100" xmlns="http://www.w3.org/2000/svg"><path d="M27.429 63.638c0-2.508-.893-4.65-2.679-6.424-1.786-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.465 2.662-1.785 1.774-2.678 3.916-2.678 6.424 0 2.508.893 4.65 2.678 6.424 1.786 1.775 3.94 2.662 6.465 2.662 2.524 0 4.678-.887 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zm13.714-31.801c0-2.508-.893-4.65-2.679-6.424-1.785-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zM71.714 65.98l7.215-27.116c.285-1.23.107-2.378-.536-3.443-.643-1.064-1.56-1.762-2.75-2.094-1.19-.33-2.333-.177-3.429.462-1.095.639-1.81 1.573-2.143 2.804l-7.214 27.116c-2.857.237-5.405 1.266-7.643 3.088-2.238 1.822-3.738 4.152-4.5 6.992-.952 3.644-.476 7.098 1.429 10.364 1.905 3.265 4.69 5.37 8.357 6.317 3.667.947 7.143.474 10.429-1.42 3.285-1.892 5.404-4.66 6.357-8.305.762-2.84.619-5.607-.429-8.305-1.047-2.697-2.762-4.85-5.143-6.46zm47.143-2.342c0-2.508-.893-4.65-2.678-6.424-1.786-1.775-3.94-2.662-6.465-2.662-2.524 0-4.678.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.786 1.775 3.94 2.662 6.464 2.662 2.524 0 4.679-.887 6.465-2.662 1.785-1.775 2.678-3.916 2.678-6.424zm-45.714-45.43c0-2.509-.893-4.65-2.679-6.425C68.68 10.01 66.524 9.122 64 9.122c-2.524 0-4.679.887-6.464 2.661-1.786 1.775-2.679 3.916-2.679 6.425 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zm32 13.629c0-2.508-.893-4.65-2.679-6.424-1.785-1.775-3.94-2.662-6.464-2.662-2.524 0-4.679.887-6.464 2.662-1.786 1.774-2.679 3.916-2.679 6.424 0 2.508.893 4.65 2.679 6.424 1.785 1.774 3.94 2.662 6.464 2.662 2.524 0 4.679-.888 6.464-2.662 1.786-1.775 2.679-3.916 2.679-6.424zM128 63.638c0 12.351-3.357 23.78-10.071 34.286-.905 1.372-2.19 2.058-3.858 2.058H13.93c-1.667 0-2.953-.686-3.858-2.058C3.357 87.465 0 76.037 0 63.638c0-8.613 1.69-16.847 5.071-24.703C8.452 31.08 13 24.312 18.714 18.634c5.715-5.68 12.524-10.199 20.429-13.559C47.048 1.715 55.333.035 64 .035c8.667 0 16.952 1.68 24.857 5.04 7.905 3.36 14.714 7.88 20.429 13.559 5.714 5.678 10.262 12.446 13.643 20.301 3.38 7.856 5.071 16.09 5.071 24.703z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/date.svg b/src/assets/icons/svg/date.svg
similarity index 100%
rename from src/icons/svg/date.svg
rename to src/assets/icons/svg/date.svg
diff --git a/src/icons/svg/dept.svg b/src/assets/icons/svg/dept.svg
similarity index 100%
rename from src/icons/svg/dept.svg
rename to src/assets/icons/svg/dept.svg
diff --git a/src/icons/svg/dev.svg b/src/assets/icons/svg/dev.svg
similarity index 100%
rename from src/icons/svg/dev.svg
rename to src/assets/icons/svg/dev.svg
diff --git a/src/icons/svg/develop.svg b/src/assets/icons/svg/develop.svg
similarity index 100%
rename from src/icons/svg/develop.svg
rename to src/assets/icons/svg/develop.svg
diff --git a/src/icons/svg/dictionary.svg b/src/assets/icons/svg/dictionary.svg
similarity index 100%
rename from src/icons/svg/dictionary.svg
rename to src/assets/icons/svg/dictionary.svg
diff --git a/src/assets/icons/svg/documentation.svg b/src/assets/icons/svg/documentation.svg
new file mode 100644
index 0000000..7043122
--- /dev/null
+++ b/src/assets/icons/svg/documentation.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M71.984 44.815H115.9L71.984 9.642v35.173zM16.094.05h63.875l47.906 38.37v76.74c0 3.392-1.682 6.645-4.677 9.044-2.995 2.399-7.056 3.746-11.292 3.746H16.094c-4.236 0-8.297-1.347-11.292-3.746-2.995-2.399-4.677-5.652-4.677-9.044V12.84C.125 5.742 7.23.05 16.094.05zm71.86 102.32V89.58h-71.86v12.79h71.86zm23.952-25.58V64H16.094v12.79h95.812z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/drag.svg b/src/assets/icons/svg/drag.svg
new file mode 100644
index 0000000..4185d3c
--- /dev/null
+++ b/src/assets/icons/svg/drag.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M73.137 29.08h-9.209 29.7L63.886.093 34.373 29.08h20.49v27.035H27.238v17.948h27.625v27.133h18.274V74.063h27.41V56.115h-27.41V29.08zm-9.245 98.827l27.518-26.711H36.59l27.302 26.71zM.042 64.982l27.196 27.029V38.167L.042 64.982zm100.505-26.815V92.01l27.41-27.029-27.41-26.815z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/edit.svg b/src/assets/icons/svg/edit.svg
new file mode 100644
index 0000000..d26101f
--- /dev/null
+++ b/src/assets/icons/svg/edit.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M106.133 67.2a4.797 4.797 0 0 0-4.8 4.8c0 .187.014.36.027.533h-.027V118.4H9.6V26.667h50.133c2.654 0 4.8-2.147 4.8-4.8 0-2.654-2.146-4.8-4.8-4.8H9.6a9.594 9.594 0 0 0-9.6 9.6V118.4c0 5.307 4.293 9.6 9.6 9.6h91.733c5.307 0 9.6-4.293 9.6-9.6V72.533h-.026c.013-.173.026-.346.026-.533 0-2.653-2.146-4.8-4.8-4.8z"/><path d="M125.16 13.373L114.587 2.8c-3.747-3.747-9.854-3.72-13.6.027l-52.96 52.96a4.264 4.264 0 0 0-.907 1.36L33.813 88.533c-.746 1.76-.226 3.534.907 4.68 1.133 1.147 2.92 1.667 4.693.92l31.4-13.293c.507-.213.96-.52 1.36-.907l52.96-52.96c3.747-3.746 3.774-9.853.027-13.6zM66.107 72.4l-18.32 7.76 7.76-18.32L92.72 24.667l10.56 10.56L66.107 72.4zm52.226-52.227l-8.266 8.267-10.56-10.56 8.266-8.267.027-.026 10.56 10.56-.027.026z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/education.svg b/src/assets/icons/svg/education.svg
new file mode 100644
index 0000000..7bfb01d
--- /dev/null
+++ b/src/assets/icons/svg/education.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M88.883 119.565c-7.284 0-19.434 2.495-21.333 8.25v.127c-4.232.13-5.222 0-7.108 0-1.895-5.76-14.045-8.256-21.333-8.256H0V0h42.523c9.179 0 17.109 5.47 21.47 13.551C68.352 5.475 76.295 0 85.478 0H128v119.57l-39.113-.005h-.004zM60.442 24.763c0-9.651-8.978-16.507-17.777-16.507H7.108V111.43H39.11c7.054-.14 18.177.082 21.333 6.12v-4.628c-.134-5.722-.004-13.522 0-13.832V27.413l.004-2.655-.004.005zm60.442-16.517h-35.55c-8.802 0-17.78 6.856-17.78 16.493v74.259c.004.32.138 8.115 0 13.813v4.627c3.155-6.022 14.279-6.26 21.333-6.114h32V8.25l-.003-.005z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/email.svg b/src/assets/icons/svg/email.svg
similarity index 100%
rename from src/icons/svg/email.svg
rename to src/assets/icons/svg/email.svg
diff --git a/src/icons/svg/error.svg b/src/assets/icons/svg/error.svg
similarity index 100%
rename from src/icons/svg/error.svg
rename to src/assets/icons/svg/error.svg
diff --git a/src/assets/icons/svg/example.svg b/src/assets/icons/svg/example.svg
new file mode 100644
index 0000000..46f42b5
--- /dev/null
+++ b/src/assets/icons/svg/example.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M96.258 57.462h31.421C124.794 27.323 100.426 2.956 70.287.07v31.422a32.856 32.856 0 0 1 25.971 25.97zm-38.796-25.97V.07C27.323 2.956 2.956 27.323.07 57.462h31.422a32.856 32.856 0 0 1 25.97-25.97zm12.825 64.766v31.421c30.46-2.885 54.507-27.253 57.713-57.712H96.579c-2.886 13.466-13.146 23.726-26.292 26.291zM31.492 70.287H.07c2.886 30.46 27.253 54.507 57.713 57.713V96.579c-13.466-2.886-23.726-13.146-26.291-26.292z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/excel.svg b/src/assets/icons/svg/excel.svg
new file mode 100644
index 0000000..74d97b8
--- /dev/null
+++ b/src/assets/icons/svg/excel.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.208 16.576v8.384h38.72v5.376h-38.72v8.704h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.512h38.72v5.376h-38.72v11.136H128v-94.72H78.208zM0 114.368L72.128 128V0L0 13.632v100.736z"/><path d="M28.672 82.56h-11.2l14.784-23.488-14.08-22.592h11.52l8.192 14.976 8.448-14.976h11.136l-14.08 22.208L58.368 82.56H46.656l-8.768-15.68z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/exit-fullscreen.svg b/src/assets/icons/svg/exit-fullscreen.svg
new file mode 100644
index 0000000..485c128
--- /dev/null
+++ b/src/assets/icons/svg/exit-fullscreen.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M49.217 41.329l-.136-35.24c-.06-2.715-2.302-4.345-5.022-4.405h-3.65c-2.712-.06-4.866 2.303-4.806 5.016l.152 19.164-24.151-23.79a6.698 6.698 0 0 0-9.499 0 6.76 6.76 0 0 0 0 9.526l23.93 23.713-18.345.074c-2.712-.069-5.228 1.813-5.64 5.02v3.462c.069 2.721 2.31 4.97 5.022 5.03l35.028-.207c.052.005.087.025.133.025l2.457.054a4.626 4.626 0 0 0 3.436-1.38c.88-.874 1.205-2.096 1.169-3.462l-.262-2.465c0-.048.182-.081.182-.136h.002zm52.523 51.212l18.32-.073c2.713.06 5.224-1.609 5.64-4.815v-3.462c-.068-2.722-2.317-4.97-5.021-5.04l-34.58.21c-.053 0-.086-.021-.138-.021l-2.451-.06a4.64 4.64 0 0 0-3.445 1.381c-.885.868-1.201 2.094-1.174 3.46l.27 2.46c.005.06-.177.095-.177.141l.141 34.697c.069 2.713 2.31 4.338 5.022 4.397l3.45.006c2.705.062 4.867-2.31 4.8-5.026l-.153-18.752 24.151 23.946a6.69 6.69 0 0 0 9.494 0 6.747 6.747 0 0 0 0-9.523L101.74 92.54v.001zM48.125 80.662a4.636 4.636 0 0 0-3.437-1.382l-2.457.06c-.05 0-.082.022-.137.022l-35.025-.21c-2.712.07-4.957 2.318-5.022 5.04v3.462c.409 3.206 2.925 4.874 5.633 4.814l18.554.06-24.132 23.928c-2.62 2.626-2.62 6.89 0 9.524a6.694 6.694 0 0 0 9.496 0l24.155-23.79-.155 18.866c-.06 2.722 2.094 5.093 4.801 5.025h3.65c2.72-.069 4.962-1.685 5.022-4.406l.141-34.956c0-.05-.182-.082-.182-.136l.262-2.46c.03-1.366-.286-2.592-1.166-3.46h-.001zM80.08 47.397a4.62 4.62 0 0 0 3.443 1.374l2.45-.054c.055 0 .088-.02.143-.028l35.08.21c2.712-.062 4.953-2.312 5.021-5.033l.009-3.463c-.417-3.211-2.937-5.084-5.64-5.025l-18.615-.073 23.917-23.715c2.63-2.623 2.63-6.879.008-9.513a6.691 6.691 0 0 0-9.494 0L92.251 26.016l.155-19.312c.065-2.713-2.097-5.085-4.802-5.025h-3.45c-2.713.069-4.954 1.693-5.022 4.406l-.139 35.247c0 .054.18.088.18.136l-.267 2.465c-.028 1.366.288 2.588 1.174 3.463v.001z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/eye-open.svg b/src/assets/icons/svg/eye-open.svg
new file mode 100644
index 0000000..88dcc98
--- /dev/null
+++ b/src/assets/icons/svg/eye-open.svg
@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><defs><style/></defs><path d="M512 128q69.675 0 135.51 21.163t115.498 54.997 93.483 74.837 73.685 82.006 51.67 74.837 32.17 54.827L1024 512q-2.347 4.992-6.315 13.483T998.87 560.17t-31.658 51.669-44.331 59.99-56.832 64.34-69.504 60.16-82.347 51.5-94.848 34.687T512 896q-69.675 0-135.51-21.163t-115.498-54.826-93.483-74.326-73.685-81.493-51.67-74.496-32.17-54.997L0 513.707q2.347-4.992 6.315-13.483t18.816-34.816 31.658-51.84 44.331-60.33 56.832-64.683 69.504-60.331 82.347-51.84 94.848-34.816T512 128.085zm0 85.333q-46.677 0-91.648 12.331t-81.152 31.83-70.656 47.146-59.648 54.485-48.853 57.686-37.675 52.821-26.325 43.99q12.33 21.674 26.325 43.52t37.675 52.351 48.853 57.003 59.648 53.845T339.2 767.02t81.152 31.488T512 810.667t91.648-12.331 81.152-31.659 70.656-46.848 59.648-54.186 48.853-57.344 37.675-52.651T927.957 512q-12.33-21.675-26.325-43.648t-37.675-52.65-48.853-57.345-59.648-54.186-70.656-46.848-81.152-31.659T512 213.334zm0 128q70.656 0 120.661 50.006T682.667 512 632.66 632.661 512 682.667 391.339 632.66 341.333 512t50.006-120.661T512 341.333zm0 85.334q-35.328 0-60.33 25.002T426.666 512t25.002 60.33T512 597.334t60.33-25.002T597.334 512t-25.002-60.33T512 426.666z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/eye.svg b/src/assets/icons/svg/eye.svg
new file mode 100644
index 0000000..16ed2d8
--- /dev/null
+++ b/src/assets/icons/svg/eye.svg
@@ -0,0 +1 @@
+<svg width="128" height="64" xmlns="http://www.w3.org/2000/svg"><path d="M127.072 7.994c1.37-2.208.914-5.152-.914-6.87-2.056-1.717-4.797-1.226-6.396.982-.229.245-25.586 32.382-55.74 32.382-29.24 0-55.74-32.382-55.968-32.627-1.6-1.963-4.57-2.208-6.397-.49C-.17 3.086-.399 6.275 1.2 8.238c.457.736 5.94 7.36 14.62 14.72L4.17 35.96c-1.828 1.963-1.6 5.152.228 6.87.457.98 1.6 1.471 2.742 1.471s2.284-.49 3.198-1.472l12.564-13.983c5.94 4.416 13.021 8.587 20.788 11.53l-4.797 17.418c-.685 2.699.686 5.397 3.198 6.133h1.37c2.057 0 3.884-1.472 4.341-3.68L52.6 42.83c3.655.736 7.538 1.227 11.422 1.227 3.883 0 7.767-.49 11.422-1.227l4.797 17.173c.457 2.208 2.513 3.68 4.34 3.68.457 0 .914 0 1.143-.246 2.513-.736 3.883-3.434 3.198-6.133l-4.797-17.172c7.767-2.944 14.848-7.114 20.788-11.53l12.336 13.738c.913.981 2.056 1.472 3.198 1.472s2.284-.49 3.198-1.472c1.828-1.963 1.828-4.906.228-6.87l-11.65-13.001c9.366-7.36 14.849-14.474 14.849-14.474z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/form.svg b/src/assets/icons/svg/form.svg
new file mode 100644
index 0000000..dcbaa18
--- /dev/null
+++ b/src/assets/icons/svg/form.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M84.068 23.784c-1.02 0-1.877-.32-2.572-.96a8.588 8.588 0 0 1-1.738-2.237 11.524 11.524 0 0 1-1.042-2.621c-.232-.895-.348-1.641-.348-2.238V0h.278c.834 0 1.622.085 2.363.256.742.17 1.645.575 2.711 1.214 1.066.64 2.363 1.535 3.892 2.686 1.53 1.15 3.453 2.664 5.77 4.54 2.502 2.045 4.494 3.771 5.977 5.178 1.483 1.406 2.618 2.6 3.406 3.58.787.98 1.274 1.812 1.46 2.494.185.682.277 1.278.277 1.79v2.046H84.068zM127.3 84.01c.278.682.464 1.535.556 2.558.093 1.023-.37 2.003-1.39 2.94-.463.427-.88.832-1.25 1.215-.372.384-.696.704-.974.96a6.69 6.69 0 0 1-.973.767l-11.816-10.741a44.331 44.331 0 0 0 1.877-1.535 31.028 31.028 0 0 1 1.737-1.406c1.112-.938 2.317-1.343 3.615-1.215 1.297.128 2.363.405 3.197.83.927.427 1.923 1.173 2.989 2.239 1.065 1.065 1.876 2.195 2.432 3.388zM78.23 95.902c2.038 0 3.752-.511 5.143-1.534l-26.969 25.83H18.037c-1.761 0-3.684-.47-5.77-1.407a24.549 24.549 0 0 1-5.838-3.709 21.373 21.373 0 0 1-4.518-5.306c-1.204-2.003-1.807-4.07-1.807-6.202V16.495c0-1.79.44-3.665 1.32-5.626A18.41 18.41 0 0 1 5.04 5.562a21.798 21.798 0 0 1 5.213-3.964C12.198.533 14.237 0 16.37 0h53.24v15.984c0 1.62.278 3.367.834 5.242a16.704 16.704 0 0 0 2.572 5.179c1.159 1.577 2.665 2.898 4.518 3.964 1.853 1.066 4.078 1.598 6.673 1.598h20.295v42.325L85.458 92.45c1.02-1.364 1.529-2.856 1.529-4.476 0-2.216-.857-4.113-2.572-5.69-1.714-1.577-3.776-2.366-6.186-2.366H26.1c-2.409 0-4.448.789-6.116 2.366-1.668 1.577-2.502 3.474-2.502 5.69 0 2.217.834 4.092 2.502 5.626 1.668 1.535 3.707 2.302 6.117 2.302h52.13zM26.1 47.951c-2.41 0-4.449.789-6.117 2.366-1.668 1.577-2.502 3.473-2.502 5.69 0 2.216.834 4.092 2.502 5.626 1.668 1.534 3.707 2.302 6.117 2.302h52.13c2.409 0 4.47-.768 6.185-2.302 1.715-1.534 2.572-3.41 2.572-5.626 0-2.217-.857-4.113-2.572-5.69-1.714-1.577-3.776-2.366-6.186-2.366H26.1zm52.407 64.063l1.807-1.663 3.476-3.196a479.75 479.75 0 0 0 4.587-4.284 500.757 500.757 0 0 1 5.004-4.667c3.985-3.666 8.48-7.758 13.485-12.276l11.677 10.741-13.485 12.404-5.004 4.603-4.587 4.22a179.46 179.46 0 0 0-3.267 3.068c-.88.853-1.367 1.322-1.46 1.407-.463.341-.973.703-1.529 1.087-.556.383-1.112.703-1.668.959-.556.256-1.413.575-2.572.959a83.5 83.5 0 0 1-3.545 1.087 72.2 72.2 0 0 1-3.475.895c-1.112.256-1.946.426-2.502.511-1.112.17-1.854.043-2.224-.383-.371-.426-.464-1.151-.278-2.174.092-.511.278-1.279.556-2.302.278-1.023.602-2.067.973-3.132l1.042-3.005c.325-.938.58-1.577.765-1.918a10.157 10.157 0 0 1 2.224-2.941z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/fullscreen.svg b/src/assets/icons/svg/fullscreen.svg
new file mode 100644
index 0000000..0e86b6f
--- /dev/null
+++ b/src/assets/icons/svg/fullscreen.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M38.47 52L52 38.462l-23.648-23.67L43.209 0H.035L0 43.137l14.757-14.865L38.47 52zm74.773 47.726L89.526 76 76 89.536l23.648 23.672L84.795 128h43.174L128 84.863l-14.757 14.863zM89.538 52l23.668-23.648L128 43.207V.038L84.866 0 99.73 14.76 76 38.472 89.538 52zM38.46 76L14.792 99.651 0 84.794v43.173l43.137.033-14.865-14.757L52 89.53 38.46 76z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/fwb.svg b/src/assets/icons/svg/fwb.svg
similarity index 100%
rename from src/icons/svg/fwb.svg
rename to src/assets/icons/svg/fwb.svg
diff --git a/src/icons/svg/github.svg b/src/assets/icons/svg/github.svg
similarity index 100%
rename from src/icons/svg/github.svg
rename to src/assets/icons/svg/github.svg
diff --git a/src/icons/svg/gonggao.svg b/src/assets/icons/svg/gonggao.svg
similarity index 100%
rename from src/icons/svg/gonggao.svg
rename to src/assets/icons/svg/gonggao.svg
diff --git a/src/assets/icons/svg/guide.svg b/src/assets/icons/svg/guide.svg
new file mode 100644
index 0000000..b271001
--- /dev/null
+++ b/src/assets/icons/svg/guide.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M1.482 70.131l36.204 16.18 69.932-65.485-61.38 70.594 46.435 18.735c1.119.425 2.397-.17 2.797-1.363v-.085L127.998.047 1.322 65.874c-1.12.597-1.519 1.959-1.04 3.151.32.511.72.937 1.2 1.107zm44.676 57.821L64.22 107.26l-18.062-7.834v28.527z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/icon.svg b/src/assets/icons/svg/icon.svg
similarity index 100%
rename from src/icons/svg/icon.svg
rename to src/assets/icons/svg/icon.svg
diff --git a/src/icons/svg/image.svg b/src/assets/icons/svg/image.svg
similarity index 100%
rename from src/icons/svg/image.svg
rename to src/assets/icons/svg/image.svg
diff --git a/src/icons/svg/index.svg b/src/assets/icons/svg/index.svg
similarity index 100%
rename from src/icons/svg/index.svg
rename to src/assets/icons/svg/index.svg
diff --git a/src/assets/icons/svg/international.svg b/src/assets/icons/svg/international.svg
new file mode 100644
index 0000000..e9b56ee
--- /dev/null
+++ b/src/assets/icons/svg/international.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M83.287 103.01c-1.57-3.84-6.778-10.414-15.447-19.548-2.327-2.444-2.182-4.306-1.338-9.862v-.64c.553-3.81 1.513-6.05 14.313-8.087 6.516-1.018 8.203 1.57 10.589 5.178l.785 1.193a12.625 12.625 0 0 0 6.43 5.207c1.134.524 2.53 1.164 4.421 2.24 4.596 2.53 4.596 5.41 4.596 11.753v.727a26.91 26.91 0 0 1-5.178 17.454 59.055 59.055 0 0 1-19.025 11.026c3.49-6.546.814-14.313 0-16.553l-.146-.087zM64 5.12a58.502 58.502 0 0 1 25.484 5.818 54.313 54.313 0 0 0-12.859 10.327c-.93 1.28-1.716 2.473-2.472 3.579-2.444 3.694-3.637 5.352-5.818 5.614a25.105 25.105 0 0 1-4.219 0c-4.276-.29-10.094-.64-11.956 4.422-1.193 3.23-1.396 11.956 2.444 16.495.66 1.077.778 2.4.32 3.578a7.01 7.01 0 0 1-2.066 3.229 18.938 18.938 0 0 1-2.909-2.91 18.91 18.91 0 0 0-8.32-6.603c-1.25-.349-2.647-.64-3.985-.93-3.782-.786-8.03-1.688-9.019-3.812a14.895 14.895 0 0 1-.727-5.818 21.935 21.935 0 0 0-1.396-9.25 8.873 8.873 0 0 0-5.557-4.946A58.705 58.705 0 0 1 64 5.12zM0 64c0 35.346 28.654 64 64 64 35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/ipvisits.svg b/src/assets/icons/svg/ipvisits.svg
similarity index 100%
rename from src/icons/svg/ipvisits.svg
rename to src/assets/icons/svg/ipvisits.svg
diff --git a/src/icons/svg/java.svg b/src/assets/icons/svg/java.svg
similarity index 100%
rename from src/icons/svg/java.svg
rename to src/assets/icons/svg/java.svg
diff --git a/src/assets/icons/svg/language.svg b/src/assets/icons/svg/language.svg
new file mode 100644
index 0000000..0082b57
--- /dev/null
+++ b/src/assets/icons/svg/language.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M84.742 36.8c2.398 7.2 5.595 12.8 11.19 18.4 4.795-4.8 7.992-11.2 10.39-18.4h-21.58zm-52.748 40h20.78l-10.39-28-10.39 28z"/><path d="M111.916 0H16.009C7.218 0 .025 7.2.025 16v96c0 8.8 7.193 16 15.984 16h95.907c8.791 0 15.984-7.2 15.984-16V16c0-8.8-6.394-16-15.984-16zM72.754 103.2c-1.598 1.6-3.197 1.6-4.795 1.6-.8 0-2.398 0-3.197-.8-.8-.8-1.599 0-1.599-.8s-.799-1.6-1.598-3.2c-.8-1.6-.8-2.4-1.599-4l-3.196-8.8H28.797L25.6 96c-1.598 3.2-2.398 5.6-3.197 7.2-.8 1.6-2.398 1.6-4.795 1.6-1.599 0-3.197-.8-4.796-1.6-1.598-1.6-2.397-2.4-2.397-4 0-.8 0-1.6.799-3.2.8-1.6.8-2.4 1.598-4l17.583-44.8c.8-1.6.8-3.2 1.599-4.8.799-1.6 1.598-3.2 2.397-4 .8-.8 1.599-2.4 3.197-3.2 1.599-.8 3.197-.8 4.796-.8 1.598 0 3.196 0 4.795.8 1.598.8 2.398 1.6 3.197 3.2.799.8 1.598 2.4 2.397 4 .8 1.6 1.599 3.2 2.398 5.6l17.583 44c1.598 3.2 2.398 5.6 2.398 7.2-.8.8-1.599 2.4-2.398 4zM116.711 72c-8.791-3.2-15.185-7.2-20.78-12-5.594 5.6-12.787 9.6-21.579 12l-2.397-4c8.791-2.4 15.984-5.6 21.579-11.2C87.939 51.2 83.144 44 81.545 36h-7.992v-3.2h21.58c-1.6-2.4-3.198-5.6-4.796-8l2.397-.8c1.599 2.4 3.997 5.6 5.595 8.8h19.98v4h-7.992c-2.397 8-6.393 15.2-11.189 20 5.595 4.8 11.988 8.8 20.78 11.2l-3.197 4z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/link.svg b/src/assets/icons/svg/link.svg
new file mode 100644
index 0000000..48197ba
--- /dev/null
+++ b/src/assets/icons/svg/link.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M115.625 127.937H.063V12.375h57.781v12.374H12.438v90.813h90.813V70.156h12.374z"/><path d="M116.426 2.821l8.753 8.753-56.734 56.734-8.753-8.745z"/><path d="M127.893 37.982h-12.375V12.375H88.706V0h39.187z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/list.svg b/src/assets/icons/svg/list.svg
new file mode 100644
index 0000000..20259ed
--- /dev/null
+++ b/src/assets/icons/svg/list.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M1.585 12.087c0 6.616 3.974 11.98 8.877 11.98 4.902 0 8.877-5.364 8.877-11.98 0-6.616-3.975-11.98-8.877-11.98-4.903 0-8.877 5.364-8.877 11.98zM125.86.107H35.613c-1.268 0-2.114 1.426-2.114 2.852v18.255c0 1.712 1.057 2.853 2.114 2.853h90.247c1.268 0 2.114-1.426 2.114-2.853V2.96c0-1.711-1.057-2.852-2.114-2.852zM.106 62.86c0 6.615 3.974 11.979 8.876 11.979 4.903 0 8.877-5.364 8.877-11.98 0-6.616-3.974-11.98-8.877-11.98-4.902 0-8.876 5.364-8.876 11.98zM124.17 50.88H33.921c-1.268 0-2.114 1.425-2.114 2.851v18.256c0 1.711 1.057 2.852 2.114 2.852h90.247c1.268 0 2.114-1.426 2.114-2.852V53.73c0-1.426-.846-2.852-2.114-2.852zM.106 115.913c0 6.616 3.974 11.98 8.876 11.98 4.903 0 8.877-5.364 8.877-11.98 0-6.616-3.974-11.98-8.877-11.98-4.902 0-8.876 5.364-8.876 11.98zm124.064-11.98H33.921c-1.268 0-2.114 1.426-2.114 2.853v18.255c0 1.711 1.057 2.852 2.114 2.852h90.247c1.268 0 2.114-1.426 2.114-2.852v-18.255c0-1.427-.846-2.853-2.114-2.853z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/lock.svg b/src/assets/icons/svg/lock.svg
similarity index 100%
rename from src/icons/svg/lock.svg
rename to src/assets/icons/svg/lock.svg
diff --git a/src/icons/svg/log.svg b/src/assets/icons/svg/log.svg
similarity index 100%
rename from src/icons/svg/log.svg
rename to src/assets/icons/svg/log.svg
diff --git a/src/icons/svg/markdown.svg b/src/assets/icons/svg/markdown.svg
similarity index 100%
rename from src/icons/svg/markdown.svg
rename to src/assets/icons/svg/markdown.svg
diff --git a/src/icons/svg/menu.svg b/src/assets/icons/svg/menu.svg
similarity index 100%
rename from src/icons/svg/menu.svg
rename to src/assets/icons/svg/menu.svg
diff --git a/src/assets/icons/svg/message.svg b/src/assets/icons/svg/message.svg
new file mode 100644
index 0000000..14ca817
--- /dev/null
+++ b/src/assets/icons/svg/message.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 20.967v59.59c0 11.59 8.537 20.966 19.075 20.966h28.613l1 26.477L76.8 101.523h32.125c10.538 0 19.075-9.377 19.075-20.966v-59.59C128 9.377 119.463 0 108.925 0h-89.85C8.538 0 0 9.377 0 20.967zm82.325 33.1c0-5.524 4.013-9.935 9.037-9.935 5.026 0 9.038 4.41 9.038 9.934 0 5.524-4.025 9.934-9.038 9.934-5.024 0-9.037-4.41-9.037-9.934zm-27.613 0c0-5.524 4.013-9.935 9.038-9.935s9.037 4.41 9.037 9.934c0 5.524-4.025 9.934-9.037 9.934-5.025 0-9.038-4.41-9.038-9.934zm-27.1 0c0-5.524 4.013-9.935 9.038-9.935s9.038 4.41 9.038 9.934c0 5.524-4.026 9.934-9.05 9.934-5.013 0-9.025-4.41-9.025-9.934z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/money.svg b/src/assets/icons/svg/money.svg
new file mode 100644
index 0000000..c1580de
--- /dev/null
+++ b/src/assets/icons/svg/money.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.122 127.892v-28.68H7.513V87.274h46.609v-12.4H7.513v-12.86h38.003L.099 0h22.6l32.556 45.07c3.617 5.144 6.44 9.611 8.487 13.385 1.788-3.05 4.89-7.779 9.301-14.186L103.93 0h24.01L82.385 62.013h38.34v12.862h-46.41v12.4h46.41v11.937h-46.41v28.68H54.123z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/monitor.svg b/src/assets/icons/svg/monitor.svg
similarity index 100%
rename from src/icons/svg/monitor.svg
rename to src/assets/icons/svg/monitor.svg
diff --git a/src/assets/icons/svg/nested.svg b/src/assets/icons/svg/nested.svg
new file mode 100644
index 0000000..06713a8
--- /dev/null
+++ b/src/assets/icons/svg/nested.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.002 9.2c0 5.044 3.58 9.133 7.998 9.133 4.417 0 7.997-4.089 7.997-9.133 0-5.043-3.58-9.132-7.997-9.132S.002 4.157.002 9.2zM31.997.066h95.981V18.33H31.997V.066zm0 45.669c0 5.044 3.58 9.132 7.998 9.132 4.417 0 7.997-4.088 7.997-9.132 0-3.263-1.524-6.278-3.998-7.91-2.475-1.63-5.524-1.63-7.998 0-2.475 1.632-4 4.647-4 7.91zM63.992 36.6h63.986v18.265H63.992V36.6zm-31.995 82.2c0 5.043 3.58 9.132 7.998 9.132 4.417 0 7.997-4.089 7.997-9.132 0-5.044-3.58-9.133-7.997-9.133s-7.998 4.089-7.998 9.133zm31.995-9.131h63.986v18.265H63.992V109.67zm0-27.404c0 5.044 3.58 9.133 7.998 9.133 4.417 0 7.997-4.089 7.997-9.133 0-3.263-1.524-6.277-3.998-7.909-2.475-1.631-5.524-1.631-7.998 0-2.475 1.632-4 4.646-4 7.91zm31.995-9.13h31.991V91.4H95.987V73.135z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/password.svg b/src/assets/icons/svg/password.svg
similarity index 100%
rename from src/icons/svg/password.svg
rename to src/assets/icons/svg/password.svg
diff --git a/src/assets/icons/svg/pdf.svg b/src/assets/icons/svg/pdf.svg
new file mode 100644
index 0000000..957aa0c
--- /dev/null
+++ b/src/assets/icons/svg/pdf.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path d="M869.073 277.307H657.111V65.344l211.962 211.963zm-238.232 26.27V65.344l-476.498-.054v416.957h714.73v-178.67H630.841zm-335.836 360.57c-5.07-3.064-10.944-5.133-17.61-6.201-6.67-1.064-13.603-1.6-20.81-1.6h-48.821v85.641h48.822c7.206 0 14.14-.532 20.81-1.6 6.665-1.065 12.54-3.133 17.609-6.202 5.064-3.063 9.134-7.406 12.208-13.007 3.065-5.602 4.6-12.937 4.6-22.011 0-9.07-1.535-16.408-4.6-22.01-3.074-5.603-7.144-9.94-12.208-13.01zM35.82 541.805v416.904h952.358V541.805H35.821zm331.421 191.179c-3.6 11.071-9.343 20.879-17.209 29.413-7.874 8.542-18.078 15.408-30.617 20.61-12.544 5.206-27.747 7.807-45.621 7.807h-66.036v102.45h-62.831V607.517h128.867c17.874 0 33.077 2.6 45.62 7.802 12.541 5.207 22.745 12.076 30.618 20.615 7.866 8.538 13.604 18.277 17.21 29.212 3.6 10.943 5.401 22.278 5.401 34.018 0 11.477-1.8 22.752-5.402 33.819zM644.9 806.417c-5.343 17.61-13.408 32.818-24.212 45.627-10.807 12.803-24.283 22.879-40.423 30.213-16.146 7.343-35.155 11.007-57.03 11.007h-123.26V607.518h123.26c18.41 0 35.552 2.941 51.428 8.808 15.873 5.869 29.618 14.671 41.22 26.412 11.608 11.744 20.674 26.411 27.217 44.02 6.535 17.61 9.803 38.288 9.803 62.035 0 20.81-2.67 40.02-8.003 57.624zm245.362-146.07h-138.07v66.03h119.66v48.829h-119.66v118.058h-62.83V607.518h200.9v52.829h-.001zm-318.2 25.611c-6.402-8.266-14.877-14.604-25.412-19.01-10.544-4.402-23.551-6.602-39.019-6.602h-44.825v180.088h56.029c9.07 0 17.872-1.463 26.415-4.401 8.535-2.932 16.14-7.802 22.812-14.609 6.665-6.8 12.007-15.667 16.007-26.61 4.003-10.94 6.003-24.275 6.003-40.021 0-14.408-1.4-27.416-4.202-39.019-2.8-11.607-7.406-21.542-13.808-29.816zm0 0"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/people.svg b/src/assets/icons/svg/people.svg
new file mode 100644
index 0000000..2bd54ae
--- /dev/null
+++ b/src/assets/icons/svg/people.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M104.185 95.254c8.161 7.574 13.145 17.441 13.145 28.28 0 1.508-.098 2.998-.285 4.466h-10.784c.238-1.465.403-2.948.403-4.465 0-8.983-4.36-17.115-11.419-23.216C86 104.66 75.355 107.162 64 107.162c-11.344 0-21.98-2.495-31.22-6.83-7.064 6.099-11.444 14.218-11.444 23.203 0 1.517.165 3 .403 4.465H10.955a35.444 35.444 0 0 1-.285-4.465c0-10.838 4.974-20.713 13.127-28.291C9.294 85.42.003 70.417.003 53.58.003 23.99 28.656.001 64 .001s63.997 23.988 63.997 53.58c0 16.842-9.299 31.85-23.812 41.673zM64 36.867c-29.454 0-53.33-10.077-53.33 15.342 0 25.418 23.876 46.023 53.33 46.023 29.454 0 53.33-20.605 53.33-46.023 0-25.419-23.876-15.342-53.33-15.342zm24.888 25.644c-3.927 0-7.111-2.665-7.111-5.953 0-3.288 3.184-5.954 7.11-5.954 3.928 0 7.111 2.666 7.111 5.954s-3.183 5.953-7.11 5.953zm-3.556 16.372c0 4.11-9.55 7.442-21.332 7.442-11.781 0-21.332-3.332-21.332-7.442 0-1.06.656-2.064 1.8-2.976 3.295 2.626 10.79 4.465 19.532 4.465 8.743 0 16.237-1.84 19.531-4.465 1.145.912 1.801 1.916 1.801 2.976zm-46.22-16.372c-3.927 0-7.11-2.665-7.11-5.953 0-3.288 3.183-5.954 7.11-5.954 3.927 0 7.111 2.666 7.111 5.954s-3.184 5.953-7.11 5.953z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/peoples.svg b/src/assets/icons/svg/peoples.svg
similarity index 100%
rename from src/icons/svg/peoples.svg
rename to src/assets/icons/svg/peoples.svg
diff --git a/src/icons/svg/permission.svg b/src/assets/icons/svg/permission.svg
similarity index 100%
rename from src/icons/svg/permission.svg
rename to src/assets/icons/svg/permission.svg
diff --git a/src/icons/svg/phone.svg b/src/assets/icons/svg/phone.svg
similarity index 100%
rename from src/icons/svg/phone.svg
rename to src/assets/icons/svg/phone.svg
diff --git a/src/icons/svg/qiniu.svg b/src/assets/icons/svg/qiniu.svg
similarity index 100%
rename from src/icons/svg/qiniu.svg
rename to src/assets/icons/svg/qiniu.svg
diff --git a/src/assets/icons/svg/qq.svg b/src/assets/icons/svg/qq.svg
new file mode 100644
index 0000000..ee13d4e
--- /dev/null
+++ b/src/assets/icons/svg/qq.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M18.448 57.545l-.244-.744-.198-.968-.132-.53v-2.181l.236-.859.24-.908.317-.953.428-1.06.561-1.103.794-1.104v-.773l.077-.724.123-.984.34-1.106.313-1.194.25-.548.289-.511.371-.569.405-.423v-2.73l.234-1.407.236-1.633.42-1.955.577-2.035.43-1.118.426-1.217.468-1.135.559-1.216.57-1.332.655-1.247.737-1.331.929-1.33.43-.762.457-.624.995-1.406 1.025-1.403 1.163-1.444 1.246-1.405 1.352-1.384 1.41-1.423 1.708-1.536 1.083-.934 1.322-1.008 1.34-.89 1.448-.855 1.392-.76 1.57-.63 1.667-.775 1.657-.532 1.653-.552 1.787-.548 1.785-.417 1.876-.347L59.128.68l1.879-.245 1.876-.252 2.002-.106h5.912l1.97.243 1.981.231 2.019.207 1.874.441 1.979.413 1.857.475 2.035.53 1.862.646 1.782.738 1.904.78 1.736.853 1.689.95 1.655 1.044 1.425.971.662.548.693.401 1.323 1.1 1.115 1.064 1.112 1.1 1.083 1.214.894 1.178 1.064 1.217.74 1.306.752 1.162.798 1.352.661 1.175 1.113 2.489.546 1.286.428 1.192.428 1.294.384 1.217.267 1.047.347 1.231.607 2.198.388 1.924.253 1.861.217 1.497.342 2.28.077.362.274.41.737 1.18.473.8.42.832.534.892.472 1.07.307 1.093.334 1.2.252 1.232.115.605.106.746v.648l-.106.643v.8l-.192.774-.35 1.5-.403.76-.299.852v.213l.142.264.4.623 1.746 2.53 1.377 1.9.66 1.267.889 1.389.774 1.52.893 1.627.894 1.828 1.006 2.069.567 1.268.518 1.239.447 1.307.44 1.175.336 1.235.342 1.16.432 2.261.343 2.31.235 2.05v2.891l-.158 1.025-.226 1.768-.308 1.59-.48 1.44-.18.588-.336.707-.28.493-.375.607-.33.383-.42.494-.375.4-.401.34-.48.207-.432.207-.355.114h-.543l-.346-.114-.66-.32-.302-.212-.317-.223-.347-.304-.35-.342-.579-.63-.684-.89-.539-.917-.538-.734-.526-.855-.741-1.517-.833-1.579-.098-.055h-.138l-.338.247-.196.415-.326.516-.567 1.533-.856 2.182-1.096 2.626-.824 1.308-.864 1.366-1.027 1.536-1.09 1.503-.557.68-.676.743-1.555 1.497.136.135.21.214.777.446 3.235 1.524 1.41.779 1.347.756 1.332.953 1.187.982.574.443.432.511.445.593.367.643.198.533.242.64.105.554.115.647-.115.433v.44l-.105.454-.242.415-.092.325-.22.394-.587.784-.543.627-.42.47-.35.348-.893.638-1.01.556-1.077.532-1.155.511-1.287.495-.693.207-.608.167-1.496.342-1.545.325-1.552.323-1.689.27-1.74.072-1.785.21h-5.539l-1.998-.114-1.86-.168-2.005-.27-1.99-.209-2.095-.286-2.03-.495-1.981-.374-1.968-.552-2.019-.707-1.98-.585-1.044-.342-.927-.323-.586-.223-.582-.12h-1.647l-1.904-.131-.962-.096-1.24-.135-.795.705-1.085.665-1.471.701-1.628.875-.99.475-1.033.376-2.281.914-1.24.305-1.3.343-1.803.344-1.13.086-1.193.1-1.246.135-1.45.053h-5.926l-3.346-.053-3.25-.321-1.644-.23-1.589-.23-1.546-.227-1.547-.305-1.442-.456-1.434-.325-1.294-.51-1.223-.474-1.142-.533-.99-.583-.984-.71-.336-.343-.44-.415-.334-.362-.3-.417-.278-.415-.215-.42-.311-.89-.109-.46-.138-.51v-.473l.138-.533v-.53l.109-.53v-1.069l.052-.564.259-.647.215-.646.39-.779.286-.3.236-.348.615-.738.49-.38.464-.266.428-.338.676-.21.543-.324.676-.341.77-.227.775-.231.897-.192.85-.11 1.008-.13 1.093-.081.284-.092h.063l.137-.115v-.13l-.2-.266-.58-.27-1.45-1.231-.975-.761-1.127-.967-1.136-1.082-1.181-1.382-1.36-1.558-.508-.843-.672-.87-.58-1.007-.522-1.1-.704-1.047-.459-1.194-.547-1.192-.546-1.33-.397-1.273-.378-1.575-.112-.057h-.115l-.059-.113h-.14l-.23.113-.114.057-.158.264-.057.321-.119.286-.206.477-.664 1.157-.345.701-.546.612-.58.736-.641.816-.677.724-.795.701-.734.658-.814.524-.89.546-.855.325-1.008.247-.99.095h-.233l-.228-.095-.18-.384-.29-.188-.38-.912-.237-.493-.255-.707-.21-.734-.113-.724-.313-1.648-.12-.972v-3.185l.12-2.379.196-1.214.23-1.252.21-1.347.374-1.254.42-1.443.431-1.407.578-1.448.545-1.38.754-1.4.699-1.52.855-1.425 1.006-1.538 1.023-1.382 1.069-1.538.891-1.071 1.142-1.227 1.202-1.237.56-.59.678-.662.985-.836 1.012-.853 1.647-1.446 1.242-.889z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/redis.svg b/src/assets/icons/svg/redis.svg
similarity index 100%
rename from src/icons/svg/redis.svg
rename to src/assets/icons/svg/redis.svg
diff --git a/src/icons/svg/role.svg b/src/assets/icons/svg/role.svg
similarity index 100%
rename from src/icons/svg/role.svg
rename to src/assets/icons/svg/role.svg
diff --git a/src/icons/svg/run.svg b/src/assets/icons/svg/run.svg
similarity index 100%
rename from src/icons/svg/run.svg
rename to src/assets/icons/svg/run.svg
diff --git a/src/icons/svg/running.svg b/src/assets/icons/svg/running.svg
similarity index 100%
rename from src/icons/svg/running.svg
rename to src/assets/icons/svg/running.svg
diff --git a/src/icons/svg/search.svg b/src/assets/icons/svg/search.svg
similarity index 100%
rename from src/icons/svg/search.svg
rename to src/assets/icons/svg/search.svg
diff --git a/src/assets/icons/svg/shopping.svg b/src/assets/icons/svg/shopping.svg
new file mode 100644
index 0000000..87513e7
--- /dev/null
+++ b/src/assets/icons/svg/shopping.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M42.913 101.36c1.642 0 3.198.332 4.667.996a12.28 12.28 0 0 1 3.89 2.772c1.123 1.184 1.987 2.582 2.592 4.193.605 1.612.908 3.318.908 5.118 0 1.8-.303 3.507-.908 5.118-.605 1.611-1.469 3.01-2.593 4.194a13.3 13.3 0 0 1-3.889 2.843 10.582 10.582 0 0 1-4.667 1.066c-1.729 0-3.306-.355-4.732-1.066a13.604 13.604 0 0 1-3.825-2.843c-1.123-1.185-1.988-2.583-2.593-4.194a14.437 14.437 0 0 1-.907-5.118c0-1.8.302-3.506.907-5.118.605-1.61 1.47-3.009 2.593-4.193a12.515 12.515 0 0 1 3.825-2.772c1.426-.664 3.003-.996 4.732-.996zm53.932.285c1.643 0 3.22.331 4.733.995a11.386 11.386 0 0 1 3.889 2.772c1.08 1.185 1.945 2.583 2.593 4.194.648 1.61.972 3.317.972 5.118 0 1.8-.324 3.506-.972 5.117-.648 1.611-1.513 3.01-2.593 4.194a12.253 12.253 0 0 1-3.89 2.843 11 11 0 0 1-4.732 1.066 10.58 10.58 0 0 1-4.667-1.066 12.478 12.478 0 0 1-3.824-2.843c-1.08-1.185-1.945-2.583-2.593-4.194a13.581 13.581 0 0 1-.973-5.117c0-1.801.325-3.507.973-5.118.648-1.611 1.512-3.01 2.593-4.194a11.559 11.559 0 0 1 3.824-2.772 11.212 11.212 0 0 1 4.667-.995zm21.781-80.747c2.42 0 4.3.355 5.64 1.066 1.34.71 2.29 1.587 2.852 2.63a6.427 6.427 0 0 1 .778 3.34c-.044 1.185-.195 2.204-.454 3.057-.26.853-.8 2.606-1.62 5.26a589.268 589.268 0 0 1-2.788 8.743 1236.373 1236.373 0 0 0-3.047 9.453c-.994 3.128-1.75 5.592-2.269 7.393-1.123 3.79-2.55 6.42-4.278 7.89-1.728 1.469-3.846 2.203-6.352 2.203H39.023l1.945 12.795h65.342c4.148 0 6.223 1.943 6.223 5.828 0 1.896-.41 3.53-1.232 4.905-.821 1.374-2.442 2.061-4.862 2.061H38.505c-1.729 0-3.176-.426-4.343-1.28-1.167-.852-2.14-1.966-2.917-3.34a21.277 21.277 0 0 1-1.88-4.478 44.128 44.128 0 0 1-1.102-4.55c-.087-.568-.324-1.942-.713-4.122-.39-2.18-.865-4.904-1.426-8.174l-1.88-10.947c-.692-4.027-1.383-8.079-2.075-12.154-1.642-9.572-3.5-20.234-5.574-31.986H6.87c-1.296 0-2.377-.356-3.24-1.067a9.024 9.024 0 0 1-2.14-2.558 10.416 10.416 0 0 1-1.167-3.2C.108 8.53 0 7.488 0 6.54c0-1.896.583-3.46 1.75-4.69C2.917.615 4.494 0 6.482 0h13.095c1.728 0 3.111.284 4.148.853 1.037.569 1.858 1.28 2.463 2.132a8.548 8.548 0 0 1 1.297 2.701c.26.948.475 1.754.648 2.417.173.758.346 1.825.519 3.199.173 1.374.345 2.772.518 4.193.26 1.706.519 3.507.778 5.403h88.678z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/size.svg b/src/assets/icons/svg/size.svg
new file mode 100644
index 0000000..ddb25b8
--- /dev/null
+++ b/src/assets/icons/svg/size.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 54.857h54.796v18.286H36.531V128H18.265V73.143H0V54.857zm127.857-36.571H91.935V128H72.456V18.286H36.534V0h91.326l-.003 18.286z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/skill.svg b/src/assets/icons/svg/skill.svg
new file mode 100644
index 0000000..a3b7312
--- /dev/null
+++ b/src/assets/icons/svg/skill.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M31.652 93.206h33.401c1.44 2.418 3.077 4.663 4.93 6.692h-38.33v-6.692zm0-10.586h28.914a44.8 44.8 0 0 1-1.264-6.688h-27.65v6.688zm0-17.27H59.39c.288-2.286.714-4.532 1.34-6.687H31.65v6.687h.003zm53.913 44.84v5.85c0 2.798-2.095 5.075-4.667 5.075h-70.07c-2.576 0-4.663-2.277-4.663-5.075V31.26l23.22-20.96v22.25H17.16v6.688h18.39V6.688h45.348c2.576 0 4.667 2.277 4.667 5.066v20.009c1.987-.675 4.053-1.128 6.17-1.445v-18.56C91.738 5.28 86.874 0 80.902 0H31.15L0 28.118v87.917c0 6.48 4.859 11.759 10.832 11.759h70.07c5.974 0 10.837-5.27 10.837-11.759v-4.41c-2.117-.312-4.183-.765-6.17-1.435h-.004zM23.279 58.667h-7.96v6.688h7.96v-6.688zm-7.956 41.23h7.96v-6.691h-7.96v6.692zm7.956-23.96h-7.96v6.687h7.96v-6.688zm89.718-15.042l-4.896-4.07-12.447 17.613-11.19-9.305-3.762 5.311 16.091 13.38 16.204-22.929zM128 70.978c0-18.632-13.97-33.782-31.147-33.782-17.168 0-31.135 15.155-31.135 33.782 0 18.628 13.97 33.783 31.135 33.783 17.172 0 31.143-15.15 31.143-33.783H128zm-6.17 0c0 14.933-11.203 27.1-24.981 27.1-13.77 0-24.987-12.158-24.987-27.1 0-14.941 11.195-27.099 24.987-27.099 13.778 0 24.982 12.158 24.982 27.1z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/sqlMonitor.svg b/src/assets/icons/svg/sqlMonitor.svg
similarity index 100%
rename from src/icons/svg/sqlMonitor.svg
rename to src/assets/icons/svg/sqlMonitor.svg
diff --git a/src/assets/icons/svg/star.svg b/src/assets/icons/svg/star.svg
new file mode 100644
index 0000000..6cf86e6
--- /dev/null
+++ b/src/assets/icons/svg/star.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M70.66 4.328l14.01 29.693c1.088 2.29 3.177 3.882 5.603 4.25l31.347 4.76c6.087.926 8.528 8.756 4.117 13.247L103.05 79.395c-1.75 1.78-2.544 4.352-2.132 6.867l5.352 32.641c1.043 6.337-5.33 11.182-10.778 8.19l-28.039-15.409a7.13 7.13 0 0 0-6.91 0l-28.039 15.41c-5.448 2.99-11.821-1.854-10.777-8.19l5.352-32.642c.415-2.515-.387-5.088-2.136-6.867L2.264 56.278C-2.146 51.787.286 43.957 6.38 43.031l31.343-4.76c2.419-.368 4.51-1.96 5.595-4.25L57.334 4.328c2.728-5.77 10.605-5.77 13.325 0z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/swagger.svg b/src/assets/icons/svg/swagger.svg
similarity index 100%
rename from src/icons/svg/swagger.svg
rename to src/assets/icons/svg/swagger.svg
diff --git a/src/icons/svg/sys-tools.svg b/src/assets/icons/svg/sys-tools.svg
similarity index 100%
rename from src/icons/svg/sys-tools.svg
rename to src/assets/icons/svg/sys-tools.svg
diff --git a/src/icons/svg/system.svg b/src/assets/icons/svg/system.svg
similarity index 100%
rename from src/icons/svg/system.svg
rename to src/assets/icons/svg/system.svg
diff --git a/src/assets/icons/svg/tab.svg b/src/assets/icons/svg/tab.svg
new file mode 100644
index 0000000..b4b48e4
--- /dev/null
+++ b/src/assets/icons/svg/tab.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.921.052H49.08c-1.865 0-3.198 1.599-3.198 3.464v6.661c0 1.865 1.6 3.464 3.198 3.464h29.84c1.865 0 3.198-1.599 3.198-3.464V3.516C82.385 1.65 80.786.052 78.92.052zm45.563 0H94.642c-1.865 0-3.464 1.599-3.464 3.464v6.661c0 1.865 1.599 3.464 3.464 3.464h29.842c1.865-.266 3.464-1.599 3.464-3.464V3.516c0-1.865-1.599-3.464-3.464-3.464zm0 22.382H40.02c-1.866 0-3.464-1.599-3.464-3.464V3.516c0-1.865-1.599-3.464-3.464-3.464H3.516C1.65.052.052 1.651.052 3.516V124.75c0 1.598 1.599 3.197 3.464 3.197h120.968c1.865 0 3.464-1.599 3.464-3.464V25.898c0-1.865-1.599-3.464-3.464-3.464z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/table.svg b/src/assets/icons/svg/table.svg
new file mode 100644
index 0000000..0e3dc9d
--- /dev/null
+++ b/src/assets/icons/svg/table.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/theme.svg b/src/assets/icons/svg/theme.svg
new file mode 100644
index 0000000..5982a2f
--- /dev/null
+++ b/src/assets/icons/svg/theme.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M125.5 36.984L95.336 2.83C93.735 1.018 91.565 0 89.3 0c-2.263 0-4.433 1.018-6.033 2.83l-3.786 4.286c-1.6 1.812-3.77 2.83-6.032 2.831H54.553c-2.263 0-4.434-1.018-6.033-2.83L44.734 2.83C43.134 1.018 40.964 0 38.701 0c-2.263 0-4.434 1.018-6.034 2.83L2.5 36.984C.9 38.796 0 41.254 0 43.815c0 2.562.899 5.02 2.5 6.831L14.565 64.31c2.178 2.468 5.367 3.403 8.33 2.444 1.35-.435 2.709.592 2.709 2.18v49.407c0 5.313 3.84 9.66 8.532 9.66h59.726c4.693 0 8.532-4.347 8.532-9.66V68.934c0-1.59 1.36-2.616 2.71-2.181 2.962.96 6.15.024 8.329-2.444L125.5 50.646c1.6-1.811 2.499-4.269 2.499-6.83 0-2.563-.899-5.02-2.5-6.832z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/timing.svg b/src/assets/icons/svg/timing.svg
similarity index 100%
rename from src/icons/svg/timing.svg
rename to src/assets/icons/svg/timing.svg
diff --git a/src/icons/svg/tools.svg b/src/assets/icons/svg/tools.svg
similarity index 100%
rename from src/icons/svg/tools.svg
rename to src/assets/icons/svg/tools.svg
diff --git a/src/assets/icons/svg/tree-table.svg b/src/assets/icons/svg/tree-table.svg
new file mode 100644
index 0000000..8aafdb8
--- /dev/null
+++ b/src/assets/icons/svg/tree-table.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M44.8 0h79.543C126.78 0 128 1.422 128 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H44.8c-2.438 0-3.657-1.422-3.657-4.267V4.267C41.143 1.422 42.362 0 44.8 0zm22.857 48h56.686c2.438 0 3.657 1.422 3.657 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H67.657C65.22 80 64 78.578 64 75.733V52.267C64 49.422 65.219 48 67.657 48zm0 48h56.686c2.438 0 3.657 1.422 3.657 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H67.657C65.22 128 64 126.578 64 123.733v-23.466C64 97.422 65.219 96 67.657 96zM50.286 68.267c2.02 0 3.657-1.91 3.657-4.267 0-2.356-1.638-4.267-3.657-4.267H17.37V32h6.4c2.02 0 3.658-1.91 3.658-4.267V4.267C27.429 1.91 25.79 0 23.77 0H3.657C1.637 0 0 1.91 0 4.267v23.466C0 30.09 1.637 32 3.657 32h6.4v80c0 2.356 1.638 4.267 3.657 4.267h36.572c2.02 0 3.657-1.91 3.657-4.267 0-2.356-1.638-4.267-3.657-4.267H17.37V68.267h32.915z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/tree.svg b/src/assets/icons/svg/tree.svg
new file mode 100644
index 0000000..dd4b7dd
--- /dev/null
+++ b/src/assets/icons/svg/tree.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M126.713 90.023c.858.985 1.287 2.134 1.287 3.447v29.553c0 1.423-.429 2.6-1.287 3.53-.858.93-1.907 1.395-3.146 1.395H97.824c-1.145 0-2.146-.465-3.004-1.395-.858-.93-1.287-2.107-1.287-3.53V93.47c0-.875.19-1.696.572-2.462.382-.766.906-1.368 1.573-1.806a3.84 3.84 0 0 1 2.146-.657h9.725V69.007a3.84 3.84 0 0 0-.43-1.806 3.569 3.569 0 0 0-1.143-1.313 2.714 2.714 0 0 0-1.573-.492h-36.47v23.149h9.725c1.144 0 2.145.492 3.004 1.478.858.985 1.287 2.134 1.287 3.447v29.553c0 .876-.191 1.696-.573 2.463-.38.766-.905 1.368-1.573 1.806a3.84 3.84 0 0 1-2.145.656H51.915a3.84 3.84 0 0 1-2.145-.656c-.668-.438-1.216-1.04-1.645-1.806a4.96 4.96 0 0 1-.644-2.463V93.47c0-1.313.43-2.462 1.288-3.447.858-.986 1.907-1.478 3.146-1.478h9.582v-23.15h-37.9c-.953 0-1.74.356-2.359 1.068-.62.711-.93 1.56-.93 2.544v19.538h9.726c1.239 0 2.264.492 3.074 1.478.81.985 1.216 2.134 1.216 3.447v29.553c0 1.423-.405 2.6-1.216 3.53-.81.93-1.835 1.395-3.074 1.395H4.29c-.476 0-.93-.082-1.358-.246a4.1 4.1 0 0 1-1.144-.657 4.658 4.658 0 0 1-.93-1.067 5.186 5.186 0 0 1-.643-1.395 5.566 5.566 0 0 1-.215-1.56V93.47c0-.437.048-.875.143-1.313a3.95 3.95 0 0 1 .429-1.15c.19-.328.429-.656.715-.984.286-.329.572-.602.858-.821.286-.22.62-.383 1.001-.493.382-.11.763-.164 1.144-.164h9.726V61.619c0-.985.31-1.833.93-2.544.619-.712 1.358-1.068 2.216-1.068h44.335V39.62h-9.582c-1.24 0-2.288-.492-3.146-1.477a5.09 5.09 0 0 1-1.287-3.448V5.14c0-1.423.429-2.627 1.287-3.612.858-.985 1.907-1.477 3.146-1.477h25.743c.763 0 1.478.246 2.145.739a5.17 5.17 0 0 1 1.573 1.888c.382.766.573 1.587.573 2.462v29.553c0 1.313-.43 2.463-1.287 3.448-.859.985-1.86 1.477-3.004 1.477h-9.725v18.389h42.762c.954 0 1.74.355 2.36 1.067.62.711.93 1.56.93 2.545v26.925h9.582c1.239 0 2.288.492 3.146 1.478z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/unlock.svg b/src/assets/icons/svg/unlock.svg
similarity index 100%
rename from src/icons/svg/unlock.svg
rename to src/assets/icons/svg/unlock.svg
diff --git a/src/icons/svg/user.svg b/src/assets/icons/svg/user.svg
similarity index 100%
rename from src/icons/svg/user.svg
rename to src/assets/icons/svg/user.svg
diff --git a/src/icons/svg/user1.svg b/src/assets/icons/svg/user1.svg
similarity index 100%
rename from src/icons/svg/user1.svg
rename to src/assets/icons/svg/user1.svg
diff --git a/src/icons/svg/validCode.svg b/src/assets/icons/svg/validCode.svg
similarity index 100%
rename from src/icons/svg/validCode.svg
rename to src/assets/icons/svg/validCode.svg
diff --git a/src/icons/svg/visits.svg b/src/assets/icons/svg/visits.svg
similarity index 100%
rename from src/icons/svg/visits.svg
rename to src/assets/icons/svg/visits.svg
diff --git a/src/icons/svg/web.svg b/src/assets/icons/svg/web.svg
similarity index 100%
rename from src/icons/svg/web.svg
rename to src/assets/icons/svg/web.svg
diff --git a/src/assets/icons/svg/wechat.svg b/src/assets/icons/svg/wechat.svg
new file mode 100644
index 0000000..c586e55
--- /dev/null
+++ b/src/assets/icons/svg/wechat.svg
@@ -0,0 +1 @@
+<svg width="128" height="110" xmlns="http://www.w3.org/2000/svg"><path d="M86.635 33.334c1.467 0 2.917.113 4.358.283C87.078 14.392 67.58.111 45.321.111 20.44.111.055 17.987.055 40.687c0 13.104 6.781 23.863 18.115 32.209l-4.527 14.352 15.82-8.364c5.666 1.182 10.207 2.395 15.858 2.395 1.42 0 2.829-.073 4.227-.189-.886-3.19-1.398-6.53-1.398-9.996 0-20.845 16.98-37.76 38.485-37.76zm-24.34-12.936c3.407 0 5.665 2.363 5.665 5.954 0 3.576-2.258 5.97-5.666 5.97-3.392 0-6.795-2.395-6.795-5.97 0-3.591 3.403-5.954 6.795-5.954zM30.616 32.323c-3.393 0-6.818-2.395-6.818-5.971 0-3.591 3.425-5.954 6.818-5.954 3.392 0 5.65 2.363 5.65 5.954 0 3.576-2.258 5.97-5.65 5.97z"/><path d="M127.945 70.52c0-19.075-18.108-34.623-38.448-34.623-21.537 0-38.5 15.548-38.5 34.623 0 19.108 16.963 34.622 38.5 34.622 4.508 0 9.058-1.2 13.584-2.395l12.414 7.167-3.404-11.923c9.087-7.184 15.854-16.712 15.854-27.471zm-50.928-5.97c-2.254 0-4.53-2.362-4.53-4.773 0-2.378 2.276-4.771 4.53-4.771 3.422 0 5.665 2.393 5.665 4.771 0 2.41-2.243 4.773-5.665 4.773zm24.897 0c-2.24 0-4.498-2.362-4.498-4.773 0-2.378 2.258-4.771 4.498-4.771 3.392 0 5.665 2.393 5.665 4.771 0 2.41-2.273 4.773-5.665 4.773z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/weixin.svg b/src/assets/icons/svg/weixin.svg
similarity index 100%
rename from src/icons/svg/weixin.svg
rename to src/assets/icons/svg/weixin.svg
diff --git a/src/assets/icons/svg/zip.svg b/src/assets/icons/svg/zip.svg
new file mode 100644
index 0000000..f806fc4
--- /dev/null
+++ b/src/assets/icons/svg/zip.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.527 116.793c.178.008.348.024.527.024h40.233c4.711-.005 8.53-3.677 8.534-8.21V18.895c-.004-4.532-3.823-8.204-8.534-8.209H79.054c-.179 0-.353.016-.527.024V0L0 10.082v107.406l78.527 10.342v-11.037zm0-101.362c.174-.024.348-.052.527-.052h40.233c2.018 0 3.659 1.578 3.659 3.52v89.713c-.003 1.942-1.64 3.517-3.659 3.519H79.054c-.179 0-.353-.028-.527-.052V15.431zM30.262 75.757l-18.721-.46V72.37l11.3-16.673v-.148l-10.266.164v-4.51l17.504-.44v3.264L18.696 70.76v.144l11.566.176v4.678zm9.419.231l-5.823-.144V50.671l5.823-.144v25.461zm22.255-11.632c-2.168 1.922-5.353 2.76-9.02 2.736-.702.004-1.402-.04-2.097-.131v9.303l-5.997-.148V50.743c1.852-.352 4.473-.647 8.218-.743 3.838-.096 6.608.539 8.48 1.913 1.807 1.306 3.032 3.5 3.032 6.112s-.926 4.833-2.612 6.331h-.004zM53.36 54.45c-.856-.01-1.71.083-2.541.275v7.682c.523.116 1.167.152 2.06.152 3.301-.004 5.36-1.614 5.36-4.314 0-2.425-1.772-3.843-4.875-3.791l-.004-.004zm39.847-37.066h9.564v3.795h-9.564v-3.795zm-9.568 5.68h9.564v3.8h-9.564v-3.8zm9.568 6.216h9.564v3.799h-9.564V29.28zm0 12h9.564v3.794h-9.564V41.28zm-9.568-6.096h9.564v3.795h-9.564v-3.795zm9.472 47.064c2.512 0 4.921-.96 6.697-2.67 1.776-1.708 2.773-4.026 2.772-6.442l-1.748-15.263c0-5.033-2.492-9.112-7.725-9.112-5.232 0-7.72 4.079-7.72 9.112l-1.752 15.263c-.001 2.417.996 4.735 2.773 6.444 1.777 1.71 4.187 2.669 6.7 2.668h.003zm-3.135-16.75h6.27v12.743h-6.27V65.5z"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/zujian.svg b/src/assets/icons/svg/zujian.svg
similarity index 100%
rename from src/icons/svg/zujian.svg
rename to src/assets/icons/svg/zujian.svg
diff --git a/src/icons/svgo.yml b/src/assets/icons/svgo.yml
similarity index 100%
rename from src/icons/svgo.yml
rename to src/assets/icons/svgo.yml
diff --git a/src/assets/avatar/avatar.png b/src/assets/images/avatar.png
similarity index 100%
rename from src/assets/avatar/avatar.png
rename to src/assets/images/avatar.png
diff --git a/src/assets/logo/logo.png b/src/assets/images/logo.png
similarity index 100%
rename from src/assets/logo/logo.png
rename to src/assets/images/logo.png
diff --git a/src/assets/styles/btn.scss b/src/assets/styles/btn.scss
new file mode 100644
index 0000000..8f47f2c
--- /dev/null
+++ b/src/assets/styles/btn.scss
@@ -0,0 +1,99 @@
+@import 'variables';
+
+@mixin colorBtn($color) {
+  background: $color;
+
+  &:hover {
+    color: $color;
+
+    &:before,
+    &:after {
+      background: $color;
+    }
+  }
+}
+
+.blue-btn {
+  @include colorBtn($blue)
+}
+
+.light-blue-btn {
+  @include colorBtn($light-blue)
+}
+
+.red-btn {
+  @include colorBtn($red)
+}
+
+.pink-btn {
+  @include colorBtn($pink)
+}
+
+.green-btn {
+  @include colorBtn($green)
+}
+
+.tiffany-btn {
+  @include colorBtn($tiffany)
+}
+
+.yellow-btn {
+  @include colorBtn($yellow)
+}
+
+.pan-btn {
+  font-size: 14px;
+  color: #fff;
+  padding: 14px 36px;
+  border-radius: 8px;
+  border: none;
+  outline: none;
+  transition: 600ms ease all;
+  position: relative;
+  display: inline-block;
+
+  &:hover {
+    background: #fff;
+
+    &:before,
+    &:after {
+      width: 100%;
+      transition: 600ms ease all;
+    }
+  }
+
+  &:before,
+  &:after {
+    content: '';
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 2px;
+    width: 0;
+    transition: 400ms ease all;
+  }
+
+  &::after {
+    right: inherit;
+    top: inherit;
+    left: 0;
+    bottom: 0;
+  }
+}
+
+.custom-button {
+  display: inline-block;
+  line-height: 1;
+  white-space: nowrap;
+  cursor: pointer;
+  background: #fff;
+  color: #fff;
+  -webkit-appearance: none;
+  text-align: center;
+  box-sizing: border-box;
+  outline: 0;
+  margin: 0;
+  padding: 10px 15px;
+  font-size: 14px;
+  border-radius: 4px;
+}
diff --git a/src/assets/styles/eladmin.scss b/src/assets/styles/eladmin.scss
new file mode 100644
index 0000000..624aaf9
--- /dev/null
+++ b/src/assets/styles/eladmin.scss
@@ -0,0 +1,96 @@
+.head-container {
+  padding-bottom: 10px;
+  .filter-item {
+    display: inline-block;
+    vertical-align: middle;
+    margin-bottom: 10px;
+    input {
+      height: 30.5px;
+      line-height: 30.5px;
+    }
+  }
+  .date-item {
+    display: inline-block;
+    vertical-align: middle;
+    margin-bottom: 10px;
+  }
+}
+.el-avatar {
+  display: inline-block;
+  text-align: center;
+  background: #ccc;
+  color: #fff;
+  white-space: nowrap;
+  position: relative;
+  overflow: hidden;
+  vertical-align: middle;
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+  border-radius: 16px;
+}
+
+.logo-con{
+  height: 60px;
+  padding: 13px 0px 0px;
+  img{
+    height: 32px;
+    width: 135px;
+    display: block;
+    //margin: 0 auto;
+  }
+}
+
+#el-login-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial, serif;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+
+#el-main-footer {
+  background: none repeat scroll 0 0 white;
+  border-top: 1px solid #e7eaec;
+  overflow: hidden;
+  padding: 10px 6px 0px 6px;
+  height: 33px;
+  font-size: 0.7rem !important;
+  color: #7a8b9a;
+  letter-spacing: 0.8px;
+  font-family: Arial, sans-serif !important;
+  position: fixed;
+  bottom: 0;
+  z-index: 99;
+  width: 100%;
+}
+.eladmin-upload {
+  border: 1px dashed #c0ccda;
+  border-radius: 5px;
+  height: 45px;
+  line-height: 45px;
+  width: 368px;
+}
+.my-blockquote{
+  margin: 0px 0px 10px;
+  padding: 15px;
+  line-height: 22px;
+  border-left: 5px solid #00437B;
+  border-radius: 0 2px 2px 0;
+  background-color: #f2f2f2;
+}
+.my-code{
+  position: relative;
+  padding: 15px;
+  line-height: 20px;
+  border-left: 5px solid #ddd;
+  color: #333;
+  font-family: Courier New, serif;
+  font-size: 12px
+}
+
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
new file mode 100644
index 0000000..9581d56
--- /dev/null
+++ b/src/assets/styles/element-ui.scss
@@ -0,0 +1,79 @@
+// cover some element-ui styles
+
+.el-breadcrumb__inner,
+.el-breadcrumb__inner a {
+  font-weight: 400 !important;
+}
+
+.el-upload {
+  input[type="file"] {
+    display: none !important;
+  }
+}
+
+.el-upload__input {
+  display: none;
+}
+
+.cell {
+  .el-tag {
+    margin-right: 0px;
+  }
+}
+
+.small-padding {
+  .cell {
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+}
+
+.fixed-width {
+  .el-button--mini {
+    padding: 7px 10px;
+    width: 60px;
+  }
+}
+
+.status-col {
+  .cell {
+    padding: 0 10px;
+    text-align: center;
+
+    .el-tag {
+      margin-right: 0px;
+    }
+  }
+}
+
+// to fixed https://github.com/ElemeFE/element/issues/2461
+.el-dialog {
+  transform: none;
+  left: 0;
+  position: relative;
+  margin: 0 auto;
+}
+
+// refine element ui upload
+.upload-container {
+  .el-upload {
+    width: 100%;
+
+    .el-upload-dragger {
+      width: 100%;
+      height: 200px;
+    }
+  }
+}
+
+// dropdown
+.el-dropdown-menu {
+  a {
+    display: block
+  }
+}
+
+// fix date-picker ui bug in filter-item
+.el-range-editor.el-input__inner {
+  display: inline-flex !important;
+}
diff --git a/src/styles/element-variables.scss b/src/assets/styles/element-variables.scss
similarity index 90%
rename from src/styles/element-variables.scss
rename to src/assets/styles/element-variables.scss
index 30a0e6b..a4f8c4a 100644
--- a/src/styles/element-variables.scss
+++ b/src/assets/styles/element-variables.scss
@@ -22,7 +22,7 @@ $--table-border:1px solid#dfe6ec;
 /* icon font path, required */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';
 
-@import "~element-ui/packages/theme-chalk/src/index";
+@import "../../../node_modules/element-ui/packages/theme-chalk/src/index";
 
 // 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/src/assets/styles/index.scss b/src/assets/styles/index.scss
new file mode 100644
index 0000000..fdf9ba4
--- /dev/null
+++ b/src/assets/styles/index.scss
@@ -0,0 +1,182 @@
+@import 'variables';
+@import 'mixin';
+@import 'transition';
+@import 'element-ui';
+@import 'sidebar';
+@import 'btn';
+@import 'eladmin';
+
+body {
+  height: 100%;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+
+label {
+  font-weight: 700;
+}
+
+html {
+  height: 100%;
+  box-sizing: border-box;
+}
+
+#app {
+  height: 100%;
+}
+
+*,
+*:before,
+*:after {
+  box-sizing: inherit;
+}
+
+.no-padding {
+  padding: 0px !important;
+}
+
+.padding-content {
+  padding: 4px 0;
+}
+
+a:focus,
+a:active {
+  outline: none;
+}
+
+a,
+a:focus,
+a:hover {
+  cursor: pointer;
+  color: inherit;
+  text-decoration: none;
+}
+
+div:focus {
+  outline: none;
+}
+
+.fr {
+  float: right;
+}
+
+.fl {
+  float: left;
+}
+
+.pr-5 {
+  padding-right: 5px;
+}
+
+.pl-5 {
+  padding-left: 5px;
+}
+
+.block {
+  display: block;
+}
+
+.pointer {
+  cursor: pointer;
+}
+
+.inlineBlock {
+  display: block;
+}
+
+.clearfix {
+  &:after {
+    visibility: hidden;
+    display: block;
+    font-size: 0;
+    content: " ";
+    clear: both;
+    height: 0;
+  }
+}
+
+aside {
+  background: #eef1f6;
+  padding: 8px 24px;
+  margin-bottom: 20px;
+  border-radius: 2px;
+  display: block;
+  line-height: 32px;
+  font-size: 16px;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  color: #2c3e50;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  a {
+    color: #337ab7;
+    cursor: pointer;
+
+    &:hover {
+      color: rgb(32, 160, 255);
+    }
+  }
+}
+
+//main-container全局样式
+.app-container {
+  padding: 20px;
+}
+
+.components-container {
+  margin: 30px 50px;
+  position: relative;
+}
+
+.pagination-container {
+  margin-top: 30px;
+}
+
+.text-center {
+  text-align: center
+}
+
+.sub-navbar {
+  height: 50px;
+  line-height: 50px;
+  position: relative;
+  width: 100%;
+  text-align: right;
+  padding-right: 20px;
+  transition: 600ms ease position;
+  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+
+  .subtitle {
+    font-size: 20px;
+    color: #fff;
+  }
+
+  &.draft {
+    background: #d0d0d0;
+  }
+
+  &.deleted {
+    background: #d0d0d0;
+  }
+}
+
+.link-type,
+.link-type:focus {
+  color: #337ab7;
+  cursor: pointer;
+
+  &:hover {
+    color: rgb(32, 160, 255);
+  }
+}
+
+//refine vue-multiselect plugin
+.multiselect {
+  line-height: 16px;
+}
+
+.multiselect--active {
+  z-index: 1000 !important;
+}
diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss
new file mode 100644
index 0000000..06fa061
--- /dev/null
+++ b/src/assets/styles/mixin.scss
@@ -0,0 +1,66 @@
+@mixin clearfix {
+  &:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+}
+
+@mixin scrollBar {
+  &::-webkit-scrollbar-track-piece {
+    background: #d3dce6;
+  }
+
+  &::-webkit-scrollbar {
+    width: 6px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #99a9bf;
+    border-radius: 20px;
+  }
+}
+
+@mixin relative {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+@mixin pct($pct) {
+  width: #{$pct};
+  position: relative;
+  margin: 0 auto;
+}
+
+@mixin triangle($width, $height, $color, $direction) {
+  $width: $width/2;
+  $color-border-style: $height solid $color;
+  $transparent-border-style: $width solid transparent;
+  height: 0;
+  width: 0;
+
+  @if $direction==up {
+    border-bottom: $color-border-style;
+    border-left: $transparent-border-style;
+    border-right: $transparent-border-style;
+  }
+
+  @else if $direction==right {
+    border-left: $color-border-style;
+    border-top: $transparent-border-style;
+    border-bottom: $transparent-border-style;
+  }
+
+  @else if $direction==down {
+    border-top: $color-border-style;
+    border-left: $transparent-border-style;
+    border-right: $transparent-border-style;
+  }
+
+  @else if $direction==left {
+    border-right: $color-border-style;
+    border-top: $transparent-border-style;
+    border-bottom: $transparent-border-style;
+  }
+}
diff --git a/src/styles/sidebar.scss b/src/assets/styles/sidebar.scss
similarity index 50%
rename from src/styles/sidebar.scss
rename to src/assets/styles/sidebar.scss
index 6457bce..3dad4c3 100644
--- a/src/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,15 +1,16 @@
 #app {
-  // 主体区域
+
   .main-container {
     min-height: 100%;
     transition: margin-left .28s;
-    margin-left: 193px;
+    margin-left: $sideBarWidth;
     position: relative;
   }
-  // 侧边栏
+
   .sidebar-container {
     transition: width 0.28s;
-    width: 193px !important;
+    width: $sideBarWidth !important;
+    background-color: $menuBg;
     height: 100%;
     position: fixed;
     font-size: 0px;
@@ -18,62 +19,111 @@
     left: 0;
     z-index: 1001;
     overflow: hidden;
-    //reset element-ui css
+
+    // reset element-ui css
     .horizontal-collapse-transition {
       transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
     }
-    .el-scrollbar__bar.is-vertical{
+
+    .scrollbar-wrapper {
+      overflow-x: hidden !important;
+    }
+
+    .el-scrollbar__bar.is-vertical {
       right: 0px;
     }
-    .scrollbar-wrapper {
-      overflow-x: hidden!important;
-      .el-scrollbar__view {
-        height: 100%;
+
+    .el-scrollbar {
+      height: 100%;
+    }
+
+    &.has-logo {
+      .el-scrollbar {
+        height: calc(100% - 50px);
       }
     }
+
     .is-horizontal {
       display: none;
     }
+
     a {
       display: inline-block;
       width: 100%;
       overflow: hidden;
     }
+
     .svg-icon {
       margin-right: 16px;
     }
+
     .el-menu {
       border: none;
       height: 100%;
       width: 100% !important;
     }
-    .is-active > .el-submenu__title{
-      color: #f4f4f5!important;
-    }
-  }
-  .hideSidebar {
-    .sidebar-container {
-      width: 36px !important;
-    }
-    .main-container {
-      margin-left: 36px;
-    }
-    .submenu-title-noDropdown {
-      padding-left: 10px !important;
-      position: relative;
-      .el-tooltip {
-        padding: 0 10px !important;
+
+    // menu hover
+    .submenu-title-noDropdown,
+    .el-submenu__title {
+      &:hover {
+        background-color: $menuHover !important;
       }
     }
+
+    .is-active>.el-submenu__title {
+      color: $subMenuActiveText !important;
+    }
+
+    & .nest-menu .el-submenu>.el-submenu__title,
+    & .el-submenu .el-menu-item {
+      min-width: $sideBarWidth !important;
+      background-color: $subMenuBg !important;
+
+      &:hover {
+        background-color: $subMenuHover !important;
+      }
+    }
+  }
+
+  .hideSidebar {
+    .sidebar-container {
+      width: 54px !important;
+    }
+
+    .main-container {
+      margin-left: 54px;
+    }
+
+    .submenu-title-noDropdown {
+      padding: 0 !important;
+      position: relative;
+
+      .el-tooltip {
+        padding: 0 !important;
+
+        .svg-icon {
+          margin-left: 20px;
+        }
+      }
+    }
+
     .el-submenu {
       overflow: hidden;
+
       &>.el-submenu__title {
-        padding-left: 10px !important;
+        padding: 0 !important;
+
+        .svg-icon {
+          margin-left: 20px;
+        }
+
         .el-submenu__icon-arrow {
           display: none;
         }
       }
     }
+
     .el-menu--collapse {
       .el-submenu {
         &>.el-submenu__title {
@@ -88,35 +138,33 @@
       }
     }
   }
-  .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
-  .sidebar-container .el-submenu .el-menu-item {
-    min-width: 195px !important;
-    background-color: $subMenuBg !important;
-    &:hover {
-      background-color: $menuHover !important;
-    }
-  }
+
   .el-menu--collapse .el-menu .el-submenu {
-    min-width: 195px !important;
+    min-width: $sideBarWidth !important;
   }
 
-  //适配移动端
+  // mobile responsive
   .mobile {
     .main-container {
       margin-left: 0px;
     }
+
     .sidebar-container {
       transition: transform .28s;
-      width: 195px !important;
+      width: $sideBarWidth !important;
     }
+
     &.hideSidebar {
       .sidebar-container {
+        pointer-events: none;
         transition-duration: 0.3s;
-        transform: translate3d(-195px, 0, 0);
+        transform: translate3d(-$sideBarWidth, 0, 0);
       }
     }
   }
+
   .withoutAnimation {
+
     .main-container,
     .sidebar-container {
       transition: none;
@@ -124,10 +172,38 @@
   }
 }
 
-.el-menu--vertical{
-  & >.el-menu{
-    .svg-icon{
+// when menu collapsed
+.el-menu--vertical {
+  &>.el-menu {
+    .svg-icon {
       margin-right: 16px;
     }
   }
+
+  .nest-menu .el-submenu>.el-submenu__title,
+  .el-menu-item {
+    &:hover {
+      // you can use $subMenuHover
+      background-color: $menuHover !important;
+    }
+  }
+
+  // the scroll bar appears when the subMenu is too long
+  >.el-menu--popup {
+    max-height: 100vh;
+    overflow-y: auto;
+
+    &::-webkit-scrollbar-track-piece {
+      background: #d3dce6;
+    }
+
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #99a9bf;
+      border-radius: 20px;
+    }
+  }
 }
diff --git a/src/styles/transition.scss b/src/assets/styles/transition.scss
similarity index 87%
rename from src/styles/transition.scss
rename to src/assets/styles/transition.scss
index 8dd9b04..4cb27cc 100644
--- a/src/styles/transition.scss
+++ b/src/assets/styles/transition.scss
@@ -1,6 +1,6 @@
-//globl transition css
+// global transition css
 
-/*fade*/
+/* fade */
 .fade-enter-active,
 .fade-leave-active {
   transition: opacity 0.28s;
@@ -11,21 +11,23 @@
   opacity: 0;
 }
 
-/*fade-transform*/
+/* fade-transform */
 .fade-transform-leave-active,
 .fade-transform-enter-active {
   transition: all .5s;
 }
+
 .fade-transform-enter {
   opacity: 0;
   transform: translateX(-30px);
 }
+
 .fade-transform-leave-to {
   opacity: 0;
   transform: translateX(30px);
 }
 
-/*fade*/
+/* breadcrumb transition */
 .breadcrumb-enter-active,
 .breadcrumb-leave-active {
   transition: all .5s;
diff --git a/src/styles/variables.scss b/src/assets/styles/variables.scss
similarity index 75%
rename from src/styles/variables.scss
rename to src/assets/styles/variables.scss
index 61e9628..a19c27c 100644
--- a/src/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -1,4 +1,14 @@
-//sidebar
+// base color
+$blue:#324157;
+$light-blue:#3A71A8;
+$red:#C03639;
+$pink: #E65D6E;
+$green: #30B08F;
+$tiffany: #4AB7BD;
+$yellow:#FEC171;
+$panGreen: #30B08F;
+
+// sidebar
 $menuText:#bfcbd9;
 $menuActiveText:#409EFF;
 $subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
@@ -9,9 +19,7 @@ $menuHover:#263445;
 $subMenuBg:#1f2d3d;
 $subMenuHover:#001528;
 
-$sideBarWidth: 193px;
-
-$hideSidebarWidth: 38px;
+$sideBarWidth: 210px;
 
 // 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/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 96b78dc..204ea59 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" v-if="item.meta.title" :key="item.path">
+      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
         <span v-if="item.redirect==='noredirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
@@ -19,7 +19,11 @@ export default {
     }
   },
   watch: {
-    $route() {
+    $route(route) {
+      // if you go to the redirect page, do not update the breadcrumbs
+      if (route.path.startsWith('/redirect/')) {
+        return
+      }
       this.getBreadcrumb()
     }
   },
@@ -28,19 +32,22 @@ export default {
   },
   methods: {
     getBreadcrumb() {
-      let matched = this.$route.matched.filter(item => {
-        if (item.name) {
-          return true
-        }
-      })
+      // only show routes with meta.title
+      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
       const first = matched[0]
-      if (first && first.name !== '首页') {
+
+      if (!this.isDashboard(first)) {
         matched = [{ path: '/dashboard', meta: { title: '首页' }}].concat(matched)
       }
-      if (matched.length >= 4) {
-        matched.splice(1, 1)
+
+      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+    },
+    isDashboard(route) {
+      const name = route && route.name
+      if (!name) {
+        return false
       }
-      this.levelList = matched
+      return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase()
     },
     pathCompile(path) {
       // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
@@ -60,15 +67,15 @@ export default {
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .app-breadcrumb.el-breadcrumb {
-    display: inline-block;
-    font-size: 14px;
-    line-height: 50px;
-    margin-left: 10px;
-    .no-redirect {
-      color: #97a8be;
-      cursor: text;
-    }
+<style lang="scss" scoped>
+.app-breadcrumb.el-breadcrumb {
+  display: inline-block;
+  font-size: 14px;
+  line-height: 50px;
+  margin-left: 8px;
+  .no-redirect {
+    color: #97a8be;
+    cursor: text;
   }
+}
 </style>
diff --git a/src/views/dashboard/BarChart.vue b/src/components/Echarts/BarChart.vue
similarity index 97%
rename from src/views/dashboard/BarChart.vue
rename to src/components/Echarts/BarChart.vue
index 28e0aef..fa265ef 100644
--- a/src/views/dashboard/BarChart.vue
+++ b/src/components/Echarts/BarChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/Category.vue b/src/components/Echarts/Category.vue
similarity index 99%
rename from src/views/dashboard/Category.vue
rename to src/components/Echarts/Category.vue
index 767b981..5859114 100644
--- a/src/views/dashboard/Category.vue
+++ b/src/components/Echarts/Category.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/Funnel.vue b/src/components/Echarts/Funnel.vue
similarity index 97%
rename from src/views/dashboard/Funnel.vue
rename to src/components/Echarts/Funnel.vue
index f8c7de3..380b373 100644
--- a/src/views/dashboard/Funnel.vue
+++ b/src/components/Echarts/Funnel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/Gauge.vue b/src/components/Echarts/Gauge.vue
similarity index 95%
rename from src/views/dashboard/Gauge.vue
rename to src/components/Echarts/Gauge.vue
index b5030ce..40ce775 100644
--- a/src/views/dashboard/Gauge.vue
+++ b/src/components/Echarts/Gauge.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/Graph.vue b/src/components/Echarts/Graph.vue
similarity index 96%
rename from src/views/dashboard/Graph.vue
rename to src/components/Echarts/Graph.vue
index 72397ee..a5a88b3 100644
--- a/src/views/dashboard/Graph.vue
+++ b/src/components/Echarts/Graph.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/HeatMap.vue b/src/components/Echarts/HeatMap.vue
similarity index 98%
rename from src/views/dashboard/HeatMap.vue
rename to src/components/Echarts/HeatMap.vue
index c1a6db6..6606278 100644
--- a/src/views/dashboard/HeatMap.vue
+++ b/src/components/Echarts/HeatMap.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/Line3D.vue b/src/components/Echarts/Line3D.vue
similarity index 96%
rename from src/views/dashboard/Line3D.vue
rename to src/components/Echarts/Line3D.vue
index 3277f92..c3f16f6 100644
--- a/src/views/dashboard/Line3D.vue
+++ b/src/components/Echarts/Line3D.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/PieChart.vue b/src/components/Echarts/PieChart.vue
similarity index 96%
rename from src/views/dashboard/PieChart.vue
rename to src/components/Echarts/PieChart.vue
index edb17d5..ff1bc52 100644
--- a/src/views/dashboard/PieChart.vue
+++ b/src/components/Echarts/PieChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/Point.vue b/src/components/Echarts/Point.vue
similarity index 97%
rename from src/views/dashboard/Point.vue
rename to src/components/Echarts/Point.vue
index a0e292d..5a6c777 100644
--- a/src/views/dashboard/Point.vue
+++ b/src/components/Echarts/Point.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/RadarChart.vue b/src/components/Echarts/RadarChart.vue
similarity index 97%
rename from src/views/dashboard/RadarChart.vue
rename to src/components/Echarts/RadarChart.vue
index 11fde32..de70e52 100644
--- a/src/views/dashboard/RadarChart.vue
+++ b/src/components/Echarts/RadarChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/Rich.vue b/src/components/Echarts/Rich.vue
similarity index 98%
rename from src/views/dashboard/Rich.vue
rename to src/components/Echarts/Rich.vue
index f7c87e4..1cf6bf2 100644
--- a/src/views/dashboard/Rich.vue
+++ b/src/components/Echarts/Rich.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/Sankey.vue b/src/components/Echarts/Sankey.vue
similarity index 96%
rename from src/views/dashboard/Sankey.vue
rename to src/components/Echarts/Sankey.vue
index 208c4b7..49968c4 100644
--- a/src/views/dashboard/Sankey.vue
+++ b/src/components/Echarts/Sankey.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/Scatter.vue b/src/components/Echarts/Scatter.vue
similarity index 98%
rename from src/views/dashboard/Scatter.vue
rename to src/components/Echarts/Scatter.vue
index b91112e..b776efb 100644
--- a/src/views/dashboard/Scatter.vue
+++ b/src/components/Echarts/Scatter.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/Sunburst.vue b/src/components/Echarts/Sunburst.vue
similarity index 96%
rename from src/views/dashboard/Sunburst.vue
rename to src/components/Echarts/Sunburst.vue
index a61aa51..fafc1a8 100644
--- a/src/views/dashboard/Sunburst.vue
+++ b/src/components/Echarts/Sunburst.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/ThemeRiver.vue b/src/components/Echarts/ThemeRiver.vue
similarity index 98%
rename from src/views/dashboard/ThemeRiver.vue
rename to src/components/Echarts/ThemeRiver.vue
index 73147d7..967fc05 100644
--- a/src/views/dashboard/ThemeRiver.vue
+++ b/src/components/Echarts/ThemeRiver.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/components/Github/index.vue b/src/components/Github/index.vue
index 0d181d9..ba3925f 100644
--- a/src/components/Github/index.vue
+++ b/src/components/Github/index.vue
@@ -1,6 +1,6 @@
 <template>
   <a href="https://github.com/elunez/eladmin" target="_blank">
-    <svg id="icon-github" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="icon svg" viewBox="0 0 1025 1024" width="100%" height="100%"><path d="M512.032 831.904c-19.168 0-38.304-9.92-58.144-29.76-7.808-7.808-7.808-20.48 0-28.288s20.48-7.808 28.288 0c12.192 12.224 21.984 18.144 29.856 18.144s17.664-5.92 29.856-18.144c7.808-7.808 20.48-7.808 28.288 0s7.808 20.48 0 28.288c-19.84 19.84-38.976 29.76-58.144 29.76zM0.032 525.504c0 49.888 4.256 95.136 12.8 135.68s20.544 75.744 36 105.536c15.456 29.792 35.008 55.904 58.656 78.336s49.344 40.928 77.056 55.456c27.744 14.528 59.456 26.304 95.2 35.264s72.096 15.264 109.056 18.848 77.696 5.376 122.144 5.376c44.448 0 85.248-1.792 122.4-5.376s73.6-9.856 109.344-18.848c35.744-8.96 67.552-20.736 95.456-35.264s53.792-33.024 77.6-55.456c23.808-22.432 43.456-48.544 58.944-78.336s27.552-64.96 36.256-105.536c8.704-40.576 13.056-85.792 13.056-135.68 0-89.376-27.744-166.368-83.2-230.976 3.2-8.608 5.952-18.496 8.256-29.6s4.544-26.816 6.656-47.104c2.144-20.288 1.344-43.712-2.4-70.272s-10.752-53.664-21.056-81.312l-8-1.632c-5.344-1.088-14.048-0.704-26.144 1.088s-26.208 5.024-42.4 9.696c-16.192 4.672-37.056 13.92-62.656 27.744s-52.608 31.328-81.056 52.512c-48.352-14.72-115.008-30.112-200-30.112s-151.808 15.392-200.544 30.112c-28.448-21.184-55.552-38.592-81.344-52.224s-46.4-22.976-61.856-28c-15.456-5.024-29.792-8.256-42.944-9.696s-21.6-1.888-25.344-1.344c-3.744 0.544-6.496 1.152-8.256 1.888-10.304 27.648-17.408 54.752-21.344 81.312s-4.8 49.888-2.656 69.984c2.144 20.096 4.448 35.904 6.944 47.392s5.344 21.344 8.544 29.6c-55.456 64.256-83.2 141.248-83.2 230.976zM136.576 639.392c0-58.016 21.344-110.624 64-157.856 12.8-14.4 27.648-25.312 44.544-32.704s36.096-11.616 57.6-12.608 42.048-0.8 61.6 0.608c19.552 1.408 43.744 3.296 72.544 5.696s53.696 3.616 74.656 3.616c20.96 0 45.856-1.184 74.656-3.616s52.992-4.288 72.544-5.696c19.552-1.408 40.096-1.6 61.6-0.608s40.8 5.216 57.856 12.608c17.056 7.392 32 18.304 44.8 32.704 42.656 47.232 64 99.84 64 157.856 0 34.016-3.552 64.32-10.656 90.944s-16.096 48.928-26.944 66.912c-10.848 18.016-26.048 33.216-45.6 45.632s-38.496 22.016-56.8 28.8c-18.304 6.784-41.952 12.096-70.944 15.904s-54.944 6.112-77.856 6.912c-22.944 0.8-51.808 1.216-86.656 1.216s-63.648-0.416-86.4-1.216c-22.752-0.8-48.608-3.104-77.6-6.912s-52.608-9.12-70.944-15.904c-18.304-6.816-37.248-16.416-56.8-28.8s-34.752-27.616-45.6-45.632c-10.848-18.016-19.84-40.32-26.944-66.912s-10.656-56.928-10.656-90.944zM256.032 608c0-53.024 28.64-96 64-96s64 42.976 64 96c0 53.024-28.64 96-64 96s-64-42.976-64-96zM640.032 608c0-53.024 28.64-96 64-96s64 42.976 64 96c0 53.024-28.64 96-64 96s-64-42.976-64-96z" p-id="1450"/></svg>
+    <svg id="icon-github" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="icon svg" viewBox="0 0 1025 1024" width="100%" height="100%"><path d="M512.032 831.904c-19.168 0-38.304-9.92-58.144-29.76-7.808-7.808-7.808-20.48 0-28.288s20.48-7.808 28.288 0c12.192 12.224 21.984 18.144 29.856 18.144s17.664-5.92 29.856-18.144c7.808-7.808 20.48-7.808 28.288 0s7.808 20.48 0 28.288c-19.84 19.84-38.976 29.76-58.144 29.76zM0.032 525.504c0 49.888 4.256 95.136 12.8 135.68s20.544 75.744 36 105.536c15.456 29.792 35.008 55.904 58.656 78.336s49.344 40.928 77.056 55.456c27.744 14.528 59.456 26.304 95.2 35.264s72.096 15.264 109.056 18.848 77.696 5.376 122.144 5.376c44.448 0 85.248-1.792 122.4-5.376s73.6-9.856 109.344-18.848c35.744-8.96 67.552-20.736 95.456-35.264s53.792-33.024 77.6-55.456c23.808-22.432 43.456-48.544 58.944-78.336s27.552-64.96 36.256-105.536c8.704-40.576 13.056-85.792 13.056-135.68 0-89.376-27.744-166.368-83.2-230.976 3.2-8.608 5.952-18.496 8.256-29.6s4.544-26.816 6.656-47.104c2.144-20.288 1.344-43.712-2.4-70.272s-10.752-53.664-21.056-81.312l-8-1.632c-5.344-1.088-14.048-0.704-26.144 1.088s-26.208 5.024-42.4 9.696c-16.192 4.672-37.056 13.92-62.656 27.744s-52.608 31.328-81.056 52.512c-48.352-14.72-115.008-30.112-200-30.112s-151.808 15.392-200.544 30.112c-28.448-21.184-55.552-38.592-81.344-52.224s-46.4-22.976-61.856-28c-15.456-5.024-29.792-8.256-42.944-9.696s-21.6-1.888-25.344-1.344c-3.744 0.544-6.496 1.152-8.256 1.888-10.304 27.648-17.408 54.752-21.344 81.312s-4.8 49.888-2.656 69.984c2.144 20.096 4.448 35.904 6.944 47.392s5.344 21.344 8.544 29.6c-55.456 64.256-83.2 141.248-83.2 230.976zM136.576 639.392c0-58.016 21.344-110.624 64-157.856 12.8-14.4 27.648-25.312 44.544-32.704s36.096-11.616 57.6-12.608 42.048-0.8 61.6 0.608c19.552 1.408 43.744 3.296 72.544 5.696s53.696 3.616 74.656 3.616c20.96 0 45.856-1.184 74.656-3.616s52.992-4.288 72.544-5.696c19.552-1.408 40.096-1.6 61.6-0.608s40.8 5.216 57.856 12.608c17.056 7.392 32 18.304 44.8 32.704 42.656 47.232 64 99.84 64 157.856 0 34.016-3.552 64.32-10.656 90.944s-16.096 48.928-26.944 66.912c-10.848 18.016-26.048 33.216-45.6 45.632s-38.496 22.016-56.8 28.8c-18.304 6.784-41.952 12.096-70.944 15.904s-54.944 6.112-77.856 6.912c-22.944 0.8-51.808 1.216-86.656 1.216s-63.648-0.416-86.4-1.216c-22.752-0.8-48.608-3.104-77.6-6.912s-52.608-9.12-70.944-15.904c-18.304-6.816-37.248-16.416-56.8-28.8s-34.752-27.616-45.6-45.632c-10.848-18.016-19.84-40.32-26.944-66.912s-10.656-56.928-10.656-90.944zM256.032 608c0-53.024 28.64-96 64-96s64 42.976 64 96c0 53.024-28.64 96-64 96s-64-42.976-64-96zM640.032 608c0-53.024 28.64-96 64-96s64 42.976 64 96c0 53.024-28.64 96-64 96s-64-42.976-64-96z" p-id="1450" /></svg>
   </a>
 </template>
 
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index e4cf00a..368b002 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -1,16 +1,13 @@
 <template>
-  <div>
+  <div style="padding: 0 15px;" @click="toggleClick">
     <svg
       :class="{'is-active':isActive}"
-      t="1492500959545"
       class="hamburger"
       viewBox="0 0 1024 1024"
       xmlns="http://www.w3.org/2000/svg"
-      version="1.1"
-      p-id="1691"
       width="64"
       height="64"
-      @click="toggleClick">
+    >
       <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
     </svg>
   </div>
@@ -23,10 +20,11 @@ export default {
     isActive: {
       type: Boolean,
       default: false
-    },
-    toggleClick: {
-      type: Function,
-      default: null
+    }
+  },
+  methods: {
+    toggleClick() {
+      this.$emit('toggleClick')
     }
   }
 }
@@ -34,14 +32,13 @@ export default {
 
 <style scoped>
 .hamburger {
-	display: inline-block;
-	cursor: pointer;
-	width: 20px;
-	height: 20px;
-	transition: .38s;
-	transform-origin: 50% 50%;
+  display: inline-block;
+  vertical-align: middle;
+  width: 20px;
+  height: 20px;
 }
+
 .hamburger.is-active {
-	transform: rotate(180deg);
+  transform: rotate(180deg);
 }
 </style>
diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
new file mode 100644
index 0000000..be9b177
--- /dev/null
+++ b/src/components/HeaderSearch/index.vue
@@ -0,0 +1,180 @@
+<template>
+  <div :class="{'show':show}" class="header-search">
+    <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
+    <el-select
+      ref="headerSearchSelect"
+      v-model="search"
+      :remote-method="querySearch"
+      filterable
+      default-first-option
+      remote
+      placeholder="Search"
+      class="header-search-select"
+      @change="change"
+    >
+      <el-option v-for="item in options" :key="item.path" :value="item" :label="item.title.join(' > ')" />
+    </el-select>
+  </div>
+</template>
+
+<script>
+// fuse is a lightweight fuzzy-search module
+// make search results more in line with expectations
+import Fuse from 'fuse.js'
+import path from 'path'
+
+export default {
+  name: 'HeaderSearch',
+  data() {
+    return {
+      search: '',
+      options: [],
+      searchPool: [],
+      show: false,
+      fuse: undefined
+    }
+  },
+  computed: {
+    routes() {
+      return this.$store.state.permission.routers
+    }
+  },
+  watch: {
+    routes() {
+      this.searchPool = this.generateRoutes(this.routes)
+    },
+    searchPool(list) {
+      this.initFuse(list)
+    },
+    show(value) {
+      if (value) {
+        document.body.addEventListener('click', this.close)
+      } else {
+        document.body.removeEventListener('click', this.close)
+      }
+    }
+  },
+  mounted() {
+    this.searchPool = this.generateRoutes(this.routes)
+  },
+  methods: {
+    click() {
+      this.show = !this.show
+      if (this.show) {
+        this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.focus()
+      }
+    },
+    close() {
+      this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.blur()
+      this.options = []
+      this.show = false
+    },
+    change(val) {
+      this.$router.push(val.path)
+      this.search = ''
+      this.options = []
+      this.$nextTick(() => {
+        this.show = false
+      })
+    },
+    initFuse(list) {
+      this.fuse = new Fuse(list, {
+        shouldSort: true,
+        threshold: 0.4,
+        location: 0,
+        distance: 100,
+        maxPatternLength: 32,
+        minMatchCharLength: 1,
+        keys: [{
+          name: 'title',
+          weight: 0.7
+        }, {
+          name: 'path',
+          weight: 0.3
+        }]
+      })
+    },
+    // Filter out the routes that can be displayed in the sidebar
+    // And generate the internationalized title
+    generateRoutes(routes, basePath = '/', prefixTitle = []) {
+      let res = []
+
+      for (const router of routes) {
+        // skip hidden router
+        if (router.hidden) { continue }
+
+        const data = {
+          path: path.resolve(basePath, router.path),
+          title: [...prefixTitle]
+        }
+
+        if (router.meta && router.meta.title) {
+          data.title = [...data.title, router.meta.title]
+
+          if (router.redirect !== 'noRedirect') {
+            // only push the routes with title
+            // special case: need to exclude parent router without redirect
+            res.push(data)
+          }
+        }
+
+        // recursive child routes
+        if (router.children) {
+          const tempRoutes = this.generateRoutes(router.children, data.path, data.title)
+          if (tempRoutes.length >= 1) {
+            res = [...res, ...tempRoutes]
+          }
+        }
+      }
+      return res
+    },
+    querySearch(query) {
+      if (query !== '') {
+        this.options = this.fuse.search(query)
+      } else {
+        this.options = []
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.header-search {
+  font-size: 0 !important;
+
+  .search-icon {
+    cursor: pointer;
+    font-size: 18px;
+    vertical-align: middle;
+  }
+
+  .header-search-select {
+    font-size: 18px;
+    transition: width 0.2s;
+    width: 0;
+    overflow: hidden;
+    background: transparent;
+    border-radius: 0;
+    display: inline-block;
+    vertical-align: middle;
+
+    /deep/ .el-input__inner {
+      border-radius: 0;
+      border: 0;
+      padding-left: 0;
+      padding-right: 0;
+      box-shadow: none !important;
+      border-bottom: 1px solid #d9d9d9;
+      vertical-align: middle;
+    }
+  }
+
+  &.show {
+    .header-search-select {
+      width: 210px;
+      margin-left: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 719b3bc..0611dc5 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="icon-body">
     <el-input v-model="name" style="position: relative;" clearable placeholder="请输入图标名称" @clear="filterIcons" @input.native="filterIcons">
-      <i slot="suffix" class="el-icon-search el-input__icon"/>
+      <i slot="suffix" class="el-icon-search el-input__icon" />
     </el-input>
     <div class="icon-list">
       <div v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)">
diff --git a/src/components/IconSelect/requireIcons.js b/src/components/IconSelect/requireIcons.js
index 83a3395..99e5c54 100644
--- a/src/components/IconSelect/requireIcons.js
+++ b/src/components/IconSelect/requireIcons.js
@@ -1,5 +1,5 @@
 
-const req = require.context('../../icons/svg', false, /\.svg$/)
+const req = require.context('../../assets/icons/svg', false, /\.svg$/)
 const requireAll = requireContext => requireContext.keys()
 
 const re = /\.\/(.*)\.svg/
diff --git a/src/components/Iframe/index.vue b/src/components/Iframe/index.vue
index f8fa4a8..9f395a3 100644
--- a/src/components/Iframe/index.vue
+++ b/src/components/Iframe/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading" :style="'height:'+ height">
-    <iframe :src="src" frameborder="no" style="width: 100%;height: 100%" scrolling="auto"/>
+    <iframe :src="src" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" />
   </div>
 </template>
 <script>
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
new file mode 100644
index 0000000..c815e13
--- /dev/null
+++ b/src/components/Pagination/index.vue
@@ -0,0 +1,101 @@
+<template>
+  <div :class="{'hidden':hidden}" class="pagination-container">
+    <el-pagination
+      :background="background"
+      :current-page.sync="currentPage"
+      :page-size.sync="pageSize"
+      :layout="layout"
+      :page-sizes="pageSizes"
+      :total="total"
+      v-bind="$attrs"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+
+<script>
+import { scrollTo } from '@/utils/scroll-to'
+
+export default {
+  name: 'Pagination',
+  props: {
+    total: {
+      required: true,
+      type: Number
+    },
+    page: {
+      type: Number,
+      default: 1
+    },
+    limit: {
+      type: Number,
+      default: 20
+    },
+    pageSizes: {
+      type: Array,
+      default() {
+        return [10, 20, 30, 50]
+      }
+    },
+    layout: {
+      type: String,
+      default: 'total, sizes, prev, pager, next, jumper'
+    },
+    background: {
+      type: Boolean,
+      default: true
+    },
+    autoScroll: {
+      type: Boolean,
+      default: true
+    },
+    hidden: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    currentPage: {
+      get() {
+        return this.page
+      },
+      set(val) {
+        this.$emit('update:page', val)
+      }
+    },
+    pageSize: {
+      get() {
+        return this.limit
+      },
+      set(val) {
+        this.$emit('update:limit', val)
+      }
+    }
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.$emit('pagination', { page: this.currentPage, limit: val })
+      if (this.autoScroll) {
+        scrollTo(0, 800)
+      }
+    },
+    handleCurrentChange(val) {
+      this.$emit('pagination', { page: val, limit: this.pageSize })
+      if (this.autoScroll) {
+        scrollTo(0, 800)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pagination-container {
+  background: #fff;
+  padding: 32px 16px;
+}
+.pagination-container.hidden {
+  display: none;
+}
+</style>
diff --git a/src/components/PanThumb/index.vue b/src/components/PanThumb/index.vue
index ec549f4..de6940a 100644
--- a/src/components/PanThumb/index.vue
+++ b/src/components/PanThumb/index.vue
@@ -2,7 +2,7 @@
   <div :style="{zIndex:zIndex,height:height,width:width}" class="pan-item">
     <div class="pan-info">
       <div class="pan-info-roles-container">
-        <slot/>
+        <slot />
       </div>
     </div>
     <img :src="image" class="pan-thumb">
diff --git a/src/components/RightPanel/index.vue b/src/components/RightPanel/index.vue
index 6d46d57..b65ecec 100644
--- a/src/components/RightPanel/index.vue
+++ b/src/components/RightPanel/index.vue
@@ -2,10 +2,6 @@
   <div ref="rightPanel" :class="{show:show}" class="rightPanel-container">
     <div class="rightPanel-background" />
     <div class="rightPanel">
-      <div v-if="settingBtn" :style="{'top':buttonTop+'px','background-color':theme}" class="handle-button" @click="show=!show">
-        <i :class="show?'el-icon-close':'el-icon-setting'" />
-      </div>
-      <div v-else :style="{'top':buttonTop+'px'}" @click="show=!show"/>
       <div class="rightPanel-items">
         <slot />
       </div>
@@ -31,24 +27,17 @@ export default {
   computed: {
     show: {
       get() {
-        return this.$store.state.settings.showRightPanel
+        return this.$store.state.settings.showSettings
       },
       set(val) {
-        this.$store.dispatch('changeSetting', {
-          key: 'showRightPanel',
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'showSettings',
           value: val
         })
       }
     },
-    theme: {
-      get() {
-        return this.$store.state.settings.theme
-      }
-    },
-    settingBtn: {
-      get() {
-        return this.$store.state.settings.settingBtn
-      }
+    theme() {
+      return this.$store.state.settings.theme
     }
   },
   watch: {
@@ -65,6 +54,7 @@ export default {
   },
   mounted() {
     this.insertToBody()
+    this.addEventClick()
   },
   beforeDestroy() {
     const elx = this.$refs.rightPanel
@@ -91,75 +81,69 @@ export default {
 </script>
 
 <style>
-.showRightPanel {
-  overflow: hidden;
-  position: relative;
-  width: calc(100% - 15px);
-}
+  .showRightPanel {
+    overflow: hidden;
+    position: relative;
+    width: calc(100% - 15px);
+  }
 </style>
 
 <style lang="scss" scoped>
-.rightPanel-background {
-  opacity: 0;
-  transition: opacity .3s cubic-bezier(.7, .3, .1, 1);
-  background: rgba(0, 0, 0, .2);
-  width: 0;
-  height: 0;
-  top: 0;
-  left: 0;
-  position: fixed;
-  z-index: -1;
-}
-
-.rightPanel {
-  background: #fff;
-  position: fixed;
-  height: 100vh;
-  width: 100%;
-  max-width: 260px;
-  top: 0px;
-  left: 0px;
-  box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, .05);
-  transition: all .25s cubic-bezier(.7, .3, .1, 1);
-  transform: translate(100%);
-  z-index: 40000;
-  left: auto;
-  right: 0px;
-}
-
-.show {
-  transition: all .3s cubic-bezier(.7, .3, .1, 1);
-
   .rightPanel-background {
-    z-index: 20000;
-    opacity: 1;
-    width: 100%;
-    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    opacity: 0;
+    transition: opacity .3s cubic-bezier(.7, .3, .1, 1);
+    background: rgba(0, 0, 0, .2);
+    z-index: -1;
   }
 
   .rightPanel {
-    transform: translate(0);
+    width: 100%;
+    max-width: 260px;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    right: 0;
+    box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, .05);
+    transition: all .25s cubic-bezier(.7, .3, .1, 1);
+    transform: translate(100%);
+    background: #fff;
+    z-index: 40000;
   }
-}
 
-.handle-button {
-  position: absolute;
-  left: -48px;
-  border-radius: 6px 0 0 6px !important;
-  width: 48px;
-  height: 48px;
-  pointer-events: auto;
-  z-index: 0;
-  cursor: pointer;
-  pointer-events: auto;
-  font-size: 24px;
-  text-align: center;
-  color: #fff;
-  line-height: 48px;
+  .show {
+    transition: all .3s cubic-bezier(.7, .3, .1, 1);
 
-  i {
+    .rightPanel-background {
+      z-index: 20000;
+      opacity: 1;
+      width: 100%;
+      height: 100%;
+    }
+
+    .rightPanel {
+      transform: translate(0);
+    }
+  }
+
+  .handle-button {
+    width: 48px;
+    height: 48px;
+    position: absolute;
+    left: -48px;
+    text-align: center;
     font-size: 24px;
+    border-radius: 6px 0 0 6px !important;
+    z-index: 0;
+    pointer-events: auto;
+    cursor: pointer;
+    color: #fff;
     line-height: 48px;
+    i {
+      font-size: 24px;
+      line-height: 48px;
+    }
   }
-}
 </style>
diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue
index 4cdcb56..260c90d 100644
--- a/src/components/Screenfull/index.vue
+++ b/src/components/Screenfull/index.vue
@@ -1,29 +1,6 @@
 <template>
   <div>
-    <svg
-      t="1508738709248"
-      class="screenfull-svg"
-      viewBox="0 0 1024 1024"
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      p-id="2069"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      width="32"
-      height="32"
-      @click="click">
-      <path
-        d="M333.493443 428.647617 428.322206 333.832158 262.572184 168.045297 366.707916 64.444754 64.09683 64.444754 63.853283 366.570793 167.283957 262.460644Z"
-        p-id="2070"/>
-      <path
-        d="M854.845439 760.133334 688.61037 593.95864 593.805144 688.764889 759.554142 854.56096 655.44604 958.161503 958.055079 958.161503 958.274066 656.035464Z"
-        p-id="2071"/>
-      <path
-        d="M688.535669 428.550403 854.31025 262.801405 957.935352 366.921787 957.935352 64.34754 655.809313 64.081481 759.919463 167.535691 593.70793 333.731874Z"
-        p-id="2072"/>
-      <path
-        d="M333.590658 594.033341 167.8171 759.804852 64.218604 655.67219 64.218604 958.270996 366.342596 958.502263 262.234493 855.071589 428.421466 688.86108Z"
-        p-id="2073"/>
-    </svg>
+    <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" @click="click" />
   </div>
 </template>
 
@@ -32,25 +9,17 @@ import screenfull from 'screenfull'
 
 export default {
   name: 'Screenfull',
-  props: {
-    width: {
-      type: Number,
-      default: 22
-    },
-    height: {
-      type: Number,
-      default: 22
-    },
-    fill: {
-      type: String,
-      default: '#48576a'
-    }
-  },
   data() {
     return {
       isFullscreen: false
     }
   },
+  mounted() {
+    this.init()
+  },
+  beforeDestroy() {
+    this.destroy()
+  },
   methods: {
     click() {
       if (!screenfull.enabled) {
@@ -61,6 +30,19 @@ export default {
         return false
       }
       screenfull.toggle()
+    },
+    change() {
+      this.isFullscreen = screenfull.isFullscreen
+    },
+    init() {
+      if (screenfull.enabled) {
+        screenfull.on('change', this.change)
+      }
+    },
+    destroy() {
+      if (screenfull.enabled) {
+        screenfull.off('change', this.change)
+      }
     }
   }
 }
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
new file mode 100644
index 0000000..e490dce
--- /dev/null
+++ b/src/components/SizeSelect/index.vue
@@ -0,0 +1,57 @@
+<template>
+  <el-dropdown trigger="click" @command="handleSetSize">
+    <div>
+      <svg-icon class-name="size-icon" icon-class="size" />
+    </div>
+    <el-dropdown-menu slot="dropdown">
+      <el-dropdown-item v-for="item of sizeOptions" :key="item.value" :disabled="size===item.value" :command="item.value">
+        {{
+          item.label }}
+      </el-dropdown-item>
+    </el-dropdown-menu>
+  </el-dropdown>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      sizeOptions: [
+        { label: 'Default', value: 'default' },
+        { label: 'Medium', value: 'medium' },
+        { label: 'Small', value: 'small' },
+        { label: 'Mini', value: 'mini' }
+      ]
+    }
+  },
+  computed: {
+    size() {
+      return this.$store.getters.size
+    }
+  },
+  methods: {
+    handleSetSize(size) {
+      this.$ELEMENT.size = size
+      this.$store.dispatch('app/setSize', size)
+      this.refreshView()
+      this.$message({
+        message: '布局设置成功',
+        type: 'success'
+      })
+    },
+    refreshView() {
+      // In order to make the cached page re-rendered
+      this.$store.dispatch('tagsView/delAllCachedViews', this.$route)
+
+      const { fullPath } = this.$route
+
+      this.$nextTick(() => {
+        this.$router.replace({
+          path: '/redirect' + fullPath
+        })
+      })
+    }
+  }
+
+}
+</script>
diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
index 12a1f58..b07ded2 100644
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -1,10 +1,14 @@
 <template>
-  <svg :class="svgClass" aria-hidden="true">
-    <use :xlink:href="iconName"/>
+  <div v-if="isExternal" :style="styleExternalIcon" class="svg-external-icon svg-icon" v-on="$listeners" />
+  <svg v-else :class="svgClass" aria-hidden="true" v-on="$listeners">
+    <use :xlink:href="iconName" />
   </svg>
 </template>
 
 <script>
+// doc: https://panjiachen.github.io/vue-element-admin-site/feature/component/svg-icon.html#usage
+import { isExternal } from '@/utils/validate'
+
 export default {
   name: 'SvgIcon',
   props: {
@@ -18,6 +22,9 @@ export default {
     }
   },
   computed: {
+    isExternal() {
+      return isExternal(this.iconClass)
+    },
     iconName() {
       return `#icon-${this.iconClass}`
     },
@@ -27,6 +34,12 @@ export default {
       } else {
         return 'svg-icon'
       }
+    },
+    styleExternalIcon() {
+      return {
+        mask: `url(${this.iconClass}) no-repeat 50% 50%`,
+        '-webkit-mask': `url(${this.iconClass}) no-repeat 50% 50%`
+      }
     }
   }
 }
@@ -40,4 +53,10 @@ export default {
   fill: currentColor;
   overflow: hidden;
 }
+
+.svg-external-icon {
+  background-color: currentColor;
+  mask-size: cover!important;
+  display: inline-block;
+}
 </style>
diff --git a/src/components/TextHoverEffect/Mallki.vue b/src/components/TextHoverEffect/Mallki.vue
deleted file mode 100644
index 4ea29fc..0000000
--- a/src/components/TextHoverEffect/Mallki.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-  <a :class="className" class="link--mallki" href="#">
-    {{ text }}
-    <span :data-letters="text"/>
-    <span :data-letters="text"/>
-  </a>
-</template>
-
-<script>
-export default {
-  props: {
-    className: {
-      type: String,
-      default: ''
-    },
-    text: {
-      type: String,
-      default: 'vue-element-admin'
-    }
-  }
-}
-</script>
-
-<style>
-/* Mallki */
-
-.link--mallki {
-  font-weight: 800;
-  color: #4dd9d5;
-  font-family: 'Dosis', sans-serif;
-  -webkit-transition: color 0.5s 0.25s;
-  transition: color 0.5s 0.25s;
-  overflow: hidden;
-  position: relative;
-  display: inline-block;
-  line-height: 1;
-  outline: none;
-  text-decoration: none;
-}
-
-.link--mallki:hover {
-  -webkit-transition: none;
-  transition: none;
-  color: transparent;
-}
-
-.link--mallki::before {
-  content: '';
-  width: 100%;
-  height: 6px;
-  margin: -3px 0 0 0;
-  background: #3888fa;
-  position: absolute;
-  left: 0;
-  top: 50%;
-  -webkit-transform: translate3d(-100%, 0, 0);
-  transform: translate3d(-100%, 0, 0);
-  -webkit-transition: -webkit-transform 0.4s;
-  transition: transform 0.4s;
-  -webkit-transition-timing-function: cubic-bezier(0.7, 0, 0.3, 1);
-  transition-timing-function: cubic-bezier(0.7, 0, 0.3, 1);
-}
-
-.link--mallki:hover::before {
-  -webkit-transform: translate3d(100%, 0, 0);
-  transform: translate3d(100%, 0, 0);
-}
-
-.link--mallki span {
-  position: absolute;
-  height: 50%;
-  width: 100%;
-  left: 0;
-  top: 0;
-  overflow: hidden;
-}
-
-.link--mallki span::before {
-  content: attr(data-letters);
-  color: red;
-  position: absolute;
-  left: 0;
-  width: 100%;
-  color: #3888fa;
-  -webkit-transition: -webkit-transform 0.5s;
-  transition: transform 0.5s;
-}
-
-.link--mallki span:nth-child(2) {
-  top: 50%;
-}
-
-.link--mallki span:first-child::before {
-  top: 0;
-  -webkit-transform: translate3d(0, 100%, 0);
-  transform: translate3d(0, 100%, 0);
-}
-
-.link--mallki span:nth-child(2)::before {
-  bottom: 0;
-  -webkit-transform: translate3d(0, -100%, 0);
-  transform: translate3d(0, -100%, 0);
-}
-
-.link--mallki:hover span::before {
-  -webkit-transition-delay: 0.3s;
-  transition-delay: 0.3s;
-  -webkit-transform: translate3d(0, 0, 0);
-  transform: translate3d(0, 0, 0);
-  -webkit-transition-timing-function: cubic-bezier(0.2, 1, 0.3, 1);
-  transition-timing-function: cubic-bezier(0.2, 1, 0.3, 1);
-}
-</style>
diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue
new file mode 100644
index 0000000..ecc6d28
--- /dev/null
+++ b/src/components/ThemePicker/index.vue
@@ -0,0 +1,175 @@
+<template>
+  <el-color-picker
+    v-model="theme"
+    :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
+    class="theme-picker"
+    popper-class="theme-picker-dropdown"
+  />
+</template>
+
+<script>
+const version = require('element-ui/package.json').version // element-ui version from node_modules
+const ORIGINAL_THEME = '#409EFF' // default color
+
+export default {
+  data() {
+    return {
+      chalk: '', // content of theme-chalk css
+      theme: ''
+    }
+  },
+  computed: {
+    defaultTheme() {
+      return this.$store.state.settings.theme
+    }
+  },
+  watch: {
+    defaultTheme: {
+      handler: function(val, oldVal) {
+        this.theme = val
+      },
+      immediate: true
+    },
+    async theme(val) {
+      const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
+      if (typeof val !== 'string') return
+      const themeCluster = this.getThemeCluster(val.replace('#', ''))
+      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
+      console.log(themeCluster, originalCluster)
+
+      const $message = this.$message({
+        message: ' Compiling the theme',
+        customClass: 'theme-message',
+        type: 'success',
+        duration: 0,
+        iconClass: 'el-icon-loading'
+      })
+
+      const getHandler = (variable, id) => {
+        return () => {
+          const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
+          const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
+
+          let styleTag = document.getElementById(id)
+          if (!styleTag) {
+            styleTag = document.createElement('style')
+            styleTag.setAttribute('id', id)
+            document.head.appendChild(styleTag)
+          }
+          styleTag.innerText = newStyle
+        }
+      }
+
+      if (!this.chalk) {
+        const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
+        await this.getCSSString(url, 'chalk')
+      }
+
+      const chalkHandler = getHandler('chalk', 'chalk-style')
+
+      chalkHandler()
+
+      const styles = [].slice.call(document.querySelectorAll('style'))
+        .filter(style => {
+          const text = style.innerText
+          return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
+        })
+      styles.forEach(style => {
+        const { innerText } = style
+        if (typeof innerText !== 'string') return
+        style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
+      })
+
+      this.$emit('change', val)
+
+      $message.close()
+    }
+  },
+
+  methods: {
+    updateStyle(style, oldCluster, newCluster) {
+      let newStyle = style
+      oldCluster.forEach((color, index) => {
+        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
+      })
+      return newStyle
+    },
+
+    getCSSString(url, variable) {
+      return new Promise(resolve => {
+        const xhr = new XMLHttpRequest()
+        xhr.onreadystatechange = () => {
+          if (xhr.readyState === 4 && xhr.status === 200) {
+            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
+            resolve()
+          }
+        }
+        xhr.open('GET', url)
+        xhr.send()
+      })
+    },
+
+    getThemeCluster(theme) {
+      const tintColor = (color, tint) => {
+        let red = parseInt(color.slice(0, 2), 16)
+        let green = parseInt(color.slice(2, 4), 16)
+        let blue = parseInt(color.slice(4, 6), 16)
+
+        if (tint === 0) { // when primary color is in its rgb space
+          return [red, green, blue].join(',')
+        } else {
+          red += Math.round(tint * (255 - red))
+          green += Math.round(tint * (255 - green))
+          blue += Math.round(tint * (255 - blue))
+
+          red = red.toString(16)
+          green = green.toString(16)
+          blue = blue.toString(16)
+
+          return `#${red}${green}${blue}`
+        }
+      }
+
+      const shadeColor = (color, shade) => {
+        let red = parseInt(color.slice(0, 2), 16)
+        let green = parseInt(color.slice(2, 4), 16)
+        let blue = parseInt(color.slice(4, 6), 16)
+
+        red = Math.round((1 - shade) * red)
+        green = Math.round((1 - shade) * green)
+        blue = Math.round((1 - shade) * blue)
+
+        red = red.toString(16)
+        green = green.toString(16)
+        blue = blue.toString(16)
+
+        return `#${red}${green}${blue}`
+      }
+
+      const clusters = [theme]
+      for (let i = 0; i <= 9; i++) {
+        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
+      }
+      clusters.push(shadeColor(theme, 0.1))
+      return clusters
+    }
+  }
+}
+</script>
+
+<style>
+.theme-message,
+.theme-picker-dropdown {
+  z-index: 99999 !important;
+}
+
+.theme-picker .el-color-picker__trigger {
+  height: 26px !important;
+  width: 26px !important;
+  padding: 2px;
+}
+
+.theme-picker-dropdown .el-color-dropdown__link-btn {
+  display: none;
+}
+</style>
diff --git a/src/components/YamlEdit/index.vue b/src/components/YamlEdit/index.vue
index b84bff9..8ad48fa 100644
--- a/src/components/YamlEdit/index.vue
+++ b/src/components/YamlEdit/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="json-editor">
-    <textarea ref="textarea"/>
+    <textarea ref="textarea" />
   </div>
 </template>
 
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 5c3a0b5..c235dc9 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -2,11 +2,11 @@
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
       <keep-alive :include="cachedViews">
-        <router-view :key="key"/>
+        <router-view :key="key" />
       </keep-alive>
     </transition>
     <div v-if="$store.state.settings.showFooter" id="el-main-footer">
-      <span v-html="$store.state.settings.footerTxt"/>
+      <span v-html="$store.state.settings.footerTxt" />
       <span> ⋅ </span>
       <a href="http://www.beian.miit.gov.cn" target="_blank">{{ $store.state.settings.caseNumber }}</a>
     </div>
@@ -21,35 +21,42 @@ export default {
       return this.$store.state.tagsView.cachedViews
     },
     key() {
-      return this.$route.fullPath
+      return this.$route.path
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
+.app-main {
+  /* 50= navbar  50  */
+  min-height: calc(100vh - 50px);
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+}
+
+.fixed-header+.app-main {
+  padding-top: 50px;
+}
+
+.hasTagsView {
   .app-main {
-    z-index: 88;
-    /*84 = navbar + tags-view = 50 +34 */
+    /* 84 = navbar + tags-view = 50 + 34 */
     min-height: calc(100vh - 84px);
-    width: 100%;
-    position: relative;
-    overflow: hidden;
-    padding-bottom: 12px;
   }
 
   .fixed-header+.app-main {
-    padding-top: 50px;
-  }
-
-  .hasTagsView {
-    .app-main {
-      min-height: calc(100vh - 84px);
-    }
-
-    .fixed-header+.app-main {
-      padding-top: 85px;
-    }
+    padding-top: 84px;
   }
+}
 </style>
 
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 15px;
+  }
+}
+</style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 900e585..69dd095 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,23 +1,25 @@
 <template>
   <div class="navbar">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb class="breadcrumb-container"/>
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+
+    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <Github class="screenfull right-menu-item"/>
+        <search id="header-search" class="right-menu-item" />
+
+        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+
+        <el-tooltip content="Global Size" effect="dark" placement="bottom">
+          <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
+
       </template>
-      <template v-if="device!=='mobile'">
-        <el-tooltip content="全屏" effect="dark" placement="bottom">
-          <screenfull class="screenfull right-menu-item"/>
-        </el-tooltip>
-      </template>
-      <el-dropdown class="avatar-container right-menu-item" trigger="click">
+
+      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="user.avatar ? baseApi + '/avatar/' + user.avatar : Avatar" class="user-avatar">
-          <i class="el-icon-caret-bottom"/>
+          <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
           <a target="_blank" href="https://docs.auauz.net/">
@@ -51,14 +53,17 @@ import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
-import Github from '@/components/Github'
-import Avatar from '@/assets/avatar/avatar.png'
+import SizeSelect from '@/components/SizeSelect'
+import Search from '@/components/HeaderSearch'
+import Avatar from '@/assets/images/avatar.png'
+
 export default {
   components: {
     Breadcrumb,
     Hamburger,
     Screenfull,
-    Github
+    SizeSelect,
+    Search
   },
   data() {
     return {
@@ -69,23 +74,26 @@ export default {
   computed: {
     ...mapGetters([
       'sidebar',
-      'user',
       'device',
+      'user',
       'baseApi'
     ]),
     show: {
       get() {
-        return this.$store.state.settings.showRightPanel
+        return this.$store.state.settings.showSettings
       },
       set(val) {
-        this.$store.dispatch('changeSetting', {
-          key: 'showRightPanel',
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'showSettings',
           value: val
         })
       }
     }
   },
   methods: {
+    toggleSideBar() {
+      this.$store.dispatch('app/toggleSideBar')
+    },
     open() {
       this.$confirm('确定注销并退出系统吗？', '提示', {
         confirmButtonText: '确定',
@@ -95,77 +103,95 @@ export default {
         this.logout()
       })
     },
-    toggleSideBar() {
-      this.$store.dispatch('ToggleSideBar')
-    },
     logout() {
-      this.dialogVisible = false
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        location.reload()
       })
     }
   }
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .navbar {
-    height: 50px;
+<style lang="scss" scoped>
+.navbar {
+  height: 50px;
+  overflow: hidden;
+  position: relative;
+  background: #fff;
+  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+
+  .hamburger-container {
+    line-height: 46px;
+    height: 100%;
+    float: left;
+    cursor: pointer;
+    transition: background .3s;
+    -webkit-tap-highlight-color:transparent;
+
+    &:hover {
+      background: rgba(0, 0, 0, .025)
+    }
+  }
+
+  .breadcrumb-container {
+    float: left;
+  }
+
+  .errLog-container {
+    display: inline-block;
+    vertical-align: top;
+  }
+
+  .right-menu {
+    float: right;
+    height: 100%;
     line-height: 50px;
-    border-radius: 0px !important;
-    .hamburger-container {
-      line-height: 58px;
-      height: 50px;
-      float: left;
-      padding: 0 10px;
+
+    &:focus {
+      outline: none;
     }
-    .breadcrumb-container{
-      float: left;
-    }
-    .errLog-container {
+
+    .right-menu-item {
       display: inline-block;
-      vertical-align: top;
-    }
-    .right-menu {
-      float: right;
+      padding: 0 8px;
       height: 100%;
-      &:focus{
-        outline: none;
+      font-size: 18px;
+      color: #5a5e66;
+      vertical-align: text-bottom;
+
+      &.hover-effect {
+        cursor: pointer;
+        transition: background .3s;
+
+        &:hover {
+          background: rgba(0, 0, 0, .025)
+        }
       }
-      .right-menu-item {
-        display: inline-block;
-        margin: 0 8px;
-      }
-      .screenfull {
-        height: 20px;
-      }
-      .international{
-        vertical-align: top;
-      }
-      .theme-switch {
-        vertical-align: 15px;
-      }
-      .avatar-container {
-        height: 50px;
-        margin-right: 30px;
-        .avatar-wrapper {
-          margin-top: 5px;
-          position: relative;
-          .user-avatar {
-            cursor: pointer;
-            width: 40px;
-            height: 40px;
-            border-radius: 10px;
-          }
-          .el-icon-caret-bottom {
-            cursor: pointer;
-            position: absolute;
-            right: -20px;
-            top: 25px;
-            font-size: 12px;
-          }
+    }
+
+    .avatar-container {
+      margin-right: 30px;
+
+      .avatar-wrapper {
+        margin-top: 5px;
+        position: relative;
+
+        .user-avatar {
+          cursor: pointer;
+          width: 40px;
+          height: 40px;
+          border-radius: 10px;
+        }
+
+        .el-icon-caret-bottom {
+          cursor: pointer;
+          position: absolute;
+          right: -20px;
+          top: 25px;
+          font-size: 12px;
         }
       }
     }
   }
+}
 </style>
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index bc1ee6c..2f3b8f1 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,33 +1,42 @@
 <template>
   <div class="drawer-container">
     <div>
-      <h3 class="drawer-title">系统布局配置</h3>
+      <h3 class="drawer-title">系统布局设置</h3>
+
       <div class="drawer-item">
-        <span>显示 Logo</span>
-        <el-switch v-model="sidebarLogo" class="drawer-switch" />
+        <span>主题颜色</span>
+        <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
       </div>
+
       <div class="drawer-item">
-        <span>固定 Header</span>
-        <el-switch v-model="fixedHeader" class="drawer-switch" />
-      </div>
-      <div class="drawer-item">
-        <span>开启 Tags-Views</span>
+        <span>打开标签</span>
         <el-switch v-model="tagsView" class="drawer-switch" />
       </div>
+
       <div class="drawer-item">
-        <span>显示 SettingButton</span>
-        <el-switch v-model="settingBtn" class="drawer-switch" />
+        <span>固定头部</span>
+        <el-switch v-model="fixedHeader" class="drawer-switch" />
       </div>
+
       <div class="drawer-item">
-        <span>菜单 UniqueOpened</span>
+        <span>显示LOGO</span>
+        <el-switch v-model="sidebarLogo" class="drawer-switch" />
+      </div>
+
+      <div class="drawer-item">
+        <span>菜单UniqueOpened</span>
         <el-switch v-model="uniqueOpened" class="drawer-switch" />
       </div>
+
     </div>
   </div>
 </template>
 
 <script>
+import ThemePicker from '@/components/ThemePicker'
+
 export default {
+  components: { ThemePicker },
   data() {
     return {}
   },
@@ -37,7 +46,7 @@ export default {
         return this.$store.state.settings.fixedHeader
       },
       set(val) {
-        this.$store.dispatch('changeSetting', {
+        this.$store.dispatch('settings/changeSetting', {
           key: 'fixedHeader',
           value: val
         })
@@ -48,7 +57,7 @@ export default {
         return this.$store.state.settings.tagsView
       },
       set(val) {
-        this.$store.dispatch('changeSetting', {
+        this.$store.dispatch('settings/changeSetting', {
           key: 'tagsView',
           value: val
         })
@@ -59,34 +68,31 @@ export default {
         return this.$store.state.settings.sidebarLogo
       },
       set(val) {
-        this.$store.dispatch('changeSetting', {
+        this.$store.dispatch('settings/changeSetting', {
           key: 'sidebarLogo',
           value: val
         })
       }
     },
-    settingBtn: {
-      get() {
-        return this.$store.state.settings.settingBtn
-      },
-      set(val) {
-        this.$store.dispatch('changeSetting', {
-          key: 'settingBtn',
-          value: val
-        })
-      }
-    },
     uniqueOpened: {
       get() {
         return this.$store.state.settings.uniqueOpened
       },
       set(val) {
-        this.$store.dispatch('changeSetting', {
+        this.$store.dispatch('settings/changeSetting', {
           key: 'uniqueOpened',
           value: val
         })
       }
     }
+  },
+  methods: {
+    themeChange(val) {
+      this.$store.dispatch('settings/changeSetting', {
+        key: 'theme',
+        value: val
+      })
+    }
   }
 }
 </script>
diff --git a/src/layout/components/Sidebar/FixiOSBug.js b/src/layout/components/Sidebar/FixiOSBug.js
index 5e0a926..bc14856 100644
--- a/src/layout/components/Sidebar/FixiOSBug.js
+++ b/src/layout/components/Sidebar/FixiOSBug.js
@@ -5,16 +5,16 @@ export default {
     }
   },
   mounted() {
-    // In order to fix the click on menu on the ios device will trigger the mouseeleave bug
+    // In order to fix the click on menu on the ios device will trigger the mouseleave bug
     // https://github.com/PanJiaChen/vue-element-admin/issues/1135
     this.fixBugIniOS()
   },
   methods: {
     fixBugIniOS() {
-      const $submenu = this.$refs.submenu
-      if ($submenu) {
-        const handleMouseleave = $submenu.handleMouseleave
-        $submenu.handleMouseleave = (e) => {
+      const $subMenu = this.$refs.subMenu
+      if ($subMenu) {
+        const handleMouseleave = $subMenu.handleMouseleave
+        $subMenu.handleMouseleave = (e) => {
           if (this.device === 'mobile') {
             return
           }
diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue
index 5d366f2..eb4dd10 100644
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -1,13 +1,13 @@
 
 <template>
-  <!-- eslint-disable vue/require-component-is-->
+  <!-- eslint-disable vue/require-component-is -->
   <component v-bind="linkProps(to)">
-    <slot/>
+    <slot />
   </component>
 </template>
 
 <script>
-import { isExternal } from '@/utils'
+import { isExternal } from '@/utils/validate'
 
 export default {
   props: {
@@ -17,11 +17,8 @@ export default {
     }
   },
   methods: {
-    isExternalLink(routePath) {
-      return isExternal(routePath)
-    },
     linkProps(url) {
-      if (this.isExternalLink(url)) {
+      if (isExternal(url)) {
         return {
           is: 'a',
           href: url,
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 01f1721..e96f5b8 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,39 +1,81 @@
 <template>
-  <el-menu-item v-if="sidebarLogo" :class="{'submenu-title-noDropdown':isCollapse}" index="0" style="pointer-events: none;">
-    <!-- 缩小时显示的logo，可以自定义，这里直接使用图标库中的 -->
-    <svg-icon v-if="isCollapse" icon-class="run" />
-    <!--正常状态下显示的，可以使用本地的logoImg-->
-    <div class="logo-con">
-      <img src="https://aurora-1255840532.cos.ap-chengdu.myqcloud.com/logo.png">
-      <!--<img :src="logoImg">-->
-    </div>
-  </el-menu-item>
+  <div class="sidebar-logo-container" :class="{'collapse':collapse}">
+    <transition name="sidebarLogoFade">
+      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
+        <img v-if="logo" :src="logo" class="sidebar-logo">
+        <h1 v-else class="sidebar-title">{{ title }} </h1>
+      </router-link>
+      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
+        <img v-if="logo" :src="logo" class="sidebar-logo">
+        <h1 class="sidebar-title">{{ title }} </h1>
+      </router-link>
+    </transition>
+  </div>
 </template>
 
 <script>
-// import logoImg from '@/assets/logo/logo.png'
-import { mapState } from 'vuex'
 export default {
-  name: 'Logo',
+  name: 'SidebarLogo',
   props: {
-    isCollapse: {
+    collapse: {
       type: Boolean,
-      default: false
+      required: true
     }
   },
   data() {
     return {
-      // logoImg: logoImg
+      title: 'EL-ADMIN 后台管理',
+      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
     }
-  },
-  computed: {
-    ...mapState({
-      sidebarLogo: state => state.settings.sidebarLogo
-    })
   }
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+.sidebarLogoFade-enter-active {
+  transition: opacity 1.5s;
+}
 
+.sidebarLogoFade-enter,
+.sidebarLogoFade-leave-to {
+  opacity: 0;
+}
+
+.sidebar-logo-container {
+  position: relative;
+  width: 100%;
+  height: 50px;
+  line-height: 50px;
+  text-align: center;
+  overflow: hidden;
+
+  & .sidebar-logo-link {
+    height: 100%;
+    width: 100%;
+
+    & .sidebar-logo {
+      width: 32px;
+      height: 32px;
+      vertical-align: middle;
+      margin-right: 12px;
+    }
+
+    & .sidebar-title {
+      display: inline-block;
+      margin: 0;
+      color: #fff;
+      font-weight: 600;
+      line-height: 50px;
+      font-size: 14px;
+      font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
+      vertical-align: middle;
+    }
+  }
+
+  &.collapse {
+    .sidebar-logo {
+      margin-right: 0px;
+    }
+  }
+}
 </style>
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index eb57b2a..2d49dd8 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,41 +1,32 @@
 <template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
+  <div v-if="!item.hidden" class="menu-wrapper">
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <app-link :to="resolvePath(onlyOneChild.path)">
+      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item v-if="onlyOneChild.meta" :icon="onlyOneChild.meta.icon||item.meta.icon" :title="onlyOneChild.meta.title" />
+          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
         </el-menu-item>
       </app-link>
     </template>
 
-    <el-submenu v-else ref="submenu" :index="resolvePath(item.path)">
+    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
-        <item v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
-      </template>
-
-      <template v-for="child in item.children" v-if="!child.hidden">
-        <sidebar-item
-          v-if="child.children&&child.children.length>0"
-          :is-nest="true"
-          :item="child"
-          :key="child.path"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu" />
-
-        <app-link v-else :to="resolvePath(child.path)" :key="child.name">
-          <el-menu-item :index="resolvePath(child.path)">
-            <item v-if="child.meta" :icon="child.meta.icon" :title="child.meta.title" />
-          </el-menu-item>
-        </app-link>
+        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
       </template>
+      <sidebar-item
+        v-for="child in item.children"
+        :key="child.path"
+        :is-nest="true"
+        :item="child"
+        :base-path="resolvePath(child.path)"
+        class="nest-menu"
+      />
     </el-submenu>
-
   </div>
 </template>
 
 <script>
 import path from 'path'
-import { isExternal } from '@/utils'
+import { isExternal } from '@/utils/validate'
 import Item from './Item'
 import AppLink from './Link'
 import FixiOSBug from './FixiOSBug'
@@ -60,12 +51,13 @@ export default {
     }
   },
   data() {
-    return {
-      onlyOneChild: null
-    }
+    // To fix https://github.com/PanJiaChen/vue-admin-template/issues/237
+    // TODO: refactor with render function
+    this.onlyOneChild = null
+    return {}
   },
   methods: {
-    hasOneShowingChild(children, parent) {
+    hasOneShowingChild(children = [], parent) {
       const showingChildren = children.filter(item => {
         if (item.hidden) {
           return false
@@ -90,13 +82,13 @@ export default {
       return false
     },
     resolvePath(routePath) {
-      if (this.isExternalLink(routePath)) {
+      if (isExternal(routePath)) {
         return routePath
       }
+      if (isExternal(this.basePath)) {
+        return this.basePath
+      }
       return path.resolve(this.basePath, routePath)
-    },
-    isExternalLink(routePath) {
-      return isExternal(routePath)
     }
   }
 }
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index b152d79..4687b29 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,25 +1,29 @@
 <template>
-  <el-scrollbar wrap-class="scrollbar-wrapper">
-    <el-menu
-      :show-timeout="200"
-      :default-active="$route.path"
-      :collapse="isCollapse"
-      :unique-opened="$store.state.settings.uniqueOpened"
-      mode="vertical"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#409EFF"
-    >
-      <Logo :is-collapse="isCollapse"/>
-      <sidebar-item v-for="route in permission_routers" :key="route.path" :item="route" :base-path="route.path"/>
-    </el-menu>
-  </el-scrollbar>
+  <div :class="{'has-logo':showLogo}">
+    <logo v-if="showLogo" :collapse="isCollapse" />
+    <el-scrollbar wrap-class="scrollbar-wrapper">
+      <el-menu
+        :default-active="activeMenu"
+        :collapse="isCollapse"
+        :background-color="variables.menuBg"
+        :text-color="variables.menuText"
+        :unique-opened="$store.state.settings.uniqueOpened"
+        :active-text-color="variables.menuActiveText"
+        :collapse-transition="false"
+        mode="vertical"
+      >
+        <sidebar-item v-for="route in permission_routers" :key="route.path" :item="route" :base-path="route.path" />
+      </el-menu>
+    </el-scrollbar>
+  </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-import SidebarItem from './SidebarItem'
 import Logo from './Logo'
+import SidebarItem from './SidebarItem'
+import variables from '@/assets/styles/variables.scss'
+
 export default {
   components: { SidebarItem, Logo },
   computed: {
@@ -27,9 +31,30 @@ export default {
       'permission_routers',
       'sidebar'
     ]),
+    activeMenu() {
+      const route = this.$route
+      const { meta, path } = route
+      // if set path, the sidebar will highlight the path you set
+      if (meta.activeMenu) {
+        return meta.activeMenu
+      }
+      return path
+    },
+    showLogo() {
+      return this.$store.state.settings.sidebarLogo
+    },
+    variables() {
+      return variables
+    },
     isCollapse() {
       return !this.sidebar.opened
     }
   }
 }
 </script>
+
+<style scoped>
+  /deep/ .el-scrollbar__wrap{
+    margin-right: -22px !important;
+  }
+</style>
diff --git a/src/components/ScrollPane/index.vue b/src/layout/components/TagsView/ScrollPane.vue
similarity index 73%
rename from src/components/ScrollPane/index.vue
rename to src/layout/components/TagsView/ScrollPane.vue
index 89998e8..0ec76e7 100644
--- a/src/components/ScrollPane/index.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -1,6 +1,6 @@
 <template>
   <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
-    <slot/>
+    <slot />
   </el-scrollbar>
 </template>
 
@@ -14,22 +14,25 @@ export default {
       left: 0
     }
   },
+  computed: {
+    scrollWrapper() {
+      return this.$refs.scrollContainer.$refs.wrap
+    }
+  },
   methods: {
     handleScroll(e) {
       const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.$refs.scrollContainer.$refs.wrap
+      const $scrollWrapper = this.scrollWrapper
       $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
     },
     moveToTarget(currentTag) {
       const $container = this.$refs.scrollContainer.$el
       const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.$refs.scrollContainer.$refs.wrap
+      const $scrollWrapper = this.scrollWrapper
       const tagList = this.$parent.$refs.tag
 
       let firstTag = null
       let lastTag = null
-      let prevTag = null
-      let nextTag = null
 
       // find first tag and last tag
       if (tagList.length > 0) {
@@ -37,26 +40,16 @@ export default {
         lastTag = tagList[tagList.length - 1]
       }
 
-      // find preTag and nextTag
-      for (let i = 0; i < tagList.length; i++) {
-        if (tagList[i] === currentTag) {
-          if (i === 0) {
-            nextTag = tagList[i].length > 1 && tagList[i + 1]
-          } else if (i === tagList.length - 1) {
-            prevTag = tagList[i].length > 1 && tagList[i - 1]
-          } else {
-            prevTag = tagList[i - 1]
-            nextTag = tagList[i + 1]
-          }
-          break
-        }
-      }
-
       if (firstTag === currentTag) {
         $scrollWrapper.scrollLeft = 0
       } else if (lastTag === currentTag) {
         $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
       } else {
+        // find preTag and nextTag
+        const currentIndex = tagList.findIndex(item => item === currentTag)
+        const prevTag = tagList[currentIndex - 1]
+        const nextTag = tagList[currentIndex + 1]
+
         // the tag's offsetLeft after of nextTag
         const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
 
@@ -74,7 +67,7 @@ export default {
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
+<style lang="scss" scoped>
 .scroll-container {
   white-space: nowrap;
   position: relative;
diff --git a/src/layout/components/TagsView.vue b/src/layout/components/TagsView/index.vue
similarity index 81%
rename from src/layout/components/TagsView.vue
rename to src/layout/components/TagsView/index.vue
index 9666ca1..d49d915 100644
--- a/src/layout/components/TagsView.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,33 +1,34 @@
 <template>
-  <div class="tags-view-container">
+  <div id="tags-view-container" class="tags-view-container">
     <scroll-pane ref="scrollPane" class="tags-view-wrapper">
       <router-link
         v-for="tag in visitedViews"
         ref="tag"
+        :key="tag.path"
         :class="isActive(tag)?'active':''"
         :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        :key="tag.path"
         tag="span"
         class="tags-view-item"
         @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)">
+        @contextmenu.prevent.native="openMenu(tag,$event)"
+      >
         {{ tag.title }}
         <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">刷新</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭</li>
-      <li @click="closeOthersTags">关闭其他</li>
-      <li @click="closeAllTags(selectedTag)">关闭所有</li>
+      <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
+      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">Close</li>
+      <li @click="closeOthersTags">Close Others</li>
+      <li @click="closeAllTags(selectedTag)">Close All</li>
     </ul>
   </div>
 </template>
 
 <script>
-import ScrollPane from '@/components/ScrollPane'
+import ScrollPane from './ScrollPane'
 import path from 'path'
-import { constantRouterMap } from '@/router/routers'
+
 export default {
   components: { ScrollPane },
   data() {
@@ -35,18 +36,21 @@ export default {
       visible: false,
       top: 0,
       left: 0,
-      affixTags: [],
-      selectedTag: {}
+      selectedTag: {},
+      affixTags: []
     }
   },
   computed: {
     visitedViews() {
       return this.$store.state.tagsView.visitedViews
+    },
+    routes() {
+      return this.$store.state.permission.routers
     }
   },
   watch: {
     $route() {
-      this.addViewTags()
+      this.addTags()
       this.moveToCurrentTag()
     },
     visible(value) {
@@ -59,7 +63,7 @@ export default {
   },
   mounted() {
     this.initTags()
-    this.addViewTags()
+    this.addTags()
   },
   methods: {
     isActive(route) {
@@ -87,18 +91,18 @@ export default {
       return tags
     },
     initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(constantRouterMap)
+      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
       for (const tag of affixTags) {
         // Must have tag name
         if (tag.name) {
-          this.$store.dispatch('addVisitedView', tag)
+          this.$store.dispatch('tagsView/addVisitedView', tag)
         }
       }
     },
-    addViewTags() {
+    addTags() {
       const { name } = this.$route
       if (name) {
-        this.$store.dispatch('addView', this.$route)
+        this.$store.dispatch('tagsView/addView', this.$route)
       }
       return false
     },
@@ -108,19 +112,17 @@ export default {
         for (const tag of tags) {
           if (tag.to.path === this.$route.path) {
             this.$refs.scrollPane.moveToTarget(tag)
-
             // when query is different then update
             if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('updateVisitedView', this.$route)
+              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
             }
-
             break
           }
         }
       })
     },
     refreshSelectedTag(view) {
-      this.$store.dispatch('delCachedView', view).then(() => {
+      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
         const { fullPath } = view
         this.$nextTick(() => {
           this.$router.replace({
@@ -130,25 +132,20 @@ export default {
       })
     },
     closeSelectedTag(view) {
-      this.$store.dispatch('delView', view).then(({ visitedViews }) => {
+      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
         if (this.isActive(view)) {
-          const latestView = visitedViews.slice(-1)[0]
-          if (latestView) {
-            this.$router.push(latestView)
-          } else {
-            this.$router.push('/')
-          }
+          this.toLastView(visitedViews, view)
         }
       })
     },
     closeOthersTags() {
       this.$router.push(this.selectedTag)
-      this.$store.dispatch('delOthersViews', this.selectedTag).then(() => {
+      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
         this.moveToCurrentTag()
       })
     },
     closeAllTags(view) {
-      this.$store.dispatch('delAllViews').then(({ visitedViews }) => {
+      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
         if (this.affixTags.some(tag => tag.path === view.path)) {
           return
         }
@@ -162,7 +159,7 @@ export default {
       } else {
         // now the default is to redirect to the home page if there is no tags-view,
         // you can adjust it according to your needs.
-        if (view.name === '首页') {
+        if (view.name === 'Dashboard') {
           // to reload home page
           this.$router.replace({ path: '/redirect' + view.fullPath })
         } else {
@@ -182,8 +179,8 @@ export default {
       } else {
         this.left = left
       }
-      this.top = e.clientY
 
+      this.top = e.clientY
       this.visible = true
       this.selectedTag = tag
     },
@@ -194,7 +191,7 @@ export default {
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
+<style lang="scss" scoped>
 .tags-view-container {
   height: 34px;
   width: 100%;
@@ -241,7 +238,7 @@ export default {
   .contextmenu {
     margin: 0;
     background: #fff;
-    z-index: 100;
+    z-index: 3000;
     position: absolute;
     list-style-type: none;
     padding: 5px 0;
@@ -262,7 +259,7 @@ export default {
 }
 </style>
 
-<style rel="stylesheet/scss" lang="scss">
+<style lang="scss">
 //reset element css of el-icon-close
 .tags-view-wrapper {
   .tags-view-item {
diff --git a/src/layout/components/index.js b/src/layout/components/index.js
index 9e7c4a5..104bd3a 100644
--- a/src/layout/components/index.js
+++ b/src/layout/components/index.js
@@ -1,5 +1,5 @@
-export { default as Navbar } from './Navbar'
-export { default as Sidebar } from './Sidebar'
 export { default as AppMain } from './AppMain'
-export { default as TagsView } from './TagsView'
+export { default as Navbar } from './Navbar'
 export { default as Settings } from './Settings'
+export { default as Sidebar } from './Sidebar/index.vue'
+export { default as TagsView } from './TagsView/index.vue'
diff --git a/src/layout/Layout.vue b/src/layout/index.vue
similarity index 85%
rename from src/layout/Layout.vue
rename to src/layout/index.vue
index 47a6193..889b7dc 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/index.vue
@@ -8,7 +8,7 @@
         <tags-view v-if="needTagsView" />
       </div>
       <app-main />
-      <right-panel>
+      <right-panel v-if="showSettings">
         <settings />
       </right-panel>
     </div>
@@ -26,16 +26,17 @@ export default {
   components: {
     AppMain,
     Navbar,
+    RightPanel,
     Settings,
     Sidebar,
-    TagsView,
-    RightPanel
+    TagsView
   },
   mixins: [ResizeMixin],
   computed: {
     ...mapState({
       sidebar: state => state.app.sidebar,
       device: state => state.app.device,
+      showSettings: state => state.settings.showSettings,
       needTagsView: state => state.settings.tagsView,
       fixedHeader: state => state.settings.fixedHeader
     }),
@@ -50,15 +51,15 @@ export default {
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('closeSideBar', { withoutAnimation: false })
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/mixin.scss";
-  @import "~@/styles/variables.scss";
+  @import "~@/assets/styles/mixin.scss";
+  @import "~@/assets/styles/variables.scss";
 
   .app-wrapper {
     @include clearfix;
@@ -86,18 +87,16 @@ export default {
     position: fixed;
     top: 0;
     right: 0;
-    background: #ffffff;
-    z-index: 99;
+    z-index: 9;
     width: calc(100% - #{$sideBarWidth});
     transition: width 0.28s;
   }
 
   .hideSidebar .fixed-header {
-    width: calc(100% - #{$hideSidebarWidth})
+    width: calc(100% - 54px)
   }
 
   .mobile .fixed-header {
     width: 100%;
   }
 </style>
-
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index 2636d5b..e8d0df8 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -1,39 +1,43 @@
 import store from '@/store'
 
 const { body } = document
-const WIDTH = 1024
-const RATIO = 3
+const WIDTH = 992 // refer to Bootstrap's responsive design
 
 export default {
   watch: {
     $route(route) {
       if (this.device === 'mobile' && this.sidebar.opened) {
-        store.dispatch('closeSideBar', { withoutAnimation: false })
+        store.dispatch('app/closeSideBar', { withoutAnimation: false })
       }
     }
   },
   beforeMount() {
-    window.addEventListener('resize', this.resizeHandler)
+    window.addEventListener('resize', this.$_resizeHandler)
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.$_resizeHandler)
   },
   mounted() {
-    const isMobile = this.isMobile()
+    const isMobile = this.$_isMobile()
     if (isMobile) {
-      store.dispatch('toggleDevice', 'mobile')
-      store.dispatch('closeSideBar', { withoutAnimation: true })
+      store.dispatch('app/toggleDevice', 'mobile')
+      store.dispatch('app/closeSideBar', { withoutAnimation: true })
     }
   },
   methods: {
-    isMobile() {
+    // use $_ for mixins properties
+    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+    $_isMobile() {
       const rect = body.getBoundingClientRect()
-      return rect.width - RATIO < WIDTH
+      return rect.width - 1 < WIDTH
     },
-    resizeHandler() {
+    $_resizeHandler() {
       if (!document.hidden) {
-        const isMobile = this.isMobile()
-        store.dispatch('toggleDevice', isMobile ? 'mobile' : 'desktop')
+        const isMobile = this.$_isMobile()
+        store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop')
 
         if (isMobile) {
-          store.dispatch('closeSideBar', { withoutAnimation: true })
+          store.dispatch('app/closeSideBar', { withoutAnimation: true })
         }
       }
     }
diff --git a/src/main.js b/src/main.js
index 51d4870..6bb9280 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,34 +1,32 @@
 import Vue from 'vue'
 
-import 'normalize.css/normalize.css' // A modern alternative to CSS resets
-import ElementUI from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
-import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
+import Cookies from 'js-cookie'
+
+import 'normalize.css/normalize.css'
+
+import Element from 'element-ui'
 import mavonEditor from 'mavon-editor'
+import dict from './components/Dict'
+import permission from './components/Permission'
 import 'mavon-editor/dist/css/index.css'
-import '@/styles/index.scss' // global css
+import './assets/styles/element-variables.scss'
+import './assets/styles/index.scss' // global css
 
 import App from './App'
-import router from './router/routers'
-import permission from './components/Permission'
-import dict from './components/Dict'
 import store from './store'
+import router from './router/routers'
 
-import '@/icons' // icon
+import './assets/icons' // icon
 import './router/index' // permission control
-import Router from 'vue-router'
 
 Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(dict)
-Vue.use(ElementUI, { locale })
-Vue.config.productionTip = false
+Vue.use(Element, {
+  size: Cookies.get('size') || 'medium' // set element-ui default size
+})
 
-const routerPush = Router.prototype.push
-Router.prototype.push = function push(location) {
-  return routerPush.call(this, location).catch(error => error)
-}
-require('babel-polyfill')
+Vue.config.productionTip = false
 
 new Vue({
   el: '#app',
diff --git a/src/router/index.js b/src/router/index.js
index ecacf7f..1401cd2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,6 @@
 import router from './routers'
 import store from '@/store'
-import Config from '@/config'
+import Config from '@/settings'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css'// progress bar style
 import { getToken } from '@/utils/auth' // getToken from cookie
@@ -13,14 +13,14 @@ const whiteList = ['/login']// no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   if (to.meta.title) {
-    document.title = to.meta.title + ' - ' + Config.webName
+    document.title = to.meta.title + ' - ' + Config.title
   }
-  NProgress.start() // start progress bar
+  NProgress.start()
   if (getToken()) {
     // 已登录且要跳转的页面是登录页
     if (to.path === '/login') {
       next({ path: '/' })
-      NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
+      NProgress.done()
     } else {
       if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(res => { // 拉取user_info
diff --git a/src/router/routers.js b/src/router/routers.js
index 40048f0..dbdfb78 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -1,24 +1,9 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+import Layout from '../layout/index'
 
 Vue.use(Router)
 
-/* Layout */
-import Layout from '../layout/Layout'
-
-/**
-* hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
-* alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
-*                                if not set alwaysShow, only more than one route under the children
-*                                it will becomes nested mode, otherwise not show the root menu
-* redirect: noredirect           if `redirect:noredirect` will no redirect in the breadcrumb
-* name:'router-name'             the name is used by <keep-alive> (must set!!!)
-* meta : {
-    title: 'title'               the name show in submenu and breadcrumb (recommend set)
-    icon: 'svg-name'             the icon show in the sidebar,
-  }
-**/
-
 export const constantRouterMap = [
   { path: '/login',
     meta: { title: '登录', noCache: true },
@@ -49,13 +34,13 @@ export const constantRouterMap = [
   {
     path: '/',
     component: Layout,
-    redirect: 'dashboard',
+    redirect: '/dashboard',
     children: [
       {
         path: 'dashboard',
         component: () => import('@/views/home'),
-        name: '首页',
-        meta: { title: '首页', icon: 'index', noCache: true, affix: true }
+        name: 'Dashboard',
+        meta: { title: '首页', icon: 'index', affix: true, noCache: true }
       }
     ]
   },
@@ -73,21 +58,6 @@ export const constantRouterMap = [
       }
     ]
   }
-  // {
-  //   path: '/generator',
-  //   component: Layout,
-  //   hidden: true,
-  //   redirect: 'noredirect',
-  //   children: [
-  //     {
-  //       path: 'config/:tableName',
-  //       component: () => import('@/views/generator/config'),
-  //       name: 'GeneratorIndex',
-  //       meta: { title: '生成配置' }
-  //     }
-  //   ]
-  // }
-  // { path: '*', redirect: '/404', hidden: true }
 ]
 
 export default new Router({
diff --git a/src/config/index.js b/src/settings.js
similarity index 81%
rename from src/config/index.js
rename to src/settings.js
index 492405f..fc96165 100644
--- a/src/config/index.js
+++ b/src/settings.js
@@ -1,19 +1,24 @@
-/**
- * @description 系统全局配置
- */
-export default {
+module.exports = {
+  /**
+   * @description 网站标题
+   */
+  title: 'EL-ADMIN',
+  /**
+   * @description 是否显示 tagsView
+   */
+  tagsView: true,
+  /**
+   * @description 固定头部
+   */
+  fixedHeader: true,
   /**
    * @description 记住密码状态下的token在Cookie中存储的天数，默认1天
    */
   tokenCookieExpires: 1,
   /**
-   * @description 记住密码状态下的密码在Cookie中存储的天数，默认1天
+   * @description 记住密码状态下的密码在Cookie中存储的天数，默认1天s
    */
   passCookieExpires: 1,
-  /**
-   * @description 此处修改网站名称
-   */
-  webName: 'EL-ADMIN',
   /**
    * @description 是否只保持一个子菜单的展开
    */
@@ -22,42 +27,22 @@ export default {
    * @description token key
    */
   TokenKey: 'EL-ADMIN-TOEKN',
-
   /**
    * @description 请求超时时间，毫秒（默认2分钟）
    */
   timeout: 1200000,
-
-  /**
-   * @description 是否显示 tagsView
-   */
-  tagsView: true,
-
-  /**
-   * @description 固定头部
-   */
-  fixedHeader: true,
-
   /**
    * @description 是否显示logo
    */
   sidebarLogo: true,
-
-  /**
-   * 是否显示设置的悬浮按钮
-   */
-  settingBtn: false,
-
   /**
    * 是否显示设置的底部信息
    */
   showFooter: true,
-
   /**
    * 底部文字，支持html语法
    */
   footerTxt: '© 2019 Zheng Jie <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License 2.0</a>',
-
   /**
    * 备案号
    */
diff --git a/src/store/getters.js b/src/store/getters.js
index 6273784..6a10892 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,4 +1,5 @@
 const getters = {
+  size: state => state.app.size,
   sidebar: state => state.app.sidebar,
   device: state => state.app.device,
   token: state => state.user.token,
diff --git a/src/store/index.js b/src/store/index.js
index 1fc27ae..0fd8395 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,24 +1,24 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import app from './modules/app'
-import api from './modules/api'
-import user from './modules/user'
-import tagsView from './modules/tagsView'
-import permission from './modules/permission'
-import settings from './modules/settings'
 import getters from './getters'
 
 Vue.use(Vuex)
 
+// https://webpack.js.org/guides/dependency-management/#requirecontext
+const modulesFiles = require.context('./modules', true, /\.js$/)
+
+// you do not need `import app from './modules/app'`
+// it will auto require all vuex module from modules file
+const modules = modulesFiles.keys().reduce((modules, modulePath) => {
+  // set './app.js' => 'app'
+  const moduleName = modulePath.replace(/^\.\/(.*)\.\w+$/, '$1')
+  const value = modulesFiles(modulePath)
+  modules[moduleName] = value.default
+  return modules
+}, {})
+
 const store = new Vuex.Store({
-  modules: {
-    app,
-    api,
-    user,
-    tagsView,
-    permission,
-    settings
-  },
+  modules,
   getters
 })
 
diff --git a/src/store/modules/api.js b/src/store/modules/api.js
index dbda078..aefdce0 100644
--- a/src/store/modules/api.js
+++ b/src/store/modules/api.js
@@ -1,4 +1,4 @@
-const baseUrl = process.env.BASE_API
+const baseUrl = process.env.VUE_APP_BASE_API
 const api = {
   state: {
     // 实时控制台
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 8aefaa6..45d89bb 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,43 +1,56 @@
 import Cookies from 'js-cookie'
 
-const app = {
-  state: {
-    sidebar: {
-      opened: !+Cookies.get('sidebarStatus'),
-      withoutAnimation: false
-    },
-    device: 'desktop'
+const state = {
+  sidebar: {
+    opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
+    withoutAnimation: false
   },
-  mutations: {
-    TOGGLE_SIDEBAR: state => {
-      if (state.sidebar.opened) {
-        Cookies.set('sidebarStatus', 1)
-      } else {
-        Cookies.set('sidebarStatus', 0)
-      }
-      state.sidebar.opened = !state.sidebar.opened
-      state.sidebar.withoutAnimation = false
-    },
-    CLOSE_SIDEBAR: (state, withoutAnimation) => {
+  device: 'desktop',
+  size: Cookies.get('size') || 'medium'
+}
+
+const mutations = {
+  TOGGLE_SIDEBAR: state => {
+    state.sidebar.opened = !state.sidebar.opened
+    state.sidebar.withoutAnimation = false
+    if (state.sidebar.opened) {
       Cookies.set('sidebarStatus', 1)
-      state.sidebar.opened = false
-      state.sidebar.withoutAnimation = withoutAnimation
-    },
-    TOGGLE_DEVICE: (state, device) => {
-      state.device = device
+    } else {
+      Cookies.set('sidebarStatus', 0)
     }
   },
-  actions: {
-    ToggleSideBar: ({ commit }) => {
-      commit('TOGGLE_SIDEBAR')
-    },
-    closeSideBar({ commit }, { withoutAnimation }) {
-      commit('CLOSE_SIDEBAR', withoutAnimation)
-    },
-    toggleDevice({ commit }, device) {
-      commit('TOGGLE_DEVICE', device)
-    }
+  CLOSE_SIDEBAR: (state, withoutAnimation) => {
+    Cookies.set('sidebarStatus', 0)
+    state.sidebar.opened = false
+    state.sidebar.withoutAnimation = withoutAnimation
+  },
+  TOGGLE_DEVICE: (state, device) => {
+    state.device = device
+  },
+  SET_SIZE: (state, size) => {
+    state.size = size
+    Cookies.set('size', size)
   }
 }
 
-export default app
+const actions = {
+  toggleSideBar({ commit }) {
+    commit('TOGGLE_SIDEBAR')
+  },
+  closeSideBar({ commit }, { withoutAnimation }) {
+    commit('CLOSE_SIDEBAR', withoutAnimation)
+  },
+  toggleDevice({ commit }, device) {
+    commit('TOGGLE_DEVICE', device)
+  },
+  setSize({ commit }, size) {
+    commit('SET_SIZE', size)
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index ef77b71..b310159 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,5 +1,5 @@
 import { constantRouterMap } from '@/router/routers'
-import Layout from '@/layout/Layout'
+import Layout from '@/layout/index'
 
 const permission = {
   state: {
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 64bbb45..c913e59 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,30 +1,38 @@
-import Config from '@/config'
-import variables from '@/styles/element-variables.scss'
+import variables from '@/assets/styles/element-variables.scss'
+import defaultSettings from '@/settings'
 
-const settings = {
-  state: {
-    showRightPanel: false,
-    tagsView: Config.tagsView,
-    fixedHeader: Config.fixedHeader,
-    sidebarLogo: Config.sidebarLogo,
-    theme: variables.theme,
-    settingBtn: Config.settingBtn,
-    uniqueOpened: Config.uniqueOpened,
-    showFooter: Config.showFooter,
-    footerTxt: Config.footerTxt,
-    caseNumber: Config.caseNumber
-  },
-  mutations: {
-    CHANGE_SETTING: (state, { key, value }) => {
-      if (state.hasOwnProperty(key)) {
-        state[key] = value
-      }
-    }
-  },
-  actions: {
-    changeSetting({ commit }, data) {
-      commit('CHANGE_SETTING', data)
+const { tagsView, fixedHeader, sidebarLogo, uniqueOpened, showFooter, footerTxt, caseNumber } = defaultSettings
+
+const state = {
+  theme: variables.theme,
+  showSettings: false,
+  tagsView: tagsView,
+  fixedHeader: fixedHeader,
+  sidebarLogo: sidebarLogo,
+  uniqueOpened: uniqueOpened,
+  showFooter: showFooter,
+  footerTxt: footerTxt,
+  caseNumber: caseNumber
+}
+
+const mutations = {
+  CHANGE_SETTING: (state, { key, value }) => {
+    if (state.hasOwnProperty(key)) {
+      state[key] = value
     }
   }
 }
-export default settings
+
+const actions = {
+  changeSetting({ commit }, data) {
+    commit('CHANGE_SETTING', data)
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index 0b457ab..3e2c170 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -1,162 +1,165 @@
-const tagsView = {
-  state: {
-    visitedViews: [],
-    cachedViews: []
+const state = {
+  visitedViews: [],
+  cachedViews: []
+}
+
+const mutations = {
+  ADD_VISITED_VIEW: (state, view) => {
+    if (state.visitedViews.some(v => v.path === view.path)) return
+    state.visitedViews.push(
+      Object.assign({}, view, {
+        title: view.meta.title || 'no-name'
+      })
+    )
+  },
+  ADD_CACHED_VIEW: (state, view) => {
+    if (state.cachedViews.includes(view.name)) return
+    if (!view.meta.noCache) {
+      state.cachedViews.push(view.name)
+    }
   },
-  mutations: {
-    ADD_VISITED_VIEW: (state, view) => {
-      if (state.visitedViews.some(v => v.path === view.path)) return
-      state.visitedViews.push(
-        Object.assign({}, view, {
-          title: view.meta.title || 'no-name'
-        })
-      )
-    },
-    ADD_CACHED_VIEW: (state, view) => {
-      if (state.cachedViews.includes(view.name)) return
-      if (!view.meta.noCache) {
-        state.cachedViews.push(view.name)
-      }
-    },
 
-    DEL_VISITED_VIEW: (state, view) => {
-      for (const [i, v] of state.visitedViews.entries()) {
-        if (v.path === view.path) {
-          state.visitedViews.splice(i, 1)
-          break
-        }
-      }
-    },
-    DEL_CACHED_VIEW: (state, view) => {
-      for (const i of state.cachedViews) {
-        if (i === view.name) {
-          const index = state.cachedViews.indexOf(i)
-          state.cachedViews.splice(index, 1)
-          break
-        }
-      }
-    },
-
-    DEL_OTHERS_VISITED_VIEWS: (state, view) => {
-      for (const [i, v] of state.visitedViews.entries()) {
-        if (v.path === view.path) {
-          state.visitedViews = state.visitedViews.slice(i, i + 1)
-          break
-        }
-      }
-    },
-    DEL_OTHERS_CACHED_VIEWS: (state, view) => {
-      for (const i of state.cachedViews) {
-        if (i === view.name) {
-          const index = state.cachedViews.indexOf(i)
-          state.cachedViews = state.cachedViews.slice(index, index + 1)
-          break
-        }
-      }
-    },
-
-    DEL_ALL_VISITED_VIEWS: state => {
-      const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
-      state.visitedViews = affixTags
-    },
-    DEL_ALL_CACHED_VIEWS: state => {
-      state.cachedViews = []
-    },
-
-    UPDATE_VISITED_VIEW: (state, view) => {
-      for (let v of state.visitedViews) {
-        if (v.path === view.path) {
-          v = Object.assign(v, view)
-          break
-        }
+  DEL_VISITED_VIEW: (state, view) => {
+    for (const [i, v] of state.visitedViews.entries()) {
+      if (v.path === view.path) {
+        state.visitedViews.splice(i, 1)
+        break
+      }
+    }
+  },
+  DEL_CACHED_VIEW: (state, view) => {
+    for (const i of state.cachedViews) {
+      if (i === view.name) {
+        const index = state.cachedViews.indexOf(i)
+        state.cachedViews.splice(index, 1)
+        break
       }
     }
-
   },
-  actions: {
-    addView({ dispatch }, view) {
-      dispatch('addVisitedView', view)
-      dispatch('addCachedView', view)
-    },
-    addVisitedView({ commit }, view) {
-      commit('ADD_VISITED_VIEW', view)
-    },
-    addCachedView({ commit }, view) {
-      commit('ADD_CACHED_VIEW', view)
-    },
 
-    delView({ dispatch, state }, view) {
-      return new Promise(resolve => {
-        dispatch('delVisitedView', view)
-        dispatch('delCachedView', view)
-        resolve({
-          visitedViews: [...state.visitedViews],
-          cachedViews: [...state.cachedViews]
-        })
-      })
-    },
-    delVisitedView({ commit, state }, view) {
-      return new Promise(resolve => {
-        commit('DEL_VISITED_VIEW', view)
-        resolve([...state.visitedViews])
-      })
-    },
-    delCachedView({ commit, state }, view) {
-      return new Promise(resolve => {
-        commit('DEL_CACHED_VIEW', view)
-        resolve([...state.cachedViews])
-      })
-    },
+  DEL_OTHERS_VISITED_VIEWS: (state, view) => {
+    state.visitedViews = state.visitedViews.filter(v => {
+      return v.meta.affix || v.path === view.path
+    })
+  },
+  DEL_OTHERS_CACHED_VIEWS: (state, view) => {
+    for (const i of state.cachedViews) {
+      if (i === view.name) {
+        const index = state.cachedViews.indexOf(i)
+        state.cachedViews = state.cachedViews.slice(index, index + 1)
+        break
+      }
+    }
+  },
 
-    delOthersViews({ dispatch, state }, view) {
-      return new Promise(resolve => {
-        dispatch('delOthersVisitedViews', view)
-        dispatch('delOthersCachedViews', view)
-        resolve({
-          visitedViews: [...state.visitedViews],
-          cachedViews: [...state.cachedViews]
-        })
-      })
-    },
-    delOthersVisitedViews({ commit, state }, view) {
-      return new Promise(resolve => {
-        commit('DEL_OTHERS_VISITED_VIEWS', view)
-        resolve([...state.visitedViews])
-      })
-    },
-    delOthersCachedViews({ commit, state }, view) {
-      return new Promise(resolve => {
-        commit('DEL_OTHERS_CACHED_VIEWS', view)
-        resolve([...state.cachedViews])
-      })
-    },
-    delAllViews({ dispatch, state }, view) {
-      return new Promise(resolve => {
-        dispatch('delAllVisitedViews', view)
-        dispatch('delAllCachedViews', view)
-        resolve({
-          visitedViews: [...state.visitedViews],
-          cachedViews: [...state.cachedViews]
-        })
-      })
-    },
-    delAllVisitedViews({ commit, state }) {
-      return new Promise(resolve => {
-        commit('DEL_ALL_VISITED_VIEWS')
-        resolve([...state.visitedViews])
-      })
-    },
-    delAllCachedViews({ commit, state }) {
-      return new Promise(resolve => {
-        commit('DEL_ALL_CACHED_VIEWS')
-        resolve([...state.cachedViews])
-      })
-    },
+  DEL_ALL_VISITED_VIEWS: state => {
+    // keep affix tags
+    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    state.visitedViews = affixTags
+  },
+  DEL_ALL_CACHED_VIEWS: state => {
+    state.cachedViews = []
+  },
 
-    updateVisitedView({ commit }, view) {
-      commit('UPDATE_VISITED_VIEW', view)
+  UPDATE_VISITED_VIEW: (state, view) => {
+    for (let v of state.visitedViews) {
+      if (v.path === view.path) {
+        v = Object.assign(v, view)
+        break
+      }
     }
   }
 }
 
-export default tagsView
+const actions = {
+  addView({ dispatch }, view) {
+    dispatch('addVisitedView', view)
+    dispatch('addCachedView', view)
+  },
+  addVisitedView({ commit }, view) {
+    commit('ADD_VISITED_VIEW', view)
+  },
+  addCachedView({ commit }, view) {
+    commit('ADD_CACHED_VIEW', view)
+  },
+
+  delView({ dispatch, state }, view) {
+    return new Promise(resolve => {
+      dispatch('delVisitedView', view)
+      dispatch('delCachedView', view)
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews]
+      })
+    })
+  },
+  delVisitedView({ commit, state }, view) {
+    return new Promise(resolve => {
+      commit('DEL_VISITED_VIEW', view)
+      resolve([...state.visitedViews])
+    })
+  },
+  delCachedView({ commit, state }, view) {
+    return new Promise(resolve => {
+      commit('DEL_CACHED_VIEW', view)
+      resolve([...state.cachedViews])
+    })
+  },
+
+  delOthersViews({ dispatch, state }, view) {
+    return new Promise(resolve => {
+      dispatch('delOthersVisitedViews', view)
+      dispatch('delOthersCachedViews', view)
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews]
+      })
+    })
+  },
+  delOthersVisitedViews({ commit, state }, view) {
+    return new Promise(resolve => {
+      commit('DEL_OTHERS_VISITED_VIEWS', view)
+      resolve([...state.visitedViews])
+    })
+  },
+  delOthersCachedViews({ commit, state }, view) {
+    return new Promise(resolve => {
+      commit('DEL_OTHERS_CACHED_VIEWS', view)
+      resolve([...state.cachedViews])
+    })
+  },
+
+  delAllViews({ dispatch, state }, view) {
+    return new Promise(resolve => {
+      dispatch('delAllVisitedViews', view)
+      dispatch('delAllCachedViews', view)
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews]
+      })
+    })
+  },
+  delAllVisitedViews({ commit, state }) {
+    return new Promise(resolve => {
+      commit('DEL_ALL_VISITED_VIEWS')
+      resolve([...state.visitedViews])
+    })
+  },
+  delAllCachedViews({ commit, state }) {
+    return new Promise(resolve => {
+      commit('DEL_ALL_CACHED_VIEWS')
+      resolve([...state.cachedViews])
+    })
+  },
+
+  updateVisitedView({ commit }, view) {
+    commit('UPDATE_VISITED_VIEW', view)
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
diff --git a/src/styles/description.scss b/src/styles/description.scss
deleted file mode 100644
index 76b0992..0000000
--- a/src/styles/description.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.my-blockquote{
-  margin: 0px 0px 10px;
-  padding: 15px;
-  line-height: 22px;
-  border-left: 5px solid #00437B;
-  border-radius: 0 2px 2px 0;
-  background-color: #f2f2f2;
-}
-.my-code{
-  position: relative;
-  padding: 15px;
-  line-height: 20px;
-  border-left: 5px solid #ddd;
-  color: #333;
-  font-family: Courier New;
-  font-size: 12px
-}
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
deleted file mode 100644
index ef7bb5d..0000000
--- a/src/styles/element-ui.scss
+++ /dev/null
@@ -1,29 +0,0 @@
- //to reset element-ui default css
-.el-upload {
-  input[type="file"] {
-    display: none !important;
-  }
-}
-
-.el-upload__input {
-  display: none;
-}
-
-//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
-
-//element ui upload
-.upload-container {
-  .el-upload {
-    width: 100%;
-    .el-upload-dragger {
-      width: 100%;
-      height: 200px;
-    }
-  }
-}
diff --git a/src/styles/index.scss b/src/styles/index.scss
deleted file mode 100644
index bb8142a..0000000
--- a/src/styles/index.scss
+++ /dev/null
@@ -1,173 +0,0 @@
-@import './variables.scss';
-@import './mixin.scss';
-@import './transition.scss';
-@import './element-ui.scss';
-@import './sidebar.scss';
-
-body {
-  height: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
-}
-
-.el-dialog__body {
-  padding: 20px 20px;
-  color: #606266;
-  font-size: 14px;
-}
-
-label {
-  font-weight: 700;
-}
-
-html {
-  height: 100%;
-  box-sizing: border-box;
-}
-
-#app{
-  height: 100%;
-}
-
-*,
-*:before,
-*:after {
-  box-sizing: inherit;
-}
-
-a,
-a:focus,
-a:hover {
-  cursor: pointer;
-  color: inherit;
-  outline: none;
-  text-decoration: none;
-}
-
-div:focus{
-  outline: none;
-}
-
-a:focus,
-a:active {
-  outline: none;
-}
-
-a,
-a:focus,
-a:hover {
-  cursor: pointer;
-  color: inherit;
-  text-decoration: none;
-}
-
-.clearfix {
-  &:after {
-    visibility: hidden;
-    display: block;
-    font-size: 0;
-    content: " ";
-    clear: both;
-    height: 0;
-  }
-}
-
-.warn-content{
-  background: rgba(66,185,131,.1);
-  border-radius: 2px;
-  padding: 11px;
-  word-spacing: .05rem;
-  a{
-    color: #42b983;
-    font-weight: 400;
-  }
-}
-
-//main-container全局样式
-.app-main{
-  height: 100%;
-}
-
-.app-container {
-  padding: 20px;
-}
-
-.head-container {
-  padding-bottom: 10px;
-  .filter-item {
-    display: inline-block;
-    vertical-align: middle;
-    margin-bottom: 10px;
-  }
-  input {
-    height: 30.5px;
-    line-height: 30.5px;
-  }
-  .el-input__icon {
-    line-height: 31px;
-  }
-}
-
-.el-avatar {
-  display: inline-block;
-  text-align: center;
-  background: #ccc;
-  color: #fff;
-  white-space: nowrap;
-  position: relative;
-  overflow: hidden;
-  vertical-align: middle;
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
-  border-radius: 16px;
-}
-
-.logo-con{
-  height: 60px;
-  padding: 13px 0px 0px;
-  img{
-    height: 32px;
-    width: 135px;
-    display: block;
-    //margin: 0 auto;
-  }
-}
-
-#el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
-}
-
-#el-main-footer {
-  background: none repeat scroll 0 0 white;
-  border-top: 1px solid #e7eaec;
-  overflow: hidden;
-  padding: 10px 6px 0px 6px;
-  height: 33px;
-  font-size: 0.7rem !important;
-  color: #7a8b9a;
-  letter-spacing: 0.8px;
-  font-family: Arial, sans-serif !important;
-  position: fixed;
-  bottom: 0;
-  z-index: 99;
-  width: 100%;
-}
-.eladmin-upload {
-  border: 1px dashed #c0ccda;
-  border-radius: 5px;
-  height: 45px;
-  line-height: 45px;
-  width: 368px;
-}
diff --git a/src/styles/mixin.scss b/src/styles/mixin.scss
deleted file mode 100644
index 601d7a0..0000000
--- a/src/styles/mixin.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@mixin clearfix {
-  &:after {
-    content: "";
-    display: table;
-    clear: both;
-  }
-}
-
-@mixin scrollBar {
-  &::-webkit-scrollbar-track-piece {
-    background: #d3dce6;
-  }
-  &::-webkit-scrollbar {
-    width: 6px;
-  }
-  &::-webkit-scrollbar-thumb {
-    background: #99a9bf;
-    border-radius: 20px;
-  }
-}
-
-@mixin relative {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 9ea9f3f..b643e73 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie'
-import Config from '@/config'
+import Config from '@/settings'
 
 const TokenKey = Config.TokenKey
 
diff --git a/src/utils/clipboard.js b/src/utils/clipboard.js
index 2529590..e916a44 100644
--- a/src/utils/clipboard.js
+++ b/src/utils/clipboard.js
@@ -3,7 +3,7 @@ import Clipboard from 'clipboard'
 
 function clipboardSuccess() {
   Vue.prototype.$message({
-    message: '复制成功',
+    message: 'Copy successfully',
     type: 'success',
     duration: 1500
   })
@@ -11,7 +11,7 @@ function clipboardSuccess() {
 
 function clipboardError() {
   Vue.prototype.$message({
-    message: '复制失败',
+    message: 'Copy failed',
     type: 'error'
   })
 }
diff --git a/src/utils/export2Excel.js b/src/utils/export2Excel.js
deleted file mode 100644
index ba956dc..0000000
--- a/src/utils/export2Excel.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/* eslint-disable */
-require('script-loader!file-saver');
-import XLSX from 'xlsx'
-
-function generateArray(table) {
-  var out = [];
-  var rows = table.querySelectorAll('tr');
-  var ranges = [];
-  for (var R = 0; R < rows.length; ++R) {
-    var outRow = [];
-    var row = rows[R];
-    var columns = row.querySelectorAll('td');
-    for (var C = 0; C < columns.length; ++C) {
-      var cell = columns[C];
-      var colspan = cell.getAttribute('colspan');
-      var rowspan = cell.getAttribute('rowspan');
-      var cellValue = cell.innerText;
-      if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
-
-      //Skip ranges
-      ranges.forEach(function (range) {
-        if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
-          for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
-        }
-      });
-
-      //Handle Row Span
-      if (rowspan || colspan) {
-        rowspan = rowspan || 1;
-        colspan = colspan || 1;
-        ranges.push({
-          s: {
-            r: R,
-            c: outRow.length
-          },
-          e: {
-            r: R + rowspan - 1,
-            c: outRow.length + colspan - 1
-          }
-        });
-      };
-
-      //Handle Value
-      outRow.push(cellValue !== "" ? cellValue : null);
-
-      //Handle Colspan
-      if (colspan)
-        for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
-    }
-    out.push(outRow);
-  }
-  return [out, ranges];
-};
-
-function datenum(v, date1904) {
-  if (date1904) v += 1462;
-  var epoch = Date.parse(v);
-  return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
-}
-
-function sheet_from_array_of_arrays(data, opts) {
-  var ws = {};
-  var range = {
-    s: {
-      c: 10000000,
-      r: 10000000
-    },
-    e: {
-      c: 0,
-      r: 0
-    }
-  };
-  for (var R = 0; R != data.length; ++R) {
-    for (var C = 0; C != data[R].length; ++C) {
-      if (range.s.r > R) range.s.r = R;
-      if (range.s.c > C) range.s.c = C;
-      if (range.e.r < R) range.e.r = R;
-      if (range.e.c < C) range.e.c = C;
-      var cell = {
-        v: data[R][C]
-      };
-      if (cell.v == null) continue;
-      var cell_ref = XLSX.utils.encode_cell({
-        c: C,
-        r: R
-      });
-
-      if (typeof cell.v === 'number') cell.t = 'n';
-      else if (typeof cell.v === 'boolean') cell.t = 'b';
-      else if (cell.v instanceof Date) {
-        cell.t = 'n';
-        cell.z = XLSX.SSF._table[14];
-        cell.v = datenum(cell.v);
-      } else cell.t = 's';
-
-      ws[cell_ref] = cell;
-    }
-  }
-  if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
-  return ws;
-}
-
-function Workbook() {
-  if (!(this instanceof Workbook)) return new Workbook();
-  this.SheetNames = [];
-  this.Sheets = {};
-}
-
-function s2ab(s) {
-  var buf = new ArrayBuffer(s.length);
-  var view = new Uint8Array(buf);
-  for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
-  return buf;
-}
-
-export function export_table_to_excel(id) {
-  var theTable = document.getElementById(id);
-  var oo = generateArray(theTable);
-  var ranges = oo[1];
-
-  /* original data */
-  var data = oo[0];
-  var ws_name = "SheetJS";
-
-  var wb = new Workbook(),
-    ws = sheet_from_array_of_arrays(data);
-
-  /* add ranges to worksheet */
-  // ws['!cols'] = ['apple', 'banan'];
-  ws['!merges'] = ranges;
-
-  /* add worksheet to workbook */
-  wb.SheetNames.push(ws_name);
-  wb.Sheets[ws_name] = ws;
-
-  var wbout = XLSX.write(wb, {
-    bookType: 'xlsx',
-    bookSST: false,
-    type: 'binary'
-  });
-
-  saveAs(new Blob([s2ab(wbout)], {
-    type: "application/octet-stream"
-  }), "test.xlsx")
-}
-
-export function export_json_to_excel({
-  header,
-  data,
-  filename,
-  autoWidth = true,
-  bookType=  'xlsx'
-} = {}) {
-  /* original data */
-  filename = filename || 'excel-list'
-  data = [...data]
-  data.unshift(header);
-  var ws_name = "SheetJS";
-  var wb = new Workbook(),
-    ws = sheet_from_array_of_arrays(data);
-
-  if (autoWidth) {
-    /*设置worksheet每列的最大宽度*/
-    const colWidth = data.map(row => row.map(val => {
-      /*先判断是否为null/undefined*/
-      if (val == null) {
-        return {
-          'wch': 10
-        };
-      }
-      /*再判断是否为中文*/
-      else if (val.toString().charCodeAt(0) > 255) {
-        return {
-          'wch': val.toString().length * 2
-        };
-      } else {
-        return {
-          'wch': val.toString().length
-        };
-      }
-    }))
-    /*以第一行为初始值*/
-    let result = colWidth[0];
-    for (let i = 1; i < colWidth.length; i++) {
-      for (let j = 0; j < colWidth[i].length; j++) {
-        if (result[j]['wch'] < colWidth[i][j]['wch']) {
-          result[j]['wch'] = colWidth[i][j]['wch'];
-        }
-      }
-    }
-    ws['!cols'] = result;
-  }
-
-  /* add worksheet to workbook */
-  wb.SheetNames.push(ws_name);
-  wb.Sheets[ws_name] = ws;
-
-  var wbout = XLSX.write(wb, {
-    bookType: bookType,
-    bookSST: false,
-    type: 'binary'
-  });
-  saveAs(new Blob([s2ab(wbout)], {
-    type: "application/octet-stream"
-  }), `${filename}.${bookType}`);
-}
diff --git a/src/utils/export2Zip.js b/src/utils/export2Zip.js
deleted file mode 100644
index f776465..0000000
--- a/src/utils/export2Zip.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* eslint-disable */
-require('script-loader!file-saver');
-import JSZip from 'jszip'
-
-export function export_txt_to_zip(th, jsonData, txtName, zipName) {
-  const zip = new JSZip()
-  const txt_name = txtName || 'file'
-  const zip_name = zipName || 'file'
-  const data = jsonData
-  let txtData = `${th}\r\n`
-  data.forEach((row) => {
-    let tempStr = ''
-    tempStr = row.toString()
-    txtData += `${tempStr}\r\n`
-  })
-  zip.file(`${txt_name}.txt`, txtData)
-  zip.generateAsync({
-    type: "blob"
-  }).then((blob) => {
-    saveAs(blob, `${zip_name}.zip`)
-  }, (err) => {
-    alert('导出失败')
-  })
-}
diff --git a/src/utils/get-page-title.js b/src/utils/get-page-title.js
new file mode 100644
index 0000000..cab7fd9
--- /dev/null
+++ b/src/utils/get-page-title.js
@@ -0,0 +1,10 @@
+import defaultSettings from '@/settings'
+
+const title = defaultSettings.title || 'Vue Element Admin'
+
+export default function getPageTitle(pageTitle) {
+  if (pageTitle) {
+    return `${pageTitle} - ${title}`
+  }
+  return `${title}`
+}
diff --git a/src/utils/index.js b/src/utils/index.js
index d12da2f..ffb5526 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,28 +1,62 @@
 /**
- * Created by jiachenpan on 16/11/18.
+ * Created by PanJiaChen on 16/11/18.
  */
 
-export function parseTime(time) {
-  if (time) {
-    var date = new Date(time)
-    var year = date.getFullYear()
-    /* 在日期格式中，月份是从0开始的，因此要加0
-     * 使用三元表达式在小于10的前面加0，以达到格式统一  如 09:11:05
-     * */
-    var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-    var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-    var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-    var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-    var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
-    // 拼接
-    return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
-  } else {
-    return ''
+/**
+ * Parse the time to string
+ * @param {(Object|string|number)} time
+ * @param {string} cFormat
+ * @returns {string}
+ */
+export function parseTime(time, cFormat) {
+  if (arguments.length === 0) {
+    return null
   }
+  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
 }
 
+/**
+ * @param {number} time
+ * @param {string} option
+ * @returns {string}
+ */
 export function formatTime(time, option) {
-  time = +time * 1000
+  if (('' + time).length === 10) {
+    time = parseInt(time) * 1000
+  } else {
+    time = +time
+  }
   const d = new Date(time)
   const now = Date.now()
 
@@ -55,6 +89,161 @@ export function formatTime(time, option) {
   }
 }
 
+/**
+ * @param {string} url
+ * @returns {Object}
+ */
+export function getQueryObject(url) {
+  url = url == null ? window.location.href : url
+  const search = url.substring(url.lastIndexOf('?') + 1)
+  const obj = {}
+  const reg = /([^?&=]+)=([^?&=]*)/g
+  search.replace(reg, (rs, $1, $2) => {
+    const name = decodeURIComponent($1)
+    let val = decodeURIComponent($2)
+    val = String(val)
+    obj[name] = val
+    return rs
+  })
+  return obj
+}
+
+/**
+ * @param {string} input value
+ * @returns {number} output value
+ */
+export function byteLength(str) {
+  // returns the byte length of an utf8 string
+  let s = str.length
+  for (var i = str.length - 1; i >= 0; i--) {
+    const code = str.charCodeAt(i)
+    if (code > 0x7f && code <= 0x7ff) s++
+    else if (code > 0x7ff && code <= 0xffff) s += 2
+    if (code >= 0xDC00 && code <= 0xDFFF) i--
+  }
+  return s
+}
+
+/**
+ * @param {Array} actual
+ * @returns {Array}
+ */
+export function cleanArray(actual) {
+  const newArray = []
+  for (let i = 0; i < actual.length; i++) {
+    if (actual[i]) {
+      newArray.push(actual[i])
+    }
+  }
+  return newArray
+}
+
+/**
+ * @param {Object} json
+ * @returns {Array}
+ */
+export function param(json) {
+  if (!json) return ''
+  return cleanArray(
+    Object.keys(json).map(key => {
+      if (json[key] === undefined) return ''
+      return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
+    })
+  ).join('&')
+}
+
+/**
+ * @param {string} url
+ * @returns {Object}
+ */
+export function param2Obj(url) {
+  const search = url.split('?')[1]
+  if (!search) {
+    return {}
+  }
+  return JSON.parse(
+    '{"' +
+      decodeURIComponent(search)
+        .replace(/"/g, '\\"')
+        .replace(/&/g, '","')
+        .replace(/=/g, '":"')
+        .replace(/\+/g, ' ') +
+      '"}'
+  )
+}
+
+/**
+ * @param {string} val
+ * @returns {string}
+ */
+export function html2Text(val) {
+  const div = document.createElement('div')
+  div.innerHTML = val
+  return div.textContent || div.innerText
+}
+
+/**
+ * Merges two objects, giving the last one precedence
+ * @param {Object} target
+ * @param {(Object|Array)} source
+ * @returns {Object}
+ */
+export function objectMerge(target, source) {
+  if (typeof target !== 'object') {
+    target = {}
+  }
+  if (Array.isArray(source)) {
+    return source.slice()
+  }
+  Object.keys(source).forEach(property => {
+    const sourceProperty = source[property]
+    if (typeof sourceProperty === 'object') {
+      target[property] = objectMerge(target[property], sourceProperty)
+    } else {
+      target[property] = sourceProperty
+    }
+  })
+  return target
+}
+
+/**
+ * @param {HTMLElement} element
+ * @param {string} className
+ */
+export function toggleClass(element, className) {
+  if (!element || !className) {
+    return
+  }
+  let classString = element.className
+  const nameIndex = classString.indexOf(className)
+  if (nameIndex === -1) {
+    classString += '' + className
+  } else {
+    classString =
+      classString.substr(0, nameIndex) +
+      classString.substr(nameIndex + className.length)
+  }
+  element.className = classString
+}
+
+/**
+ * @param {string} type
+ * @returns {Date}
+ */
+export function getTime(type) {
+  if (type === 'start') {
+    return new Date().getTime() - 3600 * 1000 * 24 * 90
+  } else {
+    return new Date(new Date().toDateString())
+  }
+}
+
+/**
+ * @param {Function} func
+ * @param {number} wait
+ * @param {boolean} immediate
+ * @return {*}
+ */
 export function debounce(func, wait, immediate) {
   let timeout, args, context, timestamp, result
 
@@ -62,7 +251,7 @@ export function debounce(func, wait, immediate) {
     // 据上一次触发时间间隔
     const last = +new Date() - timestamp
 
-    // 上次被包装函数被调用时间间隔last小于设定时间间隔wait
+    // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
     if (last < wait && last > 0) {
       timeout = setTimeout(later, wait - last)
     } else {
@@ -90,31 +279,43 @@ export function debounce(func, wait, immediate) {
   }
 }
 
-export function isExternal(path) {
-  return /^(https?:|mailto:|tel:)/.test(path)
-}
-
-// 替换邮箱字符
-export function regEmail(email) {
-  if (String(email).indexOf('@') > 0) {
-    const str = email.split('@')
-    let _s = ''
-    if (str[0].length > 3) {
-      for (var i = 0; i < str[0].length - 3; i++) {
-        _s += '*'
-      }
+/**
+ * This is just a simple version of deep copy
+ * Has a lot of edge cases bug
+ * If you want to use a perfect deep copy, use lodash's _.cloneDeep
+ * @param {Object} source
+ * @returns {Object}
+ */
+export function deepClone(source) {
+  if (!source && typeof source !== 'object') {
+    throw new Error('error arguments', 'deepClone')
+  }
+  const targetObj = source.constructor === Array ? [] : {}
+  Object.keys(source).forEach(keys => {
+    if (source[keys] && typeof source[keys] === 'object') {
+      targetObj[keys] = deepClone(source[keys])
+    } else {
+      targetObj[keys] = source[keys]
     }
-    var new_email = str[0].substr(0, 3) + _s + '@' + str[1]
-  }
-  return new_email
+  })
+  return targetObj
 }
 
-// 替换手机字符
-export function regMobile(mobile) {
-  if (mobile.length > 7) {
-    var new_mobile = mobile.substr(0, 3) + '****' + mobile.substr(7)
-  }
-  return new_mobile
+/**
+ * @param {Array} arr
+ * @returns {Array}
+ */
+export function uniqueArr(arr) {
+  return Array.from(new Set(arr))
+}
+
+/**
+ * @returns {string}
+ */
+export function createUniqueString() {
+  const timestamp = +new Date() + ''
+  const randomNum = parseInt((1 + Math.random()) * 65536) + ''
+  return (+(randomNum + timestamp)).toString(32)
 }
 
 /**
@@ -147,15 +348,3 @@ export function removeClass(ele, cls) {
     ele.className = ele.className.replace(reg, ' ')
   }
 }
-
-export function downloadFile(obj, name, suffix) {
-  const url = window.URL.createObjectURL(new Blob([obj]))
-  const link = document.createElement('a')
-  link.style.display = 'none'
-  link.href = url
-  const fileName = parseTime(new Date()) + '-' + name + '.' + suffix
-  link.setAttribute('download', fileName)
-  document.body.appendChild(link)
-  link.click()
-  document.body.removeChild(link)
-}
diff --git a/src/utils/open-window.js b/src/utils/open-window.js
new file mode 100644
index 0000000..1a655d7
--- /dev/null
+++ b/src/utils/open-window.js
@@ -0,0 +1,25 @@
+/**
+ *Created by PanJiaChen on 16/11/29.
+ * @param {Sting} url
+ * @param {Sting} title
+ * @param {Number} w
+ * @param {Number} h
+ */
+export default function openWindow(url, title, w, h) {
+  // Fixes dual-screen position                            Most browsers       Firefox
+  const dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : screen.left
+  const dualScreenTop = window.screenTop !== undefined ? window.screenTop : screen.top
+
+  const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width
+  const height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height
+
+  const left = ((width / 2) - (w / 2)) + dualScreenLeft
+  const top = ((height / 2) - (h / 2)) + dualScreenTop
+  const newWindow = window.open(url, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left)
+
+  // Puts focus on the newWindow
+  if (window.focus) {
+    newWindow.focus()
+  }
+}
+
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 77b7f77..221d384 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -3,12 +3,13 @@ import store from '@/store'
 /**
  * @param {Array} value
  * @returns {Boolean}
- * @example see @/views/auth/directive.vue
+ * @example see @/views/permission/directive.vue
  */
 export default function checkPermission(value) {
   if (value && value instanceof Array && value.length > 0) {
     const roles = store.getters && store.getters.roles
     const permissionRoles = value
+
     const hasPermission = roles.some(role => {
       return permissionRoles.includes(role)
     })
diff --git a/src/utils/request.js b/src/utils/request.js
index dcc614c..3a66a88 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,11 +3,11 @@ import router from '@/router/routers'
 import { Notification, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-import Config from '@/config'
+import Config from '@/settings'
 
 // 创建axios实例
 const service = axios.create({
-  baseURL: process.env.NODE_ENV === 'production' ? process.env.BASE_API : '/', // api 的 base_url
+  baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/', // api 的 base_url
   timeout: Config.timeout // 请求超时时间
 })
 
diff --git a/src/utils/scroll-to.js b/src/utils/scroll-to.js
new file mode 100644
index 0000000..c5d8e04
--- /dev/null
+++ b/src/utils/scroll-to.js
@@ -0,0 +1,58 @@
+Math.easeInOutQuad = function(t, b, c, d) {
+  t /= d / 2
+  if (t < 1) {
+    return c / 2 * t * t + b
+  }
+  t--
+  return -c / 2 * (t * (t - 2) - 1) + b
+}
+
+// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts
+var requestAnimFrame = (function() {
+  return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) }
+})()
+
+/**
+ * Because it's so fucking difficult to detect the scrolling element, just move them all
+ * @param {number} amount
+ */
+function move(amount) {
+  document.documentElement.scrollTop = amount
+  document.body.parentNode.scrollTop = amount
+  document.body.scrollTop = amount
+}
+
+function position() {
+  return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop
+}
+
+/**
+ * @param {number} to
+ * @param {number} duration
+ * @param {Function} callback
+ */
+export function scrollTo(to, duration, callback) {
+  const start = position()
+  const change = to - start
+  const increment = 20
+  let currentTime = 0
+  duration = (typeof (duration) === 'undefined') ? 500 : duration
+  var animateScroll = function() {
+    // increment the time
+    currentTime += increment
+    // find the value with the quadratic in-out easing function
+    var val = Math.easeInOutQuad(currentTime, start, change, duration)
+    // move the document.body
+    move(val)
+    // do the animation unless its over
+    if (currentTime < duration) {
+      requestAnimFrame(animateScroll)
+    } else {
+      if (callback && typeof (callback) === 'function') {
+        // the animation is done so lets callback
+        callback()
+      }
+    }
+  }
+  animateScroll()
+}
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 7ec38b4..6b3ac41 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,37 +1,87 @@
 /**
- * Created by jiachenpan on 16/11/18.
+ * Created by PanJiaChen on 16/11/18.
  */
 
-/* 合法uri*/
-export function validateURL(textval) {
-  const urlregex = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
-  return urlregex.test(textval)
+/**
+ * @param {string} path
+ * @returns {Boolean}
+ */
+export function isExternal(path) {
+  return /^(https?:|mailto:|tel:)/.test(path)
 }
 
-/* 小写字母*/
-export function validateLowerCase(str) {
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validUsername(str) {
+  const valid_map = ['admin', 'editor']
+  return valid_map.indexOf(str.trim()) >= 0
+}
+
+/**
+ * @param {string} url
+ * @returns {Boolean}
+ */
+export function validURL(url) {
+  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+  return reg.test(url)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validLowerCase(str) {
   const reg = /^[a-z]+$/
   return reg.test(str)
 }
 
-/* 大写字母*/
-export function validateUpperCase(str) {
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validUpperCase(str) {
   const reg = /^[A-Z]+$/
   return reg.test(str)
 }
 
-/* 大小写字母*/
-export function validatAlphabets(str) {
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validAlphabets(str) {
   const reg = /^[A-Za-z]+$/
   return reg.test(str)
 }
 
 /**
- * 验证邮箱
- * @param str
- * @returns {boolean}
+ * @param {string} email
+ * @returns {Boolean}
  */
-export function validatEmail(str) {
-  const reg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
-  return reg.test(str)
+export function validEmail(email) {
+  const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return reg.test(email)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function isString(str) {
+  if (typeof str === 'string' || str instanceof String) {
+    return true
+  }
+  return false
+}
+
+/**
+ * @param {Array} arg
+ * @returns {Boolean}
+ */
+export function isArray(arg) {
+  if (typeof Array.isArray === 'undefined') {
+    return Object.prototype.toString.call(arg) === '[object Array]'
+  }
+  return Array.isArray(arg)
 }
diff --git a/src/views/components/Echarts.vue b/src/views/components/Echarts.vue
new file mode 100644
index 0000000..a0a9901
--- /dev/null
+++ b/src/views/components/Echarts.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class="dashboard-container">
+    <div class="dashboard-editor-container">
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <radar-chart />
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <pie-chart />
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <bar-chart />
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+        <heat-map />
+      </el-row>
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <radar-chart />
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <sunburst />
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <gauge />
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="12">
+        <el-col :span="12">
+          <div class="chart-wrapper">
+            <rich />
+          </div>
+        </el-col>
+        <el-col :span="12">
+          <div class="chart-wrapper">
+            <theme-river />
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <graph />
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <sankey />
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <line3-d />
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="12">
+        <el-col :span="12">
+          <div class="chart-wrapper">
+            <scatter />
+          </div>
+        </el-col>
+        <el-col :span="12">
+          <div class="chart-wrapper">
+            <point />
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+        <div class="chart-wrapper">
+          <category />
+        </div>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import RadarChart from '@/components/Echarts/RadarChart'
+import PieChart from '@/components/Echarts/PieChart'
+import BarChart from '@/components/Echarts/BarChart'
+import { count } from '@/api/visits'
+import HeatMap from '@/components/Echarts/HeatMap'
+import Gauge from '@/components/Echarts/Gauge'
+import Rich from '@/components/Echarts/Rich'
+import ThemeRiver from '@/components/Echarts/ThemeRiver'
+import Sunburst from '@/components/Echarts/Sunburst'
+import Graph from '@/components/Echarts/Graph'
+import Sankey from '@/components/Echarts/Sankey'
+import Scatter from '@/components/Echarts/Scatter'
+import Line3D from '@/components/Echarts/Line3D'
+import Category from '@/components/Echarts/Category'
+import Point from '@/components/Echarts/Point'
+
+/**
+ * 记录访问，只有页面刷新或者第一次加载才会记录
+ */
+count().then(res => {
+})
+
+export default {
+  name: 'Dashboard',
+  components: {
+    Point,
+    Category,
+    Graph,
+    HeatMap,
+    RadarChart,
+    PieChart,
+    Sunburst,
+    Gauge,
+    Rich,
+    ThemeRiver,
+    Sankey,
+    Line3D,
+    Scatter,
+    BarChart
+  },
+  computed: {
+    ...mapGetters([
+      'roles'
+    ])
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .dashboard-editor-container {
+    padding: 18px 22px 22px 22px;
+    background-color: rgb(240, 242, 245);
+    .chart-wrapper {
+      background: #fff;
+      padding: 16px 16px 0;
+      margin-bottom: 32px;
+    }
+  }
+</style>
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index 1ae75de..91760c3 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <div ref="editor" class="text"/>
+    <div ref="editor" class="text" />
     <div style="margin: 12px 5px;font-size: 16px;font-weight: bold;color: #696969">HTML渲染如下：</div>
-    <div class="editor-content" v-html="editorContent"/>
+    <div class="editor-content" v-html="editorContent" />
   </div>
 </template>
 
diff --git a/src/views/components/IconSelect.vue b/src/views/components/IconSelect.vue
deleted file mode 100644
index b4e5cb0..0000000
--- a/src/views/components/IconSelect.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-  <div class="icons-container">
-    <p class="warn-content">
-      使用教程参考 <a href="https://panjiachen.github.io/vue-element-admin-site/guide/advanced/icon.html" target="_blank">Documentation</a>
-    </p>
-    <div class="icons-wrapper">
-      <div v-for="item of iconsMap" :key="item" @click="handleClipboard(generateIconCode(item),$event)">
-        <el-tooltip placement="top">
-          <div slot="content">
-            {{ generateIconCode(item) }}
-          </div>
-          <div class="icon-item">
-            <svg-icon :icon-class="item" class-name="disabled" />
-            <span>{{ item }}</span>
-          </div>
-        </el-tooltip>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import icons from '@/components/IconSelect/requireIcons'
-import clipboard from '@/utils/clipboard'
-
-export default {
-  name: 'Icons',
-  data() {
-    return {
-      iconsMap: icons
-    }
-  },
-  methods: {
-    generateIconCode(symbol) {
-      return `<svg-icon icon-class="${symbol}" />`
-    },
-    handleClipboard(text, event) {
-      clipboard(text, event)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.icons-container {
-  margin: 10px 20px 0;
-  overflow: hidden;
-  .icons-wrapper {
-    margin: 0 auto;
-  }
-  .icon-item {
-    margin: 16px;
-    height: 110px;
-    text-align: center;
-    width: 100px;
-    float: left;
-    font-size: 30px;
-    color: #24292e;
-    cursor: pointer;
-  }
-  span {
-    display: block;
-    font-size: 24px;
-    margin-top: 10px;
-  }
-  .disabled{
-    pointer-events: none;
-  }
-}
-</style>
diff --git a/src/views/components/MarkDown.vue b/src/views/components/MarkDown.vue
index da96b98..504f237 100644
--- a/src/views/components/MarkDown.vue
+++ b/src/views/components/MarkDown.vue
@@ -4,7 +4,7 @@
       Markdown 基于
       <a href="https://github.com/hinesboy/mavonEditor" target="_blank">mavonEditor</a>
     </p>
-    <mavon-editor ref="md" :style="'height:' + height" @imgAdd="imgAdd" @imgDel="imgDel"/>
+    <mavon-editor ref="md" :style="'height:' + height" @imgAdd="imgAdd" @imgDel="imgDel" />
   </div>
 </template>
 
diff --git a/src/views/components/YamlEdit.vue b/src/views/components/YamlEdit.vue
index 9097b08..9455fde 100644
--- a/src/views/components/YamlEdit.vue
+++ b/src/views/components/YamlEdit.vue
@@ -5,7 +5,7 @@
       <a href="https://github.com/codemirror/CodeMirror" target="_blank">CodeMirror</a>，
       主题预览地址 <a href="https://codemirror.net/demo/theme.html#idea" target="_blank">Theme</a>
     </p>
-    <Yaml :value="value" :height="height"/>
+    <Yaml :value="value" :height="height" />
   </div>
 </template>
 
diff --git a/src/views/components/icons/element-icons.js b/src/views/components/icons/element-icons.js
new file mode 100644
index 0000000..df72201
--- /dev/null
+++ b/src/views/components/icons/element-icons.js
@@ -0,0 +1,74 @@
+const elementIcons = [
+  'info',
+  'error',
+  'success',
+  'warning',
+  'question',
+  'back',
+  'arrow-left',
+  'arrow-down',
+  'arrow-right',
+  'arrow-up',
+  'caret-left',
+  'caret-bottom',
+  'caret-top',
+  'caret-right',
+  'd-arrow-left',
+  'd-arrow-right',
+  'minus',
+  'plus',
+  'remove',
+  'circle-plus',
+  'remove-outline',
+  'circle-plus-outline',
+  'close',
+  'check',
+  'circle-close',
+  'circle-check',
+  'circle-close-outline',
+  'circle-check-outline',
+  'zoom-out',
+  'zoom-in',
+  'd-caret',
+  'sort',
+  'sort-down',
+  'sort-up',
+  'tickets',
+  'document',
+  'goods',
+  'sold-out',
+  'news',
+  'message',
+  'date',
+  'printer',
+  'time',
+  'bell',
+  'mobile-phone',
+  'service',
+  'view',
+  'menu',
+  'more',
+  'more-outline',
+  'star-on',
+  'star-off',
+  'location',
+  'location-outline',
+  'phone',
+  'phone-outline',
+  'picture',
+  'picture-outline',
+  'delete',
+  'search',
+  'edit',
+  'edit-outline',
+  'rank',
+  'refresh',
+  'share',
+  'setting',
+  'upload',
+  'upload2',
+  'download',
+  'loading'
+]
+
+export default elementIcons
diff --git a/src/views/components/icons/index.vue b/src/views/components/icons/index.vue
new file mode 100644
index 0000000..3677afd
--- /dev/null
+++ b/src/views/components/icons/index.vue
@@ -0,0 +1,91 @@
+<template>
+  <div class="icons-container">
+    <aside>
+      <a href="https://panjiachen.github.io/vue-element-admin-site/guide/advanced/icon.html" target="_blank">Add and use
+      </a>
+    </aside>
+    <el-tabs type="border-card">
+      <el-tab-pane label="Icons">
+        <div v-for="item of svgIcons" :key="item" @click="handleClipboard(generateIconCode(item),$event)">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ generateIconCode(item) }}
+            </div>
+            <div class="icon-item">
+              <svg-icon :icon-class="item" class-name="disabled" />
+              <span>{{ item }}</span>
+            </div>
+          </el-tooltip>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="Element-UI Icons">
+        <div v-for="item of elementIcons" :key="item" @click="handleClipboard(generateElementIconCode(item),$event)">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ generateElementIconCode(item) }}
+            </div>
+            <div class="icon-item">
+              <i :class="'el-icon-' + item" />
+              <span>{{ item }}</span>
+            </div>
+          </el-tooltip>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import clipboard from '@/utils/clipboard'
+import svgIcons from './svg-icons'
+import elementIcons from './element-icons'
+
+export default {
+  name: 'Icons',
+  data() {
+    return {
+      svgIcons,
+      elementIcons
+    }
+  },
+  methods: {
+    generateIconCode(symbol) {
+      return `<svg-icon icon-class="${symbol}" />`
+    },
+    generateElementIconCode(symbol) {
+      return `<i class="el-icon-${symbol}" />`
+    },
+    handleClipboard(text, event) {
+      clipboard(text, event)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.icons-container {
+  margin: 10px 20px 0;
+  overflow: hidden;
+
+  .icon-item {
+    margin: 20px;
+    height: 85px;
+    text-align: center;
+    width: 100px;
+    float: left;
+    font-size: 30px;
+    color: #24292e;
+    cursor: pointer;
+  }
+
+  span {
+    display: block;
+    font-size: 16px;
+    margin-top: 10px;
+  }
+
+  .disabled {
+    pointer-events: none;
+  }
+}
+</style>
diff --git a/src/views/components/icons/svg-icons.js b/src/views/components/icons/svg-icons.js
new file mode 100644
index 0000000..724cd8e
--- /dev/null
+++ b/src/views/components/icons/svg-icons.js
@@ -0,0 +1,10 @@
+const req = require.context('../../../assets/icons/svg', false, /\.svg$/)
+const requireAll = requireContext => requireContext.keys()
+
+const re = /\.\/(.*)\.svg/
+
+const svgIcons = requireAll(req).map(i => {
+  return i.match(re)[1]
+})
+
+export default svgIcons
diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue
index 1aa650f..dcb6adb 100644
--- a/src/views/dashboard/LineChart.vue
+++ b/src/views/dashboard/LineChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}"/>
+  <div :class="className" :style="{height:height,width:width}" />
 </template>
 
 <script>
diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue
index d15164a..5244742 100644
--- a/src/views/dashboard/PanelGroup.vue
+++ b/src/views/dashboard/PanelGroup.vue
@@ -7,7 +7,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">日流量</div>
-          <count-to :start-val="0" :end-val="count.newVisits" :duration="2600" class="card-panel-num"/>
+          <count-to :start-val="0" :end-val="count.newVisits" :duration="2600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -18,7 +18,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">日IP量</div>
-          <count-to :start-val="0" :end-val="count.newIp" :duration="3000" class="card-panel-num"/>
+          <count-to :start-val="0" :end-val="count.newIp" :duration="3000" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -29,7 +29,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">周流量</div>
-          <count-to :start-val="0" :end-val="count.recentVisits" :duration="3200" class="card-panel-num"/>
+          <count-to :start-val="0" :end-val="count.recentVisits" :duration="3200" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -40,7 +40,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">周IP量</div>
-          <count-to :start-val="0" :end-val="count.recentIp" :duration="3600" class="card-panel-num"/>
+          <count-to :start-val="0" :end-val="count.recentIp" :duration="3600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
diff --git a/src/views/features/401.vue b/src/views/features/401.vue
index 14b6996..8a3b69e 100644
--- a/src/views/features/401.vue
+++ b/src/views/features/401.vue
@@ -1,39 +1,39 @@
 <template>
   <div class="errPage-container">
+    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
+      返回
+    </el-button>
     <el-row>
       <el-col :span="12">
-        <h1 class="text-jumbo text-ginormous">Oops!</h1>
-        图片来源<a href="https://zh.airbnb.com/" target="_blank">airbnb</a> 页面
-        <h2>你没有权限去操作</h2>
+        <h1 class="text-jumbo text-ginormous">
+          Oops!
+        </h1>
+        <h2>你没有权限去该页面</h2>
         <h6>如有不满请联系你领导</h6>
         <ul class="list-unstyled">
           <li>或者你可以去:</li>
           <li class="link-type">
-            <router-link to="/dashboard">回首页</router-link>
+            <router-link to="/dashboard">
+              回首页
+            </router-link>
           </li>
-          <li class="link-type"><a href="https://www.jianshu.com/">随便看看</a></li>
-          <li><a href="#" @click.prevent="dialogVisible=true">点我看图</a></li>
         </ul>
       </el-col>
       <el-col :span="12">
         <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
       </el-col>
     </el-row>
-    <el-dialog :visible.sync="dialogVisible" title="随便看">
-      <img :src="ewizardClap" class="pan-img">
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import errGif from '@/assets/401_images/401.gif'
+
 export default {
   name: 'Page401',
   data() {
     return {
-      errGif: errGif + '?' + +new Date(),
-      ewizardClap: 'https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646',
-      dialogVisible: false
+      errGif: errGif + '?' + +new Date()
     }
   },
   methods: {
@@ -48,9 +48,9 @@ export default {
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
+<style lang="scss" scoped>
   .errPage-container {
-    width: 600px;
+    width: 800px;
     max-width: 100%;
     margin: 100px auto;
     .pan-back-btn {
diff --git a/src/views/features/404.vue b/src/views/features/404.vue
index d97ab72..237d81f 100644
--- a/src/views/features/404.vue
+++ b/src/views/features/404.vue
@@ -9,9 +9,6 @@
       </div>
       <div class="bullshit">
         <div class="bullshit__oops">OOPS!</div>
-        <div class="bullshit__info">版权所有
-          <a class="link-type" href="https://wallstreetcn.com" target="_blank">华尔街见闻</a>
-        </div>
         <div class="bullshit__headline">{{ message }}</div>
         <div class="bullshit__info">请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告</div>
         <a href="/" class="bullshit__return-home">返回首页</a>
diff --git a/src/views/features/redirect.vue b/src/views/features/redirect.vue
index bf56fbc..db4c1d6 100644
--- a/src/views/features/redirect.vue
+++ b/src/views/features/redirect.vue
@@ -1,6 +1,6 @@
 <script>
 export default {
-  beforeCreate() {
+  created() {
     const { params, query } = this.$route
     const { path } = params
     this.$router.replace({ path: '/' + path, query })
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 3ff6ba6..5c9293a 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -12,30 +12,31 @@
               size="mini"
               style="float: right; padding: 6px 9px"
               type="primary"
-              @click="saveColumnConfig">保存</el-button>
+              @click="saveColumnConfig"
+            >保存</el-button>
           </div>
           <el-form size="small" label-width="90px">
             <el-table v-loading="loading" :data="data" :max-height="tableHeight" size="small" style="width: 100%;margin-bottom: 15px">
-              <el-table-column prop="columnName" label="字段名称"/>
-              <el-table-column prop="columnType" label="字段类型"/>
+              <el-table-column prop="columnName" label="字段名称" />
+              <el-table-column prop="columnType" label="字段类型" />
               <el-table-column prop="remark" label="字段描述">
                 <template slot-scope="scope">
-                  <el-input v-model="data[scope.$index].remark" size="mini" class="edit-input"/>
+                  <el-input v-model="data[scope.$index].remark" size="mini" class="edit-input" />
                 </template>
               </el-table-column>
               <el-table-column align="center" label="必填" width="70px">
                 <template slot-scope="scope">
-                  <el-checkbox v-model="data[scope.$index].notNull"/>
+                  <el-checkbox v-model="data[scope.$index].notNull" />
                 </template>
               </el-table-column>
               <el-table-column align="center" label="列表" width="70px">
                 <template slot-scope="scope">
-                  <el-checkbox v-model="data[scope.$index].listShow"/>
+                  <el-checkbox v-model="data[scope.$index].listShow" />
                 </template>
               </el-table-column>
               <el-table-column align="center" label="表单" width="70px">
                 <template slot-scope="scope">
-                  <el-checkbox v-model="data[scope.$index].formShow"/>
+                  <el-checkbox v-model="data[scope.$index].formShow" />
                 </template>
               </el-table-column>
               <el-table-column label="表单类型">
@@ -43,19 +44,24 @@
                   <el-select v-model="data[scope.$index].formType" filterable class="edit-input" clearable size="mini" placeholder="请选择">
                     <el-option
                       label="文本框"
-                      value="Input"/>
+                      value="Input"
+                    />
                     <el-option
                       label="文本域"
-                      value="Textarea"/>
+                      value="Textarea"
+                    />
                     <el-option
                       label="单选框"
-                      value="Radio"/>
+                      value="Radio"
+                    />
                     <el-option
                       label="下拉框"
-                      value="Select"/>
+                      value="Select"
+                    />
                     <el-option
                       label="日期框"
-                      value="Date"/>
+                      value="Date"
+                    />
                   </el-select>
                 </template>
               </el-table-column>
@@ -64,22 +70,28 @@
                   <el-select v-model="data[scope.$index].queryType" filterable class="edit-input" clearable size="mini" placeholder="请选择">
                     <el-option
                       label="="
-                      value="="/>
+                      value="="
+                    />
                     <el-option
                       label="!="
-                      value="!="/>
+                      value="!="
+                    />
                     <el-option
                       label=">="
-                      value=">="/>
+                      value=">="
+                    />
                     <el-option
                       label="<="
-                      value="<="/>
+                      value="<="
+                    />
                     <el-option
                       label="Like"
-                      value="Like"/>
+                      value="Like"
+                    />
                     <el-option
                       label="DateRange"
-                      value="DateRange"/>
+                      value="DateRange"
+                    />
                   </el-select>
                 </template>
               </el-table-column>
@@ -88,17 +100,19 @@
                   <el-select v-model="data[scope.$index].dateAnnotation" filterable class="edit-input" clearable size="mini" placeholder="请选择">
                     <el-option
                       label="自动创建时间"
-                      value="CreationTimestamp"/>
+                      value="CreationTimestamp"
+                    />
                     <el-option
                       label="自动更新时间"
-                      value="UpdateTimestamp"/>
+                      value="UpdateTimestamp"
+                    />
                   </el-select>
                 </template>
               </el-table-column>
               <el-table-column label="关联字典">
                 <template slot-scope="scope">
                   <el-select v-model="data[scope.$index].dictName" filterable class="edit-input" clearable size="mini" placeholder="请选择">
-                    <el-option v-for="item in dicts" :key="item.id" :label="item.remark === '' ? item.name : item.remark" :value="item.name"/>
+                    <el-option v-for="item in dicts" :key="item.id" :label="item.remark === '' ? item.name : item.remark" :value="item.name" />
                   </el-select>
                 </template>
               </el-table-column>
@@ -116,27 +130,28 @@
               size="mini"
               style="float: right; padding: 6px 9px"
               type="primary"
-              @click="doSubmit">保存</el-button>
+              @click="doSubmit"
+            >保存</el-button>
           </div>
           <el-form ref="form" :model="form" :rules="rules" size="small" label-width="78px">
             <el-form-item label="作者名称" prop="author">
-              <el-input v-model="form.author" style="width: 40%"/>
+              <el-input v-model="form.author" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">类上面的作者名称</span>
             </el-form-item>
             <el-form-item label="模块名称" prop="moduleName">
-              <el-input v-model="form.moduleName" style="width: 40%"/>
+              <el-input v-model="form.moduleName" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">模块的名称，请选择项目中已存在的模块</span>
             </el-form-item>
             <el-form-item label="至于包下" prop="pack">
-              <el-input v-model="form.pack" style="width: 40%"/>
+              <el-input v-model="form.pack" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">项目包的名称，生成的代码放到哪个包里面</span>
             </el-form-item>
             <el-form-item label="前端路径" prop="path">
-              <el-input v-model="form.path" style="width: 40%"/>
+              <el-input v-model="form.path" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">输入views文件夹下的目录，不存在即创建</span>
             </el-form-item>
             <el-form-item label="去表前缀" prop="prefix">
-              <el-input v-model="form.prefix" placeholder="默认不去除表前缀" style="width: 40%"/>
+              <el-input v-model="form.prefix" placeholder="默认不去除表前缀" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">默认不去除表前缀，可自定义</span>
             </el-form-item>
             <!--            <el-form-item label="Api路径">-->
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index 84240a6..dff0e17 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <el-input v-model="query.name" clearable placeholder="请输入表名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.name" clearable size="small" placeholder="请输入表名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
     </div>
     <!--表格渲染-->
@@ -12,10 +12,10 @@
           <div>{{ scope.$index + 1 }}</div>
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="tableName" label="表名"/>
-      <el-table-column :show-overflow-tooltip="true" prop="engine" label="数据库引擎"/>
-      <el-table-column :show-overflow-tooltip="true" prop="coding" label="字符编码集"/>
-      <el-table-column :show-overflow-tooltip="true" prop="remark" label="备注"/>
+      <el-table-column :show-overflow-tooltip="true" prop="tableName" label="表名" />
+      <el-table-column :show-overflow-tooltip="true" prop="engine" label="数据库引擎" />
+      <el-table-column :show-overflow-tooltip="true" prop="coding" label="字符编码集" />
+      <el-table-column :show-overflow-tooltip="true" prop="remark" label="备注" />
       <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -40,7 +40,8 @@
       style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </div>
 </template>
 
diff --git a/src/views/home.vue b/src/views/home.vue
index 7e55a6b..f923bb9 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -1,10 +1,30 @@
 <template>
   <div class="dashboard-container">
     <div class="dashboard-editor-container">
-      <panel-group/>
+      <panel-group />
       <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-        <line-chart/>
+        <line-chart />
       </el-row>
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <radar-chart />
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <pie-chart />
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+            <bar-chart />
+          </div>
+        </el-col>
+      </el-row>
+      <!--      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">-->
+      <!--        <heat-map/>-->
+      <!--      </el-row>-->
       <!--      <el-row :gutter="32">-->
       <!--        <el-col :xs="24" :sm="24" :lg="8">-->
       <!--          <div class="chart-wrapper">-->
@@ -13,35 +33,15 @@
       <!--        </el-col>-->
       <!--        <el-col :xs="24" :sm="24" :lg="8">-->
       <!--          <div class="chart-wrapper">-->
-      <!--            <pie-chart/>-->
+      <!--            <sunburst/>-->
       <!--          </div>-->
       <!--        </el-col>-->
       <!--        <el-col :xs="24" :sm="24" :lg="8">-->
       <!--          <div class="chart-wrapper">-->
-      <!--            <bar-chart/>-->
+      <!--            <gauge/>-->
       <!--          </div>-->
       <!--        </el-col>-->
       <!--      </el-row>-->
-      <!--      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">-->
-      <!--        <heat-map/>-->
-      <!--      </el-row>-->
-      <el-row :gutter="32">
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <radar-chart/>
-          </div>
-        </el-col>
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <sunburst/>
-          </div>
-        </el-col>
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <gauge/>
-          </div>
-        </el-col>
-      </el-row>
       <!--      <el-row :gutter="12">-->
       <!--        <el-col :span="12">-->
       <!--          <div class="chart-wrapper">-->
@@ -96,22 +96,22 @@
 import { mapGetters } from 'vuex'
 import PanelGroup from './dashboard/PanelGroup'
 import LineChart from './dashboard/LineChart'
-import RadarChart from './dashboard/RadarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
+import RadarChart from '@/components/Echarts/RadarChart'
+import PieChart from '@/components/Echarts/PieChart'
+import BarChart from '@/components/Echarts/BarChart'
 import { count } from '@/api/visits'
-import HeatMap from './dashboard/HeatMap'
-import Funnel from './dashboard/Funnel'
-import Gauge from './dashboard/Gauge'
-import Rich from './dashboard/Rich'
-import ThemeRiver from './dashboard/ThemeRiver'
-import Sunburst from './dashboard/Sunburst'
-import Graph from './dashboard/Graph'
-import Sankey from './dashboard/Sankey'
-import Scatter from './dashboard/Scatter'
-import Line3D from './dashboard/Line3D'
-import Category from './dashboard/Category'
-import Point from './dashboard/Point'
+// import HeatMap from './dashboard/HeatMap'
+// import Funnel from './dashboard/Funnel'
+// import Gauge from './dashboard/Gauge'
+// import Rich from './dashboard/Rich'
+// import ThemeRiver from './dashboard/ThemeRiver'
+// import Sunburst from './dashboard/Sunburst'
+// import Graph from './dashboard/Graph'
+// import Sankey from './dashboard/Sankey'
+// import Scatter from './dashboard/Scatter'
+// import Line3D from './dashboard/Line3D'
+// import Category from './dashboard/Category'
+// import Point from './dashboard/Point'
 
 /**
  * 记录访问，只有页面刷新或者第一次加载才会记录
@@ -122,22 +122,22 @@ count().then(res => {
 export default {
   name: 'Dashboard',
   components: {
-    Point,
-    Category,
-    Graph,
-    HeatMap,
+    // Point,
+    // Category,
+    // Graph,
+    // HeatMap,
     PanelGroup,
     LineChart,
     RadarChart,
     PieChart,
-    Funnel,
-    Sunburst,
-    Gauge,
-    Rich,
-    ThemeRiver,
-    Sankey,
-    Line3D,
-    Scatter,
+    // Funnel,
+    // Sunburst,
+    // Gauge,
+    // Rich,
+    // ThemeRiver,
+    // Sankey,
+    // Line3D,
+    // Scatter,
     BarChart
   },
   computed: {
diff --git a/src/views/login.vue b/src/views/login.vue
index d3a5f2b..5095120 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,26 +1,30 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
-      <h3 class="title">EL-ADMIN 后台管理系统</h3>
+      <h3 class="title">
+        EL-ADMIN 后台管理系统
+      </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
         <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="code">
         <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter.native="handleLogin">
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
+          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
         </el-input>
         <div class="login-code">
           <img :src="codeUrl" @click="getCode">
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住我</el-checkbox>
+      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">
+        记住我
+      </el-checkbox>
       <el-form-item style="width:100%;">
         <el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
           <span v-if="!loading">登 录</span>
@@ -30,7 +34,7 @@
     </el-form>
     <!--  底部  -->
     <div v-if="$store.state.settings.showFooter" id="el-login-footer">
-      <span v-html="$store.state.settings.footerTxt"/>
+      <span v-html="$store.state.settings.footerTxt" />
       <span> ⋅ </span>
       <a href="http://www.beian.miit.gov.cn" target="_blank">{{ $store.state.settings.caseNumber }}</a>
     </div>
@@ -39,7 +43,7 @@
 
 <script>
 import { encrypt } from '@/utils/rsaEncrypt'
-import Config from '@/config'
+import Config from '@/settings'
 import { getCodeImg } from '@/api/login'
 import Cookies from 'js-cookie'
 export default {
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index 1aefbfd..6911a58 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <Search :query="query"/>
+    <Search :query="query" />
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column type="expand">
@@ -15,11 +15,11 @@
           </el-form>
         </template>
       </el-table-column>
-      <el-table-column prop="username" label="用户名"/>
-      <el-table-column prop="requestIp" label="IP"/>
-      <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
-      <el-table-column prop="description" label="描述"/>
-      <el-table-column prop="browser" label="浏览器"/>
+      <el-table-column prop="username" label="用户名" />
+      <el-table-column prop="requestIp" label="IP" />
+      <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
+      <el-table-column prop="description" label="描述" />
+      <el-table-column prop="browser" label="浏览器" />
       <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -43,7 +43,8 @@
       style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </div>
 </template>
 
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index e44ae4d..377196d 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <Search :query="query"/>
+    <Search :query="query" />
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column type="expand">
@@ -15,11 +15,11 @@
           </el-form>
         </template>
       </el-table-column>
-      <el-table-column prop="username" label="用户名"/>
-      <el-table-column prop="requestIp" label="IP"/>
-      <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
-      <el-table-column prop="description" label="描述"/>
-      <el-table-column prop="browser" label="浏览器"/>
+      <el-table-column prop="username" label="用户名" />
+      <el-table-column prop="requestIp" label="IP" />
+      <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
+      <el-table-column prop="description" label="描述" />
+      <el-table-column prop="browser" label="浏览器" />
       <el-table-column prop="time" label="请求耗时" align="center">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
@@ -40,7 +40,8 @@
       style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </div>
 </template>
 
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index 3646c2e..3466f22 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -1,16 +1,17 @@
 <template>
   <div class="head-container">
-    <el-input v-model="query.value" clearable placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+    <el-input v-model="query.value" clearable size="small" placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
     <el-date-picker
       v-model="query.date"
       :default-time="['00:00:00','23:59:59']"
       type="daterange"
       range-separator=":"
-      class="el-range-editor--small filter-item"
-      style="height: 30.5px;width: 220px"
+      class="el-range-editor--small date-item"
+      style="width: 220px;height: 30.5px"
       value-format="yyyy-MM-dd HH:mm:ss"
       start-placeholder="开始日期"
-      end-placeholder="结束日期"/>
+      end-placeholder="结束日期"
+    />
     <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$parent.toQuery">搜索</el-button>
     <!-- 导出 -->
     <div style="display: inline-block;">
@@ -20,7 +21,8 @@
         class="filter-item"
         type="warning"
         icon="el-icon-download"
-        @click="download">导出</el-button>
+        @click="download"
+      >导出</el-button>
     </div>
   </div>
 </template>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 5ed9691..5d43da3 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="head-container">
-      <el-input v-model="query.value" clearable placeholder="全表模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable size="small" placeholder="全表模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 导出 -->
       <div style="display: inline-block;">
@@ -11,16 +11,17 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download">导出</el-button>
+          @click="download"
+        >导出</el-button>
       </div>
     </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column prop="userName" label="用户名"/>
-      <el-table-column prop="job" label="岗位"/>
-      <el-table-column prop="ip" label="登录IP"/>
-      <el-table-column :show-overflow-tooltip="true" prop="address" label="登录地点"/>
-      <el-table-column prop="browser" label="浏览器"/>
+      <el-table-column prop="userName" label="用户名" />
+      <el-table-column prop="job" label="岗位" />
+      <el-table-column prop="ip" label="登录IP" />
+      <el-table-column :show-overflow-tooltip="true" prop="address" label="登录地点" />
+      <el-table-column prop="browser" label="浏览器" />
       <el-table-column prop="loginTime" label="登录时间">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.loginTime) }}</span>
@@ -29,10 +30,11 @@
       <el-table-column prop="createTime" label="操作" width="100px" fixed="right">
         <template slot-scope="scope">
           <el-popover
-            v-permission="['admin']"
             :ref="scope.$index"
+            v-permission="['admin']"
             placement="top"
-            width="180">
+            width="180"
+          >
             <p>确定踢出该用户吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
@@ -50,7 +52,8 @@
       style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </div>
 </template>
 
diff --git a/src/views/monitor/redis/index.vue b/src/views/monitor/redis/index.vue
index 07c9e0b..8f383ee 100644
--- a/src/views/monitor/redis/index.vue
+++ b/src/views/monitor/redis/index.vue
@@ -3,7 +3,7 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入关键词搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable size="small" placeholder="输入关键词搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <div style="display: inline-block;">
         <!-- 清空缓存 -->
@@ -17,12 +17,13 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download">导出</el-button>
+          @click="download"
+        >导出</el-button>
       </div>
     </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column :show-overflow-tooltip="true" prop="key" label="KEY"/>
+      <el-table-column :show-overflow-tooltip="true" prop="key" label="KEY" />
       <el-table-column prop="value" label="VALUE">
         <template slot-scope="scope">
           <div style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
@@ -33,16 +34,17 @@
       <el-table-column v-if="checkPermission(['admin','redis:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-popover
-            v-permission="['admin','redis:del']"
             :ref="scope.$index"
+            v-permission="['admin','redis:del']"
             placement="top"
-            width="180">
+            width="180"
+          >
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
               <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.$index, scope.row)">确定</el-button>
             </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
         </template>
       </el-table-column>
@@ -54,7 +56,8 @@
       style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </div>
 </template>
 
diff --git a/src/views/monitor/server/form.vue b/src/views/monitor/server/form.vue
index 191b6ba..7b4a98c 100644
--- a/src/views/monitor/server/form.vue
+++ b/src/views/monitor/server/form.vue
@@ -1,17 +1,17 @@
 <template>
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="名称" >
-        <el-input v-model="form.name" style="width: 370px;"/>
+      <el-form-item label="名称">
+        <el-input v-model="form.name" style="width: 370px;" />
       </el-form-item>
-      <el-form-item label="IP地址" >
-        <el-input v-model="form.ip" style="width: 370px;"/>
+      <el-form-item label="IP地址">
+        <el-input v-model="form.ip" style="width: 370px;" />
       </el-form-item>
-      <el-form-item label="访问端口" >
-        <el-input-number v-model="form.port"/>
+      <el-form-item label="访问端口">
+        <el-input-number v-model="form.port" />
       </el-form-item>
-      <el-form-item label="排序" >
-        <el-input-number v-model="form.sort"/>
+      <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index ffd4d1c..20845e1 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -3,9 +3,9 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
-        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+      <el-input v-model="query.value" clearable size="small" placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable size="small" placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
       </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
@@ -16,7 +16,8 @@
           size="mini"
           type="primary"
           icon="el-icon-plus"
-          @click="add">新增
+          @click="add"
+        >新增
         </el-button>
       </div>
       <!-- 刷新 -->
@@ -26,29 +27,31 @@
           class="filter-item"
           type="warning"
           icon="el-icon-refresh"
-          @click="refresh">刷新
+          @click="refresh"
+        >刷新
         </el-button>
       </div>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd"/>
+    <eForm ref="form" :is-add="isAdd" />
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column label="状态" width="50px">
         <template slot-scope="scope">
           <el-tag
             :type="scope.row.state === '1' ? 'success' : 'info'"
-            disable-transitions>
-            <i v-if="scope.row.state === '1'" class="el-icon-success"/>
-            <i v-if="scope.row.state === '0'" class="el-icon-error"/>
+            disable-transitions
+          >
+            <i v-if="scope.row.state === '1'" class="el-icon-success" />
+            <i v-if="scope.row.state === '0'" class="el-icon-error" />
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="名称"/>
-      <el-table-column prop="ip" label="IP地址"/>
-      <el-table-column prop="port" label="访问端口" width="80px" align="center"/>
-      <el-table-column :formatter="formatCpuRate" prop="cpuRate" label="CPU使用率" width="100px" align="center"/>
-      <el-table-column prop="cpuCore" label="CPU内核数" width="100px" align="center"/>
+      <el-table-column prop="name" label="名称" />
+      <el-table-column prop="ip" label="IP地址" />
+      <el-table-column prop="port" label="访问端口" width="80px" align="center" />
+      <el-table-column :formatter="formatCpuRate" prop="cpuRate" label="CPU使用率" width="100px" align="center" />
+      <el-table-column prop="cpuCore" label="CPU内核数" width="100px" align="center" />
       <el-table-column label="物理内存" align="center">
         <template slot-scope="scope">
           <el-row>
@@ -56,7 +59,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-progress :percentage="percentNumber(scope.row.memUsed,scope.row.memTotal)" :status="percentStatus(scope.row.memUsed,scope.row.memTotal)" :show-text="false"/>
+              <el-progress :percentage="percentNumber(scope.row.memUsed,scope.row.memTotal)" :status="percentStatus(scope.row.memUsed,scope.row.memTotal)" :show-text="false" />
             </el-col>
           </el-row>
         </template>
@@ -68,7 +71,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-progress :percentage="percentNumber(scope.row.diskUsed,scope.row.diskTotal)" :status="percentStatus(scope.row.diskUsed,scope.row.diskTotal)" :show-text="false"/>
+              <el-progress :percentage="percentNumber(scope.row.diskUsed,scope.row.diskTotal)" :status="percentStatus(scope.row.diskUsed,scope.row.diskTotal)" :show-text="false" />
             </el-col>
           </el-row>
         </template>
@@ -80,25 +83,26 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-progress :percentage="percentNumber(scope.row.swapUsed,scope.row.swapTotal)" :status="percentStatus(scope.row.swapUsed,scope.row.swapTotal)" :show-text="false"/>
+              <el-progress :percentage="percentNumber(scope.row.swapUsed,scope.row.swapTotal)" :status="percentStatus(scope.row.swapUsed,scope.row.swapTotal)" :show-text="false" />
             </el-col>
           </el-row>
         </template>
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','server:edit','server:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','server:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-button v-permission="['admin','server:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
           <el-popover
-            v-permission="['admin','server:del']"
             :ref="scope.row.id"
+            v-permission="['admin','server:del']"
             placement="top"
-            width="180">
+            width="180"
+          >
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
               <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
             </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
         </template>
       </el-table-column>
@@ -110,7 +114,8 @@
       style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </div>
 </template>
 
diff --git a/src/views/monitor/sql/index.vue b/src/views/monitor/sql/index.vue
index cd37191..0ed9034 100644
--- a/src/views/monitor/sql/index.vue
+++ b/src/views/monitor/sql/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <elFrame :src="sqlApi"/>
+  <elFrame :src="sqlApi" />
 </template>
 <script>
 import { mapGetters } from 'vuex'
diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue
index 7bf6148..98240ae 100644
--- a/src/views/nested/menu1/index.vue
+++ b/src/views/nested/menu1/index.vue
@@ -1,3 +1,3 @@
-<template >
+<template>
   <router-view />
 </template>
diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue
index 8c482d9..8c323ec 100644
--- a/src/views/nested/menu1/menu1-1/index.vue
+++ b/src/views/nested/menu1/menu1-1/index.vue
@@ -1,5 +1,5 @@
-<template >
+<template>
   <div style="padding:30px;">
-    <el-alert :closable="false" title="三级菜单1" type="success"/>
+    <el-alert :closable="false" title="三级菜单1" type="success" />
   </div>
 </template>
diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue
index f0fec57..8508f4a 100644
--- a/src/views/nested/menu1/menu1-2/index.vue
+++ b/src/views/nested/menu1/menu1-2/index.vue
@@ -1,5 +1,5 @@
 <template>
   <div style="padding:30px;">
-    <el-alert :closable="false" title="三级菜单2" type="success"/>
+    <el-alert :closable="false" title="三级菜单2" type="success" />
   </div>
 </template>
diff --git a/src/views/nested/menu2/index.vue b/src/views/nested/menu2/index.vue
index 7dbc481..b8283a2 100644
--- a/src/views/nested/menu2/index.vue
+++ b/src/views/nested/menu2/index.vue
@@ -1,5 +1,5 @@
 <template>
   <div style="padding:30px;">
-    <el-alert :closable="false" title="二级菜单"/>
+    <el-alert :closable="false" title="二级菜单" />
   </div>
 </template>
diff --git a/src/views/system/dept/form.vue b/src/views/system/dept/form.vue
index 245f395..e3688ca 100644
--- a/src/views/system/dept/form.vue
+++ b/src/views/system/dept/form.vue
@@ -2,7 +2,7 @@
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增部门' : '编辑部门'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="名称" prop="name">
-        <el-input v-model="form.name" style="width: 370px;"/>
+        <el-input v-model="form.name" style="width: 370px;" />
       </el-form-item>
       <el-form-item v-if="form.pid !== 0" label="状态" prop="enabled">
         <el-radio v-for="item in dicts" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index c37e964..5d686e5 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -3,19 +3,20 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable size="small" placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
         v-model="query.date"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small filter-item"
-        style="height: 30.5px;width: 220px"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
-      <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
-        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+        end-placeholder="结束日期"
+      />
+      <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
+        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
       </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
@@ -25,7 +26,8 @@
           size="mini"
           type="primary"
           icon="el-icon-plus"
-          @click="add">新增</el-button>
+          @click="add"
+        >新增</el-button>
       </div>
       <!-- 导出 -->
       <div style="display: inline-block;">
@@ -35,14 +37,15 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download">导出</el-button>
+          @click="download"
+        >导出</el-button>
       </div>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" :dicts="dict.dept_status"/>
+    <eForm ref="form" :is-add="isAdd" :dicts="dict.dept_status" />
     <!--表格渲染-->
     <el-table v-loading="loading" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :default-expand-all="expand" :data="data" row-key="id" size="small">
-      <el-table-column label="名称" prop="name"/>
+      <el-table-column label="名称" prop="name" />
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <el-switch
@@ -50,7 +53,8 @@
             :disabled="scope.row.id == 1"
             active-color="#409EFF"
             inactive-color="#F56C6C"
-            @change="changeEnabled(scope.row, scope.row.enabled,)"/>
+            @change="changeEnabled(scope.row, scope.row.enabled,)"
+          />
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="创建日期">
@@ -60,18 +64,19 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','dept:edit','dept:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','dept:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-button v-permission="['admin','dept:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
           <el-popover
-            v-permission="['admin','dept:del']"
             :ref="scope.row.id"
+            v-permission="['admin','dept:del']"
             placement="top"
-            width="180">
+            width="180"
+          >
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
               <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
             </div>
-            <el-button slot="reference" :disabled="scope.row.id === 1" type="danger" icon="el-icon-delete" size="mini"/>
+            <el-button slot="reference" :disabled="scope.row.id === 1" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
         </template>
       </el-table-column>
diff --git a/src/views/system/dict/form.vue b/src/views/system/dict/form.vue
index 166204e..ec88532 100644
--- a/src/views/system/dict/form.vue
+++ b/src/views/system/dict/form.vue
@@ -2,10 +2,10 @@
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增字典' : '编辑字典'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="字典名称" prop="name">
-        <el-input v-model="form.name" style="width: 370px;"/>
+        <el-input v-model="form.name" style="width: 370px;" />
       </el-form-item>
       <el-form-item label="描述">
-        <el-input v-model="form.remark" style="width: 370px;"/>
+        <el-input v-model="form.remark" style="width: 370px;" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 461a4b7..32a3085 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd"/>
+    <eForm ref="form" :is-add="isAdd" />
     <el-row :gutter="10">
       <el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10" style="margin-bottom: 10px">
         <el-card class="box-card">
@@ -14,12 +14,13 @@
               style="float: right;padding: 4px 10px"
               type="primary"
               icon="el-icon-plus"
-              @click="$refs.form.dialog = true;isAdd = true">新增</el-button>
+              @click="$refs.form.dialog = true;isAdd = true"
+            >新增</el-button>
           </div>
           <!--工具栏-->
           <div class="head-container">
             <!-- 搜索 -->
-            <el-input v-model="query.value" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+            <el-input v-model="query.value" clearable size="small" placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
             <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
             <!-- 导出 -->
             <div style="display: inline-block;">
@@ -29,27 +30,29 @@
                 class="filter-item"
                 type="warning"
                 icon="el-icon-download"
-                @click="download">导出</el-button>
+                @click="download"
+              >导出</el-button>
             </div>
           </div>
           <!--表格渲染-->
           <el-table v-loading="loading" :data="data" size="small" highlight-current-row style="width: 100%;" @current-change="handleCurrentChange">
-            <el-table-column :show-overflow-tooltip="true" prop="name" label="名称"/>
-            <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述"/>
+            <el-table-column :show-overflow-tooltip="true" prop="name" label="名称" />
+            <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述" />
             <el-table-column v-if="checkPermission(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
-                <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+                <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
                 <el-popover
-                  v-permission="['admin','dict:del']"
                   :ref="scope.row.id"
+                  v-permission="['admin','dict:del']"
                   placement="top"
-                  width="180">
+                  width="180"
+                >
                   <p>此操作将删除字典与对应的字典详情，确定要删除吗？</p>
                   <div style="text-align: right; margin: 0">
                     <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
                     <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
                   </div>
-                  <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+                  <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
                 </el-popover>
               </template>
             </el-table-column>
@@ -61,7 +64,8 @@
             style="margin-top: 8px;"
             layout="total, prev, pager, next, sizes"
             @size-change="sizeChange"
-            @current-change="pageChange"/>
+            @current-change="pageChange"
+          />
         </el-card>
       </el-col>
       <el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="14">
@@ -75,9 +79,10 @@
               style="float: right;padding: 4px 10px"
               type="primary"
               icon="el-icon-plus"
-              @click="$refs.dictDetail.$refs.form.dialog = true;$refs.dictDetail.isAdd = true">新增</el-button>
+              @click="$refs.dictDetail.$refs.form.dialog = true;$refs.dictDetail.isAdd = true"
+            >新增</el-button>
           </div>
-          <dictDetail ref="dictDetail"/>
+          <dictDetail ref="dictDetail" />
         </el-card>
       </el-col>
     </el-row>
diff --git a/src/views/system/dictDetail/form.vue b/src/views/system/dictDetail/form.vue
index 5b213b2..e9fa128 100644
--- a/src/views/system/dictDetail/form.vue
+++ b/src/views/system/dictDetail/form.vue
@@ -2,13 +2,13 @@
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增字典详情' : '编辑字典详情'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="字典标签" prop="label">
-        <el-input v-model="form.label" style="width: 370px;"/>
+        <el-input v-model="form.label" style="width: 370px;" />
       </el-form-item>
       <el-form-item label="字典值">
-        <el-input v-model="form.value" style="width: 370px;"/>
+        <el-input v-model="form.value" style="width: 370px;" />
       </el-form-item>
       <el-form-item label="排序" prop="sort">
-        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;"/>
+        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
diff --git a/src/views/system/dictDetail/index.vue b/src/views/system/dictDetail/index.vue
index a738028..e12f265 100644
--- a/src/views/system/dictDetail/index.vue
+++ b/src/views/system/dictDetail/index.vue
@@ -7,35 +7,34 @@
       <!--工具栏-->
       <div class="head-container">
         <!-- 搜索 -->
-        <el-input v-model="query.value" clearable placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+        <el-input v-model="query.value" clearable size="small" placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
         <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       </div>
       <!--表单组件-->
-      <eForm ref="form" :is-add="isAdd" :dict-id="dictId"/>
+      <eForm ref="form" :is-add="isAdd" :dict-id="dictId" />
       <!--表格渲染-->
       <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
         <el-table-column label="所属字典">
-          <template slot-scope="scope">
-            {{ dictName }}
-          </template>
+          {{ dictName }}
         </el-table-column>
-        <el-table-column prop="label" label="字典标签"/>
-        <el-table-column prop="value" label="字典值"/>
-        <el-table-column prop="sort" label="排序"/>
+        <el-table-column prop="label" label="字典标签" />
+        <el-table-column prop="value" label="字典值" />
+        <el-table-column prop="sort" label="排序" />
         <el-table-column v-if="checkPermission(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+            <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
             <el-popover
-              v-permission="['admin','dict:del']"
               :ref="scope.row.id"
+              v-permission="['admin','dict:del']"
               placement="top"
-              width="180">
+              width="180"
+            >
               <p>确定删除本条数据吗？</p>
               <div style="text-align: right; margin: 0">
                 <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
                 <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
               </div>
-              <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+              <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
             </el-popover>
           </template>
         </el-table-column>
@@ -47,7 +46,8 @@
         style="margin-top: 8px;"
         layout="total, prev, pager, next, sizes"
         @size-change="sizeChange"
-        @current-change="pageChange"/>
+        @current-change="pageChange"
+      />
     </div>
   </div>
 </template>
diff --git a/src/views/system/job/form.vue b/src/views/system/job/form.vue
index c650865..4eefdb1 100644
--- a/src/views/system/job/form.vue
+++ b/src/views/system/job/form.vue
@@ -2,10 +2,10 @@
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增岗位' : '编辑岗位'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="名称" prop="name">
-        <el-input v-model="form.name" style="width: 370px;"/>
+        <el-input v-model="form.name" style="width: 370px;" />
       </el-form-item>
       <el-form-item label="排序" prop="sort">
-        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;"/>
+        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
       </el-form-item>
       <el-form-item v-if="form.pid !== 0" label="状态" prop="enabled">
         <el-radio v-for="item in dicts" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index fb835f7..2b9399b 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -3,19 +3,20 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable size="small" placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
         v-model="query.date"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small filter-item"
-        style="height: 30.5px;width: 220px"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
-      <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
-        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+        end-placeholder="结束日期"
+      />
+      <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
+        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
       </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
@@ -25,7 +26,8 @@
           size="mini"
           type="primary"
           icon="el-icon-plus"
-          @click="add">新增</el-button>
+          @click="add"
+        >新增</el-button>
       </div>
       <!-- 导出 -->
       <div style="display: inline-block;">
@@ -35,14 +37,15 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download">导出</el-button>
+          @click="download"
+        >导出</el-button>
       </div>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" :dicts="dict.job_status"/>
+    <eForm ref="form" :is-add="isAdd" :dicts="dict.job_status" />
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column prop="name" label="名称"/>
+      <el-table-column prop="name" label="名称" />
       <el-table-column label="所属部门">
         <template slot-scope="scope">
           <div>{{ scope.row.deptSuperiorName ? scope.row.deptSuperiorName + ' / ' : '' }}{{ scope.row.dept.name }}</div>
@@ -59,7 +62,8 @@
             v-model="scope.row.enabled"
             active-color="#409EFF"
             inactive-color="#F56C6C"
-            @change="changeEnabled(scope.row, scope.row.enabled,)"/>
+            @change="changeEnabled(scope.row, scope.row.enabled,)"
+          />
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="创建日期">
@@ -69,18 +73,19 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','job:edit','job:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','job:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-button v-permission="['admin','job:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
           <el-popover
-            v-permission="['admin','job:del']"
             :ref="scope.row.id"
+            v-permission="['admin','job:del']"
             placement="top"
-            width="180">
+            width="180"
+          >
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
               <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
             </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
         </template>
       </el-table-column>
@@ -92,7 +97,8 @@
       style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </div>
 </template>
 
diff --git a/src/views/system/menu/form.vue b/src/views/system/menu/form.vue
index b696f64..1c6a8fe 100644
--- a/src/views/system/menu/form.vue
+++ b/src/views/system/menu/form.vue
@@ -13,11 +13,12 @@
           placement="bottom-start"
           width="450"
           trigger="click"
-          @show="$refs['iconSelect'].reset()">
+          @show="$refs['iconSelect'].reset()"
+        >
           <IconSelect ref="iconSelect" @selected="selected" />
           <el-input slot="reference" v-model="form.icon" style="width: 450px;" placeholder="点击选择图标" readonly>
             <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon" style="height: 32px;width: 16px;" />
-            <i v-else slot="prefix" class="el-icon-search el-input__icon"/>
+            <i v-else slot="prefix" class="el-icon-search el-input__icon" />
           </el-input>
         </el-popover>
       </el-form-item>
@@ -40,25 +41,25 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item v-show="form.type.toString() !== '2'" label="菜单标题" prop="name">
-        <el-input v-model="form.name" :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 178px'" placeholder="菜单标题"/>
+        <el-input v-model="form.name" :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 178px'" placeholder="菜单标题" />
       </el-form-item>
       <el-form-item v-show="form.type.toString() === '2'" label="按钮名称">
-        <el-input v-model="form.name" placeholder="按钮名称" style="width: 178px;"/>
+        <el-input v-model="form.name" placeholder="按钮名称" style="width: 178px;" />
       </el-form-item>
       <el-form-item v-show="form.type.toString() !== '0'" label="权限标识">
-        <el-input :disabled="form.iframe === 'true'" v-model="form.permission" placeholder="权限标识" style="width: 178px;"/>
+        <el-input v-model="form.permission" :disabled="form.iframe === 'true'" placeholder="权限标识" style="width: 178px;" />
       </el-form-item>
       <el-form-item v-if="form.type.toString() !== '2'" label="路由地址" prop="path">
-        <el-input v-model="form.path" placeholder="路由地址" style="width: 178px;"/>
+        <el-input v-model="form.path" placeholder="路由地址" style="width: 178px;" />
       </el-form-item>
       <el-form-item label="菜单排序">
-        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 178px;"/>
+        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 178px;" />
       </el-form-item>
       <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件名称">
-        <el-input v-model="form.componentName" style="width: 178px;" placeholder="匹配组件内Name字段"/>
+        <el-input v-model="form.componentName" style="width: 178px;" placeholder="匹配组件内Name字段" />
       </el-form-item>
       <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件路径">
-        <el-input v-model="form.component" style="width: 178px;" placeholder="组件路径"/>
+        <el-input v-model="form.component" style="width: 178px;" placeholder="组件路径" />
       </el-form-item>
       <el-form-item label="上级类目">
         <treeselect v-model="form.pid" :options="menus" style="width: 450px;" placeholder="选择上级类目" />
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index d08db1b..2b192b2 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -3,17 +3,18 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable size="small" placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
         v-model="query.date"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small filter-item"
-        style="height: 30.5px;width: 220px"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
+        end-placeholder="结束日期"
+      />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
       <div v-permission="['admin','menu:add']" style="display: inline-block;margin: 0px 2px;">
@@ -22,7 +23,8 @@
           size="mini"
           type="primary"
           icon="el-icon-plus"
-          @click="add">新增</el-button>
+          @click="add"
+        >新增</el-button>
       </div>
       <!-- 导出 -->
       <div style="display: inline-block;">
@@ -32,14 +34,15 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download">导出</el-button>
+          @click="download"
+        >导出</el-button>
       </div>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd"/>
+    <eForm ref="form" :is-add="isAdd" />
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :default-expand-all="expand" row-key="id" size="small">
-      <el-table-column :show-overflow-tooltip="true" label="菜单名称" width="125px" prop="name"/>
+      <el-table-column :show-overflow-tooltip="true" label="菜单名称" width="125px" prop="name" />
       <el-table-column prop="icon" label="图标" align="center" width="60px">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
@@ -50,10 +53,10 @@
           {{ scope.row.sort }}
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="path" label="路由地址"/>
-      <el-table-column :show-overflow-tooltip="true" prop="permission" label="权限标识"/>
+      <el-table-column :show-overflow-tooltip="true" prop="path" label="路由地址" />
+      <el-table-column :show-overflow-tooltip="true" prop="permission" label="权限标识" />
       <!--<el-table-column :show-overflow-tooltip="true" prop="componentName" label="组件名称"/>-->
-      <el-table-column :show-overflow-tooltip="true" prop="component" label="组件路径"/>
+      <el-table-column :show-overflow-tooltip="true" prop="component" label="组件路径" />
       <el-table-column prop="iframe" label="外链" width="75px">
         <template slot-scope="scope">
           <span v-if="scope.row.iframe">是</span>
@@ -79,18 +82,19 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','menu:edit','menu:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','menu:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-button v-permission="['admin','menu:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
           <el-popover
-            v-permission="['admin','menu:del']"
             :ref="scope.row.id"
+            v-permission="['admin','menu:del']"
             placement="top"
-            width="200">
+            width="200"
+          >
             <p>确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
               <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
             </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
         </template>
       </el-table-column>
diff --git a/src/views/system/role/form.vue b/src/views/system/role/form.vue
index 20ac0b6..9c320fc 100644
--- a/src/views/system/role/form.vue
+++ b/src/views/system/role/form.vue
@@ -2,10 +2,10 @@
   <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增角色' : '编辑角色'" append-to-body width="520px">
     <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="角色名称" prop="name">
-        <el-input v-model="form.name" style="width: 145px;"/>
+        <el-input v-model="form.name" style="width: 145px;" />
       </el-form-item>
       <el-form-item label="角色权限" prop="permission">
-        <el-input v-model="form.permission" style="width: 145px;"/>
+        <el-input v-model="form.permission" style="width: 145px;" />
       </el-form-item>
       <el-form-item label="数据范围">
         <el-select v-model="form.dataScope" style="width: 145px" placeholder="请选择数据范围" @change="changeScope">
@@ -13,17 +13,18 @@
             v-for="item in dateScopes"
             :key="item"
             :label="item"
-            :value="item"/>
+            :value="item"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="角色级别" prop="sort">
-        <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;"/>
+        <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
       </el-form-item>
       <el-form-item v-if="form.dataScope === '自定义'" label="数据权限">
         <treeselect v-model="deptIds" :options="depts" multiple style="width: 380px" placeholder="请选择" />
       </el-form-item>
       <el-form-item label="描述信息">
-        <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
+        <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 09c49b9..8e530e2 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,21 +1,22 @@
 <template>
   <div class="app-container">
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd"/>
+    <eForm ref="form" :is-add="isAdd" />
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" size="small" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
         v-model="query.date"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small filter-item"
-        style="height: 30.5px;width: 220px"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
+        end-placeholder="结束日期"
+      />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
       <div v-permission="['admin','roles:add']" style="display: inline-block;margin: 0px 2px;">
@@ -24,7 +25,8 @@
           size="mini"
           type="primary"
           icon="el-icon-plus"
-          @click="add">新增</el-button>
+          @click="add"
+        >新增</el-button>
       </div>
       <!-- 导出 -->
       <div style="display: inline-block;">
@@ -34,7 +36,8 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download">导出</el-button>
+          @click="download"
+        >导出</el-button>
       </div>
     </div>
     <el-row :gutter="15">
@@ -45,11 +48,11 @@
             <span class="role-span">角色列表</span>
           </div>
           <el-table v-loading="loading" :data="data" highlight-current-row size="small" style="width: 100%;" @current-change="handleCurrentChange">
-            <el-table-column prop="name" label="名称"/>
-            <el-table-column prop="dataScope" label="数据权限"/>
-            <el-table-column prop="permission" label="角色权限"/>
-            <el-table-column prop="level" label="角色级别"/>
-            <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述"/>
+            <el-table-column prop="name" label="名称" />
+            <el-table-column prop="dataScope" label="数据权限" />
+            <el-table-column prop="permission" label="角色权限" />
+            <el-table-column prop="level" label="角色级别" />
+            <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述" />
             <el-table-column :show-overflow-tooltip="true" width="130px" prop="createTime" label="创建日期">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -57,18 +60,19 @@
             </el-table-column>
             <el-table-column v-if="checkPermission(['admin','roles:edit','roles:del'])" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
-                <el-button v-permission="['admin','roles:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+                <el-button v-permission="['admin','roles:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
                 <el-popover
-                  v-permission="['admin','roles:del']"
                   :ref="scope.row.id"
+                  v-permission="['admin','roles:del']"
                   placement="top"
-                  width="180">
+                  width="180"
+                >
                   <p>确定删除本条数据吗？</p>
                   <div style="text-align: right; margin: 0">
                     <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
                     <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
                   </div>
-                  <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+                  <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
                 </el-popover>
               </template>
             </el-table-column>
@@ -80,7 +84,8 @@
             style="margin-top: 8px;"
             layout="total, prev, pager, next, sizes"
             @size-change="sizeChange"
-            @current-change="pageChange"/>
+            @current-change="pageChange"
+          />
         </el-card>
       </el-col>
       <!-- 授权 -->
@@ -98,7 +103,8 @@
               size="mini"
               style="float: right; padding: 6px 9px"
               type="primary"
-              @click="saveMenu">保存</el-button>
+              @click="saveMenu"
+            >保存</el-button>
           </div>
           <el-tree
             ref="menu"
@@ -108,7 +114,8 @@
             check-strictly
             accordion
             show-checkbox
-            node-key="id"/>
+            node-key="id"
+          />
         </el-card>
       </el-col>
     </el-row>
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index e3d5ad8..b3d315f 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -3,17 +3,18 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
         v-model="query.date"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small filter-item"
-        style="height: 30.5px;width: 220px"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
+        end-placeholder="结束日期"
+      />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
       <div v-permission="['admin','timing:add']" style="display: inline-block;margin: 0px 2px;">
@@ -22,7 +23,8 @@
           size="mini"
           type="primary"
           icon="el-icon-plus"
-          @click="dialog = true;isAdd = true">新增</el-button>
+          @click="dialog = true;isAdd = true"
+        >新增</el-button>
       </div>
       <!-- 导出 -->
       <div style="display: inline-block;">
@@ -32,7 +34,8 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download">导出</el-button>
+          @click="download"
+        >导出</el-button>
       </div>
       <!-- 任务日志 -->
       <div style="display: inline-block;">
@@ -41,34 +44,35 @@
           size="mini"
           type="info"
           icon="el-icon-tickets"
-          @click="doLog">日志</el-button>
-        <Log ref="log"/>
+          @click="doLog"
+        >日志</el-button>
+        <Log ref="log" />
       </div>
     </div>
     <!--Form表单-->
     <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增任务' : '编辑任务'" append-to-body width="600px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="任务名称" prop="jobName">
-          <el-input v-model="form.jobName" style="width: 460px;"/>
+          <el-input v-model="form.jobName" style="width: 460px;" />
         </el-form-item>
         <el-form-item label="Bean名称" prop="beanName">
-          <el-input v-model="form.beanName" style="width: 460px;"/>
+          <el-input v-model="form.beanName" style="width: 460px;" />
         </el-form-item>
         <el-form-item label="执行方法" prop="methodName">
-          <el-input v-model="form.methodName" style="width: 460px;"/>
+          <el-input v-model="form.methodName" style="width: 460px;" />
         </el-form-item>
         <el-form-item label="参数内容">
-          <el-input v-model="form.params" style="width: 460px;"/>
+          <el-input v-model="form.params" style="width: 460px;" />
         </el-form-item>
         <el-form-item label="Cron表达式" prop="cronExpression">
-          <el-input v-model="form.cronExpression" style="width: 460px;"/>
+          <el-input v-model="form.cronExpression" style="width: 460px;" />
         </el-form-item>
         <el-form-item label="任务状态">
           <el-radio v-model="form.isPause" label="false">启用</el-radio>
-          <el-radio v-model="form.isPause" label="true" >暂停</el-radio>
+          <el-radio v-model="form.isPause" label="true">暂停</el-radio>
         </el-form-item>
         <el-form-item label="任务描述">
-          <el-input v-model="form.remark" style="width: 460px;" rows="2" type="textarea"/>
+          <el-input v-model="form.remark" style="width: 460px;" rows="2" type="textarea" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -78,17 +82,17 @@
     </el-dialog>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column :show-overflow-tooltip="true" prop="jobName" width="100px" label="任务名称"/>
-      <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称"/>
-      <el-table-column :show-overflow-tooltip="true" prop="methodName" width="90px" label="执行方法"/>
-      <el-table-column :show-overflow-tooltip="true" prop="params" width="80px" label="参数"/>
-      <el-table-column :show-overflow-tooltip="true" prop="cronExpression" width="100px" label="cron表达式"/>
+      <el-table-column :show-overflow-tooltip="true" prop="jobName" width="100px" label="任务名称" />
+      <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称" />
+      <el-table-column :show-overflow-tooltip="true" prop="methodName" width="90px" label="执行方法" />
+      <el-table-column :show-overflow-tooltip="true" prop="params" width="80px" label="参数" />
+      <el-table-column :show-overflow-tooltip="true" prop="cronExpression" width="100px" label="cron表达式" />
       <el-table-column :show-overflow-tooltip="true" prop="isPause" width="90px" label="状态">
         <template slot-scope="scope">
           <el-tag :type="scope.row.isPause ? 'warning' : 'success'">{{ scope.row.isPause ? '已暂停' : '运行中' }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述"/>
+      <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述" />
       <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -102,10 +106,11 @@
             {{ scope.row.isPause ? '恢复' : '暂停' }}
           </el-button>
           <el-popover
-            v-permission="['admin','timing:del']"
             :ref="scope.row.id"
+            v-permission="['admin','timing:del']"
             placement="top"
-            width="200">
+            width="200"
+          >
             <p>确定停止并删除该任务吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
@@ -123,7 +128,8 @@
       style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </div>
 </template>
 
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
index 56a50f2..e8b54e0 100644
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -2,19 +2,20 @@
   <el-dialog :visible.sync="dialog" append-to-body title="执行日志" width="88%">
     <!-- 搜索 -->
     <div class="head-container">
-      <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
         v-model="query.date"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small filter-item"
-        style="height: 30.5px;width: 220px"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
-      <el-select v-model="query.isSuccess" placeholder="日志状态" clearable class="filter-item" style="width: 110px" @change="toQuery">
-        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+        end-placeholder="结束日期"
+      />
+      <el-select v-model="query.isSuccess" placeholder="日志状态" clearable size="small" class="filter-item" style="width: 110px" @change="toQuery">
+        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
       </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 导出 -->
@@ -25,22 +26,23 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download">导出</el-button>
+          @click="download"
+        >导出</el-button>
       </div>
     </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;margin-top: -10px;">
-      <el-table-column :show-overflow-tooltip="true" prop="jobName" label="任务名称"/>
-      <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称"/>
-      <el-table-column :show-overflow-tooltip="true" prop="methodName" label="执行方法"/>
-      <el-table-column :show-overflow-tooltip="true" prop="params" width="120px" label="参数"/>
-      <el-table-column :show-overflow-tooltip="true" prop="cronExpression" label="cron表达式"/>
+      <el-table-column :show-overflow-tooltip="true" prop="jobName" label="任务名称" />
+      <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称" />
+      <el-table-column :show-overflow-tooltip="true" prop="methodName" label="执行方法" />
+      <el-table-column :show-overflow-tooltip="true" prop="params" width="120px" label="参数" />
+      <el-table-column :show-overflow-tooltip="true" prop="cronExpression" label="cron表达式" />
       <el-table-column prop="createTime" label="异常详情" width="110px">
         <template slot-scope="scope">
           <el-button v-show="scope.row.exceptionDetail" size="mini" type="text" @click="info(scope.row.exceptionDetail)">查看详情</el-button>
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" align="center" prop="time" width="100px" label="耗时(毫秒)"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" prop="time" width="100px" label="耗时(毫秒)" />
       <el-table-column align="center" prop="isSuccess" width="80px" label="状态">
         <template slot-scope="scope">
           <el-tag :type="scope.row.isSuccess ? 'success' : 'danger'">{{ scope.row.isSuccess ? '成功' : '失败' }}</el-tag>
@@ -65,7 +67,8 @@
       style="margin-top:8px;"
       layout="total, prev, pager, next"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </el-dialog>
 </template>
 
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index 4bb0c9c..d93f2eb 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -14,7 +14,8 @@
                 :on-error="handleError"
                 :headers="headers"
                 :action="updateAvatarApi"
-                class="avatar-uploader">
+                class="avatar-uploader"
+              >
                 <img :src="user.avatar ? baseApi + '/avatar/' + user.avatar : Avatar" title="点击上传头像" class="avatar">
               </el-upload>
             </div>
@@ -39,14 +40,14 @@
         <el-card class="box-card">
           <div slot="header" class="clearfix">
             <span>操作日志</span>
-            <div style="display:inline-block;float: right;cursor: pointer" @click="refresh"><i :class="ico"/></div>
+            <div style="display:inline-block;float: right;cursor: pointer" @click="refresh"><i :class="ico" /></div>
           </div>
           <div>
             <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-              <el-table-column prop="description" label="行为"/>
-              <el-table-column prop="requestIp" label="IP"/>
-              <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
-              <el-table-column prop="browser" label="浏览器"/>
+              <el-table-column prop="description" label="行为" />
+              <el-table-column prop="requestIp" label="IP" />
+              <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
+              <el-table-column prop="browser" label="浏览器" />
               <el-table-column prop="time" label="请求耗时" align="center">
                 <template slot-scope="scope">
                   <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
@@ -67,13 +68,14 @@
               style="margin-top: 8px;"
               layout="total, prev, pager, next, sizes"
               @size-change="sizeChange"
-              @current-change="pageChange"/>
+              @current-change="pageChange"
+            />
           </div>
         </el-card>
       </el-col>
     </el-row>
-    <updateEmail ref="email" :email="user.email"/>
-    <updatePass ref="pass"/>
+    <updateEmail ref="email" :email="user.email" />
+    <updatePass ref="pass" />
   </div>
 </template>
 
@@ -86,7 +88,7 @@ import { getToken } from '@/utils/auth'
 import store from '@/store'
 import { parseTime } from '@/utils/index'
 import initData from '@/mixins/initData'
-import Avatar from '@/assets/avatar/avatar.png'
+import Avatar from '@/assets/images/avatar.png'
 export default {
   name: 'Center',
   components: { updatePass, updateEmail },
diff --git a/src/views/system/user/center/updateEmail.vue b/src/views/system/user/center/updateEmail.vue
index 1e373a0..d571be0 100644
--- a/src/views/system/user/center/updateEmail.vue
+++ b/src/views/system/user/center/updateEmail.vue
@@ -3,14 +3,14 @@
     <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="title" append-to-body width="475px" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
         <el-form-item label="新邮箱" prop="email">
-          <el-input v-model="form.email" auto-complete="on" style="width: 200px;"/>
+          <el-input v-model="form.email" auto-complete="on" style="width: 200px;" />
           <el-button :loading="codeLoading" :disabled="isDisabled" size="small" @click="sendCode">{{ buttonName }}</el-button>
         </el-form-item>
         <el-form-item label="验证码" prop="code">
-          <el-input v-model="form.code" style="width: 320px;"/>
+          <el-input v-model="form.code" style="width: 320px;" />
         </el-form-item>
         <el-form-item label="当前密码" prop="pass">
-          <el-input v-model="form.pass" type="password" style="width: 320px;"/>
+          <el-input v-model="form.pass" type="password" style="width: 320px;" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/src/views/system/user/center/updatePass.vue b/src/views/system/user/center/updatePass.vue
index d040092..a98edd5 100644
--- a/src/views/system/user/center/updatePass.vue
+++ b/src/views/system/user/center/updatePass.vue
@@ -3,13 +3,13 @@
     <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="title" append-to-body width="500px" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
         <el-form-item label="旧密码" prop="oldPass">
-          <el-input v-model="form.oldPass" type="password" auto-complete="on" style="width: 370px;"/>
+          <el-input v-model="form.oldPass" type="password" auto-complete="on" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="新密码" prop="newPass">
-          <el-input v-model="form.newPass" type="password" auto-complete="on" style="width: 370px;"/>
+          <el-input v-model="form.newPass" type="password" auto-complete="on" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="确认密码" prop="confirmPass">
-          <el-input v-model="form.confirmPass" type="password" auto-complete="on" style="width: 370px;"/>
+          <el-input v-model="form.confirmPass" type="password" auto-complete="on" style="width: 370px;" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/src/views/system/user/form.vue b/src/views/system/user/form.vue
index 52eb213..8b6e692 100644
--- a/src/views/system/user/form.vue
+++ b/src/views/system/user/form.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增用户' : '编辑用户'" append-to-body width="570px">
     <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
       <el-form-item label="用户名" prop="username">
-        <el-input v-model="form.username"/>
+        <el-input v-model="form.username" />
       </el-form-item>
       <el-form-item label="状态" prop="enabled">
         <el-radio v-for="item in dicts" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
@@ -22,17 +22,19 @@
             v-for="(item, index) in jobs"
             :key="item.name + index"
             :label="item.name"
-            :value="item.id"/>
+            :value="item.id"
+          />
         </el-select>
       </el-form-item>
       <el-form-item style="margin-bottom: 0px;" label="角色">
         <el-select v-model="roleIds" style="width: 450px;" multiple placeholder="请选择">
           <el-option
             v-for="(item, index) in roles"
-            :disabled="level !== 1 && item.level <= level"
             :key="item.name + index"
+            :disabled="level !== 1 && item.level <= level"
             :label="item.name"
-            :value="item.id"/>
+            :value="item.id"
+          />
         </el-select>
       </el-form-item>
     </el-form>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index aac73fa..eb7483e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,33 +1,34 @@
 <template>
   <div class="app-container">
     <!--form 组件-->
-    <eForm ref="form" :is-add="isAdd" :dicts="dict.user_status"/>
+    <eForm ref="form" :is-add="isAdd" :dicts="dict.user_status" />
     <el-row :gutter="20">
       <!--部门数据-->
       <el-col :xs="9" :sm="6" :md="4" :lg="4" :xl="4">
         <div class="head-container">
-          <el-input v-model="deptName" clearable placeholder="输入部门名称搜索" prefix-icon="el-icon-search" style="width: 100%;" class="filter-item" @input="getDeptDatas"/>
+          <el-input v-model="deptName" clearable size="small" placeholder="输入部门名称搜索" prefix-icon="el-icon-search" class="filter-item" @input="getDeptDatas" />
         </div>
-        <el-tree :data="depts" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick"/>
+        <el-tree :data="depts" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick" />
       </el-col>
       <!--用户数据-->
       <el-col :xs="15" :sm="18" :md="20" :lg="20" :xl="20">
         <!--工具栏-->
         <div class="head-container">
           <!-- 搜索 -->
-          <el-input v-model="query.blurry" clearable placeholder="输入名称或者邮箱搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+          <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者邮箱搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
           <el-date-picker
             v-model="query.date"
             :default-time="['00:00:00','23:59:59']"
             type="daterange"
             range-separator=":"
-            class="el-range-editor--small filter-item"
-            style="height: 30.5px;width: 220px"
+            class="el-range-editor--small date-item"
+            style="width: 220px;height: 30.5px"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
-            end-placeholder="结束日期"/>
-          <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
-            <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+            end-placeholder="结束日期"
+          />
+          <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
+            <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
           </el-select>
           <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
           <!-- 新增 -->
@@ -37,7 +38,8 @@
               size="mini"
               type="primary"
               icon="el-icon-plus"
-              @click="add">新增</el-button>
+              @click="add"
+            >新增</el-button>
           </div>
           <!-- 导出 -->
           <div style="display: inline-block;">
@@ -47,14 +49,15 @@
               class="filter-item"
               type="warning"
               icon="el-icon-download"
-              @click="download">导出</el-button>
+              @click="download"
+            >导出</el-button>
           </div>
         </div>
         <!--表格渲染-->
         <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-          <el-table-column prop="username" label="用户名"/>
-          <el-table-column prop="phone" label="电话"/>
-          <el-table-column :show-overflow-tooltip="true" prop="email" label="邮箱"/>
+          <el-table-column prop="username" label="用户名" />
+          <el-table-column prop="phone" label="电话" />
+          <el-table-column :show-overflow-tooltip="true" prop="email" label="邮箱" />
           <el-table-column label="部门 / 岗位">
             <template slot-scope="scope">
               <div>{{ scope.row.dept.name }} / {{ scope.row.job.name }}</div>
@@ -66,7 +69,8 @@
                 v-model="scope.row.enabled"
                 active-color="#409EFF"
                 inactive-color="#F56C6C"
-                @change="changeEnabled(scope.row, scope.row.enabled,)"/>
+                @change="changeEnabled(scope.row, scope.row.enabled,)"
+              />
             </template>
           </el-table-column>
           <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
@@ -76,18 +80,19 @@
           </el-table-column>
           <el-table-column v-if="checkPermission(['admin','user:edit','user:del'])" label="操作" width="125" align="center" fixed="right">
             <template slot-scope="scope">
-              <el-button v-permission="['admin','user:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+              <el-button v-permission="['admin','user:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
               <el-popover
-                v-permission="['admin','user:del']"
                 :ref="scope.row.id"
+                v-permission="['admin','user:del']"
                 placement="top"
-                width="180">
+                width="180"
+              >
                 <p>确定删除本条数据吗？</p>
                 <div style="text-align: right; margin: 0">
                   <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
                   <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
                 </div>
-                <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+                <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
               </el-popover>
             </template>
           </el-table-column>
@@ -99,7 +104,8 @@
           style="margin-top: 8px;"
           layout="total, prev, pager, next, sizes"
           @size-change="sizeChange"
-          @current-change="pageChange"/>
+          @current-change="pageChange"
+        />
       </el-col>
     </el-row>
   </div>
diff --git a/src/views/tools/aliPay/config.vue b/src/views/tools/aliPay/config.vue
index acefd0e..ecc8459 100644
--- a/src/views/tools/aliPay/config.vue
+++ b/src/views/tools/aliPay/config.vue
@@ -1,27 +1,27 @@
 <template>
   <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="100px">
     <el-form-item label="appID" prop="appID">
-      <el-input v-model="form.appID" style="width: 40%"/>
+      <el-input v-model="form.appID" style="width: 40%" />
       <span style="color: #C0C0C0;margin-left: 10px;">应用APPID,收款账号既是APPID对应支付宝账号</span>
     </el-form-item>
     <el-form-item label="商家账号" prop="sysServiceProviderId">
-      <el-input v-model="form.sysServiceProviderId" style="width: 40%;"/>
+      <el-input v-model="form.sysServiceProviderId" style="width: 40%;" />
       <span style="color: #C0C0C0;margin-left: 10px;">商家账号</span>
     </el-form-item>
     <el-form-item label="商户私钥" prop="privateKey">
-      <el-input v-model="form.privateKey" type="password" style="width: 40%;"/>
+      <el-input v-model="form.privateKey" type="password" style="width: 40%;" />
       <span style="color: #C0C0C0;margin-left: 10px;">商户私钥，你的PKCS8格式RSA2私钥</span>
     </el-form-item>
     <el-form-item label="支付宝公钥" prop="publicKey">
-      <el-input v-model="form.publicKey" type="password" style="width: 40%;"/>
+      <el-input v-model="form.publicKey" type="password" style="width: 40%;" />
       <span style="color: #C0C0C0;margin-left: 10px;">支付宝公钥</span>
     </el-form-item>
     <el-form-item label="回调地址" prop="returnUrl">
-      <el-input v-model="form.returnUrl" style="width: 40%;"/>
+      <el-input v-model="form.returnUrl" style="width: 40%;" />
       <span style="color: #C0C0C0;margin-left: 10px;">订单完成后返回的地址</span>
     </el-form-item>
     <el-form-item label="异步通知" prop="notifyUrl">
-      <el-input v-model="form.notifyUrl" style="width: 40%;"/>
+      <el-input v-model="form.notifyUrl" style="width: 40%;" />
       <span style="color: #C0C0C0;margin-left: 10px;">支付结果异步通知地址</span>
     </el-form-item>
     <el-form-item label="">
diff --git a/src/views/tools/aliPay/index.vue b/src/views/tools/aliPay/index.vue
index e346585..5234929 100644
--- a/src/views/tools/aliPay/index.vue
+++ b/src/views/tools/aliPay/index.vue
@@ -1,10 +1,10 @@
 <template>
   <el-tabs v-model="activeName" style="padding-left: 5px;">
     <el-tab-pane label="参数配置" name="first">
-      <Config/>
+      <Config />
     </el-tab-pane>
     <el-tab-pane label="支付测试" name="second">
-      <ToPay/>
+      <ToPay />
     </el-tab-pane>
     <el-tab-pane label="使用说明" name="third">
       <div>
@@ -33,7 +33,6 @@ if (/(Android)/i.test(navigator.userAgent)){     // 判断是否为Android手机
 <script>
 import Config from './config'
 import ToPay from './toPay'
-import '@/styles/description.scss'
 export default {
   name: 'AliPay',
   components: { Config, ToPay },
diff --git a/src/views/tools/aliPay/toPay.vue b/src/views/tools/aliPay/toPay.vue
index 6e51719..e65bf38 100644
--- a/src/views/tools/aliPay/toPay.vue
+++ b/src/views/tools/aliPay/toPay.vue
@@ -2,14 +2,14 @@
   <div>
     <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="90px">
       <el-form-item label="商品名称" prop="subject">
-        <el-input v-model="form.subject" style="width: 35%"/>
+        <el-input v-model="form.subject" style="width: 35%" />
       </el-form-item>
       <el-form-item label="商品价格" prop="totalAmount">
-        <el-input v-model="form.totalAmount" style="width: 35%"/>
+        <el-input v-model="form.totalAmount" style="width: 35%" />
         <span style="color: #C0C0C0;margin-left: 10px;">测试允许区间(0,5000]</span>
       </el-form-item>
       <el-form-item label="商品描述" prop="body">
-        <el-input v-model="form.body" style="width: 35%" rows="8" type="textarea"/>
+        <el-input v-model="form.body" style="width: 35%" rows="8" type="textarea" />
       </el-form-item>
       <el-form-item label="">
         <el-button :loading="loading" size="medium" type="primary" @click="doSubmit">去支付</el-button>
diff --git a/src/views/tools/email/config.vue b/src/views/tools/email/config.vue
index 2b8dd7c..e30fabc 100644
--- a/src/views/tools/email/config.vue
+++ b/src/views/tools/email/config.vue
@@ -1,23 +1,23 @@
 <template>
   <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="100px">
     <el-form-item label="发件人邮箱" prop="fromUser">
-      <el-input v-model="form.fromUser" style="width: 40%"/>
+      <el-input v-model="form.fromUser" style="width: 40%" />
       <span style="color: #C0C0C0;margin-left: 10px;">Sender mailbox</span>
     </el-form-item>
     <el-form-item label="发件用户名" prop="user">
-      <el-input v-model="form.user" style="width: 40%;"/>
+      <el-input v-model="form.user" style="width: 40%;" />
       <span style="color: #C0C0C0;margin-left: 10px;">Sender usernamex</span>
     </el-form-item>
     <el-form-item label="邮箱密码" prop="pass">
-      <el-input v-model="form.pass" type="password" style="width: 40%;"/>
+      <el-input v-model="form.pass" type="password" style="width: 40%;" />
       <span style="color: #C0C0C0;margin-left: 10px;">email Password</span>
     </el-form-item>
     <el-form-item label="SMTP地址" prop="host">
-      <el-input v-model="form.host" style="width: 40%;"/>
+      <el-input v-model="form.host" style="width: 40%;" />
       <span style="color: #C0C0C0;margin-left: 10px;">SMTP address</span>
     </el-form-item>
     <el-form-item label="SMTP端口" prop="port">
-      <el-input v-model="form.port" style="width: 40%;"/>
+      <el-input v-model="form.port" style="width: 40%;" />
       <span style="color: #C0C0C0;margin-left: 10px;">SMTP port</span>
     </el-form-item>
     <el-form-item label="">
diff --git a/src/views/tools/email/index.vue b/src/views/tools/email/index.vue
index 3809ce4..89cf0c7 100644
--- a/src/views/tools/email/index.vue
+++ b/src/views/tools/email/index.vue
@@ -1,10 +1,10 @@
 <template>
   <el-tabs v-model="activeName" style="padding-left: 5px;">
     <el-tab-pane label="邮箱配置" name="first">
-      <Config/>
+      <Config />
     </el-tab-pane>
     <el-tab-pane label="发送邮件" name="second">
-      <Send/>
+      <Send />
     </el-tab-pane>
     <el-tab-pane label="使用说明" name="third">
       <div>
@@ -26,7 +26,6 @@
 <script>
 import Config from './config'
 import Send from './send'
-import '@/styles/description.scss'
 export default {
   name: 'Email',
   components: { Config, Send },
diff --git a/src/views/tools/email/send.vue b/src/views/tools/email/send.vue
index 4d29260..bc40b41 100644
--- a/src/views/tools/email/send.vue
+++ b/src/views/tools/email/send.vue
@@ -2,17 +2,18 @@
   <div>
     <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="100px">
       <el-form-item label="邮件标题" prop="subject">
-        <el-input v-model="form.subject" style="width: 40%"/>
+        <el-input v-model="form.subject" style="width: 40%" />
       </el-form-item>
       <el-form-item
         v-for="(domain, index) in tos"
+        :key="domain.key"
         :label="'收件邮箱' + (index === 0 ? '': index)"
-        :key="domain.key">
-        <el-input v-model="domain.value" style="width: 31%"/>
+      >
+        <el-input v-model="domain.value" style="width: 31%" />
         <el-button icon="el-icon-plus" @click="addDomain" />
-        <el-button style="margin-left:0px;" icon="el-icon-minus" @click.prevent="removeDomain(domain)"/>
+        <el-button style="margin-left:0px;" icon="el-icon-minus" @click.prevent="removeDomain(domain)" />
       </el-form-item>
-      <div ref="editor" class="editor"/>
+      <div ref="editor" class="editor" />
       <el-button :loading="loading" style="margin-left:1.6%;" size="medium" type="primary" @click="doSubmit">发送邮件</el-button>
     </el-form>
   </div>
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index bbd2631..a65a23d 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -3,17 +3,18 @@
     <!--工具栏-->
     <div class="head-container">
       <!--搜索-->
-      <el-input v-model="query.filename" clearable placeholder="输入文件名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.filename" clearable size="small" placeholder="输入文件名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
         v-model="query.date"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small filter-item"
-        style="height: 30.5px;width: 220px"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
+        end-placeholder="结束日期"
+      />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 上传 -->
       <div style="display: inline-block;margin: 0px 2px;">
@@ -23,7 +24,8 @@
           size="mini"
           type="primary"
           icon="el-icon-upload"
-          @click="dialog = true">上传图片</el-button>
+          @click="dialog = true"
+        >上传图片</el-button>
       </div>
       <div v-permission="['admin','pictures:del']" style="display: inline-block;">
         <el-button
@@ -33,7 +35,8 @@
           size="mini"
           type="danger"
           icon="el-icon-delete"
-          @click="open">删除</el-button>
+          @click="open"
+        >删除</el-button>
       </div>
       <!-- 导出 -->
       <div style="display: inline-block;">
@@ -43,7 +46,8 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download">导出</el-button>
+          @click="download"
+        >导出</el-button>
       </div>
     </div>
     <!--上传图片-->
@@ -56,8 +60,9 @@
         :headers="headers"
         :file-list="fileList"
         :action="imagesUploadApi"
-        list-type="picture-card">
-        <i class="el-icon-plus"/>
+        list-type="picture-card"
+      >
+        <i class="el-icon-plus" />
       </el-upload>
       <el-dialog :append-to-body="true" :visible.sync="dialogVisible">
         <img :src="dialogImageUrl" width="100%" alt="">
@@ -67,18 +72,18 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" ref="table" :data="data" size="small" style="width: 100%;">
-      <el-table-column type="selection" width="55"/>
-      <el-table-column prop="filename" label="文件名"/>
-      <el-table-column prop="username" label="上传者"/>
+    <el-table ref="table" v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="filename" label="文件名" />
+      <el-table-column prop="username" label="上传者" />
       <el-table-column ref="table" :show-overflow-tooltip="true" prop="url" label="缩略图">
         <template slot-scope="scope">
           <a :href="scope.row.url" style="color: #42b983" target="_blank"><img :src="scope.row.url" alt="点击打开" class="el-avatar"></a>
         </template>
       </el-table-column>
-      <el-table-column prop="size" label="文件大小"/>
-      <el-table-column prop="height" label="高度"/>
-      <el-table-column prop="width" label="宽度"/>
+      <el-table-column prop="size" label="文件大小" />
+      <el-table-column prop="height" label="高度" />
+      <el-table-column prop="width" label="宽度" />
       <el-table-column width="180px" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -89,13 +94,14 @@
           <el-popover
             :ref="scope.row.id"
             placement="top"
-            width="180">
+            width="180"
+          >
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
               <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
             </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
         </template>
       </el-table-column>
@@ -107,7 +113,8 @@
       style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </div>
 </template>
 
diff --git a/src/views/tools/storage/index.vue b/src/views/tools/storage/index.vue
index eb1c4b1..b528bf4 100644
--- a/src/views/tools/storage/index.vue
+++ b/src/views/tools/storage/index.vue
@@ -1,10 +1,10 @@
 <template>
   <el-tabs v-model="activeName" style="padding-left: 8px;" @tab-click="tabClick">
     <el-tab-pane label="本地存储" name="first">
-      <Local ref="local"/>
+      <Local ref="local" />
     </el-tab-pane>
     <el-tab-pane label="七牛云存储" name="second">
-      <QiNiu ref="qiNiu"/>
+      <QiNiu ref="qiNiu" />
     </el-tab-pane>
   </el-tabs>
 </template>
@@ -12,7 +12,6 @@
 <script>
 import QiNiu from './qiniu/index'
 import Local from './local/index'
-import '@/styles/description.scss'
 export default {
   name: 'Storage',
   components: { QiNiu, Local },
diff --git a/src/views/tools/storage/local/form.vue b/src/views/tools/storage/local/form.vue
index 1e65c23..1c24f41 100644
--- a/src/views/tools/storage/local/form.vue
+++ b/src/views/tools/storage/local/form.vue
@@ -1,8 +1,8 @@
 <template>
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '上传文件' : '编辑文件'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="文件名" >
-        <el-input v-model="form.name" style="width: 370px;"/>
+      <el-form-item label="文件名">
+        <el-input v-model="form.name" style="width: 370px;" />
       </el-form-item>
       <!--   上传文件   -->
       <el-form-item v-if="isAdd" label="上传">
@@ -14,8 +14,9 @@
           :headers="headers"
           :on-success="handleSuccess"
           :on-error="handleError"
-          :action="fileUploadApi + '?name=' + form.name">
-          <div class="eladmin-upload"><i class="el-icon-upload"/> 添加文件</div>
+          :action="fileUploadApi + '?name=' + form.name"
+        >
+          <div class="eladmin-upload"><i class="el-icon-upload" /> 添加文件</div>
           <div slot="tip" class="el-upload__tip">可上传任意格式文件，且不超过100M</div>
         </el-upload>
       </el-form-item>
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index 8d65a08..920e09c 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -3,17 +3,18 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable size="small" placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
         v-model="query.date"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small filter-item"
-        style="height: 30.5px;width: 220px"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
+        end-placeholder="结束日期"
+      />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
       <div style="display: inline-block;margin: 0px 2px;">
@@ -23,7 +24,8 @@
           size="mini"
           type="primary"
           icon="el-icon-upload"
-          @click="add">文件上传
+          @click="add"
+        >文件上传
         </el-button>
       </div>
       <!-- 多选删除 -->
@@ -36,7 +38,8 @@
           size="mini"
           type="danger"
           icon="el-icon-delete"
-          @click="open">删除
+          @click="open"
+        >删除
         </el-button>
       </div>
       <!-- 导出 -->
@@ -47,14 +50,15 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download">导出</el-button>
+          @click="download"
+        >导出</el-button>
       </div>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd"/>
+    <eForm ref="form" :is-add="isAdd" />
     <!--表格渲染-->
-    <el-table v-loading="loading" ref="table" :data="data" size="small" style="width: 100%;">
-      <el-table-column type="selection" width="55"/>
+    <el-table ref="table" v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column type="selection" width="55" />
       <el-table-column prop="name" width="150px" label="文件名">
         <template slot-scope="scope">
           <el-popover
@@ -62,13 +66,15 @@
             placement="top-start"
             title="路径"
             width="200"
-            trigger="hover">
+            trigger="hover"
+          >
             <a
               slot="reference"
               :href="baseApi + '/file/' + scope.row.type + '/' + scope.row.realName"
               class="el-link--primary"
               style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;"
-              target="_blank">
+              target="_blank"
+            >
               {{ scope.row.name }}
             </a>
           </el-popover>
@@ -81,17 +87,18 @@
             :preview-src-list="[baseApi + '/file/' + row.type + '/' + row.realName]"
             fit="contain"
             lazy
-            class="el-avatar">
+            class="el-avatar"
+          >
             <div slot="error">
-              <i class="el-icon-document"/>
+              <i class="el-icon-document" />
             </div>
           </el-image>
         </template>
       </el-table-column>
-      <el-table-column prop="suffix" label="文件类型"/>
-      <el-table-column prop="type" label="类别"/>
-      <el-table-column prop="size" label="大小"/>
-      <el-table-column prop="operate" label="操作人"/>
+      <el-table-column prop="suffix" label="文件类型" />
+      <el-table-column prop="type" label="类别" />
+      <el-table-column prop="size" label="大小" />
+      <el-table-column prop="operate" label="操作人" />
       <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -99,19 +106,20 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','storage:edit','storage:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','storage:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-button v-permission="['admin','storage:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
           <el-popover
-            v-permission="['admin','storage:del']"
             :ref="scope.row.id"
+            v-permission="['admin','storage:del']"
             placement="top"
-            width="180">
+            width="180"
+          >
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
               <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定
               </el-button>
             </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
         </template>
       </el-table-column>
@@ -123,7 +131,8 @@
       style="margin-top: 8px;"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
-      @current-change="pageChange"/>
+      @current-change="pageChange"
+    />
   </div>
 </template>
 
@@ -253,7 +262,4 @@ export default {
   /deep/ .el-image__error, .el-image__placeholder{
     background: none;
   }
-  /deep/ .el-image-viewer__wrapper{
-    top: 55px;
-  }
 </style>
diff --git a/src/views/tools/storage/qiniu/form.vue b/src/views/tools/storage/qiniu/form.vue
index 38cd650..5540732 100644
--- a/src/views/tools/storage/qiniu/form.vue
+++ b/src/views/tools/storage/qiniu/form.vue
@@ -3,16 +3,16 @@
   <el-dialog :visible.sync="dialog" :close-on-click-modal="false" title="七牛云配置" append-to-body width="580px">
     <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="110px">
       <el-form-item label="Access Key" prop="accessKey">
-        <el-input v-model="form.accessKey" style="width: 95%" placeholder="accessKey，在安全中心，秘钥管理中查看"/>
+        <el-input v-model="form.accessKey" style="width: 95%" placeholder="accessKey，在安全中心，秘钥管理中查看" />
       </el-form-item>
       <el-form-item label="Secret Key" prop="secretKey">
-        <el-input v-model="form.secretKey" type="password" style="width: 95%;" placeholder="secretKey，在安全中心，秘钥管理中查看"/>
+        <el-input v-model="form.secretKey" type="password" style="width: 95%;" placeholder="secretKey，在安全中心，秘钥管理中查看" />
       </el-form-item>
       <el-form-item label="空间名称" prop="bucket">
-        <el-input v-model="form.bucket" style="width: 95%;" placeholder="存储空间名称作为唯一的 Bucket 识别符"/>
+        <el-input v-model="form.bucket" style="width: 95%;" placeholder="存储空间名称作为唯一的 Bucket 识别符" />
       </el-form-item>
       <el-form-item label="外链域名" prop="host">
-        <el-input v-model="form.host" style="width: 95%;" placeholder = "外链域名，可自定义，需在七牛云绑定"/>
+        <el-input v-model="form.host" style="width: 95%;" placeholder="外链域名，可自定义，需在七牛云绑定" />
       </el-form-item>
       <el-form-item label="存储区域" prop="port">
         <el-select v-model="form.zone" placeholder="请选择存储区域">
@@ -20,12 +20,13 @@
             v-for="item in zones"
             :key="item"
             :label="item"
-            :value="item"/>
+            :value="item"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="空间类型" prop="host">
         <el-radio v-model="form.type" label="公开">公开</el-radio>
-        <el-radio v-model="form.type" label="私有" >私有</el-radio>
+        <el-radio v-model="form.type" label="私有">私有</el-radio>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
diff --git a/src/views/tools/storage/qiniu/index.vue b/src/views/tools/storage/qiniu/index.vue
index a32d39f..61d8d5f 100644
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -1,21 +1,22 @@
 <template>
   <div class="app-container" style="padding: 8px;">
     <!--表单组件-->
-    <eForm ref="form"/>
+    <eForm ref="form" />
     <!-- 工具栏 -->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable size="small" placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
         v-model="query.date"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small filter-item"
-        style="height: 30.5px;width: 220px"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
+        end-placeholder="结束日期"
+      />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 上传 -->
       <div style="display: inline-block;margin: 0px 2px;">
@@ -30,7 +31,8 @@
           size="mini"
           type="success"
           icon="el-icon-s-tools"
-          @click="doConfig">七牛配置</el-button>
+          @click="doConfig"
+        >七牛配置</el-button>
       </div>
       <!-- 多选删除 -->
       <div style="display: inline-block;margin: 0px 2px;">
@@ -41,7 +43,8 @@
           size="mini"
           type="danger"
           icon="el-icon-delete"
-          @click="open">删除</el-button>
+          @click="open"
+        >删除</el-button>
       </div>
       <!-- 导出 -->
       <div style="display: inline-block;">
@@ -51,7 +54,8 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="downloadList">导出</el-button>
+          @click="downloadList"
+        >导出</el-button>
       </div>
       <!-- 文件上传 -->
       <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="500px" @close="doSubmit">
@@ -63,7 +67,8 @@
           :headers="headers"
           :action="qiNiuUploadApi"
           class="upload-demo"
-          multiple>
+          multiple
+        >
           <el-button size="small" type="primary">点击上传</el-button>
           <div slot="tip" style="display: block;" class="el-upload__tip">请勿上传违法文件，且文件不超过15M</div>
         </el-upload>
@@ -72,17 +77,17 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table v-loading="loading" ref="table" :data="data" size="small" style="width: 100%;">
-        <el-table-column type="selection" width="55"/>
+      <el-table ref="table" v-loading="loading" :data="data" size="small" style="width: 100%;">
+        <el-table-column type="selection" width="55" />
         <el-table-column :show-overflow-tooltip="true" label="文件名">
           <template slot-scope="scope">
             <a href="JavaScript:;" class="el-link el-link--primary" target="_blank" type="primary" @click="download(scope.row.id)">{{ scope.row.key }}</a>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="suffix" label="文件类型"/>
-        <el-table-column prop="bucket" label="空间名称"/>
-        <el-table-column prop="size" label="文件大小"/>
-        <el-table-column prop="type" label="空间类型"/>
+        <el-table-column :show-overflow-tooltip="true" prop="suffix" label="文件类型" />
+        <el-table-column prop="bucket" label="空间名称" />
+        <el-table-column prop="size" label="文件大小" />
+        <el-table-column prop="type" label="空间类型" />
         <el-table-column width="180px" prop="updateTime" label="创建日期">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.updateTime) }}</span>
@@ -93,13 +98,14 @@
             <el-popover
               :ref="scope.row.id"
               placement="top"
-              width="180">
+              width="180"
+            >
               <p>确定删除本条数据吗？</p>
               <div style="text-align: right; margin: 0">
                 <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
                 <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
               </div>
-              <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+              <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
             </el-popover>
           </template>
         </el-table-column>
@@ -111,7 +117,8 @@
         style="margin-top: 8px;"
         layout="total, prev, pager, next, sizes"
         @size-change="sizeChange"
-        @current-change="pageChange"/>
+        @current-change="pageChange"
+      />
     </div>
   </div>
 </template>
diff --git a/src/views/tools/swagger/index.vue b/src/views/tools/swagger/index.vue
index 929cf51..5162cd9 100644
--- a/src/views/tools/swagger/index.vue
+++ b/src/views/tools/swagger/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <elFrame :src="swaggerApi"/>
+  <elFrame :src="swaggerApi" />
 </template>
 <script>
 import { mapGetters } from 'vuex'
diff --git a/static/.gitkeep b/static/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/vue.config.js b/vue.config.js
new file mode 100644
index 0000000..a10f875
--- /dev/null
+++ b/vue.config.js
@@ -0,0 +1,130 @@
+'use strict'
+const path = require('path')
+const defaultSettings = require('./src/settings.js')
+
+function resolve(dir) {
+  return path.join(__dirname, dir)
+}
+
+const name = defaultSettings.title // 网址标题
+const port = 8013 // 端口配置
+
+// All configuration item explanations can be find in https://cli.vuejs.org/config/
+module.exports = {
+  publicPath: '/',
+  outputDir: 'dist',
+  assetsDir: 'static',
+  lintOnSave: process.env.NODE_ENV === 'development',
+  productionSourceMap: false,
+  devServer: {
+    port: port,
+    open: true,
+    overlay: {
+      warnings: false,
+      errors: true
+    },
+    proxy: {
+      '/api': {
+        target: process.env.VUE_APP_BASE_API,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/api': 'api'
+        }
+      },
+      '/auth': {
+        target: process.env.VUE_APP_BASE_API,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/auth': 'auth'
+        }
+      }
+    }
+  },
+  configureWebpack: {
+    // provide the app's title in webpack's name field, so that
+    // it can be accessed in index.html to inject the correct title.
+    name: name,
+    resolve: {
+      alias: {
+        '@': resolve('src')
+      }
+    }
+  },
+  chainWebpack(config) {
+    config.plugins.delete('preload') // TODO: need test
+    config.plugins.delete('prefetch') // TODO: need test
+
+    // set svg-sprite-loader
+    config.module
+      .rule('svg')
+      .exclude.add(resolve('src/assets/icons'))
+      .end()
+    config.module
+      .rule('icons')
+      .test(/\.svg$/)
+      .include.add(resolve('src/assets/icons'))
+      .end()
+      .use('svg-sprite-loader')
+      .loader('svg-sprite-loader')
+      .options({
+        symbolId: 'icon-[name]'
+      })
+      .end()
+
+    // set preserveWhitespace
+    config.module
+      .rule('vue')
+      .use('vue-loader')
+      .loader('vue-loader')
+      .tap(options => {
+        options.compilerOptions.preserveWhitespace = true
+        return options
+      })
+      .end()
+
+    config
+      // https://webpack.js.org/configuration/devtool/#development
+      .when(process.env.NODE_ENV === 'development',
+        config => config.devtool('cheap-source-map')
+      )
+
+    config
+      .when(process.env.NODE_ENV !== 'development',
+        config => {
+          config
+            .plugin('ScriptExtHtmlWebpackPlugin')
+            .after('html')
+            .use('script-ext-html-webpack-plugin', [{
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+              inline: /runtime\..*\.js$/
+            }])
+            .end()
+          config
+            .optimization.splitChunks({
+              chunks: 'all',
+              cacheGroups: {
+                libs: {
+                  name: 'chunk-libs',
+                  test: /[\\/]node_modules[\\/]/,
+                  priority: 10,
+                  chunks: 'initial' // only package third parties that are initially dependent
+                },
+                elementUI: {
+                  name: 'chunk-elementUI', // split elementUI into a single package
+                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+                },
+                commons: {
+                  name: 'chunk-commons',
+                  test: resolve('src/components'), // can customize your rules
+                  minChunks: 3, //  minimum common number
+                  priority: 5,
+                  reuseExistingChunk: true
+                }
+              }
+            })
+          config.optimization.runtimeChunk('single')
+        }
+      )
+  }
+}

From e917b1f91c8c33bf09bac20cea363fa9609f79cb Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Wed, 20 Nov 2019 21:17:01 +0800
Subject: [PATCH 14/64] update

---
 package.json | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 39b17ac..c4f33cc 100644
--- a/package.json
+++ b/package.json
@@ -17,27 +17,30 @@
     "url": "https://github.com/elunez/eladmin-qd"
   },
   "dependencies": {
-    "@riophae/vue-treeselect": "0.0.38",
-    "axios": "^0.19.0",
-    "clipboard": "1.7.1",
-    "codemirror": "^5.38.0",
-    "connect": "3.6.6",
-    "echarts": "^4.1.0",
-    "echarts-gl": "^1.1.1",
-    "element-ui": "^2.12.0",
-    "file-saver": "1.3.8",
+    "clipboard": "2.0.4",
+    "@riophae/vue-treeselect": "0.1.0",
+    "vue-cropper": "0.4.9",
+    "axios": "0.18.1",
+    "echarts": "4.2.1",
+    "fuse.js": "3.4.4",
     "js-cookie": "2.2.0",
-    "jsencrypt": "^3.0.0-rc.1",
-    "jszip": "3.1.5",
-    "mavon-editor": "^2.7.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
-    "screenfull": "3.3.3",
-    "vue": "2.5.17",
+    "screenfull": "4.2.0",
+    "vue": "2.6.10",
     "vue-count-to": "1.0.13",
-    "vue-router": "3.1.3",
-    "vuex": "3.0.1",
+    "vue-router": "3.0.2",
+    "vue-splitpane": "1.0.4",
+    "vuex": "3.1.0",
+    "codemirror": "^5.38.0",
+    "connect": "3.6.6",
+    "echarts-gl": "^1.1.1",
+    "element-ui": "^2.12.0",
+    "file-saver": "1.3.8",
+    "jsencrypt": "^3.0.0-rc.1",
+    "jszip": "3.1.5",
+    "mavon-editor": "^2.7.0",
     "wangeditor": ">=3.0.0",
     "xlsx": "^0.11.16"
   },

From 7596acb5fb18b1e0816d38495fb66b332da07a15 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Wed, 20 Nov 2019 21:28:01 +0800
Subject: [PATCH 15/64] update

---
 package.json | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index c4f33cc..39b17ac 100644
--- a/package.json
+++ b/package.json
@@ -17,30 +17,27 @@
     "url": "https://github.com/elunez/eladmin-qd"
   },
   "dependencies": {
-    "clipboard": "2.0.4",
-    "@riophae/vue-treeselect": "0.1.0",
-    "vue-cropper": "0.4.9",
-    "axios": "0.18.1",
-    "echarts": "4.2.1",
-    "fuse.js": "3.4.4",
-    "js-cookie": "2.2.0",
-    "normalize.css": "7.0.0",
-    "nprogress": "0.2.0",
-    "path-to-regexp": "2.4.0",
-    "screenfull": "4.2.0",
-    "vue": "2.6.10",
-    "vue-count-to": "1.0.13",
-    "vue-router": "3.0.2",
-    "vue-splitpane": "1.0.4",
-    "vuex": "3.1.0",
+    "@riophae/vue-treeselect": "0.0.38",
+    "axios": "^0.19.0",
+    "clipboard": "1.7.1",
     "codemirror": "^5.38.0",
     "connect": "3.6.6",
+    "echarts": "^4.1.0",
     "echarts-gl": "^1.1.1",
     "element-ui": "^2.12.0",
     "file-saver": "1.3.8",
+    "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "jszip": "3.1.5",
     "mavon-editor": "^2.7.0",
+    "normalize.css": "7.0.0",
+    "nprogress": "0.2.0",
+    "path-to-regexp": "2.4.0",
+    "screenfull": "3.3.3",
+    "vue": "2.5.17",
+    "vue-count-to": "1.0.13",
+    "vue-router": "3.1.3",
+    "vuex": "3.0.1",
     "wangeditor": ">=3.0.0",
     "xlsx": "^0.11.16"
   },

From 01e003d9f17701d8de4e017104c7f3204590749c Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Wed, 20 Nov 2019 22:24:31 +0800
Subject: [PATCH 16/64] =?UTF-8?q?cli3=20=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                 |  7 ++++
 src/assets/styles/variables.scss             |  2 +-
 src/layout/components/Navbar.vue             |  2 +-
 src/layout/components/TagsView/index.vue     |  8 ++---
 src/utils/index.js                           | 37 ++++++++++++++++++++
 src/views/system/user/center/updateEmail.vue |  4 +--
 src/views/tools/email/send.vue               |  4 +--
 7 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index b21afa6..d0cdfef 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,13 @@
       "git add"
     ]
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/PanJiaChen/vue-element-admin.git"
+  },
+  "bugs": {
+    "url": "https://github.com/elunez/eladmin/issues"
+  },
   "dependencies": {
     "clipboard": "2.0.4",
     "@riophae/vue-treeselect": "0.1.0",
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index a19c27c..5688f25 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -19,7 +19,7 @@ $menuHover:#263445;
 $subMenuBg:#1f2d3d;
 $subMenuHover:#001528;
 
-$sideBarWidth: 210px;
+$sideBarWidth: 200px;
 
 // 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/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 69dd095..e8e6094 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -10,7 +10,7 @@
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="Global Size" effect="dark" placement="bottom">
+        <el-tooltip content="布局设置" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
 
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index d49d915..9dd84f9 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -17,10 +17,10 @@
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">Close</li>
-      <li @click="closeOthersTags">Close Others</li>
-      <li @click="closeAllTags(selectedTag)">Close All</li>
+      <li @click="refreshSelectedTag(selectedTag)">刷新</li>
+      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">关闭</li>
+      <li @click="closeOthersTags">关闭其他</li>
+      <li @click="closeAllTags(selectedTag)">关闭全部</li>
     </ul>
   </div>
 </template>
diff --git a/src/utils/index.js b/src/utils/index.js
index ffb5526..71bce1c 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -348,3 +348,40 @@ export function removeClass(ele, cls) {
     ele.className = ele.className.replace(reg, ' ')
   }
 }
+
+// 替换邮箱字符
+export function regEmail(email) {
+  if (String(email).indexOf('@') > 0) {
+    const str = email.split('@')
+    let _s = ''
+    if (str[0].length > 3) {
+      for (var i = 0; i < str[0].length - 3; i++) {
+        _s += '*'
+      }
+    }
+    var new_email = str[0].substr(0, 3) + _s + '@' + str[1]
+  }
+  return new_email
+}
+
+// 替换手机字符
+export function regMobile(mobile) {
+  if (mobile.length > 7) {
+    var new_mobile = mobile.substr(0, 3) + '****' + mobile.substr(7)
+  }
+  return new_mobile
+}
+
+// 下载文件
+export function downloadFile(obj, name, suffix) {
+  const url = window.URL.createObjectURL(new Blob([obj]))
+  const link = document.createElement('a')
+  link.style.display = 'none'
+  link.href = url
+  const fileName = parseTime(new Date()) + '-' + name + '.' + suffix
+  link.setAttribute('download', fileName)
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+}
+
diff --git a/src/views/system/user/center/updateEmail.vue b/src/views/system/user/center/updateEmail.vue
index d571be0..55e3da8 100644
--- a/src/views/system/user/center/updateEmail.vue
+++ b/src/views/system/user/center/updateEmail.vue
@@ -23,7 +23,7 @@
 
 <script>
 import store from '@/store'
-import { validatEmail } from '@/utils/validate'
+import { validEmail } from '@/utils/validate'
 import { updateEmail } from '@/api/user'
 import { resetEmail } from '@/api/code'
 export default {
@@ -39,7 +39,7 @@ export default {
         callback(new Error('新邮箱不能为空'))
       } else if (value === this.email) {
         callback(new Error('新邮箱不能与旧邮箱相同'))
-      } else if (validatEmail(value)) {
+      } else if (validEmail(value)) {
         callback()
       } else {
         callback(new Error('邮箱格式错误'))
diff --git a/src/views/tools/email/send.vue b/src/views/tools/email/send.vue
index bc40b41..7cef15f 100644
--- a/src/views/tools/email/send.vue
+++ b/src/views/tools/email/send.vue
@@ -23,7 +23,7 @@
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
 import { send } from '@/api/email'
-import { validatEmail } from '@/utils/validate'
+import { validEmail } from '@/utils/validate'
 import E from 'wangeditor'
 export default {
   name: 'Index',
@@ -96,7 +96,7 @@ export default {
                 type: 'warning'
               })
               sub = true
-            } else if (validatEmail(data.value)) {
+            } else if (validEmail(data.value)) {
               _this.form.tos.push(data.value)
             } else {
               _this.$message({

From 1c88d57f04c9d5c8f4d9b84d0c63591a8e79dedf Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Thu, 21 Nov 2019 09:11:17 +0800
Subject: [PATCH 17/64] update

---
 src/mixins/initDict.js           | 41 --------------
 src/views/components/Echarts.vue | 38 +------------
 src/views/home.vue               | 96 --------------------------------
 3 files changed, 2 insertions(+), 173 deletions(-)
 delete mode 100644 src/mixins/initDict.js

diff --git a/src/mixins/initDict.js b/src/mixins/initDict.js
deleted file mode 100644
index 43b8cdf..0000000
--- a/src/mixins/initDict.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { get, getDictMap } from '@/api/dictDetail'
-
-export default {
-  data() {
-    return {
-      dicts: [], dictMap: {}
-    }
-  },
-  methods: {
-    async getDict(name) {
-      return new Promise((resolve, reject) => {
-        get(name).then(res => {
-          this.dicts = res.content
-          resolve(res)
-        }).catch(err => {
-          reject(err)
-        })
-      })
-    },
-    // 多个字典查询时使用逗号拼接， 如：
-    // 加载多个数据字典，如何调用如下：
-    // this.getDict('user_status,job_status')
-    // 在vue中使用加载出来的字典：
-    // dictMap.[字典名称] 如：dictMap.user_status、 dictMap.job_status
-    async getDictMap(names) {
-      // 优先放入到dictMap中，避免页面加载时 undefined
-      const arr = names.split(',')
-      for (let i = 0; i < arr.length; i++) {
-        this.dictMap[arr[i]] = []
-      }
-      return new Promise((resolve, reject) => {
-        getDictMap(names).then(res => {
-          this.dictMap = res
-          resolve(res)
-        }).catch(err => {
-          reject(err)
-        })
-      })
-    }
-  }
-}
diff --git a/src/views/components/Echarts.vue b/src/views/components/Echarts.vue
index a0a9901..d6b10f6 100644
--- a/src/views/components/Echarts.vue
+++ b/src/views/components/Echarts.vue
@@ -1,23 +1,6 @@
 <template>
   <div class="dashboard-container">
     <div class="dashboard-editor-container">
-      <el-row :gutter="32">
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <radar-chart />
-          </div>
-        </el-col>
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <pie-chart />
-          </div>
-        </el-col>
-        <el-col :xs="24" :sm="24" :lg="8">
-          <div class="chart-wrapper">
-            <bar-chart />
-          </div>
-        </el-col>
-      </el-row>
       <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
         <heat-map />
       </el-row>
@@ -89,11 +72,7 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import RadarChart from '@/components/Echarts/RadarChart'
-import PieChart from '@/components/Echarts/PieChart'
-import BarChart from '@/components/Echarts/BarChart'
-import { count } from '@/api/visits'
 import HeatMap from '@/components/Echarts/HeatMap'
 import Gauge from '@/components/Echarts/Gauge'
 import Rich from '@/components/Echarts/Rich'
@@ -106,34 +85,21 @@ import Line3D from '@/components/Echarts/Line3D'
 import Category from '@/components/Echarts/Category'
 import Point from '@/components/Echarts/Point'
 
-/**
- * 记录访问，只有页面刷新或者第一次加载才会记录
- */
-count().then(res => {
-})
-
 export default {
-  name: 'Dashboard',
+  name: 'Echarts',
   components: {
     Point,
     Category,
     Graph,
     HeatMap,
     RadarChart,
-    PieChart,
     Sunburst,
     Gauge,
     Rich,
     ThemeRiver,
     Sankey,
     Line3D,
-    Scatter,
-    BarChart
-  },
-  computed: {
-    ...mapGetters([
-      'roles'
-    ])
+    Scatter
   }
 }
 </script>
diff --git a/src/views/home.vue b/src/views/home.vue
index f923bb9..e0f55be 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -22,96 +22,17 @@
           </div>
         </el-col>
       </el-row>
-      <!--      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">-->
-      <!--        <heat-map/>-->
-      <!--      </el-row>-->
-      <!--      <el-row :gutter="32">-->
-      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
-      <!--          <div class="chart-wrapper">-->
-      <!--            <radar-chart/>-->
-      <!--          </div>-->
-      <!--        </el-col>-->
-      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
-      <!--          <div class="chart-wrapper">-->
-      <!--            <sunburst/>-->
-      <!--          </div>-->
-      <!--        </el-col>-->
-      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
-      <!--          <div class="chart-wrapper">-->
-      <!--            <gauge/>-->
-      <!--          </div>-->
-      <!--        </el-col>-->
-      <!--      </el-row>-->
-      <!--      <el-row :gutter="12">-->
-      <!--        <el-col :span="12">-->
-      <!--          <div class="chart-wrapper">-->
-      <!--            <rich/>-->
-      <!--          </div>-->
-      <!--        </el-col>-->
-      <!--        <el-col :span="12">-->
-      <!--          <div class="chart-wrapper">-->
-      <!--            <theme-river/>-->
-      <!--          </div>-->
-      <!--        </el-col>-->
-      <!--      </el-row>-->
-      <!--      <el-row :gutter="32">-->
-      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
-      <!--          <div class="chart-wrapper">-->
-      <!--            <graph/>-->
-      <!--          </div>-->
-      <!--        </el-col>-->
-      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
-      <!--          <div class="chart-wrapper">-->
-      <!--            <sankey/>-->
-      <!--          </div>-->
-      <!--        </el-col>-->
-      <!--        <el-col :xs="24" :sm="24" :lg="8">-->
-      <!--          <div class="chart-wrapper">-->
-      <!--            <line3-d/>-->
-      <!--          </div>-->
-      <!--        </el-col>-->
-      <!--      </el-row>-->
-      <!--      <el-row :gutter="12">-->
-      <!--        <el-col :span="12">-->
-      <!--          <div class="chart-wrapper">-->
-      <!--            <scatter/>-->
-      <!--          </div>-->
-      <!--        </el-col>-->
-      <!--        <el-col :span="12">-->
-      <!--          <div class="chart-wrapper">-->
-      <!--            <point/>-->
-      <!--          </div>-->
-      <!--        </el-col>-->
-      <!--      </el-row>-->
-      <!--      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">-->
-      <!--        <div class="chart-wrapper">-->
-      <!--          <category/>-->
-      <!--        </div>-->
-      <!--      </el-row>-->
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import PanelGroup from './dashboard/PanelGroup'
 import LineChart from './dashboard/LineChart'
 import RadarChart from '@/components/Echarts/RadarChart'
 import PieChart from '@/components/Echarts/PieChart'
 import BarChart from '@/components/Echarts/BarChart'
 import { count } from '@/api/visits'
-// import HeatMap from './dashboard/HeatMap'
-// import Funnel from './dashboard/Funnel'
-// import Gauge from './dashboard/Gauge'
-// import Rich from './dashboard/Rich'
-// import ThemeRiver from './dashboard/ThemeRiver'
-// import Sunburst from './dashboard/Sunburst'
-// import Graph from './dashboard/Graph'
-// import Sankey from './dashboard/Sankey'
-// import Scatter from './dashboard/Scatter'
-// import Line3D from './dashboard/Line3D'
-// import Category from './dashboard/Category'
-// import Point from './dashboard/Point'
 
 /**
  * 记录访问，只有页面刷新或者第一次加载才会记录
@@ -122,28 +43,11 @@ count().then(res => {
 export default {
   name: 'Dashboard',
   components: {
-    // Point,
-    // Category,
-    // Graph,
-    // HeatMap,
     PanelGroup,
     LineChart,
     RadarChart,
     PieChart,
-    // Funnel,
-    // Sunburst,
-    // Gauge,
-    // Rich,
-    // ThemeRiver,
-    // Sankey,
-    // Line3D,
-    // Scatter,
     BarChart
-  },
-  computed: {
-    ...mapGetters([
-      'roles'
-    ])
   }
 }
 </script>

From ea085433e27ed412cccafa0a21defefb218a863b Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Fri, 22 Nov 2019 12:22:52 +0800
Subject: [PATCH 18/64] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20crud.js=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B4=E5=90=88=E9=80=9A=E7=94=A8=E7=9A=84=E5=A2=9E=E5=88=A0?=
 =?UTF-8?q?=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/index.js                    |  27 ---
 package.json                      |  31 ++--
 src/api/data.js                   |  14 +-
 src/api/job.js                    |   8 +
 src/assets/styles/eladmin.scss    |   8 +-
 src/assets/styles/element-ui.scss |   4 +-
 src/assets/styles/index.scss      |   2 +-
 src/assets/styles/sidebar.scss    |   6 +-
 src/mixins/crud.js                | 288 ++++++++++++++++++++++++++++++
 src/mixins/initData.js            |  28 ++-
 src/utils/request.js              |   2 +-
 src/views/system/job/form.vue     | 140 ---------------
 src/views/system/job/index.vue    | 198 ++++++++++----------
 13 files changed, 459 insertions(+), 297 deletions(-)
 delete mode 100644 build/index.js
 create mode 100644 src/mixins/crud.js
 delete mode 100644 src/views/system/job/form.vue

diff --git a/build/index.js b/build/index.js
deleted file mode 100644
index 244ff4a..0000000
--- a/build/index.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const { run } = require('runjs')
-const chalk = require('chalk')
-const config = require('../vue.config.js')
-const rawArgv = process.argv.slice(2)
-const args = rawArgv.join(' ')
-
-if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
-  const report = rawArgv.includes('--report')
-
-  run(`vue-cli-service build ${args}`)
-
-  const publicPath = config.publicPath
-
-  var connect = require('connect')
-  var serveStatic = require('serve-static')
-  const app = connect()
-
-  app.use(
-    publicPath,
-    serveStatic('./dist', {
-      index: ['index.html', '/']
-    })
-  )
-
-} else {
-  run(`vue-cli-service build ${args}`)
-}
diff --git a/package.json b/package.json
index d0cdfef..d84f0c2 100644
--- a/package.json
+++ b/package.json
@@ -27,36 +27,37 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/PanJiaChen/vue-element-admin.git"
+    "url": "https://github.com/elunez/eladmin-web.git"
   },
   "bugs": {
     "url": "https://github.com/elunez/eladmin/issues"
   },
   "dependencies": {
-    "clipboard": "2.0.4",
     "@riophae/vue-treeselect": "0.1.0",
-    "vue-cropper": "0.4.9",
     "axios": "0.18.1",
-    "echarts": "4.2.1",
-    "fuse.js": "3.4.4",
-    "js-cookie": "2.2.0",
-    "normalize.css": "7.0.0",
-    "nprogress": "0.2.0",
-    "path-to-regexp": "2.4.0",
-    "screenfull": "4.2.0",
-    "vue": "2.6.10",
-    "vue-count-to": "1.0.13",
-    "vue-router": "3.0.2",
-    "vue-splitpane": "1.0.4",
-    "vuex": "3.1.0",
+    "clipboard": "2.0.4",
     "codemirror": "^5.38.0",
     "connect": "3.6.6",
+    "echarts": "4.2.1",
     "echarts-gl": "^1.1.1",
     "element-ui": "^2.12.0",
     "file-saver": "1.3.8",
+    "fuse.js": "3.4.4",
+    "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "jszip": "3.1.5",
     "mavon-editor": "^2.7.0",
+    "normalize.css": "7.0.0",
+    "nprogress": "0.2.0",
+    "path-to-regexp": "2.4.0",
+    "qs": "^6.9.1",
+    "screenfull": "4.2.0",
+    "vue": "2.6.10",
+    "vue-count-to": "1.0.13",
+    "vue-cropper": "0.4.9",
+    "vue-router": "3.0.2",
+    "vue-splitpane": "1.0.4",
+    "vuex": "3.1.0",
     "wangeditor": ">=3.0.0",
     "xlsx": "^0.11.16"
   },
diff --git a/src/api/data.js b/src/api/data.js
index 7a91ac6..d975d75 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -1,9 +1,17 @@
 import request from '@/utils/request'
+import qs from 'qs'
 
 export function initData(url, params) {
   return request({
-    url: url,
-    method: 'get',
-    params
+    url: url + '?' + qs.stringify(params, { indices: false }),
+    method: 'get'
+  })
+}
+
+export function download(url, params) {
+  return request({
+    url: url + '?' + qs.stringify(params, { indices: false }),
+    method: 'get',
+    responseType: 'blob'
   })
 }
diff --git a/src/api/job.js b/src/api/job.js
index 49ba283..4eb1187 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -44,3 +44,11 @@ export function downloadJob(params) {
     responseType: 'blob'
   })
 }
+
+export default {
+  add,
+  edit,
+  del,
+  getAllJob,
+  downloadJob
+}
diff --git a/src/assets/styles/eladmin.scss b/src/assets/styles/eladmin.scss
index 624aaf9..c23186d 100644
--- a/src/assets/styles/eladmin.scss
+++ b/src/assets/styles/eladmin.scss
@@ -3,7 +3,7 @@
   .filter-item {
     display: inline-block;
     vertical-align: middle;
-    margin-bottom: 10px;
+    margin: 0 2px 10px 0;
     input {
       height: 30.5px;
       line-height: 30.5px;
@@ -32,7 +32,7 @@
 
 .logo-con{
   height: 60px;
-  padding: 13px 0px 0px;
+  padding: 13px 0 0;
   img{
     height: 32px;
     width: 135px;
@@ -58,7 +58,7 @@
   background: none repeat scroll 0 0 white;
   border-top: 1px solid #e7eaec;
   overflow: hidden;
-  padding: 10px 6px 0px 6px;
+  padding: 10px 6px 0 6px;
   height: 33px;
   font-size: 0.7rem !important;
   color: #7a8b9a;
@@ -77,7 +77,7 @@
   width: 368px;
 }
 .my-blockquote{
-  margin: 0px 0px 10px;
+  margin: 0 0 10px;
   padding: 15px;
   line-height: 22px;
   border-left: 5px solid #00437B;
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 9581d56..8f7881c 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -17,7 +17,7 @@
 
 .cell {
   .el-tag {
-    margin-right: 0px;
+    margin-right: 0;
   }
 }
 
@@ -41,7 +41,7 @@
     text-align: center;
 
     .el-tag {
-      margin-right: 0px;
+      margin-right: 0;
     }
   }
 }
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index fdf9ba4..2e8715e 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -34,7 +34,7 @@ html {
 }
 
 .no-padding {
-  padding: 0px !important;
+  padding: 0 !important;
 }
 
 .padding-content {
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 3dad4c3..17381fc 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -13,7 +13,7 @@
     background-color: $menuBg;
     height: 100%;
     position: fixed;
-    font-size: 0px;
+    font-size: 0;
     top: 0;
     bottom: 0;
     left: 0;
@@ -30,7 +30,7 @@
     }
 
     .el-scrollbar__bar.is-vertical {
-      right: 0px;
+      right: 0;
     }
 
     .el-scrollbar {
@@ -146,7 +146,7 @@
   // mobile responsive
   .mobile {
     .main-container {
-      margin-left: 0px;
+      margin-left: 0;
     }
 
     .sidebar-container {
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
new file mode 100644
index 0000000..dacd6fb
--- /dev/null
+++ b/src/mixins/crud.js
@@ -0,0 +1,288 @@
+import { initData, download } from '@/api/data'
+import { parseTime, downloadFile } from '@/utils/index'
+import checkPermission from '@/utils/permission'
+
+export default {
+  data() {
+    return {
+      // 表格数据
+      data: [],
+      // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc']
+      sort: ['id,desc', 'createTime,asc'],
+      // 页码
+      page: 0,
+      // 每页数据条数
+      size: 10,
+      // 总数据条数
+      total: 0,
+      // 请求数据的url
+      url: '',
+      // 查询数据的参数
+      params: {},
+      // 待查询的对象
+      query: {},
+      // 等待时间
+      time: 50,
+      // 是否为新增类型的表单
+      isAdd: false,
+      // 导出的 Loading
+      downloadLoading: false,
+      // 表格 Loading 属性
+      loading: true,
+      // 删除 Loading 属性
+      delLoading: false,
+      // 弹窗属性
+      dialog: false,
+      // Form 表单
+      form: {},
+      // 弹窗的标题
+      title: '',
+      // 方法
+      method: ''
+    }
+  },
+  methods: {
+    parseTime,
+    downloadFile,
+    checkPermission,
+    async init() {
+      if (!await this.beforeInit()) {
+        return
+      }
+      return new Promise((resolve, reject) => {
+        this.loading = true
+        // 请求数据
+        initData(this.url, this.getQueryParame()).then(data => {
+          this.total = data.totalElements
+          this.data = data.content
+          // time 毫秒后显示表格
+          setTimeout(() => {
+            this.loading = false
+          }, this.time)
+          resolve(data)
+        }).catch(err => {
+          this.loading = false
+          reject(err)
+        })
+      })
+    },
+    beforeInit() {
+      return true
+    },
+    getQueryParame: function() {
+      return {
+        page: this.page,
+        size: this.size,
+        sort: this.sort,
+        ...this.query,
+        ...this.params
+      }
+    },
+    // 改变页码
+    pageChange(e) {
+      this.page = e - 1
+      this.init()
+    },
+    // 改变每页显示数
+    sizeChange(e) {
+      this.page = 0
+      this.size = e
+      this.init()
+    },
+    // 预防删除第二页最后一条数据时，或者多选删除第二页的数据时，页码错误导致请求无数据
+    dleChangePage(size) {
+      if (size === undefined) {
+        size = 1
+      }
+      if (this.data.length === size && this.page !== 0) {
+        this.page = this.page - 1
+      }
+    },
+    // 查询方法
+    toQuery() {
+      this.page = 0
+      this.init()
+    },
+    /**
+     * 通用的提示封装
+     */
+    submitSuccessNotify() {
+      this.$notify({
+        title: '提交成功',
+        type: 'success',
+        duration: 2500
+      })
+    },
+    addSuccessNotify() {
+      this.$notify({
+        title: '新增成功',
+        type: 'success',
+        duration: 2500
+      })
+    },
+    editSuccessNotify() {
+      this.$notify({
+        title: '编辑成功',
+        type: 'success',
+        duration: 2500
+      })
+    },
+    delSuccessNotify() {
+      this.$notify({
+        title: '删除成功',
+        type: 'success',
+        duration: 2500
+      })
+    },
+    notify(title, type) {
+      this.$notify({
+        title: title,
+        type: type,
+        duration: 2500
+      })
+    },
+    /**
+     * 删除前可以调用 beforeDelMethod 做一些操作
+     */
+    beforeDelMethod() {
+      return true
+    },
+    /**
+     * 通用的删除
+     */
+    delMethod(id) {
+      if (!this.beforeDelMethod()) {
+        return
+      }
+      this.delLoading = true
+      this.crudMethod.del(id).then(() => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.delSuccessNotify()
+        this.afterDelMethod()
+        this.init()
+      }).catch(() => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+      })
+    },
+    afterDelMethod() {
+    },
+    /**
+     * 显示新增弹窗前可以调用该方法
+     */
+    beforeShowAddForm() {
+    },
+    /**
+     * 显示新增弹窗
+     */
+    showAddFormDialog() {
+      this.isAdd = true
+      this.beforeShowAddForm()
+      this.dialog = true
+    },
+    /**
+     * 显示编辑弹窗前可以调用该方法
+     */
+    beforeShowEditForm(data) {
+    },
+    /**
+     * 显示编辑弹窗
+     */
+    showEditFormDialog(data = '') {
+      this.isAdd = false
+      if (data) {
+        this.form = JSON.parse(JSON.stringify(data))
+      }
+      this.beforeShowEditForm(data)
+      this.dialog = true
+    },
+    /**
+     * 新增方法
+     */
+    addMethod() {
+      this.crudMethod.add(this.form).then(() => {
+        this.hideFormDialog()
+        this.addSuccessNotify()
+        this.loading = false
+        this.afterAddMethod()
+        this.init()
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    /**
+     * 新增后可以调用该方法
+     */
+    afterAddMethod() {
+    },
+    /**
+     * 通用的编辑方法
+     */
+    editMethod() {
+      this.crudMethod.edit(this.form).then(() => {
+        this.hideFormDialog()
+        this.editSuccessNotify()
+        this.loading = false
+        this.afterEditMethod()
+        this.init()
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    /**
+     * 编辑后可以调用该方法
+     */
+    afterEditMethod() {
+    },
+    /**
+     * 提交前可以调用该方法
+     */
+    beforeSubmitMethod() {
+      return true
+    },
+    /**
+     * 提交
+     */
+    submitMethod() {
+      if (!this.beforeSubmitMethod()) {
+        return
+      }
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          if (this.isAdd) {
+            this.addMethod()
+          } else this.editMethod()
+        }
+      })
+    },
+    /**
+     * 隐藏弹窗
+     */
+    hideFormDialog() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+    },
+    /**
+     * 获取弹窗的标题
+     */
+    getFormTitle() {
+      return this.isAdd ? `新增${this.title}` : `编辑${this.title}`
+    },
+    /**
+     * 通用导出
+     */
+    downloadMethod() {
+      this.beforeInit()
+      this.downloadLoading = true
+      download(this.url + '/download', this.params).then(result => {
+        this.downloadFile(result, this.title, 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
+    }
+  }
+}
diff --git a/src/mixins/initData.js b/src/mixins/initData.js
index 2162dc1..aca65a6 100644
--- a/src/mixins/initData.js
+++ b/src/mixins/initData.js
@@ -3,7 +3,28 @@ import { initData } from '@/api/data'
 export default {
   data() {
     return {
-      loading: true, data: [], page: 0, size: 10, total: 0, url: '', params: {}, query: {}, time: 50, isAdd: false, downloadLoading: false
+      // 表格 Loading 属性
+      loading: true,
+      // 表格数据
+      data: [],
+      // 页码
+      page: 0,
+      // 每页数据条数
+      size: 10,
+      // 总数据条数
+      total: 0,
+      // 请求数据的url
+      url: '',
+      // 查询数据的参数
+      params: {},
+      // 待查询的对象
+      query: {},
+      // 等待时间
+      time: 50,
+      // 是否为新增类型的表单
+      isAdd: false,
+      // 导出的 Loading
+      downloadLoading: false
     }
   },
   methods: {
@@ -13,9 +34,11 @@ export default {
       }
       return new Promise((resolve, reject) => {
         this.loading = true
+        // 请求数据
         initData(this.url, this.params).then(res => {
           this.total = res.totalElements
           this.data = res.content
+          // time 毫秒后显示表格
           setTimeout(() => {
             this.loading = false
           }, this.time)
@@ -29,10 +52,12 @@ export default {
     beforeInit() {
       return true
     },
+    // 改变页码
     pageChange(e) {
       this.page = e - 1
       this.init()
     },
+    // 改变每页显示数
     sizeChange(e) {
       this.page = 0
       this.size = e
@@ -47,6 +72,7 @@ export default {
         this.page = this.page - 1
       }
     },
+    // 查询方法
     toQuery() {
       this.page = 0
       this.init()
diff --git a/src/utils/request.js b/src/utils/request.js
index 3a66a88..0fb30a2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -81,7 +81,7 @@ service.interceptors.response.use(
       if (errorMsg !== undefined) {
         Notification.error({
           title: errorMsg,
-          duration: 3000
+          duration: 2500
         })
       }
     }
diff --git a/src/views/system/job/form.vue b/src/views/system/job/form.vue
deleted file mode 100644
index 4eefdb1..0000000
--- a/src/views/system/job/form.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增岗位' : '编辑岗位'" width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="form.name" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item label="排序" prop="sort">
-        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item v-if="form.pid !== 0" label="状态" prop="enabled">
-        <el-radio v-for="item in dicts" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
-      </el-form-item>
-      <el-form-item label="所属部门">
-        <treeselect v-model="deptId" :options="depts" style="width: 370px" placeholder="选择部门" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDepts } from '@/api/dept'
-import { add, edit } from '@/api/job'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-export default {
-  components: { Treeselect },
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    },
-    dicts: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false, depts: [], deptId: null,
-      form: {
-        id: '',
-        name: '',
-        sort: 999,
-        enabled: 'true',
-        createTime: '',
-        dept: { id: '' }
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.form.dept.id = this.deptId
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          if (this.deptId === null || this.deptId === undefined) {
-            this.$message({
-              message: '所属部门不能为空',
-              type: 'warning'
-            })
-          } else {
-            this.loading = true
-            if (this.isAdd) {
-              this.doAdd()
-            } else this.doEdit()
-          }
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.deptId = null
-      this.form = {
-        id: '',
-        name: '',
-        sort: 999,
-        enabled: 'true',
-        createTime: '',
-        dept: { id: '' }
-      }
-    },
-    getDepts() {
-      getDepts({ enabled: true }).then(res => {
-        this.depts = res.content
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
-    text-align: left;
-  }
-</style>
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index 2b9399b..fbbdcf5 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -3,9 +3,9 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable size="small" placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.name" clearable size="small" placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
-        v-model="query.date"
+        v-model="query.createTime"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
@@ -19,30 +19,49 @@
         <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
       </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <div v-permission="['admin','job:add']" style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增</el-button>
-      </div>
-      <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="download"
-        >导出</el-button>
-      </div>
+      <!-- 新增按钮 -->
+      <el-button
+        v-permission="['admin','job:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增</el-button>
+      <!-- 导出按钮 -->
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="downloadMethod"
+      >导出</el-button>
     </div>
-    <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" :dicts="dict.job_status" />
+    <!--表单渲染-->
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="hideFormDialog" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item v-show="false" label="ID" prop="id">
+          <el-input v-model="form.id" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item v-if="form.pid !== 0" label="状态" prop="enabled">
+          <el-radio v-for="item in dict.job_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
+        </el-form-item>
+        <el-form-item label="部门" prop="dept.id">
+          <treeselect v-model="form.dept.id" :options="depts" style="width: 370px" placeholder="选择部门" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="hideFormDialog">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="name" label="名称" />
@@ -71,9 +90,10 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <!--   编辑与删除   -->
       <el-table-column v-if="checkPermission(['admin','job:edit','job:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','job:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-button v-permission="['admin','job:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
           <el-popover
             :ref="scope.row.id"
             v-permission="['admin','job:del']"
@@ -83,7 +103,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -103,24 +123,45 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del, edit, downloadJob } from '@/api/job'
-import { parseTime, downloadFile } from '@/utils/index'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import crudJob from '@/api/job'
+import { getDepts } from '@/api/dept'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   name: 'Job',
-  components: { eForm },
-  mixins: [initData],
-  // 设置数据字典
+  components: { Treeselect },
+  mixins: [crud],
+  // 数据字典
   dicts: ['job_status'],
   data() {
     return {
-      delLoading: false,
+      crudMethod: {
+        ...crudJob
+      },
+      sort: ['sort,asc', 'id,desc'],
+      title: '岗位',
       enabledTypeOptions: [
         { key: 'true', display_name: '正常' },
         { key: 'false', display_name: '禁用' }
-      ]
+      ],
+      form: {
+        id: '',
+        name: '',
+        sort: 999,
+        enabled: 'true',
+        createTime: '',
+        dept: { id: null }
+      },
+      depts: [],
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
+        ]
+      }
     }
   },
   created() {
@@ -129,60 +170,23 @@ export default {
     })
   },
   methods: {
-    parseTime,
-    checkPermission,
     beforeInit() {
       this.url = 'api/job'
-      const sort = 'sort,asc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const value = query.value
-      const enabled = query.enabled
-      if (value) { this.params['name'] = value }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
-      if (enabled !== '' && enabled !== null) { this.params['enabled'] = enabled }
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
+    beforeShowAddForm() {
+      this.getDepts()
     },
-    add() {
-      this.isAdd = true
-      this.$refs.form.getDepts()
-      this.$refs.form.dialog = true
+    beforeShowEditForm(data) {
+      this.getDepts()
+      this.form.enabled = data.enabled.toString()
     },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.getDepts()
-      _this.form = {
-        id: data.id,
-        name: data.name,
-        sort: data.sort,
-        enabled: data.enabled.toString(),
-        createTime: data.createTime,
-        dept: { id: data.dept.id }
+    beforeSubmitMethod() {
+      if (!this.form.dept.id) {
+        this.notify('所属部门不能为空', 'warning')
+        return false
       }
-      _this.deptId = data.dept.id
-      _this.dialog = true
+      return true
     },
     // 改变状态
     changeEnabled(data, val) {
@@ -191,12 +195,8 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        edit(data).then(res => {
-          this.$notify({
-            title: this.dict.label.job_status[val] + '成功',
-            type: 'success',
-            duration: 2500
-          })
+        this.crudMethod.edit(data).then(() => {
+          this.notify(this.dict.label.job_status[val] + '成功', 'success')
         }).catch(err => {
           data.enabled = !data.enabled
           console.log(err.response.data.message)
@@ -205,20 +205,18 @@ export default {
         data.enabled = !data.enabled
       })
     },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadJob(this.params).then(result => {
-        downloadFile(result, '岗位列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
+    // 获取部门数据
+    getDepts() {
+      getDepts({ enabled: true }).then(res => {
+        this.depts = res.content
       })
     }
   }
 }
 </script>
 
-<style scoped>
-
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
 </style>

From d99fb71fe0f03090cbe852895b2488dab76fde72 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Fri, 22 Nov 2019 17:41:07 +0800
Subject: [PATCH 19/64] =?UTF-8?q?=E6=9B=B4=E6=8D=A2logo=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                     | Bin 67646 -> 67646 bytes
 src/api/job.js                         |  17 +-
 src/api/user.js                        |  12 +-
 src/assets/images/logo.png             | Bin 13437 -> 8852 bytes
 src/assets/styles/variables.scss       |   2 +-
 src/layout/components/Sidebar/Logo.vue |   7 +-
 src/mixins/crud.js                     |   2 +-
 src/utils/validate.js                  |   5 +
 src/views/system/user/center.vue       |   2 +
 src/views/system/user/form.vue         | 218 -----------------
 src/views/system/user/index.vue        | 313 +++++++++++++++----------
 11 files changed, 206 insertions(+), 372 deletions(-)
 delete mode 100644 src/views/system/user/form.vue

diff --git a/public/favicon.ico b/public/favicon.ico
index 34b63ac63a87ee3ea8e7a0f3f5b5406c437e2112..fcb69992e5f0777989b89db9a6318b3621eff240 100644
GIT binary patch
literal 67646
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
U$^5!t50tOVCyZ47oXe;G53^4nod5s;

literal 67646
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
X;@D+E7Ad=S_FbjlW&KY_+xPzm3MBT?

diff --git a/src/api/job.js b/src/api/job.js
index 4eb1187..1ede2e5 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -36,19 +36,4 @@ export function edit(data) {
   })
 }
 
-export function downloadJob(params) {
-  return request({
-    url: 'api/job/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
-
-export default {
-  add,
-  edit,
-  del,
-  getAllJob,
-  downloadJob
-}
+export default { add, edit, del }
diff --git a/src/api/user.js b/src/api/user.js
index 334635f..c6f831d 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -8,15 +8,6 @@ export function add(data) {
   })
 }
 
-export function downloadUser(params) {
-  return request({
-    url: 'api/users/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
-
 export function del(id) {
   return request({
     url: 'api/users/' + id,
@@ -51,3 +42,6 @@ export function updateEmail(code, data) {
     data
   })
 }
+
+export default { add, edit, del }
+
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
index 1670e67aae33d7d85aeffe5cb00c1f9a8e874f10..f7577109651b89def3d9359ab324b445c714fe77 100644
GIT binary patch
literal 8852
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
ZLF@BRes2KN|GQZNP*u`YtbtmE{|_Y7!}b6G

literal 13437
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

diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 5688f25..41de79c 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -19,7 +19,7 @@ $menuHover:#263445;
 $subMenuBg:#1f2d3d;
 $subMenuHover:#001528;
 
-$sideBarWidth: 200px;
+$sideBarWidth: 205px;
 
 // 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/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index e96f5b8..495b667 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import Logo from '@/assets/images/logo.png'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -24,8 +25,8 @@ export default {
   },
   data() {
     return {
-      title: 'EL-ADMIN 后台管理',
-      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
+      title: 'ELADMIN-后台管理',
+      logo: Logo
     }
   }
 }
@@ -57,7 +58,7 @@ export default {
       width: 32px;
       height: 32px;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 6px;
     }
 
     & .sidebar-title {
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
index dacd6fb..7b67301 100644
--- a/src/mixins/crud.js
+++ b/src/mixins/crud.js
@@ -8,7 +8,7 @@ export default {
       // 表格数据
       data: [],
       // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc']
-      sort: ['id,desc', 'createTime,asc'],
+      sort: ['id,desc'],
       // 页码
       page: 0,
       // 每页数据条数
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 6b3ac41..08b361b 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -64,6 +64,11 @@ export function validEmail(email) {
   return reg.test(email)
 }
 
+export function isvalidPhone(phone) {
+  const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
+  return reg.test(phone)
+}
+
 /**
  * @param {string} str
  * @returns {Boolean}
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index d93f2eb..f8d9fd0 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -36,6 +36,7 @@
           </div>
         </el-card>
       </el-col>
+      <!-- 用户日志 -->
       <el-col :xs="24" :sm="24" :md="16" :lg="18" :xl="19">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
@@ -143,6 +144,7 @@ export default {
         duration: 2500
       })
     },
+    // 刷新日志
     refresh() {
       this.ico = 'el-icon-loading'
       this.init()
diff --git a/src/views/system/user/form.vue b/src/views/system/user/form.vue
deleted file mode 100644
index 8b6e692..0000000
--- a/src/views/system/user/form.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增用户' : '编辑用户'" append-to-body width="570px">
-    <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
-      <el-form-item label="用户名" prop="username">
-        <el-input v-model="form.username" />
-      </el-form-item>
-      <el-form-item label="状态" prop="enabled">
-        <el-radio v-for="item in dicts" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
-      </el-form-item>
-      <el-form-item label="电话" prop="phone">
-        <el-input v-model.number="form.phone" />
-      </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-        <el-input v-model="form.email" />
-      </el-form-item>
-      <el-form-item label="部门">
-        <treeselect v-model="deptId" :options="depts" style="width: 178px" placeholder="选择部门" @select="selectFun" />
-      </el-form-item>
-      <el-form-item label="岗位">
-        <el-select v-model="jobId" style="width: 178px" placeholder="请先选择部门">
-          <el-option
-            v-for="(item, index) in jobs"
-            :key="item.name + index"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item style="margin-bottom: 0px;" label="角色">
-        <el-select v-model="roleIds" style="width: 450px;" multiple placeholder="请选择">
-          <el-option
-            v-for="(item, index) in roles"
-            :key="item.name + index"
-            :disabled="level !== 1 && item.level <= level"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-
-import { add, edit } from '@/api/user'
-import { getDepts } from '@/api/dept'
-import { getAll, getLevel } from '@/api/role'
-import { getAllJob } from '@/api/job'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-export default {
-  components: { Treeselect },
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    },
-    dicts: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    const validPhone = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error('请输入电话号码'))
-      } else if (!this.isvalidPhone(value)) {
-        callback(new Error('请输入正确的11位手机号码'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      dialog: false, loading: false, form: { username: '', email: '', enabled: 'false', roles: [], job: { id: '' }, dept: { id: '' }, phone: null },
-      roleIds: [], roles: [], depts: [], deptId: null, jobId: null, jobs: [], level: 3,
-      rules: {
-        username: [
-          { required: true, message: '请输入用户名', trigger: 'blur' },
-          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
-        ],
-        email: [
-          { required: true, message: '请输入邮箱地址', trigger: 'blur' },
-          { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }
-        ],
-        phone: [
-          { required: true, trigger: 'blur', validator: validPhone }
-        ],
-        enabled: [
-          { required: true, message: '状态不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.form.dept.id = this.deptId
-      this.form.job.id = this.jobId
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          if (this.deptId === null || this.deptId === undefined) {
-            this.$message({
-              message: '部门不能为空',
-              type: 'warning'
-            })
-          } else if (this.jobId === null) {
-            this.$message({
-              message: '岗位不能为空',
-              type: 'warning'
-            })
-          } else if (this.roleIds.length === 0) {
-            this.$message({
-              message: '角色不能为空',
-              type: 'warning'
-            })
-          } else {
-            this.loading = true
-            this.form.roles = []
-            const _this = this
-            this.roleIds.forEach(function(data, index) {
-              const role = { id: data }
-              _this.form.roles.push(role)
-            })
-            if (this.isAdd) {
-              this.doAdd()
-            } else this.doEdit()
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          message: '默认密码：123456',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.deptId = null
-      this.jobId = null
-      this.roleIds = []
-      this.form = { username: '', email: '', enabled: 'false', roles: [], job: { id: '' }, dept: { id: '' }, phone: null }
-    },
-    getRoles() {
-      getAll().then(res => {
-        this.roles = res
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    getJobs(id) {
-      getAllJob(id).then(res => {
-        this.jobs = res.content
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    getDepts() {
-      getDepts({ enabled: true }).then(res => {
-        this.depts = res.content
-      })
-    },
-    isvalidPhone(str) {
-      const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
-      return reg.test(str)
-    },
-    selectFun(node, instanceId) {
-      this.getJobs(node.id)
-    },
-    getRoleLevel() {
-      getLevel().then(res => {
-        this.level = res.level
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index eb7483e..056e95c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,14 +1,12 @@
 <template>
   <div class="app-container">
-    <!--form 组件-->
-    <eForm ref="form" :is-add="isAdd" :dicts="dict.user_status" />
     <el-row :gutter="20">
-      <!--部门数据-->
+      <!--侧边部门数据-->
       <el-col :xs="9" :sm="6" :md="4" :lg="4" :xl="4">
         <div class="head-container">
           <el-input v-model="deptName" clearable size="small" placeholder="输入部门名称搜索" prefix-icon="el-icon-search" class="filter-item" @input="getDeptDatas" />
         </div>
-        <el-tree :data="depts" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick" />
+        <el-tree :data="deptDatas" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick" />
       </el-col>
       <!--用户数据-->
       <el-col :xs="15" :sm="18" :md="20" :lg="20" :xl="20">
@@ -17,7 +15,7 @@
           <!-- 搜索 -->
           <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者邮箱搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
           <el-date-picker
-            v-model="query.date"
+            v-model="query.createTime"
             :default-time="['00:00:00','23:59:59']"
             type="daterange"
             range-separator=":"
@@ -32,27 +30,68 @@
           </el-select>
           <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
           <!-- 新增 -->
-          <div v-permission="['admin','user:add']" style="display: inline-block;margin: 0px 2px;">
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="primary"
-              icon="el-icon-plus"
-              @click="add"
-            >新增</el-button>
-          </div>
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="showAddFormDialog"
+          >新增</el-button>
           <!-- 导出 -->
-          <div style="display: inline-block;">
-            <el-button
-              :loading="downloadLoading"
-              size="mini"
-              class="filter-item"
-              type="warning"
-              icon="el-icon-download"
-              @click="download"
-            >导出</el-button>
-          </div>
+          <el-button
+            :loading="downloadLoading"
+            size="mini"
+            class="filter-item"
+            type="warning"
+            icon="el-icon-download"
+            @click="downloadMethod"
+          >导出</el-button>
         </div>
+        <!--表单渲染-->
+        <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="hideFormDialog" :title="getFormTitle()" append-to-body width="570px">
+          <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
+            <el-form-item label="用户名" prop="username">
+              <el-input v-model="form.username" />
+            </el-form-item>
+            <el-form-item label="状态" prop="enabled">
+              <el-radio v-for="item in dict.user_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
+            </el-form-item>
+            <el-form-item label="电话" prop="phone">
+              <el-input v-model.number="form.phone" />
+            </el-form-item>
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" />
+            </el-form-item>
+            <el-form-item label="部门" prop="dept.id">
+              <treeselect v-model="form.dept.id" :options="depts" style="width: 178px" placeholder="选择部门" @select="selectFun" />
+            </el-form-item>
+            <el-form-item label="岗位" prop="job.id">
+              <el-select v-model="form.job.id" style="width: 178px" placeholder="请先选择部门">
+                <el-option
+                  v-for="(item, index) in jobs"
+                  :key="item.name + index"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item style="margin-bottom: 0px;" label="角色" prop="roles">
+              <el-select v-model="form.roles" style="width: 450px;" multiple placeholder="请选择">
+                <el-option
+                  v-for="item in roles"
+                  :key="item.name"
+                  :disabled="level !== 1 && item.level <= level"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="text" @click="hideFormDialog">取消</el-button>
+            <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+          </div>
+        </el-dialog>
         <!--表格渲染-->
         <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
           <el-table-column prop="username" label="用户名" />
@@ -80,7 +119,7 @@
           </el-table-column>
           <el-table-column v-if="checkPermission(['admin','user:edit','user:del'])" label="操作" width="125" align="center" fixed="right">
             <template slot-scope="scope">
-              <el-button v-permission="['admin','user:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+              <el-button v-permission="['admin','user:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
               <el-popover
                 :ref="scope.row.id"
                 v-permission="['admin','user:del']"
@@ -90,7 +129,7 @@
                 <p>确定删除本条数据吗？</p>
                 <div style="text-align: right; margin: 0">
                   <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                  <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                  <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
                 </div>
                 <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
               </el-popover>
@@ -112,35 +151,65 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del, downloadUser, edit } from '@/api/user'
+import crud from '@/mixins/crud'
+import crudUser from '@/api/user'
+import { isvalidPhone } from '@/utils/validate'
 import { getDepts } from '@/api/dept'
-import { parseTime, downloadFile } from '@/utils/index'
-import eForm from './form'
+import { getAll, getLevel } from '@/api/role'
+import { getAllJob } from '@/api/job'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   name: 'User',
-  components: { eForm },
-  mixins: [initData],
-  // 设置数据字典
+  components: { Treeselect },
+  mixins: [crud],
+  // 数据字典
   dicts: ['user_status'],
   data() {
+    // 自定义验证
+    const validPhone = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入电话号码'))
+      } else if (!isvalidPhone(value)) {
+        callback(new Error('请输入正确的11位手机号码'))
+      } else {
+        callback()
+      }
+    }
     return {
-      height: document.documentElement.clientHeight - 180 + 'px;', isAdd: false,
-      delLoading: false, deptName: '', depts: [], deptId: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
+      crudMethod: {
+        ...crudUser
       },
+      title: '用户',
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [],
+      defaultProps: { children: 'children', label: 'name' },
       enabledTypeOptions: [
         { key: 'true', display_name: '激活' },
         { key: 'false', display_name: '锁定' }
-      ]
+      ],
+      form: { username: null, email: null, enabled: 'false', roles: [], job: { id: null }, dept: { id: null }, phone: null },
+      rules: {
+        username: [
+          { required: true, message: '请输入用户名', trigger: 'blur' },
+          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+        ],
+        email: [
+          { required: true, message: '请输入邮箱地址', trigger: 'blur' },
+          { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, trigger: 'blur', validator: validPhone }
+        ],
+        enabled: [
+          { required: true, message: '状态不能为空', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
-    this.getDeptDatas()
     this.$nextTick(() => {
+      this.getDeptDatas()
       this.init()
     })
   },
@@ -151,103 +220,82 @@ export default {
     }
   },
   methods: {
-    parseTime,
-    checkPermission,
     beforeInit() {
       this.url = 'api/users'
-      const sort = 'id,desc'
-      const query = this.query
-      const blurry = query.blurry
-      const enabled = query.enabled
-      this.params = { page: this.page, size: this.size, sort: sort, deptId: this.deptId }
-      if (blurry) { this.params['blurry'] = blurry }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
-      if (enabled !== '' && enabled !== null) { this.params['enabled'] = enabled }
       return true
     },
-    // 导出
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadUser(this.params).then(result => {
-        downloadFile(result, '用户列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
+    // 打开新增弹窗前做的操作
+    beforeShowAddForm() {
+      this.getDepts()
+      this.getRoles()
+      this.getRoleLevel()
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
+    // 打开编辑弹窗前做的操作
+    beforeShowEditForm(data) {
+      this.getDepts()
+      this.getRoles()
+      this.getRoleLevel()
+      this.getJobs(this.form.dept.id)
+      this.form.enabled = data.enabled.toString()
+      const roles = []
+      data.roles.forEach(function(role, index) {
+        roles.push(role.id)
+      })
+      this.form.roles = roles
+    },
+    // 提交前做的操作
+    beforeSubmitMethod() {
+      if (!this.form.dept.id) {
+        this.$message({
+          message: '部门不能为空',
+          type: 'warning'
         })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
+        return false
+      } else if (!this.form.job.id) {
+        this.$message({
+          message: '岗位不能为空',
+          type: 'warning'
+        })
+        return false
+      } else if (this.form.roles.length === 0) {
+        this.$message({
+          message: '角色不能为空',
+          type: 'warning'
+        })
+        return false
+      }
+      const roles = []
+      this.form.roles.forEach(function(data, index) {
+        const role = { id: data }
+        roles.push(role)
       })
+      this.form.roles = roles
+      return true
     },
+    // 获取左侧部门数据
     getDeptDatas() {
       const sort = 'id,desc'
       const params = { sort: sort }
       if (this.deptName) { params['name'] = this.deptName }
       getDepts(params).then(res => {
+        this.deptDatas = res.content
+      })
+    },
+    // 获取弹窗内部门数据
+    getDepts() {
+      getDepts({ enabled: true }).then(res => {
         this.depts = res.content
       })
     },
+    // 切换部门
     handleNodeClick(data) {
       if (data.pid === 0) {
-        this.deptId = null
+        this.query.deptId = null
       } else {
-        this.deptId = data.id
+        this.query.deptId = data.id
       }
       this.init()
     },
-    add() {
-      this.isAdd = true
-      this.$refs.form.getDepts()
-      this.$refs.form.getRoles()
-      this.$refs.form.getRoleLevel()
-      this.$refs.form.dialog = true
-    },
-    // 数据转换
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'createTime' || j === 'lastPasswordResetTime') {
-          return parseTime(v[j])
-        } else if (j === 'enabled') {
-          return parseTime(v[j]) ? '启用' : '禁用'
-        } else {
-          return v[j]
-        }
-      }))
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.getRoles()
-      _this.getDepts()
-      _this.getRoleLevel()
-      _this.roleIds = []
-      _this.form = { id: data.id, username: data.username, phone: data.phone, email: data.email, enabled: data.enabled.toString(), roles: [], dept: { id: data.dept.id }, job: { id: data.job.id }}
-      data.roles.forEach(function(data, index) {
-        _this.roleIds.push(data.id)
-      })
-      _this.deptId = data.dept.id
-      _this.jobId = data.job.id
-      _this.getJobs(_this.deptId)
-      _this.dialog = true
-    },
     // 改变状态
     changeEnabled(data, val) {
       this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
@@ -255,19 +303,36 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        edit(data).then(res => {
-          this.$notify({
-            title: this.dict.label.user_status[val] + '成功',
-            type: 'success',
-            duration: 2500
-          })
-        }).catch(err => {
+        this.crudMethod.edit(data).then(res => {
+          this.notify(this.dict.label.user_status[val] + '成功', 'success')
+        }).catch(() => {
           data.enabled = !data.enabled
-          console.log(err.response.data.message)
         })
       }).catch(() => {
         data.enabled = !data.enabled
       })
+    },
+    // 获取弹窗内角色数据
+    getRoles() {
+      getAll().then(res => {
+        this.roles = res
+      }).catch(() => {})
+    },
+    // 获取弹窗内岗位数据
+    getJobs(id) {
+      getAllJob(id).then(res => {
+        this.jobs = res.content
+      }).catch(() => {})
+    },
+    // 点击部门搜索对应的岗位
+    selectFun(node, instanceId) {
+      this.getJobs(node.id)
+    },
+    // 获取权限级别
+    getRoleLevel() {
+      getLevel().then(res => {
+        this.level = res.level
+      }).catch(() => {})
     }
   }
 }

From 559adfd7864fc23489e555285ef8779b259133e5 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Fri, 22 Nov 2019 19:57:35 +0800
Subject: [PATCH 20/64] =?UTF-8?q?=E8=B0=83=E6=95=B4=20api=20=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/{ => generator}/genConfig.js         |   0
 src/api/{ => generator}/generator.js         |   0
 src/api/{ => monitor}/log.js                 |   0
 src/api/{ => monitor}/online.js              |   0
 src/api/{ => monitor}/redis.js               |   0
 src/api/{ => monitor}/server.js              |   0
 src/api/{ => monitor}/visits.js              |   0
 src/api/{ => system}/code.js                 |   0
 src/api/{ => system}/dept.js                 |   9 +-
 src/api/{ => system}/dict.js                 |   0
 src/api/{ => system}/dictDetail.js           |   0
 src/api/{ => system}/job.js                  |   0
 src/api/{ => system}/menu.js                 |  10 +-
 src/api/{ => system}/role.js                 |  17 +-
 src/api/{ => system}/timing.js               |   0
 src/api/{ => system}/user.js                 |   0
 src/api/{ => tools}/alipay.js                |   0
 src/api/{ => tools}/email.js                 |   0
 src/api/{ => tools}/localStorage.js          |   0
 src/api/{ => tools}/picture.js               |   0
 src/api/{ => tools}/qiniu.js                 |   0
 src/components/Dict/Dict.js                  |   2 +-
 src/mixins/crud.js                           |  41 ++--
 src/router/index.js                          |   2 +-
 src/views/components/MarkDown.vue            |   2 +-
 src/views/dashboard/LineChart.vue            |   2 +-
 src/views/dashboard/PanelGroup.vue           |   2 +-
 src/views/generator/config.vue               |   6 +-
 src/views/generator/index.vue                |   2 +-
 src/views/home.vue                           |   2 +-
 src/views/monitor/log/errorLog.vue           |   2 +-
 src/views/monitor/log/search.vue             |   2 +-
 src/views/monitor/online/index.vue           |   2 +-
 src/views/monitor/redis/index.vue            |   2 +-
 src/views/monitor/server/form.vue            |   2 +-
 src/views/monitor/server/index.vue           |   2 +-
 src/views/system/dept/form.vue               | 125 -----------
 src/views/system/dept/index.vue              | 173 +++++++--------
 src/views/system/dict/form.vue               |   2 +-
 src/views/system/dict/index.vue              |   2 +-
 src/views/system/dictDetail/form.vue         |   2 +-
 src/views/system/dictDetail/index.vue        |   2 +-
 src/views/system/job/index.vue               |  20 +-
 src/views/system/menu/form.vue               | 170 ---------------
 src/views/system/menu/index.vue              | 214 ++++++++++--------
 src/views/system/role/form.vue               | 149 -------------
 src/views/system/role/index.vue              | 217 ++++++++++---------
 src/views/system/timing/index.vue            |   2 +-
 src/views/system/timing/log.vue              |   2 +-
 src/views/system/user/center/updateEmail.vue |   4 +-
 src/views/system/user/center/updatePass.vue  |   2 +-
 src/views/system/user/index.vue              |  12 +-
 src/views/tools/aliPay/config.vue            |   2 +-
 src/views/tools/aliPay/toPay.vue             |   2 +-
 src/views/tools/email/config.vue             |   2 +-
 src/views/tools/email/send.vue               |   2 +-
 src/views/tools/picture/index.vue            |   2 +-
 src/views/tools/storage/local/form.vue       |   2 +-
 src/views/tools/storage/local/index.vue      |   2 +-
 src/views/tools/storage/qiniu/form.vue       |   2 +-
 src/views/tools/storage/qiniu/index.vue      |   2 +-
 61 files changed, 394 insertions(+), 831 deletions(-)
 rename src/api/{ => generator}/genConfig.js (100%)
 rename src/api/{ => generator}/generator.js (100%)
 rename src/api/{ => monitor}/log.js (100%)
 rename src/api/{ => monitor}/online.js (100%)
 rename src/api/{ => monitor}/redis.js (100%)
 rename src/api/{ => monitor}/server.js (100%)
 rename src/api/{ => monitor}/visits.js (100%)
 rename src/api/{ => system}/code.js (100%)
 rename src/api/{ => system}/dept.js (75%)
 rename src/api/{ => system}/dict.js (100%)
 rename src/api/{ => system}/dictDetail.js (100%)
 rename src/api/{ => system}/job.js (100%)
 rename src/api/{ => system}/menu.js (75%)
 rename src/api/{ => system}/role.js (73%)
 rename src/api/{ => system}/timing.js (100%)
 rename src/api/{ => system}/user.js (100%)
 rename src/api/{ => tools}/alipay.js (100%)
 rename src/api/{ => tools}/email.js (100%)
 rename src/api/{ => tools}/localStorage.js (100%)
 rename src/api/{ => tools}/picture.js (100%)
 rename src/api/{ => tools}/qiniu.js (100%)
 delete mode 100644 src/views/system/dept/form.vue
 delete mode 100644 src/views/system/menu/form.vue
 delete mode 100644 src/views/system/role/form.vue

diff --git a/src/api/genConfig.js b/src/api/generator/genConfig.js
similarity index 100%
rename from src/api/genConfig.js
rename to src/api/generator/genConfig.js
diff --git a/src/api/generator.js b/src/api/generator/generator.js
similarity index 100%
rename from src/api/generator.js
rename to src/api/generator/generator.js
diff --git a/src/api/log.js b/src/api/monitor/log.js
similarity index 100%
rename from src/api/log.js
rename to src/api/monitor/log.js
diff --git a/src/api/online.js b/src/api/monitor/online.js
similarity index 100%
rename from src/api/online.js
rename to src/api/monitor/online.js
diff --git a/src/api/redis.js b/src/api/monitor/redis.js
similarity index 100%
rename from src/api/redis.js
rename to src/api/monitor/redis.js
diff --git a/src/api/server.js b/src/api/monitor/server.js
similarity index 100%
rename from src/api/server.js
rename to src/api/monitor/server.js
diff --git a/src/api/visits.js b/src/api/monitor/visits.js
similarity index 100%
rename from src/api/visits.js
rename to src/api/monitor/visits.js
diff --git a/src/api/code.js b/src/api/system/code.js
similarity index 100%
rename from src/api/code.js
rename to src/api/system/code.js
diff --git a/src/api/dept.js b/src/api/system/dept.js
similarity index 75%
rename from src/api/dept.js
rename to src/api/system/dept.js
index 1c3624e..571122d 100644
--- a/src/api/dept.js
+++ b/src/api/system/dept.js
@@ -31,11 +31,4 @@ export function edit(data) {
   })
 }
 
-export function downloadDept(params) {
-  return request({
-    url: 'api/dept/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
+export default { add, edit, del, getDepts }
diff --git a/src/api/dict.js b/src/api/system/dict.js
similarity index 100%
rename from src/api/dict.js
rename to src/api/system/dict.js
diff --git a/src/api/dictDetail.js b/src/api/system/dictDetail.js
similarity index 100%
rename from src/api/dictDetail.js
rename to src/api/system/dictDetail.js
diff --git a/src/api/job.js b/src/api/system/job.js
similarity index 100%
rename from src/api/job.js
rename to src/api/system/job.js
diff --git a/src/api/menu.js b/src/api/system/menu.js
similarity index 75%
rename from src/api/menu.js
rename to src/api/system/menu.js
index 10e8bd1..d605bf0 100644
--- a/src/api/menu.js
+++ b/src/api/system/menu.js
@@ -1,6 +1,5 @@
 import request from '@/utils/request'
 
-// 获取所有的菜单树
 export function getMenusTree() {
   return request({
     url: 'api/menus/tree',
@@ -38,11 +37,4 @@ export function edit(data) {
   })
 }
 
-export function downloadMenu(params) {
-  return request({
-    url: 'api/menus/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
+export default { add, edit, del, getMenusTree }
diff --git a/src/api/role.js b/src/api/system/role.js
similarity index 73%
rename from src/api/role.js
rename to src/api/system/role.js
index e8792d4..8ed97c6 100644
--- a/src/api/role.js
+++ b/src/api/system/role.js
@@ -45,14 +45,6 @@ export function edit(data) {
   })
 }
 
-export function editPermission(data) {
-  return request({
-    url: 'api/roles/permission',
-    method: 'put',
-    data
-  })
-}
-
 export function editMenu(data) {
   return request({
     url: 'api/roles/menu',
@@ -61,11 +53,4 @@ export function editMenu(data) {
   })
 }
 
-export function downloadRole(params) {
-  return request({
-    url: 'api/roles/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
+export default { add, edit, del, get, editMenu }
diff --git a/src/api/timing.js b/src/api/system/timing.js
similarity index 100%
rename from src/api/timing.js
rename to src/api/system/timing.js
diff --git a/src/api/user.js b/src/api/system/user.js
similarity index 100%
rename from src/api/user.js
rename to src/api/system/user.js
diff --git a/src/api/alipay.js b/src/api/tools/alipay.js
similarity index 100%
rename from src/api/alipay.js
rename to src/api/tools/alipay.js
diff --git a/src/api/email.js b/src/api/tools/email.js
similarity index 100%
rename from src/api/email.js
rename to src/api/tools/email.js
diff --git a/src/api/localStorage.js b/src/api/tools/localStorage.js
similarity index 100%
rename from src/api/localStorage.js
rename to src/api/tools/localStorage.js
diff --git a/src/api/picture.js b/src/api/tools/picture.js
similarity index 100%
rename from src/api/picture.js
rename to src/api/tools/picture.js
diff --git a/src/api/qiniu.js b/src/api/tools/qiniu.js
similarity index 100%
rename from src/api/qiniu.js
rename to src/api/tools/qiniu.js
diff --git a/src/components/Dict/Dict.js b/src/components/Dict/Dict.js
index 1b81a4e..48554de 100644
--- a/src/components/Dict/Dict.js
+++ b/src/components/Dict/Dict.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { get as getDictDetail } from '@/api/dictDetail'
+import { get as getDictDetail } from '@/api/system/dictDetail'
 
 export default class Dict {
   constructor(dict) {
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
index 7b67301..65e00a9 100644
--- a/src/mixins/crud.js
+++ b/src/mixins/crud.js
@@ -35,6 +35,8 @@ export default {
       dialog: false,
       // Form 表单
       form: {},
+      // 重置表单
+      resetForm: {},
       // 弹窗的标题
       title: '',
       // 方法
@@ -179,6 +181,7 @@ export default {
      */
     showAddFormDialog() {
       this.isAdd = true
+      this.resetForm = JSON.parse(JSON.stringify(this.form))
       this.beforeShowAddForm()
       this.dialog = true
     },
@@ -193,6 +196,7 @@ export default {
     showEditFormDialog(data = '') {
       this.isAdd = false
       if (data) {
+        this.resetForm = JSON.parse(JSON.stringify(this.form))
         this.form = JSON.parse(JSON.stringify(data))
       }
       this.beforeShowEditForm(data)
@@ -203,10 +207,10 @@ export default {
      */
     addMethod() {
       this.crudMethod.add(this.form).then(() => {
-        this.hideFormDialog()
         this.addSuccessNotify()
         this.loading = false
         this.afterAddMethod()
+        this.cancel()
         this.init()
       }).catch(() => {
         this.loading = false
@@ -215,17 +219,16 @@ export default {
     /**
      * 新增后可以调用该方法
      */
-    afterAddMethod() {
-    },
+    afterAddMethod() { },
     /**
      * 通用的编辑方法
      */
     editMethod() {
       this.crudMethod.edit(this.form).then(() => {
-        this.hideFormDialog()
         this.editSuccessNotify()
         this.loading = false
         this.afterEditMethod()
+        this.cancel()
         this.init()
       }).catch(() => {
         this.loading = false
@@ -234,8 +237,7 @@ export default {
     /**
      * 编辑后可以调用该方法
      */
-    afterEditMethod() {
-    },
+    afterEditMethod() {},
     /**
      * 提交前可以调用该方法
      */
@@ -249,21 +251,26 @@ export default {
       if (!this.beforeSubmitMethod()) {
         return
       }
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.addMethod()
-          } else this.editMethod()
-        }
-      })
+      if (this.$refs['form']) {
+        this.$refs['form'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            if (this.isAdd) {
+              this.addMethod()
+            } else this.editMethod()
+          }
+        })
+      }
     },
     /**
      * 隐藏弹窗
      */
-    hideFormDialog() {
+    cancel() {
       this.dialog = false
-      this.$refs['form'].resetFields()
+      if (this.$refs['form']) {
+        this.$refs['form'].clearValidate()
+        this.form = this.resetForm
+      }
     },
     /**
      * 获取弹窗的标题
@@ -278,7 +285,7 @@ export default {
       this.beforeInit()
       this.downloadLoading = true
       download(this.url + '/download', this.params).then(result => {
-        this.downloadFile(result, this.title, 'xlsx')
+        this.downloadFile(result, this.title + '数据', 'xlsx')
         this.downloadLoading = false
       }).catch(() => {
         this.downloadLoading = false
diff --git a/src/router/index.js b/src/router/index.js
index 1401cd2..b2a231b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,7 +4,7 @@ import Config from '@/settings'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css'// progress bar style
 import { getToken } from '@/utils/auth' // getToken from cookie
-import { buildMenus } from '@/api/menu'
+import { buildMenus } from '@/api/system/menu'
 import { filterAsyncRouter } from '@/store/modules/permission'
 
 NProgress.configure({ showSpinner: false })// NProgress Configuration
diff --git a/src/views/components/MarkDown.vue b/src/views/components/MarkDown.vue
index 504f237..efaec4e 100644
--- a/src/views/components/MarkDown.vue
+++ b/src/views/components/MarkDown.vue
@@ -12,7 +12,7 @@
 import axios from 'axios'
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
-import { del } from '@/api/picture'
+import { del } from '@/api/tools/picture'
 export default {
   name: 'Markdown',
   data() {
diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue
index dcb6adb..13521aa 100644
--- a/src/views/dashboard/LineChart.vue
+++ b/src/views/dashboard/LineChart.vue
@@ -6,7 +6,7 @@
 import echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import { debounce } from '@/utils'
-import { getChartData } from '@/api/visits'
+import { getChartData } from '@/api/monitor/visits'
 
 export default {
   props: {
diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue
index 5244742..c8de739 100644
--- a/src/views/dashboard/PanelGroup.vue
+++ b/src/views/dashboard/PanelGroup.vue
@@ -49,7 +49,7 @@
 
 <script>
 import CountTo from 'vue-count-to'
-import { get } from '@/api/visits'
+import { get } from '@/api/monitor/visits'
 export default {
   components: {
     CountTo
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 5c9293a..4abd2bf 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -174,9 +174,9 @@
 
 <script>
 import initData from '@/mixins/initData'
-import { update, get } from '@/api/genConfig'
-import { save } from '@/api/generator'
-import { getDicts } from '@/api/dict'
+import { update, get } from '@/api/generator/genConfig'
+import { save } from '@/api/generator/generator'
+import { getDicts } from '@/api/system/dict'
 export default {
   name: 'GeneratorConfig',
   components: {},
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index dff0e17..9a82d29 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -48,7 +48,7 @@
 <script>
 import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
-import { generator } from '@/api/generator'
+import { generator } from '@/api/generator/generator'
 export default {
   name: 'GeneratorIndex',
   mixins: [initData],
diff --git a/src/views/home.vue b/src/views/home.vue
index e0f55be..f99da16 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -32,7 +32,7 @@ import LineChart from './dashboard/LineChart'
 import RadarChart from '@/components/Echarts/RadarChart'
 import PieChart from '@/components/Echarts/PieChart'
 import BarChart from '@/components/Echarts/BarChart'
-import { count } from '@/api/visits'
+import { count } from '@/api/monitor/visits'
 
 /**
  * 记录访问，只有页面刷新或者第一次加载才会记录
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index 6911a58..b78ffb7 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -51,7 +51,7 @@
 <script>
 import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
-import { getErrDetail } from '@/api/log'
+import { getErrDetail } from '@/api/monitor/log'
 import Search from './search'
 export default {
   name: 'ErrorLog',
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index 3466f22..56f43f7 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -29,7 +29,7 @@
 
 <script>
 import { downloadFile } from '@/utils/index'
-import { downloadLog } from '@/api/log'
+import { downloadLog } from '@/api/monitor/log'
 export default {
   props: {
     query: {
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 5d43da3..978c251 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -60,7 +60,7 @@
 <script>
 import initData from '@/mixins/initData'
 import { parseTime, downloadFile } from '@/utils/index'
-import { del, downloadOnline } from '@/api/online'
+import { del, downloadOnline } from '@/api/monitor/online'
 export default {
   name: 'OnlineUser',
   mixins: [initData],
diff --git a/src/views/monitor/redis/index.vue b/src/views/monitor/redis/index.vue
index 8f383ee..7db2b22 100644
--- a/src/views/monitor/redis/index.vue
+++ b/src/views/monitor/redis/index.vue
@@ -64,7 +64,7 @@
 <script>
 import checkPermission from '@/utils/permission' // 权限判断函数
 import initData from '@/mixins/initData'
-import { del, delAll, downloadRedis } from '@/api/redis'
+import { del, delAll, downloadRedis } from '@/api/monitor/redis'
 import { downloadFile } from '@/utils/index'
 export default {
   name: 'Redis',
diff --git a/src/views/monitor/server/form.vue b/src/views/monitor/server/form.vue
index 7b4a98c..802c357 100644
--- a/src/views/monitor/server/form.vue
+++ b/src/views/monitor/server/form.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { add, edit } from '@/api/server'
+import { add, edit } from '@/api/monitor/server'
 export default {
   props: {
     isAdd: {
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 20845e1..223da40 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -122,7 +122,7 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del } from '@/api/server'
+import { del } from '@/api/monitor/server'
 import eForm from './form'
 export default {
   name: 'ServerMonitor',
diff --git a/src/views/system/dept/form.vue b/src/views/system/dept/form.vue
deleted file mode 100644
index e3688ca..0000000
--- a/src/views/system/dept/form.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增部门' : '编辑部门'" width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="form.name" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item v-if="form.pid !== 0" label="状态" prop="enabled">
-        <el-radio v-for="item in dicts" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
-      </el-form-item>
-      <el-form-item v-if="form.pid !== 0" style="margin-bottom: 0px;" label="上级部门">
-        <treeselect v-model="form.pid" :options="depts" style="width: 370px;" placeholder="选择上级类目" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit, getDepts } from '@/api/dept'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-export default {
-  components: { Treeselect },
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    },
-    dicts: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false, depts: [],
-      form: {
-        id: '',
-        name: '',
-        pid: 1,
-        enabled: 'true'
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          if (this.form.pid !== undefined) {
-            this.loading = true
-            if (this.isAdd) {
-              this.doAdd()
-            } else this.doEdit()
-          } else {
-            this.$message({
-              message: '上级部门不能为空',
-              type: 'warning'
-            })
-          }
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        name: '',
-        pid: 1,
-        enabled: 'true'
-      }
-    },
-    getDepts() {
-      getDepts({ enabled: true }).then(res => {
-        this.depts = res.content
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 5d686e5..16fccd6 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -3,9 +3,9 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable size="small" placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.name" clearable size="small" placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
-        v-model="query.date"
+        v-model="query.createTime"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
@@ -20,37 +20,49 @@
       </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
-      <div v-permission="['admin','dept:add']" style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增</el-button>
-      </div>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增</el-button>
       <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="download"
-        >导出</el-button>
-      </div>
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="downloadMethod"
+      >导出</el-button>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" :dicts="dict.dept_status" />
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item v-if="form.pid !== 0" label="状态" prop="enabled">
+          <el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
+        </el-form-item>
+        <el-form-item v-if="form.pid !== 0" style="margin-bottom: 0px;" label="上级部门" prop="pid">
+          <treeselect v-model="form.pid" :options="depts" style="width: 370px;" placeholder="选择上级类目" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :default-expand-all="expand" :data="data" row-key="id" size="small">
+    <el-table v-loading="loading" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" default-expand-all :data="data" row-key="id" size="small">
       <el-table-column label="名称" prop="name" />
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.enabled"
-            :disabled="scope.row.id == 1"
+            :disabled="scope.row.id === 1"
             active-color="#409EFF"
             inactive-color="#F56C6C"
             @change="changeEnabled(scope.row, scope.row.enabled,)"
@@ -64,7 +76,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','dept:edit','dept:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','dept:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-button v-permission="['admin','dept:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
           <el-popover
             :ref="scope.row.id"
             v-permission="['admin','dept:del']"
@@ -74,7 +86,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" :disabled="scope.row.id === 1" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -85,24 +97,31 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del, edit, downloadDept } from '@/api/dept'
-import { parseTime, downloadFile } from '@/utils/index'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import crudDept from '@/api/system/dept'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   name: 'Dept',
-  components: { eForm },
-  mixins: [initData],
+  components: { Treeselect },
+  mixins: [crud],
   // 设置数据字典
   dicts: ['dept_status'],
   data() {
     return {
+      title: '部门',
+      crudMethod: { ...crudDept },
+      depts: [],
+      form: { id: null, name: null, pid: 1, enabled: 'true' },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ]
+      },
       enabledTypeOptions: [
         { key: 'true', display_name: '正常' },
         { key: 'false', display_name: '禁用' }
-      ],
-      delLoading: false, expand: true
+      ]
     }
   },
   created() {
@@ -111,61 +130,28 @@ export default {
     })
   },
   methods: {
-    parseTime,
-    checkPermission,
     beforeInit() {
       this.url = 'api/dept'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const value = query.value
-      const enabled = query.enabled
-      if (value) { this.params['name'] = value }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
-      if (enabled !== '' && enabled !== null) { this.params['enabled'] = enabled }
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
+    // 打开新增弹窗前做的操作
+    beforeShowAddForm() {
+      this.getDepts()
+    },
+    // 打开新增弹窗前做的操作
+    beforeShowEditForm(data) {
+      this.getDepts()
+      this.form.enabled = data.enabled.toString()
+    },
+    beforeSubmitMethod() {
+      if (!this.form.pid) {
+        this.$message({
+          message: '上级部门不能为空',
+          type: 'warning'
         })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
-    },
-    add() {
-      this.isAdd = true
-      const _this = this.$refs.form
-      _this.getDepts()
-      _this.dialog = true
-    },
-    changeExpand() {
-      this.expand = !this.expand
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.getDepts()
-      _this.form = {
-        id: data.id,
-        name: data.name,
-        pid: data.pid,
-        createTime: data.createTime,
-        enabled: data.enabled.toString()
+        return false
       }
-      _this.dialog = true
+      return true
     },
     // 改变状态
     changeEnabled(data, val) {
@@ -174,12 +160,8 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        edit(data).then(res => {
-          this.$notify({
-            title: this.dict.label.dept_status[val] + '成功',
-            type: 'success',
-            duration: 2500
-          })
+        this.crudMethod.edit(data).then(res => {
+          this.notify(this.dict.label.dept_status[val] + '成功', 'success')
         }).catch(err => {
           data.enabled = !data.enabled
           console.log(err.response.data.message)
@@ -188,14 +170,9 @@ export default {
         data.enabled = !data.enabled
       })
     },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadDept(this.params).then(result => {
-        downloadFile(result, '部门列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
+    getDepts() {
+      this.crudMethod.getDepts({ enabled: true }).then(res => {
+        this.depts = res.content
       })
     }
   }
diff --git a/src/views/system/dict/form.vue b/src/views/system/dict/form.vue
index ec88532..ac76a08 100644
--- a/src/views/system/dict/form.vue
+++ b/src/views/system/dict/form.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { add, edit } from '@/api/dict'
+import { add, edit } from '@/api/system/dict'
 export default {
   props: {
     isAdd: {
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 32a3085..1f1e434 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -92,7 +92,7 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del, downloadDict } from '@/api/dict'
+import { del, downloadDict } from '@/api/system/dict'
 import dictDetail from '../dictDetail/index'
 import { downloadFile } from '@/utils/index'
 import eForm from './form'
diff --git a/src/views/system/dictDetail/form.vue b/src/views/system/dictDetail/form.vue
index e9fa128..f6e20ce 100644
--- a/src/views/system/dictDetail/form.vue
+++ b/src/views/system/dictDetail/form.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { add, edit } from '@/api/dictDetail'
+import { add, edit } from '@/api/system/dictDetail'
 export default {
   props: {
     isAdd: {
diff --git a/src/views/system/dictDetail/index.vue b/src/views/system/dictDetail/index.vue
index e12f265..f76be64 100644
--- a/src/views/system/dictDetail/index.vue
+++ b/src/views/system/dictDetail/index.vue
@@ -55,7 +55,7 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del } from '@/api/dictDetail'
+import { del } from '@/api/system/dictDetail'
 import eForm from './form'
 export default {
   components: { eForm },
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index fbbdcf5..912ed69 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -39,11 +39,8 @@
       >导出</el-button>
     </div>
     <!--表单渲染-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="hideFormDialog" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-        <el-form-item v-show="false" label="ID" prop="id">
-          <el-input v-model="form.id" style="width: 370px;" />
-        </el-form-item>
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" style="width: 370px;" />
         </el-form-item>
@@ -58,7 +55,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="hideFormDialog">取消</el-button>
+        <el-button type="text" @click="cancel">取消</el-button>
         <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
       </div>
     </el-dialog>
@@ -124,8 +121,8 @@
 
 <script>
 import crud from '@/mixins/crud'
-import crudJob from '@/api/job'
-import { getDepts } from '@/api/dept'
+import crudJob from '@/api/system/job'
+import { getDepts } from '@/api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
@@ -145,14 +142,7 @@ export default {
         { key: 'true', display_name: '正常' },
         { key: 'false', display_name: '禁用' }
       ],
-      form: {
-        id: '',
-        name: '',
-        sort: 999,
-        enabled: 'true',
-        createTime: '',
-        dept: { id: null }
-      },
+      form: { id: null, name: null, sort: 999, enabled: 'true', dept: { id: null }},
       depts: [],
       rules: {
         name: [
diff --git a/src/views/system/menu/form.vue b/src/views/system/menu/form.vue
deleted file mode 100644
index 1c6a8fe..0000000
--- a/src/views/system/menu/form.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增菜单' : '编辑菜单'" append-to-body width="580px">
-    <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="菜单类型">
-        <el-radio-group v-model="form.type" size="mini" style="width: 178px">
-          <el-radio-button label="0">目录</el-radio-button>
-          <el-radio-button label="1">菜单</el-radio-button>
-          <el-radio-button label="2">按钮</el-radio-button>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item v-show="form.type.toString() !== '2'" label="菜单图标">
-        <el-popover
-          placement="bottom-start"
-          width="450"
-          trigger="click"
-          @show="$refs['iconSelect'].reset()"
-        >
-          <IconSelect ref="iconSelect" @selected="selected" />
-          <el-input slot="reference" v-model="form.icon" style="width: 450px;" placeholder="点击选择图标" readonly>
-            <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon" style="height: 32px;width: 16px;" />
-            <i v-else slot="prefix" class="el-icon-search el-input__icon" />
-          </el-input>
-        </el-popover>
-      </el-form-item>
-      <el-form-item v-show="form.type.toString() !== '2'" label="外链菜单">
-        <el-radio-group v-model="form.iframe" size="mini">
-          <el-radio-button label="true">是</el-radio-button>
-          <el-radio-button label="false">否</el-radio-button>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item v-show="form.type.toString() === '1'" label="菜单缓存">
-        <el-radio-group v-model="form.cache" size="mini">
-          <el-radio-button label="true">是</el-radio-button>
-          <el-radio-button label="false">否</el-radio-button>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item v-show="form.type.toString() !== '2'" label="菜单可见">
-        <el-radio-group v-model="form.hidden" size="mini">
-          <el-radio-button label="false">是</el-radio-button>
-          <el-radio-button label="true">否</el-radio-button>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item v-show="form.type.toString() !== '2'" label="菜单标题" prop="name">
-        <el-input v-model="form.name" :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 178px'" placeholder="菜单标题" />
-      </el-form-item>
-      <el-form-item v-show="form.type.toString() === '2'" label="按钮名称">
-        <el-input v-model="form.name" placeholder="按钮名称" style="width: 178px;" />
-      </el-form-item>
-      <el-form-item v-show="form.type.toString() !== '0'" label="权限标识">
-        <el-input v-model="form.permission" :disabled="form.iframe === 'true'" placeholder="权限标识" style="width: 178px;" />
-      </el-form-item>
-      <el-form-item v-if="form.type.toString() !== '2'" label="路由地址" prop="path">
-        <el-input v-model="form.path" placeholder="路由地址" style="width: 178px;" />
-      </el-form-item>
-      <el-form-item label="菜单排序">
-        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 178px;" />
-      </el-form-item>
-      <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件名称">
-        <el-input v-model="form.componentName" style="width: 178px;" placeholder="匹配组件内Name字段" />
-      </el-form-item>
-      <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件路径">
-        <el-input v-model="form.component" style="width: 178px;" placeholder="组件路径" />
-      </el-form-item>
-      <el-form-item label="上级类目">
-        <treeselect v-model="form.pid" :options="menus" style="width: 450px;" placeholder="选择上级类目" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit, getMenusTree } from '@/api/menu'
-import Treeselect from '@riophae/vue-treeselect'
-import IconSelect from '@/components/IconSelect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-export default {
-  components: { Treeselect, IconSelect },
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false, menus: [],
-      form: { name: '', sort: 999, path: '', component: '', componentName: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false, type: 0, permission: '' },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ],
-        path: [
-          { required: true, message: '请输入地址', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else this.doEdit()
-        } else {
-          return false
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(() => {
-        this.loading = false
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(() => {
-        this.loading = false
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = { name: '', sort: 999, path: '', component: '', componentName: '', iframe: 'false', roles: [], pid: 0, icon: '', cache: false, hidden: false, type: 0, permission: '' }
-    },
-    selected(name) {
-      this.form.icon = name
-    },
-    getMenus() {
-      getMenusTree().then(res => {
-        this.menus = []
-        const menu = { id: 0, label: '顶级类目', children: [] }
-        menu.children = res
-        this.menus.push(menu)
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
-    text-align: left;
-  }
-</style>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 2b192b2..cfa388d 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -3,9 +3,9 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable size="small" placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.blurry" clearable size="small" placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
-        v-model="query.date"
+        v-model="query.createTime"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
@@ -17,31 +17,97 @@
       />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
-      <div v-permission="['admin','menu:add']" style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增</el-button>
-      </div>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增</el-button>
       <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="download"
-        >导出</el-button>
-      </div>
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="downloadMethod"
+      >导出</el-button>
     </div>
-    <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
+    <!--表单渲染-->
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="getFormTitle()" append-to-body width="580px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="菜单类型" prop="type">
+          <el-radio-group v-model="form.type" size="mini" style="width: 178px">
+            <el-radio-button label="0">目录</el-radio-button>
+            <el-radio-button label="1">菜单</el-radio-button>
+            <el-radio-button label="2">按钮</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() !== '2'" label="菜单图标" prop="icon">
+          <el-popover
+            placement="bottom-start"
+            width="450"
+            trigger="click"
+            @show="$refs['iconSelect'].reset()"
+          >
+            <IconSelect ref="iconSelect" @selected="selected" />
+            <el-input slot="reference" v-model="form.icon" style="width: 450px;" placeholder="点击选择图标" readonly>
+              <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon" style="height: 32px;width: 16px;" />
+              <i v-else slot="prefix" class="el-icon-search el-input__icon" />
+            </el-input>
+          </el-popover>
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() !== '2'" label="外链菜单" prop="iframe">
+          <el-radio-group v-model="form.iframe" size="mini">
+            <el-radio-button label="true">是</el-radio-button>
+            <el-radio-button label="false">否</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() === '1'" label="菜单缓存" prop="cache">
+          <el-radio-group v-model="form.cache" size="mini">
+            <el-radio-button label="true">是</el-radio-button>
+            <el-radio-button label="false">否</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() !== '2'" label="菜单可见" prop="hidden">
+          <el-radio-group v-model="form.hidden" size="mini">
+            <el-radio-button label="false">是</el-radio-button>
+            <el-radio-button label="true">否</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() !== '2'" label="菜单标题" prop="name">
+          <el-input v-model="form.name" :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 178px'" placeholder="菜单标题" />
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() === '2'" label="按钮名称" prop="name">
+          <el-input v-model="form.name" placeholder="按钮名称" style="width: 178px;" />
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() !== '0'" label="权限标识" prop="permission">
+          <el-input v-model="form.permission" :disabled="form.iframe === 'true'" placeholder="权限标识" style="width: 178px;" />
+        </el-form-item>
+        <el-form-item v-if="form.type.toString() !== '2'" label="路由地址" prop="path">
+          <el-input v-model="form.path" placeholder="路由地址" style="width: 178px;" />
+        </el-form-item>
+        <el-form-item label="菜单排序" prop="sort">
+          <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 178px;" />
+        </el-form-item>
+        <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件名称" prop="componentName">
+          <el-input v-model="form.componentName" style="width: 178px;" placeholder="匹配组件内Name字段" />
+        </el-form-item>
+        <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件路径" prop="component">
+          <el-input v-model="form.component" style="width: 178px;" placeholder="组件路径" />
+        </el-form-item>
+        <el-form-item label="上级类目" prop="pid">
+          <treeselect v-model="form.pid" :options="menus" style="width: 450px;" placeholder="选择上级类目" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :default-expand-all="expand" row-key="id" size="small">
+    <el-table v-loading="loading" :data="data" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id" size="small">
       <el-table-column :show-overflow-tooltip="true" label="菜单名称" width="125px" prop="name" />
       <el-table-column prop="icon" label="图标" align="center" width="60px">
         <template slot-scope="scope">
@@ -82,7 +148,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','menu:edit','menu:del'])" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','menu:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-button v-permission="['admin','menu:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
           <el-popover
             :ref="scope.row.id"
             v-permission="['admin','menu:del']"
@@ -92,7 +158,7 @@
             <p>确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -103,18 +169,29 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission' // 权限判断函数
-import initData from '@/mixins/initData'
-import { del, downloadMenu } from '@/api/menu'
-import { parseTime, downloadFile } from '@/utils/index'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import crudMenu from '@/api/system/menu'
+import Treeselect from '@riophae/vue-treeselect'
+import IconSelect from '@/components/IconSelect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   name: 'Menu',
-  components: { eForm },
-  mixins: [initData],
+  components: { Treeselect, IconSelect },
+  mixins: [crud],
   data() {
     return {
-      delLoading: false, expand: false
+      title: '菜单',
+      crudMethod: { ...crudMenu },
+      menus: [],
+      form: { name: null, sort: 999, path: null, component: null, componentName: null, iframe: false, roles: [], pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        path: [
+          { required: true, message: '请输入地址', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
@@ -123,68 +200,35 @@ export default {
     })
   },
   methods: {
-    parseTime,
-    checkPermission,
     beforeInit() {
       this.url = 'api/menus'
-      const sort = 'id,desc'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['blurry'] = value }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
+    // 打开新增弹窗前做的操作
+    beforeShowAddForm() {
+      this.getMenus()
     },
-    add() {
-      this.isAdd = true
-      this.$refs.form.getMenus()
-      this.$refs.form.dialog = true
+    // 打开新增弹窗前做的操作
+    beforeShowEditForm() {
+      this.getMenus()
     },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.getMenus()
-      _this.form = { id: data.id, component: data.component, componentName: data.componentName, name: data.name, sort: data.sort, pid: data.pid, path: data.path, iframe: data.iframe.toString(), roles: [], icon: data.icon, cache: data.cache, hidden: data.hidden, type: data.type, permission: data.permission }
-      _this.dialog = true
+    selected(name) {
+      this.form.icon = name
     },
-    changExpand() {
-      this.expand = !this.expand
-      this.init()
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadMenu(this.params).then(result => {
-        downloadFile(result, '菜单列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
+    getMenus() {
+      this.crudMethod.getMenusTree().then(res => {
+        this.menus = []
+        const menu = { id: 0, label: '顶级类目', children: [] }
+        menu.children = res
+        this.menus.push(menu)
       })
     }
   }
 }
 </script>
 
-<style scoped>
-
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
 </style>
diff --git a/src/views/system/role/form.vue b/src/views/system/role/form.vue
deleted file mode 100644
index 9c320fc..0000000
--- a/src/views/system/role/form.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增角色' : '编辑角色'" append-to-body width="520px">
-    <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="角色名称" prop="name">
-        <el-input v-model="form.name" style="width: 145px;" />
-      </el-form-item>
-      <el-form-item label="角色权限" prop="permission">
-        <el-input v-model="form.permission" style="width: 145px;" />
-      </el-form-item>
-      <el-form-item label="数据范围">
-        <el-select v-model="form.dataScope" style="width: 145px" placeholder="请选择数据范围" @change="changeScope">
-          <el-option
-            v-for="item in dateScopes"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="角色级别" prop="sort">
-        <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
-      </el-form-item>
-      <el-form-item v-if="form.dataScope === '自定义'" label="数据权限">
-        <treeselect v-model="deptIds" :options="depts" multiple style="width: 380px" placeholder="请选择" />
-      </el-form-item>
-      <el-form-item label="描述信息">
-        <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDepts } from '@/api/dept'
-import { add, edit } from '@/api/role'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-export default {
-  components: { Treeselect },
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      dateScopes: ['全部', '本级', '自定义'],
-      loading: false, dialog: false, depts: [], deptIds: [],
-      form: { name: '', depts: [], remark: '', dataScope: '本级', level: 3, permission: '' },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ],
-        permission: [
-          { required: true, message: '请输入权限', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      if (this.form.dataScope === '自定义' && this.deptIds.length === 0) {
-        this.$message({
-          message: '自定义数据权限不能为空',
-          type: 'warning'
-        })
-      } else {
-        this.form.depts = []
-        if (this.form.dataScope === '自定义') {
-          for (let i = 0; i < this.deptIds.length; i++) {
-            this.form.depts.push({
-              id: this.deptIds[i]
-            })
-          }
-        }
-        this.$refs['form'].validate((valid) => {
-          if (valid) {
-            this.loading = true
-            if (this.isAdd) {
-              this.doAdd()
-            } else this.doEdit()
-          } else {
-            return false
-          }
-        })
-      }
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = { name: '', depts: [], remark: '', dataScope: '本级', level: 3, permission: '' }
-    },
-    getDepts() {
-      getDepts({ enabled: true }).then(res => {
-        this.depts = res.content
-      })
-    },
-    changeScope() {
-      if (this.form.dataScope === '自定义') {
-        this.getDepts()
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
-    text-align: left;
-  }
-</style>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 8e530e2..85ffa0c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,13 +1,11 @@
 <template>
   <div class="app-container">
-    <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" size="small" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.blurry" size="small" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
-        v-model="query.date"
+        v-model="query.createTime"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
@@ -19,27 +17,57 @@
       />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
-      <div v-permission="['admin','roles:add']" style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增</el-button>
-      </div>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增</el-button>
       <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="download"
-        >导出</el-button>
-      </div>
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="downloadMethod"
+      >导出</el-button>
     </div>
+    <!-- 表单渲染 -->
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="getFormTitle()" append-to-body width="520px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="角色名称" prop="name">
+          <el-input v-model="form.name" style="width: 145px;" />
+        </el-form-item>
+        <el-form-item label="角色权限" prop="permission">
+          <el-input v-model="form.permission" style="width: 145px;" />
+        </el-form-item>
+        <el-form-item label="数据范围" prop="dataScope">
+          <el-select v-model="form.dataScope" style="width: 145px" placeholder="请选择数据范围" @change="changeScope">
+            <el-option
+              v-for="item in dateScopes"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="角色级别" prop="level">
+          <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
+        </el-form-item>
+        <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
+          <treeselect v-model="form.depts" :options="depts" multiple style="width: 380px" placeholder="请选择" />
+        </el-form-item>
+        <el-form-item label="描述信息" prop="remark">
+          <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
     <el-row :gutter="15">
       <!--角色管理-->
       <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="17" style="margin-bottom: 10px">
@@ -53,14 +81,14 @@
             <el-table-column prop="permission" label="角色权限" />
             <el-table-column prop="level" label="角色级别" />
             <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述" />
-            <el-table-column :show-overflow-tooltip="true" width="130px" prop="createTime" label="创建日期">
+            <el-table-column :show-overflow-tooltip="true" width="135px" prop="createTime" label="创建日期">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
             <el-table-column v-if="checkPermission(['admin','roles:edit','roles:del'])" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
-                <el-button v-permission="['admin','roles:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+                <el-button v-permission="['admin','roles:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
                 <el-popover
                   :ref="scope.row.id"
                   v-permission="['admin','roles:del']"
@@ -70,7 +98,7 @@
                   <p>确定删除本条数据吗？</p>
                   <div style="text-align: right; margin: 0">
                     <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                    <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                    <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
                   </div>
                   <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
                 </el-popover>
@@ -88,7 +116,7 @@
           />
         </el-card>
       </el-col>
-      <!-- 授权 -->
+      <!-- 菜单授权 -->
       <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="7">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
@@ -123,25 +151,36 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del } from '@/api/role'
-import { getMenusTree } from '@/api/menu'
-import { parseTime, downloadFile } from '@/utils/index'
-import eForm from './form'
-import { editMenu, get, downloadRole } from '@/api/role'
+import crud from '@/mixins/crud'
+import crudRoles from '@/api/system/role'
+import { getDepts } from '@/api/system/dept'
+import { getMenusTree } from '@/api/system/menu'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   name: 'Role',
-  components: { eForm },
-  mixins: [initData],
+  components: { Treeselect },
+  mixins: [crud],
   data() {
     return {
       defaultProps: {
         children: 'children',
         label: 'label'
       },
+      title: '角色',
+      dateScopes: ['全部', '本级', '自定义'],
+      crudMethod: { ...crudRoles },
       currentId: 0, menuLoading: false, showButton: false,
-      delLoading: false, menus: [], menuIds: []
+      menus: [], menuIds: [], depts: [],
+      form: { name: null, depts: [], remark: null, dataScope: null, level: 3, permission: null },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        permission: [
+          { required: true, message: '请输入权限', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
@@ -151,41 +190,42 @@ export default {
     })
   },
   methods: {
-    parseTime,
-    checkPermission,
     beforeInit() {
       this.showButton = false
       this.url = 'api/roles'
-      const sort = 'level,asc'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['blurry'] = value }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
+      this.sort = 'level,asc'
       // 清空菜单的选中
       this.$refs.menu.setCheckedKeys([])
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
+    // 打开编辑弹窗前做的操作
+    beforeShowEditForm(data) {
+      if (data.dataScope === '自定义') {
+        this.getDepts()
+      }
+      const depts = []
+      data.depts.forEach(function(dept, index) {
+        depts.push(dept.id)
       })
+      this.form.depts = depts
+    },
+    // 提交前做的操作
+    beforeSubmitMethod() {
+      if (this.form.dataScope === '自定义' && this.form.depts.length === 0) {
+        this.$message({
+          message: '自定义数据权限不能为空',
+          type: 'warning'
+        })
+        return false
+      } else {
+        const depts = []
+        this.form.depts.forEach(function(data, index) {
+          const dept = { id: data }
+          depts.push(dept)
+        })
+        this.form.depts = depts
+      }
+      return true
     },
     getMenus() {
       getMenusTree().then(res => {
@@ -222,12 +262,8 @@ export default {
         const menu = { id: data }
         role.menus.push(menu)
       })
-      editMenu(role).then(res => {
-        this.$notify({
-          title: '保存成功',
-          type: 'success',
-          duration: 2500
-        })
+      this.crudMethod.editMenu(role).then(res => {
+        this.notify('保存成功', 'success')
         this.menuLoading = false
         this.update()
       }).catch(err => {
@@ -237,7 +273,7 @@ export default {
     },
     update() {
       // 无刷新更新 表格数据
-      get(this.currentId).then(res => {
+      this.crudMethod.get(this.currentId).then(res => {
         for (let i = 0; i < this.data.length; i++) {
           if (res.id === this.data[i].id) {
             this.data[i] = res
@@ -246,32 +282,15 @@ export default {
         }
       })
     },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.deptIds = []
-      _this.form = { id: data.id, name: data.name, remark: data.remark, depts: data.depts, dataScope: data.dataScope, level: data.level, permission: data.permission }
-      if (_this.form.dataScope === '自定义') {
-        _this.getDepts()
-      }
-      for (let i = 0; i < _this.form.depts.length; i++) {
-        _this.deptIds[i] = _this.form.depts[i].id
-      }
-      _this.dialog = true
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadRole(this.params).then(result => {
-        downloadFile(result, '角色列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
+    getDepts() {
+      getDepts({ enabled: true }).then(res => {
+        this.depts = res.content
       })
+    },
+    changeScope() {
+      if (this.form.dataScope === '自定义') {
+        this.getDepts()
+      }
     }
   }
 }
@@ -284,8 +303,8 @@ export default {
   }
 </style>
 
-<style scoped>
-  /deep/ .el-tree-node__label{
-    margin-left: 5px;
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
   }
 </style>
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index b3d315f..a16e2a1 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -136,7 +136,7 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del, updateIsPause, execution, add, edit, downloadJobs } from '@/api/timing'
+import { del, updateIsPause, execution, add, edit, downloadJobs } from '@/api/system/timing'
 import { parseTime, downloadFile } from '@/utils/index'
 import Log from './log'
 export default {
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
index e8b54e0..7bd1b78 100644
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -75,7 +75,7 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { downloadLogs } from '@/api/timing'
+import { downloadLogs } from '@/api/system/timing'
 import { parseTime, downloadFile } from '@/utils/index'
 export default {
   mixins: [initData],
diff --git a/src/views/system/user/center/updateEmail.vue b/src/views/system/user/center/updateEmail.vue
index 55e3da8..2e0478f 100644
--- a/src/views/system/user/center/updateEmail.vue
+++ b/src/views/system/user/center/updateEmail.vue
@@ -24,8 +24,8 @@
 <script>
 import store from '@/store'
 import { validEmail } from '@/utils/validate'
-import { updateEmail } from '@/api/user'
-import { resetEmail } from '@/api/code'
+import { updateEmail } from '@/api/system/user'
+import { resetEmail } from '@/api/system/code'
 export default {
   props: {
     email: {
diff --git a/src/views/system/user/center/updatePass.vue b/src/views/system/user/center/updatePass.vue
index a98edd5..078ed17 100644
--- a/src/views/system/user/center/updatePass.vue
+++ b/src/views/system/user/center/updatePass.vue
@@ -22,7 +22,7 @@
 
 <script>
 import store from '@/store'
-import { updatePass } from '@/api/user'
+import { updatePass } from '@/api/system/user'
 export default {
   data() {
     const confirmPass = (rule, value, callback) => {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 056e95c..085b8b0 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -48,7 +48,7 @@
           >导出</el-button>
         </div>
         <!--表单渲染-->
-        <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="hideFormDialog" :title="getFormTitle()" append-to-body width="570px">
+        <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="getFormTitle()" append-to-body width="570px">
           <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
             <el-form-item label="用户名" prop="username">
               <el-input v-model="form.username" />
@@ -88,7 +88,7 @@
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
-            <el-button type="text" @click="hideFormDialog">取消</el-button>
+            <el-button type="text" @click="cancel">取消</el-button>
             <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
           </div>
         </el-dialog>
@@ -152,11 +152,11 @@
 
 <script>
 import crud from '@/mixins/crud'
-import crudUser from '@/api/user'
+import crudUser from '@/api/system/user'
 import { isvalidPhone } from '@/utils/validate'
-import { getDepts } from '@/api/dept'
-import { getAll, getLevel } from '@/api/role'
-import { getAllJob } from '@/api/job'
+import { getDepts } from '@/api/system/dept'
+import { getAll, getLevel } from '@/api/system/role'
+import { getAllJob } from '@/api/system/job'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
diff --git a/src/views/tools/aliPay/config.vue b/src/views/tools/aliPay/config.vue
index ecc8459..751e766 100644
--- a/src/views/tools/aliPay/config.vue
+++ b/src/views/tools/aliPay/config.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { get, update } from '@/api/alipay'
+import { get, update } from '@/api/tools/alipay'
 export default {
   name: 'Config',
   data() {
diff --git a/src/views/tools/aliPay/toPay.vue b/src/views/tools/aliPay/toPay.vue
index e65bf38..595cf08 100644
--- a/src/views/tools/aliPay/toPay.vue
+++ b/src/views/tools/aliPay/toPay.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { toAliPay } from '@/api/alipay'
+import { toAliPay } from '@/api/tools/alipay'
 export default {
   data() {
     return {
diff --git a/src/views/tools/email/config.vue b/src/views/tools/email/config.vue
index e30fabc..b72b724 100644
--- a/src/views/tools/email/config.vue
+++ b/src/views/tools/email/config.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import { get, update } from '@/api/email'
+import { get, update } from '@/api/tools/email'
 export default {
   name: 'Config',
   data() {
diff --git a/src/views/tools/email/send.vue b/src/views/tools/email/send.vue
index 7cef15f..e6cd3a1 100644
--- a/src/views/tools/email/send.vue
+++ b/src/views/tools/email/send.vue
@@ -22,7 +22,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
-import { send } from '@/api/email'
+import { send } from '@/api/tools/email'
 import { validEmail } from '@/utils/validate'
 import E from 'wangeditor'
 export default {
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index a65a23d..dc73679 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -123,7 +123,7 @@ import checkPermission from '@/utils/permission' // 权限判断函数
 import initData from '@/mixins/initData'
 import { parseTime, downloadFile } from '@/utils/index'
 import { mapGetters } from 'vuex'
-import { del, delAll, downloadPicture } from '@/api/picture'
+import { del, delAll, downloadPicture } from '@/api/tools/picture'
 import { getToken } from '@/utils/auth'
 export default {
   name: 'Pictures',
diff --git a/src/views/tools/storage/local/form.vue b/src/views/tools/storage/local/form.vue
index 1c24f41..dfa8bb2 100644
--- a/src/views/tools/storage/local/form.vue
+++ b/src/views/tools/storage/local/form.vue
@@ -31,7 +31,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
-import { edit } from '@/api/localStorage'
+import { edit } from '@/api/tools/localStorage'
 export default {
   props: {
     isAdd: {
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index 920e09c..1479435 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -140,7 +140,7 @@
 import { mapGetters } from 'vuex'
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del, delAll, downloadStorage } from '@/api/localStorage'
+import { del, delAll, downloadStorage } from '@/api/tools/localStorage'
 import { parseTime, downloadFile } from '@/utils/index'
 import eForm from './form'
 export default {
diff --git a/src/views/tools/storage/qiniu/form.vue b/src/views/tools/storage/qiniu/form.vue
index 5540732..586106c 100644
--- a/src/views/tools/storage/qiniu/form.vue
+++ b/src/views/tools/storage/qiniu/form.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import { get, update } from '@/api/qiniu'
+import { get, update } from '@/api/tools/qiniu'
 export default {
   data() {
     return {
diff --git a/src/views/tools/storage/qiniu/index.vue b/src/views/tools/storage/qiniu/index.vue
index 61d8d5f..57e3e96 100644
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -125,7 +125,7 @@
 
 <script>
 import initData from '@/mixins/initData'
-import { del, download, sync, delAll, downloadQiNiu } from '@/api/qiniu'
+import { del, download, sync, delAll, downloadQiNiu } from '@/api/tools/qiniu'
 import { parseTime, downloadFile } from '@/utils/index'
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'

From f7d78f4b986402e7a46b21ced7265ab3b0f178fb Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sat, 23 Nov 2019 21:53:02 +0800
Subject: [PATCH 21/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/monitor/online.js                     |   9 --
 src/api/system/dict.js                        |   9 +-
 src/api/system/dictDetail.js                  |   2 +
 src/assets/styles/eladmin.scss                |   1 -
 src/mixins/crud.js                            |   7 +-
 src/views/monitor/log/errorLog.vue            |  17 +--
 src/views/monitor/log/index.vue               |  16 +--
 src/views/monitor/log/search.vue              |  41 ++----
 src/views/monitor/online/index.vue            |  60 ++++-----
 src/views/system/dept/index.vue               |   5 +-
 .../index.vue => dict/dictDetail.vue}         |  99 +++++++--------
 src/views/system/dict/form.vue                | 101 ---------------
 src/views/system/dict/index.vue               | 119 +++++++-----------
 src/views/system/dictDetail/form.vue          | 116 -----------------
 src/views/system/job/index.vue                |   4 +
 src/views/system/menu/index.vue               |   9 +-
 src/views/system/role/index.vue               |   7 ++
 17 files changed, 155 insertions(+), 467 deletions(-)
 rename src/views/system/{dictDetail/index.vue => dict/dictDetail.vue} (53%)
 delete mode 100644 src/views/system/dict/form.vue
 delete mode 100644 src/views/system/dictDetail/form.vue

diff --git a/src/api/monitor/online.js b/src/api/monitor/online.js
index cdfe120..fc9a90c 100644
--- a/src/api/monitor/online.js
+++ b/src/api/monitor/online.js
@@ -6,12 +6,3 @@ export function del(key) {
     method: 'delete'
   })
 }
-
-export function downloadOnline(params) {
-  return request({
-    url: 'auth/online/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a5a8f72..11911cf 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -30,11 +30,4 @@ export function edit(data) {
   })
 }
 
-export function downloadDict(params) {
-  return request({
-    url: 'api/dict/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
+export default { add, edit, del }
diff --git a/src/api/system/dictDetail.js b/src/api/system/dictDetail.js
index b03d1cc..e8dc512 100644
--- a/src/api/system/dictDetail.js
+++ b/src/api/system/dictDetail.js
@@ -48,3 +48,5 @@ export function edit(data) {
     data
   })
 }
+
+export default { add, edit, del }
diff --git a/src/assets/styles/eladmin.scss b/src/assets/styles/eladmin.scss
index c23186d..92d8272 100644
--- a/src/assets/styles/eladmin.scss
+++ b/src/assets/styles/eladmin.scss
@@ -93,4 +93,3 @@
   font-family: Courier New, serif;
   font-size: 12px
 }
-
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
index 65e00a9..c429c8d 100644
--- a/src/mixins/crud.js
+++ b/src/mixins/crud.js
@@ -37,10 +37,8 @@ export default {
       form: {},
       // 重置表单
       resetForm: {},
-      // 弹窗的标题
-      title: '',
-      // 方法
-      method: ''
+      // 标题
+      title: ''
     }
   },
   methods: {
@@ -159,6 +157,7 @@ export default {
       this.delLoading = true
       this.crudMethod.del(id).then(() => {
         this.delLoading = false
+        console.log(this.$refs[id])
         this.$refs[id].doClose()
         this.dleChangePage()
         this.delSuccessNotify()
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index b78ffb7..31f5fd0 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -49,14 +49,13 @@
 </template>
 
 <script>
-import initData from '@/mixins/initData'
-import { parseTime } from '@/utils/index'
+import crud from '@/mixins/crud'
 import { getErrDetail } from '@/api/monitor/log'
 import Search from './search'
 export default {
   name: 'ErrorLog',
   components: { Search },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
       errorInfo: '', dialog: false
@@ -68,21 +67,13 @@ export default {
     })
   },
   methods: {
-    parseTime,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/logs/error'
-      const sort = 'id,desc'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['blurry'] = value }
       this.params['logType'] = 'ERROR'
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
       return true
     },
+    // 获取异常详情
     info(id) {
       this.dialog = true
       getErrDetail(id).then(res => {
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index 377196d..bbc6411 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -46,32 +46,22 @@
 </template>
 
 <script>
-import initData from '@/mixins/initData'
-import { parseTime } from '@/utils/index'
+import crud from '@/mixins/crud'
 import Search from './search'
 export default {
   name: 'Log',
   components: { Search },
-  mixins: [initData],
+  mixins: [crud],
   created() {
     this.$nextTick(() => {
       this.init()
     })
   },
+  // 获取数据前设置好接口地址
   methods: {
-    parseTime,
     beforeInit() {
       this.url = 'api/logs'
-      const sort = 'id,desc'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['blurry'] = value }
       this.params['logType'] = 'INFO'
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
       return true
     }
   }
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index 56f43f7..a2d0218 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="head-container">
-    <el-input v-model="query.value" clearable size="small" placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+    <el-input v-model="query.blurry" clearable size="small" placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" />
     <el-date-picker
-      v-model="query.date"
+      v-model="query.createTime"
       :default-time="['00:00:00','23:59:59']"
       type="daterange"
       range-separator=":"
@@ -14,45 +14,24 @@
     />
     <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$parent.toQuery">搜索</el-button>
     <!-- 导出 -->
-    <div style="display: inline-block;">
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="download"
-      >导出</el-button>
-    </div>
+    <el-button
+      :loading="$parent.downloadLoading"
+      size="mini"
+      class="filter-item"
+      type="warning"
+      icon="el-icon-download"
+      @click="$parent.downloadMethod"
+    >导出</el-button>
   </div>
 </template>
 
 <script>
-import { downloadFile } from '@/utils/index'
-import { downloadLog } from '@/api/monitor/log'
 export default {
   props: {
     query: {
       type: Object,
       required: true
     }
-  },
-  data() {
-    return {
-      downloadLoading: false
-    }
-  },
-  methods: {
-    download() {
-      this.$parent.beforeInit()
-      this.downloadLoading = true
-      downloadLog(this.$parent.params).then(result => {
-        downloadFile(result, '系统日志列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
-    }
   }
 }
 </script>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 978c251..373743d 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -1,19 +1,17 @@
 <template>
   <div class="app-container">
     <div class="head-container">
-      <el-input v-model="query.value" clearable size="small" placeholder="全表模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.filter" clearable size="small" placeholder="全表模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="download"
-        >导出</el-button>
-      </div>
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="downloadMethod"
+      >导出</el-button>
     </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
@@ -38,7 +36,7 @@
             <p>确定踢出该用户吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.$index, scope.row.key)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.key, scope.$index)">确定</el-button>
             </div>
             <el-button slot="reference" size="mini" type="text">踢出</el-button>
           </el-popover>
@@ -58,15 +56,15 @@
 </template>
 
 <script>
-import initData from '@/mixins/initData'
-import { parseTime, downloadFile } from '@/utils/index'
-import { del, downloadOnline } from '@/api/monitor/online'
+import crud from '@/mixins/crud'
+import { del } from '@/api/monitor/online'
 export default {
   name: 'OnlineUser',
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false
+      title: '在线用户',
+      crudMethod: { del }
     }
   },
   created() {
@@ -75,39 +73,23 @@ export default {
     })
   },
   methods: {
-    parseTime,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'auth/online'
-      this.params = { page: this.page, size: this.size }
-      if (this.query.value) { this.params['filter'] = this.query.value }
       return true
     },
-    subDelete(index, key) {
+    // 踢出用户
+    delMethod(key, index) {
       this.delLoading = true
-      del(key).then(res => {
+      this.crudMethod.del(key).then(() => {
         this.delLoading = false
         this.$refs[index].doClose()
         this.dleChangePage()
+        this.notify('踢出成功', 'success')
         this.init()
-        this.$notify({
-          title: '踢出成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
+      }).catch(() => {
         this.delLoading = false
         this.$refs[index].doClose()
-        console.log(err.response.data.message)
-      })
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadOnline(this.params).then(result => {
-        downloadFile(result, '在线用户列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
       })
     }
   }
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 16fccd6..7e941c1 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -130,6 +130,7 @@ export default {
     })
   },
   methods: {
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/dept'
       return true
@@ -138,11 +139,12 @@ export default {
     beforeShowAddForm() {
       this.getDepts()
     },
-    // 打开新增弹窗前做的操作
+    // 打开编辑弹窗前做的操作
     beforeShowEditForm(data) {
       this.getDepts()
       this.form.enabled = data.enabled.toString()
     },
+    // 提交前先做下验证
     beforeSubmitMethod() {
       if (!this.form.pid) {
         this.$message({
@@ -170,6 +172,7 @@ export default {
         data.enabled = !data.enabled
       })
     },
+    // 获取所有部门
     getDepts() {
       this.crudMethod.getDepts({ enabled: true }).then(res => {
         this.depts = res.content
diff --git a/src/views/system/dictDetail/index.vue b/src/views/system/dict/dictDetail.vue
similarity index 53%
rename from src/views/system/dictDetail/index.vue
rename to src/views/system/dict/dictDetail.vue
index f76be64..0cbf6dc 100644
--- a/src/views/system/dictDetail/index.vue
+++ b/src/views/system/dict/dictDetail.vue
@@ -7,11 +7,27 @@
       <!--工具栏-->
       <div class="head-container">
         <!-- 搜索 -->
-        <el-input v-model="query.value" clearable size="small" placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+        <el-input v-model="query.label" clearable size="small" placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
         <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       </div>
       <!--表单组件-->
-      <eForm ref="form" :is-add="isAdd" :dict-id="dictId" />
+      <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="字典标签" prop="label">
+            <el-input v-model="form.label" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="字典值">
+            <el-input v-model="form.value" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="排序" prop="sort">
+            <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="cancel">取消</el-button>
+          <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        </div>
+      </el-dialog>
       <!--表格渲染-->
       <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
         <el-table-column label="所属字典">
@@ -22,7 +38,7 @@
         <el-table-column prop="sort" label="排序" />
         <el-table-column v-if="checkPermission(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+            <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
             <el-popover
               :ref="scope.row.id"
               v-permission="['admin','dict:del']"
@@ -32,7 +48,7 @@
               <p>确定删除本条数据吗？</p>
               <div style="text-align: right; margin: 0">
                 <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
               </div>
               <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
             </el-popover>
@@ -53,71 +69,42 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del } from '@/api/system/dictDetail'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import crudDictDetail from '@/api/system/dictDetail'
 export default {
-  components: { eForm },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false, dictName: '', dictId: 0
+      title: '字典详情',
+      sort: ['sort,asc', 'id,desc'],
+      crudMethod: { ...crudDictDetail },
+      dictName: '',
+      form: { id: null, label: null, value: null, dict: { id: null }, sort: 999 },
+      rules: {
+        label: [
+          { required: true, message: '请输入字典标签', trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
+        ]
+      }
     }
   },
-  created() {
-    this.loading = false
-  },
   methods: {
-    checkPermission,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/dictDetail'
-      this.params = { page: this.page, size: this.size, dictName: this.dictName }
-      const query = this.query
-      const value = query.value
-      if (value) { this.params['label'] = value }
-      return true
-    },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        label: data.label,
-        value: data.value,
-        sort: data.sort
+      if (this.dictName) {
+        this.params['dictName'] = this.dictName
       }
-      _this.dialog = true
+      return true
     }
   }
 }
 </script>
 
-<style scoped>
-  .my-code{
-    padding: 15px;
-    line-height: 20px;
-    border-left: 3px solid #ddd;
-    color: #333;
-    font-family: Courier New;
-    font-size: 12px
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
   }
 </style>
diff --git a/src/views/system/dict/form.vue b/src/views/system/dict/form.vue
deleted file mode 100644
index ac76a08..0000000
--- a/src/views/system/dict/form.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增字典' : '编辑字典'" width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="字典名称" prop="name">
-        <el-input v-model="form.name" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item label="描述">
-        <el-input v-model="form.remark" style="width: 370px;" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/system/dict'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false,
-      form: {
-        id: '',
-        name: '',
-        remark: ''
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else this.doEdit()
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        name: '',
-        remark: ''
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 1f1e434..ba756af 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,12 +1,27 @@
 <template>
   <div class="app-container">
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="字典名称" prop="name">
+          <el-input v-model="form.name" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="描述">
+          <el-input v-model="form.remark" style="width: 370px;" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
+    <!-- 字典列表 -->
     <el-row :gutter="10">
       <el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10" style="margin-bottom: 10px">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
             <span>字典列表</span>
+            <!-- 新增 -->
             <el-button
               v-permission="['admin','dict:add']"
               class="filter-item"
@@ -14,25 +29,23 @@
               style="float: right;padding: 4px 10px"
               type="primary"
               icon="el-icon-plus"
-              @click="$refs.form.dialog = true;isAdd = true"
+              @click="showAddFormDialog"
             >新增</el-button>
           </div>
           <!--工具栏-->
           <div class="head-container">
             <!-- 搜索 -->
-            <el-input v-model="query.value" clearable size="small" placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+            <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
             <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
             <!-- 导出 -->
-            <div style="display: inline-block;">
-              <el-button
-                :loading="downloadLoading"
-                size="mini"
-                class="filter-item"
-                type="warning"
-                icon="el-icon-download"
-                @click="download"
-              >导出</el-button>
-            </div>
+            <el-button
+              :loading="downloadLoading"
+              size="mini"
+              class="filter-item"
+              type="warning"
+              icon="el-icon-download"
+              @click="downloadMethod"
+            >导出</el-button>
           </div>
           <!--表格渲染-->
           <el-table v-loading="loading" :data="data" size="small" highlight-current-row style="width: 100%;" @current-change="handleCurrentChange">
@@ -40,7 +53,7 @@
             <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述" />
             <el-table-column v-if="checkPermission(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
-                <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+                <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
                 <el-popover
                   :ref="scope.row.id"
                   v-permission="['admin','dict:del']"
@@ -50,7 +63,7 @@
                   <p>此操作将删除字典与对应的字典详情，确定要删除吗？</p>
                   <div style="text-align: right; margin: 0">
                     <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                    <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                    <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
                   </div>
                   <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
                 </el-popover>
@@ -68,6 +81,7 @@
           />
         </el-card>
       </el-col>
+      <!-- 字典详情列表 -->
       <el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="14">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
@@ -79,7 +93,7 @@
               style="float: right;padding: 4px 10px"
               type="primary"
               icon="el-icon-plus"
-              @click="$refs.dictDetail.$refs.form.dialog = true;$refs.dictDetail.isAdd = true"
+              @click="$refs.dictDetail.showAddFormDialog"
             >新增</el-button>
           </div>
           <dictDetail ref="dictDetail" />
@@ -90,23 +104,27 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del, downloadDict } from '@/api/system/dict'
-import dictDetail from '../dictDetail/index'
-import { downloadFile } from '@/utils/index'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import dictDetail from './dictDetail'
+import crudDict from '@/api/system/dict'
 export default {
   name: 'Dict',
-  components: { dictDetail, eForm },
-  mixins: [initData],
+  components: { dictDetail },
+  mixins: [crud],
   data() {
     return {
-      delLoading: false,
+      title: '字典',
+      crudMethod: { ...crudDict },
       queryTypeOptions: [
         { key: 'name', display_name: '字典名称' },
         { key: 'remark', display_name: '描述' }
-      ]
+      ],
+      form: { id: null, name: null, remark: null },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
@@ -115,69 +133,26 @@ export default {
     })
   },
   methods: {
-    checkPermission,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/dict'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const value = query.value
-      if (value) { this.params['blurry'] = value }
       if (this.$refs.dictDetail) {
         this.$refs.dictDetail.data = []
         this.$refs.dictDetail.dictName = ''
       }
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
-    },
+    // 选中字典后，设置字典详情数据
     handleCurrentChange(val) {
       if (val) {
         this.$refs.dictDetail.dictName = val.name
-        this.$refs.dictDetail.dictId = val.id
+        this.$refs.dictDetail.form.dict.id = val.id
         this.$refs.dictDetail.init()
       }
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        name: data.name,
-        remark: data.remark
-      }
-      _this.dialog = true
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadDict(this.params).then(result => {
-        downloadFile(result, '字典列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
     }
   }
 }
 </script>
 
 <style scoped>
-
 </style>
diff --git a/src/views/system/dictDetail/form.vue b/src/views/system/dictDetail/form.vue
deleted file mode 100644
index f6e20ce..0000000
--- a/src/views/system/dictDetail/form.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增字典详情' : '编辑字典详情'" width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="字典标签" prop="label">
-        <el-input v-model="form.label" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item label="字典值">
-        <el-input v-model="form.value" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item label="排序" prop="sort">
-        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/system/dictDetail'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    },
-    dictId: {
-      type: Number,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false,
-      form: {
-        id: '',
-        label: '',
-        value: '',
-        sort: 999
-      },
-      rules: {
-        label: [
-          { required: true, message: '请输入字典标签', trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.form['dict'] = { id: this.dictId }
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else this.doEdit()
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        label: '',
-        value: '',
-        sort: '999'
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
-    text-align: left;
-  }
-</style>
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index 912ed69..4e2ceee 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -160,17 +160,21 @@ export default {
     })
   },
   methods: {
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/job'
       return true
     },
+    // 打开新增弹窗前做的操作
     beforeShowAddForm() {
       this.getDepts()
     },
+    // 打开编辑弹窗前做的操作
     beforeShowEditForm(data) {
       this.getDepts()
       this.form.enabled = data.enabled.toString()
     },
+    // 提交前的验证
     beforeSubmitMethod() {
       if (!this.form.dept.id) {
         this.notify('所属部门不能为空', 'warning')
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index cfa388d..f72e9b0 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -83,7 +83,7 @@
           <el-input v-model="form.name" placeholder="按钮名称" style="width: 178px;" />
         </el-form-item>
         <el-form-item v-show="form.type.toString() !== '0'" label="权限标识" prop="permission">
-          <el-input v-model="form.permission" :disabled="form.iframe === 'true'" placeholder="权限标识" style="width: 178px;" />
+          <el-input v-model="form.permission" :disabled="form.iframe" placeholder="权限标识" style="width: 178px;" />
         </el-form-item>
         <el-form-item v-if="form.type.toString() !== '2'" label="路由地址" prop="path">
           <el-input v-model="form.path" placeholder="路由地址" style="width: 178px;" />
@@ -91,10 +91,10 @@
         <el-form-item label="菜单排序" prop="sort">
           <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 178px;" />
         </el-form-item>
-        <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件名称" prop="componentName">
+        <el-form-item v-show="!form.iframe && form.type.toString() === '1'" label="组件名称" prop="componentName">
           <el-input v-model="form.componentName" style="width: 178px;" placeholder="匹配组件内Name字段" />
         </el-form-item>
-        <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件路径" prop="component">
+        <el-form-item v-show="!form.iframe && form.type.toString() === '1'" label="组件路径" prop="component">
           <el-input v-model="form.component" style="width: 178px;" placeholder="组件路径" />
         </el-form-item>
         <el-form-item label="上级类目" prop="pid">
@@ -200,6 +200,7 @@ export default {
     })
   },
   methods: {
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/menus'
       return true
@@ -212,9 +213,11 @@ export default {
     beforeShowEditForm() {
       this.getMenus()
     },
+    // 选中图标
     selected(name) {
       this.form.icon = name
     },
+    // 获取所有菜单
     getMenus() {
       this.crudMethod.getMenusTree().then(res => {
         this.menus = []
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 85ffa0c..70364a1 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -190,6 +190,7 @@ export default {
     })
   },
   methods: {
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.showButton = false
       this.url = 'api/roles'
@@ -227,11 +228,13 @@ export default {
       }
       return true
     },
+    // 获取所有菜单
     getMenus() {
       getMenusTree().then(res => {
         this.menus = res
       })
     },
+    // 触发单选
     handleCurrentChange(val) {
       if (val) {
         const _this = this
@@ -249,6 +252,7 @@ export default {
         })
       }
     },
+    // 保存菜单
     saveMenu() {
       this.menuLoading = true
       const role = { id: this.currentId, menus: [] }
@@ -271,6 +275,7 @@ export default {
         console.log(err.response.data.message)
       })
     },
+    // 改变数据
     update() {
       // 无刷新更新 表格数据
       this.crudMethod.get(this.currentId).then(res => {
@@ -282,11 +287,13 @@ export default {
         }
       })
     },
+    // 获取部门数据
     getDepts() {
       getDepts({ enabled: true }).then(res => {
         this.depts = res.content
       })
     },
+    // 如果数据权限为自定义则获取部门数据
     changeScope() {
       if (this.form.dataScope === '自定义') {
         this.getDepts()

From b428376ed1ebeb35d9238a2f7535d7fc1eeba2bb Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 24 Nov 2019 11:04:01 +0800
Subject: [PATCH 22/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/monitor/log.js            |   9 --
 src/api/monitor/redis.js          |   9 +-
 src/api/system/timing.js          |  18 +--
 src/views/monitor/redis/index.vue |  74 ++++--------
 src/views/system/timing/index.vue | 188 +++++++-----------------------
 src/views/system/timing/log.vue   |  48 ++------
 6 files changed, 80 insertions(+), 266 deletions(-)

diff --git a/src/api/monitor/log.js b/src/api/monitor/log.js
index 446c030..d776e7a 100644
--- a/src/api/monitor/log.js
+++ b/src/api/monitor/log.js
@@ -6,12 +6,3 @@ export function getErrDetail(id) {
     method: 'get'
   })
 }
-
-export function downloadLog(params) {
-  return request({
-    url: 'api/logs/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
diff --git a/src/api/monitor/redis.js b/src/api/monitor/redis.js
index fdd3cbc..a85f037 100644
--- a/src/api/monitor/redis.js
+++ b/src/api/monitor/redis.js
@@ -34,11 +34,4 @@ export function edit(data) {
   })
 }
 
-export function downloadRedis(params) {
-  return request({
-    url: 'api/redis/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
+export default { del, delAll }
diff --git a/src/api/system/timing.js b/src/api/system/timing.js
index fb95575..95e9497 100644
--- a/src/api/system/timing.js
+++ b/src/api/system/timing.js
@@ -37,20 +37,4 @@ export function execution(id) {
   })
 }
 
-export function downloadJobs(params) {
-  return request({
-    url: 'api/jobs/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
-
-export function downloadLogs(params) {
-  return request({
-    url: 'api/jobs/download/log',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
+export default { del, updateIsPause, execution, add, edit }
diff --git a/src/views/monitor/redis/index.vue b/src/views/monitor/redis/index.vue
index 7db2b22..017c837 100644
--- a/src/views/monitor/redis/index.vue
+++ b/src/views/monitor/redis/index.vue
@@ -3,23 +3,19 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable size="small" placeholder="输入关键词搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.key" clearable size="small" placeholder="输入Key搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <div style="display: inline-block;">
-        <!-- 清空缓存 -->
-        <el-button v-permission="['admin','redis:del']" :loading="deleteAllLoading" type="danger" size="mini" class="filter-item" icon="el-icon-delete" @click="deleteAll">清空</el-button>
-      </div>
+      <!-- 清空缓存 -->
+      <el-button v-permission="['admin','redis:del']" :loading="deleteAllLoading" type="danger" size="mini" class="filter-item" icon="el-icon-delete" @click="deleteAll">清空</el-button>
       <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="download"
-        >导出</el-button>
-      </div>
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="downloadMethod"
+      >导出</el-button>
     </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
@@ -42,7 +38,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.$index, scope.row)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.$index, scope.row)">确定</el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -62,16 +58,16 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission' // 权限判断函数
-import initData from '@/mixins/initData'
-import { del, delAll, downloadRedis } from '@/api/monitor/redis'
-import { downloadFile } from '@/utils/index'
+import crud from '@/mixins/crud'
+import crudRedis from '@/api/monitor/redis'
 export default {
   name: 'Redis',
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false, permissions: [], deleteAllLoading: false
+      title: '系统缓存',
+      crudMethod: { ...crudRedis },
+      deleteAllLoading: false
     }
   },
   created() {
@@ -80,35 +76,25 @@ export default {
     })
   },
   methods: {
-    checkPermission,
+
     beforeInit() {
       this.url = 'api/redis'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size }
-      if (value) {
-        this.params['key'] = value
-      } else {
+      if (!this.query.key) {
         this.params['key'] = '*'
       }
       return true
     },
-    subDelete(index, row) {
+    delMethod(index, row) {
       this.delLoading = true
-      del(row.key).then(res => {
+      this.crudMethod.del(row.key).then(res => {
         this.delLoading = false
         this.$refs[index].doClose()
         this.dleChangePage()
         this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
+        this.notify('删除成功', 'success')
+      }).catch(() => {
         this.delLoading = false
         this.$refs[index].doClose()
-        console.log(err.response.data.message)
       })
     },
     deleteAll() {
@@ -118,22 +104,12 @@ export default {
         type: 'warning'
       }).then(() => {
         this.deleteAllLoading = true
-        delAll().then(res => {
+        this.crudMethod.delAll().then(res => {
           this.page = 0
           this.init()
           this.deleteAllLoading = false
         })
       })
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadRedis(this.params).then(result => {
-        downloadFile(result, '缓存列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
     }
   }
 }
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index a16e2a1..b09b3c6 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -3,9 +3,9 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.jobName" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
-        v-model="query.date"
+        v-model="query.createTime"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
@@ -17,40 +17,34 @@
       />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
-      <div v-permission="['admin','timing:add']" style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="dialog = true;isAdd = true"
-        >新增</el-button>
-      </div>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增</el-button>
       <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="download"
-        >导出</el-button>
-      </div>
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="downloadMethod"
+      >导出</el-button>
       <!-- 任务日志 -->
-      <div style="display: inline-block;">
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="info"
-          icon="el-icon-tickets"
-          @click="doLog"
-        >日志</el-button>
-        <Log ref="log" />
-      </div>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-tickets"
+        @click="doLog"
+      >日志</el-button>
+      <Log ref="log" />
     </div>
     <!--Form表单-->
-    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="isAdd ? '新增任务' : '编辑任务'" append-to-body width="600px">
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="getFormTitle()" append-to-body width="600px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="任务名称" prop="jobName">
           <el-input v-model="form.jobName" style="width: 460px;" />
@@ -68,8 +62,8 @@
           <el-input v-model="form.cronExpression" style="width: 460px;" />
         </el-form-item>
         <el-form-item label="任务状态">
-          <el-radio v-model="form.isPause" label="false">启用</el-radio>
-          <el-radio v-model="form.isPause" label="true">暂停</el-radio>
+          <el-radio v-model="form.isPause" :label="false">启用</el-radio>
+          <el-radio v-model="form.isPause" :label="true">暂停</el-radio>
         </el-form-item>
         <el-form-item label="任务描述">
           <el-input v-model="form.remark" style="width: 460px;" rows="2" type="textarea" />
@@ -77,7 +71,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
@@ -100,7 +94,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','timing:edit','timing:del'])" label="操作" width="180px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="edit(scope.row)">编辑</el-button>
+          <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="showEditFormDialog(scope.row)">编辑</el-button>
           <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
           <el-button v-permission="['admin',,'timing:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
             {{ scope.row.isPause ? '恢复' : '暂停' }}
@@ -114,7 +108,7 @@
             <p>确定停止并删除该任务吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" type="text" size="mini">删除</el-button>
           </el-popover>
@@ -134,20 +128,18 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del, updateIsPause, execution, add, edit, downloadJobs } from '@/api/system/timing'
-import { parseTime, downloadFile } from '@/utils/index'
+import crud from '@/mixins/crud'
+import crudJob from '@/api/system/timing'
 import Log from './log'
 export default {
   name: 'Timing',
   components: { Log },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false, isAdd: false,
-      loading: false, dialog: false,
-      form: { jobName: '', beanName: '', methodName: '', params: '', cronExpression: '', isPause: 'false', remark: '' }, permissionIds: [],
+      title: '定时任务',
+      crudMethod: { ...crudJob },
+      form: { jobName: null, beanName: null, methodName: null, params: null, cronExpression: null, isPause: false, remark: null },
       rules: {
         jobName: [
           { required: true, message: '请输入任务名称', trigger: 'blur' }
@@ -170,23 +162,14 @@ export default {
     })
   },
   methods: {
-    parseTime,
-    checkPermission,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/jobs'
-      const sort = 'id,desc'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['jobName'] = value }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
       return true
     },
+    // 执行
     execute(id) {
-      execution(id).then(res => {
+      this.crudMethod.execution(id).then(res => {
         this.$notify({
           title: '执行成功',
           type: 'success',
@@ -196,8 +179,9 @@ export default {
         console.log(err.response.data.message)
       })
     },
+    // 改变状态
     updateStatus(id, status) {
-      updateIsPause(id).then(res => {
+      this.crudMethod.updateIsPause(id).then(res => {
         this.init()
         this.$notify({
           title: status + '成功',
@@ -208,96 +192,10 @@ export default {
         console.log(err.response.data.message)
       })
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
-    },
-    toQuery() {
-      this.page = 0
-      this.init()
-    },
+    // 显示日志
     doLog() {
       this.$refs.log.dialog = true
       this.$refs.log.doInit()
-    },
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else this.doEdit()
-        } else {
-          return false
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = { jobName: '', beanName: '', methodName: '', params: '', cronExpression: '', isPause: 'false', remark: '' }
-    },
-    edit(data) {
-      this.isAdd = false
-      this.form = { id: data.id, jobName: data.jobName, beanName: data.beanName, methodName: data.methodName, params: data.params, cronExpression: data.cronExpression, isPause: data.isPause.toString(), remark: data.remark }
-      this.dialog = true
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadJobs(this.params).then(result => {
-        downloadFile(result, '任务列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
     }
   }
 }
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
index 7bd1b78..29bda5b 100644
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -2,9 +2,9 @@
   <el-dialog :visible.sync="dialog" append-to-body title="执行日志" width="88%">
     <!-- 搜索 -->
     <div class="head-container">
-      <el-input v-model="query.value" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.jobName" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
-        v-model="query.date"
+        v-model="query.createTime"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
@@ -26,7 +26,7 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download"
+          @click="downloadMethod"
         >导出</el-button>
       </div>
     </div>
@@ -55,9 +55,9 @@
       </el-table-column>
     </el-table>
     <el-dialog :visible.sync="errorDialog" append-to-body title="异常详情" width="85%">
-      <span>
+      <pre>
         {{ errorInfo }}
-      </span>
+      </pre>
     </el-dialog>
     <!--分页组件-->
     <el-pagination
@@ -73,16 +73,13 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { downloadLogs } from '@/api/system/timing'
-import { parseTime, downloadFile } from '@/utils/index'
+import crud from '@/mixins/crud'
 export default {
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
+      title: '任务日志',
       errorInfo: '', errorDialog: false,
-      dialog: false, delLoading: false,
       enabledTypeOptions: [
         { key: 'true', display_name: '成功' },
         { key: 'false', display_name: '失败' }
@@ -90,46 +87,21 @@ export default {
     }
   },
   methods: {
-    parseTime,
-    checkPermission,
     doInit() {
       this.$nextTick(() => {
         this.init()
       })
     },
-    toQuery() {
-      this.page = 0
-      this.doInit()
-    },
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/jobs/logs'
-      const sort = 'id,desc'
-      const query = this.query
-      const value = query.value
-      const isSuccess = query.isSuccess
       this.size = 6
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['jobName'] = value }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
-      if (isSuccess !== '' && isSuccess !== null) { this.params['isSuccess'] = isSuccess }
       return true
     },
+    // 异常详情
     info(errorInfo) {
       this.errorInfo = errorInfo
       this.errorDialog = true
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadLogs(this.params).then(result => {
-        downloadFile(result, '任务日志列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
     }
   }
 }

From 1d71d2cc855cc72e484533e4d072a73426d7541a Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 24 Nov 2019 12:01:35 +0800
Subject: [PATCH 23/64] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tools/localStorage.js           |   9 +-
 src/api/tools/picture.js                |   9 +-
 src/api/tools/qiniu.js                  |   9 +-
 src/mixins/crud.js                      |  36 ++++
 src/views/tools/picture/index.vue       | 139 ++++-----------
 src/views/tools/storage/local/form.vue  | 123 -------------
 src/views/tools/storage/local/index.vue | 224 ++++++++++--------------
 src/views/tools/storage/qiniu/form.vue  |   1 -
 src/views/tools/storage/qiniu/index.vue | 184 ++++++-------------
 9 files changed, 221 insertions(+), 513 deletions(-)
 delete mode 100644 src/views/tools/storage/local/form.vue

diff --git a/src/api/tools/localStorage.js b/src/api/tools/localStorage.js
index 2e68c14..c938de3 100644
--- a/src/api/tools/localStorage.js
+++ b/src/api/tools/localStorage.js
@@ -31,11 +31,4 @@ export function edit(data) {
   })
 }
 
-export function downloadStorage(params) {
-  return request({
-    url: 'api/localStorage/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
+export default { add, edit, del, delAll }
diff --git a/src/api/tools/picture.js b/src/api/tools/picture.js
index df9d720..a689c77 100644
--- a/src/api/tools/picture.js
+++ b/src/api/tools/picture.js
@@ -15,11 +15,4 @@ export function delAll(ids) {
   })
 }
 
-export function downloadPicture(params) {
-  return request({
-    url: 'api/pictures/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
+export default { del, delAll }
diff --git a/src/api/tools/qiniu.js b/src/api/tools/qiniu.js
index ce75cba..7b94205 100644
--- a/src/api/tools/qiniu.js
+++ b/src/api/tools/qiniu.js
@@ -44,11 +44,4 @@ export function delAll(ids) {
   })
 }
 
-export function downloadQiNiu(params) {
-  return request({
-    url: 'api/qiNiuContent/download/list',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
+export default { del, download, sync, delAll }
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
index c429c8d..244fc29 100644
--- a/src/mixins/crud.js
+++ b/src/mixins/crud.js
@@ -31,6 +31,7 @@ export default {
       loading: true,
       // 删除 Loading 属性
       delLoading: false,
+      delAllLoading: false,
       // 弹窗属性
       dialog: false,
       // Form 表单
@@ -170,6 +171,41 @@ export default {
     },
     afterDelMethod() {
     },
+    /**
+     * 多选删除提示
+     */
+    beforeDelAllMethod() {
+      this.$confirm('你确定删除选中的数据吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.delAllMethod()
+      })
+    },
+    /**
+     * 多选删除
+     */
+    delAllMethod() {
+      this.delAllLoading = true
+      const data = this.$refs.table.selection
+      const ids = []
+      for (let i = 0; i < data.length; i++) {
+        ids.push(data[i].id)
+      }
+      this.crudMethod.delAll(ids).then(() => {
+        this.delAllLoading = false
+        this.dleChangePage(ids.length)
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(() => {
+        this.delAllLoading = false
+      })
+    },
     /**
      * 显示新增弹窗前可以调用该方法
      */
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index dc73679..cd90086 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -5,7 +5,7 @@
       <!--搜索-->
       <el-input v-model="query.filename" clearable size="small" placeholder="输入文件名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
-        v-model="query.date"
+        v-model="query.createTime"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
@@ -17,27 +17,24 @@
       />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 上传 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          v-permission="['admin','pictures:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-upload"
-          @click="dialog = true"
-        >上传图片</el-button>
-      </div>
-      <div v-permission="['admin','pictures:del']" style="display: inline-block;">
-        <el-button
-          :loading="delAllLoading"
-          :disabled="data.length === 0 || $refs.table.selection.length === 0"
-          class="filter-item"
-          size="mini"
-          type="danger"
-          icon="el-icon-delete"
-          @click="open"
-        >删除</el-button>
-      </div>
+      <el-button
+        v-permission="['admin','pictures:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-upload"
+        @click="dialog = true"
+      >上传图片</el-button>
+      <el-button
+        v-permission="['admin','pictures:del']"
+        :loading="delAllLoading"
+        :disabled="data.length === 0 || $refs.table.selection.length === 0"
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-delete"
+        @click="beforeDelAllMethod"
+      >删除</el-button>
       <!-- 导出 -->
       <div style="display: inline-block;">
         <el-button
@@ -46,7 +43,7 @@
           class="filter-item"
           type="warning"
           icon="el-icon-download"
-          @click="download"
+          @click="downloadMethod"
         >导出</el-button>
       </div>
     </div>
@@ -77,8 +74,14 @@
       <el-table-column prop="filename" label="文件名" />
       <el-table-column prop="username" label="上传者" />
       <el-table-column ref="table" :show-overflow-tooltip="true" prop="url" label="缩略图">
-        <template slot-scope="scope">
-          <a :href="scope.row.url" style="color: #42b983" target="_blank"><img :src="scope.row.url" alt="点击打开" class="el-avatar"></a>
+        <template slot-scope="{row}">
+          <el-image
+            :src="row.url"
+            :preview-src-list="[row.url]"
+            fit="contain"
+            lazy
+            class="el-avatar"
+          />
         </template>
       </el-table-column>
       <el-table-column prop="size" label="文件大小" />
@@ -99,7 +102,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -119,23 +122,20 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission' // 权限判断函数
-import initData from '@/mixins/initData'
-import { parseTime, downloadFile } from '@/utils/index'
+import crud from '@/mixins/crud'
 import { mapGetters } from 'vuex'
-import { del, delAll, downloadPicture } from '@/api/tools/picture'
+import crudPic from '@/api/tools/picture'
 import { getToken } from '@/utils/auth'
 export default {
   name: 'Pictures',
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false,
-      delAllLoading: false,
+      title: '图片',
+      crudMethod: { ...crudPic },
       headers: {
         'Authorization': 'Bearer ' + getToken()
       },
-      dialog: false,
       dialogImageUrl: '',
       dialogVisible: false,
       fileList: [],
@@ -153,69 +153,10 @@ export default {
     })
   },
   methods: {
-    parseTime,
-    checkPermission,
     beforeInit() {
       this.url = 'api/pictures'
-      const sort = 'id,desc'
-      const query = this.query
-      const filename = query.filename
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (filename) { this.params[filename] = filename }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
-    },
-    doDelete() {
-      this.delAllLoading = true
-      const data = this.$refs.table.selection
-      const ids = []
-      for (let i = 0; i < data.length; i++) {
-        ids.push(data[i].id)
-      }
-      delAll(ids).then(res => {
-        this.delAllLoading = false
-        this.init()
-        this.dleChangePage(ids.length)
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delAllLoading = false
-        console.log(err.response.data.message)
-      })
-    },
-    open() {
-      this.$confirm('你确定删除选中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.doDelete()
-      })
-    },
     handleSuccess(response, file, fileList) {
       const uid = file.uid
       const id = response.id
@@ -224,7 +165,7 @@ export default {
     handleBeforeRemove(file, fileList) {
       for (let i = 0; i < this.pictures.length; i++) {
         if (this.pictures[i].uid === file.uid) {
-          del(this.pictures[i].id).then(res => {})
+          this.crudMethod.del(this.pictures[i].id).then(res => {})
           return true
         }
       }
@@ -249,16 +190,6 @@ export default {
         type: 'error',
         duration: 2500
       })
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadPicture(this.params).then(result => {
-        downloadFile(result, '图片列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
     }
   }
 }
diff --git a/src/views/tools/storage/local/form.vue b/src/views/tools/storage/local/form.vue
deleted file mode 100644
index dfa8bb2..0000000
--- a/src/views/tools/storage/local/form.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '上传文件' : '编辑文件'" width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="文件名">
-        <el-input v-model="form.name" style="width: 370px;" />
-      </el-form-item>
-      <!--   上传文件   -->
-      <el-form-item v-if="isAdd" label="上传">
-        <el-upload
-          ref="upload"
-          :limit="1"
-          :before-upload="beforeUpload"
-          :auto-upload="false"
-          :headers="headers"
-          :on-success="handleSuccess"
-          :on-error="handleError"
-          :action="fileUploadApi + '?name=' + form.name"
-        >
-          <div class="eladmin-upload"><i class="el-icon-upload" /> 添加文件</div>
-          <div slot="tip" class="el-upload__tip">可上传任意格式文件，且不超过100M</div>
-        </el-upload>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import { getToken } from '@/utils/auth'
-import { edit } from '@/api/tools/localStorage'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false,
-      headers: { 'Authorization': 'Bearer ' + getToken() },
-      form: {
-        id: '',
-        name: ''
-      },
-      rules: {
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'fileUploadApi'
-    ])
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.loading = true
-      if (this.isAdd) {
-        this.$refs.upload.submit()
-      } else this.doEdit()
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        name: ''
-      }
-    },
-    beforeUpload(file) {
-      let isLt2M = true
-      isLt2M = file.size / 1024 / 1024 < 100
-      if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 100MB!')
-      }
-      this.loading = false
-      return isLt2M
-    },
-    handleSuccess(response, file, fileList) {
-      this.dialog = false
-      this.resetForm()
-      this.$refs.upload.clearFiles()
-      this.$parent.init()
-    },
-    // 监听上传失败
-    handleError(e, file, fileList) {
-      const msg = JSON.parse(e.message)
-      this.$notify({
-        title: msg.message,
-        type: 'error',
-        duration: 2500
-      })
-      this.loading = false
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index 1479435..bb6c7fa 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -3,9 +3,9 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable size="small" placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.blurry" clearable size="small" placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
-        v-model="query.date"
+        v-model="query.createTime"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
@@ -17,45 +17,65 @@
       />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          v-permission="['admin','storage:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-upload"
-          @click="add"
-        >文件上传
-        </el-button>
-      </div>
+      <el-button
+        v-permission="['admin','storage:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-upload"
+        @click="showAddFormDialog"
+      >文件上传
+      </el-button>
       <!-- 多选删除 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          v-permission="['admin','storage:del']"
-          :loading="delAllLoading"
-          :disabled="data.length === 0 || $refs.table.selection.length === 0"
-          class="filter-item"
-          size="mini"
-          type="danger"
-          icon="el-icon-delete"
-          @click="open"
-        >删除
-        </el-button>
-      </div>
+      <el-button
+        v-permission="['admin','storage:del']"
+        :loading="delAllLoading"
+        :disabled="data.length === 0 || $refs.table.selection.length === 0"
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-delete"
+        @click="beforeDelAllMethod"
+      >删除
+      </el-button>
       <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="download"
-        >导出</el-button>
-      </div>
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="downloadMethod"
+      >导出</el-button>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+      <el-form ref="form" :model="form" size="small" label-width="80px">
+        <el-form-item label="文件名">
+          <el-input v-model="form.name" style="width: 370px;" />
+        </el-form-item>
+        <!--   上传文件   -->
+        <el-form-item v-if="isAdd" label="上传">
+          <el-upload
+            ref="upload"
+            :limit="1"
+            :before-upload="beforeUpload"
+            :auto-upload="false"
+            :headers="headers"
+            :on-success="handleSuccess"
+            :on-error="handleError"
+            :action="fileUploadApi + '?name=' + form.name"
+          >
+            <div class="eladmin-upload"><i class="el-icon-upload" /> 添加文件</div>
+            <div slot="tip" class="el-upload__tip">可上传任意格式文件，且不超过100M</div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
     <!--表格渲染-->
     <el-table ref="table" v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column type="selection" width="55" />
@@ -106,7 +126,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','storage:edit','storage:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','storage:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-button v-permission="['admin','storage:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
           <el-popover
             :ref="scope.row.id"
             v-permission="['admin','storage:del']"
@@ -116,7 +136,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定
               </el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
@@ -138,28 +158,24 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del, delAll, downloadStorage } from '@/api/tools/localStorage'
-import { parseTime, downloadFile } from '@/utils/index'
-import eForm from './form'
+import { getToken } from '@/utils/auth'
+import crud from '@/mixins/crud'
+import crudFile from '@/api/tools/localStorage'
 export default {
-  components: { eForm },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false, delAllLoading: false,
-      queryTypeOptions: [
-        { key: 'name', display_name: '文件名' },
-        { key: 'suffix', display_name: '后缀' },
-        { key: 'type', display_name: '类型' },
-        { key: 'operate', display_name: '操作人' }
-      ]
+      title: '文件',
+      crudMethod: { ...crudFile },
+      delAllLoading: false,
+      headers: { 'Authorization': 'Bearer ' + getToken() },
+      form: { id: null, name: null }
     }
   },
   computed: {
     ...mapGetters([
-      'baseApi'
+      'baseApi',
+      'fileUploadApi'
     ])
   },
   created() {
@@ -168,91 +184,39 @@ export default {
     })
   },
   methods: {
-    parseTime,
-    checkPermission,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/localStorage'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const value = query.value
-      if (value) { this.params['blurry'] = value }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
+    // 上传文件
+    addMethod() {
+      this.$refs.upload.submit()
     },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        name: data.name
+    beforeUpload(file) {
+      let isLt2M = true
+      isLt2M = file.size / 1024 / 1024 < 100
+      if (!isLt2M) {
+        this.$message.error('上传文件大小不能超过 100MB!')
       }
-      _this.dialog = true
+      this.loading = false
+      return isLt2M
     },
-    doDelete() {
-      this.delAllLoading = true
-      const data = this.$refs.table.selection
-      const ids = []
-      for (let i = 0; i < data.length; i++) {
-        ids.push(data[i].id)
-      }
-      delAll(ids).then(res => {
-        this.delAllLoading = false
-        this.dleChangePage(ids.length)
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delAllLoading = false
-        console.log(err.response.data.message)
-      })
+    handleSuccess(response, file, fileList) {
+      this.dialog = false
+      this.cancel()
+      this.$refs.upload.clearFiles()
+      this.init()
     },
-    open() {
-      this.$confirm('你确定删除选中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.doDelete()
-      })
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadStorage(this.params).then(result => {
-        downloadFile(result, '文件列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
+    // 监听上传失败
+    handleError(e, file, fileList) {
+      const msg = JSON.parse(e.message)
+      this.$notify({
+        title: msg.message,
+        type: 'error',
+        duration: 2500
       })
+      this.loading = false
     }
   }
 }
diff --git a/src/views/tools/storage/qiniu/form.vue b/src/views/tools/storage/qiniu/form.vue
index 586106c..570e19f 100644
--- a/src/views/tools/storage/qiniu/form.vue
+++ b/src/views/tools/storage/qiniu/form.vue
@@ -1,5 +1,4 @@
 <template>
-  <!--上传图片-->
   <el-dialog :visible.sync="dialog" :close-on-click-modal="false" title="七牛云配置" append-to-body width="580px">
     <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="110px">
       <el-form-item label="Access Key" prop="accessKey">
diff --git a/src/views/tools/storage/qiniu/index.vue b/src/views/tools/storage/qiniu/index.vue
index 57e3e96..dce0a47 100644
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -5,9 +5,9 @@
     <!-- 工具栏 -->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable size="small" placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.key" clearable size="small" placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-date-picker
-        v-model="query.date"
+        v-model="query.c"
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
@@ -19,44 +19,36 @@
       />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 上传 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button class="filter-item" size="mini" type="primary" icon="el-icon-upload" @click="dialog = true">上传文件</el-button>
-      </div>
+      <el-button class="filter-item" size="mini" type="primary" icon="el-icon-upload" @click="dialog = true">上传文件</el-button>
       <!-- 同步 -->
       <el-button :icon="icon" class="filter-item" size="mini" type="warning" @click="synchronize">同步数据</el-button>
       <!-- 配置 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="success"
-          icon="el-icon-s-tools"
-          @click="doConfig"
-        >七牛配置</el-button>
-      </div>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-s-tools"
+        @click="doConfig"
+      >七牛配置</el-button>
       <!-- 多选删除 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          :loading="delAllLoading"
-          :disabled="data.length === 0 || $refs.table.selection.length === 0"
-          class="filter-item"
-          size="mini"
-          type="danger"
-          icon="el-icon-delete"
-          @click="open"
-        >删除</el-button>
-      </div>
+      <el-button
+        :loading="delAllLoading"
+        :disabled="data.length === 0 || $refs.table.selection.length === 0"
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-delete"
+        @click="beforeDelAllMethod"
+      >删除</el-button>
       <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="downloadList"
-        >导出</el-button>
-      </div>
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="downloadMethod"
+      >导出</el-button>
       <!-- 文件上传 -->
       <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="500px" @close="doSubmit">
         <el-upload
@@ -103,7 +95,7 @@
               <p>确定删除本条数据吗？</p>
               <div style="text-align: right; margin: 0">
                 <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
               </div>
               <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
             </el-popover>
@@ -124,21 +116,21 @@
 </template>
 
 <script>
-import initData from '@/mixins/initData'
-import { del, download, sync, delAll, downloadQiNiu } from '@/api/tools/qiniu'
-import { parseTime, downloadFile } from '@/utils/index'
+import crud from '@/mixins/crud'
+import crudQiNiu from '@/api/tools/qiniu'
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
 import eForm from './form'
 export default {
   components: { eForm },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      icon: 'el-icon-refresh', delAllLoading: false,
+      title: '文件',
+      crudMethod: { ...crudQiNiu },
+      icon: 'el-icon-refresh',
       url: '', headers: { 'Authorization': 'Bearer ' + getToken() }, dialog: false,
-      dialogImageUrl: '', dialogVisible: false, fileList: [], files: [],
-      newWin: null, downloadLoading: false, delLoading: false
+      dialogImageUrl: '', dialogVisible: false, fileList: [], files: [], newWin: null
     }
   },
   computed: {
@@ -158,54 +150,17 @@ export default {
     }
   },
   methods: {
-    parseTime,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/qiNiuContent'
-      const sort = 'id,desc'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['key'] = value }
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
       return true
     },
+    // 七牛云配置
     doConfig() {
       const _this = this.$refs.form
       _this.init()
       _this.dialog = true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
-    },
-    download(id) {
-      this.downloadLoading = true
-      // 先打开一个空的新窗口，再请求
-      this.newWin = window.open()
-      download(id).then(res => {
-        this.downloadLoading = false
-        this.url = res.url
-      }).catch(err => {
-        this.downloadLoading = false
-        console.log(err.response.data.message)
-      })
-    },
     handleSuccess(response, file, fileList) {
       const uid = file.uid
       const id = response.id
@@ -214,7 +169,7 @@ export default {
     handleBeforeRemove(file, fileList) {
       for (let i = 0; i < this.files.length; i++) {
         if (this.files[i].uid === file.uid) {
-          del(this.files[i].id).then(res => {})
+          this.crudMethod.del(this.files[i].id).then(res => {})
           return true
         }
       }
@@ -234,18 +189,26 @@ export default {
     // 监听上传失败
     handleError(e, file, fileList) {
       const msg = JSON.parse(e.message)
-      this.$notify({
-        title: msg.message,
-        type: 'error',
-        duration: 2500
+      this.notify(msg.message, 'error')
+    },
+    // 下载文件
+    download(id) {
+      this.downloadLoading = true
+      // 先打开一个空的新窗口，再请求
+      this.newWin = window.open()
+      this.crudMethod.download(id).then(res => {
+        this.downloadLoading = false
+        this.url = res.url
+      }).catch(err => {
+        this.downloadLoading = false
+        console.log(err.response.data.message)
       })
     },
+    // 同步数据
     synchronize() {
       this.icon = 'el-icon-loading'
-      this.buttonName = '同步中'
-      sync().then(res => {
+      this.crudMethod.sync().then(res => {
         this.icon = 'el-icon-refresh'
-        this.buttonName = '同步数据'
         this.$message({
           showClose: true,
           message: '数据同步成功',
@@ -255,49 +218,8 @@ export default {
         this.toQuery()
       }).catch(err => {
         this.icon = 'el-icon-refresh'
-        this.buttonName = '同步数据'
         console.log(err.response.data.message)
       })
-    },
-    doDelete() {
-      this.delAllLoading = true
-      const data = this.$refs.table.selection
-      const ids = []
-      for (let i = 0; i < data.length; i++) {
-        ids.push(data[i].id)
-      }
-      delAll(ids).then(res => {
-        this.delAllLoading = false
-        this.dleChangePage(ids.length)
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delAllLoading = false
-        console.log(err.response.data.message)
-      })
-    },
-    open() {
-      this.$confirm('你确定删除选中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.doDelete()
-      })
-    },
-    downloadList() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadQiNiu(this.params).then(result => {
-        downloadFile(result, '七牛云文件列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
     }
   }
 }

From ba1fa5e6dd0064d3e49988b03289a25d7a8d5adf Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 24 Nov 2019 12:03:57 +0800
Subject: [PATCH 24/64] update

---
 src/layout/components/Settings/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 2f3b8f1..749de87 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -9,7 +9,7 @@
       </div>
 
       <div class="drawer-item">
-        <span>打开标签</span>
+        <span>显示标签</span>
         <el-switch v-model="tagsView" class="drawer-switch" />
       </div>
 

From fcc28fdd6f33477ececc0cbb25c4aef8c4c48917 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 24 Nov 2019 12:50:12 +0800
Subject: [PATCH 25/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mnt/account/index.vue       |  2 +-
 src/views/mnt/app/index.vue           |  2 +-
 src/views/mnt/database/index.vue      |  2 +-
 src/views/mnt/deploy/index.vue        | 14 +++++++-------
 src/views/mnt/deploy/sysRestore.vue   | 10 +++++-----
 src/views/mnt/deployHistory/index.vue |  2 +-
 src/views/mnt/serverDeploy/index.vue  |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/mnt/account/index.vue b/src/views/mnt/account/index.vue
index e19c700..cba59be 100644
--- a/src/views/mnt/account/index.vue
+++ b/src/views/mnt/account/index.vue
@@ -65,8 +65,8 @@
             @click="edit(scope.row)"
           />
           <el-popover
-            v-permission="['admin','serverAccount:del']"
             :ref="scope.row.id"
+            v-permission="['admin','serverAccount:del']"
             placement="top"
             width="180"
           >
diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
index b8632cf..ab49f17 100644
--- a/src/views/mnt/app/index.vue
+++ b/src/views/mnt/app/index.vue
@@ -81,8 +81,8 @@
             @click="edit(scope.row)"
           />
           <el-popover
-            v-permission="['admin','app:del']"
             :ref="scope.row.id"
+            v-permission="['admin','app:del']"
             placement="top"
             width="180"
           >
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index fdf09c8..99a228a 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -67,8 +67,8 @@
             @click="edit(scope.row)"
           />
           <el-popover
-            v-permission="['admin','database:del']"
             :ref="scope.row.id"
+            v-permission="['admin','database:del']"
             placement="top"
             width="180"
           >
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
index 8857ff8..324402d 100644
--- a/src/views/mnt/deploy/index.vue
+++ b/src/views/mnt/deploy/index.vue
@@ -92,10 +92,10 @@
       </div>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd"/>
+    <eForm ref="form" :is-add="isAdd" />
     <!--    系统还原组件-->
-    <fForm ref="sysRestore" :app-name="appName" :key="times"/>
-    <dForm ref="deploy"/>
+    <fForm ref="sysRestore" :key="times" :app-name="appName" />
+    <dForm ref="deploy" />
     <!--表格渲染-->
     <el-table
       v-loading="loading"
@@ -106,8 +106,8 @@
       style="width: 100%"
       @current-change="handleCurrentChange"
     >
-      <el-table-column :formatter="formatterAppId" prop="appId" label="应用名称"/>
-      <el-table-column prop="ip" label="服务器列表"/>
+      <el-table-column :formatter="formatterAppId" prop="appId" label="应用名称" />
+      <el-table-column prop="ip" label="服务器列表" />
       <el-table-column
         v-if="checkPermission(['admin','deploy:edit','deploy:del'])"
         label="操作"
@@ -123,8 +123,8 @@
             @click="edit(scope.row)"
           />
           <el-popover
-            v-permission="['admin','deploy:del']"
             :ref="scope.row.id"
+            v-permission="['admin','deploy:del']"
             placement="top"
             width="180"
           >
@@ -139,7 +139,7 @@
               >确定
               </el-button>
             </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
         </template>
       </el-table-column>
diff --git a/src/views/mnt/deploy/sysRestore.vue b/src/views/mnt/deploy/sysRestore.vue
index fcd6b4f..50de798 100644
--- a/src/views/mnt/deploy/sysRestore.vue
+++ b/src/views/mnt/deploy/sysRestore.vue
@@ -36,13 +36,13 @@
       >
         <el-table-column width="30px">
           <template slot-scope="scope">
-            <el-radio v-model="radio" :label="scope.$index"/>
+            <el-radio v-model="radio" :label="scope.$index" />
           </template>
         </el-table-column>
-        <el-table-column prop="appName" label="应用名称"/>
-        <el-table-column prop="ip" label="部署IP"/>
-        <el-table-column prop="deployDate" label="部署时间"/>
-        <el-table-column prop="deployUser" label="部署人员"/>
+        <el-table-column prop="appName" label="应用名称" />
+        <el-table-column prop="ip" label="部署IP" />
+        <el-table-column prop="deployDate" label="部署时间" />
+        <el-table-column prop="deployUser" label="部署人员" />
       </el-table>
     </el-form>
     <div slot="footer" class="dialog-footer">
diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue
index 99771ce..bb8b2a6 100644
--- a/src/views/mnt/deployHistory/index.vue
+++ b/src/views/mnt/deployHistory/index.vue
@@ -49,8 +49,8 @@
       >
         <template slot-scope="scope">
           <el-popover
-            v-permission="['admin','deployHistory:del']"
             :ref="scope.row.id"
+            v-permission="['admin','deployHistory:del']"
             placement="top"
             width="180"
           >
diff --git a/src/views/mnt/serverDeploy/index.vue b/src/views/mnt/serverDeploy/index.vue
index de00d4d..9852641 100644
--- a/src/views/mnt/serverDeploy/index.vue
+++ b/src/views/mnt/serverDeploy/index.vue
@@ -65,8 +65,8 @@
             @click="edit(scope.row)"
           />
           <el-popover
-            v-permission="['admin','serverDeploy:del']"
             :ref="scope.row.id"
+            v-permission="['admin','serverDeploy:del']"
             placement="top"
             width="180"
           >

From 882dc03e3c83804e7c1dc057ccb7902f6c8c6e45 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Mon, 25 Nov 2019 16:49:16 +0800
Subject: [PATCH 26/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                       |   2 +-
 .env.production                        |   2 +-
 src/api/{ => mnt}/app.js               |  10 +-
 src/api/{ => mnt}/database.js          |   2 +
 src/api/{ => mnt}/deploy.js            |   2 +
 src/api/{ => mnt}/deployHistory.js     |  20 --
 src/api/{ => mnt}/serverDeploy.js      |   2 +
 src/api/monitor/server.js              |   2 +
 src/api/serverAccount.js               |  32 ---
 src/assets/icons/svg/404.svg           |   1 -
 src/assets/icons/svg/add.svg           |   1 -
 src/assets/icons/svg/app.svg           |   1 +
 src/assets/icons/svg/backup.svg        |   1 +
 src/assets/icons/svg/bug.svg           |   1 -
 src/assets/icons/svg/clipboard.svg     |   1 -
 src/assets/icons/svg/component.svg     |   1 -
 src/assets/icons/svg/database.svg      |   1 +
 src/assets/icons/svg/deploy.svg        |   1 +
 src/assets/icons/svg/documentation.svg |   1 -
 src/assets/icons/svg/drag.svg          |   1 -
 src/assets/icons/svg/example.svg       |   1 -
 src/assets/icons/svg/excel.svg         |   1 -
 src/assets/icons/svg/eye-open.svg      |   1 -
 src/assets/icons/svg/eye.svg           |   1 -
 src/assets/icons/svg/form.svg          |   1 -
 src/assets/icons/svg/guide.svg         |   1 -
 src/assets/icons/svg/language.svg      |   1 -
 src/assets/icons/svg/mnt.svg           |   1 +
 src/assets/icons/svg/mntsvg            |   1 +
 src/assets/icons/svg/money.svg         |   1 -
 src/assets/icons/svg/pdf.svg           |   1 -
 src/assets/icons/svg/qq.svg            |   1 -
 src/assets/icons/svg/server.svg        |   1 +
 src/assets/icons/svg/shopping.svg      |   1 -
 src/assets/icons/svg/star.svg          |   1 -
 src/assets/icons/svg/sys-tools.svg     |   2 +-
 src/assets/icons/svg/table.svg         |   1 -
 src/assets/icons/svg/zip.svg           |   1 -
 src/assets/icons/svg/zujian.svg        |   2 +-
 src/mixins/crud.js                     |   1 -
 src/views/mnt/account/form.vue         | 108 --------
 src/views/mnt/account/index.vue        | 176 -------------
 src/views/mnt/app/form.vue             | 180 -------------
 src/views/mnt/app/index.vue            | 251 ++++++++----------
 src/views/mnt/database/form.vue        | 134 ----------
 src/views/mnt/database/index.vue       | 167 ++++--------
 src/views/mnt/deploy/deploy.vue        |  33 +--
 src/views/mnt/deploy/form.vue          | 132 ----------
 src/views/mnt/deploy/index.vue         | 335 +++++++++++--------------
 src/views/mnt/deploy/sysRestore.vue    |  90 +++----
 src/views/mnt/deployHistory/form.vue   | 133 ----------
 src/views/mnt/deployHistory/index.vue  | 109 +-------
 src/views/mnt/server/index.vue         | 146 +++++++++++
 src/views/mnt/serverDeploy/form.vue    | 137 ----------
 src/views/mnt/serverDeploy/index.vue   | 183 --------------
 src/views/monitor/server/form.vue      | 131 ----------
 src/views/monitor/server/index.vue     | 172 ++++++-------
 57 files changed, 594 insertions(+), 2130 deletions(-)
 rename src/api/{ => mnt}/app.js (76%)
 rename src/api/{ => mnt}/database.js (91%)
 rename src/api/{ => mnt}/deploy.js (91%)
 rename src/api/{ => mnt}/deployHistory.js (54%)
 rename src/api/{ => mnt}/serverDeploy.js (91%)
 delete mode 100644 src/api/serverAccount.js
 delete mode 100644 src/assets/icons/svg/404.svg
 delete mode 100644 src/assets/icons/svg/add.svg
 create mode 100644 src/assets/icons/svg/app.svg
 create mode 100644 src/assets/icons/svg/backup.svg
 delete mode 100644 src/assets/icons/svg/bug.svg
 delete mode 100644 src/assets/icons/svg/clipboard.svg
 delete mode 100644 src/assets/icons/svg/component.svg
 create mode 100644 src/assets/icons/svg/database.svg
 create mode 100644 src/assets/icons/svg/deploy.svg
 delete mode 100644 src/assets/icons/svg/documentation.svg
 delete mode 100644 src/assets/icons/svg/drag.svg
 delete mode 100644 src/assets/icons/svg/example.svg
 delete mode 100644 src/assets/icons/svg/excel.svg
 delete mode 100644 src/assets/icons/svg/eye-open.svg
 delete mode 100644 src/assets/icons/svg/eye.svg
 delete mode 100644 src/assets/icons/svg/form.svg
 delete mode 100644 src/assets/icons/svg/guide.svg
 delete mode 100644 src/assets/icons/svg/language.svg
 create mode 100644 src/assets/icons/svg/mnt.svg
 create mode 100644 src/assets/icons/svg/mntsvg
 delete mode 100644 src/assets/icons/svg/money.svg
 delete mode 100644 src/assets/icons/svg/pdf.svg
 delete mode 100644 src/assets/icons/svg/qq.svg
 create mode 100644 src/assets/icons/svg/server.svg
 delete mode 100644 src/assets/icons/svg/shopping.svg
 delete mode 100644 src/assets/icons/svg/star.svg
 delete mode 100644 src/assets/icons/svg/table.svg
 delete mode 100644 src/assets/icons/svg/zip.svg
 delete mode 100644 src/views/mnt/account/form.vue
 delete mode 100644 src/views/mnt/account/index.vue
 delete mode 100644 src/views/mnt/app/form.vue
 delete mode 100644 src/views/mnt/database/form.vue
 delete mode 100644 src/views/mnt/deploy/form.vue
 delete mode 100644 src/views/mnt/deployHistory/form.vue
 create mode 100644 src/views/mnt/server/index.vue
 delete mode 100644 src/views/mnt/serverDeploy/form.vue
 delete mode 100644 src/views/mnt/serverDeploy/index.vue
 delete mode 100644 src/views/monitor/server/form.vue

diff --git a/.env.development b/.env.development
index aea9ac3..d9a2132 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@ ENV = 'development'
 
 # 接口地址
 VUE_APP_BASE_API  = 'http://localhost:8000'
-VUE_APP_WS_API: '"ws://localhost:8000"',
+VUE_APP_WS_API = 'ws://localhost:8000'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index 0ac5a49..c841017 100644
--- a/.env.production
+++ b/.env.production
@@ -2,4 +2,4 @@ ENV = 'production'
 
 # 接口地址
 VUE_APP_BASE_API  = 'https://api.auauz.net'
-VUE_APP_WS_API: '"ws://api.auauz.net"',
+VUE_APP_WS_API = 'ws://api.auauz.net'
diff --git a/src/api/app.js b/src/api/mnt/app.js
similarity index 76%
rename from src/api/app.js
rename to src/api/mnt/app.js
index 8762fc1..584d322 100644
--- a/src/api/app.js
+++ b/src/api/mnt/app.js
@@ -1,13 +1,5 @@
 import request from '@/utils/request'
 
-export function queryApps(data) {
-  return request({
-    url: 'api/app',
-    method: 'get',
-    data
-  })
-}
-
 export function add(data) {
   return request({
     url: 'api/app',
@@ -30,3 +22,5 @@ export function edit(data) {
     data
   })
 }
+
+export default { add, edit, del }
diff --git a/src/api/database.js b/src/api/mnt/database.js
similarity index 91%
rename from src/api/database.js
rename to src/api/mnt/database.js
index f26f48d..084a74d 100644
--- a/src/api/database.js
+++ b/src/api/mnt/database.js
@@ -22,3 +22,5 @@ export function edit(data) {
     data
   })
 }
+
+export default { add, edit, del }
diff --git a/src/api/deploy.js b/src/api/mnt/deploy.js
similarity index 91%
rename from src/api/deploy.js
rename to src/api/mnt/deploy.js
index da3f139..1647585 100644
--- a/src/api/deploy.js
+++ b/src/api/mnt/deploy.js
@@ -72,3 +72,5 @@ export function serverStatus(data) {
     data
   })
 }
+
+export default { add, edit, del, stopServer, serverStatus, startServer, getServers, getApps }
diff --git a/src/api/deployHistory.js b/src/api/mnt/deployHistory.js
similarity index 54%
rename from src/api/deployHistory.js
rename to src/api/mnt/deployHistory.js
index a19512f..eb36dce 100644
--- a/src/api/deployHistory.js
+++ b/src/api/mnt/deployHistory.js
@@ -1,17 +1,5 @@
 import request from '@/utils/request'
 
-/**
- * 部署管理
- * @param data
- */
-export function add(data) {
-  return request({
-    url: 'api/deployHistory',
-    method: 'post',
-    data
-  })
-}
-
 export function del(id) {
   return request({
     url: 'api/deployHistory/' + id,
@@ -19,14 +7,6 @@ export function del(id) {
   })
 }
 
-export function edit(data) {
-  return request({
-    url: 'api/deployHistory',
-    method: 'put',
-    data
-  })
-}
-
 /**
  * 版本回退
  * @param data 选中行
diff --git a/src/api/serverDeploy.js b/src/api/mnt/serverDeploy.js
similarity index 91%
rename from src/api/serverDeploy.js
rename to src/api/mnt/serverDeploy.js
index 0110ddc..29fb6bb 100644
--- a/src/api/serverDeploy.js
+++ b/src/api/mnt/serverDeploy.js
@@ -22,3 +22,5 @@ export function edit(data) {
     data
   })
 }
+
+export default { add, edit, del }
diff --git a/src/api/monitor/server.js b/src/api/monitor/server.js
index e68a22c..5c2b234 100644
--- a/src/api/monitor/server.js
+++ b/src/api/monitor/server.js
@@ -22,3 +22,5 @@ export function edit(data) {
     data
   })
 }
+
+export default { add, edit, del }
diff --git a/src/api/serverAccount.js b/src/api/serverAccount.js
deleted file mode 100644
index 0408d67..0000000
--- a/src/api/serverAccount.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import request from '@/utils/request'
-
-export function queryServerAccount(data) {
-  return request({
-    url: 'api/serverAccount',
-    method: 'get',
-    data
-  })
-}
-
-export function add(data) {
-  return request({
-    url: 'api/serverAccount',
-    method: 'post',
-    data
-  })
-}
-
-export function del(id) {
-  return request({
-    url: 'api/serverAccount/' + id,
-    method: 'delete'
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/serverAccount',
-    method: 'put',
-    data
-  })
-}
diff --git a/src/assets/icons/svg/404.svg b/src/assets/icons/svg/404.svg
deleted file mode 100644
index 6df5019..0000000
--- a/src/assets/icons/svg/404.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M121.718 73.272v9.953c3.957-7.584 6.199-16.05 6.199-24.995C127.917 26.079 99.273 0 63.958 0 28.644 0 0 26.079 0 58.23c0 .403.028.806.028 1.21l22.97-25.953h13.34l-19.76 27.187h6.42V53.77l13.728-19.477v49.361H22.998V73.272H2.158c5.951 20.284 23.608 36.208 45.998 41.399-1.44 3.3-5.618 11.263-12.565 12.674-8.607 1.764 23.358.428 46.163-13.178 17.519-4.611 31.938-15.849 39.77-30.513h-13.506V73.272H85.02V59.464l22.998-25.977h13.008l-19.429 27.187h6.421v-7.433l13.727-19.402v39.433h-.027zm-78.24 2.822a10.516 10.516 0 0 1-.996-4.535V44.548c0-1.613.332-3.124.996-4.535a11.66 11.66 0 0 1 2.713-3.68c1.134-1.032 2.49-1.864 4.04-2.468 1.55-.605 3.21-.908 4.982-.908h11.292c1.77 0 3.431.303 4.981.908 1.522.604 2.85 1.41 3.986 2.418l-12.26 16.303v-2.898a1.96 1.96 0 0 0-.665-1.512c-.443-.403-.996-.604-1.66-.604-.665 0-1.218.201-1.661.604a1.96 1.96 0 0 0-.664 1.512v9.071L44.364 77.606a10.556 10.556 0 0 1-.886-1.512zm35.73-4.535c0 1.613-.332 3.124-.997 4.535a11.66 11.66 0 0 1-2.712 3.68c-1.134 1.032-2.49 1.864-4.04 2.469-1.55.604-3.21.907-4.982.907H55.185c-1.77 0-3.431-.303-4.981-.907-1.55-.605-2.906-1.437-4.041-2.47a12.49 12.49 0 0 1-1.384-1.512l13.727-18.217v6.375c0 .605.222 1.109.665 1.512.442.403.996.604 1.66.604.664 0 1.218-.201 1.66-.604a1.96 1.96 0 0 0 .665-1.512V53.87L75.97 36.838c.913.932 1.66 1.99 2.214 3.175.664 1.41.996 2.922.996 4.535v27.011h.028z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/add.svg b/src/assets/icons/svg/add.svg
deleted file mode 100644
index d9edd88..0000000
--- a/src/assets/icons/svg/add.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" class="icon" p-id="1208" t="1543748455010" version="1.1" viewBox="0 0 1024 1024"><defs><style type="text/css">@font-face{font-family:rbicon;src:url(chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2) format(&quot;woff2&quot;);font-weight:400;font-style:normal}</style></defs><path d="M590.769231 571.076923h324.923077c15.753846 0 29.538462-13.784615 29.538461-29.538461v-59.076924c0-15.753846-13.784615-29.538462-29.538461-29.538461H590.769231c-11.815385 0-19.692308-7.876923-19.692308-19.692308V108.307692c0-15.753846-13.784615-29.538462-29.538461-29.538461h-59.076924c-15.753846 0-29.538462 13.784615-29.538461 29.538461V433.230769c0 11.815385-7.876923 19.692308-19.692308 19.692308H108.307692c-15.753846 0-29.538462 13.784615-29.538461 29.538461v59.076924c0 15.753846 13.784615 29.538462 29.538461 29.538461H433.230769c11.815385 0 19.692308 7.876923 19.692308 19.692308v324.923077c0 15.753846 13.784615 29.538462 29.538461 29.538461h59.076924c15.753846 0 29.538462-13.784615 29.538461-29.538461V590.769231c0-11.815385 7.876923-19.692308 19.692308-19.692308z" p-id="1209"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/app.svg b/src/assets/icons/svg/app.svg
new file mode 100644
index 0000000..0796da3
--- /dev/null
+++ b/src/assets/icons/svg/app.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574649142168" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1910" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M468.693333 16.725333a85.333333 85.333333 0 0 1 82.56 0l381.952 211.072a85.333333 85.333333 0 0 1 44.074667 74.666667v419.029333a85.333333 85.333333 0 0 1-44.074667 74.666667l-381.952 211.114667a85.333333 85.333333 0 0 1-82.56 0l-381.952-211.072A85.333333 85.333333 0 0 1 42.666667 721.493333V302.506667a85.333333 85.333333 0 0 1 44.074666-74.666667L468.693333 16.682667z m423.253334 285.781334l-381.994667-211.072L128 302.506667v418.986666l381.952 211.072 381.994667-211.072V302.506667z m-684.714667 42.197333a42.666667 42.666667 0 0 1 57.984-16.725333l244.736 135.253333 244.778667-135.253333a42.666667 42.666667 0 0 1 41.258666 74.666666l-243.370666 134.528v268.16a42.666667 42.666667 0 0 1-85.333334 0V537.173333L223.914667 402.688a42.666667 42.666667 0 0 1-16.682667-58.026667z" fill="#bfbfbf" p-id="1911"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/backup.svg b/src/assets/icons/svg/backup.svg
new file mode 100644
index 0000000..a3272a4
--- /dev/null
+++ b/src/assets/icons/svg/backup.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574649191790" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2774" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M646 1024H100A100 100 0 0 1 0 924V258a100 100 0 0 1 100-100h546a100 100 0 0 1 100 100v31a40 40 0 1 1-80 0v-31a20 20 0 0 0-20-20H100a20 20 0 0 0-20 20v666a20 20 0 0 0 20 20h546a20 20 0 0 0 20-20V713a40 40 0 0 1 80 0v211a100 100 0 0 1-100 100z" fill="#cdcdcd" p-id="2775"></path><path d="M924 866H806a40 40 0 0 1 0-80h118a20 20 0 0 0 20-20V100a20 20 0 0 0-20-20H378a20 20 0 0 0-20 20v8a40 40 0 0 1-80 0v-8A100 100 0 0 1 378 0h546a100 100 0 0 1 100 100v666a100 100 0 0 1-100 100z" fill="#cdcdcd" p-id="2776"></path><path d="M469 887a40 40 0 0 1-27-10L152 618a40 40 0 0 1 1-60l290-248a40 40 0 0 1 66 30v128a367 367 0 0 0 241-128l94-111a40 40 0 0 1 70 35l-26 109a430 430 0 0 1-379 332v142a40 40 0 0 1-40 40zM240 589l189 169v-91a40 40 0 0 1 40-40c144 0 269-85 323-214a447 447 0 0 1-323 137 40 40 0 0 1-40-40v-83z" fill="#cdcdcd" p-id="2777"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/bug.svg b/src/assets/icons/svg/bug.svg
deleted file mode 100644
index 05a150d..0000000
--- a/src/assets/icons/svg/bug.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M127.88 73.143c0 1.412-.506 2.635-1.518 3.669-1.011 1.033-2.209 1.55-3.592 1.55h-17.887c0 9.296-1.783 17.178-5.35 23.645l16.609 17.044c1.011 1.034 1.517 2.257 1.517 3.67 0 1.412-.506 2.635-1.517 3.668-.958 1.033-2.155 1.55-3.593 1.55-1.438 0-2.635-.517-3.593-1.55l-15.811-16.063a15.49 15.49 0 0 1-1.196 1.06c-.532.434-1.65 1.208-3.353 2.322a50.104 50.104 0 0 1-5.192 2.974c-1.758.87-3.94 1.658-6.546 2.364-2.607.706-5.189 1.06-7.748 1.06V47.044H58.89v73.062c-2.716 0-5.417-.367-8.106-1.102-2.688-.734-5.003-1.631-6.945-2.692a66.769 66.769 0 0 1-5.268-3.179c-1.571-1.057-2.73-1.94-3.476-2.65L33.9 109.34l-14.611 16.877c-1.066 1.14-2.344 1.711-3.833 1.711-1.277 0-2.422-.434-3.434-1.304-1.012-.978-1.557-2.187-1.635-3.627-.079-1.44.333-2.705 1.236-3.794l16.129-18.51c-3.087-6.197-4.63-13.644-4.63-22.342H5.235c-1.383 0-2.58-.517-3.592-1.55S.125 74.545.125 73.132c0-1.412.506-2.635 1.518-3.668 1.012-1.034 2.21-1.55 3.592-1.55h17.887V43.939L9.308 29.833c-1.012-1.033-1.517-2.256-1.517-3.669 0-1.412.505-2.635 1.517-3.668 1.012-1.034 2.21-1.55 3.593-1.55s2.58.516 3.593 1.55l13.813 14.106h67.396l13.814-14.106c1.012-1.034 2.21-1.55 3.592-1.55 1.384 0 2.581.516 3.593 1.55 1.012 1.033 1.518 2.256 1.518 3.668 0 1.413-.506 2.636-1.518 3.67l-13.814 14.105v23.975h17.887c1.383 0 2.58.516 3.593 1.55 1.011 1.033 1.517 2.256 1.517 3.668l-.005.01zM89.552 26.175H38.448c0-7.23 2.489-13.386 7.466-18.469C50.892 2.623 56.92.082 64 .082c7.08 0 13.108 2.541 18.086 7.624 4.977 5.083 7.466 11.24 7.466 18.469z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/clipboard.svg b/src/assets/icons/svg/clipboard.svg
deleted file mode 100644
index 90923ff..0000000
--- a/src/assets/icons/svg/clipboard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.857 118.857h64V73.143H89.143c-1.902 0-3.52-.668-4.855-2.002-1.335-1.335-2.002-2.954-2.002-4.855V36.57H54.857v82.286zM73.143 16v-4.571a2.2 2.2 0 0 0-.677-1.61 2.198 2.198 0 0 0-1.609-.676H20.571c-.621 0-1.158.225-1.609.676a2.198 2.198 0 0 0-.676 1.61V16a2.2 2.2 0 0 0 .676 1.61c.451.45.988.676 1.61.676h50.285c.622 0 1.158-.226 1.61-.677.45-.45.676-.987.676-1.609zm18.286 48h21.357L91.43 42.642V64zM128 73.143v48c0 1.902-.667 3.52-2.002 4.855-1.335 1.335-2.953 2.002-4.855 2.002H52.57c-1.901 0-3.52-.667-4.854-2.002-1.335-1.335-2.003-2.953-2.003-4.855v-11.429H6.857c-1.902 0-3.52-.667-4.855-2.002C.667 106.377 0 104.759 0 102.857v-96c0-1.902.667-3.52 2.002-4.855C3.337.667 4.955 0 6.857 0h77.714c1.902 0 3.52.667 4.855 2.002 1.335 1.335 2.003 2.953 2.003 4.855V30.29c1 .622 1.856 1.29 2.569 2.003l29.147 29.147c1.335 1.335 2.478 3.145 3.429 5.43.95 2.287 1.426 4.383 1.426 6.291v-.018z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/component.svg b/src/assets/icons/svg/component.svg
deleted file mode 100644
index 207ada3..0000000
--- a/src/assets/icons/svg/component.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h54.857v54.857H0V0zm0 73.143h54.857V128H0V73.143zm73.143 0H128V128H73.143V73.143zm27.428-18.286C115.72 54.857 128 42.577 128 27.43 128 12.28 115.72 0 100.571 0 85.423 0 73.143 12.28 73.143 27.429c0 15.148 12.28 27.428 27.428 27.428z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/database.svg b/src/assets/icons/svg/database.svg
new file mode 100644
index 0000000..7fbad9b
--- /dev/null
+++ b/src/assets/icons/svg/database.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574649229600" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3752" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M942 191.9C939.8 128.9 748.1 78 512 78S84.2 128.9 82 191.9V831c0 63.5 192.5 115 430 115s430-51.5 430-115V191.9z m-56.7 393.8c-4.6 3.3-11.6 7.4-21.9 12.2-21.3 9.8-50.5 19.1-84.4 26.8-74 16.8-168.8 26-267 26s-193-9.2-267-26c-33.9-7.7-63.1-16.9-84.4-26.8-10.3-4.8-17.3-8.9-21.9-12.2 0.1-0.1 0.2-0.1 0.3-0.2h-7v-123c72.2 36.4 215.3 61.1 380 61.1s307.8-24.8 380-61.1v122.9h-7l0.3 0.3z m0-177c-4.6 3.3-11.6 7.4-21.9 12.2-21.3 9.8-50.5 19.1-84.4 26.8-74 16.8-168.8 26-267 26s-193-9.2-267-26c-33.9-7.7-63.1-16.9-84.4-26.8-10.3-4.8-17.3-8.9-21.9-12.2 0.1-0.1 0.2-0.1 0.3-0.2h-7V246.9c72.2 36.4 215.3 61.1 380 61.1s307.8-24.8 380-61.1v161.6h-7c0.1 0 0.2 0.1 0.3 0.2zM160.7 180.8C182 171 211.2 161.7 245 154c74-16.8 168.8-26 267-26s193 9.2 267 26c33.9 7.7 63.1 16.9 84.4 26.8 10.3 4.8 17.3 8.9 21.9 12.2-4.6 3.3-11.6 7.4-21.9 12.2C842 215 812.8 224.3 779 232c-74 16.8-168.8 26-267 26s-193-9.2-267-26c-33.9-7.7-63.1-16.9-84.4-26.8-10.3-4.8-17.3-8.9-21.9-12.2 4.7-3.3 11.7-7.4 22-12.2zM885.3 831c-4.6 3.3-11.6 7.4-21.9 12.2C842 853 812.8 862.3 779 870c-74 16.8-168.8 26-267 26s-193-9.2-267-26c-33.9-7.7-63.1-16.9-84.4-26.8-10.3-4.8-17.3-8.9-21.9-12.2 0.1-0.1 0.2-0.1 0.3-0.2h-7V639.5c72.2 36.4 215.3 61.1 380 61.1s307.8-24.8 380-61.1v191.3h-7c0.1 0.1 0.2 0.1 0.3 0.2z" fill="#cdcdcd" p-id="3753"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/deploy.svg b/src/assets/icons/svg/deploy.svg
new file mode 100644
index 0000000..f4a1c56
--- /dev/null
+++ b/src/assets/icons/svg/deploy.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574649300337" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4312" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M877.952 447.616v-0.256a272 272 0 0 0-479.68-175.68 166.144 166.144 0 0 0-226.016 155.296c0 4.768 0.32 9.6 0.704 14.144A196.896 196.896 0 0 0 206.592 832H448v-256H304l208-208 208 208H576v256h241.408a196.96 196.96 0 0 0 60.544-384.384z" fill="#cdcdcd" p-id="4313"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/documentation.svg b/src/assets/icons/svg/documentation.svg
deleted file mode 100644
index 7043122..0000000
--- a/src/assets/icons/svg/documentation.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M71.984 44.815H115.9L71.984 9.642v35.173zM16.094.05h63.875l47.906 38.37v76.74c0 3.392-1.682 6.645-4.677 9.044-2.995 2.399-7.056 3.746-11.292 3.746H16.094c-4.236 0-8.297-1.347-11.292-3.746-2.995-2.399-4.677-5.652-4.677-9.044V12.84C.125 5.742 7.23.05 16.094.05zm71.86 102.32V89.58h-71.86v12.79h71.86zm23.952-25.58V64H16.094v12.79h95.812z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/drag.svg b/src/assets/icons/svg/drag.svg
deleted file mode 100644
index 4185d3c..0000000
--- a/src/assets/icons/svg/drag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M73.137 29.08h-9.209 29.7L63.886.093 34.373 29.08h20.49v27.035H27.238v17.948h27.625v27.133h18.274V74.063h27.41V56.115h-27.41V29.08zm-9.245 98.827l27.518-26.711H36.59l27.302 26.71zM.042 64.982l27.196 27.029V38.167L.042 64.982zm100.505-26.815V92.01l27.41-27.029-27.41-26.815z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/example.svg b/src/assets/icons/svg/example.svg
deleted file mode 100644
index 46f42b5..0000000
--- a/src/assets/icons/svg/example.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M96.258 57.462h31.421C124.794 27.323 100.426 2.956 70.287.07v31.422a32.856 32.856 0 0 1 25.971 25.97zm-38.796-25.97V.07C27.323 2.956 2.956 27.323.07 57.462h31.422a32.856 32.856 0 0 1 25.97-25.97zm12.825 64.766v31.421c30.46-2.885 54.507-27.253 57.713-57.712H96.579c-2.886 13.466-13.146 23.726-26.292 26.291zM31.492 70.287H.07c2.886 30.46 27.253 54.507 57.713 57.713V96.579c-13.466-2.886-23.726-13.146-26.291-26.292z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/excel.svg b/src/assets/icons/svg/excel.svg
deleted file mode 100644
index 74d97b8..0000000
--- a/src/assets/icons/svg/excel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.208 16.576v8.384h38.72v5.376h-38.72v8.704h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.512h38.72v5.376h-38.72v11.136H128v-94.72H78.208zM0 114.368L72.128 128V0L0 13.632v100.736z"/><path d="M28.672 82.56h-11.2l14.784-23.488-14.08-22.592h11.52l8.192 14.976 8.448-14.976h11.136l-14.08 22.208L58.368 82.56H46.656l-8.768-15.68z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/eye-open.svg b/src/assets/icons/svg/eye-open.svg
deleted file mode 100644
index 88dcc98..0000000
--- a/src/assets/icons/svg/eye-open.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><defs><style/></defs><path d="M512 128q69.675 0 135.51 21.163t115.498 54.997 93.483 74.837 73.685 82.006 51.67 74.837 32.17 54.827L1024 512q-2.347 4.992-6.315 13.483T998.87 560.17t-31.658 51.669-44.331 59.99-56.832 64.34-69.504 60.16-82.347 51.5-94.848 34.687T512 896q-69.675 0-135.51-21.163t-115.498-54.826-93.483-74.326-73.685-81.493-51.67-74.496-32.17-54.997L0 513.707q2.347-4.992 6.315-13.483t18.816-34.816 31.658-51.84 44.331-60.33 56.832-64.683 69.504-60.331 82.347-51.84 94.848-34.816T512 128.085zm0 85.333q-46.677 0-91.648 12.331t-81.152 31.83-70.656 47.146-59.648 54.485-48.853 57.686-37.675 52.821-26.325 43.99q12.33 21.674 26.325 43.52t37.675 52.351 48.853 57.003 59.648 53.845T339.2 767.02t81.152 31.488T512 810.667t91.648-12.331 81.152-31.659 70.656-46.848 59.648-54.186 48.853-57.344 37.675-52.651T927.957 512q-12.33-21.675-26.325-43.648t-37.675-52.65-48.853-57.345-59.648-54.186-70.656-46.848-81.152-31.659T512 213.334zm0 128q70.656 0 120.661 50.006T682.667 512 632.66 632.661 512 682.667 391.339 632.66 341.333 512t50.006-120.661T512 341.333zm0 85.334q-35.328 0-60.33 25.002T426.666 512t25.002 60.33T512 597.334t60.33-25.002T597.334 512t-25.002-60.33T512 426.666z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/eye.svg b/src/assets/icons/svg/eye.svg
deleted file mode 100644
index 16ed2d8..0000000
--- a/src/assets/icons/svg/eye.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="64" xmlns="http://www.w3.org/2000/svg"><path d="M127.072 7.994c1.37-2.208.914-5.152-.914-6.87-2.056-1.717-4.797-1.226-6.396.982-.229.245-25.586 32.382-55.74 32.382-29.24 0-55.74-32.382-55.968-32.627-1.6-1.963-4.57-2.208-6.397-.49C-.17 3.086-.399 6.275 1.2 8.238c.457.736 5.94 7.36 14.62 14.72L4.17 35.96c-1.828 1.963-1.6 5.152.228 6.87.457.98 1.6 1.471 2.742 1.471s2.284-.49 3.198-1.472l12.564-13.983c5.94 4.416 13.021 8.587 20.788 11.53l-4.797 17.418c-.685 2.699.686 5.397 3.198 6.133h1.37c2.057 0 3.884-1.472 4.341-3.68L52.6 42.83c3.655.736 7.538 1.227 11.422 1.227 3.883 0 7.767-.49 11.422-1.227l4.797 17.173c.457 2.208 2.513 3.68 4.34 3.68.457 0 .914 0 1.143-.246 2.513-.736 3.883-3.434 3.198-6.133l-4.797-17.172c7.767-2.944 14.848-7.114 20.788-11.53l12.336 13.738c.913.981 2.056 1.472 3.198 1.472s2.284-.49 3.198-1.472c1.828-1.963 1.828-4.906.228-6.87l-11.65-13.001c9.366-7.36 14.849-14.474 14.849-14.474z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/form.svg b/src/assets/icons/svg/form.svg
deleted file mode 100644
index dcbaa18..0000000
--- a/src/assets/icons/svg/form.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M84.068 23.784c-1.02 0-1.877-.32-2.572-.96a8.588 8.588 0 0 1-1.738-2.237 11.524 11.524 0 0 1-1.042-2.621c-.232-.895-.348-1.641-.348-2.238V0h.278c.834 0 1.622.085 2.363.256.742.17 1.645.575 2.711 1.214 1.066.64 2.363 1.535 3.892 2.686 1.53 1.15 3.453 2.664 5.77 4.54 2.502 2.045 4.494 3.771 5.977 5.178 1.483 1.406 2.618 2.6 3.406 3.58.787.98 1.274 1.812 1.46 2.494.185.682.277 1.278.277 1.79v2.046H84.068zM127.3 84.01c.278.682.464 1.535.556 2.558.093 1.023-.37 2.003-1.39 2.94-.463.427-.88.832-1.25 1.215-.372.384-.696.704-.974.96a6.69 6.69 0 0 1-.973.767l-11.816-10.741a44.331 44.331 0 0 0 1.877-1.535 31.028 31.028 0 0 1 1.737-1.406c1.112-.938 2.317-1.343 3.615-1.215 1.297.128 2.363.405 3.197.83.927.427 1.923 1.173 2.989 2.239 1.065 1.065 1.876 2.195 2.432 3.388zM78.23 95.902c2.038 0 3.752-.511 5.143-1.534l-26.969 25.83H18.037c-1.761 0-3.684-.47-5.77-1.407a24.549 24.549 0 0 1-5.838-3.709 21.373 21.373 0 0 1-4.518-5.306c-1.204-2.003-1.807-4.07-1.807-6.202V16.495c0-1.79.44-3.665 1.32-5.626A18.41 18.41 0 0 1 5.04 5.562a21.798 21.798 0 0 1 5.213-3.964C12.198.533 14.237 0 16.37 0h53.24v15.984c0 1.62.278 3.367.834 5.242a16.704 16.704 0 0 0 2.572 5.179c1.159 1.577 2.665 2.898 4.518 3.964 1.853 1.066 4.078 1.598 6.673 1.598h20.295v42.325L85.458 92.45c1.02-1.364 1.529-2.856 1.529-4.476 0-2.216-.857-4.113-2.572-5.69-1.714-1.577-3.776-2.366-6.186-2.366H26.1c-2.409 0-4.448.789-6.116 2.366-1.668 1.577-2.502 3.474-2.502 5.69 0 2.217.834 4.092 2.502 5.626 1.668 1.535 3.707 2.302 6.117 2.302h52.13zM26.1 47.951c-2.41 0-4.449.789-6.117 2.366-1.668 1.577-2.502 3.473-2.502 5.69 0 2.216.834 4.092 2.502 5.626 1.668 1.534 3.707 2.302 6.117 2.302h52.13c2.409 0 4.47-.768 6.185-2.302 1.715-1.534 2.572-3.41 2.572-5.626 0-2.217-.857-4.113-2.572-5.69-1.714-1.577-3.776-2.366-6.186-2.366H26.1zm52.407 64.063l1.807-1.663 3.476-3.196a479.75 479.75 0 0 0 4.587-4.284 500.757 500.757 0 0 1 5.004-4.667c3.985-3.666 8.48-7.758 13.485-12.276l11.677 10.741-13.485 12.404-5.004 4.603-4.587 4.22a179.46 179.46 0 0 0-3.267 3.068c-.88.853-1.367 1.322-1.46 1.407-.463.341-.973.703-1.529 1.087-.556.383-1.112.703-1.668.959-.556.256-1.413.575-2.572.959a83.5 83.5 0 0 1-3.545 1.087 72.2 72.2 0 0 1-3.475.895c-1.112.256-1.946.426-2.502.511-1.112.17-1.854.043-2.224-.383-.371-.426-.464-1.151-.278-2.174.092-.511.278-1.279.556-2.302.278-1.023.602-2.067.973-3.132l1.042-3.005c.325-.938.58-1.577.765-1.918a10.157 10.157 0 0 1 2.224-2.941z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/guide.svg b/src/assets/icons/svg/guide.svg
deleted file mode 100644
index b271001..0000000
--- a/src/assets/icons/svg/guide.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M1.482 70.131l36.204 16.18 69.932-65.485-61.38 70.594 46.435 18.735c1.119.425 2.397-.17 2.797-1.363v-.085L127.998.047 1.322 65.874c-1.12.597-1.519 1.959-1.04 3.151.32.511.72.937 1.2 1.107zm44.676 57.821L64.22 107.26l-18.062-7.834v28.527z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/language.svg b/src/assets/icons/svg/language.svg
deleted file mode 100644
index 0082b57..0000000
--- a/src/assets/icons/svg/language.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M84.742 36.8c2.398 7.2 5.595 12.8 11.19 18.4 4.795-4.8 7.992-11.2 10.39-18.4h-21.58zm-52.748 40h20.78l-10.39-28-10.39 28z"/><path d="M111.916 0H16.009C7.218 0 .025 7.2.025 16v96c0 8.8 7.193 16 15.984 16h95.907c8.791 0 15.984-7.2 15.984-16V16c0-8.8-6.394-16-15.984-16zM72.754 103.2c-1.598 1.6-3.197 1.6-4.795 1.6-.8 0-2.398 0-3.197-.8-.8-.8-1.599 0-1.599-.8s-.799-1.6-1.598-3.2c-.8-1.6-.8-2.4-1.599-4l-3.196-8.8H28.797L25.6 96c-1.598 3.2-2.398 5.6-3.197 7.2-.8 1.6-2.398 1.6-4.795 1.6-1.599 0-3.197-.8-4.796-1.6-1.598-1.6-2.397-2.4-2.397-4 0-.8 0-1.6.799-3.2.8-1.6.8-2.4 1.598-4l17.583-44.8c.8-1.6.8-3.2 1.599-4.8.799-1.6 1.598-3.2 2.397-4 .8-.8 1.599-2.4 3.197-3.2 1.599-.8 3.197-.8 4.796-.8 1.598 0 3.196 0 4.795.8 1.598.8 2.398 1.6 3.197 3.2.799.8 1.598 2.4 2.397 4 .8 1.6 1.599 3.2 2.398 5.6l17.583 44c1.598 3.2 2.398 5.6 2.398 7.2-.8.8-1.599 2.4-2.398 4zM116.711 72c-8.791-3.2-15.185-7.2-20.78-12-5.594 5.6-12.787 9.6-21.579 12l-2.397-4c8.791-2.4 15.984-5.6 21.579-11.2C87.939 51.2 83.144 44 81.545 36h-7.992v-3.2h21.58c-1.6-2.4-3.198-5.6-4.796-8l2.397-.8c1.599 2.4 3.997 5.6 5.595 8.8h19.98v4h-7.992c-2.397 8-6.393 15.2-11.189 20 5.595 4.8 11.988 8.8 20.78 11.2l-3.197 4z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/mnt.svg b/src/assets/icons/svg/mnt.svg
new file mode 100644
index 0000000..502a7c0
--- /dev/null
+++ b/src/assets/icons/svg/mnt.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574572606408" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1870" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M870.4 793.6H153.6C68.9024 793.6 0 724.6976 0 640V153.6C0 68.9024 68.9024 0 153.6 0h716.8c84.6976 0 153.6 68.9024 153.6 153.6v486.4c0 84.6976-68.9024 153.6-153.6 153.6zM153.6 51.2c-56.4608 0-102.4 45.9392-102.4 102.4v486.4c0 56.4608 45.9392 102.4 102.4 102.4h716.8c56.4608 0 102.4-45.9392 102.4-102.4V153.6c0-56.4608-45.9392-102.4-102.4-102.4H153.6zM793.6 1024H230.4a25.6 25.6 0 0 1 0-51.2h563.2a25.6 25.6 0 0 1 0 51.2zM633.6 908.8h-243.2a25.6 25.6 0 0 1 0-51.2h243.2a25.6 25.6 0 0 1 0 51.2z" fill="#bfbfbf" p-id="1871"></path><path d="M349.0688 404.3008A25.664 25.664 0 0 1 330.9568 396.8l-54.2976-54.3104a25.6 25.6 0 0 1 36.2112-36.2112l44.2624 44.2752 88.2688-20.3648 20.3648-88.256-44.2752-44.2752a25.6 25.6 0 1 1 36.1984-36.1984L512 215.7824c6.2464 6.2336 8.8192 15.2576 6.848 23.8592l-27.1616 117.6704a25.6 25.6 0 0 1-19.1872 19.1872l-117.6832 27.1488a25.7792 25.7792 0 0 1-5.7472 0.6528zM584.4096 639.6288a25.4976 25.4976 0 0 1-18.0992-7.5008L512 577.8304a25.5616 25.5616 0 0 1-6.848-23.8464l27.1488-117.6832a25.6256 25.6256 0 0 1 19.2-19.1872l117.6704-27.1488a25.536 25.536 0 0 1 23.8464 6.848l54.2976 54.3104a25.6 25.6 0 0 1-36.1984 36.2112l-44.2752-44.2752-88.256 20.3648-20.3648 88.256 44.2752 44.2752a25.6 25.6 0 0 1-18.0864 43.6736z" fill="#bfbfbf" p-id="1872"></path><path d="M557.248 467.648a25.4976 25.4976 0 0 1-18.0992-7.5008l-90.496-90.496a25.6 25.6 0 1 1 36.1984-36.1984l90.496 90.496a25.6 25.6 0 0 1-18.0992 43.6992z" fill="#bfbfbf" p-id="1873"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/mntsvg b/src/assets/icons/svg/mntsvg
new file mode 100644
index 0000000..09f40bd
--- /dev/null
+++ b/src/assets/icons/svg/mntsvg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574572606408" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1870" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M870.4 793.6H153.6C68.9024 793.6 0 724.6976 0 640V153.6C0 68.9024 68.9024 0 153.6 0h716.8c84.6976 0 153.6 68.9024 153.6 153.6v486.4c0 84.6976-68.9024 153.6-153.6 153.6zM153.6 51.2c-56.4608 0-102.4 45.9392-102.4 102.4v486.4c0 56.4608 45.9392 102.4 102.4 102.4h716.8c56.4608 0 102.4-45.9392 102.4-102.4V153.6c0-56.4608-45.9392-102.4-102.4-102.4H153.6zM793.6 1024H230.4a25.6 25.6 0 0 1 0-51.2h563.2a25.6 25.6 0 0 1 0 51.2zM633.6 908.8h-243.2a25.6 25.6 0 0 1 0-51.2h243.2a25.6 25.6 0 0 1 0 51.2z" fill="#707070" p-id="1871"></path><path d="M349.0688 404.3008A25.664 25.664 0 0 1 330.9568 396.8l-54.2976-54.3104a25.6 25.6 0 0 1 36.2112-36.2112l44.2624 44.2752 88.2688-20.3648 20.3648-88.256-44.2752-44.2752a25.6 25.6 0 1 1 36.1984-36.1984L512 215.7824c6.2464 6.2336 8.8192 15.2576 6.848 23.8592l-27.1616 117.6704a25.6 25.6 0 0 1-19.1872 19.1872l-117.6832 27.1488a25.7792 25.7792 0 0 1-5.7472 0.6528zM584.4096 639.6288a25.4976 25.4976 0 0 1-18.0992-7.5008L512 577.8304a25.5616 25.5616 0 0 1-6.848-23.8464l27.1488-117.6832a25.6256 25.6256 0 0 1 19.2-19.1872l117.6704-27.1488a25.536 25.536 0 0 1 23.8464 6.848l54.2976 54.3104a25.6 25.6 0 0 1-36.1984 36.2112l-44.2752-44.2752-88.256 20.3648-20.3648 88.256 44.2752 44.2752a25.6 25.6 0 0 1-18.0864 43.6736z" fill="#707070" p-id="1872"></path><path d="M557.248 467.648a25.4976 25.4976 0 0 1-18.0992-7.5008l-90.496-90.496a25.6 25.6 0 1 1 36.1984-36.1984l90.496 90.496a25.6 25.6 0 0 1-18.0992 43.6992z" fill="#707070" p-id="1873"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/money.svg b/src/assets/icons/svg/money.svg
deleted file mode 100644
index c1580de..0000000
--- a/src/assets/icons/svg/money.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.122 127.892v-28.68H7.513V87.274h46.609v-12.4H7.513v-12.86h38.003L.099 0h22.6l32.556 45.07c3.617 5.144 6.44 9.611 8.487 13.385 1.788-3.05 4.89-7.779 9.301-14.186L103.93 0h24.01L82.385 62.013h38.34v12.862h-46.41v12.4h46.41v11.937h-46.41v28.68H54.123z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/pdf.svg b/src/assets/icons/svg/pdf.svg
deleted file mode 100644
index 957aa0c..0000000
--- a/src/assets/icons/svg/pdf.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path d="M869.073 277.307H657.111V65.344l211.962 211.963zm-238.232 26.27V65.344l-476.498-.054v416.957h714.73v-178.67H630.841zm-335.836 360.57c-5.07-3.064-10.944-5.133-17.61-6.201-6.67-1.064-13.603-1.6-20.81-1.6h-48.821v85.641h48.822c7.206 0 14.14-.532 20.81-1.6 6.665-1.065 12.54-3.133 17.609-6.202 5.064-3.063 9.134-7.406 12.208-13.007 3.065-5.602 4.6-12.937 4.6-22.011 0-9.07-1.535-16.408-4.6-22.01-3.074-5.603-7.144-9.94-12.208-13.01zM35.82 541.805v416.904h952.358V541.805H35.821zm331.421 191.179c-3.6 11.071-9.343 20.879-17.209 29.413-7.874 8.542-18.078 15.408-30.617 20.61-12.544 5.206-27.747 7.807-45.621 7.807h-66.036v102.45h-62.831V607.517h128.867c17.874 0 33.077 2.6 45.62 7.802 12.541 5.207 22.745 12.076 30.618 20.615 7.866 8.538 13.604 18.277 17.21 29.212 3.6 10.943 5.401 22.278 5.401 34.018 0 11.477-1.8 22.752-5.402 33.819zM644.9 806.417c-5.343 17.61-13.408 32.818-24.212 45.627-10.807 12.803-24.283 22.879-40.423 30.213-16.146 7.343-35.155 11.007-57.03 11.007h-123.26V607.518h123.26c18.41 0 35.552 2.941 51.428 8.808 15.873 5.869 29.618 14.671 41.22 26.412 11.608 11.744 20.674 26.411 27.217 44.02 6.535 17.61 9.803 38.288 9.803 62.035 0 20.81-2.67 40.02-8.003 57.624zm245.362-146.07h-138.07v66.03h119.66v48.829h-119.66v118.058h-62.83V607.518h200.9v52.829h-.001zm-318.2 25.611c-6.402-8.266-14.877-14.604-25.412-19.01-10.544-4.402-23.551-6.602-39.019-6.602h-44.825v180.088h56.029c9.07 0 17.872-1.463 26.415-4.401 8.535-2.932 16.14-7.802 22.812-14.609 6.665-6.8 12.007-15.667 16.007-26.61 4.003-10.94 6.003-24.275 6.003-40.021 0-14.408-1.4-27.416-4.202-39.019-2.8-11.607-7.406-21.542-13.808-29.816zm0 0"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/qq.svg b/src/assets/icons/svg/qq.svg
deleted file mode 100644
index ee13d4e..0000000
--- a/src/assets/icons/svg/qq.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M18.448 57.545l-.244-.744-.198-.968-.132-.53v-2.181l.236-.859.24-.908.317-.953.428-1.06.561-1.103.794-1.104v-.773l.077-.724.123-.984.34-1.106.313-1.194.25-.548.289-.511.371-.569.405-.423v-2.73l.234-1.407.236-1.633.42-1.955.577-2.035.43-1.118.426-1.217.468-1.135.559-1.216.57-1.332.655-1.247.737-1.331.929-1.33.43-.762.457-.624.995-1.406 1.025-1.403 1.163-1.444 1.246-1.405 1.352-1.384 1.41-1.423 1.708-1.536 1.083-.934 1.322-1.008 1.34-.89 1.448-.855 1.392-.76 1.57-.63 1.667-.775 1.657-.532 1.653-.552 1.787-.548 1.785-.417 1.876-.347L59.128.68l1.879-.245 1.876-.252 2.002-.106h5.912l1.97.243 1.981.231 2.019.207 1.874.441 1.979.413 1.857.475 2.035.53 1.862.646 1.782.738 1.904.78 1.736.853 1.689.95 1.655 1.044 1.425.971.662.548.693.401 1.323 1.1 1.115 1.064 1.112 1.1 1.083 1.214.894 1.178 1.064 1.217.74 1.306.752 1.162.798 1.352.661 1.175 1.113 2.489.546 1.286.428 1.192.428 1.294.384 1.217.267 1.047.347 1.231.607 2.198.388 1.924.253 1.861.217 1.497.342 2.28.077.362.274.41.737 1.18.473.8.42.832.534.892.472 1.07.307 1.093.334 1.2.252 1.232.115.605.106.746v.648l-.106.643v.8l-.192.774-.35 1.5-.403.76-.299.852v.213l.142.264.4.623 1.746 2.53 1.377 1.9.66 1.267.889 1.389.774 1.52.893 1.627.894 1.828 1.006 2.069.567 1.268.518 1.239.447 1.307.44 1.175.336 1.235.342 1.16.432 2.261.343 2.31.235 2.05v2.891l-.158 1.025-.226 1.768-.308 1.59-.48 1.44-.18.588-.336.707-.28.493-.375.607-.33.383-.42.494-.375.4-.401.34-.48.207-.432.207-.355.114h-.543l-.346-.114-.66-.32-.302-.212-.317-.223-.347-.304-.35-.342-.579-.63-.684-.89-.539-.917-.538-.734-.526-.855-.741-1.517-.833-1.579-.098-.055h-.138l-.338.247-.196.415-.326.516-.567 1.533-.856 2.182-1.096 2.626-.824 1.308-.864 1.366-1.027 1.536-1.09 1.503-.557.68-.676.743-1.555 1.497.136.135.21.214.777.446 3.235 1.524 1.41.779 1.347.756 1.332.953 1.187.982.574.443.432.511.445.593.367.643.198.533.242.64.105.554.115.647-.115.433v.44l-.105.454-.242.415-.092.325-.22.394-.587.784-.543.627-.42.47-.35.348-.893.638-1.01.556-1.077.532-1.155.511-1.287.495-.693.207-.608.167-1.496.342-1.545.325-1.552.323-1.689.27-1.74.072-1.785.21h-5.539l-1.998-.114-1.86-.168-2.005-.27-1.99-.209-2.095-.286-2.03-.495-1.981-.374-1.968-.552-2.019-.707-1.98-.585-1.044-.342-.927-.323-.586-.223-.582-.12h-1.647l-1.904-.131-.962-.096-1.24-.135-.795.705-1.085.665-1.471.701-1.628.875-.99.475-1.033.376-2.281.914-1.24.305-1.3.343-1.803.344-1.13.086-1.193.1-1.246.135-1.45.053h-5.926l-3.346-.053-3.25-.321-1.644-.23-1.589-.23-1.546-.227-1.547-.305-1.442-.456-1.434-.325-1.294-.51-1.223-.474-1.142-.533-.99-.583-.984-.71-.336-.343-.44-.415-.334-.362-.3-.417-.278-.415-.215-.42-.311-.89-.109-.46-.138-.51v-.473l.138-.533v-.53l.109-.53v-1.069l.052-.564.259-.647.215-.646.39-.779.286-.3.236-.348.615-.738.49-.38.464-.266.428-.338.676-.21.543-.324.676-.341.77-.227.775-.231.897-.192.85-.11 1.008-.13 1.093-.081.284-.092h.063l.137-.115v-.13l-.2-.266-.58-.27-1.45-1.231-.975-.761-1.127-.967-1.136-1.082-1.181-1.382-1.36-1.558-.508-.843-.672-.87-.58-1.007-.522-1.1-.704-1.047-.459-1.194-.547-1.192-.546-1.33-.397-1.273-.378-1.575-.112-.057h-.115l-.059-.113h-.14l-.23.113-.114.057-.158.264-.057.321-.119.286-.206.477-.664 1.157-.345.701-.546.612-.58.736-.641.816-.677.724-.795.701-.734.658-.814.524-.89.546-.855.325-1.008.247-.99.095h-.233l-.228-.095-.18-.384-.29-.188-.38-.912-.237-.493-.255-.707-.21-.734-.113-.724-.313-1.648-.12-.972v-3.185l.12-2.379.196-1.214.23-1.252.21-1.347.374-1.254.42-1.443.431-1.407.578-1.448.545-1.38.754-1.4.699-1.52.855-1.425 1.006-1.538 1.023-1.382 1.069-1.538.891-1.071 1.142-1.227 1.202-1.237.56-.59.678-.662.985-.836 1.012-.853 1.647-1.446 1.242-.889z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/server.svg b/src/assets/icons/svg/server.svg
new file mode 100644
index 0000000..db6dcdf
--- /dev/null
+++ b/src/assets/icons/svg/server.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574576420335" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9530" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M915.94 827.89h-91.42a12.5 12.5 0 0 1 0-25h78.92v-535h-78.92a12.5 12.5 0 1 1 0-25h91.42a12.5 12.5 0 0 1 12.5 12.5v560a12.5 12.5 0 0 1-12.5 12.5z" fill="#cdcdcd" p-id="9531"></path><path d="M915.94 547.91h-91.42a12.5 12.5 0 0 1 0-25h91.42a12.5 12.5 0 0 1 0 25z" fill="#cdcdcd" p-id="9532"></path><path d="M774.6 231.51a90.63 90.63 0 0 1-90.37 90.37H215.94a90.62 90.62 0 0 1-81.18-50.81 88.92 88.92 0 0 0 15.4 1.33h468.29a90.26 90.26 0 0 0 81.18-129.92c42.44 7.35 74.97 44.57 74.97 89.03z" fill="#cdcdcd" p-id="9533"></path><path d="M684.23 334.38H215.94a102.23 102.23 0 0 1-55.12-16.11 103.66 103.66 0 0 1-37.28-41.69 12.5 12.5 0 0 1 13.38-17.82 76.71 76.71 0 0 0 13.24 1.14h468.29a77.76 77.76 0 0 0 70-111.91 12.5 12.5 0 0 1 13.35-17.83 103.18 103.18 0 0 1 85.3 101.35 103.13 103.13 0 0 1-102.87 102.87zM159.46 284.9a78.31 78.31 0 0 0 56.48 24.48h468.29a77.75 77.75 0 0 0 59.28-128.2 78.73 78.73 0 0 0-24.14-19.08 103.06 103.06 0 0 1-100.92 122.8z" fill="#cdcdcd" p-id="9534"></path><path d="M618.45 284.91H150.16a102.86 102.86 0 1 1 0-205.73h468.29a102.86 102.86 0 0 1 0 205.73zM150.16 104.18a77.86 77.86 0 1 0 0 155.73h468.29a77.86 77.86 0 0 0 0-155.73z" fill="#cdcdcd" p-id="9535"></path><path d="M176.2 235.43A53.39 53.39 0 1 1 229.59 182a53.45 53.45 0 0 1-53.39 53.43z m0-81.78A28.39 28.39 0 1 0 204.59 182a28.43 28.43 0 0 0-28.39-28.35zM551.12 194.54H423a12.5 12.5 0 0 1 0-25h128.12a12.5 12.5 0 0 1 0 25z" fill="#cdcdcd" p-id="9536"></path><path d="M774.6 534.74a90.63 90.63 0 0 1-90.37 90.37H215.94a90.62 90.62 0 0 1-81.18-50.81 88.92 88.92 0 0 0 15.4 1.33h468.29a90.26 90.26 0 0 0 81.18-129.92c42.44 7.35 74.97 44.57 74.97 89.03z" fill="#cdcdcd" p-id="9537"></path><path d="M684.23 637.61H215.94a102.23 102.23 0 0 1-55.12-16.11 103.66 103.66 0 0 1-37.28-41.69A12.5 12.5 0 0 1 136.92 562a76.71 76.71 0 0 0 13.24 1.14h468.29a77.76 77.76 0 0 0 70-111.91 12.5 12.5 0 0 1 13.35-17.83 103.18 103.18 0 0 1 85.3 101.34 103.13 103.13 0 0 1-102.87 102.87z m-524.77-49.48a78.31 78.31 0 0 0 56.48 24.48h468.29a77.75 77.75 0 0 0 59.28-128.2 78.73 78.73 0 0 0-24.14-19.08 103.06 103.06 0 0 1-100.92 122.8z" fill="#cdcdcd" p-id="9538"></path><path d="M618.45 588.13H150.16a102.86 102.86 0 1 1 0-205.73h468.29a102.86 102.86 0 0 1 0 205.73zM150.16 407.4a77.86 77.86 0 1 0 0 155.73h468.29a77.86 77.86 0 0 0 0-155.73z" fill="#cdcdcd" p-id="9539"></path><path d="M176.2 538.66a53.39 53.39 0 1 1 53.39-53.39 53.45 53.45 0 0 1-53.39 53.39z m0-81.78a28.39 28.39 0 1 0 28.39 28.39 28.43 28.43 0 0 0-28.39-28.39zM551.12 497.77H423a12.5 12.5 0 0 1 0-25h128.12a12.5 12.5 0 0 1 0 25z" fill="#cdcdcd" p-id="9540"></path><path d="M774.6 869.33a90.63 90.63 0 0 1-90.37 90.37H215.94a90.62 90.62 0 0 1-81.18-50.81 88.92 88.92 0 0 0 15.4 1.33h468.29a90.26 90.26 0 0 0 81.18-129.92c42.44 7.35 74.97 44.57 74.97 89.03z" fill="#cdcdcd" p-id="9541"></path><path d="M684.23 972.2H215.94a102.23 102.23 0 0 1-55.12-16.11 103.66 103.66 0 0 1-37.28-41.69 12.5 12.5 0 0 1 13.38-17.82 76.71 76.71 0 0 0 13.24 1.14h468.29a77.76 77.76 0 0 0 70-111.91A12.5 12.5 0 0 1 701.76 768a102.73 102.73 0 0 1 55.14 174 102.16 102.16 0 0 1-72.67 30.2z m-524.77-49.48a78.31 78.31 0 0 0 56.48 24.48h468.29A77.75 77.75 0 0 0 743.51 819a78.71 78.71 0 0 0-24.14-19.08 103.06 103.06 0 0 1-100.92 122.8z" fill="#cdcdcd" p-id="9542"></path><path d="M618.45 922.72H150.16a102.86 102.86 0 1 1 0-205.73h468.29a102.86 102.86 0 0 1 0 205.73zM150.16 742a77.86 77.86 0 1 0 0 155.73h468.29a77.86 77.86 0 1 0 0-155.73z" fill="#cdcdcd" p-id="9543"></path><path d="M176.2 873.25a53.39 53.39 0 1 1 53.39-53.39 53.45 53.45 0 0 1-53.39 53.39z m0-81.78a28.39 28.39 0 1 0 28.39 28.39 28.42 28.42 0 0 0-28.39-28.4zM551.12 832.35H423a12.5 12.5 0 0 1 0-25h128.12a12.5 12.5 0 0 1 0 25z" fill="#cdcdcd" p-id="9544"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/shopping.svg b/src/assets/icons/svg/shopping.svg
deleted file mode 100644
index 87513e7..0000000
--- a/src/assets/icons/svg/shopping.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M42.913 101.36c1.642 0 3.198.332 4.667.996a12.28 12.28 0 0 1 3.89 2.772c1.123 1.184 1.987 2.582 2.592 4.193.605 1.612.908 3.318.908 5.118 0 1.8-.303 3.507-.908 5.118-.605 1.611-1.469 3.01-2.593 4.194a13.3 13.3 0 0 1-3.889 2.843 10.582 10.582 0 0 1-4.667 1.066c-1.729 0-3.306-.355-4.732-1.066a13.604 13.604 0 0 1-3.825-2.843c-1.123-1.185-1.988-2.583-2.593-4.194a14.437 14.437 0 0 1-.907-5.118c0-1.8.302-3.506.907-5.118.605-1.61 1.47-3.009 2.593-4.193a12.515 12.515 0 0 1 3.825-2.772c1.426-.664 3.003-.996 4.732-.996zm53.932.285c1.643 0 3.22.331 4.733.995a11.386 11.386 0 0 1 3.889 2.772c1.08 1.185 1.945 2.583 2.593 4.194.648 1.61.972 3.317.972 5.118 0 1.8-.324 3.506-.972 5.117-.648 1.611-1.513 3.01-2.593 4.194a12.253 12.253 0 0 1-3.89 2.843 11 11 0 0 1-4.732 1.066 10.58 10.58 0 0 1-4.667-1.066 12.478 12.478 0 0 1-3.824-2.843c-1.08-1.185-1.945-2.583-2.593-4.194a13.581 13.581 0 0 1-.973-5.117c0-1.801.325-3.507.973-5.118.648-1.611 1.512-3.01 2.593-4.194a11.559 11.559 0 0 1 3.824-2.772 11.212 11.212 0 0 1 4.667-.995zm21.781-80.747c2.42 0 4.3.355 5.64 1.066 1.34.71 2.29 1.587 2.852 2.63a6.427 6.427 0 0 1 .778 3.34c-.044 1.185-.195 2.204-.454 3.057-.26.853-.8 2.606-1.62 5.26a589.268 589.268 0 0 1-2.788 8.743 1236.373 1236.373 0 0 0-3.047 9.453c-.994 3.128-1.75 5.592-2.269 7.393-1.123 3.79-2.55 6.42-4.278 7.89-1.728 1.469-3.846 2.203-6.352 2.203H39.023l1.945 12.795h65.342c4.148 0 6.223 1.943 6.223 5.828 0 1.896-.41 3.53-1.232 4.905-.821 1.374-2.442 2.061-4.862 2.061H38.505c-1.729 0-3.176-.426-4.343-1.28-1.167-.852-2.14-1.966-2.917-3.34a21.277 21.277 0 0 1-1.88-4.478 44.128 44.128 0 0 1-1.102-4.55c-.087-.568-.324-1.942-.713-4.122-.39-2.18-.865-4.904-1.426-8.174l-1.88-10.947c-.692-4.027-1.383-8.079-2.075-12.154-1.642-9.572-3.5-20.234-5.574-31.986H6.87c-1.296 0-2.377-.356-3.24-1.067a9.024 9.024 0 0 1-2.14-2.558 10.416 10.416 0 0 1-1.167-3.2C.108 8.53 0 7.488 0 6.54c0-1.896.583-3.46 1.75-4.69C2.917.615 4.494 0 6.482 0h13.095c1.728 0 3.111.284 4.148.853 1.037.569 1.858 1.28 2.463 2.132a8.548 8.548 0 0 1 1.297 2.701c.26.948.475 1.754.648 2.417.173.758.346 1.825.519 3.199.173 1.374.345 2.772.518 4.193.26 1.706.519 3.507.778 5.403h88.678z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/star.svg b/src/assets/icons/svg/star.svg
deleted file mode 100644
index 6cf86e6..0000000
--- a/src/assets/icons/svg/star.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M70.66 4.328l14.01 29.693c1.088 2.29 3.177 3.882 5.603 4.25l31.347 4.76c6.087.926 8.528 8.756 4.117 13.247L103.05 79.395c-1.75 1.78-2.544 4.352-2.132 6.867l5.352 32.641c1.043 6.337-5.33 11.182-10.778 8.19l-28.039-15.409a7.13 7.13 0 0 0-6.91 0l-28.039 15.41c-5.448 2.99-11.821-1.854-10.777-8.19l5.352-32.642c.415-2.515-.387-5.088-2.136-6.867L2.264 56.278C-2.146 51.787.286 43.957 6.38 43.031l31.343-4.76c2.419-.368 4.51-1.96 5.595-4.25L57.334 4.328c2.728-5.77 10.605-5.77 13.325 0z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/sys-tools.svg b/src/assets/icons/svg/sys-tools.svg
index c813067..324aa04 100644
--- a/src/assets/icons/svg/sys-tools.svg
+++ b/src/assets/icons/svg/sys-tools.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553828490559" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1684" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M898.831744 900.517641 103.816972 900.517641c-36.002982 0-65.363683-29.286-65.363683-65.313541l0-554.949184c0-36.041868 29.361725-65.326844 65.363683-65.326844l795.015795 0c36.002982 0 65.198931 29.284977 65.198931 65.326844l0 554.949184C964.030675 871.231641 934.834726 900.517641 898.831744 900.517641L898.831744 900.517641zM103.816972 255.593236c-13.576203 0-24.711821 11.085476-24.711821 24.662703l0 554.949184c0 13.576203 11.136641 24.662703 24.711821 24.662703l795.015795 0c13.577227 0 24.547069-11.086499 24.547069-24.662703l0-554.949184c0-13.577227-10.970866-24.662703-24.547069-24.662703L103.816972 255.593236 103.816972 255.593236zM664.346245 251.774257c-11.161201 0-20.332071-9.080819-20.332071-20.332071l0-101.278661c0-13.576203-11.047614-24.623817-24.699542-24.623817L383.181611 105.539708c-13.576203 0-24.712845 11.04659-24.712845 24.623817l0 101.278661c0 11.252275-9.041934 20.332071-20.332071 20.332071-11.20111 0-20.319791-9.080819-20.319791-20.332071l0-101.278661c0-35.989679 29.323862-65.275679 65.364707-65.275679l236.133022 0c36.06745 0 65.402569 29.284977 65.402569 65.275679l0 101.278661C684.717202 242.694461 675.636383 251.774257 664.346245 251.774257L664.346245 251.774257zM413.233044 521.725502 75.694471 521.725502c-11.163247 0-20.333094-9.117658-20.333094-20.35663 0-11.252275 9.169847-20.332071 20.333094-20.332071l337.538573 0c11.277858 0 20.319791 9.080819 20.319791 20.332071C433.552835 512.607844 424.510902 521.725502 413.233044 521.725502L413.233044 521.725502zM912.894018 521.725502 575.367725 521.725502c-11.213389 0-20.332071-9.117658-20.332071-20.35663 0-11.252275 9.118682-20.332071 20.332071-20.332071l337.526293 0c11.290137 0 20.332071 9.080819 20.332071 20.332071C933.226089 512.607844 924.184155 521.725502 912.894018 521.725502L912.894018 521.725502zM557.56322 634.217552 445.085496 634.217552c-11.213389 0-20.332071-9.079796-20.332071-20.331048l0-168.763658c0-11.251252 9.118682-20.332071 20.332071-20.332071l112.478747 0c11.290137 0 20.370956 9.080819 20.370956 20.332071l0 168.763658C577.934177 625.137757 568.853357 634.217552 557.56322 634.217552L557.56322 634.217552zM465.417567 593.514525l71.827909 0L537.245476 465.454918l-71.827909 0L465.417567 593.514525 465.417567 593.514525z" p-id="1685" fill="#bfbfbf"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574576079728" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6611" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M981.917808 277.742466H813.589041V122.038356c0-19.638356-15.430137-35.068493-35.068493-35.068493H252.493151c-19.638356 0-35.068493 15.430137-35.068493 35.068493v155.70411H42.082192c-19.638356 0-35.068493 15.430137-35.068493 35.068493V911.780822c0 19.638356 15.430137 35.068493 35.068493 35.068493h939.835616c19.638356 0 35.068493-15.430137 35.068493-35.068493V312.810959c0-19.638356-15.430137-35.068493-35.068493-35.068493z m-694.356164-120.635617H743.452055v120.635617H287.561644v-120.635617zM252.493151 347.879452h694.356164v133.260274h-74.345205v-50.49863c0-19.638356-15.430137-35.068493-35.068494-35.068493h-117.830137c-19.638356 0-35.068493 15.430137-35.068493 35.068493v50.49863h-336.657534v-50.49863c0-19.638356-15.430137-35.068493-35.068493-35.068493h-117.830137c-19.638356 0-35.068493 15.430137-35.068493 35.068493v50.49863H77.150685v-133.260274H252.493151z m549.873972 119.232877v140.273972h-47.69315v-140.273972h47.69315z m-526.027397 0v140.273972h-47.693151v-140.273972h47.693151zM77.150685 876.712329V551.276712h81.358904v89.775343c0 19.638356 15.430137 35.068493 35.068493 35.068493h117.830137c19.638356 0 35.068493-15.430137 35.068493-35.068493v-89.775343h336.657535v89.775343c0 19.638356 15.430137 35.068493 35.068493 35.068493h117.830137c19.638356 0 35.068493-15.430137 35.068493-35.068493v-89.775343h74.345205v324.032877H77.150685z" p-id="6612" fill="#bfbfbf"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/table.svg b/src/assets/icons/svg/table.svg
deleted file mode 100644
index 0e3dc9d..0000000
--- a/src/assets/icons/svg/table.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/zip.svg b/src/assets/icons/svg/zip.svg
deleted file mode 100644
index f806fc4..0000000
--- a/src/assets/icons/svg/zip.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.527 116.793c.178.008.348.024.527.024h40.233c4.711-.005 8.53-3.677 8.534-8.21V18.895c-.004-4.532-3.823-8.204-8.534-8.209H79.054c-.179 0-.353.016-.527.024V0L0 10.082v107.406l78.527 10.342v-11.037zm0-101.362c.174-.024.348-.052.527-.052h40.233c2.018 0 3.659 1.578 3.659 3.52v89.713c-.003 1.942-1.64 3.517-3.659 3.519H79.054c-.179 0-.353-.028-.527-.052V15.431zM30.262 75.757l-18.721-.46V72.37l11.3-16.673v-.148l-10.266.164v-4.51l17.504-.44v3.264L18.696 70.76v.144l11.566.176v4.678zm9.419.231l-5.823-.144V50.671l5.823-.144v25.461zm22.255-11.632c-2.168 1.922-5.353 2.76-9.02 2.736-.702.004-1.402-.04-2.097-.131v9.303l-5.997-.148V50.743c1.852-.352 4.473-.647 8.218-.743 3.838-.096 6.608.539 8.48 1.913 1.807 1.306 3.032 3.5 3.032 6.112s-.926 4.833-2.612 6.331h-.004zM53.36 54.45c-.856-.01-1.71.083-2.541.275v7.682c.523.116 1.167.152 2.06.152 3.301-.004 5.36-1.614 5.36-4.314 0-2.425-1.772-3.843-4.875-3.791l-.004-.004zm39.847-37.066h9.564v3.795h-9.564v-3.795zm-9.568 5.68h9.564v3.8h-9.564v-3.8zm9.568 6.216h9.564v3.799h-9.564V29.28zm0 12h9.564v3.794h-9.564V41.28zm-9.568-6.096h9.564v3.795h-9.564v-3.795zm9.472 47.064c2.512 0 4.921-.96 6.697-2.67 1.776-1.708 2.773-4.026 2.772-6.442l-1.748-15.263c0-5.033-2.492-9.112-7.725-9.112-5.232 0-7.72 4.079-7.72 9.112l-1.752 15.263c-.001 2.417.996 4.735 2.773 6.444 1.777 1.71 4.187 2.669 6.7 2.668h.003zm-3.135-16.75h6.27v12.743h-6.27V65.5z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/zujian.svg b/src/assets/icons/svg/zujian.svg
index 8e0cc0a..2aba32f 100644
--- a/src/assets/icons/svg/zujian.svg
+++ b/src/assets/icons/svg/zujian.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545183338053" class="icon" style="" viewBox="0 0 1031 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1503" xmlns:xlink="http://www.w3.org/1999/xlink" width="201.3671875" height="200"><defs><style type="text/css"></style></defs><path d="M422.495 226.407l-97.74-37.845-25.11 101.070-135.585-36.382v126.653h-96.435v520.222h833.332c0 0 0-91.035 0-180.923v-13.162h66.667v-129.352h-66.667v-11.318c0-100.935 0-185.468 0-185.468h-29.768v-61.965l-385.717-194.063M346.58 230.075l363.892 149.85h-74.407l-306.292-82.192 16.807-67.657zM196.19 294.2l319.343 85.702h-319.343v-85.702zM838.745 835.438h-706.838v-387.877h706.86c0 0 0 58.073 0 129.127h-224.685v129.352h224.685c-0.023 65.183-0.023 129.398-0.023 129.398zM839.060 673.73h-192.87v-64.687h192.87v64.687zM839.060 379.903h-96.435v-20.183l-281.408-118.35 40.118-60.57 337.725 160.043v39.060z" p-id="1504"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574576020792" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5498" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M64 64h384v384H64V64z m0 512h384v384H64V576z m512 0h384v384H576V576z m192-128c106.039 0 192-85.961 192-192S874.039 64 768 64s-192 85.961-192 192 85.961 192 192 192z" p-id="5499" fill="#bfbfbf"></path></svg>
\ No newline at end of file
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
index 244fc29..551c6eb 100644
--- a/src/mixins/crud.js
+++ b/src/mixins/crud.js
@@ -158,7 +158,6 @@ export default {
       this.delLoading = true
       this.crudMethod.del(id).then(() => {
         this.delLoading = false
-        console.log(this.$refs[id])
         this.$refs[id].doClose()
         this.dleChangePage()
         this.delSuccessNotify()
diff --git a/src/views/mnt/account/form.vue b/src/views/mnt/account/form.vue
deleted file mode 100644
index fda8b91..0000000
--- a/src/views/mnt/account/form.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<template>
-  <el-dialog
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :visible.sync="dialog"
-    :title="isAdd ? '新增' : '编辑'"
-    width="500px"
-  >
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="名称">
-        <el-input v-model="form.name" style="width: 370px" />
-      </el-form-item>
-      <el-form-item label="账号">
-        <el-input v-model="form.account" style="width: 370px" />
-      </el-form-item>
-      <el-form-item label="密码">
-        <el-input v-model="form.password" type="password" style="width: 370px" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/serverAccount'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      dialog: false,
-      form: {
-        id: '',
-        name: '',
-        account: '',
-        password: ''
-      },
-      rules: {}
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.loading = true
-      if (this.isAdd) {
-        this.doAdd()
-      } else this.doEdit()
-    },
-    doAdd() {
-      add(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '添加成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    doEdit() {
-      edit(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '修改成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        name: '',
-        account: '',
-        password: ''
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/views/mnt/account/index.vue b/src/views/mnt/account/index.vue
deleted file mode 100644
index cba59be..0000000
--- a/src/views/mnt/account/index.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!-- 搜索 -->
-      <el-input
-        v-model="query.value"
-        clearable
-        placeholder="输入搜索内容"
-        style="width: 200px"
-        class="filter-item"
-        @keyup.enter.native="toQuery"
-      />
-      <el-select
-        v-model="query.type"
-        clearable
-        placeholder="类型"
-        class="filter-item"
-        style="width: 130px"
-      >
-        <el-option
-          v-for="item in queryTypeOptions"
-          :key="item.key"
-          :label="item.display_name"
-          :value="item.key"
-        />
-      </el-select>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="toQuery"
-      >搜索</el-button>
-      <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px">
-        <el-button
-          v-permission="['admin','serverAccount:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增</el-button>
-      </div>
-    </div>
-    <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
-    <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
-      <el-table-column prop="name" label="名称" />
-      <el-table-column prop="account" label="账号" />
-      <el-table-column
-        v-if="checkPermission(['admin','serverAccount:edit','serverAccount:del'])"
-        label="操作"
-        width="150px"
-        align="center"
-      >
-        <template slot-scope="scope">
-          <el-button
-            v-permission="['admin','serverAccount:edit']"
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            @click="edit(scope.row)"
-          />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','serverAccount:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button
-                :loading="delLoading"
-                type="primary"
-                size="mini"
-                @click="subDelete(scope.row.id)"
-              >确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
-  </div>
-</template>
-
-<script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del } from '@/api/serverAccount'
-import eForm from './form'
-export default {
-  components: { eForm },
-  mixins: [initData],
-  data() {
-    return {
-      delLoading: false,
-      queryTypeOptions: [
-        { key: 'name', display_name: '名称' },
-        { key: 'account', display_name: '账号' }
-      ]
-    }
-  },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
-  methods: {
-    checkPermission,
-    beforeInit() {
-      this.url = 'api/serverAccount'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const type = query.type
-      const value = query.value
-      if (type && value) {
-        this.params[type] = value
-      }
-      return true
-    },
-    subDelete(id) {
-      this.delLoading = true
-      del(id)
-        .then(res => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          this.dleChangePage()
-          this.init()
-          this.$notify({
-            title: '删除成功',
-            type: 'success',
-            duration: 2500
-          })
-        })
-        .catch(err => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          console.log(err.response.data.message)
-        })
-    },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        name: data.name,
-        account: data.account,
-        password: data.password
-      }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/views/mnt/app/form.vue b/src/views/mnt/app/form.vue
deleted file mode 100644
index efadb42..0000000
--- a/src/views/mnt/app/form.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <el-dialog
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :visible.sync="dialog"
-    :title="isAdd ? '新增' : '编辑'"
-    width="800px"
-  >
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
-      <el-form-item label="应用名称" prop="name">
-        <el-input v-model="form.name" style="width: 670px" placeholder="部署后的文件或者目录名称，用于备份" />
-      </el-form-item>
-      <el-form-item label="应用端口" prop="port">
-        <el-input-number v-model="form.port" placeholder="例如：8080" />
-      </el-form-item>
-      <el-form-item label="上传目录" prop="uploadPath">
-        <el-input
-          v-model="form.uploadPath"
-          style="width: 670px"
-          placeholder="例如: /opt/upload"
-        />
-      </el-form-item>
-      <el-form-item label="部署目录" prop="deployPath">
-        <el-input
-          v-model="form.deployPath"
-          style="width: 670px"
-          placeholder="例如: /opt/app"
-        />
-      </el-form-item>
-      <el-form-item label="备份目录" prop="backupPath">
-        <el-input
-          v-model="form.backupPath"
-          style="width: 670px"
-          placeholder="例如: /opt/backup"
-        />
-      </el-form-item>
-      <el-form-item label="启动脚本" prop="startScript">
-        <el-input
-          v-model="form.startScript"
-          :rows="2"
-          type="textarea"
-          autosize
-          style="width: 670px"
-          placeholder=""
-        />
-      </el-form-item>
-      <el-form-item label="部署脚本" prop="deployScript">
-        <el-input
-          v-model="form.deployScript"
-          :rows="2"
-          type="textarea"
-          autosize
-          style="width: 670px"
-          placeholder=""
-        />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/app'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      dialog: false,
-      form: {
-        id: '',
-        name: '',
-        port: 8080,
-        uploadPath: '/opt/upload',
-        deployPath: '/opt/app',
-        backupPath: '/opt/backup',
-        startScript: '',
-        deployScript: ''
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入应用名称', trigger: 'change' }
-        ],
-        uploadPath: [
-          { required: true, message: '请输入上传目录', trigger: 'change' }
-        ],
-        deployPath: [
-          { required: true, message: '请输入部署目录', trigger: 'change' }
-        ],
-        backupPath: [
-          { required: true, message: '请输入备份目录', trigger: 'change' }
-        ],
-        startScript: [
-          { required: true, message: '请输入启动脚本', trigger: 'change' }
-        ],
-        deployScript: [
-          { required: true, message: '请输入部署脚本', trigger: 'change' }
-        ]
-      }
-    }
-  },
-  mounted() {},
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else this.doEdit()
-        } else {
-          this.$message.error('请将表单中的信息补充完整！')
-        }
-      })
-    },
-    doAdd() {
-      add(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '添加成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    doEdit() {
-      edit(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '修改成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        name: '',
-        port: 8080,
-        uploadPath: '/opt/upload',
-        deployPath: '/opt/app',
-        backupPath: '/opt/backup',
-        startScript: '',
-        deployScript: ''
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
index ab49f17..b6230ac 100644
--- a/src/views/mnt/app/index.vue
+++ b/src/views/mnt/app/index.vue
@@ -3,83 +3,83 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input
-        v-model="query.value"
-        clearable
-        placeholder="输入搜索内容"
-        style="width: 200px"
-        class="filter-item"
-        @keyup.enter.native="toQuery"
+      <el-input v-model="query.name" clearable placeholder="输入名称搜索" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-date-picker
+        v-model="query.createTime"
+        :default-time="['00:00:00','23:59:59']"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
       />
-      <el-select
-        v-model="query.type"
-        clearable
-        placeholder="类型"
-        class="filter-item"
-        style="width: 130px"
-      >
-        <el-option
-          v-for="item in queryTypeOptions"
-          :key="item.key"
-          :label="item.display_name"
-          :value="item.key"
-        />
-      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
       <el-button
+        v-permission="['admin','app:add']"
         class="filter-item"
         size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="toQuery"
-      >搜索</el-button>
-      <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px">
-        <el-button
-          v-permission="['admin','app:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增</el-button>
-        <el-button
-          v-permission="['admin','app:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="copy"
-        >复制新增</el-button>
-      </div>
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增</el-button>
+      <el-button
+        v-permission="['admin','app:add']"
+        :disabled="!currentRow"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="copy"
+      >复制新增</el-button>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="800px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+        <el-form-item label="应用名称" prop="name">
+          <el-input v-model="form.name" style="width: 670px" placeholder="部署后的文件或者目录名称，用于备份" />
+        </el-form-item>
+        <el-form-item label="应用端口" prop="port">
+          <el-input-number v-model.number="form.port" placeholder="例如：8080" />
+        </el-form-item>
+        <el-form-item label="上传目录" prop="uploadPath">
+          <el-input v-model="form.uploadPath" style="width: 670px" placeholder="例如: /opt/upload" />
+        </el-form-item>
+        <el-form-item label="部署目录" prop="deployPath">
+          <el-input v-model="form.deployPath" style="width: 670px" placeholder="例如: /opt/app" />
+        </el-form-item>
+        <el-form-item label="备份目录" prop="backupPath">
+          <el-input v-model="form.backupPath" style="width: 670px" placeholder="例如: /opt/backup" />
+        </el-form-item>
+        <el-form-item label="启动脚本" prop="startScript">
+          <el-input v-model="form.startScript" :rows="3" type="textarea" autosize style="width: 670px" placeholder="" />
+        </el-form-item>
+        <el-form-item label="部署脚本" prop="deployScript">
+          <el-input v-model="form.deployScript" :rows="3" type="textarea" autosize style="width: 670px" placeholder="" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
     <!--表格渲染-->
-    <el-table
-      v-loading="loading"
-      :data="data"
-      highlight-current-row
-      size="small"
-      style="width: 100%"
-      @current-change="handleCurrentChange"
-    >
+    <el-table v-loading="loading" :data="data" highlight-current-row size="small" style="width: 100%" @current-change="handleCurrentChange">
       <el-table-column prop="name" label="应用名称" />
       <el-table-column prop="port" label="端口号" />
+      <el-table-column prop="uploadPath" label="上传目录" />
       <el-table-column prop="deployPath" label="部署目录" />
-      <el-table-column
-        v-if="checkPermission(['admin','app:edit','app:del'])"
-        label="操作"
-        width="150px"
-        align="center"
-      >
+      <el-table-column prop="backupPath" label="备份目录" />
+      <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
-          <el-button
-            v-permission="['admin','app:edit']"
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            @click="edit(scope.row)"
-          />
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','app:edit','app:del'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','app:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
           <el-popover
             :ref="scope.row.id"
             v-permission="['admin','app:del']"
@@ -89,12 +89,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button
-                :loading="delLoading"
-                type="primary"
-                size="mini"
-                @click="subDelete(scope.row.id)"
-              >确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -114,18 +109,48 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del } from '@/api/app'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import crudApp from '@/api/mnt/app'
 export default {
-  components: { eForm },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false,
-      queryTypeOptions: [{ key: 'name', display_name: '应用名称' }],
-      currentRow: {}
+      title: '应用',
+      crudMethod: { ...crudApp },
+      currentRow: null,
+      form: {
+        id: null,
+        name: null,
+        port: 8080,
+        uploadPath: '/opt/upload',
+        deployPath: '/opt/app',
+        backupPath: '/opt/backup',
+        startScript: null,
+        deployScript: null
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入应用名称', trigger: 'blur' }
+        ],
+        port: [
+          { required: true, message: '请输入应用端口', trigger: 'blur', type: 'number' }
+        ],
+        uploadPath: [
+          { required: true, message: '请输入上传目录', trigger: 'blur' }
+        ],
+        deployPath: [
+          { required: true, message: '请输入部署目录', trigger: 'blur' }
+        ],
+        backupPath: [
+          { required: true, message: '请输入备份目录', trigger: 'blur' }
+        ],
+        startScript: [
+          { required: true, message: '请输入启动脚本', trigger: 'blur' }
+        ],
+        deployScript: [
+          { required: true, message: '请输入部署脚本', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
@@ -134,74 +159,14 @@ export default {
     })
   },
   methods: {
-    checkPermission,
     beforeInit() {
       this.url = 'api/app'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const type = query.type
-      const value = query.value
-      if (type && value) {
-        this.params[type] = value
-      }
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id)
-        .then(res => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          this.dleChangePage()
-          this.init()
-          this.$notify({
-            title: '删除成功',
-            type: 'success',
-            duration: 2500
-          })
-        })
-        .catch(err => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          console.log(err.response.data.message)
-        })
-    },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-      const _this = this.$refs.form
-      _this.form = {
-        id: '',
-        name: '',
-        port: 8080,
-        uploadPath: '/opt/upload',
-        deployPath: '/opt/app',
-        backupPath: '/opt/backup',
-        startScript: '',
-        deployScript: ''
-      }
-    },
     copy() {
       this.isAdd = true
-      this.$refs.form.dialog = true
-      const _this = this.$refs.form
-      _this.form = this.currentRow
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        name: data.name,
-        port: data.port,
-        uploadPath: data.uploadPath,
-        deployPath: data.deployPath,
-        backupPath: data.backupPath,
-        startScript: data.startScript,
-        deployScript: data.deployScript
-      }
-      _this.dialog = true
+      this.dialog = true
+      this.form = this.currentRow
     },
     handleCurrentChange(row) {
       this.currentRow = row
diff --git a/src/views/mnt/database/form.vue b/src/views/mnt/database/form.vue
deleted file mode 100644
index db00ee0..0000000
--- a/src/views/mnt/database/form.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <el-dialog
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :visible.sync="dialog"
-    :title="isAdd ? '新增' : '编辑'"
-    width="600px"
-  >
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
-      <el-form-item label="数据库名称" prop="name">
-        <el-input v-model="form.name" style="width: 370px" />
-      </el-form-item>
-      <el-form-item label="jdbcUrl" prop="jdbcUrl">
-        <el-input v-model="form.jdbcUrl" style="width: 370px" />
-      </el-form-item>
-      <el-form-item label="用户名" prop="userName">
-        <el-input v-model="form.userName" style="width: 370px" />
-      </el-form-item>
-      <el-form-item label="数据库密码" prop="pwd">
-        <el-input v-model="form.pwd" type="password" style="width: 370px" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/database'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      dialog: false,
-      form: {
-        id: '',
-        name: '',
-        jdbcUrl: '',
-        userName: '',
-        pwd: ''
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入数据库名称', trigger: 'change' }
-        ],
-        jdbcUrl: [
-          { required: true, message: '请输入数据库连接地址', trigger: 'change' }
-        ],
-        userName: [
-          { required: true, message: '请输入用户名', trigger: 'change' }
-        ],
-        pwd: [
-          { required: true, message: '请输入数据库密码', trigger: 'change' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else {
-            this.doEdit()
-          }
-        } else {
-          this.$message.error('请将表单中的信息补充完整！')
-        }
-      })
-    },
-    doAdd() {
-      add(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '添加成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    doEdit() {
-      edit(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '修改成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        name: '',
-        jdbcUrl: '',
-        userName: '',
-        pwd: ''
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 99a228a..26c93c5 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -3,69 +3,47 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input
-        v-model="query.value"
-        clearable
-        placeholder="输入搜索内容"
-        style="width: 200px"
-        class="filter-item"
-        @keyup.enter.native="toQuery"
-      />
-      <el-select
-        v-model="query.type"
-        clearable
-        placeholder="类型"
-        class="filter-item"
-        style="width: 130px"
-      >
-        <el-option
-          v-for="item in queryTypeOptions"
-          :key="item.key"
-          :label="item.display_name"
-          :value="item.key"
-        />
-      </el-select>
+      <el-input v-model="query.blurry" clearable placeholder="模糊搜索" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
       <el-button
+        v-permission="['admin','database:add']"
         class="filter-item"
         size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="toQuery"
-      >搜索</el-button>
-      <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px">
-        <el-button
-          v-permission="['admin','database:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增</el-button>
-      </div>
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增</el-button>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="530px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+        <el-form-item label="数据库名称" prop="name">
+          <el-input v-model="form.name" style="width: 370px" />
+        </el-form-item>
+        <el-form-item label="连接地址" prop="jdbcUrl">
+          <el-input v-model="form.jdbcUrl" style="width: 370px" />
+        </el-form-item>
+        <el-form-item label="用户名" prop="userName">
+          <el-input v-model="form.userName" style="width: 370px" />
+        </el-form-item>
+        <el-form-item label="密码" prop="pwd">
+          <el-input v-model="form.pwd" type="password" style="width: 370px" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
-      <!--<el-table-column prop="id" label="id" />-->
       <el-table-column prop="name" label="数据库名称" />
-      <el-table-column prop="jdbcUrl" label="数据库连接地址" />
+      <el-table-column prop="jdbcUrl" label="连接地址" />
       <el-table-column prop="userName" label="用户名" />
-      <el-table-column
-        v-if="checkPermission(['admin','database:edit','database:del'])"
-        label="操作"
-        width="150px"
-        align="center"
-      >
+      <el-table-column v-if="checkPermission(['admin','database:edit','database:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <el-button
-            v-permission="['admin','database:edit']"
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            @click="edit(scope.row)"
-          />
+          <el-button v-permission="['admin','database:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
           <el-popover
             :ref="scope.row.id"
             v-permission="['admin','database:del']"
@@ -75,12 +53,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button
-                :loading="delLoading"
-                type="primary"
-                size="mini"
-                @click="subDelete(scope.row.id)"
-              >确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -100,20 +73,29 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del } from '@/api/database'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import crudDataBase from '@/api//mnt/database'
 export default {
-  components: { eForm },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false,
-      queryTypeOptions: [
-        { key: 'name', display_name: '数据库名称' },
-        { key: 'jdbcUrl', display_name: '数据库连接地址' }
-      ]
+      title: '数据库',
+      crudMethod: { ...crudDataBase },
+      form: { id: null, name: null, jdbcUrl: null, userName: null, pwd: null },
+      rules: {
+        name: [
+          { required: true, message: '请输入数据库名称', trigger: 'blur' }
+        ],
+        jdbcUrl: [
+          { required: true, message: '请输入数据库连接地址', trigger: 'blur' }
+        ],
+        userName: [
+          { required: true, message: '请输入用户名', trigger: 'blur' }
+        ],
+        pwd: [
+          { required: true, message: '请输入数据库密码', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
@@ -122,54 +104,9 @@ export default {
     })
   },
   methods: {
-    checkPermission,
     beforeInit() {
       this.url = 'api/database'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const type = query.type
-      const value = query.value
-      if (type && value) {
-        this.params[type] = value
-      }
       return true
-    },
-    subDelete(id) {
-      this.delLoading = true
-      del(id)
-        .then(res => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          this.dleChangePage()
-          this.init()
-          this.$notify({
-            title: '删除成功',
-            type: 'success',
-            duration: 2500
-          })
-        })
-        .catch(err => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          console.log(err.response.data.message)
-        })
-    },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        name: data.name,
-        jdbcUrl: data.jdbcUrl,
-        userName: data.userName,
-        pwd: data.pwd
-      }
-      _this.dialog = true
     }
   }
 }
diff --git a/src/views/mnt/deploy/deploy.vue b/src/views/mnt/deploy/deploy.vue
index 18bfa95..9e07aa8 100644
--- a/src/views/mnt/deploy/deploy.vue
+++ b/src/views/mnt/deploy/deploy.vue
@@ -1,11 +1,5 @@
 <template>
-  <el-dialog
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :visible.sync="dialog"
-    title="应用部署"
-    width="400px"
-  >
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" title="应用部署" width="400px">
     <el-form ref="form" :model="form" :rules="rules" size="small">
       <el-upload
         :action="deployUploadApi"
@@ -31,7 +25,7 @@
 </template>
 
 <script>
-import { add, edit, getApps, getServers } from '@/api/deploy'
+import { add, edit, getApps, getServers } from '@/api/mnt/deploy'
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
 
@@ -62,9 +56,6 @@ export default {
   created() {
     this.initWebSocket()
   },
-  destroyed: function() {
-    this.webSocketClose()
-  },
   mounted() {
     this.initSelect()
   },
@@ -144,9 +135,7 @@ export default {
       })
     },
     handleSuccess(response, file, fileList) {
-      const uid = file.uid
-      const id = response.id
-      console.log(uid, id)
+      this.cancel()
     },
     // 监听上传失败
     handleError(e, file, fileList) {
@@ -160,17 +149,8 @@ export default {
     initWebSocket() {
       const wsUri = process.env.VUE_APP_WS_API + '/webSocket/deploy'
       this.websock = new WebSocket(wsUri)
-      this.websock.onopen = this.webSocketOnOpen
       this.websock.onerror = this.webSocketOnError
       this.websock.onmessage = this.webSocketOnMessage
-      this.websock.onclose = this.webSocketClose
-    },
-    webSocketOnOpen() {
-      this.$notify({
-        title: 'WebSocket连接成功',
-        type: 'success',
-        duration: 2500
-      })
     },
     webSocketOnError(e) {
       this.$notify({
@@ -201,13 +181,6 @@ export default {
     },
     webSocketSend(agentData) {
       this.websock.send(agentData)
-    },
-    webSocketClose(e) {
-      this.$notify({
-        title: 'WebSocket已经关闭',
-        type: 'info',
-        duration: 1000
-      })
     }
   }
 }
diff --git a/src/views/mnt/deploy/form.vue b/src/views/mnt/deploy/form.vue
deleted file mode 100644
index 2a70411..0000000
--- a/src/views/mnt/deploy/form.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-  <el-dialog
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :visible.sync="dialog"
-    :title="isAdd ? '新增' : '编辑'"
-    width="500px"
-  >
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="应用编号">
-        <el-select v-model="form.appId" placeholder="请选择" style="width: 370px">
-          <el-option v-for="item in apps" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="IP列表">
-        <el-select v-model="form.selectIp" multiple placeholder="请选择" style="width: 370px">
-          <el-option v-for="item in servers" :key="item.id" :label="item.id" :value="item.id" />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { add, edit, getApps, getServers } from '@/api/deploy'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      dialog: false,
-      apps: [],
-      servers: [],
-      form: {
-        id: '',
-        appId: '',
-        ip: '',
-        selectIp: []
-      },
-      rules: {}
-    }
-  },
-  mounted() {
-    this.initSelect()
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.loading = true
-      if (this.isAdd) {
-        this.doAdd()
-      } else this.doEdit()
-    },
-    joinIp() {
-      this.form.ip = ''
-      this.form.selectIp.forEach(ip => {
-        if (this.form.ip !== '') {
-          this.form.ip += ','
-        }
-        this.form.ip += ip
-      })
-    },
-    doAdd() {
-      this.joinIp()
-      add(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '添加成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    doEdit() {
-      this.joinIp()
-      edit(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '修改成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        appId: '',
-        ip: '',
-        selectIp: []
-      }
-    },
-    initSelect() {
-      getApps().then(res => {
-        this.apps = res.content
-      })
-      getServers().then(res => {
-        this.servers = res.content
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
index 324402d..f413240 100644
--- a/src/views/mnt/deploy/index.vue
+++ b/src/views/mnt/deploy/index.vue
@@ -3,125 +3,109 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input
-        v-model="query.value"
-        clearable
-        placeholder="输入搜索内容"
-        style="width: 200px"
-        class="filter-item"
-        @keyup.enter.native="toQuery"
+      <el-input v-model="query.appName" clearable placeholder="输入应用名称查询" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-date-picker
+        v-model="query.createTime"
+        :default-time="['00:00:00','23:59:59']"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
       />
-      <el-select
-        v-model="query.type"
-        clearable
-        placeholder="类型"
-        class="filter-item"
-        style="width: 130px"
-      >
-        <el-option
-          v-for="item in queryTypeOptions"
-          :key="item.key"
-          :label="item.display_name"
-          :value="item.key"
-        />
-      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
       <el-button
+        v-permission="['admin','deploy:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增
+      </el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-upload"
+        @click="sysRestore"
+      >系统还原
+      </el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-upload"
+        @click="serverStatus"
+      >状态查询
+      </el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
         class="filter-item"
         size="mini"
         type="success"
-        icon="el-icon-search"
-        @click="toQuery"
-      >搜索
+        icon="el-icon-upload"
+        @click="startServer"
+      >启动
+      </el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-upload"
+        @click="stopServer"
+      >停止
+      </el-button>
+      <el-button
+        v-permission="['admin','deploy:add']"
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload"
+        @click="deploy"
+      >一键部署
       </el-button>
-      <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px">
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增
-        </el-button>
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-upload"
-          @click="sysRestore"
-        >系统还原
-        </el-button>
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-upload"
-          @click="serverStatus"
-        >状态查询
-        </el-button>
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="success"
-          icon="el-icon-upload"
-          @click="startServer"
-        >启动
-        </el-button>
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="danger"
-          icon="el-icon-upload"
-          @click="stopServer"
-        >停止
-        </el-button>
-        <el-button
-          v-permission="['admin','deploy:add']"
-          class="filter-item"
-          size="mini"
-          type="warning"
-          icon="el-icon-upload"
-          @click="deploy"
-        >一键部署
-        </el-button>
-      </div>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
-    <!--    系统还原组件-->
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="应用" prop="app.id">
+          <el-select v-model.number="form.app.id" placeholder="请选择" style="width: 370px">
+            <el-option v-for="item in apps" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="服务器" prop="deploys">
+          <el-select v-model="form.deploys" multiple placeholder="请选择" style="width: 370px">
+            <el-option v-for="item in servers" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
+    <!--统还原组件-->
     <fForm ref="sysRestore" :key="times" :app-name="appName" />
     <dForm ref="deploy" />
     <!--表格渲染-->
-    <el-table
-      v-loading="loading"
-      :data="data"
-      highlight-current-row
-      stripe
-      size="small"
-      style="width: 100%"
-      @current-change="handleCurrentChange"
-    >
-      <el-table-column :formatter="formatterAppId" prop="appId" label="应用名称" />
-      <el-table-column prop="ip" label="服务器列表" />
-      <el-table-column
-        v-if="checkPermission(['admin','deploy:edit','deploy:del'])"
-        label="操作"
-        width="150px"
-        align="center"
-      >
+    <el-table v-loading="loading" :data="data" highlight-current-row stripe size="small" style="width: 100%" @current-change="handleCurrentChange">
+      <el-table-column prop="app.name" label="应用名称" />
+      <el-table-column prop="servers" label="服务器列表" />
+      <el-table-column prop="createTime" label="创建日期">
         <template slot-scope="scope">
-          <el-button
-            v-permission="['admin','deploy:edit']"
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            @click="edit(scope.row)"
-          />
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','deploy:edit','deploy:del'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','deploy:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
           <el-popover
             :ref="scope.row.id"
             v-permission="['admin','deploy:del']"
@@ -131,13 +115,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right;margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button
-                :loading="delLoading"
-                type="primary"
-                size="mini"
-                @click="subDelete(scope.row.id)"
-              >确定
-              </el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -157,29 +135,39 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del, stopServer, serverStatus, startServer } from '@/api/deploy'
-import { queryApps } from '@/api/app'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import crudDeploy from '@/api/mnt/deploy'
 import dForm from './deploy'
 import fForm from './sysRestore'
 export default {
-  components: { eForm, dForm, fForm },
-  mixins: [initData],
+  components: { dForm, fForm },
+  mixins: [crud],
   data() {
     return {
-      delLoading: false,
-      queryTypeOptions: [{ key: 'ip', display_name: '服务器列表' }],
-      appList: [],
-      appMap: {},
+      title: '部署',
+      crudMethod: { ...crudDeploy },
       currentRow: {},
       selectIndex: '',
-      appName: '111',
+      appName: '',
       urlHistory: '',
       times: 0,
       appId: '',
-      deployId: ''
+      deployId: '',
+      apps: [],
+      servers: [],
+      form: {
+        id: null,
+        app: { id: null },
+        deploys: []
+      },
+      rules: {
+        'app.id': [
+          { required: true, message: '应用不能为空', trigger: 'blur', type: 'number' }
+        ],
+        deploys: [
+          { required: true, message: '服务器不能为空', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
@@ -188,51 +176,38 @@ export default {
     })
   },
   methods: {
-    checkPermission,
-    async beforeInit() {
+    beforeInit() {
       this.url = 'api/deploy'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      await queryApps({}).then(res => {
-        this.appList = res.content
-        this.appList.forEach(({ id, name }) => {
-          this.appMap[id] = name
-        })
-      })
-      const query = this.query
-      const type = query.type
-      const value = query.value
-      if (type && value) {
-        this.params[type] = value
-      }
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id)
-        .then(res => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          this.dleChangePage()
-          this.init()
-          this.$notify({
-            title: '删除成功',
-            type: 'success',
-            duration: 2500
-          })
-        })
-        .catch(err => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          console.log(err.response.data.message)
-        })
+    // 打开新增弹窗前做的操作
+    beforeShowAddForm() {
+      this.initSelect()
+    },
+    // 打开编辑弹窗前做的操作
+    beforeShowEditForm(data) {
+      this.initSelect()
+      const deploys = []
+      data.deploys.forEach(function(deploy, index) {
+        deploys.push(deploy.id)
+      })
+      this.form.deploys = deploys
+    },
+    // 提交前
+    beforeSubmitMethod() {
+      const deploys = []
+      this.form.deploys.forEach(function(data, index) {
+        const deploy = { id: data }
+        deploys.push(deploy)
+      })
+      this.form.deploys = deploys
+      return true
     },
     deploy() {
       if (this.selectIndex === '') {
         this.$message.error('请先选择服务')
       } else {
         this.$refs.deploy.dialog = true
-        debugger
         this.$refs.deploy.deployInfo = this.currentRow
       }
     },
@@ -240,31 +215,13 @@ export default {
       if (this.selectIndex === '') {
         this.$message.error('请先选择服务')
       } else {
-        this.$refs.form.$emit('open')
         this.$refs.sysRestore.dialog = true
       }
     },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        appId: data.appId,
-        ip: data.ip
-      }
-      _this.dialog = true
-    },
-    formatterAppId(row, column) {
-      return this.appMap[row.appId]
-    },
     handleCurrentChange(row) {
       this.currentRow = row
       this.selectIndex = !row ? null : row.id
-      this.appName = !row ? null : this.appMap[row.appId]
+      this.appName = !row ? null : row.app.name
       this.times = this.times + !row ? 0 : 1
       this.appId = !row ? null : row.appId
       this.deployId = !row ? null : row.id
@@ -273,7 +230,7 @@ export default {
       if (this.selectIndex === '') {
         this.$message.error('请先选择服务')
       } else {
-        startServer(JSON.stringify(this.currentRow))
+        this.crudMethod.startServer(JSON.stringify(this.currentRow))
           .then(res => {
           })
           .catch(err => {
@@ -285,7 +242,7 @@ export default {
       if (this.selectIndex === '') {
         this.$message.error('请先选择服务')
       } else {
-        stopServer(JSON.stringify(this.currentRow))
+        this.crudMethod.stopServer(JSON.stringify(this.currentRow))
           .then(res => {
           })
           .catch(err => {
@@ -297,13 +254,21 @@ export default {
       if (this.selectIndex === '') {
         this.$message.error('请先选择服务')
       } else {
-        serverStatus(JSON.stringify(this.currentRow))
+        this.crudMethod.serverStatus(JSON.stringify(this.currentRow))
           .then(res => {
           })
           .catch(err => {
             console.log('error:' + err.response.data.message)
           })
       }
+    },
+    initSelect() {
+      this.crudMethod.getApps().then(res => {
+        this.apps = res.content
+      })
+      this.crudMethod.getServers().then(res => {
+        this.servers = res.content
+      })
     }
   }
 }
diff --git a/src/views/mnt/deploy/sysRestore.vue b/src/views/mnt/deploy/sysRestore.vue
index 50de798..af3d090 100644
--- a/src/views/mnt/deploy/sysRestore.vue
+++ b/src/views/mnt/deploy/sysRestore.vue
@@ -1,39 +1,23 @@
 <template>
-  <el-dialog
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :visible.sync="dialog"
-    title="系统还原"
-    width="800px"
-  >
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" title="系统还原" width="800px">
     <!--工具栏-->
     <div class="head-container">
-      <el-input
-        v-model="query.value"
-        clearable
-        placeholder="输入部署时间"
-        style="width: 200px"
-        class="filter-item"
-        @keyup.enter.native="toQuery"
+      <el-date-picker
+        v-model="query.createTime"
+        :default-time="['00:00:00','23:59:59']"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small date-item"
+        style="width: 240px;height: 30.5px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="部署开始日期"
+        end-placeholder="部署结束日期"
       />
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="toQuery"
-      >搜索
-      </el-button>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
     </div>
     <el-form size="small" label-width="80px">
       <!--表格渲染-->
-      <el-table
-        v-loading="loading"
-        :data="data"
-        size="small"
-        style="width: 100%"
-        @row-click="showRow"
-      >
+      <el-table v-loading="loading" :data="data" size="small" style="width: 100%" @row-click="showRow">
         <el-table-column width="30px">
           <template slot-scope="scope">
             <el-radio v-model="radio" :label="scope.$index" />
@@ -41,19 +25,17 @@
         </el-table-column>
         <el-table-column prop="appName" label="应用名称" />
         <el-table-column prop="ip" label="部署IP" />
-        <el-table-column prop="deployDate" label="部署时间" />
+        <el-table-column prop="deployDate" label="部署时间">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.deployDate) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="deployUser" label="部署人员" />
       </el-table>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="text" @click="cancel">取消</el-button>
-      <el-button
-        v-permission="['admin','deploy:add']"
-        :loading="loading"
-        type="primary"
-        @click="doSubmit"
-      >确认
-      </el-button>
+      <el-button v-permission="['admin','deploy:add']" :loading="submitLoading" type="primary" @click="doSubmit">确认</el-button>
     </div>
     <!--分页组件-->
     <el-pagination
@@ -68,11 +50,10 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { reducte } from '@/api/deployHistory'
+import crud from '@/mixins/crud'
+import { reducte } from '@/api/mnt/deployHistory'
 export default {
-  mixins: [initData],
+  mixins: [crud],
   props: {
     appName: {
       type: String,
@@ -81,7 +62,7 @@ export default {
   },
   data() {
     return {
-      loading: false,
+      submitLoading: false,
       dialog: false,
       history: [],
       radio: '',
@@ -95,51 +76,38 @@ export default {
     })
   },
   methods: {
-    checkPermission,
     beforeInit() {
       this.url = 'api/deployHistory'
       this.deployId = this.$parent.deployId
-      debugger
       if (this.deployId === '') {
         return false
       }
-      const sort = 'deployDate,desc'
-      this.params = {
-        page: this.page,
-        size: this.size,
-        sort: sort,
-        deployId: this.$parent.deployId
-      }
-      const query = this.query
-      const type = 'deployDate'
-      const value = query.value
-      this.params[type] = value
+      this.sort = 'deployDate,desc'
+      this.params['deployId'] = this.deployId
       return true
     },
-    formatterAppId(row, column) {
-      return this.appNames
-    },
     showRow(row) {
       this.radio = this.data.indexOf(row)
       this.selectIndex = row.id
     },
     cancel() {
       this.dialog = false
-      this.loading = false
+      this.submitLoading = false
     },
     doSubmit() {
       if (this.selectIndex === '') {
         this.$message.error('请选择要还原的备份')
       } else {
+        this.submitLoading = true
         reducte(JSON.stringify(this.data[this.radio]))
           .then(res => {
             this.dialog = false
-            this.loading = false
+            this.submitLoading = false
             this.appNames = ''
             this.$parent.init()
           })
           .catch(err => {
-            this.loading = false
+            this.submitLoading = false
             console.log('error:' + err.response.data.message)
           })
       }
diff --git a/src/views/mnt/deployHistory/form.vue b/src/views/mnt/deployHistory/form.vue
deleted file mode 100644
index 99118d3..0000000
--- a/src/views/mnt/deployHistory/form.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-  <el-dialog
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :visible.sync="dialog"
-    :title="isAdd ? '新增' : '编辑'"
-    width="500px"
-  >
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="应用名称" prop="appName">
-        <el-input v-model="form.appName" style="width: 370px" />
-      </el-form-item>
-      <el-form-item label="部署IP" prop="ip">
-        <el-input v-model="form.ip" style="width: 370px" />
-      </el-form-item>
-      <el-form-item label="部署时间" prop="deployDate">
-        <el-input v-model="form.deployDate" style="width: 370px" />
-      </el-form-item>
-      <el-form-item label="部署人员" prop="deployUser">
-        <el-input v-model="form.deployUser" style="width: 370px" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/deployHistory'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      dialog: false,
-      form: {
-        id: '',
-        appName: '',
-        ip: '',
-        deployDate: '',
-        deployUser: ''
-      },
-      rules: {
-        id: [{ required: true, message: '请输入编号', trigger: 'change' }],
-        appName: [
-          { required: true, message: '请输入应用名称', trigger: 'change' }
-        ],
-        ip: [{ required: true, message: '请输入部署IP', trigger: 'change' }],
-        deployDate: [
-          { required: true, message: '请输入部署时间', trigger: 'change' }
-        ],
-        deployUser: [
-          { required: true, message: '请输入部署人员', trigger: 'change' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else {
-            this.doEdit()
-          }
-        } else {
-          this.$message.error('请将表单中的信息补充完整！')
-        }
-      })
-    },
-    doAdd() {
-      add(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '添加成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    doEdit() {
-      edit(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '修改成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        appName: '',
-        ip: '',
-        deployDate: '',
-        deployUser: ''
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue
index bb8b2a6..ceaeecc 100644
--- a/src/views/mnt/deployHistory/index.vue
+++ b/src/views/mnt/deployHistory/index.vue
@@ -3,50 +3,16 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input
-        v-model="query.value"
-        clearable
-        placeholder="输入搜索内容"
-        style="width: 200px"
-        class="filter-item"
-        @keyup.enter.native="toQuery"
-      />
-      <el-select
-        v-model="query.type"
-        clearable
-        placeholder="类型"
-        class="filter-item"
-        style="width: 130px"
-      >
-        <el-option
-          v-for="item in queryTypeOptions"
-          :key="item.key"
-          :label="item.display_name"
-          :value="item.key"
-        />
-      </el-select>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="toQuery"
-      >搜索</el-button>
+      <el-input v-model="query.blurry" clearable placeholder="输入搜索内容" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
     </div>
-    <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
       <el-table-column prop="appName" label="应用名称" />
       <el-table-column prop="ip" label="部署IP" />
       <el-table-column prop="deployDate" label="部署时间" />
       <el-table-column prop="deployUser" label="部署人员" />
-      <el-table-column
-        v-if="checkPermission(['admin','deployHistory:del'])"
-        label="操作"
-        width="150px"
-        align="center"
-      >
+      <el-table-column v-if="checkPermission(['admin','deployHistory:del'])" label="操作" width="100px" align="center">
         <template slot-scope="scope">
           <el-popover
             :ref="scope.row.id"
@@ -57,12 +23,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button
-                :loading="delLoading"
-                type="primary"
-                size="mini"
-                @click="subDelete(scope.row.id)"
-              >确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -82,22 +43,15 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del } from '@/api/deployHistory'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import { del } from '@/api/mnt/deployHistory'
 
 export default {
-  components: { eForm },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false,
-      queryTypeOptions: [
-        { key: 'appName', display_name: '应用名称' },
-        { key: 'ip', display_name: '部署IP' },
-        { key: 'deployUser', display_name: '部署人员' }
-      ]
+      title: '部署历史',
+      crudMethod: { del }
     }
   },
   created() {
@@ -106,54 +60,9 @@ export default {
     })
   },
   methods: {
-    checkPermission,
     beforeInit() {
       this.url = 'api/deployHistory'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const type = query.type
-      const value = query.value
-      if (type && value) {
-        this.params[type] = value
-      }
       return true
-    },
-    subDelete(id) {
-      this.delLoading = true
-      del(id)
-        .then(res => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          this.dleChangePage()
-          this.init()
-          this.$notify({
-            title: '删除成功',
-            type: 'success',
-            duration: 2500
-          })
-        })
-        .catch(err => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          console.log(err.response.data.message)
-        })
-    },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        appName: data.appName,
-        ip: data.ip,
-        deployDate: data.deployDate,
-        deployUser: data.deployUser
-      }
-      _this.dialog = true
     }
   }
 }
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
new file mode 100644
index 0000000..e897cc0
--- /dev/null
+++ b/src/views/mnt/server/index.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.id" clearable placeholder="输入名称或IP搜索" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-date-picker
+        v-model="query.createTime"
+        :default-time="['00:00:00','23:59:59']"
+        type="daterange"
+        range-separator=":"
+        class="el-range-editor--small date-item"
+        style="width: 220px;height: 30.5px"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      />
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        v-permission="['admin','serverDeploy:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增</el-button>
+    </div>
+    <!--表单组件-->
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="470px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="55px">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" style="width: 370px" />
+        </el-form-item>
+        <el-form-item label="IP" prop="ip">
+          <el-input v-model="form.ip" style="width: 370px" />
+        </el-form-item>
+        <el-form-item label="端口" prop="port">
+          <el-input-number v-model.number="form.port" controls-position="right" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="账号" prop="account">
+          <el-input v-model="form.account" style="width: 370px" />
+        </el-form-item>
+        <el-form-item label="密码" prop="password">
+          <el-input v-model="form.password" type="password" style="width: 370px" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
+      <el-table-column prop="name" label="名称" />
+      <el-table-column prop="ip" label="IP" />
+      <el-table-column prop="port" label="端口" />
+      <el-table-column prop="account" label="账号" />
+      <el-table-column prop="createTime" label="创建日期">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','serverDeploy:edit','serverDeploy:del'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','serverDeploy:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','serverDeploy:del']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import crud from '@/mixins/crud'
+import crudServer from '@/api/mnt/serverDeploy'
+import { validateIP } from '@/utils/validate'
+export default {
+  mixins: [crud],
+  data() {
+    return {
+      title: '服务器',
+      crudMethod: { ...crudServer },
+      accountList: [],
+      accountMap: {},
+      form: { id: null, name: null, ip: null, port: 22, account: 'root', password: null },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        ip: [
+          { required: true, message: '请输入IP', trigger: 'blur' },
+          { validator: validateIP, trigger: 'change' }
+        ],
+        port: [
+          { required: true, message: '请输入端口', trigger: 'blur', type: 'number' }
+        ],
+        account: [
+          { required: true, message: '请输入账号', trigger: 'blur' }
+        ],
+        password: [
+          { required: true, message: '请输入密码', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    async beforeInit() {
+      this.url = 'api/serverDeploy'
+      return true
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
+</style>
diff --git a/src/views/mnt/serverDeploy/form.vue b/src/views/mnt/serverDeploy/form.vue
deleted file mode 100644
index 3baf118..0000000
--- a/src/views/mnt/serverDeploy/form.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-dialog
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :visible.sync="dialog"
-    :title="isAdd ? '新增' : '编辑'"
-    width="500px"
-  >
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
-      <el-form-item label="服务器IP" prop="id">
-        <el-input v-model="form.id" :disabled="!isAdd" style="width: 370px" />
-      </el-form-item>
-      <el-form-item label="服务器账号" prop="accountId">
-        <el-select
-          v-model="form.accountId"
-          clearable
-          placeholder="选择对应账号"
-          class="filter-item"
-          style="width: 370px"
-        >
-          <el-option
-            v-for="item in accountList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/serverDeploy'
-import { validateIP } from '@/utils/validate'
-
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    },
-    accountList: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      dialog: false,
-      form: {
-        id: '',
-        accountId: ''
-      },
-      rules: {
-        id: [
-          { required: true, message: '请输入IP', trigger: 'change' },
-          { validator: validateIP, trigger: 'change' }
-        ],
-        accountId: [
-          { required: true, message: '请选择账号', trigger: 'change' }
-        ]
-      }
-    }
-  },
-  mounted() {},
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else {
-            this.doEdit()
-          }
-        } else {
-          this.$message.error('请将表单中的信息补充完整！')
-        }
-      })
-    },
-    doAdd() {
-      add(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '添加成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    doEdit() {
-      edit(this.form)
-        .then(res => {
-          this.resetForm()
-          this.$notify({
-            title: '修改成功',
-            type: 'success',
-            duration: 2500
-          })
-          this.loading = false
-          this.$parent.init()
-        })
-        .catch(err => {
-          this.loading = false
-          console.log(err.response.data.message)
-        })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        accountId: ''
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/views/mnt/serverDeploy/index.vue b/src/views/mnt/serverDeploy/index.vue
deleted file mode 100644
index 9852641..0000000
--- a/src/views/mnt/serverDeploy/index.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!-- 搜索 -->
-      <el-input
-        v-model="query.value"
-        clearable
-        placeholder="输入搜索内容"
-        style="width: 200px"
-        class="filter-item"
-        @keyup.enter.native="toQuery"
-      />
-      <el-select
-        v-model="query.type"
-        clearable
-        placeholder="类型"
-        class="filter-item"
-        style="width: 130px"
-      >
-        <el-option
-          v-for="item in queryTypeOptions"
-          :key="item.key"
-          :label="item.display_name"
-          :value="item.key"
-        />
-      </el-select>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="toQuery"
-      >搜索</el-button>
-      <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px">
-        <el-button
-          v-permission="['admin','serverDeploy:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增</el-button>
-      </div>
-    </div>
-    <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" :account-list="accountList" />
-    <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
-      <el-table-column prop="id" label="服务器IP" />
-      <el-table-column :formatter="accountTranslate" prop="accountId" label="服务器账号" />
-      <el-table-column
-        v-if="checkPermission(['admin','serverDeploy:edit','serverDeploy:del'])"
-        label="操作"
-        width="150px"
-        align="center"
-      >
-        <template slot-scope="scope">
-          <el-button
-            v-permission="['admin','serverDeploy:edit']"
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            @click="edit(scope.row)"
-          />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','serverDeploy:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button
-                :loading="delLoading"
-                type="primary"
-                size="mini"
-                @click="subDelete(scope.row.id)"
-              >确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
-  </div>
-</template>
-
-<script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del } from '@/api/serverDeploy'
-import { queryServerAccount } from '@/api/serverAccount'
-import eForm from './form'
-export default {
-  components: { eForm },
-  mixins: [initData],
-  data() {
-    return {
-      delLoading: false,
-      queryTypeOptions: [{ key: 'id', display_name: '服务器IP' }],
-      accountList: [],
-      accountMap: {}
-    }
-  },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
-  methods: {
-    checkPermission,
-    async beforeInit() {
-      this.url = 'api/serverDeploy'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const type = query.type
-      const value = query.value
-      await queryServerAccount({}).then(res => {
-        this.accountList = res.content
-        this.accountList.forEach(({ id, name }) => {
-          this.accountMap[id] = name
-        })
-      })
-      if (type && value) {
-        this.params[type] = value
-      }
-      return true
-    },
-    accountTranslate(row, column) {
-      return this.accountMap[row.accountId]
-    },
-    subDelete(id) {
-      this.delLoading = true
-      del(id)
-        .then(res => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          this.dleChangePage()
-          this.init()
-          this.$notify({
-            title: '删除成功',
-            type: 'success',
-            duration: 2500
-          })
-        })
-        .catch(err => {
-          this.delLoading = false
-          this.$refs[id].doClose()
-          console.log(err.response.data.message)
-        })
-    },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        accountId: data.accountId
-      }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/views/monitor/server/form.vue b/src/views/monitor/server/form.vue
deleted file mode 100644
index 802c357..0000000
--- a/src/views/monitor/server/form.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="名称">
-        <el-input v-model="form.name" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item label="IP地址">
-        <el-input v-model="form.ip" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item label="访问端口">
-        <el-input-number v-model="form.port" />
-      </el-form-item>
-      <el-form-item label="排序">
-        <el-input-number v-model="form.sort" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/monitor/server'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false,
-      form: {
-        id: '',
-        name: '',
-        ip: '',
-        port: '8777',
-        state: '',
-        cpuRate: '',
-        cpuCore: '',
-        memTotal: '',
-        memUsed: '',
-        diskTotal: '',
-        diskUsed: '',
-        swapTotal: '',
-        swapUsed: '',
-        sort: '999'
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ],
-        ip: [
-          { required: true, message: '请输入IP', trigger: 'blur' }
-        ],
-        port: [
-          { required: true, message: '请输入访问端口', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.loading = true
-      if (this.isAdd) {
-        this.doAdd()
-      } else this.doEdit()
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        name: '',
-        ip: '',
-        port: '',
-        state: '',
-        cpuRate: '',
-        cpuCore: '',
-        memTotal: '',
-        memUsed: '',
-        diskTotal: '',
-        diskUsed: '',
-        swapTotal: '',
-        swapUsed: '',
-        sort: ''
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 223da40..6e0b238 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -3,37 +3,49 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable size="small" placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-select v-model="query.type" clearable size="small" placeholder="类型" class="filter-item" style="width: 130px">
-        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
-      </el-select>
+      <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者服务地址" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          v-permission="['admin','server:add']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add"
-        >新增
-        </el-button>
-      </div>
+      <el-button
+        v-permission="['admin','server:add']"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="showAddFormDialog"
+      >新增
+      </el-button>
       <!-- 刷新 -->
-      <div style="display: inline-block;">
-        <el-button
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-refresh"
-          @click="refresh"
-        >刷新
-        </el-button>
-      </div>
+      <el-button
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新
+      </el-button>
     </div>
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="地址" prop="address">
+          <el-input v-model="form.address" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="端口" prop="port">
+          <el-input-number v-model.number="form.port" />
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model.number="form.sort" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column label="状态" width="50px">
@@ -48,8 +60,8 @@
         </template>
       </el-table-column>
       <el-table-column prop="name" label="名称" />
-      <el-table-column prop="ip" label="IP地址" />
-      <el-table-column prop="port" label="访问端口" width="80px" align="center" />
+      <el-table-column prop="address" label="地址" />
+      <el-table-column prop="port" label="端口" width="80px" align="center" />
       <el-table-column :formatter="formatCpuRate" prop="cpuRate" label="CPU使用率" width="100px" align="center" />
       <el-table-column prop="cpuCore" label="CPU内核数" width="100px" align="center" />
       <el-table-column label="物理内存" align="center">
@@ -90,7 +102,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','server:edit','server:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','server:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-button v-permission="['admin','server:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
           <el-popover
             :ref="scope.row.id"
             v-permission="['admin','server:del']"
@@ -100,7 +112,7 @@
             <p>确定删除本条数据吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
             </div>
             <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
           </el-popover>
@@ -120,21 +132,42 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del } from '@/api/monitor/server'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import crudServer from '@/api/monitor/server'
 export default {
   name: 'ServerMonitor',
-  components: { eForm },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false,
-      queryTypeOptions: [
-        { key: 'name', display_name: '名称' },
-        { key: 'ip', display_name: 'IP地址' }
-      ]
+      title: '监控',
+      crudMethod: { ...crudServer },
+      form: {
+        id: null,
+        name: null,
+        ip: null,
+        port: 8777,
+        state: null,
+        cpuRate: null,
+        cpuCore: null,
+        memTotal: null,
+        memUsed: null,
+        diskTotal: null,
+        diskUsed: null,
+        swapTotal: null,
+        swapUsed: null,
+        sort: 999
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '请输入IP', trigger: 'blur' }
+        ],
+        port: [
+          { required: true, message: '请输入访问端口', trigger: 'blur', type: 'number' }
+        ]
+      }
     }
   },
   created() {
@@ -143,65 +176,12 @@ export default {
     })
   },
   methods: {
-    checkPermission,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/server'
-      const sort = 'sort,asc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const type = query.type
-      const value = query.value
-      if (type && value) {
-        this.params[type] = value
-      }
+      this.sort = 'sort,asc'
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
-    },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        name: data.name,
-        ip: data.ip,
-        port: data.port,
-        state: data.state,
-        cpuRate: data.cpuRate,
-        cpuCore: data.cpuCore,
-        memTotal: data.memTotal,
-        memUsed: data.memUsed,
-        diskTotal: data.diskTotal,
-        diskUsed: data.diskUsed,
-        swapTotal: data.swapTotal,
-        swapUsed: data.swapUsed,
-        sort: data.sort
-      }
-      _this.dialog = true
-    },
-    refresh() {
-      this.init()
-    },
     formatCpuRate(row, column) {
       const value = row.cpuRate
       if (!value) {

From 0351b727350174a8091256b58a7af5a87e63d455 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Mon, 25 Nov 2019 19:18:43 +0800
Subject: [PATCH 27/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4initData.js=EF=BC=8C=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E7=A7=BB=E9=99=A4console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 babel.config.js                         |  6 ++
 package.json                            |  1 +
 src/assets/icons/svg/github.svg         |  2 +-
 src/assets/icons/svg/mntsvg             |  1 -
 src/assets/icons/svg/source.svg         |  1 +
 src/assets/styles/eladmin.scss          |  5 ++
 src/components/Github/index.vue         | 24 +++-----
 src/layout/components/Navbar.vue        | 12 +++-
 src/mixins/initData.js                  | 81 -------------------------
 src/views/generator/config.vue          | 19 ++++--
 src/views/generator/index.vue           | 32 +---------
 src/views/mnt/app/index.vue             |  4 +-
 src/views/mnt/deploy/index.vue          |  4 +-
 src/views/mnt/deploy/sysRestore.vue     |  4 +-
 src/views/mnt/server/index.vue          |  4 +-
 src/views/monitor/log/search.vue        |  4 +-
 src/views/system/dept/index.vue         |  4 +-
 src/views/system/job/index.vue          |  4 +-
 src/views/system/menu/index.vue         |  4 +-
 src/views/system/role/index.vue         |  4 +-
 src/views/system/timing/index.vue       |  4 +-
 src/views/system/timing/log.vue         |  4 +-
 src/views/system/user/center.vue        |  6 +-
 src/views/system/user/index.vue         |  4 +-
 src/views/tools/picture/index.vue       |  4 +-
 src/views/tools/storage/local/index.vue |  4 +-
 src/views/tools/storage/qiniu/index.vue |  4 +-
 27 files changed, 80 insertions(+), 170 deletions(-)
 delete mode 100644 src/assets/icons/svg/mntsvg
 create mode 100644 src/assets/icons/svg/source.svg
 delete mode 100644 src/mixins/initData.js

diff --git a/babel.config.js b/babel.config.js
index ba17966..804632a 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,4 +1,10 @@
+const plugins = ['@vue/babel-plugin-transform-vue-jsx']
+// 生产环境移除console
+if (process.env.NODE_ENV === 'production') {
+  plugins.push('transform-remove-console')
+}
 module.exports = {
+  plugins: plugins,
   presets: [
     '@vue/app'
   ]
diff --git a/package.json b/package.json
index d84f0c2..7012a52 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
     "babel-jest": "23.6.0",
+    "babel-plugin-transform-remove-console": "^6.9.4",
     "chalk": "2.4.2",
     "chokidar": "2.1.5",
     "connect": "3.6.6",
diff --git a/src/assets/icons/svg/github.svg b/src/assets/icons/svg/github.svg
index a58c9be..40b3131 100644
--- a/src/assets/icons/svg/github.svg
+++ b/src/assets/icons/svg/github.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200.195" height="200" class="icon" p-id="1449" t="1545982895380" version="1.1" viewBox="0 0 1025 1024"><defs><style type="text/css"/></defs><path d="M512.032 831.904c-19.168 0-38.304-9.92-58.144-29.76-7.808-7.808-7.808-20.48 0-28.288s20.48-7.808 28.288 0c12.192 12.224 21.984 18.144 29.856 18.144s17.664-5.92 29.856-18.144c7.808-7.808 20.48-7.808 28.288 0s7.808 20.48 0 28.288c-19.84 19.84-38.976 29.76-58.144 29.76zM0.032 525.504c0 49.888 4.256 95.136 12.8 135.68s20.544 75.744 36 105.536c15.456 29.792 35.008 55.904 58.656 78.336s49.344 40.928 77.056 55.456c27.744 14.528 59.456 26.304 95.2 35.264s72.096 15.264 109.056 18.848 77.696 5.376 122.144 5.376c44.448 0 85.248-1.792 122.4-5.376s73.6-9.856 109.344-18.848c35.744-8.96 67.552-20.736 95.456-35.264s53.792-33.024 77.6-55.456c23.808-22.432 43.456-48.544 58.944-78.336s27.552-64.96 36.256-105.536c8.704-40.576 13.056-85.792 13.056-135.68 0-89.376-27.744-166.368-83.2-230.976 3.2-8.608 5.952-18.496 8.256-29.6s4.544-26.816 6.656-47.104c2.144-20.288 1.344-43.712-2.4-70.272s-10.752-53.664-21.056-81.312l-8-1.632c-5.344-1.088-14.048-0.704-26.144 1.088s-26.208 5.024-42.4 9.696c-16.192 4.672-37.056 13.92-62.656 27.744s-52.608 31.328-81.056 52.512c-48.352-14.72-115.008-30.112-200-30.112s-151.808 15.392-200.544 30.112c-28.448-21.184-55.552-38.592-81.344-52.224s-46.4-22.976-61.856-28c-15.456-5.024-29.792-8.256-42.944-9.696s-21.6-1.888-25.344-1.344c-3.744 0.544-6.496 1.152-8.256 1.888-10.304 27.648-17.408 54.752-21.344 81.312s-4.8 49.888-2.656 69.984c2.144 20.096 4.448 35.904 6.944 47.392s5.344 21.344 8.544 29.6c-55.456 64.256-83.2 141.248-83.2 230.976zM136.576 639.392c0-58.016 21.344-110.624 64-157.856 12.8-14.4 27.648-25.312 44.544-32.704s36.096-11.616 57.6-12.608 42.048-0.8 61.6 0.608c19.552 1.408 43.744 3.296 72.544 5.696s53.696 3.616 74.656 3.616c20.96 0 45.856-1.184 74.656-3.616s52.992-4.288 72.544-5.696c19.552-1.408 40.096-1.6 61.6-0.608s40.8 5.216 57.856 12.608c17.056 7.392 32 18.304 44.8 32.704 42.656 47.232 64 99.84 64 157.856 0 34.016-3.552 64.32-10.656 90.944s-16.096 48.928-26.944 66.912c-10.848 18.016-26.048 33.216-45.6 45.632s-38.496 22.016-56.8 28.8c-18.304 6.784-41.952 12.096-70.944 15.904s-54.944 6.112-77.856 6.912c-22.944 0.8-51.808 1.216-86.656 1.216s-63.648-0.416-86.4-1.216c-22.752-0.8-48.608-3.104-77.6-6.912s-52.608-9.12-70.944-15.904c-18.304-6.816-37.248-16.416-56.8-28.8s-34.752-27.616-45.6-45.632c-10.848-18.016-19.84-40.32-26.944-66.912s-10.656-56.928-10.656-90.944zM256.032 608c0-53.024 28.64-96 64-96s64 42.976 64 96c0 53.024-28.64 96-64 96s-64-42.976-64-96zM640.032 608c0-53.024 28.64-96 64-96s64 42.976 64 96c0 53.024-28.64 96-64 96s-64-42.976-64-96z" p-id="1450"/></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574679460907" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3895" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M263.456 759.36c0 27.04 22.88 40.576 68.672 40.576 40.064 0 60.096-14.048 60.096-42.144 0-26.528-21.856-39.808-65.536-39.808C284.544 718.016 263.456 731.808 263.456 759.36zM853.344 0 170.688 0C76.8 0 0 76.8 0 170.688l0 682.624C0 947.264 76.8 1024 170.688 1024l682.656 0C947.232 1024 1024 947.264 1024 853.312L1024 170.688C1024 76.8 947.232 0 853.344 0zM475.744 408.992c-7.296 2.592-17.696 5.472-31.2 8.576 4.16 11.968 6.24 23.168 6.24 33.568 0 33.28-10.016 62.304-30.048 87.008-20.032 24.704-45.92 39.392-77.632 44.096-20.8 3.136-31.2 14.304-31.2 33.568 0 6.752 3.392 13.536 10.144 20.288 8.832 9.888 21.856 16.128 39.008 18.72 74.4 11.456 111.584 42.4 111.584 92.864 0 80.64-48.128 120.96-144.352 120.96-39.552 0-72.064-7.04-97.536-21.056-32.256-17.696-48.384-45.536-48.384-83.488 0-43.712 24.192-73.6 72.576-89.728l0-1.568c-17.696-10.912-26.528-27.584-26.528-49.952 0-29.12 8.32-47.36 24.96-54.624l0-1.568c-16.64-5.728-31.488-18.72-44.48-39.04-14.56-21.856-21.856-45.248-21.856-70.24 0-37.472 13.28-68.672 39.808-93.632 25.504-23.424 55.936-35.104 91.296-35.104 25.504 0 49.152 6.24 71.008 18.72 24.96 0 53.856-6.24 86.624-18.72L475.744 408.992 475.744 408.992zM602.176 679.008l-88.192 0c1.056-10.4 1.568-28.096 1.568-53.056L515.552 383.232c0-24.448-0.512-41.376-1.568-50.72l88.192 0c-1.056 9.888-1.568 26.272-1.568 49.152l0 239.552C600.608 647.776 601.152 667.04 602.176 679.008zM596.32 254.496c-10.656 11.456-23.296 17.152-37.856 17.152-15.072 0-27.968-5.728-38.624-17.152-10.656-11.456-16-24.96-16-40.576 0-16.128 5.344-29.92 16-41.376 10.656-11.456 23.552-17.152 38.624-17.152 14.56 0 27.2 5.728 37.856 17.152 10.656 11.456 16 25.216 16 41.376C612.32 229.504 606.976 243.04 596.32 254.496zM841.696 668.832c-19.264 10.4-42.4 15.616-69.472 15.616-37.984 0-64.256-13.504-78.816-40.576-10.944-20.288-16.384-52.288-16.384-95.968l0-139.68 0.768 0 0-1.568-11.712-0.768c-6.752 0-15.616 0.768-26.528 2.336L639.584 332.512l38.24 0 0-30.432c0-14.56-0.768-26.272-2.336-35.104l90.528 0c-1.536 9.888-2.336 21.056-2.336 33.536l0 32 67.872 0 0 75.68c-2.592 0-7.424-0.256-14.432-0.768-7.04-0.512-13.664-0.8-19.904-0.8l-33.568 0 0 145.152c0 34.848 11.456 52.288 34.336 52.288 16.128 0 30.688-4.416 43.712-13.248L841.696 668.832 841.696 668.832zM321.216 400.416c-32.768 0-49.152 19.264-49.152 57.76 0 35.904 16.384 53.856 49.152 53.856 31.744 0 47.616-18.208 47.616-54.624 0-15.104-3.648-28.096-10.912-39.008C349.056 406.4 336.832 400.416 321.216 400.416z" p-id="3896" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/mntsvg b/src/assets/icons/svg/mntsvg
deleted file mode 100644
index 09f40bd..0000000
--- a/src/assets/icons/svg/mntsvg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574572606408" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1870" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M870.4 793.6H153.6C68.9024 793.6 0 724.6976 0 640V153.6C0 68.9024 68.9024 0 153.6 0h716.8c84.6976 0 153.6 68.9024 153.6 153.6v486.4c0 84.6976-68.9024 153.6-153.6 153.6zM153.6 51.2c-56.4608 0-102.4 45.9392-102.4 102.4v486.4c0 56.4608 45.9392 102.4 102.4 102.4h716.8c56.4608 0 102.4-45.9392 102.4-102.4V153.6c0-56.4608-45.9392-102.4-102.4-102.4H153.6zM793.6 1024H230.4a25.6 25.6 0 0 1 0-51.2h563.2a25.6 25.6 0 0 1 0 51.2zM633.6 908.8h-243.2a25.6 25.6 0 0 1 0-51.2h243.2a25.6 25.6 0 0 1 0 51.2z" fill="#707070" p-id="1871"></path><path d="M349.0688 404.3008A25.664 25.664 0 0 1 330.9568 396.8l-54.2976-54.3104a25.6 25.6 0 0 1 36.2112-36.2112l44.2624 44.2752 88.2688-20.3648 20.3648-88.256-44.2752-44.2752a25.6 25.6 0 1 1 36.1984-36.1984L512 215.7824c6.2464 6.2336 8.8192 15.2576 6.848 23.8592l-27.1616 117.6704a25.6 25.6 0 0 1-19.1872 19.1872l-117.6832 27.1488a25.7792 25.7792 0 0 1-5.7472 0.6528zM584.4096 639.6288a25.4976 25.4976 0 0 1-18.0992-7.5008L512 577.8304a25.5616 25.5616 0 0 1-6.848-23.8464l27.1488-117.6832a25.6256 25.6256 0 0 1 19.2-19.1872l117.6704-27.1488a25.536 25.536 0 0 1 23.8464 6.848l54.2976 54.3104a25.6 25.6 0 0 1-36.1984 36.2112l-44.2752-44.2752-88.256 20.3648-20.3648 88.256 44.2752 44.2752a25.6 25.6 0 0 1-18.0864 43.6736z" fill="#707070" p-id="1872"></path><path d="M557.248 467.648a25.4976 25.4976 0 0 1-18.0992-7.5008l-90.496-90.496a25.6 25.6 0 1 1 36.1984-36.1984l90.496 90.496a25.6 25.6 0 0 1-18.0992 43.6992z" fill="#707070" p-id="1873"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/source.svg b/src/assets/icons/svg/source.svg
new file mode 100644
index 0000000..1c3a038
--- /dev/null
+++ b/src/assets/icons/svg/source.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1574679314986" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2155" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M546.26 538.81v257.63c0 18.38-14.9 33.29-33.29 33.29-18.01 0.37-32.91-13.93-33.29-31.94-0.01-0.45-0.01-0.9 0-1.35V538.81l-233-134.47c-15.73-9.25-21.07-29.45-11.98-45.27 8.82-15.71 28.7-21.3 44.41-12.48 0.29 0.16 0.57 0.33 0.86 0.5l233 133.14 231-133.14c15.43-9.29 35.48-4.31 44.77 11.13 0.17 0.28 0.34 0.57 0.5 0.86 9.09 15.82 3.74 36.01-11.98 45.27l-231 133.14v1.32z" fill="#515151" p-id="2156"></path><path d="M512 1006.74c-18.08 0-36.14-4.65-52.27-13.96L121.77 797.65c-32.24-18.61-52.27-53.3-52.27-90.53V316.87c0-37.23 20.03-71.92 52.27-90.53L459.73 31.22c32.24-18.61 72.29-18.61 104.53 0l337.97 195.13c32.24 18.61 52.27 53.3 52.27 90.53v390.25c0 37.23-20.03 71.92-52.27 90.53L564.27 992.78c-16.12 9.3-34.2 13.96-52.27 13.96z m0-940.77c-9.65 0-19.29 2.48-27.9 7.45L146.13 268.55c-17.21 9.94-27.9 28.45-27.9 48.32v390.25c0 19.87 10.69 38.39 27.9 48.32L484.1 950.57c17.21 9.94 38.59 9.93 55.8 0l337.97-195.13c17.21-9.94 27.9-28.45 27.9-48.32V316.87c0-19.87-10.69-38.39-27.9-48.32L539.9 73.43a55.757 55.757 0 0 0-27.9-7.46z" fill="#515151" p-id="2157"></path></svg>
\ No newline at end of file
diff --git a/src/assets/styles/eladmin.scss b/src/assets/styles/eladmin.scss
index 92d8272..338cbba 100644
--- a/src/assets/styles/eladmin.scss
+++ b/src/assets/styles/eladmin.scss
@@ -9,10 +9,15 @@
       line-height: 30.5px;
     }
   }
+  .el-select__caret.el-input__icon.el-icon-arrow-up{
+    line-height: 30.5px;
+  }
   .date-item {
     display: inline-block;
     vertical-align: middle;
     margin-bottom: 10px;
+    height: 30.5px;
+    width: 223px;
   }
 }
 .el-avatar {
diff --git a/src/components/Github/index.vue b/src/components/Github/index.vue
index ba3925f..793956e 100644
--- a/src/components/Github/index.vue
+++ b/src/components/Github/index.vue
@@ -1,22 +1,16 @@
 <template>
-  <a href="https://github.com/elunez/eladmin" target="_blank">
-    <svg id="icon-github" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="icon svg" viewBox="0 0 1025 1024" width="100%" height="100%"><path d="M512.032 831.904c-19.168 0-38.304-9.92-58.144-29.76-7.808-7.808-7.808-20.48 0-28.288s20.48-7.808 28.288 0c12.192 12.224 21.984 18.144 29.856 18.144s17.664-5.92 29.856-18.144c7.808-7.808 20.48-7.808 28.288 0s7.808 20.48 0 28.288c-19.84 19.84-38.976 29.76-58.144 29.76zM0.032 525.504c0 49.888 4.256 95.136 12.8 135.68s20.544 75.744 36 105.536c15.456 29.792 35.008 55.904 58.656 78.336s49.344 40.928 77.056 55.456c27.744 14.528 59.456 26.304 95.2 35.264s72.096 15.264 109.056 18.848 77.696 5.376 122.144 5.376c44.448 0 85.248-1.792 122.4-5.376s73.6-9.856 109.344-18.848c35.744-8.96 67.552-20.736 95.456-35.264s53.792-33.024 77.6-55.456c23.808-22.432 43.456-48.544 58.944-78.336s27.552-64.96 36.256-105.536c8.704-40.576 13.056-85.792 13.056-135.68 0-89.376-27.744-166.368-83.2-230.976 3.2-8.608 5.952-18.496 8.256-29.6s4.544-26.816 6.656-47.104c2.144-20.288 1.344-43.712-2.4-70.272s-10.752-53.664-21.056-81.312l-8-1.632c-5.344-1.088-14.048-0.704-26.144 1.088s-26.208 5.024-42.4 9.696c-16.192 4.672-37.056 13.92-62.656 27.744s-52.608 31.328-81.056 52.512c-48.352-14.72-115.008-30.112-200-30.112s-151.808 15.392-200.544 30.112c-28.448-21.184-55.552-38.592-81.344-52.224s-46.4-22.976-61.856-28c-15.456-5.024-29.792-8.256-42.944-9.696s-21.6-1.888-25.344-1.344c-3.744 0.544-6.496 1.152-8.256 1.888-10.304 27.648-17.408 54.752-21.344 81.312s-4.8 49.888-2.656 69.984c2.144 20.096 4.448 35.904 6.944 47.392s5.344 21.344 8.544 29.6c-55.456 64.256-83.2 141.248-83.2 230.976zM136.576 639.392c0-58.016 21.344-110.624 64-157.856 12.8-14.4 27.648-25.312 44.544-32.704s36.096-11.616 57.6-12.608 42.048-0.8 61.6 0.608c19.552 1.408 43.744 3.296 72.544 5.696s53.696 3.616 74.656 3.616c20.96 0 45.856-1.184 74.656-3.616s52.992-4.288 72.544-5.696c19.552-1.408 40.096-1.6 61.6-0.608s40.8 5.216 57.856 12.608c17.056 7.392 32 18.304 44.8 32.704 42.656 47.232 64 99.84 64 157.856 0 34.016-3.552 64.32-10.656 90.944s-16.096 48.928-26.944 66.912c-10.848 18.016-26.048 33.216-45.6 45.632s-38.496 22.016-56.8 28.8c-18.304 6.784-41.952 12.096-70.944 15.904s-54.944 6.112-77.856 6.912c-22.944 0.8-51.808 1.216-86.656 1.216s-63.648-0.416-86.4-1.216c-22.752-0.8-48.608-3.104-77.6-6.912s-52.608-9.12-70.944-15.904c-18.304-6.816-37.248-16.416-56.8-28.8s-34.752-27.616-45.6-45.632c-10.848-18.016-19.84-40.32-26.944-66.912s-10.656-56.928-10.656-90.944zM256.032 608c0-53.024 28.64-96 64-96s64 42.976 64 96c0 53.024-28.64 96-64 96s-64-42.976-64-96zM640.032 608c0-53.024 28.64-96 64-96s64 42.976 64 96c0 53.024-28.64 96-64 96s-64-42.976-64-96z" p-id="1450" /></svg>
-  </a>
+  <div>
+    <svg-icon icon-class="github" @click="click" />
+  </div>
 </template>
 
 <script>
 export default {
-  name: 'Github'
+  name: 'Github',
+  methods: {
+    click() {
+      window.open('https://github.com/elunez/eladmin', '_blank')
+    }
+  }
 }
 </script>
-
-<style scoped>
-.svg {
-  display: inline-block;
-  cursor: pointer;
-  fill: #5a5e66;;
-  width: 20px;
-  height: 20px;
-  vertical-align: 10px;
-}
-</style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index e8e6094..8d2fd8e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -8,7 +8,13 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+          <Github class="right-menu-item hover-effect" />
+        </el-tooltip>
+
+        <el-tooltip content="全屏缩放" effect="dark" placement="bottom">
+          <screenfull id="screenfull" class="right-menu-item hover-effect" />
+        </el-tooltip>
 
         <el-tooltip content="布局设置" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
@@ -52,6 +58,7 @@
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
+import Github from '@/components/Github'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
@@ -63,7 +70,8 @@ export default {
     Hamburger,
     Screenfull,
     SizeSelect,
-    Search
+    Search,
+    Github
   },
   data() {
     return {
diff --git a/src/mixins/initData.js b/src/mixins/initData.js
deleted file mode 100644
index aca65a6..0000000
--- a/src/mixins/initData.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import { initData } from '@/api/data'
-
-export default {
-  data() {
-    return {
-      // 表格 Loading 属性
-      loading: true,
-      // 表格数据
-      data: [],
-      // 页码
-      page: 0,
-      // 每页数据条数
-      size: 10,
-      // 总数据条数
-      total: 0,
-      // 请求数据的url
-      url: '',
-      // 查询数据的参数
-      params: {},
-      // 待查询的对象
-      query: {},
-      // 等待时间
-      time: 50,
-      // 是否为新增类型的表单
-      isAdd: false,
-      // 导出的 Loading
-      downloadLoading: false
-    }
-  },
-  methods: {
-    async init() {
-      if (!await this.beforeInit()) {
-        return
-      }
-      return new Promise((resolve, reject) => {
-        this.loading = true
-        // 请求数据
-        initData(this.url, this.params).then(res => {
-          this.total = res.totalElements
-          this.data = res.content
-          // time 毫秒后显示表格
-          setTimeout(() => {
-            this.loading = false
-          }, this.time)
-          resolve(res)
-        }).catch(err => {
-          this.loading = false
-          reject(err)
-        })
-      })
-    },
-    beforeInit() {
-      return true
-    },
-    // 改变页码
-    pageChange(e) {
-      this.page = e - 1
-      this.init()
-    },
-    // 改变每页显示数
-    sizeChange(e) {
-      this.page = 0
-      this.size = e
-      this.init()
-    },
-    // 预防删除第二页最后一条数据时，或者多选删除第二页的数据时，页码错误导致请求无数据
-    dleChangePage(size) {
-      if (size === undefined) {
-        size = 1
-      }
-      if (this.data.length === size && this.page !== 0) {
-        this.page = this.page - 1
-      }
-    },
-    // 查询方法
-    toQuery() {
-      this.page = 0
-      this.init()
-    }
-  }
-}
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 4abd2bf..8145f9f 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -89,8 +89,8 @@
                       value="Like"
                     />
                     <el-option
-                      label="DateRange"
-                      value="DateRange"
+                      label="BetWeen"
+                      value="BetWeen"
                     />
                   </el-select>
                 </template>
@@ -146,6 +146,10 @@
               <el-input v-model="form.pack" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">项目包的名称，生成的代码放到哪个包里面</span>
             </el-form-item>
+            <el-form-item label="接口名称" prop="apiAlias">
+              <el-input v-model="form.apiAlias" style="width: 40%" />
+              <span style="color: #C0C0C0;margin-left: 10px;">接口的名称，用于控制器与接口文档中</span>
+            </el-form-item>
             <el-form-item label="前端路径" prop="path">
               <el-input v-model="form.path" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">输入views文件夹下的目录，不存在即创建</span>
@@ -173,18 +177,18 @@
 </template>
 
 <script>
-import initData from '@/mixins/initData'
+import crud from '@/mixins/crud'
 import { update, get } from '@/api/generator/genConfig'
 import { save } from '@/api/generator/generator'
 import { getDicts } from '@/api/system/dict'
 export default {
   name: 'GeneratorConfig',
   components: {},
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
       activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [],
-      form: { id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
+      form: { id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '', apiAlias: null },
       rules: {
         author: [
           { required: true, message: '作者不能为空', trigger: 'blur' }
@@ -196,7 +200,10 @@ export default {
           { required: true, message: '包路径不能为空', trigger: 'blur' }
         ],
         path: [
-          { required: true, message: '前端代码生成路径不能为空', trigger: 'blur' }
+          { required: true, message: '前端路径不能为空', trigger: 'blur' }
+        ],
+        apiAlias: [
+          { required: true, message: '接口名称不能为空', trigger: 'blur' }
         ],
         cover: [
           { required: true, message: '不能为空', trigger: 'blur' }
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index 9a82d29..25b4008 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -46,36 +46,13 @@
 </template>
 
 <script>
-import initData from '@/mixins/initData'
-import { parseTime } from '@/utils/index'
+import crud from '@/mixins/crud'
 import { generator } from '@/api/generator/generator'
 export default {
   name: 'GeneratorIndex',
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      loading: false, dialog: false,
-      form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
-      rules: {
-        author: [
-          { required: true, message: '作者不能为空', trigger: 'blur' }
-        ],
-        pack: [
-          { required: true, message: '包路径不能为空', trigger: 'blur' }
-        ],
-        moduleName: [
-          { required: true, message: '包路径不能为空', trigger: 'blur' }
-        ],
-        path: [
-          { required: true, message: '前端代码生成路径不能为空', trigger: 'blur' }
-        ],
-        apiPath: [
-          { required: true, message: '前端Api文件生成路径不能为空', trigger: 'blur' }
-        ],
-        cover: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
     }
   },
   created() {
@@ -84,13 +61,8 @@ export default {
     })
   },
   methods: {
-    parseTime,
     beforeInit() {
       this.url = 'api/generator/tables'
-      const query = this.query
-      const name = query.name
-      this.params = { page: this.page, size: this.size }
-      if (name) { this.params['name'] = name }
       return true
     },
     toGen(tableName) {
diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
index b6230ac..9c99717 100644
--- a/src/views/mnt/app/index.vue
+++ b/src/views/mnt/app/index.vue
@@ -9,8 +9,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
index f413240..8f5b49f 100644
--- a/src/views/mnt/deploy/index.vue
+++ b/src/views/mnt/deploy/index.vue
@@ -9,8 +9,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/mnt/deploy/sysRestore.vue b/src/views/mnt/deploy/sysRestore.vue
index af3d090..87df671 100644
--- a/src/views/mnt/deploy/sysRestore.vue
+++ b/src/views/mnt/deploy/sysRestore.vue
@@ -7,8 +7,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 240px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="部署开始日期"
         end-placeholder="部署结束日期"
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
index e897cc0..1ad472e 100644
--- a/src/views/mnt/server/index.vue
+++ b/src/views/mnt/server/index.vue
@@ -9,8 +9,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index a2d0218..5ba58ed 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -6,8 +6,8 @@
       :default-time="['00:00:00','23:59:59']"
       type="daterange"
       range-separator=":"
-      class="el-range-editor--small date-item"
-      style="width: 220px;height: 30.5px"
+      size="small"
+      class="date-item"
       value-format="yyyy-MM-dd HH:mm:ss"
       start-placeholder="开始日期"
       end-placeholder="结束日期"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 7e941c1..bda7925 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -9,8 +9,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index 4e2ceee..e67442c 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -9,8 +9,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index f72e9b0..e060755 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -9,8 +9,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 70364a1..e579ea3 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -9,8 +9,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index b09b3c6..9c24b9a 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -9,8 +9,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
index 29bda5b..3606d9b 100644
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -8,8 +8,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index f8d9fd0..31e2af1 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -88,12 +88,12 @@ import updateEmail from './center/updateEmail'
 import { getToken } from '@/utils/auth'
 import store from '@/store'
 import { parseTime } from '@/utils/index'
-import initData from '@/mixins/initData'
+import crud from '@/mixins/crud'
 import Avatar from '@/assets/images/avatar.png'
 export default {
   name: 'Center',
   components: { updatePass, updateEmail },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
       Avatar: Avatar,
@@ -123,8 +123,6 @@ export default {
     },
     beforeInit() {
       this.url = 'api/logs/user'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
       return true
     },
     handleSuccess(response, file, fileList) {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 085b8b0..d812391 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -19,8 +19,8 @@
             :default-time="['00:00:00','23:59:59']"
             type="daterange"
             range-separator=":"
-            class="el-range-editor--small date-item"
-            style="width: 220px;height: 30.5px"
+            size="small"
+            class="date-item"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index cd90086..685708b 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -9,8 +9,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index bb6c7fa..efe1610 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -9,8 +9,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
diff --git a/src/views/tools/storage/qiniu/index.vue b/src/views/tools/storage/qiniu/index.vue
index dce0a47..5523ab1 100644
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -11,8 +11,8 @@
         :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
-        class="el-range-editor--small date-item"
-        style="width: 220px;height: 30.5px"
+        size="small"
+        class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
         start-placeholder="开始日期"
         end-placeholder="结束日期"

From 3f257081f4014516265e882ace072465d9cff3ce Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 26 Nov 2019 11:49:45 +0800
Subject: [PATCH 28/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue            | 1 +
 src/views/system/user/index.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 889b7dc..9674163 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -90,6 +90,7 @@ export default {
     z-index: 9;
     width: calc(100% - #{$sideBarWidth});
     transition: width 0.28s;
+    padding: 0;
   }
 
   .hideSidebar .fixed-header {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d812391..ee55d35 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -60,13 +60,13 @@
               <el-input v-model.number="form.phone" />
             </el-form-item>
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" />
+              <el-input v-model="form.email" style="width: 191px" />
             </el-form-item>
             <el-form-item label="部门" prop="dept.id">
               <treeselect v-model="form.dept.id" :options="depts" style="width: 178px" placeholder="选择部门" @select="selectFun" />
             </el-form-item>
             <el-form-item label="岗位" prop="job.id">
-              <el-select v-model="form.job.id" style="width: 178px" placeholder="请先选择部门">
+              <el-select v-model="form.job.id" placeholder="请先选择部门">
                 <el-option
                   v-for="(item, index) in jobs"
                   :key="item.name + index"

From 7387842ac78519a84752b4473ad3353cc3bc16e3 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 26 Nov 2019 13:59:25 +0800
Subject: [PATCH 29/64] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8A=A0=E5=85=A5=E4=BB=A3=E7=A0=81=E9=AB=98?=
 =?UTF-8?q?=E4=BA=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                       |  3 ++-
 src/main.js                        |  3 +++
 src/views/login.vue                |  2 +-
 src/views/monitor/log/errorLog.vue | 16 +++++++++++-----
 src/views/system/timing/log.vue    | 14 +++++++++++---
 src/views/system/user/index.vue    |  2 +-
 src/views/tools/email/send.vue     |  2 +-
 7 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 7012a52..49eb142 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,8 @@
     "vue-splitpane": "1.0.4",
     "vuex": "3.1.0",
     "wangeditor": ">=3.0.0",
-    "xlsx": "^0.11.16"
+    "xlsx": "^0.11.16",
+    "vue-highlightjs": "^1.3.3"
   },
   "devDependencies": {
     "@babel/core": "7.0.0",
diff --git a/src/main.js b/src/main.js
index 6bb9280..989a3d8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,6 +11,8 @@ import permission from './components/Permission'
 import 'mavon-editor/dist/css/index.css'
 import './assets/styles/element-variables.scss'
 import './assets/styles/index.scss' // global css
+import VueHighlightJS from 'vue-highlightjs'
+import 'highlight.js/styles/atom-one-dark.css'
 
 import App from './App'
 import store from './store'
@@ -19,6 +21,7 @@ import router from './router/routers'
 import './assets/icons' // icon
 import './router/index' // permission control
 
+Vue.use(VueHighlightJS)
 Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(dict)
diff --git a/src/views/login.vue b/src/views/login.vue
index 5095120..cc81d5f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -22,7 +22,7 @@
           <img :src="codeUrl" @click="getCode">
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">
+      <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">
         记住我
       </el-checkbox>
       <el-form-item style="width:100%;">
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index 31f5fd0..506c441 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -31,10 +31,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog :visible.sync="dialog" title="异常详情" append-to-body top="0" width="85%">
-      <pre>
-        {{ errorInfo }}
-      </pre>
+    <el-dialog :visible.sync="dialog" title="异常详情" append-to-body top="30px" width="85%">
+      <pre v-highlightjs="errorInfo"><code class="java" /></pre>
     </el-dialog>
     <!--分页组件-->
     <el-pagination
@@ -84,7 +82,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
   .demo-table-expand {
     font-size: 0;
   }
@@ -101,4 +99,12 @@ export default {
     font-size: 12px;
 
   }
+  /deep/ .el-dialog__body{
+    padding: 0 20px 10px 20px !important;
+  }
+  .java.hljs{
+    color: #444;
+    background: #ffffff !important;
+    height: 630px !important;
+  }
 </style>
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
index 3606d9b..d29d866 100644
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -55,9 +55,7 @@
       </el-table-column>
     </el-table>
     <el-dialog :visible.sync="errorDialog" append-to-body title="异常详情" width="85%">
-      <pre>
-        {{ errorInfo }}
-      </pre>
+      <pre v-highlightjs="errorInfo"><code class="java" /></pre>
     </el-dialog>
     <!--分页组件-->
     <el-pagination
@@ -106,3 +104,13 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+  .java.hljs{
+    color: #444;
+    background: #ffffff !important;
+  }
+  /deep/ .el-dialog__body{
+    padding: 0 20px 10px 20px !important;
+  }
+</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ee55d35..86f4d45 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -75,7 +75,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item style="margin-bottom: 0px;" label="角色" prop="roles">
+            <el-form-item style="margin-bottom: 0;" label="角色" prop="roles">
               <el-select v-model="form.roles" style="width: 450px;" multiple placeholder="请选择">
                 <el-option
                   v-for="item in roles"
diff --git a/src/views/tools/email/send.vue b/src/views/tools/email/send.vue
index e6cd3a1..179eaed 100644
--- a/src/views/tools/email/send.vue
+++ b/src/views/tools/email/send.vue
@@ -11,7 +11,7 @@
       >
         <el-input v-model="domain.value" style="width: 31%" />
         <el-button icon="el-icon-plus" @click="addDomain" />
-        <el-button style="margin-left:0px;" icon="el-icon-minus" @click.prevent="removeDomain(domain)" />
+        <el-button style="margin-left:0;" icon="el-icon-minus" @click.prevent="removeDomain(domain)" />
       </el-form-item>
       <div ref="editor" class="editor" />
       <el-button :loading="loading" style="margin-left:1.6%;" size="medium" type="primary" @click="doSubmit">发送邮件</el-button>

From cbded8ce20fa480ab38cd236715a36c2e89bb9b1 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 26 Nov 2019 16:03:42 +0800
Subject: [PATCH 30/64] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                      |  2 +-
 src/components/JavaEdit/index.vue | 78 +++++++++++++++++++++++++++++++
 src/components/YamlEdit/index.vue |  2 +-
 src/main.js                       | 14 ++++--
 src/views/generator/index.vue     |  6 ++-
 src/views/generator/preview.vue   | 38 +++++++++++++++
 6 files changed, 134 insertions(+), 6 deletions(-)
 create mode 100644 src/components/JavaEdit/index.vue
 create mode 100644 src/views/generator/preview.vue

diff --git a/package.json b/package.json
index 49eb142..6ebca5b 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "@riophae/vue-treeselect": "0.1.0",
     "axios": "0.18.1",
     "clipboard": "2.0.4",
-    "codemirror": "^5.38.0",
+    "codemirror": "^5.49.2",
     "connect": "3.6.6",
     "echarts": "4.2.1",
     "echarts-gl": "^1.1.1",
diff --git a/src/components/JavaEdit/index.vue b/src/components/JavaEdit/index.vue
new file mode 100644
index 0000000..c703829
--- /dev/null
+++ b/src/components/JavaEdit/index.vue
@@ -0,0 +1,78 @@
+<template>
+  <div class="json-editor">
+    <textarea ref="textarea" />
+  </div>
+</template>
+
+<script>
+import CodeMirror from 'codemirror'
+import 'codemirror/lib/codemirror.css'
+// 替换主题这里需修改名称
+import 'codemirror/theme/idea.css'
+import 'codemirror/mode/clike/clike'
+export default {
+  props: {
+    value: {
+      type: String,
+      required: true
+    },
+    height: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      editor: false
+    }
+  },
+  watch: {
+    value(value) {
+      const editorValue = this.editor.getValue()
+      if (value !== editorValue) {
+        this.editor.setValue(this.value)
+      }
+    },
+    height(value) {
+      this.editor.setSize('auto', this.height)
+    }
+  },
+  mounted() {
+    this.editor = CodeMirror.fromTextArea(this.$refs.textarea, {
+      mode: 'text/x-java',
+      lineNumbers: true,
+      lint: true,
+      lineWrapping: true,
+      tabSize: 2,
+      cursorHeight: 0.9,
+      // 替换主题这里需修改名称
+      theme: 'idea',
+      readOnly: true
+    })
+    this.editor.setSize('auto', this.height)
+    this.editor.setValue(this.value)
+  },
+  methods: {
+    getValue() {
+      return this.editor.getValue()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .json-editor{
+    height: 100%;
+    margin-bottom: 10px;
+  }
+  .json-editor >>> .CodeMirror {
+    font-size: 14px;
+    overflow-y:auto;
+    font-weight:normal
+  }
+  .json-editor >>> .CodeMirror-scroll{
+  }
+  .json-editor >>> .cm-s-rubyblue span.cm-string {
+    color: #F08047;
+  }
+</style>
diff --git a/src/components/YamlEdit/index.vue b/src/components/YamlEdit/index.vue
index 8ad48fa..83778f4 100644
--- a/src/components/YamlEdit/index.vue
+++ b/src/components/YamlEdit/index.vue
@@ -9,7 +9,7 @@ import CodeMirror from 'codemirror'
 import 'codemirror/lib/codemirror.css'
 // 替换主题这里需修改名称
 import 'codemirror/theme/idea.css'
-require('codemirror/mode/yaml/yaml.js')
+import 'codemirror/mode/yaml/yaml'
 export default {
   props: {
     value: {
diff --git a/src/main.js b/src/main.js
index 989a3d8..a0bd192 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,12 +5,20 @@ import Cookies from 'js-cookie'
 import 'normalize.css/normalize.css'
 
 import Element from 'element-ui'
+//
 import mavonEditor from 'mavon-editor'
-import dict from './components/Dict'
-import permission from './components/Permission'
 import 'mavon-editor/dist/css/index.css'
+
+// 数据字典
+import dict from './components/Dict'
+
+// 权限指令
+import permission from './components/Permission'
 import './assets/styles/element-variables.scss'
-import './assets/styles/index.scss' // global css
+// global css
+import './assets/styles/index.scss'
+
+// 代码高亮
 import VueHighlightJS from 'vue-highlightjs'
 import 'highlight.js/styles/atom-one-dark.css'
 
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index 25b4008..0dbca20 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -23,7 +23,11 @@
       </el-table-column>
       <el-table-column label="操作" width="140px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button size="mini" style="margin-right: 2px" type="text">预览</el-button>
+          <el-button size="mini" style="margin-right: 2px" type="text">
+            <router-link :to="'/sys-tools/generator/preview/' + scope.row.tableName">
+              预览
+            </router-link>
+          </el-button>
           <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text">
             <router-link :to="'/sys-tools/generator/config/' + scope.row.tableName">
               编辑
diff --git a/src/views/generator/preview.vue b/src/views/generator/preview.vue
new file mode 100644
index 0000000..8ee6cac
--- /dev/null
+++ b/src/views/generator/preview.vue
@@ -0,0 +1,38 @@
+<template>
+  <el-tabs v-if="!error" v-model="activeName" type="card">
+    <el-tab-pane v-for="item in data" :key="item.name" :lazy="true" :label="item.name" :name="item.name">
+      <Java :value="item.content" :height="height" />
+    </el-tab-pane>
+  </el-tabs>
+  <div v-else class="app-container">
+    <el-alert
+      :title="error"
+      type="error"
+    />
+  </div>
+</template>
+
+<script>
+import Java from '@/components/JavaEdit/index'
+import { generator } from '@/api/generator/generator'
+export default {
+  name: 'Preview',
+  components: { Java },
+  data() {
+    return {
+      data: null, error: null, height: '', activeName: 'Entity'
+    }
+  },
+  created() {
+    this.height = document.documentElement.clientHeight - 180 + 'px'
+    const tableName = this.$route.params.tableName
+    this.$nextTick(() => {
+      generator(tableName, 1).then(data => {
+        this.data = data
+      }).catch(err => {
+        this.error = err.response.data.message
+      })
+    })
+  }
+}
+</script>

From a0a997391165fc007df0a9f5fb4c864cd198ceb8 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 26 Nov 2019 17:43:29 +0800
Subject: [PATCH 31/64] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/generator/generator.js | 3 ++-
 src/views/generator/index.vue  | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/api/generator/generator.js b/src/api/generator/generator.js
index 194f629..85ba185 100644
--- a/src/api/generator/generator.js
+++ b/src/api/generator/generator.js
@@ -10,7 +10,8 @@ export function getAllTable() {
 export function generator(tableName, type) {
   return request({
     url: 'api/generator/' + tableName + '/' + type,
-    method: 'post'
+    method: 'post',
+    responseType: type === 2 ? 'blob' : ''
   })
 }
 
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index 0dbca20..4c31ea6 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -21,13 +21,14 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="140px" align="center" fixed="right">
+      <el-table-column label="操作" width="160px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" style="margin-right: 2px" type="text">
             <router-link :to="'/sys-tools/generator/preview/' + scope.row.tableName">
               预览
             </router-link>
           </el-button>
+          <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="toDownload(scope.row.tableName)">下载</el-button>
           <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text">
             <router-link :to="'/sys-tools/generator/config/' + scope.row.tableName">
               编辑
@@ -78,6 +79,12 @@ export default {
           duration: 2500
         })
       })
+    },
+    toDownload(tableName) {
+      // 打包下载
+      generator(tableName, 2).then(data => {
+        this.downloadFile(data, tableName, 'zip')
+      })
     }
   }
 }

From ad9cd8594e5308c6a6bf1cdaf46b7b9c661da1ae Mon Sep 17 00:00:00 2001
From: zhanghouying <zhy6599@163.com>
Date: Tue, 26 Nov 2019 17:56:40 +0800
Subject: [PATCH 32/64] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E5=AE=9A?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E8=AE=B0=E5=BD=95=E8=A2=AB=E9=80=89?=
 =?UTF-8?q?=E5=AE=9A=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C=E6=9B=B4=E4=B8=A5?=
 =?UTF-8?q?=E8=B0=A8=E4=B8=80=E4=BA=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mnt/deploy/index.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
index 8f5b49f..edc7783 100644
--- a/src/views/mnt/deploy/index.vue
+++ b/src/views/mnt/deploy/index.vue
@@ -178,6 +178,7 @@ export default {
   methods: {
     beforeInit() {
       this.url = 'api/deploy'
+      this.selectIndex = ''
       return true
     },
     // 打开新增弹窗前做的操作
@@ -204,7 +205,7 @@ export default {
       return true
     },
     deploy() {
-      if (this.selectIndex === '') {
+      if (!this.selectIndex) {
         this.$message.error('请先选择服务')
       } else {
         this.$refs.deploy.dialog = true
@@ -212,7 +213,7 @@ export default {
       }
     },
     sysRestore() {
-      if (this.selectIndex === '') {
+      if (!this.selectIndex) {
         this.$message.error('请先选择服务')
       } else {
         this.$refs.sysRestore.dialog = true
@@ -227,7 +228,7 @@ export default {
       this.deployId = !row ? null : row.id
     },
     startServer() {
-      if (this.selectIndex === '') {
+      if (!this.selectIndex) {
         this.$message.error('请先选择服务')
       } else {
         this.crudMethod.startServer(JSON.stringify(this.currentRow))
@@ -239,7 +240,7 @@ export default {
       }
     },
     stopServer() {
-      if (this.selectIndex === '') {
+      if (!this.selectIndex) {
         this.$message.error('请先选择服务')
       } else {
         this.crudMethod.stopServer(JSON.stringify(this.currentRow))
@@ -251,7 +252,7 @@ export default {
       }
     },
     serverStatus() {
-      if (this.selectIndex === '') {
+      if (!this.selectIndex) {
         this.$message.error('请先选择服务')
       } else {
         this.crudMethod.serverStatus(JSON.stringify(this.currentRow))

From 11d1a803eea8fde704a17b4a4bdb4adc21cf5593 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Wed, 27 Nov 2019 12:42:52 +0800
Subject: [PATCH 33/64] update

---
 LICENSE                                 | 204 ++++++++++++++++++++++--
 src/layout/components/Sidebar/index.vue |   6 -
 2 files changed, 187 insertions(+), 23 deletions(-)

diff --git a/LICENSE b/LICENSE
index 6151575..78a36cb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,191 @@
-MIT License
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
 
-Copyright (c) 2017-present PanJiaChen
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+1. Definitions.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "{}" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright 2019 Zheng Jie
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 4687b29..c029f61 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -52,9 +52,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-  /deep/ .el-scrollbar__wrap{
-    margin-right: -22px !important;
-  }
-</style>

From c7518278ec423c1d66b66873f815f68f683a494a Mon Sep 17 00:00:00 2001
From: zhanghouying <zhy6599@163.com>
Date: Wed, 27 Nov 2019 16:40:32 +0800
Subject: [PATCH 34/64] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=8C=89=E9=92=AE=EF=BC=8C=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E6=98=AF=E5=90=A6=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mnt/serverDeploy.js    |  8 ++++++++
 src/views/mnt/server/index.vue | 25 ++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/api/mnt/serverDeploy.js b/src/api/mnt/serverDeploy.js
index 29fb6bb..d2eb944 100644
--- a/src/api/mnt/serverDeploy.js
+++ b/src/api/mnt/serverDeploy.js
@@ -23,4 +23,12 @@ export function edit(data) {
   })
 }
 
+export function testConnect(data) {
+  return request({
+    url: 'api/serverDeploy/testConnect',
+    method: 'post',
+    data
+  })
+}
+
 export default { add, edit, del }
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
index 1ad472e..d7a68d4 100644
--- a/src/views/mnt/server/index.vue
+++ b/src/views/mnt/server/index.vue
@@ -24,7 +24,8 @@
         type="primary"
         icon="el-icon-plus"
         @click="showAddFormDialog"
-      >新增</el-button>
+      >新增
+      </el-button>
     </div>
     <!--表单组件-->
     <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="470px">
@@ -42,7 +43,8 @@
           <el-input v-model="form.account" style="width: 370px" />
         </el-form-item>
         <el-form-item label="密码" prop="password">
-          <el-input v-model="form.password" type="password" style="width: 370px" />
+          <el-input v-model="form.password" type="password" style="width: 200px" />
+          <el-button :loading="loading" type="success" style="align: right;" @click="testConnectServer">测试连接</el-button>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -94,7 +96,7 @@
 
 <script>
 import crud from '@/mixins/crud'
-import crudServer from '@/api/mnt/serverDeploy'
+import { crudServer, testConnect } from '@/api/mnt/serverDeploy'
 import { validateIP } from '@/utils/validate'
 export default {
   mixins: [crud],
@@ -134,6 +136,23 @@ export default {
     async beforeInit() {
       this.url = 'api/serverDeploy'
       return true
+    },
+    testConnectServer() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          testConnect(this.form).then((res) => {
+            this.loading = false
+            this.$notify({
+              title: res ? '连接成功' : '连接失败',
+              type: res ? 'success' : 'error',
+              duration: 2500
+            })
+          }).catch(() => {
+            this.loading = false
+          })
+        }
+      })
     }
   }
 }

From 15138b535f323ba16789bd7b66081363a8df90dd Mon Sep 17 00:00:00 2001
From: "zhy6599@163.com" <zhy6599@163.com>
Date: Thu, 28 Nov 2019 00:12:56 +0800
Subject: [PATCH 35/64] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E5=BD=A2?=
 =?UTF-8?q?=E8=AF=8D=E4=BA=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Echarts/WordCloud.vue | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/components/Echarts/WordCloud.vue

diff --git a/src/components/Echarts/WordCloud.vue b/src/components/Echarts/WordCloud.vue
new file mode 100644
index 0000000..e69de29

From a4299d944bb704b8477da6775152905c4572b2d9 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Thu, 28 Nov 2019 20:12:23 +0800
Subject: [PATCH 36/64] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8B=BC=E6=8E=A5token?=
 =?UTF-8?q?=20=E5=89=8D=E7=BC=80=EF=BC=8C=E7=94=B1=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                    | 2 +-
 src/views/components/Editor.vue         | 2 +-
 src/views/components/MarkDown.vue       | 2 +-
 src/views/mnt/deploy/deploy.vue         | 2 +-
 src/views/system/user/center.vue        | 2 +-
 src/views/tools/email/send.vue          | 2 +-
 src/views/tools/picture/index.vue       | 2 +-
 src/views/tools/storage/local/index.vue | 2 +-
 src/views/tools/storage/qiniu/index.vue | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 0fb30a2..84cd03b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -15,7 +15,7 @@ const service = axios.create({
 service.interceptors.request.use(
   config => {
     if (getToken()) {
-      config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     }
     config.headers['Content-Type'] = 'application/json'
     return config
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index 91760c3..cfb243b 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -15,7 +15,7 @@ export default {
   data() {
     return {
       headers: {
-        'Authorization': 'Bearer ' + getToken()
+        'Authorization': getToken()
       },
       editorContent:
         `<h3 style="text-align: center;">欢迎使用 wangEditor 富文本编辑器!</h3>
diff --git a/src/views/components/MarkDown.vue b/src/views/components/MarkDown.vue
index efaec4e..0a84522 100644
--- a/src/views/components/MarkDown.vue
+++ b/src/views/components/MarkDown.vue
@@ -42,7 +42,7 @@ export default {
         url: this.imagesUploadApi,
         method: 'post',
         data: formdata,
-        headers: { 'Content-Type': 'multipart/form-data', 'Authorization': 'Bearer ' + getToken() }
+        headers: { 'Content-Type': 'multipart/form-data', 'Authorization': getToken() }
       }).then((data) => {
         this.data = data.data
         this.$refs.md.$img2Url(pos, this.data.data[0])
diff --git a/src/views/mnt/deploy/deploy.vue b/src/views/mnt/deploy/deploy.vue
index 9e07aa8..eaddfe2 100644
--- a/src/views/mnt/deploy/deploy.vue
+++ b/src/views/mnt/deploy/deploy.vue
@@ -38,7 +38,7 @@ export default {
       apps: [],
       servers: [],
       headers: {
-        Authorization: 'Bearer ' + getToken()
+        Authorization: getToken()
       },
       deployInfo: {},
       form: {
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index 31e2af1..2b62df7 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -99,7 +99,7 @@ export default {
       Avatar: Avatar,
       ico: 'el-icon-refresh',
       headers: {
-        'Authorization': 'Bearer ' + getToken()
+        'Authorization': getToken()
       }
     }
   },
diff --git a/src/views/tools/email/send.vue b/src/views/tools/email/send.vue
index 179eaed..802c9f7 100644
--- a/src/views/tools/email/send.vue
+++ b/src/views/tools/email/send.vue
@@ -30,7 +30,7 @@ export default {
   data() {
     return {
       headers: {
-        'Authorization': 'Bearer ' + getToken()
+        'Authorization': getToken()
       },
       loading: false, form: { subject: '', tos: [], content: '' },
       tos: [{
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index 685708b..d71ccb6 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -134,7 +134,7 @@ export default {
       title: '图片',
       crudMethod: { ...crudPic },
       headers: {
-        'Authorization': 'Bearer ' + getToken()
+        'Authorization': getToken()
       },
       dialogImageUrl: '',
       dialogVisible: false,
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index efe1610..96f5a39 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -168,7 +168,7 @@ export default {
       title: '文件',
       crudMethod: { ...crudFile },
       delAllLoading: false,
-      headers: { 'Authorization': 'Bearer ' + getToken() },
+      headers: { 'Authorization': getToken() },
       form: { id: null, name: null }
     }
   },
diff --git a/src/views/tools/storage/qiniu/index.vue b/src/views/tools/storage/qiniu/index.vue
index 5523ab1..7adf83f 100644
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -129,7 +129,7 @@ export default {
       title: '文件',
       crudMethod: { ...crudQiNiu },
       icon: 'el-icon-refresh',
-      url: '', headers: { 'Authorization': 'Bearer ' + getToken() }, dialog: false,
+      url: '', headers: { 'Authorization': getToken() }, dialog: false,
       dialogImageUrl: '', dialogVisible: false, fileList: [], files: [], newWin: null
     }
   },

From 071a3bc598f607296cfe32b61a295689afe0c1dd Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sat, 30 Nov 2019 19:43:37 +0800
Subject: [PATCH 37/64] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E9=81=BF=E5=85=8D=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=93=8D=E4=BD=9Credis=E5=B8=A6=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=9A=90=E6=82=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/monitor/redis.js          |  37 ---------
 src/utils/request.js              |  60 +++++++--------
 src/views/monitor/redis/index.vue | 120 ------------------------------
 3 files changed, 30 insertions(+), 187 deletions(-)
 delete mode 100644 src/api/monitor/redis.js
 delete mode 100644 src/views/monitor/redis/index.vue

diff --git a/src/api/monitor/redis.js b/src/api/monitor/redis.js
deleted file mode 100644
index a85f037..0000000
--- a/src/api/monitor/redis.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/redis',
-    method: 'post',
-    data
-  })
-}
-
-export function del(key) {
-  const data = {
-    key
-  }
-  return request({
-    url: 'api/redis/',
-    method: 'delete',
-    data
-  })
-}
-
-export function delAll() {
-  return request({
-    url: 'api/redis/all',
-    method: 'delete'
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/redis',
-    method: 'put',
-    data
-  })
-}
-
-export default { del, delAll }
diff --git a/src/utils/request.js b/src/utils/request.js
index 84cd03b..f997d12 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -48,42 +48,42 @@ service.interceptors.response.use(
       if (error.toString().indexOf('Error: timeout') !== -1) {
         Notification.error({
           title: '网络请求超时',
-          duration: 2500
-        })
-        return Promise.reject(error)
-      }
-      if (error.toString().indexOf('Error: Network Error') !== -1) {
-        Notification.error({
-          title: '网络请求错误',
-          duration: 2500
+          duration: 5000
         })
         return Promise.reject(error)
       }
     }
-    if (code === 401) {
-      MessageBox.confirm(
-        '登录状态已过期，您可以继续留在该页面，或者重新登录',
-        '系统提示',
-        {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
+    if (code) {
+      if (code === 401) {
+        MessageBox.confirm(
+          '登录状态已过期，您可以继续留在该页面，或者重新登录',
+          '系统提示',
+          {
+            confirmButtonText: '重新登录',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          store.dispatch('LogOut').then(() => {
+            location.reload() // 为了重新实例化vue-router对象 避免bug
+          })
+        })
+      } else if (code === 403) {
+        router.push({ path: '/401' })
+      } else {
+        const errorMsg = error.response.data.message
+        if (errorMsg !== undefined) {
+          Notification.error({
+            title: errorMsg,
+            duration: 5000
+          })
         }
-      ).then(() => {
-        store.dispatch('LogOut').then(() => {
-          location.reload() // 为了重新实例化vue-router对象 避免bug
-        })
-      })
-    } else if (code === 403) {
-      router.push({ path: '/401' })
-    } else {
-      const errorMsg = error.response.data.message
-      if (errorMsg !== undefined) {
-        Notification.error({
-          title: errorMsg,
-          duration: 2500
-        })
       }
+    } else {
+      Notification.error({
+        title: '接口请求失败',
+        duration: 5000
+      })
     }
     return Promise.reject(error)
   }
diff --git a/src/views/monitor/redis/index.vue b/src/views/monitor/redis/index.vue
deleted file mode 100644
index 017c837..0000000
--- a/src/views/monitor/redis/index.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.key" clearable size="small" placeholder="输入Key搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 清空缓存 -->
-      <el-button v-permission="['admin','redis:del']" :loading="deleteAllLoading" type="danger" size="mini" class="filter-item" icon="el-icon-delete" @click="deleteAll">清空</el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
-    </div>
-    <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column :show-overflow-tooltip="true" prop="key" label="KEY" />
-      <el-table-column prop="value" label="VALUE">
-        <template slot-scope="scope">
-          <div style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
-            {{ scope.row.value }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','redis:del'])" label="操作" width="130px" align="center" fixed="right">
-        <template slot-scope="scope">
-          <el-popover
-            :ref="scope.$index"
-            v-permission="['admin','redis:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.$index, scope.row)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
-  </div>
-</template>
-
-<script>
-import crud from '@/mixins/crud'
-import crudRedis from '@/api/monitor/redis'
-export default {
-  name: 'Redis',
-  mixins: [crud],
-  data() {
-    return {
-      title: '系统缓存',
-      crudMethod: { ...crudRedis },
-      deleteAllLoading: false
-    }
-  },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
-  methods: {
-
-    beforeInit() {
-      this.url = 'api/redis'
-      if (!this.query.key) {
-        this.params['key'] = '*'
-      }
-      return true
-    },
-    delMethod(index, row) {
-      this.delLoading = true
-      this.crudMethod.del(row.key).then(res => {
-        this.delLoading = false
-        this.$refs[index].doClose()
-        this.dleChangePage()
-        this.init()
-        this.notify('删除成功', 'success')
-      }).catch(() => {
-        this.delLoading = false
-        this.$refs[index].doClose()
-      })
-    },
-    deleteAll() {
-      this.$confirm('你确定要清空缓存数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.deleteAllLoading = true
-        this.crudMethod.delAll().then(res => {
-          this.page = 0
-          this.init()
-          this.deleteAllLoading = false
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

From a6643947d0fa39c21b65f6398bb7009861567f32 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sat, 30 Nov 2019 21:57:16 +0800
Subject: [PATCH 38/64] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E4=B8=8E=E6=80=A7=E5=88=AB=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BF=AE=E6=94=B9=E5=9F=BA=E6=9C=AC=E8=B5=84?=
 =?UTF-8?q?=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js             |   8 ++
 src/assets/icons/svg/login.svg     |   1 +
 src/assets/icons/svg/run.svg       |   1 -
 src/assets/icons/svg/running.svg   |   1 -
 src/views/monitor/online/index.vue |   1 +
 src/views/system/user/center.vue   | 160 +++++++++++++++++++----------
 src/views/system/user/index.vue    |  44 +++++---
 7 files changed, 146 insertions(+), 70 deletions(-)
 create mode 100644 src/assets/icons/svg/login.svg
 delete mode 100644 src/assets/icons/svg/run.svg
 delete mode 100644 src/assets/icons/svg/running.svg

diff --git a/src/api/system/user.js b/src/api/system/user.js
index c6f831d..45b2f1d 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -23,6 +23,14 @@ export function edit(data) {
   })
 }
 
+export function editUser(data) {
+  return request({
+    url: 'api/users/center',
+    method: 'put',
+    data
+  })
+}
+
 export function updatePass(user) {
   const data = {
     oldPass: user.oldPass,
diff --git a/src/assets/icons/svg/login.svg b/src/assets/icons/svg/login.svg
new file mode 100644
index 0000000..cc5a854
--- /dev/null
+++ b/src/assets/icons/svg/login.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575115830633" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2251" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M409.002667 469.333333L300.8 361.130667 361.130667 300.8l211.2 211.2-211.2 211.2-60.330667-60.330667L409.002667 554.666667H128v-85.333334h281.002667zM469.333333 128h341.333334c46.933333 0 85.333333 38.4 85.333333 85.333333v597.333334c0 46.933333-38.4 85.333333-85.333333 85.333333h-341.333334v-85.333333h341.333334V213.333333h-341.333334V128z" fill="#cdcdcd" p-id="2252"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/run.svg b/src/assets/icons/svg/run.svg
deleted file mode 100644
index 9eaddb6..0000000
--- a/src/assets/icons/svg/run.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" class="icon" p-id="1314" t="1555468036837" version="1.1" viewBox="0 0 1024 1024"><defs><style type="text/css"/></defs><path fill="#e6e6e6" d="M977.066667 352 977.066667 352l-234.666667 213.333333 0 0C736 571.733333 725.333333 576 714.666667 576c-10.666667 0-19.2-4.266667-25.6-8.533333l0 0-192-149.333333 0 0c-10.666667-8.533333-17.066667-19.2-17.066667-34.133333 0-23.466667 19.2-42.666667 42.666667-42.666667 10.666667 0 19.2 4.266667 25.6 8.533333l0 0 164.266667 128 209.066667-189.866667 0 0c8.533333-6.4 17.066667-10.666667 27.733333-10.666667 23.466667 0 42.666667 19.2 42.666667 42.666667C992 332.8 985.6 343.466667 977.066667 352zM522.666667 256c-70.4 0-128-57.6-128-128 0-70.4 57.6-128 128-128s128 57.6 128 128C650.666667 198.4 593.066667 256 522.666667 256zM522.666667 85.333333c-23.466667 0-42.666667 19.2-42.666667 42.666667s19.2 42.666667 42.666667 42.666667 42.666667-19.2 42.666667-42.666667S546.133333 85.333333 522.666667 85.333333zM396.8 539.733333l234.666667 149.333333 0 0c12.8 8.533333 19.2 21.333333 19.2 36.266667 0 21.333333-17.066667 40.533333-38.4 42.666667l0 0-179.2 19.2L166.4 1013.333333l0 0C157.866667 1019.733333 149.333333 1024 138.666667 1024c-23.466667 0-42.666667-19.2-42.666667-42.666667 0-8.533333 2.133333-14.933333 6.4-21.333333l0 0 234.666667-405.333333 0 0c6.4-12.8 21.333333-21.333333 36.266667-21.333333C381.866667 533.333333 390.4 535.466667 396.8 539.733333L396.8 539.733333zM298.666667 789.333333l89.6-76.8 0 0c6.4-4.266667 14.933333-8.533333 23.466667-8.533333l0 0 72.533333-8.533333-96-59.733333L298.666667 789.333333zM302.933333 360.533333 302.933333 360.533333 138.666667 426.666667l78.933333 128 0 0c4.266667 6.4 6.4 14.933333 6.4 23.466667 0 23.466667-19.2 42.666667-42.666667 42.666667-14.933333 0-27.733333-8.533333-36.266667-19.2l0 0-106.666667-170.666667 0 0c-4.266667-6.4-6.4-14.933333-6.4-23.466667 0-17.066667 10.666667-34.133333 27.733333-40.533333l0 0 213.333333-85.333333c0 0 0 0 0 0l0 0 0 0c4.266667-2.133333 10.666667-2.133333 14.933333-2.133333 23.466667 0 42.666667 19.2 42.666667 42.666667C330.666667 337.066667 320 354.133333 302.933333 360.533333z" p-id="1315"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/running.svg b/src/assets/icons/svg/running.svg
deleted file mode 100644
index 59c5873..0000000
--- a/src/assets/icons/svg/running.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" class="icon" p-id="1499" t="1555466208830" version="1.1" viewBox="0 0 1024 1024"><defs><style type="text/css"/></defs><path fill="#8a8a8a" d="M640 192c53.02 0 96-42.98 96-96S693.02 0 640 0s-96 42.98-96 96 42.98 96 96 96zM323.38 634.94l-29.6 69.04H160c-35.34 0-64 28.66-64 64s28.66 64 64 64h154.9c38.5 0 73.16-22.88 88.22-58.18l17.58-41.04-21.34-12.6c-34.64-20.46-60.12-50.74-75.98-85.22zM864 447.98h-88.06l-52.12-106.5c-25-51.1-70.9-88.46-123.56-101.88l-142.16-42.28c-56.6-13.6-115.54-1.1-161.68 34.28l-79.34 60.82c-28.06 21.5-33.38 61.66-11.84 89.72s61.68 33.32 89.72 11.84l79.38-60.82c15.34-11.78 34.88-16 50.54-12.28l29.4 8.74-74.92 174.78c-25.24 58.96-2.62 128.02 52.6 160.62l169.96 100.34-54.94 175.46c-10.56 33.72 8.22 69.62 41.94 80.18 6.38 2 12.82 2.96 19.16 2.96 27.22 0 52.46-17.54 61.04-44.9l63.28-202.12c11.82-41.54-5.78-86.16-43.28-108.78l-122.48-72.28 62.62-156.56 40.54 82.86c16 32.68 49.84 53.78 86.22 53.78H864c35.34 0 64-28.66 64-64s-28.66-63.98-64-63.98z" p-id="1500"/></svg>
\ No newline at end of file
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 373743d..8cb5419 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -16,6 +16,7 @@
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="userName" label="用户名" />
+      <el-table-column prop="nickName" label="用户昵称" />
       <el-table-column prop="job" label="岗位" />
       <el-table-column prop="ip" label="登录IP" />
       <el-table-column :show-overflow-tooltip="true" prop="address" label="登录地点" />
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index 2b62df7..cf0b482 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -20,11 +20,11 @@
               </el-upload>
             </div>
             <ul class="user-info">
-              <li><svg-icon icon-class="user1" /> 用户名称 <div class="user-right">{{ user.username }}</div></li>
+              <li><div style="height: 100%"><svg-icon icon-class="login" /> 登录账号<div class="user-right">{{ user.username }}</div></div></li>
+              <li><svg-icon icon-class="user1" /> 用户昵称 <div class="user-right">{{ user.nickName }}</div></li>
               <li><svg-icon icon-class="phone" /> 手机号码 <div class="user-right">{{ user.phone }}</div></li>
               <li><svg-icon icon-class="email" /> 用户邮箱 <div class="user-right">{{ user.email }}</div></li>
               <li><svg-icon icon-class="dept" /> 所属部门 <div class="user-right"> {{ user.dept }} / {{ user.job }}</div></li>
-              <li><svg-icon icon-class="date" /> 创建日期 <div class="user-right">{{ parseTime(user.createTime) }}</div></li>
               <li>
                 <svg-icon icon-class="anq" /> 安全设置
                 <div class="user-right">
@@ -36,42 +36,67 @@
           </div>
         </el-card>
       </el-col>
-      <!-- 用户日志 -->
       <el-col :xs="24" :sm="24" :md="16" :lg="18" :xl="19">
+        <!--    用户资料    -->
         <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>操作日志</span>
-            <div style="display:inline-block;float: right;cursor: pointer" @click="refresh"><i :class="ico" /></div>
-          </div>
-          <div>
-            <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-              <el-table-column prop="description" label="行为" />
-              <el-table-column prop="requestIp" label="IP" />
-              <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
-              <el-table-column prop="browser" label="浏览器" />
-              <el-table-column prop="time" label="请求耗时" align="center">
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
-                  <el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
-                  <el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column prop="createTime" label="创建日期" width="180px">
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
-            <!--分页组件-->
-            <el-pagination
-              :total="total"
-              :current-page="page + 1"
-              style="margin-top: 8px;"
-              layout="total, prev, pager, next, sizes"
-              @size-change="sizeChange"
-              @current-change="pageChange"
-            />
-          </div>
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="用户资料" name="first">
+              <el-form ref="form" :model="form" :rules="rules" style="margin-top: 10px;" size="small" label-width="65px">
+                <el-form-item label="昵称" prop="nickName">
+                  <el-input v-model="form.nickName" style="width: 35%" />
+                  <span style="color: #C0C0C0;margin-left: 10px;">用户昵称不作为登录使用</span>
+                </el-form-item>
+                <el-form-item label="手机号" prop="phone">
+                  <el-input v-model="form.phone" style="width: 35%;" />
+                  <span style="color: #C0C0C0;margin-left: 10px;">手机号码不能重复</span>
+                </el-form-item>
+                <el-form-item label="性别">
+                  <el-radio-group v-model="form.sex" style="width: 178px">
+                    <el-radio label="男">男</el-radio>
+                    <el-radio label="女">女</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="">
+                  <el-button :loading="saveLoading" size="mini" type="primary" @click="doSubmit">保存配置</el-button>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <!--    操作日志    -->
+            <el-tab-pane label="操作日志" name="second">
+              <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+                <el-table-column prop="description" label="行为" />
+                <el-table-column prop="requestIp" label="IP" />
+                <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
+                <el-table-column prop="browser" label="浏览器" />
+                <el-table-column prop="time" label="请求耗时" align="center">
+                  <template slot-scope="scope">
+                    <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
+                    <el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
+                    <el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  align="right"
+                >
+                  <template slot="header">
+                    <div style="display:inline-block;float: right;cursor: pointer" @click="init">创建日期<i class="el-icon-refresh" style="margin-left: 40px" /></div>
+                  </template>
+                  <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <!--分页组件-->
+              <el-pagination
+                :total="total"
+                :current-page="page + 1"
+                style="margin-top: 8px;"
+                layout="total, prev, pager, next, sizes"
+                @size-change="sizeChange"
+                @current-change="pageChange"
+              />
+            </el-tab-pane>
+          </el-tabs>
         </el-card>
       </el-col>
     </el-row>
@@ -82,24 +107,46 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import { regEmail } from '@/utils/index'
 import updatePass from './center/updatePass'
 import updateEmail from './center/updateEmail'
 import { getToken } from '@/utils/auth'
 import store from '@/store'
+import { isvalidPhone } from '@/utils/validate'
 import { parseTime } from '@/utils/index'
 import crud from '@/mixins/crud'
+import { editUser } from '@/api/system/user'
 import Avatar from '@/assets/images/avatar.png'
 export default {
   name: 'Center',
   components: { updatePass, updateEmail },
   mixins: [crud],
   data() {
+    // 自定义验证
+    const validPhone = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入电话号码'))
+      } else if (!isvalidPhone(value)) {
+        callback(new Error('请输入正确的11位手机号码'))
+      } else {
+        callback()
+      }
+    }
     return {
       Avatar: Avatar,
-      ico: 'el-icon-refresh',
+      activeName: 'first',
+      saveLoading: false,
       headers: {
         'Authorization': getToken()
+      },
+      form: {},
+      rules: {
+        nickName: [
+          { required: true, message: '请输入用户昵称', trigger: 'blur' },
+          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, trigger: 'blur', validator: validPhone }
+        ]
       }
     }
   },
@@ -111,15 +158,15 @@ export default {
     ])
   },
   created() {
-    this.$nextTick(() => {
-      this.init()
-    })
+    this.form = { id: this.user.id, nickName: this.user.nickName, sex: this.user.sex, phone: this.user.phone }
     store.dispatch('GetInfo').then(() => {})
   },
   methods: {
     parseTime,
-    formatEmail(mail) {
-      return regEmail(mail)
+    handleClick(tab, event) {
+      if (tab.name === 'second') {
+        this.init()
+      }
     },
     beforeInit() {
       this.url = 'api/logs/user'
@@ -142,13 +189,21 @@ export default {
         duration: 2500
       })
     },
-    // 刷新日志
-    refresh() {
-      this.ico = 'el-icon-loading'
-      this.init()
-      setTimeout(() => {
-        this.ico = 'el-icon-refresh'
-      }, 300)
+    doSubmit() {
+      if (this.$refs['form']) {
+        this.$refs['form'].validate((valid) => {
+          if (valid) {
+            this.saveLoading = true
+            editUser(this.form).then(() => {
+              this.editSuccessNotify()
+              store.dispatch('GetInfo').then(() => {})
+              this.saveLoading = false
+            }).catch(() => {
+              this.saveLoading = false
+            })
+          }
+        })
+      }
     }
   }
 }
@@ -170,12 +225,11 @@ export default {
     border-radius: 50%
   }
   .user-info {
-    padding-left: 0px;
+    padding-left: 0;
     list-style: none;
     li{
       border-bottom: 1px solid #F0F3F4;
-      border-top: 1px solid #F0F3F4;
-      padding: 11px 0px;
+      padding: 11px 0;
       font-size: 13px;
     }
     .user-right {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 86f4d45..d928a8b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -53,20 +53,20 @@
             <el-form-item label="用户名" prop="username">
               <el-input v-model="form.username" />
             </el-form-item>
-            <el-form-item label="状态" prop="enabled">
-              <el-radio v-for="item in dict.user_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
-            </el-form-item>
             <el-form-item label="电话" prop="phone">
               <el-input v-model.number="form.phone" />
             </el-form-item>
+            <el-form-item label="昵称" prop="nickName">
+              <el-input v-model="form.nickName" />
+            </el-form-item>
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" style="width: 191px" />
+              <el-input v-model="form.email" />
             </el-form-item>
             <el-form-item label="部门" prop="dept.id">
               <treeselect v-model="form.dept.id" :options="depts" style="width: 178px" placeholder="选择部门" @select="selectFun" />
             </el-form-item>
             <el-form-item label="岗位" prop="job.id">
-              <el-select v-model="form.job.id" placeholder="请先选择部门">
+              <el-select v-model="form.job.id" style="width: 178px" placeholder="请先选择部门">
                 <el-option
                   v-for="(item, index) in jobs"
                   :key="item.name + index"
@@ -75,8 +75,19 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="性别">
+              <el-radio-group v-model="form.sex" style="width: 178px">
+                <el-radio label="男">男</el-radio>
+                <el-radio label="女">女</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.enabled">
+                <el-radio v-for="item in dict.user_status" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
             <el-form-item style="margin-bottom: 0;" label="角色" prop="roles">
-              <el-select v-model="form.roles" style="width: 450px;" multiple placeholder="请选择">
+              <el-select v-model="form.roles" style="width: 437px" multiple placeholder="请选择">
                 <el-option
                   v-for="item in roles"
                   :key="item.name"
@@ -94,10 +105,12 @@
         </el-dialog>
         <!--表格渲染-->
         <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-          <el-table-column prop="username" label="用户名" />
-          <el-table-column prop="phone" label="电话" />
-          <el-table-column :show-overflow-tooltip="true" prop="email" label="邮箱" />
-          <el-table-column label="部门 / 岗位">
+          <el-table-column :show-overflow-tooltip="true" prop="username" label="用户名" />
+          <el-table-column :show-overflow-tooltip="true" prop="nickName" label="昵称" />
+          <el-table-column prop="sex" label="性别" />
+          <el-table-column :show-overflow-tooltip="true" prop="phone" width="120" label="电话" />
+          <el-table-column :show-overflow-tooltip="true" width="135" prop="email" label="邮箱" />
+          <el-table-column :show-overflow-tooltip="true" width="120" label="部门 / 岗位">
             <template slot-scope="scope">
               <div>{{ scope.row.dept.name }} / {{ scope.row.job.name }}</div>
             </template>
@@ -112,7 +125,7 @@
               />
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
+          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="150" label="创建日期">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -188,21 +201,22 @@ export default {
         { key: 'true', display_name: '激活' },
         { key: 'false', display_name: '锁定' }
       ],
-      form: { username: null, email: null, enabled: 'false', roles: [], job: { id: null }, dept: { id: null }, phone: null },
+      form: { username: null, nickName: null, sex: '男', email: null, enabled: 'false', roles: [], job: { id: null }, dept: { id: null }, phone: null },
       rules: {
         username: [
           { required: true, message: '请输入用户名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
+        nickName: [
+          { required: true, message: '请输入用户昵称', trigger: 'blur' },
+          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+        ],
         email: [
           { required: true, message: '请输入邮箱地址', trigger: 'blur' },
           { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }
         ],
         phone: [
           { required: true, trigger: 'blur', validator: validPhone }
-        ],
-        enabled: [
-          { required: true, message: '状态不能为空', trigger: 'blur' }
         ]
       }
     }

From bfdb12869ea10e521fae52d3c090ee04113a04a4 Mon Sep 17 00:00:00 2001
From: "zhy6599@163.com" <zhy6599@163.com>
Date: Sun, 1 Dec 2019 16:03:51 +0800
Subject: [PATCH 39/64] =?UTF-8?q?=E5=9B=BE=E5=BD=A2=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=AF=8D=E4=BA=91=E5=9B=BE=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                         |   7 +-
 src/components/Echarts/WordCloud.vue | 192 +++++++++++++++++++++++++++
 src/views/components/Echarts.vue     |   9 +-
 3 files changed, 204 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 6ebca5b..2cf4532 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "connect": "3.6.6",
     "echarts": "4.2.1",
     "echarts-gl": "^1.1.1",
+    "echarts-wordcloud": "^1.1.3",
     "element-ui": "^2.12.0",
     "file-saver": "1.3.8",
     "fuse.js": "3.4.4",
@@ -55,12 +56,12 @@
     "vue": "2.6.10",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.4.9",
+    "vue-highlightjs": "^1.3.3",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
     "vuex": "3.1.0",
     "wangeditor": ">=3.0.0",
-    "xlsx": "^0.11.16",
-    "vue-highlightjs": "^1.3.3"
+    "xlsx": "^0.11.16"
   },
   "devDependencies": {
     "@babel/core": "7.0.0",
@@ -83,7 +84,7 @@
     "html-webpack-plugin": "3.2.0",
     "husky": "1.3.1",
     "lint-staged": "8.1.5",
-    "node-sass": "^4.9.0",
+    "node-sass": "^4.13.0",
     "plop": "2.3.0",
     "runjs": "^4.3.2",
     "sass-loader": "^7.1.0",
diff --git a/src/components/Echarts/WordCloud.vue b/src/components/Echarts/WordCloud.vue
index e69de29..415f2a8 100644
--- a/src/components/Echarts/WordCloud.vue
+++ b/src/components/Echarts/WordCloud.vue
@@ -0,0 +1,192 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts-wordcloud')
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHandler)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHandler)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      const data = [{
+        'name': '花鸟市场',
+        'value': 1446
+      },
+      {
+        'name': '汽车',
+        'value': 928
+      },
+      {
+        'name': '视频',
+        'value': 906
+      },
+      {
+        'name': '电视',
+        'value': 825
+      },
+      {
+        'name': 'Lover Boy',
+        'value': 514
+      },
+      {
+        'name': '动漫',
+        'value': 486
+      },
+      {
+        'name': '音乐',
+        'value': 53
+      },
+      {
+        'name': '直播',
+        'value': 163
+      },
+      {
+        'name': '广播电台',
+        'value': 86
+      },
+      {
+        'name': '戏曲曲艺',
+        'value': 17
+      },
+      {
+        'name': '演出票务',
+        'value': 6
+      },
+      {
+        'name': '给陌生的你听',
+        'value': 1
+      },
+      {
+        'name': '资讯',
+        'value': 1437
+      },
+      {
+        'name': '商业财经',
+        'value': 422
+      },
+      {
+        'name': '娱乐八卦',
+        'value': 353
+      },
+      {
+        'name': '军事',
+        'value': 331
+      },
+      {
+        'name': '科技资讯',
+        'value': 313
+      },
+      {
+        'name': '社会时政',
+        'value': 307
+      },
+      {
+        'name': '时尚',
+        'value': 43
+      },
+      {
+        'name': '网络奇闻',
+        'value': 15
+      },
+      {
+        'name': '旅游出行',
+        'value': 438
+      },
+      {
+        'name': '景点类型',
+        'value': 957
+      },
+      {
+        'name': '国内游',
+        'value': 927
+      },
+      {
+        'name': '远途出行方式',
+        'value': 908
+      },
+      {
+        'name': '酒店',
+        'value': 693
+      },
+      {
+        'name': '关注景点',
+        'value': 611
+      },
+      {
+        'name': '旅游网站偏好',
+        'value': 512
+      },
+      {
+        'name': '出国游',
+        'value': 382
+      }]
+      this.chart.setOption({
+        backgroundColor: '#fff',
+        tooltip: {
+          show: false
+        },
+        series: [{
+          type: 'wordCloud',
+          gridSize: 1,
+          sizeRange: [12, 55],
+          rotationRange: [-45, 0, 45, 90],
+          textStyle: {
+            normal: {
+              color: function() {
+                return 'rgb(' +
+                  Math.round(Math.random() * 255) +
+                  ', ' + Math.round(Math.random() * 255) +
+                  ', ' + Math.round(Math.random() * 255) + ')'
+              }
+            }
+          },
+          left: 'center',
+          top: 'center',
+          right: null,
+          bottom: null,
+          data: data
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/components/Echarts.vue b/src/views/components/Echarts.vue
index d6b10f6..d70a8a3 100644
--- a/src/views/components/Echarts.vue
+++ b/src/views/components/Echarts.vue
@@ -62,6 +62,11 @@
           </div>
         </el-col>
       </el-row>
+      <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+        <div class="chart-wrapper">
+          <word-cloud />
+        </div>
+      </el-row>
       <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
         <div class="chart-wrapper">
           <category />
@@ -84,6 +89,7 @@ import Scatter from '@/components/Echarts/Scatter'
 import Line3D from '@/components/Echarts/Line3D'
 import Category from '@/components/Echarts/Category'
 import Point from '@/components/Echarts/Point'
+import WordCloud from '@/components/Echarts/WordCloud'
 
 export default {
   name: 'Echarts',
@@ -99,7 +105,8 @@ export default {
     ThemeRiver,
     Sankey,
     Line3D,
-    Scatter
+    Scatter,
+    WordCloud
   }
 }
 </script>

From 48113c84c865e9fb3ca5a5bcf4e387b1019e8a6c Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 1 Dec 2019 18:12:14 +0800
Subject: [PATCH 40/64] =?UTF-8?q?=E5=89=8D=E7=AB=AFrsa=E5=85=AC=E9=92=A5?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86=E4=BC=A0=E8=BE=93=E7=99=BB=E5=BD=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=90=8E=E7=AB=AFrsa=E7=A7=81=E9=92=A5?=
 =?UTF-8?q?=E8=A7=A3=E5=AF=86=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6a19860..beb351a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,6 +1,5 @@
 import { login, getInfo, logout } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-import { decrypt } from '@/utils/rsaEncrypt'
 
 const user = {
   state: {
@@ -29,13 +28,9 @@ const user = {
   actions: {
     // 登录
     Login({ commit }, userInfo) {
-      const username = userInfo.username
-      const password = decrypt(userInfo.password)
-      const code = userInfo.code
-      const uuid = userInfo.uuid
       const rememberMe = userInfo.rememberMe
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
+        login(userInfo.username, userInfo.password, userInfo.code, userInfo.uuid).then(res => {
           setToken(res.token, rememberMe)
           commit('SET_TOKEN', res.token)
           setUserInfo(res.user, commit)
@@ -59,7 +54,6 @@ const user = {
         })
       })
     },
-
     // 登出
     LogOut({ commit }) {
       return new Promise((resolve, reject) => {

From bb6389d102f428846e358afd81d36a51f6b58cb3 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 1 Dec 2019 20:34:38 +0800
Subject: [PATCH 41/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js                       | 13 +++++++++----
 src/views/system/user/center/updateEmail.vue |  3 +--
 src/views/system/user/index.vue              |  7 +++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 45b2f1d..1e4bf6f 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { encrypt } from '@/utils/rsaEncrypt'
 
 export function add(data) {
   return request({
@@ -33,8 +34,8 @@ export function editUser(data) {
 
 export function updatePass(user) {
   const data = {
-    oldPass: user.oldPass,
-    newPass: user.newPass
+    oldPass: encrypt(user.oldPass),
+    newPass: encrypt(user.newPass)
   }
   return request({
     url: 'api/users/updatePass/',
@@ -43,9 +44,13 @@ export function updatePass(user) {
   })
 }
 
-export function updateEmail(code, data) {
+export function updateEmail(form) {
+  const data = {
+    password: encrypt(form.pass),
+    email: form.email
+  }
   return request({
-    url: 'api/users/updateEmail/' + code,
+    url: 'api/users/updateEmail/' + form.code,
     method: 'post',
     data
   })
diff --git a/src/views/system/user/center/updateEmail.vue b/src/views/system/user/center/updateEmail.vue
index 2e0478f..76b80ee 100644
--- a/src/views/system/user/center/updateEmail.vue
+++ b/src/views/system/user/center/updateEmail.vue
@@ -103,8 +103,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
-          this.user = { email: this.form.email, password: this.form.pass }
-          updateEmail(this.form.code, this.user).then(res => {
+          updateEmail(this.form).then(res => {
             this.loading = false
             this.resetForm()
             this.$notify({
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d928a8b..691b652 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -347,6 +347,13 @@ export default {
       getLevel().then(res => {
         this.level = res.level
       }).catch(() => {})
+    },
+    addSuccessNotify() {
+      this.$notify({
+        title: '新增成功，默认密码：123456',
+        type: 'success',
+        duration: 2500
+      })
     }
   }
 }

From ee3f478dc780322458699c5f640daffa849c8dfc Mon Sep 17 00:00:00 2001
From: "zhy6599@163.com" <zhy6599@163.com>
Date: Sun, 1 Dec 2019 22:13:03 +0800
Subject: [PATCH 42/64] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=93=BE=E6=8E=A5=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mnt/connect.js           | 17 +++++++++++++++++
 src/api/mnt/database.js          | 10 +++++++++-
 src/api/mnt/serverDeploy.js      |  8 --------
 src/views/mnt/database/index.vue | 24 +++++++++++++++++++++---
 src/views/mnt/server/index.vue   |  5 +++--
 5 files changed, 50 insertions(+), 14 deletions(-)
 create mode 100644 src/api/mnt/connect.js

diff --git a/src/api/mnt/connect.js b/src/api/mnt/connect.js
new file mode 100644
index 0000000..1bbe90b
--- /dev/null
+++ b/src/api/mnt/connect.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function testDbConnect(data) {
+  return request({
+    url: 'api/database/testConnect',
+    method: 'post',
+    data
+  })
+}
+
+export function testServerConnect(data) {
+  return request({
+    url: 'api/serverDeploy/testConnect',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/mnt/database.js b/src/api/mnt/database.js
index 084a74d..b25a8a8 100644
--- a/src/api/mnt/database.js
+++ b/src/api/mnt/database.js
@@ -23,4 +23,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function testDbConnection(data) {
+  return request({
+    url: 'api/database/testConnect',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, testDbConnection }
diff --git a/src/api/mnt/serverDeploy.js b/src/api/mnt/serverDeploy.js
index d2eb944..29fb6bb 100644
--- a/src/api/mnt/serverDeploy.js
+++ b/src/api/mnt/serverDeploy.js
@@ -23,12 +23,4 @@ export function edit(data) {
   })
 }
 
-export function testConnect(data) {
-  return request({
-    url: 'api/serverDeploy/testConnect',
-    method: 'post',
-    data
-  })
-}
-
 export default { add, edit, del }
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 26c93c5..7c44465 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -22,7 +22,7 @@
           <el-input v-model="form.name" style="width: 370px" />
         </el-form-item>
         <el-form-item label="连接地址" prop="jdbcUrl">
-          <el-input v-model="form.jdbcUrl" style="width: 370px" />
+          <el-input v-model="form.jdbcUrl" style="width: 300px" /><el-button :loading="loading" type="info" @click="testConnectDatabase">测试</el-button>
         </el-form-item>
         <el-form-item label="用户名" prop="userName">
           <el-input v-model="form.userName" style="width: 370px" />
@@ -74,13 +74,14 @@
 
 <script>
 import crud from '@/mixins/crud'
-import crudDataBase from '@/api//mnt/database'
+import crudDatabase from '@/api/mnt/database'
+import { testDbConnect } from '@/api/mnt/connect'
 export default {
   mixins: [crud],
   data() {
     return {
       title: '数据库',
-      crudMethod: { ...crudDataBase },
+      crudMethod: { ...crudDatabase },
       form: { id: null, name: null, jdbcUrl: null, userName: null, pwd: null },
       rules: {
         name: [
@@ -107,6 +108,23 @@ export default {
     beforeInit() {
       this.url = 'api/database'
       return true
+    },
+    testConnectDatabase() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          testDbConnect(this.form).then((res) => {
+            this.loading = false
+            this.$notify({
+              title: res ? '连接成功' : '连接失败',
+              type: res ? 'success' : 'error',
+              duration: 2500
+            })
+          }).catch(() => {
+            this.loading = false
+          })
+        }
+      })
     }
   }
 }
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
index d7a68d4..b9bcf1c 100644
--- a/src/views/mnt/server/index.vue
+++ b/src/views/mnt/server/index.vue
@@ -96,7 +96,8 @@
 
 <script>
 import crud from '@/mixins/crud'
-import { crudServer, testConnect } from '@/api/mnt/serverDeploy'
+import crudServer from '@/api/mnt/serverDeploy'
+import { testServerConnect } from '@/api/mnt/connect'
 import { validateIP } from '@/utils/validate'
 export default {
   mixins: [crud],
@@ -141,7 +142,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
-          testConnect(this.form).then((res) => {
+          testServerConnect(this.form).then((res) => {
             this.loading = false
             this.$notify({
               title: res ? '连接成功' : '连接失败',

From 1ff0492d3c69b73b0aeb8e7b0ad82ee75c2fd752 Mon Sep 17 00:00:00 2001
From: "zhy6599@163.com" <zhy6599@163.com>
Date: Sun, 1 Dec 2019 22:18:23 +0800
Subject: [PATCH 43/64] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=88=97=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mnt/database/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 7c44465..9bb53cb 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -38,9 +38,9 @@
     </el-dialog>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
-      <el-table-column prop="name" label="数据库名称" />
+      <el-table-column prop="name" label="数据库名称" width="180" />
       <el-table-column prop="jdbcUrl" label="连接地址" />
-      <el-table-column prop="userName" label="用户名" />
+      <el-table-column prop="userName" label="用户名" width="100" />
       <el-table-column v-if="checkPermission(['admin','database:edit','database:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <el-button v-permission="['admin','database:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />

From 4845d4169930901b3adbc07d0f8f499a478ce77c Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Mon, 2 Dec 2019 13:02:10 +0800
Subject: [PATCH 44/64] update table size

---
 src/main.js                             | 2 +-
 src/views/generator/index.vue           | 2 +-
 src/views/mnt/app/index.vue             | 2 +-
 src/views/mnt/database/index.vue        | 2 +-
 src/views/mnt/deploy/index.vue          | 2 +-
 src/views/mnt/deploy/sysRestore.vue     | 2 +-
 src/views/mnt/deployHistory/index.vue   | 2 +-
 src/views/mnt/server/index.vue          | 2 +-
 src/views/monitor/log/errorLog.vue      | 2 +-
 src/views/monitor/log/index.vue         | 2 +-
 src/views/monitor/online/index.vue      | 2 +-
 src/views/monitor/server/index.vue      | 2 +-
 src/views/system/dict/dictDetail.vue    | 2 +-
 src/views/system/job/index.vue          | 2 +-
 src/views/system/role/index.vue         | 2 +-
 src/views/system/timing/index.vue       | 2 +-
 src/views/system/timing/log.vue         | 2 +-
 src/views/system/user/center.vue        | 2 +-
 src/views/system/user/index.vue         | 2 +-
 src/views/tools/picture/index.vue       | 2 +-
 src/views/tools/storage/local/index.vue | 2 +-
 src/views/tools/storage/qiniu/index.vue | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main.js b/src/main.js
index a0bd192..f785423 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,7 +34,7 @@ Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(dict)
 Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
+  size: Cookies.get('size') || 'small' // set element-ui default size
 })
 
 Vue.config.productionTip = false
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index 4c31ea6..f678c91 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -6,7 +6,7 @@
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
     </div>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+    <el-table v-loading="loading" :data="data" style="width: 100%;">
       <el-table-column label="序号" width="85" align="center">
         <template slot-scope="scope">
           <div>{{ scope.$index + 1 }}</div>
diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
index 9c99717..17e5076 100644
--- a/src/views/mnt/app/index.vue
+++ b/src/views/mnt/app/index.vue
@@ -66,7 +66,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" highlight-current-row size="small" style="width: 100%" @current-change="handleCurrentChange">
+    <el-table v-loading="loading" :data="data" highlight-current-row style="width: 100%" @current-change="handleCurrentChange">
       <el-table-column prop="name" label="应用名称" />
       <el-table-column prop="port" label="端口号" />
       <el-table-column prop="uploadPath" label="上传目录" />
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 26c93c5..c4bbdb7 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -37,7 +37,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
+    <el-table v-loading="loading" :data="data" style="width: 100%">
       <el-table-column prop="name" label="数据库名称" />
       <el-table-column prop="jdbcUrl" label="连接地址" />
       <el-table-column prop="userName" label="用户名" />
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
index edc7783..b37d4d4 100644
--- a/src/views/mnt/deploy/index.vue
+++ b/src/views/mnt/deploy/index.vue
@@ -95,7 +95,7 @@
     <fForm ref="sysRestore" :key="times" :app-name="appName" />
     <dForm ref="deploy" />
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" highlight-current-row stripe size="small" style="width: 100%" @current-change="handleCurrentChange">
+    <el-table v-loading="loading" :data="data" highlight-current-row stripe style="width: 100%" @current-change="handleCurrentChange">
       <el-table-column prop="app.name" label="应用名称" />
       <el-table-column prop="servers" label="服务器列表" />
       <el-table-column prop="createTime" label="创建日期">
diff --git a/src/views/mnt/deploy/sysRestore.vue b/src/views/mnt/deploy/sysRestore.vue
index 87df671..cb80a3a 100644
--- a/src/views/mnt/deploy/sysRestore.vue
+++ b/src/views/mnt/deploy/sysRestore.vue
@@ -17,7 +17,7 @@
     </div>
     <el-form size="small" label-width="80px">
       <!--表格渲染-->
-      <el-table v-loading="loading" :data="data" size="small" style="width: 100%" @row-click="showRow">
+      <el-table v-loading="loading" :data="data" style="width: 100%" @row-click="showRow">
         <el-table-column width="30px">
           <template slot-scope="scope">
             <el-radio v-model="radio" :label="scope.$index" />
diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue
index ceaeecc..de40997 100644
--- a/src/views/mnt/deployHistory/index.vue
+++ b/src/views/mnt/deployHistory/index.vue
@@ -7,7 +7,7 @@
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
     </div>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
+    <el-table v-loading="loading" :data="data" style="width: 100%">
       <el-table-column prop="appName" label="应用名称" />
       <el-table-column prop="ip" label="部署IP" />
       <el-table-column prop="deployDate" label="部署时间" />
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
index d7a68d4..59e76cf 100644
--- a/src/views/mnt/server/index.vue
+++ b/src/views/mnt/server/index.vue
@@ -53,7 +53,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
+    <el-table v-loading="loading" :data="data" style="width: 100%">
       <el-table-column prop="name" label="名称" />
       <el-table-column prop="ip" label="IP" />
       <el-table-column prop="port" label="端口" />
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index 506c441..9b8c4d7 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <Search :query="query" />
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+    <el-table v-loading="loading" :data="data" style="width: 100%;">
       <el-table-column type="expand">
         <template slot-scope="props">
           <el-form label-position="left" inline class="demo-table-expand">
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index bbc6411..de6140e 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <Search :query="query" />
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+    <el-table v-loading="loading" :data="data" style="width: 100%;">
       <el-table-column type="expand">
         <template slot-scope="props">
           <el-form label-position="left" inline class="demo-table-expand">
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 8cb5419..3c12b72 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -14,7 +14,7 @@
       >导出</el-button>
     </div>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+    <el-table v-loading="loading" :data="data" style="width: 100%;">
       <el-table-column prop="userName" label="用户名" />
       <el-table-column prop="nickName" label="用户昵称" />
       <el-table-column prop="job" label="岗位" />
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 6e0b238..7bd5893 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -47,7 +47,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+    <el-table v-loading="loading" :data="data" style="width: 100%;">
       <el-table-column label="状态" width="50px">
         <template slot-scope="scope">
           <el-tag
diff --git a/src/views/system/dict/dictDetail.vue b/src/views/system/dict/dictDetail.vue
index 0cbf6dc..bf5872c 100644
--- a/src/views/system/dict/dictDetail.vue
+++ b/src/views/system/dict/dictDetail.vue
@@ -29,7 +29,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table v-loading="loading" :data="data" style="width: 100%;">
         <el-table-column label="所属字典">
           {{ dictName }}
         </el-table-column>
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index e67442c..f1b2a95 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -60,7 +60,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+    <el-table v-loading="loading" :data="data" style="width: 100%;">
       <el-table-column prop="name" label="名称" />
       <el-table-column label="所属部门">
         <template slot-scope="scope">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index e579ea3..183d434 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -75,7 +75,7 @@
           <div slot="header" class="clearfix">
             <span class="role-span">角色列表</span>
           </div>
-          <el-table v-loading="loading" :data="data" highlight-current-row size="small" style="width: 100%;" @current-change="handleCurrentChange">
+          <el-table v-loading="loading" :data="data" highlight-current-row style="width: 100%;" @current-change="handleCurrentChange">
             <el-table-column prop="name" label="名称" />
             <el-table-column prop="dataScope" label="数据权限" />
             <el-table-column prop="permission" label="角色权限" />
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index 9c24b9a..fb24a07 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -75,7 +75,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+    <el-table v-loading="loading" :data="data" style="width: 100%;">
       <el-table-column :show-overflow-tooltip="true" prop="jobName" width="100px" label="任务名称" />
       <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称" />
       <el-table-column :show-overflow-tooltip="true" prop="methodName" width="90px" label="执行方法" />
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
index d29d866..d9194dd 100644
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -31,7 +31,7 @@
       </div>
     </div>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;margin-top: -10px;">
+    <el-table v-loading="loading" :data="data" style="width: 100%;margin-top: -10px;">
       <el-table-column :show-overflow-tooltip="true" prop="jobName" label="任务名称" />
       <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称" />
       <el-table-column :show-overflow-tooltip="true" prop="methodName" label="执行方法" />
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index cf0b482..88dd76e 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -63,7 +63,7 @@
             </el-tab-pane>
             <!--    操作日志    -->
             <el-tab-pane label="操作日志" name="second">
-              <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+              <el-table v-loading="loading" :data="data" style="width: 100%;">
                 <el-table-column prop="description" label="行为" />
                 <el-table-column prop="requestIp" label="IP" />
                 <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 691b652..97014bc 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -104,7 +104,7 @@
           </div>
         </el-dialog>
         <!--表格渲染-->
-        <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+        <el-table v-loading="loading" :data="data" style="width: 100%;">
           <el-table-column :show-overflow-tooltip="true" prop="username" label="用户名" />
           <el-table-column :show-overflow-tooltip="true" prop="nickName" label="昵称" />
           <el-table-column prop="sex" label="性别" />
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index d71ccb6..fff5039 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -69,7 +69,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="loading" :data="data" size="small" style="width: 100%;">
+    <el-table ref="table" v-loading="loading" :data="data" style="width: 100%;">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="filename" label="文件名" />
       <el-table-column prop="username" label="上传者" />
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index 96f5a39..e2d1022 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -77,7 +77,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="loading" :data="data" size="small" style="width: 100%;">
+    <el-table ref="table" v-loading="loading" :data="data" style="width: 100%;">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="name" width="150px" label="文件名">
         <template slot-scope="scope">
diff --git a/src/views/tools/storage/qiniu/index.vue b/src/views/tools/storage/qiniu/index.vue
index 7adf83f..45b47c1 100644
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -69,7 +69,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table ref="table" v-loading="loading" :data="data" style="width: 100%;">
         <el-table-column type="selection" width="55" />
         <el-table-column :show-overflow-tooltip="true" label="文件名">
           <template slot-scope="scope">

From f1389237600bbea13836b1b12317dcd35fbd4e3d Mon Sep 17 00:00:00 2001
From: cai-peiyuan <37100059+cai-peiyuan@users.noreply.github.com>
Date: Fri, 6 Dec 2019 17:15:52 +0800
Subject: [PATCH 45/64] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=83=85=E5=86=B5=20(#53)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

判断时间格式化方法参数为空情况
---
 src/utils/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index 71bce1c..ab7ad30 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -14,7 +14,9 @@ export function parseTime(time, cFormat) {
   }
   const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
   let date
-  if (typeof time === 'object') {
+  if (typeof time === 'undefined' || time === null || time === 'null') {
+    return ''
+  } else if (typeof time === 'object') {
     date = time
   } else {
     if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
@@ -384,4 +386,3 @@ export function downloadFile(obj, name, suffix) {
   link.click()
   document.body.removeChild(link)
 }
-

From 4b14ba05d53716d3e9a84b7beabe22f7c2519dd8 Mon Sep 17 00:00:00 2001
From: zhanghouying <zhy6599@163.com>
Date: Mon, 9 Dec 2019 14:58:14 +0800
Subject: [PATCH 46/64] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=B8=8A=E4=BC=A0SQL?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E6=9D=A5=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/getters.js               |  1 +
 src/store/modules/api.js           |  2 +
 src/views/mnt/database/execute.vue | 86 ++++++++++++++++++++++++++++++
 src/views/mnt/database/index.vue   | 34 ++++++++++--
 4 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 src/views/mnt/database/execute.vue

diff --git a/src/store/getters.js b/src/store/getters.js
index 2e0d110..376e2a8 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,5 +1,6 @@
 const getters = {
   deployUploadApi: state => state.api.deployUploadApi,
+  databaseUploadApi: state => state.api.databaseUploadApi,
   size: state => state.app.size,
   sidebar: state => state.app.sidebar,
   device: state => state.app.device,
diff --git a/src/store/modules/api.js b/src/store/modules/api.js
index a4d10d3..92202f6 100644
--- a/src/store/modules/api.js
+++ b/src/store/modules/api.js
@@ -3,6 +3,8 @@ const api = {
   state: {
     // 部署包上传
     deployUploadApi: baseUrl + '/api/deploy/upload',
+    // SQL脚本上传
+    databaseUploadApi: baseUrl + '/api/database/upload',
     // 实时控制台
     socketApi: baseUrl + '/websocket?token=kl',
     // 图片上传
diff --git a/src/views/mnt/database/execute.vue b/src/views/mnt/database/execute.vue
new file mode 100644
index 0000000..4ada6be
--- /dev/null
+++ b/src/views/mnt/database/execute.vue
@@ -0,0 +1,86 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" title="执行脚本" width="400px">
+    <el-form ref="form" :rules="rules" size="small">
+      <el-upload
+        :action="databaseUploadApi"
+        :data="databaseInfo"
+        :headers="headers"
+        :on-success="handleSuccess"
+        :on-error="handleError"
+        class="upload-demo"
+        drag
+      >
+        <i class="el-icon-upload" />
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div slot="tip" class="el-upload__tip">上传后，系统会自动执行SQL脚本</div>
+      </el-upload>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="cancel">关闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { getToken } from '@/utils/auth'
+export default {
+  props: {
+    databaseInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      dialog: false,
+      headers: {
+        Authorization: 'Bearer ' + getToken()
+      },
+      rules: {}
+    }
+  },
+  computed: {
+    ...mapGetters(['databaseUploadApi'])
+  },
+  mounted() {
+  },
+  methods: {
+    cancel() {
+      this.dialog = false
+    },
+    handleSuccess(response, file, fileList) {
+      if (response === 'success') {
+        this.$notify({
+          title: '执行成功',
+          type: 'success',
+          duration: 2500
+        })
+      } else {
+        this.$notify({
+          title: response,
+          type: 'error',
+          duration: 0
+        })
+      }
+    },
+    handleError(e, file, fileList) {
+      const msg = JSON.parse(e.message)
+      this.$notify({
+        title: msg.message,
+        type: 'error',
+        duration: 0
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 9bb53cb..9e1d87b 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -13,16 +13,28 @@
         type="primary"
         icon="el-icon-plus"
         @click="showAddFormDialog"
-      >新增</el-button>
+      >新增
+      </el-button>
+      <el-button
+        v-permission="['admin','database:add']"
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload"
+        @click="execute"
+      >执行脚本
+      </el-button>
     </div>
     <!--表单组件-->
+    <eForm ref="execute" :database-info="currentRow" />
     <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="530px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="数据库名称" prop="name">
           <el-input v-model="form.name" style="width: 370px" />
         </el-form-item>
         <el-form-item label="连接地址" prop="jdbcUrl">
-          <el-input v-model="form.jdbcUrl" style="width: 300px" /><el-button :loading="loading" type="info" @click="testConnectDatabase">测试</el-button>
+          <el-input v-model="form.jdbcUrl" style="width: 300px" />
+          <el-button :loading="loading" type="info" @click="testConnectDatabase">测试</el-button>
         </el-form-item>
         <el-form-item label="用户名" prop="userName">
           <el-input v-model="form.userName" style="width: 370px" />
@@ -37,7 +49,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
+    <el-table v-loading="loading" :data="data" highlight-current-row stripe size="small" style="width: 100%" @current-change="handleCurrentChange">
       <el-table-column prop="name" label="数据库名称" width="180" />
       <el-table-column prop="jdbcUrl" label="连接地址" />
       <el-table-column prop="userName" label="用户名" width="100" />
@@ -76,12 +88,17 @@
 import crud from '@/mixins/crud'
 import crudDatabase from '@/api/mnt/database'
 import { testDbConnect } from '@/api/mnt/connect'
+import eForm from './execute'
 export default {
+  components: { eForm },
   mixins: [crud],
   data() {
     return {
       title: '数据库',
       crudMethod: { ...crudDatabase },
+      currentRow: {},
+      selectIndex: '',
+      databaseInfo: '',
       form: { id: null, name: null, jdbcUrl: null, userName: null, pwd: null },
       rules: {
         name: [
@@ -125,6 +142,17 @@ export default {
           })
         }
       })
+    },
+    execute() {
+      if (!this.selectIndex) {
+        this.$message.error('请先选择数据库')
+      } else {
+        this.$refs.execute.dialog = true
+      }
+    },
+    handleCurrentChange(row) {
+      this.currentRow = row
+      this.selectIndex = !row ? null : row.id
     }
   }
 }

From 54f04c82d1b6d82d2ad67d3041da25437c3507a3 Mon Sep 17 00:00:00 2001
From: zoulejiu <31949635+zoulejiu@users.noreply.github.com>
Date: Mon, 9 Dec 2019 16:57:53 +0800
Subject: [PATCH 47/64] =?UTF-8?q?2.4dev=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E9=94=99=E8=AF=AF=E5=92=8C=E6=96=B0=E5=A2=9E=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=B8=80=E9=94=AE=E6=B8=85=E7=A9=BA=EF=BC=8C=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E6=97=A5=E5=BF=97=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=20(#56)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 1.新增日志信息一键清空按钮

* 1.新增日志信息一键清空按钮

* 1.修复新增用户，编辑用户，角色在一次失败了，roles 传入后台格式错误问题
---
 src/api/monitor/log.js             |  14 +++
 src/mixins/crud.js                 |  26 +++--
 src/views/monitor/log/errorLog.vue |  75 +++++++++-----
 src/views/monitor/log/index.vue    |  58 ++++++++---
 src/views/monitor/log/search.vue   |  38 ++++++-
 src/views/system/user/index.vue    | 157 ++++++++++++++++++++++++-----
 6 files changed, 293 insertions(+), 75 deletions(-)

diff --git a/src/api/monitor/log.js b/src/api/monitor/log.js
index d776e7a..13f0d39 100644
--- a/src/api/monitor/log.js
+++ b/src/api/monitor/log.js
@@ -6,3 +6,17 @@ export function getErrDetail(id) {
     method: 'get'
   })
 }
+
+export function delAllError() {
+  return request({
+    url: 'api/logs/del/error',
+    method: 'delete'
+  })
+}
+
+export function delAllInfo() {
+  return request({
+    url: 'api/logs/del/info',
+    method: 'delete'
+  })
+}
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
index 551c6eb..0ccbde2 100644
--- a/src/mixins/crud.js
+++ b/src/mixins/crud.js
@@ -1,5 +1,11 @@
-import { initData, download } from '@/api/data'
-import { parseTime, downloadFile } from '@/utils/index'
+import {
+  initData,
+  download
+} from '@/api/data'
+import {
+  parseTime,
+  downloadFile
+} from '@/utils/index'
 import checkPermission from '@/utils/permission'
 
 export default {
@@ -168,8 +174,7 @@ export default {
         this.$refs[id].doClose()
       })
     },
-    afterDelMethod() {
-    },
+    afterDelMethod() {},
     /**
      * 多选删除提示
      */
@@ -208,8 +213,7 @@ export default {
     /**
      * 显示新增弹窗前可以调用该方法
      */
-    beforeShowAddForm() {
-    },
+    beforeShowAddForm() {},
     /**
      * 显示新增弹窗
      */
@@ -222,8 +226,7 @@ export default {
     /**
      * 显示编辑弹窗前可以调用该方法
      */
-    beforeShowEditForm(data) {
-    },
+    beforeShowEditForm(data) {},
     /**
      * 显示编辑弹窗
      */
@@ -248,12 +251,17 @@ export default {
         this.init()
       }).catch(() => {
         this.loading = false
+        this.afterAddErrorMethod()
       })
     },
     /**
      * 新增后可以调用该方法
      */
-    afterAddMethod() { },
+    afterAddMethod() {},
+    /**
+     * 新增失败后调用该方法
+     */
+    afterAddErrorMethod() {},
     /**
      * 通用的编辑方法
      */
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index 9b8c4d7..bb7965b 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -48,7 +48,7 @@
 
 <script>
 import crud from '@/mixins/crud'
-import { getErrDetail } from '@/api/monitor/log'
+import { getErrDetail, delAllError } from '@/api/monitor/log'
 import Search from './search'
 export default {
   name: 'ErrorLog',
@@ -77,34 +77,59 @@ export default {
       getErrDetail(id).then(res => {
         this.errorInfo = res.exception
       })
+    },
+    confirmDelAll() {
+      this.delAllLoading = true
+      delAllError().then(res => {
+        this.delAllLoading = false
+        this.$children.forEach(children => {
+          if (children.$refs.del_all) {
+            children.$refs.del_all.doClose()
+          }
+        })
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delAllLoading = false
+        this.$children.forEach(children => {
+          if (children.$refs.del_all) {
+            children.$refs.del_all.doClose()
+          }
+        })
+        console.log(err.response.data.message)
+      })
     }
   }
 }
 </script>
 
 <style scoped>
-  .demo-table-expand {
-    font-size: 0;
-  }
-  .demo-table-expand label {
-    width: 70px;
-    color: #99a9bf;
-  }
-  .demo-table-expand .el-form-item {
-    margin-right: 0;
-    margin-bottom: 0;
-    width: 100%;
-  }
-  .demo-table-expand .el-form-item__content {
-    font-size: 12px;
-
-  }
-  /deep/ .el-dialog__body{
-    padding: 0 20px 10px 20px !important;
-  }
-  .java.hljs{
-    color: #444;
-    background: #ffffff !important;
-    height: 630px !important;
-  }
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 70px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 100%;
+}
+.demo-table-expand .el-form-item__content {
+  font-size: 12px;
+}
+/deep/ .el-dialog__body {
+  padding: 0 20px 10px 20px !important;
+}
+.java.hljs {
+  color: #444;
+  background: #ffffff !important;
+  height: 630px !important;
+}
 </style>
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index de6140e..b19ce89 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -48,6 +48,7 @@
 <script>
 import crud from '@/mixins/crud'
 import Search from './search'
+import { delAllInfo } from '@/api/monitor/log'
 export default {
   name: 'Log',
   components: { Search },
@@ -63,26 +64,51 @@ export default {
       this.url = 'api/logs'
       this.params['logType'] = 'INFO'
       return true
+    },
+    confirmDelAll() {
+      this.delAllLoading = true
+      delAllInfo().then(res => {
+        this.delAllLoading = false
+        this.$children.forEach(children => {
+          if (children.$refs.del_all) {
+            children.$refs.del_all.doClose()
+          }
+        })
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delAllLoading = false
+        this.$children.forEach(children => {
+          if (children.$refs.del_all) {
+            children.$refs.del_all.doClose()
+          }
+        })
+        console.log(err.response.data.message)
+      })
     }
   }
 }
 </script>
 
 <style>
-  .demo-table-expand {
-    font-size: 0;
-  }
-  .demo-table-expand label {
-    width: 70px;
-    color: #99a9bf;
-  }
-  .demo-table-expand .el-form-item {
-    margin-right: 0;
-    margin-bottom: 0;
-    width: 100%;
-  }
-  .demo-table-expand .el-form-item__content {
-    font-size: 12px;
-
-  }
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 70px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 100%;
+}
+.demo-table-expand .el-form-item__content {
+  font-size: 12px;
+}
 </style>
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index 5ba58ed..274e1c3 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="head-container">
-    <el-input v-model="query.blurry" clearable size="small" placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" />
+    <el-input
+      v-model="query.blurry"
+      clearable
+      size="small"
+      placeholder="请输入你要搜索的内容"
+      style="width: 200px;"
+      class="filter-item"
+    />
     <el-date-picker
       v-model="query.createTime"
       :default-time="['00:00:00','23:59:59']"
@@ -12,7 +19,13 @@
       start-placeholder="开始日期"
       end-placeholder="结束日期"
     />
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$parent.toQuery">搜索</el-button>
+    <el-button
+      class="filter-item"
+      size="mini"
+      type="success"
+      icon="el-icon-search"
+      @click="$parent.toQuery"
+    >搜索</el-button>
     <!-- 导出 -->
     <el-button
       :loading="$parent.downloadLoading"
@@ -22,6 +35,27 @@
       icon="el-icon-download"
       @click="$parent.downloadMethod"
     >导出</el-button>
+    <el-button
+      slot="reference"
+      v-popover:del_all
+      :loading="$parent.delAllLoading"
+      type="danger"
+      size="mini"
+      class="filter-item"
+      icon="el-icon-delete"
+    >清空数据</el-button>
+    <el-popover ref="del_all" placement="top" width="200" trigger="click">
+      <p>确定删除所有数据吗？</p>
+      <div style="text-align: right; margin: 0">
+        <el-button size="mini" type="text" @click="$refs['del_all'].doClose()">取消</el-button>
+        <el-button
+          :loading="$parent.delAllLoading"
+          type="primary"
+          size="mini"
+          @click="$parent.confirmDelAll"
+        >确定</el-button>
+      </div>
+    </el-popover>
   </div>
 </template>
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 97014bc..94468e8 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -4,16 +4,38 @@
       <!--侧边部门数据-->
       <el-col :xs="9" :sm="6" :md="4" :lg="4" :xl="4">
         <div class="head-container">
-          <el-input v-model="deptName" clearable size="small" placeholder="输入部门名称搜索" prefix-icon="el-icon-search" class="filter-item" @input="getDeptDatas" />
+          <el-input
+            v-model="deptName"
+            clearable
+            size="small"
+            placeholder="输入部门名称搜索"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+            @input="getDeptDatas"
+          />
         </div>
-        <el-tree :data="deptDatas" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick" />
+        <el-tree
+          :data="deptDatas"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          default-expand-all
+          @node-click="handleNodeClick"
+        />
       </el-col>
       <!--用户数据-->
       <el-col :xs="15" :sm="18" :md="20" :lg="20" :xl="20">
         <!--工具栏-->
         <div class="head-container">
           <!-- 搜索 -->
-          <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者邮箱搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+          <el-input
+            v-model="query.blurry"
+            clearable
+            size="small"
+            placeholder="输入名称或者邮箱搜索"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="toQuery"
+          />
           <el-date-picker
             v-model="query.createTime"
             :default-time="['00:00:00','23:59:59']"
@@ -25,10 +47,29 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
           />
-          <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
-            <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+          <el-select
+            v-model="query.enabled"
+            clearable
+            size="small"
+            placeholder="状态"
+            class="filter-item"
+            style="width: 90px"
+            @change="toQuery"
+          >
+            <el-option
+              v-for="item in enabledTypeOptions"
+              :key="item.key"
+              :label="item.display_name"
+              :value="item.key"
+            />
           </el-select>
-          <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="success"
+            icon="el-icon-search"
+            @click="toQuery"
+          >搜索</el-button>
           <!-- 新增 -->
           <el-button
             class="filter-item"
@@ -48,8 +89,22 @@
           >导出</el-button>
         </div>
         <!--表单渲染-->
-        <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="getFormTitle()" append-to-body width="570px">
-          <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
+        <el-dialog
+          :visible.sync="dialog"
+          :close-on-click-modal="false"
+          :before-close="cancel"
+          :title="getFormTitle()"
+          append-to-body
+          width="570px"
+        >
+          <el-form
+            ref="form"
+            :inline="true"
+            :model="form"
+            :rules="rules"
+            size="small"
+            label-width="66px"
+          >
             <el-form-item label="用户名" prop="username">
               <el-input v-model="form.username" />
             </el-form-item>
@@ -63,7 +118,13 @@
               <el-input v-model="form.email" />
             </el-form-item>
             <el-form-item label="部门" prop="dept.id">
-              <treeselect v-model="form.dept.id" :options="depts" style="width: 178px" placeholder="选择部门" @select="selectFun" />
+              <treeselect
+                v-model="form.dept.id"
+                :options="depts"
+                style="width: 178px"
+                placeholder="选择部门"
+                @select="selectFun"
+              />
             </el-form-item>
             <el-form-item label="岗位" prop="job.id">
               <el-select v-model="form.job.id" style="width: 178px" placeholder="请先选择部门">
@@ -83,11 +144,22 @@
             </el-form-item>
             <el-form-item label="状态">
               <el-radio-group v-model="form.enabled">
-                <el-radio v-for="item in dict.user_status" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+                <el-radio
+                  v-for="item in dict.user_status"
+                  :key="item.id"
+                  :label="item.value"
+                >{{ item.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item style="margin-bottom: 0;" label="角色" prop="roles">
-              <el-select v-model="form.roles" style="width: 437px" multiple placeholder="请选择">
+              <el-select
+                v-model="form.roles"
+                style="width: 437px"
+                multiple
+                placeholder="请选择"
+                @remove-tag="deleteTag"
+                @change="changeRole"
+              >
                 <el-option
                   v-for="item in roles"
                   :key="item.name"
@@ -130,9 +202,21 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-if="checkPermission(['admin','user:edit','user:del'])" label="操作" width="125" align="center" fixed="right">
+          <el-table-column
+            v-if="checkPermission(['admin','user:edit','user:del'])"
+            label="操作"
+            width="125"
+            align="center"
+            fixed="right"
+          >
             <template slot-scope="scope">
-              <el-button v-permission="['admin','user:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
+              <el-button
+                v-permission="['admin','user:edit']"
+                size="mini"
+                type="primary"
+                icon="el-icon-edit"
+                @click="showEditFormDialog(scope.row)"
+              />
               <el-popover
                 :ref="scope.row.id"
                 v-permission="['admin','user:del']"
@@ -142,7 +226,12 @@
                 <p>确定删除本条数据吗？</p>
                 <div style="text-align: right; margin: 0">
                   <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                  <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
+                  <el-button
+                    :loading="delLoading"
+                    type="primary"
+                    size="mini"
+                    @click="delMethod(scope.row.id)"
+                  >确定</el-button>
                 </div>
                 <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
               </el-popover>
@@ -172,6 +261,7 @@ import { getAll, getLevel } from '@/api/system/role'
 import { getAllJob } from '@/api/system/job'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+let userRoles = []
 export default {
   name: 'User',
   components: { Treeselect },
@@ -234,6 +324,28 @@ export default {
     }
   },
   methods: {
+    changeRole(value) {
+      userRoles = []
+      value.forEach(function(data, index) {
+        const role = { id: data }
+        userRoles.push(role)
+      })
+    },
+    afterAddErrorMethod() {
+      // 恢复select
+      const initRoles = []
+      userRoles.forEach(function(role, index) {
+        initRoles.push(role.id)
+      })
+      this.form.roles = initRoles
+    },
+    deleteTag(value) {
+      userRoles.forEach(function(data, index) {
+        if (data.id === value) {
+          userRoles.splice(index, value)
+        }
+      })
+    },
     beforeInit() {
       this.url = 'api/users'
       return true
@@ -246,6 +358,7 @@ export default {
     },
     // 打开编辑弹窗前做的操作
     beforeShowEditForm(data) {
+      userRoles = []
       this.getDepts()
       this.getRoles()
       this.getRoleLevel()
@@ -254,6 +367,9 @@ export default {
       const roles = []
       data.roles.forEach(function(role, index) {
         roles.push(role.id)
+        // 初始化编辑时候的角色
+        const rol = { id: role.id }
+        userRoles.push(rol)
       })
       this.form.roles = roles
     },
@@ -278,12 +394,7 @@ export default {
         })
         return false
       }
-      const roles = []
-      this.form.roles.forEach(function(data, index) {
-        const role = { id: data }
-        roles.push(role)
-      })
-      this.form.roles = roles
+      this.form.roles = userRoles
       return true
     },
     // 获取左侧部门数据
@@ -330,13 +441,13 @@ export default {
     getRoles() {
       getAll().then(res => {
         this.roles = res
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 获取弹窗内岗位数据
     getJobs(id) {
       getAllJob(id).then(res => {
         this.jobs = res.content
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 点击部门搜索对应的岗位
     selectFun(node, instanceId) {
@@ -346,7 +457,7 @@ export default {
     getRoleLevel() {
       getLevel().then(res => {
         this.level = res.level
-      }).catch(() => {})
+      }).catch(() => { })
     },
     addSuccessNotify() {
       this.$notify({

From 5b1aef2409bfefd9508f56fad7b41b8c9b74cc36 Mon Sep 17 00:00:00 2001
From: Moxun <mxnstrive@gmail.com>
Date: Mon, 9 Dec 2019 16:58:18 +0800
Subject: [PATCH 48/64] =?UTF-8?q?1.=20=E7=AE=80=E5=8C=96CRUD=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=91=E9=87=8F=E4=BB=A3=E7=A0=81=E5=8D=B3=E5=8F=AF=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E5=8D=95=E8=A1=A8=E7=BB=B4=E6=8A=A4=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E9=9C=80=E6=8F=90=E4=BE=9B=E5=9F=BA=E6=9C=AC=E7=9A=84CRUD?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E3=80=81=E9=BB=98=E8=AE=A4=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=81=E5=92=8C=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=20(#57)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2. 增加搜索条件重置、操作栏（新增、修改、删除、导出、控制搜索栏可见性、刷新、过滤表格列显示）
3. 表单和头部（搜索栏）组件从主页面分类出来，方便代码组织维护
---
 src/components/crud/CRUD.operation.vue | 134 +++++
 src/components/crud/Pagination.vue     |  17 +
 src/components/crud/RR.operation.vue   |  37 ++
 src/components/crud/UD.operation.vue   |  82 ++++
 src/components/crud/crud.js            | 650 +++++++++++++++++++++++++
 src/views/system/job/index.vue         | 194 ++------
 src/views/system/job/module/form.vue   | 149 ++++++
 src/views/system/job/module/header.vue |  43 ++
 vue.config.js                          |   3 +-
 9 files changed, 1162 insertions(+), 147 deletions(-)
 create mode 100644 src/components/crud/CRUD.operation.vue
 create mode 100644 src/components/crud/Pagination.vue
 create mode 100644 src/components/crud/RR.operation.vue
 create mode 100644 src/components/crud/UD.operation.vue
 create mode 100644 src/components/crud/crud.js
 create mode 100644 src/views/system/job/module/form.vue
 create mode 100644 src/views/system/job/module/header.vue

diff --git a/src/components/crud/CRUD.operation.vue b/src/components/crud/CRUD.operation.vue
new file mode 100644
index 0000000..f3e23dd
--- /dev/null
+++ b/src/components/crud/CRUD.operation.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="crud-opts">
+    <span class="crud-opts-left">
+      <el-button
+        v-permission="permission.add"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="crud.toAdd"
+      >
+        新增
+      </el-button>
+      <el-button
+        v-permission="permission.edit"
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-edit"
+        :disabled="crud.selections.length !== 1"
+        @click="crud.toEdit(crud.selections[0])"
+      >
+        修改
+      </el-button>
+      <el-button
+        slot="reference"
+        v-permission="permission.delete"
+        class="filter-item"
+        type="danger"
+        icon="el-icon-delete"
+        size="mini"
+        :disabled="crud.selections.length === 0"
+        @click="toDelete(crud.selections)"
+      >
+        删除
+      </el-button>
+      <el-button
+        :loading="crud.downloadLoading"
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-download"
+        @click="crud.doExport"
+      >导出</el-button>
+    </span>
+    <el-button-group class="crud-opts-right">
+      <el-button
+        size="mini"
+        plain
+        type="info"
+        icon="el-icon-search"
+        @click="toggleSearch()"
+      />
+      <el-button
+        size="mini"
+        icon="el-icon-refresh"
+        @click="crud.refresh()"
+      />
+      <el-popover
+        placement="bottom-end"
+        width="150"
+        trigger="click"
+      >
+        <el-button
+          slot="reference"
+          size="mini"
+          icon="el-icon-s-grid"
+        >
+          <i
+            class="fa fa-caret-down"
+            aria-hidden="true"
+          />
+        </el-button>
+        <el-checkbox
+          v-for="item in crud.props.tableColumns"
+          :key="item.label"
+          v-model="item.visible"
+        >
+          {{ item.label }}
+        </el-checkbox>
+      </el-popover>
+    </el-button-group>
+  </div>
+</template>
+<script>
+import { crud } from '@crud/crud'
+export default {
+  mixins: [crud()],
+  props: {
+    permission: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  created() {
+    this.crud.updateProp('searchToggle', true)
+  },
+  methods: {
+    toDelete(datas) {
+      this.$confirm(`确认删除选中的${datas.length}条数据?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (datas.length === 1) {
+          this.crud.doDelete(datas[0])
+        } else {
+          this.crud.doDeletes(datas)
+        }
+      }).catch(() => {
+      })
+    },
+    toggleSearch() {
+      this.crud.props.searchToggle = !this.crud.props.searchToggle
+    }
+  }
+}
+</script>
+
+<style>
+  .crud-opts {
+    padding: 6px 0;
+    display: -webkit-flex;
+    display: flex;
+    align-items: center;
+  }
+  .crud-opts .crud-opts-right {
+    margin-left: auto;
+  }
+</style>
diff --git a/src/components/crud/Pagination.vue b/src/components/crud/Pagination.vue
new file mode 100644
index 0000000..32e576a
--- /dev/null
+++ b/src/components/crud/Pagination.vue
@@ -0,0 +1,17 @@
+<template>
+  <el-pagination
+    :page-size.sync="page.size"
+    :total="page.total"
+    :current-page.sync="page.page"
+    style="margin-top: 8px;"
+    layout="total, prev, pager, next, sizes"
+    @size-change="crud.sizeChangeHandler($event)"
+    @current-change="crud.pageChangeHandler"
+  />
+</template>
+<script>
+import { pagination } from '@crud/crud'
+export default {
+  mixins: [pagination()]
+}
+</script>
diff --git a/src/components/crud/RR.operation.vue b/src/components/crud/RR.operation.vue
new file mode 100644
index 0000000..a4cb24a
--- /dev/null
+++ b/src/components/crud/RR.operation.vue
@@ -0,0 +1,37 @@
+<template>
+  <span>
+    <el-button
+      class="filter-item"
+      size="mini"
+      type="success"
+      icon="el-icon-search"
+      @click="crud.toQuery"
+    >
+      搜索
+    </el-button>
+    <el-button
+      class="filter-item"
+      size="mini"
+      type="warning"
+      icon="el-icon-refresh-left"
+      @click="crud.resetQuery()"
+    >
+      重置
+    </el-button>
+  </span>
+</template>
+<script>
+export default {
+  props: {
+    crud: {
+      type: Object,
+      required: true
+    },
+    itemClass: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  }
+}
+</script>
diff --git a/src/components/crud/UD.operation.vue b/src/components/crud/UD.operation.vue
new file mode 100644
index 0000000..d132042
--- /dev/null
+++ b/src/components/crud/UD.operation.vue
@@ -0,0 +1,82 @@
+<template>
+  <div>
+    <el-button
+      v-permission="permission.edit"
+      size="mini"
+      type="primary"
+      icon="el-icon-edit"
+      @click="crud.toEdit(data)"
+    />
+    <el-popover
+      v-model="pop"
+      v-permission="permission.delete"
+      placement="top"
+      width="180"
+      trigger="manual"
+    >
+      <p>确定删除本条数据吗？</p>
+      <div
+        v-loading="crud.dataStatus[data.id].delete === 2"
+        style="text-align: right; margin: 0"
+      >
+        <el-button
+          size="mini"
+          type="text"
+          @click="doCancel"
+        >
+          取消
+        </el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          @click="crud.doDelete(data)"
+        >
+          确定
+        </el-button>
+      </div>
+      <el-button
+        slot="reference"
+        type="danger"
+        icon="el-icon-delete"
+        size="mini"
+        @click="toDelete"
+      />
+    </el-popover>
+  </div>
+</template>
+<script>
+
+import CRUD, { crud } from '@crud/crud'
+export default {
+  mixins: [crud()],
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    permission: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      pop: false
+    }
+  },
+  methods: {
+    doCancel() {
+      this.pop = false
+      this.crud.cancelDelete(this.data)
+    },
+    toDelete() {
+      this.pop = true
+    },
+    [CRUD.HOOK.afterDelete](crud, data) {
+      if (data === this.data) {
+        this.pop = false
+      }
+    }
+  }
+}
+</script>
diff --git a/src/components/crud/crud.js b/src/components/crud/crud.js
new file mode 100644
index 0000000..3c93c07
--- /dev/null
+++ b/src/components/crud/crud.js
@@ -0,0 +1,650 @@
+import { initData, download } from '@/api/data'
+import { parseTime, downloadFile } from '@/utils/index'
+import Vue from 'vue'
+
+/**
+ * CRUD配置
+ * @author moxun
+ * @param {*} options <br>
+ * @return crud instance.
+ * @example
+ */
+function CRUD(options) {
+  const defaultOptions = {
+    // 标题
+    title: '',
+    // 请求数据的url
+    url: '',
+    // 表格数据
+    data: [],
+    // 选择项
+    selections: [],
+    // 待查询的对象
+    query: {},
+    // 查询数据的参数
+    params: {},
+    // Form 表单
+    form: {},
+    // 重置表单
+    defaultForm: () => {},
+    // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc']
+    sort: ['id,desc'],
+    // 等待时间
+    time: 50,
+    // CRUD Method
+    crudMethod: {
+      add: (form) => {},
+      delete: (id) => {},
+      edit: (form) => {},
+      get: (id) => {}
+    },
+    // 自定义一些扩展属性
+    props: {},
+    // 在主页准备
+    queryOnPresenterCreated: true,
+    // 调试开关
+    debug: false
+  }
+  options = mergeOptions(defaultOptions, options)
+  const data = {
+    ...options,
+    // 记录数据状态
+    dataStatus: {},
+    status: {
+      add: CRUD.STATUS.NORMAL,
+      edit: CRUD.STATUS.NORMAL,
+      // 添加或编辑状态
+      get cu() {
+        if (this.add === CRUD.STATUS.NORMAL && this.edit === CRUD.STATUS.NORMAL) {
+          return CRUD.STATUS.NORMAL
+        } else if (this.add === CRUD.STATUS.PREPARED || this.edit === CRUD.STATUS.PREPARED) {
+          return CRUD.STATUS.PREPARED
+        } else if (this.add === CRUD.STATUS.PROCESSING || this.edit === CRUD.STATUS.PROCESSING) {
+          return CRUD.STATUS.PROCESSING
+        }
+        throw new Error('wrong crud\'s cu status')
+      },
+      // 标题
+      get title() {
+        return this.add > CRUD.STATUS.NORMAL ? `新增${crud.title}` : this.edit > CRUD.STATUS.NORMAL ? `编辑${crud.title}` : crud.title
+      }
+    },
+    page: {
+      // 页码
+      page: 0,
+      // 每页数据条数
+      size: 10,
+      // 总数据条数
+      total: 0
+    },
+    // 整体loading
+    loading: true,
+    // 导出的 Loading
+    downloadLoading: false
+  }
+  const methods = {
+    // 搜索
+    toQuery() {
+      crud.page.page = 1
+      crud.refresh()
+    },
+    // 刷新
+    refresh() {
+      if (!callVmHook(crud, CRUD.HOOK.beforeRefresh)) {
+        return
+      }
+      return new Promise((resolve, reject) => {
+        crud.loading = true
+        // 请求数据
+        initData(crud.url, crud.getQueryParams()).then(data => {
+          crud.page.total = data.total
+          crud.data = data.content
+          crud.resetDataStatus()
+          // time 毫秒后显示表格
+          setTimeout(() => {
+            crud.loading = false
+            callVmHook(crud, CRUD.HOOK.afterRefresh)
+          }, crud.time)
+          resolve(data)
+        }).catch(err => {
+          crud.loading = false
+          reject(err)
+        })
+      })
+    },
+    /**
+     * 启动添加
+     */
+    toAdd() {
+      if (!(callVmHook(crud, CRUD.HOOK.beforeToAdd, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) {
+        return
+      }
+      crud.resetForm()
+      crud.status.add = CRUD.STATUS.PREPARED
+    },
+    /**
+     * 启动编辑
+     * @param {*} data 数据项
+     */
+    toEdit(data) {
+      if (!(callVmHook(crud, CRUD.HOOK.beforeToEdit, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) {
+        return
+      }
+      crud.resetForm(JSON.parse(JSON.stringify(data)))
+      crud.status.edit = CRUD.STATUS.PREPARED
+      crud.getDataStatus(data.id).edit = CRUD.STATUS.PREPARED
+    },
+    /**
+     * 启动删除
+     * @param {*} data 数据项
+     */
+    toDelete(data) {
+      crud.getDataStatus(data.id).delete = CRUD.STATUS.PREPARED
+    },
+    /**
+     * 取消删除
+     * @param {*} data 数据项
+     */
+    cancelDelete(data) {
+      if (!callVmHook(crud, CRUD.HOOK.beforeDeleteCancel, data)) {
+        return
+      }
+      crud.getDataStatus(data.id).delete = CRUD.STATUS.NORMAL
+      callVmHook(crud, CRUD.HOOK.afterDeleteCancel, data)
+    },
+    /**
+     * 取消新增/编辑
+     */
+    cancelCU() {
+      const addStatus = crud.status.add
+      const editStatus = crud.status.edit
+      if (addStatus === CRUD.STATUS.PREPARED) {
+        if (!callVmHook(crud, CRUD.HOOK.beforeAddCancel, crud.form)) {
+          return
+        }
+        crud.status.add = CRUD.STATUS.NORMAL
+      }
+      if (editStatus === CRUD.STATUS.PREPARED) {
+        if (!callVmHook(crud, CRUD.HOOK.beforeEditCancel, crud.form)) {
+          return
+        }
+        crud.status.edit = CRUD.STATUS.NORMAL
+        crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL
+      }
+      crud.resetForm()
+      if (addStatus === CRUD.STATUS.PREPARED) {
+        callVmHook(crud, CRUD.HOOK.afterAddCancel, crud.form)
+      }
+      if (editStatus === CRUD.STATUS.PREPARED) {
+        callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form)
+      }
+    },
+    /**
+     * 提交新增/编辑
+     */
+    submitCU() {
+      if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) {
+        return
+      }
+      crud.findVM('form').$refs['form'].validate(valid => {
+        if (!valid) {
+          return
+        }
+        if (!callVmHook(crud, CRUD.HOOK.afterValidateCU)) {
+          return
+        }
+        if (crud.status.add === CRUD.STATUS.PREPARED) {
+          crud.doAdd()
+        } else if (crud.status.edit === CRUD.STATUS.PREPARED) {
+          crud.doEdit()
+        }
+      })
+    },
+    /**
+     * 执行添加
+     */
+    doAdd() {
+      if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) {
+        return
+      }
+      crud.crudMethod.add(crud.form).then(() => {
+        crud.status.add = CRUD.STATUS.NORMAL
+        crud.resetForm()
+        crud.notify('新增成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        callVmHook(crud, CRUD.HOOK.afterSubmit)
+        crud.toQuery()
+      }).catch(() => {})
+    },
+    /**
+     * 执行编辑
+     */
+    doEdit() {
+      if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) {
+        return
+      }
+      crud.crudMethod.edit(crud.form).then(() => {
+        crud.status.edit = CRUD.STATUS.NORMAL
+        crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL
+        crud.resetForm()
+        crud.notify('编辑成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        callVmHook(crud, CRUD.HOOK.afterSubmit)
+        crud.refresh()
+      }).catch(() => {})
+    },
+    /**
+     * 执行删除
+     * @param {*} data 数据项
+     */
+    doDelete(data) {
+      const dataStatus = crud.getDataStatus(data.id)
+      if (!callVmHook(crud, CRUD.HOOK.beforeDelete, data)) {
+        return
+      }
+      dataStatus.delete = CRUD.STATUS.PROCESSING
+      return crud.crudMethod.del(data.id).then(() => {
+        dataStatus.delete = CRUD.STATUS.NORMAL
+        crud.dleChangePage(1)
+        crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        callVmHook(crud, CRUD.HOOK.afterDelete, data)
+        crud.refresh()
+      }).catch(() => {
+        dataStatus.delete = CRUD.STATUS.PREPARED
+      })
+    },
+    /**
+     * 通用导出
+     */
+    doExport() {
+      crud.downloadLoading = true
+      download(crud.url + '/download', crud.getQueryParams()).then(result => {
+        downloadFile(result, crud.title + '数据', 'xlsx')
+        crud.downloadLoading = false
+      }).catch(() => {
+        crud.downloadLoading = false
+      })
+    },
+    /**
+     * 获取查询参数
+     */
+    getQueryParams: function() {
+      return {
+        page: crud.page.page - 1,
+        size: crud.page.size,
+        sort: crud.sort,
+        ...crud.query,
+        ...crud.params
+      }
+    },
+    // 当前页改变
+    pageChangeHandler(e) {
+      crud.page.page = e
+      crud.refresh()
+    },
+    // 每页条数改变
+    sizeChangeHandler(e) {
+      crud.page.size = e
+      crud.page.page = 1
+      crud.refresh()
+    },
+    // 预防删除第二页最后一条数据时，或者多选删除第二页的数据时，页码错误导致请求无数据
+    dleChangePage(size) {
+      if (crud.data.length === size && crud.page.page !== 1) {
+        crud.page.page -= 1
+      }
+    },
+    // 选择改变
+    selectionChangeHandler(val) {
+      crud.selections = val
+    },
+    /**
+     * 重置查询参数
+     * @param {Boolean} toQuery 重置后进行查询操作
+     */
+    resetQuery(toQuery = true) {
+      const defaultQuery = JSON.parse(JSON.stringify(crud.defaultQuery))
+      const query = crud.query
+      Object.keys(query).forEach(key => {
+        query[key] = defaultQuery[key]
+      })
+      if (toQuery) {
+        crud.toQuery()
+      }
+    },
+    /**
+     * 重置表单
+     * @param {Array} data 数据
+     */
+    resetForm(data) {
+      const form = data || (typeof crud.defaultForm === 'object' ? JSON.parse(JSON.stringify(crud.defaultForm)) : crud.defaultForm())
+      const crudFrom = crud.form
+      for (const key in form) {
+        if (crudFrom.hasOwnProperty(key)) {
+          crudFrom[key] = form[key]
+        } else {
+          Vue.set(crudFrom, key, form[key])
+        }
+      }
+    },
+    /**
+     * 重置数据状态
+     */
+    resetDataStatus() {
+      const dataStatus = {}
+      crud.data.forEach(e => {
+        dataStatus[e.id] = {
+          delete: 0,
+          edit: 0
+        }
+      })
+      crud.dataStatus = dataStatus
+    },
+    /**
+     * 获取数据状态
+     * @param {Number | String} id 数据项id
+     */
+    getDataStatus(id) {
+      return crud.dataStatus[id]
+    },
+    findVM(type) {
+      return crud.vms.find(vm => vm.type === type).vm
+    },
+    notify(title, type = CRUD.NOTIFICATION_TYPE.INFO) {
+      crud.vms[0].vm.$notify({
+        title,
+        type,
+        duration: 2500
+      })
+    },
+    updateProp(name, value) {
+      Vue.set(crud.props, name, value)
+    }
+  }
+  const crud = Object.assign({}, data)
+  // 可观测化
+  Vue.observable(crud)
+  // 附加方法
+  Object.assign(crud, methods)
+  // 记录初始默认的查询参数，后续重置查询时使用
+  Object.assign(crud, {
+    defaultQuery: JSON.parse(JSON.stringify(data.query)),
+    // 预留4位存储：组件 主页、头部、分页、表单，调试查看也方便找
+    vms: Array(4),
+    /**
+     * 注册组件实例
+     * @param {String} type 类型
+     * @param {*} vm 组件实例
+     * @param {Number} index 该参数内部使用
+     */
+    registerVM(type, vm, index = -1) {
+      const vmObj = {
+        type,
+        vm: vm
+      }
+      if (index < 0) {
+        this.vms.push(vmObj)
+        return
+      }
+      this.vms.length = Math.max(this.vms.length, index)
+      this.vms.splice(index, 1, vmObj)
+    },
+    /**
+     * 取消注册组件实例
+     * @param {*} vm 组件实例
+     */
+    unregisterVM(vm) {
+      this.vms.splice(this.vms.findIndex(e => e.vm === vm), 1)
+    }
+  })
+  // 冻结处理，需要扩展数据的话，使用crud.updateProp(name, value)，以crud.props.name形式访问，这个是响应式的，可以做数据绑定
+  Object.freeze(crud)
+  return crud
+}
+
+// hook VM
+function callVmHook(crud, hook) {
+  if (crud.debug) {
+    console.log('callVmHook: ' + hook)
+  }
+  let ret = true
+  const nargs = [crud]
+  for (let i = 2; i < arguments.length; ++i) {
+    nargs.push(arguments[i])
+  }
+  crud.vms.forEach(({
+    vm
+  }) => {
+    if (vm && vm[hook]) {
+      ret = vm[hook].apply(vm, nargs) !== false && ret
+    }
+  })
+  return ret
+}
+
+function mergeOptions(src, opts) {
+  const optsRet = {
+    ...src
+  }
+  for (const key in src) {
+    if (opts.hasOwnProperty(key)) {
+      optsRet[key] = opts[key]
+    }
+  }
+  return optsRet
+}
+
+/**
+ * crud主页
+ */
+function presenter(crud) {
+  function obColumns(columns) {
+    return {
+      visible(col) {
+        return !columns || !columns[col] ? true : columns[col].visible
+      }
+    }
+  }
+  return {
+    inject: ['crud'],
+    beforeCreate() {
+      // 由于initInjections在initProvide之前执行，如果该组件自己就需要crud，需要在initInjections前准备好crud
+      this._provided = {
+        crud,
+        'crud.query': crud.query,
+        'crud.page': crud.page,
+        'crud.form': crud.form
+      }
+    },
+    data() {
+      return {
+        searchToggle: true,
+        columns: obColumns()
+      }
+    },
+    methods: {
+      parseTime
+    },
+    created() {
+      this.crud.registerVM('presenter', this, 0)
+      if (crud.queryOnPresenterCreated) {
+        crud.toQuery()
+      }
+    },
+    beforeDestroy() {
+      this.crud.unregisterVM(this)
+    },
+    mounted() {
+      const columns = {}
+      this.$refs.table.columns.forEach(e => {
+        if (!e.property || e.type !== 'default') {
+          return
+        }
+        columns[e.property] = {
+          label: e.label,
+          visible: true
+        }
+      })
+      this.columns = obColumns(columns)
+      this.crud.updateProp('tableColumns', columns)
+    }
+  }
+}
+
+/**
+ * 头部
+ */
+function header() {
+  return {
+    inject: {
+      crud: {
+        from: 'crud'
+      },
+      query: {
+        from: 'crud.query'
+      }
+    },
+    created() {
+      this.crud.registerVM('header', this, 1)
+    },
+    beforeDestroy() {
+      this.crud.unregisterVM(this)
+    }
+  }
+}
+
+/**
+ * 分页
+ */
+function pagination() {
+  return {
+    inject: {
+      crud: {
+        from: 'crud'
+      },
+      page: {
+        from: 'crud.page'
+      }
+    },
+    created() {
+      this.crud.registerVM('pagination', this, 2)
+    },
+    beforeDestroy() {
+      this.crud.unregisterVM(this)
+    }
+  }
+}
+
+/**
+ * 表单
+ */
+function form(defaultForm) {
+  return {
+    inject: {
+      crud: {
+        from: 'crud'
+      },
+      form: {
+        from: 'crud.form'
+      }
+    },
+    created() {
+      this.crud.registerVM('form', this, 3)
+      this.crud.defaultForm = defaultForm
+      this.crud.resetForm()
+    },
+    beforeDestroy() {
+      this.crud.unregisterVM(this)
+    }
+  }
+}
+
+/**
+ * crud
+ */
+function crud(options = {}) {
+  const defaultOptions = {
+    type: undefined
+  }
+  options = mergeOptions(defaultOptions, options)
+  return {
+    inject: {
+      crud: {
+        from: 'crud'
+      }
+    },
+    created() {
+      this.crud.registerVM(options.type, this)
+    },
+    beforeDestroy() {
+      this.crud.unregisterVM(this)
+    }
+  }
+}
+
+/**
+ * CRUD钩子
+ */
+CRUD.HOOK = {
+  /** 刷新 - 之前 */
+  beforeRefresh: 'beforeCrudRefresh',
+  /** 刷新 - 之后 */
+  afterRefresh: 'afterCrudRefresh',
+  /** 删除 - 之前 */
+  beforeDelete: 'beforeCrudDelete',
+  /** 删除 - 之后 */
+  afterDelete: 'afterCrudDelete',
+  /** 删除取消 - 之前 */
+  beforeDeleteCancel: 'beforeCrudDeleteCancel',
+  /** 删除取消 - 之后 */
+  afterDeleteCancel: 'afterCrudDeleteCancel',
+  /** 新建 - 之前 */
+  beforeToAdd: 'beforeCrudToAdd',
+  /** 编辑 - 之前 */
+  beforeToEdit: 'beforeCrudToEdit',
+  /** 开始 "新建/编辑" - 之前 */
+  beforeToCU: 'beforeCrudToCU',
+  /** "新建/编辑" 验证 - 之前 */
+  beforeValidateCU: 'beforeCrudValidateCU',
+  /** "新建/编辑" 验证 - 之后 */
+  afterValidateCU: 'afterCrudValidateCU',
+  /** 添加取消 - 之前 */
+  beforeAddCancel: 'beforeCrudAddCancel',
+  /** 添加取消 - 之后 */
+  afterAddCancel: 'afterCrudAddCancel',
+  /** 编辑取消 - 之前 */
+  beforeEditCancel: 'beforeCrudEditCancel',
+  /** 编辑取消 - 之后 */
+  afterEditCancel: 'afterCrudEditCancel',
+  /** 提交 - 之前 */
+  beforeSubmit: 'beforeCrudSubmitCU',
+  /** 提交 - 之后 */
+  afterSubmit: 'afterCrudSubmitCU'
+}
+
+/**
+ * CRUD状态
+ */
+CRUD.STATUS = {
+  NORMAL: 0,
+  PREPARED: 1,
+  PROCESSING: 2
+}
+
+/**
+ * CRUD通知类型
+ */
+CRUD.NOTIFICATION_TYPE = {
+  SUCCESS: 'success',
+  WARNING: 'warning',
+  INFO: 'info',
+  ERROR: 'error'
+}
+
+export default CRUD
+
+export {
+  presenter,
+  header,
+  form,
+  pagination,
+  crud
+}
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index f1b2a95..2277743 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -2,186 +2,94 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.name" clearable size="small" placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
-        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
-      </el-select>
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增按钮 -->
-      <el-button
-        v-permission="['admin','job:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="showAddFormDialog"
-      >新增</el-button>
-      <!-- 导出按钮 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
+      <eHeader :dict="dict" :permission="permission" />
+      <crudOperation :permission="permission" />
     </div>
-    <!--表单渲染-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" style="width: 370px;" />
-        </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
-        </el-form-item>
-        <el-form-item v-if="form.pid !== 0" label="状态" prop="enabled">
-          <el-radio v-for="item in dict.job_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
-        </el-form-item>
-        <el-form-item label="部门" prop="dept.id">
-          <treeselect v-model="form.dept.id" :options="depts" style="width: 370px" placeholder="选择部门" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
-      </div>
-    </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%;">
-      <el-table-column prop="name" label="名称" />
-      <el-table-column label="所属部门">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('name')" prop="name" label="名称" />
+      <el-table-column v-if="columns.visible('dept')" prop="dept" label="所属部门">
         <template slot-scope="scope">
           <div>{{ scope.row.deptSuperiorName ? scope.row.deptSuperiorName + ' / ' : '' }}{{ scope.row.dept.name }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="sort" label="排序">
+      <el-table-column v-if="columns.visible('sort')" prop="sort" label="排序">
         <template slot-scope="scope">
           {{ scope.row.sort }}
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center">
+      <el-table-column v-if="columns.visible('status')" prop="status" label="状态" align="center">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.enabled"
             active-color="#409EFF"
             inactive-color="#F56C6C"
-            @change="changeEnabled(scope.row, scope.row.enabled,)"
+            @change="changeEnabled(scope.row, scope.row.enabled)"
           />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <!--   编辑与删除   -->
-      <el-table-column v-if="checkPermission(['admin','job:edit','job:del'])" label="操作" width="130px" align="center" fixed="right">
+      <el-table-column
+        v-permission="['ADMIN','USERJOB_ALL','USERJOB_EDIT','USERJOB_DELETE']"
+        label="操作"
+        width="130px"
+        align="center"
+        fixed="right"
+      >
         <template slot-scope="scope">
-          <el-button v-permission="['admin','job:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','job:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+          />
         </template>
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
+    <!--表单渲染-->
+    <eForm :job-status="dict.job_status" />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudJob from '@/api/system/job'
-import { getDepts } from '@/api/system/dept'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import eHeader from './module/header'
+import eForm from './module/form'
+import CRUD, { presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import udOperation from '@crud/UD.operation'
+
+// crud交由presenter持有
+const crud = CRUD({
+  title: '岗位',
+  url: 'api/job',
+  sort: ['sort,asc', 'id,desc'],
+  crudMethod: { ...crudJob }
+})
+
 export default {
   name: 'Job',
-  components: { Treeselect },
-  mixins: [crud],
+  components: { eHeader, eForm, crudOperation, pagination, udOperation },
+  mixins: [presenter(crud)],
   // 数据字典
   dicts: ['job_status'],
   data() {
     return {
-      crudMethod: {
-        ...crudJob
-      },
-      sort: ['sort,asc', 'id,desc'],
-      title: '岗位',
-      enabledTypeOptions: [
-        { key: 'true', display_name: '正常' },
-        { key: 'false', display_name: '禁用' }
-      ],
-      form: { id: null, name: null, sort: 999, enabled: 'true', dept: { id: null }},
-      depts: [],
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
-        ]
+      permission: {
+        add: ['admin', 'job:add'],
+        edit: ['admin', 'job:edit'],
+        delete: ['admin', 'job:delete']
       }
     }
   },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/job'
-      return true
-    },
-    // 打开新增弹窗前做的操作
-    beforeShowAddForm() {
-      this.getDepts()
-    },
-    // 打开编辑弹窗前做的操作
-    beforeShowEditForm(data) {
-      this.getDepts()
-      this.form.enabled = data.enabled.toString()
-    },
-    // 提交前的验证
-    beforeSubmitMethod() {
-      if (!this.form.dept.id) {
-        this.notify('所属部门不能为空', 'warning')
-        return false
-      }
-      return true
-    },
     // 改变状态
     changeEnabled(data, val) {
       this.$confirm('此操作将 "' + this.dict.label.job_status[val] + '" ' + data.name + '岗位, 是否继续？', '提示', {
@@ -189,21 +97,15 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.crudMethod.edit(data).then(() => {
-          this.notify(this.dict.label.job_status[val] + '成功', 'success')
+        crud.crudMethod.edit(data).then(() => {
+          crud.notify(this.dict.label.job_status[val] + '成功', 'success')
         }).catch(err => {
           data.enabled = !data.enabled
-          console.log(err.response.data.message)
+          console.log(err.data.message)
         })
       }).catch(() => {
         data.enabled = !data.enabled
       })
-    },
-    // 获取部门数据
-    getDepts() {
-      getDepts({ enabled: true }).then(res => {
-        this.depts = res.content
-      })
     }
   }
 }
diff --git a/src/views/system/job/module/form.vue b/src/views/system/job/module/form.vue
new file mode 100644
index 0000000..74dcaad
--- /dev/null
+++ b/src/views/system/job/module/form.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :before-close="crud.cancelCU"
+    :visible="crud.status.cu > 0"
+    :title="crud.status.title"
+    width="500px"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      size="small"
+      label-width="80px"
+    >
+      <el-form-item
+        label="名称"
+        prop="name"
+      >
+        <el-input
+          v-model="form.name"
+          style="width: 370px;"
+        />
+      </el-form-item>
+      <el-form-item
+        label="排序"
+        prop="sort"
+      >
+        <el-input-number
+          v-model.number="form.sort"
+          :min="0"
+          :max="999"
+          controls-position="right"
+          style="width: 370px;"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="form.pid !== 0"
+        label="状态"
+        prop="enabled"
+      >
+        <el-radio
+          v-for="item in jobStatus"
+          :key="item.id"
+          v-model="form.enabled"
+          :label="item.value === 'true'"
+        >
+          {{ item.label }}
+        </el-radio>
+      </el-form-item>
+      <el-form-item
+        label="所属部门"
+        prop="dept.id"
+        :rules="rules.dept"
+      >
+        <treeselect
+          v-model="form.dept.id"
+          :options="depts"
+          style="width: 370px"
+          placeholder="选择部门"
+        />
+      </el-form-item>
+    </el-form>
+    <div
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button
+        type="text"
+        @click="crud.cancelCU"
+      >
+        取消
+      </el-button>
+      <el-button
+        :loading="crud.cu === 2"
+        type="primary"
+        @click="crud.submitCU"
+      >
+        确认
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { form } from '@crud/crud'
+import { getDepts } from '@/api/system/dept'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+const defaultForm = {
+  id: null,
+  name: '',
+  sort: 999,
+  enabled: true,
+  dept: {
+    id: null
+  }
+}
+export default {
+  components: { Treeselect },
+  mixins: [form(defaultForm)],
+  props: {
+    jobStatus: {
+      type: Array,
+      required: true
+    }
+  },
+  data() {
+    return {
+      depts: [],
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
+        ],
+        dept: { required: true, message: '所属部门不能为空', trigger: 'select' }
+      }
+    }
+  },
+  methods: {
+    [CRUD.HOOK.beforeToCU]() {
+      getDepts({ enabled: true }).then(res => {
+        this.depts = res.content
+      })
+    },
+    // 提交前的验证
+    [CRUD.HOOK.afterValidateCU]() {
+      if (!this.form.dept.id) {
+        this.$notify({
+          title: '所属部门不能为空',
+          type: 'warning'
+        })
+        return false
+      }
+      return true
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
+</style>
diff --git a/src/views/system/job/module/header.vue b/src/views/system/job/module/header.vue
new file mode 100644
index 0000000..fda5285
--- /dev/null
+++ b/src/views/system/job/module/header.vue
@@ -0,0 +1,43 @@
+<template>
+  <div
+    v-if="crud.props.searchToggle"
+  >
+    <el-input v-model="query.name" clearable size="small" placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+    <el-date-picker
+      v-model="query.createTime"
+      :default-time="['00:00:00','23:59:59']"
+      type="daterange"
+      range-separator=":"
+      size="small"
+      class="date-item"
+      value-format="yyyy-MM-dd HH:mm:ss"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期"
+    />
+    <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 90px" @change="crud.toQuery">
+      <el-option v-for="item in dict.dict.job_status" :key="item.value" :label="item.label" :value="item.value" />
+    </el-select>
+    <rrOperation
+      :crud="crud"
+    />
+  </div>
+</template>
+
+<script>
+import { header } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+export default {
+  components: { rrOperation },
+  mixins: [header()],
+  props: {
+    dict: {
+      type: Object,
+      required: true
+    },
+    permission: {
+      type: Object,
+      required: true
+    }
+  }
+}
+</script>
diff --git a/vue.config.js b/vue.config.js
index a10f875..5207ad0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -46,7 +46,8 @@ module.exports = {
     name: name,
     resolve: {
       alias: {
-        '@': resolve('src')
+        '@': resolve('src'),
+        '@crud': resolve('src/components/crud')
       }
     }
   },

From 9f4689dc32941d622a4cd933033390c778d4fef0 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Thu, 12 Dec 2019 12:39:09 +0800
Subject: [PATCH 49/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/crud/crud.js | 4 ++++
 src/main.js                 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/crud/crud.js b/src/components/crud/crud.js
index 3c93c07..93c43ac 100644
--- a/src/components/crud/crud.js
+++ b/src/components/crud/crud.js
@@ -178,6 +178,10 @@ function CRUD(options) {
       if (editStatus === CRUD.STATUS.PREPARED) {
         callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form)
       }
+      // 清除表单验证
+      if (crud.findVM('form').$refs['form']) {
+        crud.findVM('form').$refs['form'].clearValidate()
+      }
     },
     /**
      * 提交新增/编辑
diff --git a/src/main.js b/src/main.js
index f785423..7dcd695 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,7 +34,7 @@ Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(dict)
 Vue.use(Element, {
-  size: Cookies.get('size') || 'small' // set element-ui default size
+  size: Cookies.get('size') || 'mini' // set element-ui default size
 })
 
 Vue.config.productionTip = false

From b60dcbf078367aac98fd66e106a11c5c48da9660 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sat, 14 Dec 2019 12:27:14 +0800
Subject: [PATCH 50/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{crud => Crud}/CRUD.operation.vue         |   2 +-
 src/components/{crud => Crud}/Pagination.vue  |   1 +
 src/components/Crud/RR.operation.vue          |  22 +++
 src/components/Crud/UD.operation.vue          |  48 ++++++
 src/components/{crud => Crud}/crud.js         |  41 +++--
 src/components/Operation/index.vue            | 133 ++++++++++++++++
 src/components/Permission/permission.js       |   3 +-
 src/components/crud/RR.operation.vue          |  37 -----
 src/components/crud/UD.operation.vue          |  82 ----------
 src/main.js                                   |   2 +-
 src/views/system/dept/index.vue               | 146 +++++++-----------
 src/views/system/job/index.vue                |   4 +-
 vue.config.js                                 |   2 +-
 13 files changed, 295 insertions(+), 228 deletions(-)
 rename src/components/{crud => Crud}/CRUD.operation.vue (98%)
 rename src/components/{crud => Crud}/Pagination.vue (96%)
 create mode 100644 src/components/Crud/RR.operation.vue
 create mode 100644 src/components/Crud/UD.operation.vue
 rename src/components/{crud => Crud}/crud.js (93%)
 create mode 100644 src/components/Operation/index.vue
 delete mode 100644 src/components/crud/RR.operation.vue
 delete mode 100644 src/components/crud/UD.operation.vue

diff --git a/src/components/crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue
similarity index 98%
rename from src/components/crud/CRUD.operation.vue
rename to src/components/Crud/CRUD.operation.vue
index f3e23dd..ad74541 100644
--- a/src/components/crud/CRUD.operation.vue
+++ b/src/components/Crud/CRUD.operation.vue
@@ -24,7 +24,7 @@
       </el-button>
       <el-button
         slot="reference"
-        v-permission="permission.delete"
+        v-permission="permission.del"
         class="filter-item"
         type="danger"
         icon="el-icon-delete"
diff --git a/src/components/crud/Pagination.vue b/src/components/Crud/Pagination.vue
similarity index 96%
rename from src/components/crud/Pagination.vue
rename to src/components/Crud/Pagination.vue
index 32e576a..d4482fb 100644
--- a/src/components/crud/Pagination.vue
+++ b/src/components/Crud/Pagination.vue
@@ -1,3 +1,4 @@
+<!--分页-->
 <template>
   <el-pagination
     :page-size.sync="page.size"
diff --git a/src/components/Crud/RR.operation.vue b/src/components/Crud/RR.operation.vue
new file mode 100644
index 0000000..71453d5
--- /dev/null
+++ b/src/components/Crud/RR.operation.vue
@@ -0,0 +1,22 @@
+<!--搜索与重置-->
+<template>
+  <span>
+    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
+    <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="crud.resetQuery()">重置</el-button>
+  </span>
+</template>
+<script>
+export default {
+  props: {
+    crud: {
+      type: Object,
+      required: true
+    },
+    itemClass: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  }
+}
+</script>
diff --git a/src/components/Crud/UD.operation.vue b/src/components/Crud/UD.operation.vue
new file mode 100644
index 0000000..06df122
--- /dev/null
+++ b/src/components/Crud/UD.operation.vue
@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <el-button v-permission="permission.edit" size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(data)" />
+    <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual">
+      <p>确定删除本条数据吗？</p>
+      <div style="text-align: right; margin: 0">
+        <el-button size="mini" type="text" @click="doCancel">取消</el-button>
+        <el-button :loading="crud.dataStatus[data.id].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">确定</el-button>
+      </div>
+      <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" @click="toDelete" />
+    </el-popover>
+  </div>
+</template>
+<script>
+import CRUD, { crud } from '@crud/crud'
+export default {
+  mixins: [crud()],
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    permission: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      pop: false
+    }
+  },
+  methods: {
+    doCancel() {
+      this.pop = false
+      this.crud.cancelDelete(this.data)
+    },
+    toDelete() {
+      this.pop = true
+    },
+    [CRUD.HOOK.afterDelete](crud, data) {
+      if (data === this.data) {
+        this.pop = false
+      }
+    }
+  }
+}
+</script>
diff --git a/src/components/crud/crud.js b/src/components/Crud/crud.js
similarity index 93%
rename from src/components/crud/crud.js
rename to src/components/Crud/crud.js
index 93c43ac..4dcea6d 100644
--- a/src/components/crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -121,6 +121,8 @@ function CRUD(options) {
       }
       crud.resetForm()
       crud.status.add = CRUD.STATUS.PREPARED
+      callVmHook(crud, CRUD.HOOK.afterToAdd, crud.form)
+      callVmHook(crud, CRUD.HOOK.afterToCU, crud.form)
     },
     /**
      * 启动编辑
@@ -133,6 +135,8 @@ function CRUD(options) {
       crud.resetForm(JSON.parse(JSON.stringify(data)))
       crud.status.edit = CRUD.STATUS.PREPARED
       crud.getDataStatus(data.id).edit = CRUD.STATUS.PREPARED
+      callVmHook(crud, CRUD.HOOK.afterToEdit, crud.form)
+      callVmHook(crud, CRUD.HOOK.afterToCU, crud.form)
     },
     /**
      * 启动删除
@@ -334,12 +338,18 @@ function CRUD(options) {
      */
     resetDataStatus() {
       const dataStatus = {}
-      crud.data.forEach(e => {
-        dataStatus[e.id] = {
-          delete: 0,
-          edit: 0
-        }
-      })
+      function resetStatus(datas) {
+        datas.forEach(e => {
+          dataStatus[e.id] = {
+            delete: 0,
+            edit: 0
+          }
+          if (e.children) {
+            resetStatus(e.children)
+          }
+        })
+      }
+      resetStatus(crud.data)
       crud.dataStatus = dataStatus
     },
     /**
@@ -350,7 +360,7 @@ function CRUD(options) {
       return crud.dataStatus[id]
     },
     findVM(type) {
-      return crud.vms.find(vm => vm.type === type).vm
+      return crud.vms.find(vm => vm && vm.type === type).vm
     },
     notify(title, type = CRUD.NOTIFICATION_TYPE.INFO) {
       crud.vms[0].vm.$notify({
@@ -396,7 +406,7 @@ function CRUD(options) {
      * @param {*} vm 组件实例
      */
     unregisterVM(vm) {
-      this.vms.splice(this.vms.findIndex(e => e.vm === vm), 1)
+      this.vms.splice(this.vms.findIndex(e => e && e.vm === vm), 1)
     }
   })
   // 冻结处理，需要扩展数据的话，使用crud.updateProp(name, value)，以crud.props.name形式访问，这个是响应式的，可以做数据绑定
@@ -414,10 +424,11 @@ function callVmHook(crud, hook) {
   for (let i = 2; i < arguments.length; ++i) {
     nargs.push(arguments[i])
   }
-  crud.vms.forEach(({
-    vm
-  }) => {
-    if (vm && vm[hook]) {
+  // 有些组件扮演了多个角色，调用钩子时，需要去重
+  const vmSet = new Set()
+  crud.vms.forEach(vm => vm && vmSet.add(vm.vm))
+  vmSet.forEach(vm => {
+    if (vm[hook]) {
       ret = vm[hook].apply(vm, nargs) !== false && ret
     }
   })
@@ -602,10 +613,16 @@ CRUD.HOOK = {
   afterDeleteCancel: 'afterCrudDeleteCancel',
   /** 新建 - 之前 */
   beforeToAdd: 'beforeCrudToAdd',
+  /** 新建 - 之后 */
+  afterToAdd: 'afterCrudToAdd',
   /** 编辑 - 之前 */
   beforeToEdit: 'beforeCrudToEdit',
+  /** 编辑 - 之后 */
+  afterToEdit: 'afterCrudToEdit',
   /** 开始 "新建/编辑" - 之前 */
   beforeToCU: 'beforeCrudToCU',
+  /** 开始 "新建/编辑" - 之后 */
+  afterToCU: 'afterCrudToCU',
   /** "新建/编辑" 验证 - 之前 */
   beforeValidateCU: 'beforeCrudValidateCU',
   /** "新建/编辑" 验证 - 之后 */
diff --git a/src/components/Operation/index.vue b/src/components/Operation/index.vue
new file mode 100644
index 0000000..87bdfa3
--- /dev/null
+++ b/src/components/Operation/index.vue
@@ -0,0 +1,133 @@
+<!--增删改查-->
+<template>
+  <div class="crud-opts">
+    <span class="crud-opts-left">
+      <el-button
+        v-permission="parent.permission.add"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="crud.toAdd"
+      >
+        新增
+      </el-button>
+      <el-button
+        v-permission="parent.permission.edit"
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-edit"
+        :disabled="crud.selections.length !== 1"
+        @click="crud.toEdit(crud.selections[0])"
+      >
+        修改
+      </el-button>
+      <el-button
+        slot="reference"
+        v-permission="parent.permission.del"
+        class="filter-item"
+        type="danger"
+        icon="el-icon-delete"
+        size="mini"
+        :disabled="parent.selections.length === 0"
+        @click="toDelete(crud.selections)"
+      >
+        删除
+      </el-button>
+      <el-button
+        :loading="parent.downloadLoading"
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-download"
+        @click="parent.doExport"
+      >导出</el-button>
+    </span>
+    <el-button-group class="crud-opts-right">
+      <el-button
+        size="mini"
+        plain
+        type="info"
+        icon="el-icon-search"
+        @click="toggleSearch()"
+      />
+      <el-button
+        size="mini"
+        icon="el-icon-refresh"
+        @click="crud.refresh()"
+      />
+      <el-popover
+        placement="bottom-end"
+        width="150"
+        trigger="click"
+      >
+        <el-button
+          slot="reference"
+          size="mini"
+          icon="el-icon-s-grid"
+        >
+          <i
+            class="fa fa-caret-down"
+            aria-hidden="true"
+          />
+        </el-button>
+        <el-checkbox
+          v-for="item in parent.tableColumns"
+          :key="item.label"
+          v-model="item.visible"
+        >
+          {{ item.label }}
+        </el-checkbox>
+      </el-popover>
+    </el-button-group>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    parent: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  created() {
+    this.parent.updateProp('searchToggle', true)
+  },
+  methods: {
+    toDelete(datas) {
+      this.$confirm(`确认删除选中的${datas.length}条数据?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (datas.length === 1) {
+          this.crud.doDelete(datas[0])
+        } else {
+          this.crud.doDeletes(datas)
+        }
+      }).catch(() => {
+      })
+    },
+    toggleSearch() {
+      this.crud.props.searchToggle = !this.crud.props.searchToggle
+    }
+  }
+}
+</script>
+
+<style>
+  .crud-opts {
+    padding: 6px 0;
+    display: -webkit-flex;
+    display: flex;
+    align-items: center;
+  }
+  .crud-opts .crud-opts-right {
+    margin-left: auto;
+  }
+</style>
diff --git a/src/components/Permission/permission.js b/src/components/Permission/permission.js
index b27f24d..e731ebf 100644
--- a/src/components/Permission/permission.js
+++ b/src/components/Permission/permission.js
@@ -4,7 +4,6 @@ export default {
   inserted(el, binding, vnode) {
     const { value } = binding
     const roles = store.getters && store.getters.roles
-
     if (value && value instanceof Array && value.length > 0) {
       const permissionRoles = value
 
@@ -16,7 +15,7 @@ export default {
         el.parentNode && el.parentNode.removeChild(el)
       }
     } else {
-      throw new Error(`need roles! Like v-permission="['admin','editor']"`)
+      throw new Error(`使用方式： v-permission="['admin','editor']"`)
     }
   }
 }
diff --git a/src/components/crud/RR.operation.vue b/src/components/crud/RR.operation.vue
deleted file mode 100644
index a4cb24a..0000000
--- a/src/components/crud/RR.operation.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <span>
-    <el-button
-      class="filter-item"
-      size="mini"
-      type="success"
-      icon="el-icon-search"
-      @click="crud.toQuery"
-    >
-      搜索
-    </el-button>
-    <el-button
-      class="filter-item"
-      size="mini"
-      type="warning"
-      icon="el-icon-refresh-left"
-      @click="crud.resetQuery()"
-    >
-      重置
-    </el-button>
-  </span>
-</template>
-<script>
-export default {
-  props: {
-    crud: {
-      type: Object,
-      required: true
-    },
-    itemClass: {
-      type: String,
-      required: false,
-      default: ''
-    }
-  }
-}
-</script>
diff --git a/src/components/crud/UD.operation.vue b/src/components/crud/UD.operation.vue
deleted file mode 100644
index d132042..0000000
--- a/src/components/crud/UD.operation.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-  <div>
-    <el-button
-      v-permission="permission.edit"
-      size="mini"
-      type="primary"
-      icon="el-icon-edit"
-      @click="crud.toEdit(data)"
-    />
-    <el-popover
-      v-model="pop"
-      v-permission="permission.delete"
-      placement="top"
-      width="180"
-      trigger="manual"
-    >
-      <p>确定删除本条数据吗？</p>
-      <div
-        v-loading="crud.dataStatus[data.id].delete === 2"
-        style="text-align: right; margin: 0"
-      >
-        <el-button
-          size="mini"
-          type="text"
-          @click="doCancel"
-        >
-          取消
-        </el-button>
-        <el-button
-          type="primary"
-          size="mini"
-          @click="crud.doDelete(data)"
-        >
-          确定
-        </el-button>
-      </div>
-      <el-button
-        slot="reference"
-        type="danger"
-        icon="el-icon-delete"
-        size="mini"
-        @click="toDelete"
-      />
-    </el-popover>
-  </div>
-</template>
-<script>
-
-import CRUD, { crud } from '@crud/crud'
-export default {
-  mixins: [crud()],
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    permission: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      pop: false
-    }
-  },
-  methods: {
-    doCancel() {
-      this.pop = false
-      this.crud.cancelDelete(this.data)
-    },
-    toDelete() {
-      this.pop = true
-    },
-    [CRUD.HOOK.afterDelete](crud, data) {
-      if (data === this.data) {
-        this.pop = false
-      }
-    }
-  }
-}
-</script>
diff --git a/src/main.js b/src/main.js
index 7dcd695..f785423 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,7 +34,7 @@ Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(dict)
 Vue.use(Element, {
-  size: Cookies.get('size') || 'mini' // set element-ui default size
+  size: Cookies.get('size') || 'small' // set element-ui default size
 })
 
 Vue.config.productionTip = false
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index bda7925..334bbee 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -2,43 +2,29 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.name" clearable size="small" placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
-        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
-      </el-select>
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="showAddFormDialog"
-      >新增</el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.name" clearable size="small" placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 90px" @change="crud.toQuery">
+          <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+        </el-select>
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission" />
     </div>
     <!--表单组件-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" style="width: 370px;" />
@@ -46,19 +32,19 @@
         <el-form-item v-if="form.pid !== 0" label="状态" prop="enabled">
           <el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
         </el-form-item>
-        <el-form-item v-if="form.pid !== 0" style="margin-bottom: 0px;" label="上级部门" prop="pid">
+        <el-form-item v-if="form.pid !== 0" style="margin-bottom: 0;" label="上级部门" prop="pid">
           <treeselect v-model="form.pid" :options="depts" style="width: 370px;" placeholder="选择上级类目" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" default-expand-all :data="data" row-key="id" size="small">
-      <el-table-column label="名称" prop="name" />
-      <el-table-column label="状态" align="center">
+    <el-table ref="table" v-loading="crud.loading" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" default-expand-all :data="crud.data" row-key="id" @selection-change="crud.selectionChangeHandler">
+      <el-table-column v-if="columns.visible('name')" label="名称" prop="name" />
+      <el-table-column v-if="columns.visible('enabled')" label="状态" align="center" prop="enabled">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.enabled"
@@ -69,27 +55,17 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','dept:edit','dept:del'])" label="操作" width="130px" align="center" fixed="right">
+      <el-table-column v-permission="['admin','dept:edit','dept:del']" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','dept:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','dept:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" :disabled="scope.row.id === 1" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+          />
         </template>
       </el-table-column>
     </el-table>
@@ -97,55 +73,52 @@
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudDept from '@/api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '部门', url: 'api/dept', crudMethod: { ...crudDept }})
+const defaultForm = { id: null, name: null, pid: 1, enabled: 'true' }
 export default {
   name: 'Dept',
-  components: { Treeselect },
-  mixins: [crud],
+  components: { Treeselect, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   // 设置数据字典
   dicts: ['dept_status'],
   data() {
     return {
-      title: '部门',
-      crudMethod: { ...crudDept },
       depts: [],
-      form: { id: null, name: null, pid: 1, enabled: 'true' },
       rules: {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
         ]
       },
+      permission: {
+        add: ['admin', 'dept:add'],
+        edit: ['admin', 'dept:edit'],
+        del: ['admin', 'dept:del']
+      },
       enabledTypeOptions: [
         { key: 'true', display_name: '正常' },
         { key: 'false', display_name: '禁用' }
       ]
     }
   },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/dept'
-      return true
+    // 打开新增与编辑弹窗前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      form.enabled = `${form.enabled}`
+      // 获取所有部门
+      crudDept.getDepts({ enabled: true }).then(res => {
+        this.depts = res.content
+      })
     },
-    // 打开新增弹窗前做的操作
-    beforeShowAddForm() {
-      this.getDepts()
-    },
-    // 打开编辑弹窗前做的操作
-    beforeShowEditForm(data) {
-      this.getDepts()
-      this.form.enabled = data.enabled.toString()
-    },
-    // 提交前先做下验证
-    beforeSubmitMethod() {
+    // 提交前的验证
+    [CRUD.HOOK.afterValidateCU]() {
       if (!this.form.pid) {
         this.$message({
           message: '上级部门不能为空',
@@ -171,17 +144,10 @@ export default {
       }).catch(() => {
         data.enabled = !data.enabled
       })
-    },
-    // 获取所有部门
-    getDepts() {
-      this.crudMethod.getDepts({ enabled: true }).then(res => {
-        this.depts = res.content
-      })
     }
   }
 }
 </script>
 
 <style scoped>
-
 </style>
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index 2277743..f026691 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -36,7 +36,7 @@
       </el-table-column>
       <!--   编辑与删除   -->
       <el-table-column
-        v-permission="['ADMIN','USERJOB_ALL','USERJOB_EDIT','USERJOB_DELETE']"
+        v-permission="['admin','job:edit','job:del']"
         label="操作"
         width="130px"
         align="center"
@@ -85,7 +85,7 @@ export default {
       permission: {
         add: ['admin', 'job:add'],
         edit: ['admin', 'job:edit'],
-        delete: ['admin', 'job:delete']
+        del: ['admin', 'job:del']
       }
     }
   },
diff --git a/vue.config.js b/vue.config.js
index 5207ad0..5dd3cff 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -47,7 +47,7 @@ module.exports = {
     resolve: {
       alias: {
         '@': resolve('src'),
-        '@crud': resolve('src/components/crud')
+        '@crud': resolve('src/components/Crud')
       }
     }
   },

From 6ba45c1a0c8a918e8204fced775b83e941673f80 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sat, 14 Dec 2019 14:43:30 +0800
Subject: [PATCH 51/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Crud/CRUD.operation.vue |  40 +++++++-
 src/components/Operation/index.vue     | 133 -------------------------
 2 files changed, 39 insertions(+), 134 deletions(-)
 delete mode 100644 src/components/Operation/index.vue

diff --git a/src/components/Crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue
index ad74541..61316b1 100644
--- a/src/components/Crud/CRUD.operation.vue
+++ b/src/components/Crud/CRUD.operation.vue
@@ -71,10 +71,18 @@
             aria-hidden="true"
           />
         </el-button>
+        <el-checkbox
+          v-model="allColumnsSelected"
+          :indeterminate="allColumnsSelectedIndeterminate"
+          @change="handleCheckAllChange"
+        >
+          全选
+        </el-checkbox>
         <el-checkbox
           v-for="item in crud.props.tableColumns"
           :key="item.label"
           v-model="item.visible"
+          @change="handleCheckedTableColumnsChange(item)"
         >
           {{ item.label }}
         </el-checkbox>
@@ -83,7 +91,7 @@
   </div>
 </template>
 <script>
-import { crud } from '@crud/crud'
+import CRUD, { crud } from '@crud/crud'
 export default {
   mixins: [crud()],
   props: {
@@ -94,6 +102,8 @@ export default {
   },
   data() {
     return {
+      allColumnsSelected: true,
+      allColumnsSelectedIndeterminate: false
     }
   },
   created() {
@@ -114,6 +124,34 @@ export default {
       }).catch(() => {
       })
     },
+    handleCheckAllChange(val) {
+      if (val === false) {
+        this.allColumnsSelected = true
+        return
+      }
+      for (const key in this.crud.props.tableColumns) {
+        this.crud.props.tableColumns[key].visible = val
+      }
+      this.allColumnsSelected = val
+      this.allColumnsSelectedIndeterminate = false
+    },
+    handleCheckedTableColumnsChange(item) {
+      let totalCount = 0
+      let selectedCount = 0
+      for (const key in this.crud.props.tableColumns) {
+        ++totalCount
+        selectedCount += this.crud.props.tableColumns[key].visible ? 1 : 0
+      }
+      if (selectedCount === 0) {
+        this.crud.notify('请至少选择一列', CRUD.NOTIFICATION_TYPE.WARNING)
+        this.$nextTick(function() {
+          item.visible = true
+        })
+        return
+      }
+      this.allColumnsSelected = selectedCount === totalCount
+      this.allColumnsSelectedIndeterminate = selectedCount !== totalCount && selectedCount !== 0
+    },
     toggleSearch() {
       this.crud.props.searchToggle = !this.crud.props.searchToggle
     }
diff --git a/src/components/Operation/index.vue b/src/components/Operation/index.vue
deleted file mode 100644
index 87bdfa3..0000000
--- a/src/components/Operation/index.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--增删改查-->
-<template>
-  <div class="crud-opts">
-    <span class="crud-opts-left">
-      <el-button
-        v-permission="parent.permission.add"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="crud.toAdd"
-      >
-        新增
-      </el-button>
-      <el-button
-        v-permission="parent.permission.edit"
-        class="filter-item"
-        size="mini"
-        type="success"
-        icon="el-icon-edit"
-        :disabled="crud.selections.length !== 1"
-        @click="crud.toEdit(crud.selections[0])"
-      >
-        修改
-      </el-button>
-      <el-button
-        slot="reference"
-        v-permission="parent.permission.del"
-        class="filter-item"
-        type="danger"
-        icon="el-icon-delete"
-        size="mini"
-        :disabled="parent.selections.length === 0"
-        @click="toDelete(crud.selections)"
-      >
-        删除
-      </el-button>
-      <el-button
-        :loading="parent.downloadLoading"
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-download"
-        @click="parent.doExport"
-      >导出</el-button>
-    </span>
-    <el-button-group class="crud-opts-right">
-      <el-button
-        size="mini"
-        plain
-        type="info"
-        icon="el-icon-search"
-        @click="toggleSearch()"
-      />
-      <el-button
-        size="mini"
-        icon="el-icon-refresh"
-        @click="crud.refresh()"
-      />
-      <el-popover
-        placement="bottom-end"
-        width="150"
-        trigger="click"
-      >
-        <el-button
-          slot="reference"
-          size="mini"
-          icon="el-icon-s-grid"
-        >
-          <i
-            class="fa fa-caret-down"
-            aria-hidden="true"
-          />
-        </el-button>
-        <el-checkbox
-          v-for="item in parent.tableColumns"
-          :key="item.label"
-          v-model="item.visible"
-        >
-          {{ item.label }}
-        </el-checkbox>
-      </el-popover>
-    </el-button-group>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    parent: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-    }
-  },
-  created() {
-    this.parent.updateProp('searchToggle', true)
-  },
-  methods: {
-    toDelete(datas) {
-      this.$confirm(`确认删除选中的${datas.length}条数据?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (datas.length === 1) {
-          this.crud.doDelete(datas[0])
-        } else {
-          this.crud.doDeletes(datas)
-        }
-      }).catch(() => {
-      })
-    },
-    toggleSearch() {
-      this.crud.props.searchToggle = !this.crud.props.searchToggle
-    }
-  }
-}
-</script>
-
-<style>
-  .crud-opts {
-    padding: 6px 0;
-    display: -webkit-flex;
-    display: flex;
-    align-items: center;
-  }
-  .crud-opts .crud-opts-right {
-    margin-left: auto;
-  }
-</style>

From 5d743c1d9b4f0e868187cf697858e7f13b7f13f0 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sat, 14 Dec 2019 15:30:18 +0800
Subject: [PATCH 52/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 334bbee..099346c 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -135,8 +135,8 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.crudMethod.edit(data).then(res => {
-          this.notify(this.dict.label.dept_status[val] + '成功', 'success')
+        crudDept.edit(data).then(res => {
+          this.crud.notify(this.dict.label.dept_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         }).catch(err => {
           data.enabled = !data.enabled
           console.log(err.response.data.message)

From 412ccfa30347bf61db4c1605fb049431319c95c9 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sat, 14 Dec 2019 22:32:40 +0800
Subject: [PATCH 53/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Crud/UD.operation.vue |  13 +-
 src/components/Crud/crud.js          |  41 +++-
 src/views/system/dept/index.vue      |   3 +-
 src/views/system/user/index.vue      | 271 +++++++++++----------------
 4 files changed, 159 insertions(+), 169 deletions(-)

diff --git a/src/components/Crud/UD.operation.vue b/src/components/Crud/UD.operation.vue
index 06df122..b9488a2 100644
--- a/src/components/Crud/UD.operation.vue
+++ b/src/components/Crud/UD.operation.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button v-permission="permission.edit" size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(data)" />
-    <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual">
+    <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide">
       <p>确定删除本条数据吗？</p>
       <div style="text-align: right; margin: 0">
         <el-button size="mini" type="text" @click="doCancel">取消</el-button>
@@ -42,6 +42,17 @@ export default {
       if (data === this.data) {
         this.pop = false
       }
+    },
+    onPopoverShow() {
+      setTimeout(() => {
+        document.addEventListener('click', this.handleDocumentClick)
+      }, 0)
+    },
+    onPopoverHide() {
+      document.removeEventListener('click', this.handleDocumentClick)
+    },
+    handleDocumentClick(event) {
+      this.pop = false
     }
   }
 }
diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
index 4dcea6d..00c2cbd 100644
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -69,6 +69,12 @@ function CRUD(options) {
         return this.add > CRUD.STATUS.NORMAL ? `新增${crud.title}` : this.edit > CRUD.STATUS.NORMAL ? `编辑${crud.title}` : crud.title
       }
     },
+    msg: {
+      submit: '提交成功',
+      add: '新增成功',
+      edit: '编辑成功',
+      del: '删除成功'
+    },
     page: {
       // 页码
       page: 0,
@@ -83,6 +89,21 @@ function CRUD(options) {
     downloadLoading: false
   }
   const methods = {
+    /**
+     * 通用的提示
+     */
+    submitSuccessNotify() {
+      crud.notify(crud.msg.submit, CRUD.NOTIFICATION_TYPE.SUCCESS)
+    },
+    addSuccessNotify() {
+      crud.notify(crud.msg.add, CRUD.NOTIFICATION_TYPE.SUCCESS)
+    },
+    editSuccessNotify() {
+      crud.notify(crud.msg.edit, CRUD.NOTIFICATION_TYPE.SUCCESS)
+    },
+    delSuccessNotify() {
+      crud.notify(crud.msg.del, CRUD.NOTIFICATION_TYPE.SUCCESS)
+    },
     // 搜索
     toQuery() {
       crud.page.page = 1
@@ -97,7 +118,7 @@ function CRUD(options) {
         crud.loading = true
         // 请求数据
         initData(crud.url, crud.getQueryParams()).then(data => {
-          crud.page.total = data.total
+          crud.page.total = data.totalElements
           crud.data = data.content
           crud.resetDataStatus()
           // time 毫秒后显示表格
@@ -218,10 +239,12 @@ function CRUD(options) {
       crud.crudMethod.add(crud.form).then(() => {
         crud.status.add = CRUD.STATUS.NORMAL
         crud.resetForm()
-        crud.notify('新增成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        crud.addSuccessNotify()
         callVmHook(crud, CRUD.HOOK.afterSubmit)
         crud.toQuery()
-      }).catch(() => {})
+      }).catch(() => {
+        callVmHook(crud, CRUD.HOOK.afterAddError)
+      })
     },
     /**
      * 执行编辑
@@ -234,10 +257,12 @@ function CRUD(options) {
         crud.status.edit = CRUD.STATUS.NORMAL
         crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL
         crud.resetForm()
-        crud.notify('编辑成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        crud.editSuccessNotify()
         callVmHook(crud, CRUD.HOOK.afterSubmit)
         crud.refresh()
-      }).catch(() => {})
+      }).catch(() => {
+        callVmHook(crud, CRUD.HOOK.afterEditError)
+      })
     },
     /**
      * 执行删除
@@ -252,7 +277,7 @@ function CRUD(options) {
       return crud.crudMethod.del(data.id).then(() => {
         dataStatus.delete = CRUD.STATUS.NORMAL
         crud.dleChangePage(1)
-        crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        crud.delSuccessNotify()
         callVmHook(crud, CRUD.HOOK.afterDelete, data)
         crud.refresh()
       }).catch(() => {
@@ -638,7 +663,9 @@ CRUD.HOOK = {
   /** 提交 - 之前 */
   beforeSubmit: 'beforeCrudSubmitCU',
   /** 提交 - 之后 */
-  afterSubmit: 'afterCrudSubmitCU'
+  afterSubmit: 'afterCrudSubmitCU',
+  afterAddError: 'afterCrudAddError',
+  afterEditError: 'afterCrudEditError'
 }
 
 /**
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 099346c..767620b 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -80,6 +80,7 @@ import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
+
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '部门', url: 'api/dept', crudMethod: { ...crudDept }})
 const defaultForm = { id: null, name: null, pid: 1, enabled: 'true' }
@@ -109,7 +110,7 @@ export default {
     }
   },
   methods: {
-    // 打开新增与编辑弹窗前做的操作
+    // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
       form.enabled = `${form.enabled}`
       // 获取所有部门
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 94468e8..daff332 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -26,85 +26,51 @@
       <el-col :xs="15" :sm="18" :md="20" :lg="20" :xl="20">
         <!--工具栏-->
         <div class="head-container">
-          <!-- 搜索 -->
-          <el-input
-            v-model="query.blurry"
-            clearable
-            size="small"
-            placeholder="输入名称或者邮箱搜索"
-            style="width: 200px;"
-            class="filter-item"
-            @keyup.enter.native="toQuery"
-          />
-          <el-date-picker
-            v-model="query.createTime"
-            :default-time="['00:00:00','23:59:59']"
-            type="daterange"
-            range-separator=":"
-            size="small"
-            class="date-item"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          />
-          <el-select
-            v-model="query.enabled"
-            clearable
-            size="small"
-            placeholder="状态"
-            class="filter-item"
-            style="width: 90px"
-            @change="toQuery"
-          >
-            <el-option
-              v-for="item in enabledTypeOptions"
-              :key="item.key"
-              :label="item.display_name"
-              :value="item.key"
+          <div v-if="crud.props.searchToggle">
+            <!-- 搜索 -->
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="small"
+              placeholder="输入名称或者邮箱搜索"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
             />
-          </el-select>
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="success"
-            icon="el-icon-search"
-            @click="toQuery"
-          >搜索</el-button>
-          <!-- 新增 -->
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            @click="showAddFormDialog"
-          >新增</el-button>
-          <!-- 导出 -->
-          <el-button
-            :loading="downloadLoading"
-            size="mini"
-            class="filter-item"
-            type="warning"
-            icon="el-icon-download"
-            @click="downloadMethod"
-          >导出</el-button>
+            <el-date-picker
+              v-model="query.createTime"
+              :default-time="['00:00:00','23:59:59']"
+              type="daterange"
+              range-separator=":"
+              size="small"
+              class="date-item"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            />
+            <el-select
+              v-model="query.enabled"
+              clearable
+              size="small"
+              placeholder="状态"
+              class="filter-item"
+              style="width: 90px"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in enabledTypeOptions"
+                :key="item.key"
+                :label="item.display_name"
+                :value="item.key"
+              />
+            </el-select>
+            <rrOperation :crud="crud" />
+          </div>
+          <crudOperation :permission="permission" />
         </div>
         <!--表单渲染-->
-        <el-dialog
-          :visible.sync="dialog"
-          :close-on-click-modal="false"
-          :before-close="cancel"
-          :title="getFormTitle()"
-          append-to-body
-          width="570px"
-        >
-          <el-form
-            ref="form"
-            :inline="true"
-            :model="form"
-            :rules="rules"
-            size="small"
-            label-width="66px"
-          >
+        <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="570px">
+          <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
             <el-form-item label="用户名" prop="username">
               <el-input v-model="form.username" />
             </el-form-item>
@@ -143,7 +109,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="状态">
-              <el-radio-group v-model="form.enabled">
+              <el-radio-group v-model="form.enabled" :disabled="form.id === user.id">
                 <el-radio
                   v-for="item in dict.user_status"
                   :key="item.id"
@@ -171,101 +137,83 @@
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
-            <el-button type="text" @click="cancel">取消</el-button>
-            <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+            <el-button type="text" @click="crud.cancelCU">取消</el-button>
+            <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
           </div>
         </el-dialog>
         <!--表格渲染-->
-        <el-table v-loading="loading" :data="data" style="width: 100%;">
-          <el-table-column :show-overflow-tooltip="true" prop="username" label="用户名" />
-          <el-table-column :show-overflow-tooltip="true" prop="nickName" label="昵称" />
-          <el-table-column prop="sex" label="性别" />
-          <el-table-column :show-overflow-tooltip="true" prop="phone" width="120" label="电话" />
-          <el-table-column :show-overflow-tooltip="true" width="135" prop="email" label="邮箱" />
-          <el-table-column :show-overflow-tooltip="true" width="120" label="部门 / 岗位">
+        <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+          <el-table-column v-if="columns.visible('username')" :show-overflow-tooltip="true" prop="username" label="用户名" />
+          <el-table-column v-if="columns.visible('nickName')" :show-overflow-tooltip="true" prop="nickName" label="昵称" />
+          <el-table-column v-if="columns.visible('sex')" prop="sex" label="性别" />
+          <el-table-column v-if="columns.visible('phone')" :show-overflow-tooltip="true" prop="phone" width="120" label="电话" />
+          <el-table-column v-if="columns.visible('email')" :show-overflow-tooltip="true" width="135" prop="email" label="邮箱" />
+          <el-table-column v-if="columns.visible('dept')" :show-overflow-tooltip="true" width="120" prop="dept" label="部门 / 岗位">
             <template slot-scope="scope">
               <div>{{ scope.row.dept.name }} / {{ scope.row.job.name }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="状态" align="center">
+          <el-table-column v-if="columns.visible('enabled')" label="状态" align="center" prop="enabled">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.enabled"
+                :disabled="user.id === scope.row.id"
                 active-color="#409EFF"
                 inactive-color="#F56C6C"
-                @change="changeEnabled(scope.row, scope.row.enabled,)"
+                @change="changeEnabled(scope.row, scope.row.enabled)"
               />
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="150" label="创建日期">
+          <el-table-column v-if="columns.visible('createTime')" :show-overflow-tooltip="true" prop="createTime" width="150" label="创建日期">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            v-if="checkPermission(['admin','user:edit','user:del'])"
+            v-permission="['admin','user:edit','user:del']"
             label="操作"
             width="125"
             align="center"
             fixed="right"
           >
             <template slot-scope="scope">
-              <el-button
-                v-permission="['admin','user:edit']"
-                size="mini"
-                type="primary"
-                icon="el-icon-edit"
-                @click="showEditFormDialog(scope.row)"
+              <udOperation
+                :data="scope.row"
+                :permission="permission"
               />
-              <el-popover
-                :ref="scope.row.id"
-                v-permission="['admin','user:del']"
-                placement="top"
-                width="180"
-              >
-                <p>确定删除本条数据吗？</p>
-                <div style="text-align: right; margin: 0">
-                  <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                  <el-button
-                    :loading="delLoading"
-                    type="primary"
-                    size="mini"
-                    @click="delMethod(scope.row.id)"
-                  >确定</el-button>
-                </div>
-                <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-              </el-popover>
             </template>
           </el-table-column>
         </el-table>
         <!--分页组件-->
-        <el-pagination
-          :total="total"
-          :current-page="page + 1"
-          style="margin-top: 8px;"
-          layout="total, prev, pager, next, sizes"
-          @size-change="sizeChange"
-          @current-change="pageChange"
-        />
+        <pagination />
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudUser from '@/api/system/user'
 import { isvalidPhone } from '@/utils/validate'
 import { getDepts } from '@/api/system/dept'
 import { getAll, getLevel } from '@/api/system/role'
 import { getAllJob } from '@/api/system/job'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
 import Treeselect from '@riophae/vue-treeselect'
+import { mapGetters } from 'vuex'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
 let userRoles = []
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }})
+const defaultForm = { username: null, nickName: null, sex: '男', email: null, enabled: 'false', roles: [], job: { id: null }, dept: { id: null }, phone: null }
 export default {
   name: 'User',
-  components: { Treeselect },
-  mixins: [crud],
+  components: { Treeselect, crudOperation, rrOperation, udOperation, pagination },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   // 数据字典
   dicts: ['user_status'],
   data() {
@@ -280,18 +228,18 @@ export default {
       }
     }
     return {
-      crudMethod: {
-        ...crudUser
-      },
-      title: '用户',
       height: document.documentElement.clientHeight - 180 + 'px;',
       deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [],
       defaultProps: { children: 'children', label: 'name' },
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', 'user:del']
+      },
       enabledTypeOptions: [
         { key: 'true', display_name: '激活' },
         { key: 'false', display_name: '锁定' }
       ],
-      form: { username: null, nickName: null, sex: '男', email: null, enabled: 'false', roles: [], job: { id: null }, dept: { id: null }, phone: null },
       rules: {
         username: [
           { required: true, message: '请输入用户名', trigger: 'blur' },
@@ -311,10 +259,16 @@ export default {
       }
     }
   },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
   created() {
     this.$nextTick(() => {
       this.getDeptDatas()
-      this.init()
+      this.crud.toQuery()
+      this.crud.msg.add = '新增成功，默认密码：123456'
     })
   },
   mounted: function() {
@@ -331,13 +285,19 @@ export default {
         userRoles.push(role)
       })
     },
-    afterAddErrorMethod() {
+    [CRUD.HOOK.afterAddError](crud) {
+      this.afterErrorMethod(crud)
+    },
+    [CRUD.HOOK.afterEditError](crud) {
+      this.afterErrorMethod(crud)
+    },
+    afterErrorMethod(crud) {
       // 恢复select
       const initRoles = []
       userRoles.forEach(function(role, index) {
         initRoles.push(role.id)
       })
-      this.form.roles = initRoles
+      crud.form.roles = initRoles
     },
     deleteTag(value) {
       userRoles.forEach(function(data, index) {
@@ -350,51 +310,48 @@ export default {
       this.url = 'api/users'
       return true
     },
-    // 打开新增弹窗前做的操作
-    beforeShowAddForm() {
+    // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
       this.getDepts()
       this.getRoles()
       this.getRoleLevel()
-    },
-    // 打开编辑弹窗前做的操作
-    beforeShowEditForm(data) {
+      form.enabled = form.enabled.toString()
       userRoles = []
-      this.getDepts()
-      this.getRoles()
-      this.getRoleLevel()
-      this.getJobs(this.form.dept.id)
-      this.form.enabled = data.enabled.toString()
       const roles = []
-      data.roles.forEach(function(role, index) {
+      form.roles.forEach(function(role, index) {
         roles.push(role.id)
         // 初始化编辑时候的角色
         const rol = { id: role.id }
         userRoles.push(rol)
       })
-      this.form.roles = roles
+      form.roles = roles
+    },
+    // 打开编辑弹窗前做的操作
+    [CRUD.HOOK.beforeToEdit](crud, form) {
+      this.getJobs(this.form.dept.id)
     },
     // 提交前做的操作
-    beforeSubmitMethod() {
-      if (!this.form.dept.id) {
+    [CRUD.HOOK.afterValidateCU](crud) {
+      if (!crud.form.dept.id) {
         this.$message({
           message: '部门不能为空',
           type: 'warning'
         })
         return false
-      } else if (!this.form.job.id) {
+      } else if (!crud.form.job.id) {
         this.$message({
           message: '岗位不能为空',
           type: 'warning'
         })
         return false
-      } else if (this.form.roles.length === 0) {
+      } else if (this.roles.length === 0) {
         this.$message({
           message: '角色不能为空',
           type: 'warning'
         })
         return false
       }
-      this.form.roles = userRoles
+      crud.form.roles = userRoles
       return true
     },
     // 获取左侧部门数据
@@ -419,7 +376,7 @@ export default {
       } else {
         this.query.deptId = data.id
       }
-      this.init()
+      this.crud.toQuery()
     },
     // 改变状态
     changeEnabled(data, val) {
@@ -428,8 +385,8 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.crudMethod.edit(data).then(res => {
-          this.notify(this.dict.label.user_status[val] + '成功', 'success')
+        crudUser.edit(data).then(res => {
+          this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         }).catch(() => {
           data.enabled = !data.enabled
         })
@@ -452,19 +409,13 @@ export default {
     // 点击部门搜索对应的岗位
     selectFun(node, instanceId) {
       this.getJobs(node.id)
+      this.form.job.id = null
     },
     // 获取权限级别
     getRoleLevel() {
       getLevel().then(res => {
         this.level = res.level
       }).catch(() => { })
-    },
-    addSuccessNotify() {
-      this.$notify({
-        title: '新增成功，默认密码：123456',
-        type: 'success',
-        duration: 2500
-      })
     }
   }
 }

From c321fa38146ebfcc3e6a8d06e43d68789373b944 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Mon, 16 Dec 2019 13:24:36 +0800
Subject: [PATCH 54/64] =?UTF-8?q?=E5=AF=B9=E6=A0=91=E5=BD=A2=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E7=9A=84=E5=A4=9A=E9=80=89=E5=81=9A=E4=BA=86=E7=AE=80?=
 =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dept.js                  |  10 +-
 src/api/system/job.js                   |  10 +-
 src/api/system/menu.js                  |  10 +-
 src/api/system/role.js                  |  10 +-
 src/api/system/user.js                  |  10 +-
 src/assets/styles/index.scss            |   2 +-
 src/components/Crud/CRUD.operation.vue  |  12 +-
 src/components/Crud/UD.operation.vue    |  18 ++-
 src/components/Crud/crud.js             |  88 ++++++++++++-
 src/store/modules/app.js                |   2 +-
 src/views/mnt/app/index.vue             |   2 +-
 src/views/mnt/database/execute.vue      |   2 +-
 src/views/mnt/database/index.vue        |   2 +-
 src/views/mnt/deploy/deploy.vue         |   2 +-
 src/views/mnt/deploy/index.vue          |   2 +-
 src/views/mnt/deploy/sysRestore.vue     |   2 +-
 src/views/mnt/server/index.vue          |   2 +-
 src/views/monitor/log/search.vue        |   2 +-
 src/views/monitor/online/index.vue      |  89 +++++++------
 src/views/monitor/server/index.vue      |   2 +-
 src/views/system/dept/index.vue         |   7 +-
 src/views/system/dict/dictDetail.vue    |   2 +-
 src/views/system/dict/index.vue         |   4 +-
 src/views/system/job/index.vue          |   2 +-
 src/views/system/job/module/form.vue    |   2 +-
 src/views/system/menu/index.vue         | 154 +++++++++-------------
 src/views/system/role/index.vue         | 167 ++++++++++--------------
 src/views/system/user/index.vue         |  22 ++--
 src/views/tools/picture/index.vue       |   2 +-
 src/views/tools/storage/local/index.vue |   2 +-
 30 files changed, 373 insertions(+), 270 deletions(-)

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 571122d..a071bee 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -31,4 +31,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del, getDepts }
+export function delAll(ids) {
+  return request({
+    url: 'api/dept/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export default { add, edit, del, getDepts, delAll }
diff --git a/src/api/system/job.js b/src/api/system/job.js
index 1ede2e5..56b3cc5 100644
--- a/src/api/system/job.js
+++ b/src/api/system/job.js
@@ -36,4 +36,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function delAll(ids) {
+  return request({
+    url: 'api/job/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export default { add, edit, del, delAll }
diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index d605bf0..86e917f 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -37,4 +37,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del, getMenusTree }
+export function delAll(ids) {
+  return request({
+    url: 'api/menus/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export default { add, edit, del, getMenusTree, delAll }
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 8ed97c6..b74c255 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -53,4 +53,12 @@ export function editMenu(data) {
   })
 }
 
-export default { add, edit, del, get, editMenu }
+export function delAll(ids) {
+  return request({
+    url: 'api/roles/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export default { add, edit, del, get, editMenu, delAll }
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 1e4bf6f..9f91992 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -56,5 +56,13 @@ export function updateEmail(form) {
   })
 }
 
-export default { add, edit, del }
+export function delAll(ids) {
+  return request({
+    url: 'api/users/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export default { add, edit, del, delAll }
 
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 2e8715e..21fbda1 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -122,7 +122,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 20px;
+  padding: 20px 20px 45px 20px;
 }
 
 .components-container {
diff --git a/src/components/Crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue
index 61316b1..fe7debd 100644
--- a/src/components/Crud/CRUD.operation.vue
+++ b/src/components/Crud/CRUD.operation.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="crud-opts">
     <span class="crud-opts-left">
+      <!--左侧插槽-->
+      <slot name="left" />
       <el-button
+        v-if="crud.optShow.add"
         v-permission="permission.add"
         class="filter-item"
         size="mini"
@@ -12,6 +15,7 @@
         新增
       </el-button>
       <el-button
+        v-if="crud.optShow.edit"
         v-permission="permission.edit"
         class="filter-item"
         size="mini"
@@ -23,18 +27,21 @@
         修改
       </el-button>
       <el-button
+        v-if="crud.optShow.del"
         slot="reference"
         v-permission="permission.del"
         class="filter-item"
         type="danger"
         icon="el-icon-delete"
         size="mini"
+        :loading="crud.delAllLoading"
         :disabled="crud.selections.length === 0"
         @click="toDelete(crud.selections)"
       >
         删除
       </el-button>
       <el-button
+        v-if="crud.optShow.download"
         :loading="crud.downloadLoading"
         class="filter-item"
         size="mini"
@@ -42,6 +49,8 @@
         icon="el-icon-download"
         @click="crud.doExport"
       >导出</el-button>
+      <!--右侧-->
+      <slot name="right" />
     </span>
     <el-button-group class="crud-opts-right">
       <el-button
@@ -97,7 +106,7 @@ export default {
   props: {
     permission: {
       type: Object,
-      required: true
+      default: null
     }
   },
   data() {
@@ -116,6 +125,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.crud.delAllLoading = true
         if (datas.length === 1) {
           this.crud.doDelete(datas[0])
         } else {
diff --git a/src/components/Crud/UD.operation.vue b/src/components/Crud/UD.operation.vue
index b9488a2..38f3339 100644
--- a/src/components/Crud/UD.operation.vue
+++ b/src/components/Crud/UD.operation.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
-    <el-button v-permission="permission.edit" size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(data)" />
+    <el-button v-permission="permission.edit" :disabled="disabledEdit" size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(data)" />
     <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide">
-      <p>确定删除本条数据吗？</p>
+      <p>{{ msg }}</p>
       <div style="text-align: right; margin: 0">
         <el-button size="mini" type="text" @click="doCancel">取消</el-button>
         <el-button :loading="crud.dataStatus[data.id].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">确定</el-button>
       </div>
-      <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" @click="toDelete" />
+      <el-button slot="reference" :disabled="disabledDle" type="danger" icon="el-icon-delete" size="mini" @click="toDelete" />
     </el-popover>
   </div>
 </template>
@@ -23,6 +23,18 @@ export default {
     permission: {
       type: Object,
       required: true
+    },
+    disabledEdit: {
+      type: Boolean,
+      default: false
+    },
+    disabledDle: {
+      type: Boolean,
+      default: false
+    },
+    msg: {
+      type: String,
+      default: '确定删除本条数据吗？'
     }
   },
   data() {
diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
index 00c2cbd..a02ca73 100644
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -38,6 +38,13 @@ function CRUD(options) {
       edit: (form) => {},
       get: (id) => {}
     },
+    // 主页操作栏显示哪些按钮
+    optShow: {
+      add: true,
+      edit: true,
+      del: true,
+      download: true
+    },
     // 自定义一些扩展属性
     props: {},
     // 在主页准备
@@ -86,7 +93,9 @@ function CRUD(options) {
     // 整体loading
     loading: true,
     // 导出的 Loading
-    downloadLoading: false
+    downloadLoading: false,
+    // 删除的 Loading
+    delAllLoading: false
   }
   const methods = {
     /**
@@ -150,10 +159,10 @@ function CRUD(options) {
      * @param {*} data 数据项
      */
     toEdit(data) {
+      crud.resetForm(JSON.parse(JSON.stringify(data)))
       if (!(callVmHook(crud, CRUD.HOOK.beforeToEdit, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) {
         return
       }
-      crud.resetForm(JSON.parse(JSON.stringify(data)))
       crud.status.edit = CRUD.STATUS.PREPARED
       crud.getDataStatus(data.id).edit = CRUD.STATUS.PREPARED
       callVmHook(crud, CRUD.HOOK.afterToEdit, crud.form)
@@ -280,10 +289,35 @@ function CRUD(options) {
         crud.delSuccessNotify()
         callVmHook(crud, CRUD.HOOK.afterDelete, data)
         crud.refresh()
+        crud.delAllLoading = false
       }).catch(() => {
+        crud.delAllLoading = false
         dataStatus.delete = CRUD.STATUS.PREPARED
       })
     },
+    /**
+     * 删除多条记录
+     * @param datas
+     * @returns {Promise<T>}
+     */
+    doDeletes(datas) {
+      const ids = []
+      datas.forEach(val => {
+        ids.push(val.id)
+      })
+      if (!callVmHook(crud, CRUD.HOOK.beforeDelete, data)) {
+        return
+      }
+      return crud.crudMethod.delAll(ids).then(() => {
+        crud.dleChangePage(1)
+        crud.delSuccessNotify()
+        callVmHook(crud, CRUD.HOOK.afterDelete, data)
+        crud.delAllLoading = false
+        crud.refresh()
+      }).catch(() => {
+        crud.delAllLoading = false
+      })
+    },
     /**
      * 通用导出
      */
@@ -384,6 +418,56 @@ function CRUD(options) {
     getDataStatus(id) {
       return crud.dataStatus[id]
     },
+    /**
+     * 用于树形表格多选, 选中所有
+     * @param selection
+     */
+    selectAllChange(selection) {
+      // 如果选中的数目与请求到的数目相同就选中子节点，否则就清空选中
+      if (selection && selection.length === crud.data.length) {
+        selection.forEach(val => {
+          crud.selectChange(selection, val)
+        })
+      } else {
+        crud.findVM('presenter').$refs['table'].clearSelection()
+      }
+    },
+    /**
+     * 用于树形表格多选，单选的封装
+     * @param selection
+     * @param row
+     */
+    selectChange(selection, row) {
+      // 如果selection中存在row代表是选中，否则是取消选中
+      if (selection.find(val => { return val.id === row.id })) {
+        if (row.children) {
+          row.children.forEach(val => {
+            crud.findVM('presenter').$refs['table'].toggleRowSelection(val, true)
+            selection.push(val)
+            if (val.children) {
+              crud.selectChange(selection, val)
+            }
+          })
+        }
+      } else {
+        crud.toggleRowSelection(selection, row)
+      }
+    },
+    /**
+     * 切换选中状态
+     * @param selection
+     * @param data
+     */
+    toggleRowSelection(selection, data) {
+      if (data.children) {
+        data.children.forEach(val => {
+          crud.findVM('presenter').$refs['table'].toggleRowSelection(val, false)
+          if (val.children) {
+            crud.toggleRowSelection(selection, val)
+          }
+        })
+      }
+    },
     findVM(type) {
       return crud.vms.find(vm => vm && vm.type === type).vm
     },
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 45d89bb..a384479 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -6,7 +6,7 @@ const state = {
     withoutAnimation: false
   },
   device: 'desktop',
-  size: Cookies.get('size') || 'medium'
+  size: Cookies.get('size') || 'small'
 }
 
 const mutations = {
diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
index 17e5076..ea860e2 100644
--- a/src/views/mnt/app/index.vue
+++ b/src/views/mnt/app/index.vue
@@ -36,7 +36,7 @@
       >复制新增</el-button>
     </div>
     <!--表单组件-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="800px">
+    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="800px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="应用名称" prop="name">
           <el-input v-model="form.name" style="width: 670px" placeholder="部署后的文件或者目录名称，用于备份" />
diff --git a/src/views/mnt/database/execute.vue b/src/views/mnt/database/execute.vue
index 4ada6be..22841d1 100644
--- a/src/views/mnt/database/execute.vue
+++ b/src/views/mnt/database/execute.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" title="执行脚本" width="400px">
+  <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" title="执行脚本" width="400px">
     <el-form ref="form" :rules="rules" size="small">
       <el-upload
         :action="databaseUploadApi"
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index a51e7f4..85ef670 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -27,7 +27,7 @@
     </div>
     <!--表单组件-->
     <eForm ref="execute" :database-info="currentRow" />
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="530px">
+    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="530px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="数据库名称" prop="name">
           <el-input v-model="form.name" style="width: 370px" />
diff --git a/src/views/mnt/deploy/deploy.vue b/src/views/mnt/deploy/deploy.vue
index eaddfe2..4a411b4 100644
--- a/src/views/mnt/deploy/deploy.vue
+++ b/src/views/mnt/deploy/deploy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" title="应用部署" width="400px">
+  <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" title="应用部署" width="400px">
     <el-form ref="form" :model="form" :rules="rules" size="small">
       <el-upload
         :action="deployUploadApi"
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
index b37d4d4..89d965b 100644
--- a/src/views/mnt/deploy/index.vue
+++ b/src/views/mnt/deploy/index.vue
@@ -73,7 +73,7 @@
       </el-button>
     </div>
     <!--表单组件-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="500px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="应用" prop="app.id">
           <el-select v-model.number="form.app.id" placeholder="请选择" style="width: 370px">
diff --git a/src/views/mnt/deploy/sysRestore.vue b/src/views/mnt/deploy/sysRestore.vue
index cb80a3a..4e125ec 100644
--- a/src/views/mnt/deploy/sysRestore.vue
+++ b/src/views/mnt/deploy/sysRestore.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" title="系统还原" width="800px">
+  <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" title="系统还原" width="800px">
     <!--工具栏-->
     <div class="head-container">
       <el-date-picker
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
index a5be4aa..46449d9 100644
--- a/src/views/mnt/server/index.vue
+++ b/src/views/mnt/server/index.vue
@@ -28,7 +28,7 @@
       </el-button>
     </div>
     <!--表单组件-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="470px">
+    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="470px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="55px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" style="width: 370px" />
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index 274e1c3..97e060b 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -43,7 +43,7 @@
       size="mini"
       class="filter-item"
       icon="el-icon-delete"
-    >清空数据</el-button>
+    >清空</el-button>
     <el-popover ref="del_all" placement="top" width="200" trigger="click">
       <p>确定删除所有数据吗？</p>
       <div style="text-align: right; margin: 0">
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 3c12b72..0e069bf 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -1,32 +1,40 @@
 <template>
   <div class="app-container">
     <div class="head-container">
-      <el-input v-model="query.filter" clearable size="small" placeholder="全表模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
+      <div v-if="crud.props.searchToggle">
+        <el-input v-model="query.filter" clearable size="small" placeholder="全表模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :loading="crud.delAllLoading"
+          :disabled="crud.selections.length === 0"
+          @click="crud.toDelete(crud.selections)"
+        >
+          强退
+        </el-button>
+      </crudOperation>
     </div>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%;">
-      <el-table-column prop="userName" label="用户名" />
-      <el-table-column prop="nickName" label="用户昵称" />
-      <el-table-column prop="job" label="岗位" />
-      <el-table-column prop="ip" label="登录IP" />
-      <el-table-column :show-overflow-tooltip="true" prop="address" label="登录地点" />
-      <el-table-column prop="browser" label="浏览器" />
-      <el-table-column prop="loginTime" label="登录时间">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('userName')" prop="userName" label="用户名" />
+      <el-table-column v-if="columns.visible('nickName')" prop="nickName" label="用户昵称" />
+      <el-table-column v-if="columns.visible('job')" prop="job" label="岗位" />
+      <el-table-column v-if="columns.visible('ip')" prop="ip" label="登录IP" />
+      <el-table-column v-if="columns.visible('address')" :show-overflow-tooltip="true" prop="address" label="登录地点" />
+      <el-table-column v-if="columns.visible('browser')" prop="browser" label="浏览器" />
+      <el-table-column v-if="columns.visible('loginTime')" prop="loginTime" label="登录时间">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.loginTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="操作" width="100px" fixed="right">
+      <el-table-column label="操作" width="100px" fixed="right">
         <template slot-scope="scope">
           <el-popover
             :ref="scope.$index"
@@ -34,44 +42,47 @@
             placement="top"
             width="180"
           >
-            <p>确定踢出该用户吗？</p>
+            <p>确定强制退出该用户吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
               <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.key, scope.$index)">确定</el-button>
             </div>
-            <el-button slot="reference" size="mini" type="text">踢出</el-button>
+            <el-button slot="reference" size="mini" type="text">强退</el-button>
           </el-popover>
         </template>
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import { del } from '@/api/monitor/online'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ url: 'auth/online', title: '在线用户' })
 export default {
   name: 'OnlineUser',
-  mixins: [crud],
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header(), crud()],
   data() {
     return {
-      title: '在线用户',
-      crudMethod: { del }
+      delLoading: false,
+      permission: {}
     }
   },
   created() {
-    this.$nextTick(() => {
-      this.init()
-    })
+    this.crud.optShow = {
+      add: false,
+      edit: false,
+      del: false,
+      download: true
+    }
   },
   methods: {
     // 获取数据前设置好接口地址
@@ -82,12 +93,12 @@ export default {
     // 踢出用户
     delMethod(key, index) {
       this.delLoading = true
-      this.crudMethod.del(key).then(() => {
+      del(key).then(() => {
         this.delLoading = false
         this.$refs[index].doClose()
         this.dleChangePage()
         this.notify('踢出成功', 'success')
-        this.init()
+        this.crud.toQuery()
       }).catch(() => {
         this.delLoading = false
         this.$refs[index].doClose()
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 7bd5893..947ae43 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -26,7 +26,7 @@
       </el-button>
     </div>
     <!--表单组件-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" style="width: 370px;" />
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 767620b..f9fc870 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -24,7 +24,7 @@
       <crudOperation :permission="permission" />
     </div>
     <!--表单组件-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" style="width: 370px;" />
@@ -42,7 +42,8 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" default-expand-all :data="crud.data" row-key="id" @selection-change="crud.selectionChangeHandler">
+    <el-table ref="table" v-loading="crud.loading" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" default-expand-all :data="crud.data" row-key="id" @select="crud.selectChange" @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
       <el-table-column v-if="columns.visible('name')" label="名称" prop="name" />
       <el-table-column v-if="columns.visible('enabled')" label="状态" align="center" prop="enabled">
         <template slot-scope="scope">
@@ -65,6 +66,8 @@
           <udOperation
             :data="scope.row"
             :permission="permission"
+            :disabled-dle="scope.row.id === 1"
+            msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
           />
         </template>
       </el-table-column>
diff --git a/src/views/system/dict/dictDetail.vue b/src/views/system/dict/dictDetail.vue
index bf5872c..31e7d61 100644
--- a/src/views/system/dict/dictDetail.vue
+++ b/src/views/system/dict/dictDetail.vue
@@ -11,7 +11,7 @@
         <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       </div>
       <!--表单组件-->
-      <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+      <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
           <el-form-item label="字典标签" prop="label">
             <el-input v-model="form.label" style="width: 370px;" />
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index ba756af..64e58ad 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--表单组件-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="字典名称" prop="name">
           <el-input v-model="form.name" style="width: 370px;" />
@@ -48,7 +48,7 @@
             >导出</el-button>
           </div>
           <!--表格渲染-->
-          <el-table v-loading="loading" :data="data" size="small" highlight-current-row style="width: 100%;" @current-change="handleCurrentChange">
+          <el-table v-loading="loading" :data="data" highlight-current-row style="width: 100%;" @current-change="handleCurrentChange">
             <el-table-column :show-overflow-tooltip="true" prop="name" label="名称" />
             <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述" />
             <el-table-column v-if="checkPermission(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index f026691..d06e352 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -6,7 +6,7 @@
       <crudOperation :permission="permission" />
     </div>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
       <el-table-column type="selection" width="55" />
       <el-table-column v-if="columns.visible('name')" prop="name" label="名称" />
       <el-table-column v-if="columns.visible('dept')" prop="dept" label="所属部门">
diff --git a/src/views/system/job/module/form.vue b/src/views/system/job/module/form.vue
index 74dcaad..0f2dc90 100644
--- a/src/views/system/job/module/form.vue
+++ b/src/views/system/job/module/form.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :append-to-body="true"
+    append-to-body
     :close-on-click-modal="false"
     :before-close="crud.cancelCU"
     :visible="crud.status.cu > 0"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index e060755..362bad9 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -2,40 +2,26 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.blurry" clearable size="small" placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="showAddFormDialog"
-      >新增</el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.blurry" clearable size="small" placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission" />
     </div>
     <!--表单渲染-->
-    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="getFormTitle()" append-to-body width="580px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="580px">
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="菜单类型" prop="type">
           <el-radio-group v-model="form.type" size="mini" style="width: 178px">
@@ -102,66 +88,57 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id" size="small">
-      <el-table-column :show-overflow-tooltip="true" label="菜单名称" width="125px" prop="name" />
-      <el-table-column prop="icon" label="图标" align="center" width="60px">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id" @select="crud.selectChange" @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('name')" :show-overflow-tooltip="true" label="菜单名称" width="125px" prop="name" />
+      <el-table-column v-if="columns.visible('icon')" prop="icon" label="图标" align="center" width="60px">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
         </template>
       </el-table-column>
-      <el-table-column prop="sort" align="center" label="排序">
+      <el-table-column v-if="columns.visible('sort')" prop="sort" align="center" label="排序">
         <template slot-scope="scope">
           {{ scope.row.sort }}
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="path" label="路由地址" />
-      <el-table-column :show-overflow-tooltip="true" prop="permission" label="权限标识" />
-      <!--<el-table-column :show-overflow-tooltip="true" prop="componentName" label="组件名称"/>-->
-      <el-table-column :show-overflow-tooltip="true" prop="component" label="组件路径" />
-      <el-table-column prop="iframe" label="外链" width="75px">
+      <el-table-column v-if="columns.visible('path')" :show-overflow-tooltip="true" prop="path" label="路由地址" />
+      <el-table-column v-if="columns.visible('permission')" :show-overflow-tooltip="true" prop="permission" label="权限标识" />
+      <el-table-column v-if="columns.visible('component')" :show-overflow-tooltip="true" prop="component" label="组件路径" />
+      <el-table-column v-if="columns.visible('iframe')" prop="iframe" label="外链" width="75px">
         <template slot-scope="scope">
           <span v-if="scope.row.iframe">是</span>
           <span v-else>否</span>
         </template>
       </el-table-column>
-      <el-table-column prop="iframe" label="缓存" width="75px">
+      <el-table-column v-if="columns.visible('cache')" prop="cache" label="缓存" width="75px">
         <template slot-scope="scope">
           <span v-if="scope.row.cache">是</span>
           <span v-else>否</span>
         </template>
       </el-table-column>
-      <el-table-column prop="iframe" label="可见" width="75px">
+      <el-table-column v-if="columns.visible('hidden')" prop="hidden" label="可见" width="75px">
         <template slot-scope="scope">
           <span v-if="scope.row.hidden">否</span>
           <span v-else>是</span>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期" width="135px">
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期" width="135px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','menu:edit','menu:del'])" label="操作" width="130px" align="center" fixed="right">
+      <el-table-column v-permission="['admin','menu:edit','menu:del']" label="操作" width="130px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','menu:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','menu:del']"
-            placement="top"
-            width="200"
-          >
-            <p>确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+            msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
+          />
         </template>
       </el-table-column>
     </el-table>
@@ -169,21 +146,30 @@
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudMenu from '@/api/system/menu'
-import Treeselect from '@riophae/vue-treeselect'
 import IconSelect from '@/components/IconSelect'
+import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '菜单', url: 'api/menus', crudMethod: { ...crudMenu }})
+const defaultForm = { name: null, sort: 999, path: null, component: null, componentName: null, iframe: false, roles: [], pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null }
 export default {
   name: 'Menu',
-  components: { Treeselect, IconSelect },
-  mixins: [crud],
+  components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
-      title: '菜单',
-      crudMethod: { ...crudMenu },
       menus: [],
-      form: { name: null, sort: 999, path: null, component: null, componentName: null, iframe: false, roles: [], pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null },
+      permission: {
+        add: ['admin', 'menu:add'],
+        edit: ['admin', 'menu:edit'],
+        del: ['admin', 'menu:del']
+      },
       rules: {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
@@ -194,37 +180,19 @@ export default {
       }
     }
   },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/menus'
-      return true
-    },
-    // 打开新增弹窗前做的操作
-    beforeShowAddForm() {
-      this.getMenus()
-    },
-    // 打开新增弹窗前做的操作
-    beforeShowEditForm() {
-      this.getMenus()
-    },
-    // 选中图标
-    selected(name) {
-      this.form.icon = name
-    },
-    // 获取所有菜单
-    getMenus() {
-      this.crudMethod.getMenusTree().then(res => {
+    // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      crudMenu.getMenusTree().then(res => {
         this.menus = []
         const menu = { id: 0, label: '顶级类目', children: [] }
         menu.children = res
         this.menus.push(menu)
       })
+    },
+    // 选中图标
+    selected(name) {
+      this.form.icon = name
     }
   }
 }
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 183d434..5bbaa7a 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -2,40 +2,26 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.blurry" size="small" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="showAddFormDialog"
-      >新增</el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.blurry" size="small" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission" />
     </div>
     <!-- 表单渲染 -->
-    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="getFormTitle()" append-to-body width="520px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="角色名称" prop="name">
           <el-input v-model="form.name" style="width: 145px;" />
@@ -64,8 +50,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <el-row :gutter="15">
@@ -75,45 +61,29 @@
           <div slot="header" class="clearfix">
             <span class="role-span">角色列表</span>
           </div>
-          <el-table v-loading="loading" :data="data" highlight-current-row style="width: 100%;" @current-change="handleCurrentChange">
-            <el-table-column prop="name" label="名称" />
-            <el-table-column prop="dataScope" label="数据权限" />
-            <el-table-column prop="permission" label="角色权限" />
-            <el-table-column prop="level" label="角色级别" />
-            <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述" />
-            <el-table-column :show-overflow-tooltip="true" width="135px" prop="createTime" label="创建日期">
+          <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
+            <el-table-column type="selection" width="55" />
+            <el-table-column v-if="columns.visible('name')" prop="name" label="名称" />
+            <el-table-column v-if="columns.visible('dataScope')" prop="dataScope" label="数据权限" />
+            <el-table-column v-if="columns.visible('permission')" prop="permission" label="角色权限" />
+            <el-table-column v-if="columns.visible('level')" prop="level" label="角色级别" />
+            <el-table-column v-if="columns.visible('remark')" :show-overflow-tooltip="true" prop="remark" label="描述" />
+            <el-table-column v-if="columns.visible('createTime')" :show-overflow-tooltip="true" width="135px" prop="createTime" label="创建日期">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column v-if="checkPermission(['admin','roles:edit','roles:del'])" label="操作" width="130px" align="center" fixed="right">
+            <el-table-column v-permission="['admin','roles:edit','roles:del']" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
-                <el-button v-permission="['admin','roles:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-                <el-popover
-                  :ref="scope.row.id"
-                  v-permission="['admin','roles:del']"
-                  placement="top"
-                  width="180"
-                >
-                  <p>确定删除本条数据吗？</p>
-                  <div style="text-align: right; margin: 0">
-                    <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                    <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-                  </div>
-                  <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-                </el-popover>
+                <udOperation
+                  :data="scope.row"
+                  :permission="permission"
+                />
               </template>
             </el-table-column>
           </el-table>
           <!--分页组件-->
-          <el-pagination
-            :total="total"
-            :current-page="page + 1"
-            style="margin-top: 8px;"
-            layout="total, prev, pager, next, sizes"
-            @size-change="sizeChange"
-            @current-change="pageChange"
-          />
+          <pagination />
         </el-card>
       </el-col>
       <!-- 菜单授权 -->
@@ -151,28 +121,35 @@
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudRoles from '@/api/system/role'
 import { getDepts } from '@/api/system/dept'
 import { getMenusTree } from '@/api/system/menu'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }})
+const defaultForm = { name: null, depts: [], remark: null, dataScope: null, level: 3, permission: null }
 export default {
   name: 'Role',
-  components: { Treeselect },
-  mixins: [crud],
+  components: { Treeselect, pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      },
-      title: '角色',
+      defaultProps: { children: 'children', label: 'label' },
       dateScopes: ['全部', '本级', '自定义'],
-      crudMethod: { ...crudRoles },
       currentId: 0, menuLoading: false, showButton: false,
       menus: [], menuIds: [], depts: [],
-      form: { name: null, depts: [], remark: null, dataScope: null, level: 3, permission: null },
+      permission: {
+        add: ['admin', 'roles:add'],
+        edit: ['admin', 'roles:edit'],
+        del: ['admin', 'roles:del']
+      },
       rules: {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
@@ -186,33 +163,29 @@ export default {
   created() {
     this.getMenus()
     this.$nextTick(() => {
-      this.init()
+      this.crud.toQuery()
     })
   },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.showButton = false
-      this.url = 'api/roles'
-      this.sort = 'level,asc'
-      // 清空菜单的选中
+    [CRUD.HOOK.afterRefresh]() {
       this.$refs.menu.setCheckedKeys([])
-      return true
     },
-    // 打开编辑弹窗前做的操作
-    beforeShowEditForm(data) {
-      if (data.dataScope === '自定义') {
+    // 编辑前
+    [CRUD.HOOK.beforeToEdit](crud, form) {
+      console.log(form.dataScope)
+      if (form.dataScope === '自定义') {
         this.getDepts()
       }
       const depts = []
-      data.depts.forEach(function(dept, index) {
+      form.depts.forEach(function(dept, index) {
         depts.push(dept.id)
       })
-      this.form.depts = depts
+      form.depts = depts
+      console.log(form)
     },
     // 提交前做的操作
-    beforeSubmitMethod() {
-      if (this.form.dataScope === '自定义' && this.form.depts.length === 0) {
+    [CRUD.HOOK.afterValidateCU](crud) {
+      if (crud.form.dataScope === '自定义' && crud.form.depts.length === 0) {
         this.$message({
           message: '自定义数据权限不能为空',
           type: 'warning'
@@ -220,11 +193,11 @@ export default {
         return false
       } else {
         const depts = []
-        this.form.depts.forEach(function(data, index) {
+        crud.form.depts.forEach(function(data, index) {
           const dept = { id: data }
           depts.push(dept)
         })
-        this.form.depts = depts
+        crud.form.depts = depts
       }
       return true
     },
@@ -266,8 +239,8 @@ export default {
         const menu = { id: data }
         role.menus.push(menu)
       })
-      this.crudMethod.editMenu(role).then(res => {
-        this.notify('保存成功', 'success')
+      crudRoles.editMenu(role).then(res => {
+        this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.menuLoading = false
         this.update()
       }).catch(err => {
@@ -278,10 +251,10 @@ export default {
     // 改变数据
     update() {
       // 无刷新更新 表格数据
-      this.crudMethod.get(this.currentId).then(res => {
-        for (let i = 0; i < this.data.length; i++) {
-          if (res.id === this.data[i].id) {
-            this.data[i] = res
+      crudRoles.get(this.currentId).then(res => {
+        for (let i = 0; i < this.crud.data.length; i++) {
+          if (res.id === this.crud.data[i].id) {
+            this.crud.data[i] = res
             break
           }
         }
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index daff332..1dc5e77 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -66,10 +66,10 @@
             </el-select>
             <rrOperation :crud="crud" />
           </div>
-          <crudOperation :permission="permission" />
+          <crudOperation show="" :permission="permission" />
         </div>
         <!--表单渲染-->
-        <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="570px">
+        <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="570px">
           <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
             <el-form-item label="用户名" prop="username">
               <el-input v-model="form.username" />
@@ -143,12 +143,13 @@
         </el-dialog>
         <!--表格渲染-->
         <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+          <el-table-column type="selection" width="55" />
           <el-table-column v-if="columns.visible('username')" :show-overflow-tooltip="true" prop="username" label="用户名" />
           <el-table-column v-if="columns.visible('nickName')" :show-overflow-tooltip="true" prop="nickName" label="昵称" />
           <el-table-column v-if="columns.visible('sex')" prop="sex" label="性别" />
-          <el-table-column v-if="columns.visible('phone')" :show-overflow-tooltip="true" prop="phone" width="120" label="电话" />
-          <el-table-column v-if="columns.visible('email')" :show-overflow-tooltip="true" width="135" prop="email" label="邮箱" />
-          <el-table-column v-if="columns.visible('dept')" :show-overflow-tooltip="true" width="120" prop="dept" label="部门 / 岗位">
+          <el-table-column v-if="columns.visible('phone')" :show-overflow-tooltip="true" prop="phone" width="100" label="电话" />
+          <el-table-column v-if="columns.visible('email')" :show-overflow-tooltip="true" width="125" prop="email" label="邮箱" />
+          <el-table-column v-if="columns.visible('dept')" :show-overflow-tooltip="true" width="110" prop="dept" label="部门 / 岗位">
             <template slot-scope="scope">
               <div>{{ scope.row.dept.name }} / {{ scope.row.job.name }}</div>
             </template>
@@ -164,7 +165,7 @@
               />
             </template>
           </el-table-column>
-          <el-table-column v-if="columns.visible('createTime')" :show-overflow-tooltip="true" prop="createTime" width="150" label="创建日期">
+          <el-table-column v-if="columns.visible('createTime')" :show-overflow-tooltip="true" prop="createTime" width="140" label="创建日期">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -180,6 +181,7 @@
               <udOperation
                 :data="scope.row"
                 :permission="permission"
+                :disabled-dle="scope.row.id === user.id"
               />
             </template>
           </el-table-column>
@@ -316,6 +318,10 @@ export default {
       this.getRoles()
       this.getRoleLevel()
       form.enabled = form.enabled.toString()
+    },
+    // 打开编辑弹窗前做的操作
+    [CRUD.HOOK.beforeToEdit](crud, form) {
+      this.getJobs(this.form.dept.id)
       userRoles = []
       const roles = []
       form.roles.forEach(function(role, index) {
@@ -326,10 +332,6 @@ export default {
       })
       form.roles = roles
     },
-    // 打开编辑弹窗前做的操作
-    [CRUD.HOOK.beforeToEdit](crud, form) {
-      this.getJobs(this.form.dept.id)
-    },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
       if (!crud.form.dept.id) {
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index fff5039..f04d24a 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -61,7 +61,7 @@
       >
         <i class="el-icon-plus" />
       </el-upload>
-      <el-dialog :append-to-body="true" :visible.sync="dialogVisible">
+      <el-dialog append-to-body :visible.sync="dialogVisible">
         <img :src="dialogImageUrl" width="100%" alt="">
       </el-dialog>
       <div slot="footer" class="dialog-footer">
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index e2d1022..4302cc5 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -49,7 +49,7 @@
       >导出</el-button>
     </div>
     <!--表单组件-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
       <el-form ref="form" :model="form" size="small" label-width="80px">
         <el-form-item label="文件名">
           <el-input v-model="form.name" style="width: 370px;" />

From 2a763ea2e0bcd4f155f2f124514223e60feae952 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Mon, 16 Dec 2019 18:17:56 +0800
Subject: [PATCH 55/64] =?UTF-8?q?=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E4=BD=BF=E7=94=A8=E5=BF=85=E5=BA=94=E6=AF=8F?=
 =?UTF-8?q?=E6=97=A5=E5=A3=81=E7=BA=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index cc81d5f..ed9f0f7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="login">
+  <div class="login" style="background-image:url(https://api.isoyu.com/bing_images.php)">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
         EL-ADMIN 后台管理系统
@@ -147,7 +147,6 @@ export default {
     justify-content: center;
     align-items: center;
     height: 100%;
-    background-image:url(	https://docs-1255840532.cos.ap-shanghai.myqcloud.com/3968.jpg );
     background-size: cover;
   }
   .title {

From 47d83846efbe9d1748b3f49ff030358b4c362022 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Tue, 17 Dec 2019 12:27:42 +0800
Subject: [PATCH 56/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Crud/crud.js           |   1 -
 src/views/login.vue                   |   5 +-
 src/views/mnt/app/index.vue           | 158 ++++++--------
 src/views/mnt/database/index.vue      | 121 +++++-----
 src/views/mnt/deploy/index.vue        | 303 +++++++++++---------------
 src/views/mnt/deploy/sysRestore.vue   |   4 +-
 src/views/mnt/deployHistory/index.vue |  73 ++++---
 src/views/mnt/server/index.vue        | 121 +++++-----
 src/views/monitor/log/errorLog.vue    | 105 ++++-----
 src/views/monitor/log/index.vue       | 105 ++++-----
 src/views/monitor/log/search.vue      |  52 +----
 src/views/monitor/online/index.vue    |   5 +-
 src/views/monitor/server/index.vue    | 131 ++++-------
 13 files changed, 506 insertions(+), 678 deletions(-)

diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
index a02ca73..31deb9e 100644
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -149,7 +149,6 @@ function CRUD(options) {
       if (!(callVmHook(crud, CRUD.HOOK.beforeToAdd, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) {
         return
       }
-      crud.resetForm()
       crud.status.add = CRUD.STATUS.PREPARED
       callVmHook(crud, CRUD.HOOK.afterToAdd, crud.form)
       callVmHook(crud, CRUD.HOOK.afterToCU, crud.form)
diff --git a/src/views/login.vue b/src/views/login.vue
index ed9f0f7..21801a2 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="login" style="background-image:url(https://api.isoyu.com/bing_images.php)">
+  <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
         EL-ADMIN 后台管理系统
@@ -19,7 +19,7 @@
           <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
         </el-input>
         <div class="login-code">
-          <img :src="codeUrl" @click="getCode">
+          <img :src="codeUrl" alt="验证码" @click="getCode">
         </div>
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">
@@ -147,6 +147,7 @@ export default {
     justify-content: center;
     align-items: center;
     height: 100%;
+    background-image:url(https://api.isoyu.com/bing_images.php);
     background-size: cover;
   }
   .title {
diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
index ea860e2..3779207 100644
--- a/src/views/mnt/app/index.vue
+++ b/src/views/mnt/app/index.vue
@@ -2,41 +2,37 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.name" clearable placeholder="输入名称搜索" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        v-permission="['admin','app:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="showAddFormDialog"
-      >新增</el-button>
-      <el-button
-        v-permission="['admin','app:add']"
-        :disabled="!currentRow"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="copy"
-      >复制新增</el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.name" clearable placeholder="输入名称搜索" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission">
+        <el-button
+          slot="left"
+          v-permission="['admin','app:add']"
+          :disabled="!currentRow"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="copy"
+        >复制</el-button>
+      </crudOperation>
     </div>
     <!--表单组件-->
-    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="800px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="应用名称" prop="name">
           <el-input v-model="form.name" style="width: 670px" placeholder="部署后的文件或者目录名称，用于备份" />
@@ -61,72 +57,58 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" highlight-current-row style="width: 100%" @current-change="handleCurrentChange">
-      <el-table-column prop="name" label="应用名称" />
-      <el-table-column prop="port" label="端口号" />
-      <el-table-column prop="uploadPath" label="上传目录" />
-      <el-table-column prop="deployPath" label="部署目录" />
-      <el-table-column prop="backupPath" label="备份目录" />
-      <el-table-column prop="createTime" label="创建日期">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('name')" prop="name" label="应用名称" />
+      <el-table-column v-if="columns.visible('port')" prop="port" label="端口号" />
+      <el-table-column v-if="columns.visible('uploadPath')" prop="uploadPath" label="上传目录" />
+      <el-table-column v-if="columns.visible('deployPath')" prop="deployPath" label="部署目录" />
+      <el-table-column v-if="columns.visible('backupPath')" prop="backupPath" label="备份目录" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','app:edit','app:del'])" label="操作" width="150px" align="center">
+      <el-table-column v-permission="['admin','app:edit','app:del']" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','app:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','app:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+          />
         </template>
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudApp from '@/api/mnt/app'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '应用', url: 'api/app', crudMethod: { ...crudApp }})
+const defaultForm = { id: null, name: null, port: 8080, uploadPath: '/opt/upload', deployPath: '/opt/app', backupPath: '/opt/backup', startScript: null, deployScript: null }
 export default {
-  mixins: [crud],
+  name: 'App',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
-      title: '应用',
-      crudMethod: { ...crudApp },
       currentRow: null,
-      form: {
-        id: null,
-        name: null,
-        port: 8080,
-        uploadPath: '/opt/upload',
-        deployPath: '/opt/app',
-        backupPath: '/opt/backup',
-        startScript: null,
-        deployScript: null
+      permission: {
+        add: ['admin', 'app:add'],
+        edit: ['admin', 'app:edit'],
+        del: ['admin', 'app:del']
       },
       rules: {
         name: [
@@ -153,23 +135,17 @@ export default {
       }
     }
   },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
   methods: {
-    beforeInit() {
-      this.url = 'api/app'
-      return true
-    },
     copy() {
-      this.isAdd = true
-      this.dialog = true
-      this.form = this.currentRow
+      for (const key in this.currentRow) {
+        this.form[key] = this.currentRow[key]
+      }
+      this.form.id = null
+      this.form.createTime = null
+      this.crud.toAdd()
     },
     handleCurrentChange(row) {
-      this.currentRow = row
+      this.currentRow = JSON.parse(JSON.stringify(row))
     }
   }
 }
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 85ef670..1085dd5 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -2,32 +2,27 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.blurry" clearable placeholder="模糊搜索" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        v-permission="['admin','database:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="showAddFormDialog"
-      >新增
-      </el-button>
-      <el-button
-        v-permission="['admin','database:add']"
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload"
-        @click="execute"
-      >执行脚本
-      </el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.blurry" clearable placeholder="模糊搜索" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          v-permission="['admin','database:add']"
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-upload"
+          @click="execute"
+        >执行脚本
+        </el-button>
+      </crudOperation>
     </div>
     <!--表单组件-->
     <eForm ref="execute" :database-info="currentRow" />
-    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="530px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="530px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="数据库名称" prop="name">
           <el-input v-model="form.name" style="width: 370px" />
@@ -44,62 +39,57 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" highlight-current-row stripe style="width: 100%" @current-change="handleCurrentChange">
-      <el-table-column prop="name" label="数据库名称" width="180" />
-      <el-table-column prop="jdbcUrl" label="连接地址" />
-      <el-table-column prop="userName" label="用户名" width="100" />
-      <el-table-column v-if="checkPermission(['admin','database:edit','database:del'])" label="操作" width="150px" align="center">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row stripe style="width: 100%" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('name')" prop="name" label="数据库名称" />
+      <el-table-column v-if="columns.visible('jdbcUrl')" prop="jdbcUrl" label="连接地址" />
+      <el-table-column v-if="columns.visible('userName')" prop="userName" label="用户名" />
+      <el-table-column v-permission="['admin','database:edit','database:del']" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','database:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','database:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+          />
         </template>
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudDatabase from '@/api/mnt/database'
 import { testDbConnect } from '@/api/mnt/connect'
 import eForm from './execute'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '数据库', url: 'api/database', crudMethod: { ...crudDatabase }})
+const defaultForm = { id: null, name: null, jdbcUrl: null, userName: null, pwd: null }
 export default {
-  components: { eForm },
-  mixins: [crud],
+  name: 'DataBase',
+  components: { eForm, pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
-      title: '数据库',
-      crudMethod: { ...crudDatabase },
       currentRow: {},
       selectIndex: '',
       databaseInfo: '',
-      form: { id: null, name: null, jdbcUrl: null, userName: null, pwd: null },
+      loading: false,
+      permission: {
+        add: ['admin', 'database:add'],
+        edit: ['admin', 'database:edit'],
+        del: ['admin', 'database:del']
+      },
       rules: {
         name: [
           { required: true, message: '请输入数据库名称', trigger: 'blur' }
@@ -116,27 +106,14 @@ export default {
       }
     }
   },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
   methods: {
-    beforeInit() {
-      this.url = 'api/database'
-      return true
-    },
     testConnectDatabase() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
           testDbConnect(this.form).then((res) => {
             this.loading = false
-            this.$notify({
-              title: res ? '连接成功' : '连接失败',
-              type: res ? 'success' : 'error',
-              duration: 2500
-            })
+            crud.notify(res ? '连接成功' : '连接失败', res ? 'success' : 'error')
           }).catch(() => {
             this.loading = false
           })
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
index 89d965b..665245a 100644
--- a/src/views/mnt/deploy/index.vue
+++ b/src/views/mnt/deploy/index.vue
@@ -2,78 +2,79 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.appName" clearable placeholder="输入应用名称查询" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        v-permission="['admin','deploy:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="showAddFormDialog"
-      >新增
-      </el-button>
-      <el-button
-        v-permission="['admin','deploy:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-upload"
-        @click="sysRestore"
-      >系统还原
-      </el-button>
-      <el-button
-        v-permission="['admin','deploy:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-upload"
-        @click="serverStatus"
-      >状态查询
-      </el-button>
-      <el-button
-        v-permission="['admin','deploy:add']"
-        class="filter-item"
-        size="mini"
-        type="success"
-        icon="el-icon-upload"
-        @click="startServer"
-      >启动
-      </el-button>
-      <el-button
-        v-permission="['admin','deploy:add']"
-        class="filter-item"
-        size="mini"
-        type="danger"
-        icon="el-icon-upload"
-        @click="stopServer"
-      >停止
-      </el-button>
-      <el-button
-        v-permission="['admin','deploy:add']"
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload"
-        @click="deploy"
-      >一键部署
-      </el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.appName" clearable placeholder="输入应用名称查询" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission">
+        <template slot="right">
+          <el-button
+            v-permission="['admin','deploy:add']"
+            :disabled="!selectIndex"
+            class="filter-item"
+            size="mini"
+            type="primary"
+            icon="el-icon-upload"
+            @click="sysRestore"
+          >系统还原
+          </el-button>
+          <el-button
+            v-permission="['admin','deploy:add']"
+            :disabled="!selectIndex"
+            class="filter-item"
+            size="mini"
+            type="primary"
+            icon="el-icon-upload"
+            @click="serverStatus"
+          >状态查询
+          </el-button>
+          <el-button
+            v-permission="['admin','deploy:add']"
+            :disabled="!selectIndex"
+            class="filter-item"
+            size="mini"
+            type="success"
+            icon="el-icon-upload"
+            @click="startServer"
+          >启动
+          </el-button>
+          <el-button
+            v-permission="['admin','deploy:add']"
+            :disabled="!selectIndex"
+            class="filter-item"
+            size="mini"
+            type="danger"
+            icon="el-icon-upload"
+            @click="stopServer"
+          >停止
+          </el-button>
+          <el-button
+            v-permission="['admin','deploy:add']"
+            :disabled="!selectIndex"
+            class="filter-item"
+            size="mini"
+            type="warning"
+            icon="el-icon-upload"
+            @click="deploy"
+          >一键部署
+          </el-button>
+        </template>
+      </crudOperation>
     </div>
     <!--表单组件-->
-    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="应用" prop="app.id">
           <el-select v-model.number="form.app.id" placeholder="请选择" style="width: 370px">
@@ -87,78 +88,60 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <!--统还原组件-->
     <fForm ref="sysRestore" :key="times" :app-name="appName" />
     <dForm ref="deploy" />
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" highlight-current-row stripe style="width: 100%" @current-change="handleCurrentChange">
-      <el-table-column prop="app.name" label="应用名称" />
-      <el-table-column prop="servers" label="服务器列表" />
-      <el-table-column prop="createTime" label="创建日期">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row stripe style="width: 100%" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('app.name')" prop="app.name" label="应用名称" />
+      <el-table-column v-if="columns.visible('servers')" prop="servers" label="服务器列表" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','deploy:edit','deploy:del'])" label="操作" width="150px" align="center">
+      <el-table-column v-permission="['admin','deploy:edit','deploy:del']" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','deploy:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','deploy:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right;margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+          />
         </template>
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudDeploy from '@/api/mnt/deploy'
 import dForm from './deploy'
 import fForm from './sysRestore'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '部署', url: 'api/deploy', crudMethod: { ...crudDeploy }})
+const defaultForm = { id: null, app: { id: null }, deploys: [] }
 export default {
-  components: { dForm, fForm },
-  mixins: [crud],
+  components: { dForm, fForm, pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
-      title: '部署',
-      crudMethod: { ...crudDeploy },
-      currentRow: {},
-      selectIndex: '',
-      appName: '',
-      urlHistory: '',
-      times: 0,
-      appId: '',
-      deployId: '',
-      apps: [],
-      servers: [],
-      form: {
-        id: null,
-        app: { id: null },
-        deploys: []
+      currentRow: {}, selectIndex: '', appName: '', urlHistory: '',
+      times: 0, appId: '', deployId: '', apps: [], servers: [],
+      permission: {
+        add: ['admin', 'deploy:add'],
+        edit: ['admin', 'deploy:edit'],
+        del: ['admin', 'deploy:del']
       },
       rules: {
         'app.id': [
@@ -170,32 +153,22 @@ export default {
       }
     }
   },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
   methods: {
-    beforeInit() {
-      this.url = 'api/deploy'
+    [CRUD.HOOK.beforeRefresh]() {
       this.selectIndex = ''
       return true
     },
-    // 打开新增弹窗前做的操作
-    beforeShowAddForm() {
-      this.initSelect()
-    },
-    // 打开编辑弹窗前做的操作
-    beforeShowEditForm(data) {
+    // 新增编辑前做的操作
+    [CRUD.HOOK.beforeToCU](crud, form) {
       this.initSelect()
       const deploys = []
-      data.deploys.forEach(function(deploy, index) {
+      form.deploys.forEach(function(deploy, index) {
         deploys.push(deploy.id)
       })
       this.form.deploys = deploys
     },
     // 提交前
-    beforeSubmitMethod() {
+    [CRUD.HOOK.beforeSubmit]() {
       const deploys = []
       this.form.deploys.forEach(function(data, index) {
         const deploy = { id: data }
@@ -205,19 +178,11 @@ export default {
       return true
     },
     deploy() {
-      if (!this.selectIndex) {
-        this.$message.error('请先选择服务')
-      } else {
-        this.$refs.deploy.dialog = true
-        this.$refs.deploy.deployInfo = this.currentRow
-      }
+      this.$refs.deploy.dialog = true
+      this.$refs.deploy.deployInfo = this.currentRow
     },
     sysRestore() {
-      if (!this.selectIndex) {
-        this.$message.error('请先选择服务')
-      } else {
-        this.$refs.sysRestore.dialog = true
-      }
+      this.$refs.sysRestore.dialog = true
     },
     handleCurrentChange(row) {
       this.currentRow = row
@@ -228,46 +193,34 @@ export default {
       this.deployId = !row ? null : row.id
     },
     startServer() {
-      if (!this.selectIndex) {
-        this.$message.error('请先选择服务')
-      } else {
-        this.crudMethod.startServer(JSON.stringify(this.currentRow))
-          .then(res => {
-          })
-          .catch(err => {
-            console.log('error:' + err.response.data.message)
-          })
-      }
+      crudDeploy.startServer(JSON.stringify(this.currentRow))
+        .then(res => {
+        })
+        .catch(err => {
+          console.log('error:' + err.response.data.message)
+        })
     },
     stopServer() {
-      if (!this.selectIndex) {
-        this.$message.error('请先选择服务')
-      } else {
-        this.crudMethod.stopServer(JSON.stringify(this.currentRow))
-          .then(res => {
-          })
-          .catch(err => {
-            console.log('error:' + err.response.data.message)
-          })
-      }
+      crudDeploy.stopServer(JSON.stringify(this.currentRow))
+        .then(res => {
+        })
+        .catch(err => {
+          console.log('error:' + err.response.data.message)
+        })
     },
     serverStatus() {
-      if (!this.selectIndex) {
-        this.$message.error('请先选择服务')
-      } else {
-        this.crudMethod.serverStatus(JSON.stringify(this.currentRow))
-          .then(res => {
-          })
-          .catch(err => {
-            console.log('error:' + err.response.data.message)
-          })
-      }
+      crudDeploy.serverStatus(JSON.stringify(this.currentRow))
+        .then(res => {
+        })
+        .catch(err => {
+          console.log('error:' + err.response.data.message)
+        })
     },
     initSelect() {
-      this.crudMethod.getApps().then(res => {
+      crudDeploy.getApps().then(res => {
         this.apps = res.content
       })
-      this.crudMethod.getServers().then(res => {
+      crudDeploy.getServers().then(res => {
         this.servers = res.content
       })
     }
diff --git a/src/views/mnt/deploy/sysRestore.vue b/src/views/mnt/deploy/sysRestore.vue
index 4e125ec..636f99c 100644
--- a/src/views/mnt/deploy/sysRestore.vue
+++ b/src/views/mnt/deploy/sysRestore.vue
@@ -10,8 +10,8 @@
         size="small"
         class="date-item"
         value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="部署开始日期"
-        end-placeholder="部署结束日期"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
       />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
     </div>
diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue
index de40997..597affd 100644
--- a/src/views/mnt/deployHistory/index.vue
+++ b/src/views/mnt/deployHistory/index.vue
@@ -2,17 +2,21 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.blurry" clearable placeholder="输入搜索内容" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.blurry" clearable placeholder="输入搜索内容" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission" />
     </div>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%">
-      <el-table-column prop="appName" label="应用名称" />
-      <el-table-column prop="ip" label="部署IP" />
-      <el-table-column prop="deployDate" label="部署时间" />
-      <el-table-column prop="deployUser" label="部署人员" />
-      <el-table-column v-if="checkPermission(['admin','deployHistory:del'])" label="操作" width="100px" align="center">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('appName')" prop="appName" label="应用名称" />
+      <el-table-column v-if="columns.visible('ip')" prop="ip" label="部署IP" />
+      <el-table-column v-if="columns.visible('deployDate')" prop="deployDate" label="部署时间" />
+      <el-table-column v-if="columns.visible('deployUser')" prop="deployUser" label="部署人员" />
+      <el-table-column v-permission="['admin','deployHistory:del']" label="操作" width="100px" align="center">
         <template slot-scope="scope">
           <el-popover
             :ref="scope.row.id"
@@ -31,38 +35,51 @@
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import { del } from '@/api/mnt/deployHistory'
-
+import CRUD, { presenter, header } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '部署历史', url: 'api/deployHistory', crudMethod: { del }})
 export default {
-  mixins: [crud],
+  name: 'DeployHistory',
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header()],
   data() {
     return {
-      title: '部署历史',
-      crudMethod: { del }
+      delLoading: false,
+      permission: {
+        del: ['admin', 'deployHistory:del']
+      }
     }
   },
   created() {
-    this.$nextTick(() => {
-      this.init()
-    })
+    this.crud.optShow = {
+      add: false,
+      edit: false,
+      del: true,
+      download: true
+    }
   },
   methods: {
-    beforeInit() {
-      this.url = 'api/deployHistory'
-      return true
+    delMethod(id) {
+      this.delLoading = true
+      del(id).then(() => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.crud.dleChangePage(1)
+        this.crud.delSuccessNotify()
+        this.crud.toQuery()
+      }).catch(() => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+      })
     }
   }
 }
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
index 46449d9..dab6dc5 100644
--- a/src/views/mnt/server/index.vue
+++ b/src/views/mnt/server/index.vue
@@ -2,33 +2,26 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.id" clearable placeholder="输入名称或IP搜索" style="width: 200px" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        v-permission="['admin','serverDeploy:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="showAddFormDialog"
-      >新增
-      </el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.id" clearable placeholder="输入名称或IP搜索" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission" />
     </div>
     <!--表单组件-->
-    <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="470px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="470px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="55px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" style="width: 370px" />
@@ -48,66 +41,63 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%">
-      <el-table-column prop="name" label="名称" />
-      <el-table-column prop="ip" label="IP" />
-      <el-table-column prop="port" label="端口" />
-      <el-table-column prop="account" label="账号" />
-      <el-table-column prop="createTime" label="创建日期">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('name')" prop="name" label="名称" />
+      <el-table-column v-if="columns.visible('ip')" prop="ip" label="IP" />
+      <el-table-column v-if="columns.visible('port')" prop="port" label="端口" />
+      <el-table-column v-if="columns.visible('account')" prop="account" label="账号" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','serverDeploy:edit','serverDeploy:del'])" label="操作" width="150px" align="center">
+      <el-table-column v-permission="['admin','serverDeploy:edit','serverDeploy:del']" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','serverDeploy:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','serverDeploy:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+          />
         </template>
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
+
 import crudServer from '@/api/mnt/serverDeploy'
 import { testServerConnect } from '@/api/mnt/connect'
 import { validateIP } from '@/utils/validate'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '服务器', url: 'api/serverDeploy', crudMethod: { ...crudServer }})
+const defaultForm = { id: null, name: null, ip: null, port: 22, account: 'root', password: null }
 export default {
-  mixins: [crud],
+  name: 'Server',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
-      title: '服务器',
-      crudMethod: { ...crudServer },
       accountList: [],
       accountMap: {},
-      form: { id: null, name: null, ip: null, port: 22, account: 'root', password: null },
+      loading: false,
+      permission: {
+        add: ['admin', 'serverDeploy:add'],
+        edit: ['admin', 'serverDeploy:edit'],
+        del: ['admin', 'serverDeploy:del']
+      },
       rules: {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
@@ -128,16 +118,7 @@ export default {
       }
     }
   },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
   methods: {
-    async beforeInit() {
-      this.url = 'api/serverDeploy'
-      return true
-    },
     testConnectServer() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index bb7965b..630b770 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -1,8 +1,23 @@
 <template>
   <div class="app-container">
-    <Search :query="query" />
+    <div class="head-container">
+      <Search />
+      <crudOperation>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :loading="crud.delAllLoading"
+          @click="confirmDelAll()"
+        >
+          清空
+        </el-button> v-if="columns.visible('username')"
+      </crudOperation>
+    </div>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%;">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
       <el-table-column type="expand">
         <template slot-scope="props">
           <el-form label-position="left" inline class="demo-table-expand">
@@ -15,17 +30,17 @@
           </el-form>
         </template>
       </el-table-column>
-      <el-table-column prop="username" label="用户名" />
-      <el-table-column prop="requestIp" label="IP" />
-      <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
-      <el-table-column prop="description" label="描述" />
-      <el-table-column prop="browser" label="浏览器" />
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column v-if="columns.visible('username')" prop="username" label="用户名" />
+      <el-table-column v-if="columns.visible('requestIp')" prop="requestIp" label="IP" />
+      <el-table-column v-if="columns.visible('address')" :show-overflow-tooltip="true" prop="address" label="IP来源" />
+      <el-table-column v-if="columns.visible('description')" prop="description" label="描述" />
+      <el-table-column v-if="columns.visible('browser')" prop="browser" label="浏览器" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="异常详情" width="100px">
+      <el-table-column label="异常详情" width="100px">
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="info(scope.row.id)">查看详情</el-button>
         </template>
@@ -35,42 +50,37 @@
       <pre v-highlightjs="errorInfo"><code class="java" /></pre>
     </el-dialog>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import { getErrDetail, delAllError } from '@/api/monitor/log'
 import Search from './search'
+import CRUD, { presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '异常日志', url: 'api/logs/error' })
 export default {
   name: 'ErrorLog',
-  components: { Search },
-  mixins: [crud],
+  components: { Search, crudOperation, pagination },
+  mixins: [presenter(defaultCrud)],
   data() {
     return {
       errorInfo: '', dialog: false
     }
   },
   created() {
-    this.$nextTick(() => {
-      this.init()
-    })
+    this.crud.optShow = {
+      add: false,
+      edit: false,
+      del: false,
+      download: true
+    }
   },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/logs/error'
-      this.params['logType'] = 'ERROR'
-      return true
-    },
     // 获取异常详情
     info(id) {
       this.dialog = true
@@ -79,29 +89,22 @@ export default {
       })
     },
     confirmDelAll() {
-      this.delAllLoading = true
-      delAllError().then(res => {
-        this.delAllLoading = false
-        this.$children.forEach(children => {
-          if (children.$refs.del_all) {
-            children.$refs.del_all.doClose()
-          }
+      this.$confirm(`确认清空所有异常日志吗?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.crud.delAllLoading = true
+        delAllError().then(res => {
+          this.crud.delAllLoading = false
+          this.crud.dleChangePage(1)
+          this.crud.delSuccessNotify()
+          this.crud.toQuery()
+        }).catch(err => {
+          this.crud.delAllLoading = false
+          console.log(err.response.data.message)
         })
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delAllLoading = false
-        this.$children.forEach(children => {
-          if (children.$refs.del_all) {
-            children.$refs.del_all.doClose()
-          }
-        })
-        console.log(err.response.data.message)
+      }).catch(() => {
       })
     }
   }
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index b19ce89..f5b68bc 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -1,8 +1,23 @@
 <template>
   <div class="app-container">
-    <Search :query="query" />
+    <div class="head-container">
+      <Search />
+      <crudOperation>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :loading="crud.delAllLoading"
+          @click="confirmDelAll()"
+        >
+          清空
+        </el-button>
+      </crudOperation>
+    </div>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%;">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
       <el-table-column type="expand">
         <template slot-scope="props">
           <el-form label-position="left" inline class="demo-table-expand">
@@ -15,80 +30,68 @@
           </el-form>
         </template>
       </el-table-column>
-      <el-table-column prop="username" label="用户名" />
-      <el-table-column prop="requestIp" label="IP" />
-      <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
-      <el-table-column prop="description" label="描述" />
-      <el-table-column prop="browser" label="浏览器" />
-      <el-table-column prop="time" label="请求耗时" align="center">
+      <el-table-column v-if="columns.visible('username')" prop="username" label="用户名" />
+      <el-table-column v-if="columns.visible('requestIp')" prop="requestIp" label="IP" />
+      <el-table-column v-if="columns.visible('address')" :show-overflow-tooltip="true" prop="address" label="IP来源" />
+      <el-table-column v-if="columns.visible('description')" prop="description" label="描述" />
+      <el-table-column v-if="columns.visible('browser')" prop="browser" label="浏览器" />
+      <el-table-column v-if="columns.visible('time')" prop="time" label="请求耗时" align="center">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
           <el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
           <el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期" width="180px">
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期" width="180px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import Search from './search'
 import { delAllInfo } from '@/api/monitor/log'
+import CRUD, { presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '日志', url: 'api/logs' })
 export default {
   name: 'Log',
-  components: { Search },
-  mixins: [crud],
+  components: { Search, crudOperation, pagination },
+  mixins: [presenter(defaultCrud)],
   created() {
-    this.$nextTick(() => {
-      this.init()
-    })
+    this.crud.optShow = {
+      add: false,
+      edit: false,
+      del: false,
+      download: true
+    }
   },
-  // 获取数据前设置好接口地址
   methods: {
-    beforeInit() {
-      this.url = 'api/logs'
-      this.params['logType'] = 'INFO'
-      return true
-    },
     confirmDelAll() {
-      this.delAllLoading = true
-      delAllInfo().then(res => {
-        this.delAllLoading = false
-        this.$children.forEach(children => {
-          if (children.$refs.del_all) {
-            children.$refs.del_all.doClose()
-          }
+      this.$confirm(`确认清空所有操作日志吗?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.crud.delAllLoading = true
+        delAllInfo().then(res => {
+          this.crud.delAllLoading = false
+          this.crud.dleChangePage(1)
+          this.crud.delSuccessNotify()
+          this.crud.toQuery()
+        }).catch(err => {
+          this.crud.delAllLoading = false
+          console.log(err.response.data.message)
         })
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delAllLoading = false
-        this.$children.forEach(children => {
-          if (children.$refs.del_all) {
-            children.$refs.del_all.doClose()
-          }
-        })
-        console.log(err.response.data.message)
+      }).catch(() => {
       })
     }
   }
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index 97e060b..0a3387e 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="head-container">
+  <div v-if="crud.props.searchToggle">
     <el-input
       v-model="query.blurry"
       clearable
@@ -19,53 +19,17 @@
       start-placeholder="开始日期"
       end-placeholder="结束日期"
     />
-    <el-button
-      class="filter-item"
-      size="mini"
-      type="success"
-      icon="el-icon-search"
-      @click="$parent.toQuery"
-    >搜索</el-button>
-    <!-- 导出 -->
-    <el-button
-      :loading="$parent.downloadLoading"
-      size="mini"
-      class="filter-item"
-      type="warning"
-      icon="el-icon-download"
-      @click="$parent.downloadMethod"
-    >导出</el-button>
-    <el-button
-      slot="reference"
-      v-popover:del_all
-      :loading="$parent.delAllLoading"
-      type="danger"
-      size="mini"
-      class="filter-item"
-      icon="el-icon-delete"
-    >清空</el-button>
-    <el-popover ref="del_all" placement="top" width="200" trigger="click">
-      <p>确定删除所有数据吗？</p>
-      <div style="text-align: right; margin: 0">
-        <el-button size="mini" type="text" @click="$refs['del_all'].doClose()">取消</el-button>
-        <el-button
-          :loading="$parent.delAllLoading"
-          type="primary"
-          size="mini"
-          @click="$parent.confirmDelAll"
-        >确定</el-button>
-      </div>
-    </el-popover>
+    <rrOperation
+      :crud="crud"
+    />
   </div>
 </template>
 
 <script>
+import { header } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
 export default {
-  props: {
-    query: {
-      type: Object,
-      required: true
-    }
-  }
+  components: { rrOperation },
+  mixins: [header()]
 }
 </script>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 0e069bf..afa227f 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -77,6 +77,7 @@ export default {
     }
   },
   created() {
+    this.crud.msg.del = '强退成功！'
     this.crud.optShow = {
       add: false,
       edit: false,
@@ -96,8 +97,8 @@ export default {
       del(key).then(() => {
         this.delLoading = false
         this.$refs[index].doClose()
-        this.dleChangePage()
-        this.notify('踢出成功', 'success')
+        this.crud.dleChangePage(1)
+        this.crud.delSuccessNotify()
         this.crud.toQuery()
       }).catch(() => {
         this.delLoading = false
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 947ae43..6815eab 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -2,31 +2,15 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者服务地址" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        v-permission="['admin','server:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="showAddFormDialog"
-      >新增
-      </el-button>
-      <!-- 刷新 -->
-      <el-button
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-refresh"
-        @click="toQuery"
-      >刷新
-      </el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者服务地址" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission" />
     </div>
     <!--表单组件-->
-    <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" style="width: 370px;" />
@@ -42,13 +26,14 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%;">
-      <el-table-column label="状态" width="50px">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('state')" prop="state" label="状态" width="50px">
         <template slot-scope="scope">
           <el-tag
             :type="scope.row.state === '1' ? 'success' : 'info'"
@@ -59,12 +44,12 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="名称" />
-      <el-table-column prop="address" label="地址" />
-      <el-table-column prop="port" label="端口" width="80px" align="center" />
-      <el-table-column :formatter="formatCpuRate" prop="cpuRate" label="CPU使用率" width="100px" align="center" />
-      <el-table-column prop="cpuCore" label="CPU内核数" width="100px" align="center" />
-      <el-table-column label="物理内存" align="center">
+      <el-table-column v-if="columns.visible('name')" prop="name" label="名称" />
+      <el-table-column v-if="columns.visible('address')" prop="address" label="地址" />
+      <el-table-column v-if="columns.visible('port')" prop="port" label="端口" width="80px" align="center" />
+      <el-table-column v-if="columns.visible('cpuRate')" :formatter="formatCpuRate" prop="cpuRate" label="CPU使用率" width="100px" align="center" />
+      <el-table-column v-if="columns.visible('cpuCore')" prop="cpuCore" label="CPU内核数" width="100px" align="center" />
+      <el-table-column v-if="columns.visible('memTotal')" prop="memTotal" label="物理内存" align="center">
         <template slot-scope="scope">
           <el-row>
             <el-col :span="24">{{ formatMem(scope.row) }}</el-col>
@@ -76,7 +61,7 @@
           </el-row>
         </template>
       </el-table-column>
-      <el-table-column :formatter="formatDisk" label="磁盘使用情况" align="center">
+      <el-table-column v-if="columns.visible('diskTotal')" prop="diskTotal" :formatter="formatDisk" label="磁盘使用情况" align="center">
         <template slot-scope="scope">
           <el-row>
             <el-col :span="24">{{ formatDisk(scope.row) }}</el-col>
@@ -88,7 +73,7 @@
           </el-row>
         </template>
       </el-table-column>
-      <el-table-column label="交换空间" align="center">
+      <el-table-column v-if="columns.visible('swapTotal')" prop="swapTotal" label="交换空间" align="center">
         <template slot-scope="scope">
           <el-row>
             <el-col :span="24">{{ formatSwap(scope.row) }}</el-col>
@@ -100,62 +85,41 @@
           </el-row>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','server:edit','server:del'])" label="操作" width="150px" align="center">
+      <el-table-column v-permission="['admin','server:edit','server:del']" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','server:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','server:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
-        </template>
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+          />
+        </template> v-if="columns.visible('name')"
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudServer from '@/api/monitor/server'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '监控', url: 'api/server', sort: 'sort,asc', crudMethod: { ...crudServer }})
+const defaultForm = { id: null, name: null, ip: null, port: 8777, state: null, cpuRate: null, cpuCore: null, memTotal: null, memUsed: null, diskTotal: null, diskUsed: null, swapTotal: null, swapUsed: null, sort: 999 }
 export default {
   name: 'ServerMonitor',
-  mixins: [crud],
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
-      title: '监控',
-      crudMethod: { ...crudServer },
-      form: {
-        id: null,
-        name: null,
-        ip: null,
-        port: 8777,
-        state: null,
-        cpuRate: null,
-        cpuCore: null,
-        memTotal: null,
-        memUsed: null,
-        diskTotal: null,
-        diskUsed: null,
-        swapTotal: null,
-        swapUsed: null,
-        sort: 999
+      permission: {
+        add: ['admin', 'server:add'],
+        edit: ['admin', 'server:edit'],
+        del: ['admin', 'server:del']
       },
       rules: {
         name: [
@@ -170,18 +134,7 @@ export default {
       }
     }
   },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/server'
-      this.sort = 'sort,asc'
-      return true
-    },
     formatCpuRate(row, column) {
       const value = row.cpuRate
       if (!value) {

From b3528e88d0d37aca83cfd35ca4ccd50d052be04d Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Wed, 18 Dec 2019 13:24:39 +0800
Subject: [PATCH 57/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/monitor/online.js              |  7 ++--
 src/api/monitor/server.js              |  7 ++--
 src/api/system/dept.js                 | 17 +++------
 src/api/system/job.js                  | 17 +++------
 src/api/system/menu.js                 | 17 +++------
 src/api/system/role.js                 | 17 +++------
 src/api/system/user.js                 | 17 +++------
 src/components/Crud/CRUD.operation.vue |  6 +--
 src/components/Crud/crud.js            | 52 +++++++++++---------------
 src/views/login.vue                    |  2 +-
 src/views/monitor/online/index.vue     | 29 +++++++++++---
 src/views/monitor/server/index.vue     |  5 ++-
 src/views/system/dept/index.vue        |  5 ++-
 src/views/system/job/module/form.vue   |  2 +-
 src/views/system/role/index.vue        |  4 +-
 15 files changed, 91 insertions(+), 113 deletions(-)

diff --git a/src/api/monitor/online.js b/src/api/monitor/online.js
index fc9a90c..057275b 100644
--- a/src/api/monitor/online.js
+++ b/src/api/monitor/online.js
@@ -1,8 +1,9 @@
 import request from '@/utils/request'
 
-export function del(key) {
+export function del(keys) {
   return request({
-    url: 'auth/online/' + key,
-    method: 'delete'
+    url: 'auth/online',
+    method: 'delete',
+    data: keys
   })
 }
diff --git a/src/api/monitor/server.js b/src/api/monitor/server.js
index 5c2b234..2ade356 100644
--- a/src/api/monitor/server.js
+++ b/src/api/monitor/server.js
@@ -8,10 +8,11 @@ export function add(data) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/server/' + id,
-    method: 'delete'
+    url: 'api/server',
+    method: 'delete',
+    data: ids
   })
 }
 
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index a071bee..59998ba 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -16,10 +16,11 @@ export function add(data) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/dept/' + id,
-    method: 'delete'
+    url: 'api/dept',
+    method: 'delete',
+    data: ids
   })
 }
 
@@ -31,12 +32,4 @@ export function edit(data) {
   })
 }
 
-export function delAll(ids) {
-  return request({
-    url: 'api/dept/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export default { add, edit, del, getDepts, delAll }
+export default { add, edit, del, getDepts }
diff --git a/src/api/system/job.js b/src/api/system/job.js
index 56b3cc5..2888c05 100644
--- a/src/api/system/job.js
+++ b/src/api/system/job.js
@@ -21,10 +21,11 @@ export function add(data) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/job/' + id,
-    method: 'delete'
+    url: 'api/job',
+    method: 'delete',
+    data: ids
   })
 }
 
@@ -36,12 +37,4 @@ export function edit(data) {
   })
 }
 
-export function delAll(ids) {
-  return request({
-    url: 'api/job/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export default { add, edit, del, delAll }
+export default { add, edit, del }
diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index 86e917f..4e8ac90 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -22,10 +22,11 @@ export function add(data) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/menus/' + id,
-    method: 'delete'
+    url: 'api/menus',
+    method: 'delete',
+    data: ids
   })
 }
 
@@ -37,12 +38,4 @@ export function edit(data) {
   })
 }
 
-export function delAll(ids) {
-  return request({
-    url: 'api/menus/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export default { add, edit, del, getMenusTree, delAll }
+export default { add, edit, del, getMenusTree }
diff --git a/src/api/system/role.js b/src/api/system/role.js
index b74c255..198e328 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -30,10 +30,11 @@ export function getLevel() {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/roles/' + id,
-    method: 'delete'
+    url: 'api/roles',
+    method: 'delete',
+    data: ids
   })
 }
 
@@ -53,12 +54,4 @@ export function editMenu(data) {
   })
 }
 
-export function delAll(ids) {
-  return request({
-    url: 'api/roles/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export default { add, edit, del, get, editMenu, delAll }
+export default { add, edit, del, get, editMenu }
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 9f91992..6cd91a5 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -9,10 +9,11 @@ export function add(data) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/users/' + id,
-    method: 'delete'
+    url: 'api/users',
+    method: 'delete',
+    data: ids
   })
 }
 
@@ -56,13 +57,5 @@ export function updateEmail(form) {
   })
 }
 
-export function delAll(ids) {
-  return request({
-    url: 'api/users/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export default { add, edit, del, delAll }
+export default { add, edit, del }
 
diff --git a/src/components/Crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue
index fe7debd..206616c 100644
--- a/src/components/Crud/CRUD.operation.vue
+++ b/src/components/Crud/CRUD.operation.vue
@@ -126,11 +126,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.crud.delAllLoading = true
-        if (datas.length === 1) {
-          this.crud.doDelete(datas[0])
-        } else {
-          this.crud.doDeletes(datas)
-        }
+        this.crud.doDelete(datas)
       }).catch(() => {
       })
     },
diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
index 31deb9e..a07ce92 100644
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -264,8 +264,8 @@ function CRUD(options) {
       crud.crudMethod.edit(crud.form).then(() => {
         crud.status.edit = CRUD.STATUS.NORMAL
         crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL
-        crud.resetForm()
         crud.editSuccessNotify()
+        crud.resetForm()
         callVmHook(crud, CRUD.HOOK.afterSubmit)
         crud.refresh()
       }).catch(() => {
@@ -277,44 +277,36 @@ function CRUD(options) {
      * @param {*} data 数据项
      */
     doDelete(data) {
-      const dataStatus = crud.getDataStatus(data.id)
-      if (!callVmHook(crud, CRUD.HOOK.beforeDelete, data)) {
-        return
-      }
-      dataStatus.delete = CRUD.STATUS.PROCESSING
-      return crud.crudMethod.del(data.id).then(() => {
-        dataStatus.delete = CRUD.STATUS.NORMAL
-        crud.dleChangePage(1)
-        crud.delSuccessNotify()
-        callVmHook(crud, CRUD.HOOK.afterDelete, data)
-        crud.refresh()
-        crud.delAllLoading = false
-      }).catch(() => {
-        crud.delAllLoading = false
-        dataStatus.delete = CRUD.STATUS.PREPARED
-      })
-    },
-    /**
-     * 删除多条记录
-     * @param datas
-     * @returns {Promise<T>}
-     */
-    doDeletes(datas) {
+      let delAll = false
+      let dataStatus
       const ids = []
-      datas.forEach(val => {
-        ids.push(val.id)
-      })
+      if (data instanceof Array) {
+        delAll = true
+        data.forEach(val => {
+          ids.push(val.id)
+        })
+      } else {
+        ids.push(data.id)
+        dataStatus = crud.getDataStatus(data.id)
+      }
       if (!callVmHook(crud, CRUD.HOOK.beforeDelete, data)) {
         return
       }
-      return crud.crudMethod.delAll(ids).then(() => {
+      if (!delAll) {
+        dataStatus.delete = CRUD.STATUS.PROCESSING
+      }
+      return crud.crudMethod.del(ids).then(() => {
+        if (delAll) {
+          crud.delAllLoading = false
+        } else dataStatus.delete = CRUD.STATUS.PREPARED
         crud.dleChangePage(1)
         crud.delSuccessNotify()
         callVmHook(crud, CRUD.HOOK.afterDelete, data)
-        crud.delAllLoading = false
         crud.refresh()
       }).catch(() => {
-        crud.delAllLoading = false
+        if (delAll) {
+          crud.delAllLoading = false
+        } else dataStatus.delete = CRUD.STATUS.PREPARED
       })
     },
     /**
diff --git a/src/views/login.vue b/src/views/login.vue
index 21801a2..5eb6053 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -19,7 +19,7 @@
           <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
         </el-input>
         <div class="login-code">
-          <img :src="codeUrl" alt="验证码" @click="getCode">
+          <img :src="codeUrl" alt="加载失败" @click="getCode">
         </div>
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index afa227f..cb735b6 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -12,9 +12,9 @@
           type="danger"
           icon="el-icon-delete"
           size="mini"
-          :loading="crud.delAllLoading"
+          :loading="delLoading"
           :disabled="crud.selections.length === 0"
-          @click="crud.toDelete(crud.selections)"
+          @click="doDelete(crud.selections)"
         >
           强退
         </el-button>
@@ -91,18 +91,37 @@ export default {
       this.url = 'auth/online'
       return true
     },
+    doDelete(datas) {
+      this.$confirm(`确认强退选中的${datas.length}个用户?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.delMethod(datas)
+      }).catch(() => {})
+    },
     // 踢出用户
     delMethod(key, index) {
+      const ids = []
+      if (key instanceof Array) {
+        key.forEach(val => {
+          ids.push(val.key)
+        })
+      } else ids.push(key)
       this.delLoading = true
-      del(key).then(() => {
+      del(ids).then(() => {
         this.delLoading = false
-        this.$refs[index].doClose()
+        if (this.$refs[index]) {
+          this.$refs[index].doClose()
+        }
         this.crud.dleChangePage(1)
         this.crud.delSuccessNotify()
         this.crud.toQuery()
       }).catch(() => {
         this.delLoading = false
-        this.$refs[index].doClose()
+        if (this.$refs[index]) {
+          this.$refs[index].doClose()
+        }
       })
     }
   }
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 6815eab..6e3c461 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -109,7 +109,7 @@ import pagination from '@crud/Pagination'
 
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '监控', url: 'api/server', sort: 'sort,asc', crudMethod: { ...crudServer }})
-const defaultForm = { id: null, name: null, ip: null, port: 8777, state: null, cpuRate: null, cpuCore: null, memTotal: null, memUsed: null, diskTotal: null, diskUsed: null, swapTotal: null, swapUsed: null, sort: 999 }
+const defaultForm = { id: null, address: 'localhost', name: null, ip: null, port: 8777, state: null, cpuRate: null, cpuCore: null, memTotal: null, memUsed: null, diskTotal: null, diskUsed: null, swapTotal: null, swapUsed: null, sort: 999 }
 export default {
   name: 'ServerMonitor',
   components: { pagination, crudOperation, rrOperation, udOperation },
@@ -134,6 +134,9 @@ export default {
       }
     }
   },
+  created() {
+    this.crud.optShow.download = false
+  },
   methods: {
     formatCpuRate(row, column) {
       const value = row.cpuRate
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index f9fc870..6597112 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -43,7 +43,7 @@
     </el-dialog>
     <!--表格渲染-->
     <el-table ref="table" v-loading="crud.loading" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" default-expand-all :data="crud.data" row-key="id" @select="crud.selectChange" @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler">
-      <el-table-column type="selection" width="55" />
+      <el-table-column :selectable="checkboxT" type="selection" width="55" />
       <el-table-column v-if="columns.visible('name')" label="名称" prop="name" />
       <el-table-column v-if="columns.visible('enabled')" label="状态" align="center" prop="enabled">
         <template slot-scope="scope">
@@ -148,6 +148,9 @@ export default {
       }).catch(() => {
         data.enabled = !data.enabled
       })
+    },
+    checkboxT(row, rowIndex) {
+      return row.id !== 1
     }
   }
 }
diff --git a/src/views/system/job/module/form.vue b/src/views/system/job/module/form.vue
index 0f2dc90..ce4bbcc 100644
--- a/src/views/system/job/module/form.vue
+++ b/src/views/system/job/module/form.vue
@@ -95,7 +95,7 @@ const defaultForm = {
   sort: 999,
   enabled: true,
   dept: {
-    id: null
+    id: 1
   }
 }
 export default {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 5bbaa7a..3a0abd4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -134,7 +134,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }})
-const defaultForm = { name: null, depts: [], remark: null, dataScope: null, level: 3, permission: null }
+const defaultForm = { name: null, depts: [], remark: null, dataScope: '全部', level: 3, permission: null }
 export default {
   name: 'Role',
   components: { Treeselect, pagination, crudOperation, rrOperation, udOperation },
@@ -172,7 +172,6 @@ export default {
     },
     // 编辑前
     [CRUD.HOOK.beforeToEdit](crud, form) {
-      console.log(form.dataScope)
       if (form.dataScope === '自定义') {
         this.getDepts()
       }
@@ -181,7 +180,6 @@ export default {
         depts.push(dept.id)
       })
       form.depts = depts
-      console.log(form)
     },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {

From 965e9266e734fe41706cb7445ef655dcb9fff975 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Wed, 18 Dec 2019 21:07:07 +0800
Subject: [PATCH 58/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mnt/app.js                     |  7 ++++---
 src/api/mnt/database.js                |  7 ++++---
 src/api/mnt/deploy.js                  |  7 ++++---
 src/api/mnt/deployHistory.js           |  7 ++++---
 src/api/mnt/serverDeploy.js            |  7 ++++---
 src/components/Crud/CRUD.operation.vue |  1 +
 src/views/login.vue                    |  2 +-
 src/views/mnt/database/index.vue       | 23 ++++++++++++++++++-----
 src/views/mnt/deploy/index.vue         |  2 +-
 src/views/mnt/deployHistory/index.vue  | 18 +++++++++++++++++-
 src/views/system/user/index.vue        |  5 ++++-
 11 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/src/api/mnt/app.js b/src/api/mnt/app.js
index 584d322..2a27054 100644
--- a/src/api/mnt/app.js
+++ b/src/api/mnt/app.js
@@ -8,10 +8,11 @@ export function add(data) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/app/' + id,
-    method: 'delete'
+    url: 'api/app',
+    method: 'delete',
+    data: ids
   })
 }
 
diff --git a/src/api/mnt/database.js b/src/api/mnt/database.js
index b25a8a8..91797fb 100644
--- a/src/api/mnt/database.js
+++ b/src/api/mnt/database.js
@@ -8,10 +8,11 @@ export function add(data) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/database/' + id,
-    method: 'delete'
+    url: 'api/database',
+    method: 'delete',
+    data: ids
   })
 }
 
diff --git a/src/api/mnt/deploy.js b/src/api/mnt/deploy.js
index 1647585..c1475ea 100644
--- a/src/api/mnt/deploy.js
+++ b/src/api/mnt/deploy.js
@@ -8,10 +8,11 @@ export function add(data) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/deploy/' + id,
-    method: 'delete'
+    url: 'api/deploy',
+    method: 'delete',
+    data: ids
   })
 }
 
diff --git a/src/api/mnt/deployHistory.js b/src/api/mnt/deployHistory.js
index eb36dce..30335e4 100644
--- a/src/api/mnt/deployHistory.js
+++ b/src/api/mnt/deployHistory.js
@@ -1,9 +1,10 @@
 import request from '@/utils/request'
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/deployHistory/' + id,
-    method: 'delete'
+    url: 'api/deployHistory',
+    method: 'delete',
+    data: ids
   })
 }
 
diff --git a/src/api/mnt/serverDeploy.js b/src/api/mnt/serverDeploy.js
index 29fb6bb..e796114 100644
--- a/src/api/mnt/serverDeploy.js
+++ b/src/api/mnt/serverDeploy.js
@@ -8,10 +8,11 @@ export function add(data) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/serverDeploy/' + id,
-    method: 'delete'
+    url: 'api/serverDeploy',
+    method: 'delete',
+    data: ids
   })
 }
 
diff --git a/src/components/Crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue
index 206616c..de052b7 100644
--- a/src/components/Crud/CRUD.operation.vue
+++ b/src/components/Crud/CRUD.operation.vue
@@ -43,6 +43,7 @@
       <el-button
         v-if="crud.optShow.download"
         :loading="crud.downloadLoading"
+        :disabled="!crud.data.length"
         class="filter-item"
         size="mini"
         type="warning"
diff --git a/src/views/login.vue b/src/views/login.vue
index 5eb6053..d3833fd 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -19,7 +19,7 @@
           <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
         </el-input>
         <div class="login-code">
-          <img :src="codeUrl" alt="加载失败" @click="getCode">
+          <img :src="codeUrl" @click="getCode">
         </div>
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 1085dd5..5fd6918 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -5,12 +5,24 @@
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
         <el-input v-model="query.blurry" clearable placeholder="模糊搜索" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
         <rrOperation :crud="crud" />
       </div>
       <crudOperation :permission="permission">
         <el-button
           slot="right"
           v-permission="['admin','database:add']"
+          :disabled="!selectIndex"
           class="filter-item"
           size="mini"
           type="warning"
@@ -49,6 +61,11 @@
       <el-table-column v-if="columns.visible('name')" prop="name" label="数据库名称" />
       <el-table-column v-if="columns.visible('jdbcUrl')" prop="jdbcUrl" label="连接地址" />
       <el-table-column v-if="columns.visible('userName')" prop="userName" label="用户名" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column v-permission="['admin','database:edit','database:del']" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <udOperation
@@ -121,11 +138,7 @@ export default {
       })
     },
     execute() {
-      if (!this.selectIndex) {
-        this.$message.error('请先选择数据库')
-      } else {
-        this.$refs.execute.dialog = true
-      }
+      this.$refs.execute.dialog = true
     },
     handleCurrentChange(row) {
       this.currentRow = row
diff --git a/src/views/mnt/deploy/index.vue b/src/views/mnt/deploy/index.vue
index 665245a..0f0762e 100644
--- a/src/views/mnt/deploy/index.vue
+++ b/src/views/mnt/deploy/index.vue
@@ -100,7 +100,7 @@
       <el-table-column type="selection" width="55" />
       <el-table-column v-if="columns.visible('app.name')" prop="app.name" label="应用名称" />
       <el-table-column v-if="columns.visible('servers')" prop="servers" label="服务器列表" />
-      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="部署日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue
index 597affd..924589a 100644
--- a/src/views/mnt/deployHistory/index.vue
+++ b/src/views/mnt/deployHistory/index.vue
@@ -5,6 +5,18 @@
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
         <el-input v-model="query.blurry" clearable placeholder="输入搜索内容" style="width: 200px" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-date-picker
+          v-model="query.deployDate"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          style="width: 240px"
+          start-placeholder="部署开始日期"
+          end-placeholder="部署结束日期"
+        />
         <rrOperation :crud="crud" />
       </div>
       <crudOperation :permission="permission" />
@@ -14,8 +26,12 @@
       <el-table-column type="selection" width="55" />
       <el-table-column v-if="columns.visible('appName')" prop="appName" label="应用名称" />
       <el-table-column v-if="columns.visible('ip')" prop="ip" label="部署IP" />
-      <el-table-column v-if="columns.visible('deployDate')" prop="deployDate" label="部署时间" />
       <el-table-column v-if="columns.visible('deployUser')" prop="deployUser" label="部署人员" />
+      <el-table-column v-if="columns.visible('deployDate')" prop="deployDate" label="部署时间">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deployDate) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column v-permission="['admin','deployHistory:del']" label="操作" width="100px" align="center">
         <template slot-scope="scope">
           <el-popover
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1dc5e77..2498666 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -143,7 +143,7 @@
         </el-dialog>
         <!--表格渲染-->
         <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-          <el-table-column type="selection" width="55" />
+          <el-table-column :selectable="checkboxT" type="selection" width="55" />
           <el-table-column v-if="columns.visible('username')" :show-overflow-tooltip="true" prop="username" label="用户名" />
           <el-table-column v-if="columns.visible('nickName')" :show-overflow-tooltip="true" prop="nickName" label="昵称" />
           <el-table-column v-if="columns.visible('sex')" prop="sex" label="性别" />
@@ -418,6 +418,9 @@ export default {
       getLevel().then(res => {
         this.level = res.level
       }).catch(() => { })
+    },
+    checkboxT(row, rowIndex) {
+      return row.id !== this.user.id
     }
   }
 }

From b9b48e139b5c71c2889077c123e53b99dcf59f1f Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Thu, 19 Dec 2019 12:33:49 +0800
Subject: [PATCH 59/64] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=85=8D=E8=B4=B9?=
 =?UTF-8?q?=E5=9B=BE=E5=BA=8A=E7=AE=A1=E7=90=86=EF=BC=8C=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E5=8F=AF=E4=BB=A5=E5=89=8D=E5=BE=80?=
 =?UTF-8?q?=EF=BC=9Ahttps://sm.ms/=20=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                      |   2 +-
 src/api/tools/picture.js          |  13 +-
 src/components/SvgIcon/index.vue  |   2 +-
 src/views/tools/picture/index.vue | 200 ------------------------------
 4 files changed, 5 insertions(+), 212 deletions(-)
 delete mode 100644 src/views/tools/picture/index.vue

diff --git a/package.json b/package.json
index 2cf4532..d508830 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
-    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
+    "svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml",
     "new": "plop"
   },
   "husky": {
diff --git a/src/api/tools/picture.js b/src/api/tools/picture.js
index a689c77..f5ea30f 100644
--- a/src/api/tools/picture.js
+++ b/src/api/tools/picture.js
@@ -1,18 +1,11 @@
 import request from '@/utils/request'
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/pictures/' + id,
-    method: 'delete'
-  })
-}
-
-export function delAll(ids) {
-  return request({
-    url: 'api/pictures/',
+    url: 'api/pictures',
     method: 'delete',
     data: ids
   })
 }
 
-export default { del, delAll }
+export default { del }
diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
index b07ded2..9a3318e 100644
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="isExternal" :style="styleExternalIcon" class="svg-external-icon svg-icon" v-on="$listeners" />
   <svg v-else :class="svgClass" aria-hidden="true" v-on="$listeners">
-    <use :xlink:href="iconName" />
+    <use :href="iconName" />
   </svg>
 </template>
 
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
deleted file mode 100644
index f04d24a..0000000
--- a/src/views/tools/picture/index.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!--搜索-->
-      <el-input v-model="query.filename" clearable size="small" placeholder="输入文件名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 上传 -->
-      <el-button
-        v-permission="['admin','pictures:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-upload"
-        @click="dialog = true"
-      >上传图片</el-button>
-      <el-button
-        v-permission="['admin','pictures:del']"
-        :loading="delAllLoading"
-        :disabled="data.length === 0 || $refs.table.selection.length === 0"
-        class="filter-item"
-        size="mini"
-        type="danger"
-        icon="el-icon-delete"
-        @click="beforeDelAllMethod"
-      >删除</el-button>
-      <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="downloadMethod"
-        >导出</el-button>
-      </div>
-    </div>
-    <!--上传图片-->
-    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="600px" @close="doSubmit">
-      <el-upload
-        :on-preview="handlePictureCardPreview"
-        :before-remove="handleBeforeRemove"
-        :on-success="handleSuccess"
-        :on-error="handleError"
-        :headers="headers"
-        :file-list="fileList"
-        :action="imagesUploadApi"
-        list-type="picture-card"
-      >
-        <i class="el-icon-plus" />
-      </el-upload>
-      <el-dialog append-to-body :visible.sync="dialogVisible">
-        <img :src="dialogImageUrl" width="100%" alt="">
-      </el-dialog>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="doSubmit">确认</el-button>
-      </div>
-    </el-dialog>
-    <!--表格渲染-->
-    <el-table ref="table" v-loading="loading" :data="data" style="width: 100%;">
-      <el-table-column type="selection" width="55" />
-      <el-table-column prop="filename" label="文件名" />
-      <el-table-column prop="username" label="上传者" />
-      <el-table-column ref="table" :show-overflow-tooltip="true" prop="url" label="缩略图">
-        <template slot-scope="{row}">
-          <el-image
-            :src="row.url"
-            :preview-src-list="[row.url]"
-            fit="contain"
-            lazy
-            class="el-avatar"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column prop="size" label="文件大小" />
-      <el-table-column prop="height" label="高度" />
-      <el-table-column prop="width" label="宽度" />
-      <el-table-column width="180px" prop="createTime" label="创建日期">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','pictures:del'])" label="操作" width="100px" align="center" fixed="right">
-        <template slot-scope="scope">
-          <el-popover
-            :ref="scope.row.id"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
-  </div>
-</template>
-
-<script>
-import crud from '@/mixins/crud'
-import { mapGetters } from 'vuex'
-import crudPic from '@/api/tools/picture'
-import { getToken } from '@/utils/auth'
-export default {
-  name: 'Pictures',
-  mixins: [crud],
-  data() {
-    return {
-      title: '图片',
-      crudMethod: { ...crudPic },
-      headers: {
-        'Authorization': getToken()
-      },
-      dialogImageUrl: '',
-      dialogVisible: false,
-      fileList: [],
-      pictures: []
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'imagesUploadApi'
-    ])
-  },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
-  methods: {
-    beforeInit() {
-      this.url = 'api/pictures'
-      return true
-    },
-    handleSuccess(response, file, fileList) {
-      const uid = file.uid
-      const id = response.id
-      this.pictures.push({ uid, id })
-    },
-    handleBeforeRemove(file, fileList) {
-      for (let i = 0; i < this.pictures.length; i++) {
-        if (this.pictures[i].uid === file.uid) {
-          this.crudMethod.del(this.pictures[i].id).then(res => {})
-          return true
-        }
-      }
-    },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
-    },
-    // 刷新列表数据
-    doSubmit() {
-      this.fileList = []
-      this.dialogVisible = false
-      this.dialogImageUrl = ''
-      this.dialog = false
-      this.init()
-    },
-    // 监听上传失败
-    handleError(e, file, fileList) {
-      const msg = JSON.parse(e.message)
-      this.$notify({
-        title: msg.message,
-        type: 'error',
-        duration: 2500
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

From 4ccb6cb81c19f185c09de035b28597da28493414 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Fri, 20 Dec 2019 19:30:06 +0800
Subject: [PATCH 60/64] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=EF=BC=8C=E5=8A=A0=E5=85=A5=E5=9B=BE=E5=BA=8A?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/timing.js          |   7 +-
 src/api/tools/picture.js          |   9 +-
 src/utils/upload.js               |  11 ++
 src/views/components/Editor.vue   |  53 +++++----
 src/views/components/MarkDown.vue |  40 ++-----
 src/views/system/timing/index.vue | 172 +++++++++++++--------------
 src/views/tools/email/send.vue    |  42 ++++---
 src/views/tools/picture/index.vue | 185 ++++++++++++++++++++++++++++++
 8 files changed, 353 insertions(+), 166 deletions(-)
 create mode 100644 src/utils/upload.js
 create mode 100644 src/views/tools/picture/index.vue

diff --git a/src/api/system/timing.js b/src/api/system/timing.js
index 95e9497..613e15f 100644
--- a/src/api/system/timing.js
+++ b/src/api/system/timing.js
@@ -8,10 +8,11 @@ export function add(data) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request({
-    url: 'api/jobs/' + id,
-    method: 'delete'
+    url: 'api/jobs',
+    method: 'delete',
+    data: ids
   })
 }
 
diff --git a/src/api/tools/picture.js b/src/api/tools/picture.js
index f5ea30f..237d5f5 100644
--- a/src/api/tools/picture.js
+++ b/src/api/tools/picture.js
@@ -8,4 +8,11 @@ export function del(ids) {
   })
 }
 
-export default { del }
+export function sync() {
+  return request({
+    url: 'api/pictures/synchronize',
+    method: 'post'
+  })
+}
+
+export default { del, sync }
diff --git a/src/utils/upload.js b/src/utils/upload.js
new file mode 100644
index 0000000..945414b
--- /dev/null
+++ b/src/utils/upload.js
@@ -0,0 +1,11 @@
+import axios from 'axios'
+import { getToken } from '@/utils/auth'
+
+export function upload(api, file) {
+  var data = new FormData()
+  data.append('file', file)
+  const config = {
+    headers: { 'Authorization': getToken() }
+  }
+  return axios.post(api, data, config)
+}
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index cfb243b..8a12323 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -1,26 +1,33 @@
 <template>
-  <div>
-    <div ref="editor" class="text" />
-    <div style="margin: 12px 5px;font-size: 16px;font-weight: bold;color: #696969">HTML渲染如下：</div>
-    <div class="editor-content" v-html="editorContent" />
+  <div class="app-container">
+    <p class="warn-content">
+      Markdown 基于
+      <el-link type="primary" href="https://www.kancloud.cn/wangfupeng/wangeditor3/332599" target="_blank">wangEditor</el-link>
+      ，图片上传使用 <el-link type="primary" href="https://sm.ms/" target="_blank">SM.MS</el-link>
+    </p>
+    <el-row :gutter="10">
+      <el-col :xs="24" :sm="24" :md="15" :lg="15" :xl="15">
+        <div ref="editor" class="text" />
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="9" :lg="9" :xl="9">
+        <div v-html="editorContent" />
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
+import { upload } from '@/utils/upload'
 import E from 'wangeditor'
-import { getToken } from '@/utils/auth'
 export default {
   name: 'Editor',
   data() {
     return {
-      headers: {
-        'Authorization': getToken()
-      },
       editorContent:
-        `<h3 style="text-align: center;">欢迎使用 wangEditor 富文本编辑器!</h3>
+        `
         <ul>
-          <li>富文本中图片上传使用的是sm.ms图床，支持上传到七牛云：<a style="color: #42b983" target="_blank" href="https://sm.ms/">sm.ms</a></li>
+          <li>富文本中图片上传使用的是 SM.MS 图床：<a style="color: #42b983" target="_blank" href="https://sm.ms/">sm.ms</a></li>
           <li>更多帮助请查看官方文档：<a style="color: #42b983" target="_blank" href="https://www.kancloud.cn/wangfupeng/wangeditor3/332599">wangEditor</a></li>
         </ul>`
     }
@@ -31,13 +38,20 @@ export default {
     ])
   },
   mounted() {
+    const _this = this
     var editor = new E(this.$refs.editor)
-    editor.customConfig.uploadImgShowBase64 = true // 使用 base64 保存图片
-    // 不可修改
-    editor.customConfig.uploadImgHeaders = this.headers
-    // 自定义文件名，不可修改，修改后会上传失败
-    editor.customConfig.uploadFileName = 'file'
-    editor.customConfig.uploadImgServer = this.imagesUploadApi // 上传图片到服务器
+    // 自定义菜单配置
+    editor.customConfig.zIndex = 10
+    // 文件上传
+    editor.customConfig.customUploadImg = function(files, insert) {
+      // files 是 input 中选中的文件列表
+      // insert 是获取图片 url 后，插入到编辑器的方法
+      files.forEach(image => {
+        upload(_this.imagesUploadApi, image).then(data => {
+          insert(data.data.url)
+        })
+      })
+    }
     editor.customConfig.onchange = (html) => {
       this.editorContent = html
     }
@@ -49,11 +63,10 @@ export default {
 </script>
 
 <style scoped>
-  .editor-content{
-    padding-left: 5px;
-  }
   .text {
     text-align:left;
-    margin: 5px
+  }
+  /deep/ .w-e-text-container {
+    height: 420px !important;
   }
 </style>
diff --git a/src/views/components/MarkDown.vue b/src/views/components/MarkDown.vue
index 0a84522..ed734a5 100644
--- a/src/views/components/MarkDown.vue
+++ b/src/views/components/MarkDown.vue
@@ -2,24 +2,21 @@
   <div class="app-container">
     <p class="warn-content">
       Markdown 基于
-      <a href="https://github.com/hinesboy/mavonEditor" target="_blank">mavonEditor</a>
+      <el-link type="primary" href="https://github.com/hinesboy/mavonEditor" target="_blank">MavonEditor</el-link>
+      ，图片上传使用 <el-link type="primary" href="https://sm.ms/" target="_blank">SM.MS</el-link>
     </p>
-    <mavon-editor ref="md" :style="'height:' + height" @imgAdd="imgAdd" @imgDel="imgDel" />
+    <mavon-editor ref="md" :style="'height:' + height" @imgAdd="imgAdd" />
   </div>
 </template>
 
 <script>
-import axios from 'axios'
+import { upload } from '@/utils/upload'
 import { mapGetters } from 'vuex'
-import { getToken } from '@/utils/auth'
-import { del } from '@/api/tools/picture'
 export default {
   name: 'Markdown',
   data() {
     return {
-      height: document.documentElement.clientHeight - 200 + 'px',
-      data: null,
-      images: {}
+      height: document.documentElement.clientHeight - 200 + 'px'
     }
   },
   computed: {
@@ -28,7 +25,6 @@ export default {
     ])
   },
   mounted() {
-    this.$refs.md.$refs.toolbar_left.img_file = []
     const that = this
     window.onresize = function temp() {
       that.height = document.documentElement.clientHeight - 200 + 'px'
@@ -36,31 +32,9 @@ export default {
   },
   methods: {
     imgAdd(pos, $file) {
-      var formdata = new FormData()
-      formdata.append('file', $file)
-      axios({
-        url: this.imagesUploadApi,
-        method: 'post',
-        data: formdata,
-        headers: { 'Content-Type': 'multipart/form-data', 'Authorization': getToken() }
-      }).then((data) => {
-        this.data = data.data
-        this.$refs.md.$img2Url(pos, this.data.data[0])
-
-        this.images[this.data.data[0]] = this.data
-      }).catch((error) => {
-        console.log('image upload error', error)
-        this.$refs.md.$refs.toolbar_left.$imgDel(pos)
+      upload(this.imagesUploadApi, $file).then(data => {
+        this.$refs.md.$img2Url(pos, data.data.url)
       })
-    },
-    imgDel(file, pos) {
-      const image = this.images[file[1]]
-      if (image) {
-        del(image.id).then(res => {
-        }).catch(err => {
-          console.log(err.response.data.message)
-        })
-      }
     }
   }
 }
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index fb24a07..044eecd 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -2,49 +2,37 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.jobName" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="showAddFormDialog"
-      >新增</el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
-      <!-- 任务日志 -->
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="info"
-        icon="el-icon-tickets"
-        @click="doLog"
-      >日志</el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.jobName" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission">
+        <!-- 任务日志 -->
+        <el-button
+          slot="right"
+          class="filter-item"
+          size="mini"
+          type="info"
+          icon="el-icon-tickets"
+          @click="doLog"
+        >日志</el-button>
+      </crudOperation>
       <Log ref="log" />
     </div>
     <!--Form表单-->
-    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="getFormTitle()" append-to-body width="600px">
+    <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" append-to-body width="600px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="任务名称" prop="jobName">
           <el-input v-model="form.jobName" style="width: 460px;" />
@@ -70,33 +58,34 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%;">
-      <el-table-column :show-overflow-tooltip="true" prop="jobName" width="100px" label="任务名称" />
-      <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称" />
-      <el-table-column :show-overflow-tooltip="true" prop="methodName" width="90px" label="执行方法" />
-      <el-table-column :show-overflow-tooltip="true" prop="params" width="80px" label="参数" />
-      <el-table-column :show-overflow-tooltip="true" prop="cronExpression" width="100px" label="cron表达式" />
-      <el-table-column :show-overflow-tooltip="true" prop="isPause" width="90px" label="状态">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table-column :selectable="checkboxT" type="selection" width="55" />
+      <el-table-column v-if="columns.visible('jobName')" :show-overflow-tooltip="true" prop="jobName" width="100px" label="任务名称" />
+      <el-table-column v-if="columns.visible('beanName')" :show-overflow-tooltip="true" prop="beanName" label="Bean名称" />
+      <el-table-column v-if="columns.visible('methodName')" :show-overflow-tooltip="true" prop="methodName" width="90px" label="执行方法" />
+      <el-table-column v-if="columns.visible('params')" :show-overflow-tooltip="true" prop="params" width="80px" label="参数" />
+      <el-table-column v-if="columns.visible('cronExpression')" :show-overflow-tooltip="true" prop="cronExpression" width="100px" label="cron表达式" />
+      <el-table-column v-if="columns.visible('isPause')" :show-overflow-tooltip="true" prop="isPause" width="90px" label="状态">
         <template slot-scope="scope">
           <el-tag :type="scope.row.isPause ? 'warning' : 'success'">{{ scope.row.isPause ? '已暂停' : '运行中' }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述" />
-      <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
+      <el-table-column v-if="columns.visible('remark')" :show-overflow-tooltip="true" prop="remark" label="描述" />
+      <el-table-column v-if="columns.visible('createTime')" :show-overflow-tooltip="true" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','timing:edit','timing:del'])" label="操作" width="180px" align="center" fixed="right">
+      <el-table-column v-permission="['admin','timing:edit','timing:del']" label="操作" width="180px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="showEditFormDialog(scope.row)">编辑</el-button>
+          <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="crud.toEdit(scope.row)">编辑</el-button>
           <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
-          <el-button v-permission="['admin',,'timing:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
+          <el-button v-permission="['admin','timing:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
             {{ scope.row.isPause ? '恢复' : '暂停' }}
           </el-button>
           <el-popover
@@ -116,30 +105,33 @@
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudJob from '@/api/system/timing'
 import Log from './log'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '定时任务', url: 'api/jobs', crudMethod: { ...crudJob }})
+const defaultForm = { jobName: null, beanName: null, methodName: null, params: null, cronExpression: null, isPause: false, remark: null }
 export default {
   name: 'Timing',
-  components: { Log },
-  mixins: [crud],
+  components: { Log, pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
-      title: '定时任务',
-      crudMethod: { ...crudJob },
-      form: { jobName: null, beanName: null, methodName: null, params: null, cronExpression: null, isPause: false, remark: null },
+      delLoading: false,
+      permission: {
+        add: ['admin', 'timing:add'],
+        edit: ['admin', 'timing:edit'],
+        del: ['admin', 'timing:del']
+      },
       rules: {
         jobName: [
           { required: true, message: '请输入任务名称', trigger: 'blur' }
@@ -156,46 +148,44 @@ export default {
       }
     }
   },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/jobs'
-      return true
-    },
     // 执行
     execute(id) {
-      this.crudMethod.execution(id).then(res => {
-        this.$notify({
-          title: '执行成功',
-          type: 'success',
-          duration: 2500
-        })
+      crudJob.execution(id).then(res => {
+        this.crud.notify('执行成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       }).catch(err => {
         console.log(err.response.data.message)
       })
     },
     // 改变状态
     updateStatus(id, status) {
-      this.crudMethod.updateIsPause(id).then(res => {
-        this.init()
-        this.$notify({
-          title: status + '成功',
-          type: 'success',
-          duration: 2500
-        })
+      crudJob.updateIsPause(id).then(res => {
+        this.crud.toQuery()
+        this.crud.notify(status + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       }).catch(err => {
         console.log(err.response.data.message)
       })
     },
+    delMethod(id) {
+      this.delLoading = true
+      crudJob.del([id]).then(() => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.crud.dleChangePage(1)
+        this.crud.delSuccessNotify()
+        this.crud.toQuery()
+      }).catch(() => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+      })
+    },
     // 显示日志
     doLog() {
       this.$refs.log.dialog = true
       this.$refs.log.doInit()
+    },
+    checkboxT(row, rowIndex) {
+      return row.id !== 1
     }
   }
 }
diff --git a/src/views/tools/email/send.vue b/src/views/tools/email/send.vue
index 802c9f7..1aed640 100644
--- a/src/views/tools/email/send.vue
+++ b/src/views/tools/email/send.vue
@@ -2,14 +2,14 @@
   <div>
     <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="100px">
       <el-form-item label="邮件标题" prop="subject">
-        <el-input v-model="form.subject" style="width: 40%" />
+        <el-input v-model="form.subject" style="width: 646px" />
       </el-form-item>
       <el-form-item
         v-for="(domain, index) in tos"
         :key="domain.key"
         :label="'收件邮箱' + (index === 0 ? '': index)"
       >
-        <el-input v-model="domain.value" style="width: 31%" />
+        <el-input v-model="domain.value" style="width: 550px" />
         <el-button icon="el-icon-plus" @click="addDomain" />
         <el-button style="margin-left:0;" icon="el-icon-minus" @click.prevent="removeDomain(domain)" />
       </el-form-item>
@@ -20,18 +20,15 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import { getToken } from '@/utils/auth'
 import { send } from '@/api/tools/email'
+import { upload } from '@/utils/upload'
 import { validEmail } from '@/utils/validate'
+import { mapGetters } from 'vuex'
 import E from 'wangeditor'
 export default {
   name: 'Index',
   data() {
     return {
-      headers: {
-        'Authorization': getToken()
-      },
       loading: false, form: { subject: '', tos: [], content: '' },
       tos: [{
         value: ''
@@ -45,21 +42,26 @@ export default {
   },
   computed: {
     ...mapGetters([
-      // sm.ms图床
-      'imagesUploadApi',
-      // 七牛云 按需选择
-      'qiNiuUploadApi'
+      'imagesUploadApi'
     ])
   },
   mounted() {
+    const _this = this
     var editor = new E(this.$refs.editor)
-    editor.customConfig.uploadImgShowBase64 = true // 使用 base64 保存图片
-    // 不可修改
-    editor.customConfig.uploadImgHeaders = this.headers
-    // 自定义文件名，不可修改，修改后会上传失败
-    editor.customConfig.uploadFileName = 'file'
-    // 上传到哪儿，按需选择
-    editor.customConfig.uploadImgServer = this.imagesUploadApi // 上传图片到服务器
+    // 自定义菜单配置
+    editor.customConfig.zIndex = 10
+    // 文件上传
+    editor.customConfig.customUploadImg = function(files, insert) {
+      // files 是 input 中选中的文件列表
+      // insert 是获取图片 url 后，插入到编辑器的方法
+      files.forEach(image => {
+        files.forEach(image => {
+          upload(_this.imagesUploadApi, image).then(data => {
+            insert(data.data.url)
+          })
+        })
+      })
+    }
     editor.customConfig.onchange = (html) => {
       this.form.content = html
     }
@@ -132,5 +134,9 @@ export default {
   .editor{
     text-align:left;
     margin: 20px;
+    width: 730px;
+  }
+  /deep/ .w-e-text-container {
+    height: 360px !important;
   }
 </style>
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
new file mode 100644
index 0000000..e706e84
--- /dev/null
+++ b/src/views/tools/picture/index.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!--搜索-->
+        <el-input v-model="query.filename" clearable size="small" placeholder="输入文件名" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission">
+        <!-- 上传 -->
+        <el-button
+          slot="left"
+          v-permission="['admin','pictures:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-upload"
+          @click="dialog = true"
+        >上传</el-button>
+        <el-tooltip slot="right" class="item" effect="dark" content="使用同步功能需要在 https://sm.ms/login 中注册账号，并且在 application.yml 文件中修改 Secret Token" placement="top-start">
+          <el-button
+            v-permission="['admin','pictures:add']"
+            class="filter-item"
+            size="mini"
+            type="success"
+            icon="el-icon-upload"
+            :loading="syncLoading"
+            @click="sync"
+          >同步</el-button>
+        </el-tooltip>
+      </crudOperation>
+    </div>
+    <!--上传图片-->
+    <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="600px" @close="doSubmit">
+      <el-upload
+        :on-preview="handlePictureCardPreview"
+        :before-remove="handleBeforeRemove"
+        :on-success="handleSuccess"
+        :on-error="handleError"
+        :headers="headers"
+        :file-list="fileList"
+        :action="imagesUploadApi"
+        list-type="picture-card"
+      >
+        <i class="el-icon-plus" />
+      </el-upload>
+      <el-dialog append-to-body :visible.sync="dialogVisible">
+        <img :src="dialogImageUrl" width="100%" alt="">
+      </el-dialog>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="doSubmit">确认</el-button>
+      </div>
+    </el-dialog>
+    <!--表格渲染-->
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('filename')" width="200" prop="filename" label="文件名" />
+      <el-table-column v-if="columns.visible('username')" prop="username" label="上传者" />
+      <el-table-column v-if="columns.visible('url')" ref="table" :show-overflow-tooltip="true" prop="url" label="缩略图">
+        <template slot-scope="{row}">
+          <el-image
+            :src="row.url"
+            :preview-src-list="[row.url]"
+            fit="contain"
+            lazy
+            class="el-avatar"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column v-if="columns.visible('size')" prop="size" label="文件大小" />
+      <el-table-column v-if="columns.visible('height')" prop="height" label="高度" />
+      <el-table-column v-if="columns.visible('width')" prop="width" label="宽度" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import crudPic from '@/api/tools/picture'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import { getToken } from '@/utils/auth'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '图片', url: 'api/pictures', crudMethod: { ...crudPic }})
+export default {
+  name: 'Pictures',
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header(), crud()],
+  data() {
+    return {
+      dialog: false,
+      syncLoading: false,
+      headers: {
+        'Authorization': getToken()
+      },
+      permission: {
+        del: ['admin', 'pictures:del']
+      },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      fileList: [],
+      pictures: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'imagesUploadApi'
+    ])
+  },
+  created() {
+    this.crud.optShow.add = false
+    this.crud.optShow.edit = false
+  },
+  methods: {
+    handleSuccess(response, file, fileList) {
+      const uid = file.uid
+      const id = response.id
+      this.pictures.push({ uid, id })
+    },
+    handleBeforeRemove(file, fileList) {
+      for (let i = 0; i < this.pictures.length; i++) {
+        if (this.pictures[i].uid === file.uid) {
+          crudPic.del(this.pictures[i].id).then(res => {})
+          return true
+        }
+      }
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    // 刷新列表数据
+    doSubmit() {
+      this.fileList = []
+      this.dialogVisible = false
+      this.dialogImageUrl = ''
+      this.dialog = false
+      this.crud.toQuery()
+    },
+    // 监听上传失败
+    handleError(e, file, fileList) {
+      const msg = JSON.parse(e.message)
+      this.$notify({
+        title: msg.message,
+        type: 'error',
+        duration: 2500
+      })
+    },
+    sync() {
+      this.syncLoading = true
+      crudPic.sync().then(res => {
+        this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+        this.syncLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

From 2bc97e315864144926cd757aafd92a4875785d33 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sat, 21 Dec 2019 15:44:47 +0800
Subject: [PATCH 61/64] update

---
 src/api/tools/localStorage.js           |  11 +-
 src/api/tools/qiniu.js                  |  13 +-
 src/views/tools/aliPay/config.vue       |   4 +-
 src/views/tools/storage/index.vue       |   4 +-
 src/views/tools/storage/local/index.vue | 168 ++++++++++--------------
 src/views/tools/storage/qiniu/form.vue  |   2 +-
 src/views/tools/storage/qiniu/index.vue | 159 +++++++++-------------
 7 files changed, 141 insertions(+), 220 deletions(-)

diff --git a/src/api/tools/localStorage.js b/src/api/tools/localStorage.js
index c938de3..63ebe2b 100644
--- a/src/api/tools/localStorage.js
+++ b/src/api/tools/localStorage.js
@@ -8,14 +8,7 @@ export function add(data) {
   })
 }
 
-export function del(id) {
-  return request({
-    url: 'api/localStorage/' + id,
-    method: 'delete'
-  })
-}
-
-export function delAll(ids) {
+export function del(ids) {
   return request({
     url: 'api/localStorage/',
     method: 'delete',
@@ -31,4 +24,4 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del, delAll }
+export default { add, edit, del }
diff --git a/src/api/tools/qiniu.js b/src/api/tools/qiniu.js
index 7b94205..6d56771 100644
--- a/src/api/tools/qiniu.js
+++ b/src/api/tools/qiniu.js
@@ -15,13 +15,6 @@ export function update(data) {
   })
 }
 
-export function del(id) {
-  return request({
-    url: 'api/qiNiuContent/' + id,
-    method: 'delete'
-  })
-}
-
 export function download(id) {
   return request({
     url: 'api/qiNiuContent/download/' + id,
@@ -36,12 +29,12 @@ export function sync() {
   })
 }
 
-export function delAll(ids) {
+export function del(ids) {
   return request({
-    url: 'api/qiNiuContent/',
+    url: 'api/qiNiuContent',
     method: 'delete',
     data: ids
   })
 }
 
-export default { del, download, sync, delAll }
+export default { del, download, sync }
diff --git a/src/views/tools/aliPay/config.vue b/src/views/tools/aliPay/config.vue
index 751e766..8e01f39 100644
--- a/src/views/tools/aliPay/config.vue
+++ b/src/views/tools/aliPay/config.vue
@@ -1,7 +1,7 @@
 <template>
   <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="100px">
     <el-form-item label="appID" prop="appID">
-      <el-input v-model="form.appID" style="width: 40%" />
+      <el-input v-model="form.appId" style="width: 40%" />
       <span style="color: #C0C0C0;margin-left: 10px;">应用APPID,收款账号既是APPID对应支付宝账号</span>
     </el-form-item>
     <el-form-item label="商家账号" prop="sysServiceProviderId">
@@ -37,7 +37,7 @@ export default {
   data() {
     return {
       loading: false,
-      form: { appID: '', sysServiceProviderId: '', privateKey: '', publicKey: '', returnUrl: '', notifyUrl: '' },
+      form: { appId: '', sysServiceProviderId: '', privateKey: '', publicKey: '', returnUrl: '', notifyUrl: '' },
       rules: {
         appID: [
           { required: true, message: '请输入appID', trigger: 'blur' }
diff --git a/src/views/tools/storage/index.vue b/src/views/tools/storage/index.vue
index b528bf4..5bb3fc0 100644
--- a/src/views/tools/storage/index.vue
+++ b/src/views/tools/storage/index.vue
@@ -23,9 +23,9 @@ export default {
   methods: {
     tabClick(name) {
       if (this.activeName === 'first') {
-        this.$refs.local.init()
+        this.$refs.local.crud.toQuery()
       } else {
-        this.$refs.qiNiu.init()
+        this.$refs.qiNiu.crud.toQuery()
       }
     }
   }
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index 4302cc5..95e0269 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -2,60 +2,44 @@
   <div class="app-container" style="padding: 8px;">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.blurry" clearable size="small" placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        v-permission="['admin','storage:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-upload"
-        @click="showAddFormDialog"
-      >文件上传
-      </el-button>
-      <!-- 多选删除 -->
-      <el-button
-        v-permission="['admin','storage:del']"
-        :loading="delAllLoading"
-        :disabled="data.length === 0 || $refs.table.selection.length === 0"
-        class="filter-item"
-        size="mini"
-        type="danger"
-        icon="el-icon-delete"
-        @click="beforeDelAllMethod"
-      >删除
-      </el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.blurry" clearable size="small" placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission">
+        <!-- 新增 -->
+        <el-button
+          slot="left"
+          v-permission="['admin','storage:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-upload"
+          @click="crud.toAdd"
+        >上传
+        </el-button>
+      </crudOperation>
     </div>
     <!--表单组件-->
-    <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.add ? '文件上传' : '编辑文件'" width="500px">
       <el-form ref="form" :model="form" size="small" label-width="80px">
         <el-form-item label="文件名">
           <el-input v-model="form.name" style="width: 370px;" />
         </el-form-item>
         <!--   上传文件   -->
-        <el-form-item v-if="isAdd" label="上传">
+        <el-form-item v-if="crud.status.add" label="上传">
           <el-upload
             ref="upload"
             :limit="1"
@@ -72,14 +56,15 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button v-if="crud.status.add" :loading="loading" type="primary" @click="upload">确认</el-button>
+        <el-button v-else :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="loading" :data="data" style="width: 100%;">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="name" width="150px" label="文件名">
+      <el-table-column v-if="columns.visible('name')" prop="name" label="文件名">
         <template slot-scope="scope">
           <el-popover
             :content="'file/' + scope.row.type + '/' + scope.row.realName"
@@ -100,7 +85,7 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column prop="path" label="预览图">
+      <el-table-column v-if="columns.visible('path')" prop="path" label="预览图">
         <template slot-scope="{row}">
           <el-image
             :src=" baseApi + '/file/' + row.type + '/' + row.realName"
@@ -115,61 +100,45 @@
           </el-image>
         </template>
       </el-table-column>
-      <el-table-column prop="suffix" label="文件类型" />
-      <el-table-column prop="type" label="类别" />
-      <el-table-column prop="size" label="大小" />
-      <el-table-column prop="operate" label="操作人" />
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column v-if="columns.visible('suffix')" prop="suffix" label="文件类型" />
+      <el-table-column v-if="columns.visible('type')" prop="type" label="类别" />
+      <el-table-column v-if="columns.visible('size')" prop="size" label="大小" />
+      <el-table-column v-if="columns.visible('operate')" prop="operate" label="操作人" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','storage:edit','storage:del'])" label="操作" width="150px" align="center">
-        <template slot-scope="scope">
-          <el-button v-permission="['admin','storage:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','storage:del']"
-            placement="top"
-            width="180"
-          >
-            <p>确定删除本条数据吗？</p>
-            <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定
-              </el-button>
-            </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-          </el-popover>
-        </template>
-      </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
-import crud from '@/mixins/crud'
 import crudFile from '@/api/tools/localStorage'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '文件', url: 'api/localStorage', crudMethod: { ...crudFile }})
+const defaultForm = { id: null, name: '' }
 export default {
-  mixins: [crud],
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
-      title: '文件',
-      crudMethod: { ...crudFile },
       delAllLoading: false,
+      loading: false,
       headers: { 'Authorization': getToken() },
-      form: { id: null, name: null }
+      permission: {
+        edit: ['admin', 'storage:edit'],
+        del: ['admin', 'storage:del']
+      }
     }
   },
   computed: {
@@ -179,34 +148,29 @@ export default {
     ])
   },
   created() {
-    this.$nextTick(() => {
-      this.init()
-    })
+    this.crud.optShow.add = false
   },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/localStorage'
-      return true
-    },
     // 上传文件
-    addMethod() {
+    upload() {
       this.$refs.upload.submit()
     },
     beforeUpload(file) {
       let isLt2M = true
       isLt2M = file.size / 1024 / 1024 < 100
       if (!isLt2M) {
+        this.loading = false
         this.$message.error('上传文件大小不能超过 100MB!')
       }
-      this.loading = false
+      this.form.name = file.name
       return isLt2M
     },
     handleSuccess(response, file, fileList) {
-      this.dialog = false
-      this.cancel()
+      this.crud.notify('上传成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       this.$refs.upload.clearFiles()
-      this.init()
+      this.crud.status.add = CRUD.STATUS.NORMAL
+      this.crud.resetForm()
+      this.crud.toQuery()
     },
     // 监听上传失败
     handleError(e, file, fileList) {
diff --git a/src/views/tools/storage/qiniu/form.vue b/src/views/tools/storage/qiniu/form.vue
index 570e19f..a9120b7 100644
--- a/src/views/tools/storage/qiniu/form.vue
+++ b/src/views/tools/storage/qiniu/form.vue
@@ -77,7 +77,7 @@ export default {
               type: 'success',
               duration: 2500
             })
-            this.$parent.init()
+            this.$parent.crud.toQuery()
             this.loading = false
             this.dialog = false
           }).catch(err => {
diff --git a/src/views/tools/storage/qiniu/index.vue b/src/views/tools/storage/qiniu/index.vue
index 45b47c1..7b215e3 100644
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -4,51 +4,38 @@
     <eForm ref="form" />
     <!-- 工具栏 -->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.key" clearable size="small" placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.c"
-        :default-time="['00:00:00','23:59:59']"
-        type="daterange"
-        range-separator=":"
-        size="small"
-        class="date-item"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 上传 -->
-      <el-button class="filter-item" size="mini" type="primary" icon="el-icon-upload" @click="dialog = true">上传文件</el-button>
-      <!-- 同步 -->
-      <el-button :icon="icon" class="filter-item" size="mini" type="warning" @click="synchronize">同步数据</el-button>
-      <!-- 配置 -->
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="success"
-        icon="el-icon-s-tools"
-        @click="doConfig"
-      >七牛配置</el-button>
-      <!-- 多选删除 -->
-      <el-button
-        :loading="delAllLoading"
-        :disabled="data.length === 0 || $refs.table.selection.length === 0"
-        class="filter-item"
-        size="mini"
-        type="danger"
-        icon="el-icon-delete"
-        @click="beforeDelAllMethod"
-      >删除</el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.key" clearable size="small" placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+        <el-date-picker
+          v-model="query.c"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission">
+        <template slot="left">
+          <!-- 上传 -->
+          <el-button class="filter-item" size="mini" type="primary" icon="el-icon-upload" @click="dialog = true">上传</el-button>
+          <!-- 同步 -->
+          <el-button :icon="icon" class="filter-item" size="mini" type="warning" @click="synchronize">同步</el-button>
+          <!-- 配置 -->
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="success"
+            icon="el-icon-s-tools"
+            @click="doConfig"
+          >配置</el-button>
+        </template>
+      </crudOperation>
       <!-- 文件上传 -->
       <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="500px" @close="doSubmit">
         <el-upload
@@ -69,67 +56,52 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="loading" :data="data" style="width: 100%;">
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column :show-overflow-tooltip="true" label="文件名">
+        <el-table-column v-if="columns.visible('name')" prop="name" :show-overflow-tooltip="true" label="文件名">
           <template slot-scope="scope">
-            <a href="JavaScript:;" class="el-link el-link--primary" target="_blank" type="primary" @click="download(scope.row.id)">{{ scope.row.key }}</a>
+            <a href="JavaScript:" class="el-link el-link--primary" target="_blank" type="primary" @click="download(scope.row.id)">{{ scope.row.key }}</a>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="suffix" label="文件类型" />
-        <el-table-column prop="bucket" label="空间名称" />
-        <el-table-column prop="size" label="文件大小" />
-        <el-table-column prop="type" label="空间类型" />
-        <el-table-column width="180px" prop="updateTime" label="创建日期">
+        <el-table-column v-if="columns.visible('suffix')" :show-overflow-tooltip="true" prop="suffix" label="文件类型" @selection-change="crud.selectionChangeHandler" />
+        <el-table-column v-if="columns.visible('bucket')" prop="bucket" label="空间名称" />
+        <el-table-column v-if="columns.visible('size')" prop="size" label="文件大小" />
+        <el-table-column v-if="columns.visible('type')" prop="type" label="空间类型" />
+        <el-table-column v-if="columns.visible('updateTime')" prop="updateTime" label="创建日期">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.updateTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <el-popover
-              :ref="scope.row.id"
-              placement="top"
-              width="180"
-            >
-              <p>确定删除本条数据吗？</p>
-              <div style="text-align: right; margin: 0">
-                <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
-              </div>
-              <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
-            </el-popover>
-          </template>
-        </el-table-column>
       </el-table>
       <!--分页组件-->
-      <el-pagination
-        :total="total"
-        :current-page="page + 1"
-        style="margin-top: 8px;"
-        layout="total, prev, pager, next, sizes"
-        @size-change="sizeChange"
-        @current-change="pageChange"
-      />
+      <pagination />
     </div>
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
 import crudQiNiu from '@/api/tools/qiniu'
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
 import eForm from './form'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '七牛云文件', url: 'api/qiNiuContent', crudMethod: { ...crudQiNiu }})
 export default {
-  components: { eForm },
-  mixins: [crud],
+  components: { eForm, pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header(), crud()],
   data() {
     return {
-      title: '文件',
-      crudMethod: { ...crudQiNiu },
+      permission: {
+        del: ['admin', 'storage:del']
+      },
+      title: '文件', dialog: false,
       icon: 'el-icon-refresh',
-      url: '', headers: { 'Authorization': getToken() }, dialog: false,
+      url: '', headers: { 'Authorization': getToken() },
       dialogImageUrl: '', dialogVisible: false, fileList: [], files: [], newWin: null
     }
   },
@@ -149,12 +121,11 @@ export default {
       }
     }
   },
+  created() {
+    this.crud.optShow.add = false
+    this.crud.optShow.edit = false
+  },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/qiNiuContent'
-      return true
-    },
     // 七牛云配置
     doConfig() {
       const _this = this.$refs.form
@@ -169,7 +140,7 @@ export default {
     handleBeforeRemove(file, fileList) {
       for (let i = 0; i < this.files.length; i++) {
         if (this.files[i].uid === file.uid) {
-          this.crudMethod.del(this.files[i].id).then(res => {})
+          crudQiNiu.del([this.files[i].id]).then(res => {})
           return true
         }
       }
@@ -184,19 +155,19 @@ export default {
       this.dialogVisible = false
       this.dialogImageUrl = ''
       this.dialog = false
-      this.init()
+      this.crud.toQuery()
     },
     // 监听上传失败
     handleError(e, file, fileList) {
       const msg = JSON.parse(e.message)
-      this.notify(msg.message, 'error')
+      this.crud.notify(msg.message, CRUD.NOTIFICATION_TYPE.ERROR)
     },
     // 下载文件
     download(id) {
       this.downloadLoading = true
       // 先打开一个空的新窗口，再请求
       this.newWin = window.open()
-      this.crudMethod.download(id).then(res => {
+      crudQiNiu.download(id).then(res => {
         this.downloadLoading = false
         this.url = res.url
       }).catch(err => {
@@ -207,7 +178,7 @@ export default {
     // 同步数据
     synchronize() {
       this.icon = 'el-icon-loading'
-      this.crudMethod.sync().then(res => {
+      crudQiNiu.sync().then(res => {
         this.icon = 'el-icon-refresh'
         this.$message({
           showClose: true,
@@ -215,7 +186,7 @@ export default {
           type: 'success',
           duration: 1500
         })
-        this.toQuery()
+        this.crud.toQuery()
       }).catch(err => {
         this.icon = 'el-icon-refresh'
         console.log(err.response.data.message)

From 1e1705be5001e0708dbe4b490f2f28d7d6f42a03 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sat, 21 Dec 2019 21:31:52 +0800
Subject: [PATCH 62/64] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E7=BB=B4?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E4=B8=80=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mnt/app/index.vue           |  6 +++---
 src/views/mnt/database/execute.vue    |  2 +-
 src/views/mnt/database/index.vue      | 18 +++++++++---------
 src/views/mnt/deploy/sysRestore.vue   |  2 +-
 src/views/mnt/deployHistory/index.vue |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/mnt/app/index.vue b/src/views/mnt/app/index.vue
index 3779207..fdb6277 100644
--- a/src/views/mnt/app/index.vue
+++ b/src/views/mnt/app/index.vue
@@ -49,12 +49,12 @@
         <el-form-item label="备份目录" prop="backupPath">
           <el-input v-model="form.backupPath" style="width: 670px" placeholder="例如: /opt/backup" />
         </el-form-item>
-        <el-form-item label="启动脚本" prop="startScript">
-          <el-input v-model="form.startScript" :rows="3" type="textarea" autosize style="width: 670px" placeholder="" />
-        </el-form-item>
         <el-form-item label="部署脚本" prop="deployScript">
           <el-input v-model="form.deployScript" :rows="3" type="textarea" autosize style="width: 670px" placeholder="" />
         </el-form-item>
+        <el-form-item label="启动脚本" prop="startScript">
+          <el-input v-model="form.startScript" :rows="3" type="textarea" autosize style="width: 670px" placeholder="" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="text" @click="crud.cancelCU">取消</el-button>
diff --git a/src/views/mnt/database/execute.vue b/src/views/mnt/database/execute.vue
index 22841d1..94622fc 100644
--- a/src/views/mnt/database/execute.vue
+++ b/src/views/mnt/database/execute.vue
@@ -41,7 +41,7 @@ export default {
       loading: false,
       dialog: false,
       headers: {
-        Authorization: 'Bearer ' + getToken()
+        Authorization: getToken()
       },
       rules: {}
     }
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 5fd6918..c5fb4dd 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -36,14 +36,14 @@
     <eForm ref="execute" :database-info="currentRow" />
     <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="530px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
-        <el-form-item label="数据库名称" prop="name">
+        <el-form-item label="连接名称" prop="name">
           <el-input v-model="form.name" style="width: 370px" />
         </el-form-item>
-        <el-form-item label="连接地址" prop="jdbcUrl">
+        <el-form-item label="JDBC地址" prop="jdbcUrl">
           <el-input v-model="form.jdbcUrl" style="width: 300px" />
-          <el-button :loading="loading" type="info" @click="testConnectDatabase">测试</el-button>
+          <el-button :loading="loading" type="success" @click="testConnectDatabase">测试</el-button>
         </el-form-item>
-        <el-form-item label="用户名" prop="userName">
+        <el-form-item label="用户" prop="userName">
           <el-input v-model="form.userName" style="width: 370px" />
         </el-form-item>
         <el-form-item label="密码" prop="pwd">
@@ -58,10 +58,10 @@
     <!--表格渲染-->
     <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row stripe style="width: 100%" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
       <el-table-column type="selection" width="55" />
-      <el-table-column v-if="columns.visible('name')" prop="name" label="数据库名称" />
+      <el-table-column v-if="columns.visible('name')" prop="name" width="130px" label="数据库名称" />
       <el-table-column v-if="columns.visible('jdbcUrl')" prop="jdbcUrl" label="连接地址" />
-      <el-table-column v-if="columns.visible('userName')" prop="userName" label="用户名" />
-      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
+      <el-table-column v-if="columns.visible('userName')" prop="userName" width="200px" label="用户名" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" width="200px" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -91,7 +91,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '数据库', url: 'api/database', crudMethod: { ...crudDatabase }})
-const defaultForm = { id: null, name: null, jdbcUrl: null, userName: null, pwd: null }
+const defaultForm = { id: null, name: null, jdbcUrl: 'jdbc:mysql://', userName: null, pwd: null }
 export default {
   name: 'DataBase',
   components: { eForm, pagination, crudOperation, rrOperation, udOperation },
@@ -130,7 +130,7 @@ export default {
           this.loading = true
           testDbConnect(this.form).then((res) => {
             this.loading = false
-            crud.notify(res ? '连接成功' : '连接失败', res ? 'success' : 'error')
+            this.crud.notify(res ? '连接成功' : '连接失败', res ? 'success' : 'error')
           }).catch(() => {
             this.loading = false
           })
diff --git a/src/views/mnt/deploy/sysRestore.vue b/src/views/mnt/deploy/sysRestore.vue
index 636f99c..46b568d 100644
--- a/src/views/mnt/deploy/sysRestore.vue
+++ b/src/views/mnt/deploy/sysRestore.vue
@@ -104,7 +104,7 @@ export default {
             this.dialog = false
             this.submitLoading = false
             this.appNames = ''
-            this.$parent.init()
+            this.$parent.crud.toQuery()
           })
           .catch(err => {
             this.submitLoading = false
diff --git a/src/views/mnt/deployHistory/index.vue b/src/views/mnt/deployHistory/index.vue
index 924589a..21397fa 100644
--- a/src/views/mnt/deployHistory/index.vue
+++ b/src/views/mnt/deployHistory/index.vue
@@ -86,7 +86,7 @@ export default {
   methods: {
     delMethod(id) {
       this.delLoading = true
-      del(id).then(() => {
+      del([id]).then(() => {
         this.delLoading = false
         this.$refs[id].doClose()
         this.crud.dleChangePage(1)

From aeebe25c602a6ed0444ed56d29b13c9a5fda8b02 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sat, 21 Dec 2019 23:32:58 +0800
Subject: [PATCH 63/64] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/generator/generator.js    |  8 +++
 src/views/generator/config.vue    | 37 ++++++++------
 src/views/generator/index.vue     | 81 +++++++++++++++++++------------
 src/views/generator/preview.vue   | 20 +++-----
 src/views/tools/picture/index.vue |  2 +-
 5 files changed, 88 insertions(+), 60 deletions(-)

diff --git a/src/api/generator/generator.js b/src/api/generator/generator.js
index 85ba185..0c49718 100644
--- a/src/api/generator/generator.js
+++ b/src/api/generator/generator.js
@@ -23,3 +23,11 @@ export function save(data) {
   })
 }
 
+export function sync(tables) {
+  return request({
+    url: 'api/generator/sync',
+    method: 'post',
+    data: tables
+  })
+}
+
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 8145f9f..48a39d2 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <el-row :gutter="15">
-      <!--角色管理-->
       <el-col style="margin-bottom: 10px">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
@@ -10,10 +9,18 @@
               :loading="columnLoading"
               icon="el-icon-check"
               size="mini"
-              style="float: right; padding: 6px 9px"
+              style="float: right; padding: 6px 9px;"
               type="primary"
               @click="saveColumnConfig"
             >保存</el-button>
+            <el-button
+              :loading="syncLoading"
+              icon="el-icon-refresh"
+              size="mini"
+              style="float: right; padding: 6px 9px;margin-right: 10px"
+              type="success"
+              @click="sync"
+            >同步</el-button>
           </div>
           <el-form size="small" label-width="90px">
             <el-table v-loading="loading" :data="data" :max-height="tableHeight" size="small" style="width: 100%;margin-bottom: 15px">
@@ -179,7 +186,7 @@
 <script>
 import crud from '@/mixins/crud'
 import { update, get } from '@/api/generator/genConfig'
-import { save } from '@/api/generator/generator'
+import { save, sync } from '@/api/generator/generator'
 import { getDicts } from '@/api/system/dict'
 export default {
   name: 'GeneratorConfig',
@@ -187,7 +194,7 @@ export default {
   mixins: [crud],
   data() {
     return {
-      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [],
+      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [], syncLoading: false,
       form: { id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '', apiAlias: null },
       rules: {
         author: [
@@ -235,11 +242,7 @@ export default {
     saveColumnConfig() {
       this.columnLoading = true
       save(this.data).then(res => {
-        this.$notify({
-          title: '保存成功',
-          type: 'success',
-          duration: 2500
-        })
+        this.notify('保存成功', 'success')
         this.columnLoading = false
       }).catch(err => {
         this.columnLoading = false
@@ -251,11 +254,7 @@ export default {
         if (valid) {
           this.configLoading = true
           update(this.form).then(res => {
-            this.$notify({
-              title: '保存成功',
-              type: 'success',
-              duration: 2500
-            })
+            this.notify('保存成功', 'success')
             this.form = res
             this.form.cover = this.form.cover.toString()
             this.configLoading = false
@@ -265,6 +264,16 @@ export default {
           })
         }
       })
+    },
+    sync() {
+      this.syncLoading = true
+      sync([this.tableName]).then(() => {
+        this.init()
+        this.notify('同步成功', 'success')
+        this.syncLoading = false
+      }).then(() => {
+        this.syncLoading = false
+      })
     }
   }
 }
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index f678c91..e780545 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -2,21 +2,31 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <el-input v-model="query.name" clearable size="small" placeholder="请输入表名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <div v-if="crud.props.searchToggle">
+        <el-input v-model="query.name" clearable size="small" placeholder="请输入表名" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation>
+        <el-button
+          slot="left"
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-refresh"
+          :loading="syncLoading"
+          :disabled="crud.selections.length === 0"
+          @click="sync"
+        >同步</el-button>
+      </crudOperation>
     </div>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" style="width: 100%;">
-      <el-table-column label="序号" width="85" align="center">
-        <template slot-scope="scope">
-          <div>{{ scope.$index + 1 }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="tableName" label="表名" />
-      <el-table-column :show-overflow-tooltip="true" prop="engine" label="数据库引擎" />
-      <el-table-column :show-overflow-tooltip="true" prop="coding" label="字符编码集" />
-      <el-table-column :show-overflow-tooltip="true" prop="remark" label="备注" />
-      <el-table-column prop="createTime" label="创建日期">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column v-if="columns.visible('tableName')" :show-overflow-tooltip="true" prop="tableName" label="表名" />
+      <el-table-column v-if="columns.visible('engine')" :show-overflow-tooltip="true" prop="engine" label="数据库引擎" />
+      <el-table-column v-if="columns.visible('coding')" :show-overflow-tooltip="true" prop="coding" label="字符编码集" />
+      <el-table-column v-if="columns.visible('remark')" :show-overflow-tooltip="true" prop="remark" label="备注" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -39,37 +49,32 @@
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+    <pagination />
   </div>
 </template>
 
 <script>
-import crud from '@/mixins/crud'
-import { generator } from '@/api/generator/generator'
+import { generator, sync } from '@/api/generator/generator'
+import CRUD, { presenter, header } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ url: 'api/generator/tables' })
 export default {
   name: 'GeneratorIndex',
-  mixins: [crud],
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header()],
   data() {
     return {
+      syncLoading: false
     }
   },
   created() {
-    this.$nextTick(() => {
-      this.init()
-    })
+    this.crud.optShow = { add: false, edit: false, del: false, download: false }
   },
   methods: {
-    beforeInit() {
-      this.url = 'api/generator/tables'
-      return true
-    },
     toGen(tableName) {
       // 生成代码
       generator(tableName, 0).then(data => {
@@ -85,6 +90,20 @@ export default {
       generator(tableName, 2).then(data => {
         this.downloadFile(data, tableName, 'zip')
       })
+    },
+    sync() {
+      const tables = []
+      this.crud.selections.forEach(val => {
+        tables.push(val.tableName)
+      })
+      this.syncLoading = true
+      sync(tables).then(() => {
+        this.crud.refresh()
+        this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.syncLoading = false
+      }).then(() => {
+        this.syncLoading = false
+      })
     }
   }
 }
diff --git a/src/views/generator/preview.vue b/src/views/generator/preview.vue
index 8ee6cac..e95fc46 100644
--- a/src/views/generator/preview.vue
+++ b/src/views/generator/preview.vue
@@ -1,15 +1,9 @@
 <template>
-  <el-tabs v-if="!error" v-model="activeName" type="card">
+  <el-tabs v-model="activeName" type="card">
     <el-tab-pane v-for="item in data" :key="item.name" :lazy="true" :label="item.name" :name="item.name">
       <Java :value="item.content" :height="height" />
     </el-tab-pane>
   </el-tabs>
-  <div v-else class="app-container">
-    <el-alert
-      :title="error"
-      type="error"
-    />
-  </div>
 </template>
 
 <script>
@@ -20,18 +14,16 @@ export default {
   components: { Java },
   data() {
     return {
-      data: null, error: null, height: '', activeName: 'Entity'
+      data: null, height: '', activeName: 'Entity'
     }
   },
   created() {
     this.height = document.documentElement.clientHeight - 180 + 'px'
     const tableName = this.$route.params.tableName
-    this.$nextTick(() => {
-      generator(tableName, 1).then(data => {
-        this.data = data
-      }).catch(err => {
-        this.error = err.response.data.message
-      })
+    generator(tableName, 1).then(data => {
+      this.data = data
+    }).catch(() => {
+      this.$router.go(-1)
     })
   }
 }
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index e706e84..ead112a 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -35,7 +35,7 @@
             class="filter-item"
             size="mini"
             type="success"
-            icon="el-icon-upload"
+            icon="el-icon-refresh"
             :loading="syncLoading"
             @click="sync"
           >同步</el-button>

From a3d7193ea00eb2fb2674cf96eb398a408e71d075 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sun, 22 Dec 2019 10:39:59 +0800
Subject: [PATCH 64/64] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=EF=BC=8C=E4=BC=98=E5=8C=96=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=BA=A7=E5=88=AB=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/role.js          |  2 +-
 src/views/components/Editor.vue |  2 +-
 src/views/generator/config.vue  | 61 +++++++++++++++++++++++++--------
 src/views/generator/index.vue   | 25 ++++++++------
 src/views/system/role/index.vue | 32 ++++++++++++++---
 5 files changed, 89 insertions(+), 33 deletions(-)

diff --git a/src/api/system/role.js b/src/api/system/role.js
index 198e328..1f7bc1e 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -54,4 +54,4 @@ export function editMenu(data) {
   })
 }
 
-export default { add, edit, del, get, editMenu }
+export default { add, edit, del, get, editMenu, getLevel }
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index 8a12323..415ad15 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <p class="warn-content">
-      Markdown 基于
+      富文本基于
       <el-link type="primary" href="https://www.kancloud.cn/wangfupeng/wangeditor3/332599" target="_blank">wangEditor</el-link>
       ，图片上传使用 <el-link type="primary" href="https://sm.ms/" target="_blank">SM.MS</el-link>
     </p>
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 48a39d2..951acc6 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -5,22 +5,32 @@
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <span class="role-span">字段配置：{{ tableName }}</span>
+            <el-button
+              :loading="genLoading"
+              icon="el-icon-s-promotion"
+              size="mini"
+              style="float: right; padding: 6px 9px;"
+              type="success"
+              @click="toGen"
+            >保存&生成</el-button>
             <el-button
               :loading="columnLoading"
               icon="el-icon-check"
               size="mini"
-              style="float: right; padding: 6px 9px;"
+              style="float: right; padding: 6px 9px;margin-right: 9px"
               type="primary"
               @click="saveColumnConfig"
             >保存</el-button>
-            <el-button
-              :loading="syncLoading"
-              icon="el-icon-refresh"
-              size="mini"
-              style="float: right; padding: 6px 9px;margin-right: 10px"
-              type="success"
-              @click="sync"
-            >同步</el-button>
+            <el-tooltip class="item" effect="dark" content="数据库中表字段变动时使用该功能" placement="top-start">
+              <el-button
+                :loading="syncLoading"
+                icon="el-icon-refresh"
+                size="mini"
+                style="float: right; padding: 6px 9px;"
+                type="info"
+                @click="sync"
+              >同步</el-button>
+            </el-tooltip>
           </div>
           <el-form size="small" label-width="90px">
             <el-table v-loading="loading" :data="data" :max-height="tableHeight" size="small" style="width: 100%;margin-bottom: 15px">
@@ -95,6 +105,10 @@
                       label="Like"
                       value="Like"
                     />
+                    <el-option
+                      label="NotNull"
+                      value="NotNull"
+                    />
                     <el-option
                       label="BetWeen"
                       value="BetWeen"
@@ -161,14 +175,14 @@
               <el-input v-model="form.path" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">输入views文件夹下的目录，不存在即创建</span>
             </el-form-item>
+            <!--            <el-form-item label="接口目录">-->
+            <!--              <el-input v-model="form.apiPath" style="width: 40%" />-->
+            <!--              <span style="color: #C0C0C0;margin-left: 10px;">Api存放路径[src/api]，为空则自动生成路径</span>-->
+            <!--            </el-form-item>-->
             <el-form-item label="去表前缀" prop="prefix">
               <el-input v-model="form.prefix" placeholder="默认不去除表前缀" style="width: 40%" />
               <span style="color: #C0C0C0;margin-left: 10px;">默认不去除表前缀，可自定义</span>
             </el-form-item>
-            <!--            <el-form-item label="Api路径">-->
-            <!--              <el-input v-model="form.apiPath"/>-->
-            <!--              <span style="color: #C0C0C0;margin-left: 10px;">Sender mailbox</span>-->
-            <!--            </el-form-item>-->
             <el-form-item label="是否覆盖" prop="cover">
               <el-radio-group v-model="form.cover" size="mini" style="width: 40%">
                 <el-radio-button label="true">是</el-radio-button>
@@ -186,7 +200,7 @@
 <script>
 import crud from '@/mixins/crud'
 import { update, get } from '@/api/generator/genConfig'
-import { save, sync } from '@/api/generator/generator'
+import { save, sync, generator } from '@/api/generator/generator'
 import { getDicts } from '@/api/system/dict'
 export default {
   name: 'GeneratorConfig',
@@ -194,7 +208,7 @@ export default {
   mixins: [crud],
   data() {
     return {
-      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [], syncLoading: false,
+      activeName: 'first', tableName: '', tableHeight: 550, columnLoading: false, configLoading: false, dicts: [], syncLoading: false, genLoading: false,
       form: { id: null, tableName: '', author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '', apiAlias: null },
       rules: {
         author: [
@@ -274,6 +288,23 @@ export default {
       }).then(() => {
         this.syncLoading = false
       })
+    },
+    toGen() {
+      this.genLoading = true
+      save(this.data).then(res => {
+        this.notify('保存成功', 'success')
+        // 生成代码
+        generator(this.tableName, 0).then(data => {
+          this.genLoading = false
+          this.notify('生成成功', 'success')
+        }).catch(err => {
+          this.genLoading = false
+          console.log(err.response.data.message)
+        })
+      }).catch(err => {
+        this.genLoading = false
+        console.log(err.response.data.message)
+      })
     }
   }
 }
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index e780545..a0d022b 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -7,16 +7,17 @@
         <rrOperation :crud="crud" />
       </div>
       <crudOperation>
-        <el-button
-          slot="left"
-          class="filter-item"
-          size="mini"
-          type="success"
-          icon="el-icon-refresh"
-          :loading="syncLoading"
-          :disabled="crud.selections.length === 0"
-          @click="sync"
-        >同步</el-button>
+        <el-tooltip slot="right" class="item" effect="dark" content="数据库中表字段变动时使用该功能" placement="top-start">
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="success"
+            icon="el-icon-refresh"
+            :loading="syncLoading"
+            :disabled="crud.selections.length === 0"
+            @click="sync"
+          >同步</el-button>
+        </el-tooltip>
       </crudOperation>
     </div>
     <!--表格渲染-->
@@ -54,7 +55,9 @@
 </template>
 
 <script>
+
 import { generator, sync } from '@/api/generator/generator'
+import { downloadFile } from '@/utils/index'
 import CRUD, { presenter, header } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -88,7 +91,7 @@ export default {
     toDownload(tableName) {
       // 打包下载
       generator(tableName, 2).then(data => {
-        this.downloadFile(data, tableName, 'zip')
+        downloadFile(data, tableName, 'zip')
       })
     },
     sync() {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3a0abd4..a0ab4c4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -62,7 +62,7 @@
             <span class="role-span">角色列表</span>
           </div>
           <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
-            <el-table-column type="selection" width="55" />
+            <el-table-column :selectable="checkboxT" type="selection" width="55" />
             <el-table-column v-if="columns.visible('name')" prop="name" label="名称" />
             <el-table-column v-if="columns.visible('dataScope')" prop="dataScope" label="数据权限" />
             <el-table-column v-if="columns.visible('permission')" prop="permission" label="角色权限" />
@@ -76,6 +76,7 @@
             <el-table-column v-permission="['admin','roles:edit','roles:del']" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
                 <udOperation
+                  v-if="scope.row.level >= level"
                   :data="scope.row"
                   :permission="permission"
                 />
@@ -142,7 +143,7 @@ export default {
   data() {
     return {
       defaultProps: { children: 'children', label: 'label' },
-      dateScopes: ['全部', '本级', '自定义'],
+      dateScopes: ['全部', '本级', '自定义'], level: 3,
       currentId: 0, menuLoading: false, showButton: false,
       menus: [], menuIds: [], depts: [],
       permission: {
@@ -162,6 +163,10 @@ export default {
   },
   created() {
     this.getMenus()
+    crudRoles.getLevel().then(data => {
+      this.level = data.level
+      console.log(this.level)
+    })
     this.$nextTick(() => {
       this.crud.toQuery()
     })
@@ -189,16 +194,31 @@ export default {
           type: 'warning'
         })
         return false
-      } else {
+      } else if (crud.form.dataScope === '自定义') {
         const depts = []
         crud.form.depts.forEach(function(data, index) {
           const dept = { id: data }
           depts.push(dept)
         })
         crud.form.depts = depts
+      } else {
+        crud.form.depts = []
       }
       return true
     },
+    [CRUD.HOOK.afterAddError](crud) {
+      this.afterErrorMethod(crud)
+    },
+    [CRUD.HOOK.afterEditError](crud) {
+      this.afterErrorMethod(crud)
+    },
+    afterErrorMethod(crud) {
+      const depts = []
+      crud.form.depts.forEach(function(dept, index) {
+        depts.push(dept.id)
+      })
+      crud.form.depts = depts
+    },
     // 获取所有菜单
     getMenus() {
       getMenusTree().then(res => {
@@ -213,8 +233,7 @@ export default {
         this.$refs.menu.setCheckedKeys([])
         // 保存当前的角色id
         this.currentId = val.id
-        // 点击后显示按钮
-        this.showButton = true
+        this.showButton = this.level <= val.level
         // 初始化
         this.menuIds = []
         // 菜单数据需要特殊处理
@@ -269,6 +288,9 @@ export default {
       if (this.form.dataScope === '自定义') {
         this.getDepts()
       }
+    },
+    checkboxT(row, rowIndex) {
+      return row.level >= this.level
     }
   }
 }