Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
b2924823 by xiaomiao
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents bfa807e7 89ea6006
Expand all
Inline Side-by-side
Showing 52 changed files with 510 additions and 297 deletions
1 <!-- 1 <!--
2 功能：结果 2 * @Description:
3 作者：calliope 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 11:09:01
4 --> 5 -->
5 <template> 6 <template>
6 <div class='result'> 7 <div class='result'>
7 <p>响应xml</p> 8 <div class="result-con" style="margin-bottom: 15px;">
8 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML"> 9 <p>响应xml</p>
9 </el-input> 10 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML">
10 <p>错误信息</p> 11 </el-input>
11 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO"> 12 </div>
12 </el-input> 13 <div class="result-con" style="margin-top: 15px;">
14 <p>错误信息</p>
15 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO">
16 </el-input>
17 </div>
13 </div> 18 </div>
14 </template> 19 </template>
15 <script> 20 <script>
...@@ -40,22 +45,40 @@ export default { ...@@ -40,22 +45,40 @@ export default {
40 <style scoped lang='scss'> 45 <style scoped lang='scss'>
41 @import '~@/styles/public.scss'; 46 @import '~@/styles/public.scss';
42 47
48
43 .result { 49 .result {
44 padding: 15px; 50 padding: 15px;
45 height: 100%; 51 height: 100%;
46 52
47 p {
48 color: #ffffff;
49 line-height: 26px;
50 font-size: 18px;
51 }
52
53 /deep/.el-textarea__inner { 53 /deep/.el-textarea__inner {
54 min-height: 30vh !important; 54 height: 30vh !important;
55 background-color: #08346F !important;
56 color: #ffffff; 55 color: #ffffff;
57 border: none !important; 56 border: none !important;
57 color: #ffffff;
58 } 58 }
59 59
60 &-con {
61 background: #04275B;
62 border-radius: 2px;
63 padding: 10px;
64 box-sizing: border-box;
65
66 p {
67 color: #2997E8;
68 font-size: 14px;
69 position: relative;
70 padding-left: 10px;
71 }
72
73 p::before {
74 position: absolute;
75 content: '';
76 width: 3px;
77 height: 10px;
78 background-color: #2997E8;
79 left: 0;
80 top: 3px;
81 }
82 }
60 } 83 }
61 </style> 84 </style>
......
...@@ -341,20 +341,39 @@ export default { ...@@ -341,20 +341,39 @@ export default {
341 /deep/.el-dialog__body { 341 /deep/.el-dialog__body {
342 display: flex; 342 display: flex;
343 flex-direction: column; 343 flex-direction: column;
344 padding-bottom: 25px; 344 padding-bottom: 30px;
345 } 345 }
346 346
347 /deep/ .el-tabs { 347 /deep/ .el-tabs {
348 color: #CEF8FF; 348 color: #CEF8FF;
349 } 349 }
350 350
351 .d-center {
352 z-index: 1000;
353 }
354
351 .sjmx { 355 .sjmx {
356 display: flex;
357 flex-direction: column;
358 height: 49vh;
359
352 /deep/.el-tabs__item { 360 /deep/.el-tabs__item {
353 height: 50px; 361 height: 50px;
354 padding-top: 6px; 362 padding-top: 6px;
355 } 363 }
356 } 364 }
357 365
366 .result {
367 flex: 1;
368 height: 100%;
369 }
370
371 .editDialogBox-con {
372 flex: 1;
373 height: 100%;
374 overflow-y: hidden;
375 }
376
358 /deep/.el-tabs__item { 377 /deep/.el-tabs__item {
359 color: #CEF8FF !important; 378 color: #CEF8FF !important;
360 379
...@@ -427,9 +446,7 @@ export default { ...@@ -427,9 +446,7 @@ export default {
427 overflow-y: auto; 446 overflow-y: auto;
428 overflow-x: hidden; 447 overflow-x: hidden;
429 padding-right: 1px; 448 padding-right: 1px;
430 margin-bottom: 10px;
431 border-top: none; 449 border-top: none;
432 height: 44vh;
433 } 450 }
434 451
435 /deep/.editDialogBox { 452 /deep/.editDialogBox {
...@@ -439,7 +456,7 @@ export default { ...@@ -439,7 +456,7 @@ export default {
439 456
440 .el-dialog__header { 457 .el-dialog__header {
441 display: flex; 458 display: flex;
442 margin-bottom: 15px; 459 margin-bottom: 10px;
443 } 460 }
444 461
445 .dialog_footer { 462 .dialog_footer {
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 } 61 }
62 62
63 .appMain { 63 .appMain {
64 min-width: 1290px; 64 // min-width: 1280px;
65 height: calc(100vh - 101px) !important; 65 height: calc(100vh - 101px) !important;
66 box-sizing: border-box; 66 box-sizing: border-box;
67 67
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
2 overflow: hidden; 2 overflow: hidden;
3 background: url("~@/image/dialogBg.png") no-repeat !important; 3 background: url("~@/image/dialogBg.png") no-repeat !important;
4 background-size: 100% 100% !important; 4 background-size: 100% 100% !important;
5 min-height: 90vh; 5 // min-height: 90vh;
6 6
7 .dialog_title { 7 .dialog_title {
8 display: flex; 8 display: flex;
9 position: relative; 9 position: relative;
10 font-size: 24px; 10 font-size: 22px;
11 top: -11px; 11 top: -10px;
12 width: 38%; 12 width: 38%;
13 height: 40px; 13 height: 40px;
14 margin-left: 28px; 14 margin-left: 28px;
...@@ -68,8 +68,9 @@ ...@@ -68,8 +68,9 @@
68 } 68 }
69 69
70 .regularHeight { 70 .regularHeight {
71 height: 80vh;
72 display: flex; 71 display: flex;
72 flex: 1;
73 height: 100%;
73 flex-direction: column; 74 flex-direction: column;
74 75
75 .editDialogBox-con, 76 .editDialogBox-con,
...@@ -97,7 +98,6 @@ ...@@ -97,7 +98,6 @@
97 color: #B5D6DC; 98 color: #B5D6DC;
98 border-radius: 2px; 99 border-radius: 2px;
99 border: 1px solid #224C7C; 100 border: 1px solid #224C7C;
100 margin: 5px;
101 101
102 span { 102 span {
103 display: inline-block; 103 display: inline-block;
...@@ -147,7 +147,6 @@ ...@@ -147,7 +147,6 @@
147 147
148 .el-dialog__header { 148 .el-dialog__header {
149 color: #FFFFFF; 149 color: #FFFFFF;
150 // background: #074487;
151 height: 46px !important; 150 height: 46px !important;
152 width: 97%; 151 width: 97%;
153 margin: 0 auto; 152 margin: 0 auto;
...@@ -157,6 +156,7 @@ ...@@ -157,6 +156,7 @@
157 .el-dialog__body { 156 .el-dialog__body {
158 padding-top: 0; 157 padding-top: 0;
159 padding-bottom: 0; 158 padding-bottom: 0;
159 // height: 95vh;
160 } 160 }
161 161
162 .el-dialog__headerbtn { 162 .el-dialog__headerbtn {
......
...@@ -232,19 +232,21 @@ table td { ...@@ -232,19 +232,21 @@ table td {
232 } 232 }
233 233
234 // table 固定列样式 234 // table 固定列样式
235 tr:hover { 235 // tr:hover {
236 background: #063160 !important; 236 // background: #063160 !important;
237 box-shadow: inset 0px 0px 20px 0px #03DBFF !important; 237 // box-shadow: inset 0px 0px 20px 0px #03DBFF !important;
238 } 238 // }
239 // .el-table__fixed-right-patch {
240 // background-color: #073781
241 // }
239 242
240 .el-table__fixed-right-patch { 243 .el-table__fixed-right {
241 background-color: #073781; 244 background-color: #073781
242 } 245 }
243 246
244 .el-table__fixed-right { 247 .el-table__fixed::before,
245 box-shadow: inset 0px 0px 20px 0px #5BE7FF !important; 248 .el-table__fixed-right::before {
246 border-left: 3px solid #142e54; 249 display: none;
247 background-color: #1f2c3a;
248 } 250 }
249 251
250 // 表格样式 252 // 表格样式
......
...@@ -336,6 +336,15 @@ aside { ...@@ -336,6 +336,15 @@ aside {
336 color: $yellow; 336 color: $yellow;
337 } 337 }
338 338
339 // 操作按钮样式
340 .btnColor {
341 color: #8DEAF9;
342 }
343 .successColor {
344 color:#67C23A
345 }
346
347
339 // 通过 入库 样式 348 // 通过 入库 样式
340 .adopt, 349 .adopt,
341 .success { 350 .success {
...@@ -409,10 +418,9 @@ aside { ...@@ -409,10 +418,9 @@ aside {
409 background: #FF7962; 418 background: #FF7962;
410 color: #FF7962; 419 color: #FF7962;
411 } 420 }
421
412 // 引入字体 422 // 引入字体
413 @font-face { 423 @font-face {
414 font-family:AliBold; 424 font-family: AliBold;
415 src:url('../image/font/Alibaba_PuHuiTi_2.0_55_Regular_85_Bold.ttf') 425 src: url('../image/font/Alibaba_PuHuiTi_2.0_55_Regular_85_Bold.ttf')
416 } 426 }
417
418
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -340,4 +340,5 @@ ...@@ -340,4 +340,5 @@
340 word-break: break-all; 340 word-break: break-all;
341 line-height: 20px; 341 line-height: 20px;
342 flex: 1; 342 flex: 1;
343
343 } 344 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 .from-clues { 48 .from-clues {
49 height: 100%; 49 height: 100%;
50 width: 100%; 50 width: 100%;
51 min-width: 1280px; 51 // min-width: 1280px;
52 box-sizing: border-box; 52 box-sizing: border-box;
53 overflow-x: hidden; 53 overflow-x: hidden;
54 padding: 2px; 54 padding: 2px;
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
407 407
408 .el-dialog__header { 408 .el-dialog__header {
409 display: flex; 409 display: flex;
410 margin-bottom: 15px; 410 margin-bottom: 10px;
411 } 411 }
412 412
413 .el-dialog__footer { 413 .el-dialog__footer {
......
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
336 } 336 }
337 337
338 .el-menu-item span { 338 .el-menu-item span {
339 white-space: normal; 339 white-space: nowrap !important;
340 word-break: break-all; 340 word-break: break-all;
341 line-height: 20px; 341 line-height: 20px;
342 flex: 1; 342 flex: 1;
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:11:50
5 */
1 /** 6 /**
2 * 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器 7 * 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
3 */ 8 */
...@@ -57,17 +62,17 @@ service.interceptors.response.use( ...@@ -57,17 +62,17 @@ service.interceptors.response.use(
57 } 62 }
58 ); 63 );
59 //对错误信息的处理函数 64 //对错误信息的处理函数
60 function handleErrorData(status) { 65 function handleErrorData (status) {
61 switch (status) { 66 switch (status) {
62 case 401: 67 // case 401:
63 Message.error("由于长时间未操作，请重新登录!"); 68 // Message.error("由于长时间未操作，请重新登录!");
64 router.replace({ 69 // router.replace({
65 path: "/login/jg", 70 // path: "/login/jg",
66 query: { 71 // query: {
67 redirect: router.history.current.fullPath, 72 // redirect: router.history.current.fullPath,
68 }, 73 // },
69 }); 74 // });
70 break; 75 // break;
71 case 403: 76 case 403:
72 Message.error("拒绝访问"); 77 Message.error("拒绝访问");
73 break; 78 break;
......
...@@ -172,9 +172,15 @@ export function setExport2Excel (exportName) { ...@@ -172,9 +172,15 @@ export function setExport2Excel (exportName) {
172 wrapText: 1, 172 wrapText: 1,
173 indent: 0, 173 indent: 0,
174 wrap_text: true 174 wrap_text: true
175 },
176 border: { // 设置边框
177 top: { style: 'thin' },
178 bottom: { style: 'thin' },
179 left: { style: 'thin' },
180 right: { style: 'thin' }
175 } 181 }
176 } 182 }
177 } else if (key.indexOf('!') === -1 && wb[key].v) { 183 } else if (key.indexOf('!') === -1) {
178 wb[key].s = { 184 wb[key].s = {
179 font: {//字体设置 185 font: {//字体设置
180 sz: 13, 186 sz: 13,
...@@ -210,6 +216,7 @@ function addRangeBorder (range, ws) { ...@@ -210,6 +216,7 @@ function addRangeBorder (range, ws) {
210 range.forEach(item => { 216 range.forEach(item => {
211 let startColNumber = Number(item.s.r), endColNumber = Number(item.e.r); 217 let startColNumber = Number(item.s.r), endColNumber = Number(item.e.r);
212 let startRowNumber = Number(item.s.c), endRowNumber = Number(item.e.c); 218 let startRowNumber = Number(item.s.c), endRowNumber = Number(item.e.c);
219 console.log(startColNumber);
213 const test = ws[arr[startRowNumber] + (startColNumber + 1)]; 220 const test = ws[arr[startRowNumber] + (startColNumber + 1)];
214 for (let col = startColNumber; col <= endColNumber; col++) { 221 for (let col = startColNumber; col <= endColNumber; col++) {
215 for (let row = startRowNumber; row <= endRowNumber; row++) { 222 for (let row = startRowNumber; row <= endRowNumber; row++) {
......
...@@ -29,11 +29,13 @@ class data extends filter { ...@@ -29,11 +29,13 @@ class data extends filter {
29 }, 29 },
30 { 30 {
31 label: "业务号", 31 label: "业务号",
32 prop: "ywh" 32 prop: "ywh",
33 minWidth: 150,
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: "不动产产权证号",
...@@ -41,19 +43,23 @@ class data extends filter { ...@@ -41,19 +43,23 @@ class data extends filter {
41 // }, 43 // },
42 { 44 {
43 label: "查封机关", 45 label: "查封机关",
44 prop: "cfjg" 46 prop: "cfjg",
47 minWidth: 150,
45 }, 48 },
46 { 49 {
47 label: "查封文号", 50 label: "查封文号",
48 prop: "cfwh" 51 prop: "cfwh",
52 minWidth: 130,
49 }, 53 },
50 { 54 {
51 label: "解封机关", 55 label: "解封机关",
52 prop: "jfjg" 56 prop: "jfjg",
57 width: 150,
53 }, 58 },
54 { 59 {
55 label: "解封文号", 60 label: "解封文号",
56 prop: "jfwh" 61 prop: "jfwh",
62 minWidth: 130,
57 }, 63 },
58 64
59 { 65 {
......
...@@ -120,11 +120,12 @@ export default { ...@@ -120,11 +120,12 @@ export default {
120 return ( 120 return (
121 <div> 121 <div>
122 <el-button 122 <el-button
123 type="primary" 123 type="text"
124 size="mini" 124 class='btnColor'
125 onClick={() => { this.handleEdit(scope.row) }} 125 onClick={() => { this.handleEdit(scope.row) }}
126 > 126 >
127 详情 127 详情
128 <i class="el-icon-d-arrow-right"></i>
128 </el-button> 129 </el-button>
129 </div> 130 </div>
130 ) 131 )
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:22:01
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() {
...@@ -34,12 +39,12 @@ class data extends filter { ...@@ -34,12 +39,12 @@ class data extends filter {
34 { 39 {
35 label: "不动产单元号", 40 label: "不动产单元号",
36 prop: "bdcdyh", 41 prop: "bdcdyh",
37 width: 150, 42 minWidth: 150,
38 }, 43 },
39 { 44 {
40 label: "不动产权证号", 45 label: "不动产权证号",
41 prop: "bdcdjzmh", 46 prop: "bdcdjzmh",
42 width: 150, 47 minWidth: 160,
43 }, 48 },
44 { 49 {
45 label: "抵押类型", 50 label: "抵押类型",
......
...@@ -113,11 +113,13 @@ export default { ...@@ -113,11 +113,13 @@ export default {
113 return ( 113 return (
114 <div> 114 <div>
115 <el-button 115 <el-button
116 type="primary" 116 type="text"
117 class='btnColor'
117 size="mini" 118 size="mini"
118 onClick={() => { this.handleEdit(scope.row) }} 119 onClick={() => { this.handleEdit(scope.row) }}
119 > 120 >
120 详情 121 详情
122 <i class="el-icon-d-arrow-right"></i>
121 </el-button> 123 </el-button>
122 </div> 124 </div>
123 ) 125 )
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:23: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() {
...@@ -7,16 +12,18 @@ class data extends filter { ...@@ -7,16 +12,18 @@ class data extends filter {
7 return [ 12 return [
8 { 13 {
9 label: "行政区", 14 label: "行政区",
15 width: 80,
10 render: (h, scope) => { 16 render: (h, scope) => {
11 return ( 17 return (
12 <div> 18 <div>
13 <span>{this.dicStatus(scope.row.xzq, 'A20')}</span> 19 <span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
14 </div> 20 </div>
15 ) 21 )
16 }, 22 },
17 }, 23 },
18 { 24 {
19 label: "权属状态", 25 label: "权属状态",
26 width: 80,
20 render: (h, scope) => { 27 render: (h, scope) => {
21 return ( 28 return (
22 <div> 29 <div>
...@@ -31,17 +38,18 @@ class data extends filter { ...@@ -31,17 +38,18 @@ class data extends filter {
31 }, 38 },
32 { 39 {
33 label: "供役地不动产单元号", 40 label: "供役地不动产单元号",
34 width: 150, 41 minWidth: 150,
35 prop: "GYDBDCDYH" 42 prop: "GYDBDCDYH"
36 }, 43 },
37 { 44 {
38 label: "需役地不动产单元号", 45 label: "需役地不动产单元号",
39 width: 150, 46 minWidth: 150,
40 prop: "XYDBDCDYH" 47 prop: "XYDBDCDYH"
41 }, 48 },
42 { 49 {
43 label: "不动产产权证号", 50 label: "不动产产权证号",
44 prop: "bdcqzh" 51 prop: "bdcqzh",
52 minWidth: 150,
45 }, 53 },
46 { 54 {
47 label: "权利类型", 55 label: "权利类型",
...@@ -59,11 +67,13 @@ class data extends filter { ...@@ -59,11 +67,13 @@ class data extends filter {
59 }, 67 },
60 { 68 {
61 label: "登记时间", 69 label: "登记时间",
62 prop: "DJSJ" 70 prop: "DJSJ",
71 width: 140,
63 }, 72 },
64 { 73 {
65 label: "登记机构", 74 label: "登记机构",
66 prop: "DJJG" 75 prop: "DJJG",
76 minWidth: 150,
67 } 77 }
68 ] 78 ]
69 } 79 }
......
...@@ -116,16 +116,17 @@ export default { ...@@ -116,16 +116,17 @@ export default {
116 }].concat(data.columns()).concat([ 116 }].concat(data.columns()).concat([
117 { 117 {
118 label: "操作", 118 label: "操作",
119 width: 170, 119 width: 80,
120 render: (h, scope) => { 120 render: (h, scope) => {
121 return ( 121 return (
122 <div> 122 <div>
123 <el-button 123 <el-button
124 type="primary" 124 type="text"
125 size="mini" 125 class='btnColor'
126 onClick={() => { this.handleEdit(scope.row) }} 126 onClick={() => { this.handleEdit(scope.row) }}
127 > 127 >
128 详情 128 详情
129 <i class="el-icon-d-arrow-right"></i>
129 </el-button> 130 </el-button>
130 </div> 131 </div>
131 ) 132 )
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:25: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() {
...@@ -33,11 +38,13 @@ class data extends filter { ...@@ -33,11 +38,13 @@ class data extends filter {
33 }, 38 },
34 { 39 {
35 label: "不动产单元号", 40 label: "不动产单元号",
36 prop: "bdcdyh" 41 prop: "bdcdyh",
42 minWidth: 150,
37 }, 43 },
38 { 44 {
39 label: "不动产权证号", 45 label: "不动产权证号",
40 prop: "bdcqzh" 46 prop: "bdcqzh",
47 minWidth: 150,
41 }, 48 },
42 { 49 {
43 label: "权利人", 50 label: "权利人",
...@@ -86,7 +93,8 @@ class data extends filter { ...@@ -86,7 +93,8 @@ class data extends filter {
86 }, 93 },
87 { 94 {
88 label: "登记机构", 95 label: "登记机构",
89 prop: "djjg" 96 prop: "djjg",
97 minWidth: 150,
90 } 98 }
91 ] 99 ]
92 } 100 }
......
...@@ -104,17 +104,19 @@ export default { ...@@ -104,17 +104,19 @@ export default {
104 }].concat(data.columns()).concat([ 104 }].concat(data.columns()).concat([
105 { 105 {
106 label: "操作", 106 label: "操作",
107 width: 90, 107 width: 80,
108 render: (h, scope) => { 108 render: (h, scope) => {
109 return ( 109 return (
110 <div> 110 <div>
111 <el-button 111 <el-button
112 type="primary" 112 type="text"
113 class='btnColor'
113 onClick={() => { 114 onClick={() => {
114 this.handleEdit(scope.row); 115 this.handleEdit(scope.row);
115 }} 116 }}
116 > 117 >
117 详情 118 详情
119 <i class="el-icon-d-arrow-right"></i>
118 </el-button> 120 </el-button>
119 </div> 121 </div>
120 ); 122 );
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:25:56
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() {
...@@ -8,7 +13,7 @@ class data extends filter { ...@@ -8,7 +13,7 @@ class data extends filter {
8 { 13 {
9 label: "业务号", 14 label: "业务号",
10 prop: "ywh", 15 prop: "ywh",
11 width: 150 16 minWidth: 150,
12 }, 17 },
13 // { 18 // {
14 // label: "权利类型", 19 // label: "权利类型",
......
...@@ -77,12 +77,14 @@ export default { ...@@ -77,12 +77,14 @@ export default {
77 return ( 77 return (
78 <div> 78 <div>
79 <el-button 79 <el-button
80 type="primary" 80 type="text"
81 class='btnColor'
81 onClick={() => { 82 onClick={() => {
82 this.handleEdit(scope.row); 83 this.handleEdit(scope.row);
83 }} 84 }}
84 > 85 >
85 详情 86 详情
87 <i class="el-icon-d-arrow-right"></i>
86 </el-button> 88 </el-button>
87 </div> 89 </div>
88 ); 90 );
......
...@@ -34,12 +34,12 @@ class data extends filter { ...@@ -34,12 +34,12 @@ class data extends filter {
34 { 34 {
35 label: "不动产单元号", 35 label: "不动产单元号",
36 prop: "bdcdyh", 36 prop: "bdcdyh",
37 width: 150 37 minWidth: 150,
38 }, 38 },
39 { 39 {
40 label: "不动产权证号", 40 label: "不动产权证号",
41 prop: "bdcqzh", 41 prop: "bdcqzh",
42 width: 150 42 minWidth: 150,
43 }, 43 },
44 { 44 {
45 label: "权利人", 45 label: "权利人",
......
...@@ -109,12 +109,14 @@ export default { ...@@ -109,12 +109,14 @@ export default {
109 return ( 109 return (
110 <div> 110 <div>
111 <el-button 111 <el-button
112 type="primary" 112 type="text"
113 class='btnColor'
113 onClick={() => { 114 onClick={() => {
114 this.handleEdit(scope.row); 115 this.handleEdit(scope.row);
115 }} 116 }}
116 > 117 >
117 详情 118 详情
119 <i class="el-icon-d-arrow-right"></i>
118 </el-button> 120 </el-button>
119 </div> 121 </div>
120 ); 122 );
......
...@@ -7,6 +7,7 @@ class data extends filter { ...@@ -7,6 +7,7 @@ class data extends filter {
7 return [ 7 return [
8 { 8 {
9 label: "行政区", 9 label: "行政区",
10 width: 80,
10 render: (h, scope) => { 11 render: (h, scope) => {
11 return ( 12 return (
12 <div> 13 <div>
...@@ -28,19 +29,17 @@ class data extends filter { ...@@ -28,19 +29,17 @@ class data extends filter {
28 { 29 {
29 label: "业务号", 30 label: "业务号",
30 prop: "YWH", 31 prop: "YWH",
31 width: 150 32 minWidth: 150,
32 },
33 {
34 label: "业务号",
35 prop: "BDCDYH"
36 }, 33 },
37 { 34 {
38 label: "不动产单元号", 35 label: "不动产单元号",
39 prop: "BDCDYH" 36 prop: "BDCDYH",
37 minWidth: 150,
40 }, 38 },
41 { 39 {
42 label: "不动产权证号", 40 label: "不动产权证号",
43 prop: "BDCQZH" 41 prop: "BDCQZH",
42 minWidth: 150,
44 }, 43 },
45 { 44 {
46 label: "建筑物名称", 45 label: "建筑物名称",
......
...@@ -100,17 +100,19 @@ export default { ...@@ -100,17 +100,19 @@ export default {
100 }].concat(data.columns()).concat([ 100 }].concat(data.columns()).concat([
101 { 101 {
102 label: "操作", 102 label: "操作",
103 width: 170, 103 width: 80,
104 render: (h, scope) => { 104 render: (h, scope) => {
105 return ( 105 return (
106 <div> 106 <div>
107 <el-button 107 <el-button
108 type="primary" 108 type="text"
109 class='btnColor'
109 onClick={() => { 110 onClick={() => {
110 this.handleEdit(scope.row); 111 this.handleEdit(scope.row);
111 }} 112 }}
112 > 113 >
113 详情 114 详情
115 <i class="el-icon-d-arrow-right"></i>
114 </el-button> 116 </el-button>
115 </div> 117 </div>
116 ); 118 );
......
...@@ -7,10 +7,11 @@ class data extends filter { ...@@ -7,10 +7,11 @@ class data extends filter {
7 return [ 7 return [
8 { 8 {
9 label: "行政区", 9 label: "行政区",
10 width: 80,
10 render: (h, scope) => { 11 render: (h, scope) => {
11 return ( 12 return (
12 <div> 13 <div>
13 <span>{this.dicStatus(scope.row.XZQ, 'A20')}</span> 14 <span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
14 </div> 15 </div>
15 ) 16 )
16 }, 17 },
...@@ -20,7 +21,7 @@ class data extends filter { ...@@ -20,7 +21,7 @@ class data extends filter {
20 render: (h, scope) => { 21 render: (h, scope) => {
21 return ( 22 return (
22 <div> 23 <div>
23 <span>{this.dicStatus(scope.row.ZXYWH, 'A22')}</span> 24 <span>{this.dicStatus(scope.row.qszt, 'A22')}</span>
24 </div> 25 </div>
25 ) 26 )
26 }, 27 },
...@@ -28,19 +29,17 @@ class data extends filter { ...@@ -28,19 +29,17 @@ class data extends filter {
28 { 29 {
29 label: "业务号", 30 label: "业务号",
30 prop: "YWH", 31 prop: "YWH",
31 width: 150 32 minWidth: 150,
32 },
33 {
34 label: "业务号",
35 prop: "BDCDYH"
36 }, 33 },
37 { 34 {
38 label: "不动产单元号", 35 label: "不动产单元号",
39 prop: "BDCDYH" 36 prop: "BDCDYH",
37 minWidth: 150,
40 }, 38 },
41 { 39 {
42 label: "不动产权证号", 40 label: "不动产权证号",
43 prop: "BDCQZH" 41 prop: "BDCQZH",
42 minWidth: 150,
44 }, 43 },
45 { 44 {
46 label: "海岛名称", 45 label: "海岛名称",
......
...@@ -101,17 +101,19 @@ export default { ...@@ -101,17 +101,19 @@ export default {
101 }].concat(data.columns()).concat([ 101 }].concat(data.columns()).concat([
102 { 102 {
103 label: "操作", 103 label: "操作",
104 width: 170, 104 width: 80,
105 render: (h, scope) => { 105 render: (h, scope) => {
106 return ( 106 return (
107 <div> 107 <div>
108 <el-button 108 <el-button
109 type="primary" 109 type="text"
110 class='btnColor'
110 onClick={() => { 111 onClick={() => {
111 this.handleEdit(scope.row); 112 this.handleEdit(scope.row);
112 }} 113 }}
113 > 114 >
114 详情 115 详情
116 <i class="el-icon-d-arrow-right"></i>
115 </el-button> 117 </el-button>
116 </div> 118 </div>
117 ); 119 );
......
...@@ -11,7 +11,7 @@ class data extends filter { ...@@ -11,7 +11,7 @@ class data extends filter {
11 render: (h, scope) => { 11 render: (h, scope) => {
12 return ( 12 return (
13 <div> 13 <div>
14 <span>{this.dicStatus(scope.row.QXDM, 'A20')}</span> 14 <span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
15 </div> 15 </div>
16 ) 16 )
17 }, 17 },
...@@ -22,7 +22,7 @@ class data extends filter { ...@@ -22,7 +22,7 @@ class data extends filter {
22 render: (h, scope) => { 22 render: (h, scope) => {
23 return ( 23 return (
24 <div> 24 <div>
25 <span>{this.dicStatus(scope.row.QSZT, 'A22')}</span> 25 <span>{this.dicStatus(scope.row.qszt, 'A22')}</span>
26 </div> 26 </div>
27 ) 27 )
28 }, 28 },
...@@ -52,17 +52,17 @@ class data extends filter { ...@@ -52,17 +52,17 @@ class data extends filter {
52 { 52 {
53 label: "业务号", 53 label: "业务号",
54 prop: "YWH", 54 prop: "YWH",
55 width: 95 55 minWidth: 150,
56 }, 56 },
57 { 57 {
58 label: "不动产单元号", 58 label: "不动产单元号",
59 prop: "BDCDYH", 59 prop: "BDCDYH",
60 width: 150, 60 minWidth: 150,
61 }, 61 },
62 { 62 {
63 label: "不动产权证号", 63 label: "不动产权证号",
64 prop: "BDCQZH", 64 prop: "BDCQZH",
65 width: 150, 65 minWidth: 150,
66 }, 66 },
67 { 67 {
68 label: "权利人", 68 label: "权利人",
......
...@@ -103,12 +103,14 @@ export default { ...@@ -103,12 +103,14 @@ export default {
103 return ( 103 return (
104 <div> 104 <div>
105 <el-button 105 <el-button
106 type="primary" 106 type="text"
107 class='btnColor'
107 onClick={() => { 108 onClick={() => {
108 this.handleEdit(scope.row); 109 this.handleEdit(scope.row);
109 }} 110 }}
110 > 111 >
111 详情 112 详情
113 <i class="el-icon-d-arrow-right"></i>
112 </el-button> 114 </el-button>
113 </div> 115 </div>
114 ); 116 );
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:33:35
5 */
1 6
2 import filter from '@/utils/filter.js' 7 import filter from '@/utils/filter.js'
3 class data extends filter { 8 class data extends filter {
...@@ -8,35 +13,40 @@ class data extends filter { ...@@ -8,35 +13,40 @@ class data extends filter {
8 return [ 13 return [
9 { 14 {
10 label: "行政区", 15 label: "行政区",
16 width: 80,
11 render: (h, scope) => { 17 render: (h, scope) => {
12 return ( 18 return (
13 <div> 19 <div>
14 <span>{this.dicStatus(scope.row.XZQ, 'A20')}</span> 20 <span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
15 </div> 21 </div>
16 ) 22 )
17 }, 23 },
18 }, 24 },
19 { 25 {
20 label: "权属状态", 26 label: "权属状态",
27 width: 80,
21 render: (h, scope) => { 28 render: (h, scope) => {
22 return ( 29 return (
23 <div> 30 <div>
24 <span>{this.dicStatus(scope.row.ZXYWH, 'A22')}</span> 31 <span>{this.dicStatus(scope.row.qszt, 'A22')}</span>
25 </div> 32 </div>
26 ) 33 )
27 }, 34 },
28 }, 35 },
29 { 36 {
30 label: "业务号", 37 label: "业务号",
31 prop: "BDCDYH" 38 prop: "BDCDYH",
39 minWidth: 150,
32 }, 40 },
33 { 41 {
34 label: "不动产单元号", 42 label: "不动产单元号",
35 prop: "BDCDYH" 43 prop: "BDCDYH",
44 minWidth: 150,
36 }, 45 },
37 { 46 {
38 label: "不动产权证号", 47 label: "不动产权证号",
39 prop: "BDCQZH" 48 prop: "BDCQZH",
49 minWidth: 150,
40 }, 50 },
41 { 51 {
42 label: "权利人", 52 label: "权利人",
......
...@@ -95,17 +95,19 @@ export default { ...@@ -95,17 +95,19 @@ export default {
95 }].concat(data.columns()).concat([ 95 }].concat(data.columns()).concat([
96 { 96 {
97 label: "操作", 97 label: "操作",
98 width: 170, 98 width: 80,
99 render: (h, scope) => { 99 render: (h, scope) => {
100 return ( 100 return (
101 <div> 101 <div>
102 <el-button 102 <el-button
103 type="primary" 103 type="text"
104 class='btnColor'
104 onClick={() => { 105 onClick={() => {
105 this.handleEdit(scope.row); 106 this.handleEdit(scope.row);
106 }} 107 }}
107 > 108 >
108 详情 109 详情
110 <i class="el-icon-d-arrow-right"></i>
109 </el-button> 111 </el-button>
110 </div> 112 </div>
111 ); 113 );
......
...@@ -7,20 +7,22 @@ class data extends filter { ...@@ -7,20 +7,22 @@ class data extends filter {
7 return [ 7 return [
8 { 8 {
9 label: "行政区", 9 label: "行政区",
10 width: 80,
10 render: (h, scope) => { 11 render: (h, scope) => {
11 return ( 12 return (
12 <div> 13 <div>
13 <span>{this.dicStatus(scope.row.XZQ, 'A20')}</span> 14 <span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
14 </div> 15 </div>
15 ) 16 )
16 }, 17 },
17 }, 18 },
18 { 19 {
19 label: "权属状态", 20 label: "权属状态",
21 width: 80,
20 render: (h, scope) => { 22 render: (h, scope) => {
21 return ( 23 return (
22 <div> 24 <div>
23 <span>{this.dicStatus(scope.row.ZXYWH, 'A22')}</span> 25 <span>{this.dicStatus(scope.row.qszt, 'A22')}</span>
24 </div> 26 </div>
25 ) 27 )
26 }, 28 },
...@@ -28,11 +30,7 @@ class data extends filter { ...@@ -28,11 +30,7 @@ class data extends filter {
28 { 30 {
29 label: "业务号", 31 label: "业务号",
30 prop: "YWH", 32 prop: "YWH",
31 width: 150 33 width: 150,
32 },
33 {
34 label: "业务号",
35 prop: "BDCDYH"
36 }, 34 },
37 { 35 {
38 label: "不动产单元号", 36 label: "不动产单元号",
......
...@@ -100,17 +100,19 @@ export default { ...@@ -100,17 +100,19 @@ export default {
100 }].concat(data.columns()).concat([ 100 }].concat(data.columns()).concat([
101 { 101 {
102 label: "操作", 102 label: "操作",
103 width: 170, 103 width: 80,
104 render: (h, scope) => { 104 render: (h, scope) => {
105 return ( 105 return (
106 <div> 106 <div>
107 <el-button 107 <el-button
108 type="primary" 108 type="text"
109 class='btnColor'
109 onClick={() => { 110 onClick={() => {
110 this.handleEdit(scope.row); 111 this.handleEdit(scope.row);
111 }} 112 }}
112 > 113 >
113 详情 114 详情
115 <i class="el-icon-d-arrow-right"></i>
114 </el-button> 116 </el-button>
115 </div> 117 </div>
116 ); 118 );
......
1 /*
2 * @Description: ,
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:35:00
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,15 +35,17 @@ class data extends filter { ...@@ -30,15 +35,17 @@ class data extends filter {
30 { 35 {
31 label: "业务号", 36 label: "业务号",
32 prop: "ywh", 37 prop: "ywh",
33 width: 80, 38 minWidth: 150,
34 }, 39 },
35 { 40 {
36 label: "不动产单元号", 41 label: "不动产单元号",
37 prop: "bdcdyh" 42 prop: "bdcdyh",
43 minWidth: 150,
38 }, 44 },
39 { 45 {
40 label: "不动产权证号", 46 label: "不动产权证号",
41 prop: "bdcqzh" 47 prop: "bdcqzh",
48 minWidth: 150,
42 }, 49 },
43 { 50 {
44 label: "权利人", 51 label: "权利人",
......
...@@ -101,12 +101,14 @@ export default { ...@@ -101,12 +101,14 @@ export default {
101 return ( 101 return (
102 <div> 102 <div>
103 <el-button 103 <el-button
104 type="primary" 104 type="text"
105 class='btnColor'
105 onClick={() => { 106 onClick={() => {
106 this.handleEdit(scope.row); 107 this.handleEdit(scope.row);
107 }} 108 }}
108 > 109 >
109 详情 110 详情
111 <i class="el-icon-d-arrow-right"></i>
110 </el-button> 112 </el-button>
111 </div> 113 </div>
112 ); 114 );
......
...@@ -108,16 +108,17 @@ export default { ...@@ -108,16 +108,17 @@ export default {
108 }].concat(data.columns()).concat([ 108 }].concat(data.columns()).concat([
109 { 109 {
110 label: "操作", 110 label: "操作",
111 width: 170, 111 width: 80,
112 render: (h, scope) => { 112 render: (h, scope) => {
113 return ( 113 return (
114 <div> 114 <div>
115 <el-button 115 <el-button
116 type="primary" 116 type="text"
117 size="mini" 117 class='btnColor'
118 onClick={() => { this.handleEdit(scope.row) }} 118 onClick={() => { this.handleEdit(scope.row) }}
119 > 119 >
120 详情 120 详情
121 <i class="el-icon-d-arrow-right"></i>
121 </el-button> 122 </el-button>
122 </div> 123 </div>
123 ) 124 )
......
...@@ -7,16 +7,18 @@ class data extends filter { ...@@ -7,16 +7,18 @@ class data extends filter {
7 return [ 7 return [
8 { 8 {
9 label: "行政区", 9 label: "行政区",
10 width: 80,
10 render: (h, scope) => { 11 render: (h, scope) => {
11 return ( 12 return (
12 <div> 13 <div>
13 <span>{this.dicStatus(scope.row.xzq, 'A20')}</span> 14 <span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
14 </div> 15 </div>
15 ) 16 )
16 }, 17 },
17 }, 18 },
18 { 19 {
19 label: "权属状态", 20 label: "权属状态",
21 width: 80,
20 render: (h, scope) => { 22 render: (h, scope) => {
21 return ( 23 return (
22 <div> 24 <div>
...@@ -27,15 +29,18 @@ class data extends filter { ...@@ -27,15 +29,18 @@ class data extends filter {
27 }, 29 },
28 { 30 {
29 label: "业务号", 31 label: "业务号",
30 prop: "ywh" 32 prop: "ywh",
33 minWidth: 150,
31 }, 34 },
32 { 35 {
33 label: "不动产单元号", 36 label: "不动产单元号",
34 prop: "bdcdyh" 37 prop: "bdcdyh",
38 minWidth: 150,
35 }, 39 },
36 { 40 {
37 label: "不动产产权证号", 41 label: "不动产产权证号",
38 prop: "bdcqzh" 42 prop: "bdcqzh",
43 minWidth: 150,
39 }, 44 },
40 { 45 {
41 label: "权利人", 46 label: "权利人",
......
...@@ -101,11 +101,12 @@ export default { ...@@ -101,11 +101,12 @@ export default {
101 return ( 101 return (
102 <div> 102 <div>
103 <el-button 103 <el-button
104 type="primary" 104 type="text"
105 size="mini" 105 class='btnColor'
106 onClick={() => { this.handleEdit(scope.row) }} 106 onClick={() => { this.handleEdit(scope.row) }}
107 > 107 >
108 详情 108 详情
109 <i class="el-icon-d-arrow-right"></i>
109 </el-button> 110 </el-button>
110 </div> 111 </div>
111 ) 112 )
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:37:10
5 */
1 6
2 import filter from '@/utils/filter.js' 7 import filter from '@/utils/filter.js'
3 class data extends filter { 8 class data extends filter {
...@@ -8,10 +13,11 @@ class data extends filter { ...@@ -8,10 +13,11 @@ class data extends filter {
8 return [ 13 return [
9 { 14 {
10 label: "行政区", 15 label: "行政区",
16 width: 80,
11 render: (h, scope) => { 17 render: (h, scope) => {
12 return ( 18 return (
13 <div> 19 <div>
14 <span>{this.dicStatus(scope.row.QXDM, 'A20')}</span> 20 <span>{this.dicStatus(scope.row.qxdm, 'A20')}</span>
15 </div> 21 </div>
16 ) 22 )
17 }, 23 },
...@@ -28,11 +34,13 @@ class data extends filter { ...@@ -28,11 +34,13 @@ class data extends filter {
28 // }, 34 // },
29 { 35 {
30 label: "业务号", 36 label: "业务号",
31 prop: "YWH" 37 prop: "YWH",
38 minWidth: 150,
32 }, 39 },
33 { 40 {
34 label: "不动产单元号", 41 label: "不动产单元号",
35 prop: "BDCDYH" 42 prop: "BDCDYH",
43 minWidth: 150,
36 }, 44 },
37 { 45 {
38 label: "不动产权证号", 46 label: "不动产权证号",
......
...@@ -102,12 +102,14 @@ export default { ...@@ -102,12 +102,14 @@ export default {
102 return ( 102 return (
103 <div> 103 <div>
104 <el-button 104 <el-button
105 type="primary" 105 type="text"
106 class='btnColor'
106 onClick={() => { 107 onClick={() => {
107 this.handleEdit(scope.row); 108 this.handleEdit(scope.row);
108 }} 109 }}
109 > 110 >
110 详情 111 详情
112 <i class="el-icon-d-arrow-right"></i>
111 </el-button> 113 </el-button>
112 </div> 114 </div>
113 ); 115 );
......
...@@ -199,6 +199,8 @@ ...@@ -199,6 +199,8 @@
199 width: 60%; 199 width: 60%;
200 flex-direction: column; 200 flex-direction: column;
201 position: relative; 201 position: relative;
202 flex: 1;
203 height: 100%;
202 li { 204 li {
203 font-size: 0.1042rem; 205 font-size: 0.1042rem;
204 } 206 }
...@@ -222,6 +224,7 @@ ...@@ -222,6 +224,7 @@
222 .cardcontent-right { 224 .cardcontent-right {
223 flex: 1; 225 flex: 1;
224 width: 100%; 226 width: 100%;
227 height: 100%;
225 flex-direction: column; 228 flex-direction: column;
226 font-size: 0.09977rem; 229 font-size: 0.09977rem;
227 230
......
...@@ -78,6 +78,7 @@ export default { ...@@ -78,6 +78,7 @@ export default {
78 endTime: timeFormat(new Date(), true), 78 endTime: timeFormat(new Date(), true),
79 qxdm: "", 79 qxdm: "",
80 }, 80 },
81 interval: 50
81 }; 82 };
82 }, 83 },
83 mounted () { 84 mounted () {
...@@ -100,6 +101,10 @@ export default { ...@@ -100,6 +101,10 @@ export default {
100 this.form.qxdm 101 this.form.qxdm
101 ); 102 );
102 this.chartData = res; 103 this.chartData = res;
104 console.log(this.chartData);
105
106 let maxData = Math.max.apply(Math, this.chartData.map(item => { return item.failure }))
107 this.interval = Math.ceil(maxData / 10)
103 //行政区代码过滤 108 //行政区代码过滤
104 res.length > 0 && 109 res.length > 0 &&
105 res.forEach((item) => { 110 res.forEach((item) => {
...@@ -191,7 +196,7 @@ export default { ...@@ -191,7 +196,7 @@ export default {
191 color: "#fff", 196 color: "#fff",
192 fontSize: "16", 197 fontSize: "16",
193 }, 198 },
194 interval: 50, 199 interval: this.interval,
195 axisLabel: { 200 axisLabel: {
196 formatter: "{value}", 201 formatter: "{value}",
197 textStyle: { 202 textStyle: {
......
...@@ -56,7 +56,7 @@ class data extends filter { ...@@ -56,7 +56,7 @@ class data extends filter {
56 { 56 {
57 prop: "recflowid", 57 prop: "recflowid",
58 label: "业务流水号", 58 label: "业务流水号",
59 width: 95, 59 width: 100,
60 }, 60 },
61 { 61 {
62 prop: "estatenum", 62 prop: "estatenum",
...@@ -70,6 +70,7 @@ class data extends filter { ...@@ -70,6 +70,7 @@ class data extends filter {
70 }, 70 },
71 { 71 {
72 prop: "rectypeName", 72 prop: "rectypeName",
73 minWidth: 240,
73 label: "业务名称", 74 label: "业务名称",
74 render: (h, scope) => { 75 render: (h, scope) => {
75 return ( 76 return (
......
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
193 scope.row.receiveState == 2 ? 193 scope.row.receiveState == 2 ?
194 <el-button 194 <el-button
195 type="text" 195 type="text"
196 style="color:#67C23A" 196 class='successColor'
197 onClick={() => { 197 onClick={() => {
198 this.handleDetails(scope.row); 198 this.handleDetails(scope.row);
199 }} 199 }}
...@@ -203,6 +203,7 @@ export default { ...@@ -203,6 +203,7 @@ export default {
203 </el-button> : 203 </el-button> :
204 <el-button 204 <el-button
205 type="text" 205 type="text"
206 class='btnColor'
206 onClick={() => { 207 onClick={() => {
207 this.handleDetails(scope.row); 208 this.handleDetails(scope.row);
208 }} 209 }}
......
...@@ -166,13 +166,13 @@ ...@@ -166,13 +166,13 @@
166 </el-tabs> 166 </el-tabs>
167 <!-- 当日登薄详单 --> 167 <!-- 当日登薄详单 -->
168 <div class="from-clues-content" v-show="titleName2 == 'drdbxd'"> 168 <div class="from-clues-content" v-show="titleName2 == 'drdbxd'">
169 <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200" 169 <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="180"
170 :data="tableDBData.data"> 170 :data="tableDBData.data">
171 </lb-table> 171 </lb-table>
172 </div> 172 </div>
173 <!-- 当日上报详单 --> 173 <!-- 当日上报详单 -->
174 <div class="from-clues-content" v-show="titleName2 == 'sbslxd'"> 174 <div class="from-clues-content" v-show="titleName2 == 'sbslxd'">
175 <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200" 175 <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="180"
176 :data="tableSBData.data"> 176 :data="tableSBData.data">
177 </lb-table> 177 </lb-table>
178 </div> 178 </div>
...@@ -467,10 +467,26 @@ export default { ...@@ -467,10 +467,26 @@ export default {
467 margin: 0; 467 margin: 0;
468 } 468 }
469 469
470 /deep/.el-dialog {
471 display: flex;
472 flex-direction: column;
473 }
474
475 /deep/.el-dialog__body {
476 display: flex;
477 flex-direction: column;
478 padding-bottom: 30px;
479 height: 100%;
480 flex: 1;
481 position: relative;
482 }
483
470 .regularHeight { 484 .regularHeight {
471 height: 77vh;
472 display: flex; 485 display: flex;
473 flex-direction: column; 486 flex-direction: column;
487 flex: 1;
488 height: 100%;
489 margin-bottom: 5px;
474 490
475 .editDialogBox-con, 491 .editDialogBox-con,
476 .JsonEditor { 492 .JsonEditor {
...@@ -478,6 +494,12 @@ export default { ...@@ -478,6 +494,12 @@ export default {
478 } 494 }
479 } 495 }
480 496
497 .d-center {}
498
499 .dialog_title {
500 top: -13px
501 }
502
481 /deep/.el-tabs__item { 503 /deep/.el-tabs__item {
482 color: #CEF8FF !important; 504 color: #CEF8FF !important;
483 505
...@@ -516,6 +538,7 @@ export default { ...@@ -516,6 +538,7 @@ export default {
516 .editDialogBox-box { 538 .editDialogBox-box {
517 position: relative; 539 position: relative;
518 top: 10px; 540 top: 10px;
541 height: 100%;
519 } 542 }
520 543
521 .dialog-from { 544 .dialog-from {
...@@ -546,7 +569,7 @@ export default { ...@@ -546,7 +569,7 @@ export default {
546 } 569 }
547 570
548 &_title { 571 &_title {
549 font-size: 18px; 572 font-size: 14px;
550 color: #d7eaee; 573 color: #d7eaee;
551 margin: 3px 0; 574 margin: 3px 0;
552 } 575 }
......
...@@ -22,7 +22,7 @@ class data { ...@@ -22,7 +22,7 @@ class data {
22 { 22 {
23 prop: "UPLOADTIME", 23 prop: "UPLOADTIME",
24 label: "汇交日期", 24 label: "汇交日期",
25 width: '150', 25 width: '140',
26 }, 26 },
27 { 27 {
28 prop: "AREANAME", 28 prop: "AREANAME",
...@@ -31,7 +31,7 @@ class data { ...@@ -31,7 +31,7 @@ class data {
31 { 31 {
32 prop: "ACCESSDATE", 32 prop: "ACCESSDATE",
33 label: "日期", 33 label: "日期",
34 width: '150', 34 width: '140',
35 }, 35 },
36 { 36 {
37 prop: "type", 37 prop: "type",
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 14:39:14
5 */
1 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
2 let vm = null 7 let vm = null
3 const sendThis = (_this) => { 8 const sendThis = (_this) => {
...@@ -51,6 +56,7 @@ class data extends filter { ...@@ -51,6 +56,7 @@ class data extends filter {
51 { 56 {
52 prop: "estatenum", 57 prop: "estatenum",
53 label: "不动产单元号", 58 label: "不动产单元号",
59 width: 150,
54 }, 60 },
55 { 61 {
56 prop: "rectype", 62 prop: "rectype",
...@@ -60,6 +66,7 @@ class data extends filter { ...@@ -60,6 +66,7 @@ class data extends filter {
60 { 66 {
61 prop: "rectypeName", 67 prop: "rectypeName",
62 label: "业务名称", 68 label: "业务名称",
69 minWidth: 240,
63 }, 70 },
64 { 71 {
65 prop: "exchangeDate", 72 prop: "exchangeDate",
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 }, 84 },
85 mounted () { 85 mounted () {
86 if (this.userInfo) { 86 if (this.userInfo) {
87 this.getUserdata(this.userInfo) 87 this.getUserdata(this.userInfo.id)
88 } 88 }
89 this.sexList = [ 89 this.sexList = [
90 { 90 {
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
105 ] 105 ]
106 }, 106 },
107 methods: { 107 methods: {
108 getUserdata (p) { 108 getUserdata (id) {
109 getAction(`${api.users}/${p.id}`).then((res) => { 109 getAction(`${api.users}/${id}`).then((res) => {
110 if (res.status === 1) { 110 if (res.status === 1) {
111 this.form = res.content 111 this.form = res.content
112 } else { 112 } else {
...@@ -135,7 +135,6 @@ ...@@ -135,7 +135,6 @@
135 <style scoped lang="scss"> 135 <style scoped lang="scss">
136 .user-info { 136 .user-info {
137 margin: 0.1875rem 1.0417rem; 137 margin: 0.1875rem 1.0417rem;
138 background: #ffffff;
139 overflow-y: auto; 138 overflow-y: auto;
140 .form-wrapper { 139 .form-wrapper {
141 padding: 0px 120px 0px; 140 padding: 0px 120px 0px;
...@@ -156,7 +155,7 @@ ...@@ -156,7 +155,7 @@
156 } 155 }
157 .bottom-wrapper { 156 .bottom-wrapper {
158 padding: 0px 120px 0px; 157 padding: 0px 120px 0px;
159 text-align: right; 158 text-align: center;
160 } 159 }
161 } 160 }
162 </style> 161 </style>
......
1 <!-- 1 <!--
2 * @Author: xiaomiao 1158771342@qq.com 2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-03-08 15:30:43 3 * @Date: 2023-03-08 15:30:43
4 * @LastEditors: xiaomiao 1158771342@qq.com 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-03-08 16:33:50 5 * @LastEditTime: 2023-03-13 17:19:46
6 * @FilePath: \监管系统\js-web-jianguan\src\views\system\information copy\index.vue 6 * @FilePath: \bdcjg-web\src\views\system\information\index.vue
7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE 7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8 --> 8 -->
9 <template> 9 <template>
...@@ -15,8 +15,18 @@ ...@@ -15,8 +15,18 @@
15 </el-form-item> 15 </el-form-item>
16 <el-row class="mb-5"> 16 <el-row class="mb-5">
17 <el-col :span="3" class="btnColRight"> 17 <el-col :span="3" class="btnColRight">
18 <btn nativeType="cx" @click="information">基本信息</btn> 18 <!-- <btn nativeType="cx" @click="information"
19 <btn nativeType="cx" @click="password">修改密码</btn> 19 >基本信息</btn
20 >
21 <btn nativeType="cx" :class="isshow ? '' : ''" @click="password"
22 >修改密码</btn
23 > -->
24 <button @click="information" :class="isshow ? 'button choosed' : 'button'">
25 基本信息
26 </button>
27 <button @click="password" :class="isshow ? 'button' : 'button choosed'">
28 修改密码
29 </button>
20 </el-col> 30 </el-col>
21 </el-row> 31 </el-row>
22 </el-form> 32 </el-form>
...@@ -30,56 +40,69 @@ ...@@ -30,56 +40,69 @@
30 </div> 40 </div>
31 </template> 41 </template>
32 <script> 42 <script>
33 import "@/utils/flexible.js"; 43 import "@/utils/flexible.js";
34 import BaseSet from "./base-set.vue"; 44 import BaseSet from "./base-set.vue";
35 import PasswordEdit from "./password-edit.vue"; 45 import PasswordEdit from "./password-edit.vue";
36 export default { 46 export default {
37 components: { 47 components: {
38 BaseSet, 48 BaseSet,
39 PasswordEdit, 49 PasswordEdit,
50 },
51 data() {
52 return {
53 isshow: true,
54 };
55 },
56 computed: {
57 userData() {
58 return this.$store.state.user.userInfo;
40 }, 59 },
41 data () { 60 },
42 return { 61 watch: {},
43 isshow: true, 62 created() {},
44 }; 63 mounted() {},
64 methods: {
65 information() {
66 this.isshow = true;
45 }, 67 },
46 computed: { 68 password() {
47 userData () { 69 this.isshow = false;
48 return this.$store.state.user.userInfo;
49 },
50 }, 70 },
51 watch: {}, 71 },
52 created () { }, 72 };
53 mounted () {
54
55
56 },
57 methods: {
58 information () {
59 this.isshow = true;
60 },
61 password () {
62 this.isshow = false;
63 },
64 },
65 };
66 </script> 73 </script>
67 74
68 <style scoped lang="scss"> 75 <style scoped lang="scss">
69 @import "~@/styles/mixin.scss"; 76 @import "~@/styles/mixin.scss";
70 @import "~@/styles/public.scss"; 77 @import "~@/styles/public.scss";
71 .information { 78 .information {
72 /deep/.content { 79 display: flex;
73 .el-input__inner { 80 flex-direction: column;
74 background: none; 81 .btnColRight {
75 } 82 .button {
76 .user-info { 83 width: 76px;
77 background: none; 84 height: 32px;
78 } 85 color: #ffffff;
79 86 margin: 0 5px;
80 .boxin { 87 cursor: pointer;
81 height: 79%; 88 border: 0;
82 } 89 background: url('../../../image/btn.png') no-repeat 0 0;
90 background-size: cover;
83 } 91 }
92 .choosed{
93 background: url('../../../image/btn.png') no-repeat 0 -34px;
94 }
95 }
96 /deep/.content {
97 .el-input__inner {
98 background: none;
99 }
100 .user-info {
101 background: none;
102 }
103 }
104 .boxin {
105 flex: 1;
84 } 106 }
107 }
85 </style> 108 </style>
......
...@@ -6,27 +6,31 @@ ...@@ -6,27 +6,31 @@
6 label-width="100px" 6 label-width="100px"
7 :model="form" 7 :model="form"
8 class="form-wrapper" 8 class="form-wrapper"
9 :rules="rules"> 9 :rules="rules"
10 >
10 <el-form-item label="旧密码:" prop="oldPassword"> 11 <el-form-item label="旧密码:" prop="oldPassword">
11 <el-input 12 <el-input
12 v-model="form.oldPassword" 13 v-model="form.oldPassword"
13 clearable 14 clearable
14 type="password" 15 type="password"
15 show-password /> 16 show-password
17 />
16 </el-form-item> 18 </el-form-item>
17 <el-form-item label="新密码:" prop="newPassword"> 19 <el-form-item label="新密码:" prop="newPassword">
18 <el-input 20 <el-input
19 v-model="form.newPassword" 21 v-model="form.newPassword"
20 clearable 22 clearable
21 type="password" 23 type="password"
22 show-password /> 24 show-password
25 />
23 </el-form-item> 26 </el-form-item>
24 <el-form-item label="确认密码:" prop="confirmPassword"> 27 <el-form-item label="确认密码:" prop="confirmPassword">
25 <el-input 28 <el-input
26 v-model="form.confirmPassword" 29 v-model="form.confirmPassword"
27 clearable 30 clearable
28 type="password" 31 type="password"
29 show-password /> 32 show-password
33 />
30 </el-form-item> 34 </el-form-item>
31 </el-form> 35 </el-form>
32 <div class="bottom-wrapper"> 36 <div class="bottom-wrapper">
...@@ -37,102 +41,100 @@ ...@@ -37,102 +41,100 @@
37 </template> 41 </template>
38 42
39 <script> 43 <script>
40 import { updateUserPassword } from "@/api/personnelManage"; 44 import { updateUserPassword } from "@/api/personnelManage";
41 export default { 45 export default {
42 props: { 46 props: {
43 userInfo: { 47 userInfo: {
44 type: Object, 48 type: Object,
45 default: null 49 default: null,
46 }
47 }, 50 },
48 data () { 51 },
49 return { 52 data() {
50 form: {}, 53 return {
51 sexList: [], 54 form: {},
52 userId: '', 55 sexList: [],
53 rules: { 56 userId: "",
54 oldPassword: [ 57 rules: {
55 { required: true, message: '旧密码不能为空', trigger: 'blur' } 58 oldPassword: [
56 ], 59 { required: true, message: "旧密码不能为空", trigger: "blur" },
57 newPassword: [ 60 ],
58 { required: true, message: '新密码不能为空', trigger: 'blur' } 61 newPassword: [
59 ], 62 { required: true, message: "新密码不能为空", trigger: "blur" },
60 confirmPassword: [ 63 ],
61 { required: true, message: '确认密码不能为空', trigger: 'blur' }, 64 confirmPassword: [
62 { validator: this.validatorConfirmPassword, trigger: 'blur' } 65 { required: true, message: "确认密码不能为空", trigger: "blur" },
63 ] 66 { validator: this.validatorConfirmPassword, trigger: "blur" },
67 ],
68 },
69 };
70 },
71 computed: {},
72 watch: {
73 userInfo: {
74 handler: function (val) {
75 if (val) {
76 this.getid(val);
64 } 77 }
65 } 78 },
66 }, 79 },
67 computed: {}, 80 },
68 watch: { 81 mounted() {
69 userInfo: { 82 if (this.userInfo) {
70 handler: function (val) { 83 this.getid(this.userInfo);
71 if (val) { 84 }
72 this.getid(val) 85 },
73 } 86 methods: {
74 } 87 getid(val) {
75 } 88 this.userId = val.id;
76
77 }, 89 },
78 mounted () { 90 validatorConfirmPassword(rule, value, callback) {
79 if (this.userInfo) { 91 const { newPassword } = this.form;
80 this.getid(this.userInfo) 92 if (value !== newPassword) {
93 callback("两次输入密码不一致");
94 } else {
95 callback();
81 } 96 }
82 }, 97 },
83 methods: { 98 updatePassword() {
84 getid (val) { 99 this.$refs.form.validate((valid) => {
85 this.userId = val.id 100 if (valid) {
86 }, 101 const params = Object.assign({}, this.form, { id: this.userId });
87 validatorConfirmPassword (rule, value, callback) { 102 updateUserPassword(params).then((res) => {
88 const { newPassword } = this.form 103 if (res.status === 1) {
89 if (value !== newPassword) { 104 this.$message.success({ message: res.message, showClose: true });
90 callback('两次输入密码不一致') 105 } else {
91 } else { 106 this.$message.error({ message: res.message, showClose: true });
92 callback() 107 }
108 });
93 } 109 }
94 }, 110 });
95 updatePassword () { 111 },
96 this.$refs.form.validate((valid) => { 112 },
97 if (valid) { 113 };
98 const params = Object.assign({}, this.form, { id: this.userId })
99 updateUserPassword(params).then((res) => {
100 if (res.status === 1) {
101 this.$message.success({ message: res.message, showClose: true })
102 } else {
103 this.$message.error({ message: res.message, showClose: true })
104 }
105 })
106 }
107 })
108 }
109 }
110 }
111 </script> 114 </script>
112 115
113 <style scoped lang="scss"> 116 <style scoped lang="scss">
114 .user-info { 117 .user-info {
115 margin: 36px 200px; 118 margin: 36px 200px;
116 background: #ffffff; 119 overflow-y: auto;
117 overflow-y: auto; 120 .form-wrapper {
118 .form-wrapper { 121 padding: 24px 120px 0px;
119 padding: 24px 120px 0px; 122 /deep/.el-form-item {
120 /deep/.el-form-item { 123 margin-bottom: 24px;
121 margin-bottom: 24px; 124 .el-form-item__label {
122 .el-form-item__label { 125 color: #ffffff;
123 color: #ffffff; 126 }
124 } 127 .el-input .el-input__inner {
125 .el-input .el-input__inner { 128 padding: 0 8px;
126 padding: 0 8px; 129 height: 40px;
127 height: 40px; 130 line-height: 40px;
128 line-height: 40px; 131 border: 1px solid #6bc1fc;
129 border: 1px solid #6bc1fc;
130 }
131 } 132 }
132 } 133 }
133 .bottom-wrapper {
134 padding: 32px 120px 24px;
135 text-align: right;
136 }
137 } 134 }
135 .bottom-wrapper {
136 padding: 32px 120px 24px;
137 text-align: center;
138 }
139 }
138 </style> 140 </style>
......