diff --git a/src/assets/styles/realize/element-variables.scss b/src/assets/styles/realize/element-variables.scss
index 6947c758..b8b4a90d 100644
--- a/src/assets/styles/realize/element-variables.scss
+++ b/src/assets/styles/realize/element-variables.scss
@@ -325,27 +325,12 @@ thead tr {
   font-size: 18px;
   top: -5px;
 }
-
-// dialog
-.el-dialog__footer {
-  text-align: left;
-  padding-left: 30px;
-}
-
+// el-dialog
 .el-dialog__title {
   color: $parent-title-color;
   font-size: 16px;
   font-weight: 500;
 }
-
-.el-dialog__header {
-  padding-left: 30px;
-}
-
-.el-dialog__body {
-  padding: 30px;
-}
-
 // tab
 .el-tabs__item.is-active {
   color: $theme;
diff --git a/src/config/stage/plugins.js b/src/config/stage/plugins.js
index cff65f70..8693b4ec 100644
--- a/src/config/stage/plugins.js
+++ b/src/config/stage/plugins.js
@@ -1,10 +1,10 @@
 // 本文件是自动生成, 请勿修改
-import LinCmsUi from '@/plugins/LinCmsUi/stage-config'
 import custom from '@/plugins/custom/stage-config'
+import LinCmsUi from '@/plugins/LinCmsUi/stage-config'
 
 const pluginsConfig = [
-  LinCmsUi,
   custom,
+  LinCmsUi,
 ]
 
 export default pluginsConfig
diff --git a/src/plugins/LinCmsUi/stage-config.js b/src/plugins/LinCmsUi/stage-config.js
index c66fa271..9848debd 100644
--- a/src/plugins/LinCmsUi/stage-config.js
+++ b/src/plugins/LinCmsUi/stage-config.js
@@ -273,7 +273,7 @@ const LinCmsUiRouter = {
           filePath: 'plugins/LinCmsUi/views/form/TimePicker.vue',
           inNav: true,
           icon: 'iconfont icon-jiemiansheji',
-
+          right: null,
         },
         {
           title: 'DateTimePicker 日期时间选择器',
@@ -283,7 +283,7 @@ const LinCmsUiRouter = {
           filePath: 'plugins/LinCmsUi/views/form/DateTimePicker.vue',
           inNav: true,
           icon: 'iconfont icon-jiemiansheji',
-
+          right: null,
         },
         {
           title: 'DatePicker 日期选择器',
@@ -293,7 +293,7 @@ const LinCmsUiRouter = {
           filePath: 'plugins/LinCmsUi/views/form/DatePicker.vue',
           inNav: true,
           icon: 'iconfont icon-jiemiansheji',
-
+          right: null,
         },
       ],
     },
@@ -339,6 +339,38 @@ const LinCmsUiRouter = {
         },
       ],
     },
+    {
+      title: 'Others',
+      type: 'folder',
+      name: null,
+      route: '/lin-cms-ui/others/base',
+      filePath: 'plugins/LinCmsUi/views/others/',
+      inNav: true,
+      icon: 'iconfont icon-jiemiansheji',
+      right: null,
+      children: [
+        {
+          title: 'Dialog 对话框',
+          type: 'view',
+          name: null,
+          route: '/lin-cms-ui/other/dialog',
+          filePath: 'plugins/LinCmsUi/views/other/Dialog.vue',
+          inNav: true,
+          icon: 'iconfont icon-jiemiansheji',
+          right: null,
+        },
+        {
+          title: 'Timeline 时间线',
+          type: 'view',
+          name: null,
+          route: '/lin-cms-ui/other/timeline',
+          filePath: 'plugins/LinCmsUi/views/other/Timeline.vue',
+          inNav: true,
+          icon: 'iconfont icon-jiemiansheji',
+          right: null,
+        },
+      ],
+    },
   ],
 }
 
