Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

 VUE_APP_api = 'http://192.168.2.108:8000'
 VUE_APP_api1 = 'http://192.168.2.76:8000'
+VUE_APP_api2 = 'http://127.0.0.1:8006'
 VUE_APP_name = '开发环境'
 NODE_ENV="development"
 VUE_APP_VERSION = 'psh'
\ No newline at end of file

@@ -19,3 +19,5 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+package-lock.json
+CadastralSystem.iml

@@ -17,6 +17,7 @@
     "e-icon-picker": "^1.0.7",
     "element-ui": "^2.13.2",
     "file-saver": "^2.0.2",
+    "form-making": "^1.2.9",
     "js-cookie": "^2.2.1",
     "mockjs": "^1.1.0",
     "screenfull": "^5.0.2",

@@ -51,7 +51,25 @@ const constantRoutes = [
         name: '综合查询',
         code: '0-5',
         component: () => import('@/views/panel/search/index')
-      }
+      },
+      {
+        path: '/zrz',
+        name: '自然幢',
+        code: '1-1',
+        component: () => import('@/views/basic/zrz/index'),
+      },
+      {
+        path: '/dz',
+        name: '多幢',
+        code: '1-2',
+        component: () => import('@/views/basic/dz/index'),
+      },
+      {
+        path: '/h',
+        name: '户',
+        code: '1-3',
+        component: () => import('@/views/basic/h/index'),
+      },
     ]
   }
 ]

+.zrz {
+  min-height: 200px;
+  width: 100%;
+  margin-top: 10px;
+  float: left;
+
+  .el-input__inner{
+    width: 100%;
+    border: 0;
+  }
+
+  textarea{
+    width: 100%;
+    border: 0;
+  }
+
+
+  .el-form-item{
+    font-weight: bold;
+    font-size: xx-large
+  }
+
+  table{
+    background: #fff;
+  }
+
+  td{
+    //bgcolor:#F1F4FC;
+    bgcolor:#fff;
+    width:8.33%
+  }
+
+  .el-select{
+    display:block;
+  }
+
+  table{
+    font-size: 14px;
+  }
+}
\ No newline at end of file

+.zrz {
+  min-height: 200px;
+  width: 100%;
+  margin-top: 10px;
+  float: left;
+
+  .el-input__inner{
+    width: 100%;
+    border: 0;
+  }
+
+  textarea{
+    width: 100%;
+    border: 0;
+  }
+
+
+  .el-form-item{
+    font-weight: bold;
+    font-size: xx-large
+  }
+
+  table{
+    background: #fff;
+  }
+
+  td{
+    //bgcolor:#F1F4FC;
+    bgcolor:#fff;
+    width:8.33%
+  }
+
+  .el-select{
+    display:block;
+  }
+}
+
+table{
+  font-size: 14px;
+}
\ No newline at end of file

+.zrz {
+  min-height: 200px;
+  width: 100%;
+  margin-top: 10px;
+  float: left;
+
+  .el-input__inner{
+    width: 100%;
+    border: 0;
+  }
+
+  textarea{
+    width: 100%;
+    border: 0;
+  }
+
+
+  .el-form-item{
+    font-weight: bold;
+    font-size: xx-large
+  }
+
+  table{
+    background: #fff;
+  }
+
+  td{
+    //bgcolor:#F1F4FC;
+    bgcolor:#fff;
+    width:8.33%
+  }
+
+  .el-select{
+    display:block;
+  }
+
+  table{
+    font-size: 14px;
+  }
+}
\ No newline at end of file

@@ -49,7 +49,7 @@ module.exports = {
       hotOnly: false,
       proxy: {
         "/api": {
-          target: process.env.VUE_APP_api,
+          target: process.env.VUE_APP_api2,
           changeOrigin: true,
           pathRewrite: {
             "^/api": "/",