Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
ed59c22d by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents d1280967 b3196c51
Expand all
Inline Side-by-side
Showing 12 changed files with 63 additions and 2 deletions
...@@ -31,6 +31,12 @@ ...@@ -31,6 +31,12 @@
31 <ul class="icon_lists dib-box"> 31 <ul class="icon_lists dib-box">
32 32
33 <li class="dib"> 33 <li class="dib">
34 <span class="icon iconfont">&#xe7b9;</span>
35 <div class="name">取消选择</div>
36 <div class="code-name">&amp;#xe7b9;</div>
37 </li>
38
39 <li class="dib">
34 <span class="icon iconfont">&#xe7b2;</span> 40 <span class="icon iconfont">&#xe7b2;</span>
35 <div class="name">首页</div> 41 <div class="name">首页</div>
36 <div class="code-name">&amp;#xe7b2;</div> 42 <div class="code-name">&amp;#xe7b2;</div>
...@@ -669,6 +675,15 @@ ...@@ -669,6 +675,15 @@
669 <ul class="icon_lists dib-box"> 675 <ul class="icon_lists dib-box">
670 676
671 <li class="dib"> 677 <li class="dib">
678 <span class="icon iconfont iconquxiaoxuanze"></span>
679 <div class="name">
680 取消选择
681 </div>
682 <div class="code-name">.iconquxiaoxuanze
683 </div>
684 </li>
685
686 <li class="dib">
672 <span class="icon iconfont iconshouye"></span> 687 <span class="icon iconfont iconshouye"></span>
673 <div class="name"> 688 <div class="name">
674 首页 689 首页
...@@ -1581,6 +1596,14 @@ ...@@ -1581,6 +1596,14 @@
1581 1596
1582 <li class="dib"> 1597 <li class="dib">
1583 <svg class="icon svg-icon" aria-hidden="true"> 1598 <svg class="icon svg-icon" aria-hidden="true">
1599 <use xlink:href="#iconquxiaoxuanze"></use>
1600 </svg>
1601 <div class="name">取消选择</div>
1602 <div class="code-name">#iconquxiaoxuanze</div>
1603 </li>
1604
1605 <li class="dib">
1606 <svg class="icon svg-icon" aria-hidden="true">
1584 <use xlink:href="#iconshouye"></use> 1607 <use xlink:href="#iconshouye"></use>
1585 </svg> 1608 </svg>
1586 <div class="name">首页</div> 1609 <div class="name">首页</div>
......
This diff could not be displayed because it is too large.
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
9 "icon_id": "19804282",
10 "name": "取消选择",
11 "font_class": "quxiaoxuanze",
12 "unicode": "e7b9",
13 "unicode_decimal": 59321
14 },
15 {
9 "icon_id": "19791411", 16 "icon_id": "19791411",
10 "name": "首页", 17 "name": "首页",
11 "font_class": "shouye", 18 "font_class": "shouye",
......
...@@ -20,7 +20,10 @@ Created by iconfont ...@@ -20,7 +20,10 @@ Created by iconfont
20 /> 20 />
21 <missing-glyph /> 21 <missing-glyph />
22 22
23 <glyph glyph-name="shouye" unicode="&#59314;" d="M494.6944 880.4352a30.72 30.72 0 0 0 34.6112 0l409.6-279.7056a30.72 30.72 0 0 0 13.4144-25.344v-204.8a30.72 30.72 0 0 0-48.2816-25.2416l-2.9696 2.0992L901.12-25.6a81.92 81.92 0 0 0-74.4448-81.5616L819.2-107.52H204.8a81.92 81.92 0 0 0-81.5616 74.4448L122.88-25.6l-0.0512 373.0432-2.8672-2.048a30.72 30.72 0 0 0-46.8992 15.872l-1.024 4.4544-0.3584 4.864v204.8a30.72 30.72 0 0 0 13.4144 25.344zM512 618.2912L184.2688 390.1952 184.32-25.6a20.48 20.48 0 0 1 16.384-20.0704L204.8-46.08h143.36v232.0384a158.72 158.72 0 0 0 317.184 9.0112l0.256-9.0112V-46.08h153.6a20.48 20.48 0 0 1 20.0704 16.384L839.68-25.6l-0.0512 415.8464L512 618.2912z m-5.12-335.0528a97.28 97.28 0 0 1-96.9728-89.7024L409.6 185.9584V-46.08h194.56v232.0384a97.28 97.28 0 0 1-97.28 97.28zM512 817.8688L133.12 559.2064v-129.792l361.3184 251.4432a30.72 30.72 0 0 0 30.4128 2.7136l4.7104-2.7136L890.88 429.4144V559.1552L512 817.8688z" horiz-adv-x="1024" /> 23 <glyph glyph-name="quxiaoxuanze" unicode="&#59321;" d="M149.971606 21.959138000000053a511.968185 511.968185 0 1 1 724.06929 724.06929 511.968185 511.968185 0 0 1-724.06929-724.06929z m51.635648 51.708787a438.829873 438.829873 0 1 0 620.724855 620.724855 438.829873 438.829873 0 0 0-620.724855-620.724855z m83.889644 84.840442a36.569156 36.569156 0 0 1 46.589105-4.242022l5.119682 4.242022 175.824502 175.897641 175.897641-175.897641a36.569156 36.569156 0 0 1 55.87767 46.589105l-4.242022 5.119682-175.89764 175.824502 175.89764 175.897641a36.569156 36.569156 0 0 1-46.589105 55.87767l-5.119681-4.242022-175.824503-175.824502-175.89764 175.824502a36.569156 36.569156 0 0 1-55.877671-46.589105l4.242022-5.119682L461.321401 386.114794 285.496898 210.21715400000005a36.569156 36.569156 0 0 1 0-51.708787z" horiz-adv-x="1024" />
24
25
26 <glyph glyph-name="shouye" unicode="&#59314;" d="M494.6944 861.4912a30.72 30.72 0 0 0 34.6112 0l409.6-279.7056a30.72 30.72 0 0 0 13.4144-25.344v-204.8a30.72 30.72 0 0 0-48.2816-25.2416l-2.9184 2.0992v-321.8432a81.92 81.92 0 0 0-74.4448-81.5616L819.2-75.26400000000001H204.8a81.92 81.92 0 0 0-81.5616 74.496L122.88 6.655999999999949v321.8432l-2.9184-2.048a30.72 30.72 0 0 0-46.8992 15.872l-1.024 4.5056-0.3584 4.8128v204.8a30.72 30.72 0 0 0 13.4144 25.344zM512 599.3471999999999l-327.7312-228.096 0.0512-364.544a20.48 20.48 0 0 1 16.384-20.1216l4.096-0.4096h143.36v180.8384a158.72 158.72 0 0 0 317.184 9.0112l0.256-9.0112v-180.8384h153.6a20.48 20.48 0 0 1 20.0704 16.384l0.4096 4.096v364.5952L512 599.3471999999999z m-5.12-335.0528a97.28 97.28 0 0 1-96.9728-89.6512L409.6 167.01440000000002v-180.8384h194.56v180.8384a97.28 97.28 0 0 1-97.28 97.28zM512 798.9248L133.12 540.2624000000001v-129.792l361.3184 251.4432a30.72 30.72 0 0 0 30.4128 2.7136l4.7104-2.7136 361.3184-251.392V540.1600000000001L512 798.9248z" horiz-adv-x="1024" />
24 27
25 28
26 <glyph glyph-name="gengzheng" unicode="&#59315;" d="M751.104 773.12a30.72 30.72 0 0 0 4.9664-61.0304l-4.9664-0.4096H336.896a20.48 20.48 0 0 1-20.0704-16.384L316.416 691.2v-532.4288l413.3888-0.0512a30.72 30.72 0 0 0 4.9664-61.0304l-4.9664-0.4096-413.3888 0.0512V25.6a20.48 20.48 0 0 1 16.384-20.0704l4.096-0.4096h519.5776a20.48 20.48 0 0 1 20.0704 16.384l0.4096 4.096V399.2064a30.72 30.72 0 0 0 61.0304 4.9664l0.4096-4.9664V25.6a81.92 81.92 0 0 0-74.496-81.5616l-7.424-0.3584H336.896a81.92 81.92 0 0 0-81.5616 74.4448L254.976 25.6v71.7312l-71.68-0.0512a81.92 81.92 0 0 0-81.5616 74.4448L101.376 179.2V742.4a30.72 30.72 0 0 0 61.0304 4.9664L162.816 742.4v-563.2a20.48 20.48 0 0 1 16.384-20.0704l4.096-0.4096 71.68 0.0512V691.2a81.92 81.92 0 0 0 74.496 81.5616L336.896 773.12h414.208z m-21.2992-409.6a30.72 30.72 0 0 0 4.9664-61.0304l-4.9664-0.4096H440.32a30.72 30.72 0 0 0-4.9664 61.0304L440.32 363.52h289.4848z m242.176 355.2256a30.72 30.72 0 0 0 2.4576-39.2704l-3.6864-4.1472-219.8528-207.9232a30.72 30.72 0 0 0-45.8752 40.448l3.6352 4.1984 219.8528 207.872a30.72 30.72 0 0 0 43.4688-1.1776zM561.0496 568.32a30.72 30.72 0 0 0 5.0176-61.0304l-5.0176-0.4096H440.32a30.72 30.72 0 0 0-4.9664 61.0304L440.32 568.32h120.7296z" horiz-adv-x="1024" /> 29 <glyph glyph-name="gengzheng" unicode="&#59315;" d="M751.104 773.12a30.72 30.72 0 0 0 4.9664-61.0304l-4.9664-0.4096H336.896a20.48 20.48 0 0 1-20.0704-16.384L316.416 691.2v-532.4288l413.3888-0.0512a30.72 30.72 0 0 0 4.9664-61.0304l-4.9664-0.4096-413.3888 0.0512V25.6a20.48 20.48 0 0 1 16.384-20.0704l4.096-0.4096h519.5776a20.48 20.48 0 0 1 20.0704 16.384l0.4096 4.096V399.2064a30.72 30.72 0 0 0 61.0304 4.9664l0.4096-4.9664V25.6a81.92 81.92 0 0 0-74.496-81.5616l-7.424-0.3584H336.896a81.92 81.92 0 0 0-81.5616 74.4448L254.976 25.6v71.7312l-71.68-0.0512a81.92 81.92 0 0 0-81.5616 74.4448L101.376 179.2V742.4a30.72 30.72 0 0 0 61.0304 4.9664L162.816 742.4v-563.2a20.48 20.48 0 0 1 16.384-20.0704l4.096-0.4096 71.68 0.0512V691.2a81.92 81.92 0 0 0 74.496 81.5616L336.896 773.12h414.208z m-21.2992-409.6a30.72 30.72 0 0 0 4.9664-61.0304l-4.9664-0.4096H440.32a30.72 30.72 0 0 0-4.9664 61.0304L440.32 363.52h289.4848z m242.176 355.2256a30.72 30.72 0 0 0 2.4576-39.2704l-3.6864-4.1472-219.8528-207.9232a30.72 30.72 0 0 0-45.8752 40.448l3.6352 4.1984 219.8528 207.872a30.72 30.72 0 0 0 43.4688-1.1776zM561.0496 568.32a30.72 30.72 0 0 0 5.0176-61.0304l-5.0176-0.4096H440.32a30.72 30.72 0 0 0-4.9664 61.0304L440.32 568.32h120.7296z" horiz-adv-x="1024" />
......
...@@ -76,7 +76,10 @@ ...@@ -76,7 +76,10 @@
76 }, 76 },
77 reset() { 77 reset() {
78 this.errorData = []; 78 this.errorData = [];
79 this.sxdrData = {bsm: ''}; 79 this.sxdrData = {
80 bsm: this.bsm,
81 type: this.dylx
82 };
80 }, 83 },
81 close() { 84 close() {
82 this.$emit('close') 85 this.$emit('close')
......
...@@ -986,6 +986,7 @@ ...@@ -986,6 +986,7 @@
986 border: 1px solid #E4EBF4; 986 border: 1px solid #E4EBF4;
987 background-color: white; 987 background-color: white;
988 overflow: auto; 988 overflow: auto;
989 box-shadow: none!important;;
989 .clearfix{ 990 .clearfix{
990 span{ 991 span{
991 color: #9B9B9B; 992 color: #9B9B9B;
......
...@@ -92,6 +92,13 @@ ...@@ -92,6 +92,13 @@
92 @click="batchUpload" 92 @click="batchUpload"
93 ><i class="iconfont iconshangchuan"></i>批量上传</el-button 93 ><i class="iconfont iconshangchuan"></i>批量上传</el-button
94 > 94 >
95 <el-button
96 class="radioBtn"
97 label="7"
98 border
99 @click="batchCancelChoosed"
100 ><i class="iconfont iconquxiaoxuanze"></i>取消选中</el-button
101 >
95 </div> 102 </div>
96 </el-col> 103 </el-col>
97 </el-row> 104 </el-row>
...@@ -536,6 +543,23 @@ export default { ...@@ -536,6 +543,23 @@ export default {
536 this.uploadVisible = true 543 this.uploadVisible = true
537 } 544 }
538 }, 545 },
546 //取消选中
547 batchCancelChoosed(){
548 this.cbsmList = [];
549 this.bsms = [];
550 this.qsztList = [];
551 this.$refs.lpbContent.hbsmList = [];
552 this.$refs.lpbContent.cbsmList = [];
553 this.$refs.lpbContent.choosedList = [];
554 this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
555 item.style.border = '';
556 item.className = "";
557 });
558 this.$refs.lpbContent.$refs.cBsm.forEach((item) => {
559 item.style.border = '';
560 item.className = "";
561 });
562 },
539 uploadError(err, file, fileList) { 563 uploadError(err, file, fileList) {
540 Message.error("上传文件失败") 564 Message.error("上传文件失败")
541 console.log("上传文件失败", err) 565 console.log("上传文件失败", err)
......