diff --git a/src/plugins/LinCmsUi/views/data/progress/Progress.vue b/src/plugins/LinCmsUi/views/data/progress/Progress.vue
index 3ca21966..414d8487 100644
--- a/src/plugins/LinCmsUi/views/data/progress/Progress.vue
+++ b/src/plugins/LinCmsUi/views/data/progress/Progress.vue
@@ -107,4 +107,8 @@ export default {
 
 <style lang="scss" scoped>
 @import '../../../assets/style/container';
+.el-progress {
+  margin-top:20px;
+  margin-left: 20px;
+}
 </style>
diff --git a/src/plugins/LinCmsUi/views/other/Dialog.vue b/src/plugins/LinCmsUi/views/other/Dialog.vue
new file mode 100644
index 00000000..ae8a7ac3
--- /dev/null
+++ b/src/plugins/LinCmsUi/views/other/Dialog.vue
@@ -0,0 +1,349 @@
+<template>
+<div class="lin-container">
+  <div class="lin-title">Dialog 对话框</div>
+  <div class="lin-wrap-ui">
+    <el-card style="margin-bottom:50px;">
+      <div slot="header">
+        <span>基础用法</span>
+      </div>
+      <el-row>
+        <el-button type="text" @click="dialogVisible = true">点击打开 Dialog</el-button>
+        <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+          <span>这是一段信息</span>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          </span>
+        </el-dialog>
+      </el-row>
+      <el-collapse>
+        <el-collapse-item title="查看代码" name="2">
+          <div style="white-space: pre-wrap;">{{base}}</div>
+        </el-collapse-item>
+      </el-collapse>
+    </el-card>
+    <el-card style="margin-bottom:50px;">
+      <div slot="header">
+        <span>自定义内容</span>
+      </div>
+      <el-row>
+        <el-button type="text" @click="dialogTableVisible = true">打开嵌套表格的 Dialog</el-button>
+
+        <el-dialog title="收货地址" :visible.sync="dialogTableVisible">
+          <el-table :data="gridData">
+            <el-table-column property="date" label="日期" width="150"></el-table-column>
+            <el-table-column property="name" label="姓名" width="200"></el-table-column>
+            <el-table-column property="address" label="地址"></el-table-column>
+          </el-table>
+        </el-dialog>
+
+        <!-- Form -->
+        <el-button type="text" @click="dialogFormVisible = true">打开嵌套表单的 Dialog</el-button>
+
+        <el-dialog title="收货地址" :visible.sync="dialogFormVisible" class="dialogForm">
+          <el-form :model="form">
+            <el-form-item label="活动名称" :label-width="formLabelWidth">
+              <el-input v-model="form.name" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="活动区域" :label-width="formLabelWidth">
+              <el-select v-model="form.region" placeholder="请选择活动区域">
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+          </div>
+        </el-dialog>
+      </el-row>
+      <el-collapse class="test" style="color:red;">
+        <el-collapse-item title="查看代码" name="2">
+          <div style="white-space: pre-wrap;">{{diy}}</div>
+        </el-collapse-item>
+      </el-collapse>
+    </el-card>
+    <el-card style="margin-bottom:50px;">
+      <div slot="header">
+        <span>嵌套的 Dialog</span>
+      </div>
+      <el-row>
+        <span class="demonstration">如果需要在一个 Dialog 内部嵌套另一个 Dialog，需要使用 append-to-body 属性</span>
+        <template>
+          <el-button type="text" @click="outerVisible = true">点击打开外层 Dialog</el-button>
+
+          <el-dialog title="外层 Dialog" :visible.sync="outerVisible">
+            <el-dialog width="30%" title="内层 Dialog" :visible.sync="innerVisible" append-to-body>
+            </el-dialog>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="outerVisible = false">取 消</el-button>
+              <el-button type="primary" @click="innerVisible = true">打开内层 Dialog</el-button>
+            </div>
+          </el-dialog>
+        </template>
+      </el-row>
+      <el-collapse class="test" style="color:red;">
+        <el-collapse-item title="查看代码" name="2">
+          <div style="white-space: pre-wrap;">{{appendToBody}}</div>
+        </el-collapse-item>
+      </el-collapse>
+    </el-card>
+    <el-card style="margin-bottom:50px;">
+      <div slot="header">
+        <span>居中布局</span>
+      </div>
+      <el-row>
+        <span class="demonstration">标题和底部可水平居中</span>
+        <el-button type="text" @click="centerDialogVisible = true">点击打开 Dialog</el-button>
+
+        <el-dialog title="提示" :visible.sync="centerDialogVisible" width="30%" center>
+          <span>需要注意的是内容是默认不居中的</span>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="centerDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+          </span>
+        </el-dialog>
+      </el-row>
+      <el-collapse class="test" style="color:red;">
+        <el-collapse-item title="查看代码" name="2">
+          <div style="white-space: pre-wrap;">{{center}}</div>
+        </el-collapse-item>
+      </el-collapse>
+    </el-card>
+  </div>
+</div>
+</template>
+
+<script>
+export default {
+  /* eslint-disable */
+    name: '',
+    components: {},
+    data() {
+      return {
+        centerDialogVisible: false,
+        outerVisible: false,
+        innerVisible: false,
+        dialogVisible: false,
+        gridData: [{
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }],
+        dialogTableVisible: false,
+        dialogFormVisible: false,
+        form: {
+          name: '',
+          region: '',
+          date1: '',
+          date2: '',
+          delivery: false,
+          type: [],
+          resource: '',
+          desc: ''
+        },
+        formLabelWidth: '120px',
+        base: `
+      <el-button type="text" @click="dialogVisible = true">点击打开 Dialog</el-button>
+
+<el-dialog
+  title="提示"
+  :visible.sync="dialogVisible"
+  width="30%"
+  :before-close="handleClose">
+  <span>这是一段信息</span>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+  </span>
+</el-dialog>
+
+<script>
+  export default {
+    data() {
+      return {
+        dialogVisible: false
+      };
+    },
+    methods: {
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      }
+    }
+  };
+<\/script>`,
+        diy: `<!-- Table -->
+<el-button type="text" @click="dialogTableVisible = true">打开嵌套表格的 Dialog</el-button>
+
+<el-dialog title="收货地址" :visible.sync="dialogTableVisible">
+  <el-table :data="gridData">
+    <el-table-column property="date" label="日期" width="150"></el-table-column>
+    <el-table-column property="name" label="姓名" width="200"></el-table-column>
+    <el-table-column property="address" label="地址"></el-table-column>
+  </el-table>
+</el-dialog>
+
+<!-- Form -->
+<el-button type="text" @click="dialogFormVisible = true">打开嵌套表单的 Dialog</el-button>
+
+<el-dialog title="收货地址" :visible.sync="dialogFormVisible">
+  <el-form :model="form">
+    <el-form-item label="活动名称" :label-width="formLabelWidth">
+      <el-input v-model="form.name" autocomplete="off"></el-input>
+    </el-form-item>
+    <el-form-item label="活动区域" :label-width="formLabelWidth">
+      <el-select v-model="form.region" placeholder="请选择活动区域">
+        <el-option label="区域一" value="shanghai"></el-option>
+        <el-option label="区域二" value="beijing"></el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+  <div slot="footer" class="dialog-footer">
+    <el-button @click="dialogFormVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+  </div>
+</el-dialog>
+
+<script>
+  export default {
+    data() {
+      return {
+        gridData: [{
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }],
+        dialogTableVisible: false,
+        dialogFormVisible: false,
+        form: {
+          name: '',
+          region: '',
+          date1: '',
+          date2: '',
+          delivery: false,
+          type: [],
+          resource: '',
+          desc: ''
+        },
+        formLabelWidth: '120px'
+      };
+    }
+  };
+<\/script>`,
+        appendToBody: `
+<template>
+  <el-button type="text" @click="outerVisible = true">点击打开外层 Dialog</el-button>
+
+  <el-dialog title="外层 Dialog" :visible.sync="outerVisible">
+    <el-dialog
+      width="30%"
+      title="内层 Dialog"
+      :visible.sync="innerVisible"
+      append-to-body>
+    </el-dialog>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="outerVisible = false">取 消</el-button>
+      <el-button type="primary" @click="innerVisible = true">打开内层 Dialog</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        outerVisible: false,
+        innerVisible: false
+      };
+    }
+  }
+<\/script>`,
+center: `<el-button type="text" @click="centerDialogVisible = true">点击打开 Dialog</el-button>
+
+<el-dialog
+  title="提示"
+  :visible.sync="centerDialogVisible"
+  width="30%"
+  center>
+  <span>需要注意的是内容是默认不居中的</span>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="centerDialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+  </span>
+</el-dialog>
+
+<script>
+  export default {
+    data() {
+      return {
+        centerDialogVisible: false
+      };
+    }
+  };
+<\/script>`
+    };
+  },
+  // 计算属性设置
+  computed: {},
+  // 数据变更监听
+  watch: {},
+  mounted() {
+    this.init()
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {});
+    },
+    // 执行获取数据等初始化动作
+    init() {},
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../../assets/style/container';
+
+.demonstration {
+  display: block;
+  color: #8492a6;
+  font-size: 14px;
+  margin-bottom: 20px;
+}
+
+.dialogForm /deep/ .el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/plugins/LinCmsUi/views/other/Timeline.vue b/src/plugins/LinCmsUi/views/other/Timeline.vue
new file mode 100644
index 00000000..24060c56
--- /dev/null
+++ b/src/plugins/LinCmsUi/views/other/Timeline.vue
@@ -0,0 +1,276 @@
+<template>
+<div class="lin-container">
+  <div class="lin-title">Timeline 时间线</div>
+  <div class="lin-wrap-ui">
+    <el-card style="margin-bottom:50px;">
+      <div slot="header">
+        <span>基础用法</span>
+      </div>
+      <el-row>
+        <span class="demonstration">Timeline 可拆分成多个按照时间戳正序或倒序排列的 activity，时间戳是其区分于其他控件的重要特征，使⽤时注意与 Steps 步骤条等区分。</span>
+        <div class="block">
+          排序:
+          <div class="radio">
+            <el-radio-group v-model="reverse">
+              <el-radio :label="true">倒序</el-radio>
+              <el-radio :label="false">正序</el-radio>
+            </el-radio-group>
+          </div>
+          <el-timeline :reverse="reverse">
+            <el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="activity.timestamp">
+              {{activity.content}}
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </el-row>
+      <el-collapse>
+        <el-collapse-item title="查看代码" name="2">
+          <div style="white-space: pre-wrap;">{{base}}</div>
+        </el-collapse-item>
+      </el-collapse>
+    </el-card>
+    <el-card style="margin-bottom:50px;">
+      <div slot="header">
+        <span>⾃定义节点样式</span>
+      </div>
+      <el-row>
+        <div class="block">
+          <el-timeline>
+            <el-timeline-item
+            v-for="(activity, index) in activities1"
+            :key="index" :icon="activity.icon"
+            :type="activity.type"
+            :color="activity.color"
+            :size="activity.size"
+            :timestamp="activity.timestamp">
+              {{activity.content}}
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </el-row>
+      <el-collapse class="test" style="color:red;">
+        <el-collapse-item title="查看代码" name="2">
+          <div style="white-space: pre-wrap;">{{diy}}</div>
+        </el-collapse-item>
+      </el-collapse>
+    </el-card>
+    <el-card style="margin-bottom:50px;">
+      <div slot="header">
+        <span>⾃定义时间戳</span>
+      </div>
+      <el-row>
+        <div class="block">
+          <el-timeline>
+            <el-timeline-item timestamp="2018/4/12" placement="top">
+              <el-card class="timeLineCard">
+                <h4>更新 Github 模板</h4>
+                <p>王小虎 提交于 2018/4/12 20:46</p>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="2018/4/3" placement="top">
+              <el-card class="timeLineCard">
+                <h4>更新 Github 模板</h4>
+                <p>王小虎 提交于 2018/4/3 20:46</p>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="2018/4/2" placement="top">
+              <el-card class="timeLineCard">
+                <h4>更新 Github 模板</h4>
+                <p>王小虎 提交于 2018/4/2 20:46</p>
+              </el-card>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </el-row>
+      <el-collapse class="test" style="color:red;">
+        <el-collapse-item title="查看代码" name="2">
+          <div style="white-space: pre-wrap;">{{placement}}</div>
+        </el-collapse-item>
+      </el-collapse>
+    </el-card>
+  </div>
+</div>
+</template>
+
+<script>
+export default {
+  /* eslint-disable */
+  name: '',
+  components: {},
+  data() {
+    return {
+      base: `<div class="block">
+  <div class="radio">
+    排序：
+    <el-radio-group v-model="reverse">
+      <el-radio :label="true">倒序</el-radio>
+      <el-radio :label="false">正序</el-radio>
+    </el-radio-group>
+  </div>
+
+  <el-timeline :reverse="reverse">
+    <el-timeline-item
+      v-for="(activity, index) in activities"
+      :key="index"
+      :timestamp="activity.timestamp">
+      {{activity.content}}
+    </el-timeline-item>
+  </el-timeline>
+</div>
+
+<script>
+  export default {
+    data() {
+      return {
+        reverse: true,
+        activities: [{
+          content: '活动按期开始',
+          timestamp: '2018-04-15'
+        }, {
+          content: '通过审核',
+          timestamp: '2018-04-13'
+        }, {
+          content: '创建成功',
+          timestamp: '2018-04-11'
+        }]
+      };
+    }
+  };
+<\/script>
+        `,
+      diy: `
+        <div class="block">
+  <el-timeline>
+    <el-timeline-item
+      v-for="(activity, index) in activities"
+      :key="index"
+      :icon="activity.icon"
+      :type="activity.type"
+      :color="activity.color"
+      :size="activity.size"
+      :timestamp="activity.timestamp">
+      {{activity.content}}
+    </el-timeline-item>
+  </el-timeline>
+</div>
+
+<script>
+  export default {
+    data() {
+      return {
+        activities: [{
+          content: '支持使用图标',
+          timestamp: '2018-04-12 20:46',
+          size: 'large',
+          type: 'primary',
+          icon: 'el-icon-more'
+        }, {
+          content: '支持自定义颜色',
+          timestamp: '2018-04-03 20:46',
+          color: '#3963bc'
+        }, {
+          content: '支持自定义尺寸',
+          timestamp: '2018-04-03 20:46',
+          size: 'large'
+        }, {
+          content: '默认样式的节点',
+          timestamp: '2018-04-03 20:46'
+        }]
+      };
+    }
+  };
+<\/script>`,
+      placement: `<div class="block">
+  <el-timeline>
+    <el-timeline-item timestamp="2018/4/12" placement="top">
+      <el-card>
+        <h4>更新 Github 模板</h4>
+        <p>王小虎 提交于 2018/4/12 20:46</p>
+      </el-card>
+    </el-timeline-item>
+    <el-timeline-item timestamp="2018/4/3" placement="top">
+      <el-card>
+        <h4>更新 Github 模板</h4>
+        <p>王小虎 提交于 2018/4/3 20:46</p>
+      </el-card>
+    </el-timeline-item>
+    <el-timeline-item timestamp="2018/4/2" placement="top">
+      <el-card>
+        <h4>更新 Github 模板</h4>
+        <p>王小虎 提交于 2018/4/2 20:46</p>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</div>`,
+      reverse: true,
+      activities: [{
+        content: '活动按期开始',
+        timestamp: '2018-04-15'
+      }, {
+        content: '通过审核',
+        timestamp: '2018-04-13'
+      }, {
+        content: '创建成功',
+        timestamp: '2018-04-11'
+      }],
+      activities1: [{
+        content: '支持使用图标',
+        timestamp: '2018-04-12 20:46',
+        size: 'large',
+        type: 'primary',
+        icon: 'el-icon-more'
+      }, {
+        content: '支持自定义颜色',
+        timestamp: '2018-04-03 20:46',
+        color: '#3963bc'
+      }, {
+        content: '支持自定义尺寸',
+        timestamp: '2018-04-03 20:46',
+        size: 'large'
+      }, {
+        content: '默认样式的节点',
+        timestamp: '2018-04-03 20:46'
+      }]
+    };
+  },
+  // 计算属性设置
+  computed: {},
+  // 数据变更监听
+  watch: {},
+  mounted() {
+    this.init()
+  },
+  methods: {
+    // 执行获取数据等初始化动作
+    init() {},
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../../assets/style/container';
+
+.radio {
+  display: inline-block;
+  margin-bottom: 20px;
+}
+
+.demonstration {
+  display: block;
+  color: #8492a6;
+  font-size: 14px;
+  margin-bottom: 20px;
+}
+
+.timeLineCard /deep/ .el-card__body {
+  padding: 20px;
+}
+
+.timeLineCard /deep/ .el-card__body h4 {
+  margin: 20px 0px;
+}
+
+.timeLineCard /deep/ .el-card__body {
+  margin: 14px 0px;
+}
+</style>
diff --git a/src/plugins/LinCmsUi/views/table/TableCombo.vue b/src/plugins/LinCmsUi/views/table/TableCombo.vue
index 4c3c5ca6..2f898516 100644
--- a/src/plugins/LinCmsUi/views/table/TableCombo.vue
+++ b/src/plugins/LinCmsUi/views/table/TableCombo.vue
@@ -529,4 +529,17 @@ export default {
     margin: 20px;
   }
 }
+// dialog
+.tableSample /deep/ .el-dialog__footer {
+  text-align: left;
+  padding-left: 30px;
+}
+
+.tableSample /deep/ .el-dialog__header {
+  padding-left: 30px;
+}
+
+.tableSample /deep/ .el-dialog__body {
+  padding: 30px;
+}
 </style>
diff --git a/src/views/admin/group/GroupList.vue b/src/views/admin/group/GroupList.vue
index 8658edd2..e5a24406 100644
--- a/src/views/admin/group/GroupList.vue
+++ b/src/views/admin/group/GroupList.vue
@@ -10,7 +10,7 @@
       @row-click="rowClick"
       v-loading="loading">
     </lin-table>
-    <el-dialog :append-to-body="true" :visible.sync="dialogFormVisible" :before-close="handleClose">
+    <el-dialog :append-to-body="true" :visible.sync="dialogFormVisible" :before-close="handleClose" class="groupListInfoDialog">
       <div style="margin-top:-25px;">
         <el-tabs v-model="activeTab" @tab-click="handleClick">
           <el-tab-pane label="修改信息" name="修改信息" style="margin-top:10px;">
@@ -271,4 +271,15 @@ export default {
     font-weight: 500;
   }
 }
+.groupListInfoDialog /deep/ .el-dialog__footer {
+  text-align: left;
+  padding-left: 30px;
+}
+.groupListInfoDialog /deep/ .el-dialog__header {
+  padding-left: 30px;
+}
+
+.groupListInfoDialog /deep/ .el-dialog__body {
+  padding: 30px;
+}
 </style>
diff --git a/src/views/admin/user/UserList.vue b/src/views/admin/user/UserList.vue
index 2dc20758..94ca496d 100644
--- a/src/views/admin/user/UserList.vue
+++ b/src/views/admin/user/UserList.vue
@@ -3,18 +3,14 @@
     <div class="header">
       <div class="title">用户列表</div>
       <!-- 分组选择下拉框 -->
-      <el-dropdown @command="handleCommand">
-        <el-button>
-          {{groupType}}
-          <i class="el-icon-arrow-down el-icon--right"></i>
-        </el-button>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item :command="[undefined,'全部分组']">全部分组</el-dropdown-item>
-          <el-dropdown-item v-for="(group, index) in groups" :key="index" :command="[group.id,group.name]">
-            {{group.name}}
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+      <el-select  size="medium" filterable v-model="group_id" placeholder="请选择分组" @change="handleChange" clearable>
+        <el-option
+          v-for="(group, index) in groups"
+          :key="index"
+          :label="group.name"
+          :value="group.id">
+        </el-option>
+      </el-select>
     </div>
     <!-- 表格 -->
     <lin-table
@@ -94,9 +90,9 @@ export default {
       tableColumn: [], // 表头数据
       operate: [], // 表格按键操作区
       dialogFormVisible: false, // 控制弹窗显示
+      selectGroup: '', // 选中的分组Id
       groups: [], // 所有分组
       group_id: undefined,
-      groupType: '全部分组', // select下拉框分组种类
       activeTab: '修改信息',
       form: { // 表单信息
         nickname: '',
@@ -153,8 +149,7 @@ export default {
       this.dialogFormVisible = true
     },
     // 下拉框选择分组
-    async handleCommand(group) {
-      [this.group_id, this.groupType] = group
+    async handleChange() {
       this.currentPage = 1
       this.loading = true
       await this.getAdminUsers()