Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
3f7dfa98 by 杨威
Options

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

2 parents c49c1fb7 6f07939f
Expand all
Inline Side-by-side
Showing 12 changed files with 144 additions and 2 deletions
1 VUE_APP_api = 'http://192.168.2.108:8000' 1 VUE_APP_api = 'http://192.168.2.108:8000'
2 VUE_APP_api1 = 'http://192.168.2.76:8000' 2 VUE_APP_api1 = 'http://192.168.2.76:8000'
3 VUE_APP_api2 = 'http://127.0.0.1:8006'
3 VUE_APP_name = '开发环境' 4 VUE_APP_name = '开发环境'
4 NODE_ENV="development" 5 NODE_ENV="development"
5 VUE_APP_VERSION = 'psh' 6 VUE_APP_VERSION = 'psh'
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -19,3 +19,5 @@ yarn-error.log* ...@@ -19,3 +19,5 @@ yarn-error.log*
19 *.njsproj 19 *.njsproj
20 *.sln 20 *.sln
21 *.sw? 21 *.sw?
22 package-lock.json
23 CadastralSystem.iml
......
This diff could not be displayed because it is too large.
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
17 "e-icon-picker": "^1.0.7", 17 "e-icon-picker": "^1.0.7",
18 "element-ui": "^2.13.2", 18 "element-ui": "^2.13.2",
19 "file-saver": "^2.0.2", 19 "file-saver": "^2.0.2",
20 "form-making": "^1.2.9",
20 "js-cookie": "^2.2.1", 21 "js-cookie": "^2.2.1",
21 "mockjs": "^1.1.0", 22 "mockjs": "^1.1.0",
22 "screenfull": "^5.0.2", 23 "screenfull": "^5.0.2",
......
...@@ -51,7 +51,25 @@ const constantRoutes = [ ...@@ -51,7 +51,25 @@ const constantRoutes = [
51 name: '综合查询', 51 name: '综合查询',
52 code: '0-5', 52 code: '0-5',
53 component: () => import('@/views/panel/search/index') 53 component: () => import('@/views/panel/search/index')
54 } 54 },
55 {
56 path: '/zrz',
57 name: '自然幢',
58 code: '1-1',
59 component: () => import('@/views/basic/zrz/index'),
60 },
61 {
62 path: '/dz',
63 name: '多幢',
64 code: '1-2',
65 component: () => import('@/views/basic/dz/index'),
66 },
67 {
68 path: '/h',
69 name: '户',
70 code: '1-3',
71 component: () => import('@/views/basic/h/index'),
72 },
55 ] 73 ]
56 } 74 }
57 ] 75 ]
......
1 .zrz {
2 min-height: 200px;
3 width: 100%;
4 margin-top: 10px;
5 float: left;
6
7 .el-input__inner{
8 width: 100%;
9 border: 0;
10 }
11
12 textarea{
13 width: 100%;
14 border: 0;
15 }
16
17
18 .el-form-item{
19 font-weight: bold;
20 font-size: xx-large
21 }
22
23 table{
24 background: #fff;
25 }
26
27 td{
28 //bgcolor:#F1F4FC;
29 bgcolor:#fff;
30 width:8.33%
31 }
32
33 .el-select{
34 display:block;
35 }
36
37 table{
38 font-size: 14px;
39 }
40 }
...\ No newline at end of file ...\ No newline at end of file
1 .zrz {
2 min-height: 200px;
3 width: 100%;
4 margin-top: 10px;
5 float: left;
6
7 .el-input__inner{
8 width: 100%;
9 border: 0;
10 }
11
12 textarea{
13 width: 100%;
14 border: 0;
15 }
16
17
18 .el-form-item{
19 font-weight: bold;
20 font-size: xx-large
21 }
22
23 table{
24 background: #fff;
25 }
26
27 td{
28 //bgcolor:#F1F4FC;
29 bgcolor:#fff;
30 width:8.33%
31 }
32
33 .el-select{
34 display:block;
35 }
36 }
37
38 table{
39 font-size: 14px;
40 }
...\ No newline at end of file ...\ No newline at end of file
1 .zrz {
2 min-height: 200px;
3 width: 100%;
4 margin-top: 10px;
5 float: left;
6
7 .el-input__inner{
8 width: 100%;
9 border: 0;
10 }
11
12 textarea{
13 width: 100%;
14 border: 0;
15 }
16
17
18 .el-form-item{
19 font-weight: bold;
20 font-size: xx-large
21 }
22
23 table{
24 background: #fff;
25 }
26
27 td{
28 //bgcolor:#F1F4FC;
29 bgcolor:#fff;
30 width:8.33%
31 }
32
33 .el-select{
34 display:block;
35 }
36
37 table{
38 font-size: 14px;
39 }
40 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -49,7 +49,7 @@ module.exports = { ...@@ -49,7 +49,7 @@ module.exports = {
49 hotOnly: false, 49 hotOnly: false,
50 proxy: { 50 proxy: {
51 "/api": { 51 "/api": {
52 target: process.env.VUE_APP_api, 52 target: process.env.VUE_APP_api2,
53 changeOrigin: true, 53 changeOrigin: true,
54 pathRewrite: { 54 pathRewrite: {
55 "^/api": "/", 55 "^/api": "/",
......