Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
bf12ec7e by 任超
Options

Merge branch 'master' into dev

2 parents 68b86f0e acca3b99
Inline Side-by-side
Showing 15 changed files with 96 additions and 58 deletions
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
94 // shadowOffsetY: 20, 94 // shadowOffsetY: 20,
95 }, 95 },
96 }, 96 },
97 },{ 97 }, {
98 aspectScale: 1, //长宽比 98 aspectScale: 1, //长宽比
99 zoom: 1.1, 99 zoom: 1.1,
100 mapType: "", // 自定义扩展图表类型 100 mapType: "", // 自定义扩展图表类型
...@@ -102,12 +102,12 @@ export default { ...@@ -102,12 +102,12 @@ export default {
102 left: "10%", 102 left: "10%",
103 map: "汉中市", 103 map: "汉中市",
104 itemStyle: { 104 itemStyle: {
105 color:'#21371d', 105 color: '#21371d',
106 areaColor: "#21371d", 106 areaColor: "#21371d",
107 borderWidth: 1, 107 borderWidth: 1,
108 borderColor:"#00A3CB", 108 borderColor: "#00A3CB",
109 shadowColor: "#01C5E9", 109 shadowColor: "#01C5E9",
110 shadowBlur:10, 110 shadowBlur: 10,
111 shadowOffsetX: 0, 111 shadowOffsetX: 0,
112 shadowOffsetY: -12, 112 shadowOffsetY: -12,
113 // normal: { 113 // normal: {
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
117 // }, 117 // },
118 }, 118 },
119 emphasis: { 119 emphasis: {
120 disabled:true 120 disabled: true
121 } 121 }
122 }], 122 }],
123 series: [ 123 series: [
...@@ -154,17 +154,16 @@ export default { ...@@ -154,17 +154,16 @@ export default {
154 }, 154 },
155 borderType: 'dottod', 155 borderType: 'dottod',
156 borderWidth: 0, 156 borderWidth: 0,
157 borderColor:'#F8F071', 157 borderColor: '#F8F071',
158 shadowColor: '#000', 158 shadowColor: '#000',
159 shadowBlur: 10, 159 shadowBlur: 10,
160 shadowOffsetY:4 160 shadowOffsetY: 4
161 // } 161 // }
162
163 } 162 }
164 }, 163 },
165 label: { 164 label: {
166 formatter: (params) => { 165 formatter: (params) => {
167 return `${params.name}\n${params.value + "个"}`; 166 // return `${params.name}\n${params.value + "个"}`;
168 }, 167 },
169 show: true, 168 show: true,
170 position: "insideRight", 169 position: "insideRight",
......
...@@ -139,7 +139,7 @@ input[type="number"] { ...@@ -139,7 +139,7 @@ input[type="number"] {
139 } 139 }
140 140
141 ::-webkit-scrollbar-thumb { 141 ::-webkit-scrollbar-thumb {
142 background: rgba(69, 138, 207,.3); 142 background: rgba(69, 138, 207, .6);
143 background-clip: padding-box; 143 background-clip: padding-box;
144 min-height: 28px; 144 min-height: 28px;
145 -webkit-border-radius: 6px; 145 -webkit-border-radius: 6px;
...@@ -148,13 +148,11 @@ input[type="number"] { ...@@ -148,13 +148,11 @@ input[type="number"] {
148 } 148 }
149 149
150 ::-webkit-scrollbar-thumb:hover { 150 ::-webkit-scrollbar-thumb:hover {
151 background: rgba(69, 138, 207,.3); 151 background: rgba(69, 138, 207, .6);
152 } 152 }
153
153 // 滚动条位置 154 // 滚动条位置
154 .el-scrollbar__wrap{ 155
155 // margin-bottom: 0px!important;
156 margin-right: 0px!important;
157 }
158 156
159 // element 样式补丁 157 // element 样式补丁
160 .el-menu--horizontal { 158 .el-menu--horizontal {
...@@ -493,9 +491,7 @@ table td { ...@@ -493,9 +491,7 @@ table td {
493 } 491 }
494 492
495 .el-button--text { 493 .el-button--text {
496 display: flex; 494 line-height: 10px;
497 align-items: center;
498 justify-content: center;
499 } 495 }
500 496
501 // 时间组件input框部分 497 // 时间组件input框部分
......
...@@ -351,7 +351,7 @@ aside { ...@@ -351,7 +351,7 @@ aside {
351 color: #02D9FD; 351 color: #02D9FD;
352 width: 64px; 352 width: 64px;
353 height: 28px; 353 height: 28px;
354 background: rgba(255, 255, 255, 0.1); 354 background: rgba(255, 255, 255, 0.2);
355 border-radius: 16px; 355 border-radius: 16px;
356 } 356 }
357 357
...@@ -362,6 +362,13 @@ aside { ...@@ -362,6 +362,13 @@ aside {
362 border-radius: 16px; 362 border-radius: 16px;
363 color: #0097FF; 363 color: #0097FF;
364 } 364 }
365 .successColor:hover {
366 width: 64px;
367 height: 28px;
368 background: rgba(255, 255, 255, 0.2);
369 border-radius: 16px;
370 color: #0097FF;
371 }
365 .configurationbtnColor { 372 .configurationbtnColor {
366 width: 64px; 373 width: 64px;
367 height: 28px; 374 height: 28px;
...@@ -369,6 +376,13 @@ aside { ...@@ -369,6 +376,13 @@ aside {
369 border-radius: 16px; 376 border-radius: 16px;
370 color: #b0e4dd; 377 color: #b0e4dd;
371 } 378 }
379 .configurationbtnColor:hover {
380 width: 64px;
381 height: 28px;
382 background: rgba(255, 255, 255, 0.2);
383 border-radius: 16px;
384 color: #b0e4dd;
385 }
372 .resetbtnColor { 386 .resetbtnColor {
373 width: 64px; 387 width: 64px;
374 height: 28px; 388 height: 28px;
...@@ -376,20 +390,25 @@ aside { ...@@ -376,20 +390,25 @@ aside {
376 border-radius: 16px; 390 border-radius: 16px;
377 color: #A5CBDA; 391 color: #A5CBDA;
378 } 392 }
379 .movebtnColor { 393 .resetbtnColor:hover {
380 width: 64px; 394 width: 64px;
381 height: 28px; 395 height: 28px;
382 background: rgba(255, 255, 255, 0.1); 396 background: rgba(255, 255, 255, 0.2);
383 border-radius: 16px; 397 border-radius: 16px;
384 color: #0097FF; 398 color: #A5CBDA;
385 } 399 }
386 .successColor:hover { 400 .movebtnColor {
387 width: 64px; 401 width: 64px;
388 height: 28px; 402 height: 28px;
389 background: rgba(255, 255, 255, 0.1); 403 background: rgba(255, 255, 255, 0.1);
390 border-radius: 16px; 404 border-radius: 16px;
391 color: #0097FF; 405 color: #0097FF;
392 } 406 }
407 .movebtnColor:hover {
408 background: rgba(255, 255, 255, 0.2);
409 border-radius: 16px;
410 color: #0097FF;
411 }
393 412
394 .delColor { 413 .delColor {
395 width: 64px; 414 width: 64px;
...@@ -402,7 +421,7 @@ aside { ...@@ -402,7 +421,7 @@ aside {
402 .delColor:hover { 421 .delColor:hover {
403 width: 64px; 422 width: 64px;
404 height: 28px; 423 height: 28px;
405 background: rgba(255, 255, 255, 0.1); 424 background: rgba(255, 255, 255, 0.2);
406 border-radius: 16px; 425 border-radius: 16px;
407 color: #B06974; 426 color: #B06974;
408 } 427 }
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-17 15:13:09
5 */
1 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
2 class data extends filter { 7 class data extends filter {
3 constructor() { 8 constructor() {
...@@ -54,7 +59,7 @@ class data extends filter { ...@@ -54,7 +59,7 @@ class data extends filter {
54 { 59 {
55 label: "解封机关", 60 label: "解封机关",
56 prop: "jfjg", 61 prop: "jfjg",
57 width: 150, 62 minWidth: 150,
58 }, 63 },
59 { 64 {
60 label: "解封文号", 65 label: "解封文号",
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:22:01 4 * @LastEditTime: 2023-03-17 15:13:30
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 class data extends filter { 7 class data extends filter {
...@@ -34,7 +34,8 @@ class data extends filter { ...@@ -34,7 +34,8 @@ class data extends filter {
34 }, 34 },
35 { 35 {
36 label: "业务号", 36 label: "业务号",
37 prop: "ywh" 37 prop: "ywh",
38 minWidth: 150,
38 }, 39 },
39 { 40 {
40 label: "不动产单元号", 41 label: "不动产单元号",
...@@ -62,6 +63,7 @@ class data extends filter { ...@@ -62,6 +63,7 @@ class data extends filter {
62 }, 63 },
63 { 64 {
64 label: "登记类型", 65 label: "登记类型",
66 minWidth: 100,
65 render: (h, scope) => { 67 render: (h, scope) => {
66 return ( 68 return (
67 <div> 69 <div>
...@@ -73,11 +75,12 @@ class data extends filter { ...@@ -73,11 +75,12 @@ class data extends filter {
73 { 75 {
74 label: "被担保主债权数额", 76 label: "被担保主债权数额",
75 prop: "bdbzzqse", 77 prop: "bdbzzqse",
76 width: 135, 78 minWidth: 135,
77 }, 79 },
78 { 80 {
79 label: "最高债权额", 81 label: "最高债权额",
80 prop: "zgzqse" 82 prop: "zgzqse",
83 minWidth: 100,
81 }, 84 },
82 { 85 {
83 label: "登记时间", 86 label: "登记时间",
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:23:47 4 * @LastEditTime: 2023-03-17 15:14:13
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 class data extends filter { 7 class data extends filter {
...@@ -34,6 +34,7 @@ class data extends filter { ...@@ -34,6 +34,7 @@ class data extends filter {
34 }, 34 },
35 { 35 {
36 label: "业务号", 36 label: "业务号",
37 minWidth: 150,
37 prop: "YWH", 38 prop: "YWH",
38 }, 39 },
39 { 40 {
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:25:09 4 * @LastEditTime: 2023-03-17 15:18:26
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 class data extends filter { 7 class data extends filter {
...@@ -34,7 +34,8 @@ class data extends filter { ...@@ -34,7 +34,8 @@ class data extends filter {
34 }, 34 },
35 { 35 {
36 label: "业务号", 36 label: "业务号",
37 prop: "ywh" 37 prop: "ywh",
38 minWidth: 150,
38 }, 39 },
39 { 40 {
40 label: "不动产单元号", 41 label: "不动产单元号",
...@@ -49,7 +50,7 @@ class data extends filter { ...@@ -49,7 +50,7 @@ class data extends filter {
49 { 50 {
50 label: "权利人", 51 label: "权利人",
51 prop: "qlrmc", 52 prop: "qlrmc",
52 width: 150 53 minWidth: 100
53 }, 54 },
54 { 55 {
55 label: "用途", 56 label: "用途",
...@@ -57,7 +58,7 @@ class data extends filter { ...@@ -57,7 +58,7 @@ class data extends filter {
57 }, 58 },
58 { 59 {
59 label: "权利类型", 60 label: "权利类型",
60 width: 150, 61 minWidth: 160,
61 render: (h, scope) => { 62 render: (h, scope) => {
62 return ( 63 return (
63 <div> 64 <div>
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-17 15:18:47
5 */
1 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
2 class data extends filter { 7 class data extends filter {
3 constructor() { 8 constructor() {
...@@ -30,6 +35,7 @@ class data extends filter { ...@@ -30,6 +35,7 @@ class data extends filter {
30 { 35 {
31 label: "业务号", 36 label: "业务号",
32 prop: "ywh", 37 prop: "ywh",
38 minWidth: 150,
33 }, 39 },
34 { 40 {
35 label: "不动产单元号", 41 label: "不动产单元号",
...@@ -44,14 +50,16 @@ class data extends filter { ...@@ -44,14 +50,16 @@ class data extends filter {
44 { 50 {
45 label: "权利人", 51 label: "权利人",
46 prop: "qlrmc", 52 prop: "qlrmc",
47 width: 150 53 minWidth: 70
48 }, 54 },
49 { 55 {
50 label: "用途", 56 label: "用途",
51 prop: "ytmc" 57 prop: "ytmc",
58 minWidth: 70
52 }, 59 },
53 { 60 {
54 label: "权利类型", 61 label: "权利类型",
62 minWidth: 170,
55 render: (h, scope) => { 63 render: (h, scope) => {
56 return ( 64 return (
57 <div> 65 <div>
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-17 15:15:38
5 */
1 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
2 class data extends filter { 7 class data extends filter {
3 constructor() { 8 constructor() {
...@@ -51,7 +56,8 @@ class data extends filter { ...@@ -51,7 +56,8 @@ class data extends filter {
51 }, 56 },
52 { 57 {
53 label: "用途", 58 label: "用途",
54 prop: "yt" 59 prop: "yt",
60 minWidth: 150,
55 }, 61 },
56 { 62 {
57 label: "权利类型", 63 label: "权利类型",
......
...@@ -30,17 +30,17 @@ class data extends filter { ...@@ -30,17 +30,17 @@ class data extends filter {
30 { 30 {
31 label: "业务号", 31 label: "业务号",
32 prop: "YWH", 32 prop: "YWH",
33 width: 150, 33 minWidth: 150,
34 }, 34 },
35 { 35 {
36 label: "不动产单元号", 36 label: "不动产单元号",
37 prop: "BDCDYH", 37 prop: "BDCDYH",
38 width: 150, 38 minWidth: 150,
39 }, 39 },
40 { 40 {
41 label: "不动产权证号", 41 label: "不动产权证号",
42 prop: "BDCQZH", 42 prop: "BDCQZH",
43 width: 150, 43 minWidth: 150,
44 }, 44 },
45 { 45 {
46 label: "地籍号", 46 label: "地籍号",
......
...@@ -12,6 +12,7 @@ class data extends filter { ...@@ -12,6 +12,7 @@ class data extends filter {
12 }, 12 },
13 { 13 {
14 label: "预告登记种类", 14 label: "预告登记种类",
15 minWidth: 130,
15 render: (h, scope) => { 16 render: (h, scope) => {
16 return ( 17 return (
17 <div> 18 <div>
...@@ -22,7 +23,7 @@ class data extends filter { ...@@ -22,7 +23,7 @@ class data extends filter {
22 }, 23 },
23 { 24 {
24 label: "登记类型", 25 label: "登记类型",
25 width: 100, 26 minWidth: 100,
26 render: (h, scope) => { 27 render: (h, scope) => {
27 return ( 28 return (
28 <div> 29 <div>
...@@ -33,11 +34,13 @@ class data extends filter { ...@@ -33,11 +34,13 @@ class data extends filter {
33 }, 34 },
34 { 35 {
35 label: "不动产单元号", 36 label: "不动产单元号",
36 prop: "BDCDYH" 37 prop: "BDCDYH",
38 minWidth: 150,
37 }, 39 },
38 { 40 {
39 label: "不动产登记证明号", 41 label: "不动产登记证明号",
40 prop: "BDCDJZMH" 42 prop: "BDCDJZMH",
43 minWidth: 150,
41 }, 44 },
42 { 45 {
43 label: "登记时间", 46 label: "登记时间",
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:37:10 4 * @LastEditTime: 2023-03-17 15:18:00
5 */ 5 */
6 6
7 import filter from '@/utils/filter.js' 7 import filter from '@/utils/filter.js'
...@@ -45,7 +45,7 @@ class data extends filter { ...@@ -45,7 +45,7 @@ class data extends filter {
45 { 45 {
46 label: "不动产权证号", 46 label: "不动产权证号",
47 prop: "BDCQZH", 47 prop: "BDCQZH",
48 width: 150 48 minWidth: 150
49 }, 49 },
50 { 50 {
51 label: "权利人", 51 label: "权利人",
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-16 13:44:11 4 * @LastEditTime: 2023-03-17 15:10:43
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 class data extends filter { 7 class data extends filter {
...@@ -75,7 +75,7 @@ class data extends filter { ...@@ -75,7 +75,7 @@ class data extends filter {
75 }, 75 },
76 { 76 {
77 prop: "rectypeName", 77 prop: "rectypeName",
78 minWidth: 240, 78 minWidth: 210,
79 label: "业务名称", 79 label: "业务名称",
80 render: (h, scope) => { 80 render: (h, scope) => {
81 return ( 81 return (
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:39:14 4 * @LastEditTime: 2023-03-17 15:11:13
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -31,17 +31,17 @@ class data extends filter { ...@@ -31,17 +31,17 @@ class data extends filter {
31 { 31 {
32 prop: "areacode", 32 prop: "areacode",
33 label: "行政区代码", 33 label: "行政区代码",
34 width: 90, 34 minWidth: 90,
35 }, 35 },
36 { 36 {
37 prop: "areaName", 37 prop: "areaName",
38 label: "行政区名称", 38 label: "行政区名称",
39 width: 90, 39 minWidth: 90,
40 }, 40 },
41 { 41 {
42 prop: "bizMsgid", 42 prop: "bizMsgid",
43 label: "业务报文ID", 43 label: "业务报文ID",
44 width: 150, 44 minWidth: 150,
45 }, 45 },
46 { 46 {
47 prop: "createdate", 47 prop: "createdate",
...@@ -51,22 +51,22 @@ class data extends filter { ...@@ -51,22 +51,22 @@ class data extends filter {
51 { 51 {
52 prop: "recflowid", 52 prop: "recflowid",
53 label: "业务流水号", 53 label: "业务流水号",
54 width: 100, 54 minWidth: 100,
55 }, 55 },
56 { 56 {
57 prop: "estatenum", 57 prop: "estatenum",
58 label: "不动产单元号", 58 label: "不动产单元号",
59 width: 150, 59 minWidth: 150,
60 }, 60 },
61 { 61 {
62 prop: "rectype", 62 prop: "rectype",
63 label: "业务编码", 63 label: "业务编码",
64 width: 90, 64 minWidth: 90,
65 }, 65 },
66 { 66 {
67 prop: "rectypeName", 67 prop: "rectypeName",
68 label: "业务名称", 68 label: "业务名称",
69 minWidth: 240, 69 minWidth: 190,
70 }, 70 },
71 { 71 {
72 prop: "exchangeDate", 72 prop: "exchangeDate",
......
...@@ -178,7 +178,6 @@ ...@@ -178,7 +178,6 @@
178 type="text" 178 type="text"
179 size="mini" 179 size="mini"
180 class="configurationbtnColor" 180 class="configurationbtnColor"
181 icon="el-icon-video-pause"
182 onClick={() => { 181 onClick={() => {
183 this.getList(scope.row); 182 this.getList(scope.row);
184 }} 183 }}
...@@ -200,7 +199,6 @@ ...@@ -200,7 +199,6 @@
200 type="text" 199 type="text"
201 size="mini" 200 size="mini"
202 class='successColor' 201 class='successColor'
203 icon="el-icon-edit"
204 onClick={() => { 202 onClick={() => {
205 this.handleAddEdit(scope.row); 203 this.handleAddEdit(scope.row);
206 }} 204 }}
...@@ -222,7 +220,6 @@ ...@@ -222,7 +220,6 @@
222 disabled={scope.row.category === 1} 220 disabled={scope.row.category === 1}
223 size="mini" 221 size="mini"
224 class='delColor' 222 class='delColor'
225 icon="el-icon-delete"
226 // style="color:#F56C6C" 223 // style="color:#F56C6C"
227 onClick={() => { 224 onClick={() => {
228 this.handleDelete(scope.row.id, scope.row.name); 225 this.handleDelete(scope.row.id, scope.row.name);
......