diff --git a/src/router/index.js b/src/router/index.js
index 4793b85..30c82dd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -12,7 +12,6 @@ Vue.use(Router)
   * hidden : if `hidden:true` will not show in the sidebar
   * redirect : if `redirect:noredirect` will not redirct in the levelbar
   * noDropdown : if `noDropdown:true` will not has submenu in the sidebar
-  * meta : `{ role: ['admin'] }`  will control the page role
   **/
 export const constantRouterMap = [
   { path: '/login', component: ()=>import('@/views/login/index'), hidden: true },
@@ -54,7 +53,7 @@ export default new Router({
     {
       path: '/DouBan',
       component: Layout,
-      redirect: '/DouBan/person',
+      redirect: '/DouBan/movie',
       name:"DouBan",
       title:"豆瓣查询",
       icon:'tubiao',
@@ -69,7 +68,7 @@ export default new Router({
     {
       path: '/system',
       component: Layout,
-      redirect: '/system/user',
+      redirect: '/system/users',
       name:"system",
       title:"系统设置",
       icon:'zujian',
@@ -77,11 +76,13 @@ export default new Router({
         { path: 'users', name: 'users',title:"用户设置", component: ()=>import('@/views/system/users'),meta:{title:"用户设置"}},
         { path: 'dept', name: 'dept',title:"部门设置", component: ()=>import('@/views/system/dept'),meta:{title:"部门设置"}},
         { path: 'role', name: 'role',title:"角色设置", component: ()=>import('@/views/system/role'),meta:{title:"角色设置"}},
-        // { path: 'menu', name: 'menu',title:"菜单设置", component: ()=>import('@/views/system/menu'),meta:{title:"菜单设置"}}
+        { path: 'role2', name: 'role2',title:"表单设计", component: ()=>import('@/views/system/formdesigner'),meta:{title:"表单设计"}},
 
       ]
     },
 
+    
+
     {path:"*",redirect:"/404",hidden:true}
   ]
 
diff --git a/src/views/Archive/person.vue b/src/views/Archive/person.vue
index 5e230a0..7ed3ffe 100644
--- a/src/views/Archive/person.vue
+++ b/src/views/Archive/person.vue
@@ -1,5 +1,14 @@
 <template>
   <div class="app-container" id="person">
+
+<el-button @click="test()"></el-button>
+
+<generate-form
+    :data="jsonData"
+    ref="generateForm">
+</generate-form>
+
+
 <el-row>
   <el-col :span="2">
       <el-button @click="New()" type="primary" size="small">新增</el-button>
@@ -116,10 +125,85 @@ import {
 } from "@/api/Archive/person"
 import { getToken } from "@/utils/auth"
 import UploadAffix from "@/components/UploadAffix"
+import {
+  GenerateForm
+} from 'form-making'
+
 export default {
   //
   data() {
     return {
+      jsonData:{
+  "list": [
+    {
+      "type": "input",
+      "name": "单行文本",
+      "icon": "regular/keyboard",
+      "options": {
+        "width": "100%",
+        "defaultValue": "",
+        "required": false,
+        "dataType": "string",
+        "pattern": "",
+        "placeholder": "",
+        "remoteFunc": "func_1540898325000_60519"
+      },
+      "key": "1540898325000_60519",
+      "model": "input_1540898325000_60519",
+      "rules": [
+        {
+          "type": "string",
+          "message": "单行文本格式不正确"
+        }
+      ]
+    },
+    {
+      "type": "textarea",
+      "name": "多行文本",
+      "icon": "regular/keyboard",
+      "options": {
+        "width": "100%",
+        "defaultValue": "",
+        "required": false,
+        "pattern": "",
+        "placeholder": "",
+        "remoteFunc": "func_1540898327000_70367"
+      },
+      "key": "1540898327000_70367",
+      "model": "textarea_1540898327000_70367",
+      "rules": []
+    },
+    {
+      "type": "time",
+      "name": "时间选择器",
+      "icon": "regular/clock",
+      "options": {
+        "defaultValue": "",
+        "readonly": false,
+        "disabled": false,
+        "editable": true,
+        "clearable": true,
+        "placeholder": "",
+        "startPlaceholder": "",
+        "endPlaceholder": "",
+        "isRange": false,
+        "arrowControl": true,
+        "format": "HH:mm:ss",
+        "required": false,
+        "width": "",
+        "remoteFunc": "func_1540898328000_61326"
+      },
+      "key": "1540898328000_61326",
+      "model": "time_1540898328000_61326",
+      "rules": []
+    }
+  ],
+  "config": {
+    "labelWidth": 100,
+    "labelPosition": "left",
+    "size": "small"
+  }
+},
       selected: null,
       textMap: {
         update: "编辑",
@@ -155,7 +239,8 @@ export default {
     }
   },
   components: {
-    UploadAffix
+    UploadAffix,
+    GenerateForm
   },
 
   created() {
@@ -244,7 +329,16 @@ export default {
         this.dialogFormVisible = false
         this.fetchData(this.listQuery)
       })
-    }
+    },
+    test(){
+            // 调用此方法验证表单数据和获取表单数据
+            this.$refs.generateForm.getData().then(data => {
+                console.log(data)
+                // data 为获取的表单数据
+            }).catch(e => {
+                // 数据校验失败
+            })
+        }
   }
 }
 </script>
diff --git a/src/views/system/formdesigner.vue b/src/views/system/formdesigner.vue
new file mode 100644
index 0000000..bc98576
--- /dev/null
+++ b/src/views/system/formdesigner.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="app-container" ref="container" id="formdesigner">
+<making-form preview generate-json ref="form" >
+    <template slot="action">
+      <el-button @click="test">保存</el-button>
+    </template>
+</making-form>
+  </div>
+</template>
+
+<script>
+import {MakingForm} from 'form-making'
+
+export default {
+  name:"formdesigner",
+  data(){
+    return {
+
+    }
+  },
+  methods:{
+      test(){
+        this.$refs.form.getJSON().then(data=>{
+            console.log(data)
+        })
+      }
+  },
+  components:{
+MakingForm
+  }
+}
+</script>
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
deleted file mode 100644
index 14d36bd..0000000
--- a/src/views/system/menu.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <div class="app-container" ref="container" id="dept">
-
-   <el-button @click="New()" type="primary" size="small" style="margin:10px 0px">新增</el-button>
-
-
-    <el-table   :data="list" v-loading.body="listLoading" element-loading-text="拼命加载中" border fit highlight-current-row>
-      <el-table-column align="center" label='ID' width="95">
-        <template slot-scope="scope">
-          {{scope.row.id}}
-        </template>
-      </el-table-column>
-      <el-table-column label="菜单名称">
-        <template slot-scope="scope">
-          {{scope.row.title}}
-        </template>
-      </el-table-column>
-      <el-table-column label="菜单路径">
-        <template slot-scope="scope">
-          {{scope.row.path}}
-        </template>
-      </el-table-column>
-
- <el-table-column label="菜单唯一标识">
-        <template slot-scope="scope">
-          {{scope.row.name}}
-        </template>
-      </el-table-column>
-
-       <el-table-column label="父级菜单">
-        <template slot-scope="scope">
-          {{scope.row.parentid}}
-        </template>
-      </el-table-column>
-
-       <el-table-column label="菜单图标">
-        <template slot-scope="scope">
-          {{scope.row.icon}}
-        </template>
-      </el-table-column>
- <el-table-column label="排序码">
-        <template slot-scope="scope">
-          {{scope.row.sequence}}
-        </template>
-      </el-table-column>
-
-      <el-table-column label="操作" align="center" min-width="110px">
-        <template slot-scope="scope">
-          <el-button @click="Edit(scope.row.id)" type="success" size="small">编辑</el-button>
-
-          <el-button @click="Delete(scope.row.id)" type="danger" size="small">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.pageNumber"
-      :page-sizes="[10, 20, 30]" :page-size="listQuery.pageSize" 　 layout="total,sizes, prev, pager, next" :total="listQuery.totalCount"
-      style="margin-top:5px">
-    </el-pagination>
-    <!-- <el-tree :data="depttree"  default-expand-all node-key="id" ref="tree" highlight-current :props="defaultProps">
-    </el-tree> -->
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="50%" :modal-append-to-body='false'>
-      <el-form class="small-space" :model="temp" label-position="left" label-width="70px">
-
-        <el-form-item label="部门名称">
-          <el-input class="filter-item" v-model="temp.deptname" placeholder="请输入部门名称">
-
-          </el-input>
-        </el-form-item>
-        <el-form-item label="排序码">
-          <el-input class="filter-item" v-model="temp.rank" placeholder="请输入排序码">
-
-          </el-input>
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button v-if="dialogStatus=='create'" type="primary" @click="create">确 定</el-button>
-        <el-button v-else type="primary" @click="update">确 定</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-  import {
-   MenuList,
-    DeleteMenu,
-    GetMenuDetail,
-    AddMenu,
-    UpdateMenu,
-  } from "@/api/system/menu";
-
-  export default {
-    data() {
-      return {
-        textMap: {
-          update: "编辑",
-          create: "新增"
-        },
-        dialogFormVisible: false,
-        dialogStatus: "",
-        list: null,
-        windowheight:"550",
-        listLoading: true,
-        temp: {
-          id: "",
-          name: "",
-          icon: "",
-          parentid: "",
-          path: "",
-          sequence: "",
-          title: "",
-          redirect: "noredirect",
-        },
-            listQuery: {
-        totalCount: 0,
-        pageSize: 10,
-        pageNumber: 1
-      },
-        depttree: [],
-        defaultProps: {
-          children: "children",
-          label: "text"
-        }
-      }
-    },
-
-    created() {
-      // GetDeptTree().then(response => {
-      //   this.depttree = JSON.parse(response.data);
-      // });
-      this.fetchData(this.listQuery);
-
-
-    },
-    mounted(){
-     
-    },
-    methods: {
-
-           handleSizeChange(val) {
-      this.listQuery.pageSize = val
-      this.fetchData(this.listQuery)
-    },
-    handleCurrentChange(val) {
-      this.listQuery.pageNumber = val
-      this.fetchData(this.listQuery)
-    },
-
-
-      fetchData(params) {
-        this.listLoading = true;
-        MenuList(params).then(response => {
-          this.list = response.data.list;
-          this.listLoading = false
-          this.listQuery.totalCount = parseInt(response.data.total)
-
-        });
-      },
-      New() {
-        this.dialogFormVisible = true;
-        this.temp.deptname = "";
-        this.temp.rank = "";
-        this.dialogStatus = "create";
-      },
-      Delete(id) {
-        this.$confirm("确认删除?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            DeleteMenu(id).then(()=>{    
-                      this.fetchData()
-})
-          })
-
-      },
-      Edit(id) {
-        this.dialogStatus = "update";
-
-        GetMenuDetail(id).then(response => {
-          this.dialogStatus = "update";
-          this.temp = response.data;
-          console.log(this.temp)
-          this.dialogFormVisible = true;
-
-        });
-
-      },
-
-
-      create() {
-        AddMenu(this.temp).then(response => {
-         
-          this.dialogFormVisible = false;
-          this.fetchData();
-
-        });
-
-      },
-      update() {
-        UpdateMenu(this.temp).then(response => {
-          
-          this.dialogFormVisible = false;
-
-          this.fetchData();
-
-        });
-
-      }
-    }
-  };
-
-</script>
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index 8d1269c..0b1549c 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -109,7 +109,7 @@ export default {
   created() {
     this.fetchData(this.listQuery)
 
-
+console.log(asyncRouterMap)
    let arr =  asyncRouterMap.filter(item=>{
 
       if(item.hidden)