Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
61693ed0 by renchao@pashanhoo.com
Options

Merge branch 'master' into dev

2 parents 72a6ebdc 4f63a148
Inline Side-by-side
Showing 12 changed files with 183 additions and 203 deletions
...@@ -191,7 +191,6 @@ export default { ...@@ -191,7 +191,6 @@ export default {
191 padding: 10px 20px; 191 padding: 10px 20px;
192 line-height: 28px; 192 line-height: 28px;
193 border: 1px solid #ccc; 193 border: 1px solid #ccc;
194 margin-right: 15px;
195 border-radius: 3px; 194 border-radius: 3px;
196 } 195 }
197 196
......
...@@ -154,7 +154,6 @@ export default { ...@@ -154,7 +154,6 @@ export default {
154 padding: 10px 20px; 154 padding: 10px 20px;
155 line-height: 28px; 155 line-height: 28px;
156 border: 1px solid #ccc; 156 border: 1px solid #ccc;
157 margin-right: 15px;
158 border-radius: 3px; 157 border-radius: 3px;
159 } 158 }
160 159
......
...@@ -328,7 +328,7 @@ export default { ...@@ -328,7 +328,7 @@ export default {
328 components: { 328 components: {
329 treeSelect, 329 treeSelect,
330 }, 330 },
331 data() { 331 data () {
332 return { 332 return {
333 obligeeForm: { 333 obligeeForm: {
334 obligeeList: [ 334 obligeeList: [
...@@ -364,18 +364,18 @@ export default { ...@@ -364,18 +364,18 @@ export default {
364 }; 364 };
365 }, 365 },
366 methods: { 366 methods: {
367 async featchData() { 367 async featchData () {
368 try { 368 try {
369 let { result: res } = await zttGyQlr.getZttGyQlrById(this.bsmSjsb); 369 let { result: res } = await zttGyQlr.getZttGyQlrById(this.bsmSjsb);
370 this.obligeeForm.obligeeList = res; 370 this.obligeeForm.obligeeList = res;
371 } catch (error) {} 371 } catch (error) { }
372 }, 372 },
373 handleUpdateForm() { 373 handleUpdateForm () {
374 return new Promise(async (resolve) => { 374 return new Promise(async (resolve) => {
375 try { 375 try {
376 let res = await zttGyQlr.updateZttGyQlr(this.obligeeForm.obligeeList); 376 let res = await zttGyQlr.updateZttGyQlr(this.obligeeForm.obligeeList);
377 resolve(res.code); 377 resolve(res.code);
378 } catch (error) {} 378 } catch (error) { }
379 }); 379 });
380 }, 380 },
381 }, 381 },
...@@ -398,7 +398,6 @@ export default { ...@@ -398,7 +398,6 @@ export default {
398 padding: 10px 20px; 398 padding: 10px 20px;
399 line-height: 28px; 399 line-height: 28px;
400 border: 1px solid #ccc; 400 border: 1px solid #ccc;
401 margin-right: 15px;
402 border-radius: 3px; 401 border-radius: 3px;
403 } 402 }
404 403
......
...@@ -94,6 +94,12 @@ ...@@ -94,6 +94,12 @@
94 </el-col> 94 </el-col>
95 </el-row> 95 </el-row>
96 </div> 96 </div>
97 <div class="JsonEditor" v-if="titleName == 'xml'">
98 <JsonEditor class="editXML" :resultInfo="resultInfo" />
99 </div>
100 <div class="xyjg" v-if="titleName == 'xyjg'">
101 <Xyjg :form-data='dataReport'></Xyjg>
102 </div>
97 </div> 103 </div>
98 <div class="editDialogBox-box editDialogBox-con" v-if="titleName == 'sjmx'"> 104 <div class="editDialogBox-box editDialogBox-con" v-if="titleName == 'sjmx'">
99 <div class="sjmx"> 105 <div class="sjmx">
...@@ -111,11 +117,6 @@ ...@@ -111,11 +117,6 @@
111 </div> 117 </div>
112 </div> 118 </div>
113 </div> 119 </div>
114 <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xml'">
115 <JsonEditor class="editXML" :resultInfo="resultInfo" />
116 </div>
117 <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'">
118 <Xyjg :form-data='dataReport'></Xyjg>
119 </div> 120 </div>
120 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'sjmx'"> 121 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'sjmx'">
121 <btn nativeType="cz" @click="dialogVisible = false">取 消</btn> 122 <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
...@@ -124,7 +125,6 @@ ...@@ -124,7 +125,6 @@
124 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'"> 125 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
125 <btn nativeType="cx" @click="handleResubmit">重新上报</btn> 126 <btn nativeType="cx" @click="handleResubmit">重新上报</btn>
126 </div> 127 </div>
127 </div>
128 </el-dialog> 128 </el-dialog>
129 </template> 129 </template>
130 130
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-04-04 09:52:39
5 -->
1 <template> 6 <template>
2 <el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo"> 7 <el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo">
3 </el-input> 8 </el-input>
......
...@@ -140,6 +140,10 @@ ul li { ...@@ -140,6 +140,10 @@ ul li {
140 margin-top: 10px !important; 140 margin-top: 10px !important;
141 } 141 }
142 142
143 .mt-10 {
144 margin-top: 10px;
145 }
146
143 .pr-5 { 147 .pr-5 {
144 padding-right: 5px; 148 padding-right: 5px;
145 } 149 }
...@@ -148,10 +152,6 @@ ul li { ...@@ -148,10 +152,6 @@ ul li {
148 padding-left: 5px; 152 padding-left: 5px;
149 } 153 }
150 154
151 .mt-10 {
152 margin-top: 20px !important;
153 margin-bottom: 5px !important;
154 }
155 155
156 //flex 公共样式 156 //flex 公共样式
157 .d-flex { 157 .d-flex {
......
...@@ -397,11 +397,6 @@ ...@@ -397,11 +397,6 @@
397 border-bottom: 1px solid transparent; 397 border-bottom: 1px solid transparent;
398 } 398 }
399 399
400 .el-tabs__header {
401 border: none;
402 margin-bottom: 0;
403 }
404
405 .el-tabs__item.is-top:not(:last-child) { 400 .el-tabs__item.is-top:not(:last-child) {
406 margin-right: 5px; 401 margin-right: 5px;
407 } 402 }
...@@ -566,7 +561,6 @@ ...@@ -566,7 +561,6 @@
566 overflow: hidden; 561 overflow: hidden;
567 background: url("~@/image/dialogBg.png") no-repeat !important; 562 background: url("~@/image/dialogBg.png") no-repeat !important;
568 background-size: 100% 100% !important; 563 background-size: 100% 100% !important;
569 // min-height: 90vh;
570 564
571 .dialog_title { 565 .dialog_title {
572 display: flex; 566 display: flex;
...@@ -622,33 +616,82 @@ ...@@ -622,33 +616,82 @@
622 box-shadow: inset 0px 0px 12px 0px #02D9FD; 616 box-shadow: inset 0px 0px 12px 0px #02D9FD;
623 border-radius: 2px; 617 border-radius: 2px;
624 border: 1px solid #6BC1FC; 618 border: 1px solid #6BC1FC;
625 margin: 0 18px 10px 18px; 619 margin: 0 18px 0 18px;
626
627 // .el-form-item__label {
628 // color: #fff;
629 // }
630
631 // .el-form-item__content {
632 // color: #fff;
633 // }
634 } 620 }
635 621
636 .item-content-input { 622 .item-content-input {
637 .el-input__inner { 623 .el-input__inner {
638 border: none !important; 624 border: none !important;
639 text-align: right; 625 text-align: right;
626 color: #A5CBDA !important;
640 } 627 }
641 } 628 }
642 629
643 .regularHeight { 630 .regularHeight {
644 display: flex; 631 display: flex;
645 flex-direction: column; 632 flex-direction: column;
646 height: 87vh; 633 height: 85vh;
647 634
648 .editDialogBox-con,
649 .JsonEditor { 635 .JsonEditor {
650 flex: 1; 636 height: 75vh;
637
638 .editXML {
639 height: 100%;
640 padding: 15px;
641
642 .el-textarea {
643 height: 100% !important;
644 }
645
646 .el-textarea__inner {
647 height: 100% !important;
648 background: #04275B;
649 border-radius: 2px;
650 border: none;
651 }
652 }
653 }
654
655 // 响应结果
656 .xyjg {
657 height: 78vh;
658 padding: 15px;
659
660 .result-con {
661 height: 49%;
662 background: #04275B;
663 border-radius: 2px;
664 box-sizing: border-box;
665 padding: 10px;
666
667 .el-textarea {
668 height: 90%;
669 }
670
671 .el-textarea__inner {
651 height: 100%; 672 height: 100%;
673 background: transparent;
674 border: none;
675 }
676
677 p {
678 color: #2188E3;
679 font-weight: 700;
680 font-size: 18px;
681 position: relative;
682 padding-left: 8px;
683 }
684
685 p:before {
686 content: '';
687 width: 3px;
688 height: 13px;
689 position: absolute;
690 left: 0;
691 top: 4px;
692 background-color: #2188E3;
693 }
694 }
652 } 695 }
653 } 696 }
654 697
...@@ -656,6 +699,7 @@ ...@@ -656,6 +699,7 @@
656 padding: 13px; 699 padding: 13px;
657 border-radius: 2px; 700 border-radius: 2px;
658 box-sizing: border-box; 701 box-sizing: border-box;
702 margin-top: 10px;
659 703
660 .el-row { 704 .el-row {
661 display: flex; 705 display: flex;
...@@ -678,7 +722,7 @@ ...@@ -678,7 +722,7 @@
678 overflow: hidden; 722 overflow: hidden;
679 white-space: nowrap; 723 white-space: nowrap;
680 text-align: left; 724 text-align: left;
681 color: #02D9FD; 725 color: #0288B0;
682 } 726 }
683 727
684 p { 728 p {
...@@ -697,18 +741,15 @@ ...@@ -697,18 +741,15 @@
697 } 741 }
698 742
699 .el-textarea__inner { 743 .el-textarea__inner {
700 border: 1px solid #224C7C; 744 background: #04275B;
701 margin: 0 0 10px 0 !important; 745 border-radius: 2px;
702 width: 100% !important;
703 color: #dadde3 !important;
704 background: transparent !important;
705 } 746 }
706 747
707 .el-input__inner { 748 .el-input__inner {
708 border: 1px solid #224C7C !important; 749 border: 1px solid #224C7C !important;
709 margin: 0 !important; 750 margin: 0 !important;
710 width: 100% !important; 751 width: 100% !important;
711 color: #dadde3 !important; 752 color: #A5CBDA !important;
712 background: transparent !important; 753 background: transparent !important;
713 } 754 }
714 755
...@@ -769,6 +810,11 @@ ...@@ -769,6 +810,11 @@
769 } 810 }
770 } 811 }
771 812
813 .el-tabs__header {
814 border: none !important;
815 margin-bottom: 0;
816 }
817
772 // 登簿日志弹出框 818 // 登簿日志弹出框
773 .entryJournal { 819 .entryJournal {
774 .el-textarea__inner { 820 .el-textarea__inner {
...@@ -779,13 +825,8 @@ ...@@ -779,13 +825,8 @@
779 border: none !important; 825 border: none !important;
780 } 826 }
781 827
782 .el-tabs__header { 828 .el-col {
783 margin: 0; 829 margin: 5px;
784 }
785
786 .el-dialog {
787 display: flex;
788 flex-direction: column;
789 } 830 }
790 831
791 .el-dialog__body { 832 .el-dialog__body {
...@@ -795,29 +836,11 @@ ...@@ -795,29 +836,11 @@
795 height: 100%; 836 height: 100%;
796 flex: 1; 837 flex: 1;
797 position: relative; 838 position: relative;
798 } 839 margin-top: 10px;
799
800 .regularHeight {
801 display: flex;
802 flex-direction: column;
803 height: 87vh;
804 margin-bottom: 5px;
805
806 .editDialogBox-con,
807 .JsonEditor {
808 flex: 1;
809 }
810 }
811
812 .d-center {}
813
814 .dialog_title {
815 top: -6px
816 } 840 }
817 841
818 .el-tabs__item { 842 .el-tabs__item {
819 color: #CEF8FF !important; 843 color: #CEF8FF !important;
820
821 display: flex; 844 display: flex;
822 flex-direction: row; 845 flex-direction: row;
823 justify-content: center; 846 justify-content: center;
...@@ -845,19 +868,14 @@ ...@@ -845,19 +868,14 @@
845 } 868 }
846 869
847 .from-clues-content { 870 .from-clues-content {
848
849
850 margin-top: 0; 871 margin-top: 0;
851 background: none; 872 background: none;
852 padding: 0; 873 padding: 0;
853
854
855 } 874 }
856 875
857 .editDialogBox-box { 876 .editDialogBox-box {
858 position: relative; 877 position: relative;
859 top: 10px; 878 height: 98.5%;
860 height: 100%;
861 } 879 }
862 880
863 .dialog-from { 881 .dialog-from {
...@@ -901,6 +919,7 @@ ...@@ -901,6 +919,7 @@
901 display: flex; 919 display: flex;
902 flex-direction: column; 920 flex-direction: column;
903 padding-bottom: 30px; 921 padding-bottom: 30px;
922 margin-top: 10px;
904 } 923 }
905 924
906 .el-tabs { 925 .el-tabs {
...@@ -914,7 +933,7 @@ ...@@ -914,7 +933,7 @@
914 .sjmx { 933 .sjmx {
915 display: flex; 934 display: flex;
916 flex-direction: column; 935 flex-direction: column;
917 height: 49vh; 936 height: 52vh;
918 937
919 .el-tabs__item { 938 .el-tabs__item {
920 height: 50px; 939 height: 50px;
...@@ -931,6 +950,7 @@ ...@@ -931,6 +950,7 @@
931 flex: 1; 950 flex: 1;
932 height: 100%; 951 height: 100%;
933 overflow-y: hidden; 952 overflow-y: hidden;
953 margin: 10px 18px;
934 } 954 }
935 955
936 .el-tabs__item { 956 .el-tabs__item {
...@@ -966,11 +986,6 @@ ...@@ -966,11 +986,6 @@
966 border-bottom: 1px solid transparent; 986 border-bottom: 1px solid transparent;
967 } 987 }
968 988
969 .el-tabs__header {
970 border: none;
971 margin-bottom: 0;
972 }
973
974 .el-tabs__item.is-top:not(:last-child) { 989 .el-tabs__item.is-top:not(:last-child) {
975 margin-right: 5px; 990 margin-right: 5px;
976 } 991 }
...@@ -1404,3 +1419,11 @@ ...@@ -1404,3 +1419,11 @@
1404 } 1419 }
1405 } 1420 }
1406 } 1421 }
1422
1423 // 监管
1424 .editDialogBox-box {
1425 .el-form-item__label {
1426 color: #0288B0 !important;
1427 line-height: 20px;
1428 }
1429 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -258,12 +258,8 @@ ...@@ -258,12 +258,8 @@
258 // 登簿日志弹出框 258 // 登簿日志弹出框
259 .commonDialog { 259 .commonDialog {
260 .el-textarea.is-disabled .el-textarea__inner { 260 .el-textarea.is-disabled .el-textarea__inner {
261 margin-top: 20px;
262 @include borderColor("border"); 261 @include borderColor("border");
263 } 262 color: #4a4a4a;
264
265 /deep/.dialog-from_header {
266 margin: 0 !important;
267 } 263 }
268 264
269 .el-dialog__headerbtn .el-dialog__close { 265 .el-dialog__headerbtn .el-dialog__close {
...@@ -303,16 +299,62 @@ ...@@ -303,16 +299,62 @@
303 height: 80vh; 299 height: 80vh;
304 margin-bottom: 5px; 300 margin-bottom: 5px;
305 301
306 .editDialogBox-con,
307 .JsonEditor { 302 .JsonEditor {
308 flex: 1; 303 height: 73vh;
309 }
310 304
311 .editXML { 305 .editXML {
312 margin-top: 10px; 306 height: 100%;
307
308 .el-textarea {
309 height: 100% !important;
310 }
313 311
314 .el-textarea__inner { 312 .el-textarea__inner {
315 height: 68vh !important; 313 height: 100% !important;
314 border-radius: 2px;
315 border: none;
316 }
317 }
318 }
319
320
321 // 响应结果
322 .xyjg {
323 height: 78vh;
324
325 .result-con {
326 height: 49%;
327 border-radius: 2px;
328 box-sizing: border-box;
329 padding: 10px;
330
331 .el-textarea {
332 height: 90%;
333 }
334
335 .el-textarea__inner {
336 height: 100%;
337 background: transparent;
338 border: none;
339 }
340
341 p {
342 color: #2188E3;
343 font-weight: 700;
344 font-size: 18px;
345 position: relative;
346 padding-left: 8px;
347 }
348
349 p:before {
350 content: '';
351 width: 3px;
352 height: 13px;
353 position: absolute;
354 left: 0;
355 top: 4px;
356 background-color: #2188E3;
357 }
316 } 358 }
317 } 359 }
318 } 360 }
...@@ -373,11 +415,20 @@ ...@@ -373,11 +415,20 @@
373 .dialog-from { 415 .dialog-from {
374 padding-top: 0; 416 padding-top: 0;
375 417
418 .el-row {
419 display: flex;
420 flex-wrap: nowrap;
421 }
422
376 .el-col { 423 .el-col {
377 height: 40px;
378 line-height: 40px;
379 display: flex; 424 display: flex;
380 justify-content: space-between; 425 justify-content: space-between;
426 border: 1px solid #C0C4CC;
427 border-radius: 2px;
428 line-height: 36px;
429 height: 36px;
430 margin: 5px;
431 padding: 0 5px;
381 } 432 }
382 433
383 .bz { 434 .bz {
...@@ -391,10 +442,11 @@ ...@@ -391,10 +442,11 @@
391 width: 100%; 442 width: 100%;
392 } 443 }
393 444
394 445 .el-input__inner {
446 border: none;
447 }
395 448
396 .el-textarea__inner { 449 .el-textarea__inner {
397
398 margin: 0; 450 margin: 0;
399 } 451 }
400 452
...@@ -411,23 +463,9 @@ ...@@ -411,23 +463,9 @@
411 } 463 }
412 } 464 }
413 465
414 .entryJournal { 466 .el-input-number__increase,
415 .el-textarea__inner { 467 .el-input-number__decrease {
416 height: 67vh !important; 468 display: none !important;
417 border: none !important;
418 background-color: #ffffff !important;
419 color: #000000 !important;
420 }
421 }
422
423 // 上报日志弹出框
424 .sbdialog {
425 .el-textarea__inner {
426 height: 30vh !important;
427 border: none !important;
428 background-color: #ffffff !important;
429 color: #000000 !important;
430 }
431 } 469 }
432 470
433 // 数据上报弹出框 471 // 数据上报弹出框
...@@ -440,7 +478,6 @@ ...@@ -440,7 +478,6 @@
440 @include background("navbg"); 478 @include background("navbg");
441 479
442 .dialog_title { 480 .dialog_title {
443
444 color: white; 481 color: white;
445 margin-bottom: 10px; 482 margin-bottom: 10px;
446 } 483 }
...@@ -497,8 +534,6 @@ ...@@ -497,8 +534,6 @@
497 } 534 }
498 535
499 .obligee-item-name { 536 .obligee-item-name {
500 // background: url("~@/image/itembg.png") no-repeat;
501 // background-size: 100% 100%;
502 @include background("btnBg"); 537 @include background("btnBg");
503 border-radius: 3px; 538 border-radius: 3px;
504 @include borderColor("border"); 539 @include borderColor("border");
...@@ -521,8 +556,6 @@ ...@@ -521,8 +556,6 @@
521 556
522 &-con { 557 &-con {
523 background: #ffffff; 558 background: #ffffff;
524 // @include borderColor("border");
525 // border: 1px solid blue;
526 border-radius: 2px; 559 border-radius: 2px;
527 padding: 10px; 560 padding: 10px;
528 box-sizing: border-box; 561 box-sizing: border-box;
...@@ -628,67 +661,8 @@ ...@@ -628,67 +661,8 @@
628 .el-dialog__wrapper { 661 .el-dialog__wrapper {
629 overflow: hidden; 662 overflow: hidden;
630 } 663 }
631
632 .dialog-from {
633 padding-top: 0;
634
635 .el-col {
636 height: 40px;
637 line-height: 40px;
638 display: flex;
639 justify-content: space-between;
640 }
641
642 .bz {
643 height: 100%;
644 position: relative;
645 top: 3px;
646 }
647
648 .el-select {
649 padding-right: 15px;
650 }
651
652 .el-icon-circle-close {
653 display: none;
654 }
655
656 .el-input__suffix {
657 right: 0px !important;
658 top: -5px;
659 }
660
661 .el-select,
662 .el-input {
663 flex: 1;
664 width: 100%;
665 }
666
667 .el-textarea__inner {
668 border: none !important;
669 margin: 0;
670 }
671
672 &_header {
673 margin: 0 -5px !important;
674 }
675
676 &_title {
677 font-size: 18px;
678 color: #d7eaee;
679 margin: 3px 0;
680 }
681 }
682 } 664 }
683 665
684 // // 人员管理上下移动按钮样式
685 // .el-button.is-disabled.el-button--text {
686 // width: 64px;
687 // height: 28px;
688 // background: rgba(255, 255, 255, 0.1);
689 // border-radius: 16px;
690 // }
691
692 // 人员管理角色管理菜单管理修改新增弹框样式 666 // 人员管理角色管理菜单管理修改新增弹框样式
693 .PersonnelDialog { 667 .PersonnelDialog {
694 .el-dialog__headerbtn .el-dialog__close { 668 .el-dialog__headerbtn .el-dialog__close {
...@@ -715,24 +689,7 @@ ...@@ -715,24 +689,7 @@
715 display: flex; 689 display: flex;
716 } 690 }
717 691
718 .el-input__inner {
719 // background-color: #07388b;
720 }
721
722 .el-input__inner {
723 // background: #07388b;
724 // border-radius: 2px;
725 // border: 1px solid #6bc1fc;
726 }
727
728 .el-textarea__inner {
729 // background: #07388b;
730 // color: rgb(0, 0, 0);
731 }
732
733 .el-dialog__header { 692 .el-dialog__header {
734
735
736 .el-dialog__headerbtn { 693 .el-dialog__headerbtn {
737 right: 20px !important; 694 right: 20px !important;
738 top: 23px !important; 695 top: 23px !important;
...@@ -877,7 +834,6 @@ ...@@ -877,7 +834,6 @@
877 834
878 .el-textarea__inner { 835 .el-textarea__inner {
879 margin: 5px; 836 margin: 5px;
880 width: 96%;
881 background: none; 837 background: none;
882 color: #FFFFFF; 838 color: #FFFFFF;
883 border-radius: 2px; 839 border-radius: 2px;
...@@ -905,11 +861,8 @@ ...@@ -905,11 +861,8 @@
905 861
906 .el-input__inner { 862 .el-input__inner {
907 margin: 5px; 863 margin: 5px;
908 width: 96%;
909 // background: #05275B;
910 border-radius: 2px; 864 border-radius: 2px;
911 text-align: left; 865 text-align: left;
912
913 } 866 }
914 867
915 .el-form-item { 868 .el-form-item {
......
...@@ -72,7 +72,7 @@ class data extends filter { ...@@ -72,7 +72,7 @@ class data extends filter {
72 { 72 {
73 label: "不动产权证号", 73 label: "不动产权证号",
74 prop: "BDCQZH", 74 prop: "BDCQZH",
75 minWidth: 150, 75 minWidth: 180,
76 }, 76 },
77 { 77 {
78 label: "用途", 78 label: "用途",
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 <div id="myChart" class="chart" style="height:100%;width:100%;"></div> 35 <div id="myChart" class="chart" style="height:100%;width:100%;"></div>
36 <div id="myChart-bar" class="chart-bar" style="height:100%;width:100%;"></div> 36 <div id="myChart-bar" class="chart-bar" style="height:100%;width:100%;"></div>
37 </div> 37 </div>
38 <div class="from-clues-content center" v-else>暂无数据</div> 38 <div class="from-clues-content echarts-box center" v-else>暂无数据</div>
39 </div> 39 </div>
40 </template> 40 </template>
41 <script> 41 <script>
......
...@@ -177,9 +177,9 @@ ...@@ -177,9 +177,9 @@
177 </lb-table> 177 </lb-table>
178 </div> 178 </div>
179 </div> 179 </div>
180 <div class="JsonEditor" v-if="titleName == 'xml'">
181 <JsonEditor class="editXML" :resultInfo="resultInfo" :key="key" />
180 </div> 182 </div>
181 <div class="editDialogBox-box" v-if="titleName == 'xml'">
182 <JsonEditor :resultInfo="resultInfo" :key="key" />
183 </div> 183 </div>
184 </div> 184 </div>
185 <div class="d-center" v-if="titleName == 'sjmx'"> 185 <div class="d-center" v-if="titleName == 'sjmx'">
......
...@@ -4,14 +4,16 @@ ...@@ -4,14 +4,16 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="80px"> 6 <el-form ref="ruleForm" :model="form" label-width="80px">
7 <el-form-item v-if="BASE_API.THEME=='jg'">
8 <!-- 判断进入监管还是上报系统 --> 7 <!-- 判断进入监管还是上报系统 -->
8 <el-form-item v-if="BASE_API.THEME == 'jg'">
9 <Breadcrumb /> 9 <Breadcrumb />
10 </el-form-item> 10 </el-form-item>
11 <el-row> 11 <el-row>
12 <el-col :span="6"> 12 <el-col :span="6">
13 <el-form-item label="行政区"> 13 <el-form-item label="行政区">
14 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.areacode = $store.state.user.userInfo.areaCode : form.areacode" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'"> 14 <el-select
15 v-model="$store.state.user.userInfo.grade === 'county' ? form.areacode = $store.state.user.userInfo.areaCode : form.areacode"
16 class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
15 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 17 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
16 </el-option> 18 </el-option>
17 </el-select> 19 </el-select>
......